aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-06-06 08:51:48 -0400
committerStefan Monnier2012-06-06 08:51:48 -0400
commitb7bb58381961ddb74fe347a2c4076113c73d75a6 (patch)
treeba1edc8912e106347bd223caa8478c0b3cdd001d
parentdfb308badd63c6046545293306117c1ff117b8f0 (diff)
downloademacs-b7bb58381961ddb74fe347a2c4076113c73d75a6.tar.gz
emacs-b7bb58381961ddb74fe347a2c4076113c73d75a6.zip
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Don't spam the output
with "loading" messages. Fixes: debbugs:11635
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/macroexp.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ba7a327ad3..343368bc591 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-06-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/macroexp.el (macroexpand-all-1): Don't spam the output
4 with "loading" messages (bug#11635).
5
12012-06-06 Michael Albinus <michael.albinus@gmx.de> 62012-06-06 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * files.el (enable-remote-dir-locals): New option. 8 * files.el (enable-remote-dir-locals): New option.
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index b021abe71ea..514824554d1 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -188,7 +188,8 @@ Assumes the caller has bound `macroexpand-all-environment'."
188 (or (not (eq (car-safe (symbol-function func)) 188 (or (not (eq (car-safe (symbol-function func))
189 'autoload)) 189 'autoload))
190 (ignore-errors 190 (ignore-errors
191 (load (nth 1 (symbol-function func)))))) 191 (load (nth 1 (symbol-function func))
192 'noerror 'nomsg))))
192 ;; Follow the sequence of aliases. 193 ;; Follow the sequence of aliases.
193 (setq func (symbol-function func))) 194 (setq func (symbol-function func)))
194 (if (null handler) 195 (if (null handler)