procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(calculator): Do more extensive checking for when 3 lines should be

Browse source 
used for the calculator.
This commit is contained in:
Jay Belanger 2007-02-10 22:03:55 +00:00
parent 5b0be7fc50
commit a45928e693
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2007-02-10 Jay Belanger <belanger@truman.edu>
* calculator.el (calculator): Do more extensive checking for when
3 lines should be used for the calculator.
2007-02-10 Eli Zaretskii <eliz@gnu.org>
* info-look.el (info-lookup-make-completions): Bind

26
lisp/calculator.el
View file

@ -735,8 +735,32 @@ See the documentation for `calculator-mode' for more information."
;; `raised' modeline in Emacs 21
(select-window
(split-window-vertically
;; If the modeline might interfere with the calculator buffer,
;; use 3 lines instead.
(if (and (fboundp 'face-attr-construct)
(plist-get (face-attr-construct 'modeline) :box))
;; If the modeline is shorter than the default,
;; stick with 2 lines. (It may be necessary to
;; check how much shorter.)
(let ((dh (plist-get (face-attr-construct 'default) :height))
(mh (plist-get (face-attr-construct 'modeline) :height)))
(not
(or (and (integerp dh)
(integerp mh)
(< mh dh))
(and (numberp mh)
(not (integerp mh))
(< mh 1)))))
(or
;; If the modeline has a box with non-negative line-width,
;; use 3 lines.
(let* ((bx (plist-get (face-attr-construct 'modeline) :box))
(lh (plist-get bx :line-width)))
(and bx
(or
(not lh)
(> lh 0))))
;; If the modeline has an overline, use 3 lines.
(plist-get (face-attr-construct 'modeline) :overline)))
-3 -2)))
(switch-to-buffer calculator-buffer)))
((not (eq (current-buffer) calculator-buffer))