projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quoting fixes
[gnus]
/
lisp
/
rfc1843.el
diff --git
a/lisp/rfc1843.el
b/lisp/rfc1843.el
index
fb59ede
..
cab2f4e
100644
(file)
--- a/
lisp/rfc1843.el
+++ b/
lisp/rfc1843.el
@@
-1,25
+1,24
@@
;;; rfc1843.el --- HZ (rfc1843) decoding
;;; rfc1843.el --- HZ (rfc1843) decoding
-;; Copyright (c) 1998,1999 by Shenghuo Zhu <zsh@cs.rochester.edu>
+
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; Keywords: news HZ
+;; Keywords: news HZ
HZ+ mail i18n
-;; This file is
a part of GNU Emacs, but the same permissions apply
.
+;; 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 you
r
-;; option) any later version.
+;; 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 3 of the License, o
r
+;;
(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.
+;; 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
+;; G
NU G
eneral Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-32,28
+31,33
@@
;;; Code:
;;; Code:
+(eval-when-compile (require 'cl))
(require 'mm-util)
(require 'mm-util)
+(defvar gnus-decode-encoded-word-function)
+(defvar gnus-decode-header-function)
+(defvar gnus-newsgroup-name)
+
(defvar rfc1843-word-regexp
(defvar rfc1843-word-regexp
- "~\\({\\([\041-\167][\041-\176]\\| \\)+\\(~}\\|$\\)")
+ "~\\({\\([\041-\167][\041-\176]\\| \\)+\\
)\\
(~}\\|$\\)")
(defvar rfc1843-word-regexp-strictly
(defvar rfc1843-word-regexp-strictly
- "~\\({\\([\041-\167][\041-\176]\\)+\\(~}\\|$\\)")
+ "~\\({\\([\041-\167][\041-\176]\\)+\\
)\\
(~}\\|$\\)")
(defvar rfc1843-hzp-word-regexp
"~\\({\\([\041-\167][\041-\176]\\| \\)+\\|\
(defvar rfc1843-hzp-word-regexp
"~\\({\\([\041-\167][\041-\176]\\| \\)+\\|\
-[<>]\\([\041-\175][\041-\176]\\| \\)+\\)\\(~}\\|$\\)")
+
\
[<>]\\([\041-\175][\041-\176]\\| \\)+\\)\\(~}\\|$\\)")
(defvar rfc1843-hzp-word-regexp-strictly
"~\\({\\([\041-\167][\041-\176]\\)+\\|\
(defvar rfc1843-hzp-word-regexp-strictly
"~\\({\\([\041-\167][\041-\176]\\)+\\|\
-[<>]\\([\041-\175][\041-\176]\\)+\\)\\(~}\\|$\\)")
+
\
[<>]\\([\041-\175][\041-\176]\\)+\\)\\(~}\\|$\\)")
(defcustom rfc1843-decode-loosely nil
"Loosely check HZ encoding if non-nil.
When it is set non-nil, only buffers or strings with strictly
HZ-encoded are decoded."
:type 'boolean
(defcustom rfc1843-decode-loosely nil
"Loosely check HZ encoding if non-nil.
When it is set non-nil, only buffers or strings with strictly
HZ-encoded are decoded."
:type 'boolean
- :group '
gnus
)
+ :group '
mime
)
(defcustom rfc1843-decode-hzp t
"HZ+ decoding support if non-nil.
(defcustom rfc1843-decode-hzp t
"HZ+ decoding support if non-nil.
@@
-63,12
+67,12
@@
e-mail transmission, news posting, etc.
The document of HZ+ 0.78 specification can be found at
ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
:type 'boolean
The document of HZ+ 0.78 specification can be found at
ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
:type 'boolean
- :group '
gnus
)
+ :group '
mime
)
(defcustom rfc1843-newsgroups-regexp "chinese\\|hz"
"Regexp of newsgroups in which might be HZ encoded."
:type 'string
(defcustom rfc1843-newsgroups-regexp "chinese\\|hz"
"Regexp of newsgroups in which might be HZ encoded."
:type 'string
- :group '
gnus
)
+ :group '
mime
)
(defun rfc1843-decode-region (from to)
"Decode HZ in the region between FROM and TO."
(defun rfc1843-decode-region (from to)
"Decode HZ in the region between FROM and TO."
@@
-86,7
+90,10
@@
ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
(while (re-search-forward (if rfc1843-decode-hzp
rfc1843-hzp-word-regexp
rfc1843-word-regexp) (point-max) t)
(while (re-search-forward (if rfc1843-decode-hzp
rfc1843-hzp-word-regexp
rfc1843-word-regexp) (point-max) t)
- (setq str (match-string 1))
+ ;;; Text with extents may cause XEmacs crash
+ (setq str (buffer-substring-no-properties
+ (match-beginning 1)
+ (match-end 1)))
(setq firstc (aref str 0))
(insert (mm-decode-coding-string
(rfc1843-decode
(setq firstc (aref str 0))
(insert (mm-decode-coding-string
(rfc1843-decode
@@
-129,6
+136,10
@@
ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
(aset s (incf i) (+ v (if (< v 63) 64 98))))))
s))
(aset s (incf i) (+ v (if (< v 63) 64 98))))))
s))
+(autoload 'mail-header-parse-content-type "mail-parse")
+(autoload 'message-narrow-to-head "message")
+(declare-function message-fetch-field "message" (header &optional not-all))
+
(defun rfc1843-decode-article-body ()
"Decode HZ encoded text in the article body."
(if (string-match (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>")
(defun rfc1843-decode-article-body ()
"Decode HZ encoded text in the article body."
(if (string-match (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>")
@@
-139,9
+150,8
@@
ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
(let* ((inhibit-point-motion-hooks t)
(case-fold-search t)
(ct (message-fetch-field "Content-Type" t))
(let* ((inhibit-point-motion-hooks t)
(case-fold-search t)
(ct (message-fetch-field "Content-Type" t))
- (ctl (and ct (ignore-errors
- (mail-header-parse-content-type ct)))))
- (if (and ctl (not (string-match "/" (car ctl))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
+ (if (and ctl (not (string-match "/" (car ctl))))
(setq ctl nil))
(goto-char (point-max))
(widen)
(setq ctl nil))
(goto-char (point-max))
(widen)
@@
-151,7
+161,6
@@
ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
(equal (car ctl) "text/plain"))
(rfc1843-decode-region (point) (point-max))))))))
(equal (car ctl) "text/plain"))
(rfc1843-decode-region (point) (point-max))))))))
-(defvar rfc1843-old-gnus-decode-header-function nil)
(defvar gnus-decode-header-methods)
(defvar gnus-decode-encoded-word-methods)
(defvar gnus-decode-header-methods)
(defvar gnus-decode-encoded-word-methods)