X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fhelp.el;h=1ac1780dec349a3db3bbb5c14efa3726c2eb06a8;hp=1835b7d2345aa50ed5c62ca9b6bc48e1256796df;hb=d498337390c3a567aae4fa0e1c1f06064a808d21;hpb=d8654f7c5ad0c04060008c6fbbd90add1f4537e3

diff --git a/lisp/help.el b/lisp/help.el
index 1835b7d..1ac1780 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -736,7 +736,7 @@ of the key sequence that ran this command."
 (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."
@@ -1075,7 +1075,8 @@ part of the documentation of internal subroutines."
   (let ((doc (condition-case nil
 		 (or (documentation function)
 		     (gettext "not documented"))
-	       (void-function ""))))
+	       (void-function "(alias for undefined function)")
+	       (error "(unexpected error from `documention')"))))
     (if (and strip-arglist
 	     (string-match "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'" doc))
 	(setq doc (substring doc 0 (match-beginning 0))))
@@ -1095,7 +1096,7 @@ part of the documentation of internal subroutines."
 	   (princ object)
 	   (put-nonduplicable-text-property
 	    pos (marker-position standard-output) 'face face buf)))
-	(t princ object)))
+	(t (princ object))))
 
 ;; replacement for `prin1' that puts the text in the specified face,
 ;; if possible
@@ -1111,7 +1112,7 @@ part of the documentation of internal subroutines."
 	   (prin1 object)
 	   (put-nonduplicable-text-property
 	    pos (marker-position standard-output) 'face face buf)))
-	(t prin1 object)))
+	(t (prin1 object))))
 
 (defvar help-symbol-regexp
   (let ((sym-char "[+a-zA-Z0-9_:*]")
@@ -1185,7 +1186,10 @@ part of the documentation of internal subroutines."
 			 (documentation-property sym
 						 'variable-documentation t)))
 	       (fun (and sym (fboundp sym)
-			 (documentation sym t))))
+			 (condition-case nil
+			     (documentation sym t)
+			   (void-function "(alias for undefined function)")
+			   (error "(unexpected error from `documention')")))))
 	  (when (or var fun)
 	    (let ((ex (make-extent b e)))
 	      (require 'hyper-apropos)