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-yank.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-yank.el')
| -rw-r--r-- | lisp/calc/calc-yank.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el index 65512334166..c08f875fcf8 100644 --- a/lisp/calc/calc-yank.el +++ b/lisp/calc/calc-yank.el @@ -1,5 +1,5 @@ ;; Calculator for GNU Emacs, part II [calc-yank.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. @@ -410,7 +410,7 @@ (function (lambda (x) (if (math-vectorp x) (setq allow-ret t)) - (math-format-nice-expr x (screen-width))))) + (math-format-nice-expr x (frame-width))))) (if (> n 0) (calc-top-list n) (calc-top-list 1 (- n))))))) @@ -488,7 +488,7 @@ To cancel the edit, simply kill the *Calc Edit* buffer." (select-window (get-buffer-window (aref calc-embedded-info 1)))) (switch-to-buffer (get-buffer-create "*Calc Edit*"))) (setq calc-return-buffer buf) - (if (and (< (window-width) (screen-width)) + (if (and (< (window-width) (frame-width)) calc-display-trail) (let ((win (get-buffer-window (calc-trail-buffer)))) (if win |