mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-28 19:42:02 +00:00
Code Issues Releases Activity

* calc/calc.el (calc-kill-stack-buffer): Make sure that the trail

Browse Source 
buffer isn't killed before making it current.
This commit is contained in:
Jay Belanger 2011-06-01 19:09:42 -05:00
parent 8d009f4aa9
commit a1c2400f27
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-02 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc.el (calc-kill-stack-buffer): Make sure that the trail
buffer isn't killed before making it current.
2011-06-01 Stefan Monnier <monnier@iro.umontreal.ca>
Silence various byte-compiler warnings.

27
lisp/calc/calc.el
View File

@ -1293,19 +1293,20 @@ the trail buffer."
(if (not info-list)
(progn
(setq calc-buffer-list (delete cb calc-buffer-list))
(with-current-buffer calc-trail-buffer
(if (eq cb calc-main-buffer)
;; If there are other Calc stacks, make another one
;; the calc-main-buffer ...
(if calc-buffer-list
(setq calc-main-buffer (car calc-buffer-list))
;; ... otherwise kill the trail and its windows.
(let ((wl (get-buffer-window-list calc-trail-buffer)))
(while wl
(delete-window (car wl))
(setq wl (cdr wl))))
(kill-buffer calc-trail-buffer)
(setq calc-trail-buffer nil))))
(if (buffer-live-p calc-trail-buffer)
(with-current-buffer calc-trail-buffer
(if (eq cb calc-main-buffer)
;; If there are other Calc stacks, make another one
;; the calc-main-buffer ...
(if calc-buffer-list
(setq calc-main-buffer (car calc-buffer-list))
;; ... otherwise kill the trail and its windows.
(let ((wl (get-buffer-window-list calc-trail-buffer)))
(while wl
(delete-window (car wl))
(setq wl (cdr wl))))
(kill-buffer calc-trail-buffer)))))
(setq calc-trail-buffer nil)
t))))
(defun calc-mode ()