* Re: master 943f95e03c: Merge from origin/emacs-28
[not found] ` <20221028201119.764F0C009A8@vcs2.savannah.gnu.org>
@ 2022-10-29 11:30 ` Arash Esbati
2022-10-29 12:41 ` Eli Zaretskii
0 siblings, 1 reply; 2+ messages in thread
From: Arash Esbati @ 2022-10-29 11:30 UTC (permalink / raw)
To: emacs-devel; +Cc: Stefan Kangas
Stefan Kangas <stefankangas@gmail.com> writes:
> branch: master
> commit 943f95e03c4b9d790267c71b1b9addf55b1c4802
> Merge: 27b817ad32 510020d30d
> Author: Stefan Kangas <stefankangas@gmail.com>
> Commit: Stefan Kangas <stefankangas@gmail.com>
>
> Merge from origin/emacs-28
>
> 510020d30d ; Improve doc strings in whitespace.el
>
> # Conflicts:
> # lisp/whitespace.el
> ---
> lisp/whitespace.el | 287 ++++++++++++++++++++++++++++++-----------------------
> 1 file changed, 161 insertions(+), 126 deletions(-)
>
> diff --git a/lisp/whitespace.el b/lisp/whitespace.el
> index d7b83ef34a..4238461b7e 100644
>
> @@ -542,7 +544,9 @@ Used when `whitespace-style' includes the value `trailing'.")
> '((default :weight bold)
> (((class mono)) :inverse-video t :underline t)
> (t :background "red1" :foreground "yellow"))
> - "Face used to visualize trailing blanks."
> + "Face used to visualize trailing blanks.
> +
> +See '`whitespace-trailing-regexp'."
_^_
I think the first ' is misplaced.
> :group 'whitespace)
Best, Arash
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-29 12:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <166698787901.26222.13628700934169544477@vcs2.savannah.gnu.org>
[not found] ` <20221028201119.764F0C009A8@vcs2.savannah.gnu.org>
2022-10-29 11:30 ` master 943f95e03c: Merge from origin/emacs-28 Arash Esbati
2022-10-29 12:41 ` Eli Zaretskii
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.