comparison src/window.c @ 321:19dcec799385 r21-0-58

Import from CVS: tag r21-0-58
author cvs
date Mon, 13 Aug 2007 10:46:44 +0200
parents afd57c14dfc8
children 8bec6624d99b
comparison
equal deleted inserted replaced
320:73c75c43c1f2 321:19dcec799385
1633 CHECK_INT_COERCE_MARKER (pos); 1633 CHECK_INT_COERCE_MARKER (pos);
1634 set_marker_restricted (w->start[CURRENT_DISP], pos, w->buffer); 1634 set_marker_restricted (w->start[CURRENT_DISP], pos, w->buffer);
1635 /* this is not right, but much easier than doing what is right. */ 1635 /* this is not right, but much easier than doing what is right. */
1636 /* w->start_at_line_beg = 0; */ 1636 /* w->start_at_line_beg = 0; */
1637 /* WTF is the above supposed to mean? GE */ 1637 /* WTF is the above supposed to mean? GE */
1638 w->start_at_line_beg = beginning_of_line_p (XBUFFER (w->buffer), XINT (pos)); 1638 w->start_at_line_beg = beginning_of_line_p (XBUFFER (w->buffer),
1639 marker_position (w->start[CURRENT_DISP]));
1639 if (NILP (noforce)) 1640 if (NILP (noforce))
1640 w->force_start = 1; 1641 w->force_start = 1;
1641 w->redo_modeline = 1; 1642 w->redo_modeline = 1;
1642 SET_LAST_MODIFIED (w, 0); 1643 SET_LAST_MODIFIED (w, 0);
1643 SET_LAST_FACECHANGE (w); 1644 SET_LAST_FACECHANGE (w);
3165 make_int (XBUFFER (buffer)->last_window_start), 3166 make_int (XBUFFER (buffer)->last_window_start),
3166 buffer); 3167 buffer);
3167 Fset_marker (w->sb_point, w->start[CURRENT_DISP], buffer); 3168 Fset_marker (w->sb_point, w->start[CURRENT_DISP], buffer);
3168 /* set start_at_line_beg correctly. GE */ 3169 /* set start_at_line_beg correctly. GE */
3169 w->start_at_line_beg = beginning_of_line_p (XBUFFER (buffer), 3170 w->start_at_line_beg = beginning_of_line_p (XBUFFER (buffer),
3170 XBUFFER (buffer)->last_window_start); 3171 marker_position (w->start[CURRENT_DISP]));
3171 w->force_start = 0; /* Lucid fix */ 3172 w->force_start = 0; /* Lucid fix */
3172 SET_LAST_MODIFIED (w, 1); 3173 SET_LAST_MODIFIED (w, 1);
3173 SET_LAST_FACECHANGE (w); 3174 SET_LAST_FACECHANGE (w);
3174 MARK_WINDOWS_CHANGED (w); 3175 MARK_WINDOWS_CHANGED (w);
3175 recompute_all_cached_specifiers_in_window (w); 3176 recompute_all_cached_specifiers_in_window (w);
5668 5669
5669 Vvertical_divider_line_width = Fmake_specifier (Qnatnum); 5670 Vvertical_divider_line_width = Fmake_specifier (Qnatnum);
5670 { 5671 {
5671 Lisp_Object fb = Qnil; 5672 Lisp_Object fb = Qnil;
5672 #ifdef HAVE_TTY 5673 #ifdef HAVE_TTY
5673 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 5674 fb = Fcons (Fcons (list1 (Qtty), make_int (1)), fb);
5674 #endif 5675 #endif
5675 #ifdef HAVE_X_WINDOWS 5676 #ifdef HAVE_X_WINDOWS
5676 fb = Fcons (Fcons (list1 (Qx), make_int (3)), fb); 5677 fb = Fcons (Fcons (list1 (Qx), make_int (3)), fb);
5677 #endif 5678 #endif
5678 #ifdef HAVE_MS_WINDOWS 5679 #ifdef HAVE_MS_WINDOWS