diff options
| author | Dan Nicolaescu | 2008-05-17 15:16:50 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-17 15:16:50 +0000 |
| commit | 9f94054523715db2cb186ab1f2b1ea83f42f5ccd (patch) | |
| tree | 2d927997d3dab694a17ee6383c1496291ba657bc | |
| parent | 62867b112dc73f1ff2fc5156398850f1c8edd33b (diff) | |
| download | emacs-9f94054523715db2cb186ab1f2b1ea83f42f5ccd.tar.gz emacs-9f94054523715db2cb186ab1f2b1ea83f42f5ccd.zip | |
(vc-hg-annotate-command): Allow white space before version number.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab6fb19c1ee..e4ea722702d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-05-17 David Hull <david@snap.com> (tiny change) | ||
| 2 | |||
| 3 | * vc-hg.el (vc-hg-annotate-command): Allow white space before | ||
| 4 | version number. | ||
| 5 | |||
| 1 | 2008-05-12 Simon Marshall <simon@gnu.org> | 6 | 2008-05-12 Simon Marshall <simon@gnu.org> |
| 2 | 7 | ||
| 3 | * obsolete/fast-lock.el (fast-lock-cache-directories): Remove "." | 8 | * obsolete/fast-lock.el (fast-lock-cache-directories): Remove "." |
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 77a52611ca7..7bd54528a6e 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -311,8 +311,8 @@ Optional arg VERSION is a version to annotate from." | |||
| 311 | (vc-hg-command buffer 0 file "annotate" "-d" "-n" (if version (concat "-r" version))) | 311 | (vc-hg-command buffer 0 file "annotate" "-d" "-n" (if version (concat "-r" version))) |
| 312 | (with-current-buffer buffer | 312 | (with-current-buffer buffer |
| 313 | (goto-char (point-min)) | 313 | (goto-char (point-min)) |
| 314 | (re-search-forward "^[0-9]") | 314 | (re-search-forward "^[ \t]*[0-9]") |
| 315 | (delete-region (point-min) (1- (point))))) | 315 | (delete-region (point-min) (match-beginning 0)))) |
| 316 | 316 | ||
| 317 | 317 | ||
| 318 | ;; The format for one line output by "hg annotate -d -n" looks like this: | 318 | ;; The format for one line output by "hg annotate -d -n" looks like this: |