2004-09-04 13:13:48 +00:00
|
|
|
;;; rfc2231.el --- Functions for decoding rfc2231 headers
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-09-19 13:40:08 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:56:49 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2008-05-06 03:56:49 +00:00
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2000-09-19 13:40:08 +00:00
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:56:49 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2000-11-01 15:08:23 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
2000-09-19 13:40:08 +00:00
|
|
|
(require 'ietf-drums)
|
2004-09-04 13:13:48 +00:00
|
|
|
(require 'rfc2047)
|
|
|
|
(autoload 'mm-encode-body "mm-bodies")
|
|
|
|
(autoload 'mail-header-remove-whitespace "mail-parse")
|
|
|
|
(autoload 'mail-header-remove-comments "mail-parse")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun rfc2231-get-value (ct attribute)
|
|
|
|
"Return the value of ATTRIBUTE from CT."
|
|
|
|
(cdr (assq attribute (cdr ct))))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun rfc2231-parse-qp-string (string)
|
|
|
|
"Parse QP-encoded string using `rfc2231-parse-string'.
|
|
|
|
N.B. This is in violation with RFC2047, but it seem to be in common use."
|
|
|
|
(rfc2231-parse-string (rfc2047-decode-string string)))
|
|
|
|
|
2006-02-08 04:35:58 +00:00
|
|
|
(defun rfc2231-parse-string (string &optional signal-error)
|
2000-09-19 13:40:08 +00:00
|
|
|
"Parse STRING and return a list.
|
|
|
|
The list will be on the form
|
2006-02-08 04:35:58 +00:00
|
|
|
`(name (attribute . value) (attribute . value)...)'.
|
|
|
|
|
|
|
|
If the optional SIGNAL-ERROR is non-nil, signal an error when this
|
2006-02-17 00:24:04 +00:00
|
|
|
function fails in parsing of parameters. Otherwise, this function
|
|
|
|
must never cause a Lisp error."
|
2000-09-19 13:40:08 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token))
|
|
|
|
(stoken (ietf-drums-token-to-list ietf-drums-tspecials))
|
|
|
|
(ntoken (ietf-drums-token-to-list "0-9"))
|
2007-10-28 09:18:39 +00:00
|
|
|
c type attribute encoded number parameters value)
|
2006-02-17 00:24:04 +00:00
|
|
|
(ietf-drums-init
|
|
|
|
(condition-case nil
|
|
|
|
(mail-header-remove-whitespace
|
|
|
|
(mail-header-remove-comments string))
|
|
|
|
;; The most likely cause of an error is unbalanced parentheses
|
|
|
|
;; or double-quotes. If all parentheses and double-quotes are
|
|
|
|
;; quoted meaninglessly with backslashes, removing them might
|
|
|
|
;; make it parseable. Let's try...
|
|
|
|
(error
|
|
|
|
(let (mod)
|
|
|
|
(when (and (string-match "\\\\\"" string)
|
|
|
|
(not (string-match "\\`\"\\|[^\\]\"" string)))
|
|
|
|
(setq string (mm-replace-in-string string "\\\\\"" "\"")
|
|
|
|
mod t))
|
|
|
|
(when (and (string-match "\\\\(" string)
|
|
|
|
(string-match "\\\\)" string)
|
|
|
|
(not (string-match "\\`(\\|[^\\][()]" string)))
|
|
|
|
(setq string (mm-replace-in-string string "\\\\\\([()]\\)" "\\1")
|
|
|
|
mod t))
|
|
|
|
(or (and mod
|
|
|
|
(ignore-errors
|
|
|
|
(mail-header-remove-whitespace
|
|
|
|
(mail-header-remove-comments string))))
|
|
|
|
;; Finally, attempt to extract only type.
|
|
|
|
(if (string-match
|
|
|
|
(concat "\\`[\t\n ]*\\([^" ietf-drums-tspecials "\t\n ]+"
|
2007-10-28 09:18:39 +00:00
|
|
|
"\\(?:/[^" ietf-drums-tspecials
|
|
|
|
"\t\n ]+\\)?\\)\\(?:[\t\n ;]\\|\\'\\)")
|
2006-02-17 00:24:04 +00:00
|
|
|
string)
|
|
|
|
(match-string 1 string)
|
|
|
|
""))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(let ((table (copy-syntax-table ietf-drums-syntax-table)))
|
|
|
|
(modify-syntax-entry ?\' "w" table)
|
2004-09-04 13:13:48 +00:00
|
|
|
(modify-syntax-entry ?* " " table)
|
|
|
|
(modify-syntax-entry ?\; " " table)
|
|
|
|
(modify-syntax-entry ?= " " table)
|
2000-09-19 13:40:08 +00:00
|
|
|
;; The following isn't valid, but one should be liberal
|
|
|
|
;; in what one receives.
|
|
|
|
(modify-syntax-entry ?\: "w" table)
|
|
|
|
(set-syntax-table table))
|
|
|
|
(setq c (char-after))
|
|
|
|
(when (and (memq c ttoken)
|
2006-02-17 00:24:04 +00:00
|
|
|
(not (memq c stoken))
|
|
|
|
(setq type (ignore-errors
|
|
|
|
(downcase
|
|
|
|
(buffer-substring (point) (progn
|
|
|
|
(forward-sexp 1)
|
|
|
|
(point)))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
;; Do the params
|
2006-02-08 04:35:58 +00:00
|
|
|
(condition-case err
|
|
|
|
(progn
|
|
|
|
(while (not (eobp))
|
2000-09-19 13:40:08 +00:00
|
|
|
(setq c (char-after))
|
2006-02-08 04:35:58 +00:00
|
|
|
(unless (eq c ?\;)
|
|
|
|
(error "Invalid header: %s" string))
|
|
|
|
(forward-char 1)
|
|
|
|
;; If c in nil, then this is an invalid header, but
|
|
|
|
;; since elm generates invalid headers on this form,
|
|
|
|
;; we allow it.
|
|
|
|
(when (setq c (char-after))
|
|
|
|
(if (and (memq c ttoken)
|
|
|
|
(not (memq c stoken)))
|
|
|
|
(setq attribute
|
|
|
|
(intern
|
|
|
|
(downcase
|
|
|
|
(buffer-substring
|
|
|
|
(point) (progn (forward-sexp 1) (point))))))
|
|
|
|
(error "Invalid header: %s" string))
|
|
|
|
(setq c (char-after))
|
2006-02-10 05:08:29 +00:00
|
|
|
(if (eq c ?*)
|
|
|
|
(progn
|
2006-02-08 04:35:58 +00:00
|
|
|
(forward-char 1)
|
2006-02-10 05:08:29 +00:00
|
|
|
(setq c (char-after))
|
|
|
|
(if (not (memq c ntoken))
|
|
|
|
(setq encoded t
|
|
|
|
number nil)
|
|
|
|
(setq number
|
|
|
|
(string-to-number
|
|
|
|
(buffer-substring
|
|
|
|
(point) (progn (forward-sexp 1) (point)))))
|
|
|
|
(setq c (char-after))
|
|
|
|
(when (eq c ?*)
|
|
|
|
(setq encoded t)
|
|
|
|
(forward-char 1)
|
|
|
|
(setq c (char-after)))))
|
|
|
|
(setq number nil
|
|
|
|
encoded nil))
|
2006-02-08 04:35:58 +00:00
|
|
|
(unless (eq c ?=)
|
|
|
|
(error "Invalid header: %s" string))
|
2000-09-19 13:40:08 +00:00
|
|
|
(forward-char 1)
|
2006-02-08 04:35:58 +00:00
|
|
|
(setq c (char-after))
|
|
|
|
(cond
|
|
|
|
((eq c ?\")
|
|
|
|
(setq value (buffer-substring (1+ (point))
|
|
|
|
(progn
|
|
|
|
(forward-sexp 1)
|
2006-02-10 05:08:29 +00:00
|
|
|
(1- (point)))))
|
|
|
|
(when encoded
|
|
|
|
(setq value (mapconcat (lambda (c) (format "%%%02x" c))
|
|
|
|
value ""))))
|
2006-02-08 04:35:58 +00:00
|
|
|
((and (or (memq c ttoken)
|
|
|
|
;; EXTENSION: Support non-ascii chars.
|
|
|
|
(> c ?\177))
|
|
|
|
(not (memq c stoken)))
|
|
|
|
(setq value
|
|
|
|
(buffer-substring
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
(point)
|
|
|
|
(progn
|
2006-06-21 02:13:50 +00:00
|
|
|
;; Jump over asterisk, non-ASCII
|
|
|
|
;; and non-boundary characters.
|
|
|
|
(while (and c
|
|
|
|
(or (eq c ?*)
|
|
|
|
(> c ?\177)
|
|
|
|
(not (eq (char-syntax c) ? ))))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
(forward-char 1)
|
2006-06-21 02:13:50 +00:00
|
|
|
(setq c (char-after)))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
(point)))))
|
2006-02-08 04:35:58 +00:00
|
|
|
(t
|
|
|
|
(error "Invalid header: %s" string)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(push (list attribute value number encoded)
|
|
|
|
parameters))))
|
2006-02-08 04:35:58 +00:00
|
|
|
(error
|
|
|
|
(setq parameters nil)
|
2007-10-28 09:18:39 +00:00
|
|
|
(when signal-error
|
|
|
|
(signal (car err) (cdr err)))))
|
|
|
|
|
|
|
|
;; Now collect and concatenate continuation parameters.
|
|
|
|
(let ((cparams nil)
|
|
|
|
elem)
|
|
|
|
(loop for (attribute value part encoded)
|
|
|
|
in (sort parameters (lambda (e1 e2)
|
|
|
|
(< (or (caddr e1) 0)
|
|
|
|
(or (caddr e2) 0))))
|
2010-10-12 22:18:24 +00:00
|
|
|
do (cond
|
|
|
|
;; First part.
|
|
|
|
((or (not (setq elem (assq attribute cparams)))
|
|
|
|
(and (numberp part)
|
|
|
|
(zerop part)))
|
|
|
|
(push (list attribute value encoded) cparams))
|
|
|
|
;; Repetition of a part; do nothing.
|
|
|
|
((and elem
|
|
|
|
(null number))
|
|
|
|
)
|
|
|
|
;; Concatenate continuation parts.
|
|
|
|
(t
|
|
|
|
(setcar (cdr elem) (concat (cadr elem) value)))))
|
2007-10-28 09:18:39 +00:00
|
|
|
;; Finally decode encoded values.
|
|
|
|
(cons type (mapcar
|
|
|
|
(lambda (elem)
|
|
|
|
(cons (car elem)
|
|
|
|
(if (nth 2 elem)
|
|
|
|
(rfc2231-decode-encoded-string (nth 1 elem))
|
|
|
|
(nth 1 elem))))
|
|
|
|
(nreverse cparams))))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun rfc2231-decode-encoded-string (string)
|
|
|
|
"Decode an RFC2231-encoded string.
|
2006-02-10 05:08:29 +00:00
|
|
|
These look like:
|
|
|
|
\"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
|
|
|
\"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
|
|
|
\"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
|
|
|
\"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
|
|
|
|
\"This is ***fun***\"."
|
2007-10-28 09:18:39 +00:00
|
|
|
(string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
|
|
|
|
(let ((coding-system (mm-charset-to-coding-system (match-string 1 string)))
|
|
|
|
;;(language (match-string 2 string))
|
|
|
|
(value (match-string 3 string)))
|
2006-03-23 05:51:44 +00:00
|
|
|
(mm-with-unibyte-buffer
|
2006-02-10 05:08:29 +00:00
|
|
|
(insert value)
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-min))
|
2008-06-01 02:34:55 +00:00
|
|
|
(while (re-search-forward "%\\([0-9A-Fa-f][0-9A-Fa-f]\\)" nil t)
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert
|
|
|
|
(prog1
|
2008-06-01 02:34:55 +00:00
|
|
|
(string-to-number (match-string 1) 16)
|
|
|
|
(delete-region (match-beginning 0) (match-end 0)))))
|
2006-02-10 05:08:29 +00:00
|
|
|
;; Decode using the charset, if any.
|
2006-03-23 05:51:44 +00:00
|
|
|
(if (memq coding-system '(nil ascii))
|
|
|
|
(buffer-string)
|
|
|
|
(mm-decode-coding-string (buffer-string) coding-system)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun rfc2231-encode-string (param value)
|
2006-02-08 04:35:58 +00:00
|
|
|
"Return and PARAM=VALUE string encoded according to RFC2231.
|
|
|
|
Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert
|
|
|
|
the result of this function."
|
2000-09-19 13:40:08 +00:00
|
|
|
(let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token))
|
|
|
|
(tspecial (ietf-drums-token-to-list ietf-drums-tspecials))
|
|
|
|
(special (ietf-drums-token-to-list "*'%\n\t"))
|
|
|
|
(ascii (ietf-drums-token-to-list ietf-drums-text-token))
|
|
|
|
(num -1)
|
2006-02-08 04:35:58 +00:00
|
|
|
;; Don't make lines exceeding 76 column.
|
2006-02-04 00:58:23 +00:00
|
|
|
(limit (- 74 (length param)))
|
2000-09-19 13:40:08 +00:00
|
|
|
spacep encodep charsetp charset broken)
|
2006-03-23 05:51:44 +00:00
|
|
|
(mm-with-multibyte-buffer
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert value)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
|
|
|
(cond
|
|
|
|
((or (memq (following-char) control)
|
|
|
|
(memq (following-char) tspecial)
|
|
|
|
(memq (following-char) special))
|
|
|
|
(setq encodep t))
|
|
|
|
((eq (following-char) ? )
|
|
|
|
(setq spacep t))
|
|
|
|
((not (memq (following-char) ascii))
|
|
|
|
(setq charsetp t)))
|
|
|
|
(forward-char 1))
|
|
|
|
(when charsetp
|
|
|
|
(setq charset (mm-encode-body)))
|
2006-03-23 11:30:48 +00:00
|
|
|
(mm-disable-multibyte)
|
2000-09-19 13:40:08 +00:00
|
|
|
(cond
|
2006-02-04 00:58:23 +00:00
|
|
|
((or encodep charsetp
|
|
|
|
(progn
|
|
|
|
(end-of-line)
|
|
|
|
(> (current-column) (if spacep (- limit 2) limit))))
|
|
|
|
(setq limit (- limit 6))
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-min))
|
2006-02-04 00:58:23 +00:00
|
|
|
(insert (symbol-name (or charset 'us-ascii)) "''")
|
2000-09-19 13:40:08 +00:00
|
|
|
(while (not (eobp))
|
|
|
|
(if (or (not (memq (following-char) ascii))
|
|
|
|
(memq (following-char) control)
|
|
|
|
(memq (following-char) tspecial)
|
|
|
|
(memq (following-char) special)
|
|
|
|
(eq (following-char) ? ))
|
|
|
|
(progn
|
2006-02-04 00:58:23 +00:00
|
|
|
(when (>= (current-column) (1- limit))
|
|
|
|
(insert ";\n")
|
|
|
|
(setq broken t))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert "%" (format "%02x" (following-char)))
|
|
|
|
(delete-char 1))
|
2006-02-04 00:58:23 +00:00
|
|
|
(when (> (current-column) limit)
|
|
|
|
(insert ";\n")
|
|
|
|
(setq broken t))
|
2000-09-19 13:40:08 +00:00
|
|
|
(forward-char 1)))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (not broken)
|
|
|
|
(insert param "*=")
|
|
|
|
(while (not (eobp))
|
2006-02-08 04:35:58 +00:00
|
|
|
(insert (if (>= num 0) " " "")
|
2004-09-04 13:13:48 +00:00
|
|
|
param "*" (format "%d" (incf num)) "*=")
|
2000-09-19 13:40:08 +00:00
|
|
|
(forward-line 1))))
|
|
|
|
(spacep
|
|
|
|
(goto-char (point-min))
|
2006-02-10 05:08:29 +00:00
|
|
|
(insert param "=\"")
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-max))
|
|
|
|
(insert "\""))
|
|
|
|
(t
|
|
|
|
(goto-char (point-min))
|
2006-02-10 05:08:29 +00:00
|
|
|
(insert param "=")))
|
2000-09-19 13:40:08 +00:00
|
|
|
(buffer-string))))
|
|
|
|
|
|
|
|
(provide 'rfc2231)
|
|
|
|
|
|
|
|
;;; rfc2231.el ends here
|