diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-06-07 09:03:59 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-06-07 09:03:59 -0700 |
| commit | fa6d56529f9ebaedaf62ecbf8887ffecca7dce12 (patch) | |
| tree | 922e12ffbf813534647a96788b9a5fb77b4f2288 /lisp/gnus | |
| parent | 6cb557e7a58d7f1c2e9afceeba45d0ced2aff214 (diff) | |
| parent | 35661ef943d261f6c43e93e475ddd8516f4a4b62 (diff) | |
| download | emacs-fa6d56529f9ebaedaf62ecbf8887ffecca7dce12.tar.gz | |
Merge from origin/emacs-27
35661ef943 (origin/emacs-27) Fix typo in "(elisp) Type Keywords"
1af0e95fec Gnus nnir-summary-line-format has no effect
dd366b5d3b Improve documentation of 'window-text-pixel-size'
fbd49f969e * src/xdisp.c (Fwindow_text_pixel_size): Doc fix. (Bug#41...
d8593fd19f Minor improvements to EDE and EIEIO manuals
3916e63f9e Have Fido mode also imitate Ido mode in ignore-case options
cc35b197c7 Update package-menu-quick-help
bf09106256 Improve documentation of 'sort-subr'
73749efa13 Update Ukrainian transliteration
30a7ee505a Fix Arabic shaping when eww/shr fill the text to be rendered
7d323f07c0 Silence some byte-compiler warnings in tests
cf473e742f * test/lisp/battery-tests.el: New file.
b07e3b1d97 Improve format-spec documentation (bug#41571)
# Conflicts:
# test/lisp/emacs-lisp/package-tests.el
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/nnir.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 0277524a8c6..722969c21ba 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -663,7 +663,7 @@ A non-nil `specs' arg must be an alist with `nnir-query-spec' and (let ((backend (car (gnus-server-to-method server)))) (if backend (nnoo-change-server backend server definitions) - (add-hook 'gnus-summary-prepared-hook 'nnir-mode) + (add-hook 'gnus-summary-generate-hook 'nnir-mode) (nnoo-change-server 'nnir server definitions)))) (deffoo nnir-request-group (group &optional server dont-check _info) @@ -1850,8 +1850,11 @@ is also searched." (defun nnir-mode () (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) - (setq gnus-summary-line-format - (or nnir-summary-line-format gnus-summary-line-format)) + (when (and nnir-summary-line-format + (not (string= nnir-summary-line-format + gnus-summary-line-format))) + (setq gnus-summary-line-format nnir-summary-line-format) + (gnus-update-format-specifications nil 'summary)) (when (bound-and-true-p gnus-registry-enabled) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) |