Mercurial > emacs

comparison lisp/ediff.el @ 36857:f6386773ce30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu> * ediff-util.el: Copyright years. (ediff-choose-syntax-table): New function. (ediff-setup): Use ediff-choose-syntax-table. * ediff-init.el (ediff-with-syntax-table): New macro, uses with-syntax-table. * ediff.el: Date of last update, copyright years. * ediff-wind (ediff-setup-control-frame): Nill->nil. * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy of Scott Bronson. (ex-cmd-assoc,ex-cmd-one-letr): New functions. (viper-check-sub,viper-get-ex-command,viper-execute-ex-command): Deleted functions. (viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new ex-token-list. * viper-util.el: Spaces, indentation. * viper.el: Changed version, modification time.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sat, 17 Mar 2001 18:59:39 +0000
parents be20c22dc16d
children 10482dd382e7
comparison
equal deleted inserted replaced
36856:e11fd97820c0 36857:f6386773ce30
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 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.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.75" "The current version of Ediff") 9 (defconst ediff-version "2.75" "The current version of Ediff")
10 (defconst ediff-date "January 19, 2001" "Date of last update") 10 (defconst ediff-date "March 5, 2001" "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