[Emacs-diffs] Changes to emacs/lisp/calc/calc-misc.el

[Eli Zaretskii]

Index: emacs/lisp/calc/calc-misc.el
diff -u emacs/lisp/calc/calc-misc.el:1.1 emacs/lisp/calc/calc-misc.el:1.2
--- emacs/lisp/calc/calc-misc.el:1.1    Tue Nov  6 13:59:06 2001
+++ emacs/lisp/calc/calc-misc.el        Tue Nov 13 02:29:02 2001
@@ -1,5 +1,5 @@
 ;; Calculator for GNU Emacs, part I [calc-misc.el]
-;; Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
 ;; Written by Dave Gillespie, address@hidden
 
 ;; This file is part of GNU Emacs.
@@ -108,8 +108,8 @@
     (if cwin
        (setq calc-full-mode
              (if kwin
-                 (and twin (eq (window-width twin) (screen-width)))
-               (eq (window-height cwin) (1- (screen-height))))))
+                 (and twin (eq (window-width twin) (frame-width)))
+               (eq (window-height cwin) (1- (frame-height))))))
     (setq calc-full-mode (if arg
                             (> (prefix-numeric-value arg) 0)
                           (not calc-full-mode)))
@@ -759,7 +759,7 @@
 
 
 (defun math-do-working (msg arg)
-  (or executing-macro
+  (or executing-kbd-macro
       (progn
        (calc-set-command-flag 'clear-message)
        (if math-working-step