[Emacs-diffs] /srv/bzr/emacs/trunk r106531: Spelling fixes (mostly "inactive" vs "deactivate").

[Paul Eggert]

------------------------------------------------------------
revno: 106531
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-11-27 10:17:40 -0800
message:
  Spelling fixes (mostly "inactive" vs "deactivate").
modified:
  doc/misc/gnus.texi
  etc/NEWS.23
  lisp/ChangeLog.15
  lisp/ChangeLog.4
  lisp/ChangeLog.7
  lisp/cus-edit.el
  lisp/emacs-lisp/advice.el
  lisp/erc/ChangeLog.02
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/isearch.el
  lisp/ldefs-boot.el
  lisp/mh-e/mh-tool-bar.el
  lisp/net/tramp.el
  lisp/textmodes/table.el
  src/ChangeLog.10
  src/search.c

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-11-27 04:43:11 +0000
+++ b/doc/misc/gnus.texi        2011-11-27 18:17:40 +0000
@@ -21895,7 +21895,7 @@
 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

=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23       2011-11-27 04:43:11 +0000
+++ b/etc/NEWS.23       2011-11-27 18:17:40 +0000
@@ -1027,8 +1027,8 @@
 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).

=== modified file 'lisp/ChangeLog.15'
--- a/lisp/ChangeLog.15 2011-11-25 13:26:30 +0000
+++ b/lisp/ChangeLog.15 2011-11-27 18:17:40 +0000
@@ -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.

=== modified file 'lisp/ChangeLog.4'
--- a/lisp/ChangeLog.4  2011-11-20 02:29:42 +0000
+++ b/lisp/ChangeLog.4  2011-11-27 18:17:40 +0000
@@ -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

=== modified file 'lisp/ChangeLog.7'
--- a/lisp/ChangeLog.7  2011-11-27 04:43:11 +0000
+++ b/lisp/ChangeLog.7  2011-11-27 18:17:40 +0000
@@ -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.

=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el  2011-10-01 20:32:01 +0000
+++ b/lisp/cus-edit.el  2011-11-27 18:17:40 +0000
@@ -3225,7 +3225,7 @@
     (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))))

=== modified file 'lisp/emacs-lisp/advice.el'
--- a/lisp/emacs-lisp/advice.el 2011-11-19 09:18:31 +0000
+++ b/lisp/emacs-lisp/advice.el 2011-11-27 18:17:40 +0000
@@ -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

=== modified file 'lisp/erc/ChangeLog.02'
--- a/lisp/erc/ChangeLog.02     2011-11-20 02:29:42 +0000
+++ b/lisp/erc/ChangeLog.02     2011-11-27 18:17:40 +0000
@@ -979,7 +979,7 @@
 
 2002-11-16  Alex Schroeder  <address@hidden>
 
-       * erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, 
erc-match.el 1.14, 
+       * erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, 
erc-match.el 1.14,
          erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
        Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 
@@ -1447,7 +1447,7 @@
        * erc-match.el 1.10: fixed spelling error
 
        * erc-track.el 1.14, erc-match.el 1.9: * 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 1.281:
-       * 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 1.245: remove trailing \n from any sent text
 
-       * servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 
1.3, 
-         erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, 
erc-list.el 1.5, 
-         erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 
1.3, 
+       * servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 
1.3,
+         erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, 
erc-list.el 1.5,
+         erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 
1.3,
          erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 
1.244:
        clean whitespace
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-11-27 04:43:11 +0000
+++ b/lisp/gnus/ChangeLog       2011-11-27 18:17:40 +0000
@@ -2778,7 +2778,7 @@
 2011-01-28  Lars Ingebrigtsen  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2011-11-25 07:14:48 +0000
+++ b/lisp/gnus/gnus-group.el   2011-11-27 18:17:40 +0000
@@ -1354,7 +1354,7 @@
                     (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)))

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-11-19 21:03:12 +0000
+++ b/lisp/isearch.el   2011-11-27 18:17:40 +0000
@@ -1872,7 +1872,7 @@
   (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)

=== modified file 'lisp/ldefs-boot.el'
--- a/lisp/ldefs-boot.el        2011-11-27 04:43:11 +0000
+++ b/lisp/ldefs-boot.el        2011-11-27 18:17:40 +0000
@@ -27771,7 +27771,7 @@
 
 (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.
 

=== modified file 'lisp/mh-e/mh-tool-bar.el'
--- a/lisp/mh-e/mh-tool-bar.el  2011-01-26 08:36:39 +0000
+++ b/lisp/mh-e/mh-tool-bar.el  2011-11-27 18:17:40 +0000
@@ -127,7 +127,7 @@
   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.

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2011-11-17 09:09:20 +0000
+++ b/lisp/net/tramp.el 2011-11-27 18:17:40 +0000
@@ -1331,7 +1331,7 @@
                (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

=== modified file 'lisp/textmodes/table.el'
--- a/lisp/textmodes/table.el   2011-11-20 02:29:42 +0000
+++ b/lisp/textmodes/table.el   2011-11-27 18:17:40 +0000
@@ -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 @@
 ;;;###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)

=== modified file 'src/ChangeLog.10'
--- a/src/ChangeLog.10  2011-11-27 04:43:11 +0000
+++ b/src/ChangeLog.10  2011-11-27 18:17:40 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/search.c'
--- a/src/search.c      2011-11-20 03:48:53 +0000
+++ b/src/search.c      2011-11-27 18:17:40 +0000
@@ -3132,7 +3132,7 @@
                         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.  */)