aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS5
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1a33d958b50..4717d3011f5 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12014-09-13 Christopher Schmidt <ch@ristopher.com>
2
3 * NEWS: Mention prefix argument of `quick-calc'.
4
12014-10-20 Glenn Morris <rgm@gnu.org> 52014-10-20 Glenn Morris <rgm@gnu.org>
2 6
3 * Merge in all changes up to 24.4 release. 7 * Merge in all changes up to 24.4 release.
diff --git a/etc/NEWS b/etc/NEWS
index 42608f1d5a3..27b58fefbeb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -127,6 +127,11 @@ Unicode standards.
127 127
128* Changes in Specialized Modes and Packages in Emacs 25.1 128* Changes in Specialized Modes and Packages in Emacs 25.1
129 129
130** Calc
131+++
132*** If `quick-calc' is called with a prefix argument, insert the
133result of the calculation into the current buffer.
134
130** ElDoc 135** ElDoc
131*** New minor mode global-eldoc-mode 136*** New minor mode global-eldoc-mode
132*** eldoc-documentation-function now defaults to nil 137*** eldoc-documentation-function now defaults to nil