From: john muhl <jm@pub.pink>
Date: Wed, 28 Jun 2023 17:58:27 +0000 (-0500)
Subject: Support cons cell as value of ':line-width' box attribute
X-Git-Tag: emacs-29.1-rc1~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e8386bdacc;p=emacs.git

Support cons cell as value of ':line-width' box attribute

* lisp/calculator.el (calculator-need-3-lines): Support
values of a face's ':line-width' box attribute that are
cons cells.  (Bug#64344)

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/calculator.el b/lisp/calculator.el
index 6a1d960c3e4..dbfba0b5bb7 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -746,7 +746,7 @@ See the documentation for `calculator-mode' for more information."
              ;; use 3 lines
              (let* ((bx (face-attribute 'mode-line :box))
                     (lh (plist-get bx :line-width)))
-               (and bx (or (not lh) (> lh 0))))
+               (and bx (or (not lh) (> (if (listp lh) (cdr lh) lh) 0))))
              ;; if the mode line has an overline, use 3 lines
              (not (memq (face-attribute 'mode-line :overline)
                         '(nil unspecified)))))))