diff options
| author | Glenn Morris | 2013-07-08 23:59:45 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-07-08 23:59:45 -0700 |
| commit | 584ee3fc72260acb3cc83f4d1a047b733a08ca17 (patch) | |
| tree | 562e5a345c80518105441d35ba36226b62e78783 | |
| parent | 1b6006a514b19f042560a14ac8fdb3985d065bbf (diff) | |
| download | emacs-584ee3fc72260acb3cc83f4d1a047b733a08ca17.tar.gz emacs-584ee3fc72260acb3cc83f4d1a047b733a08ca17.zip | |
ChangeLog fix
| -rw-r--r-- | lisp/ChangeLog | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83f824edef0..f79c8f0e692 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -37,31 +37,32 @@ | |||
| 37 | * subr.el (read-quoted-char): Remove unused local variable `char'. | 37 | * subr.el (read-quoted-char): Remove unused local variable `char'. |
| 38 | 38 | ||
| 39 | 2013-07-07 Michael Kifer <kifer@cs.stonybrook.edu> | 39 | 2013-07-07 Michael Kifer <kifer@cs.stonybrook.edu> |
| 40 | Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 41 | 40 | ||
| 42 | * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook. | 41 | * ediff.el (ediff-version): Version update. |
| 43 | 42 | (ediff-files-command, ediff3-files-command, ediff-merge-command) | |
| 44 | * viper.el (viper-emacs-state-mode-list): Add egg-status-buffer-mode. | 43 | (ediff-merge-with-ancestor-command, ediff-directories-command) |
| 45 | (viper-version): Version update. | 44 | (ediff-directories3-command, ediff-merge-directories-command) |
| 46 | (viper-go-away, viper-setup-hooks): Function changed. | 45 | (ediff-merge-directories-with-ancestor-command): New functions. |
| 47 | (viper--lookup-key, viper-catch-tty-ESC, viper-uncatch-tty-ESC) | 46 | All are command-line interfaces to ediff: to facilitate calling |
| 48 | (viper-setup-ESC-to-escape): New functions. | 47 | Emacs with the appropriate ediff functions invoked. |
| 49 | 48 | ||
| 50 | * viper-cmd.el (viper-del-forward-char-in-insert): New function. | 49 | * viper-cmd.el (viper-del-forward-char-in-insert): New function. |
| 51 | (viper-save-kill-buffer): Check if buffer is modified. | 50 | (viper-save-kill-buffer): Check if buffer is modified. |
| 52 | (viper-envelop-ESC-key): Function deleted. | ||
| 53 | (viper-intercept-ESC-key): Function changed. | ||
| 54 | 51 | ||
| 55 | * viper-keym.el (viper-ESC-key): Constant changed. | 52 | * viper.el (viper-version): Version update. |
| 53 | (viper-emacs-state-mode-list): Add egg-status-buffer-mode. | ||
| 56 | 54 | ||
| 57 | * ediff.el (ediff-files-command, ediff3-files-command): New functions. | 55 | 2013-07-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 58 | (ediff-merge-command, ediff-merge-with-ancestor-command): New functions. | 56 | |
| 59 | (ediff-directories-command, ediff-directories3-command): New functions. | 57 | * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook. |
| 60 | (ediff-merge-directories-command): New function. | 58 | * viper-cmd.el (viper-envelop-ESC-key): Remove function. |
| 61 | (ediff-merge-directories-with-ancestor-command): New function. | 59 | (viper-intercept-ESC-key): Simplify. |
| 62 | All the above are command-line interfaces to ediff: facilitate calling | 60 | * viper-keym.el (viper-ESC-key): Make it a constant, don't use kbd. |
| 63 | Emacs with the appropriate ediff functions invoked. | 61 | * viper.el (viper--tty-ESC-filter, viper--lookup-key) |
| 64 | (ediff-version): Version update. | 62 | (viper-catch-tty-ESC, viper-uncatch-tty-ESC) |
| 63 | (viper-setup-ESC-to-escape): New functions. | ||
| 64 | (viper-go-away, viper-set-hooks): Call viper-setup-ESC-to-escape. | ||
| 65 | (viper-set-hooks): Do not modify flyspell-mode-hook. (Bug#13793) | ||
| 65 | 66 | ||
| 66 | 2013-07-07 Eli Zaretskii <eliz@gnu.org> | 67 | 2013-07-07 Eli Zaretskii <eliz@gnu.org> |
| 67 | 68 | ||