Mercurial > emacs

changeset 93244:790aba3b39c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(byte-compile-obsolete): If no replacement is provided, don't print "use nil instead".
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 26 Mar 2008 12:18:17 +0000
parents 9ecf89702ffc
children 3bbc1c7cc289
files lisp/emacs-lisp/bytecomp.el
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emacs-lisp/bytecomp.el	Wed Mar 26 11:50:34 2008 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Wed Mar 26 12:18:17 2008 +0000
@@ -1119,15 +1119,17 @@
 ;;; Used by make-obsolete.
 (defun byte-compile-obsolete (form)
   (let* ((new (get (car form) 'byte-obsolete-info))
+	 (use (car new))
 	 (handler (nth 1 new))
 	 (when (nth 2 new)))
     (byte-compile-set-symbol-position (car form))
     (if (byte-compile-warning-enabled-p 'obsolete)
-	(byte-compile-warn "`%s' is an obsolete function%s; %s" (car form)
+	(byte-compile-warn "`%s' is an obsolete function%s%s" (car form)
 			   (if when (concat " (as of Emacs " when ")") "")
-			   (if (stringp (car new))
-			       (car new)
-			     (format "use `%s' instead." (car new)))))
+			   (cond ((stringp use)
+				  (concat "; " use))
+				 (use (format "; use `%s' instead." use))
+				 (t "."))))
     (funcall (or handler 'byte-compile-normal-call) form)))
 
 ;; Compiler options