X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fhyper-apropos.el;h=d5e4cde0909481707aa443b71a0e5ac1d46246bf;hb=d34741dd7fc8cca69512739dd3d392ee303e6905;hp=a9c4d3443daf9fca5a9cb6a0976f321496390c53;hpb=b5eeb6918c29470b36f8461c402eb0c65cb19bd2;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/hyper-apropos.el b/lisp/hyper-apropos.el
index a9c4d34..d5e4cde 100644
--- a/lisp/hyper-apropos.el
+++ b/lisp/hyper-apropos.el
@@ -58,7 +58,7 @@
 ;; Massive changes by Christoph Wedler <wedler@fmi.uni-passau.de>
 ;; Some changes for XEmacs 20.3 by hniksic
 
-;; ### The maintainer is supposed to be stig, but I haven't seen him
+;; #### The maintainer is supposed to be stig, but I haven't seen him
 ;; around for ages.  The real maintainer for the moment is Hrvoje
 ;; Niksic <hniksic@xemacs.org>.
 
@@ -310,10 +310,12 @@ a = autoloaded, b = byte-compiled, i = internal, l = lambda, m = macro.\n\n"
 			 (if (natnump l) l 0)))
       (and hyper-apropos-show-brief-docs
 	   (setq doc
-	   ;; A symbol's function slot can point to an unbound symbol.
-	   ;; In that case, `documentation' will fail.
-		 (ignore-errors
-		   (documentation fn)))
+		 ;; A symbol's function slot can point to an unbound symbol.
+		 ;; In that case, `documentation' will fail.
+		 (condition-case nil
+		     (documentation fn)
+		   (void-function "(alias for undefined function)")
+		   (error "(unexpected error from `documentation')")))
 	   (if  (string-match
 		 "^([^\n\t )]+[\t ]*\\([^\n)]+\\)?)\\(:[\t ]*\\|\n?\\'\\)"
 		 doc)
@@ -726,7 +728,12 @@ See also `hyper-apropos' and `hyper-describe-function'."
 		     local (current-local-map)
 		     global (current-global-map)
 		     obsolete (get symbol 'byte-obsolete-info)
-		     doc (or (documentation symbol) "function not documented"))
+		     doc (or (condition-case nil
+				 (documentation symbol)
+			       (void-function
+				"(alias for undefined function)")
+			       (error "(unexpected error from `documention')"))
+			     "function not documented"))
 	       (save-excursion
 		 (set-buffer hyper-apropos-help-buf)
 		 (goto-char (point-max))
@@ -1085,12 +1092,13 @@ Deletes lines which match PATTERN."
 	       nil
 	     (forward-char 3)
 	     (read (point-marker))))
-	  ((and
-	    (eq major-mode 'hyper-apropos-help-mode)
-	    (> (point) (point-min)))
-	   (save-excursion
-	     (goto-char (point-min))
-	     (hyper-apropos-this-symbol)))
+	  ;; What's this?  This ends up in the same symbol already described.
+;;	  ((and
+;;	    (eq major-mode 'hyper-apropos-help-mode)
+;;	    (> (point) (point-min)))
+;;	   (save-excursion
+;;	     (goto-char (point-min))
+;;	     (hyper-apropos-this-symbol)))
 	  (t
 	   (let* ((st (progn
 			(skip-syntax-backward "w_")