Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-105
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-106
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-107
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-108
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-109
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-110
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-37
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-516

1 files changed, 6 insertions, 0 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 737877f15de..60aa3e7aaed 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -739,6 +739,12 @@ struct buffer
   /* Non-nil means indicate buffer boundaries and scrolling.  */
   Lisp_Object indicate_buffer_boundaries;
 
+  /* Logical to physical fringe bitmap mappings.  */
+  Lisp_Object fringe_indicator_alist;
+
+  /* Logical to physical cursor bitmap mappings.  */
+  Lisp_Object fringe_cursor_alist;
+
   /* Time stamp updated each time this buffer is displayed in a window.  */
   Lisp_Object display_time;