HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
emacs-lisp
/
macroexp.el
diff --git
a/lisp/emacs-lisp/macroexp.el
b/lisp/emacs-lisp/macroexp.el
index
3bf08ee
..
6bb7964
100644
(file)
--- a/
lisp/emacs-lisp/macroexp.el
+++ b/
lisp/emacs-lisp/macroexp.el
@@
-124,7
+124,10
@@
and also to avoid outputting the warning during normal execution."
(macroexp--funcall-if-compiled ',when-compiled)
,form))
(t
(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)
form))))
(defun macroexp--obsolete-warning (fun obsolescence-data type)