diff options
| author | Pavel Janík | 2002-01-16 06:44:20 +0000 |
|---|---|---|
| committer | Pavel Janík | 2002-01-16 06:44:20 +0000 |
| commit | 4b41cebbeff1337081dea113afa2d0b379f12568 (patch) | |
| tree | d0b7fb40c5cc48672b96884f0dd85cd4b60f599e /src | |
| parent | 30c93a6196c68a3f091a1761d5cb66f99693e57a (diff) | |
| download | emacs-4b41cebbeff1337081dea113afa2d0b379f12568.tar.gz emacs-4b41cebbeff1337081dea113afa2d0b379f12568.zip | |
Remove forgotten extern declaration of `Qimage'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 694935c9c02..19922bddc7a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 34 | calling Lisp functions like `sit-for'. The C function `redisplay' | 34 | calling Lisp functions like `sit-for'. The C function `redisplay' |
| 35 | in xdisp.c is the only entry into the inner redisplay code. (Or, | 35 | in xdisp.c is the only entry into the inner redisplay code. (Or, |
| 36 | let's say almost---see the description of direct update | 36 | let's say almost---see the description of direct update |
| 37 | operations, below.). | 37 | operations, below.) |
| 38 | 38 | ||
| 39 | The following diagram shows how redisplay code is invoked. As you | 39 | The following diagram shows how redisplay code is invoked. As you |
| 40 | can see, Lisp calls redisplay and vice versa. Under window systems | 40 | can see, Lisp calls redisplay and vice versa. Under window systems |
| @@ -260,7 +260,7 @@ int inhibit_eval_during_redisplay; | |||
| 260 | /* Names of text properties relevant for redisplay. */ | 260 | /* Names of text properties relevant for redisplay. */ |
| 261 | 261 | ||
| 262 | Lisp_Object Qdisplay, Qrelative_width, Qalign_to; | 262 | Lisp_Object Qdisplay, Qrelative_width, Qalign_to; |
| 263 | extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth; | 263 | extern Lisp_Object Qface, Qinvisible, Qwidth; |
| 264 | 264 | ||
| 265 | /* Symbols used in text property values. */ | 265 | /* Symbols used in text property values. */ |
| 266 | 266 | ||
| @@ -385,7 +385,7 @@ int highlight_nonselected_windows; | |||
| 385 | 385 | ||
| 386 | static int scroll_step; | 386 | static int scroll_step; |
| 387 | 387 | ||
| 388 | /* Non-0 means scroll just far enough to bring point back on the | 388 | /* Nonzero means scroll just far enough to bring point back on the |
| 389 | screen, when appropriate. */ | 389 | screen, when appropriate. */ |
| 390 | 390 | ||
| 391 | static int scroll_conservatively; | 391 | static int scroll_conservatively; |
| @@ -443,12 +443,12 @@ Lisp_Object Vmessage_stack; | |||
| 443 | 443 | ||
| 444 | int message_enable_multibyte; | 444 | int message_enable_multibyte; |
| 445 | 445 | ||
| 446 | /* True if we should redraw the mode lines on the next redisplay. */ | 446 | /* Nonzero if we should redraw the mode lines on the next redisplay. */ |
| 447 | 447 | ||
| 448 | int update_mode_lines; | 448 | int update_mode_lines; |
| 449 | 449 | ||
| 450 | /* Nonzero if window sizes or contents have changed since last | 450 | /* Nonzero if window sizes or contents have changed since last |
| 451 | redisplay that finished */ | 451 | redisplay that finished. */ |
| 452 | 452 | ||
| 453 | int windows_or_buffers_changed; | 453 | int windows_or_buffers_changed; |
| 454 | 454 | ||
| @@ -461,7 +461,7 @@ int line_number_displayed; | |||
| 461 | 461 | ||
| 462 | Lisp_Object Vline_number_display_limit; | 462 | Lisp_Object Vline_number_display_limit; |
| 463 | 463 | ||
| 464 | /* line width to consider when repostioning for line number display */ | 464 | /* Line width to consider when repositioning for line number display. */ |
| 465 | 465 | ||
| 466 | static int line_number_display_limit_width; | 466 | static int line_number_display_limit_width; |
| 467 | 467 | ||
| @@ -869,7 +869,7 @@ window_box_width (w, area) | |||
| 869 | 869 | ||
| 870 | 870 | ||
| 871 | /* Return the pixel height of the display area of window W, not | 871 | /* Return the pixel height of the display area of window W, not |
| 872 | including mode lines of W, if any.. */ | 872 | including mode lines of W, if any. */ |
| 873 | 873 | ||
| 874 | INLINE int | 874 | INLINE int |
| 875 | window_box_height (w) | 875 | window_box_height (w) |
| @@ -2302,7 +2302,7 @@ handle_face_prop (it) | |||
| 2302 | 2302 | ||
| 2303 | /* Is this a start of a run of characters with box face? | 2303 | /* Is this a start of a run of characters with box face? |
| 2304 | Caveat: this can be called for a freshly initialized | 2304 | Caveat: this can be called for a freshly initialized |
| 2305 | iterator; face_id is -1 is this case. We know that the new | 2305 | iterator; face_id is -1 in this case. We know that the new |
| 2306 | face will not change until limit, i.e. if the new face has a | 2306 | face will not change until limit, i.e. if the new face has a |
| 2307 | box, all characters up to limit will have one. But, as | 2307 | box, all characters up to limit will have one. But, as |
| 2308 | usual, we don't know whether limit is really the end. */ | 2308 | usual, we don't know whether limit is really the end. */ |
| @@ -2812,7 +2812,7 @@ display_prop_end (it, object, start_pos) | |||
| 2812 | If PROP is a `space' or `image' sub-property, set *POSITION to the | 2812 | If PROP is a `space' or `image' sub-property, set *POSITION to the |
| 2813 | end position of the `display' property. | 2813 | end position of the `display' property. |
| 2814 | 2814 | ||
| 2815 | Value is non-zero something was found which replaces the display | 2815 | Value is non-zero if something was found which replaces the display |
| 2816 | of buffer or string text. */ | 2816 | of buffer or string text. */ |
| 2817 | 2817 | ||
| 2818 | static int | 2818 | static int |
| @@ -2829,7 +2829,7 @@ handle_single_display_prop (it, prop, object, position, | |||
| 2829 | Lisp_Object form; | 2829 | Lisp_Object form; |
| 2830 | 2830 | ||
| 2831 | /* If PROP is a list of the form `(when FORM . VALUE)', FORM is | 2831 | /* If PROP is a list of the form `(when FORM . VALUE)', FORM is |
| 2832 | evaluated. If the result is nil, VALUE is ignored. */ | 2832 | evaluated. If the result is nil, VALUE is ignored. */ |
| 2833 | form = Qt; | 2833 | form = Qt; |
| 2834 | if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) | 2834 | if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
| 2835 | { | 2835 | { |
| @@ -2960,7 +2960,7 @@ handle_single_display_prop (it, prop, object, position, | |||
| 2960 | else if (!it->string_from_display_prop_p) | 2960 | else if (!it->string_from_display_prop_p) |
| 2961 | { | 2961 | { |
| 2962 | /* `((margin left-margin) VALUE)' or `((margin right-margin) | 2962 | /* `((margin left-margin) VALUE)' or `((margin right-margin) |
| 2963 | VALUE) or `((margin nil) VALUE)' or VALUE. */ | 2963 | VALUE) or `((margin nil) VALUE)' or VALUE. */ |
| 2964 | Lisp_Object location, value; | 2964 | Lisp_Object location, value; |
| 2965 | struct text_pos start_pos; | 2965 | struct text_pos start_pos; |
| 2966 | int valid_p; | 2966 | int valid_p; |
| @@ -6221,7 +6221,7 @@ ensure_echo_area_buffers () | |||
| 6221 | that the current message becomes the last displayed one, make | 6221 | that the current message becomes the last displayed one, make |
| 6222 | choose a suitable buffer for echo_area_buffer[0], and clear it. | 6222 | choose a suitable buffer for echo_area_buffer[0], and clear it. |
| 6223 | 6223 | ||
| 6224 | Value is what FN returns. */ | 6224 | Value is what FN returns. */ |
| 6225 | 6225 | ||
| 6226 | static int | 6226 | static int |
| 6227 | with_echo_area_buffer (w, which, fn, a1, a2, a3, a4) | 6227 | with_echo_area_buffer (w, which, fn, a1, a2, a3, a4) |
| @@ -6572,7 +6572,7 @@ resize_mini_window_1 (a1, exactly, a3, a4) | |||
| 6572 | /* Resize mini-window W to fit the size of its contents. EXACT:P | 6572 | /* Resize mini-window W to fit the size of its contents. EXACT:P |
| 6573 | means size the window exactly to the size needed. Otherwise, it's | 6573 | means size the window exactly to the size needed. Otherwise, it's |
| 6574 | only enlarged until W's buffer is empty. Value is non-zero if | 6574 | only enlarged until W's buffer is empty. Value is non-zero if |
| 6575 | the window height has been changed. */ | 6575 | the window height has been changed. */ |
| 6576 | 6576 | ||
| 6577 | int | 6577 | int |
| 6578 | resize_mini_window (w, exact_p) | 6578 | resize_mini_window (w, exact_p) |
| @@ -6624,7 +6624,7 @@ resize_mini_window (w, exact_p) | |||
| 6624 | else | 6624 | else |
| 6625 | max_height = total_height / 4; | 6625 | max_height = total_height / 4; |
| 6626 | 6626 | ||
| 6627 | /* Correct that max. height if it's bogus. */ | 6627 | /* Correct that max. height if it's bogus. */ |
| 6628 | max_height = max (1, max_height); | 6628 | max_height = max (1, max_height); |
| 6629 | max_height = min (total_height, max_height); | 6629 | max_height = min (total_height, max_height); |
| 6630 | 6630 | ||
| @@ -9163,7 +9163,7 @@ mark_window_display_accurate (window, accurate_p) | |||
| 9163 | { | 9163 | { |
| 9164 | /* Force a thorough redisplay the next time by setting | 9164 | /* Force a thorough redisplay the next time by setting |
| 9165 | last_arrow_position and last_arrow_string to t, which is | 9165 | last_arrow_position and last_arrow_string to t, which is |
| 9166 | unequal to any useful value of Voverlay_arrow_... */ | 9166 | unequal to any useful value of Voverlay_arrow_... */ |
| 9167 | last_arrow_position = Qt; | 9167 | last_arrow_position = Qt; |
| 9168 | last_arrow_string = Qt; | 9168 | last_arrow_string = Qt; |
| 9169 | } | 9169 | } |
| @@ -12939,7 +12939,7 @@ display_line (it) | |||
| 12939 | hpos_before = it->hpos; | 12939 | hpos_before = it->hpos; |
| 12940 | x_before = x; | 12940 | x_before = x; |
| 12941 | 12941 | ||
| 12942 | if (/* Not a newline. */ | 12942 | if (/* Not a newline. */ |
| 12943 | nglyphs > 0 | 12943 | nglyphs > 0 |
| 12944 | /* Glyphs produced fit entirely in the line. */ | 12944 | /* Glyphs produced fit entirely in the line. */ |
| 12945 | && it->current_x < it->last_visible_x) | 12945 | && it->current_x < it->last_visible_x) |