[Emacs-diffs] trunk r115348: * font.h (FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT):

[Dmitry Antipov]

------------------------------------------------------------
revno: 115348
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-02 17:35:53 +0400
message:
  * font.h (FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT):
  Define here to unify between...
  * nsterm.h, w32term.h, xterm.h: ...port-specific headers.
  * w32term.h (CHECK_W32_FRAME): Remove unused macro.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.h                     font.h-20091113204419-o5vbwnq5f7feedwu-8541
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
  src/w32term.h                  w32term.h-20091113204419-o5vbwnq5f7feedwu-954
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-02 01:05:57 +0000
+++ b/src/ChangeLog     2013-12-02 13:35:53 +0000
@@ -1,3 +1,10 @@
+2013-12-02  Dmitry Antipov  <address@hidden>
+
+       * font.h (FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT):
+       Define here to unify between...
+       * nsterm.h, w32term.h, xterm.h: ...port-specific headers.
+       * w32term.h (CHECK_W32_FRAME): Remove unused macro.
+
 2013-12-02  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xterm.h (struct scroll_bar): Remove member `fringe_extended_p'.

=== modified file 'src/font.h'
--- a/src/font.h        2013-10-25 07:28:16 +0000
+++ b/src/font.h        2013-12-02 13:35:53 +0000
@@ -234,6 +234,11 @@
 #define FONT_SET_STYLE(font, prop, val)        \
   ASET ((font), prop, make_number (font_style_to_value (prop, val, 1)))
 
+#define FONT_WIDTH(f) ((f)->max_width)
+#define FONT_HEIGHT(f) ((f)->height)
+#define FONT_BASE(f) ((f)->ascent)
+#define FONT_DESCENT(f) ((f)->descent)
+
 extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript;
 extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity;
 extern Lisp_Object Qp;

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2013-11-30 09:25:31 +0000
+++ b/src/nsterm.h      2013-12-02 13:35:53 +0000
@@ -720,11 +720,6 @@
 #define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height)
 #define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.ns->toolbar_height)
 
-#define FONT_WIDTH(f)  ((f)->max_width)
-#define FONT_HEIGHT(f) ((f)->height)
-#define FONT_BASE(f)    ((f)->ascent)
-#define FONT_DESCENT(f) ((f)->descent)
-
 #define FRAME_DEFAULT_FACE(f) FACE_FROM_ID (f, DEFAULT_FACE_ID)
 
 #define FRAME_NS_VIEW(f) ((f)->output_data.ns->view)

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2013-11-30 09:25:31 +0000
+++ b/src/w32term.h     2013-12-02 13:35:53 +0000
@@ -26,23 +26,8 @@
 #define BLACK_PIX_DEFAULT(f) PALETTERGB(0,0,0)
 #define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255)
 
-#define FONT_WIDTH(f)     ((f)->max_width)
-#define FONT_HEIGHT(f)    ((f)->height)
-#define FONT_BASE(f)      ((f)->ascent)
-#define FONT_DESCENT(f)   ((f)->descent)
-
 #define CP_DEFAULT 1004
 
-#define CHECK_W32_FRAME(f, frame)              \
-  if (NILP (frame))                            \
-    f = SELECTED_FRAME ();                     \
-  else                                         \
-    {                                          \
-      CHECK_LIVE_FRAME (frame, 0);             \
-      f = XFRAME (frame);                      \
-    }                                          \
-  if (! FRAME_W32_P (f))
-
 /* Indicates whether we are in the readsocket call and the message we
    are processing in the current loop */
 

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2013-12-02 01:05:57 +0000
+++ b/src/xterm.h       2013-12-02 13:35:53 +0000
@@ -84,11 +84,6 @@
 #define WHITE_PIX_DEFAULT(f)                                   \
   WhitePixel (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f))
 
-#define FONT_WIDTH(f)  ((f)->max_width)
-#define FONT_HEIGHT(f) ((f)->ascent + (f)->descent)
-#define FONT_BASE(f)    ((f)->ascent)
-#define FONT_DESCENT(f) ((f)->descent)
-
 /* The mask of events that text windows always want to receive.  This
    includes mouse movement events, since handling the mouse-font text property
    means that we must track mouse motion all the time.  */