merge from trunk

2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 035a4169399..013e181c406 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
 
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
+        * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
         * editfns.c (insert_before_markers): Mention overlay in the doc string.
 
         * marker.c (set_marker): Remove documentation of undefined behavior.
diff --git a/src/buffer.c b/src/buffer.c
index f6e61cd28ee..d9525f247d0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6115,7 +6115,7 @@ An entry (apply FUN-NAME . ARGS) means undo the change with
 
 An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo
 in the active region.  BEG and END is the range affected by this entry
-and DELTA is the number of bytes added or deleted in that range by
+and DELTA is the number of characters added or deleted in that range by
 this change.
 
 An entry (MARKER . DISTANCE) indicates that the marker MARKER