projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5-10 branch.
[gnus]
/
lisp
/
mm-extern.el
diff --git
a/lisp/mm-extern.el
b/lisp/mm-extern.el
index
4579a55
..
2f75139
100644
(file)
--- a/
lisp/mm-extern.el
+++ b/
lisp/mm-extern.el
@@
-1,5
+1,7
@@
;;; mm-extern.el --- showing message/external-body
;;; mm-extern.el --- showing message/external-body
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message external-body
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message external-body
@@
-18,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:
@@
-29,6
+31,9
@@
(require 'mm-util)
(require 'mm-decode)
(require 'mm-util)
(require 'mm-decode)
+(require 'mm-url)
+
+(defvar gnus-article-mime-handles)
(defvar mm-extern-function-alist
'((local-file . mm-extern-local-file)
(defvar mm-extern-function-alist
'((local-file . mm-extern-local-file)
@@
-48,22
+53,21
@@
(coding-system-for-read mm-binary-coding-system))
(unless name
(error "The filename is not specified"))
(coding-system-for-read mm-binary-coding-system))
(unless name
(error "The filename is not specified"))
- (mm-disable-multibyte
-mule4
)
+ (mm-disable-multibyte)
(if (file-exists-p name)
(mm-insert-file-contents name nil nil nil nil t)
(if (file-exists-p name)
(mm-insert-file-contents name nil nil nil nil t)
- (error
(format "File %s is gone" name)
))))
+ (error
"File %s is gone" name
))))
(defun mm-extern-url (handle)
(erase-buffer)
(defun mm-extern-url (handle)
(erase-buffer)
- (require 'url)
(let ((url (cdr (assq 'url (cdr (mm-handle-type handle)))))
(name buffer-file-name)
(coding-system-for-read mm-binary-coding-system))
(unless url
(error "URL is not specified"))
(let ((url (cdr (assq 'url (cdr (mm-handle-type handle)))))
(name buffer-file-name)
(coding-system-for-read mm-binary-coding-system))
(unless url
(error "URL is not specified"))
- (mm-with-unibyte-current-buffer
-mule4
- (url-insert-file-contents url))
- (mm-disable-multibyte
-mule4
)
+ (mm-with-unibyte-current-buffer
+ (
mm-
url-insert-file-contents url))
+ (mm-disable-multibyte)
(setq buffer-file-name name)))
(defun mm-extern-anon-ftp (handle)
(setq buffer-file-name name)))
(defun mm-extern-anon-ftp (handle)
@@
-79,7
+83,7
@@
(coding-system-for-read mm-binary-coding-system))
(unless name
(error "The filename is not specified"))
(coding-system-for-read mm-binary-coding-system))
(unless name
(error "The filename is not specified"))
- (mm-disable-multibyte
-mule4
)
+ (mm-disable-multibyte)
(mm-insert-file-contents path nil nil nil nil t)))
(defun mm-extern-ftp (handle)
(mm-insert-file-contents path nil nil nil nil t)))
(defun mm-extern-ftp (handle)
@@
-98,7
+102,7
@@
(message-mail server subject)
(message-goto-body)
(delete-region (point) (point-max))
(message-mail server subject)
(message-goto-body)
(delete-region (point) (point-max))
- (insert-buffer buf)
+ (insert-buffer
-substring
buf)
(message "Requesting external body...")
(message-send-and-exit)
(setq info "Request is sent.")
(message "Requesting external body...")
(message-send-and-exit)
(setq info "Request is sent.")
@@
-124,7
+128,7
@@
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
handles)
(unless (mm-handle-cache handle)
(unless func
handles)
(unless (mm-handle-cache handle)
(unless func
- (error
(format "Access type (%s) is not supported" access-type)
))
+ (error
"Access type (%s) is not supported" access-type
))
(with-temp-buffer
(mm-insert-part handle)
(goto-char (point-max))
(with-temp-buffer
(mm-insert-part handle)
(goto-char (point-max))
@@
-163,4
+167,7
@@
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
(error nil))
(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
(error nil))
(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
+(provide 'mm-extern)
+
+;;; arch-tag: 9653808e-14d9-4172-86e6-adceaa05378e
;;; mm-extern.el ends here
;;; mm-extern.el ends here