merge from trunk

5 files changed, 12 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5633d95cbf2..59bf6b420c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2013-08-27  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * 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  <dmantipov@yandex.ru>
+
         * lisp.h (Mouse_HLInfo): Move from here...
         * dispextern.h (Mouse_HLInfo): ...to here and offload lisp.h.
         (reset_mouse_highlight): New function.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0f3f5ba58ba..0de748654eb 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -35,6 +35,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #include "charset.h"
 #include "coding.h"
+#include "font.h"
+
 #include <gdk/gdkkeysyms.h>
 #include "xsettings.h"
 
@@ -2050,7 +2052,6 @@ xg_get_file_name (struct frame *f,
 
 
 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
diff --git a/src/image.c b/src/image.c
index 59347161576..8d9c33de12c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -563,7 +563,6 @@ static void x_emboss (struct frame *, struct image *);
 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
diff --git a/src/nsterm.h b/src/nsterm.h
index a3174ade07b..4815cc4bb48 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -752,8 +752,6 @@ struct x_output
   (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
diff --git a/src/xterm.h b/src/xterm.h
index d1a586881b2..723550c57c4 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1078,10 +1078,6 @@ extern Lisp_Object Qx_gtk_map_stock;
 
 #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 @@ extern Lisp_Object Qx_gtk_map_stock;
 #define XCHAR2B_BYTE2(chp) \
   ((chp)->byte2)
 
-
 #define STORE_NATIVE_RECT(nr,rx,ry,rwidth,rheight)      \
   ((nr).x = (rx),                                       \
    (nr).y = (ry),                                       \