Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 358-423)

   - Update from CVS
   - Remove "-face" suffix from widget faces
   - Remove "-face" suffix from custom faces
   - Remove "-face" suffix from change-log faces
   - Remove "-face" suffix from compilation faces
   - Remove "-face" suffix from diff-mode faces
   - lisp/longlines.el (longlines-visible-face): Face removed
   - Remove "-face" suffix from woman faces
   - Remove "-face" suffix from whitespace-highlight face
   - Remove "-face" suffix from ruler-mode faces
   - Remove "-face" suffix from show-paren faces
   - Remove "-face" suffix from log-view faces
   - Remove "-face" suffix from smerge faces
   - Remove "-face" suffix from show-tabs faces
   - Remove "-face" suffix from highlight-changes faces
   - Remove "-face" suffix from and downcase info faces
   - Remove "-face" suffix from pcvs faces
   - Update uses of renamed pcvs faces
   - Tweak ChangeLog
   - Remove "-face" suffix from strokes-char face
   - Remove "-face" suffix from compare-windows face
   - Remove "-face" suffix from calendar faces
   - Remove "-face" suffix from diary-button face
   - Remove "-face" suffix from testcover faces
   - Remove "-face" suffix from viper faces
   - Remove "-face" suffix from org faces
   - Remove "-face" suffix from sgml-namespace face
   - Remove "-face" suffix from table-cell face
   - Remove "-face" suffix from tex-mode faces
   - Remove "-face" suffix from texinfo-heading face
   - Remove "-face" suffix from flyspell faces
   - Remove "-face" suffix from gomoku faces
   - Remove "-face" suffix from mpuz faces
   - Merge from gnus--rel--5.10
   - Remove "-face" suffix from Buffer-menu-buffer face
   - Remove "-face" suffix from antlr-mode faces
   - Remove "-face" suffix from ebrowse faces
   - Remove "-face" suffix from flymake faces
   - Remove "-face" suffix from idlwave faces
   - Remove "-face" suffix from sh-script faces
   - Remove "-face" suffix from vhdl-mode faces
   - Remove "-face" suffix from which-func face
   - Remove "-face" suffix from cperl-mode faces
   - Remove "-face" suffix from ld-script faces
   - Fix cperl-mode font-lock problem
   - Tweak which-func face

 * gnus--rel--5.10  (patch 80-82)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

6 files changed, 43 insertions, 33 deletions

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index fe2b0a892a8..c6d479b173f 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -447,13 +447,13 @@ a cons (TYPE . COLOR), then both properties are affected."
           (choice :tag "Type"
                   (const :tag "Filled box" box)
                   (const :tag "Vertical bar" bar)
-                  (const :tag "Horisontal bar" hbar)
+                  (const :tag "Horizontal bar" hbar)
                   (const :tag "Hollow box" hollow))
           (cons :tag "Color and Type"
                 (choice :tag "Type"
                         (const :tag "Filled box" box)
                         (const :tag "Vertical bar" bar)
-                        (const :tag "Horisontal bar" hbar)
+                        (const :tag "Horizontal bar" hbar)
                         (const :tag "Hollow box" hollow))
                 (color :tag "Color")))
   :group 'cua)
@@ -471,13 +471,13 @@ a cons (TYPE . COLOR), then both properties are affected."
           (choice :tag "Type"
                   (const :tag "Filled box" box)
                   (const :tag "Vertical bar" bar)
-                  (const :tag "Horisontal bar" hbar)
+                  (const :tag "Horizontal bar" hbar)
                   (const :tag "Hollow box" hollow))
           (cons :tag "Color and Type"
                 (choice :tag "Type"
                         (const :tag "Filled box" box)
                         (const :tag "Vertical bar" bar)
-                        (const :tag "Horisontal bar" hbar)
+                        (const :tag "Horizontal bar" hbar)
                         (const :tag "Hollow box" hollow))
                 (color :tag "Color")))
   :group 'cua)
@@ -495,13 +495,13 @@ a cons (TYPE . COLOR), then both properties are affected."
           (choice :tag "Type"
                   (const :tag "Filled box" box)
                   (const :tag "Vertical bar" bar)
-                  (const :tag "Horisontal bar" hbar)
+                  (const :tag "Horizontal bar" hbar)
                   (const :tag "Hollow box" hollow))
           (cons :tag "Color and Type"
                 (choice :tag "Type"
                         (const :tag "Filled box" box)
                         (const :tag "Vertical bar" bar)
-                        (const :tag "Horisontal bar" hbar)
+                        (const :tag "Horizontal bar" hbar)
                         (const :tag "Hollow box" hollow))
                 (color :tag "Color")))
   :group 'cua)
@@ -520,13 +520,13 @@ a cons (TYPE . COLOR), then both properties are affected."
           (choice :tag "Type"
                   (const :tag "Filled box" box)
                   (const :tag "Vertical bar" bar)
-                  (const :tag "Horisontal bar" hbar)
+                  (const :tag "Horizontal bar" hbar)
                   (const :tag "Hollow box" hollow))
           (cons :tag "Color and Type"
                 (choice :tag "Type"
                         (const :tag "Filled box" box)
                         (const :tag "Vertical bar" bar)
-                        (const :tag "Horisontal bar" hbar)
+                        (const :tag "Horizontal bar" hbar)
                         (const :tag "Hollow box" hollow))
                 (color :tag "Color")))
   :group 'cua)
@@ -1360,7 +1360,7 @@ paste (in addition to the normal emacs bindings)."
 
   (if (not cua-mode)
       (setq emulation-mode-map-alists (delq 'cua--keymap-alist emulation-mode-map-alists))
-    (add-to-list 'emulation-mode-map-alists 'cua--keymap-alist)
+    (add-to-ordered-list 'emulation-mode-map-alists 'cua--keymap-alist 400)
     (cua--select-keymaps))
 
   (cond
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 1221fca5199..5231abb588a 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -99,7 +99,7 @@ errors are suppressed."
 (defcustom pc-select-selection-keys-only nil
   "*Non-nil means only bind the basic selection keys when started.
 Other keys that emulate pc-behavior will be untouched.
-This gives mostly Emacs-like behaviour with only the selection keys enabled."
+This gives mostly Emacs-like behavior with only the selection keys enabled."
   :type 'boolean
   :group 'pc-select)
 
@@ -825,7 +825,7 @@ If the value is non-nil, call the function MODE with an argument of
 
 ;;;###autoload
 (define-minor-mode pc-selection-mode
-  "Change mark behaviour to emulate Motif, MAC or MS-Windows cut and paste style.
+  "Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style.
 
 This mode enables Delete Selection mode and Transient Mark mode.
 
@@ -971,7 +971,7 @@ but before calling PC Selection mode):
 ;;;###autoload
 (defcustom pc-selection-mode nil
   "Toggle PC Selection mode.
-Change mark behaviour to emulate Motif, MAC or MS-Windows cut and paste style,
+Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style,
 and cursor movement commands.
 This mode enables Delete Selection mode and Transient Mark mode.
 Setting this variable directly does not take effect;
diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el
index cd0092e5e87..d6b7c2728b2 100644
--- a/lisp/emulation/vi.el
+++ b/lisp/emulation/vi.el
@@ -520,7 +520,7 @@ set sw=n     M-x set-variable vi-shift-width n "
   "Go into insert state, the text entered will be repeated if REPETITION > 1.
 If PREFIX-CODE is given, do it before insertion begins if DO-IT-NOW-P is T.
 In any case, the prefix-code will be done before each 'redo-insert'.
-This function expects 'overwrite-mode' being set properly beforehand."
+This function expects `overwrite-mode' being set properly beforehand."
   (if do-it-now-p (apply (car prefix-code) (cdr prefix-code)))
   (setq vi-ins-point (point))
   (setq vi-ins-repetition repetition)
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 19f08d54989..dace12d4c8f 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -1342,7 +1342,7 @@ after search."
 (defun vip-find-char-forward (arg)
   "Find char on the line.  If called interactively read the char to find
 from the terminal, and if called from vip-repeat, the char last used is
-used.  This behaviour is controlled by the sign of prefix numeric value."
+used.  This behavior is controlled by the sign of prefix numeric value."
   (interactive "P")
   (let ((val (vip-p-val arg)) (com (vip-getcom arg)))
     (if (> val 0)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 4593d84c6fc..3f9a425987e 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -3131,7 +3131,7 @@ On reaching beginning of line, stop and signal error."
 (defun viper-find-char-forward (arg)
   "Find char on the line.
 If called interactively read the char to find from the terminal, and if
-called from viper-repeat, the char last used is used.  This behaviour is
+called from viper-repeat, the char last used is used.  This behavior is
 controlled by the sign of prefix numeric value."
   (interactive "P")
   (let ((val (viper-p-val arg))
@@ -3672,8 +3672,8 @@ If MAJOR-MODE is set, set the macros only in that major mode."
           (sit-for 2)
           (viper-unrecord-kbd-macro "///" 'vi-state)))
     ))
-  
-  
+
+
 (defun viper-set-parsing-style-toggling-macro (unset)
   "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses.
 This is used in conjunction with the `%' command.
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 4f08f1b6cc1..ab9212cb95f 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -1,6 +1,6 @@
 ;;; viper-init.el --- some common definitions for Viper
 
-;; Copyright (C) 1997, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -850,74 +850,84 @@ Related buffers can be cycled through via :R and :P commands."
   :group 'viper)
 
 
-(defface viper-search-face
+(defface viper-search
   '((((class color)) (:foreground "Black" :background "khaki"))
     (t (:underline t :stipple "gray3")))
   "*Face used to flash out the search pattern."
   :group 'viper-highlighting)
+;; backward-compatibility alias
+(put 'viper-search-face 'face-alias 'viper-search)
 ;; An internal variable.  Viper takes the face from here.
-(defvar viper-search-face 'viper-search-face
+(defvar viper-search-face 'viper-search
   "Face used to flash out the search pattern.
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-search-face'
 this variable represents.")
-(viper-hide-face 'viper-search-face)
+(viper-hide-face 'viper-search)
 
 
-(defface viper-replace-overlay-face
+(defface viper-replace-overlay
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
     (t (:underline t :stipple "gray3")))
   "*Face for highlighting replace regions on a window display."
   :group 'viper-highlighting)
+;; backward-compatibility alias
+(put 'viper-replace-overlay-face 'face-alias 'viper-replace-overlay)
 ;; An internal variable.  Viper takes the face from here.
-(defvar viper-replace-overlay-face 'viper-replace-overlay-face
+(defvar viper-replace-overlay-face 'viper-replace-overlay
   "Face for highlighting replace regions on a window display.
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-replace-overlay-face'
 this variable represents.")
-(viper-hide-face 'viper-replace-overlay-face)
+(viper-hide-face 'viper-replace-overlay)
 
 
-(defface viper-minibuffer-emacs-face
+(defface viper-minibuffer-emacs
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
     (t (:weight bold)))
   "Face used in the Minibuffer when it is in Emacs state."
   :group 'viper-highlighting)
+;; backward-compatibility alias
+(put 'viper-minibuffer-emacs-face 'face-alias 'viper-minibuffer-emacs)
 ;; An internal variable.  Viper takes the face from here.
-(defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs-face
+(defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs
   "Face used in the Minibuffer when it is in Emacs state.
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-emacs-face'
 this variable represents.")
-(viper-hide-face 'viper-minibuffer-emacs-face)
+(viper-hide-face 'viper-minibuffer-emacs)
 
 
-(defface viper-minibuffer-insert-face
+(defface viper-minibuffer-insert
   '((((class color)) (:foreground "Black" :background "pink"))
     (t (:slant italic)))
   "Face used in the Minibuffer when it is in Insert state."
   :group 'viper-highlighting)
+;; backward-compatibility alias
+(put 'viper-minibuffer-insert-face 'face-alias 'viper-minibuffer-insert)
 ;; An internal variable.  Viper takes the face from here.
-(defvar viper-minibuffer-insert-face 'viper-minibuffer-insert-face
+(defvar viper-minibuffer-insert-face 'viper-minibuffer-insert
   "Face used in the Minibuffer when it is in Insert state.
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-insert-face'
 this variable represents.")
-(viper-hide-face 'viper-minibuffer-insert-face)
+(viper-hide-face 'viper-minibuffer-insert)
 
 
-(defface viper-minibuffer-vi-face
+(defface viper-minibuffer-vi
   '((((class color)) (:foreground "DarkGreen" :background "grey"))
     (t (:inverse-video t)))
   "Face used in the Minibuffer when it is in Vi state."
   :group 'viper-highlighting)
+;; backward-compatibility alias
+(put 'viper-minibuffer-vi-face 'face-alias 'viper-minibuffer-vi)
 ;; An internal variable.  Viper takes the face from here.
-(defvar viper-minibuffer-vi-face 'viper-minibuffer-vi-face
+(defvar viper-minibuffer-vi-face 'viper-minibuffer-vi
   "Face used in the Minibuffer when it is in Vi state.
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-vi-face'
 this variable represents.")
-(viper-hide-face 'viper-minibuffer-vi-face)
+(viper-hide-face 'viper-minibuffer-vi)
 
 ;; the current face to be used in the minibuffer
 (viper-deflocalvar