User: aidan
Date: 06/07/10 23:00:18
Modified: packages/xemacs-packages/xemacs-devel ChangeLog find-func.el
Log:
Prefer source-directory to source-root; fix find-func for 21.4
Revision Changes Path
1.106 +7 -0 XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ChangeLog 2006/07/10 05:13:51 1.105
+++ ChangeLog 2006/07/10 21:00:16 1.106
@@ -1,3 +1,10 @@
+2006-07-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * find-func.el (find-function-C-source-directory):
+ Prefer source-directory to source-root, check that the
+ corresponding variables exist before using them--fixes an error on
+ 21.4.
+
2006-07-10 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.73 released.
1.10 +8 -3 XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el
Index: find-func.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- find-func.el 2006/07/07 21:22:29 1.9
+++ find-func.el 2006/07/10 21:00:17 1.10
@@ -162,9 +162,14 @@ See the functions `find-function' and `f
;; GNU and is here.
(defvar find-function-C-source-directory
- ;; XEmacs change ; source-directory -> source-root
- (let ((dir (expand-file-name "src" source-root)))
- (when (and (file-directory-p dir) (file-readable-p dir))
+ ;; XEmacs change ; check source-root too, which was available for a couple
+ ;; of years in 21.5.
+ (let (dir)
+ (when (and (setq dir (or (and (boundp 'source-directory)
+ (expand-file-name "src" source-directory))
+ (and (boundp 'source-root)
+ (expand-file-name "src" source-root))))
+ (file-directory-p dir) (file-readable-p dir))
dir))
"Directory where the C source files of XEmacs can be found.
If nil, do not try to find the source code of functions and variables