summaryrefslogtreecommitdiff
path: root/lisp/calc/calc-graph.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2001-11-13 07:30:58 +0000
committerEli Zaretskii <eliz@gnu.org>2001-11-13 07:30:58 +0000
commit8f66f4797a757f44fda1ad9ca3a59f8b285d26d9 (patch)
tree65d6f75137874d8e0eba5bd41c3b8d33a938bee9 /lisp/calc/calc-graph.el
parent26f6427dc85018dc734a34d6387a0b4ebdd3d9e4 (diff)
downloademacs-8f66f4797a757f44fda1ad9ca3a59f8b285d26d9.tar.gz
emacs-8f66f4797a757f44fda1ad9ca3a59f8b285d26d9.tar.bz2
emacs-8f66f4797a757f44fda1ad9ca3a59f8b285d26d9.zip
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-graph.el')
-rw-r--r--lisp/calc/calc-graph.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 955942e11be..60a46a6a50c 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1,5 +1,5 @@
;; Calculator for GNU Emacs, part II [calc-graph.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.
@@ -352,11 +352,11 @@
"dumb" "postscript")))))
(if (equal device "dumb")
(setq device (format "dumb %d %d"
- (1- (screen-width)) (1- (screen-height)))))
+ (1- (frame-width)) (1- (frame-height)))))
(if (equal device "big")
(setq device (format "dumb %d %d"
- (* 4 (- (screen-width) 3))
- (* 4 (- (screen-height) 3)))))
+ (* 4 (- (frame-width) 3))
+ (* 4 (- (frame-height) 3)))))
(if (stringp output)
(if (or (equal output "auto")
(and (equal output "tty") (setq tty-output t)))
@@ -1370,7 +1370,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
(set-window-buffer win buf)
(if (eq major-mode 'calc-mode)
(if (or need
- (< (window-height) (1- (screen-height))))
+ (< (window-height) (1- (frame-height))))
(display-buffer buf))
(switch-to-buffer buf)))))
(save-excursion