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

17 files changed, 31 insertions, 31 deletions

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a1da74710a4..69b17a94d68 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -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
 @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
 @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
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index ec33037acba..4e541c0deb3 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -1027,8 +1027,8 @@ motion keys (e.g. S-left and S-down) activate and extend a temporary
 region, similar to mouse-selection.
 
 *** Temporarily active regions, created using shift-selection or
-mouse-selection, are not necessarily deactivated in the next command.
-They are only deactivated after point motion commands that are not
+mouse-selection, are not necessarily deactivated after the next command.
+They are deactivated only after point motion commands that are not
 shift-translated, or after commands that would ordinarily deactivate
 the mark in Transient Mark mode (e.g., any command that modifies the
 buffer).
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 82f3417ef82..e0c244d5725 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -2809,7 +2809,7 @@
 	Consolidate layout provisions coce directly into the activation
 	condition branch, now that we've removed those provisions.
 	(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
 	warnings for version of function used only where
 	set-buffer-multibyte is unavailable.
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index b2cdc634f84..51e2661d89e 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -914,7 +914,7 @@
 	(desktop-locals-to-save): Add line-number-mode to be saved when
 	local.
 	(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,
 	offer to quit regardless.
 	(desktop-save-buffer-p): Disregard case when testing file and
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index b9f8de3b598..934258ade67 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -18065,7 +18065,7 @@
 	have KEY.
 	(current-input-method-title): Doc-string modified.
 	(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.
 	(describe-language-support): Doc-string modified.  Calls an
 	appropriate function for each language.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 07944a6c16f..3d5ae69fe3d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3225,7 +3225,7 @@ Also change :reverse-video to :inverse-video."
     (if (not inactive)
 	;; Widget is alive, we don't have to do anything special
 	(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.
       (delete-region (car (cdr inactive))
 		     (+ (car (cdr inactive)) (cdr (cdr inactive))))
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 976848e155d..ae2900775ac 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -625,12 +625,12 @@
 ;;
 ;;    (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-")
 ;;
 ;; 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.
 
 ;; A certain piece of advice is considered a match if its name contains a
@@ -833,7 +833,7 @@
 ;;     Reactivate an advised function but only if its advice is currently
 ;;     active. This can be used to bring all currently advised function up
 ;;     to date with the current state of advice without also activating
-;;     currently deactivated functions.
+;;     currently inactive functions.
 ;; - Caching:
 ;;     Is the saving of an advised definition and an identifying cache-id so
 ;;     it can be reused, for example, for activation after deactivation.
@@ -853,7 +853,7 @@
 ;; - ad-activate to activate 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
-;;               yet activated or is currently deactivated.
+;;               yet activated or is currently inactive.
 ;; - ad-unadvise deactivates a FUNCTION and removes all of its advice
 ;;               information, hence, it cannot be activated again
 ;; - ad-recover  tries to redefine a FUNCTION to its original definition and
@@ -1261,7 +1261,7 @@
 ;; contain some advice matched by the regular expression. This is a save
 ;; way to update the activation of advised functions whose advice changed
 ;; in some way or other without accidentally also activating currently
-;; deactivated functions:
+;; inactive functions:
 ;;
 ;; (ad-update-regexp "^fg-")
 ;; nil
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 279a336f15f..3364af531f5 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -979,7 +979,7 @@
 
 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:
 	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 
@@ -1447,7 +1447,7 @@
 	* erc-match.el: fixed spelling error
 
 	* 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,
 	    erc-current-nick-p
 
@@ -1564,7 +1564,7 @@
 	  (require 'erc-nickserv) is now necessary for this to work
 
 	* erc.el:
-	* results of /COUNTRY now formatted as notice; errors are ignored, 
+	* results of /COUNTRY now formatted as notice; errors are ignored,
 	  fixing
 	  bug which made prompt disappear
 
@@ -1959,9 +1959,9 @@
 
 	* erc.el: remove trailing \n from any sent text
 
-	* servers.pl, erc-bbdb.el, erc-button.el, erc-chess.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, 
+	* servers.pl, erc-bbdb.el, erc-button.el, erc-chess.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-speak.el, erc-speedbar.el, erc-track.el, erc.el:
 	clean whitespace
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7e0d60018c2..6f1b6a3a42a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2778,7 +2778,7 @@
 2011-01-28  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* 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>
 
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 02c37f22774..694b4d7e8b4 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1354,7 +1354,7 @@ if it is a string, only list groups matching REGEXP."
 		     (predicate t)	; We list all groups?
 		     (t
 		      (or
-		       (if (eq unread t) ; Deactivated?
+		       (if (eq unread t) ; Inactive?
 			   gnus-group-list-inactive-groups
 					; We list inactive
 			 (and (numberp unread) (> unread 0)))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 39ed7adc9c4..6d95993bdd3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1872,7 +1872,7 @@ the bottom."
   (goto-char isearch-point))
 
 (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."
   (isearch-unread-key-sequence keylist)
   (let (overriding-terminal-local-map)
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index fb1735cf6a1..8d7e4d41265 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -27771,7 +27771,7 @@ companion command to `table-capture' this way.
 
 (autoload 'table-release "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
 `table-capture' which does the opposite process.
 
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index ddc9b3ffe94..4469c043b15 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -127,7 +127,7 @@ where,
   first line is useful and complete without the rest of the string.
 
   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."
   ;; The following variable names have been carefully chosen to make code
   ;; generation easier. Modifying the names should be done carefully.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0ee6ad8dea4..c89b61c2eb1 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1331,7 +1331,7 @@ ARGS to actually emit the message (if applicable)."
 		(setq fn nil)))
 	    (setq btn (1+ btn))))
 	;; 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.
 ;	(let ((ffn (find-function-noselect (intern fn))))
 ;	  (insert
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 08a45b6b302..65f6d98ef79 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -173,19 +173,19 @@
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize'              |Recognize all tables in the       |
 ;; |`table-unrecognize'            |current buffer and                |
-;; |                               |activate/inactivate them.         |
+;; |                               |activate/deactivate them.         |
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize-region'       |Recognize all the cells in a      |
-;; |`table-unrecognize-region'     |region and activate/inactivate    |
+;; |`table-unrecognize-region'     |region and activate/deactivate    |
 ;; |                               |them.                             |
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize-table'        |Recognize all the cells in a      |
 ;; |`table-unrecognize-table'      |single table and                  |
-;; |                               |activate/inactivate them.         |
+;; |                               |activate/deactivate them.         |
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize-cell'         |Recognize a cell.  Find a cell    |
 ;; |`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|
 ;; |                               |a table.                          |
@@ -3856,7 +3856,7 @@ companion command to `table-capture' this way.
 ;;;###autoload
 (defun table-release ()
   "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
 `table-capture' which does the opposite process."
   (interactive)
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 42af99ccc58..7d2f48a03ea 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -12087,7 +12087,7 @@
 	(merge_face_heights): Eliminate GCPRO arg.  All callers changed.
 
 	* 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>
 
diff --git a/src/search.c b/src/search.c
index a6a0fddb137..fe4ce534b0b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3132,7 +3132,7 @@ record_unwind_save_match_data (void)
 			 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,
        doc: /* Return a regexp string which matches exactly STRING and nothing else.  */)