Mercurial > hg > xemacs-beta
diff src/console.h @ 2:ac2d302a0011 r19-15b2
Import from CVS: tag r19-15b2
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:46:35 +0200 |
| parents | 376386a54a3c |
| children | 441bb1e64a06 |
line wrap: on
line diff
--- a/src/console.h Mon Aug 13 08:45:53 2007 +0200 +++ b/src/console.h Mon Aug 13 08:46:35 2007 +0200 @@ -105,8 +105,8 @@ int (*frame_visible_p_method) (struct frame *f); int (*frame_totally_visible_p_method) (struct frame *f); int (*frame_iconified_p_method) (struct frame *f); - void (*set_title_from_char_method) (struct frame *f, char *title); - void (*set_icon_name_from_char_method) (struct frame *f, char *title); + void (*set_title_from_bufbyte_method) (struct frame *f, Bufbyte *title); + void (*set_icon_name_from_bufbyte_method) (struct frame *f, Bufbyte *title); void (*set_frame_pointer_method) (struct frame *f); void (*set_frame_icon_method) (struct frame *f); void (*popup_menu_method) (Lisp_Object menu, Lisp_Object event); @@ -523,16 +523,12 @@ #define CONSOLE_LAST_NONMINIBUF_FRAME(con) NON_LVALUE ((con)->_last_nonminibuf_frame) #define CONSOLE_QUIT_CHAR(con) ((con)->quit_char) -#define CDFW_CONSOLE(obj) \ - (WINDOWP (obj) \ - ? WINDOW_CONSOLE (XWINDOW (obj)) \ - : (FRAMEP (obj) \ - ? FRAME_CONSOLE (XFRAME (obj)) \ - : (DEVICEP (obj) \ - ? DEVICE_CONSOLE (XDEVICE (obj)) \ - : (CONSOLEP (obj) \ - ? obj \ - : Qnil)))) +#define CDFW_CONSOLE(obj) \ + (WINDOWP (obj) ? WINDOW_CONSOLE (XWINDOW (obj)) \ + : (FRAMEP (obj) ? FRAME_CONSOLE (XFRAME (obj)) \ + : (DEVICEP (obj) ? DEVICE_CONSOLE (XDEVICE (obj)) \ + : (CONSOLEP (obj) ? obj \ + : Qnil)))) #define CONSOLE_LOOP(concons) LIST_LOOP (concons, Vconsole_list) #define CONSOLE_DEVICE_LOOP(devcons, con) \