Minor redisplay cleanups.

* src/dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): Add missing
definition for no-X builds.

* src/termhooks.h (FRAME_WINDOW_P): Remove duplicated definitions.

* src/xdisp.c (get_next_display_element): Remove unnecessary ifdefs.

5 files changed, 12 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3aa5d48d99f..22e85967b82 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (get_next_display_element): Remove unnecessary ifdefs.
+
+        * termhooks.h (FRAME_WINDOW_P): Remove duplicated definitions.
+
+        * dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): Add missing
+        definition for no-X builds.
+
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Static checks with GCC 4.6.0 and non-default toolkits.
diff --git a/src/dispextern.h b/src/dispextern.h
index d00eeae2b19..1f2189adeca 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1752,6 +1752,7 @@ struct face_cache
 
 #else /* not HAVE_WINDOW_SYSTEM */
 
+#define FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE, CHAR) 1
 #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1
 #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) ((FACE)->id)
 
diff --git a/src/termhooks.h b/src/termhooks.h
index 468381b69aa..c6b1084f347 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -633,19 +633,6 @@ extern struct terminal *terminal_list;
 
 #define FRAME_TERMINAL(f) ((f)->terminal)
 
-/* FRAME_WINDOW_P tests whether the frame is a window, and is
-   defined to be the predicate for the window system being used.  */
-
-#ifdef HAVE_X_WINDOWS
-#define FRAME_WINDOW_P(f) FRAME_X_P (f)
-#endif
-#ifdef HAVE_NTGUI
-#define FRAME_WINDOW_P(f) FRAME_W32_P (f)
-#endif
-#ifndef FRAME_WINDOW_P
-#define FRAME_WINDOW_P(f) (0)
-#endif
-
 /* Return true if the terminal device is not suspended. */
 #define TERMINAL_ACTIVE_P(d) (((d)->type != output_termcap && (d)->type !=output_msdos_raw) || (d)->display_info.tty->input)
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 3c75a63f4e0..eaab8dac18d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5861,7 +5861,6 @@ get_next_display_element (struct it *it)
         }
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
   /* Adjust face id for a multibyte character.  There are no multibyte
      character in unibyte text.  */
   if ((it->what == IT_CHARACTER || it->what == IT_COMPOSITION)
@@ -5888,7 +5887,6 @@ get_next_display_element (struct it *it)
                                        it->string);
         }
     }
-#endif
 
  done:
   /* Is this character the last one of a run of characters with
diff --git a/src/xterm.c b/src/xterm.c
index a44313d0a56..491a8b3698f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2924,9 +2924,8 @@ x_clear_frame (struct frame *f)
      follow an explicit cursor_to.  */
   BLOCK_INPUT;
 
-  /* The following calls have been commented out because they do not
-     seem to accomplish anything, apart from causing flickering during
-     window resize.  */
+  /* The following call is commented out because it does not seem to accomplish
+     anything, apart from causing flickering during window resize.  */
   /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */
 
   /* We have to clear the scroll bars.  If we have changed colors or