diff options
| author | Michael Kifer | 2013-07-07 15:35:54 -0400 |
|---|---|---|
| committer | Michael Kifer | 2013-07-07 15:35:54 -0400 |
| commit | f1e6674bb32058c7ef683d5f8f8ac67f99e96dd2 (patch) | |
| tree | 6cc51c44045bdbbd5ec28d52f4d212cb52ebaa49 /lisp/ChangeLog | |
| parent | 1d44267275efdcee3c3584eaa79baccad54266b3 (diff) | |
| download | emacs-f1e6674bb32058c7ef683d5f8f8ac67f99e96dd2.tar.gz emacs-f1e6674bb32058c7ef683d5f8f8ac67f99e96dd2.zip | |
* 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.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e8059101717..cdc1b25c7ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,33 @@ | |||
| 1 | 2013-07-07 Michael Kifer <kifer@cs.stonybrook.edu> | ||
| 2 | |||
| 3 | * faces.el (tty-run-terminal-initialization): function changed (Stefan | ||
| 4 | Monnier's patch). | ||
| 5 | |||
| 6 | * viper.el (viper-emacs-state-mode-list): add egg-status-buffer-mode. | ||
| 7 | (viper-version): version update. | ||
| 8 | (viper-go-away,viper-setup-hooks): function changed (Stefan Monnier's | ||
| 9 | patch). | ||
| 10 | (viper--lookup-key,viper-catch-tty-ESC,viper-uncatch-tty-ESC, | ||
| 11 | viper-setup-ESC-to-escape): new functions (Stefan Monnier's | ||
| 12 | patch). | ||
| 13 | |||
| 14 | * viper-cmd.el: (viper-del-forward-char-in-insert): new function. | ||
| 15 | (viper-save-kill-buffer): check if buffer is modified. | ||
| 16 | (viper-envelop-ESC-key): function deleted (Stefan Monnier's patch). | ||
| 17 | (viper-intercept-ESC-key): function changed (Stefan Monnier's patch). | ||
| 18 | |||
| 19 | * viper-keym.el (viper-ESC-key): constant changed (Stefan Monnier's | ||
| 20 | patch). | ||
| 21 | |||
| 22 | * ediff.el (ediff-files-command,ediff3-files-command): new functions. | ||
| 23 | (ediff-merge-command,ediff-merge-with-ancestor-command): new functions. | ||
| 24 | (ediff-directories-command,ediff-directories3-command): new functions. | ||
| 25 | (ediff-merge-directories-command): new function. | ||
| 26 | (ediff-merge-directories-with-ancestor-command): new function. | ||
| 27 | All the above are command-line interfaces to ediff: facilitate calling | ||
| 28 | Emacs with the appropriate ediff functions invoked. | ||
| 29 | (ediff-version): version update. | ||
| 30 | |||
| 1 | 2013-07-07 Eli Zaretskii <eliz@gnu.org> | 31 | 2013-07-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 32 | ||
| 3 | * simple.el (default-font-height, window-screen-lines): New | 33 | * simple.el (default-font-height, window-screen-lines): New |