Mercurial > emacs
view src/s/sol2-4.h @ 71337:7128a9839095
(init_from_display_pos): Don't set it->method and
overlay_string_index after pop_it. Add asserts.
(handle_stop): Look for overlay strings around a display string,
image, or composition. Handle properties on those strings.
(next_overlay_string): Don't set string, pos or method after pop_it.
(get_overlay_strings_1): Split from get_overlay_strings; don't
modify it if no overlay strings are found.
(get_overlay_strings): Use get_overlay_strings_1. Always set
it->string and it->method.
(push_it): Push it->image_id and it->method. Push it->object
instead of it->string if method is GET_FROM_IMAGE.
(pop_it): Pop it->image_id and it->method. Ppo it->object
instead of it->string if method is GET_FROM_IMAGE.
Reset it->current.string_pos if popped it->string is nil.
(reseat_1): Remove comment dated 19 May 2003. It expressed doubt
whether a given change was correct; but the change is correct.
Clear it->string_from_display_prop_p.
(set_iterator_to_next): Rely on it->method and it->image_id from
iterator stack, instead of setting them explicitly after pop_it.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 13 Jun 2006 22:45:00 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 cb1bfa1dca4f |
line wrap: on
line source
/* Handle Solaris 2.4. */ #include "sol2-3.h" #define SOLARIS2_4 /* Get rid of -traditional and let const really do its thing. */ #ifdef __GNUC__ #undef C_SWITCH_SYSTEM #undef const #endif /* __GNUC__ */ #undef LD_SWITCH_SYSTEM /* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet. Instead, dynamically check whether USE_MOTIF expands to something. */ #define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; } #ifndef __GNUC__ #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'` #else /* GCC */ /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX has anything in it. It can be empty. This works ok in temacs. */ #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'` #endif /* GCC */ /* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files are in this directory on Solaris 2.4. */ #define C_SWITCH_X_SYSTEM -I/usr/dt/include /* arch-tag: 6f0de37b-cfda-427a-a5ae-b83ed54aaae7 (do not change this comment) */