Mercurial > emacs

comparison lisp/ediff.el @ 90233:ee12d75eb214

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 556-561) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 122-124) - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. - Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 25 Sep 2005 22:07:01 +0000
parents 2d92f5c9d6ae ed770a0a7846
children aa89c814f853
comparison
equal deleted inserted replaced
90232:eab32348047a 90233:ee12d75eb214
5 5
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; Created: February 2, 1994 7 ;; Created: February 2, 1994
8 ;; Keywords: comparing, merging, patching, tools, unix 8 ;; Keywords: comparing, merging, patching, tools, unix
9 9
10 (defconst ediff-version "2.80" "The current version of Ediff") 10 (defconst ediff-version "2.80.1" "The current version of Ediff")
11 (defconst ediff-date "July 8, 2005" "Date of last update") 11 (defconst ediff-date "September 19, 2005" "Date of last update")
12 12
13 13
14 ;; This file is part of GNU Emacs. 14 ;; This file is part of GNU Emacs.
15 15
16 ;; GNU Emacs is free software; you can redistribute it and/or modify 16 ;; GNU Emacs is free software; you can redistribute it and/or modify
1259 (if (stringp file) (find-file file)) 1259 (if (stringp file) (find-file file))
1260 (let (rev1 rev2) 1260 (let (rev1 rev2)
1261 (setq rev1 1261 (setq rev1
1262 (read-string 1262 (read-string
1263 (format 1263 (format
1264 "Version 1 to merge (default: %s's working version): " 1264 "Version 1 to merge (default %s's working version): "
1265 (if (stringp file) 1265 (if (stringp file)
1266 (file-name-nondirectory file) "current buffer"))) 1266 (file-name-nondirectory file) "current buffer")))
1267 rev2 1267 rev2
1268 (read-string 1268 (read-string
1269 (format 1269 (format
1270 "Version 2 to merge (default: %s): " 1270 "Version 2 to merge (default %s): "
1271 (if (stringp file) 1271 (if (stringp file)
1272 (file-name-nondirectory file) "current buffer")))) 1272 (file-name-nondirectory file) "current buffer"))))
1273 (ediff-load-version-control) 1273 (ediff-load-version-control)
1274 ;; ancestor-revision=nil 1274 ;; ancestor-revision=nil
1275 (funcall 1275 (funcall
1291 (if (stringp file) (find-file file)) 1291 (if (stringp file) (find-file file))
1292 (let (rev1 rev2 ancestor-rev) 1292 (let (rev1 rev2 ancestor-rev)
1293 (setq rev1 1293 (setq rev1
1294 (read-string 1294 (read-string
1295 (format 1295 (format
1296 "Version 1 to merge (default: %s's working version): " 1296 "Version 1 to merge (default %s's working version): "
1297 (if (stringp file) 1297 (if (stringp file)
1298 (file-name-nondirectory file) "current buffer"))) 1298 (file-name-nondirectory file) "current buffer")))
1299 rev2 1299 rev2
1300 (read-string 1300 (read-string
1301 (format 1301 (format
1302 "Version 2 to merge (default: %s): " 1302 "Version 2 to merge (default %s): "
1303 (if (stringp file) 1303 (if (stringp file)
1304 (file-name-nondirectory file) "current buffer"))) 1304 (file-name-nondirectory file) "current buffer")))
1305 ancestor-rev 1305 ancestor-rev
1306 (read-string 1306 (read-string
1307 (format 1307 (format
1308 "Ancestor version (default: %s's base revision): " 1308 "Ancestor version (default %s's base revision): "
1309 (if (stringp file) 1309 (if (stringp file)
1310 (file-name-nondirectory file) "current buffer")))) 1310 (file-name-nondirectory file) "current buffer"))))
1311 (ediff-load-version-control) 1311 (ediff-load-version-control)
1312 (funcall 1312 (funcall
1313 (intern (format "ediff-%S-merge-internal" ediff-version-control-package)) 1313 (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
1409 (buffer-name)))) 1409 (buffer-name))))
1410 (save-buffer (current-buffer))) 1410 (save-buffer (current-buffer)))
1411 (let (rev1 rev2) 1411 (let (rev1 rev2)
1412 (setq rev1 1412 (setq rev1
1413 (read-string 1413 (read-string
1414 (format "Revision 1 to compare (default: %s's latest revision): " 1414 (format "Revision 1 to compare (default %s's latest revision): "
1415 (file-name-nondirectory file))) 1415 (file-name-nondirectory file)))
1416 rev2 1416 rev2
1417 (read-string 1417 (read-string
1418 (format "Revision 2 to compare (default: %s's current state): " 1418 (format "Revision 2 to compare (default %s's current state): "
1419 (file-name-nondirectory file)))) 1419 (file-name-nondirectory file))))
1420 (ediff-load-version-control) 1420 (ediff-load-version-control)
1421 (funcall 1421 (funcall
1422 (intern (format "ediff-%S-internal" ediff-version-control-package)) 1422 (intern (format "ediff-%S-internal" ediff-version-control-package))
1423 rev1 rev2 startup-hooks) 1423 rev1 rev2 startup-hooks)