[Mew-dist 05111] Re: 1.93b40
Kazu Yamamoto ( 山本和彦 )
kazu at example.com
1998年 6月 25日 (木) 16:59:24 JST
From: Maybe TABOO <y-koga at example.com>
Subject: [Mew-dist 05102] Re: 1.93b40
Date: Wed, 24 Jun 1998 22:16:12 +0900
> > (2) Marker 周りの関数を大幅に書き換えました。ユーザには直接は関係ありま
> > せん。
>
> これの影響か、C-c C-c して n をするとおかしくなります。色が消えるし、
> もう一度送信すると、壊れたメールになって imput にエラー扱いされてしま
> うようになりました。
すいません。お祭りモードでプログラムを書くと失敗しますね。以下で直ると思
います。
--かず
-------------- next part --------------
Index: 00changes
===================================================================
RCS file: /usr/local/cvsroot/Mew/mew/00changes,v
retrieving revision 1.108
retrieving revision 1.109
diff -c -r1.108 -r1.109
*** 00changes 1998/06/24 10:41:19 1.108
--- 00changes 1998/06/25 06:01:37 1.109
***************
*** 18,23 ****
--- 18,25 ----
*** todo ***
* Header encoding.
* pick on XEmacs
+ * Emacs 20
+ * refile myself
*** todo ***
1.93b40 (98/06/24)
Index: mew-encode.el
===================================================================
RCS file: /usr/local/cvsroot/Mew/mew/mew-encode.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** mew-encode.el 1998/06/23 02:07:56 1.20
--- mew-encode.el 1998/06/25 06:01:38 1.21
***************
*** 93,99 ****
(funcall func med (1- (point))))
)))))
(goto-char (mew-draft-header-end))
! (mew-highlight-header-region (point-min) (point)))
(defun mew-draft-make-single ()
(mew-draft-make-backup 'single)
--- 93,100 ----
(funcall func med (1- (point))))
)))))
(goto-char (mew-draft-header-end))
! (mew-highlight-header-region (point-min) (point))
! (mew-draft-header-clear))
(defun mew-draft-make-single ()
(mew-draft-make-backup 'single)
***************
*** 249,255 ****
(mew-header-insert-param-here cdpparams)
(insert-before-markers "\n")))
;; Terminate content-header.
! (insert-before-markers "\n")
;; header "\n" (cur) [text]
(if encopts
;; Binary objects matches here.
--- 250,256 ----
(mew-header-insert-param-here cdpparams)
(insert-before-markers "\n")))
;; Terminate content-header.
! (insert "\n")
;; header "\n" (cur) [text]
(if encopts
;; Binary objects matches here.
***************
*** 375,387 ****
(insert-before-markers "\n"))
)
(while (< cnt len)
! (insert-before-markers (concat "\n--" boundary "\n"))
(if (mew-syntax-multipart-p (aref syntax cnt))
(mew-encode-multipart (aref syntax cnt) fullname (1+ depth))
(mew-encode-singlepart (aref syntax cnt) fullname (1+ depth)))
(setq cnt (1+ cnt))
)
! (insert-before-markers (concat "\n--" boundary "--\n"))
;;
;; Let's go privacy services.
;;
--- 376,388 ----
(insert-before-markers "\n"))
)
(while (< cnt len)
! (insert (concat "\n--" boundary "\n"))
(if (mew-syntax-multipart-p (aref syntax cnt))
(mew-encode-multipart (aref syntax cnt) fullname (1+ depth))
(mew-encode-singlepart (aref syntax cnt) fullname (1+ depth)))
(setq cnt (1+ cnt))
)
! (insert (concat "\n--" boundary "--\n"))
;;
;; Let's go privacy services.
;;
***************
*** 448,462 ****
(mew-header-insert-here mew-ct: ct 'noret)
(insert-before-markers (format ";\n\tprotocol=\"%s\"" protocol))
(insert-before-markers (format ";\n\tboundary=\"%s\"\n" boundary)) ;; \n doubled
! (insert-before-markers (format "\n--%s\n" boundary))
;; Insert control keys
(mew-encode-singlepart
(mew-encode-syntax-single file2 (list protocol) cte2))
! (insert-before-markers (format "\n--%s\n" boundary))
;; Insert encrpted body
(mew-encode-singlepart
(mew-encode-syntax-single file3 mew-type-apo cte3))
! (insert-before-markers (format "\n--%s--\n" boundary))
;; Throw away the garbage
(if (file-exists-p file1) (delete-file file1))
(if (file-exists-p file2) (delete-file file2))
--- 449,463 ----
(mew-header-insert-here mew-ct: ct 'noret)
(insert-before-markers (format ";\n\tprotocol=\"%s\"" protocol))
(insert-before-markers (format ";\n\tboundary=\"%s\"\n" boundary)) ;; \n doubled
! (insert (format "\n--%s\n" boundary))
;; Insert control keys
(mew-encode-singlepart
(mew-encode-syntax-single file2 (list protocol) cte2))
! (insert (format "\n--%s\n" boundary))
;; Insert encrpted body
(mew-encode-singlepart
(mew-encode-syntax-single file3 mew-type-apo cte3))
! (insert (format "\n--%s--\n" boundary))
;; Throw away the garbage
(if (file-exists-p file1) (delete-file file1))
(if (file-exists-p file2) (delete-file file2))
***************
*** 496,508 ****
(insert-before-markers (format ";\n\tprotocol=\"%s\"" protocol))
(insert-before-markers (format ";\n\tmicalg=\"%s\"" micalg))
(insert-before-markers (format ";\n\tboundary=\"%s\"\n" boundary)) ;; \n doubled
! (insert-before-markers (format "\n--%s\n" boundary))
(goto-char (point-max))
;; After the sigend part
! (insert-before-markers (format "\n--%s\n" boundary))
(mew-encode-singlepart
(mew-encode-syntax-single file2 (list protocol) cte2))
! (insert-before-markers (format "\n--%s--\n" boundary))
;; Throw away the garbage
(if (file-exists-p file1) (delete-file file1))
(if (file-exists-p file2) (delete-file file2))
--- 497,509 ----
(insert-before-markers (format ";\n\tprotocol=\"%s\"" protocol))
(insert-before-markers (format ";\n\tmicalg=\"%s\"" micalg))
(insert-before-markers (format ";\n\tboundary=\"%s\"\n" boundary)) ;; \n doubled
! (insert (format "\n--%s\n" boundary))
(goto-char (point-max))
;; After the sigend part
! (insert (format "\n--%s\n" boundary))
(mew-encode-singlepart
(mew-encode-syntax-single file2 (list protocol) cte2))
! (insert (format "\n--%s--\n" boundary))
;; Throw away the garbage
(if (file-exists-p file1) (delete-file file1))
(if (file-exists-p file2) (delete-file file2))
Index: mew-summary.el
===================================================================
RCS file: /usr/local/cvsroot/Mew/mew/mew-summary.el,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** mew-summary.el 1998/06/23 02:08:05 1.66
--- mew-summary.el 1998/06/25 06:01:40 1.67
***************
*** 1248,1262 ****
(goto-char (point-min))
(re-search-forward mew-eoh2 nil t)
(beginning-of-line)
- (let ((beg (point)))
- (forward-line)
- (delete-region beg (point)))
;; Dcc or Fcc:
(mew-header-fill-here "Fcc:" mew-fcc)
(mew-header-fill-here "Dcc:" mew-dcc)
(mew-header-fill-here "From:" mew-from)
(mew-header-fill-here "Reply-To:" mew-reply-to)
(mew-header-fill-here "X-Mailer:" mew-x-mailer)
(mew-draft-header-prepared))
(defun mew-summary-reedit ()
--- 1248,1263 ----
(goto-char (point-min))
(re-search-forward mew-eoh2 nil t)
(beginning-of-line)
;; Dcc or Fcc:
(mew-header-fill-here "Fcc:" mew-fcc)
(mew-header-fill-here "Dcc:" mew-dcc)
(mew-header-fill-here "From:" mew-from)
(mew-header-fill-here "Reply-To:" mew-reply-to)
(mew-header-fill-here "X-Mailer:" mew-x-mailer)
+ ;; erase the old header separator
+ (let ((beg (point)))
+ (forward-line)
+ (delete-region beg (point)))
(mew-draft-header-prepared))
(defun mew-summary-reedit ()
Index: mew-syntax.el
===================================================================
RCS file: /usr/local/cvsroot/Mew/mew/mew-syntax.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** mew-syntax.el 1998/06/23 02:08:06 1.28
--- mew-syntax.el 1998/06/25 06:01:41 1.29
***************
*** 858,863 ****
--- 858,868 ----
(markerp mew-draft-buffer-attach))
(set-marker mew-draft-buffer-attach nil))))
+ (defmacro mew-draft-header-clear ()
+ (` (if (and (mew-local-variable-p 'mew-draft-buffer-header)
+ (markerp mew-draft-buffer-header))
+ (set-marker mew-draft-buffer-header nil))))
+
(defmacro mew-draft-header-prepared ()
(` (progn
(if mew-config-insert-when-prepared
Index: mew-vars.el
===================================================================
RCS file: /usr/local/cvsroot/Mew/mew/mew-vars.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** mew-vars.el 1998/06/24 09:39:09 1.56
--- mew-vars.el 1998/06/25 06:01:42 1.57
***************
*** 1041,1047 ****
(defvar mew-summary-toolbar nil)
(defvar scrollbar-height nil)
(defvar default-toolbar-visible-p nil)
- (defvar xemacs-codename nil)
(defvar zmacs-regions nil)
(defvar last-pressed-toolbar-button nil)
(defvar mode-motion-hook nil)
--- 1041,1046 ----
Mew-dist メーリングリストの案内