[Emacs-diffs] /srv/bzr/emacs/trunk r99575: Fix more save-excursion warnings.

[Chong Yidong]

------------------------------------------------------------
revno: 99575
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-02-27 20:22:44 -0500
message:
  Fix more save-excursion warnings.
  
  * textmodes/reftex-toc.el (reftex-toc-promote-prepare):
  * emacs-lisp/elint.el (elint-add-required-env):
  * cedet/semantic/db-find.el (semanticdb-find-translate-path-brutish-default):
  * cedet/ede/make.el (ede-make-check-version):
  * calendar/icalendar.el (icalendar--add-diary-entry):
  * calc/calcalg2.el (math-tracing-integral): Use with-current-buffer instead 
of save-excursion.
modified:
  lisp/ChangeLog
  lisp/calc/calcalg2.el
  lisp/calendar/icalendar.el
  lisp/cedet/ede/make.el
  lisp/cedet/semantic/db-find.el
  lisp/emacs-lisp/elint.el
  lisp/textmodes/reftex-toc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-28 01:11:15 +0000
+++ b/lisp/ChangeLog    2010-02-28 01:22:44 +0000
@@ -1,5 +1,12 @@
 2010-02-28  Chong Yidong  <address@hidden>
 
+       * textmodes/reftex-toc.el (reftex-toc-promote-prepare):
+       * emacs-lisp/elint.el (elint-add-required-env):
+       * cedet/semantic/db-find.el
+       (semanticdb-find-translate-path-brutish-default):
+       * cedet/ede/make.el (ede-make-check-version):
+       * calendar/icalendar.el (icalendar--add-diary-entry):
+       * calc/calcalg2.el (math-tracing-integral):
        * files.el (recover-session-finish): Use with-current-buffer
        instead of save-excursion.
 

=== modified file 'lisp/calc/calcalg2.el'
--- a/lisp/calc/calcalg2.el     2010-01-13 08:35:10 +0000
+++ b/lisp/calc/calcalg2.el     2010-02-28 01:22:44 +0000
@@ -670,8 +670,8 @@
 (defmacro math-tracing-integral (&rest parts)
   (list 'and
        'trace-buffer
-       (list 'save-excursion
-             '(set-buffer trace-buffer)
+       (list 'with-current-buffer
+             'trace-buffer
              '(goto-char (point-max))
              (list 'and
                    '(bolp)

=== modified file 'lisp/calendar/icalendar.el'
--- a/lisp/calendar/icalendar.el        2010-02-19 18:59:00 +0000
+++ b/lisp/calendar/icalendar.el        2010-02-28 01:22:44 +0000
@@ -2246,8 +2246,7 @@
                  'make-diary-entry)
                string non-marking diary-file)))
   ;; Würgaround to remove the trailing blank char
-  (save-excursion
-    (set-buffer (find-file diary-file))
+  (with-current-buffer (find-file diary-file)
     (goto-char (point-max))
     (if (= (char-before) ? )
         (delete-char -1)))

=== modified file 'lisp/cedet/ede/make.el'
--- a/lisp/cedet/ede/make.el    2010-01-13 08:35:10 +0000
+++ b/lisp/cedet/ede/make.el    2010-02-28 01:22:44 +0000
@@ -76,9 +76,8 @@
        (rev nil)
        (ans nil)
        )
-    (save-excursion
+    (with-current-buffer b
       ;; Setup, and execute make.
-      (set-buffer b)
       (setq default-directory cd)
       (erase-buffer)
       (call-process ede-make-command nil b nil

=== modified file 'lisp/cedet/semantic/db-find.el'
--- a/lisp/cedet/semantic/db-find.el    2010-01-18 04:39:40 +0000
+++ b/lisp/cedet/semantic/db-find.el    2010-02-28 01:22:44 +0000
@@ -326,9 +326,8 @@
         (cond ((null path) semanticdb-current-database)
               ((semanticdb-table-p path) (oref path parent-db))
               (t (let ((tt (semantic-something-to-tag-table path)))
-                   (save-excursion
-                     ;; @todo - What does this DO ??!?!
-                     (set-buffer (semantic-tag-buffer (car tt)))
+                   ;; @todo - What does this DO ??!?!
+                   (with-current-buffer (semantic-tag-buffer (car tt))
                      semanticdb-current-database))))))
     (apply
      #'nconc

=== modified file 'lisp/emacs-lisp/elint.el'
--- a/lisp/emacs-lisp/elint.el  2010-02-14 17:28:10 +0000
+++ b/lisp/emacs-lisp/elint.el  2010-02-28 01:22:44 +0000
@@ -505,11 +505,10 @@
        ;; (Messes up the "Initializing elint..." message.)
 ;;;    (message nil)
        (if lib
-           (save-excursion
+           (with-current-buffer (find-file-noselect lib)
              ;; FIXME this doesn't use a temp buffer, because it
              ;; stores the result in buffer-local variables so that
              ;; it can be reused.
-             (set-buffer (find-file-noselect lib))
              (elint-update-env)
              (setq env (elint-env-add-env env elint-buffer-env)))
              ;;; (with-temp-buffer

=== modified file 'lisp/textmodes/reftex-toc.el'
--- a/lisp/textmodes/reftex-toc.el      2010-02-14 17:28:10 +0000
+++ b/lisp/textmodes/reftex-toc.el      2010-02-28 01:22:44 +0000
@@ -665,9 +665,8 @@
           (if (and (markerp marker) (marker-buffer marker))
               ;; Buffer is still live and we have the marker.
               (progn
-                (save-excursion
+                (with-current-buffer (marker-buffer marker)
                   ;; Goto the buffer and check of section is unchanged
-                  (set-buffer (marker-buffer marker))
                   (goto-char (marker-position marker))
                   (if (looking-at (regexp-quote literal))
                       ;; OK, get the makro name