Merge trunk to elmo-imap4-compliance

Correctly get the number of the appended message

* elmo-maildir.el (elmo-folder-append-buffer): Correctly get the
number of the appended message.

Merged trunk to branch elmo-imap4-compliance

Obtain number of appended draft message by `elmo-folder-append-buffer'

* wl-draft.el (wl-draft-save): Obtain number of appended draft message
by `elmo-folder-append-buffer', handle case UID of appended message
could not be found.

Return uid of append message if requested

* elmo-date.el (elmo-time-make-imap-date-string): New
function. Return IMAP4 compliant date string.

* elmo-imap4.el (elmo-folder-append-buffer): Return uid of append
message if requested.

Return number of appended message, implemented all except IMAP

* elmo-maildir.el (elmo-folder-append-buffer): Return number of
appended message.
* elmo-localdir.el (elmo-folder-append-buffer): Dto.
* elmo-archive.el (elmo-archive-folder-append-buffer): Dto.

Add optional fourth argument, return number of appended message if possible

* elmo.el (elmo-folder-append-buffer): Add optional fourth
  argument, return number of appended message if possible.
* elmo-pipe.el (elmo-folder-append-buffer): Dto.
* elmo-maildir.el (elmo-folder-append-buffer): Dto.
* elmo-flag.el (elmo-folder-append-buffer): Dto.
* elmo-localdir.el (elmo-folder-append-buffer): Dto.
* elmo-filter.el (elmo-folder-append-buffer): Dto.
* elmo-cache.el (elmo-folder-append-buffer): Dto.
* elmo-archive.el (elmo-folder-append-buffer)
(elmo-archive-folder-append-buffer): Dto.

Merged trunk to elmo-imap4-compliance

* elmo-imap4.el (elmo-folder-delete-messages-plugged): Use smarter
mechanism to expunge messages.

If there are already messages in the mailbox with the \Deleted flag
set, use following algorithm to delete only our messages:

If `elmo-imap4-use-uid' is non-nil, and the server supports the
UIDPLUS extension, use the UID EXPUNGE command.  Otherwise temporarily
remove \Deleted flag, call EXPUNGE, and restore the flag.

If `elmo-imap4-use-uid' is nil, use old mechanism and prompt the user.

elmo-imap4.el (elmo-imap4-session-deselect-mailbox): New function.
Leave selected state without causing silent EXPUNGE.
(elmo-imap4-folder-status-plugged, elmo-folder-rename-internal): Use
function.

* elmo-imap4.el (elmo-imap4-mailbox-size-update-maybe): Ignore
EXPUNGE responses.
(elmo-imap4-mailbox-size-update-maybe): Use latest EXIST or RECENT
response value.

If the mailbox size changes due to EXPUNGE by another client the
server will inform us with a EXISTS or RECENT response.  If the
expunging didn't change the mailbox size the server might not do so.

If there are more than one EXISTS or RECENT response, use the latest.

2010-07-02  David Maus  <dmaus@ictsoc.de>

    * elmo-imap4.el (elmo-folder-next-message-number-plugged): Close
    mailbox before calling STATUS if selected.  If
    `elmo-imap4-use-select-to-update-status' is non-nil, do the opposite.

2010-07-02  David Maus  <dmaus@ictsoc.de>

* elmo-imap4.el (elmo-imap4-folder-status-plugged): Remove usage of kill file to
adjust message counter.

2010-07-02  David Maus  <dmaus@ictsoc.de>

* elmo-imap4.el (elmo-server-diff-async): Remove.  Unused luna
method.
(elmo-imap4-folder-status-plugged): Close mailbox before calling
STATUS if it is selected.  If
`elmo-imap4-use-select-to-update-status' is non-nil, do the
opposite.

* elmo-imap4.el (elmo-imap4-mailbox-selected-p): Fix typo.

