Merge emh-1_10_1_1.

[elisp/emh.git] / emh-comp.el

diff --git a/emh-comp.el b/emh-comp.el
index a326f1f..4c16c36 100644 (file)
--- a/emh-comp.el
+++ b/emh-comp.el
@@ -30,6 +30,14 @@
 (require 'mh-comp)
 (require 'mime-edit)
 
+;; Avoid byte compile warnings.
+;; (defvar gnus-article-buffer)
+;; (defvar gnus-article-copy)
+;; (defvar gnus-original-article-buffer)
+;; (eval-when-compile
+;;   (fset 'gnus-copy-article-buffer 'ignore)
+;;   )
+
 
 ;;; @ variable
 ;;;
@@ -40,7 +48,7 @@ Default is \"forwcomps\".  If not a complete path name, the file
 is searched for first in the user's MH directory, then in the
 system MH lib directory.")
 
-(defvar emh-message-yank-function 'mh-yank-cur-msg)
+;; (defvar emh-message-yank-function 'mh-yank-cur-msg)
 
 
 ;;; @ for tm-edit
@@ -480,37 +488,37 @@ yanked message will be deleted."
            (insert "\n"))))
     (error "There is no current message")))
 
-(defun emh-yank-current-message ()
-  "Insert the current message into the draft buffer.
-It uses variable `emh-message-yank-function'
-to select message yanking function."
-  (interactive)
-  (let ((mh-sent-from-folder mh-sent-from-folder)
-       (mh-sent-from-msg mh-sent-from-msg))
-    (if (and (not (stringp mh-sent-from-folder))
-            (boundp 'gnus-article-buffer)
-            (get-buffer gnus-article-buffer)
-            (bufferp mh-sent-from-folder)
-            ) ; might be called from GNUS
-       (if (boundp 'gnus-article-copy) ; might be sgnus
-           (save-excursion
-             (gnus-copy-article-buffer)
-             (setq mh-sent-from-folder gnus-article-copy)
-             (set-buffer mh-sent-from-folder)
-             (setq mh-show-buffer gnus-article-copy)
-             )
-         (save-excursion
-           (setq mh-sent-from-folder gnus-article-buffer)
-           (set-buffer gnus-article-buffer)
-           (setq mh-show-buffer (current-buffer))
-           )))
-    (funcall emh-message-yank-function)
-    ))
-
-(substitute-key-definition
- 'mh-yank-cur-msg 'emh-yank-current-message mh-letter-mode-map)
-(substitute-key-definition
- 'mh-insert-letter 'emh-insert-letter mh-letter-mode-map)
+;; (defun emh-yank-current-message ()
+;;   "Insert the current message into the draft buffer.
+;; It uses variable `emh-message-yank-function'
+;; to select message yanking function."
+;;   (interactive)
+;;   (let ((mh-sent-from-folder mh-sent-from-folder)
+;;         (mh-sent-from-msg mh-sent-from-msg))
+;;     (if (and (not (stringp mh-sent-from-folder))
+;;              (boundp 'gnus-article-buffer)
+;;              (get-buffer gnus-article-buffer)
+;;              (bufferp mh-sent-from-folder)
+;;              ) ; might be called from GNUS
+;;         (if (boundp 'gnus-article-copy) ; might be sgnus
+;;             (save-excursion
+;;               (gnus-copy-article-buffer)
+;;               (setq mh-sent-from-folder gnus-article-copy)
+;;               (set-buffer mh-sent-from-folder)
+;;               (setq mh-show-buffer gnus-article-copy)
+;;               )
+;;           (save-excursion
+;;             (setq mh-sent-from-folder gnus-article-buffer)
+;;             (set-buffer gnus-article-buffer)
+;;             (setq mh-show-buffer (current-buffer))
+;;             )))
+;;     (funcall emh-message-yank-function)
+;;     ))
+
+;; (substitute-key-definition
+;;  'mh-yank-cur-msg 'emh-yank-current-message mh-letter-mode-map)
+;; (substitute-key-definition
+;;  'mh-insert-letter 'emh-insert-letter mh-letter-mode-map)
 
 
 ;;; @ end