* faces.el (tty-run-terminal-initialization): function changed (Stefan
commitf1e6674bb32058c7ef683d5f8f8ac67f99e96dd2
authorMichael Kifer <kifer@cs.stonybrook.edu>
Sun, 7 Jul 2013 19:35:54 +0000 (7 15:35 -0400)
committerMichael Kifer <kifer@cs.stonybrook.edu>
Sun, 7 Jul 2013 19:35:54 +0000 (7 15:35 -0400)
tree6cc51c44045bdbbd5ec28d52f4d212cb52ebaa49
parent1d44267275efdcee3c3584eaa79baccad54266b3
* faces.el  (tty-run-terminal-initialization): function changed (Stefan
Monnier's patch).

* viper.el (viper-emacs-state-mode-list): add egg-status-buffer-mode.
(viper-version): version update.
(viper-go-away,viper-setup-hooks): function changed (Stefan Monnier's
patch).
(viper--lookup-key,viper-catch-tty-ESC,viper-uncatch-tty-ESC,
viper-setup-ESC-to-escape): new functions (Stefan Monnier's
patch).

* viper-cmd.el: (viper-del-forward-char-in-insert): new function.
(viper-save-kill-buffer): check if buffer is modified.
(viper-envelop-ESC-key): function deleted (Stefan Monnier's patch).
(viper-intercept-ESC-key): function changed (Stefan Monnier's patch).

* viper-keym.el (viper-ESC-key): constant changed (Stefan Monnier's
patch).

* ediff.el (ediff-files-command,ediff3-files-command): new functions.
(ediff-merge-command,ediff-merge-with-ancestor-command): new functions.
(ediff-directories-command,ediff-directories3-command): new functions.
(ediff-merge-directories-command): new function.
(ediff-merge-directories-with-ancestor-command): new function.
All the above are command-line interfaces to ediff: facilitate calling
Emacs with the appropriate ediff functions invoked.
(ediff-version): version update.
lisp/ChangeLog
lisp/emulation/viper-cmd.el
lisp/emulation/viper-keym.el
lisp/emulation/viper.el
lisp/faces.el
lisp/vc/ediff.el