--- a/lisp/viper/viper-init.el	Mon Aug 13 09:59:07 2007 +0200
+++ b/lisp/viper/viper-init.el	Mon Aug 13 10:00:02 2007 +0200
@@ -51,16 +51,17 @@
 (defun viper-window-display-p ()
   (and (viper-device-type) (not (memq (viper-device-type) '(tty stream pc)))))
 
-(defcustom viper-ms-style-os-p (memq system-type '(ms-dos windows-nt windows-95))
+(defcustom viper-ms-style-os-p (memq system-type
+				     '(ms-dos windows-nt windows-95))
   "Tells if Emacs is running under an MS-style OS: ms-dos, windows-nt, W95."
   :type 'boolean
   :tag "Is it Microsoft-made OS?"
-  :group 'viper)
+  :group 'viper-misc)
 (defcustom viper-vms-os-p (memq system-type '(vax-vms axp-vms))
   "Tells if Emacs is running under VMS."
   :type 'boolean
   :tag "Is it VMS?"
-  :group 'viper)
+  :group 'viper-misc)
 
 (defcustom viper-force-faces nil
   "If t, Viper will think that it is running on a display that supports faces.
@@ -68,7 +69,7 @@
 that Viper doesn't know about.
 In all likelihood, you don't need to bother with this setting."
   :type 'boolean
-  :group 'viper)
+  :group 'viper-highlighting)
 
 (defun viper-has-face-support-p ()
   (cond ((viper-window-display-p))
@@ -470,7 +471,7 @@
 This is a list where Viper keeps the history of previously inserted pieces of
 text."
   :type 'integer
-  :group 'viper)
+  :group 'viper-misc)
 ;; The insertion ring.
 (defvar viper-insertion-ring nil)
 ;; This is temp insertion ring. Used to do rotation for display purposes.
@@ -481,7 +482,7 @@
 (defcustom viper-command-ring-size 14
   "The size of history of Vi commands repeatable with dot."
   :type 'integer
-  :group 'viper)
+  :group 'viper-misc)
 ;; The command ring.
 (defvar viper-command-ring nil)
 ;; This is temp command ring. Used to do rotation for display purposes.
@@ -494,7 +495,7 @@
 Setting this too high may slow down your typing. Setting this value too low
 will make it hard to use Vi-stile timeout macros."
   :type 'integer
-  :group 'viper)
+  :group 'viper-misc)
 
 (defcustom viper-ESC-keyseq-timeout (if (viper-window-display-p)
 				      0 viper-fast-keyseq-timeout)
@@ -503,7 +504,7 @@
 this value too low will make it impossible to use function keys in insert mode
 on a dumb terminal."
   :type 'integer
-  :group 'viper)
+  :group 'viper-misc)
 
 ;; Modes and related variables
 
@@ -612,6 +613,11 @@
 
 ;;; Variables for Moves and Searches
 
+(defgroup viper-search nil
+  "Variables that define the search and query-replace behavior of Viper."
+  :prefix "viper-"
+  :group 'viper)
+
 ;; For use by `;' command.
 (defvar viper-f-char nil)
 
@@ -638,13 +644,13 @@
 (defcustom viper-case-fold-search nil
   "*If not nil, search ignores cases."
   :type 'boolean
-  :group 'viper)
+  :group 'viper-search)
 
 (defcustom viper-re-search t
   "*If not nil, search is regexp search, otherwise vanilla search."
   :type 'boolean
   :tag "Regexp Search"
-  :group 'viper)
+  :group 'viper-search)
 
 (defcustom viper-search-scroll-threshold 2
   "*If search lands within this threshnold from the window top/bottom,
@@ -652,19 +658,19 @@
 If you want Viper search to behave as usual in Vi, set this variable to a
 negative number."
   :type 'boolean
-  :group 'viper)
+  :group 'viper-search)
 
 (defcustom viper-re-query-replace t
   "*If t then do regexp replace, if nil then do string replace."
   :type 'boolean
   :tag "Regexp Query Replace"
-  :group 'viper)
+  :group 'viper-search)
 
 (defcustom viper-re-replace t
   "*If t, do regexp replace. nil means do string replace."
   :type 'boolean
   :tag "Regexp Replace"
-  :group 'viper)
+  :group 'viper-search)
 
 (defcustom viper-parse-sexp-ignore-comments t
   "*If t, `%' ignores the parentheses that occur inside comments."
@@ -707,20 +713,20 @@
 (defcustom viper-buffer-search-char nil
   "*Key used for buffer-searching. Must be a character type, e.g., ?g."
   :type '(choice (const nil) character)
-  :group 'viper)
+  :group 'viper-search)
 
 (defcustom viper-search-wrap-around-t t
   "*If t, search wraps around."
   :type 'boolean
   :tag "Search Wraps Around"
-  :group 'viper)
+  :group 'viper-search)
   
 (viper-deflocalvar viper-related-files-and-buffers-ring nil "")
 (defcustom viper-related-files-and-buffers-ring nil
   "*List of file and buffer names that are considered to be related to the current buffer.
 Related buffers can be cycled through via :R and :P commands."
   :type 'boolean
-  :group 'viper)
+  :group 'viper-misc)
 (put 'viper-related-files-and-buffers-ring 'permanent-local t)
 
 ;; Used to find out if we are done with searching the current buffer.
@@ -826,7 +832,11 @@
   "*Face used to flash out the search pattern."
   :group 'viper-highlighting)
 ;; An internal variable. Viper takes the face from here.
-(defvar viper-search-face 'viper-search-face)
+(defvar viper-search-face 'viper-search-face
+  "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)
   
 ;;(defvar viper-replace-overlay-face
@@ -852,7 +862,11 @@
   "*Face for highlighting replace regions on a window display."
   :group 'viper-highlighting)
 ;; 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
+  "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)
 
 ;;(defvar viper-minibuffer-emacs-face
@@ -887,7 +901,11 @@
   "Face used in the Minibuffer when it is in Emacs state."
   :group 'viper-highlighting)
 ;; 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
+  "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)
     
 ;;(defvar viper-minibuffer-insert-face
@@ -920,7 +938,11 @@
   "Face used in the Minibuffer when it is in Insert state."
   :group 'viper-highlighting)
 ;; 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
+  "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)
     
 ;;(defvar viper-minibuffer-vi-face
@@ -945,11 +967,16 @@
   "Face used in the Minibuffer when it is in Vi state."
   :group 'viper-highlighting)
 ;; 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
+  "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)
     
 ;; the current face to be used in the minibuffer
-(viper-deflocalvar viper-minibuffer-current-face viper-minibuffer-emacs-face "")
+(viper-deflocalvar
+  viper-minibuffer-current-face viper-minibuffer-emacs-face "")
 
 
 ;;; Miscellaneous
@@ -960,12 +987,12 @@
 (defcustom viper-spell-function 'ispell-region
   "Spell function used by #s<move> command to spell."
   :type 'function
-  :group 'viper)
+  :group 'viper-misc)
 
 (defcustom viper-tags-file-name "TAGS"
   "The tags file used by Viper."
   :type 'string
-  :group 'viper)
+  :group 'viper-misc)
 
 ;; Minibuffer
 
@@ -995,27 +1022,32 @@
   "Mode line tag identifying the Replace mode of Viper.")
 
 
+(defgroup viper-hooks nil
+  "Viper hooks."
+  :prefix "viper-"
+  :group 'viper)
+
 (defcustom viper-vi-state-hook nil
   "*Hooks run just before the switch to Vi mode is completed."
   :type 'hook
-  :group 'viper)
+  :group 'viper-hooks)
 (defcustom viper-insert-state-hook nil
   "*Hooks run just before the switch to Insert mode is completed."
   :type 'hook
-  :group 'viper)
+  :group 'viper-hooks)
 (defcustom viper-replace-state-hook nil
   "*Hooks run just before the switch to Replace mode is completed."
   :type 'hook
-  :group 'viper)
+  :group 'viper-hooks)
 (defcustom viper-emacs-state-hook nil
   "*Hooks run just before the switch to Emacs mode is completed."
   :type 'hook
-  :group 'viper)
+  :group 'viper-hooks)
   
 (defcustom viper-load-hook nil
   "Hooks run just after loading Viper."
   :type 'hook
-  :group 'viper)
+  :group 'viper-hooks)
   
 
 ;;; Local Variables: