Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-726
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-727
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-728
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-729
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-730
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-731
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-732
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-733
   Update from CVS: man/calc.texi: Fix some TeX definitions.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-734
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-736
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-737
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-738
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-739
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-740
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-741
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-742
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-743
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-744
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-745
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-746
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-75
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-277

1 files changed, 31 insertions, 3 deletions

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index fafb5eff7cd..cbb951d60b7 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -447,10 +447,14 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
       (vc-insert-file (expand-file-name ".svn/entries" dirname)))
     (goto-char (point-min))
     (when (re-search-forward
-	   (concat "name=\"svn:this_dir\"[\n\t ]*"
-		   "\\([-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
+	   ;; Old `svn' used name="svn:dir", newer use just name="".
+	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
+		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
 		   "url=\"\\([^\"]+\\)\"") nil t)
-      (match-string 2))))
+      ;; This is not a hostname but a URL.  This may actually be considered
+      ;; as a feature since it allows vc-svn-stay-local to specify different
+      ;; behavior for different modules on the same server.
+      (match-string 1))))
 
 (defun vc-svn-parse-status (localp)
   "Parse output of \"svn status\" command in the current buffer.
@@ -505,6 +509,30 @@ essential information."
   (and (string-match "^[0-9]" tag)
        (not (string-match "[^0-9]" tag))))
 
+;; Support for `svn annotate'
+
+(defun vc-svn-annotate-command (file buf &optional rev)
+  (vc-svn-command buf 0 file "annotate" (if rev (concat "-r" rev))))
+
+(defun vc-svn-annotate-time-of-rev (rev)
+  ;; Arbitrarily assume 10 commmits per day.
+  (/ (string-to-number rev) 10.0))
+
+(defun vc-svn-annotate-current-time ()
+  (vc-svn-annotate-time-of-rev vc-annotate-parent-rev))
+
+(defconst vc-svn-annotate-re "[ \t]*\\([0-9]+\\)[ \t]+[^\t ]+ ")
+
+(defun vc-svn-annotate-time ()
+  (when (looking-at vc-svn-annotate-re)
+    (goto-char (match-end 0))
+    (vc-svn-annotate-time-of-rev (match-string 1))))
+
+(defun vc-svn-annotate-extract-revision-at-line ()
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at vc-svn-annotate-re) (match-string 1))))
+
 (provide 'vc-svn)
 
 ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d