mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

Merge changes made in No Gnus

Browse Source 
nnml.el (nnml-request-compact-group): Delete the marks file after compaction (bug#10800).
gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on group exit.
nnimap.el (nnimap-parse-flags): Parse correctly when we have mixed QRESYNC/FETCH output.
This commit is contained in:
Lars Ingebrigtsen 2012-02-12 22:20:48 +00:00 committed by Katsumi Yamaoka
parent fa9958a67e
commit 4eff9c1abb
5 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/gnus/ChangeLog
View File

@ -1,3 +1,14 @@
2012-02-12 Lars Ingebrigtsen <larsi@gnus.org>
* nnml.el (nnml-request-compact-group): Delete the marks file after
compaction (bug#10800).
* gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on
group exit.
* nnimap.el (nnimap-parse-flags): Parse correctly when we have mixed
QRESYNC/FETCH output.
2012-02-11 Glenn Morris <rgm@gnu.org>
* sieve-manage.el (sieve-manage-default-stream):

4
lisp/gnus/gnus-art.el
View File

@ -4582,6 +4582,10 @@ commands:
(when (eq (elt timer 5) 'image-animate-timeout)
(cancel-timer timer))))
(defun gnus-stop-downloads ()
(when (boundp 'url-queue)
(set (intern "url-queue" obarray) nil)))
;; Set article window start at LINE, where LINE is the number of lines
;; from the head of the article.
(defun gnus-article-set-window-start (&optional line)

2
lisp/gnus/gnus-sum.el
View File

@ -7319,6 +7319,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
(when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer
(gnus-article-stop-animations)
(gnus-stop-downloads)
(mm-destroy-parts gnus-article-mime-handles)
;; Set it to nil for safety reason.
(setq gnus-article-mime-handle-alist nil)
@ -9656,6 +9657,7 @@ C-u g', show the raw article."
(when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer
(gnus-article-stop-animations)
(gnus-stop-downloads)
(mm-destroy-parts gnus-article-mime-handles)
;; Set it to nil for safety reason.
(setq gnus-article-mime-handle-alist nil)

7
lisp/gnus/nnimap.el
View File

@ -1539,7 +1539,8 @@ textual parts.")
(defun nnimap-parse-flags (sequences)
(goto-char (point-min))
;; Change \Delete etc to %Delete, so that the reader can read it.
;; Change \Delete etc to %Delete, so that the Emacs Lisp reader can
;; read it.
(subst-char-in-region (point-min) (point-max)
?\\ ?% t)
;; Remove any MODSEQ entries in the buffer, because they may contain
@ -1610,7 +1611,9 @@ textual parts.")
vanished highestmodseq)
articles)
groups)
(goto-char end)
(if (eq flag-sequence 'qresync)
(goto-char end)
(setq end (point)))
(setq articles nil))))
groups))

3
lisp/gnus/nnml.el
View File

@ -1298,6 +1298,9 @@ Use the nov database for the current group if available."
(nnml-save-nov)
;; b/ Save the active file:
(nnmail-save-active nnml-group-alist nnml-active-file)
(let ((marks (nnml-group-pathname group nnml-marks-file-name server)))
(when (file-exists-p marks)
(delete-file marks)))
t)))))
(defun nnml-request-compact (&optional server)