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

[Jay Belanger]

Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.60 emacs/lisp/calc/calc.el:1.61
*** emacs/lisp/calc/calc.el:1.60        Mon May 30 02:49:54 2005
--- emacs/lisp/calc/calc.el     Mon May 30 21:03:51 2005
***************
*** 325,331 ****
    :type '(choice (string) (sexp)))
  
  (defvar calc-bug-address "address@hidden"
!   "Address of the author of Calc, for use by `report-calc-bug'.")
  
  (defvar calc-scan-for-dels t
    "If t, scan keymaps to find all DEL-like keys.
--- 325,331 ----
    :type '(choice (string) (sexp)))
  
  (defvar calc-bug-address "address@hidden"
!   "Address of the maintainer of Calc, for use by `report-calc-bug'.")
  
  (defvar calc-scan-for-dels t
    "If t, scan keymaps to find all DEL-like keys.
***************
*** 720,725 ****
--- 720,731 ----
  (defvar calc-load-hook nil
    "Hook run when calc.el is loaded.")
  
+ (defvar calc-window-hook nil
+   "Hook called to create the Calc window.")
+ 
+ (defvar calc-trail-window-hook nil
+   "Hook called to create the Calc trail window.")
+ 
  ;; Verify that Calc is running on the right kind of system.
  (defvar calc-emacs-type-lucid (not (not (string-match "Lucid" 
emacs-version))))
  
***************
*** 1205,1222 ****
            (switch-to-buffer (current-buffer) t)
          (if (get-buffer-window (current-buffer))
              (select-window (get-buffer-window (current-buffer)))
!             (let ((w (get-largest-window)))
!               (if (and pop-up-windows
!                        (> (window-height w)
!                           (+ window-min-height calc-window-height 2)))
!                   (progn
!                     (setq w (split-window w
!                                           (- (window-height w)
!                                              calc-window-height 2)
!                                           nil))
!                     (set-window-buffer w (current-buffer))
!                     (select-window w))
!                 (pop-to-buffer (current-buffer))))))
        (save-excursion
          (set-buffer (calc-trail-buffer))
          (and calc-display-trail
--- 1211,1230 ----
            (switch-to-buffer (current-buffer) t)
          (if (get-buffer-window (current-buffer))
              (select-window (get-buffer-window (current-buffer)))
!             (if calc-window-hook
!                 (run-hooks 'calc-window-hook)
!               (let ((w (get-largest-window)))
!                 (if (and pop-up-windows
!                          (> (window-height w)
!                             (+ window-min-height calc-window-height 2)))
!                     (progn
!                       (setq w (split-window w
!                                             (- (window-height w)
!                                                calc-window-height 2)
!                                             nil))
!                       (set-window-buffer w (current-buffer))
!                       (select-window w))
!                   (pop-to-buffer (current-buffer)))))))
        (save-excursion
          (set-buffer (calc-trail-buffer))
          (and calc-display-trail
***************
*** 1823,1837 ****
              (not (if flag (memq flag '(nil 0)) win)))
        (if (null win)
            (progn
!               (let ((w (split-window nil (/ (* (window-width) 2) 3) t)))
!                 (set-window-buffer w calc-trail-buffer))
!             (calc-wrapper
!              (setq overlay-arrow-string calc-trail-overlay
!                    overlay-arrow-position calc-trail-pointer)
!              (or no-refresh
!                  (if interactive
!                      (calc-do-refresh)
!                    (calc-refresh))))))
        (if win
          (progn
            (delete-window win)
--- 1831,1847 ----
              (not (if flag (memq flag '(nil 0)) win)))
        (if (null win)
            (progn
!               (if calc-trail-window-hook
!                   (run-hooks 'calc-trail-window-hook)
!                 (let ((w (split-window nil (/ (* (window-width) 2) 3) t)))
!                   (set-window-buffer w calc-trail-buffer)))
!               (calc-wrapper
!                (setq overlay-arrow-string calc-trail-overlay
!                      overlay-arrow-position calc-trail-pointer)
!                (or no-refresh
!                    (if interactive
!                        (calc-do-refresh)
!                      (calc-refresh))))))
        (if win
          (progn
            (delete-window win)