* elmo-imap4.el (elmo-imap4-mailbox-selected-p): New macro.
Return non-nil if mailbox is selected in session.
(elmo-imap4-session-select-mailbox): Use macro
`elmo-imap4-mailbox-selected-p'.
(elmo-folder-exists-p-plugged): Dto.
(elmo-folder-check-plugged): Dto.
(elmo-imap4-folder-diff-plugged): Dto.

* elmo-imap4.el (elmo-imap4-mailbox-size-update-maybe): Use
simpler method to count expunged messages.
(elmo-imap4-folder-diff-plugged): Use NOOP and SEARCH when called
for selected mailbox.

Remove usage of kill file to adjust message counter.

The kill file contains cons' with ranges of UIDs that are considered
'killed', i.e. hidden from user's view.  But these ranges cannot be
used to adjust counter of total messages in a IMAP4 mailbox: A range
of (1 . 100) does not necessarily refer to 100 messages.  E.g. if
there are 100 messages in the mailbox with UID ranging from 1 to 100
and you delete the first message, the range (1 . 100) refers to 99
messages.

* elmo-imap4.el (elmo-imap4-mailbox-size-update-maybe): Build list of
  expunged messages only when response contains expunge.

Record mailbox size changes of selected IMAP4 mailbox.  Required to
comply with RFC 3501, section 7.3 and 7.4.1.

Note: EXPUNGE response is recognized to decrement number of
messages in mailbox only.

This commit was manufactured by cvs2svn to create branch 'elmo-
imap4-compliance'.

* elmo-imap4.el (elmo-imap4-folder-name-syntax): Allow numbers in
  imap user name.

* elmo-imap4.el (elmo-imap4-disabled-extension): New
variable. List of server extensions that are disabled on the
client side.
(elmo-imap4-session-capable-p): Honour list of disabled
extensions.

Let user disable server extensions on the client side.  Provides way
to work around problematic or bugged server implementations
(e.g. problems with MS Exchange 2007 and ESEARCH capability).

* elmo-imap4.el (elmo-imap4-folder-list-flagged)
(elmo-imap4-search-internal-primitive): Pass filter type to imap
search when performing search for flagged messages.

* elmo-imap4.el (elmo-imap4-folder-list-flagged)
(elmo-imap4-search-internal-primitive): Pass filter type to
imap search when performing search for flagged messages.

Fixes debian bug #573726.

(wl-user-agent-insert-body): Make sure body ends with newline.
(wl-user-agent-compose, wl-user-agent-compose-internal): Fix regexps so as to
 match header tokens strictly.

* etc/icons/unplugged.xpm: Change design. Use `unplugged' style instead of `prohibition sign' style.

(wl-summary-test-spam): Call `wl-summary-unmark-spam' for the message not
 classified as spam.
(wl-summary-test-spam-messages): New function.
(wl-summary-test-spam-region): Use `wl-summary-test-spam-messages' instead of
 `wl-spam-map-spam-messages'.

Define unmark functions for temporary marks.

(wl-summary-action-unmark-docstring): New inline function.
(wl-summary-define-mark-action): Define unmark functions.
(wl-summary-unmark): Add the second argument `mark'.
(wl-summary-delete-all-mark): Pass `mark' to `wl-summary-unmark'.

Inhibit pgp autodecryption for draft preview

Fix date in Changelog.

Ask IMAP server for capabilities after login.

Remove empty entity files from modb cache.

* test-utf7.el (test-utf7-encode-string-alpha): Fix indent.

* test-elmo-date.el (test-elmo-date-get-week): Add assert.

New feature: toggle visibility of MIME buttons.

* elmo-imap4.el (elmo-folder-list-messages-plugged): Use TAB for
indent (only cosmetic fix).

Add ESEARCH feature entry to NEWS & NEWS.ja.

Add `elmo-imap4-set-seen-flag-explicitly' entry to NEWS & NEWS.ja.

New custom `elmo-imap4-set-seen-flag-explicitly' to override setting
of Seen flag for some buggy servers.

Replace deprecated time-stamp-hh:mm:ss by format-time-string

Bump version to 2.15.9

Implement partial UIDs update for IMAP

Better logging for imap4 proto

