Re: master 943f95e03c: Merge from origin/emacs-28

[Arash Esbati]

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