APPROVE COMMIT NOTE: This patch has been committed. xemacs-packages/xemacs-devel/ChangeLog addition: 2006-07-10 Aidan Kehoe <kehoea(a)parhasard.net&gt; * 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. XEmacs Packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/xemacs-devel/find-func.el Index: xemacs-packages/xemacs-devel/find-func.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el,v retrieving revision 1.9 diff -u -u -r1.9 find-func.el --- xemacs-packages/xemacs-devel/find-func.el 2006/07/07 21:22:29 1.9 +++ xemacs-packages/xemacs-devel/find-func.el 2006/07/10 20:57:15 ＠＠ -162,9 +162,14 ＠＠ ;; 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 -- Santa Maradona, priez pour moi!