(describe-function-1, describe-variable): If no

replacement is provided, don't print "use nil instead".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74c0df45635333de55c5a8cf93410b0bdcca1c3f..a54e2272d47b6d22601bd244af66f7947e80ea02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * help-fns.el (describe-function-1, describe-variable): If no
+       replacement is provided, don't print "use nil instead".
+
 2008-03-25  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
        * proced.el: Update copyright.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index dd25fcece1d01fb771b17c2a8fa23d0ec0e4d811..ed6a6a8d10a9cd7a960fc8824d5d96116f7ee6fe 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -431,7 +431,8 @@ face (according to `face-differs-from-default-p')."
               (insert (format " since %s" (nth 2 obsolete))))
             (insert ";\n"
                     (if (stringp (car obsolete)) (car obsolete)
-                      (format "use `%s' instead." (car obsolete)))
+                      (if (null (car obsolete)) ""
+                        (format "use `%s' instead." (car obsolete))))
                     "\n"))
           (insert "\n"
                   (or doc "Not documented.")))))))
@@ -662,7 +663,8 @@ it is displayed along with the global value."
                 (if (cdr obsolete) (princ (format " since %s" (cdr obsolete))))
                 (princ ";\n  ")
                 (princ (if (stringp (car obsolete)) (car obsolete)
-                         (format "use `%s' instead." (car obsolete))))
+                         (if (null (car obsolete)) ""
+                           (format "use `%s' instead." (car obsolete)))))
                 (terpri))
              (when safe-var
                 (setq extra-line t)