[Emacs-diffs] /srv/bzr/emacs/trunk r111236: macroexp--warn-and-return message tweak (bug#13132)

[Glenn Morris]

------------------------------------------------------------
revno: 111236
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-14 16:27:39 -0500
message:
  macroexp--warn-and-return message tweak (bug#13132)
  
  * lisp/emacs-lisp/macroexp.el (macroexp--warn-and-return):
  Try to include filename in non-bytecomp warning.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/macroexp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-14 18:59:00 +0000
+++ b/lisp/ChangeLog    2012-12-14 21:27:39 +0000
@@ -1,3 +1,8 @@
+2012-12-14  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/macroexp.el (macroexp--warn-and-return):
+       Try to include filename in non-bytecomp warning.  (Bug#13132)
+
 2012-12-14  Paul Eggert  <address@hidden>
 
        Fix permissions bugs with setgid directories etc. (Bug#13125)

=== modified file 'lisp/emacs-lisp/macroexp.el'
--- a/lisp/emacs-lisp/macroexp.el       2012-10-26 15:59:40 +0000
+++ b/lisp/emacs-lisp/macroexp.el       2012-12-14 21:27:39 +0000
@@ -124,7 +124,10 @@
          (macroexp--funcall-if-compiled ',when-compiled)
          ,form))
      (t
-      (message "%s" msg)
+      (message "%s%s" (if (stringp load-file-name)
+                          (concat (file-relative-name load-file-name) ": ")
+                        "")
+               msg)
       form))))
 
 (defun macroexp--obsolete-warning (fun obsolescence-data type)