# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1206499005 0
# Node ID 53d5f10d34bc61cbf1ee1cb001afff2ed42f4836
# Parent  6c8ba589315951b622774cd1bfffcc9df430e961
(describe-function-1, describe-variable): If no
replacement is provided, don't print "use nil instead".

diff -r 6c8ba5893159 -r 53d5f10d34bc lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 26 02:29:43 2008 +0000
+++ b/lisp/ChangeLog	Wed Mar 26 02:36:45 2008 +0000
@@ -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 -r 6c8ba5893159 -r 53d5f10d34bc lisp/help-fns.el
--- a/lisp/help-fns.el	Wed Mar 26 02:29:43 2008 +0000
+++ b/lisp/help-fns.el	Wed Mar 26 02:36:45 2008 +0000
@@ -431,7 +431,8 @@
               (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 @@
                 (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)