This commit was generated by cvs2svn to compensate for changes in r437,

[elisp/tm.git] / gnus / gnus-mime.el

diff --git a/gnus/gnus-mime.el b/gnus/gnus-mime.el
index 66fbf61..7829b51 100644 (file)
--- a/gnus/gnus-mime.el
+++ b/gnus/gnus-mime.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1996/8/6
-;; Version: $Revision: 0.4 $
+;; Version: $Revision: 0.6 $
 ;; Keywords: news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is not part of GNU Emacs yet.
@@ -20,38 +20,20 @@
 ;; General Public License for more details.
 
 ;; 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.
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
-(defun call-after-loaded (module func &optional hook-name)
-  "If MODULE is provided, then FUNC is called.
-Otherwise func is set to MODULE-load-hook.
-If optional argument HOOK-NAME is specified,
-it is used as hook to set. [gnus-mime.el]"
-  (if (featurep module)
-      (funcall func)
-    (progn
-      (if (null hook-name)
-         (setq hook-name
-               (intern (concat (symbol-name module) "-load-hook")))
-       )
-      (add-hook hook-name func)
-      )))
-
-(defun get-version-string (id)
-  "Return a version-string from RCS ID. [gnus-mime.el]"
-  (and (string-match ",v \\([0-9][0-9.][0-9.]+\\)" id)
-       (substring id (match-beginning 1)(match-end 1))
-       ))
+(require 'tl-misc)
 
 
 ;;; @ version
 ;;;
 
 (defconst gnus-mime-RCS-ID
-  "$Id: gnus-mime.el,v 0.4 1996/08/12 08:57:33 morioka Exp $")
+  "$Id: gnus-mime.el,v 0.6 1996/08/22 17:55:17 morioka Exp $")
 
 (defconst gnus-mime-version
   (get-version-string gnus-mime-RCS-ID))
@@ -150,32 +132,6 @@ The function is called from the article buffer.")
     )))
 
 
-;;; @ for tm-edit
-;;;
-
-;;; modified by Steven L. Baur <steve@miranova.com>
-;;;    1995/12/6 (c.f. [tm-en:209])
-(defun mime-editor/attach-to-news-reply-menu ()
-  "Arrange to attach MIME editor's popup menu to VM's"
-  (if (boundp 'news-reply-menu)
-      (progn
-       (setq news-reply-menu (append news-reply-menu
-                                     '("---")
-                                     mime-editor/popup-menu-for-xemacs))
-       (remove-hook 'news-setup-hook
-                    'mime-editor/attach-to-news-reply-menu)
-       )))
-
-(call-after-loaded
- 'tm-edit
- (function
-  (lambda ()
-    (if (string-match "XEmacs\\|Lucid" emacs-version)
-       (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu)
-      )
-    )))
-
-
 ;;; @ end
 ;;;
 
@@ -205,6 +161,30 @@ The function is called from the article buffer.")
            
            (setq gnus-strict-mime nil)
            ))
+      
+      (if running-xemacs
+         (progn
+           ;; modified by Steven L. Baur <steve@miranova.com>
+           ;;  1995/12/6 (c.f. [tm-en:209])
+           (defun mime-editor/attach-to-news-reply-menu ()
+             "Arrange to attach MIME editor's popup menu to VM's"
+             (if (boundp 'news-reply-menu)
+                 (progn
+                   (setq news-reply-menu
+                         (append news-reply-menu
+                                 '("---")
+                                 mime-editor/popup-menu-for-xemacs))
+                   (remove-hook 'news-setup-hook
+                                'mime-editor/attach-to-news-reply-menu)
+                   )))
+           (call-after-loaded
+            'tm-edit
+            (function
+             (lambda ()
+               (add-hook 'news-setup-hook
+                         'mime-editor/attach-to-news-reply-menu)
+               )))
+           ))
       ))
 
 (run-hooks 'gnus-mime-load-hook)