APPROVE COMMIT 21.5 RECOMMEND 21.4
As reported by Hrvoje on -beta.
Vin, this is needed in 21.4 as well.
NOTE: This patch has been committed.
21.5 patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: lisp/ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: lisp/help.el
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.680
diff -u -p -U0 -r1.680 ChangeLog
--- lisp/ChangeLog 9 Oct 2005 10:41:37 -0000 1.680
+++ lisp/ChangeLog 10 Oct 2005 02:44:13 -0000
@@ -0,0 +1,6 @@
+2005-10-10 Steve Youngs <steve(a)sxemacs.org>
+
+ * help.el (view-emacs-news): Use `expand-file-name' instead of
+ `locate-data-file' as the latter will find any "NEWS" files that
+ might exist in packages _before_ the one in core.
+
Index: lisp/help.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/help.el,v
retrieving revision 1.44
diff -u -p -u -r1.44 help.el
--- lisp/help.el 31 Jan 2005 20:08:45 -0000 1.44
+++ lisp/help.el 10 Oct 2005 02:43:17 -0000
@@ -838,7 +838,7 @@ of the key sequence that ran this comman
(defun view-emacs-news ()
"Display info on recent changes to XEmacs."
(interactive)
- (Help-find-file (locate-data-file "NEWS")))
+ (Help-find-file (expand-file-name "NEWS" data-directory)))
(defun xemacs-www-page ()
"Go to the XEmacs World Wide Web page."
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| I am Dyslexic of Borg. |
| Fusistance is retile. Your arse will be laminated. |
|------------------------------------<steve(a)sxemacs.org>---|