diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-11-13 07:30:58 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-11-13 07:30:58 +0000 |
| commit | 8f66f4797a757f44fda1ad9ca3a59f8b285d26d9 (patch) | |
| tree | 65d6f75137874d8e0eba5bd41c3b8d33a938bee9 /lisp/calc/calc-misc.el | |
| parent | 26f6427dc85018dc734a34d6387a0b4ebdd3d9e4 (diff) | |
| download | emacs-8f66f4797a757f44fda1ad9ca3a59f8b285d26d9.tar.gz | |
Use `frame-width' instead of `screen-width',
`frame-height' instead of `screen-height', and,
`executing-kbd-macro' instead of `executing-macro'.
Diffstat (limited to 'lisp/calc/calc-misc.el')
| -rw-r--r-- | lisp/calc/calc-misc.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index 1e4d376f643..14e78862bce 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -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, daveg@synaptics.com. ;; This file is part of GNU Emacs. @@ -108,8 +108,8 @@ Calc user interface as before (either M-# C or M-# K; initially M-# C)." (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 @@ loaded and the keystroke automatically re-typed." (defun math-do-working (msg arg) - (or executing-macro + (or executing-kbd-macro (progn (calc-set-command-flag 'clear-message) (if math-working-step |