[Emacs-diffs] emacs/src xdisp.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/03 21:09:22

Modified files:
        src            : xdisp.c 

Log message:
        (XPNTR) [USE_LSB_TAG && USE_LISP_UNION_TYPE]: silence compiler.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1316&r2=1.1317

Patches:
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1316
retrieving revision 1.1317
diff -u -b -r1.1316 -r1.1317
--- xdisp.c     19 Oct 2009 04:27:20 -0000      1.1316
+++ xdisp.c     3 Nov 2009 21:09:21 -0000       1.1317
@@ -45,12 +45,6 @@
    change the interpreter's state.  If you don't follow these rules,
    you will encounter bugs which are very hard to explain.
 
-            (Direct functions, see below)
-             direct_output_for_insert,
-             direct_forward_char (dispnew.c)
-         +---------------------------------+
-          |                                 |
-         |                                 V
    +--------------+   redisplay     +----------------+
    | Lisp machine |---------------->| Redisplay code |<--+
    +--------------+   (xdisp.c)     +----------------+   |
@@ -85,27 +79,6 @@
    reusing part of the display by scrolling lines.
 
 
-   Direct operations.
-
-   You will find a lot of redisplay optimizations when you start
-   looking at the innards of redisplay.  The overall goal of all these
-   optimizations is to make redisplay fast because it is done
-   frequently.
-
-   Two optimizations are not found in xdisp.c.  These are the direct
-   operations mentioned above.  As the name suggests they follow a
-   different principle than the rest of redisplay.  Instead of
-   building a desired matrix and then comparing it with the current
-   display, they perform their actions directly on the display and on
-   the current matrix.
-
-   One direct operation updates the display after one character has
-   been entered.  The other one moves the cursor by one position
-   forward or backward.  You find these functions under the names
-   `direct_output_for_insert' and `direct_output_forward_char' in
-   dispnew.c.
-
-
    Desired matrices.
 
    Desired matrices are always built per Emacs window.  The function
@@ -655,7 +628,7 @@
 Lisp_Object Vblink_cursor_alist;
 
 /* A scratch glyph row with contents used for generating truncation
-   glyphs.  Also used in direct_output_for_insert.  */
+   glyphs.  Also used in get_overlay_arrow_glyph_row.  */
 
 #define MAX_SCRATCH_GLYPHS 100
 struct glyph_row scratch_glyph_row;
@@ -11360,16 +11333,6 @@
   if (!f->glyphs_initialized_p)
     return;
 
-  /* The flag redisplay_performed_directly_p is set by
-     direct_output_for_insert when it already did the whole screen
-     update necessary.  */
-  if (redisplay_performed_directly_p)
-    {
-      redisplay_performed_directly_p = 0;
-      if (!hscroll_windows (selected_window))
-       return;
-    }
-
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS)
   if (popup_activated ())
     return;