Cleaned up custom support.

1 files changed, 21 insertions, 9 deletions

diff --git a/lisp/fast-lock.el b/lisp/fast-lock.el
index 75a5082bc63..efa0e873c24 100644
--- a/lisp/fast-lock.el
+++ b/lisp/fast-lock.el
@@ -253,7 +253,10 @@ For example:
 
 would cause a file's current directory to be used if the file is under your
 home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
-  :type '(repeat (radio (cons regexp directory) directory))
+  :type '(repeat (radio (cons :tag "Matching"
+			      (regexp :tag "regexp")
+			      (directory :tag "directory"))
+			(directory :tag "directory")))
   :group 'fast-lock)
 
 (defcustom fast-lock-minimum-size (* 25 1024)
@@ -265,10 +268,17 @@ where MAJOR-MODE is a symbol or t (meaning the default).  For example:
  ((c-mode . 25600) (c++-mode . 25600) (rmail-mode . 1048576))
 means that the minimum size is 25K for buffers in C or C++ modes, one megabyte
 for buffers in Rmail mode, and size is irrelevant otherwise."
-  :type '(radio (const :tag "None" nil)
-		(integer :tag "Size")
-		(repeat (cons (symbol :tag "Major Mode")
-			      (integer :tag "Size"))))
+  :type '(choice (const :tag "none" nil)
+		 (integer :tag "size")
+		 (repeat :menu-tag "mode specific" :tag "mode specific"
+			 :value ((t . nil))
+			 (cons :tag "Instance"
+			       (radio :tag "Mode"
+				      (const :tag "all" t)
+				      (symbol :tag "name"))
+			       (radio :tag "Size"
+				      (const :tag "none" nil)
+				      (integer :tag "size")))))
   :group 'fast-lock)
 
 (defcustom fast-lock-save-events '(kill-buffer kill-emacs)
@@ -276,7 +286,9 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
 Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.
 If concurrent editing sessions use the same associated cache file for a file's
 buffer, then you should add `save-buffer' to this list."
-  :type '(set (const kill-buffer) (const save-buffer) (const kill-emacs))
+  :type '(set (const :tag "buffer saving" save-buffer)
+	      (const :tag "buffer killing" kill-buffer)
+	      (const :tag "emacs killing" kill-emacs))
   :group 'fast-lock)
 
 (defcustom fast-lock-save-others t
@@ -289,9 +301,9 @@ Font Lock cache files saved.  Ownership may be unknown for networked files."
 (defcustom fast-lock-verbose font-lock-verbose
   "*If non-nil, means show status messages for cache processing.
 If a number, only buffers greater than this size have processing messages."
-  :type '(radio (const :tag "Never" nil)
-		(const :tag "Always" t)
-		(integer :tag "Size"))
+  :type '(choice (const :tag "never" nil)
+		 (const :tag "always" t)
+		 (integer :tag "size"))
   :group 'fast-lock)
 
 (defvar fast-lock-save-faces