aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2020-01-17 07:50:28 -0800
committerGlenn Morris2020-01-17 07:50:28 -0800
commitd97a77c481ec913d8c3c24f2eecdc41a28243678 (patch)
tree2adcb280b6e179e6f93e12cfa6c073ceb2c89a41
parent8c376493fcce89710cf3e0e92e6d5ab085a62623 (diff)
parent4df0c1c6c4627e83ba3b2a76ce618af6ef180a57 (diff)
downloademacs-d97a77c481ec913d8c3c24f2eecdc41a28243678.tar.gz
emacs-d97a77c481ec913d8c3c24f2eecdc41a28243678.zip
Merge from origin/emacs-27
4df0c1c6c4 (origin/emacs-27) ; * src/lread.c (force_new_style_backquo... 069741b2f7 ; * etc/NEWS: Mention latest changes in checkdoc. (Bug#38... a785be29bf Fix wording and punctuation of a recent commit 0d3d3be35c Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/e... 5da372e17e ; Minor edit in anti.texi # Conflicts: # etc/NEWS
-rw-r--r--etc/NEWS.278
-rw-r--r--lisp/emacs-lisp/checkdoc.el4
-rw-r--r--lisp/textmodes/ispell.el6
-rw-r--r--src/lread.c2
4 files changed, 14 insertions, 6 deletions
diff --git a/etc/NEWS.27 b/etc/NEWS.27
index d6eb5d9e666..69ffcdb66e5 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -1458,6 +1458,14 @@ A new command 'xref-revert-buffer' is bound to 'g'.
1458--- 1458---
1459*** Imenu support has been added to 'xref--xref-buffer-mode'. 1459*** Imenu support has been added to 'xref--xref-buffer-mode'.
1460 1460
1461** Checkdoc
1462
1463---
1464*** Checkdoc can now optionally spell-check doc strings.
1465Invoking 'checkdoc-buffer' with a non-nil TAKE-NOTES argument
1466(interactively, with a prefix arg) will now spell-check the doc
1467strings and report all the spelling mistakes.
1468
1461** Icomplete 1469** Icomplete
1462 1470
1463+++ 1471+++
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index cbad6f05541..ccdddb47c35 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2110,8 +2110,8 @@ nil."
2110 (unless ispell-process 2110 (unless ispell-process
2111 (condition-case nil 2111 (condition-case nil
2112 (progn 2112 (progn
2113 (ispell-set-spellchecker-params) ; Initialize variables and dicts alists 2113 (ispell-set-spellchecker-params) ; Initialize variables and dict alists.
2114 (ispell-accept-buffer-local-defs) ; use the correct dictionary 2114 (ispell-accept-buffer-local-defs) ; Use the correct dictionary.
2115 ;; This code copied in part from ispell.el Emacs 19.34 2115 ;; This code copied in part from ispell.el Emacs 19.34
2116 (dolist (w checkdoc-ispell-lisp-words) 2116 (dolist (w checkdoc-ispell-lisp-words)
2117 (process-send-string ispell-process (concat "@" w "\n")))) 2117 (process-send-string ispell-process (concat "@" w "\n"))))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c06f3915faa..fc529a83596 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2015,7 +2015,7 @@ quit spell session exited."
2015 2015
2016(defun ispell--run-on-word (word) 2016(defun ispell--run-on-word (word)
2017 "Run ispell on WORD." 2017 "Run ispell on WORD."
2018 (ispell-send-string "%\n") ; put in verbose mode 2018 (ispell-send-string "%\n") ; Put the speller in verbose mode.
2019 (ispell-send-string (concat "^" word "\n")) 2019 (ispell-send-string (concat "^" word "\n"))
2020 ;; wait until ispell has processed word 2020 ;; wait until ispell has processed word
2021 (while (progn 2021 (while (progn
@@ -2035,13 +2035,13 @@ quit spell session exited."
2035 (or ispell-current-dictionary "default"))) 2035 (or ispell-current-dictionary "default")))
2036 2036
2037(defun ispell-correct-p (&optional following) 2037(defun ispell-correct-p (&optional following)
2038 "Return t if the word at point is correct. Nil otherwise. 2038 "Return t if the word at point is correct, nil otherwise.
2039 2039
2040If optional argument FOLLOWING is non-nil then the following 2040If optional argument FOLLOWING is non-nil then the following
2041word (rather than preceding) is checked when the cursor is not 2041word (rather than preceding) is checked when the cursor is not
2042over a word." 2042over a word."
2043 (save-excursion 2043 (save-excursion
2044 ;; reset ispell-filter so it only contains the result of 2044 ;; Reset ispell-filter so it only contains the result of
2045 ;; spell-checking the current-word: 2045 ;; spell-checking the current-word:
2046 (setq ispell-filter nil) 2046 (setq ispell-filter nil)
2047 (let* ((word-and-boundaries (ispell-get-word following)) 2047 (let* ((word-and-boundaries (ispell-get-word following))
diff --git a/src/lread.c b/src/lread.c
index 290b3d3d64e..4e9860d5dc8 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -5070,7 +5070,7 @@ that are loaded before your customizations are read! */);
5070If nil, `load' and `read' raise errors when encountering some 5070If nil, `load' and `read' raise errors when encountering some
5071old-style variants of backquote and comma. If non-nil, these 5071old-style variants of backquote and comma. If non-nil, these
5072constructs are always interpreted as described in the Info node 5072constructs are always interpreted as described in the Info node
5073`(elisp)Backquotes', even if that interpretation is incompatible with 5073`(elisp)Backquote', even if that interpretation is incompatible with
5074previous versions of Emacs. Setting this variable to non-nil makes 5074previous versions of Emacs. Setting this variable to non-nil makes
5075Emacs compatible with the behavior planned for Emacs 28. In Emacs 28, 5075Emacs compatible with the behavior planned for Emacs 28. In Emacs 28,
5076this variable will become obsolete. */); 5076this variable will become obsolete. */);