projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(nnmail-broken-references-mailers): New variable.
[gnus]
/
lisp
/
qp.el
diff --git
a/lisp/qp.el
b/lisp/qp.el
index
13882fd
..
7ae1412
100644
(file)
--- a/
lisp/qp.el
+++ b/
lisp/qp.el
@@
-1,6
+1,7
@@
;;; qp.el --- Quoted-Printable functions
;;; qp.el --- Quoted-Printable functions
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail, extensions
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail, extensions
@@
-19,8
+20,8
@@
;; 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
;; 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., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-32,10
+33,18
@@
(require 'mm-util)
(eval-when-compile (defvar mm-use-ultra-safe-encoding))
(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
(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."
+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))
(interactive
;; Let the user determine the coding system with "C-x RET c".
(list (region-beginning) (region-end) coding-system-for-read))
@@
-60,15
+69,11
@@
coding-system."
(cond ((eq (char-after (1+ (point))) ?\n)
(delete-char 2))
((looking-at "=[0-9A-F][0-9A-F]")
(cond ((eq (char-after (1+ (point))) ?\n)
(delete-char 2))
((looking-at "=[0-9A-F][0-9A-F]")
- (let ((byte (string-to-
int
(buffer-substring (1+ (point))
+ (let ((byte (string-to-
number
(buffer-substring (1+ (point))
(+ 3 (point)))
16)))
(+ 3 (point)))
16)))
- (insert byte)
- (delete-char 3)
- ;; Why backward-char???
- ;;(unless (eq byte 61) ;; 61 is not ?= in XEmacs
- ;; (backward-char))
- ))
+ (mm-insert-byte byte 1)
+ (delete-char 3)))
(t
(message "Malformed quoted-printable text")
(forward-char)))))
(t
(message "Malformed quoted-printable text")
(forward-char)))))
@@
-77,8
+82,10
@@
coding-system."
(defun quoted-printable-decode-string (string &optional coding-system)
"Decode the quoted-printable encoded STRING and return the result.
(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."
- (with-temp-buffer
+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)))
(insert string)
(quoted-printable-decode-region (point-min) (point-max) coding-system)
(buffer-string)))
@@
-99,21
+106,20
@@
encode lines starting with \"From\"."
;; Equivalent to "^\000-\007\013\015-\037\200-\377="
(setq class "\010-\012\014\040-\074\076-\177"))
(save-excursion
;; 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)
(save-restriction
(narrow-to-region from to)
- ;; We can live with characters between 00-FF.
- (goto-char (point-min))
- (while (not (eobp))
- (if (>= (char-after) 256)
- (error "Multibyte character in QP encoding region"))
- (forward-char))
;; Encode all the non-ascii and control characters.
(goto-char (point-min))
(while (and (skip-chars-forward class)
(not (eobp)))
(insert
(prog1
;; Encode all the non-ascii and control characters.
(goto-char (point-min))
(while (and (skip-chars-forward class)
(not (eobp)))
(insert
(prog1
- (format "=%02X" (char-after))
+ ;; To unibyte in case of Emacs 23 (unicode) 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))
(delete-char 1))))
;; Encode white space at the end of lines.
(goto-char (point-min))
@@
-128,7
+134,7
@@
encode lines starting with \"From\"."
(and (boundp 'mm-use-ultra-safe-encoding)
mm-use-ultra-safe-encoding)))
(when (or fold 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.
+ (let ((tab-width 1))
; HTAB is one character.
(goto-char (point-min))
(while (not (eobp))
;; In ultra-safe mode, encode "From " at the beginning
(goto-char (point-min))
(while (not (eobp))
;; In ultra-safe mode, encode "From " at the beginning
@@
-137,7
+143,7
@@
encode lines starting with \"From\"."
(if (looking-at "From ")
(replace-match "From=20" nil t)
(if (looking-at "-")
(if (looking-at "From ")
(replace-match "From=20" nil t)
(if (looking-at "-")
-
(replace-match "=2D" nil t))))
+ (replace-match "=2D" nil t))))
(end-of-line)
;; Fold long lines.
(while (> (current-column) 76) ; tab-width must be 1.
(end-of-line)
;; Fold long lines.
(while (> (current-column) 76) ; tab-width must be 1.
@@
-158,4
+164,5
@@
encode lines starting with \"From\"."
(provide 'qp)
(provide 'qp)
+;;; arch-tag: db89e52a-e4a1-4b69-926f-f434f04216ba
;;; qp.el ends here
;;; qp.el ends here