3 files changed, 73 insertions, 33 deletions
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 98e9f3b9ee..73d9cd3ee3 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -266,6 +266,11 @@
 
 ;;; Code:
 
+(defgroup tpu nil
+  "Emacs emulating TPU emulating EDT."
+  :prefix "tpu-"
+  :group 'emulations)
+
 
 ;;;
 ;;;  Version Information
@@ -276,17 +281,25 @@
 ;;;
 ;;;  User Configurable Variables
 ;;;
-(defconst tpu-have-ispell t
-  "*If non-nil (default), TPU-edt uses ispell for spell checking.")
-
-(defconst tpu-kill-buffers-silently nil
-  "*If non-nil, TPU-edt kills modified buffers without asking.")
-
-(defvar tpu-percent-scroll 75
-  "*Percentage of the screen to scroll for next/previous screen commands.")
-
-(defvar tpu-pan-columns 16
-  "*Number of columns the tpu-pan functions scroll left or right.")
+(defcustom tpu-have-ispell t
+  "*If non-nil (default), TPU-edt uses ispell for spell checking."
+  :type 'boolean
+  :group 'tpu)
+
+(defcustom tpu-kill-buffers-silently nil
+  "*If non-nil, TPU-edt kills modified buffers without asking."
+  :type 'boolean
+  :group 'tpu)
+
+(defcustom tpu-percent-scroll 75
+  "*Percentage of the screen to scroll for next/previous screen commands."
+  :type 'integer
+  :group 'tpu)
+
+(defcustom tpu-pan-columns 16
+  "*Number of columns the tpu-pan functions scroll left or right."
+  :type 'integer
+  :group 'tpu)
 
 
 ;;;
diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index dbaf20ce3a..dc16fc80ad 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -110,17 +110,23 @@
 
 ;;;  Customization variables
 
-(defconst tpu-top-scroll-margin 0
+(defcustom tpu-top-scroll-margin 0
   "*Scroll margin at the top of the screen.
-Interpreted as a percent of the current window size.")
-(defconst tpu-bottom-scroll-margin 0
+Interpreted as a percent of the current window size."
+  :type 'integer
+  :group 'tpu)
+(defcustom tpu-bottom-scroll-margin 0
   "*Scroll margin at the bottom of the screen.
-Interpreted as a percent of the current window size.")
+Interpreted as a percent of the current window size."
+  :type 'integer
+  :group 'tpu)
 
-(defvar tpu-backward-char-like-tpu t
+(defcustom tpu-backward-char-like-tpu t
   "*If non-nil, in free cursor mode backward-char (left-arrow) works
 just like TPU/edt.  Otherwise, backward-char will move to the end of
-the previous line when starting from a line beginning.")
+the previous line when starting from a line beginning."
+  :type 'boolean
+  :group 'tpu)
 
 
 ;;;  Global variables
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 8f8edf42b5..78952bbb0f 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -35,6 +35,11 @@
 
 ;;; Code:
 
+(defgroup vip nil
+  "A VI Package for GNU Emacs."
+  :prefix "vip-"
+  :group 'emulations)
+
 ;; external variables
 
 (defvar vip-emacs-local-map nil
@@ -85,11 +90,15 @@
 (defvar vip-d-com nil
   "How to reexecute last destructive command.  Value is list (M-COM VAL COM).")
 
-(defconst vip-shift-width 8
-  "*The number of columns shifted by > and < command.")
+(defcustom vip-shift-width 8
+  "*The number of columns shifted by > and < command."
+  :type 'integer
+  :group 'vip)
 
-(defconst vip-re-replace nil
-  "*If t then do regexp replace, if nil then do string replace.")
+(defcustom vip-re-replace nil
+  "*If t then do regexp replace, if nil then do string replace."
+  :type 'boolean
+  :group 'vip)
 
 (defvar vip-d-char nil
   "The character remembered by the vi \"r\" command.")
@@ -106,11 +115,15 @@
 (defvar vip-f-offset nil
   "For use by \";\" command.")
 
-(defconst vip-search-wrap-around t
-  "*if t, search wraps around.")
+(defcustom vip-search-wrap-around t
+  "*If t, search wraps around."
+  :type 'boolean
+  :group 'vip)
 
-(defconst vip-re-search nil
-  "*if t, search is reg-exp search, otherwise vanilla search.")
+(defcustom vip-re-search nil
+  "*If t, search is reg-exp search, otherwise vanilla search."
+  :type 'boolean
+  :group 'vip)
 
 (defvar vip-s-string nil
   "Last vip search string.")
@@ -118,18 +131,26 @@
 (defvar vip-s-forward nil
   "If t, search is forward.")
 
-(defconst vip-case-fold-search nil
-  "*If t, search ignores cases.")
+(defcustom vip-case-fold-search nil
+  "*If t, search ignores cases."
+  :type 'boolean
+  :group 'vip)
 
-(defconst vip-re-query-replace nil
-  "*If t then do regexp replace, if nil then do string replace.")
+(defcustom vip-re-query-replace nil
+  "*If t then do regexp replace, if nil then do string replace."
+  :type 'boolean
+  :group 'vip)
 
-(defconst vip-open-with-indent nil
-  "*If t, indent when open a new line.")
+(defcustom vip-open-with-indent nil
+  "*If t, indent when open a new line."
+  :type 'boolean
+  :group 'vip)
 
-(defconst vip-help-in-insert-mode nil
+(defcustom vip-help-in-insert-mode nil
   "*If t then C-h is bound to help-command in insert mode.
-If nil then it is bound to `delete-backward-char'.")
+If nil then it is bound to `delete-backward-char'."
+  :type 'boolean
+  :group 'vip)
 
 (defvar vip-quote-string "> "
   "String inserted at the beginning of region.")