[Emacs-commit] emacs man/viper.texi man/ediff.texi lisp/emulat...

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <address@hidden>  02/01/07 23:36:01

Modified files:
        man            : viper.texi ediff.texi 
        lisp/emulation : viper.el viper-util.el viper-mous.el 
                         viper-macs.el viper-keym.el viper-init.el 
                         viper-ex.el viper-cmd.el 
        lisp           : ediff.el ediff-wind.el ediff-vers.el 
                         ediff-util.el ediff-ptch.el ediff-mult.el 
                         ediff-merg.el ediff-init.el ediff-hook.el 
                         ediff-help.el ediff-diff.el ChangeLog 

Log message:
        2002-01-07  Michael Kifer  <address@hidden>
        
        * viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
        new macro that replaces viper-emacs-p and viper-xemacs-p in many
        cases. Used to reduce the number of warnings.
        
        * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
        (viper-standard-value): moved here from viper.el.
        (viper-set-unread-command-events): moved to viper-util.el
        (viper-check-minibuffer-overlay): make sure
        viper-minibuffer-overlay is moved to cover the entire input field.
        
        * viper-util.el:  use viper-cond-compile-for-xemacs-or-emacs.
        (viper-read-key-sequence, viper-set-unread-command-events,
        viper-char-symbol-sequence-p, viper-char-array-p): moved here.
        
        * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
        
        * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
        
        * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
        
        * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
        viper-event-vector-p): moved to viper-util.el
        
        * viper.el (viper-standard-value): moved to viper-cmd.el.
        Use viper-cond-compile-for-xemacs-or-emacs.
        
        * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
        
        * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
        
        * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
        macro designed to be used in many places where ediff-emacs-p or
        ediff-xemacs-p was previously used. Reduces the number of
        warnings.
        Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
        of ediff-xemacs-p.
        (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
        ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
        ediff-whitespace-diff-region-p, ediff-get-region-contents):
        moved to ediff-util.el.
        (ediff-event-key): moved here.
        
        * ediff-merge.el: got rid of unreferenced variables.
        
        * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
        
        * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
        (ediff-cleanup-mess): improved the way windows are set up after
        quitting ediff.
        (ediff-janitor): use ediff-dispose-of-variant-according-to-user.
        (ediff-dispose-of-variant-according-to-user): new function
        designed to be smarter and also understands indirect buffers.
        (ediff-highlight-diff-in-one-buffer,
        ediff-unhighlight-diff-in-one-buffer,
        ediff-unhighlight-diffs-totally-in-one-buffer,
        ediff-highlight-diff, ediff-highlight-diff,
        ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
        ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
        ediff-get-region-contents, ediff-make-current-diff-overlay):
        moved here.
        (ediff-format-bindings-of): new function by Hannu Koivisto
        <address@hidden>.
        (ediff-setup): make sure the merge buffer is always widened and
        modifiable.
        (ediff-write-merge-buffer-and-maybe-kill): refuse to write the
        result of a merge into a file visited by another buffer.
        (ediff-arrange-autosave-in-merge-jobs): check if the merge file
        is visited by another buffer and ask to save/delete that buffer.
        (ediff-verify-file-merge-buffer): new function to do the above.
        
        * ediff-vers.el: load ediff-init.el at compile time.
        
        * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
        
        * ediff.el (ediff-windows, ediff-regions-wordwise,
        ediff-regions-linewise): use indirect buffers to improve
        robustness and make it possible to compare regions of the same
        buffer (even overlapping regions).
        (ediff-clone-buffer-for-region-comparison,
        ediff-clone-buffer-for-window-comparison): new functions.
        (ediff-files-internal): refuse to compare identical files.
        (ediff-regions-internal): get rid of the warning about comparing
        regions of the same buffer.
        
        * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
        Plus the following fixes courtesy of Dave Love:
        Doc fixes.
        (ediff-word-1): Use word class and move - to the
        front per regexp documentation.
        (ediff-wordify): Bind forward-word-function outside loop.
        (ediff-copy-to-buffer): Use insert-buffer-substring rather than
        consing buffer contents.
        (ediff-goto-word): Move syntax table setting outside loop.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/man/viper.texi.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/man/ediff.texi.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper.el.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-util.el.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-mous.el.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-macs.el.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-keym.el.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-init.el.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-ex.el.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emulation/viper-cmd.el.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff.el.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-wind.el.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-vers.el.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-util.el.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-ptch.el.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-mult.el.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-merg.el.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-init.el.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-hook.el.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-help.el.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-diff.el.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.3300&tr2=1.3301&r1=text&r2=text