aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-06-25 20:34:54 -0400
committerGlenn Morris2014-06-25 20:34:54 -0400
commit92f1664d5e0e9f99093cde778ac18756cdc72bcf (patch)
tree045f0b42a1735d968f042bb640d540a5ea8509aa
parent83d208a5dd293caae48beb9d36dd45529375631a (diff)
downloademacs-92f1664d5e0e9f99093cde778ac18756cdc72bcf.tar.gz
emacs-92f1664d5e0e9f99093cde778ac18756cdc72bcf.zip
ChangeLog fixes.
Not sure how M-x authors missed these so far...
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/ChangeLog.162
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 386e0660c5f..1c0f4b03a99 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10686,7 +10686,7 @@
10686 10686
106872013-07-07 Michael Kifer <kifer@cs.stonybrook.edu> 106872013-07-07 Michael Kifer <kifer@cs.stonybrook.edu>
10688 10688
10689 * ediff.el (ediff-version): Version update. 10689 * vc/ediff.el (ediff-version): Version update.
10690 (ediff-files-command, ediff3-files-command, ediff-merge-command) 10690 (ediff-files-command, ediff3-files-command, ediff-merge-command)
10691 (ediff-merge-with-ancestor-command, ediff-directories-command) 10691 (ediff-merge-with-ancestor-command, ediff-directories-command)
10692 (ediff-directories3-command, ediff-merge-directories-command) 10692 (ediff-directories3-command, ediff-merge-directories-command)
@@ -10694,19 +10694,21 @@
10694 All are command-line interfaces to ediff: to facilitate calling 10694 All are command-line interfaces to ediff: to facilitate calling
10695 Emacs with the appropriate ediff functions invoked. 10695 Emacs with the appropriate ediff functions invoked.
10696 10696
10697 * viper-cmd.el (viper-del-forward-char-in-insert): New function. 10697 * emulation/viper-cmd.el (viper-del-forward-char-in-insert):
10698 New function.
10698 (viper-save-kill-buffer): Check if buffer is modified. 10699 (viper-save-kill-buffer): Check if buffer is modified.
10699 10700
10700 * viper.el (viper-version): Version update. 10701 * emulation/viper.el (viper-version): Version update.
10701 (viper-emacs-state-mode-list): Add egg-status-buffer-mode. 10702 (viper-emacs-state-mode-list): Add egg-status-buffer-mode.
10702 10703
107032013-07-07 Stefan Monnier <monnier@iro.umontreal.ca> 107042013-07-07 Stefan Monnier <monnier@iro.umontreal.ca>
10704 10705
10705 * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook. 10706 * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook.
10706 * viper-cmd.el (viper-envelop-ESC-key): Remove function. 10707 * emulation/viper-cmd.el (viper-envelop-ESC-key): Remove function.
10707 (viper-intercept-ESC-key): Simplify. 10708 (viper-intercept-ESC-key): Simplify.
10708 * viper-keym.el (viper-ESC-key): Make it a constant, don't use kbd. 10709 * emulation/viper-keym.el (viper-ESC-key): Make it a constant,
10709 * viper.el (viper--tty-ESC-filter, viper--lookup-key) 10710 don't use kbd.
10711 * emulation/viper.el (viper--tty-ESC-filter, viper--lookup-key)
10710 (viper-catch-tty-ESC, viper-uncatch-tty-ESC) 10712 (viper-catch-tty-ESC, viper-uncatch-tty-ESC)
10711 (viper-setup-ESC-to-escape): New functions. 10713 (viper-setup-ESC-to-escape): New functions.
10712 (viper-go-away, viper-set-hooks): Call viper-setup-ESC-to-escape. 10714 (viper-go-away, viper-set-hooks): Call viper-setup-ESC-to-escape.
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 534f91f61ce..2e8c6df24a6 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -8501,7 +8501,7 @@
8501 8501
85022012-07-25 Jay Belanger <jay.p.belanger@gmail.com> 85022012-07-25 Jay Belanger <jay.p.belanger@gmail.com>
8503 8503
8504 * calc-alg.el (math-simplify-divide): Don't cross multiply 8504 * calc/calc-alg.el (math-simplify-divide): Don't cross multiply
8505 in an equation when the lhs is a variable. 8505 in an equation when the lhs is a variable.
8506 8506
85072012-07-24 Julien Danjou <julien@danjou.info> 85072012-07-24 Julien Danjou <julien@danjou.info>