(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'.

2 files changed, 8 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3071991ba35..560ccf3711b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-03  Juanma Barranquero  <lektu@terra.es>
+
+        * calculator.el (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'.
+
 2003-02-03  Dave Love  <fx@gnu.org>
 
         * emacs-lisp/benchmark.el: New.
@@ -122,8 +128,6 @@
 
         * antlr-mode.el (antlr): Moved to SourceForge.net
 
-        Changes from 2002-02-28:
-
         * antlr-mode.el: Minor bug fixes: insert options and indentation.
         (antlr-option-location): Don't use point as position where to
         insert options if point is in comment.
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)