(vc-sccs-diff): Fix setting of oldvers and newvers.

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index f7d986028d6b558e7ea13a0c37319431cf20c950..ecad8f7432dbc6f4003817dced32c9da05c7bc41 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -55,9 +55,6 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html
 
 * BUGS
 
-** vc-sccs-diff is broken (see FIXME).
-http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-02/msg00121.html
-
 ** Does deleting frames run Lisp code?  If so, can we get rid of that?
 It is a dangerous design.
 http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01330.html

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 244995563a387b09f1f93752b7927ca4c58b0f70..31dc2347f979d217a6f035282b3e125730949f99 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-25  Glenn Morris  <rgm@gnu.org>
+
+       * vc-sccs.el (vc-sccs-diff): Fix setting of oldvers and newvers.
+
 2008-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * diff-mode.el (diff-file-junk-re): New const.

diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index a22a95521d5d68fcee142285b8e9e4ca95557941..0c1cc41ed64abd59c4346e4509b95a53ea397640 100644 (file)
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -7,8 +7,6 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id$
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -314,9 +312,8 @@ locked.  REV is the revision to check out."
 
 (defun vc-sccs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SCCS between two filesets."
-  ;; FIXME this is broken (`file' versus `files').
-  (setq oldvers (vc-sccs-lookup-triple file oldvers))
-  (setq newvers (vc-sccs-lookup-triple file newvers))
+  (setq oldvers (vc-sccs-lookup-triple (car files) oldvers))
+  (setq newvers (vc-sccs-lookup-triple (car files) newvers))
   (apply 'vc-do-command (or buffer "*vc-diff*")
         1 "vcdiff" (mapcar 'vc-name (vc-expand-dirs files))
          (append (list "-q"