(byte-compile-obsolete): If no replacement is provided,

don't print "use nil instead".

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e62968a392de6076f57d77ef0ead479af1bc1877..2aeefc38e8cd6159fac8ebe934ce1c4a651543ec 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1119,15 +1119,17 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
 ;;; 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)))
 \f
 ;; Compiler options