mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-01 20:06:00 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Glenn Morris 2008-02-25 08:14:21 +00:00
parent f52d2f9c30
commit e46e905ae3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/FOR-RELEASE
View File

@ -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

4
lisp/ChangeLog
View File

@ -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.

7
lisp/vc-sccs.el
View File

@ -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"