X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/23b8b1803172cf4749f0260b79a89bb2ee391e79..307f5c57467e8e967f795d47ec885bf19fd5317f:/lisp/mh-e/mh-gnus.el diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el index 0a893efa3c..970f98556e 100644 --- a/lisp/mh-e/mh-gnus.el +++ b/lisp/mh-e/mh-gnus.el @@ -1,6 +1,6 @@ -;;; mh-gnus.el --- Make MH-E compatible with installed version of Gnus. +;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. ;; Author: Satyaki Das ;; Maintainer: Bill Wohler @@ -21,8 +21,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 -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -30,68 +30,70 @@ ;;; Code: -(load "mm-decode" t t) ; Non-fatal dependency -(load "mm-uu" t t) ; Non-fatal dependency -(load "mailcap" t t) ; Non-fatal dependency -(load "smiley" t t) ; Non-fatal dependency - -(defmacro mh-defun-compat (function arg-list &rest body) - "This is a macro to define functions which are not defined. -It is used for Gnus utility functions which were added recently. If FUNCTION -is not defined then it is defined to have argument list, ARG-LIST and body, -BODY." - (let ((defined-p (fboundp function))) - (unless defined-p - `(defun ,function ,arg-list ,@body)))) -(put 'mh-defun-compat 'lisp-indent-function 'defun) - -(defmacro mh-defmacro-compat (function arg-list &rest body) - "This is a macro to define functions which are not defined. -It is used for Gnus utility functions which were added recently. If FUNCTION -is not defined then it is defined to have argument list, ARG-LIST and body, -BODY." - (let ((defined-p (fboundp function))) - (unless defined-p - `(defmacro ,function ,arg-list ,@body)))) -(put 'mh-defmacro-compat 'lisp-indent-function 'defun) - -;; Copy of original function from gnus-util.el -(mh-defun-compat gnus-local-map-property (map) +(require 'mh-e) + +(mh-require 'gnus-util nil t) +(mh-require 'mm-bodies nil t) +(mh-require 'mm-decode nil t) +(mh-require 'mm-view nil t) +(mh-require 'mml nil t) + +;; Copy of function from gnus-util.el. +(mh-defun-compat mh-gnus-local-map-property gnus-local-map-property (map) "Return a list suitable for a text property list specifying keymap MAP." (cond (mh-xemacs-flag (list 'keymap map)) ((>= emacs-major-version 21) (list 'keymap map)) (t (list 'local-map map)))) -;; Copy of original function from mm-decode.el -(mh-defun-compat mm-merge-handles (handles1 handles2) +;; Copy of function from mm-decode.el. +(mh-defun-compat mh-mm-merge-handles mm-merge-handles (handles1 handles2) (append (if (listp (car handles1)) handles1 (list handles1)) (if (listp (car handles2)) handles2 (list handles2)))) -;; Copy of function from mm-decode.el -(mh-defun-compat mm-set-handle-multipart-parameter (handle parameter value) +;; Copy of function from mm-decode.el. +(mh-defun-compat mh-mm-set-handle-multipart-parameter + mm-set-handle-multipart-parameter (handle parameter value) ;; HANDLE could be a CTL. (if handle (put-text-property 0 (length (car handle)) parameter value (car handle)))) -;; Copy of original macro is in mm-decode.el -(mh-defmacro-compat mm-handle-multipart-ctl-parameter (handle parameter) - `(get-text-property 0 ,parameter (car ,handle))) +;; Copy of function from mm-view.el. +(mh-defun-compat mh-mm-inline-text-vcard mm-inline-text-vcard (handle) + (let (buffer-read-only) + (mm-insert-inline + handle + (concat "\n-- \n" + (ignore-errors + (if (fboundp 'vcard-pretty-print) + (vcard-pretty-print (mm-get-part handle)) + (vcard-format-string + (vcard-parse-string (mm-get-part handle) + 'vcard-standard-filter)))))))) + +;; Function from mm-decode.el used in PGP messages. Just define it with older +;; Gnus to avoid compiler warning. +(mh-defun-compat mh-mm-possibly-verify-or-decrypt + mm-possibly-verify-or-decrypt (parts ctl) + nil) -(mh-do-in-xemacs (defvar default-enable-multibyte-characters)) +;; Copy of macro in mm-decode.el. +(mh-defmacro-compat mh-mm-handle-multipart-ctl-parameter + mm-handle-multipart-ctl-parameter (handle parameter) + `(get-text-property 0 ,parameter (car ,handle))) -;; Copy of original function in mm-decode.el -(mh-defun-compat mm-readable-p (handle) +;; Copy of function in mm-decode.el. +(mh-defun-compat mh-mm-readable-p mm-readable-p (handle) "Say whether the content of HANDLE is readable." (and (< (with-current-buffer (mm-handle-buffer handle) (buffer-size)) 10000) (mm-with-unibyte-buffer (mm-insert-part handle) (and (eq (mm-body-7-or-8) '7bit) - (not (mm-long-lines-p 76)))))) + (not (mh-mm-long-lines-p 76)))))) -;; Copy of original function in mm-bodies.el -(mh-defun-compat mm-long-lines-p (length) +;; Copy of function in mm-bodies.el. +(mh-defun-compat mh-mm-long-lines-p mm-long-lines-p (length) "Say whether any of the lines in the buffer is longer than LENGTH." (save-excursion (goto-char (point-min)) @@ -103,19 +105,39 @@ BODY." (and (> (current-column) length) (current-column)))) -(mh-defun-compat mm-keep-viewer-alive-p (handle) +(mh-defun-compat mh-mm-keep-viewer-alive-p mm-keep-viewer-alive-p (handle) ;; Released Gnus doesn't keep handles associated with externally displayed ;; MIME parts. So this will always return nil. nil) -(mh-defun-compat mm-destroy-parts (list) - "Older emacs don't have this function." +(mh-defun-compat mh-mm-destroy-parts mm-destroy-parts (list) + "Older versions of Emacs don't have this function." nil) -;;; This is mm-save-part from gnus 5.10 since that function in emacs21.2 is -;;; buggy (the args to read-file-name are incorrect). When all supported -;;; versions of Emacs come with at least Gnus 5.10, we can delete this -;;; function and rename calls to mh-mm-save-part to mm-save-part. +(mh-defun-compat mh-mm-uu-dissect-text-parts mm-uu-dissect-text-parts (handles) + "Emacs 21 and XEmacs don't have this function." + nil) + +;; Copy of function in mml.el. +(mh-defun-compat mh-mml-minibuffer-read-disposition + mml-minibuffer-read-disposition (type &optional default) + (unless default (setq default + (if (and (string-match "\\`text/" type) + (not (string-match "\\`text/rtf\\'" type))) + "inline" + "attachment"))) + (let ((disposition (completing-read + (format "Disposition (default %s): " default) + '(("attachment") ("inline") ("")) + nil t nil nil default))) + (if (not (equal disposition "")) + disposition + default))) + +;; This is mm-save-part from Gnus 5.10 since that function in emacs21.2 is +;; buggy (the args to read-file-name are incorrect). When all supported +;; versions of Emacs come with at least Gnus 5.10, we can delete this +;; function and rename calls to mh-mm-save-part to mm-save-part. (defun mh-mm-save-part (handle) "Write HANDLE to a file." (let ((name (mail-content-type-get (mm-handle-type handle) 'name)) @@ -134,11 +156,19 @@ BODY." file))) (mm-save-part-to-file handle file)))) +(defun mh-mm-text-html-renderer () + "Find the renderer Gnus is using to display text/html MIME parts." + (or (and (boundp 'mm-inline-text-html-renderer) mm-inline-text-html-renderer) + (and (boundp 'mm-text-html-renderer) mm-text-html-renderer))) + (provide 'mh-gnus) -;;; Local Variables: -;;; no-byte-compile: t -;;; no-update-autoloads: t -;;; End: + +;; Local Variables: +;; no-byte-compile: t +;; no-update-autoloads: t +;; indent-tabs-mode: nil +;; sentence-end-double-space: nil +;; End: ;; arch-tag: 1e3638af-cad3-4c69-8427-bc8eb6e5e4fa ;;; mh-gnus.el ends here