Mercurial > emacs

comparison lisp/ediff.el @ 49428:0f80cb4f9d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2003-01-25 Michael Kifer <kifer@cs.stonybrook.edu> * ediff.el (ediff-revision): better defaults. * ediff-vers.el (ediff-vc-latest-version): new function. (ediff-vc-internal): use latest version instead of working version.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sat, 25 Jan 2003 08:09:16 +0000
parents 1b4ba54b52de
children 37645a051842
comparison
equal deleted inserted replaced
49427:5c89d088d737 49428:0f80cb4f9d29
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch 1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
2 2
3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
6 ;; Created: February 2, 1994 6 ;; Created: February 2, 1994
7 ;; Keywords: comparing, merging, patching, tools, unix 7 ;; Keywords: comparing, merging, patching, tools, unix
8 8
9 (defconst ediff-version "2.77" "The current version of Ediff") 9 (defconst ediff-version "2.78" "The current version of Ediff")
10 (defconst ediff-date "March 5, 2002" "Date of last update") 10 (defconst ediff-date "January 25, 2003" "Date of last update")
11 11
12 12
13 ;; This file is part of GNU Emacs. 13 ;; This file is part of GNU Emacs.
14 14
15 ;; GNU Emacs is free software; you can redistribute it and/or modify 15 ;; GNU Emacs is free software; you can redistribute it and/or modify
1351 (buffer-name)))) 1351 (buffer-name))))
1352 (save-buffer (current-buffer))) 1352 (save-buffer (current-buffer)))
1353 (let (rev1 rev2) 1353 (let (rev1 rev2)
1354 (setq rev1 1354 (setq rev1
1355 (read-string 1355 (read-string
1356 (format "Version 1 to compare (default: %s's working version): " 1356 (format "Revision 1 to compare (default: %s's latest revision): "
1357 (file-name-nondirectory file))) 1357 (file-name-nondirectory file)))
1358 rev2 1358 rev2
1359 (read-string 1359 (read-string
1360 (format "Version 2 to compare (default: %s): " 1360 (format "Revision 2 to compare (default: %s's current state): "
1361 (file-name-nondirectory file)))) 1361 (file-name-nondirectory file))))
1362 (ediff-load-version-control) 1362 (ediff-load-version-control)
1363 (funcall 1363 (funcall
1364 (intern (format "ediff-%S-internal" ediff-version-control-package)) 1364 (intern (format "ediff-%S-internal" ediff-version-control-package))
1365 rev1 rev2 startup-hooks) 1365 rev1 rev2 startup-hooks)