Mercurial > emacs

comparison lisp/ediff.el @ 65856:d64aeb0dc54e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst. (ediff-merge-region-is-non-clash-to-skip): previouslu called ediff-merge-region-is-non-clash. * ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use insert-buffer-substring. * ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for selecting files to patch. Also bug fixes. * ediff-util.el (ediff-setup): bug fix. (ediff-next-difference): Never skip clashes that differ in white space only. * ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame): check the menubar feature. * viper-cmd.el (viper-normalize-minor-mode-map-alist, viper-refresh-mode-line): use make-local-variable to localize some vars instead of make-variable-buffer-local. Suggested by Stefan Monnier. * viper-init.el (viper-make-variable-buffer-local): delete alias. (viper-restore-cursor-type,viper-set-insert-cursor-type): use make-local-variable instead of make-variable-buffer-local. Suggested by Stefan Monnier. * viper.el (viper-mode): don't use viper-make-variable-buffer-local. (viper-comint-mode-hook): use make-local-variable on require-final-newline. (viper-non-hook-settings): don't use make-variable-buffer-local.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Thu, 06 Oct 2005 00:09:49 +0000
parents ed770a0a7846
children 231622e4e399 aa89c814f853
comparison
equal deleted inserted replaced
65855:97ab21c68453 65856:d64aeb0dc54e
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.1" "The current version of Ediff") 10 (defconst ediff-version "2.80.1" "The current version of Ediff")
11 (defconst ediff-date "September 19, 2005" "Date of last update") 11 (defconst ediff-date "October 5, 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