diff lisp/calc/calc.el @ 105792:2c12fbae77c2

* calc/calc.el (calc, calc-refresh, calc-trail-buffer, calc-record) (calcDigit-nondigit): * calc/calc-yank.el (calc-copy-to-buffer): * calc/calc-units.el (calc-invalidate-units-table): * calc/calc-trail.el (calc-trail-yank): * calc/calc-store.el (calc-insert-variables): * calc/calc-rewr.el (math-rewrite, math-rewrite-phase): * calc/calc-prog.el (calc-read-parse-table): * calc/calc-keypd.el (calc-do-keypad, calc-keypad-right-click): * calc/calc-help.el (calc-describe-bindings, calc-describe-key): * calc/calc-graph.el (calc-graph-delete, calc-graph-add-curve) (calc-graph-juggle, calc-graph-count-curves, calc-graph-plot) (calc-graph-plot, calc-graph-format-data, calc-graph-set-styles) (calc-graph-name, calc-graph-find-command, calc-graph-view) (calc-graph-view, calc-gnuplot-command, calc-graph-init): * calc/calc-ext.el (calc-realign): * calc/calc-embed.el (calc-do-embedded, calc-do-embedded) (calc-embedded-finish-edit, calc-embedded-make-info) (calc-embedded-finish-command, calc-embedded-stack-change): * calc/calc-aent.el (calcAlg-enter): Use with-current-buffer.

--- a/lisp/calc/calc.el	Wed Oct 28 15:54:00 2009 +0000
+++ b/lisp/calc/calc.el	Wed Oct 28 18:35:33 2009 +0000
@@ -1427,8 +1427,7 @@
                       (set-window-buffer w (current-buffer))
                       (select-window w))
                   (pop-to-buffer (current-buffer)))))))
-	(save-excursion
-	  (set-buffer (calc-trail-buffer))
+	(with-current-buffer (calc-trail-buffer)
 	  (and calc-display-trail
 	       (= (window-width) (frame-width))
 	       (calc-trail-display 1 t)))
@@ -1979,8 +1978,7 @@
 	   (goto-char save-point))
 	 (if save-mark (set-mark save-mark))))
   (and calc-embedded-info (not (eq major-mode 'calc-mode))
-       (save-excursion
-	 (set-buffer (aref calc-embedded-info 1))
+       (with-current-buffer (aref calc-embedded-info 1)
 	 (calc-refresh align)))
   (setq calc-refresh-count (1+ calc-refresh-count)))
 
@@ -2005,8 +2003,7 @@
 	       (calc-trail-mode buf)))))
   (or (and calc-trail-pointer
 	   (eq (marker-buffer calc-trail-pointer) calc-trail-buffer))
-      (save-excursion
-	(set-buffer calc-trail-buffer)
+      (with-current-buffer calc-trail-buffer
 	(goto-char (point-min))
 	(forward-line 1)
 	(setq calc-trail-pointer (point-marker))))
@@ -2025,8 +2022,7 @@
 			 (math-showing-full-precision
 			  (math-format-flat-expr val 0)))
 		     "")))
-	(save-excursion
-	  (set-buffer buf)
+	(with-current-buffer buf
 	  (let ((aligned (calc-check-trail-aligned))
 		(buffer-read-only nil))
 	    (goto-char (point-max))
@@ -2262,8 +2258,7 @@
   (or (boundp 'calc-buffer)
       (use-local-map minibuffer-local-map))
   (let ((str (minibuffer-contents)))
-    (setq calc-digit-value (save-excursion
-			     (set-buffer calc-buffer)
+    (setq calc-digit-value (with-current-buffer calc-buffer
 			     (math-read-number str))))
   (if (and (null calc-digit-value) (> (calc-minibuffer-size) 0))
       (progn