From aeca2910477d53331550ef6ce5e937d2c000f2ec Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 12:21:16 +0000 Subject: [PATCH] tm 7.35. --- Changes-7.35.en | 44 +++++++++++++++++++ Makefile | 2 +- doc/tm_en.texi | 9 ++-- doc/tm_ja.texi | 14 +++---- gnus/ChangeLog-7.23-7.24.en | 8 ++++ gnus/Makefile | 2 +- gnus/g3-path | 2 +- gnus/g4-path | 2 +- gnus/g5-path | 2 +- gnus/s-path | 2 +- gnus/tm-sgnus.el | 34 +++++++++++---- tm-def.el | 18 +++++++- tm-edit.el | 9 ++-- tm-file.el | 3 +- tm-mail.el | 11 +++-- tm-pgp.el | 15 +++++-- tm-rmail.el | 6 +-- tm-view.el | 98 +++++++++++++++++++++---------------------- tm-vm.el | 17 ++++---- 19 files changed, 196 insertions(+), 102 deletions(-) create mode 100644 Changes-7.35.en create mode 100644 gnus/ChangeLog-7.23-7.24.en diff --git a/Changes-7.35.en b/Changes-7.35.en new file mode 100644 index 0000000..036b5fc --- /dev/null +++ b/Changes-7.35.en @@ -0,0 +1,44 @@ +Sat Dec 15 16:16:32 1995 Morioka Tomohiko + + * tm: Version 7.35 was released. + * tm/gnus: Version 7.24 was released. + +Fri Dec 15 15:40:10 1995 Morioka Tomohiko + + * tm-pgp.el: + According to Shuhei KOBAYASHI , + `(autoload 'mc-snarf-keys "mc-toplev")' was added. + (cf. [tm-ja:1345]) + + * tm-view.el: + (1) Popup menu for Emacs 19.* was deleted. + (2) MIME-View menu was defined for Emacs 19.*. In Emacs 19.29 or + later, system popup menu is available. + +Fri Dec 15 15:02:14 1995 Morioka Tomohiko + + * tm-edit.el (mime/editor-mode): DOC string was fixed. + +Fri Dec 15 13:58:51 1995 Morioka Tomohiko + + * tm-vm.el: + (1) New variable `tm-vm/use-xemacs-popup-menu'. + (2) popup menu of MIME-Edit minor mode became sub menu. + +Fri Dec 15 13:56:51 1995 Morioka Tomohiko + + * tm-rmail.el: + Setting was modified to load tm-mail after tm-edit is loaded. + + * tm-mail.el: + (1) New variable `tm-mail/use-xemacs-popup-menu'. + (2) popup menu of MIME-Edit minor mode became sub menu. + + * tm-def.el (tm:set-fields): New function + +Fri Dec 15 12:00:23 1995 Morioka Tomohiko + + * tm-pgp.el (mime-article/check-pgp-signature): fixed problem of + binary declarations + + * tm-file.el: delete unnecessary `(file-coding-system *noconv*)' diff --git a/Makefile b/Makefile index d55eb9b..03c5e84 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.34.tar.gz +TARFILE = tm7.35.tar.gz 18: diff --git a/doc/tm_en.texi b/doc/tm_en.texi index 6b8025c..cbbfb0c 100644 --- a/doc/tm_en.texi +++ b/doc/tm_en.texi @@ -6,7 +6,7 @@ @titlepage @title tm Manual (English Version) @author by MORIOKA Tomohiko -@code{$Id: tm_en.texi,v 7.3 1995/12/13 09:26:11 morioka Exp morioka $} +@code{$Id: tm_en.texi,v 7.4 1995/12/15 05:34:44 morioka Exp morioka $} @end titlepage @@ -340,17 +340,16 @@ automatically in default setting. @cindex bug report @cindex mailing list -Please report tm bugs you find to fj.editor.emacs or send a mail to -tm ML: +Please report tm bugs you find to fj.editor.emacs or send a mail to: @itemize @bullet @item Japanese or English - + @item English - + @end itemize Via tm ML, You can report bugs of tm, obtain the latest release of tm diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi index 25bf940..fbf6148 100644 --- a/doc/tm_ja.texi +++ b/doc/tm_ja.texi @@ -6,7 +6,7 @@ @titlepage @title{tm Manual¡ÊÆüËܸìÈÇ¡Ë} @author{¼é²¬ ÃÎɧ Ãø} -@code{$Id: tm_ja.texi,v 7.2 1995/12/13 09:26:59 morioka Exp morioka $} +@code{$Id: tm_ja.texi,v 7.3 1995/12/15 05:36:34 morioka Exp morioka $} @end titlepage @@ -395,17 +395,17 @@ support @cindex bug Êó¹ð @cindex mailing list -tm ¤Î¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é fj.editor.emacs ¤Ë post ¤¹¤ë¤«¡¢tm ML ¤Ë mail ¤ò -Á÷¤Ã¤Æ²¼¤µ¤¤¡£tm ML ¤Î address ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£ +tm ¤Î¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é fj.editor.emacs ¤Ë post ¤¹¤ë¤«¡¢°Ê²¼¤Î address +¤Ë mail ¤òÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡§ @itemize @bullet -@item Japanese or English +@item ÆüËܸì - + -@item English +@item ±Ñ¸ì - + @end itemize tm ML ¤Ç¤Ï tm ¤Î¥Ð¥°¾ðÊó¤Î¸ò´¹¤äºÇ¿·ÈǤÎÇÛÉÛ¡¢tm ¤Î²þÎɤ˴ؤ¹¤ëµÄÏÀ¤ò diff --git a/gnus/ChangeLog-7.23-7.24.en b/gnus/ChangeLog-7.23-7.24.en new file mode 100644 index 0000000..825e1c5 --- /dev/null +++ b/gnus/ChangeLog-7.23-7.24.en @@ -0,0 +1,8 @@ +Sat Dec 15 15:03:15 1995 Morioka Tomohiko + + * tm/gnus: Version 7.24 was released. + +Fri Dec 15 13:47:36 1995 Morioka Tomohiko + + * tm-sgnus.el (tm-gnus/summary-toggle-header): + new implementation diff --git a/gnus/Makefile b/gnus/Makefile index 03e90ba..68a7466 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -27,7 +27,7 @@ TMDIR19_29 = $(DATADIR19_29)/$(EMACS_PREFIX)/site-lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.22.tar +TARFILE = tm-gnus7.24.tar gnus: diff --git a/gnus/g3-path b/gnus/g3-path index 3c3e3b5..8ba54fe 100644 --- a/gnus/g3-path +++ b/gnus/g3-path @@ -7,4 +7,4 @@ (require 'tl-misc) ;; please edit -(add-path "gnus-3.14.4") +(add-path "gnus-3.14.4" 'all-paths) diff --git a/gnus/g4-path b/gnus/g4-path index ba798f5..165165c 100644 --- a/gnus/g4-path +++ b/gnus/g4-path @@ -11,4 +11,4 @@ ;;; ;; please edit -(add-path "gnus-4.1/lisp") +(add-path "gnus-4.1/lisp" 'all-paths) diff --git a/gnus/g5-path b/gnus/g5-path index 185b173..0e91ced 100644 --- a/gnus/g5-path +++ b/gnus/g5-path @@ -7,4 +7,4 @@ ;;; ;; please edit -(add-path "gnus-5.0.13/lisp") +(add-path "gnus-5.0.13/lisp" 'all-paths) diff --git a/gnus/s-path b/gnus/s-path index 3394631..711cba2 100644 --- a/gnus/s-path +++ b/gnus/s-path @@ -7,4 +7,4 @@ ;;; ;; please edit -(add-path "sgnus-0.22/lisp") +(add-path "sgnus-0.22/lisp" 'all-paths) diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 1879180..555f41e 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -1,5 +1,5 @@ ;;; -;;; tm-sgnus.el --- tm-gnus module for September GNUS +;;; tm-sgnus.el --- tm-gnus module for September Gnus ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. ;;; Copyright (C) 1995 MORIOKA Tomohiko @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.22 $ +;;; Version: $Revision: 7.24 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -25,6 +25,8 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with This program. If not, write to the Free Software ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'tl-str) (require 'tl-list) @@ -38,7 +40,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.22 1995/12/11 12:50:58 morioka Exp $") + "$Id: tm-sgnus.el,v 7.24 1995/12/15 13:47:36 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -85,11 +87,27 @@ This variable is set to `gnus-show-mime'.") (let ((mime-viewer/ignored-field-regexp (if (save-excursion (set-buffer gnus-article-buffer) - (some-element - (lambda (field) - (rfc822/get-field-body field) - ) - mime-viewer/ignored-field-list)) + (save-restriction + (narrow-to-region + (point-min) + (if (re-search-forward "^$" nil t) + (match-beginning 0) + (point-max) + )) + (some-element + (lambda (field) + (goto-char (point-min)) + (and (re-search-forward + (concat "^" field ":") nil t) + (setq field + (buffer-substring-no-properties + (match-beginning 0) (match-end 0))) + (not + (string-match + mime-viewer/visible-field-regexp field)) + ) + ) + mime-viewer/ignored-field-list))) mime-viewer/ignored-field-regexp "^:$"))) (gnus-summary-select-article t t) diff --git a/tm-def.el b/tm-def.el index 2aba73c..62d69a3 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 7.5 1995/12/09 04:11:11 morioka Exp $ +;;; $Id: tm-def.el,v 7.6 1995/12/15 12:55:53 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, definition ;;; ;;; This file is part of tm (Tools for MIME). @@ -207,6 +207,22 @@ ROT47 will be performed for Japanese text in any case." ;;; @ field ;;; +(defun tm:set-fields (sym field-list &optional regexp-sym) + (or regexp-sym + (setq regexp-sym + (let ((name (symbol-name sym))) + (intern + (concat (if (string-match "\\(.*\\)-list" name) + (substring name 0 (match-end 1)) + name) + "-regexp") + ))) + ) + (set sym field-list) + (set regexp-sym + (concat "^" (apply (function regexp-or) field-list) ":")) + ) + (defun tm:add-fields (sym field-list &optional regexp-sym) (or regexp-sym (setq regexp-sym diff --git a/tm-edit.el b/tm-edit.el index 139b7b2..5d2efdc 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -7,7 +7,7 @@ ;; Author: UMEDA Masanobu ;; MORIOKA Tomohiko -;; Version: $Revision: 7.34 $ +;; Version: $Revision: 7.35 $ ;; Keywords: mail, news, MIME, multimedia, multilingual ;; This file is not part of GNU Emacs. @@ -108,7 +108,7 @@ ;; LCD Archive Entry: ;; mime|Masanobu UMEDA|umerin@mse.kyutech.ac.jp| ;; Simple MIME Composer| -;; $Date: 1995/12/14 15:49:00 $|$Revision: 7.34 $|~/misc/mime.el.Z| +;; $Date: 1995/12/15 15:02:14 $|$Revision: 7.35 $|~/misc/mime.el.Z| ;;; Code: @@ -126,7 +126,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.34 1995/12/14 15:49:00 morioka Exp $") + "$Id: tm-edit.el,v 7.35 1995/12/15 15:02:14 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -623,6 +623,9 @@ Following commands are available in addition to major mode commands: \\[mime-editor/enclose-parallel-region] enclose as multipart/parallel. \\[mime-editor/enclose-mixed-region] enclose as multipart/mixed. \\[mime-editor/enclose-digest-region] enclose as multipart/digest. +\\[mime-editor/enclose-signed-region] enclose as PGP signed. +\\[mime-editor/enclose-encrypted-region] enclose as PGP encrypted. +\\[mime-editor/insert-key] insert PGP public key. \\[mime-editor/preview-message] preview editing MIME message. \\[mime-editor/exit] exit and translate into a MIME compliant message. \\[mime-editor/maybe-translate] exit, translate and run the original command. diff --git a/tm-file.el b/tm-file.el index 557a208..07a2280 100644 --- a/tm-file.el +++ b/tm-file.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-file.el,v 7.0 1995/12/12 00:55:25 morioka Exp $ +;;; $Id: tm-file.el,v 7.1 1995/12/15 11:58:29 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -33,7 +33,6 @@ (let* ((name (or (cdr (assoc "name" cal)) (cdr (assoc "x-name" cal)))) (encoding (cdr (assq 'encoding cal))) - (file-coding-system *noconv*) (filename (if name (expand-file-name name diff --git a/tm-mail.el b/tm-mail.el index f7b1c1d..699d984 100644 --- a/tm-mail.el +++ b/tm-mail.el @@ -7,7 +7,7 @@ ;;; modified by MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/11/27 -;;; Version: $Id: tm-mail.el,v 1.2 1995/12/07 10:22:31 morioka Exp $ +;;; Version: $Id: tm-mail.el,v 2.0 1995/12/15 13:53:55 morioka Exp $ ;;; Keywords: mail, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -60,11 +60,14 @@ )) )) -(if (string-match "XEmacs\\|Lucid" emacs-version) +(defvar tm-mail/use-xemacs-popup-menu t) + +(if (and (string-match "XEmacs\\|Lucid" emacs-version) + tm-mail/use-xemacs-popup-menu) (setq mail-mode-menu (append mail-mode-menu - '("---") - mime-editor/popup-menu-for-xemacs)) + (list "---" + mime-editor/popup-menu-for-xemacs))) ) diff --git a/tm-pgp.el b/tm-pgp.el index b452eb8..107e848 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/7 ;;; Version: -;;; $Id: tm-pgp.el,v 5.0 1995/12/14 15:41:18 morioka Exp $ +;;; $Id: tm-pgp.el,v 7.0 1995/12/15 15:40:10 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, PGP, security ;;; ;;; This file is part of tm (Tools for MIME). @@ -148,9 +148,14 @@ (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name))) (insert str) (base64-decode-region (point-min)(point-max)) - (let ((file-coding-system *noconv*) - jka-compr-compression-info-list - jam-zcat-filename-list) + (let ((mc-flag nil) ; for Mule + (file-coding-system + (if (featurep 'mule) *noconv*)) + kanji-flag ; for NEmacs + (emx-binary-mode t) ; for OS/2 + jka-compr-compression-info-list ; for jka-compr + jam-zcat-filename-list ; for jam-zcat + require-final-newline) (write-file sig-file) ) ;;(define-program-coding-system (current-buffer) "pgp" *noconv*) @@ -182,6 +187,8 @@ ;;; ;;; It is based on draft-elkins-pem-pgp-01.txt +(autoload 'mc-snarf-keys "mc-toplev") + (defun mime-article/add-pgp-keys (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) (cur-buf (current-buffer)) diff --git a/tm-rmail.el b/tm-rmail.el index 87e6c68..1099108 100644 --- a/tm-rmail.el +++ b/tm-rmail.el @@ -6,7 +6,7 @@ ;;; modified by KOBAYASHI Shuhei ;;; Created: 1994/8/30 ;;; Version: -;;; $Revision: 7.19 $ +;;; $Revision: 7.20 $ ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -40,7 +40,7 @@ ;;; (defconst tm-rmail/RCS-ID - "$Id: tm-rmail.el,v 7.19 1995/12/07 04:55:49 morioka Exp $") + "$Id: tm-rmail.el,v 7.20 1995/12/15 13:56:51 morioka Exp $") (defconst tm-rmail/version (get-version-string tm-rmail/RCS-ID)) (defvar tm-rmail/decode-all nil) @@ -284,7 +284,7 @@ GNUS. The message will be appended if being composed." 'tm-edit (function (lambda () - (autoload 'tm-mail/insert-message "tm-mail") + (require 'tm-mail) (set-alist 'mime-editor/message-inserter-alist 'mail-mode (function tm-mail/insert-message)) ))) diff --git a/tm-view.el b/tm-view.el index 8270505..badb800 100644 --- a/tm-view.el +++ b/tm-view.el @@ -8,7 +8,7 @@ ;;; modified by Steven L. Baur ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.33 $ +;;; Version: $Revision: 7.34 $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -44,7 +44,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.33 1995/12/13 05:46:06 morioka Exp $") + "$Id: tm-view.el,v 7.34 1995/12/15 15:08:28 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -693,6 +693,20 @@ The compressed face will be piped to this command.") ;;; @ MIME viewer mode ;;; +(defconst mime-viewer/menu-title "MIME-View") +(defconst mime-viewer/menu-list + '((up "Move to upper content" mime-viewer/up-content) + (previous "Move to previous content" mime-viewer/previous-content) + (next "Move to next content" mime-viewer/next-content) + (scroll-down "Scroll to previous content" mime-viewer/scroll-down-content) + (scroll-up "Scroll to next content" mime-viewer/scroll-up-content) + (play "Play Content" mime-viewer/play-content) + (extract "Extract Content" mime-viewer/extract-content) + (print "Print" mime-viewer/print-content) + (x-face "Show X Face" mime-viewer/display-x-face) + ) + "Menu for MIME Viewer") + (defvar mime/viewer-mode-map nil) (if (null mime/viewer-mode-map) (progn @@ -734,57 +748,39 @@ The compressed face will be piped to this command.") (define-key mime/viewer-mode-map mouse-button-2 (function tm:button-dispatcher)) ) - (if mouse-button-3 - (define-key mime/viewer-mode-map - mouse-button-3 (function mime-viewer/popup-menu)) - ) + (cond ((string-match "XEmacs\\|Lucid" emacs-version) + (defvar mime-viewer/xemacs-popup-menu + (cons mime-viewer/menu-title + (mapcar (function + (lambda (item) + (vector (nth 1 item)(nth 2 item) t) + )) + mime-viewer/menu-list))) + (defun mime-viewer/xemacs-popup-menu (event) + "Popup the menu in the MIME Viewer buffer" + (interactive "e") + (select-window (event-window event)) + (set-buffer (event-buffer event)) + (popup-menu 'mime-viewer/xemacs-popup-menu)) + (define-key mime/viewer-mode-map + mouse-button-3 (function mime-viewer/xemacs-popup-menu)) + ) + ((>= emacs-major-version 19) + (define-key mime/viewer-mode-map [menu-bar mime-view] + (cons mime-viewer/menu-title + (make-sparse-keymap mime-viewer/menu-title))) + (mapcar (function + (lambda (item) + (define-key mime/viewer-mode-map + (vector 'menu-bar 'mime-view (car item)) + (cons (nth 1 item)(nth 2 item)) + ) + )) + (reverse mime-viewer/menu-list) + ) + )) )) -(defvar mime-viewer/popup-menu-title "MIME Viewer Commands") -(defvar mime-viewer/popup-menu-items - '(("Move to upper content" . mime-viewer/up-content) - ("Move to previous content" . mime-viewer/previous-content) - ("Move to next content" . mime-viewer/next-content) - ("Scroll to previous content" . mime-viewer/scroll-down-content) - ("Scroll to next content" . mime-viewer/scroll-up-content) - ("Play Content" . mime-viewer/play-content) - ("Extract Content" . mime-viewer/extract-content) - ("Print" . mime-viewer/print-content) - ("Show X Face" . mime-viewer/display-x-face) - ) - "Popup Menu for MIME Viewer") - -(cond ((string-match "XEmacs\\|Lucid" emacs-version) - (defvar mime-viewer/popup-menu - (cons mime-viewer/popup-menu-title - (mapcar (function - (lambda (item) - (vector (car item)(cdr item) t) - )) - mime-viewer/popup-menu-items))) - (defun mime-viewer/popup-menu (event) - "Popup the menu in the MIME Viewer buffer" - (interactive "e") - (select-window (event-window event)) - (set-buffer (event-buffer event)) - (popup-menu 'mime-viewer/popup-menu)) - ) - ((>= emacs-major-version 19) - (defun mime-viewer/popup-menu (event) - (interactive "e") - (mouse-set-point event) - (let ((menu - (cons mime-viewer/popup-menu-title - (list (cons "Menu Items" mime-viewer/popup-menu-items)) - ))) - (let ((func (x-popup-menu event menu))) - (if func - (funcall func) - )) - )) - )) - - (defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf) "Major mode for viewing MIME message. diff --git a/tm-vm.el b/tm-vm.el index 66a2f2e..1da346a 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -12,7 +12,7 @@ ;;; and ISHIHARA Akito ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/10/29 -;;; Version: $Revision: 7.35 $ +;;; Version: $Revision: 7.36 $ ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -39,7 +39,7 @@ (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.35 1995/12/14 16:38:50 morioka Exp $") + "$Id: tm-vm.el,v 7.36 1995/12/15 13:58:51 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -640,6 +640,8 @@ only marked messages will be put into the digest." (substitute-key-definition 'vm-send-digest 'tm-vm/send-digest vm-mode-map) +(defvar tm-vm/use-xemacs-popup-menu t) + ;;; modified by Steven L. Baur ;;; 1995/12/6 (c.f. [tm-en:209]) (defun mime-editor/attach-to-vm-mode-menu () @@ -647,9 +649,9 @@ only marked messages will be put into the digest." (if (boundp 'vm-menu-mail-menu) (progn (setq vm-menu-mail-menu - (nconc vm-menu-mail-menu - (list "----") - mime-editor/popup-menu-for-xemacs)) + (append vm-menu-mail-menu + (list "----" + mime-editor/popup-menu-for-xemacs))) (remove-hook 'vm-mail-mode-hook 'mime-editor/attach-to-vm-mode-menu) ))) @@ -660,7 +662,8 @@ only marked messages will be put into the digest." (autoload 'tm-mail/insert-message "tm-mail") (set-alist 'mime-editor/message-inserter-alist 'mail-mode (function tm-mail/insert-message)) - (if (string-match "XEmacs\\|Lucid" emacs-version) + (if (and (string-match "XEmacs\\|Lucid" emacs-version) + tm-vm/use-xemacs-popup-menu) (add-hook 'vm-mail-mode-hook 'mime-editor/attach-to-vm-mode-menu) ) ))) @@ -669,8 +672,6 @@ only marked messages will be put into the digest." 'mime-setup (function (lambda () - ;;(remove-hook 'mail-mode-hook 'mime/editor-mode) - ;;(add-hook 'vm-mail-mode-hook 'mime/editor-mode) (setq vm-forwarding-digest-type "rfc1521") (setq vm-digest-send-type "rfc1521") ))) -- 1.7.10.4