Remove unnecessary let-bindings in bookmark.el (Bug#6515)

[bpt/emacs.git] / lisp / cedet / cedet-global.el

diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index 2cc74f6..3a34ca4 100644 (file)
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -1,6 +1,6 @@
 ;;; cedet-global.el --- GNU Global support for CEDET.
 
-;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -23,6 +23,8 @@
 ;;
 ;; Basic support for calling GNU Global, and testing version numbers.
 
+(declare-function inversion-check-version "inversion")
+
 (defvar cedet-global-min-version "5.0"
   "Minimum version of GNU global required.")
 
@@ -57,18 +59,15 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
                       "c")
                      ((eq texttype 'regexp)
                       "g")
-                     (t "r")))
-       )
+                     (t "r"))))
     (cedet-gnu-global-call (list (concat flgs scopeflgs stflag)
                                 searchtext))))
 
 (defun cedet-gnu-global-call (flags)
   "Call GNU Global with the list of FLAGS."
   (let ((b (get-buffer-create "*CEDET Global*"))
-       (cd default-directory)
-       )
-    (save-excursion
-      (set-buffer b)
+       (cd default-directory))
+    (with-current-buffer b
       (setq default-directory cd)
       (erase-buffer))
     (apply 'call-process cedet-global-command
@@ -80,13 +79,12 @@ 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")
                 (split-string (buffer-string) "\n" t)))))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (if ans
          (if (= (length ans) 1)
              (message "%s" (car ans))
@@ -104,17 +102,13 @@ Return a fully qualified filename."
   "Return the root of any GNU Global scanned project.
 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")))
+  (let ((default-directory (or dir default-directory)))
+    (with-current-buffer (cedet-gnu-global-call (list "-pq"))
       (goto-char (point-min))
       (when (not (eobp))
        (file-name-as-directory
         (buffer-substring (point) (point-at-eol)))))))
 
-(declare-function inversion-check-version "inversion")
-
 (defun cedet-gnu-global-version-check (&optional noerror)
   "Check the version of the installed GNU Global command.
 If optional programatic argument NOERROR is non-nil, then
@@ -128,11 +122,10 @@ return nil."
        (rev nil))
     (if (not b)
        (progn
-         (when (interactive-p)
+         (when (called-interactively-p 'interactive)
            (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))
@@ -142,7 +135,7 @@ return nil."
              (error "Version of GNU Global is %s.  Need at least %s"
                     rev cedet-global-min-version))
          ;; Else, return TRUE, as in good enough.
-         (when (interactive-p)
+         (when (called-interactively-p 'interactive)
            (message "GNU Global %s  - Good enough for CEDET." rev))
          t)))))
 
@@ -150,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))
@@ -162,4 +154,5 @@ return nil."
 
 (provide 'cedet-global)
 
+;; arch-tag: 0d0d3ac2-91ef-4820-bb2b-1d59ccf38392
 ;;; cedet-global.el ends here