(save_frame_matrix, restore_frame_matrix): Removed.

[gnu-emacs] / src / w32term.h

diff --git a/src/w32term.h b/src/w32term.h
index e64202549f767cf9c9b9ce35fa6039945e6bcf13..e87ea67da9d3104549a212f8be46ecdf03b36c44 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -35,11 +35,15 @@ Boston, MA 02111-1307, USA.  */
 #define FONT_BASE(f)        \
   ((f)->bdf ? (f)->bdf->ury : (f)->tm.tmAscent)
 #define FONT_DESCENT(f)     \
-  ((f)->bdf ? (f)->bdf->lly : (f)->tm.tmDescent)
+  ((f)->bdf ? -((f)->bdf->lly) : (f)->tm.tmDescent)
 #define FONT_MAX_WIDTH(f)   \
   ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth)
 
 #define CP_DEFAULT 1004
+/* Special pseudo-codepages. */
+#define CP_8BIT      -1
+#define CP_UNICODE   -2
+#define CP_UNKNOWN   -3
 
 #define CHECK_W32_FRAME(f, frame)              \
   if (NILP (frame))                            \
@@ -51,7 +55,6 @@ Boston, MA 02111-1307, USA.  */
     }                                          \
   if (! FRAME_W32_P (f))
 
-
 /* Indicates whether we are in the readsocket call and the message we
    are processing in the current loop */
 
@@ -348,6 +351,7 @@ struct w32_output
   Cursor modeline_cursor;
   Cursor cross_cursor;
   Cursor busy_cursor;
+  Cursor horizontal_drag_cursor;
 
   /* Window whose cursor is busy_cursor.  This window is temporarily
      mapped to display a busy-cursor.  */