Commit bb7f5cbc authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

Merge changes made in Gnus trunk.

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.
parent 7927f48d
2011-01-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mm-view.el (mml-smime): Require.
2010-12-20 David Engster <deng@eml.cc>
* 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.
2011-01-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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.
2011-01-02 Wang Diancheng <dcwang@kingbase.com.cn> (tiny change)
* nnml.el (nnml-request-article): Allow requesting by Message-ID to
work when using a compressed nnml folder.
2011-01-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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.
2010-12-30 Tassilo Horn <tassilo@member.fsf.org>
* 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.
2010-12-27 Daiki Ueno <ueno@unixuser.org> 2010-12-27 Daiki Ueno <ueno@unixuser.org>
   
* mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Take care the * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Take care the
......
;;; auth-source.el --- authentication sources for Gnus and Emacs ;;; auth-source.el --- authentication sources for Gnus and Emacs
;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz@lifelogs.com> ;; Author: Ted Zlatanov <tzz@lifelogs.com>
;; Keywords: news ;; Keywords: news
...@@ -370,7 +370,7 @@ Return structure as specified by MODE." ...@@ -370,7 +370,7 @@ Return structure as specified by MODE."
;; making `epa-file-encrypt-to' local to this buffer lets ;; making `epa-file-encrypt-to' local to this buffer lets
;; epa-file skip the key selection query (see the ;; epa-file skip the key selection query (see the
;; `local-variable-p' check in `epa-file-write-region'). ;; `local-variable-p' check in `epa-file-write-region').
(unless (local-variable-p 'epa-file-encrypt-to) (unless (local-variable-p 'epa-file-encrypt-to (current-buffer))
(make-local-variable 'epa-file-encrypt-to)) (make-local-variable 'epa-file-encrypt-to))
(if (listp auth-source-gpg-encrypt-to) (if (listp auth-source-gpg-encrypt-to)
(setq epa-file-encrypt-to auth-source-gpg-encrypt-to))) (setq epa-file-encrypt-to auth-source-gpg-encrypt-to)))
......
;;; gnus-group.el --- group mode commands for Gnus ;;; gnus-group.el --- group mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
;; Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news ;; Keywords: news
...@@ -3790,7 +3791,8 @@ of groups killed." ...@@ -3790,7 +3791,8 @@ of groups killed."
gnus-list-of-killed-groups)) gnus-list-of-killed-groups))
(gnus-group-change-level (gnus-group-change-level
(if entry entry group) gnus-level-killed (if entry nil level)) (if entry entry group) gnus-level-killed (if entry nil level))
(gnus-request-update-group-status group 'unsubscribe) (when (numberp (gnus-group-unread group))
(gnus-request-update-group-status group 'unsubscribe))
(message "Killed group %s" (gnus-group-decoded-name group))) (message "Killed group %s" (gnus-group-decoded-name group)))
;; If there are lots and lots of groups to be killed, we use ;; If there are lots and lots of groups to be killed, we use
;; this thing instead. ;; this thing instead.
...@@ -3814,7 +3816,8 @@ of groups killed." ...@@ -3814,7 +3816,8 @@ of groups killed."
;; There may be more than one instance displayed. ;; There may be more than one instance displayed.
(while (gnus-group-goto-group group) (while (gnus-group-goto-group group)
(gnus-delete-line)) (gnus-delete-line))
(gnus-request-update-group-status group 'unsubscribe)) (when (numberp (gnus-group-unread group))
(gnus-request-update-group-status group 'unsubscribe)))
(gnus-make-hashtable-from-newsrc-alist)) (gnus-make-hashtable-from-newsrc-alist))
(gnus-group-position-point) (gnus-group-position-point)
......
;;; gnus-sum.el --- summary mode commands for Gnus ;;; gnus-sum.el --- summary mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news ;; Keywords: news
...@@ -5603,7 +5603,7 @@ If SELECT-ARTICLES, only select those articles from GROUP." ...@@ -5603,7 +5603,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(setq gnus-newsgroup-processable nil) (setq gnus-newsgroup-processable nil)
(gnus-update-read-articles group gnus-newsgroup-unreads) (gnus-update-read-articles group gnus-newsgroup-unreads t)
;; Adjust and set lists of article marks. ;; Adjust and set lists of article marks.
(when info (when info
......
;;; mm-view.el --- functions for viewing MIME objects ;;; mm-view.el --- functions for viewing MIME objects
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
(require 'mm-bodies) (require 'mm-bodies)
(require 'mm-decode) (require 'mm-decode)
(require 'smime) (require 'smime)
(require 'mml-smime)
(autoload 'gnus-completing-read "gnus-util") (autoload 'gnus-completing-read "gnus-util")
(autoload 'gnus-window-inside-pixel-edges "gnus-ems") (autoload 'gnus-window-inside-pixel-edges "gnus-ems")
...@@ -683,17 +684,23 @@ ...@@ -683,17 +684,23 @@
(defun mm-view-pkcs7-decrypt (handle &optional from) (defun mm-view-pkcs7-decrypt (handle &optional from)
(insert-buffer-substring (mm-handle-buffer handle)) (insert-buffer-substring (mm-handle-buffer handle))
(goto-char (point-min)) (goto-char (point-min))
(insert "MIME-Version: 1.0\n") (if (eq mml-smime-use 'epg)
(mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m") ;; Use EPG/gpgsm
(smime-decrypt-region (let ((part (base64-decode-string (buffer-string))))
(point-min) (point-max) (erase-buffer)
(if (= (length smime-keys) 1) (insert (epg-decrypt-string (epg-make-context 'CMS) part)))
(cadar smime-keys) ;; Use openssl
(smime-get-key-by-email (insert "MIME-Version: 1.0\n")
(gnus-completing-read (mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m")
"Decipher using key" (smime-decrypt-region
smime-keys nil nil nil (car-safe (car-safe smime-keys))))) (point-min) (point-max)
from) (if (= (length smime-keys) 1)
(cadar smime-keys)
(smime-get-key-by-email
(gnus-completing-read
"Decipher using key"
smime-keys nil nil nil (car-safe (car-safe smime-keys)))))
from))
(goto-char (point-min)) (goto-char (point-min))
(while (search-forward "\r\n" nil t) (while (search-forward "\r\n" nil t)
(replace-match "\n")) (replace-match "\n"))
......
;;; nnimap.el --- IMAP interface for Gnus ;;; nnimap.el --- IMAP interface for Gnus
;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Simon Josefsson <simon@josefsson.org> ;; Simon Josefsson <simon@josefsson.org>
...@@ -639,7 +639,7 @@ textual parts.") ...@@ -639,7 +639,7 @@ textual parts.")
(let ((result (nnimap-possibly-change-group (let ((result (nnimap-possibly-change-group
;; Don't SELECT the group if we're going to select it ;; Don't SELECT the group if we're going to select it
;; later, anyway. ;; later, anyway.
(if (and dont-check (if (and (not dont-check)
(assoc group nnimap-current-infos)) (assoc group nnimap-current-infos))
nil nil
group) group)
......
;;; nnml.el --- mail spool access for Gnus ;;; nnml.el --- mail spool access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ;; 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) ;; Authors: Didier Verna <didier@xemacs.org> (adding compaction)
;; Simon Josefsson <simon@josefsson.org> (adding MARKS) ;; Simon Josefsson <simon@josefsson.org> (adding MARKS)
...@@ -235,7 +236,11 @@ non-nil.") ...@@ -235,7 +236,11 @@ non-nil.")
(nnheader-article-to-file-alist (nnheader-article-to-file-alist
(setq gpath (nnml-group-pathname (car group-num) (setq gpath (nnml-group-pathname (car group-num)
nil server)))))) 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))) (setq path (nnml-article-to-file id)))
(cond (cond
((not path) ((not path)
......
;;; shr.el --- Simple HTML Renderer ;;; shr.el --- Simple HTML Renderer
;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: html ;; Keywords: html
...@@ -74,8 +74,12 @@ fit these criteria." ...@@ -74,8 +74,12 @@ fit these criteria."
:type 'character) :type 'character)
(defcustom shr-width fill-column (defcustom shr-width fill-column
"Frame width to use for rendering." "Frame width to use for rendering.
:type 'integer May either be an integer specifying a fixed width in characters,
or nil, meaning that the full width of the window should be
used."
:type '(choice (integer :tag "Fixed width in characters")
(const :tag "Use the width of the window" nil))
:group 'shr) :group 'shr)
(defvar shr-content-function nil (defvar shr-content-function nil
...@@ -113,7 +117,8 @@ cid: URL as the argument.") ...@@ -113,7 +117,8 @@ cid: URL as the argument.")
(defun shr-insert-document (dom) (defun shr-insert-document (dom)
(setq shr-content-cache nil) (setq shr-content-cache nil)
(let ((shr-state nil) (let ((shr-state nil)
(shr-start nil)) (shr-start nil)
(shr-width (or shr-width (window-width))))
(shr-descend (shr-transform-dom dom)))) (shr-descend (shr-transform-dom dom))))
(defun shr-copy-url () (defun shr-copy-url ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment