comparison src/window.c @ 22:8fc7fe29b841 r19-15b94

Import from CVS: tag r19-15b94
author cvs
date Mon, 13 Aug 2007 08:50:29 +0200
parents 859a2309aef8
children 441bb1e64a06
comparison
equal deleted inserted replaced
21:b88636d63495 22:8fc7fe29b841
4039 } 4039 }
4040 } 4040 }
4041 4041
4042 } 4042 }
4043 4043
4044 extern int signal_error_on_buffer_boundary;
4045
4044 DEFUN ("scroll-up", Fscroll_up, 0, 1, "_P", /* 4046 DEFUN ("scroll-up", Fscroll_up, 0, 1, "_P", /*
4045 Scroll text of current window upward ARG lines; or near full screen if no ARG. 4047 Scroll text of current window upward ARG lines; or near full screen if no ARG.
4046 A near full screen is `next-screen-context-lines' less than a full screen. 4048 A near full screen is `next-screen-context-lines' less than a full screen.
4047 Negative ARG means scroll downward. 4049 Negative ARG means scroll downward.
4048 When calling from a program, supply a number as argument or nil. 4050 When calling from a program, supply a number as argument or nil.
4051
4052 If `signal-error-on-buffer-boundary' is nil, the usual error and
4053 loss of zmacs region is suppressed when moving past end of buffer.
4049 */ 4054 */
4050 (n)) 4055 (n))
4051 { 4056 {
4052 window_scroll (Fselected_window (Qnil), n, 1, ERROR_ME); 4057 Error_behavior errb =
4058 signal_error_on_buffer_boundary ? ERROR_ME : ERROR_ME_NOT;
4059
4060 window_scroll (Fselected_window (Qnil), n, 1, errb);
4053 return Qnil; 4061 return Qnil;
4054 } 4062 }
4055 4063
4056 DEFUN ("scroll-down", Fscroll_down, 0, 1, "_P", /* 4064 DEFUN ("scroll-down", Fscroll_down, 0, 1, "_P", /*
4057 Scroll text of current window downward ARG lines; or near full screen if no ARG. 4065 Scroll text of current window downward ARG lines; or near full screen if no ARG.
4058 A near full screen is `next-screen-context-lines' less than a full screen. 4066 A near full screen is `next-screen-context-lines' less than a full screen.
4059 Negative ARG means scroll upward. 4067 Negative ARG means scroll upward.
4060 When calling from a program, supply a number as argument or nil. 4068 When calling from a program, supply a number as argument or nil.
4069
4070 If `signal-error-on-buffer-boundary' is nil, the usual error and
4071 loss of zmacs region is suppressed when moving past end of buffer.
4061 */ 4072 */
4062 (n)) 4073 (n))
4063 { 4074 {
4064 window_scroll (Fselected_window (Qnil), n, -1, ERROR_ME); 4075 Error_behavior errb =
4076 signal_error_on_buffer_boundary ? ERROR_ME : ERROR_ME_NOT;
4077
4078 window_scroll (Fselected_window (Qnil), n, -1, errb);
4065 return Qnil; 4079 return Qnil;
4066 } 4080 }
4067 4081
4068 DEFUN ("other-window-for-scrolling", Fother_window_for_scrolling, 0, 0, 0, /* 4082 DEFUN ("other-window-for-scrolling", Fother_window_for_scrolling, 0, 0, 0, /*
4069 Return the other window for \"other window scroll\" commands. 4083 Return the other window for \"other window scroll\" commands.