aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJoakim Verona2013-01-11 00:03:43 +0100
committerJoakim Verona2013-01-11 00:03:43 +0100
commit26f277ba01010776e63623d446f182f5b6f23dd3 (patch)
treeaa2a9a9f31241f687902eafafc1535ea23bd1887 /etc
parent09708f70bd02e7a2edec79e1bcfd04fb9b7f48d3 (diff)
parenta778dd57d0da9004a72320f8082d4f6220f178e2 (diff)
downloademacs-26f277ba01010776e63623d446f182f5b6f23dd3.tar.gz
emacs-26f277ba01010776e63623d446f182f5b6f23dd3.zip
auto upstream
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog2
-rw-r--r--etc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1c057848ead..6c1a08cb670 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -85,7 +85,7 @@
85 85
862012-10-01 Eric Ludlam <zappo@gnu.org> 862012-10-01 Eric Ludlam <zappo@gnu.org>
87 87
88 * srecode/cc.srt, srecode/ede-autoconf.srt: New files. 88 * srecode/c.srt, srecode/ede-autoconf.srt: New files.
89 89
90 * srecode/cpp.srt: Move parts to c.srt. 90 * srecode/cpp.srt: Move parts to c.srt.
91 91
diff --git a/etc/NEWS b/etc/NEWS
index 29e0d5a9fe5..52429a3e21d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -66,6 +66,9 @@ bound to <f11> and M-<f10>, respectively.
66 66
67* Changes in Specialized Modes and Packages in Emacs 24.4 67* Changes in Specialized Modes and Packages in Emacs 24.4
68 68
69** completing-read-multiple's separator can now be a regexp.
70The default separator is changed to allow surrounding spaces around the comma.
71
69** Battery 72** Battery
70 73
71*** Battery information via the BSD `apm' utility is now supported. 74*** Battery information via the BSD `apm' utility is now supported.