mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-06 23:51:24 -08:00
Code Issues Projects Releases Wiki Activity

(describe-function-1, describe-variable): If CURRENT-NAME is nil,

Browse source 
don't end obsolescence info with semicolon.
This commit is contained in:
Juanma Barranquero 2008-03-26 14:49:15 +00:00
parent d9dd743ee6
commit fdb5bd87c4
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/help-fns.el
View file

@ -421,19 +421,19 @@ face (according to `face-differs-from-default-p')."
(insert (car high) "\n")
(fill-region fill-begin (point)))
(setq doc (cdr high))))
(let ((obsolete (and
;; function might be a lambda construct.
(symbolp function)
(get function 'byte-obsolete-info))))
(let* ((obsolete (and
;; function might be a lambda construct.
(symbolp function)
(get function 'byte-obsolete-info)))
(use (car obsolete)))
(when obsolete
(princ "\nThis function is obsolete")
(when (nth 2 obsolete)
(insert (format " since %s" (nth 2 obsolete))))
(insert ";\n"
(if (stringp (car obsolete)) (car obsolete)
(if (null (car obsolete)) ""
(format "use `%s' instead." (car obsolete))))
"\n"))
(insert (cond ((stringp use) (concat ";\n" use))
(use (format ";\nuse `%s' instead." use))
(t "."))
"\n"))
(insert "\n"
(or doc "Not documented.")))))))
@ -640,6 +640,7 @@ it is displayed along with the global value."
(indirect-variable variable)
(error variable)))
(obsolete (get variable 'byte-obsolete-variable))
(use (car obsolete))
(safe-var (get variable 'safe-local-variable))
(doc (or (documentation-property variable 'variable-documentation)
(documentation-property alias 'variable-documentation)))
@ -661,10 +662,9 @@ it is displayed along with the global value."
(setq extra-line t)
(princ " This variable is obsolete")
(if (cdr obsolete) (princ (format " since %s" (cdr obsolete))))
(princ ";\n ")
(princ (if (stringp (car obsolete)) (car obsolete)
(if (null (car obsolete)) ""
(format "use `%s' instead." (car obsolete)))))
(princ (cond ((stringp use) (concat ";\n " use))
(use (format ";\n use `%s' instead." (car obsolete)))
(t ".")))
(terpri))
(when safe-var
(setq extra-line t)