Mercurial > emacs
changeset 106672:71b23891f0e7
Merge from mainline.
| author | Tassilo Horn <tassilo@member.fsf.org> |
|---|---|
| date | Mon, 28 Dec 2009 20:25:38 +0100 |
| parents | 04cdd0140564 (current diff) 1b4df859a104 (diff) |
| children | 17b93d093db8 |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 28 16:25:05 2009 +0100 +++ b/lisp/ChangeLog Mon Dec 28 20:25:38 2009 +0100 @@ -1,3 +1,9 @@ +2009-12-28 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-rcs.el (vc-rcs-register): Fix registering a specific version. + + * vc-bzr.el (vc-bzr-log-view-mode): Fix short log regexp. + 2009-12-28 Juanma Barranquero <lekktu@gmail.com> Supersede color.diff settings in git log (bug#5211).
--- a/lisp/vc-bzr.el Mon Dec 28 16:25:05 2009 +0100 +++ b/lisp/vc-bzr.el Mon Dec 28 20:25:38 2009 +0100 @@ -462,7 +462,7 @@ (set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-message-re) (if vc-short-log - "^ +\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" + "^ *\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) (set (make-local-variable 'log-view-font-lock-keywords) ;; log-view-font-lock-keywords is careful to use the buffer-local
--- a/lisp/vc-rcs.el Mon Dec 28 16:25:05 2009 +0100 +++ b/lisp/vc-rcs.el Mon Dec 28 20:25:38 2009 +0100 @@ -277,6 +277,8 @@ Automatically retrieve a read-only version of the file with keywords expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (let (subdir name) + ;; When REV is specified, we need to force using "-t-". + (when rev (unless comment (setq comment ""))) (dolist (file files) (and (not (file-exists-p (setq subdir (expand-file-name "RCS"