aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-11-08 13:29:04 -0800
committerGlenn Morris2014-11-08 13:29:04 -0800
commit7d8205619a95e44ec5c4d589c538c6616e64483b (patch)
tree94afc5982f9a9917b1cd04100969b52e053fb0c2
parentd244e9bf0369c630386efbdc69ea123ae1289844 (diff)
downloademacs-7d8205619a95e44ec5c4d589c538c6616e64483b.tar.gz
emacs-7d8205619a95e44ec5c4d589c538c6616e64483b.zip
* bytecomp.el (byte-compile-report-error): Allow the argument to be a string.
Due to the vague doc, it was already being used this way.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/emacs-lisp/bytecomp.el7
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e03e05c46f8..c3ecb7536e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12014-11-08 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/bytecomp.el (byte-compile-report-error):
4 Allow the argument to be a string. Due to the vague doc,
5 it was already being used this way.
6
12014-11-07 Michael Albinus <michael.albinus@gmx.de> 72014-11-07 Michael Albinus <michael.albinus@gmx.de>
2 8
3 * net/tramp.el (tramp-check-cached-permissions): Include hop in 9 * net/tramp.el (tramp-check-cached-permissions): Include hop in
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index a4f26efa027..51006d7c471 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1147,10 +1147,13 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
1147 (byte-compile-warn "%s" msg))))) 1147 (byte-compile-warn "%s" msg)))))
1148 1148
1149(defun byte-compile-report-error (error-info) 1149(defun byte-compile-report-error (error-info)
1150 "Report Lisp error in compilation. ERROR-INFO is the error data." 1150 "Report Lisp error in compilation.
1151ERROR-INFO is the error data, in the form of either (ERROR-SYMBOL . DATA)
1152or STRING."
1151 (setq byte-compiler-error-flag t) 1153 (setq byte-compiler-error-flag t)
1152 (byte-compile-log-warning 1154 (byte-compile-log-warning
1153 (error-message-string error-info) 1155 (if (stringp error-info) error-info
1156 (error-message-string error-info))
1154 nil :error)) 1157 nil :error))
1155 1158
1156;;; sanity-checking arglists 1159;;; sanity-checking arglists