From 67af6bdd7bd5a144f2d06fb70042ee00c582ac14 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 26 Mar 2008 02:36:45 +0000 Subject: [PATCH] (describe-function-1, describe-variable): If no replacement is provided, don't print "use nil instead". --- lisp/ChangeLog | 5 +++++ lisp/help-fns.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 74c0df45635..a54e2272d47 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-03-26 Stefan Monnier + + * help-fns.el (describe-function-1, describe-variable): If no + replacement is provided, don't print "use nil instead". + 2008-03-25 Roland Winkler * proced.el: Update copyright. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index dd25fcece1d..ed6a6a8d10a 100644 --- 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) -- 2.39.5