[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xdisp.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xdisp.c |
Date: |
Sun, 21 Jun 2009 14:28:31 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/06/21 14:28:30
Modified files:
src : ChangeLog xdisp.c
Log message:
* xdisp.c (IT_DISPLAYING_WHITESPACE): Define for
!HAVE_WINDOW_SYSTEM.
(move_it_in_display_line_to, move_it_in_display_line_to)
(display_line): Remove #ifdef HAVE_WINDOW_SYSTEM.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7586&r2=1.7587
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1288&r2=1.1289
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586
retrieving revision 1.7587
diff -u -b -r1.7586 -r1.7587
--- ChangeLog 21 Jun 2009 03:34:19 -0000 1.7586
+++ ChangeLog 21 Jun 2009 14:28:27 -0000 1.7587
@@ -1,3 +1,10 @@
+2009-06-21 Chong Yidong <address@hidden>
+
+ * xdisp.c (IT_DISPLAYING_WHITESPACE): Define for
+ !HAVE_WINDOW_SYSTEM.
+ (move_it_in_display_line_to, move_it_in_display_line_to)
+ (display_line): Remove #ifdef HAVE_WINDOW_SYSTEM.
+
2009-06-21 Jason Rumney <address@hidden>
* w32term.c (keyboard_codepage): New static variable.
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1288
retrieving revision 1.1289
diff -u -b -r1.1288 -r1.1289
--- xdisp.c 18 Jun 2009 09:49:07 -0000 1.1288
+++ xdisp.c 21 Jun 2009 14:28:29 -0000 1.1289
@@ -354,6 +354,8 @@
&& it->current_x == it->last_visible_x \
&& it->line_wrap != WORD_WRAP)
+#else /* !HAVE_WINDOW_SYSTEM */
+#define IT_OVERFLOW_NEWLINE_INTO_FRINGE(it) 0
#endif /* HAVE_WINDOW_SYSTEM */
/* Test if the display element loaded in IT is a space or tab
@@ -6918,7 +6920,6 @@
}
set_iterator_to_next (it, 1);
-#ifdef HAVE_WINDOW_SYSTEM
/* One graphical terminals, newlines may
"overflow" into the fringe if
overflow-newline-into-fringe is non-nil.
@@ -6947,7 +6948,6 @@
break;
}
}
-#endif /* HAVE_WINDOW_SYSTEM */
}
}
else
@@ -7022,7 +7022,6 @@
if (it->line_wrap == TRUNCATE
&& it->current_x >= it->last_visible_x)
{
-#ifdef HAVE_WINDOW_SYSTEM
if (!FRAME_WINDOW_P (it->f)
|| IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
{
@@ -7038,7 +7037,6 @@
break;
}
}
-#endif /* HAVE_WINDOW_SYSTEM */
result = MOVE_LINE_TRUNCATED;
break;
}
@@ -16622,12 +16620,9 @@
display the cursor there under X. Set the charpos of the
first glyph of blank lines not corresponding to any text
to -1. */
-#ifdef HAVE_WINDOW_SYSTEM
if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
row->exact_window_width_line_p = 1;
- else
-#endif /* HAVE_WINDOW_SYSTEM */
- if ((append_space_for_newline (it, 1) && row->used[TEXT_AREA] == 1)
+ else if ((append_space_for_newline (it, 1) && row->used[TEXT_AREA] ==
1)
|| row->used[TEXT_AREA] == 0)
{
row->glyphs[TEXT_AREA]->charpos = -1;
@@ -16770,7 +16765,6 @@
goto back_to_wrap;
set_iterator_to_next (it, 1);
-#ifdef HAVE_WINDOW_SYSTEM
if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
{
if (!get_next_display_element (it))
@@ -16786,7 +16780,6 @@
row->exact_window_width_line_p = 1;
}
}
-#endif /* HAVE_WINDOW_SYSTEM */
}
}
else if (CHAR_GLYPH_PADDING_P (*glyph)
@@ -16923,12 +16916,10 @@
row->ends_in_newline_from_string_p = STRINGP (it->object);
-#ifdef HAVE_WINDOW_SYSTEM
/* Add a space at the end of the line that is used to
display the cursor there. */
if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
append_space_for_newline (it, 0);
-#endif /* HAVE_WINDOW_SYSTEM */
/* Extend the face to the end of the line. */
extend_face_to_end_of_line (it);
@@ -16969,12 +16960,9 @@
produce_special_glyphs (it, IT_TRUNCATION);
}
}
-#ifdef HAVE_WINDOW_SYSTEM
- else
+ else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
{
/* Don't truncate if we can overflow newline into fringe. */
- if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
- {
if (!get_next_display_element (it))
{
it->continuation_lines_width = 0;
@@ -16988,8 +16976,6 @@
goto at_end_of_line;
}
}
- }
-#endif /* HAVE_WINDOW_SYSTEM */
row->truncated_on_right_p = 1;
it->continuation_lines_width = 0;
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Chong Yidong, 2009/06/07
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Chong Yidong, 2009/06/10
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Seiji Zenitani, 2009/06/14
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Andreas Schwab, 2009/06/18
- [Emacs-diffs] emacs/src ChangeLog xdisp.c,
Chong Yidong <=
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Chong Yidong, 2009/06/21
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Chong Yidong, 2009/06/26
- [Emacs-diffs] emacs/src ChangeLog xdisp.c, Chong Yidong, 2009/06/28