summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/server.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87520c2721b..22cc8f3a3ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-29 Juanma Barranquero <lekktu@gmail.com>
+
+ * server.el (server-process-filter): Doc fix.
+
2010-09-27 Drew Adams <drew.adams@oracle.com>
* dired.el (dired-save-positions): Doc fix. (Bug#7119)
diff --git a/lisp/server.el b/lisp/server.el
index e8a0125f554..265b422e957 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -857,7 +857,7 @@ The following commands are accepted by the client:
returned by -eval.
`-error DESCRIPTION'
- Signal an error (but continue processing).
+ Signal an error and delete process PROC.
`-suspend'
Suspend this terminal, i.e., stop the client process.