projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(shr-insert-table): Bind free variable.
[gnus]
/
lisp
/
mml.el
diff --git
a/lisp/mml.el
b/lisp/mml.el
index
2ebd799
..
3cf0f37
100644
(file)
--- a/
lisp/mml.el
+++ b/
lisp/mml.el
@@
-40,6
+40,7
@@
(autoload 'message-make-message-id "message")
(declare-function gnus-setup-posting-charset "gnus-msg" (group))
(autoload 'gnus-make-local-hook "gnus-util")
(autoload 'message-make-message-id "message")
(declare-function gnus-setup-posting-charset "gnus-msg" (group))
(autoload 'gnus-make-local-hook "gnus-util")
+(autoload 'gnus-completing-read "gnus-util")
(autoload 'message-fetch-field "message")
(autoload 'message-mark-active-p "message")
(autoload 'message-info "message")
(autoload 'message-fetch-field "message")
(autoload 'message-mark-active-p "message")
(autoload 'message-info "message")
@@
-120,10
+121,10
@@
match found will be used."
,dispositions))))
:group 'message)
,dispositions))))
:group 'message)
-(defcustom mml-insert-mime-headers-always
nil
+(defcustom mml-insert-mime-headers-always
t
"If non-nil, always put Content-Type: text/plain at top of empty parts.
It is necessary to work against a bug in certain clients."
"If non-nil, always put Content-Type: text/plain at top of empty parts.
It is necessary to work against a bug in certain clients."
- :version "2
2
.1"
+ :version "2
4
.1"
:type 'boolean
:group 'message)
:type 'boolean
:group 'message)
@@
-1188,9
+1189,10
@@
If not set, `default-directory' will be used."
;; looks like, and offer text/plain if it looks
;; like text/plain.
"application/octet-stream"))
;; looks like, and offer text/plain if it looks
;; like text/plain.
"application/octet-stream"))
- (string (completing-read
- (format "Content type (default %s): " default)
- (mapcar 'list (mailcap-mime-types)))))
+ (string (gnus-completing-read
+ "Content type"
+ (mailcap-mime-types)
+ nil nil nil default)))
(if (not (equal string ""))
string
default)))
(if (not (equal string ""))
string
default)))
@@
-1204,10
+1206,10
@@
If not set, `default-directory' will be used."
(defun mml-minibuffer-read-disposition (type &optional default filename)
(unless default
(setq default (mml-content-disposition type filename)))
(defun mml-minibuffer-read-disposition (type &optional default filename)
(unless default
(setq default (mml-content-disposition type filename)))
- (let ((disposition (completing-read
- (format "Disposition (default %s): " default)
- '(
("attachment") ("inline") ("")
)
-
nil
t nil nil default)))
+ (let ((disposition (
gnus-
completing-read
+ "Disposition"
+ '(
"attachment" "inline"
)
+ t nil nil default)))
(if (not (equal disposition ""))
disposition
default)))
(if (not (equal disposition ""))
disposition
default)))
@@
-1395,11
+1397,11
@@
TYPE is the MIME type to use."
(defun mml-insert-multipart (&optional type)
(interactive (if (message-in-body-p)
(defun mml-insert-multipart (&optional type)
(interactive (if (message-in-body-p)
- (list (
completing-read "Multipart type (default mixed):
"
- '(("mixed") ("alternative")
- ("digest") ("parallel")
-
("signed") ("encrypted")
)
-
nil
nil "mixed"))
+ (list (
gnus-completing-read "Multipart type
"
+ '("mixed" "alternative"
+ "digest" "parallel"
+
"signed" "encrypted"
)
+
nil "mixed"))
(error "Use this command in the message body")))
(or type
(setq type "mixed"))
(error "Use this command in the message body")))
(or type
(setq type "mixed"))
@@
-1570,5
+1572,4
@@
or the `pop-to-buffer' function."
(provide 'mml)
(provide 'mml)
-;; arch-tag: 583c96cf-1ffe-451b-a5e5-4733ae9ddd12
;;; mml.el ends here
;;; mml.el ends here