Mercurial > emacs

changeset 99400:b0dc8618a597

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calc-quit): Use `window-full-width-p' to check window width.
author Jay Belanger <jay.p.belanger@gmail.com>
date Wed, 05 Nov 2008 22:10:21 +0000
parents 6620e11a4f76
children 2ac19526bf39
files lisp/calc/calc.el
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calc/calc.el	Wed Nov 05 21:16:17 2008 +0000
+++ b/lisp/calc/calc.el	Wed Nov 05 22:10:21 2008 +0000
@@ -1424,9 +1424,12 @@
             (win (get-buffer-window (current-buffer)))
             (kbuf (get-buffer "*Calc Keypad*")))
         (delete-windows-on (calc-trail-buffer))
+        ;; The next few lines will set `calc-window-height' so that the
+        ;; next time Calc is called, the window will be the same size
+        ;; as the current window.
         (if (and win
                  (< (window-height win) (1- (frame-height)))
-                 (= (window-width win) (frame-width))  ; avoid calc-keypad
+                 (window-full-width-p win) ; avoid calc-keypad
                  (not (get-buffer-window "*Calc Keypad*")))
             (setq calc-window-height (- (window-height win) 2)))
         (progn