From 68f8f1c0c680494639b4396e242747e5103ae40d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 6 Nov 2012 09:40:07 -0800 Subject: [PATCH] Minor adjustments of recently-changed frame functions. * buffer.c (Fbuffer_list): Omit CHECK_FRAME, since arg is already known to be a frame (we're in the FRAMEP branch). * lisp.h (Qframep): Remove decl. frame.h declares this. * window.c (quad): Args are of type EMACS_INT, not ptrdiff_t, since they're meant for Lisp fixnum values. --- src/ChangeLog | 9 +++++++++ src/buffer.c | 3 +-- src/lisp.h | 3 --- src/window.c | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 10c48b80f76..1a4da7f6a3c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2012-11-06 Paul Eggert + + Minor adjustments of recently-changed frame functions. + * buffer.c (Fbuffer_list): Omit CHECK_FRAME, since arg is already + known to be a frame (we're in the FRAMEP branch). + * lisp.h (Qframep): Remove decl. frame.h declares this. + * window.c (quad): Args are of type EMACS_INT, not ptrdiff_t, + since they're meant for Lisp fixnum values. + 2012-11-06 Dmitry Antipov * window.c (Fwindow_combination_limit): Revert to the only diff --git a/src/buffer.c b/src/buffer.c index 24286610570..bb69675346a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -406,7 +406,6 @@ followed by the rest of the buffers. */) Lisp_Object framelist, prevlist, tail; Lisp_Object args[3]; - CHECK_FRAME (frame); framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); prevlist = Fnreverse (Fcopy_sequence (XFRAME (frame)->buried_buffer_list)); @@ -2103,7 +2102,7 @@ set_buffer_internal_1 (register struct buffer *b) return; BUFFER_CHECK_INDIRECTION (b); - + old_buf = current_buffer; current_buffer = b; last_known_column_point = -1; /* invalidate indentation cache */ diff --git a/src/lisp.h b/src/lisp.h index 1a76a502ca0..97764eb24bd 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2628,9 +2628,6 @@ extern Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; EXFUN (Fbyteorder, 0) ATTRIBUTE_CONST; -/* Defined in frame.c. */ -extern Lisp_Object Qframep; - /* Defined in data.c. */ extern Lisp_Object indirect_function (Lisp_Object); extern Lisp_Object find_symbol_value (Lisp_Object); diff --git a/src/window.c b/src/window.c index f1177be3d99..197f4916bc2 100644 --- a/src/window.c +++ b/src/window.c @@ -273,7 +273,7 @@ decode_valid_window (register Lisp_Object window) /* Build a frequently used 4-integer (X Y W H) list. */ static Lisp_Object -quad (ptrdiff_t x, ptrdiff_t y, ptrdiff_t w, ptrdiff_t h) +quad (EMACS_INT x, EMACS_INT y, EMACS_INT w, EMACS_INT h) { return list4 (make_number (x), make_number (y), make_number (w), make_number (h)); @@ -3105,7 +3105,7 @@ run_window_configuration_change_hook (struct frame *f) DEFUN ("run-window-configuration-change-hook", Frun_window_configuration_change_hook, Srun_window_configuration_change_hook, 0, 1, 0, - doc: /* Run `window-configuration-change-hook' for FRAME. + doc: /* Run `window-configuration-change-hook' for FRAME. If FRAME is omitted or nil, it defaults to the selected frame. */) (Lisp_Object frame) { -- 2.39.5