summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2009-04-05 15:24:40 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2009-04-05 15:24:40 +0200
commit56a8ae94142c0751346dda52972a37fa3f3bbab1 (patch)
tree9b1e3eb591746fc5d00fb3b3622eff96f6aa4f68
parentc9675ebc9652d65592f5e711fa9df9623f8f4a97 (diff)
downloadorg-mode-56a8ae94142c0751346dda52972a37fa3f3bbab1.tar.gz
Compatibility: Make `org-reload' work on XEmacs.
This uses ideas by Tony E. Bennett.
-rwxr-xr-xlisp/ChangeLog1
-rw-r--r--lisp/org.el10
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9df801..1c07067 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,7 @@
case-sensitively.
(org-map-continue-from): New variable.
(org-scan-tags): Respect values in `org-map-continue-from'.
+ (org-reload): Make XEmacs compatible.
2009-04-04 Carsten Dominik <carsten.dominik@gmail.com>
diff --git a/lisp/org.el b/lisp/org.el
index 64737bb..e871346 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14710,7 +14710,15 @@ With optional NODE, go directly to that node."
With prefix arg UNCOMPILED, load the uncompiled versions."
(interactive "P")
(require 'find-func)
- (let* ((dir (file-name-directory (find-library-name "org")))
+ (let* ((dir
+ (if (fboundp 'find-library-name)
+ (file-name-directory (find-library-name "org"))
+ (flet ((find-library-name-helper (filename ignored-codesys)
+ filename)
+ (find-library-name
+ (library)
+ (find-library library nil 'find-library-name-helper)))
+ (file-name-directory (find-library-name "org")))))
(files (directory-files dir t "\\.el\\'"))
(remove-re (concat (if (featurep 'xemacs)
"org-colview" "org-colview-xemacs")