Mercurial > emacs
comparison lisp/mh-e/mh-mime.el @ 90384:c156f6a9e7b5
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 204-225)
- Update from CVS
- Sync from erc--emacs--0
- Merge from gnus--rel--5.10
- Improve tq.el.
- Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* gnus--rel--5.10 (patch 81-85)
- Update from CVS
- Merge from emacs--devo--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 17 Apr 2006 08:41:12 +0000 |
parents | 5754737d1e04 d81780942bb8 |
children | 138ce2701550 |
comparison
equal
deleted
inserted
replaced
90383:ab20fb198dda | 90384:c156f6a9e7b5 |
---|---|
823 | 823 |
824 | 824 |
825 ;;; Button Display | 825 ;;; Button Display |
826 | 826 |
827 ;; Shush compiler. | 827 ;; Shush compiler. |
828 (eval-when-compile (mh-do-in-xemacs (defvar dots) (defvar type) (defvar ov))) | 828 (defvar dots) ; XEmacs |
829 (defvar type) ; XEmacs | |
830 (defvar ov) ; XEmacs | |
829 | 831 |
830 (defun mh-insert-mime-button (handle index displayed) | 832 (defun mh-insert-mime-button (handle index displayed) |
831 "Insert MIME button for HANDLE. | 833 "Insert MIME button for HANDLE. |
832 INDEX is the part number that will be DISPLAYED. It is also used | 834 INDEX is the part number that will be DISPLAYED. It is also used |
833 by commands like \"K v\" which operate on individual MIME parts." | 835 by commands like \"K v\" which operate on individual MIME parts." |
868 "Mouse-2 click or press RET (in show buffer) to toggle display") | 870 "Mouse-2 click or press RET (in show buffer) to toggle display") |
869 (dolist (ov (mh-funcall-if-exists overlays-in begin end)) | 871 (dolist (ov (mh-funcall-if-exists overlays-in begin end)) |
870 (mh-funcall-if-exists overlay-put ov 'evaporate t)))) | 872 (mh-funcall-if-exists overlay-put ov 'evaporate t)))) |
871 | 873 |
872 ;; Shush compiler. | 874 ;; Shush compiler. |
873 (eval-when-compile | 875 (defvar mm-verify-function-alist) ; < Emacs 22 |
874 (when (< emacs-major-version 22) | 876 (defvar mm-decrypt-function-alist) ; < Emacs 22 |
875 (defvar mm-verify-function-alist) | 877 (defvar pressed-details) ; XEmacs |
876 (defvar mm-decrypt-function-alist)) | |
877 (mh-do-in-xemacs | |
878 (defvar pressed-details))) | |
879 | 878 |
880 (defun mh-insert-mime-security-button (handle) | 879 (defun mh-insert-mime-security-button (handle) |
881 "Display buttons for PGP message, HANDLE." | 880 "Display buttons for PGP message, HANDLE." |
882 (let* ((protocol (mh-mm-handle-multipart-ctl-parameter handle 'protocol)) | 881 (let* ((protocol (mh-mm-handle-multipart-ctl-parameter handle 'protocol)) |
883 (crypto-type (or (nth 2 (assoc protocol mm-verify-function-alist)) | 882 (crypto-type (or (nth 2 (assoc protocol mm-verify-function-alist)) |
1535 (erase-buffer) | 1534 (erase-buffer) |
1536 (insert-file-contents backup-file)) | 1535 (insert-file-contents backup-file)) |
1537 (after-find-file nil))) | 1536 (after-find-file nil))) |
1538 | 1537 |
1539 ;; Shush compiler. | 1538 ;; Shush compiler. |
1540 (eval-when-compile (defvar mh-identity-pgg-default-user-id)) | 1539 (defvar mh-identity-pgg-default-user-id) |
1541 | 1540 |
1542 ;;;###mh-autoload | 1541 ;;;###mh-autoload |
1543 (defun mh-mml-secure-message-encrypt (method) | 1542 (defun mh-mml-secure-message-encrypt (method) |
1544 "Add tag to encrypt the message. | 1543 "Add tag to encrypt the message. |
1545 | 1544 |