comparison src/dispextern.h @ 83160:c5bae78b527c

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-408 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-200
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 15 Jun 2004 16:45:35 +0000
parents 6ae3d2810507 fa167cc79556
children dbcd0af66869
comparison
equal deleted inserted replaced
83159:38500c0c86ab 83160:c5bae78b527c
2558 void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *)); 2558 void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *));
2559 extern Lisp_Object Qtool_bar; 2559 extern Lisp_Object Qtool_bar;
2560 extern Lisp_Object Vshow_trailing_whitespace; 2560 extern Lisp_Object Vshow_trailing_whitespace;
2561 extern int mode_line_in_non_selected_windows; 2561 extern int mode_line_in_non_selected_windows;
2562 extern int redisplaying_p; 2562 extern int redisplaying_p;
2563 extern Lisp_Object Vimage_types;
2564 extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); 2563 extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));
2565 extern int help_echo_showing_p; 2564 extern int help_echo_showing_p;
2566 extern int current_mode_line_height, current_header_line_height; 2565 extern int current_mode_line_height, current_header_line_height;
2567 extern Lisp_Object help_echo_string, help_echo_window; 2566 extern Lisp_Object help_echo_string, help_echo_window;
2568 extern Lisp_Object help_echo_object, previous_help_echo_string; 2567 extern Lisp_Object help_echo_object, previous_help_echo_string;
2643 #endif 2642 #endif
2644 2643
2645 /* Defined in image.c */ 2644 /* Defined in image.c */
2646 2645
2647 #ifdef HAVE_WINDOW_SYSTEM 2646 #ifdef HAVE_WINDOW_SYSTEM
2647
2648 extern Lisp_Object Vimage_types;
2648 2649
2649 extern int x_bitmap_height P_ ((struct frame *, int)); 2650 extern int x_bitmap_height P_ ((struct frame *, int));
2650 extern int x_bitmap_width P_ ((struct frame *, int)); 2651 extern int x_bitmap_width P_ ((struct frame *, int));
2651 extern int x_bitmap_pixmap P_ ((struct frame *, int)); 2652 extern int x_bitmap_pixmap P_ ((struct frame *, int));
2652 extern void x_reference_bitmap P_ ((struct frame *, int)); 2653 extern void x_reference_bitmap P_ ((struct frame *, int));