Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 490-504)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 161-163)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130

6 files changed, 21 insertions, 21 deletions

diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 14838987d1d..cee60c6ec8e 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -202,7 +202,7 @@
 
     Sometimes, edt-mapper will ignore a key you press, and just continue to
     prompt for the same key.  This can happen when your window manager sucks
-    up the key and doesn't pass it on to emacs, or it could be an emacs bug.
+    up the key and doesn't pass it on to Emacs, or it could be an Emacs bug.
     Either way, there's nothing that edt-mapper can do about it.  You must
     press RETURN, to skip the current key and continue.  Later, you and/or
     your local system guru can try to figure out why the key is being ignored.
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 878ac56ac8d..5d90728898a 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -432,7 +432,7 @@ CSI is DEC's name for the sequence <ESC>[.")
   (let ((map (make-keymap)))
     (define-key map "\e[" GOLD-CSI-map)                  ; GOLD-CSI map
     (define-key map "\eO" GOLD-SS3-map)                  ; GOLD-SS3 map
-    ;; 
+    ;;
     (define-key map "\C-A" 'tpu-toggle-overwrite-mode)   ; ^A
     (define-key map "\C-B" 'nil)                         ; ^B
     (define-key map "\C-C" 'nil)                         ; ^C
@@ -557,7 +557,7 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
 (defvar SS3-map
   (let ((map (make-sparse-keymap)))
     (define-key map "P" GOLD-map)                         ; GOLD map
-    ;; 
+    ;;
     (define-key map "A" 'tpu-previous-line)               ; up
     (define-key map "B" 'tpu-next-line)                   ; down
     (define-key map "C" 'tpu-forward-char)                ; right
@@ -1141,7 +1141,7 @@ This is useful for inserting control characters."
        R     Toggle rectangular mode for remove and insert
        S     Search and substitute - line mode REPLACE command
 
-      ^T     Toggle control key bindings between TPU and emacs
+      ^T     Toggle control key bindings between TPU and Emacs
        U     Undo - undo the last edit
        W     Write - save current buffer
        X     Exit - save all modified buffers and exit
@@ -1292,7 +1292,7 @@ kills modified buffers without asking."
   (kill-buffer (current-buffer)))
 
 (defun tpu-save-all-buffers-kill-emacs nil
-  "Save all buffers and exit emacs."
+  "Save all buffers and exit Emacs."
   (interactive)
   (let ((delete-old-versions t))
     (save-buffers-kill-emacs t)))
@@ -1852,8 +1852,8 @@ A negative argument means replace all occurrences of the search string."
     (message "Replaced %s occurrence%s." strings (if (not (= 1 strings)) "s" ""))))
 
 (defun tpu-emacs-replace (&optional dont-ask)
-  "A TPU-edt interface to the emacs replace functions.  If TPU-edt is
-currently in regular expression mode, the emacs regular expression
+  "A TPU-edt interface to the Emacs replace functions.  If TPU-edt is
+currently in regular expression mode, the Emacs regular expression
 replace functions are used.  If an argument is supplied, replacements
 are performed without asking.  Only works in forward direction."
   (interactive "P")
@@ -2285,7 +2285,7 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
   (setq tpu-control-keys t))
 
 (defun tpu-reset-control-keys (tpu-style)
-  "Set control keys to TPU or emacs style functions."
+  "Set control keys to TPU or Emacs style functions."
   (let* ((tpu   (and tpu-style (not tpu-control-keys)))
          (emacs (and (not tpu-style) tpu-control-keys))
          (doit  (or tpu emacs)))
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 227fe88b1a1..8b5109793c0 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -45,7 +45,7 @@
 ;; external variables
 
 (defvar vip-emacs-local-map nil
-  "Local map used in emacs mode.  (Buffer-specific.)")
+  "Local map used in Emacs mode.  (Buffer-specific.)")
 
 (defvar vip-insert-local-map nil
   "Local map used in insert command mode.  (Buffer-specific.)")
@@ -447,7 +447,7 @@ Type `n' to quit this window for now.\n")
   (vip-change-mode 'insert-mode))
 
 (defun vip-change-mode-to-emacs ()
-  "Change mode to emacs mode."
+  "Change mode to Emacs mode."
   (interactive)
   (vip-change-mode 'emacs-mode))
 
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 465f6e5cfb8..bf85d282fed 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -438,7 +438,7 @@ delete the text being replaced, as in standard Vi."
 ;; confused in some cases. So, this var is nulled for now.
 ;; (defcustom viper-emacs-state-cursor-color "Magenta"
 (defcustom viper-emacs-state-cursor-color nil
-  "Cursor color when Viper is in emacs state."
+  "Cursor color when Viper is in Emacs state."
   :type 'string
   :group 'viper)
 (if (fboundp 'make-variable-frame-local)
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 6f9ade2f9e4..8eeb5b4f3fc 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -144,7 +144,7 @@ viper-insert-basic-map.  Not recommended, except for novice users.")
   "Auxiliary map for global user-defined bindings in Emacs state.")
 
 (defvar  viper-emacs-kbd-map  (make-sparse-keymap)
-  "This keymap keeps Vi-style kbd macros for emacs mode.")
+  "This keymap keeps Vi-style kbd macros for Emacs mode.")
 
 (viper-deflocalvar viper-emacs-local-user-map  (make-sparse-keymap)
   "Auxiliary map for local user-defined bindings in Emacs state.")
@@ -160,10 +160,10 @@ viper-insert-basic-map.  Not recommended, except for novice users.")
 
 ;; Some important keys used in viper
 (defcustom viper-toggle-key [(control ?z)]  ; "\C-z"
-  "The key used to change states from emacs to Vi and back.
+  "The key used to change states from Emacs to Vi and back.
 In insert mode, this key also functions as Meta.
 
-Enter as a sexp. Examples: \"\\C-z\", [(control ?z)]."
+Enter as a sexp.  Examples: \"\\C-z\", [(control ?z)]."
   :type 'sexp
   :group 'viper
   :set (lambda (symbol value)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 82c070d5264..fd1a8aa92ea 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -359,7 +359,7 @@ user decide when to invoke Viper in a major mode."
 (defcustom viper-mode (cond (noninteractive nil)
                             (t 'ask))
   "To Viperize or not to Viperize.
-If t, viperize emacs.  If nil -- don't.  If `ask', ask the user.
+If t, viperize Emacs.  If nil -- don't.  If `ask', ask the user.
 This variable is used primatily when Viper is being loaded.
 
 Must be set in `~/.emacs' before Viper is loaded.
@@ -502,10 +502,10 @@ unless it is coming up in a wrong Viper state."
 The list has the structure: ((mode viper-state keymap) (mode viper-state
 keymap) ...).  If `mode' is on the list, the `kemap' will be made active (on
 the minor-mode-map-alist) in the specified viper state.
-If you change this list, have to restart emacs for the change to take effect.
-However, if you did the change through the customization widget, then emacs
+If you change this list, have to restart Emacs for the change to take effect.
+However, if you did the change through the customization widget, then Emacs
 needs to be restarted only if you deleted a triple mode-state-keymap from the
-list.  No need to restart emacs in case of insertion or modification of an
+list.  No need to restart Emacs in case of insertion or modification of an
 existing triple."
   :type '(repeat
           (list symbol
@@ -891,7 +891,7 @@ It also can't undo some Viper settings."
   (eval-after-load
    "passwd"
    '(defadvice read-passwd-1 (before viper-passwd-ad activate)
-      "Switch to emacs state while reading password."
+      "Switch to Emacs state while reading password."
       (viper-change-state-to-emacs)))
 
   (defadvice self-insert-command (around viper-self-insert-ad activate)
@@ -939,7 +939,7 @@ It also can't undo some Viper settings."
   (eval-after-load
    "rmailedit"
    '(defadvice rmail-cease-edit (after viper-rmail-advice activate)
-      "Switch to emacs state when done editing message."
+      "Switch to Emacs state when done editing message."
       (viper-change-state-to-emacs)))
   ;; In case RMAIL was loaded before Viper.
   (defadvice rmail-cease-edit (after viper-rmail-advice activate)
@@ -1121,7 +1121,7 @@ It also can't undo some Viper settings."
        (save-window-excursion
          (with-output-to-temp-buffer " *viper-info*"
            (princ "
-You have loaded Viper, and are about to Viperize your emacs!
+You have loaded Viper, and are about to Viperize your Emacs!
 
 Viper is a Package for Emacs Rebels and a venomous VI PERil,