aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.62
-rw-r--r--lisp/elec-pair.el7
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/progmodes/cc-engine.el4
-rw-r--r--lisp/textmodes/flyspell.el21
5 files changed, 25 insertions, 11 deletions
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 3a6d60dfbcd..0d0df58f58e 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -3506,7 +3506,7 @@
3506 (sgml-beginning-of-tag, sgml-value): New functions. 3506 (sgml-beginning-of-tag, sgml-value): New functions.
3507 3507
3508 (html-*): All these functions and variables are new. 3508 (html-*): All these functions and variables are new.
3509 Mostly they parametrize everything preceding. 3509 Mostly they parameterize everything preceding.
3510 3510
3511 * autoinsert.el (auto-insert-alist): For html-mode, use `sgml-tag'. 3511 * autoinsert.el (auto-insert-alist): For html-mode, use `sgml-tag'.
3512 3512
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index af9a44c844c..97049a7d9d9 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -580,8 +580,11 @@ the mode if ARG is omitted or nil.
580 580
581Electric Pair mode is a global minor mode. When enabled, typing 581Electric Pair mode is a global minor mode. When enabled, typing
582an open parenthesis automatically inserts the corresponding 582an open parenthesis automatically inserts the corresponding
583closing parenthesis. (Likewise for brackets, etc.). To toggle 583closing parenthesis, and vice versa. (Likewise for brackets, etc.).
584the mode in a single buffer, use `electric-pair-local-mode'." 584If the region is active, the parentheses (brackets, etc.) are
585inserted around the region instead.
586
587To toggle the mode in a single buffer, use `electric-pair-local-mode'."
585 :global t :group 'electricity 588 :global t :group 'electricity
586 (if electric-pair-mode 589 (if electric-pair-mode
587 (progn 590 (progn
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index e5e5f4ee590..a316364761d 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1402,7 +1402,7 @@
1402 (setq offset (- offset #x80))) 1402 (setq offset (- offset #x80)))
1403 ((eq bytedecomp-op 'byte-switch) 1403 ((eq bytedecomp-op 'byte-switch)
1404 (cl-assert (hash-table-p last-constant) nil 1404 (cl-assert (hash-table-p last-constant) nil
1405 "byte-switch used without preceeding hash table") 1405 "byte-switch used without preceding hash table")
1406 ;; We cannot use the original hash table referenced in the op, 1406 ;; We cannot use the original hash table referenced in the op,
1407 ;; so we create a copy of it, and replace the addresses with 1407 ;; so we create a copy of it, and replace the addresses with
1408 ;; TAGs. 1408 ;; TAGs.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index cddf79b351c..c5b07b37027 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2585,7 +2585,7 @@ comment at the start of cc-engine.el for more info."
2585 ;; or the car of the list is the "position element" of ELT, the position 2585 ;; or the car of the list is the "position element" of ELT, the position
2586 ;; where ELT is valid. 2586 ;; where ELT is valid.
2587 ;; 2587 ;;
2588 ;; POINT is left at the postition for which the returned state is valid. It 2588 ;; POINT is left at the position for which the returned state is valid. It
2589 ;; will be either the position element of ELT, or one character before 2589 ;; will be either the position element of ELT, or one character before
2590 ;; that. (The latter happens in Emacs <= 25 and XEmacs, when ELT indicates 2590 ;; that. (The latter happens in Emacs <= 25 and XEmacs, when ELT indicates
2591 ;; its position element directly follows a potential first character of a 2591 ;; its position element directly follows a potential first character of a
@@ -2656,7 +2656,7 @@ comment at the start of cc-engine.el for more info."
2656 ((nth 3 state) ; A string 2656 ((nth 3 state) ; A string
2657 (list (point) (nth 3 state) (nth 8 state))) 2657 (list (point) (nth 3 state) (nth 8 state)))
2658 ((and (nth 4 state) ; A comment 2658 ((and (nth 4 state) ; A comment
2659 (not (eq (nth 7 state) 'syntax-table))) ; but not a psuedo comment. 2659 (not (eq (nth 7 state) 'syntax-table))) ; but not a pseudo comment.
2660 (list (point) 2660 (list (point)
2661 (if (eq (nth 7 state) 1) 'c++ 'c) 2661 (if (eq (nth 7 state) 1) 'c++ 'c)
2662 (nth 8 state))) 2662 (nth 8 state)))
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 5568bbb1d97..aaa8ebfd480 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1103,7 +1103,10 @@ If the optional argument FOLLOWING, or, when called interactively
1103`ispell-following-word', is non-nil, checks the following (rather 1103`ispell-following-word', is non-nil, checks the following (rather
1104than preceding) word when the cursor is not over a word. If 1104than preceding) word when the cursor is not over a word. If
1105optional argument KNOWN-MISSPELLING is non nil considers word a 1105optional argument KNOWN-MISSPELLING is non nil considers word a
1106misspelling and skips redundant spell-checking step." 1106misspelling and skips redundant spell-checking step.
1107
1108See `flyspell-get-word' for details of how this finds the word to
1109spell-check."
1107 (interactive (list ispell-following-word)) 1110 (interactive (list ispell-following-word))
1108 (ispell-set-spellchecker-params) ; Initialize variables and dicts alists 1111 (ispell-set-spellchecker-params) ; Initialize variables and dicts alists
1109 (save-excursion 1112 (save-excursion
@@ -1302,7 +1305,13 @@ misspelling and skips redundant spell-checking step."
1302Optional argument FOLLOWING non-nil means to get the following 1305Optional argument FOLLOWING non-nil means to get the following
1303\(rather than preceding) word when the cursor is not over a word. 1306\(rather than preceding) word when the cursor is not over a word.
1304Optional second argument EXTRA-OTHERCHARS is a regexp of characters 1307Optional second argument EXTRA-OTHERCHARS is a regexp of characters
1305that may be included as part of a word (see `ispell-dictionary-alist')." 1308that may be included as part of a word (see `ispell-dictionary-alist').
1309
1310This finds the word to spell-check by searching for CASECHARS defined
1311in `ispell-dictionary-alist' for the current dictionary. Thus, the
1312word could be far away of point if point is inside whitespace or
1313punctuation characters, or in text that belongs to a different
1314language."
1306 (let* ((flyspell-casechars (flyspell-get-casechars)) 1315 (let* ((flyspell-casechars (flyspell-get-casechars))
1307 (flyspell-not-casechars (flyspell-get-not-casechars)) 1316 (flyspell-not-casechars (flyspell-get-not-casechars))
1308 (ispell-otherchars (ispell-get-otherchars)) 1317 (ispell-otherchars (ispell-get-otherchars))
@@ -1919,8 +1928,10 @@ before point that's highlighted as misspelled."
1919 "Correct the current word. 1928 "Correct the current word.
1920This command proposes various successive corrections for the 1929This command proposes various successive corrections for the
1921current word. If invoked repeatedly on the same position, it 1930current word. If invoked repeatedly on the same position, it
1922cycles through the possible corrections of the word at or near 1931cycles through the possible corrections of the current word.
1923that position." 1932
1933See `flyspell-get-word' for details of how this finds the word to
1934spell-check."
1924 (interactive) 1935 (interactive)
1925 ;; If we are not in the construct where flyspell should be active, 1936 ;; If we are not in the construct where flyspell should be active,
1926 ;; invoke the original binding of M-TAB, if that was recorded. 1937 ;; invoke the original binding of M-TAB, if that was recorded.
@@ -2000,7 +2011,7 @@ that position."
2000 (let ((new-word replace)) 2011 (let ((new-word replace))
2001 (if (not (equal new-word (car poss))) 2012 (if (not (equal new-word (car poss)))
2002 (progn 2013 (progn
2003 ;; the save the current replacements 2014 ;; then save the current replacements
2004 (setq flyspell-auto-correct-region 2015 (setq flyspell-auto-correct-region
2005 (cons start (length new-word))) 2016 (cons start (length new-word)))
2006 (let ((l replacements)) 2017 (let ((l replacements))