From e46e905ae3b3d7a5d2708e6090dca70fe7a604f0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 25 Feb 2008 08:14:21 +0000 Subject: [PATCH] (vc-sccs-diff): Fix setting of oldvers and newvers. --- admin/FOR-RELEASE | 3 --- lisp/ChangeLog | 4 ++++ lisp/vc-sccs.el | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index f7d986028d6..ecad8f7432d 100644 --- 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 244995563a3..31dc2347f97 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-25 Glenn Morris + + * vc-sccs.el (vc-sccs-diff): Fix setting of oldvers and newvers. + 2008-02-25 Stefan Monnier * 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 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel -;; $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" -- 2.11.4.GIT