From 111d472f5ea44db162b313dc4d42840fd629eab4 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 18 Apr 2005 22:15:06 +0000 Subject: [PATCH] Synch to No Gnus 200504181439. --- lisp/ChangeLog | 5 +++++ lisp/mml.el | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 91664b3..b67c8e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-04-18 Reiner Steib + + * mml.el (mml-mode, mml-dnd-attach-file): Use dnd-* instead of + x-dnd-*. + 2005-04-18 Katsumi Yamaoka * qp.el (quoted-printable-encode-region): Save excursion. diff --git a/lisp/mml.el b/lisp/mml.el index 2558fe5..7774052 100644 --- 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)) -- 1.7.10.4