[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 49aa3a1: Remove recently added BUFFER arg of `windo
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] master 49aa3a1: Remove recently added BUFFER arg of `window-text-pixel-size'. |
Date: |
Thu, 05 Feb 2015 14:41:38 +0000 |
branch: master
commit 49aa3a12ccf0ceea3961edaec9cd00dc6038fc79
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>
Remove recently added BUFFER arg of `window-text-pixel-size'.
* xdisp.c (Fwindow_text_pixel_size): Remove optional BUFFER
argument added on 2015-02-01.
* display.texi (Size of Displayed Text): Remove description of
optional argument BUFFER of `window-text-pixel-size'.
---
doc/lispref/ChangeLog | 5 +++++
doc/lispref/display.texi | 9 +--------
src/ChangeLog | 5 +++++
src/xdisp.c | 35 ++++++++++-------------------------
4 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index aa4d320..e928d19 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-05 Martin Rudalics <address@hidden>
+
+ * display.texi (Size of Displayed Text): Remove description of
+ optional argument BUFFER of `window-text-pixel-size'.
+
2015-02-01 Martin Rudalics <address@hidden>
* display.texi (Size of Displayed Text): Describe optional
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 10b17a3..b09b82a 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1880,7 +1880,7 @@ displayed in a given window. This function is used by
@code{fit-frame-to-buffer} (@pxref{Size and Position}) to make a window
exactly as large as the text it contains.
address@hidden window-text-pixel-size &optional window from to x-limit y-limit
mode-and-header-line buffer
address@hidden window-text-pixel-size &optional window from to x-limit y-limit
mode-and-header-line
This function returns the size of the text of @var{window}'s buffer in
pixels. @var{window} must be a live window and defaults to the selected
one. The return value is a cons of the maximum pixel-width of any text
@@ -1919,13 +1919,6 @@ means to not include the height of the mode- or
header-line of
@code{mode-line} or @code{header-line}, include only the height of that
line, if present, in the return value. If it is @code{t}, include the
height of both, if present, in the return value.
-
-The optional argument @var{buffer} allows to specify an alternate buffer
-whose text size will be calculated. If @var{buffer} is @code{nil} or
-omitted, then operate on the buffer of @var{window}. If it is @code{t},
-then operate on the current buffer as if it were displayed in
address@hidden If it specifies a live buffer, then operate on that
-buffer as if it were displayed in @var{window}.
@end defun
diff --git a/src/ChangeLog b/src/ChangeLog
index 6b56abb..2c9b6c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-05 Martin Rudalics <address@hidden>
+
+ * xdisp.c (Fwindow_text_pixel_size): Remove optional BUFFER
+ argument added on 2015-02-01.
+
2015-02-04 Paul Eggert <address@hidden>
Remove no-longer-used two_byte_p calculations
diff --git a/src/xdisp.c b/src/xdisp.c
index 3c928f7..5c3e641 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9650,7 +9650,7 @@ in_display_vector_p (struct it *it)
&& it->dpvec + it->current.dpvec_index != it->dpend);
}
-DEFUN ("window-text-pixel-size", Fwindow_text_pixel_size,
Swindow_text_pixel_size, 0, 7, 0,
+DEFUN ("window-text-pixel-size", Fwindow_text_pixel_size,
Swindow_text_pixel_size, 0, 6, 0,
doc: /* Return the size of the text of WINDOW's buffer in pixels.
WINDOW must be a live window and defaults to the selected one. The
return value is a cons of the maximum pixel-width of any text line and
@@ -9683,17 +9683,12 @@ Optional argument MODE-AND-HEADER-LINE nil or omitted
means do not
include the height of the mode- or header-line of WINDOW in the return
value. If it is either the symbol `mode-line' or `header-line', include
only the height of that line, if present, in the return value. If t,
-include the height of both, if present, in the return value.
-
-Optional argument BUFFER nil means to return the size of the text of
-WINDOW's buffer. BUFFER t means to return the size of the text of the
-current buffer as if it were displayed in WINDOW. Else BUFFER has to
-specify a live buffer and this function returns the size of the text of
-BUFFER as if it were displayed in WINDOW. */)
+include the height of both, if present, in the return value. */)
(Lisp_Object window, Lisp_Object from, Lisp_Object to, Lisp_Object x_limit,
- Lisp_Object y_limit, Lisp_Object mode_and_header_line, Lisp_Object buffer)
+ Lisp_Object y_limit, Lisp_Object mode_and_header_line)
{
struct window *w = decode_live_window (window);
+ Lisp_Object buffer = w->contents;
struct buffer *b;
struct it it;
struct buffer *old_b = NULL;
@@ -9702,23 +9697,13 @@ BUFFER as if it were displayed in WINDOW. */)
void *itdata = NULL;
int c, max_y = -1, x = 0, y = 0;
- if (EQ (buffer, Qt))
- b = current_buffer;
- else
- {
- if (NILP (buffer))
- buffer = w->contents;
-
- CHECK_BUFFER (buffer);
- if (!BUFFER_LIVE_P (XBUFFER (buffer)))
- error ("Not a live buffer");
+ CHECK_BUFFER (buffer);
+ b = XBUFFER (buffer);
- b = XBUFFER (buffer);
- if (b != current_buffer)
- {
- old_b = current_buffer;
- set_buffer_internal (b);
- }
+ if (b != current_buffer)
+ {
+ old_b = current_buffer;
+ set_buffer_internal (b);
}
if (NILP (from))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 49aa3a1: Remove recently added BUFFER arg of `window-text-pixel-size'.,
Martin Rudalics <=