1 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3067bf36cf9..b17ebc895e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * server.el: Remove spurious * in docstrings.
+        (server-process-filter): Exit from recursive editing before processing
+        a new request.
+
 2006-11-27  J.D. Smith  <jdsmith@as.arizona.edu>
 
         * progmodes/hideshow.el (hs-already-hidden-p): Move to end of
@@ -97,8 +103,8 @@
 
 2006-11-25  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * progmodes/cc-vars.el (c-backslash-column): Mention
-        c-backslash-max-column in documentation for c-backslash-column.
+        * progmodes/cc-vars.el (c-backslash-column):
+        Mention c-backslash-max-column in documentation for c-backslash-column.
 
 2006-11-24  Lars Hansen  <larsh@soem.dk>