summaryrefslogtreecommitdiff
path: root/lisp/help-fns.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-03-26 02:36:45 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-03-26 02:36:45 +0000
commit67af6bdd7bd5a144f2d06fb70042ee00c582ac14 (patch)
tree5eb011da3e855c34a05325ca0a4d33d30a17efaa /lisp/help-fns.el
parent1ba1a8b97269cb615b17357260f2e6f7ca6e2af7 (diff)
downloademacs-67af6bdd7bd5a144f2d06fb70042ee00c582ac14.tar.gz
(describe-function-1, describe-variable): If no
replacement is provided, don't print "use nil instead".
Diffstat (limited to 'lisp/help-fns.el')
-rw-r--r--lisp/help-fns.el6
1 files changed, 4 insertions, 2 deletions
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)