Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108

1 files changed, 10 insertions, 0 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 9d3ca6ea463..96db95a57e4 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -82,6 +82,9 @@ Boston, MA 02110-1301, USA.  */
 /* Modification count.  */
 #define MODIFF (current_buffer->text->modiff)
 
+/* Character modification count.  */
+#define CHARS_MODIFF (current_buffer->text->chars_modiff)
+
 /* Overlay modification count.  */
 #define OVERLAY_MODIFF (current_buffer->text->overlay_modiff)
 
@@ -147,6 +150,9 @@ Boston, MA 02110-1301, USA.  */
 /* Modification count.  */
 #define BUF_MODIFF(buf) ((buf)->text->modiff)
 
+/* Character modification count.  */
+#define BUF_CHARS_MODIFF(buf) ((buf)->text->chars_modiff)
+
 /* Modification count as of last visit or save.  */
 #define BUF_SAVE_MODIFF(buf) ((buf)->text->save_modiff)
 
@@ -410,6 +416,10 @@ struct buffer_text
                                    for this buffer.  It is incremented for
                                    each such event, and never otherwise
                                    changed.  */
+    int chars_modiff;           /* This is modified with character change
+                                   events for this buffer.  It is set to
+                                   modiff for each such event, and never
+                                   otherwise changed.  */
     int save_modiff;            /* Previous value of modiff, as of last
                                    time buffer visited or saved a file.  */