diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
| commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
| tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/gnus/gnus-dired.el | |
| parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
| parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
| download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/gnus/gnus-dired.el')
| -rw-r--r-- | lisp/gnus/gnus-dired.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el index 6f231c4fbb8..ca2d57de7dc 100644 --- a/lisp/gnus/gnus-dired.el +++ b/lisp/gnus/gnus-dired.el @@ -1,4 +1,4 @@ -;;; gnus-dired.el --- utility functions where gnus and dired meet +;;; gnus-dired.el --- utility functions where gnus and dired meet -*- lexical-binding: t; -*- ;; Copyright (C) 1996-1999, 2001-2021 Free Software Foundation, Inc. @@ -29,7 +29,7 @@ ;; following in your ~/.gnus: ;; (require 'gnus-dired) ;, isn't needed due to autoload cookies -;; (add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode) +;; (add-hook 'dired-mode-hook #'turn-on-gnus-dired-mode) ;; Note that if you visit dired buffers before your ~/.gnus file has ;; been read, those dired buffers won't have the keybindings in @@ -40,7 +40,6 @@ (require 'dired) (autoload 'mml-attach-file "mml") -(autoload 'mm-default-file-encoding "mm-decode");; Shift this to `mailcap.el'? (autoload 'mailcap-extension-to-mime "mailcap") (autoload 'mailcap-mime-info "mailcap") @@ -166,8 +165,9 @@ filenames." (goto-char (point-max)) ;attach at end of buffer (while files-to-attach (mml-attach-file (car files-to-attach) - (or (mm-default-file-encoding (car files-to-attach)) - "application/octet-stream") nil) + (or (mm-default-file-type (car files-to-attach)) + "application/octet-stream") + nil) (setq files-to-attach (cdr files-to-attach))) (message "Attached file(s) %s" files-str)))) |