Merge from trunk.

4 files changed, 14 insertions, 2 deletions

diff --git a/etc/.gitignore b/etc/.gitignore
index 618d09438f8..8e12acbee0c 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,3 +1,2 @@
 DOC
-DOC-*
 icons/
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 46564aeebcd..f4f17ac29cf 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * .gitignore: Don't ignore DOC-* any more.
+
 2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
diff --git a/etc/NEWS b/etc/NEWS
index 144adf15506..5f238988820 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -282,6 +282,12 @@ when possible.
 *** Handlers for `file-acl' and `set-file-acl' for remote machines
 which support POSIX ACLs.
 
+** VHDL mode
+
+*** New options: `vhdl-actual-generic-name', `vhdl-beautify-options'.
+
+*** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'.
+
 ** Woman
 
 *** The commands `woman-default-faces' and `woman-monochrome-faces'
@@ -327,6 +333,9 @@ It is layered as:
 
 * Incompatible Lisp Changes in Emacs 24.4
 
+** Default process filers and sentinels are not nil any more.
+Instead they default to a function which does what the nil value used to do.
+
 ** `read-event' does not return decoded chars in ttys any more.
 Just as was the case in Emacs-22 and before, decoding of tty input according to
 keyboard-coding-system is not performed in read-event any more.  But contrary
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 0cfc0ad0c14..7556c23daee 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -551,7 +551,7 @@ with CEDET 1.0pre4) or later.
 
 *** Self-documentation messages are garbled.
 
-This means that the file `etc/DOC-...' doesn't properly correspond
+This means that the file `etc/DOC' doesn't properly correspond
 with the Emacs executable.  Redumping Emacs and then installing the
 corresponding pair of files should fix the problem.