Changeset 3442

Timestamp:

09/06/04 22:28:02 (4 years ago)

Author:

miyoshi

Message:

(IT_OVERFLOW_NEWLINE_INTO_FRINGE): New macro from Emacs
CVS HEAD.
(move_it_in_display_line_to): Sync up with Emacs CVS HEAD.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/xdisp.c (modified) (14 diffs)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-09-06  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * xdisp.c (IT_OVERFLOW_NEWLINE_INTO_FRINGE): New macro from Emacs
+        CVS HEAD.
+        (move_it_in_display_line_to): Sync up with Emacs CVS HEAD.
+
-2004-08-29  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/xdisp.c

@@ -282 +282 @@
-
-Lisp_Object Vshow_trailing_whitespace;
+
+#ifdef HAVE_WINDOW_SYSTEM
+/* Test if overflow newline into fringe.  Called with iterator IT
+   at or past right window margin, and with IT->current_x set.  */
+
+#define IT_OVERFLOW_NEWLINE_INTO_FRINGE(it)     \
+  (FRAME_WINDOW_P (it->f)                       \
+   && it->current_x == it->last_visible_x)
+
+#endif /* HAVE_WINDOW_SYSTEM */
-
-/* Name of the face used to highlight trailing whitespace.  */
@@ -4986 +4996 @@
-  it->glyph_row = NULL;
-
+#define BUFFER_POS_REACHED_P()                      \
+  ((op & MOVE_TO_POS) != 0                          \
+   && BUFFERP (it->object)                          \
+   && IT_CHARPOS (*it) >= to_charpos)
+
-  while (1)
-    {
-      int x, i, ascent = 0, descent = 0;
-
-
+
+
+
+
+
-      if (!get_next_display_element (it)
-
-
-
+
+
-        {
-          result = MOVE_POS_MATCH_OR_ZV;
-          break;
-        }
-
+
-      /* The call to produce_glyphs will get the metrics of the
-         display element IT is loaded with.  We record in x the
@@ -5005 +5022 @@
-         fit on the line.  */
-      x = it->current_x;
-
+
-      /* Remember the line height so far in case the next element doesn't
-         fit on the line.  */
@@ -5013 +5030 @@
-          descent = it->max_descent;
-        }
-
+
-      PRODUCE_GLYPHS (it);
-
@@ -5046 +5063 @@
-          int single_glyph_width = it->pixel_width / it->nglyphs;
-          int new_x;
-
+
-          for (i = 0; i < it->nglyphs; ++i, x = new_x)
-            {
@@ -5054 +5071 @@
-              if ((op & MOVE_TO_X) && new_x > to_x)
-                {
+                  if (BUFFER_POS_REACHED_P ())
+                    goto buffer_pos_reached;
-                  it->current_x = x;
-                  result = MOVE_X_REACHED;
@@ -5076 +5095 @@
-                      it->current_x = new_x;
-                      if (i == it->nglyphs - 1)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                  else
@@ -5084 +5128 @@
-                      it->max_descent = descent;
-                    }
-
+
-                  TRACE_MOVE ((stderr, "move_it_in: continued at %d\n",
-                               IT_CHARPOS (*it)));
@@ -5090 +5134 @@
-                  break;
-                }
+              else if (BUFFER_POS_REACHED_P ())
+                goto buffer_pos_reached;
-              else if (new_x > it->first_visible_x)
-                {
@@ -5098 +5144 @@
-              else
-                {
- 
+
-                     area.  Nothing to do.  */
-                }
@@ -5105 +5151 @@
-          if (result != MOVE_UNDEFINED)
-            break;
+        }
+      else if (BUFFER_POS_REACHED_P ())
+        {
+        buffer_pos_reached:
+          it->current_x = x;
+          it->max_ascent = ascent;
+          it->max_descent = descent;
+          result = MOVE_POS_MATCH_OR_ZV;
+          break;
-        }
-      else if ((op & MOVE_TO_X) && it->current_x >= to_x)
@@ -5116 +5171 @@
-          break;
-        }
-
+
-      /* Is this a line end?  If yes, we're done.  */
-      if (ITERATOR_AT_END_OF_LINE_P (it))
@@ -5123 +5178 @@
-          break;
-        }
-
+
-      /* The current display element has been consumed.  Advance
-         to the next.  */
-      set_iterator_to_next (it, 1);
-
+
-      /* Stop if lines are truncated and IT's current x-position is
-         past the right edge of the window now.  */
@@ -5133 +5188 @@
-          && it->current_x >= it->last_visible_x)
-        {
+#ifdef HAVE_WINDOW_SYSTEM
+          if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
+            {
+              if (!get_next_display_element (it)
+                  || BUFFER_POS_REACHED_P ())
+                {
+                  result = MOVE_POS_MATCH_OR_ZV;
+                  break;
+                }
+              if (ITERATOR_AT_END_OF_LINE_P (it))
+                {
+                  result = MOVE_NEWLINE_OR_CR;
+                  break;
+                }
+            }
+#endif /* HAVE_WINDOW_SYSTEM */
-          result = MOVE_LINE_TRUNCATED;
-          break;
-        }
-    }
+
+#undef BUFFER_POS_REACHED_P
-
-  /* Restore the iterator settings altered at the beginning of this