changeset 109980:afecdfb04036

merge trunk
author Kenichi Handa <handa@m17n.org>
date Wed, 25 Aug 2010 15:06:14 +0900
parents 35753506eda5 (current diff) 27e6f236ba8d (diff)
children 55e2c5cbf29c ab4ed8456c4e
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/lispref/ChangeLog	Wed Aug 25 14:58:15 2010 +0900
+++ b/doc/lispref/ChangeLog	Wed Aug 25 15:06:14 2010 +0900
@@ -1,3 +1,7 @@
+2010-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* processes.texi (Filter Functions): Fix last change.
+
 2010-08-24  Markus Triska  <triska@gmx.at>
 
 	* processes.texi (Filter Functions): Use `buffer-live-p' instead
--- a/doc/lispref/processes.texi	Wed Aug 25 14:58:15 2010 +0900
+++ b/doc/lispref/processes.texi	Wed Aug 25 15:06:14 2010 +0900
@@ -1286,7 +1286,7 @@
 @end group
 @group
         (save-excursion
-          ;;  <at> r{Insert the text, advancing the process marker.}
+          ;;  @r{Insert the text, advancing the process marker.}
           (goto-char (process-mark proc))
           (insert string)
           (set-marker (process-mark proc) (point)))