[Emacs-diffs] /srv/bzr/emacs/trunk r104315: * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Convert ' to #' for

[Stefan Monnier]

------------------------------------------------------------
revno: 104315
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8712
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2011-05-22 15:22:30 -0300
message:
  * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Convert ' to #' for
  funcall as well.  Warn when performing those conversions.
  * lisp/emacs-lisp/bytecomp.el (byte-compile-form): Fix error report.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el
  lisp/emacs-lisp/macroexp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-22 17:19:24 +0000
+++ b/lisp/ChangeLog    2011-05-22 18:22:30 +0000
@@ -1,5 +1,9 @@
 2011-05-22  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/macroexp.el (macroexpand-all-1): Convert ' to #' for
+       funcall as well (bug#8712).  Warn when performing those conversions.
+       * emacs-lisp/bytecomp.el (byte-compile-form): Fix error report.
+
        * progmodes/grep.el (grep-mode): Fix it for good (bug#8684)!
 
 2011-05-22  Glenn Morris  <address@hidden>

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2011-05-12 02:36:05 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2011-05-22 18:22:30 +0000
@@ -2892,8 +2892,8 @@
 That command is designed for interactive use only" fn))
         (if (and (fboundp (car form))
                  (eq (car-safe (symbol-function (car form))) 'macro))
-            (byte-compile-report-error
-             (format "Forgot to expand macro %s" (car form))))
+            (byte-compile-log-warning
+             (format "Forgot to expand macro %s" (car form)) nil :error))
         (if (and handler
                  ;; Make sure that function exists.  This is important
                  ;; for CL compiler macros since the symbol may be

=== modified file 'lisp/emacs-lisp/macroexp.el'
--- a/lisp/emacs-lisp/macroexp.el       2011-03-12 03:32:43 +0000
+++ b/lisp/emacs-lisp/macroexp.el       2011-05-22 18:22:30 +0000
@@ -169,14 +169,22 @@
       ;; here, so that any code that cares about the difference will
       ;; see the same transformation.
       ;; First arg is a function:
-      (`(,(and fun (or `apply `mapcar `mapatoms `mapconcat `mapc))
+      (`(,(and fun (or `funcall `apply `mapcar `mapatoms `mapconcat `mapc))
          ',(and f `(lambda . ,_)) . ,args)
+       (byte-compile-log-warning
+        (format "%s quoted with ' rather than with #'"
+                (list 'lambda (nth 1 f) '...))
+        t)
        ;; We don't use `maybe-cons' since there's clearly a change.
        (cons fun
              (cons (macroexpand-all-1 (list 'function f))
                    (macroexpand-all-forms args))))
       ;; Second arg is a function:
       (`(,(and fun (or `sort)) ,arg1 ',(and f `(lambda . ,_)) . ,args)
+       (byte-compile-log-warning
+        (format "%s quoted with ' rather than with #'"
+                (list 'lambda (nth 1 f) '...))
+        t)
        ;; We don't use `maybe-cons' since there's clearly a change.
        (cons fun
              (cons (macroexpand-all-1 arg1)