aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2004-11-03 14:18:53 +0000
committerThien-Thi Nguyen2004-11-03 14:18:53 +0000
commitcd227df34ce1a9716dad95acc3cccf602611ae39 (patch)
treebe74d9ead66a8d782a78e6ee45ef98aa1a447667
parentbc99a9685c7f646dc5e1db1404ad82ca2f6ef781 (diff)
downloademacs-cd227df34ce1a9716dad95acc3cccf602611ae39.tar.gz
emacs-cd227df34ce1a9716dad95acc3cccf602611ae39.zip
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-mcvs.el10
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7c72f3bd68..9e6bdf07cb9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12004-11-03 Thien-Thi Nguyen <ttn@gnu.org> 12004-11-03 Thien-Thi Nguyen <ttn@gnu.org>
2 2
3 * vc-cvs.el (vc-cvs-annotate-command):
4 Delete extraneous lines from beginning of buffer.
5 * vc-mcvs.el (vc-mcvs-annotate-command): Likewise.
6
3 * progmodes/grep.el (grep-default-command): Take empty string 7 * progmodes/grep.el (grep-default-command): Take empty string
4 for tag if all other methods yield nil. Shell-quote the tag. 8 for tag if all other methods yield nil. Shell-quote the tag.
5 9
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index d2ac776170f..ea577489239 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -26,9 +26,9 @@
26;;; Commentary: 26;;; Commentary:
27 27
28;; The home page of the Meta-CVS version control system is at 28;; The home page of the Meta-CVS version control system is at
29;; 29;;
30;; http://users.footprints.net/~kaz/mcvs.html 30;; http://users.footprints.net/~kaz/mcvs.html
31;; 31;;
32;; This is derived from vc-cvs.el as follows: 32;; This is derived from vc-cvs.el as follows:
33;; - cp vc-cvs.el vc-mcvs.el 33;; - cp vc-cvs.el vc-mcvs.el
34;; - Replace CVS/ with MCVS/CVS/ 34;; - Replace CVS/ with MCVS/CVS/
@@ -478,7 +478,11 @@ Optional arg VERSION is a version to annotate from."
478 (vc-mcvs-command 478 (vc-mcvs-command
479 buffer 479 buffer
480 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) 480 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
481 file "annotate" (if version (concat "-r" version)))) 481 file "annotate" (if version (concat "-r" version)))
482 (with-current-buffer buffer
483 (goto-char (point-min))
484 (re-search-forward "^[0-9]")
485 (delete-region (point-min) (1- (point)))))
482 486
483(defalias 'vc-mcvs-annotate-current-time 'vc-cvs-annotate-current-time) 487(defalias 'vc-mcvs-annotate-current-time 'vc-cvs-annotate-current-time)
484(defalias 'vc-mcvs-annotate-time 'vc-cvs-annotate-time) 488(defalias 'vc-mcvs-annotate-time 'vc-cvs-annotate-time)