projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--devo--0
[gnus]
/
lisp
/
qp.el
diff --git
a/lisp/qp.el
b/lisp/qp.el
index
7380294
..
4aedaa0
100644
(file)
--- a/
lisp/qp.el
+++ b/
lisp/qp.el
@@
-1,7
+1,7
@@
;;; qp.el --- Quoted-Printable functions
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;;; qp.el --- Quoted-Printable functions
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005
, 2006, 2007, 2008
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail, extensions
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail, extensions
@@
-10,7
+10,7
@@
;; 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
;; 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)
+;; the Free Software Foundation; either version
3
, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-31,7
+31,7
@@
;;; Code:
(require 'mm-util)
;;; Code:
(require 'mm-util)
-(
eval-when-compile (defvar mm-use-ultra-safe-encoding)
)
+(
defvar mm-use-ultra-safe-encoding
)
;;;###autoload
(defun quoted-printable-decode-region (from to &optional coding-system)
;;;###autoload
(defun quoted-printable-decode-region (from to &optional coding-system)
@@
-82,7
+82,7
@@
them into characters should be done separately."
(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.
+If CODING-SYSTEM is non-nil, decode the
string
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
Use of CODING-SYSTEM is deprecated; this function should deal with
raw bytes, and coding conversion should be done separately."
(mm-with-unibyte-buffer
@@
-118,7
+118,7
@@
encode lines starting with \"From\"."
(not (eobp)))
(insert
(prog1
(not (eobp)))
(insert
(prog1
- ;; To unibyte in case of Emacs 2
2
eight-bit.
+ ;; To unibyte in case of Emacs 2
3 (unicode)
eight-bit.
(format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
(delete-char 1))))
;; Encode white space at the end of lines.
(format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
(delete-char 1))))
;; Encode white space at the end of lines.