From: Lars Ingebrigtsen <larsi@gnus.org>
To: Boruch Baum <boruch_baum@gmx.com>
Cc: 43295@debbugs.gnu.org
Subject: bug#43295: 26.1: calc-mode header line [UPDATED PATCH]
Date: Sun, 13 Sep 2020 15:15:27 +0200 [thread overview]
Message-ID: <87sgblyg0g.fsf@gnus.org> (raw)
In-Reply-To: <20200913004324.pwpzxe74zq7sqr74@E15-2016.optimum.net> (Boruch Baum's message of "Sat, 12 Sep 2020 20:43:24 -0400")
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
Boruch Baum <boruch_baum@gmx.com> writes:
> In the attached patch:
>
> 1) the hunk @1421 restores the behavior that Eli wants
>
> 2) the hunk @2010 corrects the width calculation in that case
>
> 3) the hunk @2133 better handles the header line for the trail display
This results in a trail buffer that looks like:
[-- Attachment #2: Type: image/png, Size: 15104 bytes --]
[-- Attachment #3: Type: text/plain, Size: 3837 bytes --]
Which surely can't be optimal? If modified as follows, the duplicated
text disappears:
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index bf8b006d7c..62c0bea6d4 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1396,8 +1396,6 @@ calc--header-line
(let* ((len-long (length long))
(len-short (length short))
(fudge (or fudge 0))
- ;; fudge for trail is: -3 (added to len-long)
- ;; (width ) for trail
(factor (if (> width (+ len-long fudge)) len-long len-short))
(size (max (/ (- width factor) 2) 0))
(fill (make-string size ?-))
@@ -1428,6 +1426,12 @@ calc-create-buffer
(set-buffer (get-buffer-create "*Calculator*"))
(or (derived-mode-p 'calc-mode)
(calc-mode))
+ (when calc-show-banner
+ (calc--header-line "Emacs Calculator Mode" "Emacs Calc"
+ (if calc-display-trail
+ (/ (* (window-width) 2) 3)
+ (window-width))
+ 1))
(setq max-lisp-eval-depth (max max-lisp-eval-depth 1000))
(when calc-always-load-extensions
(require 'calc-ext))
@@ -2009,8 +2013,8 @@ calc-refresh
(setq calc-any-selections nil)
(erase-buffer)
(when calc-show-banner
- (calc--header-line "Emacs Calculator Mode" "Emacs Calc"
- (* 2 (/ (window-width) 3)) -3))
+ (calc--header-line "Emacs Calculator Mode" "Emacs Calc"
+ (window-width) 1))
(while thing
(goto-char (point-min))
(insert (math-format-stack-value (car thing)) "\n")
@@ -2133,29 +2137,32 @@ calc-record
(defun calc-trail-display (flag &optional no-refresh interactive)
(interactive "P\ni\np")
(let ((win (get-buffer-window (calc-trail-buffer))))
- (if (setq calc-display-trail
- (not (if flag (memq flag '(nil 0)) win)))
- (if (null win)
- (progn
- (if calc-trail-window-hook
- (run-hooks 'calc-trail-window-hook)
- (let ((w (split-window nil (/ (* (window-width) 2) 3) t)))
- (set-window-buffer w calc-trail-buffer)))
- (calc-wrapper
- (setq overlay-arrow-string calc-trail-overlay
- overlay-arrow-position calc-trail-pointer)
- (or no-refresh
- (if interactive
- (calc-do-refresh)
- (calc-refresh))))))
- (if win
- (progn
- (delete-window win)
- (calc-wrapper
- (or no-refresh
- (if interactive
- (calc-do-refresh)
- (calc-refresh))))))))
+ (cond
+ ((setq calc-display-trail
+ (not (if flag (memq flag '(nil 0)) win)))
+ (when (null win)
+ (if calc-trail-window-hook
+ (run-hooks 'calc-trail-window-hook)
+ (setq win (split-window nil (/ (* (window-width) 2) 3) t))
+ (set-window-buffer win calc-trail-buffer))
+ (calc-wrapper
+ (setq overlay-arrow-string calc-trail-overlay
+ overlay-arrow-position calc-trail-pointer)
+ (or no-refresh
+ (if interactive
+ (calc-do-refresh)
+ (calc-refresh)))))
+ (with-current-buffer calc-trail-buffer
+ (when calc-show-banner
+ (calc--header-line "Emacs Calculator Trail" "Calc Trail"
+ (window-width win) -3))))
+ (win ; not calc-display-trail
+ (delete-window win)
+ (calc-wrapper
+ (or no-refresh
+ (if interactive
+ (calc-do-refresh)
+ (calc-refresh)))))))
calc-trail-buffer)
(defun calc-trail-here ()
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2020-09-13 13:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 18:31 bug#43295: 26.1: calc-mode header line [UPDATED PATCH] Boruch Baum
2020-09-10 21:45 ` Lars Ingebrigtsen
2020-09-10 23:40 ` Boruch Baum
2020-09-11 12:15 ` Lars Ingebrigtsen
2020-09-11 13:37 ` Boruch Baum
2020-09-11 13:55 ` Eli Zaretskii
2020-09-13 0:43 ` Boruch Baum
2020-09-13 13:15 ` Lars Ingebrigtsen [this message]
2020-09-13 14:54 ` Boruch Baum
2020-09-13 14:56 ` Lars Ingebrigtsen
2020-09-13 15:03 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgblyg0g.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=43295@debbugs.gnu.org \
--cc=boruch_baum@gmx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.