From e6921cb278e7fb5b1708377ae95d349c70460b00 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 11 Aug 1998 00:30:59 +0000 Subject: [PATCH] Update. --- ChangeLog | 15 +++++++++++++++ mime-edit.el | 7 ++----- mime-text.el | 3 ++- mime-w3.el | 21 +++++++++++---------- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc9e1aa..e65982c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +1998-08-10 MORIOKA Tomohiko + + * mime-text.el (mime-text-insert-decoded-body): Specify line break + code type as CRLF. + +1998-08-10 Shuhei KOBAYASHI + + * mime-edit.el (mime-edit-normalize-body): Failed to canonicalize + empty lines. + +1998-08-09 MORIOKA Tomohiko + + * mime-w3.el (mime-preview-text/html): Insert dummy "\n" into end + of entity to avoid keymap text-property problem. + 1998-07-21 MORIOKA Tomohiko * NEWS (Don't use "file" command to detect content of entity): New diff --git a/mime-edit.el b/mime-edit.el index 0d28389..94ea968 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -2054,11 +2054,8 @@ Content-Transfer-Encoding: 7bit (save-restriction (narrow-to-region beg (mime-edit-content-end)) (goto-char beg) - (while (re-search-forward "\\([^\r]\\)\n" nil t) - (replace-match - (concat (buffer-substring (match-beginning 0) - (match-end 1)) "\r\n")) - ))) + (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t) + (replace-match "\\1\r\n")))) (goto-char beg) (mime-encode-region beg (mime-edit-content-end) encoding) (mime-edit-define-encoding encoding) diff --git a/mime-text.el b/mime-text.el index db93142..e107222 100644 --- a/mime-text.el +++ b/mime-text.el @@ -47,7 +47,8 @@ SITUATION. It must be symbol." (or (mime-content-type-parameter (mime-entity-content-type entity) "charset") - default-mime-charset)) + default-mime-charset) + 'CRLF) ))) (run-hooks 'mime-text-decode-hook) ) diff --git a/mime-w3.el b/mime-w3.el index 2c0655b..fec612c 100644 --- a/mime-w3.el +++ b/mime-w3.el @@ -32,8 +32,7 @@ ',(if (featurep 'xemacs) 'keymap 'local-map) - ,keymap) - ) + ,keymap)) (defmacro mime-save-background-color (&rest body) (if (featurep 'xemacs) @@ -45,14 +44,16 @@ (cons 'progn body))) (defun mime-preview-text/html (entity situation) - (mime-save-background-color - (save-restriction - (narrow-to-region (point-max)(point-max)) - (mime-text-insert-decoded-body entity) - (let ((beg (point-min))) - (remove-text-properties beg (point-max) '(face nil)) - (w3-region beg (point-max)) - (mime-put-keymap-region beg (point-max) w3-mode-map) + (goto-char (point-max)) + (let ((p (point))) + (insert "\n") + (goto-char p) + (mime-save-background-color + (save-restriction + (narrow-to-region p p) + (mime-text-insert-decoded-body entity) + (w3-region p (point-max)) + (mime-put-keymap-region p (point-max) w3-mode-map) )))) -- 1.7.10.4