From: Miles Bader <miles@gnu.org>
Date: Fri, 11 Jun 2004 03:52:53 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397
X-Git-Tag: ttn-vms-21-2-B4~5835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c2222fafbe829e01a9bb54cb693d6d329644c37;p=emacs.git

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397

Work around vc-arch problems when building eshell

2004-06-10  Miles Bader  <miles@gnu.ai.mit.edu>

   * lisp/eshell/esh-module.el (eshell-load-defgroups): Bind
   `vc-handled-backends' to nil when opening files.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e89afc7e0dc..6dcc5c8fbbe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-10  Miles Bader  <miles@gnu.ai.mit.edu>
+
+	* eshell/esh-module.el (eshell-load-defgroups): Bind
+	`vc-handled-backends' to nil when opening files.
+
 2004-06-11  Juanma Barranquero  <lektu@terra.es>
 
 	* files.el (parse-colon-path, cd): Doc fixes (refer to
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 4c8ffceef78..dcbf77364f4 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,6 +1,6 @@
 ;;; esh-module.el --- Eshell modules
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
@@ -41,32 +41,33 @@ customizing the variable `eshell-modules-list'."
 
 (defun eshell-load-defgroups (&optional directory)
   "Load `defgroup' statements from Eshell's module files."
-  (with-current-buffer
-      (find-file-noselect (expand-file-name "esh-groups.el" directory))
-    (erase-buffer)
-    (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n")
-    (let ((files (directory-files (or directory
-				      (car command-line-args-left))
-				  nil "\\`em-.*\\.el\\'")))
-      (while files
-	(message "Loading defgroup from `%s'" (car files))
-	(let (defgroup)
-	  (catch 'handled
-	    (with-current-buffer (find-file-noselect (car files))
-	      (goto-char (point-min))
-	      (while t
-		(forward-sexp)
-		(if (eobp) (throw 'handled t))
-		(backward-sexp)
-		(let ((begin (point))
-		      (defg (looking-at "(defgroup")))
+  (let ((vc-handled-backends nil)) ; avoid VC fucking things up
+    (with-current-buffer
+	(find-file-noselect (expand-file-name "esh-groups.el" directory))
+      (erase-buffer)
+      (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n")
+      (let ((files (directory-files (or directory
+					(car command-line-args-left))
+				    nil "\\`em-.*\\.el\\'")))
+	(while files
+	  (message "Loading defgroup from `%s'" (car files))
+	  (let (defgroup)
+	    (catch 'handled
+	      (with-current-buffer (find-file-noselect (car files))
+		(goto-char (point-min))
+		(while t
 		  (forward-sexp)
-		  (if defg
-		      (setq defgroup (buffer-substring begin (point))))))))
-	  (if defgroup
-	      (insert defgroup "\n\n")))
-	(setq files (cdr files))))
-    (save-buffer)))
+		  (if (eobp) (throw 'handled t))
+		  (backward-sexp)
+		  (let ((begin (point))
+			(defg (looking-at "(defgroup")))
+		    (forward-sexp)
+		    (if defg
+			(setq defgroup (buffer-substring begin (point))))))))
+	    (if defgroup
+		(insert defgroup "\n\n")))
+	  (setq files (cdr files))))
+      (save-buffer))))
 
 ;; load the defgroup's for the standard extension modules, so that
 ;; documentation can be provided when the user customize's