* cedet/srecode/srt-mode.el (semantic-analyze-possible-completions):

* cedet/semantic/symref/list.el (semantic-symref-rb-toggle-expand-tag):
* cedet/semantic/symref/grep.el (semantic-symref-perform-search):
* cedet/semantic/bovine/gcc.el (semantic-gcc-query):
* cedet/semantic/bovine/c.el (semantic-c-parse-lexical-token):
* cedet/semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons)
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype)
(semantic-analyzer-debug-insert-include-summary):
* cedet/semantic/util.el (semantic-file-tag-table):
(semantic-describe-buffer-var-helper, semantic-something-to-tag-table)
(semantic-recursive-find-nonterminal-by-name):
* cedet/semantic/tag-ls.el (semantic-tag-calculate-parent-default):
* cedet/semantic/tag-file.el (semantic-prototype-file):
* cedet/semantic/symref.el (semantic-symref-parse-tool-output):
* cedet/semantic/sb.el (semantic-sb-fetch-tag-table):
* cedet/semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
* cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
(semantic-idle-summary-maybe-highlight):
* cedet/semantic/ia-sb.el (semantic-ia-speedbar)
(semantic-ia-sb-tag-info):
* cedet/semantic/grammar.el (semantic-analyze-possible-completions):
* cedet/semantic/find.el (semantic-brute-find-tag-by-position):
* cedet/semantic/ede-grammar.el (project-compile-target):
(ede-proj-makefile-insert-variables):
* cedet/semantic/debug.el (semantic-debug-set-parser-location):
(semantic-debug-set-source-location, semantic-debug-interface-layout)
(semantic-debug-mode, semantic-debug):
* cedet/semantic/db.el (semanticdb-needs-refresh-p):
* cedet/semantic/db-typecache.el (semanticdb-typecache-refresh-for-buffer):
* cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
* cedet/semantic/db-find.el (semanticdb-find-log-new-search)
(semanticdb-find-translate-path-includes--internal)
(semanticdb-reset-log, semanticdb-find-log-activity):
* cedet/semantic/db-file.el (object-write):
* cedet/semantic/db-el.el (semanticdb-equivalent-mode):
* cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-C-file-p)
(semanticdb-create-ebrowse-database):
* cedet/semantic/db-debug.el (semanticdb-table-sanity-check):
* cedet/semantic/complete.el (semantic-displayor-focus-request)
(semantic-collector-calculate-completions-raw)
(semantic-complete-read-tag-analyzer):
* cedet/semantic/analyze.el (semantic-analyze-pulse):
* cedet/ede/util.el (ede-update-version-in-source):
* cedet/ede/proj.el (project-delete-target):
* cedet/ede/proj-elisp.el (ede-update-version-in-source)
(ede-proj-flush-autoconf):
* cedet/ede/pconf.el (ede-proj-configure-synchronize)
(ede-proj-configure-synchronize):
* cedet/ede/locate.el (ede-locate-file-in-project-impl):
* cedet/ede/linux.el (ede-linux-version):
* cedet/ede/emacs.el (ede-emacs-version):
* cedet/ede/dired.el (ede-dired-add-to-target):
* cedet/ede.el (ede-buffer-header-file, ede-find-target)
(ede-buffer-documentation-files, ede-project-buffers, ede-set)
(ede-target-buffers, ede-buffers, ede-make-project-local-variable):
* cedet/cedet-idutils.el (cedet-idutils-fnid-call):
(cedet-idutils-lid-call, cedet-idutils-expand-filename)
(cedet-idutils-version-check):
* cedet/cedet-global.el (cedet-gnu-global-call):
(cedet-gnu-global-expand-filename, cedet-gnu-global-root)
(cedet-gnu-global-version-check, cedet-gnu-global-scan-hits):
* cedet/cedet-cscope.el (cedet-cscope-call)
(cedet-cscope-expand-filename, cedet-cscope-version-check):
Use with-current-buffer.
* cedet/ede.el (ede-make-project-local-variable)
(ede-set-project-variables, ede-set): Use dolist.

diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index 6bb7508fd6013a04c5c1f1fce5a27c90d4e7973f..ee3d75e22403e1790ca3ff6994c380026ddf9ad4 100644 (file)
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -77,8 +77,7 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
   (let ((b (get-buffer-create "*CEDET CScope*"))
        (cd default-directory)
        )
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (setq default-directory cd)
       (erase-buffer))
     (apply 'call-process cedet-cscope-command
@@ -90,8 +89,8 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
   "Expand the FILENAME with CScope.
 Return a fully qualified filename."
   (interactive "sFile: ")
-  (let* ((ans1 (save-excursion
-                (set-buffer (cedet-cscope-call (list "-d" "-L" "-7" filename)))
+  (let* ((ans1 (with-current-buffer
+                   (cedet-cscope-call (list "-d" "-L" "-7" filename))
                 (goto-char (point-min))
                 (if (looking-at "[^ \n]*cscope: ")
                     (error "CScope not available")
@@ -137,8 +136,7 @@ return nil."
          (when (interactive-p)
            (message "CScope not found."))
          nil)
-      (save-excursion
-       (set-buffer b)
+      (with-current-buffer b
        (goto-char (point-min))
        (re-search-forward "cscope: version \\([0-9.]+\\)" nil t)
        (setq rev (match-string 1))

diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index dc3ef815be3062c3f8fec7209a726edc04f7aacb..ac96055cc3b64fb20d7966247902db95d89e5831 100644 (file)
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -67,8 +67,7 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
   "Call GNU Global with the list of FLAGS."
   (let ((b (get-buffer-create "*CEDET Global*"))
        (cd default-directory))
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (setq default-directory cd)
       (erase-buffer))
     (apply 'call-process cedet-global-command
@@ -80,8 +79,7 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
   "Expand the FILENAME with GNU Global.
 Return a fully qualified filename."
   (interactive "sFile: ")
-  (let ((ans (save-excursion
-              (set-buffer (cedet-gnu-global-call (list "-Pa" filename)))
+  (let ((ans (with-current-buffer (cedet-gnu-global-call (list "-Pa" filename))
               (goto-char (point-min))
               (if (looking-at "global: ")
                   (error "GNU Global not available")
@@ -105,8 +103,7 @@ Return a fully qualified filename."
 If a default starting DIR is not specified, the current buffer's
 `default-directory' is used."
   (let ((default-directory (or dir default-directory)))
-    (save-excursion
-      (set-buffer (cedet-gnu-global-call (list "-pq")))
+    (with-current-buffer (cedet-gnu-global-call (list "-pq"))
       (goto-char (point-min))
       (when (not (eobp))
        (file-name-as-directory
@@ -128,8 +125,7 @@ return nil."
          (when (interactive-p)
            (message "GNU Global not found."))
          nil)
-      (save-excursion
-       (set-buffer b)
+      (with-current-buffer b
        (goto-char (point-min))
        (re-search-forward "GNU GLOBAL \\([0-9.]+\\)" nil t)
        (setq rev (match-string 1))
@@ -147,8 +143,7 @@ return nil."
   "Scan all the hits from the GNU Global output BUFFER."
   (let ((hits nil)
        (r1 "^\\([^ ]+\\) +\\([0-9]+\\) \\([^ ]+\\) "))
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (goto-char (point-min))
       (while (re-search-forward r1 nil t)
        (setq hits (cons (cons (string-to-number (match-string 2))

diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index e3cbf0d9ff3c303f42a0b03c3769b1210ce4b54f..32c2f3264b454553561e2f99c769224eb392fc79 100644 (file)
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -82,8 +82,7 @@ Return the created buffer with with program output."
   (let ((b (get-buffer-create "*CEDET fnid*"))
        (cd default-directory)
        )
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (setq default-directory cd)
       (erase-buffer))
     (apply 'call-process cedet-idutils-file-command
@@ -97,8 +96,7 @@ Return the created buffer with with program output."
   (let ((b (get-buffer-create "*CEDET lid*"))
        (cd default-directory)
        )
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (setq default-directory cd)
       (erase-buffer))
     (apply 'call-process cedet-idutils-token-command
@@ -112,8 +110,7 @@ Return the created buffer with with program output."
   "Expand the FILENAME with ID Utils.
 Return a filename relative to the default directory."
   (interactive "sFile: ")
-  (let ((ans (save-excursion
-              (set-buffer (cedet-idutils-fnid-call (list filename)))
+  (let ((ans (with-current-buffer (cedet-idutils-fnid-call (list filename))
               (goto-char (point-min))
               (if (looking-at "[^ \n]*fnid: ")
                   (error "ID Utils not available")
@@ -160,8 +157,7 @@ return nil."
          (when (interactive-p)
            (message "ID Utils not found."))
          nil)
-      (save-excursion
-       (set-buffer b)
+      (with-current-buffer b
        (goto-char (point-min))
        (re-search-forward "fnid - \\([0-9.]+\\)" nil t)
        (setq rev (match-string 1))

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 3d05202e7aa209f6dc6e716bb7adbb68a8975339..a88589c686dec511414cdd20fbe07998c7e13939 100644 (file)
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -1467,8 +1467,7 @@ Not all buffers need headers, so return nil if no applicable."
 (defmethod ede-buffer-header-file ((this ede-target) buffer)
   "There are no default header files in EDE.
 Do a quick check to see if there is a Header tag in this buffer."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (if (re-search-forward "::Header:: \\([a-zA-Z0-9.]+\\)" nil t)
        (buffer-substring-no-properties (match-beginning 1)
                                        (match-end 1))
@@ -1495,8 +1494,7 @@ Some projects may have multiple documentation files, so return a list."
 (defmethod ede-buffer-documentation-files ((this ede-target) buffer)
   "Check for some documentation files for THIS.
 Also do a quick check to see if there is a Documentation tag in this BUFFER."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (if (re-search-forward "::Documentation:: \\([a-zA-Z0-9.]+\\)" nil t)
        (buffer-substring-no-properties (match-beginning 1)
                                        (match-end 1))
@@ -1743,8 +1741,7 @@ could become slow in time."
 
 (defmethod ede-find-target ((proj ede-project) buffer)
   "Fetch the target in PROJ belonging to BUFFER or nil."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (or ede-object
        (if (ede-buffer-mine proj buffer)
            proj
@@ -1781,8 +1778,7 @@ This includes buffers controlled by a specific target of PROJECT."
   (let ((bl (buffer-list))
        (pl nil))
     (while bl
-      (save-excursion
-       (set-buffer (car bl))
+      (with-current-buffer (car bl)
        (if (and ede-object (eq (ede-current-project) project))
            (setq pl (cons (car bl) pl))))
       (setq bl (cdr bl)))
@@ -1793,8 +1789,7 @@ This includes buffers controlled by a specific target of PROJECT."
   (let ((bl (buffer-list))
        (pl nil))
     (while bl
-      (save-excursion
-       (set-buffer (car bl))
+      (with-current-buffer (car bl)
        (if (if (listp ede-object)
                (memq target ede-object)
              (eq ede-object target))
@@ -1807,8 +1802,7 @@ This includes buffers controlled by a specific target of PROJECT."
   (let ((bl (buffer-list))
        (pl nil))
     (while bl
-      (save-excursion
-       (set-buffer (car bl))
+      (with-current-buffer (car bl)
        (if ede-object
            (setq pl (cons (car bl) pl))))
       (setq bl (cdr bl)))
@@ -1897,22 +1891,18 @@ Return the first non-nil value returned by PROC."
       nil
     (oset project local-variables (cons (list variable)
                                        (oref project local-variables)))
-    (mapcar (lambda (b) (save-excursion
-                         (set-buffer  b)
-                         (make-local-variable variable)))
-           (ede-project-buffers project))))
+    (dolist (b (ede-project-buffers project))
+      (with-current-buffer b
+        (make-local-variable variable)))))
 
 (defmethod ede-set-project-variables ((project ede-project) &optional buffer)
   "Set variables local to PROJECT in BUFFER."
   (if (not buffer) (setq buffer (current-buffer)))
-  (save-excursion
-   (set-buffer buffer)
-   (mapcar (lambda (v)
-            (make-local-variable (car v))
-            ;; set it's value here?
-            (set (car v) (cdr v))
-            )
-          (oref project local-variables))))
+  (with-current-buffer buffer
+    (dolist (v (oref project local-variables))
+      (make-local-variable (car v))
+      ;; set it's value here?
+      (set (car v) (cdr v)))))
 
 (defun ede-set (variable value &optional proj)
   "Set the project local VARIABLE to VALUE.
@@ -1923,10 +1913,9 @@ is the project to use, instead of `ede-current-project'."
     (if (and p (setq a (assoc variable (oref p local-variables))))
        (progn
          (setcdr a value)
-         (mapc (lambda (b) (save-excursion
-                             (set-buffer b)
-                             (set variable value)))
-               (ede-project-buffers p)))
+         (dolist (b (ede-project-buffers p))
+            (with-current-buffer b
+              (set variable value))))
       (set variable value))
     (ede-commit-local-variables p))
   value)

diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 43f821da766657f5661aecb55b5e8309b5ed691f..9367121d11497b6865b710c46a1fe8f164bc6426 100644 (file)
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -90,8 +90,7 @@ negative, force off."
       (project-add-file target (car files))
       ;; Find the buffer for this files, and set it's ede-object
       (if (get-file-buffer (car files))
-         (save-excursion
-           (set-buffer (get-file-buffer (car files)))
+         (with-current-buffer (get-file-buffer (car files))
            (setq ede-object nil)
            (setq ede-object (ede-buffer-object (current-buffer)))))
       ;; Increment.

diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index a38e6a0ef0d34d174c72a5c83cea24aa1b7516aa..ac8616b18249caeb9a9a26b267e2198cc5b95a57 100644 (file)
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -76,8 +76,7 @@ Return a tuple of ( EMACSNAME . VERSION )."
   (let ((buff (get-buffer-create " *emacs-query*"))
        (emacs "Emacs")
        (ver ""))
-    (save-excursion
-      (set-buffer buff)
+    (with-current-buffer buff
       (erase-buffer)
       (setq default-directory (file-name-as-directory dir))
       ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")

diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index c80902bf0be906b25096cc07c1ab4caff2b23b53..7ef03b58301d418e81bda509d2ae28298f6e635f 100644 (file)
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -72,8 +72,7 @@ DIR is the directory to search from."
 (defun ede-linux-version (dir)
   "Find the Linux version for the Linux src in DIR."
   (let ((buff (get-buffer-create " *linux-query*")))
-    (save-excursion
-      (set-buffer buff)
+    (with-current-buffer buff
       (erase-buffer)
       (setq default-directory (file-name-as-directory dir))
       (insert-file-contents "Makefile" nil 0 512)

diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 3f38dc312c1c81d4e2f01a7f2882315712119b0d..8d1bd5a35443301658ab5dbefbddf05a7c6a9d17 100644 (file)
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -190,15 +190,13 @@ that crated this ede locat object."
         (b (get-buffer-create "*LOCATE*"))
         (cd default-directory)
         )
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (setq default-directory cd)
       (erase-buffer))
     (apply 'call-process locate-command
           nil b nil
           searchstr nil)
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (split-string (buffer-string) "\n" t))
     )
   )

diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 216da94096feaef88234a30a62ed59bdbe2e32f4..7f9d92e57810e4d68b84e0449023ec4a15ab228a 100644 (file)
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -112,10 +112,10 @@ don't do it.  A value of nil means to just do it.")
     ;; Verify that we have a make system.
     (if (or (not (ede-expand-filename (ede-toplevel this) "Makefile"))
            ;; Now is this one of our old Makefiles?
-           (save-excursion
-             (set-buffer (find-file-noselect
-                          (ede-expand-filename (ede-toplevel this)
-                                               "Makefile" t) t))
+           (with-current-buffer
+                (find-file-noselect
+                 (ede-expand-filename (ede-toplevel this)
+                                      "Makefile" t) t)
              (goto-char (point-min))
              ;; Here is the unique piece for our makefiles.
              (re-search-forward "For use with: make" nil t)))
@@ -128,8 +128,7 @@ don't do it.  A value of nil means to just do it.")
            (accept-process-output)
            (sit-for 1))
 
-         (save-excursion
-           (set-buffer "*compilation*")
+         (with-current-buffer "*compilation*"
            (goto-char (point-max))
 
            (when (not (string= mode-line-process ":exit [0]"))

diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index bbee823ba030b93f0fb741b870829db15be04867..a8b16e6ee6c177f6591be0be506c9557ec9f1104 100644 (file)
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -151,9 +151,8 @@ is found, such as a `-version' variable, or the standard header."
       (let ((vs (oref this versionsource))
            (match nil))
        (while vs
-         (save-excursion
-           (set-buffer (find-file-noselect
-                        (ede-expand-filename this (car vs))))
+         (with-current-buffer (find-file-noselect
+                                (ede-expand-filename this (car vs)))
            (goto-char (point-min))
            (let ((case-fold-search t))
              (if (re-search-forward "-version\\s-+\"\\([^\"]+\\)\"" nil t)
@@ -244,8 +243,7 @@ is found, such as a `-version' variable, or the standard header."
   (let ((ec (ede-expand-filename this "elisp-comp" 'newfile))
        )
     (if (and ec (file-exists-p ec))
-       (save-excursion
-         (set-buffer (find-file-noselect ec t))
+       (with-current-buffer (find-file-noselect ec t)
          (goto-char (point-min))
          (while (re-search-forward "(cons \\([^ ]+\\) load-path)"
                                    nil t)

diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 046567fe8316b74d5496a25e6857b8211da1ee9d..6722fd7b2b7a7facfd47d068cedd8017b2ff1978 100644 (file)
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -407,8 +407,7 @@ Argument TARGET is the project we are completing customization on."
       (let* ((default-directory (oref this path))
             (b (get-file-buffer (car ts))))
        (if b
-           (save-excursion
-             (set-buffer b)
+           (with-current-buffer b
              (if (eq ede-object this)
                  (progn
                    (setq ede-object nil)

diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el
index 11fbee2eb7a65920237d5effc40054a041dfcf37..5dc6a76e3d2e410010a0176945961aff34e1ce12 100644 (file)
--- a/lisp/cedet/ede/util.el
+++ b/lisp/cedet/ede/util.el
@@ -64,9 +64,8 @@ their sources to VERSION."
           (oref this versionsource))
       (let ((vs (oref this versionsource)))
        (while vs
-         (save-excursion
-           (set-buffer (find-file-noselect
-                        (ede-expand-filename this (car vs))))
+         (with-current-buffer (find-file-noselect
+                                (ede-expand-filename this (car vs)))
            (goto-char (point-min))
            (let ((case-fold-search t))
              (if (re-search-forward "version:\\s-*\\([^ \t\n]+\\)" nil t)

diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index a4d5664f2263ebeb0b16598b1f4259883e9af666..d7e18102b8120b6125d94cffa97a931cc1ffee2e 100644 (file)
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -710,8 +710,7 @@ Optional argument CTXT is the context to show."
 (defmethod semantic-analyze-pulse ((context semantic-analyze-context))
   "Pulse the region that CONTEXT affects."
   (require 'pulse)
-  (save-excursion
-    (set-buffer (oref context :buffer))
+  (with-current-buffer (oref context :buffer)
     (let ((bounds (oref context :bounds)))
       (when bounds
        (pulse-momentary-highlight-region (car bounds) (cdr bounds))))))

diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index f7c390784d6ad5c6e6dcc17bd0beaed11d20d5d7..2b5325f848d61c848dd5040ef84d7beddd4f0953 100644 (file)
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -104,8 +104,7 @@ Argument COMP are possible completions here."
        ;; NOTE: This line is copied from semantic-analyze-current-context.
        ;;       You will need to update both places.
        (condition-case err
-           (save-excursion
-             (set-buffer origbuf)
+           (with-current-buffer origbuf
              (let* ((position (or (cdr-safe (oref ctxt bounds)) (point)))
                     (prefixtypes nil) ; Used as type return
                     (scope (semantic-calculate-scope position))
@@ -246,13 +245,11 @@ with the command:
          (princ "\nSemantic has found the datatype ")
          (semantic-analyzer-debug-insert-tag dt)
          (if (or (not (semantic-equivalent-tag-p ots dt))
-                 (not (save-excursion
-                        (set-buffer orig-buffer)
+                 (not (with-current-buffer orig-buffer
                         (car (semantic-analyze-dereference-metatype
                          ots (oref ctxt scope))))))
              (let ((lasttype ots)
-                   (nexttype (save-excursion
-                               (set-buffer orig-buffer)
+                   (nexttype (with-current-buffer orig-buffer
                                (car (semantic-analyze-dereference-metatype
                                 ots (oref ctxt scope))))))
                (if (eq nexttype lasttype)
@@ -274,8 +271,7 @@ with the command:
                  (princ "\n")
                  (setq lasttype nexttype
                        nexttype
-                       (save-excursion
-                         (set-buffer orig-buffer)
+                       (with-current-buffer orig-buffer
                          (car (semantic-analyze-dereference-metatype
                           nexttype (oref ctxt scope)))))
                  )
@@ -391,21 +387,17 @@ or implementing a version specific to ")
   (let ((inc (semantic-find-tags-by-class 'include table))
        ;;(path (semanticdb-find-test-translate-path-no-loading))
        (unk
-        (save-excursion
-          (set-buffer (semanticdb-get-buffer table))
+        (with-current-buffer (semanticdb-get-buffer table)
           semanticdb-find-lost-includes))
        (ip
-        (save-excursion
-          (set-buffer (semanticdb-get-buffer table))
+        (with-current-buffer (semanticdb-get-buffer table)
           semantic-dependency-system-include-path))
        (edeobj
-        (save-excursion
-          (set-buffer (semanticdb-get-buffer table))
+        (with-current-buffer (semanticdb-get-buffer table)
           (and (boundp 'ede-object)
                ede-object)))
        (edeproj
-        (save-excursion
-          (set-buffer (semanticdb-get-buffer table))
+        (with-current-buffer (semanticdb-get-buffer table)
           (and (boundp 'ede-object-project)
                ede-object-project))))
 
@@ -589,9 +581,8 @@ PARENT is a possible parent (by nesting) tag."
 Look for key expressions, and add push-buttons near them."
   (let ((orig-buffer (make-marker)))
     (set-marker orig-buffer (point) (current-buffer))
-    (save-excursion
-      ;; Get a buffer ready.
-      (set-buffer "*Help*")
+    ;; Get a buffer ready.
+    (with-current-buffer "*Help*"
       (toggle-read-only -1)
       (goto-char (point-min))
       (set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer)

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index de7ed48edfd267b58184a0e65fa86c037ef79bd6..064e231c9e981fee9f5baf30a9671cd3bd0881e1 100644 (file)
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -703,8 +703,7 @@ the regular parser."
         (symtext (semantic-lex-token-text lexicaltoken))
         (macros (get-text-property 0 'macros symtext))
         )
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (when (not (eq major-mode mode))
        (save-match-data

diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el
index 7ad7aba59985e2a82e3444bfecbccc264af189d7..197e9b0065ac1fc686f38600d151c96f965f5ecf 100644 (file)
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -40,8 +40,7 @@ to give to the program."
   ;;
   (let ((buff (get-buffer-create " *gcc-query*"))
         (old-lc-messages (getenv "LC_ALL")))
-    (save-excursion
-      (set-buffer buff)
+    (with-current-buffer buff
       (erase-buffer)
       (setenv "LC_ALL" "C")
       (condition-case nil

diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 154defb417af2354b9df3d2d454b5fe2fabf934d..9f68c9f24366a9c098cdcc7ffc0ab18312060b04 100644 (file)
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -947,8 +947,7 @@ Calculate the cache if there isn't one."
   "Calculate the completions for prefix from completionlist.
 Output must be in semanticdb Find result format."
   ;; Must output in semanticdb format
-  (let ((table (save-excursion
-                (set-buffer (oref obj buffer))
+  (let ((table (with-current-buffer (oref obj buffer)
                 semanticdb-current-table))
        (result (semantic-find-tags-for-completion
                 prefix
@@ -1227,8 +1226,7 @@ inserted into the current context.")
            (semantic-analyze-possible-completions (oref obj context))))
   ;; search our cached completion list.  make it look like a semanticdb
   ;; results type.
-  (list (cons (save-excursion
-               (set-buffer (oref (oref obj context) buffer))
+  (list (cons (with-current-buffer (oref (oref obj context) buffer)
                semanticdb-current-table)
              (semantic-find-tags-for-completion
               prefix
@@ -1463,8 +1461,7 @@ one in the source buffer."
                   (and table (semanticdb-get-buffer table)))))
       ;; If no buffer is provided, then we can make up a summary buffer.
       (when (not buf)
-       (save-excursion
-         (set-buffer (get-buffer-create "*Completion Focus*"))
+       (with-current-buffer (get-buffer-create "*Completion Focus*")
          (erase-buffer)
          (insert "Focus on tag: \n")
          (insert (semantic-format-tag-summarize tag nil t) "\n\n")
@@ -1893,8 +1890,7 @@ prompts.  these are calculated from the CONTEXT variable passed in."
       :buffer (oref context buffer)
       :context context)
      (semantic-displayor-traditional-with-focus-highlight "simple")
-     (save-excursion
-       (set-buffer (oref context buffer))
+     (with-current-buffer (oref context buffer)
        (goto-char (cdr (oref context bounds)))
        (concat prompt (mapconcat 'identity syms ".")
               (if syms "." "")

diff --git a/lisp/cedet/semantic/db-debug.el b/lisp/cedet/semantic/db-debug.el
index 619dd601186704bdbb321866101a01a4b3a96378..40b311ca285862f7df4b566eb1bc806d181de34b 100644 (file)
--- a/lisp/cedet/semantic/db-debug.el
+++ b/lisp/cedet/semantic/db-debug.el
@@ -88,8 +88,7 @@
   (let* ((full-filename (semanticdb-full-filename table))
         (buff (find-buffer-visiting full-filename)))
     (if buff
-       (save-excursion
-         (set-buffer buff)
+       (with-current-buffer buff
          (semantic-sanity-check))
       ;; We can't use the usual semantic validity check, so hack our own.
       (semanticdb-table-oob-sanity-check (semanticdb-get-tags table)))))

diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index 9b915935c66449a62048082c7ca9f54b576b16de..d8f14a765c3e091449720cac4a7b6a804504ffb7 100644 (file)
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -118,8 +118,7 @@ EBROWSE is a C/C++ parser for use with `ebrowse' Emacs program.")
       (and (string-match "/\\w+$" file)
           (not (file-directory-p file))
           (let ((tmp (get-buffer-create "*semanticdb-ebrowse-tmp*")))
-            (save-excursion
-              (set-buffer tmp)
+            (with-current-buffer tmp
               (condition-case nil
                   (insert-file-contents file nil 0 100 t)
                 (error (insert-file-contents file nil nil nil t)))
@@ -141,8 +140,7 @@ is specified by `semanticdb-default-save-directory'."
         (regexp nil)
         )
     ;; Create the input to the ebrowse command
-    (save-excursion
-      (set-buffer filebuff)
+    (with-current-buffer filebuff
       (buffer-disable-undo filebuff)
       (setq default-directory (expand-file-name dir))
 
@@ -156,8 +154,7 @@ is specified by `semanticdb-default-save-directory'."
                (insert "\n")))
            files)
       ;; Cleanup the ebrowse output buffer.
-      (save-excursion
-       (set-buffer (get-buffer-create "*EBROWSE OUTPUT*"))
+      (with-current-buffer (get-buffer-create "*EBROWSE OUTPUT*")
        (erase-buffer))
       ;; Call the EBROWSE command.
       (message "Creating ebrowse file: %s ..." savein)
@@ -169,8 +166,7 @@ is specified by `semanticdb-default-save-directory'."
     ;; Create a short LOADER program for loading in this database.
     (let* ((lfn (concat savein "-load.el"))
           (lf (find-file-noselect lfn)))
-      (save-excursion
-       (set-buffer lf)
+      (with-current-buffer lf
        (erase-buffer)
        (insert "(semanticdb-ebrowse-load-helper \""
                (expand-file-name dir)

diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 7e491a21efb9a40698cc22b66c42a3eb3b7150aa..4b232278a397063d55d08620ec0ffa016b4118d7 100644 (file)
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -109,8 +109,7 @@ For Emacs Lisp, creates a specialized table."
   "Return non-nil if TABLE's mode is equivalent to BUFFER.
 Equivalent modes are specified by by `semantic-equivalent-major-modes'
 local variable."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode)))
 
 (defmethod semanticdb-full-filename ((obj semanticdb-table-emacs-lisp))

diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 4bd042ecefed5cd610f94484bb8a2f7cb2ad0d8a..ec8ffdccb28ff8957076ae8b38310a5ecd986343 100644 (file)
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -281,8 +281,7 @@ Restore the overlays after writting.
 Argument OBJ is the object to write."
   (when (semanticdb-live-p obj)
     (when (semanticdb-in-buffer-p obj)
-      (save-excursion
-       (set-buffer (semanticdb-in-buffer-p obj))
+      (with-current-buffer (semanticdb-in-buffer-p obj)
 
        ;; Make sure all our tag lists are up to date.
        (semantic-fetch-tags)

diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index fd5b7706c31cd25cc7ae0c43154a7113deb32eb3..b2ec243f506d5cb23189cf87a4078929b4cfce5a 100644 (file)
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -469,12 +469,11 @@ a new path from the provided PATH."
                 incfname (semanticdb-full-filename path))
           )
          ((bufferp path)
-          (save-excursion
-            (set-buffer path)
+          (with-current-buffer path
             (semantic-refresh-tags-safe))
           (setq includetags (semantic-find-tags-included path)
-                curtable (save-excursion (set-buffer path)
-                                         semanticdb-current-table)
+                curtable (with-current-buffer path
+                            semanticdb-current-table)
                 incfname (buffer-file-name path)))
          (t
           (setq includetags (semantic-find-tags-included path))
@@ -1048,8 +1047,7 @@ Returns result."
   "Reset the log buffer."
   (interactive)
   (when semanticdb-find-log-flag
-    (save-excursion
-      (set-buffer (get-buffer-create semanticdb-find-log-buffer-name))
+    (with-current-buffer (get-buffer-create semanticdb-find-log-buffer-name)
       (erase-buffer)
       )))
 
@@ -1069,8 +1067,7 @@ Returns result."
 (defun semanticdb-find-log-new-search (forwhat)
   "Start a new search FORWHAT."
   (when semanticdb-find-log-flag
-    (save-excursion
-      (set-buffer (get-buffer-create semanticdb-find-log-buffer-name))
+    (with-current-buffer (get-buffer-create semanticdb-find-log-buffer-name)
       (insert (format "New Search: %S\n" forwhat))
       )
     (semanticdb-find-log-move-to-end)))
@@ -1078,8 +1075,7 @@ Returns result."
 (defun semanticdb-find-log-activity (table result)
   "Log that TABLE has been searched and RESULT was found."
   (when semanticdb-find-log-flag
-    (save-excursion
-      (set-buffer semanticdb-find-log-buffer-name)
+    (with-current-buffer semanticdb-find-log-buffer-name
       (insert "Table: " (object-print table)
              " Result: " (int-to-string (length result)) " tags"
              "\n")

diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index 8fa3f15f5bab42dd6c7c267f99e8ce5200dbacba..cfd6575902ca8b4203586a9c3c91ca49f8af8e03 100644 (file)
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -147,8 +147,7 @@ Create one of our special tables that can act as an intermediary."
   "Return non-nil if TABLE's mode is equivalent to BUFFER.
 Equivalent modes are specified by by `semantic-equivalent-major-modes'
 local variable."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (eq (or mode-local-active-mode major-mode) 'javascript-mode)))
 
 ;;; Usage

diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 4c841494a970b695df78d30174d5b64a84d562bb..b3ae2540e268c9fb95ea748136c73bbf6a5ce964 100644 (file)
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -540,8 +540,7 @@ If there isn't one, create it.
 
 (defun semanticdb-typecache-refresh-for-buffer (buffer)
   "Refresh the typecache for BUFFER."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (let* ((tab semanticdb-current-table)
           ;(idx (semanticdb-get-table-index tab))
           (tc (semanticdb-get-typecache tab)))

diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index cfde30b7585c4e5623cc959ee353026631ab82ce..48531513ad630b2f1b2cf94b9219a1615d1d7ad1 100644 (file)
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -552,8 +552,7 @@ The file associated with OBJ does not need to be in a buffer."
         (buff (semanticdb-in-buffer-p obj))
         )
     (if buff
-       (save-excursion
-         (set-buffer buff)
+       (with-current-buffer buff
          ;; Use semantic's magic tracker to determine of the buffer is up
          ;; to date or not.
          (not (semantic-parse-tree-up-to-date-p))

diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index ac8b4b1314e545faa042b37684785da70ea9e43a..94cba53b942750ec5f4984a5ccdbf72d1366e7e7 100644 (file)
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -118,8 +118,7 @@ These buffers are brought into view when layout occurs.")
 
 (defmethod semantic-debug-set-parser-location ((iface semantic-debug-interface) point)
   "Set the parser location in IFACE to POINT."
-  (save-excursion
-    (set-buffer (oref iface parser-buffer))
+  (with-current-buffer (oref iface parser-buffer)
     (if (not (slot-boundp iface 'parser-location))
        (oset iface parser-location (make-marker)))
     (move-marker (oref iface parser-location) point))
@@ -127,8 +126,7 @@ These buffers are brought into view when layout occurs.")
 
 (defmethod semantic-debug-set-source-location ((iface semantic-debug-interface) point)
   "Set the source location in IFACE to POINT."
-  (save-excursion
-    (set-buffer (oref iface source-buffer))
+  (with-current-buffer (oref iface source-buffer)
     (if (not (slot-boundp iface 'source-location))
        (oset iface source-location (make-marker)))
     (move-marker (oref iface source-location) point))
@@ -140,8 +138,7 @@ These buffers are brought into view when layout occurs.")
   ;; Deal with the data buffer
   (when (slot-boundp iface 'data-buffer)
     (let ((lines (/ (frame-height (selected-frame)) 3))
-         (cnt (save-excursion
-                (set-buffer (oref iface data-buffer))
+         (cnt (with-current-buffer (oref iface data-buffer)
                 (count-lines (point-min) (point-max))))
          )
       ;; Set the number of lines to 1/3, or the size of the data buffer.
@@ -307,8 +304,7 @@ Argument ONOFF is non-nil when we are entering debug mode.
   (let ((iface semantic-debug-current-interface))
     (if onoff
        ;; Turn it on
-       (save-excursion
-         (set-buffer (oref iface parser-buffer))
+       (with-current-buffer (oref iface parser-buffer)
          ;; Install our map onto this buffer
          (use-local-map semantic-debug-mode-map)
          ;; Make the buffer read only
@@ -323,15 +319,13 @@ Argument ONOFF is non-nil when we are entering debug mode.
          (run-hooks 'semantic-debug-mode-hook)
          )
       ;; Restore old mode information
-      (save-excursion
-       (set-buffer
-        (oref semantic-debug-current-interface parser-buffer))
+      (with-current-buffer
+          (oref semantic-debug-current-interface parser-buffer)
        (use-local-map
         (oref semantic-debug-current-interface parser-local-map))
        )
-      (save-excursion
-       (set-buffer
-        (oref semantic-debug-current-interface source-buffer))
+      (with-current-buffer
+          (oref semantic-debug-current-interface source-buffer)
        (use-local-map
         (oref semantic-debug-current-interface source-local-map))
        )
@@ -355,8 +349,7 @@ Argument ONOFF is non-nil when we are entering debug mode.
           (semantic-debug-interface
            "Debug Interface"
            :parser-buffer parserb
-           :parser-local-map (save-excursion
-                               (set-buffer parserb)
+           :parser-local-map (with-current-buffer parserb
                                (current-local-map))
            :source-buffer (current-buffer)
            :source-local-map (current-local-map)

diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index e0162f52c8d45dc8cc7294cd440fd19fda16952b..e19234bb81202b823ec545640a5209c06b27e088 100644 (file)
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -129,8 +129,7 @@ Lays claim to all -by.el, and -wy.el files."
         (proj (ede-target-parent obj))
         (default-directory (oref proj directory)))
     (mapc (lambda (src)
-           (save-excursion
-             (set-buffer (find-file-noselect src))
+           (with-current-buffer (find-file-noselect src)
              (save-excursion
                (semantic-grammar-create-package))
              (save-buffer)
@@ -162,8 +161,7 @@ Lays claim to all -by.el, and -wy.el files."
       (concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL")
     (insert
      (mapconcat (lambda (src)
-                 (save-excursion
-                   (set-buffer (find-file-noselect src))
+                 (with-current-buffer (find-file-noselect src)
                    (concat (semantic-grammar-package) ".el")))
                (oref this source)
                " ")))

diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index d9da329bd0b354006ec0fbe55b63b2ba9be84dcf..073777037749613bd8756b279975cb3da17ca344 100644 (file)
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -640,8 +640,7 @@ the median calculation, and return nil."
   (save-excursion
     (if (markerp position) (set-buffer (marker-buffer position)))
     (let* ((stream (if (bufferp streamorbuffer)
-                      (save-excursion
-                        (set-buffer streamorbuffer)
+                      (with-current-buffer streamorbuffer
                         (semantic-fetch-tags))
                     streamorbuffer))
           (prev nil)

diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index f4d34def561c0b5c8a9b52b948e94bf4f862dff3..3600c1917bfd3ff281d346ef8ec2b46cdf9490dc 100644 (file)
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1877,8 +1877,7 @@ Optional argument COLOR determines if color is added to the text."
   (if (semantic-grammar-in-lisp-p)
       (with-mode-local emacs-lisp-mode
        (semantic-analyze-possible-completions context))
-    (save-excursion
-      (set-buffer (oref context buffer))
+    (with-current-buffer (oref context buffer)
       (let* ((prefix (car (oref context :prefix)))
             (completetext (cond ((semantic-tag-p prefix)
                                  (semantic-tag-name prefix))

diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 3b57133d0c3f1626e8f0946711fb3a4d2c7c9bed..98eeeeda1411bd6ddbede8812d113cdf7f17c8d9 100644 (file)
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -104,8 +104,7 @@ DIRECTORY is the current directory, which is ignored, and ZERO is 0."
            ))
       (error nil))
     (select-frame cf)
-    (save-excursion
-      (set-buffer speedbar-buffer)
+    (with-current-buffer speedbar-buffer
       ;; If we have something, do something spiff with it.
       (erase-buffer)
       (speedbar-insert-separator "Buffer/Function")
@@ -288,16 +287,14 @@ TEXT, TAG, and INDENT are speedbar function arguments."
          (setq ob (current-buffer))
          (with-output-to-temp-buffer "*Tag Information*"
            ;; Output something about this tag:
-           (save-excursion
-             (set-buffer "*Tag Information*")
+           (with-current-buffer "*Tag Information*"
              (goto-char (point-max))
              (insert
               (semantic-format-tag-prototype tag nil t)
               "\n")
              (let ((typetok
                     (condition-case nil
-                        (save-excursion
-                          (set-buffer ob)
+                        (with-current-buffer ob
                           ;; @todo - We need a context to derive a scope from.
                           (semantic-analyze-tag-type tag nil))
                       (error nil))))

diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index b93ed65c1f5457d533b9c43bfbdf382fc2e21c20..ec2af3e36be3ea683fc1337206dc221d5d753cd4 100644 (file)
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -350,8 +350,7 @@ Disable to prevent lots of excessive parsing in idle time."
   "Do long-processing work for for BUFFER.
 Uses `semantic-safe' and returns the output.
 Returns t of all processing succeeded."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (not (and
          ;; Just in case
          (semantic-safe "Idle Work Parse Error: %S"
@@ -845,8 +844,7 @@ visible, then highlight it."
         (pulse-flag nil)
         )
     (cond ((semantic-overlay-p region)
-          (save-excursion
-            (set-buffer (semantic-overlay-buffer region))
+          (with-current-buffer (semantic-overlay-buffer region)
             (goto-char (semantic-overlay-start region))
             (when (pos-visible-in-window-p
                    (point) (get-buffer-window (current-buffer) 'visible))

diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index b078a25b28e2c3a1226979e986076f25e8476afc..d7bbee5d5e6bd04ee14504f64aa6961338f57714 100644 (file)
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -864,8 +864,7 @@ and variable state from the current buffer."
                           semantic-lex-spp-expanded-macro-stack
                           ))
         )
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       ;; Below is a painful hack to make sure everything is setup correctly.
       (when (not (eq major-mode mode))

diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index 582eea39d8b08a172d0ddcb8d30fe0073502d3ad..277b28a81b3cf312bdc49fa09a8d0c570137cc8a 100644 (file)
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -391,8 +391,7 @@ Returns the tag list, or t for an error."
        ;; Successful DB query.
        nil
       ;; No database, do it the old way.
-      (save-excursion
-       (set-buffer (find-file-noselect file))
+      (with-current-buffer (find-file-noselect file)
        (if (or (not (featurep 'semantic))
                (not semantic--parse-table))
            (setq out t)

diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 429e902602198bcb60fdcbacc235aadae666fe8c..16f351ce15eca4998830131ca6939573a284d34e 100644 (file)
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -476,8 +476,7 @@ The symref TOOL should already contain the search criteria."
   "Parse the entire OUTPUTBUFFER of a symref tool.
 Calls the method `semantic-symref-parse-tool-output-one-line' over and
 over until it returns nil."
-  (save-excursion
-    (set-buffer outputbuffer)
+  (with-current-buffer outputbuffer
     (goto-char (point-min))
     (let ((result nil)
          (hit nil))

diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index 08c79ed842efe25b593cf824d10776786a701b66..949a44980ac6087ca2b368232efeab7123a0539f 100644 (file)
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -156,8 +156,7 @@ GREPPATTERN is the pattern used by grep."
         (ans nil)
         )
 
-    (save-excursion
-      (set-buffer b)
+    (with-current-buffer b
       (erase-buffer)
       (setq default-directory rootdir)
 

diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 94114c14f6ea82ed95174d8f68d2f3a901570f8f..d8f29940c8ee61d0eccbb5561df5b7b98a393f62 100644 (file)
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -217,8 +217,7 @@ BUTTON is the button that was clicked."
     (cond
      ((eq state 'closed)
       (toggle-read-only -1)
-      (save-excursion
-       (set-buffer buff)
+      (with-current-buffer buff
        (dolist (H hits)
          (goto-char (point-min))
          (forward-line (1- H))

diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index 70d6b9cd6881adb4a83cb625d0515021f5fffd18..0be88ea046956f298e5c1f3859a63a04d26cc092 100644 (file)
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -193,12 +193,10 @@ file prototypes belong in."
   (:override
    ;; Perform some default behaviors
    (if (and (fboundp 'ede-header-file) ede-minor-mode)
-       (save-excursion
-         (set-buffer buffer)
+       (with-current-buffer buffer
          (ede-header-file))
      ;; No EDE options for a quick answer.  Search.
-     (save-excursion
-       (set-buffer buffer)
+     (with-current-buffer buffer
        (if (re-search-forward "::Header:: \\([a-zA-Z0-9.]+\\)" nil t)
            (match-string 1))))))
 

diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 2d12b03e24898c6e738d95c569eeab7a48811d0f..3456ce8769b22bb18e8b79145f622400c7ca2d96 100644 (file)
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -49,8 +49,7 @@ search locally, then semanticdb for that tag (when enabled.)")
 (defun semantic-tag-calculate-parent-default (tag)
   "Attempt to calculate the parent of TAG."
   (when (semantic-tag-in-buffer-p tag)
-    (save-excursion
-      (set-buffer (semantic-tag-buffer tag))
+    (with-current-buffer (semantic-tag-buffer tag)
       (save-excursion
        (goto-char (semantic-tag-start tag))
        (semantic-current-tag-parent))

diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index 126c587a80162e53f1b439d7b94d454613d19db7..9a4d7dd26ac9897ef7509007b35124737256644d 100644 (file)
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -67,8 +67,7 @@ If FILE is not loaded, and semanticdb is not available, find the file
    and parse it."
   (save-match-data
     (if (find-buffer-visiting file)
-       (save-excursion
-         (set-buffer (find-buffer-visiting file))
+       (with-current-buffer (find-buffer-visiting file)
          (semantic-fetch-tags))
       ;; File not loaded
       (if (and (require 'semantic/db-mode)
@@ -76,8 +75,7 @@ If FILE is not loaded, and semanticdb is not available, find the file
          ;; semanticdb is around, use it.
          (semanticdb-file-stream file)
        ;; Get the stream ourselves.
-       (save-excursion
-         (set-buffer (find-file-noselect file))
+       (with-current-buffer (find-file-noselect file)
          (semantic-fetch-tags))))))
 
 (semantic-alias-obsolete 'semantic-file-token-stream
@@ -94,14 +92,12 @@ buffer, or a filename.  If SOMETHING is nil return nil."
     something)
    ;; A buffer
    ((bufferp something)
-    (save-excursion
-      (set-buffer something)
+    (with-current-buffer something
       (semantic-fetch-tags)))
    ;; A Tag: Get that tag's buffer
    ((and (semantic-tag-with-position-p something)
         (semantic-tag-in-buffer-p something))
-    (save-excursion
-      (set-buffer (semantic-tag-buffer something))
+    (with-current-buffer (semantic-tag-buffer something)
       (semantic-fetch-tags)))
    ;; Tag with a file name in it
    ((and (semantic-tag-p something)
@@ -148,8 +144,7 @@ The return item is of the form (BUFFER TOKEN) where BUFFER is the buffer
 in which TOKEN (the token found to match NAME) was found.
 
 THIS ISN'T USED IN SEMANTIC.  DELETE ME SOON."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (let* ((stream (semantic-fetch-tags))
           (includelist (or (semantic-find-tags-by-class 'include stream)
                            "empty.silly.thing"))
@@ -158,9 +153,8 @@ THIS ISN'T USED IN SEMANTIC.  DELETE ME SOON."
       (while (and (not found) includelist)
        (let ((fn (semantic-dependency-tag-file (car includelist))))
          (if (and fn (not (member fn unfound)))
-             (save-excursion
-               (save-match-data
-                 (set-buffer (find-file-noselect fn)))
+             (with-current-buffer (save-match-data
+                                     (find-file-noselect fn))
                (message "Scanning %s" (buffer-file-name))
                (setq stream (semantic-fetch-tags))
                (setq found (semantic-find-first-tag-by-name name stream))
@@ -287,8 +281,7 @@ If TAG is not specified, use the tag at point."
 (defun semantic-describe-buffer-var-helper (varsym buffer)
   "Display to standard out the value of VARSYM in BUFFER."
   (require 'data-debug)
-  (let ((value (save-excursion
-                (set-buffer buffer)
+  (let ((value (with-current-buffer buffer
                 (symbol-value varsym))))
     (cond
      ((and (consp value)

diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index d7e4b7b3ff4237e0386d22e050881dd6c057d0ce..645d2d392073b9c9e8188d086a5aa89d6722cde7 100644 (file)
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -629,8 +629,7 @@ section or ? for an ask variable."
 (define-mode-local-override semantic-analyze-possible-completions
   srecode-template-mode (context)
   "Return a list of possible completions based on NONTEXT."
-  (save-excursion
-    (set-buffer (oref context buffer))
+  (with-current-buffer (oref context buffer)
     (let* ((prefix (car (last (oref context :prefix))))
           (prefixstr (cond ((stringp prefix)
                             prefix)