From: Nick Roberts Date: Tue, 10 Feb 2009 06:03:07 +0000 (+0000) Subject: (vc-svn-after-dir-status): Use shy group for revision X-Git-Tag: emacs-pretest-23.0.91~309 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af02d73901bd7ffd1c50e31125de290593ccd468;p=emacs.git (vc-svn-after-dir-status): Use shy group for revision number as it isn't present for unregistered files. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5addc9374a..ba87f116101 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2009-02-10 Nick Roberts + + * vc-svn.el (vc-svn-after-dir-status): Use shy group for revision + number as it isn't present for unregistered files. + + * vc-dir.el (vc-dir-find-file-other-window): Allow mouse events. + (vc-dir-mouse-map): New keymap. + (vc-default-dir-printer): Use it locally. + 2009-02-10 Glenn Morris * speedbar.el: Avoid messing up font-lock-global-modes. @@ -193,12 +202,6 @@ (turn-off-xterm-mouse-tracking-on-terminal): Do not turn on the mode on the initial terminal. -2009-02-05 Nick Roberts - - * vc-dir.el (vc-dir-find-file-other-window): Allow mouse events. - (vc-dir-mouse-map): New keymap. - (vc-default-dir-printer): Use it locally. - 2009-02-05 Glenn Morris * mail/rmail.el (rmail-what-message, rmail-duplicate-message): diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index e79ef9a0fa6..a2e455a8702 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -164,7 +164,7 @@ want to force an empty list of arguments, use t." (?? . unregistered) ;; This is what vc-svn-parse-status does. (?~ . edited))) - (re (if remote "^\\(.\\)..... \\([ *]\\) +[-0-9]+ +\\(.*\\)$" + (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)? +\\(.*\\)$" ;; Subexp 2 is a dummy in this case, so the numbers match. "^\\(.\\)....\\(.\\) \\(.*\\)$")) result)