Added support for ESEARCH feature (RFC4731)

* wl-score.el (wl-score-followup): Remove verbose comment (same as docstring).

* wl-addrbook.el (wl-summary-addrbook-add): Use `with-current-buffer' instead of `save-excursion' & `set-buffer'.

* wl-summary.el (wl-summary-update-persistent-mark-on-event):
Revert `save-excursion' for `wl-summary-jump-to-msg'.

Undo last commit.

* elmo-util.el (elmo-set-work-buf): Revert `save-excursion' for robustness.

Fix last change (comment-style).

* wl.el (wl-toggle-plugged, wl-plugged-dop-queue-info)
(wl-plugged-exit, wl-exit): Fix comment-out style. Use three
semicolons, that should start at the left margin.
See. also (Info-goto-node "(elisp)Comment Tips").
* wl-acap.el (wl-acap-store): Ditto.
* wl-action.el (wl-summary-unset-mark): Ditto.
* wl-address.el (wl-address-ldap-search): Ditto.
* wl-demo.el (wl-demo-insert-image): Ditto.
* wl-dnd.el (wl-dnd-set-drag-starter): Ditto.
* wl-draft.el (wl-draft-normal-send-func, wl-draft-send)
(wl-draft-previous-history-element): Ditto.
* wl-e21.el (wl-draft-key-setup, wl-draft-overload-functions): Ditto.
* wl-folder.el (toplevel, wl-folder-mode-menu-spec)
(wl-folder-mode-map, wl-folder-get-prev-folder)
(wl-folder-jump-to-current-entity, wl-folder-check-entity)
(wl-folder-check-entity-async)
(wl-create-folder-entity-from-buffer): Ditto.
* wl-fldmgr.el (toplevel): Ditto.
* wl-message.el (wl-message-buffer-cache-sort)
(wl-message-redisplay, wl-message-buffer-prefetch-clear-timer):
Ditto.
* wl-mule.el (wl-draft-key-setup, wl-draft-overload-functions):
Ditto.
* wl-summary.el (toplevel, wl-summary-mode)
(wl-summary-edit-addresses, wl-summary-sync-update)
(wl-summary-stick): Ditto.
* wl-thread.el (toplevel, wl-thread-insert-message)
(wl-thread-insert-entity-sub, wl-thread-open-close): Ditto.
* wl-util.el (toplevel): Ditto.
* wl-xmas.el (wl-draft-key-setup, wl-draft-overload-functions):
Ditto.

* acap.el (acap-parse-response): Fix comment-out style. Use three
semicolons, that should start at the left margin.
See. also (Info-goto-node "(elisp)Comment Tips").
* elmo.el (toplevel, elmo-message-match-condition)
(elmo-folder-set-info-max-by-numdb, elmo-folder-move-messages):
Ditto.
* elmo-archive.el (elmo-archive-suffix-alist)
(elmo-archive-tar-method-alist, elmo-archive-tgz-method-alist)
(elmo-archive-method-list)
(elmo-archive-msgdb-create-as-numlist-subr2, elmo-folder-search):
Ditto.
* elmo-imap4.el (toplevel)
(elmo-imap4-send-command, elmo-imap4-check-validity)
(elmo-imap4-fetch-callback-1-subr)
(elmo-network-initialize-session, elmo-server-diff-async)
(elmo-imap4-folder-diff-plugged): Ditto
* elmo-maildir.el (elmo-maildir-temporal-filename): Ditto.
* elmo-msgdb.el (elmo-msgdb-append-element): Ditto.
* elmo-net.el (elmo-network-close-session): Ditto.
* elmo-nntp.el (elmo-nntp-create-msgdb-from-overview-string)
(elmo-nntp-parse-overview-string, elmo-nntp-post): Ditto.
* elmo-pop3.el (elmo-pop3-retrieve-headers):  Ditto.
* elmo-util.el (elmo-set-auto-coding, elmo-passwd-alist-save)
(elmo-number-set-delete)
(elmo-cache-get-oldest-cache-file-entity): Ditto.

Version number is increased to 2.15.8.

* WL-MK (wl-scan-source, wl-uninstall)
(compile-wl-package, install-wl-package)
(compile-wl-package-xmas, install-wl-package-xmas)
(wl-texinfo-format, wl-texinfo-install) : Use `mapc' instead of
`mapcar'. Don't quote `lambda'.

