scratch/emoji 648cc18: Don't use variables for the variable pitch stuff

[Lars Ingebrigtsen]

branch: scratch/emoji
commit 648cc18dc488e2789708bf0524597b55a7a8f4e9
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Don't use variables for the variable pitch stuff
---
 lisp/play/emoji.el |  7 ++-----
 lisp/transient.el  | 21 ++++++---------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/lisp/play/emoji.el b/lisp/play/emoji.el
index 7e70df8..e779ac4 100644
--- a/lisp/play/emoji.el
+++ b/lisp/play/emoji.el
@@ -174,8 +174,6 @@ when the command was issued."
 
 (defun emoji--init (&optional force)
   ;; Remove debugging.
-  (setq transient-use-variable-pitch t)
-  (setq transient--use-variable-pitch t)
   (when (or (not emoji--labels)
             force)
     (setq emoji--derived (make-hash-table :test #'equal))
@@ -400,15 +398,14 @@ when the command was issued."
     (setf (symbol-function name)
           (lambda ()
             (interactive)
-            (let ((transient-use-variable-pitch t))
-              (transient-setup name))))
+            (transient-setup name)))
     (pcase-let ((`(,class ,slots ,suffixes ,docstr ,_body)
                  (transient--expand-define-args (list args))))
        (put name 'interactive-only t)
        (put name 'function-documentation docstr)
        (put name 'transient--prefix
             (apply (or class 'transient-prefix) :command name
-                   slots))
+                   (cons :variable-pitch (cons t slots))))
        (put name 'transient--layout
             (cl-mapcan (lambda (s) (transient--parse-child name s))
                        suffixes)))
diff --git a/lisp/transient.el b/lisp/transient.el
index f850472..84a7aea 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -315,13 +315,6 @@ be remapped to `fixed-pitch' in that buffer."
   :group 'transient
   :type 'boolean)
 
-(defcustom transient-use-variable-pitch nil
-  "Whether to use alignment suitable for variable-pitch data.
-Bind around the call to `transient-setup' or set."
-  :package-version '(transient . "0.3.6")
-  :group 'transient
-  :type 'boolean)
-
 (defcustom transient-force-single-column nil
   "Whether to force use of a single column to display suffixes.
 
@@ -597,7 +590,8 @@ If `transient-save-history' is nil, then do nothing."
    (transient-suffix     :initarg :transient-suffix     :initform nil)
    (transient-non-suffix :initarg :transient-non-suffix :initform nil)
    (incompatible         :initarg :incompatible         :initform nil)
-   (suffix-description   :initarg :suffix-description))
+   (suffix-description   :initarg :suffix-description)
+   (variable-pitch       :initarg :variable-pitch       :initform nil))
   "Transient prefix command.
 
 Each transient prefix command consists of a command, which is
@@ -1322,9 +1316,6 @@ Usually it remains selected while the transient is 
active.")
   "The buffer that was current before the transient was invoked.
 Usually it remains current while the transient is active.")
 
-(defvar transient--use-variable-pitch nil
-  "Whether to use variable pitch or not.")
-
 (defvar transient--debug nil "Whether put debug information into *Messages*.")
 
 (defvar transient--history nil)
@@ -1707,7 +1698,6 @@ EDIT may be non-nil."
     (setq transient--redisplay-map (transient--make-redisplay-map))
     (setq transient--original-window (selected-window))
     (setq transient--original-buffer (current-buffer))
-    (setq transient--use-variable-pitch transient-use-variable-pitch)
     (transient--redisplay)
     (transient--init-transient)
     (transient--suspend-which-key-mode)))
@@ -2977,16 +2967,17 @@ have a history of their own.")
                  (push desc rows))
                rows))
            (oref group suffixes)))
+         (vp (oref transient--prefix variable-pitch))
          (rs (apply #'max (mapcar #'length columns)))
          (cs (length columns))
          (cw (mapcar (lambda (col)
-                       (apply #'max (mapcar (if transient--use-variable-pitch
+                       (apply #'max (mapcar (if vp
                                                 #'transient--pixel-width
                                               #'length)
                                             col)))
                      columns))
          (cc (transient--seq-reductions-from
-              (apply-partially #'+ (if transient--use-variable-pitch 30 3))
+              (apply-partially #'+ (if vp 30 3))
               cw 0)))
     (if transient-force-single-column
         (dotimes (c cs)
@@ -2998,7 +2989,7 @@ have a history of their own.")
             (insert ?\n)))
       (dotimes (r rs)
         (dotimes (c cs)
-          (if transient--use-variable-pitch
+          (if vp
               (progn
                 (when-let ((cell (nth r (nth c columns))))
                   (insert cell))