[Emacs-diffs] trunk r114018: * xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)

[Dmitry Antipov]

------------------------------------------------------------
revno: 114018
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-27 08:23:54 +0400
message:
  * xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)
  * nsterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE):
  Remove the leftovers.
  * gtkutil.c (toplevel): Do not declare Qxft but include
  font.h to do so.
  * image.c (toplevel): Do not declare Vlibrary_cache because
  it's already done in lisp.h.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gtkutil.c                  gtkutil.c-20091113204419-o5vbwnq5f7feedwu-2527
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-27 03:52:21 +0000
+++ b/src/ChangeLog     2013-08-27 04:23:54 +0000
@@ -1,5 +1,15 @@
 2013-08-27  Dmitry Antipov  <address@hidden>
 
+       * xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)
+       * nsterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE):
+       Remove the leftovers.
+       * gtkutil.c (toplevel): Do not declare Qxft but include
+       font.h to do so.
+       * image.c (toplevel): Do not declare Vlibrary_cache because
+       it's already done in lisp.h.
+
+2013-08-27  Dmitry Antipov  <address@hidden>
+
        * lisp.h (Mouse_HLInfo): Move from here...
        * dispextern.h (Mouse_HLInfo): ...to here and offload lisp.h.
        (reset_mouse_highlight): New function.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2013-08-26 15:44:56 +0000
+++ b/src/gtkutil.c     2013-08-27 04:23:54 +0000
@@ -35,6 +35,8 @@
 #include "keyboard.h"
 #include "charset.h"
 #include "coding.h"
+#include "font.h"
+
 #include <gdk/gdkkeysyms.h>
 #include "xsettings.h"
 
@@ -2050,7 +2052,6 @@
 
 
 static char *x_last_font_name;
-extern Lisp_Object Qxft;
 
 /* Pop up a GTK font selector and return the name of the font the user
    selects, as a C string.  The returned font name follows GTK's own

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-26 21:31:50 +0000
+++ b/src/image.c       2013-08-27 04:23:54 +0000
@@ -563,7 +563,6 @@
 static void x_build_heuristic_mask (struct frame *, struct image *,
                                     Lisp_Object);
 #ifdef WINDOWSNT
-extern Lisp_Object Vlibrary_cache;
 #define CACHE_IMAGE_TYPE(type, status) \
   do { Vlibrary_cache = Fcons (Fcons (type, status), Vlibrary_cache); } while 
(0)
 #else

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2013-08-26 21:31:50 +0000
+++ b/src/nsterm.h      2013-08-27 04:23:54 +0000
@@ -752,8 +752,6 @@
   (FRAME_NS_DISPLAY_INFO (f)->smallest_char_width)
 #define FRAME_SMALLEST_FONT_HEIGHT(f) \
   (FRAME_NS_DISPLAY_INFO (f)->smallest_font_height)
-#define FONT_TYPE_FOR_UNIBYTE(font, ch)   0
-#define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.ns->baseline_offset)
 #define BLACK_PIX_DEFAULT(f) 0x000000
 #define WHITE_PIX_DEFAULT(f) 0xFFFFFF

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2013-08-27 03:52:21 +0000
+++ b/src/xterm.h       2013-08-27 04:23:54 +0000
@@ -1078,10 +1078,6 @@
 
 #define FRAME_X_EMBEDDED_P(f) (FRAME_X_OUTPUT(f)->explicit_parent != 0)
 
-
-#define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
-#define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
-
 #define STORE_XCHAR2B(chp, b1, b2) \
   ((chp)->byte1 = (b1), (chp)->byte2 = (b2))
 
@@ -1091,7 +1087,6 @@
 #define XCHAR2B_BYTE2(chp) \
   ((chp)->byte2)
 
-
 #define STORE_NATIVE_RECT(nr,rx,ry,rwidth,rheight)     \
   ((nr).x = (rx),                                      \
    (nr).y = (ry),                                      \