[Emacs-diffs] emacs/src xdisp.c

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/08/29 17:35:59

Modified files:
        src            : xdisp.c 

Log message:
        (redisplay_internal): Remove redundant test and collapse both branches
        into one.

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

Patches:
Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -b -r1.1295 -r1.1296
--- xdisp.c     15 Aug 2009 17:30:21 -0000      1.1295
+++ xdisp.c     29 Aug 2009 17:35:56 -0000      1.1296
@@ -11658,29 +11658,17 @@
                    = MATRIX_ROW (w->current_matrix, this_line_vpos + 1);
                  int delta, delta_bytes;
 
-                 if (Z - CHARPOS (tlendpos) == ZV)
-                   {
-                     /* This line ends at end of (accessible part of)
-                        buffer.  There is no newline to count.  */
+                 /* We used to distinguish between two cases here,
+                    conditioned by Z - CHARPOS (tlendpos) == ZV, for
+                    when the line ends in a newline or the end of the
+                    buffer's accessible portion.  But both cases did
+                    the same, so they were collapsed.  */
                      delta = (Z
                               - CHARPOS (tlendpos)
                               - MATRIX_ROW_START_CHARPOS (row));
                      delta_bytes = (Z_BYTE
                                     - BYTEPOS (tlendpos)
                                     - MATRIX_ROW_START_BYTEPOS (row));
-                   }
-                 else
-                   {
-                     /* This line ends in a newline.  Must take
-                        account of the newline and the rest of the
-                        text that follows.  */
-                     delta = (Z
-                              - CHARPOS (tlendpos)
-                              - MATRIX_ROW_START_CHARPOS (row));
-                     delta_bytes = (Z_BYTE
-                                    - BYTEPOS (tlendpos)
-                                    - MATRIX_ROW_START_BYTEPOS (row));
-                   }
 
                  increment_matrix_positions (w->current_matrix,
                                              this_line_vpos + 1,