Merge from trunk before trying Unix TTY.

2 files changed, 5 insertions, 2 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 06ca0f3f8bc..a68d76fc4d1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,7 +2,7 @@
 
         * NEWS: Mention new bool-vector functionality.
 
-aaaa2013-09-15  Jan Djärv  <jan.h.d@swipnet.se>
+2013-09-15  Jan Djärv  <jan.h.d@swipnet.se>
 
         * NEWS: Mention the macfont backend.
 
diff --git a/etc/NEWS b/etc/NEWS
index da17f5ddba5..e26d18c93ed 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -154,6 +154,9 @@ not consume CPU cycles.
 some enhancements, like the ability to restore deleted frames.  Command
 `frame-configuration-to-register' is still available, but unbound.
 
+** The command `quail-help' is deleted.  Use `C-h C-\'
+(`describe-input-method') instead.
+
 
 * Editing Changes in Emacs 24.4
 
@@ -644,7 +647,7 @@ for something (not just adding elements to it), it ought not to affect you.
 *** `bool-vector-intersection'
 *** `bool-vector-set-difference'
 *** `bool-vector-not'
-*** `bool-vector-subset'
+*** `bool-vector-subsetp'
 *** `bool-vector-count-matches'
 *** `bool-vector-count-matches-at'