aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorEli Zaretskii2010-02-20 05:25:57 -0500
committerEli Zaretskii2010-02-20 05:25:57 -0500
commitd77fbdad04a1e3f8e4fa1038508379a5f5b8e67e (patch)
treed20e47abe63806acbc519454e597ab7dc6ced017 /src/dispextern.h
parentae9784892b7c9005b792b026d466af105bcb655f (diff)
parent0f00e9485d96c308b126553bd1b90ce4e64f1a1d (diff)
downloademacs-d77fbdad04a1e3f8e4fa1038508379a5f5b8e67e.tar.gz
emacs-d77fbdad04a1e3f8e4fa1038508379a5f5b8e67e.zip
Merge from mainline.
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index e281fe6d925..2b581fd0eaa 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2385,8 +2385,8 @@ struct it
2385 && ((IT)->c == '\n' \ 2385 && ((IT)->c == '\n' \
2386 || ((IT)->c == '\r' && (IT)->selective))) 2386 || ((IT)->c == '\r' && (IT)->selective)))
2387 2387
2388/* Call produce_glyphs or produce_glyphs_hook, if set. Shortcut to 2388/* Call produce_glyphs or FRAME_RIF->produce_glyphs, if set. Shortcut
2389 avoid the function call overhead. */ 2389 to avoid the function call overhead. */
2390 2390
2391#define PRODUCE_GLYPHS(IT) \ 2391#define PRODUCE_GLYPHS(IT) \
2392 do { \ 2392 do { \