Mercurial > emacs
comparison lisp/calc/calc-misc.el @ 90037:0fe073a08cef
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-65
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-634
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-639
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-641
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 27 Oct 2004 05:42:04 +0000 |
parents | ff0e824afa37 d9073880a6e4 |
children | f2ebccfa87d4 |
comparison
equal
deleted
inserted
replaced
90036:af754c88f187 | 90037:0fe073a08cef |
---|---|
128 (calc nil calc-full-mode nil)))) | 128 (calc nil calc-full-mode nil)))) |
129 (message (if calc-full-mode | 129 (message (if calc-full-mode |
130 "Now using full screen for Calc" | 130 "Now using full screen for Calc" |
131 "Now using partial screen for Calc")))) | 131 "Now using partial screen for Calc")))) |
132 | 132 |
133 (defun calc-other-window () | 133 (defun calc-other-window (&optional interactive) |
134 "Invoke the Calculator in another window." | 134 "Invoke the Calculator in another window." |
135 (interactive) | 135 (interactive "p") |
136 (if (memq major-mode '(calc-mode calc-trail-mode)) | 136 (if (memq major-mode '(calc-mode calc-trail-mode)) |
137 (progn | 137 (progn |
138 (other-window 1) | 138 (other-window 1) |
139 (if (memq major-mode '(calc-mode calc-trail-mode)) | 139 (if (memq major-mode '(calc-mode calc-trail-mode)) |
140 (other-window 1))) | 140 (other-window 1))) |
141 (if (get-buffer-window "*Calculator*") | 141 (if (get-buffer-window "*Calculator*") |
142 (calc-quit) | 142 (calc-quit) |
143 (let ((win (selected-window))) | 143 (let ((win (selected-window))) |
144 (calc nil win (interactive-p)))))) | 144 (calc nil win interactive))))) |
145 | 145 |
146 (defun another-calc () | 146 (defun another-calc () |
147 "Create another, independent Calculator buffer." | 147 "Create another, independent Calculator buffer." |
148 (interactive) | 148 (interactive) |
149 (if (eq major-mode 'calc-mode) | 149 (if (eq major-mode 'calc-mode) |