aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKirk Kelsey2012-11-30 21:10:53 -0500
committerGlenn Morris2012-11-30 21:10:53 -0500
commit3ddbf803756fec0f773e0f5ba6f6a79044c44829 (patch)
tree69286eba4730478fe94b3df9d46240db2c4ba0cc /lisp
parent5781e949aef30c56532bed496e69d9f267ec27f8 (diff)
downloademacs-3ddbf803756fec0f773e0f5ba6f6a79044c44829.tar.gz
emacs-3ddbf803756fec0f773e0f5ba6f6a79044c44829.zip
* vc-hg.el (vc-hg-next-revision): Ensure use of default "tip" output format
Fixes: debbugs:6968
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ChangeLog.152
-rw-r--r--lisp/vc/vc-hg.el2
3 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 498a2ec6fa0..4dc694e486c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-12-01 Kirk Kelsey <kirk.kelsey@0x4b.net>
2
3 * vc/vc-hg.el (vc-hg-next-revision):
4 Ensure use of default "tip" output format. (Bug#6968)
5
12012-12-01 Kim F. Storm <storm@cua.dk> 62012-12-01 Kim F. Storm <storm@cua.dk>
2 7
3 * startup.el (fancy-startup-tail): Add a clickable link 8 * startup.el (fancy-startup-tail): Add a clickable link
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 83657a98bfd..b97cd80cdba 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -7979,7 +7979,7 @@
7979 Remember the buffers at head, rather than their name. 7979 Remember the buffers at head, rather than their name.
7980 * iswitchb.el (iswitchb-kill-buffer): Re-make the list. 7980 * iswitchb.el (iswitchb-kill-buffer): Re-make the list.
7981 7981
79822010-08-22 Kirk Kelsey <kirk.kelsey@0x4b.net> (tiny change) 79822010-08-22 Kirk Kelsey <kirk.kelsey@0x4b.net>
7983 Stefan Monnier <monnier@iro.umontreal.ca> 7983 Stefan Monnier <monnier@iro.umontreal.ca>
7984 7984
7985 * progmodes/make-mode.el (makefile-fill-paragraph): Account for the 7985 * progmodes/make-mode.el (makefile-fill-paragraph): Account for the
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 727fb08e388..50678fad075 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -384,7 +384,7 @@ Optional arg REVISION is a revision to annotate from."
384 (let ((newrev (1+ (string-to-number rev))) 384 (let ((newrev (1+ (string-to-number rev)))
385 (tip-revision 385 (tip-revision
386 (with-temp-buffer 386 (with-temp-buffer
387 (vc-hg-command t 0 nil "tip") 387 (vc-hg-command t 0 nil "tip" "--style=default")
388 (goto-char (point-min)) 388 (goto-char (point-min))
389 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):") 389 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
390 (string-to-number (match-string-no-properties 1))))) 390 (string-to-number (match-string-no-properties 1)))))