Commit e9a452d9 authored by Paul Eggert's avatar Paul Eggert

Spelling fixes (mostly "inactive" vs "deactivate").

parent c3f1c606
...@@ -21895,7 +21895,7 @@ Clearly, the easiest way would be if marks could somehow be ...@@ -21895,7 +21895,7 @@ Clearly, the easiest way would be if marks could somehow be
automatically set for the original article. This is exactly what automatically set for the original article. This is exactly what
@emph{marks propagation} is about. @emph{marks propagation} is about.
Marks propagation is deactivated by default. You can activate it for a Marks propagation is inactive by default. You can activate it for a
certain @code{nnmairix} group with certain @code{nnmairix} group with
@code{nnmairix-group-toggle-propmarks-this-group} (bound to @kbd{G b @code{nnmairix-group-toggle-propmarks-this-group} (bound to @kbd{G b
p}). This function will warn you if you try to use it with your default p}). This function will warn you if you try to use it with your default
...@@ -1027,8 +1027,8 @@ motion keys (e.g. S-left and S-down) activate and extend a temporary ...@@ -1027,8 +1027,8 @@ motion keys (e.g. S-left and S-down) activate and extend a temporary
region, similar to mouse-selection. region, similar to mouse-selection.
*** Temporarily active regions, created using shift-selection or *** Temporarily active regions, created using shift-selection or
mouse-selection, are not necessarily deactivated in the next command. mouse-selection, are not necessarily deactivated after the next command.
They are only deactivated after point motion commands that are not They are deactivated only after point motion commands that are not
shift-translated, or after commands that would ordinarily deactivate shift-translated, or after commands that would ordinarily deactivate
the mark in Transient Mark mode (e.g., any command that modifies the the mark in Transient Mark mode (e.g., any command that modifies the
buffer). buffer).
......
...@@ -2809,7 +2809,7 @@ ...@@ -2809,7 +2809,7 @@
Consolidate layout provisions coce directly into the activation Consolidate layout provisions coce directly into the activation
condition branch, now that we've removed those provisions. condition branch, now that we've removed those provisions.
(allout-unload-function): Explicitly activate the mode before (allout-unload-function): Explicitly activate the mode before
deactivating, if it's initially deactivated. deactivating, if it's initially inactive.
(allout-set-buffer-multibyte): Properly prevent byte-compiler (allout-set-buffer-multibyte): Properly prevent byte-compiler
warnings for version of function used only where warnings for version of function used only where
set-buffer-multibyte is unavailable. set-buffer-multibyte is unavailable.
......
...@@ -914,7 +914,7 @@ ...@@ -914,7 +914,7 @@
(desktop-locals-to-save): Add line-number-mode to be saved when (desktop-locals-to-save): Add line-number-mode to be saved when
local. local.
(desktop-remove): In case the desktop file cannot be deleted (desktop-remove): In case the desktop file cannot be deleted
make sure that the desktop system is still inactivated. make sure that the desktop system is still inactive.
(desktop-kill): In case an error occurs when saving the desktop, (desktop-kill): In case an error occurs when saving the desktop,
offer to quit regardless. offer to quit regardless.
(desktop-save-buffer-p): Disregard case when testing file and (desktop-save-buffer-p): Disregard case when testing file and
......
...@@ -18065,7 +18065,7 @@ ...@@ -18065,7 +18065,7 @@
have KEY. have KEY.
(current-input-method-title): Doc-string modified. (current-input-method-title): Doc-string modified.
(select-input-method): Set current-input-method to nil even if (select-input-method): Set current-input-method to nil even if
inactivation of the current input method failed. deactivation of the current input method failed.
(set-language-environment): Doc-string modified. (set-language-environment): Doc-string modified.
(describe-language-support): Doc-string modified. Calls an (describe-language-support): Doc-string modified. Calls an
appropriate function for each language. appropriate function for each language.
......
...@@ -3225,7 +3225,7 @@ Also change :reverse-video to :inverse-video." ...@@ -3225,7 +3225,7 @@ Also change :reverse-video to :inverse-video."
(if (not inactive) (if (not inactive)
;; Widget is alive, we don't have to do anything special ;; Widget is alive, we don't have to do anything special
(widget-default-delete widget) (widget-default-delete widget)
;; WIDGET is already deleted because we did so to inactivate it; ;; WIDGET is already deleted because we did so to deactivate it;
;; now just get rid of the label we put in its place. ;; now just get rid of the label we put in its place.
(delete-region (car (cdr inactive)) (delete-region (car (cdr inactive))
(+ (car (cdr inactive)) (cdr (cdr inactive)))) (+ (car (cdr inactive)) (cdr (cdr inactive))))
......
...@@ -625,12 +625,12 @@ ...@@ -625,12 +625,12 @@
;; ;;
;; (ad-activate-regexp "^ange-ftp-") ;; (ad-activate-regexp "^ange-ftp-")
;; ;;
;; A saver way would have been to use ;; A safer way would have been to use
;; ;;
;; (ad-update-regexp "^ange-ftp-") ;; (ad-update-regexp "^ange-ftp-")
;; ;;
;; instead which would have only reactivated currently actively advised ;; instead which would have only reactivated currently actively advised
;; functions, but not functions that were currently deactivated. All these ;; functions, but not functions that were currently inactive. All these
;; functions can also be called interactively. ;; functions can also be called interactively.
;; A certain piece of advice is considered a match if its name contains a ;; A certain piece of advice is considered a match if its name contains a
...@@ -833,7 +833,7 @@ ...@@ -833,7 +833,7 @@
;; Reactivate an advised function but only if its advice is currently ;; Reactivate an advised function but only if its advice is currently
;; active. This can be used to bring all currently advised function up ;; active. This can be used to bring all currently advised function up
;; to date with the current state of advice without also activating ;; to date with the current state of advice without also activating
;; currently deactivated functions. ;; currently inactive functions.
;; - Caching: ;; - Caching:
;; Is the saving of an advised definition and an identifying cache-id so ;; Is the saving of an advised definition and an identifying cache-id so
;; it can be reused, for example, for activation after deactivation. ;; it can be reused, for example, for activation after deactivation.
...@@ -853,7 +853,7 @@ ...@@ -853,7 +853,7 @@
;; - ad-activate to activate the advice of a FUNCTION ;; - ad-activate to activate the advice of a FUNCTION
;; - ad-deactivate to deactivate the advice of a FUNCTION ;; - ad-deactivate to deactivate the advice of a FUNCTION
;; - ad-update to activate the advice of a FUNCTION unless it was not ;; - ad-update to activate the advice of a FUNCTION unless it was not
;; yet activated or is currently deactivated. ;; yet activated or is currently inactive.
;; - ad-unadvise deactivates a FUNCTION and removes all of its advice ;; - ad-unadvise deactivates a FUNCTION and removes all of its advice
;; information, hence, it cannot be activated again ;; information, hence, it cannot be activated again
;; - ad-recover tries to redefine a FUNCTION to its original definition and ;; - ad-recover tries to redefine a FUNCTION to its original definition and
...@@ -1261,7 +1261,7 @@ ...@@ -1261,7 +1261,7 @@
;; contain some advice matched by the regular expression. This is a save ;; contain some advice matched by the regular expression. This is a save
;; way to update the activation of advised functions whose advice changed ;; way to update the activation of advised functions whose advice changed
;; in some way or other without accidentally also activating currently ;; in some way or other without accidentally also activating currently
;; deactivated functions: ;; inactive functions:
;; ;;
;; (ad-update-regexp "^fg-") ;; (ad-update-regexp "^fg-")
;; nil ;; nil
......
...@@ -979,7 +979,7 @@ ...@@ -979,7 +979,7 @@
2002-11-16 Alex Schroeder <alex@gnu.org> 2002-11-16 Alex Schroeder <alex@gnu.org>
* erc-autoaway.el, erc-button.el, erc-fill.el, erc-match.el, * erc-autoaway.el, erc-button.el, erc-fill.el, erc-match.el,
erc-menu.el, erc-ring.el, erc-track.el: erc-menu.el, erc-ring.el, erc-track.el:
Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries. Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
...@@ -1447,7 +1447,7 @@ ...@@ -1447,7 +1447,7 @@
* erc-match.el: fixed spelling error * erc-match.el: fixed spelling error
* erc-track.el, erc-match.el: * erc-match.el: * erc-track.el, erc-match.el: * erc-match.el:
highlight current nickname in its own face (deactivated by default): highlight current nickname in its own face (inactive by default):
- added erc-current-nick-highlight-type, erc-current-nick-face, - added erc-current-nick-highlight-type, erc-current-nick-face,
erc-current-nick-p erc-current-nick-p
...@@ -1564,7 +1564,7 @@ ...@@ -1564,7 +1564,7 @@
(require 'erc-nickserv) is now necessary for this to work (require 'erc-nickserv) is now necessary for this to work
* erc.el: * erc.el:
* results of /COUNTRY now formatted as notice; errors are ignored, * results of /COUNTRY now formatted as notice; errors are ignored,
fixing fixing
bug which made prompt disappear bug which made prompt disappear
...@@ -1959,9 +1959,9 @@ ...@@ -1959,9 +1959,9 @@
* erc.el: remove trailing \n from any sent text * erc.el: remove trailing \n from any sent text
* servers.pl, erc-bbdb.el, erc-button.el, erc-chess.el, * servers.pl, erc-bbdb.el, erc-button.el, erc-chess.el,
erc-complete.el, erc-fill.el, erc-ibuffer.el, erc-list.el, erc-complete.el, erc-fill.el, erc-ibuffer.el, erc-list.el,
erc-match.el, erc-menu.el, erc-nets.el, erc-replace.el, erc-match.el, erc-menu.el, erc-nets.el, erc-replace.el,
erc-speak.el, erc-speedbar.el, erc-track.el, erc.el: erc-speak.el, erc-speedbar.el, erc-track.el, erc.el:
clean whitespace clean whitespace
......
...@@ -2778,7 +2778,7 @@ ...@@ -2778,7 +2778,7 @@
2011-01-28 Lars Ingebrigtsen <larsi@gnus.org> 2011-01-28 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
data if the group is deactivated. data if the group is inactive.
2011-01-28 Julien Danjou <julien@danjou.info> 2011-01-28 Julien Danjou <julien@danjou.info>
......
...@@ -1354,7 +1354,7 @@ if it is a string, only list groups matching REGEXP." ...@@ -1354,7 +1354,7 @@ if it is a string, only list groups matching REGEXP."
(predicate t) ; We list all groups? (predicate t) ; We list all groups?
(t (t
(or (or
(if (eq unread t) ; Deactivated? (if (eq unread t) ; Inactive?
gnus-group-list-inactive-groups gnus-group-list-inactive-groups
; We list inactive ; We list inactive
(and (numberp unread) (> unread 0))) (and (numberp unread) (> unread 0)))
......
...@@ -1872,7 +1872,7 @@ the bottom." ...@@ -1872,7 +1872,7 @@ the bottom."
(goto-char isearch-point)) (goto-char isearch-point))
(defun isearch-reread-key-sequence-naturally (keylist) (defun isearch-reread-key-sequence-naturally (keylist)
"Reread key sequence KEYLIST with Isearch mode's keymap deactivated. "Reread key sequence KEYLIST with an inactive Isearch-mode keymap.
Return the key sequence as a string/vector." Return the key sequence as a string/vector."
(isearch-unread-key-sequence keylist) (isearch-unread-key-sequence keylist)
(let (overriding-terminal-local-map) (let (overriding-terminal-local-map)
......
...@@ -27771,7 +27771,7 @@ companion command to `table-capture' this way. ...@@ -27771,7 +27771,7 @@ companion command to `table-capture' this way.
(autoload 'table-release "table" "\ (autoload 'table-release "table" "\
Convert a table into plain text by removing the frame from a table. Convert a table into plain text by removing the frame from a table.
Remove the frame from a table and inactivate the table. This command Remove the frame from a table and deactivate the table. This command
converts a table into plain text without frames. It is a companion to converts a table into plain text without frames. It is a companion to
`table-capture' which does the opposite process. `table-capture' which does the opposite process.
...@@ -127,7 +127,7 @@ where, ...@@ -127,7 +127,7 @@ where,
first line is useful and complete without the rest of the string. first line is useful and complete without the rest of the string.
Optional item ENABLE-EXPR is an arbitrary lisp expression. If it Optional item ENABLE-EXPR is an arbitrary lisp expression. If it
evaluates to nil, then the button is deactivated, otherwise it is evaluates to nil, then the button is inactive, otherwise it is
active. If it isn't present then the button is always active." active. If it isn't present then the button is always active."
;; The following variable names have been carefully chosen to make code ;; The following variable names have been carefully chosen to make code
;; generation easier. Modifying the names should be done carefully. ;; generation easier. Modifying the names should be done carefully.
......
...@@ -1331,7 +1331,7 @@ ARGS to actually emit the message (if applicable)." ...@@ -1331,7 +1331,7 @@ ARGS to actually emit the message (if applicable)."
(setq fn nil))) (setq fn nil)))
(setq btn (1+ btn)))) (setq btn (1+ btn))))
;; The following code inserts filename and line number. ;; The following code inserts filename and line number.
;; Should be deactivated by default, because it is time ;; Should be inactive by default, because it is time
;; consuming. ;; consuming.
; (let ((ffn (find-function-noselect (intern fn)))) ; (let ((ffn (find-function-noselect (intern fn))))
; (insert ; (insert
......
...@@ -173,19 +173,19 @@ ...@@ -173,19 +173,19 @@
;; +-------------------------------+----------------------------------+ ;; +-------------------------------+----------------------------------+
;; |`table-recognize' |Recognize all tables in the | ;; |`table-recognize' |Recognize all tables in the |
;; |`table-unrecognize' |current buffer and | ;; |`table-unrecognize' |current buffer and |
;; | |activate/inactivate them. | ;; | |activate/deactivate them. |
;; +-------------------------------+----------------------------------+ ;; +-------------------------------+----------------------------------+
;; |`table-recognize-region' |Recognize all the cells in a | ;; |`table-recognize-region' |Recognize all the cells in a |
;; |`table-unrecognize-region' |region and activate/inactivate | ;; |`table-unrecognize-region' |region and activate/deactivate |
;; | |them. | ;; | |them. |
;; +-------------------------------+----------------------------------+ ;; +-------------------------------+----------------------------------+
;; |`table-recognize-table' |Recognize all the cells in a | ;; |`table-recognize-table' |Recognize all the cells in a |
;; |`table-unrecognize-table' |single table and | ;; |`table-unrecognize-table' |single table and |
;; | |activate/inactivate them. | ;; | |activate/deactivate them. |
;; +-------------------------------+----------------------------------+ ;; +-------------------------------+----------------------------------+
;; |`table-recognize-cell' |Recognize a cell. Find a cell | ;; |`table-recognize-cell' |Recognize a cell. Find a cell |
;; |`table-unrecognize-cell' |which contains the current point | ;; |`table-unrecognize-cell' |which contains the current point |
;; | |and activate/inactivate that cell.| ;; | |and activate/deactivate that cell.|
;; +-------------------------------+----------------------------------+ ;; +-------------------------------+----------------------------------+
;; |`table-forward-cell' |Move point to the next Nth cell in| ;; |`table-forward-cell' |Move point to the next Nth cell in|
;; | |a table. | ;; | |a table. |
...@@ -3856,7 +3856,7 @@ companion command to `table-capture' this way. ...@@ -3856,7 +3856,7 @@ companion command to `table-capture' this way.
;;;###autoload ;;;###autoload
(defun table-release () (defun table-release ()
"Convert a table into plain text by removing the frame from a table. "Convert a table into plain text by removing the frame from a table.
Remove the frame from a table and inactivate the table. This command Remove the frame from a table and deactivate the table. This command
converts a table into plain text without frames. It is a companion to converts a table into plain text without frames. It is a companion to
`table-capture' which does the opposite process." `table-capture' which does the opposite process."
(interactive) (interactive)
......
...@@ -12087,7 +12087,7 @@ ...@@ -12087,7 +12087,7 @@
(merge_face_heights): Eliminate GCPRO arg. All callers changed. (merge_face_heights): Eliminate GCPRO arg. All callers changed.
* keyboard.c (command_loop_1): Change Vtransient_mark_mode * keyboard.c (command_loop_1): Change Vtransient_mark_mode
before deciding whether to inactivate mark. before deciding whether to deactivate mark.
2004-11-06 Lars Brinkhoff <lars@nocrew.org> 2004-11-06 Lars Brinkhoff <lars@nocrew.org>
......
...@@ -3132,7 +3132,7 @@ record_unwind_save_match_data (void) ...@@ -3132,7 +3132,7 @@ record_unwind_save_match_data (void)
Fmatch_data (Qnil, Qnil, Qnil)); Fmatch_data (Qnil, Qnil, Qnil));
} }
/* Quote a string to inactivate reg-expr chars */ /* Quote a string to deactivate reg-expr chars */
DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0, DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0,
doc: /* Return a regexp string which matches exactly STRING and nothing else. */) doc: /* Return a regexp string which matches exactly STRING and nothing else. */)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment