diff lisp/ChangeLog @ 65856:d64aeb0dc54e

2005-10-05 Michael Kifer <[e-mail]> * 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.

--- a/lisp/ChangeLog	Wed Oct 05 17:20:04 2005 +0000
+++ b/lisp/ChangeLog	Thu Oct 06 00:09:49 2005 +0000
@@ -12,6 +12,39 @@
 	(gdb-locals-mode): Use `gdb-local-font-lock-keywords'
 	(gdb-threads-font-lock-keywords): New font lock keywords definition.
 	(gdb-threads-mode): Use `gdb-threads-font-lock-keywords'.
+	
[phone]  Michael Kifer  <[e-mail]>
+	
+	* 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.
 
 2005-10-05  Stefan Monnier  <[e-mail]>