From: Juri Linkov <juri@jurta.org>
Date: Thu, 17 Nov 2005 07:18:07 +0000 (+0000)
Subject: (lisp, c, tex): Add :link (custom-group-link font-lock-faces) to defgroup.
X-Git-Tag: emacs-pretest-22.0.90~5821
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e721a14657e49adc614ba493cafdb15d805a0a5;p=emacs.git

(lisp, c, tex): Add :link (custom-group-link font-lock-faces) to defgroup.
(custom-variable-prompt): Clarify the code.
---

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 63a0f388f56..59a8b341cad 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -212,11 +212,13 @@
 
 (defgroup lisp nil
   "Lisp support, including Emacs Lisp."
+  :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
   :group 'languages
   :group 'development)
 
 (defgroup c nil
   "Support for the C language and related languages."
+  :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
   :link '(custom-manual "(ccmode)")
   :group 'languages)
 
@@ -323,6 +325,7 @@
 
 (defgroup tex nil
   "Code related to the TeX formatter."
+  :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
   :group 'wp)
 
 (defgroup faces nil
@@ -490,15 +493,14 @@ IF REGEXP is not a string, return it unchanged."
 (defun custom-variable-prompt ()
   "Prompt for a custom variable, defaulting to the variable at point.
 Return a list suitable for use in `interactive'."
-   (let ((v (variable-at-point))
-	 (enable-recursive-minibuffers t)
-	 val)
-     (setq val (if (and (symbolp v) (custom-variable-p v))
-		   (completing-read
-		    (format "Customize option (default %s): " v) obarray
-		    'custom-variable-p t nil nil (symbol-name v))
-		 (completing-read "Customize option: " obarray
-				  'custom-variable-p t)))
+   (let* ((v (variable-at-point))
+	  (default (and (symbolp v) (custom-variable-p v) (symbol-name v)))
+	  (enable-recursive-minibuffers t)
+	  val)
+     (setq val (completing-read
+		(if default (format "Customize option (default %s): " default)
+		  "Customize option: ")
+		obarray 'custom-variable-p t nil nil default))
      (list (if (equal val "")
 	       (if (symbolp v) v nil)
 	     (intern val)))))