[Emacs-diffs] Changes to emacs/lisp/cus-edit.el

[Stefan Monnier]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.159 emacs/lisp/cus-edit.el:1.160
*** emacs/lisp/cus-edit.el:1.159        Sat Jul 20 18:14:36 2002
--- emacs/lisp/cus-edit.el      Fri Aug 30 17:52:10 2002
***************
*** 448,457 ****
           (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)))
           (if custom-unlispify-remove-prefixes
               (let ((prefixes custom-prefix-list)
                     prefix)
--- 448,459 ----
           (erase-buffer)
           (princ symbol (current-buffer))
           (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,3812 ****
    "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)))))
  
  ;;;###autoload
  (defun custom-menu-create (symbol)
--- 3808,3815 ----
    "Ignoring WIDGET, create a menu entry for customization group SYMBOL."
    `( ,(custom-unlispify-menu-entry symbol t)
       :filter (lambda (&rest junk)
!              (let ((menu (custom-menu-create ',symbol)))
!                (if (consp menu) (cdr menu) menu)))))
  
  ;;;###autoload
  (defun custom-menu-create (symbol)
***************
*** 3845,3851 ****
      (setq name "Customize"))
    `(,name
      :filter (lambda (&rest junk)
!             (custom-menu-create ',symbol))))
  
  ;;; The Custom Mode.
  
--- 3848,3855 ----
      (setq name "Customize"))
    `(,name
      :filter (lambda (&rest junk)
!             (let ((menu (custom-menu-create ',symbol)))
!               (if (consp menu) (cdr menu) menu)))))
  
  ;;; The Custom Mode.