mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-14 09:39:42 +00:00
06e7028b76
since compatibility functions should have our package prefix (mh-) by Emacs convention and to avoid messing up checks for the same functions in other packages. Use explicit argument instead of forming name by adding mh-e prefix so that one can grep and find the definition. * mh-alias.el (mh-alias-local-users, mh-alias-reload) (mh-alias-expand, mh-alias-minibuffer-confirm-address): Use mh-assoc-string instead of assoc-string. * mh-compat.el (assoc-string): Rename to mh-assoc-string. (mh-mail-abbrev-make-syntax-table, mh-url-hexify-string): Move here from mh-utils.el. (mh-display-completion-list): Move here from mh-comp.el. (mh-face-foreground, mh-face-background): Move here from mh-xface.el. (mh-write-file-functions): Move here from mh-folder.el * mh-folder.el (mh-write-file-functions-compat): Move to mh-compat.el and rename to mh-write-file-functions. (mh-folder-mode): Use the new name. * mh-gnus.el (gnus-local-map-property): Rename to mh-gnus-local-map-property. (mm-merge-handles): Rename to mh-mm-merge-handles. (mm-set-handle-multipart-parameter): Rename to mh-mm-set-handle-multipart-parameter. (mm-inline-text-vcard): Rename to mh-mm-inline-text-vcard. (mm-possibly-verify-or-decrypt): Rename to mh-mm-possibly-verify-or-decrypt. (mm-handle-multipart-ctl-parameter): Rename to mh-mm-handle-multipart-ctl-parameter. (mm-readable-p): Rename to mh-mm-readable-p. (mm-long-lines-p): Rename to mh-mm-long-lines-p. (mm-keep-viewer-alive-p): Rename to mh-mm-keep-viewer-alive-p. (mm-destroy-parts): Rename to mh-mm-destroy-parts. (mm-uu-dissect-text-parts): Rename to mh-mm-uu-dissect-text-parts. (mml-minibuffer-read-disposition): Rename to mh-mml-minibuffer-read-disposition. * mh-identity.el (mh-identity-field-handler): Use mh-assoc-string instead of assoc-string. * mh-mime.el (mh-mm-inline-media-tests, mh-mm-inline-message) (mh-mime-display, mh-mime-display-security) (mh-insert-mime-button, mh-insert-mime-security-button) (mh-handle-set-external-undisplayer) (mh-mime-security-press-button, mh-mime-security-show-details) (mh-mml-attach-file, mh-mime-cleanup) (mh-destroy-postponed-handles): Use new mh-* names for compatibility functions. * mh-utils.el (mail-abbrev-make-syntax-table): Move to mh-compat.el and rename to mh-mail-abbrev-make-syntax-table. (mh-beginning-of-word): Use the new name. (mh-get-field): Delete ancient alias. * mh-xface.el (mh-face-foreground-compat): Move to mh-compat.el and rename to mh-face-foreground (mh-face-background-compat): Move to mh-compat.el and rename to mh-face-background. (mh-face-display-function): Use the new names. (mh-x-image-url-cache-canonicalize): Use mh-url-hexify-string instead of url-hexify-string. (url-unreserved-chars): Move to mh-compat.el and rename to mh-url-unreserved-chars. (url-hexify-string): Move to mh-compat.el and rename to mh-url-hexify-string.
175 lines
6.4 KiB
EmacsLisp
175 lines
6.4 KiB
EmacsLisp
;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus
|
|
|
|
;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
|
|
|
|
;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
|
|
;; Maintainer: Bill Wohler <wohler@newt.com>
|
|
;; Keywords: mail
|
|
;; See: mh-e.el
|
|
|
|
;; 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 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.
|
|
|
|
;; 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., 51 Franklin Street, Fifth Floor,
|
|
;; Boston, MA 02110-1301, USA.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Change Log:
|
|
|
|
;;; Code:
|
|
|
|
(require 'mh-e)
|
|
|
|
(require 'gnus-util nil t)
|
|
(require 'mm-bodies nil t)
|
|
(require 'mm-decode nil t)
|
|
(require 'mm-view nil t)
|
|
(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 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 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 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)
|
|
|
|
;; 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 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 (mh-mm-long-lines-p 76))))))
|
|
|
|
;; 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))
|
|
(end-of-line)
|
|
(while (and (not (eobp))
|
|
(not (> (current-column) length)))
|
|
(forward-line 1)
|
|
(end-of-line))
|
|
(and (> (current-column) length)
|
|
(current-column))))
|
|
|
|
(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 mh-mm-destroy-parts mm-destroy-parts (list)
|
|
"Older versions of Emacs don't have this function."
|
|
nil)
|
|
|
|
(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))
|
|
(filename (mail-content-type-get
|
|
(mm-handle-disposition handle) 'filename))
|
|
file)
|
|
(when filename
|
|
(setq filename (file-name-nondirectory filename)))
|
|
(setq file (read-file-name "Save MIME part to: "
|
|
(or mm-default-directory
|
|
default-directory)
|
|
nil nil (or filename name "")))
|
|
(setq mm-default-directory (file-name-directory file))
|
|
(and (or (not (file-exists-p file))
|
|
(yes-or-no-p (format "File %s already exists; overwrite? "
|
|
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
|
|
;; indent-tabs-mode: nil
|
|
;; sentence-end-double-space: nil
|
|
;; End:
|
|
|
|
;; arch-tag: 1e3638af-cad3-4c69-8427-bc8eb6e5e4fa
|
|
;;; mh-gnus.el ends here
|