Mercurial > hg > xemacs-beta

comparison src/window.c @ 4775:1d61580e0cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove Fsave_window_excursion from window.c, it's overridden by Lisp. lisp/ChangeLog addition: 2009-11-08 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el (save-window-excursion): Remove the compiler form for this bytecode, we no longer generate calls to it. Keep the information about the bytecode's numeric value, we want that for disassembling code. src/ChangeLog addition: 2009-11-08 Aidan Kehoe <kehoea@parhasard.net> * window.c (Fsave_window_excursion, save_window_excursion_unwind): Remove these functions, the first was masked by #'save-window-excursion in window.el, and the second can be easily replaced with Lisp primitives. * bytecode.c (Bsave_window_excursion) : Don't pass save_window_excursion_unwind to record_unwind_protect, now the former is gone. * event-stream.c (execute_help_form): Ditto.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 17 Dec 2009 12:57:38 +0000
parents 80cd90837ac5
children a98ca4640147 e0db3c197671
comparison
equal deleted inserted replaced
4774:26a007fa2f4c 4775:1d61580e0cf7
5265 if (!NILP (w->hchild)) delete_all_subwindows (XWINDOW (w->hchild)); 5265 if (!NILP (w->hchild)) delete_all_subwindows (XWINDOW (w->hchild));
5266 5266
5267 mark_window_as_deleted (w); 5267 mark_window_as_deleted (w);
5268 } 5268 }
5269 5269
5270 Lisp_Object
5271 save_window_excursion_unwind (Lisp_Object window_config)
5272 {
5273 Lisp_Object val = call1 (Qset_window_configuration, window_config);
5274 return val;
5275 }
5276
5277 DEFUN ("save-window-excursion", Fsave_window_excursion, 0, UNEVALLED, 0, /*
5278 Execute BODY, preserving window sizes and contents.
5279 Restores which buffer appears in which window, where display starts,
5280 as well as the current buffer.
5281 Does not restore the value of point in current buffer.
5282
5283 arguments: (&rest BODY)
5284 */
5285 (args))
5286 {
5287 /* This function can GC */
5288 int speccount = specpdl_depth ();
5289
5290 record_unwind_protect (save_window_excursion_unwind,
5291 call1 (Qcurrent_window_configuration, Qnil));
5292 return unbind_to_1 (speccount, Fprogn (args));
5293 }
5294 5270
5295 static int 5271 static int
5296 get_current_pixel_pos (Lisp_Object window, Lisp_Object pos, 5272 get_current_pixel_pos (Lisp_Object window, Lisp_Object pos,
5297 struct window **w, 5273 struct window **w,
5298 struct rune **rb, struct display_line **dl) 5274 struct rune **rb, struct display_line **dl)
5556 DEFSUBR (Fcenter_to_window_line); 5532 DEFSUBR (Fcenter_to_window_line);
5557 DEFSUBR (Fmove_to_window_line); 5533 DEFSUBR (Fmove_to_window_line);
5558 #ifdef MEMORY_USAGE_STATS 5534 #ifdef MEMORY_USAGE_STATS
5559 DEFSUBR (Fwindow_memory_usage); 5535 DEFSUBR (Fwindow_memory_usage);
5560 #endif 5536 #endif
5561 DEFSUBR (Fsave_window_excursion);
5562 DEFSUBR (Fcurrent_pixel_column); 5537 DEFSUBR (Fcurrent_pixel_column);
5563 DEFSUBR (Fcurrent_pixel_row); 5538 DEFSUBR (Fcurrent_pixel_row);
5564 } 5539 }
5565 5540
5566 void 5541 void