Re: scroll-conservatively overflow

[Romain Francoise <romain@orebokech.com>]

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

Romain Francoise <romain@orebokech.com> writes:

> About scrolling: I've been bitten by a bug for some weeks now, I
> originally thought it was specific to the multi-tty code but I
> discovered this morning that it's not.  (A fresh checkout from CVS HEAD
> this morning exhibited the same issues.)

I have finally found enough time to track it down.  The change
responsible for all my scrolling problems is Richard's change to
indent.c on March 2nd:

2004-03-02  Richard M. Stallman  <rms@gnu.org>

	* indent.c (compute_motion): Save vpos in prev_vpos, like hpos etc.

Reverting this change (see attached patch) solves all issues in Dired,
Gnus, etc.

I have tried to come up with a fix but failed.  I don't really
understand why this change was necessary, it adds complexity and does
not fix anything as far as I can see.  If it was just a code cleanup,
maybe the best would be to revert it for the time being.

-- 
Romain Francoise <romain@orebokech.com> | This is a man's man's man's
it's a miracle -- http://orebokech.com/ | world. --James Brown

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: emacs-indent-fix.diff --]
[-- Type: text/x-patch, Size: 2421 bytes --]

Index: src/indent.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/indent.c,v
retrieving revision 1.160
diff -c -r1.160 indent.c
*** src/indent.c	5 Apr 2004 21:41:08 -0000	1.160
--- src/indent.c	30 Apr 2004 11:27:23 -0000
***************
*** 1197,1202 ****
--- 1197,1203 ----
      = (INTEGERP (current_buffer->selective_display)
         ? XINT (current_buffer->selective_display)
         : !NILP (current_buffer->selective_display) ? -1 : 0);
+   int prev_hpos = 0;
    int selective_rlen
      = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
         ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
***************
*** 1224,1231 ****
    int wide_column_end_hpos = 0;
    int prev_pos;			/* Previous buffer position.  */
    int prev_pos_byte;		/* Previous buffer position.  */
-   int prev_hpos = 0;
-   int prev_vpos = 0;
    int contin_hpos;		/* HPOS of last column of continued line.  */
    int prev_tab_offset;		/* Previous tab offset.  */
  
--- 1225,1230 ----
***************
*** 1274,1280 ****
  		  pos = prev_pos;
  		  pos_byte = prev_pos_byte;
  		  hpos = prev_hpos;
- 		  vpos = prev_vpos;
  		  tab_offset = prev_tab_offset;
  		}
  	      break;
--- 1273,1278 ----
***************
*** 1384,1390 ****
  		  if (pos >= next_boundary)
  		    next_boundary = pos + 1;
  		  prev_hpos = width;
- 		  prev_vpos = vpos;
  		  prev_tab_offset = tab_offset;
  		}
  	    }
--- 1382,1387 ----
***************
*** 1417,1423 ****
  	  pos = prev_pos;
  	  pos_byte = prev_pos_byte;
  	  hpos = prev_hpos;
- 	  vpos = prev_vpos;
  	  tab_offset = prev_tab_offset;
  
  	  /* NOTE on contin_hpos, hpos, and prev_hpos.
--- 1414,1419 ----
***************
*** 1438,1443 ****
--- 1434,1443 ----
  	      hpos = contin_hpos;
  	      vpos = vpos - 1;
  	    }
+ 	  else if (c == '\n')
+ 	    /* If previous character is NEWLINE,
+ 	       set VPOS back to previous line */
+ 	    vpos = vpos - 1;
  	  break;
  	}
  
***************
*** 1455,1461 ****
  	      pos = prev_pos;
  	      pos_byte = prev_pos_byte;
  	      hpos = prev_hpos;
- 	      vpos = prev_vpos;
  	      tab_offset = prev_tab_offset;
  	    }
  	  break;
--- 1455,1460 ----
***************
*** 1464,1470 ****
  	break;
  
        prev_hpos = hpos;
-       prev_vpos = vpos;
        prev_pos = pos;
        prev_pos_byte = pos_byte;
        wide_column_end_hpos = 0;
--- 1463,1468 ----

[-- Attachment #3: Type: text/plain, Size: 141 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel