diff options
author | Glenn Morris <rgm@gnu.org> | 2019-07-30 21:42:34 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-07-30 21:42:34 -0700 |
commit | 1ac0cfa2642ac026e09a7555f000e895b49289d5 (patch) | |
tree | 952416b5746614ea4e961dca70a00162421de36f /doc/misc | |
parent | 77fb84e6db96cbaa70e230f4881e4ede6e028f15 (diff) | |
parent | 8fbe46252f5f241d274b59c6b1aaecd3ee58cc6a (diff) | |
download | emacs-1ac0cfa2642ac026e09a7555f000e895b49289d5.tar.gz |
Merge from origin/emacs-26
8fbe462 (origin/emacs-26) ; * doc/lispref/positions.texi (List Motion...
1d9efc0 Add index for "\( in strings" (Bug#25195)
304e96f Fix doc-string of 'fit-window-to-buffer' (Bug#36848)
d4c4987 Update view-mode docstring
d6ca1fc ; * lisp/term.el: Add missing / to esc seq commentary.
b3e2073 Fix subproc listening when setting filter to non-t (Bug#36591)
f671950 * etc/NEWS.25: Belatedly announce rcirc-reconnect-delay.
7f42277 Mention term.el's \032 dir tracking in commentary (Bug#19524)
16a529e Remove upload functionality of package-x from the elisp manual
78e6c2a * etc/AUTHORS: Update.
086a56e Clarify Gravatar docs
0592467 * doc/lispref/display.texi (Defining Faces): Say a face can't...
# Conflicts:
# doc/emacs/programs.texi
# etc/AUTHORS
# lisp/term.el
Diffstat (limited to 'doc/misc')
-rw-r--r-- | doc/misc/gnus.texi | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 8f0023c1989..dcba47aca05 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -23505,11 +23505,11 @@ XEmacs. Here are examples: (png . (:relief -2)))) @end lisp -@pxref{Image Descriptors, ,Image Descriptors, elisp, The Emacs Lisp -Reference Manual} for the valid properties for various image types. -Currently, @code{pbm} is used for X-Face images and @code{png} is used -for Face images in Emacs. Only the @code{:face} property is effective -on the @code{xface} image type in XEmacs if it is built with the +@xref{Image Descriptors,,, elisp, The Emacs Lisp Reference Manual}, +for the valid properties for various image types. Currently, +@code{pbm} is used for X-Face images and @code{png} is used for Face +images in Emacs. Only the @code{:face} property is effective on the +@code{xface} image type in XEmacs if it is built with the @samp{libcompface} library. @end table @@ -23780,21 +23780,25 @@ The following variables offer control over how things are displayed. @item gnus-gravatar-size @vindex gnus-gravatar-size The size in pixels of gravatars. Gravatars are always square, so one -number for the size is enough. +number for the size is enough. If @code{nil}, this defaults to the +value of @code{gravatar-size}. @item gnus-gravatar-properties @vindex gnus-gravatar-properties -List of image properties applied to Gravatar images. +List of image properties applied to Gravatar images (@pxref{Image +Descriptors,,, elisp, The Emacs Lisp Reference Manual}). @item gnus-gravatar-too-ugly @vindex gnus-gravatar-too-ugly -Regexp that matches mail addresses or names of people of which avatars -should not be displayed, or @code{nil}. It default to the value of -@code{gnus-article-x-face-too-ugly} (@pxref{X-Face}). +Regexp that matches mail addresses or names of people whose avatars +should not be displayed, or @code{nil} to display all avatars. It +defaults to the value of @code{gnus-article-x-face-too-ugly} +(@pxref{X-Face}). @end table -If you want to see them in the From field, set: +If you want to see gravatars in the From field, set: + @lisp (setq gnus-treat-from-gravatar 'head) @end lisp |