[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/calc calc-embed.el
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] emacs/lisp/calc calc-embed.el |
Date: |
Mon, 30 Mar 2009 02:17:41 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jay Belanger <jpb> 09/03/30 02:17:41
Modified files:
lisp/calc : calc-embed.el
Log message:
(calc-embedded-restore-original-modes): Add argument for Calculator
buffer.
(calc-do-embedded): Use specific Calculator buffer when cancelling
embedded mode.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-embed.el?cvsroot=emacs&r1=1.45&r2=1.46
Patches:
Index: calc-embed.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-embed.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- calc-embed.el 5 Jan 2009 03:20:00 -0000 1.45
+++ calc-embed.el 30 Mar 2009 02:17:40 -0000 1.46
@@ -159,10 +159,9 @@
(message "Current modes will be preserved when leaving embedded
mode."))
(message "Not in embedded mode.")))
-(defun calc-embedded-restore-original-modes ()
+(defun calc-embedded-restore-original-modes (calcbuf)
"Restore the original Calc modes when leaving embedded mode."
- (let ((calcbuf (get-buffer "*Calculator*"))
- (changed nil)
+ (let ((changed nil)
(lang (car calc-embedded-original-modes))
(modes (cdr calc-embedded-original-modes)))
(if (and calcbuf calc-embedded-original-modes)
@@ -232,7 +231,8 @@
((eq (current-buffer) (aref calc-embedded-info 0))
(let* ((info calc-embedded-info)
- (mode calc-embedded-modes))
+ (mode calc-embedded-modes)
+ (calcbuf (aref calc-embedded-info 1)))
(save-excursion
(set-buffer (aref info 1))
(if (and (> (calc-stack-size) 0)
@@ -253,7 +253,7 @@
(setq minor-mode-overriding-map-alist
(remq calc-override-minor-modes
minor-mode-overriding-map-alist))
(set-buffer-modified-p (buffer-modified-p))
- (calc-embedded-restore-original-modes)
+ (calc-embedded-restore-original-modes calcbuf)
(or calc-embedded-quiet
(message "Back to %s mode" (format-mode-line mode-name)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp/calc calc-embed.el,
Jay Belanger <=