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

Merge from origin/emacs-29

Browse source 
196def4fa6 Fix description of 'Package-Requires' library header
c177843279 ; * doc/misc/tramp.texi (FUSE setup): Fix typo.
a64336cbb9 * lisp/emacs-lisp/cl-lib.el (cl--defalias): Improve&fix d...
da8b85b577 Add two docstrings in cl-lib.el
This commit is contained in:
Eli Zaretskii 2023-11-04 05:21:39 -04:00
commit 050086931a
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
doc/lispref/tips.texi
View file

@ -1169,6 +1169,21 @@ element) is equivalent to entry with version "0". For instance:
;; Package-Requires: ((gnus "1.0") (bubbles "2.7.2") cl-lib (seq)) ;; Package-Requires: ((gnus "1.0") (bubbles "2.7.2") cl-lib (seq))
@end smallexample @end smallexample
Packages that don't need to support Emacs versions older than Emacs 27
can have the @samp{Package-Requires} header split across multiple
lines, like this:
@smallexample
@group
;; Package-Requires: ((emacs "27.1")
;; (compat "29.1.4.1"))
@end group
@end smallexample
@noindent
Note that with this format, you still need to start the list on the
same line as @samp{Package-Requires}.
The package code automatically defines a package named @samp{emacs} The package code automatically defines a package named @samp{emacs}
with the version number of the currently running Emacs. This can be with the version number of the currently running Emacs. This can be
used to require a minimal version of Emacs for a package. used to require a minimal version of Emacs for a package.

2
doc/misc/tramp.texi
View file

@ -2984,7 +2984,7 @@ connection cleanup or on Emacs exiting.
@cindex rclone setup @cindex rclone setup
The default arguments of the @command{rclone} operations The default arguments of the @command{rclone} operations
@command{mount}, @command{coopyto}, @command{moveto} and @command{mount}, @command{copyto}, @command{moveto} and
@command{about} are declared in the variable @code{tramp-methods} as @command{about} are declared in the variable @code{tramp-methods} as
method specific parameters. Usually, they don't need to be overwritten. method specific parameters. Usually, they don't need to be overwritten.

3
lisp/emacs-lisp/cl-lib.el
View file

@ -157,6 +157,7 @@ to an element already in the list stored in PLACE.
`(cl-callf2 cl-adjoin ,x ,place ,@keys))) `(cl-callf2 cl-adjoin ,x ,place ,@keys)))
(defun cl--set-buffer-substring (start end val) (defun cl--set-buffer-substring (start end val)
"Delete region from START to END and insert VAL."
(save-excursion (delete-region start end) (save-excursion (delete-region start end)
(goto-char start) (goto-char start)
(insert val) (insert val)
@ -194,6 +195,8 @@ to an element already in the list stored in PLACE.
;; the target form to return the values as a list. ;; the target form to return the values as a list.
(defun cl--defalias (cl-f el-f &optional doc) (defun cl--defalias (cl-f el-f &optional doc)
"Define function CL-F as definition EL-F.
Like `defalias' but marks the alias itself as inlinable."
(defalias cl-f el-f doc) (defalias cl-f el-f doc)
(put cl-f 'byte-optimizer 'byte-compile-inline-expand)) (put cl-f 'byte-optimizer 'byte-compile-inline-expand))