Mercurial > emacs
changeset 47168:59fc9e6fd3e8
(custom-unlispify-menu-entry): Don't remove
the -p prefix from variables since they shouldn't have it anyway.
(custom-group-menu-create, customize-menu-create):
Only cdr if applicable, since custom-menu-create might return
a vector (i.e. a single menu entry).
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 30 Aug 2002 21:52:10 +0000 |
| parents | fb51fc1dba63 |
| children | bed718560d06 |
| files | lisp/cus-edit.el |
| diffstat | 1 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/cus-edit.el Fri Aug 30 20:41:05 2002 +0000 +++ b/lisp/cus-edit.el Fri Aug 30 21:52:10 2002 +0000 @@ -448,10 +448,12 @@ (erase-buffer) (princ symbol (current-buffer)) (goto-char (point-min)) - (when (and (eq (get symbol 'custom-type) 'boolean) - (re-search-forward "-p\\'" nil t)) - (replace-match "" t t) - (goto-char (point-min))) + ;; FIXME: Boolean variables are not predicates, so they shouldn't + ;; end with `-p'. -stef + ;; (when (and (eq (get symbol 'custom-type) 'boolean) + ;; (re-search-forward "-p\\'" nil t)) + ;; (replace-match "" t t) + ;; (goto-char (point-min))) (if custom-unlispify-remove-prefixes (let ((prefixes custom-prefix-list) prefix) @@ -3806,7 +3808,8 @@ "Ignoring WIDGET, create a menu entry for customization group SYMBOL." `( ,(custom-unlispify-menu-entry symbol t) :filter (lambda (&rest junk) - (cdr (custom-menu-create ',symbol))))) + (let ((menu (custom-menu-create ',symbol))) + (if (consp menu) (cdr menu) menu))))) ;;;###autoload (defun custom-menu-create (symbol) @@ -3845,7 +3848,8 @@ (setq name "Customize")) `(,name :filter (lambda (&rest junk) - (custom-menu-create ',symbol)))) + (let ((menu (custom-menu-create ',symbol))) + (if (consp menu) (cdr menu) menu))))) ;;; The Custom Mode.