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

[bpt/emacs.git] / lisp / cedet / semantic / debug.el

diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index ac8b4b1..94cba53 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)