(get_keyelt): Handle an indirect entry with meta char.

[gnu-emacs] / src / msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index eba5c8c6c35f1ae78bce86f80e401022da7950cc..3e3c6ec0695286623fa303bc2589252e0343fa6b 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef _MSDOS_H_
 #define _MSDOS_H_
@@ -26,6 +27,7 @@ int dos_ttraw ();
 int dos_ttcooked ();
 int dos_get_saved_screen (char **, int *, int *);
 int dos_set_keyboard (int, int);
+void dos_set_window_size (int *, int *);
 
 int getdefdir (int, char*);
 void unixtodos_filename (char *);
@@ -53,7 +55,7 @@ typedef int Window;
 #define XDISPLAY
 
 /* This is a cut-down version of the one in xterm.h, which see.  */
-struct x_display
+struct x_output
 {
   int left_pos;
   int top_pos;
@@ -68,7 +70,7 @@ struct x_display
   int size_computed_faces;
 };
 
-extern struct x_display the_only_x_display;
+extern struct x_output the_only_x_display;
 extern Display *x_current_display;
 
 #define FRAME_PARAM_FACES(f) (the_only_x_display.param_faces)
@@ -92,15 +94,12 @@ extern Display *x_current_display;
 #define x_destroy_bitmap(p1,p2)
 #define load_pixmap(p1,p2,p3,p4) (0)
 #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9)
-#define DisplayWidth(p1,p2) (the_only_frame.width)
-#define DisplayHeight(p1,p2) (the_only_frame.height)
+#define DisplayWidth(p1,p2) (selected_frame->width)
+#define DisplayHeight(p1,p2) (selected_frame->height)
 #define XMenuSetAEQ (void)
 #define XMenuSetFreeze (void)
 #define XMenuRecompute (void)
 #define FONT_WIDTH(foo) 1
-/* Function `getcbrk' is the most harmless I can think of right now...  */
-#define check_x if (FRAME_TERMCAP_P (bar)) error ("Not running under a windows system."); else getcbrk
-#define x_mouse_leave getcbrk
 #define XM_FAILURE -1
 #define XM_SUCCESS 1
 #define XM_NO_SELECT 2