procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-30

Browse source 
a0406f7c12 ; Improve documentation of 'add-to-list'
bd6dfb97ff NS: Fix scroll-bar setting code (bug#72331)
This commit is contained in:
Eli Zaretskii 2024-08-10 04:15:32 -04:00
commit 23d8e4326c
4 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/lispref/lists.texi
View file

@ -840,6 +840,13 @@ The argument @var{symbol} is not implicitly quoted; @code{add-to-list}
is an ordinary function, like @code{set} and unlike @code{setq}. Quote
the argument yourself if that is what you want.
This function is for adding elements to configuration variables such as
@code{load-path} (@pxref{Library Search}), @code{image-load-path}
(@pxref{Defining Images}), etc. Its code includes quite a few special
checks for these uses, and emits warnings in support of them. For this
reason, we recommend against using it in Lisp programs for constructing
arbitrary lists; use @code{push} instead. @xref{List Variables}.
Do not use this function when @var{symbol} refers to a lexical
variable.
@end defun

8
lisp/subr.el
View file

@ -2384,9 +2384,11 @@ LIST-VAR should not refer to a lexical variable.
The return value is the new value of LIST-VAR.
This is handy to add some elements to configuration variables,
but please do not abuse it in Elisp code, where you are usually
better off using `push' or `cl-pushnew'.
This is meant to be used for adding elements to configuration
variables, such as adding a directory to a path variable
like `load-path', but please do not abuse it to construct
arbitrary lists in Elisp code, where using `push' or `cl-pushnew'
will get you more efficient code.
If you want to use `add-to-list' on a variable that is not
defined until a certain package is loaded, you should put the

16
src/nsterm.h
View file

@ -1069,22 +1069,6 @@ struct x_output
styleMask:[[FRAME_NS_VIEW (f) window] styleMask]]) \
- NSHeight([[[FRAME_NS_VIEW (f) window] contentView] frame])))
/* Compute pixel size for vertical scroll bars. */
#define NS_SCROLL_BAR_WIDTH(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS (f) \
? rint (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0 \
? FRAME_CONFIG_SCROLL_BAR_WIDTH (f) \
: (FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))) \
: 0)
/* Compute pixel size for horizontal scroll bars. */
#define NS_SCROLL_BAR_HEIGHT(f) \
(FRAME_HAS_HORIZONTAL_SCROLL_BARS (f) \
? rint (FRAME_CONFIG_SCROLL_BAR_HEIGHT (f) > 0 \
? FRAME_CONFIG_SCROLL_BAR_HEIGHT (f) \
: (FRAME_SCROLL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f))) \
: 0)
/* Difference between char-column-calculated and actual SB widths.
This is only a concern for rendering when SB on left. */
#define NS_SCROLL_BAR_ADJUST(w, f) \

6
src/nsterm.m
View file

@ -5067,7 +5067,7 @@ Function modeled after x_draw_glyph_string_box ().
window_box (window, ANY_AREA, 0, &window_y, 0, &window_height);
top = window_y;
height = window_height;
width = NS_SCROLL_BAR_WIDTH (f);
width = WINDOW_SCROLL_BAR_AREA_WIDTH (window);
left = WINDOW_SCROLL_BAR_AREA_X (window);
r = NSMakeRect (left, top, width, height);
@ -5161,7 +5161,7 @@ Function modeled after x_draw_glyph_string_box ().
window_box (window, ANY_AREA, &window_x, 0, &window_width, 0);
left = window_x;
width = window_width;
height = NS_SCROLL_BAR_HEIGHT (f);
height = WINDOW_SCROLL_BAR_AREA_HEIGHT (window);
top = WINDOW_SCROLL_BAR_AREA_Y (window);
r = NSMakeRect (left, top, width, height);
@ -5199,7 +5199,7 @@ Function modeled after x_draw_glyph_string_box ().
it fills with junk. */
if (!NILP (window->vertical_scroll_bar))
ns_clear_frame_area (f, WINDOW_SCROLL_BAR_AREA_X (window), top,
NS_SCROLL_BAR_HEIGHT (f), height);
WINDOW_SCROLL_BAR_AREA_WIDTH (window), height);
if (update_p)
[bar setPosition: position portion: portion whole: whole];