Mercurial > emacs
annotate lisp/epg-config.el @ 110410:f2e111723c3a
Merge changes made in Gnus trunk.
Reimplement nnimap, and do tweaks to the rest of the code to support that.
* gnus-int.el (gnus-finish-retrieve-group-infos)
(gnus-retrieve-group-data-early): New functions.
* gnus-range.el (gnus-range-nconcat): New function.
* gnus-start.el (gnus-get-unread-articles): Support early retrieval of
data.
(gnus-read-active-for-groups): Support finishing the early retrieval of
data.
* gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
if the move is internal, so that nnimap can do fast internal moves.
* gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
nnimap usage.
* nnimap.el: Rewritten.
* nnmail.el (nnmail-inhibit-default-split-group): New internal variable
to allow the mail splitting to not return a default group. This is
useful for nnimap, which will leave unmatched mail in the inbox.
* utf7.el (utf7-encode): Autoload.
Implement shell connection.
* nnimap.el (nnimap-open-shell-stream): New function.
(nnimap-open-connection): Use it.
Get the number of lines by using BODYSTRUCTURE.
(nnimap-transform-headers): Get the number of lines in each message.
(nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
number of lines.
Not all servers return UIDNEXT. Work past this problem.
Remove junk from end of file.
Fix typo in "bogus" section.
Make capabilties be case-insensitive.
Require cl when compiling.
Don't bug out if the LIST command doesn't have any parameters.
2010-09-17 Knut Anders Hatlen <kahatlen@gmail.com> (tiny change)
* nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
doesn't have any parameters.
(mm-text-html-renderer): Document gnus-article-html.
2010-09-17 Julien Danjou <julien@danjou.info> (tiny fix)
* mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
* dgnushack.el: Define netrc-credentials.
If the user doesn't have a /etc/services, supply some sensible port defaults.
Have `unseen-or-unread' select an unread unseen article first.
(nntp-open-server): Return whether the open was successful or not.
Throughout all files, replace (save-excursion (set-buffer ...)) with (with-current-buffer ... ).
Save result so that it doesn't say "failed" all the time.
Add ~/.authinfo to the default, since that's probably most useful for users.
Don't use the "finish" method when we're reading from the agent.
Add some more nnimap-relevant agent stuff to nnagent.el.
* nnimap.el (nnimap-with-process-buffer): Removed.
Revert one line that was changed by mistake in the last checkin.
(nnimap-open-connection): Don't error out when we can't make a connection
nnimap-related changes to avoid bugging out if we can't contact a server.
* gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
from methods that are denied.
* nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
in.
(nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
nothing.
* gnus-sum.el (gnus-select-newsgroup): Indent.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sat, 18 Sep 2010 10:02:19 +0000 |
parents | 280c8ae2476d |
children | 1b078a586243 |
rev | line source |
---|---|
91647 | 1 ;;; epg-config.el --- configuration of the EasyPG Library |
106000 | 2 |
106815 | 3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
91647 | 4 |
5 ;; Author: Daiki Ueno <ueno@unixuser.org> | |
6 ;; Keywords: PGP, GnuPG | |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
107378
diff
changeset
|
7 ;; Package: epg |
91647 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91731
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
91647 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91731
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91731
diff
changeset
|
14 ;; (at your option) any later version. |
91647 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91731
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
91647 | 23 |
24 ;;; Code: | |
25 | |
91731
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
26 (defconst epg-package-name "epg" |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
27 "Name of this package.") |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
28 |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
29 (defconst epg-version-number "1.0.0" |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
30 "Version number of this package.") |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
31 |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
32 (defconst epg-bug-report-address "ueno@unixuser.org" |
7efbdc83b944
EasyPG: Implement some suggestions from emacs-devel.
Michael Olson <mwolson@gnu.org>
parents:
91703
diff
changeset
|
33 "Report bugs to this address.") |
91647 | 34 |
35 (defgroup epg () | |
106000 | 36 "The EasyPG library." |
91703
bda1e76bc03b
* epa.el (epa-faces, epa):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
91687
diff
changeset
|
37 :version "23.1" |
107378
904ccd8f2acb
Reorganize Custom groups.
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
38 :group 'data) |
91647 | 39 |
40 (defcustom epg-gpg-program "gpg" | |
41 "The `gpg' executable." | |
42 :group 'epg | |
43 :type 'string) | |
44 | |
45 (defcustom epg-gpgsm-program "gpgsm" | |
46 "The `gpgsm' executable." | |
47 :group 'epg | |
48 :type 'string) | |
49 | |
50 (defcustom epg-gpg-home-directory nil | |
51 "The directory which contains the configuration files of `epg-gpg-program'." | |
52 :group 'epg | |
53 :type '(choice (const :tag "Default" nil) directory)) | |
54 | |
55 (defcustom epg-passphrase-coding-system nil | |
56 "Coding system to use with messages from `epg-gpg-program'." | |
57 :group 'epg | |
58 :type 'symbol) | |
59 | |
60 (defcustom epg-debug nil | |
61 "If non-nil, debug output goes to the \" *epg-debug*\" buffer. | |
62 Note that the buffer name starts with a space." | |
63 :group 'epg | |
64 :type 'boolean) | |
65 | |
66 (defconst epg-gpg-minimum-version "1.4.3") | |
67 | |
68 ;;;###autoload | |
69 (defun epg-configuration () | |
70 "Return a list of internal configuration parameters of `epg-gpg-program'." | |
71 (let (config groups type args) | |
72 (with-temp-buffer | |
73 (apply #'call-process epg-gpg-program nil (list t nil) nil | |
74 (append (if epg-gpg-home-directory | |
75 (list "--homedir" epg-gpg-home-directory)) | |
76 '("--with-colons" "--list-config"))) | |
77 (goto-char (point-min)) | |
78 (while (re-search-forward "^cfg:\\([^:]+\\):\\(.*\\)" nil t) | |
79 (setq type (intern (match-string 1)) | |
80 args (match-string 2)) | |
81 (cond | |
82 ((eq type 'group) | |
83 (if (string-match "\\`\\([^:]+\\):" args) | |
84 (setq groups | |
85 (cons (cons (downcase (match-string 1 args)) | |
86 (delete "" (split-string | |
87 (substring args | |
88 (match-end 0)) | |
89 ";"))) | |
90 groups)) | |
91 (if epg-debug | |
92 (message "Invalid group configuration: %S" args)))) | |
93 ((memq type '(pubkey cipher digest compress)) | |
94 (if (string-match "\\`\\([0-9]+\\)\\(;[0-9]+\\)*" args) | |
95 (setq config | |
96 (cons (cons type | |
97 (mapcar #'string-to-number | |
98 (delete "" (split-string args ";")))) | |
99 config)) | |
100 (if epg-debug | |
101 (message "Invalid %S algorithm configuration: %S" | |
102 type args)))) | |
103 (t | |
104 (setq config (cons (cons type args) config)))))) | |
105 (if groups | |
106 (cons (cons 'groups groups) config) | |
107 config))) | |
108 | |
109 (defun epg-config--parse-version (string) | |
110 (let ((index 0) | |
111 version) | |
112 (while (eq index (string-match "\\([0-9]+\\)\\.?" string index)) | |
113 (setq version (cons (string-to-number (match-string 1 string)) | |
114 version) | |
115 index (match-end 0))) | |
116 (nreverse version))) | |
117 | |
118 (defun epg-config--compare-version (v1 v2) | |
119 (while (and v1 v2 (= (car v1) (car v2))) | |
120 (setq v1 (cdr v1) v2 (cdr v2))) | |
121 (- (or (car v1) 0) (or (car v2) 0))) | |
122 | |
123 ;;;###autoload | |
124 (defun epg-check-configuration (config &optional minimum-version) | |
125 "Verify that a sufficient version of GnuPG is installed." | |
126 (let ((entry (assq 'version config)) | |
127 version) | |
128 (unless (and entry | |
129 (stringp (cdr entry))) | |
130 (error "Undetermined version: %S" entry)) | |
131 (setq version (epg-config--parse-version (cdr entry)) | |
132 minimum-version (epg-config--parse-version | |
133 (or minimum-version | |
134 epg-gpg-minimum-version))) | |
135 (unless (>= (epg-config--compare-version version minimum-version) 0) | |
136 (error "Unsupported version: %s" (cdr entry))))) | |
137 | |
138 ;;;###autoload | |
139 (defun epg-expand-group (config group) | |
140 "Look at CONFIG and try to expand GROUP." | |
141 (let ((entry (assq 'groups config))) | |
142 (if (and entry | |
143 (setq entry (assoc (downcase group) (cdr entry)))) | |
144 (cdr entry)))) | |
145 | |
146 (provide 'epg-config) | |
147 | |
91687 | 148 ;; arch-tag: 9aca7cb8-5f63-4bcb-84ee-46fd2db0763f |
91647 | 149 ;;; epg-config.el ends here |