aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2012-04-14 11:11:27 -0700
committerPaul Eggert2012-04-14 11:11:27 -0700
commit899b41b6e37a321e14559d2cf3c05ea3f8063811 (patch)
tree1ca101db0dfe3f96c4fb40eae537003f32e51557 /etc
parent3078ffdd457776d0b44b40a9581c36b56b780450 (diff)
parent3c80ae807c532597ba07ff028efc8add447f962e (diff)
downloademacs-899b41b6e37a321e14559d2cf3c05ea3f8063811.tar.gz
emacs-899b41b6e37a321e14559d2cf3c05ea3f8063811.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS5
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index e5157fd9da9..69e04cf9244 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -60,8 +60,11 @@ character when doing minibuffer filename prompts.
60** which-function-mode now applies to all applicable major modes by default. 60** which-function-mode now applies to all applicable major modes by default.
61 61
62** erc will look up server/channel names via auth-source and use the 62** erc will look up server/channel names via auth-source and use the
63 channel keys found, if any. 63channel keys found, if any.
64 64
65** The `server-auth-key' variable can be used to set a permanent
66shared key for Emacs Server.
67
65** Obsolete packages: 68** Obsolete packages:
66 69
67*** mailpost.el 70*** mailpost.el