Customized.

2 files changed, 34 insertions, 14 deletions

diff --git a/lisp/hscroll.el b/lisp/hscroll.el
index 7dd3674527d..3940430f93d 100644
--- a/lisp/hscroll.el
+++ b/lisp/hscroll.el
@@ -54,23 +54,35 @@
 
 (defvar hscroll-version "2.2")
 
-(defvar hscroll-margin 5 
+(defgroup hscroll nil
+  "Minor mode to automatically scroll truncated lines horizontally."
+  :group 'editing)
+
+(defcustom hscroll-margin 5 
   "*How many columns away from the edge of the window point is allowed to get
-before HScroll will horizontally scroll the window.")
+before HScroll will horizontally scroll the window."
+  :group 'hscroll
+  :type 'integer)
 
-(defvar hscroll-snap-threshold 30
+(defcustom hscroll-snap-threshold 30
   "*When point is this many columns (or less) from the left edge of the document, 
 don't do any horizontal scrolling.  In other words, be biased towards the left
 edge of the document.
-  Set this variable to zero to disable this bias.")
+  Set this variable to zero to disable this bias."
+  :group 'hscroll
+  :type 'integer)
 
-(defvar hscroll-step-percent 25
+(defcustom hscroll-step-percent 25
   "*How far away to place the point from the window's edge when scrolling.
-Expressed as a percentage of the window's width.")
+Expressed as a percentage of the window's width."
+  :group 'hscroll
+  :type 'integer)
 
-(defvar hscroll-mode-name " Hscr"
+(defcustom hscroll-mode-name " Hscr"
   "*Horizontal scrolling mode line indicator.
-Set this to nil to conserve valuable mode line space.")
+Set this to nil to conserve valuable mode line space."
+  :group 'hscroll
+  :type 'string)
 
 (or (assq 'hscroll-mode minor-mode-alist)
     (setq minor-mode-alist
diff --git a/lisp/indent.el b/lisp/indent.el
index 5b69fab958a..6639f4b2100 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -28,11 +28,17 @@
 
 ;;; Code:
 
-(defvar standard-indent 4 "\
-Default number of columns for margin-changing functions to indent.")
+(defgroup indent nil
+  "Indentation commands"
+  :group 'editing)
 
-(defvar indent-line-function 'indent-to-left-margin "\
-Function to indent current line.")
+(defcustom standard-indent 4
+  "*Default number of columns for margin-changing functions to indent."
+  :group 'indent
+  :type 'integer)
+
+(defvar indent-line-function 'indent-to-left-margin
+  "Function to indent current line.")
 
 (defun indent-according-to-mode ()
   "Indent line in proper way for current major mode."
@@ -357,10 +363,12 @@ column point starts at, `tab-to-tab-stop' is done instead."
           (move-marker opoint nil))
       (tab-to-tab-stop))))
 
-(defvar tab-stop-list
+(defcustom tab-stop-list
   '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120)
   "*List of tab stop positions used by `tab-to-tab-stops'.
-This should be a list of integers, ordered from smallest to largest.")
+This should be a list of integers, ordered from smallest to largest."
+  :group 'indent
+  :type '(repeat integer))
 
 (defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.")
 (if edit-tab-stops-map