summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2003-02-03 16:30:27 +0000
committerJuanma Barranquero <lekktu@gmail.com>2003-02-03 16:30:27 +0000
commit5c75d7a63ee4a8d0c77c8071092d0ac3dd21df85 (patch)
tree699ee9b45da1687ddd9c3c004ce1285cd27e250e
parentf804796eecce86953c9f47ed07e9a6a34655ff32 (diff)
downloademacs-5c75d7a63ee4a8d0c77c8071092d0ac3dd21df85.tar.gz
(calculator): Don't use the minibuffer even in electric mode; use a private
buffer and display it in the minibuffer window using `set-window-buffer'.
-rw-r--r--lisp/calculator.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 0aca51b2a46..64f6ea8af1b 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -668,14 +668,13 @@ See the documentation for `calculator-mode' for more information."
;; don't change this since it is a customization variable,
;; its set function will add any new operators
(calculator-add-operators calculator-user-operators)))
+ (setq calculator-buffer (get-buffer-create "*calculator*"))
(if calculator-electric-mode
(save-window-excursion
(progn (require 'electric) (message nil)) ; hide load message
(let (old-g-map old-l-map (echo-keystrokes 0)
(garbage-collection-messages nil)) ; no gc msg when electric
- ;; strange behavior in FSF: doesn't always select correct
- ;; minibuffer. I have no idea how to fix this
- (setq calculator-buffer (window-buffer (minibuffer-window)))
+ (set-window-buffer (minibuffer-window) calculator-buffer)
(select-window (minibuffer-window))
(calculator-reset)
(calculator-update-display)
@@ -697,7 +696,6 @@ See the documentation for `calculator-mode' for more information."
(use-local-map old-l-map)
(use-global-map old-g-map))))
(progn
- (setq calculator-buffer (get-buffer-create "*calculator*"))
(cond
((not (get-buffer-window calculator-buffer))
(let ((split-window-keep-point nil)