[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104474: * calc/calc.el (calc-kill-st
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104474: * calc/calc.el (calc-kill-stack-buffer): Make sure that the trail |
Date: |
Wed, 01 Jun 2011 19:09:42 -0500 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104474
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-01 19:09:42 -0500
message:
* calc/calc.el (calc-kill-stack-buffer): Make sure that the trail
buffer isn't killed before making it current.
modified:
lisp/ChangeLog
lisp/calc/calc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-01 19:32:04 +0000
+++ b/lisp/ChangeLog 2011-06-02 00:09:42 +0000
@@ -1,3 +1,8 @@
+2011-06-02 Jay Belanger <address@hidden>
+
+ * 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 <address@hidden>
Silence various byte-compiler warnings.
=== modified file 'lisp/calc/calc.el'
--- a/lisp/calc/calc.el 2011-03-17 01:30:08 +0000
+++ b/lisp/calc/calc.el 2011-06-02 00:09:42 +0000
@@ -1293,19 +1293,20 @@
(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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104474: * calc/calc.el (calc-kill-stack-buffer): Make sure that the trail,
Jay Belanger <=