[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: |
Wed, 27 Feb 2008 22:48:44 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 08/02/27 22:48:44
Index: dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- dispextern.h 26 Feb 2008 18:18:03 -0000 1.239
+++ dispextern.h 27 Feb 2008 22:48:44 -0000 1.240
@@ -418,7 +418,7 @@
/* Is GLYPH a space? */
#define CHAR_GLYPH_SPACE_P(GLYPH) \
- (GLYPH_FROM_CHAR_GLYPH ((GLYPH)) == SPACEGLYPH)
+ ((GLYPH).u.ch == SPACEGLYPH)
/* Are glyph slices of glyphs *X and *Y equal */
@@ -465,18 +465,25 @@
#define SET_CHAR_GLYPH_FROM_GLYPH(GLYPH, FROM) \
SET_CHAR_GLYPH ((GLYPH), \
- FAST_GLYPH_CHAR ((FROM)), \
- FAST_GLYPH_FACE ((FROM)), \
+ GLYPH_CHAR ((FROM)), \
+ GLYPH_FACE ((FROM)), \
0)
/* Construct a glyph code from a character glyph GLYPH. If the
character is multibyte, return -1 as we can't use glyph table for a
multibyte character. */
-#define GLYPH_FROM_CHAR_GLYPH(GLYPH) \
- ((GLYPH).u.ch < 256 \
- ? ((GLYPH).u.ch | ((GLYPH).face_id << CHARACTERBITS)) \
- : -1)
+#define SET_GLYPH_FROM_CHAR_GLYPH(G, GLYPH) \
+ do \
+ { \
+ if ((GLYPH).u.ch < 256) \
+ SET_GLYPH ((G), (GLYPH).u.ch, ((GLYPH).face_id)); \
+ else \
+ SET_GLYPH ((G), -1, 0); \
+ } \
+ while (0)
+
+#define GLYPH_INVALID_P(GLYPH) (GLYPH_CHAR (GLYPH) < 0)
/* Is GLYPH a padding glyph? */
@@ -3017,7 +3024,7 @@
void init_display P_ ((void));
void syms_of_display P_ ((void));
extern Lisp_Object Qredisplay_dont_pause;
-GLYPH spec_glyph_lookup_face P_ ((struct window *, GLYPH));
+void spec_glyph_lookup_face P_ ((struct window *, GLYPH *));
/* Defined in terminal.c */
- [Emacs-diffs] Changes to emacs/src/dispextern.h,v, Miles Bader, 2008/02/01
- [Emacs-diffs] Changes to emacs/src/dispextern.h,v, Stefan Monnier, 2008/02/22
- [Emacs-diffs] Changes to emacs/src/dispextern.h,v, Stefan Monnier, 2008/02/24
- [Emacs-diffs] Changes to emacs/src/dispextern.h,v, Kenichi Handa, 2008/02/24
- [Emacs-diffs] Changes to emacs/src/dispextern.h,v, Stefan Monnier, 2008/02/26
- [Emacs-diffs] Changes to emacs/src/dispextern.h,v,
Kim F. Storm <=