aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-02-21 18:36:11 +0000
committerStefan Monnier2005-02-21 18:36:11 +0000
commitdae3211dbdeab1939c610a5138f0f08839bfe3fa (patch)
treeb1069ea5bbe28193a374a60440aec452435a9ded
parent9df747e1c99d8dbb21e46a5d4aa47c89d433d6cf (diff)
downloademacs-dae3211dbdeab1939c610a5138f0f08839bfe3fa.tar.gz
emacs-dae3211dbdeab1939c610a5138f0f08839bfe3fa.zip
(cvs-retrieve-revision): Fix thinko.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/pcvs.el5
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a41eadc355b..dd1bc36f284 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
12005-02-21 Stefan <monnier@iro.umontreal.ca> 12005-02-21 Wolfgang Jenkner <wjenkner@inode.at> (tiny change)
2
3 * pcvs.el (cvs-retrieve-revision): Fix thinko.
4
52005-02-21 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * frame.el (blink-cursor-mode): Use define-minor-mode. 7 * frame.el (blink-cursor-mode): Use define-minor-mode.
4 8
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index cd0cf0a2df1..2c0016dcc47 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1,7 +1,7 @@
1;;; pcvs.el --- a front-end to CVS 1;;; pcvs.el --- a front-end to CVS
2 2
3;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4;; 2000, 2002, 2003, 2004 Free Software Foundation, Inc. 4;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5 5
6;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com 6;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com
7;; (Per Cederqvist) ceder@lysator.liu.se 7;; (Per Cederqvist) ceder@lysator.liu.se
@@ -1687,8 +1687,7 @@ Signal an error if there is no backup file."
1687 (message "Retrieving revision %s..." rev) 1687 (message "Retrieving revision %s..." rev)
1688 ;; Discard stderr output to work around the CVS+SSH+libc 1688 ;; Discard stderr output to work around the CVS+SSH+libc
1689 ;; problem when stdout and stderr are the same. 1689 ;; problem when stdout and stderr are the same.
1690 ;; FIXME: this doesn't seem to make any difference :-( 1690 (let ((res (apply 'call-process cvs-program nil '(t nil) nil
1691 (let ((res (apply 'call-process cvs-program nil '(t . nil) nil
1692 "-q" "update" "-p" 1691 "-q" "update" "-p"
1693 ;; If `rev' is HEAD, don't pass it at all: 1692 ;; If `rev' is HEAD, don't pass it at all:
1694 ;; the default behavior is to get the head 1693 ;; the default behavior is to get the head