[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispextern.h,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispextern.h,v |
Date: |
Fri, 16 Jun 2006 11:53:00 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 06/06/16 11:53:00
Index: dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- dispextern.h 13 Jun 2006 22:45:21 -0000 1.219
+++ dispextern.h 16 Jun 2006 11:53:00 -0000 1.220
@@ -1932,7 +1932,21 @@
int stop_charpos;
int face_id;
Lisp_Object string;
+ union {
+ struct {
+ Lisp_Object object;
+ struct it_slice slice;
int image_id;
+ } image;
+ struct {
+ Lisp_Object object;
+ int c, len;
+ int cmp_id, cmp_len;
+ } comp;
+ struct {
+ Lisp_Object object;
+ } stretch;
+ } u;
struct display_pos pos;
int end_charpos;
int string_nchars;
@@ -1941,7 +1955,6 @@
unsigned multibyte_p : 1;
unsigned string_from_display_prop_p : 1;
unsigned display_ellipsis_p : 1;
- struct it_slice slice;
Lisp_Object space_width;
short voffset;
Lisp_Object font_height;