(message-get-original-reply-buffer): Abolished.
(message-get-parameter): New inline function.
(message-get-parameter-with-eval): New macro.
(message-fetch-reply-field): Do not use `message-get-reply-buffer'.
(message-yank-original): Ditto.
(message-setup): Use `message-get-parameter'.
(message-mime-insert-article): Use `message-get-parameter-with-eval' instead
of`message-get-original-reply-buffer'.
;;;
;;; Utility functions.
;;;
;;;
;;; Utility functions.
;;;
+(defun message-eval-parameter (parameter)
+ (condition-case ()
+ (if (symbolp parameter)
+ (if (functionp parameter)
+ (funcall parameter)
+ (eval parameter))
+ parameter)
+ (error nil)))
+
+(defsubst message-get-parameter (key &optional alist)
+ (unless alist
+ (setq alist message-parameter-alist))
+ (cdr (assq key alist)))
+
+(defmacro message-get-parameter-with-eval (key &optional alist)
+ `(message-eval-parameter (message-get-parameter ,alist ,key)))
(defmacro message-y-or-n-p (question show &rest text)
"Ask QUESTION, displaying the rest of the arguments in a temp. buffer if SHOW"
(defmacro message-y-or-n-p (question show &rest text)
"Ask QUESTION, displaying the rest of the arguments in a temp. buffer if SHOW"
(defun message-fetch-reply-field (header)
"Fetch FIELD from the message we're replying to."
(defun message-fetch-reply-field (header)
"Fetch FIELD from the message we're replying to."
- (let ((buffer (message-get-reply-buffer)))
+ (let ((buffer (message-eval-parameter message-reply-buffer)))
(when (and buffer
(buffer-name buffer))
(save-excursion
(when (and buffer
(buffer-name buffer))
(save-excursion
(- max rank)
(1+ max)))))
(message-sort-headers-1))))
(- max rank)
(1+ max)))))
(message-sort-headers-1))))
-
-(defun message-eval-parameter (parameter)
- (condition-case ()
- (if (symbolp parameter)
- (if (functionp parameter)
- (funcall parameter)
- (eval parameter))
- parameter)
- (error nil)))
-
-(defun message-get-reply-buffer ()
- (message-eval-parameter message-reply-buffer))
-
-(defun message-get-original-reply-buffer ()
- (message-eval-parameter
- (cdr (assq 'original-buffer message-parameter-alist))))
prefix, and don't delete any headers."
(interactive "P")
(let ((modified (buffer-modified-p))
prefix, and don't delete any headers."
(interactive "P")
(let ((modified (buffer-modified-p))
- (buffer (message-get-reply-buffer)))
+ (buffer (message-eval-parameter message-reply-buffer)))
(when (and buffer
message-cite-function)
(delete-windows-on buffer t)
(when (and buffer
message-cite-function)
(delete-windows-on buffer t)
(when actions
(setq message-send-actions actions))
(setq message-reply-buffer
(when actions
(setq message-send-actions actions))
(setq message-reply-buffer
- (or (cdr (assq 'reply-buffer message-parameter-alist))
+ (or (message-get-parameter 'reply-buffer)
replybuffer))
(goto-char (point-min))
;; Insert all the headers.
replybuffer))
(goto-char (point-min))
;; Insert all the headers.
(defun message-mime-insert-article (&optional message)
(interactive)
(let ((message-cite-function 'mime-edit-inserted-message-filter)
(defun message-mime-insert-article (&optional message)
(interactive)
(let ((message-cite-function 'mime-edit-inserted-message-filter)
- (message-reply-buffer (message-get-original-reply-buffer))
+ (message-reply-buffer
+ (message-get-parameter-with-eval 'original-buffer))
(start (point)))
(message-yank-original nil)
(save-excursion
(start (point)))
(message-yank-original nil)
(save-excursion