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

Merge from origin/emacs-28

Browse source 
64e8cc14b5 ; * lisp/image.el (create-image): Fix last change in doc s...
f3e3632394 Update some Gnus documentation in the Emacs manual
This commit is contained in:
Stefan Kangas 2022-09-30 06:30:41 +02:00
commit d5cccca945
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/emacs/misc.texi
View file

@ -162,12 +162,12 @@ List killed groups (@code{gnus-group-list-killed}).
List zombie groups (@code{gnus-group-list-zombies}).
@kindex u @r{(Gnus Group mode)}
@findex gnus-group-toggle-subscription
@findex gnus-group-toggle-subscription-at-point
@cindex subscribe groups
@cindex unsubscribe groups
@item u
Toggle the subscription status of the group
(@code{gnus-group-toggle-subscription}) on the current line.
(@code{gnus-group-toggle-subscription-at-point}) on the current line.
Invoking this on a killed or zombie group turns it into an
unsubscribed group.
@ -245,7 +245,7 @@ buffer and typed @kbd{C-s} (@pxref{Incremental Search}).
@kindex M-s M-s @r{(Gnus Summary mode)}
@findex gnus-summary-search-article-forward
@item M-s @var{regexp} @key{RET}
@item M-s M-s @var{regexp} @key{RET}
Search forward for articles containing a match for @var{regexp}
(@code{gnus-summary-search-article-forward}).

6
lisp/image.el
View file

@ -495,11 +495,7 @@ automatically scaled up in proportion to the default font.
Value is the image created, or nil if images of type TYPE are not supported.
Images should not be larger than specified by `max-image-size'.
Image file names that are not absolute are searched for in the
\"images\" sub-directory of `data-directory' and
`x-bitmap-file-path' (in that order)."
Images should not be larger than specified by `max-image-size'."
(let ((data-format
;; Pass the image format, if any, if this is data.
(and data-p (or (plist-get props :format) t))))