diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-08 13:32:10 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-08 13:32:10 -0800 |
| commit | 089c6aab18ea8986bfc02ef3e65500b589e7afbe (patch) | |
| tree | e9eb9948f92edb14d493aac970e5f82dc8ac306d /lisp/emacs-lisp | |
| parent | e7e61abaa9de9a7e8485d1fc52a5aa6ce112620e (diff) | |
| parent | 7d8205619a95e44ec5c4d589c538c6616e64483b (diff) | |
| download | emacs-089c6aab18ea8986bfc02ef3e65500b589e7afbe.tar.gz | |
Merge from emacs-24; up to 117689
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 7fd72dd7705..fdb8cc8f39d 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1165,10 +1165,13 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (byte-compile-warn "%s" msg))))) (defun byte-compile-report-error (error-info) - "Report Lisp error in compilation. ERROR-INFO is the error data." + "Report Lisp error in compilation. +ERROR-INFO is the error data, in the form of either (ERROR-SYMBOL . DATA) +or STRING." (setq byte-compiler-error-flag t) (byte-compile-log-warning - (error-message-string error-info) + (if (stringp error-info) error-info + (error-message-string error-info)) nil :error)) ;;; sanity-checking arglists |