[Emacs-diffs] Changes to emacs/lisp/help-fns.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/08/30 03:26:03

Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- help-fns.el 28 Jul 2008 13:19:09 -0000      1.123
+++ help-fns.el 30 Aug 2008 03:26:03 -0000      1.124
@@ -268,7 +268,8 @@
                function))
         file-name string
         (beg (if (commandp def) "an interactive " "a "))
-         (pt1 (with-current-buffer (help-buffer) (point))))
+        (pt1 (with-current-buffer (help-buffer) (point)))
+        errtype)
     (setq string
          (cond ((or (stringp def)
                     (vectorp def))
@@ -280,8 +281,11 @@
                ((byte-code-function-p def)
                 (concat beg "compiled Lisp function"))
                ((symbolp def)
-                (while (symbolp (symbol-function def))
+                (while (and (fboundp def)
+                            (symbolp (symbol-function def)))
                   (setq def (symbol-function def)))
+                ;; Handle (defalias 'foo 'bar), where bar is undefined.
+                (or (fboundp def) (setq errtype 'alias))
                 (format "an alias for `%s'" def))
                ((eq (car-safe def) 'lambda)
                 (concat beg "Lisp function"))
@@ -307,6 +311,8 @@
                      "a sparse keymap")))
                (t "")))
     (princ string)
+    (if (eq errtype 'alias)
+       (princ ",\nwhich is not defined.  Please make a bug report.")
     (with-current-buffer standard-output
       (save-excursion
        (save-match-data
@@ -435,7 +441,7 @@
                          (t "."))
                    "\n"))
           (insert "\n"
-                  (or doc "Not documented.")))))))
+                   (or doc "Not documented."))))))))
 
 
 ;; Variables