projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add arch tagline
[gnus]
/
lisp
/
mm-url.el
diff --git
a/lisp/mm-url.el
b/lisp/mm-url.el
index
6dd921a
..
23909d3
100644
(file)
--- a/
lisp/mm-url.el
+++ b/
lisp/mm-url.el
@@
-1,5
+1,7
@@
;;; mm-url.el --- a wrapper of url functions/commands for Gnus
;;; mm-url.el --- a wrapper of url functions/commands for Gnus
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
@@
-17,8
+19,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:
@@
-34,10
+36,9
@@
(require 'mm-util)
(require 'gnus)
(require 'mm-util)
(require 'gnus)
-(eval-when-compile
- (if (featurep 'xemacs)
- (require 'timer-funcs)
- (require 'timer)))
+(defvar url-current-object)
+(defvar url-package-name)
+(defvar url-package-version)
(defgroup mm-url nil
"A wrapper of url package and external url command for Gnus."
(defgroup mm-url nil
"A wrapper of url package and external url command for Gnus."
@@
-56,7
+57,7
@@
'((wget "wget" "--user-agent=mm-url" "-q" "-O" "-")
(w3m "w3m" "-dump_source")
(lynx "lynx" "-source")
'((wget "wget" "--user-agent=mm-url" "-q" "-O" "-")
(w3m "w3m" "-dump_source")
(lynx "lynx" "-source")
- (curl "curl" "--silent")))
+ (curl "curl" "--silent"
"--user-agent mm-url" "--location"
)))
(defcustom mm-url-program
(cond
(defcustom mm-url-program
(cond
@@
-268,7
+269,10
@@
This is taken from RFC 2396.")
(defun mm-url-load-url ()
"Load `url-insert-file-contents'."
(unless (condition-case ()
(defun mm-url-load-url ()
"Load `url-insert-file-contents'."
(unless (condition-case ()
- (require 'url-handlers)
+ (progn
+ (require 'url-handlers)
+ (require 'url-parse)
+ (require 'url-vars))
(error nil))
;; w3-4.0pre0.46 or earlier version.
(require 'w3-vars)
(error nil))
;; w3-4.0pre0.46 or earlier version.
(require 'w3-vars)
@@
-290,7
+294,6
@@
If `mm-url-use-external' is non-nil, use `mm-url-program'."
(list url (buffer-size)))
(mm-url-load-url)
(let ((name buffer-file-name)
(list url (buffer-size)))
(mm-url-load-url)
(let ((name buffer-file-name)
- (url-request-extra-headers (list (cons "Connection" "Close")))
(url-package-name (or mm-url-package-name
url-package-name))
(url-package-version (or mm-url-package-version
(url-package-name (or mm-url-package-name
url-package-name))
(url-package-version (or mm-url-package-version
@@
-357,7
+360,7
@@
If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
(defun mm-url-decode-entities ()
"Decode all HTML entities."
(goto-char (point-min))
(defun mm-url-decode-entities ()
"Decode all HTML entities."
(goto-char (point-min))
- (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
+ (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+
[0-9]*
\\);" nil t)
(let ((elem (if (eq (aref (match-string 1) 0) ?\#)
(let ((c
(string-to-number (substring
(let ((elem (if (eq (aref (match-string 1) 0) ?\#)
(let ((c
(string-to-number (substring