projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Oort Gnus): Trivial fixes.
[gnus]
/
lisp
/
message.el
diff --git
a/lisp/message.el
b/lisp/message.el
index
ae2f079
..
b5bfab2
100644
(file)
--- a/
lisp/message.el
+++ b/
lisp/message.el
@@
-303,6
+303,8
@@
few false positives here."
:group 'message-various
:type 'regexp)
:group 'message-various
:type 'regexp)
+;; Fixme: Why are all these things autoloaded?
+
;;; marking inserted text
;;;###autoload
;;; marking inserted text
;;;###autoload
@@
-1305,8
+1307,7
@@
no, only reply back to the author."
(defcustom message-use-idna (and (condition-case nil (require 'idna)
(file-error))
(defcustom message-use-idna (and (condition-case nil (require 'idna)
(file-error))
- (fboundp 'coding-system-p)
- (coding-system-p 'utf-8)
+ (mm-coding-system-p 'utf-8)
'ask)
"Whether to encode non-ASCII in domain names into ASCII according to IDNA."
:group 'message-headers
'ask)
"Whether to encode non-ASCII in domain names into ASCII according to IDNA."
:group 'message-headers
@@
-1494,8
+1495,8
@@
is used by default."
(beg 1)
(first t)
quoted elems paren)
(beg 1)
(first t)
quoted elems paren)
- (
save-excursion
- (m
essage-set-work-buffer
)
+ (
with-temp-buffer
+ (m
m-enable-multibyte
)
(insert header)
(goto-char (point-min))
(while (not (eobp))
(insert header)
(goto-char (point-min))
(while (not (eobp))
@@
-1588,15
+1589,6
@@
is used by default."
(mail-narrow-to-head)
(message-fetch-field header))))
(mail-narrow-to-head)
(message-fetch-field header))))
-(defun message-set-work-buffer ()
- (if (get-buffer " *message work*")
- (progn
- (set-buffer " *message work*")
- (erase-buffer))
- (set-buffer (get-buffer-create " *message work*"))
- (kill-all-local-variables)
- (mm-enable-multibyte)))
-
(defun message-functionp (form)
"Return non-nil if FORM is funcallable."
(or (and (symbolp form) (fboundp form))
(defun message-functionp (form)
"Return non-nil if FORM is funcallable."
(or (and (symbolp form) (fboundp form))
@@
-2626,7
+2618,7
@@
With the prefix argument FORCE, insert the header anyway."
(let ((point (point)))
(message-goto-signature)
(unless (eobp)
(let ((point (point)))
(message-goto-signature)
(unless (eobp)
- (
forward-line -2
))
+ (
end-of-line -1
))
(kill-region point (point))
(unless (bolp)
(insert "\n"))))
(kill-region point (point))
(unless (bolp)
(insert "\n"))))
@@
-2722,7
+2714,7
@@
Prefix arg means justify as well."
(defun message-fill-paragraph (&optional arg)
"Like `fill-paragraph'."
(interactive (list (if current-prefix-arg 'full)))
(defun message-fill-paragraph (&optional arg)
"Like `fill-paragraph'."
(interactive (list (if current-prefix-arg 'full)))
- (if (
and
(boundp 'filladapt-mode) filladapt-mode)
+ (if (
if
(boundp 'filladapt-mode) filladapt-mode)
nil
(message-newline-and-reformat arg t)
t))
nil
(message-newline-and-reformat arg t)
t))
@@
-3928,7
+3920,7
@@
Otherwise, generate and save a value for `canlock-password' first."
(length
(setq to (completing-read
"Followups to (default: no Followup-To header) "
(length
(setq to (completing-read
"Followups to (default: no Followup-To header) "
- (mapcar
(lambda (g) (list g))
+ (mapcar
#'list
(cons "poster"
(message-tokenize-header
newsgroups)))))))))
(cons "poster"
(message-tokenize-header
newsgroups)))))))))
@@
-4411,8
+4403,8
@@
If NOW, use that time instead."
(if (message-functionp message-user-organization)
(funcall message-user-organization)
message-user-organization))))
(if (message-functionp message-user-organization)
(funcall message-user-organization)
message-user-organization))))
- (
save-excursion
- (m
essage-set-work-buffer
)
+ (
with-temp-buffer
+ (m
m-enable-multibyte
)
(cond ((stringp organization)
(insert organization))
((and (eq t organization)
(cond ((stringp organization)
(insert organization))
((and (eq t organization)
@@
-4496,8
+4488,8
@@
If NOW, use that time instead."
(user-full-name))))
(when (string= fullname "&")
(setq fullname (user-login-name)))
(user-full-name))))
(when (string= fullname "&")
(setq fullname (user-login-name)))
- (
save-excursion
- (m
essage-set-work-buffer
)
+ (
with-temp-buffer
+ (m
m-enable-multibyte
)
(cond
((or (null style)
(equal fullname ""))
(cond
((or (null style)
(equal fullname ""))
@@
-5260,6
+5252,10
@@
are not included."
(when message-default-mail-headers
(insert message-default-mail-headers)
(or (bolp) (insert ?\n)))
(when message-default-mail-headers
(insert message-default-mail-headers)
(or (bolp) (insert ?\n)))
+ (save-restriction
+ (message-narrow-to-headers)
+ (if message-alternative-emails
+ (message-use-alternative-email-as-from)))
(when message-generate-headers-first
(message-generate-headers
(message-headers-to-generate
(when message-generate-headers-first
(message-generate-headers
(message-headers-to-generate
@@
-5271,8
+5267,6
@@
are not included."
(message-insert-signature)
(save-restriction
(message-narrow-to-headers)
(message-insert-signature)
(save-restriction
(message-narrow-to-headers)
- (if message-alternative-emails
- (message-use-alternative-email-as-from))
(run-hooks 'message-header-setup-hook))
(set-buffer-modified-p nil)
(setq buffer-undo-list nil)
(run-hooks 'message-header-setup-hook))
(set-buffer-modified-p nil)
(setq buffer-undo-list nil)
@@
-5857,8
+5851,9
@@
news, Source is the list of newsgroups is was posted to."
(concat "["
(let ((prefix
(or (message-fetch-field "newsgroups")
(concat "["
(let ((prefix
(or (message-fetch-field "newsgroups")
- (cdr
- (mail-header-parse-address (message-fetch-field "from")))
+ (let ((from (message-fetch-field "from")))
+ (and from
+ (cdr (mail-header-parse-address from))))
"(nowhere)")))
(if message-forward-decoded-p
prefix
"(nowhere)")))
(if message-forward-decoded-p
prefix
@@
-5942,11
+5937,11
@@
Optional DIGEST will use digest to forward."
(not message-forward-decoded-p))
(insert
(with-temp-buffer
(not message-forward-decoded-p))
(insert
(with-temp-buffer
- (mm-disable-multibyte
-mule4
)
+ (mm-disable-multibyte)
(insert
(with-current-buffer forward-buffer
(insert
(with-current-buffer forward-buffer
- (mm-with-unibyte-current-buffer
-mule4
(buffer-string))))
- (mm-enable-multibyte
-mule4
)
+ (mm-with-unibyte-current-buffer (buffer-string))))
+ (mm-enable-multibyte)
(mime-to-mml)
(goto-char (point-min))
(when (looking-at "From ")
(mime-to-mml)
(goto-char (point-min))
(when (looking-at "From ")
@@
-6394,11
+6389,6
@@
regexp varstr."
(cdr local)))))
locals)))
(cdr local)))))
locals)))
-;;; Miscellaneous functions
-
-(defsubst message-replace-chars-in-string (string from to)
- (mm-subst-char-in-string from to string))
-
;;;
;;; MIME functions
;;;
;;;
;;; MIME functions
;;;