Browse Source

Compatibility: Make `org-reload' work on XEmacs.

This uses ideas by Tony E. Bennett.
Carsten Dominik 16 years ago
parent
commit
56a8ae9414
2 changed files with 10 additions and 1 deletions
  1. 1 0
      lisp/ChangeLog
  2. 9 1
      lisp/org.el

+ 1 - 0
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>
 

+ 9 - 1
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")