* wl-message.el (wl-message-uu-substring): Suppress compile
warnings; Use `with-current-buffer' instead of `save-excursion' &
`set-buffer'.
* wl-mime.el (wl-draft-yank-current-message-entity)
(wl-mime-preview-follow-no-mime)
(wl-mime-preview-follow-current-region): Ditto.
* wl-summary.el (wl-summary-update-persistent-mark-on-event)
(wl-summary-switch-to-clone-buffer)
(wl-summary-target-mark-forward)
(wl-summary-target-mark-reply-with-citation)
(wl-summary-target-mark-uudecode): Ditto.

* elmo-mime.el (elmo-mime-insert-header-from-buffer): Use
`with-current-buffer' instead of `save-excursion' (for suppress
compile warnings).

* wl-addrmgr.el (wl-addrmgr-replace-field): Use `point-at-bol'.
* wl-action.el (wl-summary-remove-argument): Explicit `point-at-bol'.
* wl-summary.el (wl-summary-narrow-to-region)
(wl-summary-insert-line): Use `point-at-bol', `point-at-eol'.

Fix changelog typo.

* elmo.el (elmo-folder-confirm-appends): Use `number-to-string'
instead of `int-to-string'.
* elmo-archive.el (elmo-archive-message-fetch-internal)
(elmo-archive-folder-message-make-temp-files)
(elmo-archive-folder-append-buffer)
(elmo-folder-delete-messages-internal)
(elmo-archive-msgdb-create-entity)
(elmo-archive-msgdb-create-as-numlist-subr2): Ditto.
* elmo-util.el (elmo-cache-expire-by-age): Ditto.
* elmo-flag.el (elmo-global-flag-set-internal): Ditto.
* elmo-file.el (elmo-folder-message-make-temp-files): Ditto.
* elmo-imap4.el (elmo-imap4-make-number-set-list)
(elmo-folder-list-subfolders): Ditto.
* elmo-localdir.el (elmo-message-file-name)
(elmo-folder-message-make-temp-files)
(elmo-localdir-msgdb-create-entity)
(elmo-folder-append-messages-*-localdir)
(elmo-folder-pack-numbers): Ditto.
* elmo-maildir.el (elmo-folder-message-make-temp-files): Ditto.
* elmo-map.el (elmo-location-map-key): Ditto.
* elmo-nntp.el (elmo-nntp-folder-postfix)
(elmo-nntp-folder-list-subfolders)
(elmo-nntp-folder-msgdb-create): Ditto.

* wl.el (wl-plugged-sending-queue-status): Use `int-to-string'
instead of `number-to-string'.
* wl-dnd.el (wl-dnd-start-drag): Ditto.
* wl-score.el (wl-score-insert-help, wl-summary-increase-score): Ditto.
* wl-summary.el (wl-summary-jump-to-msg, wl-summary-save): Ditto.
* wl-util.el (wl-url-nntp): Ditto.

Fix last change.  Cosmetic fix around `lambda (x)'.

* wl.el (wl-plugged-set-variables, wl-plugged-dop-queue-info)
(wl-plugged-dop-queue-status): Don't quote `lambda'.
* wl-thread.el (wl-thread-delete-message): Ditto
* wl-summary.el (wl-summary-edit-addresses)
(wl-summary-edit-addresses-collect-candidate-fields)
(wl-summary-search-by-subject): Ditto.
* wl-mime.el (wl-mime-node-id-to-string): Ditto.
* wl-fldmgr.el (wl-fldmgr-add-completion-all-completions)
(wl-fldmgr-add-completion-subr): Ditto.
* wl-draft.el (wl-smtp-extension-bind)
(wl-draft-insert-get-message, wl-draft-default-headers)
(wl-jump-to-draft-buffer): Ditto.
* wl-summary.el (wl-summary-cursor-move-surface, wl-summary-up)
(wl-summary-down): Ditto.
* wl-message.el (wl-message-buffer-prefetch-subr): Ditto.
* wl-draft.el (wl-draft-reply, wl-draft-write-sendlog): Ditto.
* wl-folder.el (wl-folder-make-save-access-list)
(wl-folder-update-access-group, wl-folder-pick): Ditto.

* elmo.el (elmo-crosspost-message-alist-save): Don't use
`function' for `lambda'.
* elmo-archive.el (elmo-archive-folder-list-subfolders)
(elmo-folder-append-messages-*-archive)
(elmo-folder-delete-messages-internal): Ditto.
* elmo-date.el (elmo-replace-in-string): Ditto.
* elmo-multi.el (elmo-folder-list-messages, elmo-folder-search)
(elmo-folder-list-flagged): Ditto.
* elmo-maildir.el (elmo-maildir-cleanup-temporal): Ditto.
* elmo-imap4.el (elmo-network-authenticate-session): Ditto.
* modb-standard.el (modb-standard-cleanup-stale-entities): Ditto.

* elmo-dop.el (elmo-dop-spool-folder): Suppress warning "defsubst
`elmo-dop-spool-folder' was used before it was defined"; Use
`defun' instead.

* wl-draft.el (wl-draft-default-headers): Suppress warning
"defsubst `wl-draft-default-headers' was used before it was
defined"; Use `defun' instead of `defsubst'.

* wl-folder.el (wl-folder-get-entity-from-buffer): Macro to function.
* wl-util.el (wl-match-string, wl-match-buffer):  Macro to function.
* wl-summary.el (wl-summary-message-status): Macro to inline-function.
* wl.el (wl-plugged-string): Macro to function.

* pldap.el (ldap/ldif-safe-string-p): macro to function.
* elmo-imap4.el (elmo-imap4-detect-search-charset): Ditto.

* wl-address.el (wl-address-header-extract-address)
(wl-address-header-extract-realname): Fix mail-address in docstring.

* wl-expire.el (wl-expire-make-sortable-date): Macro to inline-function.
* wl-folder.el (wl-folder-unread-regex, wl-folder-buffer-group-p): Macro to function.
* wl-highlight.el (wl-delete-all-overlays):  Macro to function.
* wl-summary.el (wl-summary-get-alike): Macro to inline-function.
(wl-summary-buffer-folder-name, wl-summary-sticky-buffer-name): Macro to function.

* wl-thread.el (wl-thread-open, wl-thread-close): Use `point-at-bol', `point-at-eol'.

* wl.el (wl-plugged-server-indent, wl-plugged-drawing)
(wl-plugged-redrawing-switch, wl-plugged-toggle): Use `(string-to-char " ")' instead of `? ', `?\ '.
* wl-action.el (wl-summary-print-argument): Ditto.
* wl-address.el (wl-complete-field-body): Ditto.
* wl-demo.el (wl-demo-insert-image): Ditto.
* wl-summary.el (wl-summary-edit-addresses-subr): Ditto.
* wl-util.el (wl-ask-folder, wl-set-string-width)
(wl-y-or-n-p-with-scroll): Ditto.

* elmo.el (elmo-folder-info-make-hashtb): Use `mapc' instead of `mapcar'; Suppress compile warning.
* elmo-imap4.el (elmo-network-initialize-session-buffer)
(elmo-imap4-search-internal-primitive): Ditto.
* elmo-nntp.el (elmo-nntp-search-primitive): Ditto.
* elmo-archive.el (elmo-archive-exec-msgs-subr2): Ditto.

* elmo-imap4.el (elmo-imap4-parse-address-list)
(elmo-imap4-parse-fetch-body-section, elmo-imap4-parse-body)
(elmo-imap4-parse-acl, elmo-imap4-parse-body-extension)
(elmo-imap4-parse-body-ext, elmo-imap4-parse-body): Use `(string-to-char " ")' instead of `? ', `?\ '.

* wl-addrmgr.el(wl-addrmgr-mark-write): Use `string-to-char' instead of `? '.  Use `point-at-bol' and `point-at-eol'.  Remove verbose point move.

* wl-address.el (wl-address-add-or-change): Use `point-at-bol' and `point-at-eol'.
* wl-addrmgr.el (wl-addrmgr-unmark, wl-addrmgr-address-entry): Ditto.

* wl-util.el (wl-count-lines): Use `point-at-bol' instead of `(beginning-of-line) (point)'.

* wl-fldmgr.el (wl-fldmgr-make-indent): Change from macro to function.
(wl-fldmgr-delete-line): Change from macro to function. Use `point-at-bol' and `point-at-eol'.

* wl.el (toplevel): Use `mapc' instead of `mapcar'. Don't use `function' for lambda.

* wl.el (wl-plugged-server-indent): Change from macro to function.

* wl-score.el (wl-score-put-alike): Explicit add `alike' argument.

Revert wl-score-put-alike.

* wl-draft.el (wl-draft-config-body-goto-header)
(wl-draft-body-goto-top, wl-draft-body-goto-bottom): Change from macro to function.

* wl-score.el (wl-score-get-alike, wl-score-put-alike): Change from macro to inline-function.

(wl-kill-buffers): Change from macro to function.
(wl-count-lines): Change from macro to inline-function.

Fix last `wl-kill-buffers' change.

* pldap.el (ldap-search-entries): Don't use `function' for lambda.
(ldap-add-entries, ldap-modify-entries): Use `mapc' instead of `mapcar'.
(ldap-delete-entries): Use `mapc' instead of `mapcar'. Don't use `function' for lambda.

* wl-util.el (wl-collect-summary, wl-kill-buffers): Use `mapc' instead of `mapcar'. Don't use `function' for lambda.
(wl-read-search-condition-internal): Don't use `function' for lambda.

Fix order (cosmetic fix).

Cosmetic fix.

* wl-draft.el (wl-draft-generate-clone-buffer, wl-draft-config-exec): Suppress compile warnings; Use `with-current-buffer' instead of `save-excursion' & `set-buffer'.

* wl-score.el (wl-score-insert-help, wl-score-edit-get-header)
(wl-score-edit-insert-number): Suppress compile warnings; Use `with-current-buffer' instead of `save-excursion' & `set-buffer'.

* wl-draft.el (wl-draft-reply): Use `elmo-parse' instead of `wl-parse'.

* wl-draft.el (wl-draft-send, wl-draft-do-fcc): Suppress compile warnings; Use
`with-current-buffer' instead of `save-excursion' & `set-buffer'.
* wl-draft.el (wl-draft-do-fcc): Use `with-temp-buffer'.

* wl-draft.el (wl-draft-add-in-reply-to, wl-draft-delete): Suppress compile warnings; Use `with-current-buffer' instead of `save-excursion' & `set-buffer'.

* modb-standard.el (modb-standard-cleanup-stale-entities): Use `string-to-number' instead of `string-to-int'.

* test-elmo-util.el (test-elmo-delete-cr-1): New testcase.
* test-elmo-date.el (test-elmo-time-parse-date-string-1)
(test-elmo-time-parse-date-string-2): New testcase.

* wl.el (wl-plugged-change): Suppress compile warnings; Use
`with-current-buffer' instead of `save-excursion' & `set-buffer'.
* wl-action.el (wl-summary-exec-action-resend-subr): Ditto.
* wl-address.el (wl-complete-window-show): Ditto.
* wl-message.el (wl-message-select-buffer): Ditto.
* wl-template.el (wl-template-show): Ditto.
* wl-util.el (wl-collect-summary): Ditto.

* wl-util.el (wl-collect-summary): Use `eq' instead of `equal' for symbol.

* wl-action.el (wl-summary-auto-refile): Use `goto-char' instead of `goto-line'.