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

Merge from origin/emacs-29

Browse source 
6eddbfe33f Clarify the meaning of the argument of ':align-to' space ...
5c6a51668b ; * doc/misc/eshell.texi (Argument Modifiers): Fix typo i...
da5e05a50e Fix handling of ".elpaignore" file when compiling packages
This commit is contained in:
Eli Zaretskii 2023-08-04 03:17:50 -04:00
commit 54d7426428
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/lispref/display.texi
View file

@ -5287,10 +5287,18 @@ the ``pixel width'' of a character is usually 1, but it could be more
for TABs and double-width CJK characters.)
@item :align-to @var{hpos}
Specifies that the space should be wide enough to reach @var{hpos}.
If @var{hpos} is a number, it is measured in units of the normal
character width. @var{hpos} can also be a @dfn{pixel width}
specification (@pxref{Pixel Specification}).
Specifies that the space should be wide enough to reach the column
@var{hpos}. If @var{hpos} is a number, it is a column number, and is
measured in units of the canonical character width (@pxref{Frame
Font}). @var{hpos} can also be a @dfn{pixel width} specification
(@pxref{Pixel Specification}). When the current line is wider than
the window, and is either displayed by one or more continuation lines,
or is truncated and possibly scrolled horizontally (@pxref{Horizontal
Scrolling}), @var{hpos} is measured from the beginning of the logical
line, not from the visual beginning of the screen line. This way,
alignment produced by @code{:align-to} is consistent with functions
that count columns, such as @code{current-column} and
@code{move-to-column} (@pxref{Columns}).
@end table
You should use one and only one of the above properties. You can

2
doc/misc/eshell.texi
View file

@ -1715,7 +1715,7 @@ Treating the value as a file name, gets the directory name (the
@item t
Treating the value as a file name, gets the base name (the ``tail'').
For example, @samp{foo/bar/baz.el(:h)} expands to @samp{baz.el}.
For example, @samp{foo/bar/baz.el(:t)} expands to @samp{baz.el}.
@item e
Treating the value as a file name, gets the final extension of the

10
lisp/emacs-lisp/bytecomp.el
View file

@ -1975,6 +1975,8 @@ also be compiled."
(emacs-lisp-compilation-mode))
(let ((directories (list default-directory))
(default-directory default-directory)
(ignore-files-regexp
(mapconcat #'identity byte-compile-ignore-files "\\|"))
(skip-count 0)
(fail-count 0)
(file-count 0)
@ -1995,9 +1997,7 @@ also be compiled."
(or (null arg) (eq 0 arg)
(y-or-n-p (concat "Check " source "? ")))
;; Directory is requested to be ignored
(not (string-match-p
(regexp-opt byte-compile-ignore-files)
source))
(not (string-match-p ignore-files-regexp source))
(setq directories (nconc directories (list source))))
;; It is an ordinary file. Decide whether to compile it.
(if (and (string-match emacs-lisp-file-regexp source)
@ -2007,9 +2007,7 @@ also be compiled."
(not (auto-save-file-name-p source))
(not (member source (dir-locals--all-files directory)))
;; File is requested to be ignored
(not (string-match-p
(regexp-opt byte-compile-ignore-files)
source)))
(not (string-match-p ignore-files-regexp source)))
(progn (cl-incf
(pcase (byte-recompile-file source force arg)
('no-byte-compile skip-count)