[Emacs-diffs] Changes to emacs/lisp/menu-bar.el

[Richard M . Stallman]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.246 emacs/lisp/menu-bar.el:1.247
*** emacs/lisp/menu-bar.el:1.246        Fri Apr 30 21:44:12 2004
--- emacs/lisp/menu-bar.el      Tue Oct 26 08:31:40 2004
***************
*** 596,605 ****
  
  (defmacro menu-bar-make-toggle (name variable doc message help &rest body)
    `(progn
!      (defun ,name ()
         ,(concat "Toggle whether to " (downcase (substring help 0 1))
!               (substring help 1) ".")
!        (interactive)
         (if ,(if body `(progn . ,body)
              `(progn
                 (custom-load-symbol ',variable)
--- 596,607 ----
  
  (defmacro menu-bar-make-toggle (name variable doc message help &rest body)
    `(progn
!      (defun ,name (&optional interactively)
         ,(concat "Toggle whether to " (downcase (substring help 0 1))
!               (substring help 1) ".\
! In an interactive call, record this option as a candidate for saving
! by \"Save Options\" in Custom buffers.")
!        (interactive "p")
         (if ,(if body `(progn . ,body)
              `(progn
                 (custom-load-symbol ',variable)
***************
*** 612,618 ****
         ;; a variable is set interactively, as the purpose is to mark it as
         ;; a candidate for "Save Options", and we do not want to save options
         ;; the user have already set explicitly in his init file.
!        (if (interactive-p) (customize-mark-as-set ',variable)))
       '(menu-item ,doc ,name
                 :help ,help
                   :button (:toggle . (and (default-boundp ',variable)
--- 614,620 ----
         ;; a variable is set interactively, as the purpose is to mark it as
         ;; a candidate for "Save Options", and we do not want to save options
         ;; the user have already set explicitly in his init file.
!        (if interactively (customize-mark-as-set ',variable)))
       '(menu-item ,doc ,name
                 :help ,help
                   :button (:toggle . (and (default-boundp ',variable)