mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
e9bd578264
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 76) - Update from CVS 2005-05-30 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group) (gnus-agent-fetch-articles): Replace `string-to-int' by `string-to-number'. * lisp/gnus/gnus-art.el (gnus-button-fetch-group): Ditto. * lisp/gnus/gnus-cache.el (gnus-cache-generate-active) (gnus-cache-articles-in-group): Ditto. * lisp/gnus/gnus-group.el (gnus-group-set-current-level) (gnus-group-insert-group-line): Ditto. * lisp/gnus/gnus-score.el (gnus-score-set-expunge-below) (gnus-score-set-mark-below, gnus-summary-score-effect) (gnus-summary-score-entry): Ditto. * lisp/gnus/gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas) (gnus-soup-pack): Ditto. * lisp/gnus/gnus-spec.el (gnus-xmas-format): Ditto. * lisp/gnus/gnus-start.el (gnus-newsrc-to-gnus-format): Ditto. * lisp/gnus/gnus-sum.el (gnus-create-xref-hashtb): Ditto. * lisp/gnus/gnus-uu.el (gnus-uu-expand-numbers): Ditto. * lisp/gnus/nnbabyl.el (nnbabyl-article-group-number): Ditto. * lisp/gnus/nndb.el (nndb-get-remote-expire-response): Ditto. * lisp/gnus/nndiary.el (nndiary-parse-schedule-value) (nndiary-string-to-number, nndiary-request-replace-article) (nndiary-request-article): Ditto. * lisp/gnus/nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto. * lisp/gnus/nndraft.el (nndraft-articles, nndraft-request-group): Ditto. * lisp/gnus/nneething.el (nneething-make-head): Ditto. * lisp/gnus/nnfolder.el (nnfolder-request-article) (nnfolder-retrieve-headers): Ditto. * lisp/gnus/nnheader.el (nnheader-file-to-number): Ditto. * lisp/gnus/nnkiboze.el (nnkiboze-request-article): Ditto. * lisp/gnus/nnmail.el (nnmail-process-unix-mail-format) (nnmail-process-babyl-mail-format): Ditto. * lisp/gnus/nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto. * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number) (nnmh-request-create-group, nnmh-request-list-1) (nnmh-request-group, nnmh-request-article): Ditto. * lisp/gnus/nnml.el (nnml-request-replace-article, nnml-request-article): Ditto. * lisp/gnus/nnrss.el (nnrss-find-rss-via-syndic8): Ditto. * lisp/gnus/nnsoup.el (nnsoup-make-active): Ditto. * lisp/gnus/nnspool.el (nnspool-find-id, nnspool-request-group): Ditto. * lisp/gnus/nntp.el (nntp-find-group-and-number) (nntp-retrieve-headers-with-xover): Ditto. * lisp/gnus/pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto. * lisp/gnus/pgg-parse.el (pgg-read-body, pgg-read-bytes) (pgg-format-key-identifier): Ditto. * lisp/gnus/pop3.el (pop3-last, pop3-stat): Ditto. * lisp/gnus/qp.el (quoted-printable-decode-region): Ditto. * lisp/gnus/spam-report.el (spam-report-url-ping-mm-url): Use format instead of concat.
169 lines
6.1 KiB
EmacsLisp
169 lines
6.1 KiB
EmacsLisp
;;; qp.el --- Quoted-Printable functions
|
|
|
|
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
|
|
;; Free Software Foundation, Inc.
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
|
;; Keywords: mail, extensions
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
;; any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
;; Boston, MA 02111-1307, USA.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Functions for encoding and decoding quoted-printable text as
|
|
;; defined in RFC 2045.
|
|
|
|
;;; Code:
|
|
|
|
(require 'mm-util)
|
|
(eval-when-compile (defvar mm-use-ultra-safe-encoding))
|
|
|
|
;;;###autoload
|
|
(defun quoted-printable-decode-region (from to &optional coding-system)
|
|
"Decode quoted-printable in the region between FROM and TO, per RFC 2045.
|
|
If CODING-SYSTEM is non-nil, decode bytes into characters with that
|
|
coding-system.
|
|
|
|
Interactively, you can supply the CODING-SYSTEM argument
|
|
with \\[universal-coding-system-argument].
|
|
|
|
The CODING-SYSTEM argument is a historical hangover and is deprecated.
|
|
QP encodes raw bytes and should be decoded into raw bytes. Decoding
|
|
them into characters should be done separately."
|
|
(interactive
|
|
;; Let the user determine the coding system with "C-x RET c".
|
|
(list (region-beginning) (region-end) coding-system-for-read))
|
|
(unless (mm-coding-system-p coding-system) ; e.g. `ascii' from Gnus
|
|
(setq coding-system nil))
|
|
(save-excursion
|
|
(save-restriction
|
|
;; RFC 2045: ``An "=" followed by two hexadecimal digits, one
|
|
;; or both of which are lowercase letters in "abcdef", is
|
|
;; formally illegal. A robust implementation might choose to
|
|
;; recognize them as the corresponding uppercase letters.''
|
|
(let ((case-fold-search t))
|
|
(narrow-to-region from to)
|
|
;; Do this in case we're called from Gnus, say, in a buffer
|
|
;; which already contains non-ASCII characters which would
|
|
;; then get doubly-decoded below.
|
|
(if coding-system
|
|
(mm-encode-coding-region (point-min) (point-max) coding-system))
|
|
(goto-char (point-min))
|
|
(while (and (skip-chars-forward "^=")
|
|
(not (eobp)))
|
|
(cond ((eq (char-after (1+ (point))) ?\n)
|
|
(delete-char 2))
|
|
((looking-at "=[0-9A-F][0-9A-F]")
|
|
(let ((byte (string-to-number (buffer-substring (1+ (point))
|
|
(+ 3 (point)))
|
|
16)))
|
|
(mm-insert-byte byte 1)
|
|
(delete-char 3)))
|
|
(t
|
|
(message "Malformed quoted-printable text")
|
|
(forward-char)))))
|
|
(if coding-system
|
|
(mm-decode-coding-region (point-min) (point-max) coding-system)))))
|
|
|
|
(defun quoted-printable-decode-string (string &optional coding-system)
|
|
"Decode the quoted-printable encoded STRING and return the result.
|
|
If CODING-SYSTEM is non-nil, decode the region with coding-system.
|
|
Use of CODING-SYSTEM is deprecated; this function should deal with
|
|
raw bytes, and coding conversion should be done separately."
|
|
(mm-with-unibyte-buffer
|
|
(insert string)
|
|
(quoted-printable-decode-region (point-min) (point-max) coding-system)
|
|
(buffer-string)))
|
|
|
|
(defun quoted-printable-encode-region (from to &optional fold class)
|
|
"Quoted-printable encode the region between FROM and TO per RFC 2045.
|
|
|
|
If FOLD, fold long lines at 76 characters (as required by the RFC).
|
|
If CLASS is non-nil, translate the characters not matched by that
|
|
regexp class, which is in the form expected by `skip-chars-forward'.
|
|
You should probably avoid non-ASCII characters in this arg.
|
|
|
|
If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and
|
|
encode lines starting with \"From\"."
|
|
(interactive "r")
|
|
(unless class
|
|
;; Avoid using 8bit characters. = is \075.
|
|
;; Equivalent to "^\000-\007\013\015-\037\200-\377="
|
|
(setq class "\010-\012\014\040-\074\076-\177"))
|
|
(save-excursion
|
|
(goto-char from)
|
|
(if (re-search-forward (mm-string-to-multibyte "[^\x0-\x7f\x80-\xff]")
|
|
to t)
|
|
(error "Multibyte character in QP encoding region"))
|
|
(save-restriction
|
|
(narrow-to-region from to)
|
|
;; Encode all the non-ascii and control characters.
|
|
(goto-char (point-min))
|
|
(while (and (skip-chars-forward class)
|
|
(not (eobp)))
|
|
(insert
|
|
(prog1
|
|
;; To unibyte in case of Emacs 22 eight-bit.
|
|
(format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
|
|
(delete-char 1))))
|
|
;; Encode white space at the end of lines.
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "[ \t]+$" nil t)
|
|
(goto-char (match-beginning 0))
|
|
(while (not (eolp))
|
|
(insert
|
|
(prog1
|
|
(format "=%02X" (char-after))
|
|
(delete-char 1)))))
|
|
(let ((mm-use-ultra-safe-encoding
|
|
(and (boundp 'mm-use-ultra-safe-encoding)
|
|
mm-use-ultra-safe-encoding)))
|
|
(when (or fold mm-use-ultra-safe-encoding)
|
|
(let ((tab-width 1)) ; HTAB is one character.
|
|
(goto-char (point-min))
|
|
(while (not (eobp))
|
|
;; In ultra-safe mode, encode "From " at the beginning
|
|
;; of a line.
|
|
(when mm-use-ultra-safe-encoding
|
|
(if (looking-at "From ")
|
|
(replace-match "From=20" nil t)
|
|
(if (looking-at "-")
|
|
(replace-match "=2D" nil t))))
|
|
(end-of-line)
|
|
;; Fold long lines.
|
|
(while (> (current-column) 76) ; tab-width must be 1.
|
|
(beginning-of-line)
|
|
(forward-char 75) ; 75 chars plus an "="
|
|
(search-backward "=" (- (point) 2) t)
|
|
(insert "=\n")
|
|
(end-of-line))
|
|
(forward-line))))))))
|
|
|
|
(defun quoted-printable-encode-string (string)
|
|
"Encode the STRING as quoted-printable and return the result."
|
|
(let ((default-enable-multibyte-characters (mm-multibyte-string-p string)))
|
|
(with-temp-buffer
|
|
(insert string)
|
|
(quoted-printable-encode-region (point-min) (point-max))
|
|
(buffer-string))))
|
|
|
|
(provide 'qp)
|
|
|
|
;;; arch-tag: db89e52a-e4a1-4b69-926f-f434f04216ba
|
|
;;; qp.el ends here
|