Merge from emacs-24; up to 117689

This commit is contained in:
Glenn Morris 2014-11-08 13:32:10 -08:00
commit 089c6aab18
4 changed files with 19 additions and 3 deletions

View file

@ -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