diff options
| author | Paul Eggert | 2012-07-12 20:50:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-12 20:50:58 -0700 |
| commit | 1a95276708930fe579fff152c590df875c29570e (patch) | |
| tree | ff7f9bba778abb2cb9817876a3871255695cb8ab | |
| parent | 32fb4bb69b61a2ef5b1d5d1e17e6915ba5d23e5b (diff) | |
| download | emacs-1a95276708930fe579fff152c590df875c29570e.tar.gz emacs-1a95276708930fe579fff152c590df875c29570e.zip | |
* xdisp.c (produce_special_glyphs): Now static.
* dispextern.h (produce_special_glyphs): Remove decl.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispextern.h | 1 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5d19ea0c782..0ce8839c405 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-13 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * xdisp.c (produce_special_glyphs): Now static. | ||
| 4 | * dispextern.h (produce_special_glyphs): Remove decl. | ||
| 5 | |||
| 1 | 2012-07-13 Glenn Morris <rgm@gnu.org> | 6 | 2012-07-13 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * s/bsd-common, s/cygwin.h: Remove empty files. | 8 | * s/bsd-common, s/cygwin.h: Remove empty files. |
diff --git a/src/dispextern.h b/src/dispextern.h index b08d6107b80..5bdf943466b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -3065,7 +3065,6 @@ extern ptrdiff_t compute_display_string_pos (struct text_pos *, | |||
| 3065 | extern ptrdiff_t compute_display_string_end (ptrdiff_t, | 3065 | extern ptrdiff_t compute_display_string_end (ptrdiff_t, |
| 3066 | struct bidi_string_data *); | 3066 | struct bidi_string_data *); |
| 3067 | extern void produce_stretch_glyph (struct it *); | 3067 | extern void produce_stretch_glyph (struct it *); |
| 3068 | extern void produce_special_glyphs (struct it *, enum display_element_type); | ||
| 3069 | 3068 | ||
| 3070 | #ifdef HAVE_WINDOW_SYSTEM | 3069 | #ifdef HAVE_WINDOW_SYSTEM |
| 3071 | 3070 | ||
diff --git a/src/xdisp.c b/src/xdisp.c index a03de37dba9..4fa3c375ea7 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -951,6 +951,7 @@ static void append_stretch_glyph (struct it *, Lisp_Object, | |||
| 951 | 951 | ||
| 952 | #endif /* HAVE_WINDOW_SYSTEM */ | 952 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 953 | 953 | ||
| 954 | static void produce_special_glyphs (struct it *, enum display_element_type); | ||
| 954 | static void show_mouse_face (Mouse_HLInfo *, enum draw_glyphs_face); | 955 | static void show_mouse_face (Mouse_HLInfo *, enum draw_glyphs_face); |
| 955 | static int coords_in_mouse_face_p (struct window *, int, int); | 956 | static int coords_in_mouse_face_p (struct window *, int, int); |
| 956 | 957 | ||
| @@ -24179,7 +24180,7 @@ produce_stretch_glyph (struct it *it) | |||
| 24179 | non-null glyph_row member. This function ensures that fields like | 24180 | non-null glyph_row member. This function ensures that fields like |
| 24180 | face_id, c, len of IT are left untouched. */ | 24181 | face_id, c, len of IT are left untouched. */ |
| 24181 | 24182 | ||
| 24182 | void | 24183 | static void |
| 24183 | produce_special_glyphs (struct it *it, enum display_element_type what) | 24184 | produce_special_glyphs (struct it *it, enum display_element_type what) |
| 24184 | { | 24185 | { |
| 24185 | struct it temp_it; | 24186 | struct it temp_it; |