mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes made in Gnus trunk.

Browse source 
mm-view.el (mml-smime): Require.
mm-view.el (mm-view-pkcs7-decrypt): If mml-smime-use is set to 'epg, use EPG to decrypt S/MIME messages instead of openssl.
nnimap.el (nnimap-request-group): Avoid double SELECT on `M-g'.
gnus-group.el (gnus-group-kill-group): Don't try to update the group status is the group clearly is unreachable.
auth-source.el (auth-source-create): Add the optional second parameter to `local-variable-p' to be compatible with XEmacs.
nnml.el (nnml-request-article): Allow requesting by Message-ID to work when using a compressed nnml folder.
gnus-sum.el (gnus-select-newsgroup): Don't propagate marks to backends after sanitising on entry, because this never makes sense: If the articles have gone missing, then the data no longer exists on the backend, and if they haven't, then Gnus is wrong, and shouldn't overwrite anything anyway.
shr.el (shr-insert-document): Bind shr-width dynamically to window-width if it's nil.
shr.el (shr-width, shr-insert-document): Allow nil as shr-width value with the meaning of using the full emacs window width for rendering.
This commit is contained in:
Gnus developers 2011-01-02 11:23:02 +00:00 • committed by Katsumi Yamaoka
parent 7927f48d45
commit bb7f5cbcda
8 changed files with 87 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/gnus/nnml.el
View file

@ -1,7 +1,8 @@
;;; nnml.el --- mail spool access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
;; Foundation, Inc.
;; Authors: Didier Verna <didier@xemacs.org> (adding compaction)
;; Simon Josefsson <simon@josefsson.org> (adding MARKS)
@ -235,7 +236,11 @@ non-nil.")
(nnheader-article-to-file-alist
(setq gpath (nnml-group-pathname (car group-num)
nil server))))))
(setq path (concat gpath (int-to-string (cdr group-num)))))
(nnml-update-file-alist)
(setq path (concat gpath (if nnml-use-compressed-files
(cdr (assq (cdr group-num)
nnml-article-file-alist))
(number-to-string (cdr group-num))))))
(setq path (nnml-article-to-file id)))
(cond
((not path)