* smiley-ems.el (smiley-update-cache): Auto detect file type.
* message.el (message-forward-rmail-make-body):
save-window-excursion.
(message-encode-message-body): no error.
(message-setup-1): compose-mail send-actions are different from
message-send-actions.
+2001-11-01 07:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * smiley-ems.el (smiley-update-cache): Auto detect file type.
+
+ * message.el (message-forward-rmail-make-body):
+ save-window-excursion.
+ (message-encode-message-body): no error.
+ (message-setup-1): compose-mail send-actions are different from
+ message-send-actions.
+
2001-11-01 Simon Josefsson <jas@extundo.com>
* sieve.el: Don't require easy-mmode. Suggested by Katsumi Yamaoka
find-image font-create-object gnus-mule-get-coding-system
font-lock-set-defaults
image-size image-type-available-p insert-image
+ image-type-from-file-header
make-temp-file message-xmas-redefine
mail-aliases-setup mm-copy-tree
mule-write-region-no-coding-system put-image
;;; (push '(message-mode (encrypt . mc-encrypt-message)
;;; (sign . mc-sign-message))
;;; mc-modes-alist))
- (when actions
- (setq message-send-actions actions))
+ (dolist (action actions)
+ (condition-case nil
+ (add-to-list 'message-send-actions
+ `(apply ',(car action) ',(cdr action)))))
(setq message-reply-buffer replybuffer)
(goto-char (point-min))
;; Insert all the headers.
;;;###autoload
(defun message-forward-rmail-make-body (forward-buffer)
- (with-current-buffer forward-buffer
+ (save-window-excursion
+ (set-buffer forward-buffer)
(let (rmail-enable-mime)
(rmail-toggle-header 0)))
(message-forward-make-body forward-buffer))
;; /usr/bin/mail.
(unless content-type-p
(goto-char (point-min))
- (re-search-forward "^MIME-Version:")
- (forward-line 1)
- (insert "Content-Type: text/plain; charset=us-ascii\n")))))
+ ;; For unknown reason, MIME-Version doesn't exist.
+ (when (re-search-forward "^MIME-Version:" nil t)
+ (forward-line 1)
+ (insert "Content-Type: text/plain; charset=us-ascii\n"))))))
(defun message-read-from-minibuffer (prompt)
"Read from the minibuffer while providing abbrev expansion."
("\\(:-{\\)\\W" 1 "frown.pbm"))
"*A list of regexps to map smilies to images.
The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
-rgexp to replace with IMAGE. IMAGE is the name of a PBM file in
+regexp to replace with IMAGE. IMAGE is the name of a PBM file in
`smiley-data-directory'."
:type '(repeat (list regexp
(integer :tag "Regexp match number")
(symbol-value smiley-regexp-alist)
smiley-regexp-alist))
(let* ((data-directory smiley-data-directory)
- (image (find-image (list (list :type 'pbm
+ (image (find-image (list (list :type
+ (image-type-from-file-header
+ (nth 2 elt))
:file (nth 2 elt)
:ascent 'center)))))
(if image