summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-11-04 09:37:03 -0800
committerGlenn Morris <rgm@gnu.org>2018-11-04 09:37:03 -0800
commita9140091dd0df7e89ddbaabec17608a20f06f7b0 (patch)
tree3def81298da0b3608f1b5047081fd62b7d7dc7bb /lisp/emacs-lisp
parent5ad0d805855dacfee285fe4f2375f18c9f245875 (diff)
parentbd1d61753d90ef47af1e9a3b7a92ee77b7d43ed0 (diff)
downloademacs-a9140091dd0df7e89ddbaabec17608a20f06f7b0.tar.gz
emacs-a9140091dd0df7e89ddbaabec17608a20f06f7b0.tar.bz2
emacs-a9140091dd0df7e89ddbaabec17608a20f06f7b0.zip
Merge from origin/emacs-26
bd1d617 Avoid race in rcirc process filter (bug#33145) 88ef31a Avoid file-name errors when viewing PDF from Gnus c939042 Avoid crashes with remapped default face in Org mode 97660fa Doc fix for checkdoc-continue 96f055b Fix a typo in autoload.el
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/autoload.el2
-rw-r--r--lisp/emacs-lisp/checkdoc.el5
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index c9ee532ac82..22aac954d17 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1047,7 +1047,7 @@ write its autoloads into the specified file instead."
;; we don't want to depend on whether Emacs was
;; built with or without modules support, nor
;; what is the suffix for the underlying OS.
- (unless (string-match "\\.\\(elc\\|\\so\\|dll\\)" suf)
+ (unless (string-match "\\.\\(elc\\|so\\|dll\\)" suf)
(push suf tmp)))
(concat "^[^=.].*" (regexp-opt tmp t) "\\'")))
(files (apply #'nconc
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 83929beb1e0..86d211c729a 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -884,9 +884,8 @@ a separate buffer."
;;;###autoload
(defun checkdoc-continue (&optional take-notes)
"Find the next doc string in the current buffer which has a style error.
-Prefix argument TAKE-NOTES means to continue through the whole buffer and
-save warnings in a separate buffer. Second optional argument START-POINT
-is the starting location. If this is nil, `point-min' is used instead."
+Prefix argument TAKE-NOTES means to continue through the whole
+buffer and save warnings in a separate buffer."
(interactive "P")
(let ((wrong nil) (msg nil)
;; Assign a flag to spellcheck flag