diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-20 21:15:43 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-20 21:15:43 -0500 |
| commit | b1cf262a79463f28164ea1c2ffee3c657ce02ea4 (patch) | |
| tree | 4a428c5e0c026c1bb30e5972e78b145335b4b747 /lisp/emacs-lisp | |
| parent | a415a97461cb10d2c6710871f90f57bd1ca34ec2 (diff) | |
| parent | b3f4a3a5aee93fa2f7ad2597383befbf7b242209 (diff) | |
| download | emacs-b1cf262a79463f28164ea1c2ffee3c657ce02ea4.tar.gz emacs-b1cf262a79463f28164ea1c2ffee3c657ce02ea4.tar.bz2 emacs-b1cf262a79463f28164ea1c2ffee3c657ce02ea4.zip | |
Merge from origin/emacs-26
b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2...
c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change)
2f9d9ef ; Remove the mention of "plain C code" in the docstring as well
aca827b Merge branch 'widen-less' into emacs-26
87548f5 ; Rephrase NEWS entry a bit
da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL.
3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler...
471b6c1 ; Replace non-ascii quote characters in doc strings etc
7af7f5e Fix some more aliases to user options
79fb4b5 Fix some flymake aliases
b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no...
446faf3 Replace the mention of c-indent-defun with js-indent-line
7e9eef0 Consolidate 'widen' calls
# Conflicts:
# etc/NEWS
# lisp/progmodes/flymake-proc.el
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 25f738cb8ec..e08e0d92863 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1253,7 +1253,7 @@ function directly; use `byte-compile-warn' or (defun byte-compile-report-error (error-info &optional fill) "Report Lisp error in compilation. ERROR-INFO is the error data, in the form of either (ERROR-SYMBOL . DATA) -or STRING. If FILL is non-nil, set ‘warning-fill-prefix’ to four spaces +or STRING. If FILL is non-nil, set `warning-fill-prefix' to four spaces when printing the error message." (setq byte-compiler-error-flag t) (byte-compile-log-warning |