Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/dispextern.h Mon Jun 14 20:00:54 2004 +0000 +++ b/src/dispextern.h Tue Jun 15 16:45:35 2004 +0000 @@ -2560,7 +2560,6 @@ extern Lisp_Object Vshow_trailing_whitespace; extern int mode_line_in_non_selected_windows; extern int redisplaying_p; -extern Lisp_Object Vimage_types; extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); extern int help_echo_showing_p; extern int current_mode_line_height, current_header_line_height; @@ -2646,6 +2645,8 @@ #ifdef HAVE_WINDOW_SYSTEM +extern Lisp_Object Vimage_types; + extern int x_bitmap_height P_ ((struct frame *, int)); extern int x_bitmap_width P_ ((struct frame *, int)); extern int x_bitmap_pixmap P_ ((struct frame *, int));