aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2008-02-25 08:14:21 +0000
committerGlenn Morris2008-02-25 08:14:21 +0000
commite46e905ae3b3d7a5d2708e6090dca70fe7a604f0 (patch)
tree61c100e95c7862f1ed38173223f8efa9cfff4ac6 /lisp
parentf52d2f9c301760f4554e2e800bf9908430b87bba (diff)
downloademacs-e46e905ae3b3d7a5d2708e6090dca70fe7a604f0.tar.gz
emacs-e46e905ae3b3d7a5d2708e6090dca70fe7a604f0.zip
(vc-sccs-diff): Fix setting of oldvers and newvers.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-sccs.el7
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 244995563a3..31dc2347f97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-02-25 Glenn Morris <rgm@gnu.org>
2
3 * vc-sccs.el (vc-sccs-diff): Fix setting of oldvers and newvers.
4
12008-02-25 Stefan Monnier <monnier@iro.umontreal.ca> 52008-02-25 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * diff-mode.el (diff-file-junk-re): New const. 7 * diff-mode.el (diff-file-junk-re): New const.
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index a22a95521d5..0c1cc41ed64 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -7,8 +7,6 @@
7;; Author: FSF (see vc.el for full credits) 7;; Author: FSF (see vc.el for full credits)
8;; Maintainer: Andre Spiegel <spiegel@gnu.org> 8;; Maintainer: Andre Spiegel <spiegel@gnu.org>
9 9
10;; $Id$
11
12;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
13 11
14;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -314,9 +312,8 @@ locked. REV is the revision to check out."
314 312
315(defun vc-sccs-diff (files &optional oldvers newvers buffer) 313(defun vc-sccs-diff (files &optional oldvers newvers buffer)
316 "Get a difference report using SCCS between two filesets." 314 "Get a difference report using SCCS between two filesets."
317 ;; FIXME this is broken (`file' versus `files'). 315 (setq oldvers (vc-sccs-lookup-triple (car files) oldvers))
318 (setq oldvers (vc-sccs-lookup-triple file oldvers)) 316 (setq newvers (vc-sccs-lookup-triple (car files) newvers))
319 (setq newvers (vc-sccs-lookup-triple file newvers))
320 (apply 'vc-do-command (or buffer "*vc-diff*") 317 (apply 'vc-do-command (or buffer "*vc-diff*")
321 1 "vcdiff" (mapcar 'vc-name (vc-expand-dirs files)) 318 1 "vcdiff" (mapcar 'vc-name (vc-expand-dirs files))
322 (append (list "-q" 319 (append (list "-q"