[Emacs-diffs] Changes to emacs/lisp/calculator.el

[Miles Bader]

Index: emacs/lisp/calculator.el
diff -c emacs/lisp/calculator.el:1.12 emacs/lisp/calculator.el:1.13
*** emacs/lisp/calculator.el:1.12       Sun Feb  3 08:43:37 2002
--- emacs/lisp/calculator.el    Mon Feb  3 11:30:27 2003
***************
*** 668,681 ****
             ;; don't change this since it is a customization variable,
             ;; its set function will add any new operators
             (calculator-add-operators calculator-user-operators)))
    (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)))
          (select-window (minibuffer-window))
          (calculator-reset)
          (calculator-update-display)
--- 668,680 ----
             ;; 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
!         (set-window-buffer (minibuffer-window) calculator-buffer)
          (select-window (minibuffer-window))
          (calculator-reset)
          (calculator-update-display)
***************
*** 697,703 ****
            (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)
--- 696,701 ----