[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110576: In window.c fix two flaws re
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110576: In window.c fix two flaws reported by Dmitry Antipov. |
Date: |
Thu, 18 Oct 2012 10:27:49 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110576
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-18 10:27:49 +0200
message:
In window.c fix two flaws reported by Dmitry Antipov.
* window.c (Ftemp_output_buffer_show): Remove.
(Fwindow_vscroll, Fset_window_vscroll): Use decode_live_window.
(syms_of_window): Remove defsubr for Stemp_output_buffer_show.
modified:
src/ChangeLog
src/window.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-17 19:02:44 +0000
+++ b/src/ChangeLog 2012-10-18 08:27:49 +0000
@@ -1,10 +1,17 @@
+2012-10-18 Martin Rudalics <address@hidden>
+
+ Fix two flaws reported by Dmitry Antipov.
+ * window.c (Ftemp_output_buffer_show): Remove.
+ (Fwindow_vscroll, Fset_window_vscroll): Use decode_live_window.
+ (syms_of_window): Remove defsubr for Stemp_output_buffer_show.
+
2012-10-17 Eli Zaretskii <address@hidden>
- * makefile.w32-in ($(BLD)/w32.$(O)):
- ($(BLD)/vm-limit.$(O)):
- ($(BLD)/term.$(O)):
- ($(BLD)/unexw32.$(O)):
- ($(BLD)/fileio.$(O)):
+ * makefile.w32-in ($(BLD)/w32.$(O)):
+ ($(BLD)/vm-limit.$(O)):
+ ($(BLD)/term.$(O)):
+ ($(BLD)/unexw32.$(O)):
+ ($(BLD)/fileio.$(O)):
($(BLD)/dispnew.$(O)): Update dependencies.
* w32term.h (w32_initialize_display_info, initialize_w32_display):
=== modified file 'src/window.c'
--- a/src/window.c 2012-10-15 09:03:56 +0000
+++ b/src/window.c 2012-10-18 08:27:49 +0000
@@ -3339,7 +3339,7 @@
return Qnil;
}
-
+/* Obsolete since 24.3. */
void
temp_output_buffer_show (register Lisp_Object buf)
{
@@ -3392,16 +3392,6 @@
}
}
}
-
-DEFUN ("internal-temp-output-buffer-show",
- Ftemp_output_buffer_show, Stemp_output_buffer_show,
- 1, 1, 0,
- doc: /* Internal function for `with-output-to-temp-buffer'. */)
- (Lisp_Object buf)
-{
- temp_output_buffer_show (buf);
- return Qnil;
-}
/* Make new window, have it replace WINDOW in window-tree, and make
WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only
@@ -6423,15 +6413,8 @@
(Lisp_Object window, Lisp_Object pixels_p)
{
Lisp_Object result;
- struct frame *f;
- struct window *w;
-
- if (NILP (window))
- window = selected_window;
- else
- CHECK_WINDOW (window);
- w = XWINDOW (window);
- f = XFRAME (w->frame);
+ struct window *w = decode_live_window (window);
+ struct frame *f = XFRAME (w->frame);
if (FRAME_WINDOW_P (f))
result = (NILP (pixels_p)
@@ -6455,18 +6438,11 @@
If PIXELS-P is non-nil, the return value is VSCROLL. */)
(Lisp_Object window, Lisp_Object vscroll, Lisp_Object pixels_p)
{
- struct window *w;
- struct frame *f;
+ struct window *w = decode_live_window (window);
+ struct frame *f = XFRAME (w->frame);
- if (NILP (window))
- window = selected_window;
- else
- CHECK_WINDOW (window);
CHECK_NUMBER_OR_FLOAT (vscroll);
- w = XWINDOW (window);
- f = XFRAME (w->frame);
-
if (FRAME_WINDOW_P (f))
{
int old_dy = w->vscroll;
@@ -6923,7 +6899,6 @@
defsubr (&Srun_window_configuration_change_hook);
defsubr (&Sselect_window);
defsubr (&Sforce_window_update);
- defsubr (&Stemp_output_buffer_show);
defsubr (&Ssplit_window_internal);
defsubr (&Sscroll_up);
defsubr (&Sscroll_down);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110576: In window.c fix two flaws reported by Dmitry Antipov.,
martin rudalics <=