Synch to No Gnus 200504181439.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91664b3..b67c8e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mml.el (mml-mode, mml-dnd-attach-file): Use dnd-* instead of
+       x-dnd-*.
+
 2005-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * qp.el (quoted-printable-encode-region): Save excursion.

diff --git a/lisp/mml.el b/lisp/mml.el
index 2558fe5..7774052 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -914,11 +914,11 @@ See Info node `(emacs-mime)Composing'.
               (> (prefix-numeric-value arg) 0)))
     (add-minor-mode 'mml-mode " MML" mml-mode-map)
     (easy-menu-add mml-menu mml-mode-map)
-    (when (boundp 'x-dnd-protocol-alist)
-      (set (make-local-variable 'x-dnd-protocol-alist)
-          '(("^file:///" . mml-x-dnd-attach-file)
-            ("^file://"  . x-dnd-open-file)
-            ("^file:"    . mml-x-dnd-attach-file))))
+    (when (boundp 'dnd-protocol-alist)
+      (set (make-local-variable 'dnd-protocol-alist)
+          '(("^file:///" . mml-dnd-attach-file)
+            ("^file://"  . dnd-open-file)
+            ("^file:"    . mml-dnd-attach-file))))
     (run-hooks 'mml-mode-hook)))
 
 ;;;
@@ -1034,9 +1034,9 @@ description of the attachment."
                        'disposition (or disposition "attachment")
                        'description description))
 
-(defun mml-x-dnd-attach-file (uri action)
+(defun mml-dnd-attach-file (uri action)
   "Attach a drag and drop file."
-  (let ((file (x-dnd-get-local-file-name uri t)))
+  (let ((file (dnd-get-local-file-name uri t)))
     (when (and file (file-regular-p file))
       (let* ((type (mml-minibuffer-read-type file))
            (description (mml-minibuffer-read-description))