[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/help-fns.el,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/help-fns.el,v |
Date: |
Wed, 26 Mar 2008 14:49:15 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 08/03/26 14:49:15
Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- help-fns.el 26 Mar 2008 02:36:44 -0000 1.117
+++ help-fns.el 26 Mar 2008 14:49:15 -0000 1.118
@@ -421,18 +421,18 @@
(insert (car high) "\n")
(fill-region fill-begin (point)))
(setq doc (cdr high))))
- (let ((obsolete (and
+ (let* ((obsolete (and
;; function might be a lambda construct.
(symbolp function)
- (get function 'byte-obsolete-info))))
+ (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))))
+ (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 @@
(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 @@
(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)