Mercurial > hg > xemacs-beta

comparison src/window.c @ 223:2c611d1463a6 r20-4b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b10
author cvs
date Mon, 13 Aug 2007 10:10:54 +0200
parents d44af0c54775
children 677f6a0ee643
comparison
equal deleted inserted replaced
222:aae4c8b01452 223:2c611d1463a6
1491 { 1491 {
1492 struct window *w = decode_window (window); 1492 struct window *w = decode_window (window);
1493 1493
1494 CHECK_INT_COERCE_MARKER (pos); 1494 CHECK_INT_COERCE_MARKER (pos);
1495 if (w == XWINDOW (Fselected_window (Qnil))) 1495 if (w == XWINDOW (Fselected_window (Qnil)))
1496 Fgoto_char (pos, Fcurrent_buffer ()); 1496 Fgoto_char (pos, Qnil);
1497 else 1497 else
1498 set_marker_restricted (w->pointm[CURRENT_DISP], pos, w->buffer); 1498 set_marker_restricted (w->pointm[CURRENT_DISP], pos, w->buffer);
1499 1499
1500 MARK_POINT_CHANGED; 1500 MARK_POINT_CHANGED;
1501 return pos; 1501 return pos;
4899 /* As documented in Fcurrent_window_configuration, don't 4899 /* As documented in Fcurrent_window_configuration, don't
4900 save the location of point in the buffer which was current 4900 save the location of point in the buffer which was current
4901 when the window configuration was recorded. */ 4901 when the window configuration was recorded. */
4902 if (!EQ (p->buffer, new_current_buffer) && 4902 if (!EQ (p->buffer, new_current_buffer) &&
4903 XBUFFER (p->buffer) == current_buffer) 4903 XBUFFER (p->buffer) == current_buffer)
4904 Fgoto_char (w->pointm[CURRENT_DISP], Fcurrent_buffer ()); 4904 Fgoto_char (w->pointm[CURRENT_DISP], Qnil);
4905 } 4905 }
4906 else if (NILP (w->buffer) || 4906 else if (NILP (w->buffer) ||
4907 !BUFFER_LIVE_P (XBUFFER (w->buffer))) 4907 !BUFFER_LIVE_P (XBUFFER (w->buffer)))
4908 /* Else if window's old buffer is dead too, get a live one. */ 4908 /* Else if window's old buffer is dead too, get a live one. */
4909 { 4909 {