--- a/lisp/ChangeLog	Thu Dec 20 07:58:23 2001 +0000
+++ b/lisp/ChangeLog	Sat Dec 22 07:20:58 2001 +0000
@@ -1,3 +1,11 @@
+2001-12-18  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* gnuserv.el: 
+	(gnuserv-mode-line-string): new customizable variable
+	(gnuserv-minor-mode): make variable buffer-local
+	* isearch-mode.el:
+	(isearch-mode-line-string): new customizable variable	
+
 2001-12-16  Andy Piper  <andy@xemacs.org>
 
 	* package-get.el (package-get-update-all): Make sure installed.db

--- a/lisp/gnuserv.el	Thu Dec 20 07:58:23 2001 +0000
+++ b/lisp/gnuserv.el	Sat Dec 22 07:20:58 2001 +0000
@@ -89,6 +89,14 @@
   :group 'processes
   :group 'terminals)
 
+;;;###autoload
+(defcustom gnuserv-mode-line-string " Server"
+  "*String to display in the modeline when Gnuserv is active.
+Set this to nil if you don't want a modeline indicator."
+  :type '(choice string
+		 (const :tag "none" nil))
+  :group 'gnuserv)
+
 
 ;; Provide the old variables as aliases, to avoid breaking .emacs
 ;; files.  However, they are obsolete and should be converted to the
@@ -261,9 +269,10 @@
 ;; We want the client-infested buffers to have some modeline
 ;; identification, so we'll make a "minor mode".
 (defvar gnuserv-minor-mode nil)
-(make-variable-buffer-local 'gnuserv-mode)
-(pushnew '(gnuserv-minor-mode " Server") minor-mode-alist
-	  :test 'equal)
+(make-variable-buffer-local 'gnuserv-minor-mode)
+;;(pushnew '(gnuserv-minor-mode "Server") minor-mode-alist
+;;	 :test 'equal)
+(add-minor-mode 'gnuserv-minor-mode 'gnuserv-mode-line-string)
 
 
 ;; Sample gnuserv-frame functions

--- a/lisp/isearch-mode.el	Thu Dec 20 07:58:23 2001 +0000
+++ b/lisp/isearch-mode.el	Sat Dec 22 07:20:58 2001 +0000
@@ -225,6 +225,13 @@
   :type 'boolean
   :group 'isearch)
 
+(defcustom isearch-mode-line-string " Isearch"
+  "*String to display in the modeline when `isearch-mode' is active.
+Set this to nil if you don't want a modeline indicator."
+  :type '(choice string
+		 (const :tag "none" nil))
+  :group 'isearch)
+
 ;;;====================================================
 ;;; Define isearch-mode keymap.
 
@@ -384,7 +391,7 @@
 ;; Minor-mode-alist changes - kind of redundant with the
 ;; echo area, but if isearching in multiple windows, it can be useful.
 
-(add-minor-mode 'isearch-mode 'isearch-mode)
+(add-minor-mode 'isearch-mode 'isearch-mode-line-string)
 
 (defvar isearch-mode nil) ;; Name of the minor mode, if non-nil.
 (make-variable-buffer-local 'isearch-mode)