Mercurial > emacs
comparison lisp/calculator.el @ 108429:c944b55d017d
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 07 Mar 2010 11:51:19 +0000 |
| parents | 176028ab9fc6 |
| children | 904ccd8f2acb e950143ab9e0 |
comparison
equal
deleted
inserted
replaced
| 108428:9257c5632940 | 108429:c944b55d017d |
|---|---|
| 722 (use-local-map old-l-map) | 722 (use-local-map old-l-map) |
| 723 (use-global-map old-g-map)))) | 723 (use-global-map old-g-map)))) |
| 724 (progn | 724 (progn |
| 725 (cond | 725 (cond |
| 726 ((not (get-buffer-window calculator-buffer)) | 726 ((not (get-buffer-window calculator-buffer)) |
| 727 (let ((split-window-keep-point nil) | 727 (let ((window-min-height 2)) |
| 728 (window-min-height 2)) | |
| 729 ;; maybe leave two lines for our window because of the normal | 728 ;; maybe leave two lines for our window because of the normal |
| 730 ;; `raised' modeline in Emacs 21 | 729 ;; `raised' modeline in Emacs 21 |
| 731 (select-window | 730 (select-window |
| 732 (split-window-vertically | 731 (split-window-vertically |
| 733 ;; If the modeline might interfere with the calculator buffer, | 732 ;; If the modeline might interfere with the calculator buffer, |