(custom-add-to-group): Allow multiple entries for a given value OPTION,

as long as their widget types are different.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 706751d315ab210889c20f1cfc91ecc6e81b0245..7ce144dcc86e089339c9e5268f34e434feff711c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-29  Miles Bader  <miles@gnu.org>
+
+       * custom.el (custom-add-to-group): Allow multiple entries for a
+       given value OPTION, as long as their widget types are different.
+       * cus-edit.el (custom-face-value-create): If face name doesn't end
+       with "face", add such here (similar to custom group widgets).
+
+       * comint.el (comint-highlight-prompt): Add :type.
+
 2000-10-28  John Wiegley  <johnw@gnu.org>
 
        * textmodes/flyspell.el (flyspell-maybe-correct-transposition):

diff --git a/lisp/custom.el b/lisp/custom.el
index ef0fce7ecb49985b06df7137182665acb53e003a..ca5948d1ddc768ed9137d4741140b7c6870dc9f4 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -319,12 +319,12 @@ information."
 
 (defun custom-add-to-group (group option widget)
   "To existing GROUP add a new OPTION of type WIDGET.
-If there already is an entry for that option, overwrite it."
-  (let* ((members (get group 'custom-group))
-        (old (assq option members)))
-    (if old
-       (setcar (cdr old) widget)
-      (put group 'custom-group (nconc members (list (list option widget)))))))
+If there already is an entry for OPTION and WIDGET, nothing is done."
+  (let ((members (get group 'custom-group))
+       (entry (list option widget)))
+    (message "adding %s" entry)
+    (unless (member entry members)
+      (put group 'custom-group (nconc members (list entry))))))
 
 ;;; Properties.