[Emacs-commit] emacs/lisp emulation/viper.el emulation/viper-i...

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Michael Kifer <address@hidden>  05/10/06 00:09:50

Modified files:
        lisp/emulation : viper.el viper-init.el viper-cmd.el 
        lisp           : ediff.el ediff-wind.el ediff-util.el 
                         ediff-ptch.el ediff-mult.el ediff-merg.el 
                         ChangeLog 

Log message:
        2005-10-05  Michael Kifer  <address@hidden>
        
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper.el.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-init.el.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-cmd.el.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff.el.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-wind.el.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-util.el.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-ptch.el.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-mult.el.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-merg.el.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.8281&tr2=1.8282&r1=text&r2=text