Customized.

2 files changed, 36 insertions, 16 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 49fd8172c40..d46156d15e7 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,6 +1,6 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process.
 
-;; Copyright (C) 1986, 1987, 1992, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 87, 92, 94, 95, 96, 1997 Free Software Foundation, Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
@@ -75,17 +75,29 @@
 
 ;;; Code:
 
-(defvar server-program (expand-file-name "emacsserver" exec-directory)
-  "*The program to use as the edit server.")
-
-(defvar server-visit-hook nil
-  "*List of hooks to call when visiting a file for the Emacs server.")
-
-(defvar server-switch-hook nil
-  "*List of hooks to call when switching to a buffer for the Emacs server.")
-
-(defvar server-done-hook nil
-  "*List of hooks to call when done editing a buffer for the Emacs server.")
+(defgroup server nil
+  "Emacs running as a server process."
+  :group 'external)
+
+(defcustom server-program (expand-file-name "emacsserver" exec-directory)
+  "*The program to use as the edit server."
+  :group 'server
+  :type 'string)
+
+(defcustom server-visit-hook nil
+  "*List of hooks to call when visiting a file for the Emacs server."
+  :group 'server
+  :type '(repeat function))
+
+(defcustom server-switch-hook nil
+  "*List of hooks to call when switching to a buffer for the Emacs server."
+  :group 'server
+  :type '(repeat function))
+
+(defcustom server-done-hook nil
+  "*List of hooks to call when done editing a buffer for the Emacs server."
+  :group 'server
+  :type '(repeat function))
 
 (defvar server-process nil 
   "the current server process")
@@ -109,10 +121,12 @@ When a buffer is marked as \"done\", it is removed from this list.")
 If nil, use the selected window.
 If it is a frame, use the frame's selected window.")
 
-(defvar server-temp-file-regexp "^/tmp/Re\\|/draft$"
+(defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$"
   "*Regexp which should match filenames of temporary files
 which are deleted and reused after each edit
-by the programs that invoke the emacs server.")
+by the programs that invoke the emacs server."
+  :group 'server
+  :type 'regexp)
 
 (or (assq 'server-buffer-clients minor-mode-alist)
     (setq minor-mode-alist (cons '(server-buffer-clients " Server") minor-mode-alist)))
diff --git a/lisp/sort.el b/lisp/sort.el
index fcd8906b1f0..886d77eb40c 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -30,8 +30,14 @@
 
 ;;; Code:
 
-(defvar sort-fold-case nil
-  "*Non-nil if the buffer sort functions should ignore case.")
+(defgroup sort nil
+  "Commands to sort text in an Emacs buffer."
+  :group 'data)
+
+(defcustom sort-fold-case nil
+  "*Non-nil if the buffer sort functions should ignore case."
+  :group 'sort
+  :type 'boolean)
 
 ;;;###autoload
 (defun sort-subr (reverse nextrecfun endrecfun &optional startkeyfun endkeyfun)