[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103939: Minor redisplay cleanups.
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103939: Minor redisplay cleanups. |
Date: |
Sun, 17 Apr 2011 14:40:55 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 103939
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-04-17 14:40:55 -0400
message:
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.
modified:
src/ChangeLog
src/dispextern.h
src/termhooks.h
src/xdisp.c
src/xterm.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-04-16 23:31:57 +0000
+++ b/src/ChangeLog 2011-04-17 18:40:55 +0000
@@ -1,3 +1,12 @@
+2011-04-17 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
Static checks with GCC 4.6.0 and non-default toolkits.
=== modified file 'src/dispextern.h'
--- a/src/dispextern.h 2011-04-16 21:24:54 +0000
+++ b/src/dispextern.h 2011-04-17 18:40:55 +0000
@@ -1752,6 +1752,7 @@
#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)
=== modified file 'src/termhooks.h'
--- a/src/termhooks.h 2011-04-16 21:27:29 +0000
+++ b/src/termhooks.h 2011-04-17 18:40:55 +0000
@@ -633,19 +633,6 @@
#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)
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2011-04-16 22:48:31 +0000
+++ b/src/xdisp.c 2011-04-17 18:40:55 +0000
@@ -5861,7 +5861,6 @@
}
}
-#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 @@
it->string);
}
}
-#endif
done:
/* Is this character the last one of a run of characters with
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2011-04-16 21:29:00 +0000
+++ b/src/xterm.c 2011-04-17 18:40:55 +0000
@@ -2924,9 +2924,8 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103939: Minor redisplay cleanups.,
Chong Yidong <=