aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel1998-05-06 13:36:45 +0000
committerAndré Spiegel1998-05-06 13:36:45 +0000
commit0465c34f4139db80de7ea66e3111b0233a9160a9 (patch)
tree04e4b48f4d1be2505deacd266d9e257d05fee027
parentf91adf294316bc89f86b2d566525be27c6666831 (diff)
downloademacs-0465c34f4139db80de7ea66e3111b0233a9160a9.tar.gz
emacs-0465c34f4139db80de7ea66e3111b0233a9160a9.zip
(vc-consult-rcs-headers): Avoid bug with ci -k in RCS 5.7.
-rw-r--r--lisp/vc-hooks.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index a6b455f8eef..aeab27f5302 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -5,7 +5,7 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> 6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
7 7
8;; $Id: vc-hooks.el,v 1.106 1998/04/20 02:00:00 done Exp spiegel $ 8;; $Id: vc-hooks.el,v 1.107 1998/05/02 16:41:44 spiegel Exp spiegel $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -433,10 +433,11 @@ similarly for other version control systems."
433 (cond 433 (cond
434 ;; search for $Id or $Header 434 ;; search for $Id or $Header
435 ;; ------------------------- 435 ;; -------------------------
436 ((or (and (search-forward "$Id: " nil t) 436 ;; The ':\ 's below avoid an RCS 5.7 bug when checking in this file.
437 ((or (and (search-forward "$Id:\ " nil t)
437 (looking-at "[^ ]+ \\([0-9.]+\\) ")) 438 (looking-at "[^ ]+ \\([0-9.]+\\) "))
438 (and (progn (goto-char (point-min)) 439 (and (progn (goto-char (point-min))
439 (search-forward "$Header: " nil t)) 440 (search-forward "$Header:\ " nil t))
440 (looking-at "[^ ]+ \\([0-9.]+\\) "))) 441 (looking-at "[^ ]+ \\([0-9.]+\\) ")))
441 (goto-char (match-end 0)) 442 (goto-char (match-end 0))
442 ;; if found, store the revision number ... 443 ;; if found, store the revision number ...