comparison lisp/vc-svn.el @ 83644:0ece58f6e0aa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 803-813) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 51-58) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-236) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
author Miles Bader <miles@gnu.org>
date Sun, 15 Jul 2007 02:05:20 +0000
parents 0a2fb180b0a5
children 1b5dfd1b9ca0 988f1edc9674
comparison
equal deleted inserted replaced
83643:70b38dec13a1 83644:0ece58f6e0aa
490 (goto-char (point-min)) 490 (goto-char (point-min))
491 (when (re-search-forward 491 (when (re-search-forward
492 ;; Old `svn' used name="svn:this_dir", newer use just name="". 492 ;; Old `svn' used name="svn:this_dir", newer use just name="".
493 (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*" 493 (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
494 "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?" 494 "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
495 "url=\"\\([^\"]+\\)\"") nil t) 495 "url=\"\\(?1:[^\"]+\\)\""
496 ;; Yet newer ones don't use XML any more.
497 "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
496 ;; This is not a hostname but a URL. This may actually be considered 498 ;; This is not a hostname but a URL. This may actually be considered
497 ;; as a feature since it allows vc-svn-stay-local to specify different 499 ;; as a feature since it allows vc-svn-stay-local to specify different
498 ;; behavior for different modules on the same server. 500 ;; behavior for different modules on the same server.
499 (match-string 1)))) 501 (match-string 1))))
500 502