Mercurial > emacs
comparison src/window.c @ 46293:1fb8f75062c6
Use macro SPECPDL_INDEX.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 11 Jul 2002 14:18:02 +0000 |
parents | 3f111801efb4 |
children | 40db0673e6f0 |
comparison
equal
deleted
inserted
replaced
46292:712d0161e499 | 46293:1fb8f75062c6 |
---|---|
2662 Lisp_Object window, buffer; | 2662 Lisp_Object window, buffer; |
2663 int run_hooks_p; | 2663 int run_hooks_p; |
2664 { | 2664 { |
2665 struct window *w = XWINDOW (window); | 2665 struct window *w = XWINDOW (window); |
2666 struct buffer *b = XBUFFER (buffer); | 2666 struct buffer *b = XBUFFER (buffer); |
2667 int count = specpdl_ptr - specpdl; | 2667 int count = SPECPDL_INDEX (); |
2668 | 2668 |
2669 w->buffer = buffer; | 2669 w->buffer = buffer; |
2670 | 2670 |
2671 if (EQ (window, selected_window)) | 2671 if (EQ (window, selected_window)) |
2672 b->last_selected_window = window; | 2672 b->last_selected_window = window; |
3172 if (!NILP (tem)) | 3172 if (!NILP (tem)) |
3173 { | 3173 { |
3174 tem = Fsymbol_value (Qtemp_buffer_show_hook); | 3174 tem = Fsymbol_value (Qtemp_buffer_show_hook); |
3175 if (!NILP (tem)) | 3175 if (!NILP (tem)) |
3176 { | 3176 { |
3177 int count = specpdl_ptr - specpdl; | 3177 int count = SPECPDL_INDEX (); |
3178 Lisp_Object prev_window; | 3178 Lisp_Object prev_window; |
3179 prev_window = selected_window; | 3179 prev_window = selected_window; |
3180 | 3180 |
3181 /* Select the window that was chosen, for running the hook. */ | 3181 /* Select the window that was chosen, for running the hook. */ |
3182 record_unwind_protect (Fselect_window, prev_window); | 3182 record_unwind_protect (Fselect_window, prev_window); |
5460 usage: (save-window-excursion BODY ...) */) | 5460 usage: (save-window-excursion BODY ...) */) |
5461 (args) | 5461 (args) |
5462 Lisp_Object args; | 5462 Lisp_Object args; |
5463 { | 5463 { |
5464 register Lisp_Object val; | 5464 register Lisp_Object val; |
5465 register int count = specpdl_ptr - specpdl; | 5465 register int count = SPECPDL_INDEX (); |
5466 | 5466 |
5467 record_unwind_protect (Fset_window_configuration, | 5467 record_unwind_protect (Fset_window_configuration, |
5468 Fcurrent_window_configuration (Qnil)); | 5468 Fcurrent_window_configuration (Qnil)); |
5469 val = Fprogn (args); | 5469 val = Fprogn (args); |
5470 return unbind_to (count, val); | 5470 return unbind_to (count, val); |