[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#17954: 24.4.50; [patch] `menu-bar-make-toggle' should allow for keyw
bug#17954: 24.4.50; [patch] `menu-bar-make-toggle' should allow for keywords
Thu, 28 Apr 2016 00:05:35 +0200
Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)
Drew Adams <address@hidden> writes:
> It cannot accept keywords in the normal way because it defines BODY as
> an &rest parameter. This mistake should be corrected, making for an
> incompatible change unfortunately, in order to allow a KEYWORDS &rest
> BODY is seldom used. In the Emacs Lisp sources, there are only these
> two occurrences of `menu-bar-make-toggle' that use BODY:
> `toggle-save-place-globally' and `toggle-uniquify-buffer-names'. They
> would just need to wrap the current BODY code in an explicit `progn'.
I don't think such an incompatible change would be appropriate.
> Of course, there may be 3rd-party code that uses parameter BODY. The
> only way I can think of to be sensitive to that breakage is to use a new
> macro name and code, and deprecate the old name `menu-bar-make-toggle'.
> Perhaps this incompatible change could be tolerated, since BODY is rare
> and the adaptation for any existing code is trivial (wrap with `progn').
And having two macros that do the same wouldn't be very appropriate,
I think it would make more sense to extend the HELP parameter to be a
list, and then it could be the keyword list.
Your code as a patch included below.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index cc7233e..ca40e94 100644
@@ -629,31 +629,44 @@ menu-bar-make-mm-toggle
:button (:toggle . (and (default-boundp ',fname)
-(defmacro menu-bar-make-toggle (name variable doc message help &rest body)
+(defmacro menu-bar-make-toggle (command variable item-name message help
+ &optional setting-sexp &rest keywords)
+ "Define a menu-bar toggle command.
+COMMAND (a symbol) is the toggle command to define.
+VARIABLE (a symbol) is the variable to set.
+ITEM-NAME (a string) is the menu-item name.
+MESSAGE is a format string for the toggle message, with %s for the new
+HELP (a string) is the `:help' tooltip text and the doc string first
+ line (minus final period) for the command.
+SETTING-SEXP is a Lisp sexp that sets VARIABLE, or it is nil meaning
+ set it according to its `defcustom' or using `set-default'.
+KEYWORDS is a plist for `menu-item' for keywords other than `:help'."
- (defun ,name (&optional interactively)
+ (defun ,command (&optional interactively)
,(concat "Toggle whether to " (downcase (substring help 0 1))
- (substring help 1) ".
+ (substring help 1) ".
In an interactive call, record this option as a candidate for saving
by \"Save Options\" in Custom buffers.")
- (if ,(if body `(progn . ,body)
+ (if ,(if setting-sexp
(let ((set (or (get ',variable 'custom-set) 'set-default))
(get (or (get ',variable 'custom-get) 'default-value)))
(funcall set ',variable (not (funcall get ',variable))))))
- (message ,message "enabled globally")
- (message ,message "disabled globally"))
- ;; The function `customize-mark-as-set' must only be called when
- ;; 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)
- (default-value ',variable))))))
+ (message ,message "enabled globally")
+ (message ,message "disabled globally"))
+ ;; `customize-mark-as-set' must only be called when a variable is set
+ ;; interactively, because the purpose is to mark the variable as a
+ ;; candidate for `Save Options', and we do not want to save options that
+ ;; the user has already set explicitly in the init file.
+ (when interactively (customize-mark-as-set ',variable)))
+ '(menu-item ,item-name ,command :help ,help
+ :button (:toggle . (and (default-boundp ',variable)
+ (default-value ',variable)))
;; Function for setting/saving default font.
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
|[Prev in Thread]
||[Next in Thread]|
- bug#17954: 24.4.50; [patch] `menu-bar-make-toggle' should allow for keywords,
Lars Ingebrigtsen <=