aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2019-12-09 18:44:35 -0800
committerPaul Eggert2019-12-09 18:45:18 -0800
commitd1a791f8edc1b8f2189b6f1b3be7b946fef1edbc (patch)
treefb415df3de5b00b9ce7616872ead40c983b55a12 /lisp
parent28578f87b52ead4d31479fdcfba028118dfa6987 (diff)
downloademacs-d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc.tar.gz
emacs-d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc.zip
Spelling fixes
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.52
-rw-r--r--lisp/ChangeLog.82
-rw-r--r--lisp/char-fold.el2
-rw-r--r--lisp/elec-pair.el2
-rw-r--r--lisp/electric.el4
-rw-r--r--lisp/emacs-lisp/backtrace.el2
-rw-r--r--lisp/emacs-lisp/rx.el2
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/font-lock.el2
-rw-r--r--lisp/gnus/gnus-art.el2
-rw-r--r--lisp/net/goto-addr.el4
-rw-r--r--lisp/net/nsm.el6
-rw-r--r--lisp/net/tramp-cmds.el2
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/org/org-table.el2
-rw-r--r--lisp/org/org.el2
-rw-r--r--lisp/progmodes/python.el6
-rw-r--r--lisp/simple.el2
-rw-r--r--lisp/so-long.el48
19 files changed, 48 insertions, 48 deletions
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 749e7f68b6c..4d762d517ec 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -7912,7 +7912,7 @@
7912 7912
7913 * simple.el (choose-completion): Check for 7913 * simple.el (choose-completion): Check for
7914 next-single-property-change returning nil. 7914 next-single-property-change returning nil.
7915 * mouse.el (mouse-choose-completion): Dito. 7915 * mouse.el (mouse-choose-completion): Ditto.
7916 7916
79171994-07-28 Richard Stallman <rms@mole.gnu.ai.mit.edu> 79171994-07-28 Richard Stallman <rms@mole.gnu.ai.mit.edu>
7918 7918
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index cd090533b0b..27d19d93046 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -618,7 +618,7 @@
6181999-12-12 Martin Stjernholm <mast@lysator.liu.se> 6181999-12-12 Martin Stjernholm <mast@lysator.liu.se>
619 619
620 Changes for new style variable init system: 620 Changes for new style variable init system:
621 * cc-langs.el (c-common-init): Dito. 621 * cc-langs.el (c-common-init): Ditto.
622 * cc-styles.el: c-offsets-alist moved to cc-vars.el since it's 622 * cc-styles.el: c-offsets-alist moved to cc-vars.el since it's
623 now customizable. 623 now customizable.
624 * cc-vars.el: Style variables may now take a value 624 * cc-vars.el: Style variables may now take a value
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index d8d2ebc72ba..2b0b5b62f4d 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -253,7 +253,7 @@ Each entry is a list of a character and the strings that fold into it."
253 :version "27.1") 253 :version "27.1")
254 254
255(defcustom char-fold-exclude char-fold--default-exclude 255(defcustom char-fold-exclude char-fold--default-exclude
256 "Character foldings to remove from default decompisitions. 256 "Character foldings to remove from default decompositions.
257Each entry is a list of a character and the strings to remove from folding." 257Each entry is a list of a character and the strings to remove from folding."
258 :type '(alist :key-type (character :tag "Fold to character") 258 :type '(alist :key-type (character :tag "Fold to character")
259 :value-type (repeat (string :tag "Fold from string"))) 259 :value-type (repeat (string :tag "Fold from string")))
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index f3cbee70486..37a73281c23 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -230,7 +230,7 @@ inside a comment or string."
230 (electric-pair-mode nil) 230 (electric-pair-mode nil)
231 ;; When adding the "closer" delimiter, a job his function is 231 ;; When adding the "closer" delimiter, a job his function is
232 ;; frequently used for, we don't want to munch any extra 232 ;; frequently used for, we don't want to munch any extra
233 ;; newlines above us. That would be the default behaviour of 233 ;; newlines above us. That would be the default behavior of
234 ;; `electric-layout-mode', which potentially kicked in before 234 ;; `electric-layout-mode', which potentially kicked in before
235 ;; us to add these newlines, and is probably about to kick in 235 ;; us to add these newlines, and is probably about to kick in
236 ;; again after we add the closer. 236 ;; again after we add the closer.
diff --git a/lisp/electric.el b/lisp/electric.el
index a14deb71afb..7b683347175 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -423,10 +423,10 @@ If multiple rules match, only first one is executed.")
423 ;; newlines, re-indentation is prevented. 423 ;; newlines, re-indentation is prevented.
424 ;; 424 ;;
425 ;; FIXME: when `newline'ing, we exceptionally 425 ;; FIXME: when `newline'ing, we exceptionally
426 ;; prevent a specific behaviour of 426 ;; prevent a specific behavior of
427 ;; `eletric-pair-mode', that of opening an extra 427 ;; `eletric-pair-mode', that of opening an extra
428 ;; newline between newly inserted matching paris. 428 ;; newline between newly inserted matching paris.
429 ;; In theory that behaviour should be provided by 429 ;; In theory that behavior should be provided by
430 ;; `electric-layout-mode' instead, which should be 430 ;; `electric-layout-mode' instead, which should be
431 ;; possible given the current API. 431 ;; possible given the current API.
432 ;; 432 ;;
diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el
index 0c4c7987c3c..40784893391 100644
--- a/lisp/emacs-lisp/backtrace.el
+++ b/lisp/emacs-lisp/backtrace.el
@@ -709,7 +709,7 @@ line and recenter window line accordingly."
709(defun backtrace-print-to-string (obj &optional limit) 709(defun backtrace-print-to-string (obj &optional limit)
710 "Return a printed representation of OBJ formatted for backtraces. 710 "Return a printed representation of OBJ formatted for backtraces.
711Attempt to get the length of the returned string under LIMIT 711Attempt to get the length of the returned string under LIMIT
712charcters with appropriate settings of `print-level' and 712characters with appropriate settings of `print-level' and
713`print-length.' LIMIT defaults to `backtrace-line-length'." 713`print-length.' LIMIT defaults to `backtrace-line-length'."
714 (backtrace--with-output-variables backtrace-view 714 (backtrace--with-output-variables backtrace-view
715 (backtrace--print-to-string obj limit))) 715 (backtrace--print-to-string obj limit)))
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 0dc6e198663..a92c613b9aa 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -275,7 +275,7 @@ Return (REGEXP . PRECEDENCE)."
275 ;; -> "[A-Z@%[:digit:][:space:][:word:]]" 275 ;; -> "[A-Z@%[:digit:][:space:][:word:]]"
276 ;; 276 ;;
277 ;; Problem: If a subpattern is carefully written to be 277 ;; Problem: If a subpattern is carefully written to be
278 ;; optimisable by regexp-opt, how do we prevent the transforms 278 ;; optimizable by regexp-opt, how do we prevent the transforms
279 ;; above from destroying that property? 279 ;; above from destroying that property?
280 ;; Example: (or "a" (or "abc" "abd" "abe")) 280 ;; Example: (or "a" (or "abc" "abd" "abe"))
281 (cond 281 (cond
diff --git a/lisp/faces.el b/lisp/faces.el
index 0f31628f5f9..df15764cc4a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1773,7 +1773,7 @@ If FRAME is nil, that stands for the selected frame."
1773(defun defined-colors-with-face-attributes (&optional frame) 1773(defun defined-colors-with-face-attributes (&optional frame)
1774 "Return a list of colors supported for a particular frame. 1774 "Return a list of colors supported for a particular frame.
1775See `defined-colors' for arguments and return value. In contrast 1775See `defined-colors' for arguments and return value. In contrast
1776to `define-colorss' the elements of the returned list are color 1776to `define-colors' the elements of the returned list are color
1777strings with text properties, that make the color names render 1777strings with text properties, that make the color names render
1778with the color they represent as background color." 1778with the color they represent as background color."
1779 (mapcar 1779 (mapcar
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 01c19e6e874..c20b410a687 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1101,7 +1101,7 @@ accessible portion of the current buffer."
1101Called with two arguments BEG and END.") 1101Called with two arguments BEG and END.")
1102 1102
1103(defun font-lock-debug-fontify () 1103(defun font-lock-debug-fontify ()
1104 "Reinitialise the font-lock machinery and (re-)fontify the buffer. 1104 "Reinitialize the font-lock machinery and (re-)fontify the buffer.
1105This functions is a convenience functions when developing font 1105This functions is a convenience functions when developing font
1106locking for a mode, and is not meant to be called from lisp functions." 1106locking for a mode, and is not meant to be called from lisp functions."
1107 (interactive) 1107 (interactive)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index cfb185b3d1c..5745bf12bde 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2088,7 +2088,7 @@ you're expecting some kind of apostrophe or quotation mark, then
2088try this wash." 2088try this wash."
2089 (interactive) 2089 (interactive)
2090 (article-translate-strings gnus-article-smartquotes-map)) 2090 (article-translate-strings gnus-article-smartquotes-map))
2091(define-obsolete-function-alias 'article-treat-dumquotes 2091(define-obsolete-function-alias 'article-treat-dumbquotes
2092 #'article-treat-smartquotes "27.1") 2092 #'article-treat-smartquotes "27.1")
2093 2093
2094(defvar org-entities) 2094(defvar org-entities)
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 40a067e6251..8aa5f16083e 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -100,7 +100,7 @@ A value of t means there is no limit--fontify regardless of the size."
100 '("mailto:" "data:") 100 '("mailto:" "data:")
101 "List of URI schemes to exclude from `goto-address-uri-schemes'. 101 "List of URI schemes to exclude from `goto-address-uri-schemes'.
102 102
103Customisations to this variable made after goto-addr is loaded 103Customizations to this variable made after goto-addr is loaded
104will have no effect.") 104will have no effect.")
105 105
106(defvar goto-address-uri-schemes 106(defvar goto-address-uri-schemes
@@ -111,7 +111,7 @@ will have no effect.")
111 (copy-sequence thing-at-point-uri-schemes)) 111 (copy-sequence thing-at-point-uri-schemes))
112 "List of URI schemes matched by `goto-address-url-regexp'. 112 "List of URI schemes matched by `goto-address-url-regexp'.
113 113
114Customisations to this variable made after goto-addr is loaded 114Customizations to this variable made after goto-addr is loaded
115will have no effect.") 115will have no effect.")
116 116
117(defvar goto-address-url-regexp 117(defvar goto-address-url-regexp
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 5dc5244e6d5..e430daa3823 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -384,7 +384,7 @@ Security (DTLS)\", \"(4.1. General Guidelines)\"
384This check is a response to Logjam[1]. Logjam is an attack that 384This check is a response to Logjam[1]. Logjam is an attack that
385allows an attacker with sufficient resource, and positioned 385allows an attacker with sufficient resource, and positioned
386between the user and the server, to downgrade vulnerable TLS 386between the user and the server, to downgrade vulnerable TLS
387connections to insecure 512-bit export grade crypotography. 387connections to insecure 512-bit export grade cryptography.
388 388
389The Logjam paper suggests using 1024-bit prime on the client to 389The Logjam paper suggests using 1024-bit prime on the client to
390mitigate some effects of this attack, and upgrade to 2048-bit as 390mitigate some effects of this attack, and upgrade to 2048-bit as
@@ -550,7 +550,7 @@ Security (TLS) and Datagram Transport Layer Security (DTLS)\",
550Due to its use of 64-bit block size, it is known that a 550Due to its use of 64-bit block size, it is known that a
551ciphertext collision is highly likely when 2^32 blocks are 551ciphertext collision is highly likely when 2^32 blocks are
552encrypted with the same key bundle under 3-key 3DES. Practical 552encrypted with the same key bundle under 3-key 3DES. Practical
553birthday attacks of this kind have been demostrated by Sweet32[1]. 553birthday attacks of this kind have been demonstrated by Sweet32[1].
554As such, NIST is in the process of disallowing its use in TLS[2]. 554As such, NIST is in the process of disallowing its use in TLS[2].
555 555
556[1]: Bhargavan, Leurent (2016). \"On the Practical (In-)Security of 556[1]: Bhargavan, Leurent (2016). \"On the Practical (In-)Security of
@@ -752,7 +752,7 @@ protocol."
752 ;; Plain connection allowed. 752 ;; Plain connection allowed.
753 (memq :none saved-fingerprints) 753 (memq :none saved-fingerprints)
754 ;; We are pinning certs, and we have seen this host before, 754 ;; We are pinning certs, and we have seen this host before,
755 ;; but the credientials for this host differs from the last 755 ;; but the credentials for this host differs from the last
756 ;; times we saw it. 756 ;; times we saw it.
757 (member (nsm-fingerprint status) saved-fingerprints)))) 757 (member (nsm-fingerprint status) saved-fingerprints))))
758 758
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 96b11c7f524..607b0257206 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -359,7 +359,7 @@ The remote connection identified by SOURCE is flushed by
359 ;; Append local file name if none is specified. 359 ;; Append local file name if none is specified.
360 (when (string-equal (file-remote-p target) target) 360 (when (string-equal (file-remote-p target) target)
361 (setq target (concat target (file-remote-p source 'localname)))) 361 (setq target (concat target (file-remote-p source 'localname))))
362 ;; Make them directoy names. 362 ;; Make them directory names.
363 (setq source (directory-file-name source) 363 (setq source (directory-file-name source)
364 target (directory-file-name target)) 364 target (directory-file-name target))
365 365
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 2404ca43dcb..2f0bd5f4e17 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -7636,7 +7636,7 @@ and deselects entries with tag `John' or matching the regexp `plot'.
7636 7636
7637During entry of the filter, completion for tags, categories and effort 7637During entry of the filter, completion for tags, categories and effort
7638values is offered. Since the syntax for categories and tags is identical 7638values is offered. Since the syntax for categories and tags is identical
7639there should be no overlap between categoroes and tags. If there is, tags 7639there should be no overlap between categories and tags. If there is, tags
7640get priority. 7640get priority.
7641 7641
7642A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the 7642A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 5f42db50688..a2e77e07392 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1709,7 +1709,7 @@ The function assumes `org-table-copy-increment' is non-nil."
1709 (number-suffix-regexp (rx (and (one-or-more digit) string-end))) 1709 (number-suffix-regexp (rx (and (one-or-more digit) string-end)))
1710 (analyze 1710 (analyze
1711 (lambda (field) 1711 (lambda (field)
1712 ;; Analyse string FIELD and return information related to 1712 ;; Analyze string FIELD and return information related to
1713 ;; increment or nil. When non-nil, return value has the 1713 ;; increment or nil. When non-nil, return value has the
1714 ;; following scheme: (TYPE VALUE PATTERN) where 1714 ;; following scheme: (TYPE VALUE PATTERN) where
1715 ;; - TYPE is a symbol among `number', `prefix', `suffix' 1715 ;; - TYPE is a symbol among `number', `prefix', `suffix'
diff --git a/lisp/org/org.el b/lisp/org/org.el
index f25c53caaff..11bc3641022 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -10008,7 +10008,7 @@ By default the available states are \"TODO\" and \"DONE\". So, for this
10008example: when the item starts with TODO, it is changed to DONE. 10008example: when the item starts with TODO, it is changed to DONE.
10009When it starts with DONE, the DONE is removed. And when neither TODO nor 10009When it starts with DONE, the DONE is removed. And when neither TODO nor
10010DONE are present, add TODO at the beginning of the heading. 10010DONE are present, add TODO at the beginning of the heading.
10011You can set up single-charcter keys to fast-select the new state. See the 10011You can set up single-character keys to fast-select the new state. See the
10012`org-todo-keywords' and `org-use-fast-todo-selection' for details. 10012`org-todo-keywords' and `org-use-fast-todo-selection' for details.
10013 10013
10014With `\\[universal-argument]' prefix ARG, force logging the state change \ 10014With `\\[universal-argument]' prefix ARG, force logging the state change \
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 1b3b92deaf5..0eed7acd0d7 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3737,9 +3737,9 @@ Pdbtracking would open the file for current stack frame found in pdb output by
3737`python-pdbtrack-stacktrace-info-regexp' and add overlay arrow in currently 3737`python-pdbtrack-stacktrace-info-regexp' and add overlay arrow in currently
3738inspected line in that file. 3738inspected line in that file.
3739 3739
3740After command listed in `python-pdbtrack-continue-command' or 3740After the command listed in `python-pdbtrack-continue-command' or
3741`python-pdbtrack-exit-command' is sent to pdb, pdbtracking session is 3741`python-pdbtrack-exit-command' is sent to pdb, the pdbtracking session is
3742considered over. Overlay arrow will be removed from currentry tracked 3742considered over. The overlay arrow will be removed from the currently tracked
3743buffer. Additionally, if `python-pdbtrack-kill-buffers' is non-nil, all 3743buffer. Additionally, if `python-pdbtrack-kill-buffers' is non-nil, all
3744files opened by pdbtracking will be killed." 3744files opened by pdbtracking will be killed."
3745 :type 'boolean 3745 :type 'boolean
diff --git a/lisp/simple.el b/lisp/simple.el
index a0250cc2ac4..6d5030073bb 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -50,7 +50,7 @@ wait this many seconds after Emacs becomes idle before doing an update."
50The `undo' command will normally consider \"similar\" changes 50The `undo' command will normally consider \"similar\" changes
51(like inserting characters) to be part of the same change. This 51(like inserting characters) to be part of the same change. This
52is called \"amalgamating\" the changes. This variable says what 52is called \"amalgamating\" the changes. This variable says what
53the maximum number of changes condidered is when amalgamating. A 53the maximum number of changes considered is when amalgamating. A
54value of 1 means that nothing is amalgamated.") 54value of 1 means that nothing is amalgamated.")
55 55
56(defgroup killing nil 56(defgroup killing nil
diff --git a/lisp/so-long.el b/lisp/so-long.el
index 49595a3fd91..3df2de97297 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -38,7 +38,7 @@
38;; compacted into the smallest file size possible, which often entails removing 38;; compacted into the smallest file size possible, which often entails removing
39;; newlines should they not be strictly necessary). This can result in lines 39;; newlines should they not be strictly necessary). This can result in lines
40;; which are many thousands of characters long, and most programming modes 40;; which are many thousands of characters long, and most programming modes
41;; simply aren't optimised (remotely) for this scenario, so performance can 41;; simply aren't optimized (remotely) for this scenario, so performance can
42;; suffer significantly. 42;; suffer significantly.
43;; 43;;
44;; When such files are detected, the command `so-long' is automatically called, 44;; When such files are detected, the command `so-long' is automatically called,
@@ -90,7 +90,7 @@
90;; * Overview of modes and commands 90;; * Overview of modes and commands
91;; -------------------------------- 91;; --------------------------------
92;; - `global-so-long-mode' - A global minor mode which enables the automated 92;; - `global-so-long-mode' - A global minor mode which enables the automated
93;; behaviour, causing the user's preferred action to be invoked whenever a 93;; behavior, causing the user's preferred action to be invoked whenever a
94;; newly-visited file contains excessively long lines. 94;; newly-visited file contains excessively long lines.
95;; - `so-long-mode' - A major mode, and the default action. 95;; - `so-long-mode' - A major mode, and the default action.
96;; - `so-long-minor-mode' - A minor mode version of the major mode, and an 96;; - `so-long-minor-mode' - A minor mode version of the major mode, and an
@@ -111,7 +111,7 @@
111;; 111;;
112;; On rare occasions you may choose to manually invoke the `so-long' command, 112;; On rare occasions you may choose to manually invoke the `so-long' command,
113;; which invokes your preferred `so-long-action' (exactly as the automatic 113;; which invokes your preferred `so-long-action' (exactly as the automatic
114;; behaviour would do if it had detected long lines). You might use this if a 114;; behavior would do if it had detected long lines). You might use this if a
115;; problematic file did not meet your configured criteria, and you wished to 115;; problematic file did not meet your configured criteria, and you wished to
116;; trigger the performance improvements manually. 116;; trigger the performance improvements manually.
117;; 117;;
@@ -120,7 +120,7 @@
120;; available to `so-long' but, like any other mode, they can be invoked directly 120;; available to `so-long' but, like any other mode, they can be invoked directly
121;; if you have a need to do that (see also "Other ways of using so-long" below). 121;; if you have a need to do that (see also "Other ways of using so-long" below).
122;; 122;;
123;; If the behaviour ever triggers when you did not want it to, you can use the 123;; If the behavior ever triggers when you did not want it to, you can use the
124;; `so-long-revert' command to restore the buffer to its original state. 124;; `so-long-revert' command to restore the buffer to its original state.
125 125
126;; * Basic configuration 126;; * Basic configuration
@@ -199,7 +199,7 @@
199;; 199;;
200;; Note that `so-long-minor-modes' is not useful for other global minor modes 200;; Note that `so-long-minor-modes' is not useful for other global minor modes
201;; (as distinguished from globalized minor modes), but in some cases it will be 201;; (as distinguished from globalized minor modes), but in some cases it will be
202;; possible to inhibit or otherwise counter-act the behaviour of a global mode 202;; possible to inhibit or otherwise counter-act the behavior of a global mode
203;; by overriding variables, or by employing hooks (see below). You would need 203;; by overriding variables, or by employing hooks (see below). You would need
204;; to inspect the code for a given global mode (on a case by case basis) to 204;; to inspect the code for a given global mode (on a case by case basis) to
205;; determine whether it's possible to inhibit it for a single buffer -- and if 205;; determine whether it's possible to inhibit it for a single buffer -- and if
@@ -211,7 +211,7 @@
211;; If `so-long-action' is set to either `so-long-mode' or `so-long-minor-mode', 211;; If `so-long-action' is set to either `so-long-mode' or `so-long-minor-mode',
212;; the buffer-local value for each variable in the list is set to the associated 212;; the buffer-local value for each variable in the list is set to the associated
213;; value in the alist. Use this to enforce values which will improve 213;; value in the alist. Use this to enforce values which will improve
214;; performance or otherwise avoid undesirable behaviours. If `so-long-revert' 214;; performance or otherwise avoid undesirable behaviors. If `so-long-revert'
215;; is called, then the original values are restored. 215;; is called, then the original values are restored.
216 216
217;; * Hooks 217;; * Hooks
@@ -325,7 +325,7 @@
325;; meaning you would need to add to `safe-local-variable-values' in order to 325;; meaning you would need to add to `safe-local-variable-values' in order to
326;; avoid being queried about them. 326;; avoid being queried about them.
327;; 327;;
328;; Finally, the `so-long-predicate' user option enables the automated behaviour 328;; Finally, the `so-long-predicate' user option enables the automated behavior
329;; to be determined by a custom function, if greater control is needed. 329;; to be determined by a custom function, if greater control is needed.
330 330
331;; * Implementation notes 331;; * Implementation notes
@@ -342,7 +342,7 @@
342 342
343;; * Caveats 343;; * Caveats
344;; --------- 344;; ---------
345;; The variables affecting the automated behaviour of this library (such as 345;; The variables affecting the automated behavior of this library (such as
346;; `so-long-action') can be used as file- or dir-local values in Emacs 26+, but 346;; `so-long-action') can be used as file- or dir-local values in Emacs 26+, but
347;; not in previous versions of Emacs. This is on account of improvements made 347;; not in previous versions of Emacs. This is on account of improvements made
348;; to `normal-mode' in 26.1, which altered the execution order with respect to 348;; to `normal-mode' in 26.1, which altered the execution order with respect to
@@ -399,7 +399,7 @@
399;; 0.6 - Added `so-long-minor-modes' and `so-long-hook'. 399;; 0.6 - Added `so-long-minor-modes' and `so-long-hook'.
400;; 0.5 - Renamed library to "so-long.el". 400;; 0.5 - Renamed library to "so-long.el".
401;; - Added explicit `so-long-enable' command to activate our advice. 401;; - Added explicit `so-long-enable' command to activate our advice.
402;; 0.4 - Amended/documented behaviour with file-local 'mode' variables. 402;; 0.4 - Amended/documented behavior with file-local 'mode' variables.
403;; 0.3 - Defer to a file-local 'mode' variable. 403;; 0.3 - Defer to a file-local 'mode' variable.
404;; 0.2 - Initial release to EmacsWiki. 404;; 0.2 - Initial release to EmacsWiki.
405;; 0.1 - Experimental. 405;; 0.1 - Experimental.
@@ -500,7 +500,7 @@ files would prevent Emacs from handling them correctly."
500(defcustom so-long-invisible-buffer-function #'so-long-deferred 500(defcustom so-long-invisible-buffer-function #'so-long-deferred
501 "Function called in place of `so-long' when the buffer is not displayed. 501 "Function called in place of `so-long' when the buffer is not displayed.
502 502
503This affects the behaviour of `global-so-long-mode'. 503This affects the behavior of `global-so-long-mode'.
504 504
505We treat invisible buffers differently from displayed buffers because, in 505We treat invisible buffers differently from displayed buffers because, in
506cases where a library is using a buffer for behind-the-scenes processing, 506cases where a library is using a buffer for behind-the-scenes processing,
@@ -548,7 +548,7 @@ Defaults to `so-long-detected-long-line-p'."
548(defun so-long--action-type () 548(defun so-long--action-type ()
549 "Generate a :type for `so-long-action' based on `so-long-action-alist'." 549 "Generate a :type for `so-long-action' based on `so-long-action-alist'."
550 ;; :type seemingly cannot be a form to be evaluated on demand, so we 550 ;; :type seemingly cannot be a form to be evaluated on demand, so we
551 ;; endeavour to keep it up-to-date with `so-long-action-alist' by 551 ;; endeavor to keep it up-to-date with `so-long-action-alist' by
552 ;; calling this from `so-long--action-alist-setter'. 552 ;; calling this from `so-long--action-alist-setter'.
553 `(radio ,@(mapcar (lambda (x) (list 'const :tag (cadr x) (car x))) 553 `(radio ,@(mapcar (lambda (x) (list 'const :tag (cadr x) (car x)))
554 (assq-delete-all nil so-long-action-alist)) 554 (assq-delete-all nil so-long-action-alist))
@@ -609,7 +609,7 @@ will be automatically processed; but custom actions can also do these things.
609The value `longlines-mode' causes that minor mode to be enabled. See 609The value `longlines-mode' causes that minor mode to be enabled. See
610longlines.el for more details. 610longlines.el for more details.
611 611
612Each action likewise determines the behaviour of `so-long-revert'. 612Each action likewise determines the behavior of `so-long-revert'.
613 613
614If the value is nil, or not defined in `so-long-action-alist', then no action 614If the value is nil, or not defined in `so-long-action-alist', then no action
615will be taken." 615will be taken."
@@ -756,7 +756,7 @@ By default this happens if `so-long-action' is set to either `so-long-mode'
756or `so-long-minor-mode'. If `so-long-revert' is subsequently invoked, then the 756or `so-long-minor-mode'. If `so-long-revert' is subsequently invoked, then the
757disabled modes are re-enabled by calling them with the numeric argument 1. 757disabled modes are re-enabled by calling them with the numeric argument 1.
758 758
759`so-long-hook' can be used where more custom behaviour is desired. 759`so-long-hook' can be used where more custom behavior is desired.
760 760
761Please submit bug reports to recommend additional modes for this list, whether 761Please submit bug reports to recommend additional modes for this list, whether
762they are in Emacs core, GNU ELPA, or elsewhere." 762they are in Emacs core, GNU ELPA, or elsewhere."
@@ -833,7 +833,7 @@ If nil, no mode line indicator will be displayed."
833;; Modes that go slowly and line lengths excessive 833;; Modes that go slowly and line lengths excessive
834;; Font-lock performance becoming oppressive 834;; Font-lock performance becoming oppressive
835;; All of my CPU tied up with strings 835;; All of my CPU tied up with strings
836;; These are a few of my least-favourite things 836;; These are a few of my least-favorite things
837 837
838(defvar-local so-long-original-values nil 838(defvar-local so-long-original-values nil
839 "Alist holding the buffer's original `major-mode' value, and other data. 839 "Alist holding the buffer's original `major-mode' value, and other data.
@@ -916,7 +916,7 @@ If RESET is non-nil, remove any existing values before storing the new ones."
916 ;; triggered by mouse when some other window is selected. 916 ;; triggered by mouse when some other window is selected.
917 "Revert the current action and invoke the chosen replacement. 917 "Revert the current action and invoke the chosen replacement.
918 918
919This commmand calls `so-long' with the selected action as an argument.") 919This command calls `so-long' with the selected action as an argument.")
920 sym) 920 sym)
921 :enable (not (and so-long--active 921 :enable (not (and so-long--active
922 (eq ',actionfunc so-long-function) 922 (eq ',actionfunc so-long-function)
@@ -1129,7 +1129,7 @@ This minor mode is a standard `so-long-action' option."
1129 (if so-long-minor-mode ;; We are enabling the mode. 1129 (if so-long-minor-mode ;; We are enabling the mode.
1130 (progn 1130 (progn
1131 ;; Housekeeping. `so-long-minor-mode' might be invoked directly rather 1131 ;; Housekeeping. `so-long-minor-mode' might be invoked directly rather
1132 ;; than via `so-long', so replicate the necessary behaviours. The minor 1132 ;; than via `so-long', so replicate the necessary behaviors. The minor
1133 ;; mode also cares about whether `so-long' was already active, as we do 1133 ;; mode also cares about whether `so-long' was already active, as we do
1134 ;; not want to remember values which were potentially overridden already. 1134 ;; not want to remember values which were potentially overridden already.
1135 (unless (or so-long--calling so-long--active) 1135 (unless (or so-long--calling so-long--active)
@@ -1201,9 +1201,9 @@ values), despite potential performance issues, type \\[so-long-revert].
1201 1201
1202Use \\[so-long-commentary] for more information. 1202Use \\[so-long-commentary] for more information.
1203 1203
1204Use \\[so-long-customize] to configure the behaviour." 1204Use \\[so-long-customize] to configure the behavior."
1205 ;; Housekeeping. `so-long-mode' might be invoked directly rather than via 1205 ;; Housekeeping. `so-long-mode' might be invoked directly rather than via
1206 ;; `so-long', so replicate the necessary behaviours. We could use this same 1206 ;; `so-long', so replicate the necessary behaviors. We could use this same
1207 ;; test in `so-long-after-change-major-mode' to run `so-long-hook', but that's 1207 ;; test in `so-long-after-change-major-mode' to run `so-long-hook', but that's
1208 ;; not so obviously the right thing to do, so I've omitted it for now. 1208 ;; not so obviously the right thing to do, so I've omitted it for now.
1209 (unless so-long--calling 1209 (unless so-long--calling
@@ -1249,7 +1249,7 @@ Use \\[so-long-customize] to configure the behaviour."
1249This advice acts before `so-long-mode', with the previous mode still active." 1249This advice acts before `so-long-mode', with the previous mode still active."
1250 (unless (derived-mode-p 'so-long-mode) 1250 (unless (derived-mode-p 'so-long-mode)
1251 ;; Housekeeping. `so-long-mode' might be invoked directly rather than 1251 ;; Housekeeping. `so-long-mode' might be invoked directly rather than
1252 ;; via `so-long', so replicate the necessary behaviours. 1252 ;; via `so-long', so replicate the necessary behaviors.
1253 (unless so-long--calling 1253 (unless so-long--calling
1254 (so-long-remember-all :reset)) 1254 (so-long-remember-all :reset))
1255 ;; Remember the original major mode, regardless. 1255 ;; Remember the original major mode, regardless.
@@ -1334,7 +1334,7 @@ This is the `so-long-revert-function' for `so-long-mode'."
1334 ;; Emacs 26+ has already called `hack-local-variables' (during 1334 ;; Emacs 26+ has already called `hack-local-variables' (during
1335 ;; `run-mode-hooks'; provided there was a `buffer-file-name'), but for older 1335 ;; `run-mode-hooks'; provided there was a `buffer-file-name'), but for older
1336 ;; versions we need to call it here. In Emacs 26+ the revised 'HANDLE-MODE' 1336 ;; versions we need to call it here. In Emacs 26+ the revised 'HANDLE-MODE'
1337 ;; argument is set to `no-mode' (being the non-nil-and-non-t behaviour), 1337 ;; argument is set to `no-mode' (being the non-nil-and-non-t behavior),
1338 ;; which we mimic here by binding `so-long--hack-local-variables-no-mode', 1338 ;; which we mimic here by binding `so-long--hack-local-variables-no-mode',
1339 ;; in order to prevent a local 'mode' variable from clobbering the major 1339 ;; in order to prevent a local 'mode' variable from clobbering the major
1340 ;; mode we have just called. 1340 ;; mode we have just called.
@@ -1371,7 +1371,7 @@ because we do not want to downgrade the major mode in that scenario."
1371 ;; Act only if `so-long-mode' would be enabled by the current action. 1371 ;; Act only if `so-long-mode' would be enabled by the current action.
1372 (when (and (symbolp (so-long-function)) 1372 (when (and (symbolp (so-long-function))
1373 (provided-mode-derived-p (so-long-function) 'so-long-mode)) 1373 (provided-mode-derived-p (so-long-function) 'so-long-mode))
1374 ;; Downgrade from `so-long-mode' to the `so-long-minor-mode' behaviour. 1374 ;; Downgrade from `so-long-mode' to the `so-long-minor-mode' behavior.
1375 (setq so-long-function 'turn-on-so-long-minor-mode 1375 (setq so-long-function 'turn-on-so-long-minor-mode
1376 so-long-revert-function 'turn-off-so-long-minor-mode)))) 1376 so-long-revert-function 'turn-off-so-long-minor-mode))))
1377 1377
@@ -1391,7 +1391,7 @@ and cannot be conveniently intercepted, so we are forced to replicate it here.
1391 1391
1392This special-case code will ultimately be removed from Emacs, as it exists to 1392This special-case code will ultimately be removed from Emacs, as it exists to
1393deal with a deprecated feature; but until then we need to replicate it in order 1393deal with a deprecated feature; but until then we need to replicate it in order
1394to inhibit our own behaviour in the presence of a header comment `mode' 1394to inhibit our own behavior in the presence of a header comment `mode'
1395declaration. 1395declaration.
1396 1396
1397If a file-local mode is detected in the header comment, then we call the 1397If a file-local mode is detected in the header comment, then we call the
@@ -1526,7 +1526,7 @@ by testing the value against `major-mode'; but as we may have changed the
1526major mode to `so-long-mode' by this point, that protection is insufficient 1526major mode to `so-long-mode' by this point, that protection is insufficient
1527and so we need to perform our own test. 1527and so we need to perform our own test.
1528 1528
1529We likewise need to support an equivalent of the `no-mode' behaviour in 26.1+ 1529We likewise need to support an equivalent of the `no-mode' behavior in 26.1+
1530to ensure that `so-long-mode-revert' will not restore a file-local mode again 1530to ensure that `so-long-mode-revert' will not restore a file-local mode again
1531after it has already reverted to the original mode. 1531after it has already reverted to the original mode.
1532 1532
@@ -1673,7 +1673,7 @@ When such files are detected by `so-long-predicate', we invoke the selected
1673 1673
1674Use \\[so-long-commentary] for more information. 1674Use \\[so-long-commentary] for more information.
1675 1675
1676Use \\[so-long-customize] to configure the behaviour." 1676Use \\[so-long-customize] to configure the behavior."
1677 :global t 1677 :global t
1678 :group 'so-long 1678 :group 'so-long
1679 (if global-so-long-mode 1679 (if global-so-long-mode