mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-06 11:50:51 -08:00
Merge remote-tracking branch 'savannah/master' into HEAD
This commit is contained in:
commit
f7e7ff4fb1
107 changed files with 1076 additions and 639 deletions
|
|
@ -3812,7 +3812,6 @@ has been fetched."
|
|||
t))))
|
||||
|
||||
(defun gnus-agent-store-article (article group)
|
||||
(declare (obsolete nil "28.1"))
|
||||
(let* ((gnus-command-method (gnus-find-method-for-group group))
|
||||
(file (gnus-agent-article-name (number-to-string article) group))
|
||||
(file-name-coding-system nnmail-pathname-coding-system)
|
||||
|
|
|
|||
|
|
@ -7092,7 +7092,10 @@ If given a prefix, show the hidden text instead."
|
|||
gnus-summary-buffer)
|
||||
(when gnus-keep-backlog
|
||||
(gnus-backlog-enter-article
|
||||
group article (current-buffer))))
|
||||
group article (current-buffer)))
|
||||
(when (and gnus-agent
|
||||
(gnus-agent-group-covered-p group))
|
||||
(gnus-agent-store-article article group)))
|
||||
(setq result 'article))
|
||||
(methods
|
||||
(setq gnus-override-method (pop methods)))
|
||||
|
|
|
|||
|
|
@ -225,6 +225,12 @@ that was fetched."
|
|||
(save-excursion
|
||||
(save-restriction
|
||||
(narrow-to-region mark (point-max))
|
||||
;; Put the articles into the agent, if they aren't already.
|
||||
(when (and gnus-agent
|
||||
(gnus-agent-group-covered-p group))
|
||||
(save-restriction
|
||||
(narrow-to-region mark (point-max))
|
||||
(gnus-agent-store-article article group)))
|
||||
;; Prefetch images for the groups that want that.
|
||||
(when (fboundp 'gnus-html-prefetch-images)
|
||||
(gnus-html-prefetch-images summary))
|
||||
|
|
|
|||
|
|
@ -6240,8 +6240,8 @@ If WHERE is `summary', the summary mode line format will be used."
|
|||
;; We might have to chop a bit of the string off...
|
||||
(when (> (length mode-string) max-len)
|
||||
(setq mode-string
|
||||
(concat (truncate-string-to-width mode-string (- max-len 3))
|
||||
"...")))))
|
||||
(truncate-string-to-width
|
||||
mode-string (- max-len 3) nil nil t)))))
|
||||
;; Update the mode line.
|
||||
(setq mode-line-buffer-identification
|
||||
(gnus-mode-line-buffer-identification (list mode-string)))
|
||||
|
|
|
|||
|
|
@ -1106,7 +1106,8 @@ point and mark around the citation text as modified."
|
|||
If nil, don't insert a signature.
|
||||
If t, insert `message-signature-file'.
|
||||
If a function or form, insert its result.
|
||||
See `mail-signature' for the recommended format of a signature."
|
||||
See `mail-signature' for the recommended format of a signature.
|
||||
Also see `message-signature-insert-empty-line'."
|
||||
:version "23.2"
|
||||
:type '(choice string
|
||||
(const :tag "None" nil)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue