[Mew-dist 11495] diff from b6
Kazu Yamamoto ( 山本和彦 )
kazu at example.com
1999年 11月 27日 (土) 00:39:48 JST
ピッチで作業しているのでパッケージにする余裕がありません。とりあえず、
1.95b6 に対する diff をお送りします。
- mew-attach-folder ができた(hard coding を少なくするため)
デフォルトは +attach
昔のままがいい人は +draft/mime に setq して下さい
- 暗号化が失敗したら、ちゃんと undo する
- mo のバグが直ったと思う
- Queue は非同期に flush する
- +queue のメールを "E" したときは、そのメールは消す (#msg になる)
- などなど
--かず
-------------- next part --------------
? LOGLESS
? xxx.el
? LOG
Index: 00changes
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/00changes,v
retrieving revision 1.476
retrieving revision 1.479
diff -c -r1.476 -r1.479
*** 00changes 1999/11/23 12:25:03 1.476
--- 00changes 1999/11/26 11:27:49 1.479
***************
*** 12,19 ****
--- 12,27 ----
* a draft with "real" attachments
* don't use cache?
* charset vs icharset
+ * +draft vs. +queue
+ - Multipart/Encrypted vs CTE:
- Customize
- Guess feature for Draft mode.
+
+ 1.95b7
+
+ * Updating contrib/*.el
+ Chifumi Hayashi <chifumi at example.com>
+ Hideyuki SHIRAI <shirai at example.com>
1.95b6 (99/11/23) mew-dist release
Index: mew-draft.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-draft.el,v
retrieving revision 1.158
retrieving revision 1.161
diff -c -r1.158 -r1.161
*** mew-draft.el 1999/11/22 07:31:37 1.158
--- mew-draft.el 1999/11/26 11:27:49 1.161
***************
*** 525,538 ****
;; draft buffer
(rename-buffer draftname))))
! ;; +draft/1 -> +draft/mime/1
! ;; This function is hard coding due to mew-draft-mime-folder, sigh...
! (defun mew-draft-to-mime (draft)
! (concat (file-name-as-directory mew-draft-mime-folder)
(file-name-nondirectory draft)))
(defun mew-attachdir (&optional draft)
! (mew-expand-folder (mew-draft-to-mime (or draft (buffer-name)))))
(defun mew-draft-header-insert-alist (halist)
"Insert field-body: and field-value. Return the value of
--- 525,537 ----
;; draft buffer
(rename-buffer draftname))))
! (defun mew-draft-to-attach (draft)
! "Converting draft to attach. E.g. +draft/1 -> +attach/1"
! (concat (file-name-as-directory mew-attach-folder)
(file-name-nondirectory draft)))
(defun mew-attachdir (&optional draft)
! (mew-expand-folder (mew-draft-to-attach (or draft (buffer-name)))))
(defun mew-draft-header-insert-alist (halist)
"Insert field-body: and field-value. Return the value of
***************
*** 1003,1011 ****
(let* ((fld-msg (buffer-file-name))
(fld (directory-file-name (file-name-directory fld-msg)))
(msg (file-name-nondirectory fld-msg)))
! (mew-encode privacy)
! (mew-encode-send-message fld msg 'justqueuing)
! (message "This message is queued in %s." mew-queue-folder)))
(defun mew-draft-send-message ()
(interactive)
--- 1002,1011 ----
(let* ((fld-msg (buffer-file-name))
(fld (directory-file-name (file-name-directory fld-msg)))
(msg (file-name-nondirectory fld-msg)))
! (if (mew-encode privacy)
! (progn
! (mew-encode-send-message fld msg 'justqueuing)
! (message "This message has been queued in %s." mew-queue-folder)))))
(defun mew-draft-send-message ()
(interactive)
***************
*** 1014,1022 ****
(let* ((fld-msg (buffer-file-name))
(fld (directory-file-name (file-name-directory fld-msg)))
(msg (file-name-nondirectory fld-msg)))
! (mew-encode)
! (mew-encode-send-message fld msg)
! (message "Sending in background ... "))))
;; backward-compatibility
(fset 'mew-draft-send-letter (symbol-function 'mew-draft-send-message))
--- 1014,1023 ----
(let* ((fld-msg (buffer-file-name))
(fld (directory-file-name (file-name-directory fld-msg)))
(msg (file-name-nondirectory fld-msg)))
! (if (mew-encode)
! (progn
! (mew-encode-send-message fld msg)
! (message "Sending in background ... "))))))
;; backward-compatibility
(fset 'mew-draft-send-letter (symbol-function 'mew-draft-send-message))
Index: mew-edit.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-edit.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** mew-edit.el 1999/11/14 11:24:38 1.12
--- mew-edit.el 1999/11/26 11:27:49 1.13
***************
*** 264,272 ****
(defun mew-summary-edit-message ()
(let* ((fld (mew-summary-folder-name))
(msg (mew-summary-message-number))
! (part (mew-syntax-nums))
(cache (mew-current-get 'cache))
! backup multip syntax ct doit draft attachdir)
(if (null msg)
(save-excursion
(mew-summary-goto-message)
--- 264,273 ----
(defun mew-summary-edit-message ()
(let* ((fld (mew-summary-folder-name))
(msg (mew-summary-message-number))
! (part (mew-syntax-number))
(cache (mew-current-get 'cache))
! (killp (and (equal fld mew-queue-folder) (null part)))
! multip syntax ct doit draft attachdir)
(if (null msg)
(save-excursion
(mew-summary-goto-message)
***************
*** 285,300 ****
(mew-syntax-get-part syntax))))))
(if (not doit)
t ;; error
(mew-current-set 'window (current-window-configuration))
(mew-window-configure (current-buffer) 'summary)
(mew-summary-prepare-draft
! (if (or part (not (equal fld mew-draft-folder)))
! (setq draft (mew-folder-new-message mew-draft-folder))
! (setq draft (mew-expand-folder-get-msg fld msg))
! (setq msg (concat mew-summary-reedit-backup-prefix msg))
! (setq backup (mew-expand-folder-get-msg fld msg))
! (if (file-exists-p backup) (delete-file backup))
! (rename-file draft backup))
(setq attachdir (mew-attachdir draft))
;; prepare draft file
(mew-draft-find-and-switch draft)
--- 286,299 ----
(mew-syntax-get-part syntax))))))
(if (not doit)
t ;; error
+ (if killp
+ (progn
+ (mew-mark-kill-line)
+ (set-buffer-modified-p nil)))
(mew-current-set 'window (current-window-configuration))
(mew-window-configure (current-buffer) 'summary)
(mew-summary-prepare-draft
! (setq draft (mew-folder-new-message mew-draft-folder))
(setq attachdir (mew-attachdir draft))
;; prepare draft file
(mew-draft-find-and-switch draft)
***************
*** 315,320 ****
--- 314,325 ----
cache
(mew-syntax-get-begin syntax)
(mew-syntax-get-end (mew-syntax-get-part syntax))))))
+ (if killp
+ (let* ((original (mew-expand-folder-get-msg fld msg))
+ (bmsg (concat mew-summary-reedit-backup-prefix msg))
+ (backup (mew-expand-folder-get-msg fld bmsg)))
+ (if (file-exists-p backup) (delete-file backup))
+ (rename-file original backup)))
nil))) ;; success
(defun mew-summary-edit-header ()
***************
*** 337,351 ****
(defun mew-summary-reedit ()
(interactive)
(mew-summary-msg-or-part
! (if (mew-summary-edit-message)
! (message "Can't reedit here.")
! (mew-summary-edit-header)
! (mew-draft-mode)
! (if mew-encode-syntax
! (save-excursion
! (mew-draft-prepare-attachments t)))
! (save-buffer)
! (run-hooks 'mew-draft-mode-reedit-hook))))
(defun mew-d2e (fld msg dir nums)
(let (syntax len beg end hbeg hend cnt ct part)
--- 342,360 ----
(defun mew-summary-reedit ()
(interactive)
(mew-summary-msg-or-part
! (cond
! ((equal (mew-summary-folder-name) mew-draft-folder)
! (message "Not implemented yet"))
! (t
! (if (mew-summary-edit-message)
! (message "Can't reedit here.")
! (mew-summary-edit-header)
! (mew-draft-mode)
! (if mew-encode-syntax
! (save-excursion
! (mew-draft-prepare-attachments t)))
! (save-buffer)
! (run-hooks 'mew-draft-mode-reedit-hook))))))
(defun mew-d2e (fld msg dir nums)
(let (syntax len beg end hbeg hend cnt ct part)
Index: mew-encode.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-encode.el,v
retrieving revision 1.122
retrieving revision 1.126
diff -c -r1.122 -r1.126
*** mew-encode.el 1999/11/22 07:43:43 1.122
--- mew-encode.el 1999/11/26 11:27:49 1.126
***************
*** 196,209 ****
;;;
(defun mew-encode (&optional privacy)
! (if mew-debug
! (let ((debug-on-error t))
! (mew-encode-message privacy))
! (condition-case nil
! (mew-encode-message privacy)
! (error
! (mew-encode-undo)
! (message mew-encode-error)))))
(defun mew-encode-message (&optional privacy)
(widen)
--- 196,212 ----
;;;
(defun mew-encode (&optional privacy)
! (let ((ret t))
! (if mew-debug
! (let ((debug-on-error t))
! (mew-encode-message privacy))
! (condition-case nil
! (mew-encode-message privacy)
! (error
! (mew-encode-undo)
! (message mew-encode-error)
! (setq ret nil))))
! ret))
(defun mew-encode-message (&optional privacy)
(widen)
***************
*** 441,447 ****
(forward-line)
(let ((beg (point))
(syntax mew-encode-syntax)
! (path (mew-expand-folder mew-draft-mime-folder))
buffered)
;; Just after the header
;; See if a cover page is empty or not
--- 444,450 ----
(forward-line)
(let ((beg (point))
(syntax mew-encode-syntax)
! (path (mew-expand-folder mew-attach-folder))
buffered)
;; Just after the header
;; See if a cover page is empty or not
***************
*** 882,892 ****
(setq mew-watch-buffer-process
(mew-im-start-process mew-prog-imput
"Send"
"-draftfolder" fld
"-draftmessage" msg
(if justqueuing
"--justqueuing=on"
! "--justqueuing=off")
"-watch" "-verbose"))
(mew-set-process-cs mew-watch-buffer-process
mew-cs-autoconv mew-cs-dummy)
--- 885,896 ----
(setq mew-watch-buffer-process
(mew-im-start-process mew-prog-imput
"Send"
+ 'current-buffer
"-draftfolder" fld
"-draftmessage" msg
(if justqueuing
"--justqueuing=on"
! "--queuing=on")
"-watch" "-verbose"))
(mew-set-process-cs mew-watch-buffer-process
mew-cs-autoconv mew-cs-dummy)
Index: mew-func.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-func.el,v
retrieving revision 1.95
retrieving revision 1.98
diff -c -r1.95 -r1.98
*** mew-func.el 1999/11/23 04:43:13 1.95
--- mew-func.el 1999/11/24 14:51:26 1.98
***************
*** 208,213 ****
--- 208,226 ----
(throw 'loop (setcar var (, value))))
(setq var (cdr var)))))))
+ (defmacro mew-remove (variable key)
+ (` (let* ((crn (, variable)) prv)
+ (if (equal (nth 0 (car crn)) (, key))
+ (setq (, variable) (cdr crn))
+ (setq prv crn)
+ (setq crn (cdr crn))
+ (catch 'loop
+ (while crn
+ (if (equal (nth 0 (car crn)) (, key))
+ (throw 'loop (setcdr prv (cdr crn))))
+ (setq prv crn)
+ (setq crn (cdr crn))))))))
+
;;
;; Generic extract functions
;;
***************
*** 549,560 ****
(if (not (nth 0 attr)) ;; this is a file
()
(setq subfolder (concat subprefix relpath))
! (setq folders (nconc folders (list subfolder)))
! (if (or (and mew-folder-list-skip-pattern
! (not (string-match mew-folder-list-skip-pattern
! relpath)))
! (/= (nth 1 attr) 2)) ;; # of links
! (setq folders (nconc folders (mew-folder-list subfolder))))))
folders) ;; return value
(file-error folders))))
--- 562,576 ----
(if (not (nth 0 attr)) ;; this is a file
()
(setq subfolder (concat subprefix relpath))
! (if (equal subfolder mew-attach-folder)
! ()
! (setq folders (nconc folders (list subfolder)))
! (if (or (and mew-folder-list-skip-pattern
! (not (string-match mew-folder-list-skip-pattern
! relpath)))
! (/= (nth 1 attr) 2)) ;; # of links
! (setq folders
! (nconc folders (mew-folder-list subfolder)))))))
folders) ;; return value
(file-error folders))))
***************
*** 762,770 ****
(if msg (message "%s ... failed" msg) (message "failed"))
nil)))
! (defun mew-im-start-process (prog name &rest arg)
(apply (function start-process)
! name (current-buffer) prog
(append arg mew-prog-im-arg)))
(defconst mew-im-boundary-begin "^---BEGIN-IMGET-MESSAGE---\n")
--- 778,786 ----
(if msg (message "%s ... failed" msg) (message "failed"))
nil)))
! (defun mew-im-start-process (prog name cbufp &rest arg)
(apply (function start-process)
! name (if cbufp (current-buffer) nil) prog
(append arg mew-prog-im-arg)))
(defconst mew-im-boundary-begin "^---BEGIN-IMGET-MESSAGE---\n")
Index: mew-mark.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-mark.el,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** mew-mark.el 1999/11/23 12:25:03 1.105
--- mew-mark.el 1999/11/26 11:27:49 1.106
***************
*** 525,547 ****
(set-buffer-modified-p nil)
(setq mew-summary-buffer-process nil))))))))
(defun mew-mark-kill-line-region (beg end)
"Kill lines marked with mark to be killed."
! (mew-elet
! (let ((m (make-marker))
! (regex (concat mew-summary-message-regex mew-regex-mark))
! mark start)
! (set-marker m end)
! (goto-char beg)
! (while (re-search-forward regex m t)
! (setq mark (string-to-char (mew-match 2)))
! (if (mew-markdb-killp mark)
! (progn
! (beginning-of-line)
! (setq start (point))
! (forward-line)
! (delete-region start (point)))))
! (set-buffer-modified-p nil))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
--- 525,550 ----
(set-buffer-modified-p nil)
(setq mew-summary-buffer-process nil))))))))
+ (defmacro mew-mark-kill-line ()
+ '(mew-elet
+ (let (start)
+ (beginning-of-line)
+ (setq start (point))
+ (forward-line)
+ (delete-region start (point)))))
+
(defun mew-mark-kill-line-region (beg end)
"Kill lines marked with mark to be killed."
! (let ((m (make-marker))
! (regex (concat mew-summary-message-regex mew-regex-mark))
! mark)
! (set-marker m end)
! (goto-char beg)
! (while (re-search-forward regex m t)
! (setq mark (string-to-char (mew-match 2)))
! (if (mew-markdb-killp mark)
! (mew-mark-kill-line)))
! (set-buffer-modified-p nil)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
Index: mew-refile.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-refile.el,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** mew-refile.el 1999/11/23 10:49:57 1.90
--- mew-refile.el 1999/11/24 14:51:26 1.91
***************
*** 500,506 ****
(interactive "P")
(if report (mew-summary-refile-report) (mew-summary-refile-body)))
! (defun mew-summary-refile-body (&optional exp-flds auto)
(mew-summary-only
(mew-summary-msg-or-part
(let (msg folders mark buf learn-info fld)
--- 500,506 ----
(interactive "P")
(if report (mew-summary-refile-report) (mew-summary-refile-body)))
! (defun mew-summary-refile-body (&optional exp-flds auto no-msg)
(mew-summary-only
(mew-summary-msg-or-part
(let (msg folders mark buf learn-info fld)
***************
*** 532,537 ****
--- 532,539 ----
(mew-buffer-message)))) ;; for ","
(setq learn-info (mew-refile-decide-folders buf msg mark auto))
(setq folders (car learn-info)))
+ ;; we must prevent refiling a message to +queue
+ (setq folders (delete mew-queue-folder folders))
;; mark refile
(if folders
(progn
***************
*** 541,547 ****
(mew-refile-reset msg)
(mapcar (function (lambda (x) (mew-refile-set msg x))) folders)
(mew-mark-unmark))
! (mew-mark-put-mark mew-mark-refile auto)))
;; memorize last-folder
(setq mew-refile-last-folder folders)
(set-buffer-modified-p nil)
--- 543,549 ----
(mew-refile-reset msg)
(mapcar (function (lambda (x) (mew-refile-set msg x))) folders)
(mew-mark-unmark))
! (mew-mark-put-mark mew-mark-refile no-msg)))
;; memorize last-folder
(setq mew-refile-last-folder folders)
(set-buffer-modified-p nil)
***************
*** 626,636 ****
(setq mark (mew-summary-get-mark))
(if mew-mark-review-only
(and (equal mark mew-mark-review)
! (mew-summary-refile-body nil t))
(or (equal mark mew-mark-refile)
(equal mark mew-mark-delete)
(and mark mew-refile-auto-refile-skip-any-mark)
! (mew-summary-refile-body nil t)))
(forward-line)
(if (equal (% (/ (* 100 line) lines) 10) 0)
(message "Auto refiling ... %s%%"
--- 628,638 ----
(setq mark (mew-summary-get-mark))
(if mew-mark-review-only
(and (equal mark mew-mark-review)
! (mew-summary-refile-body nil t 'no-msg))
(or (equal mark mew-mark-refile)
(equal mark mew-mark-delete)
(and mark mew-refile-auto-refile-skip-any-mark)
! (mew-summary-refile-body nil t 'no-msg)))
(forward-line)
(if (equal (% (/ (* 100 line) lines) 10) 0)
(message "Auto refiling ... %s%%"
***************
*** 658,664 ****
(save-window-excursion
(goto-char (point-min))
(while (re-search-forward regex nil t)
! (setq last (mew-summary-refile-body last))
(forward-line))
(message "Mark refiling ... done"))))))
--- 660,666 ----
(save-window-excursion
(goto-char (point-min))
(while (re-search-forward regex nil t)
! (setq last (mew-summary-refile-body last nil 'no-msg))
(forward-line))
(message "Mark refiling ... done"))))))
Index: mew-scan.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-scan.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -c -r1.78 -r1.79
*** mew-scan.el 1999/11/23 08:46:27 1.78
--- mew-scan.el 1999/11/26 11:27:50 1.79
***************
*** 322,337 ****
;; On PPP environment, executing "imget" lets the dial be up.
;; So, it's a good idea to flush queue at this time
;; if messages to be sent exist.
! (if (and (string-match mew-prog-imget prog)
! mew-auto-flush-queue
! mew-queue-folder)
! (let* ((mew-ask-flush-queue nil)
! (queuedir (mew-expand-folder mew-queue-folder))
! (msgs (directory-files queuedir nil mew-regex-message-files)))
! (if (null msgs)
! ()
! (sit-for 1) ;; wait
! (mew-summary-flush-queue))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
--- 322,331 ----
;; On PPP environment, executing "imget" lets the dial be up.
;; So, it's a good idea to flush queue at this time
;; if messages to be sent exist.
! (if (and (string-match mew-prog-imget prog) (mew-flushable-p))
! (let ((mew-ask-flush-queue nil))
! (sit-for 1) ;; wait
! (mew-summary-flush-queue)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
Index: mew-summary.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-summary.el,v
retrieving revision 1.249
retrieving revision 1.253
diff -c -r1.249 -r1.253
*** mew-summary.el 1999/11/23 08:46:27 1.249
--- mew-summary.el 1999/11/26 11:27:50 1.253
***************
*** 1350,1356 ****
(mew-draft-prepare-attachments t))))))
(defun mew-draft-multi-copy (draft files)
! (let* ((attach (mew-draft-to-mime draft))
(attachdir (mew-expand-folder attach)))
(if (not (file-directory-p attachdir))
(mew-make-directory attachdir))
--- 1350,1356 ----
(mew-draft-prepare-attachments t))))))
(defun mew-draft-multi-copy (draft files)
! (let* ((attach (mew-draft-to-attach draft))
(attachdir (mew-expand-folder attach)))
(if (not (file-directory-p attachdir))
(mew-make-directory attachdir))
***************
*** 1667,1679 ****
(t
(message "Use this command in %s" mew-queue-folder)))))
(defun mew-summary-flush-queue ()
"Flush the mail queue explicitly."
(interactive)
! (if (or (not mew-ask-flush-queue) (y-or-n-p "Flush queue? "))
! (progn
! (mew-im-call-process-no-output "Sending message" mew-prog-imput "-q")
! (mew-summary-clean-folder-cache mew-queue-folder))))
(provide 'mew-summary)
--- 1667,1697 ----
(t
(message "Use this command in %s" mew-queue-folder)))))
+
+ (defvar mew-flush-process nil)
+
+ (defun mew-flushable-p ()
+ (and (not mew-flush-process)
+ mew-queue-folder
+ (directory-files (mew-expand-folder mew-queue-folder)
+ nil mew-regex-message-files)))
+
(defun mew-summary-flush-queue ()
"Flush the mail queue explicitly."
(interactive)
! (if (not (mew-flushable-p))
! (message "Can't flush the queue now")
! (if (and mew-ask-flush-queue (not (y-or-n-p "Flush queue? ")))
! (message "The queue is not flushed.")
! (message "Flushing the queue ... ")
! (setq mew-flush-process
! (mew-im-start-process mew-prog-imput "Send" nil "-q"))
! (set-process-sentinel mew-flush-process 'mew-flush-sentinel)
! (mew-summary-clean-folder-cache mew-queue-folder))))
!
! (defun mew-flush-sentinel (process event)
! (message "Flushing the queue ... done")
! (setq mew-flush-process nil))
(provide 'mew-summary)
Index: mew-vars.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-vars.el,v
retrieving revision 1.209
retrieving revision 1.210
diff -c -r1.209 -r1.210
*** mew-vars.el 1999/11/23 10:49:57 1.209
--- mew-vars.el 1999/11/24 14:51:27 1.210
***************
*** 837,842 ****
--- 837,845 ----
;; Folders
;;
+ (defvar mew-attach-folder "+attach"
+ "*The folder where attachments are contained.")
+
(defvar mew-folder-mode 448 ;; decimal for octal 0700
"Secure file mode for folders. 448(0700 in octal) is STRONGLY recommended
for privacy reasons.")
***************
*** 854,860 ****
make start-up much faster.")
;; xxx hard coding...
! (defvar mew-folders-ignore '("+from" "+draft" "=")
"*Folder list to contain messages whose To: is you and From: is
personal, e.g. a friend. Directories under this folder is ignored
for refile guess.")
--- 857,863 ----
make start-up much faster.")
;; xxx hard coding...
! (defvar mew-folders-ignore '("+from" "+draft" "+queue" "=")
"*Folder list to contain messages whose To: is you and From: is
personal, e.g. a friend. Directories under this folder is ignored
for refile guess.")
Index: mew.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew.el,v
retrieving revision 1.242
retrieving revision 1.243
diff -c -r1.242 -r1.243
*** mew.el 1999/11/23 04:43:14 1.242
--- mew.el 1999/11/24 14:51:27 1.243
***************
*** 209,216 ****
("ConfigCases" . mew-config-cases)
("ConfigCaseInbox" . mew-config-case-inbox)))
- (defvar mew-draft-mime-folder nil)
-
(defmacro mew-config-error (var key)
(` (if (null (, var))
(setq errmsg (concat errmsg "\t" (, key)
--- 209,214 ----
***************
*** 251,259 ****
(mew-config-error mew-queue-folder "QueueFolder")
(if errmsg
errmsg ;; return value
- ;; xxx hard coding... +draft/mime
- (setq mew-draft-mime-folder
- (concat (file-name-as-directory mew-draft-folder) "mime"))
(mew-config-set-modes (list mew-mail-path mew-news-path))
(mew-config-create-folders (cons mew-queue-folder
(cons mew-draft-folder
--- 249,254 ----
Index: bin/Makefile
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/bin/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** Makefile 1999/09/27 08:22:59 1.2
--- Makefile 1999/11/24 11:31:45 1.3
***************
*** 6,16 ****
--- 6,22 ----
OBJS = mewencode.o getopt.o
PRG = mewencode
ALT = mewdecode mewcat
+ #PRG = mewencode.exe
+ #ALT = mewdecode.exe mewcat.exe
OTH = uumerge
BINDIR = /usr/local/bin
PERL = /usr/local/bin/perl
+ #BINDIR = /perl/bin
+ #PERL = /perl/bin/perl
+ CP = cp
+ LN = ln
RM = rm -f
MKDIR = mkdir -p
***************
*** 22,28 ****
$(CC) -o $@ $(OBJS)
$(RM) $(ALT)
for f in $(ALT); do \
! ln $(PRG) $${f}; done
uumerge: uumerge.in
sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
--- 28,34 ----
$(CC) -o $@ $(OBJS)
$(RM) $(ALT)
for f in $(ALT); do \
! $(LN) $(PRG) $${f}; done
uumerge: uumerge.in
sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
***************
*** 32,41 ****
- at example.com [ ! -d $(BINDIR) ]; then \
$(MKDIR) $(BINDIR); \
fi; \
! cp $(PRG) $(BINDIR)
for f in $(ALT); do \
! $(RM) $(BINDIR)/$${f}; ln $(BINDIR)/$(PRG) $(BINDIR)/$${f}; done
! cp $(OTH) $(BINDIR)
clean:
$(RM) $(OBJS) $(PRG) $(ALT) $(OTH)
--- 38,47 ----
- at example.com [ ! -d $(BINDIR) ]; then \
$(MKDIR) $(BINDIR); \
fi; \
! $(CP) $(PRG) $(BINDIR)
for f in $(ALT); do \
! $(RM) $(BINDIR)/$${f}; $(LN) $(BINDIR)/$(PRG) $(BINDIR)/$${f}; done
! $(CP) $(OTH) $(BINDIR)
clean:
$(RM) $(OBJS) $(PRG) $(ALT) $(OTH)
Index: contrib/mew-fake-imap.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/contrib/mew-fake-imap.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** mew-fake-imap.el 1999/10/20 12:10:29 1.2
--- mew-fake-imap.el 1999/11/24 11:50:38 1.3
***************
*** 1,5 ****
;; -*- Mode: Emacs-Lisp -*-
! ;; $Id: mew-fake-imap.el,v 1.2 1999/10/20 12:10:29 kazu Exp $
;;
;; mew-fake-imap.el: Fake IMAP (message caching method).
;;
--- 1,5 ----
;; -*- Mode: Emacs-Lisp -*-
! ;; $Id: mew-fake-imap.el,v 1.3 1999/11/24 11:50:38 kazu Exp $
;;
;; mew-fake-imap.el: Fake IMAP (message caching method).
;;
***************
*** 194,200 ****
(call-interactively 'mew-fake-imap-mark-regexp)
(setq msgs (mew-summary-mark-collect
mew-mark-review (point-min) (point-max)))
! (mew-summary-batch-unmark (list mew-mark-review) nil)))
(if (or (and (boundp 'mark-active) mark-active)
(and (functionp 'region-exists-p) (region-exists-p)))
(setq msgs (mew-fake-imap-number
--- 194,200 ----
(call-interactively 'mew-fake-imap-mark-regexp)
(setq msgs (mew-summary-mark-collect
mew-mark-review (point-min) (point-max)))
! (mew-mark-undo-marks (list mew-mark-review) 'nomsg)))
(if (or (and (boundp 'mark-active) mark-active)
(and (functionp 'region-exists-p) (region-exists-p)))
(setq msgs (mew-fake-imap-number
Index: contrib/mew-nmz.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/contrib/mew-nmz.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** mew-nmz.el 1999/11/04 09:49:43 1.10
--- mew-nmz.el 1999/11/24 11:50:38 1.11
***************
*** 1,5 ****
;; -*- Mode: Emacs-Lisp -*-
! ;; $Id: mew-nmz.el,v 1.10 1999/11/04 09:49:43 kazu Exp $
;;
;; mew-nmz.el: Another Mew search method, powered by Namazu.
;;
--- 1,5 ----
;; -*- Mode: Emacs-Lisp -*-
! ;; $Id: mew-nmz.el,v 1.11 1999/11/24 11:50:38 kazu Exp $
;;
;; mew-nmz.el: Another Mew search method, powered by Namazu.
;;
***************
*** 384,390 ****
(if (and (mew-summary-mark-collect
mew-nmz-mark-unindexed (point-min) (point-max))
(y-or-n-p (format "Unmark '%c' ? " mew-nmz-mark-unindexed)))
! (mew-summary-batch-unmark (list mew-nmz-mark-unindexed) 'msg))
(let* ((url-file-name (expand-file-name
"NMZ.field.url"
(mew-nmz-expand-folder (buffer-name))))
--- 384,390 ----
(if (and (mew-summary-mark-collect
mew-nmz-mark-unindexed (point-min) (point-max))
(y-or-n-p (format "Unmark '%c' ? " mew-nmz-mark-unindexed)))
! (mew-mark-undo-marks (list mew-nmz-mark-unindexed)))
(let* ((url-file-name (expand-file-name
"NMZ.field.url"
(mew-nmz-expand-folder (buffer-name))))
***************
*** 711,721 ****
(insert str)
(setq str "")))
(setq fld-msgs (cdr fld-msgs))))
! (mew-summary-batch-unmark (list mew-mark-multi
! mew-mark-review
! mew-mark-delete
! mew-mark-refile
! mew-mark-tmp) nil)))
(goto-char (point-min))
(setq buffer-read-only t)
(if (null namazu-im-dirs)
--- 711,722 ----
(insert str)
(setq str "")))
(setq fld-msgs (cdr fld-msgs))))
! (mew-mark-undo-marks (list mew-mark-multi
! mew-mark-review
! mew-mark-delete
! mew-mark-unlink
! mew-mark-refile
! mew-mark-tmp) 'nomsg)))
(goto-char (point-min))
(setq buffer-read-only t)
(if (null namazu-im-dirs)
Index: contrib/mew-virtual-thread.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/contrib/mew-virtual-thread.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** mew-virtual-thread.el 1999/09/27 08:20:58 1.5
--- mew-virtual-thread.el 1999/11/24 11:50:38 1.6
***************
*** 1,5 ****
;; -*- Mode: Emacs-Lisp -*-
! ;; $Id: mew-virtual-thread.el,v 1.5 1999/09/27 08:20:58 kazu Exp $
;;
;; mew-virtual-thread.el --- "Virtual Thread mode for Mew, easy and safety :-)"
;;
--- 1,5 ----
;; -*- Mode: Emacs-Lisp -*-
! ;; $Id: mew-virtual-thread.el,v 1.6 1999/11/24 11:50:38 kazu Exp $
;;
;; mew-virtual-thread.el --- "Virtual Thread mode for Mew, easy and safety :-)"
;;
***************
*** 59,65 ****
(call-interactively 'mew-virtual-thread-mark-regexp)
(setq range (mew-summary-mark-collect
mew-mark-review (point-min) (point-max)))
! (mew-summary-batch-unmark (list mew-mark-review) nil)))
(if (or (and (boundp 'mark-active) mark-active)
(and (functionp 'region-exists-p) (region-exists-p)))
(setq range (mew-virtual-thread-number
--- 59,65 ----
(call-interactively 'mew-virtual-thread-mark-regexp)
(setq range (mew-summary-mark-collect
mew-mark-review (point-min) (point-max)))
! (mew-mark-undo-marks (list mew-mark-review) 'nomsg)))
(if (or (and (boundp 'mark-active) mark-active)
(and (functionp 'region-exists-p) (region-exists-p)))
(setq range (mew-virtual-thread-number
***************
*** 123,129 ****
mew-mark-multi (point-min) (point-max)))
(y-or-n-p (format "Unmark '%c', '%c' ? "
mew-mark-review mew-mark-multi))
! (mew-summary-batch-unmark (list mew-mark-review mew-mark-multi) 'msg))
(goto-char (point-min))
(let (msg)
(while (search-forward-regexp "^ *\\([1-9][0-9]*\\)" nil t)
--- 123,129 ----
mew-mark-multi (point-min) (point-max)))
(y-or-n-p (format "Unmark '%c', '%c' ? "
mew-mark-review mew-mark-multi))
! (mew-mark-undo-marks (list mew-mark-review mew-mark-multi)))
(goto-char (point-min))
(let (msg)
(while (search-forward-regexp "^ *\\([1-9][0-9]*\\)" nil t)
Mew-dist メーリングリストの案内