diff options
author | Glenn Morris <rgm@gnu.org> | 2018-08-29 08:24:03 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-08-29 08:24:03 -0700 |
commit | d8bef4b519624de20baa1428dd103f61dfb220fa (patch) | |
tree | ed458e2d88b9a0a422fd46e50c1d2654d24b07a9 /lisp/emacs-lisp | |
parent | b28d5333e0144acc7385339578d907196c4b6f3e (diff) | |
parent | 2670cbf9a87eb498d73770c381ca51657d390a1e (diff) | |
download | emacs-d8bef4b519624de20baa1428dd103f61dfb220fa.tar.gz emacs-d8bef4b519624de20baa1428dd103f61dfb220fa.tar.bz2 emacs-d8bef4b519624de20baa1428dd103f61dfb220fa.zip |
Merge from origin/emacs-26
2670cbf (origin/emacs-26) ; * configure.ac: Remove outdated comment (...
3b71bef admin.el: respect environment settings for makeinfo etc
3764ab4 * etc/PROBLEMS: New entry about GTK+ 3 crash with some X serv...
9d61344 Index profiler commands in elisp manual
f088817 Fix math-imaginary-i check
fca935e ; Let pre-commit git hook check merged in changes (Bug#29197)
fe06fcc Avoid infinite hscrolling loops when line numbers are displayed
63e59c8 Avoid crashes in malformed defvar
785682c * configure.ac (emacs_config_features): Add GLIB, XDBE, XIM.
2695b7e * configure.ac: Doc fixes related to --with-xim.
d0d162c Small checkdoc quoting fix (bug#32546)
Conflicts:
configure.ac
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 1b3b23d8871..83929beb1e0 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1837,7 +1837,7 @@ Replace with \"%s\"? " original replace) (if (checkdoc-autofix-ask-replace (match-beginning 1) (+ (match-beginning 1) (length ms)) - msg (format-message "`%s'" ms) t) + msg (format "`%s'" ms) t) (setq msg nil) (setq msg (format-message |