[Mew-dist 09715] please try this
Kazu Yamamoto ( 山本和彦 )
kazu at example.com
1999年 7月 16日 (金) 12:56:18 JST
今から会議なので、その間にテストしてくれる人を募集します。以下のパッチを
当てると、
- Draft モードの C-cC-r (暗号化後署名)が直る
- プロパティ関係が直る
* attachments の後が read-only になり編集できなくなる
はずです。
なにかおかしと思ったら教えてもらえると幸いです。
--かず
-------------- next part --------------
Index: 00changes
===================================================================
RCS file: /home/kazu/cvsroot/Mew/mew/00changes,v
retrieving revision 1.369
retrieving revision 1.371
diff -c -r1.369 -r1.371
*** 00changes 1999/07/15 09:56:57 1.369
--- 00changes 1999/07/16 03:51:52 1.371
***************
*** 1,5 ****
--- 1,14 ----
<Change Log>
+ 1.94b43 (99/07/16) mew-dist release
+
+ * mew-refile-auto-refile-confirm is default to nil.
+ * Property code was revised.
+ * Putting read-only after attachments.
+ SAKAI Kiyotaka <ksakai at example.com>
+ * Bug fixes for C-cC-r in Draft
+ KOIE Hidetaka <koie at example.com>
+
1.94b42 (99/07/15) mew-dist release
* mew-input-passwd ignores control characters.
Index: mew-addrbook.el
===================================================================
RCS file: /home/kazu/cvsroot/Mew/mew/mew-addrbook.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** mew-addrbook.el 1999/07/13 03:33:54 1.32
--- mew-addrbook.el 1999/07/16 03:33:47 1.33
***************
*** 320,328 ****
(let ((beg (point)))
(insert key ": ")
(put-text-property beg (point) 'read-only t)
! (if mew-xemacs-p
! (put-text-property beg (point) 'end-open t)
! (put-text-property beg (point) 'rear-nonsticky t))
(and val (insert val))
(insert "\n"))))
--- 320,326 ----
(let ((beg (point)))
(insert key ": ")
(put-text-property beg (point) 'read-only t)
! (mew-rear-nonsticky beg (point))
(and val (insert val))
(insert "\n"))))
Index: mew-env.el
===================================================================
RCS file: /home/kazu/cvsroot/Mew/mew/mew-env.el,v
retrieving revision 1.43
retrieving revision 1.45
diff -c -r1.43 -r1.45
*** mew-env.el 1999/07/14 12:41:33 1.43
--- mew-env.el 1999/07/16 03:49:27 1.45
***************
*** 69,74 ****
--- 69,90 ----
(interactive "r")
(mapcar (function mew-overlay-delete)
(extent-list (current-buffer) beg end)))
+ (defun mew-front-sticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'start-closed t)
+ (put-text-property beg-or-ovl end 'start-closed t)))
+ (defun mew-front-nonsticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'start-closed nil)
+ (put-text-property beg-or-ovl end 'start-closed nil)))
+ (defun mew-rear-sticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'end-open nil)
+ (put-text-property beg-or-ovl end 'end-open nil)))
+ (defun mew-rear-nonsticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'end-open t)
+ (put-text-property beg-or-ovl end 'end-open t)))
(fset 'mew-buffer-substring (symbol-function 'buffer-substring))
(defun mew-mark () (mark t))
(defun mew-pop-to-buffer (buf)
***************
*** 100,105 ****
--- 116,137 ----
(while (and (<= cur end) (overlays-at cur))
(mapcar (function mew-overlay-delete) (overlays-at cur)))
(setq cur (next-overlay-change cur)))))
+ (defun mew-front-sticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'front-sticky t)
+ (put-text-property beg-or-ovl end 'front-sticky t)))
+ (defun mew-front-nonsticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'front-sticky nil)
+ (put-text-property beg-or-ovl end 'front-sticky nil)))
+ (defun mew-rear-sticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'rear-nonsticky nil)
+ (put-text-property beg-or-ovl end 'rear-nonsticky nil)))
+ (defun mew-rear-nonsticky (beg-or-ovl &optional end)
+ (if (mew-overlay-p beg-or-ovl)
+ (mew-overlay-put beg-or-ovl 'rear-nonsticky t)
+ (put-text-property beg-or-ovl end 'rear-nonsticky t)))
(require 'easymenu)
(if (fboundp 'buffer-substring-no-properties)
(fset 'mew-buffer-substring
Index: mew-pgp.el
===================================================================
RCS file: /home/kazu/cvsroot/Mew/mew/mew-pgp.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** mew-pgp.el 1999/07/15 09:41:08 1.77
--- mew-pgp.el 1999/07/16 03:33:47 1.78
***************
*** 592,598 ****
(defun mew-pgp-encrypt-sign-letter ()
"Encrypt then sign the entire draft with PGP. Input your passphrase."
(interactive)
! (mew-pgp-encode-letter 'pgp-signature-encryption))
(defmacro mew-pgp-encode-letter (type)
(` (if (null mew-pgp-ver)
--- 592,598 ----
(defun mew-pgp-encrypt-sign-letter ()
"Encrypt then sign the entire draft with PGP. Input your passphrase."
(interactive)
! (mew-pgp-encode-letter 'pgp-encryption-signature))
(defmacro mew-pgp-encode-letter (type)
(` (if (null mew-pgp-ver)
Index: mew-syntax.el
===================================================================
RCS file: /home/kazu/cvsroot/Mew/mew/mew-syntax.el,v
retrieving revision 1.88
retrieving revision 1.89
diff -c -r1.88 -r1.89
*** mew-syntax.el 1999/06/28 12:33:45 1.88
--- mew-syntax.el 1999/07/16 03:33:47 1.89
***************
*** 427,432 ****
--- 427,433 ----
(mapcar (function insert-and-inherit)
(nreverse mew-syntax-multi-form))
(put-text-property (mew-attach-begin) (point-max) 'read-only t)
+ (mew-rear-sticky (mew-attach-begin) (point-max))
(if mew-icon-p
(mew-syntax-print-icon-spec (nreverse mew-syntax-icon-spec)
mew-draft-toolbar))
***************
*** 843,858 ****
(if (, sep)
(insert (, sep))
(forward-line))
- (cond
- (mew-xemacs-p
- (put-text-property end (point) 'start-open t)
- (put-text-property end (point) 'end-open t))
- (t
- (if (not (equal end 1))
- (put-text-property (1- end) end 'front-nonsticky t))
- (if (not (equal (point) 1))
- (put-text-property (1- (point)) (point) 'rear-nonsticky t))))
(put-text-property end (point) 'read-only t)
end))))
(defmacro mew-header-clear ()
--- 844,852 ----
(if (, sep)
(insert (, sep))
(forward-line))
(put-text-property end (point) 'read-only t)
+ (mew-front-nonsticky end (point))
+ (mew-rear-nonsticky end (point))
end))))
(defmacro mew-header-clear ()
***************
*** 878,890 ****
(insert "\n")
(put-text-property beg (1+ beg) 'mew-attach-begin t)
(put-text-property (1- (point)) (point) 'mew-attach-end t)
! (cond
! (mew-xemacs-p
! (put-text-property beg (point-max) 'start-open t)
! (put-text-property beg (point-max) 'end-open t))
! (t
! (put-text-property (1- beg) beg 'front-nonsticky t)
! (put-text-property (1- (point-max)) (point-max) 'rear-nonsticky t)))
(beginning-of-line)
(mew-draft-attach-keymap)))))
--- 872,879 ----
(insert "\n")
(put-text-property beg (1+ beg) 'mew-attach-begin t)
(put-text-property (1- (point)) (point) 'mew-attach-end t)
! (mew-front-nonsticky beg (point-max))
! (mew-rear-nonsticky beg (point-max))
(beginning-of-line)
(mew-draft-attach-keymap)))))
***************
*** 915,922 ****
(mew-overlay-put mew-overlay-header-keymap
(if mew-xemacs-p 'keymap 'local-map)
mew-draft-header-map)
! (mew-overlay-put mew-overlay-header-keymap
! (if mew-xemacs-p 'end-closed 'rear-sticky) t))))))
(defmacro mew-draft-attach-keymap ()
(` (progn
(if mew-use-overlay-keymap
--- 904,911 ----
(mew-overlay-put mew-overlay-header-keymap
(if mew-xemacs-p 'keymap 'local-map)
mew-draft-header-map)
! (mew-rear-sticky mew-overlay-header-keymap))))))
!
(defmacro mew-draft-attach-keymap ()
(` (progn
(if mew-use-overlay-keymap
Index: mew-vars.el
===================================================================
RCS file: /home/kazu/cvsroot/Mew/mew/mew-vars.el,v
retrieving revision 1.149
retrieving revision 1.150
diff -c -r1.149 -r1.150
*** mew-vars.el 1999/07/15 09:13:48 1.149
--- mew-vars.el 1999/07/16 03:33:47 1.150
***************
*** 576,582 ****
directory for copy, etc. See also \"mew-summary-preserve-dir\".")
! (defvar mew-draft-mode-auto-save nil
"*If t, a draft is repeatedly saved to \"buffer-auto-save-file-name\"
by \"do-auto-save\". If automatic saving is enabled and Emacs is crashed,
the \".save-\" file remains. If this value is nil, automatic saving does
--- 576,582 ----
directory for copy, etc. See also \"mew-summary-preserve-dir\".")
! (defvar mew-draft-mode-auto-save t
"*If t, a draft is repeatedly saved to \"buffer-auto-save-file-name\"
by \"do-auto-save\". If automatic saving is enabled and Emacs is crashed,
the \".save-\" file remains. If this value is nil, automatic saving does
***************
*** 1312,1318 ****
(list 'pgp-encryption (list (list mew-ct-mle mew-ct-pge)))
(list 'pgp-signature-encryption
(list (list mew-ct-mls mew-ct-pgs) (list mew-ct-mle mew-ct-pge)))
! (list 'pgp-signature-encryption
(list (list mew-ct-mle mew-ct-pge) (list mew-ct-mls mew-ct-pgs))))
"*Alist of key and a list of privacy Content-Type.")
--- 1312,1318 ----
(list 'pgp-encryption (list (list mew-ct-mle mew-ct-pge)))
(list 'pgp-signature-encryption
(list (list mew-ct-mls mew-ct-pgs) (list mew-ct-mle mew-ct-pge)))
! (list 'pgp-encryption-signature
(list (list mew-ct-mle mew-ct-pge) (list mew-ct-mls mew-ct-pgs))))
"*Alist of key and a list of privacy Content-Type.")
Mew-dist メーリングリストの案内