Merged from [email protected]

Patches applied:

 * [email protected]/emacs--devo--0--patch-413
   Update from CVS

 * [email protected]/emacs--devo--0--patch-414
   Update from CVS

 * [email protected]/emacs--devo--0--patch-415
   Update from CVS

 * [email protected]/emacs--devo--0--patch-416
   Update from CVS

 * [email protected]/emacs--devo--0--patch-417
   Update from CVS

 * [email protected]/emacs--devo--0--patch-418
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-419
   Update from CVS

 * [email protected]/emacs--devo--0--patch-420
   Update from CVS

 * [email protected]/emacs--devo--0--patch-421
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-422
   Update from CVS

 * [email protected]/emacs--devo--0--patch-423
   Update from CVS

 * [email protected]/emacs--devo--0--patch-424
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-425
   Update from CVS

 * [email protected]/emacs--devo--0--patch-426
   Update from CVS

 * [email protected]/emacs--devo--0--patch-427
   Update from CVS

 * [email protected]/emacs--devo--0--patch-428
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-429
   Update from CVS

 * [email protected]/emacs--devo--0--patch-430
   Update from CVS

 * [email protected]/emacs--devo--0--patch-431
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-432
   Update from CVS

 * [email protected]/emacs--devo--0--patch-433
   Update from CVS

 * [email protected]/emacs--devo--0--patch-434
   Update from CVS

 * [email protected]/emacs--devo--0--patch-435
   Update from CVS

 * [email protected]/emacs--devo--0--patch-436
   Update from CVS

 * [email protected]/emacs--devo--0--patch-437
   Update from CVS

 * [email protected]/emacs--devo--0--patch-438
   Update from CVS

 * [email protected]/emacs--devo--0--patch-439
   Update from CVS

 * [email protected]/emacs--devo--0--patch-440
   Update from CVS

 * [email protected]/emacs--devo--0--patch-441
   lisp/url/url-methods.el: Fix format error when http_proxy is empty string

 * [email protected]/emacs--devo--0--patch-442
   Update from CVS

 * [email protected]/emacs--devo--0--patch-443
   Update from CVS

 * [email protected]/emacs--devo--0--patch-444
   Update from CVS

 * [email protected]/emacs--devo--0--patch-445
   Update from CVS

 * [email protected]/emacs--devo--0--patch-446
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-447
   Update from CVS

 * [email protected]/emacs--devo--0--patch-448
   Update from CVS

 * [email protected]/emacs--devo--0--patch-449
   Update from CVS

 * [email protected]/emacs--devo--0--patch-450
   Update from CVS

 * [email protected]/emacs--devo--0--patch-451
   Update from CVS

 * [email protected]/emacs--devo--0--patch-452
   Update from CVS

 * [email protected]/emacs--devo--0--patch-453
   Update from CVS

 * [email protected]/emacs--devo--0--patch-454
   Update from CVS

 * [email protected]/emacs--devo--0--patch-455
   Update from CVS

 * [email protected]/emacs--devo--0--patch-456
   Update from CVS

 * [email protected]/emacs--devo--0--patch-457
   Update from CVS

 * [email protected]/emacs--devo--0--patch-458
   Update from CVS

 * [email protected]/emacs--devo--0--patch-459
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-460
   Update from CVS

 * [email protected]/emacs--devo--0--patch-461
   Update from CVS

 * [email protected]/emacs--devo--0--patch-462
   Update from CVS

 * [email protected]/emacs--devo--0--patch-463
   Update from CVS

 * [email protected]/emacs--devo--0--patch-464
   Update from CVS

 * [email protected]/emacs--devo--0--patch-465
   Update from CVS

 * [email protected]/emacs--devo--0--patch-466
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-467
   Update from CVS

 * [email protected]/emacs--devo--0--patch-468
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-469
   Update from CVS

 * [email protected]/emacs--devo--0--patch-470
   Update from CVS

 * [email protected]/emacs--devo--0--patch-471
   Update from CVS

 * [email protected]/emacs--devo--0--patch-472
   Update from CVS

 * [email protected]/emacs--devo--0--patch-473
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-128
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-129
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-130
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-131
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-132
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-133
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-134
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-135
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-136
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-137
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-138
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-139
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-140
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-141
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-142
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-143
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-144
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-145
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-146
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-147
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-148
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-149
   Update from CVS


git-archimport-id: [email protected]/emacs--multi-tty--0--patch-582

1 files changed, 28 insertions, 1 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 6a11569c85..f2f15a5474 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -387,6 +387,7 @@ The value is never nil.  */)
   BUF_ZV_BYTE (b) = BEG_BYTE;
   BUF_Z_BYTE (b) = BEG_BYTE;
   BUF_MODIFF (b) = 1;
+  BUF_CHARS_MODIFF (b) = 1;
   BUF_OVERLAY_MODIFF (b) = 1;
   BUF_SAVE_MODIFF (b) = 1;
   BUF_INTERVALS (b) = 0;
@@ -1161,6 +1162,31 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
 
   return make_number (BUF_MODIFF (buf));
 }
+
+DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick,
+       Sbuffer_chars_modified_tick, 0, 1, 0,
+       doc: /* Return BUFFER's character-change tick counter.
+Each buffer has a character-change tick counter, which is set to the
+value of the buffer's tick counter \(see `buffer-modified-tick'), each
+time text in that buffer is inserted or deleted.  By comparing the
+values returned by two individual calls of `buffer-chars-modified-tick',
+you can tell whether a character change occurred in that buffer in
+between these calls.  No argument or nil as argument means use current
+buffer as BUFFER.  */)
+     (buffer)
+     register Lisp_Object buffer;
+{
+  register struct buffer *buf;
+  if (NILP (buffer))
+    buf = current_buffer;
+  else
+    {
+      CHECK_BUFFER (buffer);
+      buf = XBUFFER (buffer);
+    }
+
+  return make_number (BUF_CHARS_MODIFF (buf));
+}
 
 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2,
        "sRename buffer (to new name): \nP",
@@ -5495,7 +5521,7 @@ A string is printed verbatim in the mode line except for %-constructs:
         or print Bottom or All.
   %n -- print Narrow if appropriate.
   %t -- visited file is text or binary (if OS supports this distinction).
-  %z -- print mnemonics of buffer, terminal, and keyboard coding systems.
+  %z -- print mnemonics of keyboard, terminal, and buffer coding systems.
   %Z -- like %z, but including the end-of-line format.
   %e -- print error message about full memory.
   %[ -- print one [ for each recursive editing level.  %] similar.
@@ -6074,6 +6100,7 @@ The function `kill-all-local-variables' runs this before doing anything else.  *
   defsubr (&Sbuffer_modified_p);
   defsubr (&Sset_buffer_modified_p);
   defsubr (&Sbuffer_modified_tick);
+  defsubr (&Sbuffer_chars_modified_tick);
   defsubr (&Srename_buffer);
   defsubr (&Sother_buffer);
   defsubr (&Sbuffer_enable_undo);