[Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/11/09 03:31:12

Index: vc-svn.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- vc-svn.el   9 Nov 2006 03:14:51 -0000       1.29
+++ vc-svn.el   9 Nov 2006 03:31:09 -0000       1.30
@@ -95,38 +95,22 @@
   ;; :group 'vc
   )
 
-(defvar vc-svn-admin-directory
-  (cond ((and (eq system-type 'windows-nt)
-             (getenv "SVN_ASP_DOT_NET_HACK"))
-        "_svn")
-       (t ".svn"))
-  "The name of the \".svn\" subdirectory or its equivalent.")
-
 ;;;
 ;;; State-querying functions
 ;;;
 
-;;; vc-svn-admin-directory is generally not defined when the
-;;; autoloaded function is called.
-
 ;;;###autoload (defun vc-svn-registered (f)
-;;;###autoload   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
-;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
-;;;###autoload                           "_svn")
-;;;###autoload                          (t ".svn"))))
 ;;;###autoload     (when (file-readable-p (expand-file-name
-;;;###autoload                             (concat admin-dir "/entries"))
-;;;###autoload                            (file-name-directory f))
+;;;###autoload                           ".svn/entries" (file-name-directory 
f)))
 ;;;###autoload       (load "vc-svn")
-;;;###autoload       (vc-svn-registered f))))
+;;;###autoload       (vc-svn-registered f)))
 
 ;;;###autoload
 (add-to-list 'completion-ignored-extensions ".svn/")
 
 (defun vc-svn-registered (file)
   "Check if FILE is SVN registered."
-  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
-                                                  "/entries")
+  (when (file-readable-p (expand-file-name ".svn/entries"
                                           (file-name-directory file)))
     (with-temp-buffer
       (cd (file-name-directory file))
@@ -222,7 +206,7 @@
 
 (defun vc-svn-responsible-p (file)
   "Return non-nil if SVN thinks it is responsible for FILE."
-  (file-directory-p (expand-file-name vc-svn-admin-directory
+  (file-directory-p (expand-file-name ".svn"
                                      (if (file-directory-p file)
                                          file
                                        (file-name-directory file)))))
@@ -490,9 +474,7 @@
     (let ((coding-system-for-read
           (or file-name-coding-system
               default-file-name-coding-system)))
-      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
-                                               "/entries")
-                                       dirname)))
+      (vc-insert-file (expand-file-name ".svn/entries" dirname)))
     (goto-char (point-min))
     (when (re-search-forward
           ;; Old `svn' used name="svn:dir", newer use just name="".