* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): New function.

(macroexp--expand-all): Use it.
(macroexp--funcall-and-return): Remove by folding it into its sole
caller (macroexp--warn-and-return).
* lisp/emacs-lisp/bytecomp.el (byte-compile-warn-obsolete):
Use macroexp--obsolete-warning.

3 files changed, 39 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f9a15d9dfc..8b99fc29252 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2012-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/macroexp.el (macroexp--obsolete-warning): New function.
+        (macroexp--expand-all): Use it.
+        (macroexp--funcall-and-return): Remove by folding it into its sole
+        caller (macroexp--warn-and-return).
+        * emacs-lisp/bytecomp.el (byte-compile-warn-obsolete):
+        Use macroexp--obsolete-warning.
+
         * calc/calc.el: Fix last change by removing the whole chunk, since it
         was only needed back when Calc was not bundled.
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c42ae21aae5..7a229750178 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1115,18 +1115,12 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
   "Warn that SYMBOL (a variable or function) is obsolete."
   (when (byte-compile-warning-enabled-p 'obsolete)
     (let* ((funcp (get symbol 'byte-obsolete-info))
-           (obsolete (or funcp (get symbol 'byte-obsolete-variable)))
-           (instead (car obsolete))
-           (asof (nth 2 obsolete)))
+           (msg (macroexp--obsolete-warning
+                 symbol
+                 (or funcp (get symbol 'byte-obsolete-variable))
+                 (if funcp "function" "variable"))))
       (unless (and funcp (memq symbol byte-compile-not-obsolete-funcs))
-        (byte-compile-warn "`%s' is an obsolete %s%s%s" symbol
-                           (if funcp "function" "variable")
-                           (if asof (concat " (as of " asof ")") "")
-                           (cond ((stringp instead)
-                                  (concat "; " instead))
-                                 (instead
-                                  (format "; use `%s' instead." instead))
-                                 (t ".")))))))
+        (byte-compile-warn "%s" msg)))))
 
 (defun byte-compile-report-error (error-info)
   "Report Lisp error in compilation.  ERROR-INFO is the error data."
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index f9be3e4fcc4..cab693fecac 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -111,23 +111,30 @@ and also to avoid outputting the warning during normal execution."
        (funcall (eval (cadr form)))
        (byte-compile-constant nil)))
 
-(defun macroexp--funcall-and-return (when-compiled when-interpreted form)
-  ;; FIXME: ¡¡Major Ugly Hack!! To determine whether the output of this
-  ;; macro-expansion will be processed by the byte-compiler, we check
-  ;; circumstantial evidence.
-  (if (member '(declare-function . byte-compile-macroexpand-declare-function)
-              macroexpand-all-environment)
+(defun macroexp--warn-and-return (msg form)
+  (let ((when-compiled (lambda () (byte-compile-log-warning msg t))))
+    (cond
+     ((null msg) form)
+     ;; FIXME: ¡¡Major Ugly Hack!! To determine whether the output of this
+     ;; macro-expansion will be processed by the byte-compiler, we check
+     ;; circumstantial evidence.
+     ((member '(declare-function . byte-compile-macroexpand-declare-function)
+                macroexpand-all-environment)
       `(progn
          (macroexp--funcall-if-compiled ',when-compiled)
-         ,form)
-    (funcall when-interpreted)
-    form))
-
-(defun macroexp--warn-and-return (msg form)
-  (macroexp--funcall-and-return
-   (lambda () (byte-compile-log-warning msg t))
-   (lambda () (message "%s" msg))
-   form))
+         ,form))
+     (t
+      (message "%s" msg)
+      form))))
+
+(defun macroexp--obsolete-warning (fun obsolescence-data type)
+  (let ((instead (car obsolescence-data))
+        (asof (nth 2 obsolescence-data)))
+    (format "`%s' is an obsolete %s%s%s" fun type
+            (if asof (concat " (as of " asof ")") "")
+            (cond ((stringp instead) (concat "; " instead))
+                  (instead (format "; use `%s' instead." instead))
+                  (t ".")))))
 
 (defun macroexp--expand-all (form)
   "Expand all macros in FORM.
@@ -148,10 +155,11 @@ Assumes the caller has bound `macroexpand-all-environment'."
                      (car-safe form)
                      (symbolp (car form))
                      (get (car form) 'byte-obsolete-info))
-                (macroexp--funcall-and-return
-                 (lambda () (byte-compile-warn-obsolete (car form)))
-                 #'ignore      ;FIXME: We should `message' something.
-                 new-form)
+                (let* ((fun (car form))
+                       (obsolete (get fun 'byte-obsolete-info)))
+                  (macroexp--warn-and-return
+                   (macroexp--obsolete-warning fun obsolete "macro")
+                   new-form))
               new-form)))
     (pcase form
       (`(cond . ,clauses)