From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 12 Jul 2016 23:16:10 +0000 (+0200)
Subject: Remove CHECK_FRAME_FONT cruft from bytecode.c
X-Git-Tag: emacs-26.0.90~1840^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60dd094a8c7bdbbff121c99f56f42910534e7cc1;p=emacs.git

Remove CHECK_FRAME_FONT cruft from bytecode.c

* src/bytecode.c [CHECK_FRAME_FONT]: Do not include frame.h, xterm.h.
Remove some old ‘#if 0’ code.
---

diff --git a/src/bytecode.c b/src/bytecode.c
index 1b02c60c618..8b700b0312a 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -27,11 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "syntax.h"
 #include "window.h"
 
-#ifdef CHECK_FRAME_FONT
-#include "frame.h"
-#include "xterm.h"
-#endif
-
 /* Work around GCC bug 54561.  */
 #if GNUC_PREREQ (4, 3, 0)
 # pragma GCC diagnostic ignored "-Wclobbered"
@@ -439,16 +434,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
   Lisp_Object result;
   enum handlertype type;
 
-#if 0 /* CHECK_FRAME_FONT */
- {
-   struct frame *f = SELECTED_FRAME ();
-   if (FRAME_X_P (f)
-       && FRAME_FONT (f)->direction != 0
-       && FRAME_FONT (f)->direction != 1)
-     emacs_abort ();
- }
-#endif
-
   CHECK_STRING (bytestr);
   CHECK_VECTOR (vector);
   CHECK_NATNUM (maxdepth);