Mercurial > emacs

comparison lisp/ediff.el @ 93773:d7554c14325c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu> * viper*.el (viper-search-wrap-around-t): replace with viper-search-wrap-around. * ediff*.el: replace 3-argument 'require' statements with 1-argument ones (wrapped in if's). For compatibility with the current stable version of XEmacs.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sun, 06 Apr 2008 19:26:02 +0000
parents 6523ed37006c
children 1e3a407766b9
comparison
equal deleted inserted replaced
93772:061a2121a7e8 93773:d7554c14325c
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.81.2" "The current version of Ediff") 10 (defconst ediff-version "2.81.2" "The current version of Ediff")
11 (defconst ediff-date "January 09, 2008" "Date of last update") 11 (defconst ediff-date "April 06, 2008" "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