comparison lisp/tm/tmh-comp.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 7e54bd776075
children c0c698873ce1
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
1 ;;; tm-mh-e.el --- tm-mh-e functions for composing messages 1 ;;; tm-mh-e.el --- tm-mh-e functions for composing messages
2 2
3 ;; Copyright (C) 1993,1994,1995,1996,1997 Free Software Foundation, Inc. 3 ;; Copyright (C) 1993,1994,1995,1996 Free Software Foundation, Inc.
4 4
5 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp> 5 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
6 ;; OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp> 6 ;; OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
7 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp> 7 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
8 ;; Created: 1996/2/29 (separated from tm-mh-e.el) 8 ;; Created: 1996/2/29 (separated from tm-mh-e.el)
9 ;; Version: $Id: tmh-comp.el,v 1.5 1997/03/22 05:29:25 steve Exp $ 9 ;; Version: $Id: tmh-comp.el,v 1.1.1.1 1996/12/18 22:43:38 steve Exp $
10 ;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual 10 ;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual
11 11
12 ;; This file is part of tm (Tools for MIME). 12 ;; This file is part of tm (Tools for MIME).
13 13
14 ;; This program is free software; you can redistribute it and/or 14 ;; This program is free software; you can redistribute it and/or
223 (cond ((and mh-draft-folder (equal from-folder mh-draft-folder)) 223 (cond ((and mh-draft-folder (equal from-folder mh-draft-folder))
224 (let ((name (format "draft-%d" msg))) 224 (let ((name (format "draft-%d" msg)))
225 (if (get-buffer name) 225 (if (get-buffer name)
226 (throw 'tag (pop-to-buffer name)) 226 (throw 'tag (pop-to-buffer name))
227 ) 227 )
228 (let ((filename (mh-msg-filename msg mh-draft-folder))) 228 (let ((file-coding-system-for-read *noconv*)
229 (filename
230 (mh-msg-filename msg mh-draft-folder)
231 ))
229 (set-buffer (get-buffer-create name)) 232 (set-buffer (get-buffer-create name))
230 (as-binary-input-file (insert-file-contents filename)) 233 (insert-file-contents filename)
231 (setq buffer-file-name filename) 234 (setq buffer-file-name filename)
232 (setq code-conversion t) 235 (setq code-conversion t)
233 ) 236 )
234 (pop-to-buffer name) 237 (pop-to-buffer name)
235 (if (re-search-forward "^-+$" nil t) 238 (if (re-search-forward "^-+$" nil t)
236 (replace-match "") 239 (replace-match "")
237 ) 240 )
238 name)) 241 name))
239 (t 242 (t
240 (prog1 243 (prog1
241 (as-binary-input-file 244 (let ((file-coding-system-for-read *noconv*))
242 (mh-read-draft "clean-up" (mh-msg-filename msg) nil) 245 (mh-read-draft "clean-up" (mh-msg-filename msg) nil)
243 ) 246 )
244 (setq code-conversion t) 247 (setq code-conversion t)
245 )))) 248 ))))
246 ) 249 )
247 (goto-char (point-min)) 250 (goto-char (point-min))
248 (mh-clean-msg-header (point-min) mh-new-draft-cleaned-headers nil) 251 (mh-clean-msg-header (point-min) mh-new-draft-cleaned-headers nil)
459 (set-buffer mh-sent-from-folder) 462 (set-buffer mh-sent-from-folder)
460 (if mh-delete-yanked-msg-window 463 (if mh-delete-yanked-msg-window
461 (delete-windows-on mh-show-buffer)) 464 (delete-windows-on mh-show-buffer))
462 (set-buffer mh-show-buffer) ; Find displayed message 465 (set-buffer mh-show-buffer) ; Find displayed message
463 (let ((mh-ins-str 466 (let ((mh-ins-str
464 (if mime::preview/article-buffer 467 (let (mime-viewer/plain-text-preview-hook buf)
465 (let (mime-viewer/plain-text-preview-hook buf) 468 (prog1
466 (prog1 469 (save-window-excursion
467 (save-window-excursion 470 (set-buffer mime::preview/article-buffer)
468 (set-buffer mime::preview/article-buffer) 471 (setq buf (mime/viewer-mode))
469 (setq buf (mime/viewer-mode)) 472 (buffer-string)
470 (buffer-string) 473 )
471 ) 474 (kill-buffer buf)))))
472 (kill-buffer buf)
473 ))
474 (buffer-string)
475 )))
476 (set-buffer to-buffer) 475 (set-buffer to-buffer)
477 (save-restriction 476 (save-restriction
478 (narrow-to-region to-point to-point) 477 (narrow-to-region to-point to-point)
479 (push-mark) 478 (push-mark)
480 (insert mh-ins-str) 479 (insert mh-ins-str)
513 'mh-yank-cur-msg 'tm-mh-e/yank-current-message mh-letter-mode-map) 512 'mh-yank-cur-msg 'tm-mh-e/yank-current-message mh-letter-mode-map)
514 (substitute-key-definition 513 (substitute-key-definition
515 'mh-insert-letter 'tm-mh-e/insert-letter mh-letter-mode-map) 514 'mh-insert-letter 'tm-mh-e/insert-letter mh-letter-mode-map)
516 515
517 516
518 ;;; @ for mu-cite
519 ;;;
520
521 (call-after-loaded
522 'mu-cite
523 (function
524 (lambda ()
525 (set-alist 'mu-cite/get-field-value-method-alist
526 'mh-letter-mode
527 (function
528 (lambda (name)
529 (if (and (stringp mh-sent-from-folder)
530 (numberp mh-sent-from-msg))
531 (save-excursion
532 (set-buffer mh-sent-from-folder)
533 (set-buffer mh-show-buffer)
534 (and (boundp 'mime::preview/article-buffer)
535 (bufferp mime::preview/article-buffer)
536 (set-buffer mime::preview/article-buffer))
537 (std11-field-body name)
538 ))
539 )))
540 )))
541
542
543 ;;; @ end 517 ;;; @ end
544 ;;; 518 ;;;
545 519
546 (provide 'tmh-comp) 520 (provide 'tmh-comp)
547 (require 'tm-mh-e) 521 (require 'tm-mh-e)