diff options
| author | Bill Wohler <wohler@newt.com> | 2006-01-29 19:34:57 +0000 |
|---|---|---|
| committer | Bill Wohler <wohler@newt.com> | 2006-01-29 19:34:57 +0000 |
| commit | dda00b2cb544301117d2e6b20e9190f3497ab44e (patch) | |
| tree | 6f42177ea323627aa661aaf4b1e1a7ad3928b843 /lisp/mh-e/mh-mime.el | |
| parent | a102b252928c9274ef6c8f0f93b1a905d8cecac0 (diff) | |
| download | emacs-dda00b2cb544301117d2e6b20e9190f3497ab44e.tar.gz | |
The Great Cleanup
Remove circular dependencies.
mh-e.el now includes few require statements and stands alone. Other
files should need to require mh-e.el, which requires mh-loaddefs.el,
plus variable-only files such as mh-scan.el.
Remove unneeded require statements.
Remove unneeded load statements, or replace them with non-fatal
require statements.
Break out components into their own files that were often spread
between many files. As a result, many functions that are now only used
within a single file no longer need to be autoloaded.
Rearrange and provide consistent headings.
Untabify.
* mh-acros.el: Update commentary to reflect current usage. Add
autoload cookies to all macros.
(mh-require-cl): Merge docstring and comment.
(mh-do-in-xemacs): Fix typo in docstring.
(assoc-string): Move to new file mh-compat.el.
(with-mh-folder-updating, mh-in-show-buffer)
(mh-do-at-event-location, mh-seq-msgs): Move here from mh-utils.el.
(mh-iterate-on-messages-in-region, mh-iterate-on-range): Move here
from mh-seq.el.
* mh-alias.el (mh-address-mail-regexp)
(mh-goto-address-find-address-at-point): Move here from mh-utils.el.
(mh-folder-line-matches-show-buffer-p): Move here from mh-e.el.
* mh-buffers.el: Update descriptive text.
* mh-comp.el (mh-note-repl, mh-note-forw, mh-note-dist): Move to new
file mh-scan.el.
(mh-yank-hooks, mh-to-field-choices, mh-position-on-field)
(mh-letter-menu, mh-letter-mode-help-messages)
(mh-letter-buttons-init-flag, mh-letter-mode)
(mh-font-lock-field-data, mh-letter-header-end)
(mh-auto-fill-for-letter, mh-to-field, mh-to-fcc)
(mh-file-is-vcard-p, mh-insert-signature, mh-check-whom)
(mh-insert-letter, mh-extract-from-attribution, mh-yank-cur-msg)
(mh-filter-out-non-text, mh-insert-prefix-string)
(mh-current-fill-prefix, mh-open-line, mh-complete-word)
(mh-folder-expand-at-point, mh-letter-complete-function-alist)
(mh-letter-complete, mh-letter-complete-or-space)
(mh-letter-confirm-address, mh-letter-header-field-at-point)
(mh-letter-next-header-field-or-indent)
(mh-letter-next-header-field, mh-letter-previous-header-field)
(mh-letter-skipped-header-field-p)
(mh-letter-skip-leading-whitespace-in-header-field)
(mh-hidden-header-keymap)
(mh-letter-toggle-header-field-display-button)
(mh-letter-toggle-header-field-display)
(mh-letter-truncate-header-field, mh-letter-mode-map): Move to new
file mh-letter.el.
(mh-letter-mode-map, mh-sent-from-folder, mh-send-args)
(mh-pgp-support-flag, mh-x-mailer-string)
(mh-letter-header-field-regexp): Move to mh-e.el.
(mh-goto-header-field, mh-goto-header-end)
(mh-extract-from-header-value, mh-beginning-of-word): Move to
mh-utils.el.
(mh-insert-header-separator): Move to mh-comp.el.
(mh-display-completion-list-compat): Move to new file mh-compat.el.
* mh-compat.el: New file.
(assoc-string): Move here from mh-acros.el.
(mh-display-completion-list): Move here from mh-comp.el.
* mh-customize.el: Move content into mh-e.el and remove.
* mh-e.el (mh-folder-mode-map, mh-folder-seq-tool-bar-map)
(mh-folder-tool-bar-map, mh-inc-spool-map, mh-letter-mode-map)
(mh-letter-tool-bar-map, mh-search-mode-map, mh-show-mode-map)
(mh-show-seq-tool-bar-map, mh-show-tool-bar-map): All maps now
declared here so that they can be used in docstrings.
(mh-sent-from-folder, mh-sent-from-msg)
(mh-letter-header-field-regexp, mh-pgp-support-flag)
(mh-x-mailer-string): Move here from mh-comp.el.
(mh-folder-line-matches-show-buffer-p): Move to mh-alias.el.
(mh-thread-scan-line-map, mh-thread-scan-line-map-stack): Move here
from mh-seq.el.
(mh-draft-folder, mh-inbox, mh-user-path, mh-current-folder)
(mh-previous-window-config, mh-seen-list, mh-seq-list)
(mh-show-buffer, mh-showing-mode, mh-globals-hash)
(mh-show-folder-buffer, mh-mail-header-separator)
(mh-unseen-seq, mh-previous-seq, mh-page-to-next-msg-flag)
(mh-signature-separator, mh-signature-separator-regexp)
(mh-list-to-string, mh-list-to-string-1): Move here from mh-utils.el.
(mh-index-max-cmdline-args, mh-xargs, mh-quote-for-shell)
(mh-exec-cmd, mh-exec-cmd-error, mh-exec-cmd-daemon)
(mh-exec-cmd-env-daemon, mh-process-daemon, mh-exec-cmd-quiet)
(mh-exec-cmd-output)
(mh-exchange-point-and-mark-preserving-active-mark)
(mh-exec-lib-cmd-output, mh-handle-process-error): Move here from
deprecated file mh-exec.el.
(mh-path): Move here from deprecated file mh-customize.el.
(mh-sys-path, mh-variants, mh-variant-in-use, mh-progs, mh-lib)
(mh-flists-present-flag, mh-variants, mh-variant-mh-info)
(mh-variant-mu-mh-info, mh-variant-nmh-info, mh-file-command-p)
(mh-variant-set-variant, mh-variant-p, mh-profile-component)
(mh-profile-component-value, mh-defface-compat): Move here from
deprecated file mh-init.el.
(mh-goto-next-button, mh-folder-mime-action)
(mh-folder-toggle-mime-part, mh-folder-inline-mime-part)
(mh-folder-save-mime-part, mh-toggle-mime-buttons): Move to to
mh-mime.el.
(mh-scan-format-mh, mh-scan-format-nmh, mh-note-deleted)
(mh-note-refiled, mh-note-cur, mh-scan-good-msg-regexp)
(mh-scan-deleted-msg-regexp, mh-scan-refiled-msg-regexp)
(mh-scan-valid-regexp, mh-scan-cur-msg-number-regexp)
(mh-scan-date-regexp, mh-scan-rcpt-regexp, mh-scan-body-regexp)
(mh-scan-subject-regexp, mh-scan-sent-to-me-sender-regexp)
(mh-scan-cmd-note-width, mh-scan-destination-width)
(mh-scan-date-width, mh-scan-date-flag-width)
(mh-scan-from-mbox-width, mh-scan-from-mbox-sep-width)
(mh-scan-field-destination-offset)
(mh-scan-field-from-start-offset, mh-scan-field-from-end-offset)
(mh-scan-field-subject-start-offset, mh-scan-format)
(mh-msg-num-width-to-column, mh-set-cmd-note): Move to new file
mh-scan.el.
(mh-partial-folder-mode-line-annotation)
(mh-folder-font-lock-keywords, mh-folder-font-lock-subject)
(mh-generate-sequence-font-lock, mh-last-destination)
(mh-last-destination-write, mh-first-msg-num, mh-last-msg-num)
(mh-rmail, mh-nmail, mh-delete-msg, mh-delete-msg-no-motion)
(mh-execute-commands, mh-first-msg, mh-header-display)
(mh-inc-folder, mh-last-msg, mh-next-undeleted-msg)
(mh-folder-from-address, mh-prompt-for-refile-folder)
(mh-refile-msg, mh-refile-or-write-again, mh-quit, mh-page-msg)
(mh-previous-page, mh-previous-undeleted-msg)
(mh-previous-unread-msg, mh-next-button, mh-prev-button)
(mh-reset-threads-and-narrowing, mh-rescan-folder)
(mh-write-msg-to-file, mh-toggle-showing, mh-undo)
(mh-visit-folder, mh-update-sequences, mh-delete-a-msg)
(mh-refile-a-msg, mh-next-msg, mh-next-unread-msg)
(mh-set-scan-mode, mh-undo-msg, mh-make-folder)
(mh-folder-sequence-menu, mh-folder-message-menu)
(mh-folder-folder-menu, mh-remove-xemacs-horizontal-scrollbar)
(mh-write-file-functions-compat, mh-folder-mode)
(mh-restore-desktop-buffer, mh-scan-folder)
(mh-regenerate-headers, mh-generate-new-cmd-note)
(mh-get-new-mail, mh-make-folder-mode-line, mh-goto-cur-msg)
(mh-process-or-undo-commands, mh-process-commands)
(mh-update-unseen, mh-delete-scan-msgs)
(mh-outstanding-commands-p): Move to new file mh-folder.el.
(mh-mapc, mh-colors-available-p, mh-colors-in-use-p)
(mh-make-local-vars, mh-coalesce-msg-list, mh-greaterp)
(mh-lessp): Move to mh-utils.el.
(mh-parse-flist-output-line, mh-folder-size-folder)
(mh-folder-size-flist, mh-folder-size, mh-add-sequence-notation)
(mh-remove-sequence-notation, mh-remove-cur-notation)
(mh-remove-all-notation, mh-delete-seq-locally)
(mh-read-folder-sequences, mh-read-msg-list)
(mh-notate-user-sequences, mh-internal-seqs, mh-internal-seq)
(mh-valid-seq-p, mh-delete-msg-from-seq, mh-catchup)
(mh-delete-a-msg-from-seq, mh-undefine-sequence)
(mh-define-sequence, mh-seq-containing-msg): Move to mh-seq.el.
(mh-xemacs-flag)
(mh-customize, mh-e, mh-alias, mh-folder, mh-folder-selection)
(mh-identity, mh-inc, mh-junk, mh-letter, mh-ranges)
(mh-scan-line-formats, mh-search, mh-sending-mail, mh-sequences)
(mh-show, mh-speedbar, mh-thread, mh-tool-bar, mh-hooks)
(mh-faces, mh-alias-completion-ignore-case-flag)
(mh-alias-expand-aliases-flag, mh-alias-flash-on-comma)
(mh-alias-insert-file, mh-alias-insertion-location)
(mh-alias-local-users, mh-alias-local-users-prefix)
(mh-alias-passwd-gecos-comma-separator-flag)
(mh-new-messages-folders, mh-ticked-messages-folders)
(mh-large-folder, mh-recenter-summary-flag)
(mh-recursive-folders-flag, mh-sortm-args)
(mh-default-folder-for-message-function, mh-default-folder-list)
(mh-default-folder-must-exist-flag, mh-default-folder-prefix)
(mh-identity-list, mh-auto-fields-list)
(mh-auto-fields-prompt-flag, mh-identity-default)
(mh-identity-handlers, mh-inc-prog, mh-inc-spool-list)
(mh-junk-choice, mh-junk-function-alist, mh-junk-choose)
(mh-junk-background, mh-junk-disposition, mh-junk-program)
(mh-compose-insertion, mh-compose-skipped-header-fields)
(mh-compose-space-does-completion-flag)
(mh-delete-yanked-msg-window-flag)
(mh-extract-from-attribution-verb, mh-ins-buf-prefix)
(mh-letter-complete-function, mh-letter-fill-column)
(mh-mml-method-default, mh-signature-file-name)
(mh-signature-separator-flag, mh-x-face-file, mh-yank-behavior)
(mh-interpret-number-as-range-flag, mh-adaptive-cmd-note-flag)
(mh-scan-format-file-check, mh-scan-format-file)
(mh-adaptive-cmd-note-flag-check, mh-scan-prog)
(mh-search-program, mh-compose-forward-as-mime-flag)
(mh-compose-letter-function, mh-compose-prompt-flag)
(mh-forward-subject-format, mh-insert-x-mailer-flag)
(mh-redist-full-contents-flag, mh-reply-default-reply-to)
(mh-reply-show-message-flag, mh-refile-preserves-sequences-flag)
(mh-tick-seq, mh-update-sequences-after-mh-show-flag)
(mh-bury-show-buffer-flag, mh-clean-message-header-flag)
(mh-decode-mime-flag, mh-display-buttons-for-alternatives-flag)
(mh-display-buttons-for-inline-parts-flag)
(mh-do-not-confirm-flag, mh-fetch-x-image-url)
(mh-graphical-smileys-flag, mh-graphical-emphasis-flag)
(mh-highlight-citation-style)
(mh-invisible-header-fields-internal)
(mh-delay-invisible-header-generation-flag)
(mh-invisible-header-fields, mh-invisible-header-fields-default)
(mh-invisible-header-fields-compiled, mh-invisible-headers)
(mh-lpr-command-format, mh-max-inline-image-height)
(mh-max-inline-image-width, mh-mhl-format-file)
(mh-mime-save-parts-default-directory, mh-print-background-flag)
(mh-show-maximum-size, mh-show-use-goto-addr-flag)
(mh-show-use-xface-flag, mh-store-default-directory)
(mh-summary-height, mh-speed-update-interval)
(mh-show-threads-flag, mh-tool-bar-search-function)
(mh-after-commands-processed-hook, mh-alias-reloaded-hook)
(mh-before-commands-processed-hook, mh-before-quit-hook)
(mh-before-send-letter-hook, mh-delete-msg-hook)
(mh-find-path-hook, mh-folder-mode-hook, mh-forward-hook)
(mh-inc-folder-hook, mh-insert-signature-hook)
(mh-kill-folder-suppress-prompt-hooks, mh-letter-mode-hook)
(mh-mh-to-mime-hook, mh-search-mode-hook, mh-quit-hook)
(mh-refile-msg-hook, mh-show-hook, mh-show-mode-hook)
(mh-unseen-updated-hook, mh-min-colors-defined-flag)
(mh-folder-address, mh-folder-body)
(mh-folder-cur-msg-number, mh-folder-date, mh-folder-deleted)
(mh-folder-followup, mh-folder-msg-number, mh-folder-refiled)
(mh-folder-sent-to-me-hint, mh-folder-sent-to-me-sender)
(mh-folder-subject, mh-folder-tick, mh-folder-to)
(mh-search-folder, mh-letter-header-field, mh-show-cc)
(mh-show-date, mh-show-from, mh-show-header, mh-show-pgg-bad)
(mh-show-pgg-good, mh-show-pgg-unknown, mh-show-signature)
(mh-show-subject, mh-show-to, mh-show-xface, mh-speedbar-folder)
(mh-speedbar-folder-with-unseen-messages)
(mh-speedbar-selected-folder)
(mh-speedbar-selected-folder-with-unseen-messages): Move here from
deprecated file mh-customize.el.
* mh-exec.el: Move content into mh-e.el and remove.
* mh-folder.el: New file. Contains mh-folder-mode from mh-e.el
* mh-funcs.el (mh-note-copied, mh-note-printed): Move to new file
mh-scan.el.
(mh-ephem-message, mh-help, mh-prefix-help): Move to mh-utils.el.
* mh-gnus.el (mm-uu-dissect-text-parts): Add.
(mh-mail-abbrev-make-syntax-table): Move to mh-utils.el and rename to
mail-abbrev-make-syntax-table.
* mh-identity.el (mh-identity-menu): New variable for existing menu.
(mh-identity-make-menu-no-autoload): New alias for
mh-identity-make-menu which can be called from mh-e.el.
(mh-identity-list-set): Move to mh-e.el.
(mh-identity-add-menu): New function
(mh-insert-identity): Add optional argument maybe-insert so that local
variable mh-identity-local does not have to be visible.
(mh-identity-handler-default):
* mh-inc.el (mh-inc-spool-map): Move declaration to mh-e.el (with rest
of keymaps). Update key binding for ? to call mh-help with help
messages in new argument.
(mh-inc-spool-make-no-autoload): New alias for mh-inc-spool-make which
can be called from mh-e.el.
(mh-inc-spool-list-set): Simplify update of mh-inc-spool-map-help.
* mh-init.el: Move content into mh-e.el and remove.
* mh-junk.el: Update requires, untabify, and add mh-autoload cookies.
* mh-letter.el: New file. Contains mh-letter-mode from mh-comp.el.
* mh-limit.el: New file. Contains display limit commands from
mh-mime.el.
* mh-mime.el: Rearrange for consistency with other files.
(mh-buffer-data, mh-mm-inline-media-tests): Move here from
mh-utils.el.
(mh-folder-inline-mime-part, mh-folder-save-mime-part)
(mh-folder-toggle-mime-part, mh-toggle-mime-buttons)
(mh-goto-next-button): Move here from mh-e.el.
* mh-print.el: Rearrange for consistency with other files.
* mh-scan.el: New file. Contains scan line constants and utilities
from XXX, mh-funcs, mh-utils.el.
* mh-search.el: Rearrange for consistency with other files.
(mh-search-mode-map): Drop C-c C-f {dr} bindings since these fields
which don't exist in the saved header. Replace C-c C-f f with C-c C-f
m per mail-mode consistency.
(mh-search-mode): Use mh-set-help instead of setting mh-help-messages.
* mh-seq.el (mh-thread-message, mh-thread-container)
(mh-thread-id-hash, mh-thread-subject-hash, mh-thread-id-table)
(mh-thread-id-index-map, mh-thread-index-id-map)
(mh-thread-scan-line-map, mh-thread-scan-line-map-stack)
(mh-thread-subject-container-hash, mh-thread-duplicates)
(mh-thread-history, mh-thread-body-width)
(mh-thread-find-msg-subject mh-thread-initialize-hash)
(mh-thread-initialize, mh-thread-id-container)
(mh-thread-remove-parent-link, mh-thread-add-link)
(mh-thread-ancestor-p, mh-thread-get-message-container)
(mh-thread-get-message, mh-thread-canonicalize-id)
(mh-thread-prune-subject, mh-thread-container-subject)
(mh-thread-rewind-pruning, mh-thread-prune-containers)
(mh-thread-sort-containers, mh-thread-group-by-subject)
(mh-thread-process-in-reply-to, mh-thread-set-tables)
(mh-thread-update-id-index-maps, mh-thread-generate)
(mh-thread-inc, mh-thread-generate-scan-lines)
(mh-thread-parse-scan-line, mh-thread-update-scan-line-map)
(mh-thread-add-spaces, mh-thread-print-scan-lines)
(mh-thread-folder, mh-toggle-threads, mh-thread-forget-message)
(mh-thread-current-indentation-level, mh-thread-next-sibling)
(mh-thread-previous-sibling, mh-thread-immediate-ancestor)
(mh-thread-ancestor, mh-thread-find-children)
(mh-message-id-regexp, mh-thread-delete, mh-thread-refile): Move to
new file mh-thread.el.
(mh-subject-to-sequence, mh-subject-to-sequence-unthreaded)
(mh-subject-to-sequence-threaded, mh-edit-pick-expr)
(mh-pick-args-list, mh-narrow-to-subject, mh-narrow-to-from)
(mh-narrow-to-cc, mh-narrow-to-to, mh-narrow-to-header-field)
(mh-current-message-header-field, mh-narrow-to-range)
(mh-delete-subject, mh-delete-subject-or-thread): Move to new file
mh-limit.el.
(mh-iterate-on-messages-in-region, mh-iterate-on-range): Move to
mh-acros.el.
(mh-internal-seqs, mh-catchup, mh-delete-msg-from-seq)
(mh-internal-seq, mh-valid-seq-p, mh-seq-containing-msg)
(mh-define-sequence, mh-undefine-sequence)
(mh-delete-a-msg-from-seq, mh-delete-seq-locally)
(mh-folder-size, mh-folder-size-flist, mh-folder-size-folder)
(mh-parse-flist-output-line, mh-read-folder-sequences)
(mh-read-msg-list, mh-notate-user-sequences)
(mh-remove-cur-notation, mh-add-sequence-notation)
(mh-remove-sequence-notation, mh-remove-all-notation): Move here from
mh-e.el.
(mh-make-seq, mh-seq-name, mh-find-seq, mh-seq-to-msgs)
(mh-add-msgs-to-seq, mh-notate): Move here from mh-utils.el.
* mh-show.el: New file. Contains mh-show-mode from mh-utils.el.
* mh-speed.el: Rearrange for consistency with other files.
* mh-thread.el: New file. Contains threading code from mh-seq.el.
* mh-tool-bar.el: New file. Contains tool bar creation code from
deprecated file mh-customize.el.
* mh-utils.el (recursive-load-depth-limit): Remove setting. No longer
needed.
(mh-scan-msg-number-regexp, mh-scan-msg-overflow-regexp)
(mh-scan-msg-format-regexp, mh-scan-msg-format-string)
(mh-scan-msg-search-regexp, mh-cmd-note, mh-note-seq)
(mh-update-scan-format, mh-msg-num-width): Move to new file
mh-scan.el.
(mh-show-buffer-mode-line-buffer-id, mh-letter-header-font-lock)
(mh-header-field-font-lock, mh-header-to-font-lock)
(mh-header-cc-font-lock, mh-header-subject-font-lock)
(mh-show-font-lock-keywords)
(mh-show-font-lock-keywords-with-cite)
(mh-show-font-lock-fontify-region)
(mh-gnus-article-highlight-citation, mh-showing-with-headers)
(mh-start-of-uncleaned-message, mh-invalidate-show-buffer)
(mh-unvisit-file, mh-defun-show-buffer, mh-show-mode-map)
(mh-show-sequence-menu, mh-show-message-menu)
(mh-show-folder-menu, mh-show-mode, mh-show-addr)
(mh-maybe-show, mh-show, mh-show-msg, mh-show-unquote-From)
(mh-msg-folder, mh-display-msg, mh-clean-msg-header): Move to new file
mh-show.el.
(mh-mail-header-separator, mh-signature-separator-regexp)
(mh-signature-separator, mh-globals-hash, mh-user-path)
(mh-draft-folder, mh-unseen-seq, mh-previous-seq, mh-inbox)
(mh-previous-window-config, mh-current-folder mh-show-buffer)
(mh-showing-mode, mh-show-mode-map, mh-show-folder-buffer)
(mh-showing-mode, mh-seq-list, mh-seen-list, mh-summary-height)
(mh-list-to-string, mh-list-to-string-1): Move to mh-e.el.
(mh-buffer-data, mh-mm-inline-media-tests): Move to mh-mime.el.
(mh-address-mail-regexp, mh-goto-address-find-address-at-point): Move
to mh-alias.el.
(mh-letter-font-lock-keywords): Move to new file mh-letter.el.
(mh-folder-filename, mh-msg-count, mh-recenter, mh-msg-filename)
(mh-show-mouse, mh-modify, mh-goto-msg, mh-set-folder-modified-p):
Move to new file mh-folder.el.
(with-mh-folder-updating, mh-in-show-buffer)
(mh-do-at-event-location, mh-seq-msgs): Moved to mh-acros.el.
(mh-make-seq, mh-seq-name, mh-notate, mh-find-seq)
(mh-seq-to-msgs, mh-add-msgs-to-seq, mh-canonicalize-sequence): Moved
to mh-seq.el.
(mh-show-xface-function, mh-uncompface-executable, mh-face-to-png)
(mh-uncompface, mh-icontopbm, mh-face-foreground-compat)
(mh-face-background-compat, mh-face-display-function)
(mh-show-xface, mh-picon-directory-list)
(mh-picon-existing-directory-list)
(mh-picon-cache, mh-picon-image-types)
(mh-picon-set-directory-list, mh-picon-get-image)
(mh-picon-file-contents, mh-picon-generate-path)
(mh-x-image-cache-directory, mh-x-image-scaling-function)
(mh-wget-executable, mh-wget-choice, mh-wget-option)
(mh-x-image-temp-file, mh-x-image-url, mh-x-image-marker)
(mh-x-image-url-cache-file, mh-x-image-scale-with-pnm)
(mh-x-image-scale-with-convert)
(url-unreserved-chars, url-hexify-string)
(mh-x-image-url-cache-canonicalize)
(mh-x-image-set-download-state, mh-x-image-get-download-state)
(mh-x-image-url-fetch-image, mh-x-image-display)
(mh-x-image-scale-and-display, mh-x-image-url-sane-p)
(mh-x-image-url-display): Move to new file mh-xface.el.
(mh-logo-display): Call mh-image-load-path.
(mh-find-path-run, mh-find-path): Move here from deprecated file
mh-init.el.
(mh-help-messages): Now an alist of modes to an alist of messages.
(mh-set-help): New function used to set mh-help-messages
(mh-help): Adjust for new format of mh-help-messages. Add
help-messages argument.
(mh-prefix-help): Refactor to use mh-help.
(mh-coalesce-msg-list, mh-greaterp, mh-lessp): Move here from mh-e.el.
(mh-clear-sub-folders-cache): New function added to avoid exposing
mh-sub-folders-cache variable.
* mh-xface.el: New file. Contains X-Face and Face header field display
routines from mh-utils.el.
Diffstat (limited to 'lisp/mh-e/mh-mime.el')
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 2453 |
1 files changed, 1364 insertions, 1089 deletions
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index a91d7b1212a..de4c01a9604 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1,4 +1,4 @@ -;;; mh-mime.el --- MH-E support for composing MIME messages +;;; mh-mime.el --- MH-E MIME support ;; Copyright (C) 1993, 1995, ;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -27,733 +27,159 @@ ;;; Commentary: -;; Internal support for MH-E package. -;; Support for generating MH-style directives for mhn or mhbuild as well as -;; MML (MIME Meta Language) tags. MH-style directives are supported by MH 6.8 -;; or later. +;; Message composition of MIME message is done with either MH-style +;; directives for mhn or mhbuild (MH 6.8 or later) or MML (MIME Meta +;; Language) tags. + +;; TODO: +;; Paragraph code should not fill # lines if MIME enabled. +;; Implement mh-auto-mh-to-mime (if non-nil, \\[mh-send-letter] +;; invokes mh-mh-to-mime automatically before sending.) +;; Actually, instead of mh-auto-mh-to-mime, +;; should read automhnproc from profile. +;; MIME option to mh-forward command to move to content-description +;; insertion point. ;;; Change Log: ;;; Code: -;;(message "> mh-mime") -(eval-when-compile (require 'mh-acros)) -(mh-require-cl) +(require 'mh-e) +(require 'mh-gnus) ;needed because mh-gnus.el not compiled +(require 'font-lock) (require 'gnus-util) -(require 'mh-buffers) -(require 'mh-comp) -(require 'mh-gnus) -;;(message "< mh-mime") +(require 'mailcap) +(require 'mm-decode) +(require 'mm-view) +(require 'mml) (autoload 'article-emphasize "gnus-art") -(autoload 'gnus-article-goto-header "gnus-art") (autoload 'gnus-eval-format "gnus-spec") -(autoload 'gnus-get-buffer-create "gnus") +(autoload 'mail-content-type-get "mail-parse") +(autoload 'mail-decode-encoded-word-string "mail-parse") +(autoload 'mail-header-parse-content-type "mail-parse") +(autoload 'mail-header-strip "mail-parse") (autoload 'message-options-set-recipient "message") +(autoload 'mm-decode-body "mm-bodies") (autoload 'mm-uu-dissect "mm-uu") (autoload 'mml-unsecure-message "mml-sec") (autoload 'rfc2047-decode-region "rfc2047") (autoload 'widget-convert-button "wid-edit") -;;;###mh-autoload -(defun mh-compose-insertion (&optional inline) - "Add tag to include a file such as an image or sound. - -You are prompted for the filename containing the object, the -media type if it cannot be determined automatically, and a -content description. If you're using MH-style directives, you -will also be prompted for additional attributes. - -The option `mh-compose-insertion' controls what type of tags are -inserted. Optional argument INLINE means make it an inline -attachment." - (interactive "P") - (if (equal mh-compose-insertion 'mml) - (if inline - (mh-mml-attach-file "inline") - (mh-mml-attach-file)) - (call-interactively 'mh-mh-attach-file))) - -;;;###mh-autoload -(defun mh-compose-forward (&optional description folder range) - "Add tag to forward a message. - -You are prompted for a content DESCRIPTION, the name of the -FOLDER in which the messages to forward are located, and a RANGE -of messages, which defaults to the current message in that -folder. Check the documentation of `mh-interactive-range' to see -how RANGE is read in interactive use. - -The option `mh-compose-insertion' controls what type of tags are inserted." - (interactive - (let* ((description - (mml-minibuffer-read-description)) - (folder - (mh-prompt-for-folder "Message from" - mh-sent-from-folder nil)) - (default - (if (and (equal folder mh-sent-from-folder) - (numberp mh-sent-from-msg)) - mh-sent-from-msg - (nth 0 (mh-translate-range folder "cur")))) - (range - (mh-read-range "Forward" folder - (or (and default - (number-to-string default)) - t) - t t))) - (list description folder range))) - (let ((messages (mapconcat 'identity (mh-list-to-string range) " "))) - (dolist (message (mh-translate-range folder messages)) - (if (equal mh-compose-insertion 'mml) - (mh-mml-forward-message description folder (format "%s" message)) - (mh-mh-forward-message description folder (format "%s" message)))))) - -;; To do: -;; paragraph code should not fill # lines if MIME enabled. -;; implement mh-auto-mh-to-mime (if non-nil, \\[mh-send-letter] -;; invokes mh-mh-to-mime automatically before sending.) -;; actually, instead of mh-auto-mh-to-mime, -;; should read automhnproc from profile -;; MIME option to mh-forward -;; command to move to content-description insertion point - -(defvar mh-mh-to-mime-args nil - "Extra arguments for \\[mh-mh-to-mime] to pass to the \"mhbuild\" command. -The arguments are passed to \"mhbuild\" if \\[mh-mh-to-mime] is -given a prefix argument. Normally default arguments to -\"mhbuild\" are specified in the MH profile.") - -(defvar mh-media-type-regexp - (concat (regexp-opt '("text" "image" "audio" "video" "application" - "multipart" "message") t) - "/[-.+a-zA-Z0-9]+") - "Regexp matching valid media types used in MIME attachment compositions.") - -(defvar mh-have-file-command 'undefined - "Cached value of function `mh-have-file-command'. -Do not reference this variable directly as it might not have been -initialized. Always use the command `mh-have-file-command'.") - -;;;###mh-autoload -(defun mh-have-file-command () - "Return t if 'file' command is on the system. -'file -i' is used to get MIME type of composition insertion." - (when (eq mh-have-file-command 'undefined) - (setq mh-have-file-command - (and (fboundp 'executable-find) - (executable-find "file") ; file command exists - ; and accepts -i and -b args. - (zerop (call-process "file" nil nil nil "-i" "-b" - (expand-file-name "inc" mh-progs)))))) - mh-have-file-command) - -(defvar mh-file-mime-type-substitutions - '(("application/msword" "\.xls" "application/ms-excel") - ("application/msword" "\.ppt" "application/ms-powerpoint") - ("text/plain" "\.vcf" "text/x-vcard")) - "Substitutions to make for Content-Type returned from file command. -The first element is the Content-Type returned by the file command. -The second element is a regexp matching the file name, usually the -extension. -The third element is the Content-Type to replace with.") - -(defun mh-file-mime-type-substitute (content-type filename) - "Return possibly changed CONTENT-TYPE on the FILENAME. -Substitutions are made from the `mh-file-mime-type-substitutions' -variable." - (let ((subst mh-file-mime-type-substitutions) - (type) (match) (answer content-type) - (case-fold-search t)) - (while subst - (setq type (car (car subst)) - match (elt (car subst) 1)) - (if (and (string-equal content-type type) - (string-match match filename)) - (setq answer (elt (car subst) 2) - subst nil) - (setq subst (cdr subst)))) - answer)) - -;;;###mh-autoload -(defun mh-file-mime-type (filename) - "Return MIME type of FILENAME from file command. -Returns nil if file command not on system." - (cond - ((not (mh-have-file-command)) - nil) ;no file command, exit now - ((not (and (file-exists-p filename) - (file-readable-p filename))) - nil) ;no file or not readable, ditto - (t - (save-excursion - (let ((tmp-buffer (get-buffer-create mh-temp-buffer))) - (set-buffer tmp-buffer) - (unwind-protect - (progn - (call-process "file" nil '(t nil) nil "-b" "-i" - (expand-file-name filename)) - (goto-char (point-min)) - (if (not (re-search-forward mh-media-type-regexp nil t)) - nil - (mh-file-mime-type-substitute (match-string 0) filename))) - (kill-buffer tmp-buffer))))))) - -(defun mh-minibuffer-read-type (filename &optional default) - "Return the content type associated with the given FILENAME. -If the \"file\" command exists and recognizes the given file, -then its value is returned\; otherwise, the user is prompted for -a type (see `mailcap-mime-types' and for Emacs 20, -`mh-mime-content-types'). -Optional argument DEFAULT is returned if a type isn't entered." - (mailcap-parse-mimetypes) - (let* ((default (or default - (mm-default-file-encoding filename) - "application/octet-stream")) - (probed-type (mh-file-mime-type filename)) - (type (or (and (not (equal probed-type "application/octet-stream")) - probed-type) - (completing-read - (format "Content type (default %s): " default) - (mapcar 'list (mailcap-mime-types)))))) - (if (not (equal type "")) - type - default))) - -;; RFC 2045 - Multipurpose Internet Mail Extensions (MIME) Part One: -;; Format of Internet Message Bodies. -;; RFC 2046 - Multipurpose Internet Mail Extensions (MIME) Part Two: -;; Media Types. -;; RFC 2049 - Multipurpose Internet Mail Extensions (MIME) Part Five: -;; Conformance Criteria and Examples. -;; RFC 2017 - Definition of the URL MIME External-Body Access-Type -;; RFC 1738 - Uniform Resource Locators (URL) -(defvar mh-access-types - '(("anon-ftp") ; RFC2046 Anonymous File Transfer Protocol - ("file") ; RFC1738 Host-specific file names - ("ftp") ; RFC2046 File Transfer Protocol - ("gopher") ; RFC1738 The Gopher Protocol - ("http") ; RFC1738 Hypertext Transfer Protocol - ("local-file") ; RFC2046 Local file access - ("mail-server") ; RFC2046 mail-server Electronic mail address - ("mailto") ; RFC1738 Electronic mail address - ("news") ; RFC1738 Usenet news - ("nntp") ; RFC1738 Usenet news using NNTP access - ("propspero") ; RFC1738 Prospero Directory Service - ("telnet") ; RFC1738 Telnet - ("tftp") ; RFC2046 Trivial File Transfer Protocol - ("url") ; RFC2017 URL scheme MIME access-type Protocol - ("wais")) ; RFC1738 Wide Area Information Servers - "Valid MIME access-type values.") - -;;;###mh-autoload -(defun mh-mh-attach-file (filename type description attributes) - "Add a tag to insert a MIME message part from a file. -You are prompted for the FILENAME containing the object, the -media TYPE if it cannot be determined automatically, and a -content DESCRIPTION. In addition, you are also prompted for -additional ATTRIBUTES. - -See also \\[mh-mh-to-mime]." - (interactive (let ((filename (mml-minibuffer-read-file "Attach file: "))) - (list - filename - (mh-minibuffer-read-type filename) - (mml-minibuffer-read-description) - (read-string "Attributes: " - (concat "name=\"" - (file-name-nondirectory filename) - "\""))))) - (mh-mh-compose-type filename type description attributes)) - -(defun mh-mh-compose-type (filename type - &optional description attributes comment) - "Insert an MH-style directive to insert a file. -The file specified by FILENAME is encoded as TYPE. An optional -DESCRIPTION is used as the Content-Description field, optional -set of ATTRIBUTES and an optional COMMENT can also be included." - (beginning-of-line) - (insert "#" type) - (and attributes - (insert "; " attributes)) - (and comment - (insert " (" comment ")")) - (insert " [") - (and description - (insert description)) - (insert "] " (expand-file-name filename)) - (insert "\n")) - -;;;###mh-autoload -(defun mh-mh-compose-anon-ftp (host filename type description) - "Add tag to include anonymous ftp reference to a file. - -You can have your message initiate an \"ftp\" transfer when the -recipient reads the message. You are prompted for the remote HOST -and FILENAME, the media TYPE, and the content DESCRIPTION. - -See also \\[mh-mh-to-mime]." - (interactive (list - (read-string "Remote host: ") - (read-string "Remote filename: ") - (mh-minibuffer-read-type "DUMMY-FILENAME") - (mml-minibuffer-read-description))) - (mh-mh-compose-external-type "anon-ftp" host filename - type description)) - -;;;###mh-autoload -(defun mh-mh-compose-external-compressed-tar (host filename description) - "Add tag to include anonymous ftp reference to a compressed tar file. - -In addition to retrieving the file via anonymous \"ftp\" as per -the command \\[mh-mh-compose-anon-ftp], the file will also be -uncompressed and untarred. You are prompted for the remote HOST -and FILENAME and the content DESCRIPTION. - -See also \\[mh-mh-to-mime]." - (interactive (list - (read-string "Remote host: ") - (read-string "Remote filename: ") - (mml-minibuffer-read-description))) - (mh-mh-compose-external-type "anon-ftp" host filename - "application/octet-stream" - description - "type=tar; conversions=x-compress" - "mode=image")) - -;;;###mh-autoload -(defun mh-mh-compose-external-type (access-type host filename type - &optional description - attributes parameters - comment) - "Add tag to refer to a remote file. - -This command is a general utility for referencing external files. -In fact, all of the other commands that insert directives to -access external files call this command. You are prompted for the -ACCESS-TYPE, remote HOST and FILENAME, and content TYPE. If you -provide a prefix argument, you are also prompted for a content -DESCRIPTION, ATTRIBUTES, PARAMETERS, and a COMMENT. - -See also \\[mh-mh-to-mime]." - (interactive (list - (completing-read "Access type: " mh-access-types) - (read-string "Remote host: ") - (read-string "Remote filename: ") - (mh-minibuffer-read-type "DUMMY-FILENAME") - (if current-prefix-arg (mml-minibuffer-read-description)) - (if current-prefix-arg (read-string "Attributes: ")) - (if current-prefix-arg (read-string "Parameters: ")) - (if current-prefix-arg (read-string "Comment: ")))) - (beginning-of-line) - (insert "#@" type) - (and attributes - (insert "; " attributes)) - (and comment - (insert " (" comment ") ")) - (insert " [") - (and description - (insert description)) - (insert "] ") - (insert "access-type=" access-type "; ") - (insert "site=" host) - (insert "; name=" (file-name-nondirectory filename)) - (let ((directory (file-name-directory filename))) - (and directory - (insert "; directory=\"" directory "\""))) - (and parameters - (insert "; " parameters)) - (insert "\n")) - -;;;###mh-autoload -(defun mh-mh-forward-message (&optional description folder messages) - "Add tag to forward a message. -You are prompted for a content DESCRIPTION, the name of the -FOLDER in which the messages to forward are located, and the -MESSAGES' numbers. - -See also \\[mh-mh-to-mime]." - (interactive (list - (mml-minibuffer-read-description) - (mh-prompt-for-folder "Message from" mh-sent-from-folder nil) - (read-string (concat "Messages" - (if (numberp mh-sent-from-msg) - (format " (default %d): " - mh-sent-from-msg) - ": "))))) - (beginning-of-line) - (insert "#forw [") - (and description - (not (string= description "")) - (insert description)) - (insert "]") - (and folder - (not (string= folder "")) - (insert " " folder)) - (if (and messages - (not (string= messages ""))) - (let ((start (point))) - (insert " " messages) - (subst-char-in-region start (point) ?, ? )) - (if (numberp mh-sent-from-msg) - (insert " " (int-to-string mh-sent-from-msg)))) - (insert "\n")) - -;;;###mh-autoload -(defun mh-mh-to-mime (&optional extra-args) - "Compose MIME message from MH-style directives. - -Typically, you send a message with attachments just like any other -message. However, you may take a sneak preview of the MIME encoding if -you wish by running this command. - -If you wish to pass additional arguments to \"mhbuild\" (\"mhn\") -to affect how it builds your message, use the option -`mh-mh-to-mime-args'. For example, you can build a consistency -check into the message by setting `mh-mh-to-mime-args' to -\"-check\". The recipient of your message can then run \"mhbuild --check\" on the message--\"mhbuild\" (\"mhn\") will complain if -the message has been corrupted on the way. This command only -consults this option when given a prefix argument EXTRA-ARGS. - -The hook `mh-mh-to-mime-hook' is called after the message has been -formatted. - -The effects of this command can be undone by running -\\[mh-mh-to-mime-undo]." - (interactive "*P") - (mh-mh-quote-unescaped-sharp) - (save-buffer) - (message "Running %s..." (if (mh-variant-p 'nmh) "mhbuild" "mhn")) - (cond - ((mh-variant-p 'nmh) - (mh-exec-cmd-error nil - "mhbuild" - (if extra-args mh-mh-to-mime-args) - buffer-file-name)) - (t - (mh-exec-cmd-error (format "mhdraft=%s" buffer-file-name) - "mhn" - (if extra-args mh-mh-to-mime-args) - buffer-file-name))) - (revert-buffer t t) - (message "Running %s...done" (if (mh-variant-p 'nmh) "mhbuild" "mhn")) - (run-hooks 'mh-mh-to-mime-hook)) - -(defun mh-mh-quote-unescaped-sharp () - "Quote \"#\" characters that haven't been quoted for \"mhbuild\". -If the \"#\" character is present in the first column, but it isn't -part of a MH-style directive then \"mhbuild\" gives an error. -This function will quote all such characters." - (save-excursion - (goto-char (point-min)) - (while (re-search-forward "^#" nil t) - (beginning-of-line) - (unless (mh-mh-directive-present-p (point) (line-end-position)) - (insert "#")) - (goto-char (line-end-position))))) - -;;;###mh-autoload -(defun mh-mh-to-mime-undo (noconfirm) - "Undo effects of \\[mh-mh-to-mime]. - -It does this by reverting to a backup file. You are prompted to -confirm this action, but you can avoid the confirmation by adding -a prefix argument NOCONFIRM." - (interactive "*P") - (if (null buffer-file-name) - (error "Buffer does not seem to be associated with any file")) - (let ((backup-strings '("," "#")) - backup-file) - (while (and backup-strings - (not (file-exists-p - (setq backup-file - (concat (file-name-directory buffer-file-name) - (car backup-strings) - (file-name-nondirectory buffer-file-name) - ".orig"))))) - (setq backup-strings (cdr backup-strings))) - (or backup-strings - (error "Backup file for %s no longer exists" buffer-file-name)) - (or noconfirm - (yes-or-no-p (format "Revert buffer from file %s? " - backup-file)) - (error "Revert not confirmed")) - (let ((buffer-read-only nil)) - (erase-buffer) - (insert-file-contents backup-file)) - (after-find-file nil))) - -;;;###mh-autoload -(defun mh-mh-directive-present-p (&optional begin end) - "Check if the text between BEGIN and END might be a MH-style directive. -The optional argument BEGIN defaults to the beginning of the -buffer, while END defaults to the the end of the buffer." - (unless begin (setq begin (point-min))) - (unless end (setq end (point-max))) - (save-excursion - (block 'search-for-mh-directive - (goto-char begin) - (while (re-search-forward "^#" end t) - (let ((s (buffer-substring-no-properties (point) (line-end-position)))) - (cond ((equal s "")) - ((string-match "^forw[ \t\n]+" s) - (return-from 'search-for-mh-directive t)) - (t (let ((first-token (car (split-string s "[ \t;@]")))) - (when (and first-token - (string-match mh-media-type-regexp - first-token)) - (return-from 'search-for-mh-directive t))))))) - nil))) - -;;; MIME composition functions - -;;;###mh-autoload -(defun mh-mml-to-mime () - "Compose MIME message from MML tags. - -Typically, you send a message with attachments just like any -other message. However, you may take a sneak preview of the MIME -encoding if you wish by running this command. - -This action can be undone by running \\[undo]." - (interactive) - (require 'message) - (when mh-pgp-support-flag ;; This is only needed for PGP - (message-options-set-recipient)) - (let ((saved-text (buffer-string)) - (buffer (current-buffer)) - (modified-flag (buffer-modified-p))) - (condition-case err (mml-to-mime) - (error - (with-current-buffer buffer - (delete-region (point-min) (point-max)) - (insert saved-text) - (set-buffer-modified-p modified-flag)) - (error (error-message-string err)))))) - -;;;###mh-autoload -(defun mh-mml-forward-message (description folder message) - "Forward a message as attachment. - -The function will prompt the user for a DESCRIPTION, a FOLDER and -MESSAGE number." - (let ((msg (if (and (equal message "") (numberp mh-sent-from-msg)) - mh-sent-from-msg - (string-to-number message)))) - (cond ((integerp msg) - (if (string= "" description) - ;; Rationale: mml-attach-file constructs a malformed composition - ;; if the description string is empty. This fixes SF #625168. - (mml-attach-file (format "%s%s/%d" - mh-user-path (substring folder 1) msg) - "message/rfc822") - (mml-attach-file (format "%s%s/%d" - mh-user-path (substring folder 1) msg) - "message/rfc822" - description))) - (t (error "The message number, %s, is not a integer" msg))))) - -(defvar mh-mml-cryptographic-method-history ()) - -;;;###mh-autoload -(defun mh-mml-query-cryptographic-method () - "Read the cryptographic method to use." - (if current-prefix-arg - (let ((def (or (car mh-mml-cryptographic-method-history) - mh-mml-method-default))) - (completing-read (format "Method (default %s): " def) - '(("pgp") ("pgpmime") ("smime")) - nil t nil 'mh-mml-cryptographic-method-history def)) - mh-mml-method-default)) +;;; Variables +;; This has to be a macro, since we do: (setf (mh-buffer-data) ...) ;;;###mh-autoload -(defun mh-mml-attach-file (&optional disposition) - "Add a tag to insert a MIME message part from a file. - -You are prompted for the filename containing the object, the -media type if it cannot be determined automatically, a content -description and the DISPOSITION of the attachment. - -This is basically `mml-attach-file' from Gnus, modified such that a prefix -argument yields an \"inline\" disposition and Content-Type is determined -automatically." - (let* ((file (mml-minibuffer-read-file "Attach file: ")) - (type (mh-minibuffer-read-type file)) - (description (mml-minibuffer-read-description)) - (dispos (or disposition - (mml-minibuffer-read-disposition type)))) - (mml-insert-empty-tag 'part 'type type 'filename file - 'disposition dispos 'description description))) - -;; Shush compiler. -(eval-when-compile (defvar mh-identity-pgg-default-user-id)) - -(defun mh-secure-message (method mode &optional identity) - "Add tag to encrypt or sign message. +(defmacro mh-buffer-data () + "Convenience macro to get the MIME data structures of the current buffer." + `(gethash (current-buffer) mh-globals-hash)) + +;; Structure to keep track of MIME handles on a per buffer basis. +(mh-defstruct (mh-buffer-data (:conc-name mh-mime-) + (:constructor mh-make-buffer-data)) + (handles ()) ; List of MIME handles + (handles-cache (make-hash-table)) ; Cache to avoid multiple decodes of + ; nested messages + (parts-count 0) ; The button number is generated from + ; this number + (part-index-hash (make-hash-table))) ; Avoid incrementing the part number + ; for nested messages + +(defvar mh-mm-inline-media-tests + `(("image/jpeg" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'jpeg handle))) + ("image/png" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'png handle))) + ("image/gif" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'gif handle))) + ("image/tiff" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'tiff handle)) ) + ("image/xbm" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'xbm handle))) + ("image/x-xbitmap" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'xbm handle))) + ("image/xpm" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'xpm handle))) + ("image/x-pixmap" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'xpm handle))) + ("image/bmp" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'bmp handle))) + ("image/x-portable-bitmap" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'pbm handle))) + ("text/plain" mm-inline-text identity) + ("text/enriched" mm-inline-text identity) + ("text/richtext" mm-inline-text identity) + ("text/x-patch" mm-display-patch-inline + (lambda (handle) + (locate-library "diff-mode"))) + ("application/emacs-lisp" mm-display-elisp-inline identity) + ("application/x-emacs-lisp" mm-display-elisp-inline identity) + ("text/html" + ,(if (fboundp 'mm-inline-text-html) 'mm-inline-text-html 'mm-inline-text) + (lambda (handle) + (or (and (boundp 'mm-inline-text-html-renderer) + mm-inline-text-html-renderer) + (and (boundp 'mm-text-html-renderer) mm-text-html-renderer)))) + ("text/x-vcard" + mm-inline-text-vcard + (lambda (handle) + (or (featurep 'vcard) + (locate-library "vcard")))) + ("message/delivery-status" mm-inline-text identity) + ("message/rfc822" mh-mm-inline-message identity) + ;;("message/partial" mm-inline-partial identity) + ;;("message/external-body" mm-inline-external-body identity) + ("text/.*" mm-inline-text identity) + ("audio/wav" mm-inline-audio + (lambda (handle) + (and (or (featurep 'nas-sound) (featurep 'native-sound)) + (device-sound-enabled-p)))) + ("audio/au" + mm-inline-audio + (lambda (handle) + (and (or (featurep 'nas-sound) (featurep 'native-sound)) + (device-sound-enabled-p)))) + ("application/pgp-signature" ignore identity) + ("application/x-pkcs7-signature" ignore identity) + ("application/pkcs7-signature" ignore identity) + ("application/x-pkcs7-mime" ignore identity) + ("application/pkcs7-mime" ignore identity) + ("multipart/alternative" ignore identity) + ("multipart/mixed" ignore identity) + ("multipart/related" ignore identity) + ;; Disable audio and image + ("audio/.*" ignore ignore) + ("image/.*" ignore ignore) + ;; Default to displaying as text + (".*" mm-inline-text mm-readable-p)) + "Alist of media types/tests saying whether types can be displayed inline.") -METHOD should be one of: \"pgpmime\", \"pgp\", \"smime\". -MODE should be one of: \"sign\", \"encrypt\", \"signencrypt\", \"none\". -IDENTITY is optionally the default-user-id to use." - (if (not mh-pgp-support-flag) - (error "Your version of Gnus does not support PGP/GPG") - ;; Check the arguments - (let ((valid-methods (list "pgpmime" "pgp" "smime")) - (valid-modes (list "sign" "encrypt" "signencrypt" "none"))) - (if (not (member method valid-methods)) - (error "Method %s is invalid" method)) - (if (not (member mode valid-modes)) - (error "Mode %s is invalid" mode)) - (mml-unsecure-message) - (if (not (string= mode "none")) - (save-excursion - (goto-char (point-min)) - (mh-goto-header-end 1) - (if mh-identity-pgg-default-user-id - (mml-insert-tag 'secure 'method method 'mode mode - 'sender mh-identity-pgg-default-user-id) - (mml-insert-tag 'secure 'method method 'mode mode))))))) - -;;;###mh-autoload -(defun mh-mml-unsecure-message () - "Remove any secure message tags." - (interactive) - (if (not mh-pgp-support-flag) - (error "Your version of Gnus does not support PGP/GPG") - (mml-unsecure-message))) - -;;;###mh-autoload -(defun mh-mml-secure-message-sign (method) - "Add tag to sign the message. - -A proper multipart message is created for you when you send the -message. Use the command \\[mh-mml-unsecure-message] to remove -this tag. Use a prefix argument METHOD to be prompted for one of -the possible security methods (see `mh-mml-method-default')." - (interactive (list (mh-mml-query-cryptographic-method))) - (mh-secure-message method "sign" mh-identity-pgg-default-user-id)) - -;;;###mh-autoload -(defun mh-mml-secure-message-encrypt (method) - "Add tag to encrypt the message. - -A proper multipart message is created for you when you send the -message. Use the command \\[mh-mml-unsecure-message] to remove -this tag. Use a prefix argument METHOD to be prompted for one of -the possible security methods (see `mh-mml-method-default')." - (interactive (list (mh-mml-query-cryptographic-method))) - (mh-secure-message method "encrypt" mh-identity-pgg-default-user-id)) - -;;;###mh-autoload -(defun mh-mml-secure-message-signencrypt (method) - "Add tag to encrypt and sign the message. - -A proper multipart message is created for you when you send the -message. Use the command \\[mh-mml-unsecure-message] to remove -this tag. Use a prefix argument METHOD to be prompted for one of -the possible security methods (see `mh-mml-method-default')." - (interactive (list (mh-mml-query-cryptographic-method))) - (mh-secure-message method "signencrypt" mh-identity-pgg-default-user-id)) - -;;;###mh-autoload -(defun mh-mml-tag-present-p () - "Check if the current buffer has text which may be a MML tag." - (save-excursion - (goto-char (point-min)) - (re-search-forward - (concat - "\\(<#\\(mml\\|part\\)\\(.\\|\n\\)*>[ \n\t]*<#/\\(mml\\|part\\)>\\|" - "^<#secure.+>$\\)") - nil t))) - - - -;;; MIME cleanup - -;;;###mh-autoload -(defun mh-mime-cleanup () - "Free the decoded MIME parts." - (let ((mime-data (gethash (current-buffer) mh-globals-hash))) - ;; This is for Emacs, what about XEmacs? - (mh-funcall-if-exists remove-images (point-min) (point-max)) - (when mime-data - (mm-destroy-parts (mh-mime-handles mime-data)) - (remhash (current-buffer) mh-globals-hash)))) - -;;;###mh-autoload -(defun mh-destroy-postponed-handles () - "Free MIME data for externally displayed MIME parts." - (let ((mime-data (mh-buffer-data))) - (when mime-data - (mm-destroy-parts (mh-mime-handles mime-data))) - (remhash (current-buffer) mh-globals-hash))) - -(defun mh-handle-set-external-undisplayer (folder handle function) - "Replacement for `mm-handle-set-external-undisplayer'. - -This is only called in recent versions of Gnus. The MIME handles -are stored in data structures corresponding to MH-E folder buffer -FOLDER instead of in Gnus (as in the original). The MIME part, -HANDLE is associated with the undisplayer FUNCTION." - (if (mm-keep-viewer-alive-p handle) - (let ((new-handle (copy-sequence handle))) - (mm-handle-set-undisplayer new-handle function) - (mm-handle-set-undisplayer handle nil) - (save-excursion - (set-buffer folder) - (push new-handle (mh-mime-handles (mh-buffer-data))))) - (mm-handle-set-undisplayer handle function))) - - - -;;; MIME transformations -(eval-when-compile (require 'font-lock)) - -;;;###mh-autoload -(defun mh-add-missing-mime-version-header () - "Some mail programs don't put a MIME-Version header. -I have seen this only in spam, so maybe we shouldn't fix -this ;-)" - (save-excursion - (goto-char (point-min)) - (re-search-forward "\n\n" nil t) - (save-restriction - (narrow-to-region (point-min) (point)) - (when (and (message-fetch-field "content-type") - (not (message-fetch-field "mime-version"))) - (goto-char (point-min)) - (insert "MIME-Version: 1.0\n"))))) - -(defun mh-small-show-buffer-p () - "Check if show buffer is small. -This is used to decide if smileys and graphical emphasis will be -displayed." - (let ((max nil)) - (when (and (boundp 'font-lock-maximum-size) font-lock-maximum-size) - (cond ((numberp font-lock-maximum-size) - (setq max font-lock-maximum-size)) - ((listp font-lock-maximum-size) - (setq max (cdr (or (assoc 'mh-show-mode font-lock-maximum-size) - (assoc t font-lock-maximum-size))))))) - (or (not (numberp max)) (>= (/ max 8) (buffer-size))))) - -;;;###mh-autoload -(defun mh-display-smileys () - "Display smileys." - (when (and mh-graphical-smileys-flag (mh-small-show-buffer-p)) - (mh-funcall-if-exists smiley-region (point-min) (point-max)))) - -;;;###mh-autoload -(defun mh-display-emphasis () - "Display graphical emphasis." - (when (and mh-graphical-emphasis-flag (mh-small-show-buffer-p)) - (flet ((article-goto-body ())) ; shadow this function to do nothing - (save-excursion - (goto-char (point-min)) - (article-emphasize))))) +(defvar mh-mime-save-parts-directory nil + "Default to use for `mh-mime-save-parts-default-directory'. +Set from last use.") ;; Copied from gnus-art.el (should be checked for other cool things that can ;; be added to the buttons) @@ -796,9 +222,148 @@ displayed." (define-key map '(button2) 'mh-push-button)) map)) -(defvar mh-mime-save-parts-directory nil - "Default to use for `mh-mime-save-parts-default-directory'. -Set from last use.") + + +;;; MH-Folder Commands + +;; Alphabetical. + +;;;###mh-autoload +(defun mh-display-with-external-viewer (part-index) + "View attachment externally. + +If Emacs does not know how to view an attachment, you could save +it into a file and then run some program to open it. It is +easier, however, to launch the program directly from MH-E with +this command. While you'll most likely use this to view +spreadsheets and documents, it is also useful to use your browser +to view HTML attachments with higher fidelity than what Emacs can +provide. + +This command displays the attachment associated with the button +under the cursor. If the cursor is not located over a button, +then the cursor first moves to the next button, wrapping to the +beginning of the message if necessary. You can provide a numeric +prefix argument PART-INDEX to view the attachment labeled with +that number. + +This command tries to provide a reasonable default for the viewer +by calling the Emacs function `mailcap-mime-info'. This function +usually reads the file \"/etc/mailcap\"." + (interactive "P") + (when (consp part-index) (setq part-index (car part-index))) + (mh-folder-mime-action + part-index + #'(lambda () + (let* ((part (get-text-property (point) 'mh-data)) + (type (mm-handle-media-type part)) + (methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x)))) + (mailcap-mime-info type 'all))) + (def (caar methods)) + (prompt (format "Viewer%s: " (if def + (format " (default %s)" def) + ""))) + (method (completing-read prompt methods nil nil nil nil def)) + (folder mh-show-folder-buffer) + (buffer-read-only nil)) + (when (string-match "^[^% \t]+$" method) + (setq method (concat method " %s"))) + (flet ((mm-handle-set-external-undisplayer (handle function) + (mh-handle-set-external-undisplayer folder handle function))) + (unwind-protect (mm-display-external part method) + (set-buffer-modified-p nil))))) + nil)) + +;;;###mh-autoload +(defun mh-folder-inline-mime-part (part-index) + "Show attachment verbatim. + +You can view the raw contents of an attachment with this command. +This command displays (or hides) the contents of the attachment +associated with the button under the cursor verbatim. If the +cursor is not located over a button, then the cursor first moves +to the next button, wrapping to the beginning of the message if +necessary. + +You can also provide a numeric prefix argument PART-INDEX to view +the attachment labeled with that number." + (interactive "P") + (when (consp part-index) (setq part-index (car part-index))) + (mh-folder-mime-action part-index #'mh-mime-inline-part nil)) + +(defun mh-mime-inline-part () + "Toggle display of the raw MIME part." + (interactive) + (let* ((buffer-read-only nil) + (data (get-text-property (point) 'mh-data)) + (inserted-flag (get-text-property (point) 'mh-mime-inserted)) + (displayed-flag (mm-handle-displayed-p data)) + (point (point)) + start end) + (cond ((and data (not inserted-flag) (not displayed-flag)) + (let ((contents (mm-get-part data))) + (add-text-properties (line-beginning-position) (line-end-position) + '(mh-mime-inserted t)) + (setq start (point-marker)) + (forward-line 1) + (mm-insert-inline data contents) + (setq end (point-marker)) + (add-text-properties + start (progn (goto-char start) (line-end-position)) + `(mh-region (,start . ,end))))) + ((and data (or inserted-flag displayed-flag)) + (mh-press-button) + (message "MIME part already inserted"))) + (goto-char point) + (set-buffer-modified-p nil))) + +;;;###mh-autoload +(defun mh-folder-save-mime-part (part-index) + "Save (output) attachment. + +This command saves the attachment associated with the button under the +cursor. If the cursor is not located over a button, then the cursor +first moves to the next button, wrapping to the beginning of the +message if necessary. + +You can also provide a numeric prefix argument PART-INDEX to save the +attachment labeled with that number. + +This command prompts you for a filename and suggests a specific name +if it is available." + (interactive "P") + (when (consp part-index) (setq part-index (car part-index))) + (mh-folder-mime-action part-index #'mh-mime-save-part nil)) + +(defun mh-mime-save-part () + "Save MIME part at point." + (interactive) + (let ((data (get-text-property (point) 'mh-data))) + (when data + (let ((mm-default-directory + (file-name-as-directory (or mh-mime-save-parts-directory + default-directory)))) + (mh-mm-save-part data) + (setq mh-mime-save-parts-directory mm-default-directory))))) + +;;;###mh-autoload +(defun mh-folder-toggle-mime-part (part-index) + "View attachment. + +This command displays (or hides) the attachment associated with +the button under the cursor. If the cursor is not located over a +button, then the cursor first moves to the next button, wrapping +to the beginning of the message if necessary. This command has +the advantage over related commands of working from the MH-Folder +buffer. + +You can also provide a numeric prefix argument PART-INDEX to view +the attachment labeled with that number. If Emacs does not know +how to display the attachment, then Emacs offers to save the +attachment in a file." + (interactive "P") + (when (consp part-index) (setq part-index (car part-index))) + (mh-folder-mime-action part-index #'mh-press-button t)) ;;;###mh-autoload (defun mh-mime-save-parts (prompt) @@ -856,32 +421,6 @@ do the work." (switch-to-buffer-other-window mh-log-buffer) (sit-for 3)))))))) -;; Avoid errors if gnus-sum isn't loaded yet... -(defvar gnus-newsgroup-charset nil) -(defvar gnus-newsgroup-name nil) - -(defun mh-decode-message-body () - "Decode message based on charset. -If message has been encoded for transfer take that into account." - (let (ct charset cte) - (goto-char (point-min)) - (re-search-forward "\n\n" nil t) - (save-restriction - (narrow-to-region (point-min) (point)) - (setq ct (ignore-errors (mail-header-parse-content-type - (message-fetch-field "Content-Type" t))) - charset (mail-content-type-get ct 'charset) - cte (message-fetch-field "Content-Transfer-Encoding"))) - (when (stringp cte) (setq cte (mail-header-strip cte))) - (when (or (not ct) (equal (car ct) "text/plain")) - (save-restriction - (narrow-to-region (min (1+ (mh-mail-header-end)) (point-max)) - (point-max)) - (mm-decode-body charset - (and cte (intern (downcase - (gnus-strip-whitespace cte)))) - (car ct)))))) - ;;;###mh-autoload (defun mh-toggle-mh-decode-mime-flag () "Toggle the value of `mh-decode-mime-flag'." @@ -893,6 +432,72 @@ If message has been encoded for transfer take that into account." "Displaying raw message"))) ;;;###mh-autoload +(defun mh-toggle-mime-buttons () + "Toggle option `mh-display-buttons-for-inline-parts-flag'." + (interactive) + (setq mh-display-buttons-for-inline-parts-flag + (not mh-display-buttons-for-inline-parts-flag)) + (mh-show nil t)) + + + +;;; MIME Display Routines + +(defun mh-mm-inline-message (handle) + "Display message, HANDLE. +The function decodes the message and displays it. It avoids +decoding the same message multiple times." + (let ((b (point)) + (clean-message-header mh-clean-message-header-flag) + (invisible-headers mh-invisible-header-fields-compiled) + (visible-headers nil)) + (save-excursion + (save-restriction + (narrow-to-region b b) + (mm-insert-part handle) + (mh-mime-display + (or (gethash handle (mh-mime-handles-cache (mh-buffer-data))) + (setf (gethash handle (mh-mime-handles-cache (mh-buffer-data))) + (let ((handles (mm-dissect-buffer nil))) + (if handles + (mm-uu-dissect-text-parts handles) + (setq handles (mm-uu-dissect))) + (setf (mh-mime-handles (mh-buffer-data)) + (mm-merge-handles + handles (mh-mime-handles (mh-buffer-data)))) + handles)))) + + (goto-char (point-min)) + (mh-show-xface) + (cond (clean-message-header + (mh-clean-msg-header (point-min) + invisible-headers + visible-headers) + (goto-char (point-min))) + (t + (mh-start-of-uncleaned-message))) + (mh-decode-message-header) + (mh-show-addr) + ;; The other highlighting types don't need anything special + (when (eq mh-highlight-citation-style 'gnus) + (mh-gnus-article-highlight-citation)) + (goto-char (point-min)) + (insert "\n------- Forwarded Message\n\n") + (mh-display-smileys) + (mh-display-emphasis) + (mm-handle-set-undisplayer + handle + `(lambda () + (let (buffer-read-only) + (if (fboundp 'remove-specifier) + ;; This is only valid on XEmacs. + (mapcar (lambda (prop) + (remove-specifier + (face-property 'default prop) (current-buffer))) + '(background background-pixmap foreground))) + (delete-region ,(point-min-marker) ,(point-max-marker))))))))) + +;;;###mh-autoload (defun mh-decode-message-header () "Decode RFC2047 encoded message header fields." (when mh-decode-mime-flag @@ -922,34 +527,60 @@ parsed and then displayed." (if pre-dissected-handles (setq handles pre-dissected-handles) (if (setq handles (mm-dissect-buffer nil)) - (when (fboundp 'mm-uu-dissect-text-parts) - (mm-uu-dissect-text-parts handles)) + (mm-uu-dissect-text-parts handles) (setq handles (mm-uu-dissect))) (setf (mh-mime-handles (mh-buffer-data)) (mm-merge-handles handles (mh-mime-handles (mh-buffer-data)))) - (unless handles (mh-decode-message-body))) + (unless handles + (mh-decode-message-body))) (cond ((and handles - (or (not (stringp (car handles))) (cdr handles))) - ;; Goto start of message body + (or (not (stringp (car handles))) + (cdr handles))) + ;; Go to start of message body (goto-char (point-min)) - (or (search-forward "\n\n" nil t) (goto-char (point-max))) + (or (search-forward "\n\n" nil t) + (goto-char (point-max))) ;; Delete the body (delete-region (point) (point-max)) ;; Display the MIME handles (mh-mime-display-part handles)) - (t (mh-signature-highlight)))) + (t + (mh-signature-highlight)))) (error (message "Could not display body: %s" (error-message-string err)) (delete-region (point-min) (point-max)) (insert raw-message-data)))))) +(defun mh-decode-message-body () + "Decode message based on charset. +If message has been encoded for transfer take that into account." + (let (ct charset cte) + (goto-char (point-min)) + (re-search-forward "\n\n" nil t) + (save-restriction + (narrow-to-region (point-min) (point)) + (setq ct (ignore-errors (mail-header-parse-content-type + (message-fetch-field "Content-Type" t))) + charset (mail-content-type-get ct 'charset) + cte (message-fetch-field "Content-Transfer-Encoding"))) + (when (stringp cte) (setq cte (mail-header-strip cte))) + (when (or (not ct) (equal (car ct) "text/plain")) + (save-restriction + (narrow-to-region (min (1+ (mh-mail-header-end)) (point-max)) + (point-max)) + (mm-decode-body charset + (and cte (intern (downcase + (gnus-strip-whitespace cte)))) + (car ct)))))) + (defun mh-mime-display-part (handle) "Decides the viewer to call based on the type of HANDLE." - (cond ((null handle) nil) + (cond ((null handle) + nil) ((not (stringp (car handle))) (mh-mime-display-single handle)) ((equal (car handle) "multipart/alternative") @@ -958,14 +589,20 @@ parsed and then displayed." (or (equal (car handle) "multipart/signed") (equal (car handle) "multipart/encrypted"))) (mh-mime-display-security handle)) - (t (mh-mime-display-mixed (cdr handle))))) + (t + (mh-mime-display-mixed (cdr handle))))) + +(defun mh-mime-display-mixed (handles) + "Display the list of MIME parts, HANDLES recursively." + (mapcar #'mh-mime-display-part handles)) (defun mh-mime-display-alternative (handles) "Choose among the alternatives, HANDLES the part that will be displayed. If no part is preferred then all the parts are displayed." (let* ((preferred (mm-preferred-alternative handles)) (others (loop for x in handles unless (eq x preferred) collect x))) - (cond ((and preferred (stringp (car preferred))) + (cond ((and preferred + (stringp (car preferred))) (mh-mime-display-part preferred) (mh-mime-maybe-display-alternatives others)) (preferred @@ -974,7 +611,8 @@ If no part is preferred then all the parts are displayed." (mh-mime-display-single preferred) (mh-mime-maybe-display-alternatives others) (goto-char (point-max)))) - (t (mh-mime-display-mixed handles))))) + (t + (mh-mime-display-mixed handles))))) (defun mh-mime-maybe-display-alternatives (alternatives) "Show buttons for ALTERNATIVES. @@ -988,9 +626,128 @@ buttons for alternative parts that are usually suppressed." (mh-insert-mime-button x (mh-mime-part-index x) nil)) (insert "\n----------------------------------------------------\n"))) -(defun mh-mime-display-mixed (handles) - "Display the list of MIME parts, HANDLES recursively." - (mapcar #'mh-mime-display-part handles)) +(defun mh-mime-display-security (handle) + "Display PGP encrypted/signed message, HANDLE." + (save-restriction + (narrow-to-region (point) (point)) + (insert "\n") + (mh-insert-mime-security-button handle) + (mh-mime-display-mixed (cdr handle)) + (insert "\n") + (let ((mh-mime-security-button-line-format + mh-mime-security-button-end-line-format)) + (mh-insert-mime-security-button handle)) + (mm-set-handle-multipart-parameter + handle 'mh-region (cons (point-min-marker) (point-max-marker))))) + +(defun mh-mime-display-single (handle) + "Display a leaf node, HANDLE in the MIME tree." + (let* ((type (mm-handle-media-type handle)) + (small-image-flag (mh-small-image-p handle)) + (attachmentp (equal (car (mm-handle-disposition handle)) + "attachment")) + (inlinep (and (equal (car (mm-handle-disposition handle)) "inline") + (mm-inlinable-p handle) + (mm-inlined-p handle))) + (displayp (or inlinep ; show if inline OR + (mh-inline-vcard-p handle); inline vcard OR + (and (not attachmentp) ; if not an attachment + (or small-image-flag ; and small image + ; and user wants inline + (and (not (equal + (mm-handle-media-supertype handle) + "image")) + (mm-inlinable-p handle) + (mm-inlined-p handle))))))) + (save-restriction + (narrow-to-region (point) (if (eobp) (point) (1+ (point)))) + (cond ((and mh-pgp-support-flag + (equal type "application/pgp-signature")) + nil) ; skip signatures as they are already handled... + ((not displayp) + (insert "\n") + (mh-insert-mime-button handle (mh-mime-part-index handle) nil)) + ((and displayp + (not mh-display-buttons-for-inline-parts-flag)) + (or (mm-display-part handle) + (mm-display-part handle)) + (mh-signature-highlight handle)) + ((and displayp + mh-display-buttons-for-inline-parts-flag) + (insert "\n") + (mh-insert-mime-button handle (mh-mime-part-index handle) nil) + (forward-line -1) + (mh-mm-display-part handle))) + (goto-char (point-max))))) + +;; There is a bug in Gnus inline image display due to which an extra line +;; gets inserted every time it is viewed. To work around that problem we are +;; using an extra property 'mh-region to remember the region that is added +;; when the button is clicked. The region is then deleted to make sure that +;; no extra lines get inserted. +(defun mh-mm-display-part (handle) + "Toggle display of button for MIME part, HANDLE." + (beginning-of-line) + (let ((id (get-text-property (point) 'mh-part)) + (point (point)) + (window (selected-window)) + (mail-parse-charset 'nil) + (mail-parse-ignored-charsets nil) + region buffer-read-only) + (save-excursion + (unwind-protect + (let ((win (get-buffer-window (current-buffer) t))) + (when win + (select-window win)) + (goto-char point) + + (if (mm-handle-displayed-p handle) + ;; This will remove the part. + (progn + ;; Delete the button and displayed part (if any) + (let ((region (get-text-property point 'mh-region))) + (when region + (mh-funcall-if-exists + remove-images (car region) (cdr region))) + (mm-display-part handle) + (when region + (delete-region (car region) (cdr region)))) + ;; Delete button (if it still remains). This happens for + ;; externally displayed parts where the previous step does + ;; nothing. + (unless (eolp) + (delete-region (point) (progn (forward-line) (point))))) + (save-restriction + (delete-region (point) (progn (forward-line 1) (point))) + (narrow-to-region (point) (point)) + ;; Maybe we need another unwind-protect here. + (when (equal (mm-handle-media-supertype handle) "image") + (insert "\n")) + (when (and (not (eq (ignore-errors (mm-display-part handle)) + 'inline)) + (equal (mm-handle-media-supertype handle) + "image")) + (goto-char (point-min)) + (delete-char 1)) + (when (equal (mm-handle-media-supertype handle) "text") + (when (eq mh-highlight-citation-style 'gnus) + (mh-gnus-article-highlight-citation)) + (mh-display-smileys) + (mh-display-emphasis) + (mh-signature-highlight handle)) + (setq region (cons (progn (goto-char (point-min)) + (point-marker)) + (progn (goto-char (point-max)) + (point-marker))))))) + (when (window-live-p window) + (select-window window)) + (goto-char point) + (beginning-of-line) + (mh-insert-mime-button handle id (mm-handle-displayed-p handle)) + (goto-char point) + (when region + (add-text-properties (line-beginning-position) (line-end-position) + `(mh-region ,region))))))) (defun mh-mime-part-index (handle) "Generate the button number for MIME part, HANDLE. @@ -1009,7 +766,7 @@ This is only useful if a Content-Disposition header is not present." (mm-inline-large-images t)) (and media-test (equal (mm-handle-media-supertype handle) "image") - (funcall media-test handle) ; Since mm-inline-large-images is T, + (funcall media-test handle) ; Since mm-inline-large-images is T, ; this only tells us if the image is ; something that emacs can display (let* ((image (mm-get-image handle))) @@ -1040,43 +797,6 @@ This is only useful if a Content-Disposition header is not present." (goto-char (point-min)) (not (mh-signature-separator-p))))))) -(defun mh-mime-display-single (handle) - "Display a leaf node, HANDLE in the MIME tree." - (let* ((type (mm-handle-media-type handle)) - (small-image-flag (mh-small-image-p handle)) - (attachmentp (equal (car (mm-handle-disposition handle)) - "attachment")) - (inlinep (and (equal (car (mm-handle-disposition handle)) "inline") - (mm-inlinable-p handle) - (mm-inlined-p handle))) - (displayp (or inlinep ; show if inline OR - (mh-inline-vcard-p handle); inline vcard OR - (and (not attachmentp) ; if not an attachment - (or small-image-flag ; and small image - ; and user wants inline - (and (not (equal - (mm-handle-media-supertype handle) - "image")) - (mm-inlinable-p handle) - (mm-inlined-p handle))))))) - (save-restriction - (narrow-to-region (point) (if (eobp) (point) (1+ (point)))) - (cond ((and mh-pgp-support-flag - (equal type "application/pgp-signature")) - nil) ; skip signatures as they are already handled... - ((not displayp) - (insert "\n") - (mh-insert-mime-button handle (mh-mime-part-index handle) nil)) - ((and displayp (not mh-display-buttons-for-inline-parts-flag)) - (or (mm-display-part handle) (mm-display-part handle)) - (mh-signature-highlight handle)) - ((and displayp mh-display-buttons-for-inline-parts-flag) - (insert "\n") - (mh-insert-mime-button handle (mh-mime-part-index handle) nil) - (forward-line -1) - (mh-mm-display-part handle))) - (goto-char (point-max))))) - (defun mh-signature-highlight (&optional handle) "Highlight message signature in HANDLE. The optional argument, HANDLE is a MIME handle if the function is @@ -1099,9 +819,12 @@ being used to highlight the signature in a MIME part." (set-extent-property (make-extent (point) (point-max)) 'face 'mh-show-signature)))))) -(mh-do-in-xemacs - (defvar dots) - (defvar type)) + + +;;; Button Display + +;; Shush compiler. +(eval-when-compile (mh-do-in-xemacs (defvar dots) (defvar type) (defvar ov))) (defun mh-insert-mime-button (handle index displayed) "Insert MIME button for HANDLE. @@ -1145,76 +868,161 @@ by commands like \"K v\" which operate on individual MIME parts." (dolist (ov (mh-funcall-if-exists overlays-in begin end)) (mh-funcall-if-exists overlay-put ov 'evaporate t)))) -;; There is a bug in Gnus inline image display due to which an extra line -;; gets inserted every time it is viewed. To work around that problem we are -;; using an extra property 'mh-region to remember the region that is added -;; when the button is clicked. The region is then deleted to make sure that -;; no extra lines get inserted. -(defun mh-mm-display-part (handle) - "Toggle display of button for MIME part, HANDLE." - (beginning-of-line) - (let ((id (get-text-property (point) 'mh-part)) - (point (point)) - (window (selected-window)) - (mail-parse-charset 'nil) - (mail-parse-ignored-charsets nil) - region buffer-read-only) - (save-excursion - (unwind-protect - (let ((win (get-buffer-window (current-buffer) t))) - (when win - (select-window win)) - (goto-char point) +;; Shush compiler. +(eval-when-compile + (when (< emacs-major-version 22) + (defvar mm-verify-function-alist) + (defvar mm-decrypt-function-alist)) + (mh-do-in-xemacs + (defvar pressed-details))) - (if (mm-handle-displayed-p handle) - ;; This will remove the part. - (progn - ;; Delete the button and displayed part (if any) - (let ((region (get-text-property point 'mh-region))) - (when region - (mh-funcall-if-exists - remove-images (car region) (cdr region))) - (mm-display-part handle) - (when region - (delete-region (car region) (cdr region)))) - ;; Delete button (if it still remains). This happens for - ;; externally displayed parts where the previous step does - ;; nothing. - (unless (eolp) - (delete-region (point) (progn (forward-line) (point))))) - (save-restriction - (delete-region (point) (progn (forward-line 1) (point))) - (narrow-to-region (point) (point)) - ;; Maybe we need another unwind-protect here. - (when (equal (mm-handle-media-supertype handle) "image") - (insert "\n")) - (when (and (not (eq (ignore-errors (mm-display-part handle)) - 'inline)) - (equal (mm-handle-media-supertype handle) - "image")) - (goto-char (point-min)) - (delete-char 1)) - (when (equal (mm-handle-media-supertype handle) "text") - (when (eq mh-highlight-citation-style 'gnus) - (mh-gnus-article-highlight-citation)) - (mh-display-smileys) - (mh-display-emphasis) - (mh-signature-highlight handle)) - (setq region (cons (progn (goto-char (point-min)) - (point-marker)) - (progn (goto-char (point-max)) - (point-marker))))))) - (when (window-live-p window) - (select-window window)) - (goto-char point) - (beginning-of-line) - (mh-insert-mime-button handle id (mm-handle-displayed-p handle)) - (goto-char point) - (when region - (add-text-properties (line-beginning-position) (line-end-position) - `(mh-region ,region))))))) +(defun mh-insert-mime-security-button (handle) + "Display buttons for PGP message, HANDLE." + (let* ((protocol (mm-handle-multipart-ctl-parameter handle 'protocol)) + (crypto-type (or (nth 2 (assoc protocol mm-verify-function-alist)) + (nth 2 (assoc protocol mm-decrypt-function-alist)) + "Unknown")) + (type (concat crypto-type + (if (equal (car handle) "multipart/signed") + " Signed" " Encrypted") + " Part")) + (info (or (mm-handle-multipart-ctl-parameter handle 'gnus-info) + "Undecided")) + (details (mm-handle-multipart-ctl-parameter handle 'gnus-details)) + pressed-details begin end face) + (setq details (if details (concat "\n" details) "")) + (setq pressed-details (if mh-mime-security-button-pressed details "")) + (setq face (mh-mime-security-button-face info)) + (unless (bolp) (insert "\n")) + (setq begin (point)) + (gnus-eval-format + mh-mime-security-button-line-format + mh-mime-security-button-line-format-alist + `(,@(gnus-local-map-property mh-mime-security-button-map) + mh-button-pressed ,mh-mime-security-button-pressed + mh-callback mh-mime-security-press-button + mh-line-format ,mh-mime-security-button-line-format + mh-data ,handle)) + (setq end (point)) + (widget-convert-button 'link begin end + :mime-handle handle + :action 'mh-widget-press-button + :button-keymap mh-mime-security-button-map + :button-face face + :help-echo "Mouse-2 click or press RET (in show buffer) to see security details.") + (dolist (ov (mh-funcall-if-exists overlays-in begin end)) + (mh-funcall-if-exists overlay-put ov 'evaporate t)) + (when (equal info "Failed") + (let* ((type (if (equal (car handle) "multipart/signed") + "verification" "decryption")) + (warning (if (equal type "decryption") + "(passphrase may be incorrect)" ""))) + (message "%s %s failed %s" crypto-type type warning))))) + +(defun mh-mime-security-button-face (info) + "Return the button face to use for encrypted/signed mail based on INFO." + (cond ((string-match "OK" info) ;Decrypted mail + 'mh-show-pgg-good) + ((string-match "Failed" info) ;Decryption failed or signature invalid + 'mh-show-pgg-bad) + ((string-match "Undecided" info);Unprocessed mail + 'mh-show-pgg-unknown) + ((string-match "Untrusted" info);Key not trusted + 'mh-show-pgg-unknown) + (t + 'mh-show-pgg-good))) + + + +;;; Button Handlers + +(defun mh-folder-mime-action (part-index action include-security-flag) + "Go to PART-INDEX and carry out ACTION. + +If PART-INDEX is nil then go to the next part in the buffer. The +search for the next buffer wraps around if end of buffer is reached. +If argument INCLUDE-SECURITY-FLAG is non-nil then include security +info buttons when searching for a suitable parts." + (unless mh-showing-mode + (mh-show)) + (mh-in-show-buffer (mh-show-buffer) + (let ((criterion + (cond (part-index + (lambda (p) + (let ((part (get-text-property p 'mh-part))) + (and (integerp part) (= part part-index))))) + (t (lambda (p) + (if include-security-flag + (get-text-property p 'mh-data) + (integerp (get-text-property p 'mh-part))))))) + (point (point))) + (cond ((and (get-text-property point 'mh-part) + (or (null part-index) + (= (get-text-property point 'mh-part) part-index))) + (funcall action)) + ((and (get-text-property point 'mh-data) + include-security-flag + (null part-index)) + (funcall action)) + (t + (mh-goto-next-button nil criterion) + (if (= (point) point) + (message "No matching MIME part found") + (funcall action))))))) ;;;###mh-autoload +(defun mh-goto-next-button (backward-flag &optional criterion) + "Search for next button satisfying criterion. + +If BACKWARD-FLAG is non-nil search backward in the buffer for a mime +button. +If CRITERION is a function or a symbol which has a function binding +then that function must return non-nil at the button we stop." + (unless (or (and (symbolp criterion) (fboundp criterion)) + (functionp criterion)) + (setq criterion (lambda (x) t))) + ;; Move to the next button in the buffer satisfying criterion + (goto-char (or (save-excursion + (beginning-of-line) + ;; Find point before current button + (let ((point-before-current-button + (save-excursion + (while (get-text-property (point) 'mh-data) + (unless (= (forward-line + (if backward-flag 1 -1)) + 0) + (if backward-flag + (goto-char (point-min)) + (goto-char (point-max))))) + (point)))) + ;; Skip over current button + (while (and (get-text-property (point) 'mh-data) + (not (if backward-flag (bobp) (eobp)))) + (forward-line (if backward-flag -1 1))) + ;; Stop at next MIME button if any exists. + (block loop + (while (/= (progn + (unless (= (forward-line + (if backward-flag -1 1)) + 0) + (if backward-flag + (goto-char (point-max)) + (goto-char (point-min))) + (beginning-of-line)) + (point)) + point-before-current-button) + (when (and (get-text-property (point) 'mh-data) + (funcall criterion (point))) + (return-from loop (point)))) + nil))) + (point)))) + +(defun mh-widget-press-button (widget el) + "Callback for widget, WIDGET. +Parameter EL is unused." + (goto-char (widget-get widget :from)) + (mh-press-button)) + (defun mh-press-button () "View contents of button. @@ -1234,7 +1042,6 @@ attachment, the attachment is hidden." (unwind-protect (and function (funcall function data)) (set-buffer-modified-p nil))))) -;;;###mh-autoload (defun mh-push-button (event) "Click MIME button for EVENT. @@ -1251,110 +1058,40 @@ to click the MIME button." (mh-handle-set-external-undisplayer folder handle func))) (and function (funcall function data)))))) -;;;###mh-autoload -(defun mh-mime-save-part () - "Save MIME part at point." - (interactive) - (let ((data (get-text-property (point) 'mh-data))) - (when data - (let ((mm-default-directory - (file-name-as-directory (or mh-mime-save-parts-directory - default-directory)))) - (mh-mm-save-part data) - (setq mh-mime-save-parts-directory mm-default-directory))))) - -;;;###mh-autoload -(defun mh-mime-inline-part () - "Toggle display of the raw MIME part." - (interactive) - (let* ((buffer-read-only nil) - (data (get-text-property (point) 'mh-data)) - (inserted-flag (get-text-property (point) 'mh-mime-inserted)) - (displayed-flag (mm-handle-displayed-p data)) - (point (point)) - start end) - (cond ((and data (not inserted-flag) (not displayed-flag)) - (let ((contents (mm-get-part data))) - (add-text-properties (line-beginning-position) (line-end-position) - '(mh-mime-inserted t)) - (setq start (point-marker)) - (forward-line 1) - (mm-insert-inline data contents) - (setq end (point-marker)) - (add-text-properties - start (progn (goto-char start) (line-end-position)) - `(mh-region (,start . ,end))))) - ((and data (or inserted-flag displayed-flag)) - (mh-press-button) - (message "MIME part already inserted"))) - (goto-char point) - (set-buffer-modified-p nil))) - -;;;###mh-autoload -(defun mh-display-with-external-viewer (part-index) - "View attachment externally. - -If Emacs does not know how to view an attachment, you could save -it into a file and then run some program to open it. It is -easier, however, to launch the program directly from MH-E with -this command. While you'll most likely use this to view -spreadsheets and documents, it is also useful to use your browser -to view HTML attachments with higher fidelity than what Emacs can -provide. - -This command displays the attachment associated with the button -under the cursor. If the cursor is not located over a button, -then the cursor first moves to the next button, wrapping to the -beginning of the message if necessary. You can provide a numeric -prefix argument PART-INDEX to view the attachment labeled with -that number. - -This command tries to provide a reasonable default for the viewer -by calling the Emacs function `mailcap-mime-info'. This function -usually reads the file \"/etc/mailcap\"." - (interactive "P") - (when (consp part-index) (setq part-index (car part-index))) - (mh-folder-mime-action - part-index - #'(lambda () - (let* ((part (get-text-property (point) 'mh-data)) - (type (mm-handle-media-type part)) - (methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x)))) - (mailcap-mime-info type 'all))) - (def (caar methods)) - (prompt (format "Viewer%s: " (if def - (format " (default %s)" def) - ""))) - (method (completing-read prompt methods nil nil nil nil def)) - (folder mh-show-folder-buffer) - (buffer-read-only nil)) - (when (string-match "^[^% \t]+$" method) - (setq method (concat method " %s"))) - (flet ((mm-handle-set-external-undisplayer (handle function) - (mh-handle-set-external-undisplayer folder handle function))) - (unwind-protect (mm-display-external part method) - (set-buffer-modified-p nil))))) - nil)) +(defun mh-handle-set-external-undisplayer (folder handle function) + "Replacement for `mm-handle-set-external-undisplayer'. -(defun mh-widget-press-button (widget el) - "Callback for widget, WIDGET. -Parameter EL is unused." - (goto-char (widget-get widget :from)) - (mh-press-button)) +This is only called in recent versions of Gnus. The MIME handles +are stored in data structures corresponding to MH-E folder buffer +FOLDER instead of in Gnus (as in the original). The MIME part, +HANDLE is associated with the undisplayer FUNCTION." + (if (mm-keep-viewer-alive-p handle) + (let ((new-handle (copy-sequence handle))) + (mm-handle-set-undisplayer new-handle function) + (mm-handle-set-undisplayer handle nil) + (save-excursion + (set-buffer folder) + (push new-handle (mh-mime-handles (mh-buffer-data))))) + (mm-handle-set-undisplayer handle function))) -(defun mh-mime-display-security (handle) - "Display PGP encrypted/signed message, HANDLE." - (save-restriction - (narrow-to-region (point) (point)) - (insert "\n") - (mh-insert-mime-security-button handle) - (mh-mime-display-mixed (cdr handle)) - (insert "\n") - (let ((mh-mime-security-button-line-format - mh-mime-security-button-end-line-format)) - (mh-insert-mime-security-button handle)) - (mm-set-handle-multipart-parameter - handle 'mh-region (cons (point-min-marker) (point-max-marker))))) +(defun mh-mime-security-press-button (handle) + "Callback from security button for part HANDLE." + (if (mm-handle-multipart-ctl-parameter handle 'gnus-info) + (mh-mime-security-show-details handle) + (let ((region (mm-handle-multipart-ctl-parameter handle 'mh-region)) + point) + (setq point (point)) + (goto-char (car region)) + (delete-region (car region) (cdr region)) + (with-current-buffer (mm-handle-multipart-ctl-parameter handle 'buffer) + (let* ((mm-verify-option 'known) + (mm-decrypt-option 'known) + (new (mm-possibly-verify-or-decrypt (cdr handle) handle))) + (unless (eq new (cdr handle)) + (mm-destroy-parts (cdr handle)) + (setcdr handle new)))) + (mh-mime-display-security handle) + (goto-char point)))) ;; I rewrote the security part because Gnus doesn't seem to ever minimize ;; the button. That is once the mime-security button is pressed there seems @@ -1383,142 +1120,680 @@ Parameter EL is unused." (point-max))) (forward-line -1))))) -(defun mh-mime-security-button-face (info) - "Return the button face to use for encrypted/signed mail based on INFO." - (cond ((string-match "OK" info) ;Decrypted mail - 'mh-show-pgg-good) - ((string-match "Failed" info) ;Decryption failed or signature invalid - 'mh-show-pgg-bad) - ((string-match "Undecided" info);Unprocessed mail - 'mh-show-pgg-unknown) - ((string-match "Untrusted" info);Key not trusted - 'mh-show-pgg-unknown) - (t - 'mh-show-pgg-good))) + -(defun mh-mime-security-press-button (handle) - "Callback from security button for part HANDLE." - (if (mm-handle-multipart-ctl-parameter handle 'gnus-info) - (mh-mime-security-show-details handle) - (let ((region (mm-handle-multipart-ctl-parameter handle 'mh-region)) - point) - (setq point (point)) - (goto-char (car region)) - (delete-region (car region) (cdr region)) - (with-current-buffer (mm-handle-multipart-ctl-parameter handle 'buffer) - (let* ((mm-verify-option 'known) - (mm-decrypt-option 'known) - (new (mm-possibly-verify-or-decrypt (cdr handle) handle))) - (unless (eq new (cdr handle)) - (mm-destroy-parts (cdr handle)) - (setcdr handle new)))) - (mh-mime-display-security handle) - (goto-char point)))) +;;; Miscellaneous Article Washing + +;;;###mh-autoload +(defun mh-add-missing-mime-version-header () + "Some mail programs don't put a MIME-Version header. +I have seen this only in spam, so maybe we shouldn't fix +this ;-)" + (save-excursion + (goto-char (point-min)) + (re-search-forward "\n\n" nil t) + (save-restriction + (narrow-to-region (point-min) (point)) + (when (and (message-fetch-field "content-type") + (not (message-fetch-field "mime-version"))) + (goto-char (point-min)) + (insert "MIME-Version: 1.0\n"))))) + +;;;###mh-autoload +(defun mh-display-smileys () + "Display smileys." + (when (and mh-graphical-smileys-flag (mh-small-show-buffer-p)) + (mh-funcall-if-exists smiley-region (point-min) (point-max)))) + +;;;###mh-autoload +(defun mh-display-emphasis () + "Display graphical emphasis." + (when (and mh-graphical-emphasis-flag (mh-small-show-buffer-p)) + (flet ((article-goto-body ())) ; shadow this function to do nothing + (save-excursion + (goto-char (point-min)) + (article-emphasize))))) + +(defun mh-small-show-buffer-p () + "Check if show buffer is small. +This is used to decide if smileys and graphical emphasis should be +displayed." + (let ((max nil)) + (when (and (boundp 'font-lock-maximum-size) font-lock-maximum-size) + (cond ((numberp font-lock-maximum-size) + (setq max font-lock-maximum-size)) + ((listp font-lock-maximum-size) + (setq max (cdr (or (assoc 'mh-show-mode font-lock-maximum-size) + (assoc t font-lock-maximum-size))))))) + (or (not (numberp max)) (>= (/ max 8) (buffer-size))))) + + + +;;; MH-Letter Commands + +;; MH-E commands are alphabetical; specific support routines follow command. + +;;;###mh-autoload +(defun mh-compose-forward (&optional description folder range) + "Add tag to forward a message. + +You are prompted for a content DESCRIPTION, the name of the +FOLDER in which the messages to forward are located, and a RANGE +of messages, which defaults to the current message in that +folder. Check the documentation of `mh-interactive-range' to see +how RANGE is read in interactive use. + +The option `mh-compose-insertion' controls what type of tags are inserted." + (interactive + (let* ((description + (mml-minibuffer-read-description)) + (folder + (mh-prompt-for-folder "Message from" + mh-sent-from-folder nil)) + (default + (if (and (equal folder mh-sent-from-folder) + (numberp mh-sent-from-msg)) + mh-sent-from-msg + (nth 0 (mh-translate-range folder "cur")))) + (range + (mh-read-range "Forward" folder + (or (and default + (number-to-string default)) + t) + t t))) + (list description folder range))) + (let ((messages (mapconcat 'identity (mh-list-to-string range) " "))) + (dolist (message (mh-translate-range folder messages)) + (if (equal mh-compose-insertion 'mml) + (mh-mml-forward-message description folder (format "%s" message)) + (mh-mh-forward-message description folder (format "%s" message)))))) + +;;;###mh-autoload +(defun mh-mml-forward-message (description folder message) + "Forward a message as attachment. + +The function will prompt the user for a DESCRIPTION, a FOLDER and +MESSAGE number." + (let ((msg (if (and (equal message "") (numberp mh-sent-from-msg)) + mh-sent-from-msg + (string-to-number message)))) + (cond ((integerp msg) + (if (string= "" description) + ;; Rationale: mml-attach-file constructs a malformed composition + ;; if the description string is empty. This fixes SF #625168. + (mml-attach-file (format "%s%s/%d" + mh-user-path (substring folder 1) msg) + "message/rfc822") + (mml-attach-file (format "%s%s/%d" + mh-user-path (substring folder 1) msg) + "message/rfc822" + description))) + (t (error "The message number, %s, is not a integer" msg))))) + +(defun mh-mh-forward-message (&optional description folder messages) + "Add tag to forward a message. +You are prompted for a content DESCRIPTION, the name of the +FOLDER in which the messages to forward are located, and the +MESSAGES' numbers. + +See also \\[mh-mh-to-mime]." + (interactive (list + (mml-minibuffer-read-description) + (mh-prompt-for-folder "Message from" mh-sent-from-folder nil) + (read-string (concat "Messages" + (if (numberp mh-sent-from-msg) + (format " (default %d): " + mh-sent-from-msg) + ": "))))) + (beginning-of-line) + (insert "#forw [") + (and description + (not (string= description "")) + (insert description)) + (insert "]") + (and folder + (not (string= folder "")) + (insert " " folder)) + (if (and messages + (not (string= messages ""))) + (let ((start (point))) + (insert " " messages) + (subst-char-in-region start (point) ?, ? )) + (if (numberp mh-sent-from-msg) + (insert " " (int-to-string mh-sent-from-msg)))) + (insert "\n")) + +;;;###mh-autoload +(defun mh-compose-insertion (&optional inline) + "Add tag to include a file such as an image or sound. + +You are prompted for the filename containing the object, the +media type if it cannot be determined automatically, and a +content description. If you're using MH-style directives, you +will also be prompted for additional attributes. + +The option `mh-compose-insertion' controls what type of tags are +inserted. Optional argument INLINE means make it an inline +attachment." + (interactive "P") + (if (equal mh-compose-insertion 'mml) + (if inline + (mh-mml-attach-file "inline") + (mh-mml-attach-file)) + (call-interactively 'mh-mh-attach-file))) + +(defun mh-mml-attach-file (&optional disposition) + "Add a tag to insert a MIME message part from a file. + +You are prompted for the filename containing the object, the +media type if it cannot be determined automatically, a content +description and the DISPOSITION of the attachment. + +This is basically `mml-attach-file' from Gnus, modified such that a prefix +argument yields an \"inline\" disposition and Content-Type is determined +automatically." + (let* ((file (mml-minibuffer-read-file "Attach file: ")) + (type (mh-minibuffer-read-type file)) + (description (mml-minibuffer-read-description)) + (dispos (or disposition + (mml-minibuffer-read-disposition type)))) + (mml-insert-empty-tag 'part 'type type 'filename file + 'disposition dispos 'description description))) + +(defun mh-mh-attach-file (filename type description attributes) + "Add a tag to insert a MIME message part from a file. +You are prompted for the FILENAME containing the object, the +media TYPE if it cannot be determined automatically, and a +content DESCRIPTION. In addition, you are also prompted for +additional ATTRIBUTES. + +See also \\[mh-mh-to-mime]." + (interactive (let ((filename (mml-minibuffer-read-file "Attach file: "))) + (list + filename + (mh-minibuffer-read-type filename) + (mml-minibuffer-read-description) + (read-string "Attributes: " + (concat "name=\"" + (file-name-nondirectory filename) + "\""))))) + (mh-mh-compose-type filename type description attributes)) + +(defun mh-mh-compose-type (filename type + &optional description attributes comment) + "Insert an MH-style directive to insert a file. +The file specified by FILENAME is encoded as TYPE. An optional +DESCRIPTION is used as the Content-Description field, optional +set of ATTRIBUTES and an optional COMMENT can also be included." + (beginning-of-line) + (insert "#" type) + (and attributes + (insert "; " attributes)) + (and comment + (insert " (" comment ")")) + (insert " [") + (and description + (insert description)) + (insert "] " (expand-file-name filename)) + (insert "\n")) + +;;;###mh-autoload +(defun mh-mh-compose-anon-ftp (host filename type description) + "Add tag to include anonymous ftp reference to a file. + +You can have your message initiate an \"ftp\" transfer when the +recipient reads the message. You are prompted for the remote HOST +and FILENAME, the media TYPE, and the content DESCRIPTION. + +See also \\[mh-mh-to-mime]." + (interactive (list + (read-string "Remote host: ") + (read-string "Remote filename: ") + (mh-minibuffer-read-type "DUMMY-FILENAME") + (mml-minibuffer-read-description))) + (mh-mh-compose-external-type "anon-ftp" host filename + type description)) + +;;;###mh-autoload +(defun mh-mh-compose-external-compressed-tar (host filename description) + "Add tag to include anonymous ftp reference to a compressed tar file. + +In addition to retrieving the file via anonymous \"ftp\" as per +the command \\[mh-mh-compose-anon-ftp], the file will also be +uncompressed and untarred. You are prompted for the remote HOST +and FILENAME and the content DESCRIPTION. + +See also \\[mh-mh-to-mime]." + (interactive (list + (read-string "Remote host: ") + (read-string "Remote filename: ") + (mml-minibuffer-read-description))) + (mh-mh-compose-external-type "anon-ftp" host filename + "application/octet-stream" + description + "type=tar; conversions=x-compress" + "mode=image")) + +;; RFC 2045 - Multipurpose Internet Mail Extensions (MIME) Part One: +;; Format of Internet Message Bodies. +;; RFC 2046 - Multipurpose Internet Mail Extensions (MIME) Part Two: +;; Media Types. +;; RFC 2049 - Multipurpose Internet Mail Extensions (MIME) Part Five: +;; Conformance Criteria and Examples. +;; RFC 2017 - Definition of the URL MIME External-Body Access-Type +;; RFC 1738 - Uniform Resource Locators (URL) +(defvar mh-access-types + '(("anon-ftp") ; RFC2046 Anonymous File Transfer Protocol + ("file") ; RFC1738 Host-specific file names + ("ftp") ; RFC2046 File Transfer Protocol + ("gopher") ; RFC1738 The Gopher Protocol + ("http") ; RFC1738 Hypertext Transfer Protocol + ("local-file") ; RFC2046 Local file access + ("mail-server") ; RFC2046 mail-server Electronic mail address + ("mailto") ; RFC1738 Electronic mail address + ("news") ; RFC1738 Usenet news + ("nntp") ; RFC1738 Usenet news using NNTP access + ("propspero") ; RFC1738 Prospero Directory Service + ("telnet") ; RFC1738 Telnet + ("tftp") ; RFC2046 Trivial File Transfer Protocol + ("url") ; RFC2017 URL scheme MIME access-type Protocol + ("wais")) ; RFC1738 Wide Area Information Servers + "Valid MIME access-type values.") + +;;;###mh-autoload +(defun mh-mh-compose-external-type (access-type host filename type + &optional description + attributes parameters + comment) + "Add tag to refer to a remote file. + +This command is a general utility for referencing external files. +In fact, all of the other commands that insert directives to +access external files call this command. You are prompted for the +ACCESS-TYPE, remote HOST and FILENAME, and content TYPE. If you +provide a prefix argument, you are also prompted for a content +DESCRIPTION, ATTRIBUTES, PARAMETERS, and a COMMENT. + +See also \\[mh-mh-to-mime]." + (interactive (list + (completing-read "Access type: " mh-access-types) + (read-string "Remote host: ") + (read-string "Remote filename: ") + (mh-minibuffer-read-type "DUMMY-FILENAME") + (if current-prefix-arg (mml-minibuffer-read-description)) + (if current-prefix-arg (read-string "Attributes: ")) + (if current-prefix-arg (read-string "Parameters: ")) + (if current-prefix-arg (read-string "Comment: ")))) + (beginning-of-line) + (insert "#@" type) + (and attributes + (insert "; " attributes)) + (and comment + (insert " (" comment ") ")) + (insert " [") + (and description + (insert description)) + (insert "] ") + (insert "access-type=" access-type "; ") + (insert "site=" host) + (insert "; name=" (file-name-nondirectory filename)) + (let ((directory (file-name-directory filename))) + (and directory + (insert "; directory=\"" directory "\""))) + (and parameters + (insert "; " parameters)) + (insert "\n")) + +(defvar mh-mh-to-mime-args nil + "Extra arguments for \\[mh-mh-to-mime] to pass to the \"mhbuild\" command. +The arguments are passed to \"mhbuild\" if \\[mh-mh-to-mime] is +given a prefix argument. Normally default arguments to +\"mhbuild\" are specified in the MH profile.") + +;;;###mh-autoload +(defun mh-mh-to-mime (&optional extra-args) + "Compose MIME message from MH-style directives. + +Typically, you send a message with attachments just like any other +message. However, you may take a sneak preview of the MIME encoding if +you wish by running this command. + +If you wish to pass additional arguments to \"mhbuild\" (\"mhn\") +to affect how it builds your message, use the option +`mh-mh-to-mime-args'. For example, you can build a consistency +check into the message by setting `mh-mh-to-mime-args' to +\"-check\". The recipient of your message can then run \"mhbuild +-check\" on the message--\"mhbuild\" (\"mhn\") will complain if +the message has been corrupted on the way. This command only +consults this option when given a prefix argument EXTRA-ARGS. + +The hook `mh-mh-to-mime-hook' is called after the message has been +formatted. + +The effects of this command can be undone by running +\\[mh-mh-to-mime-undo]." + (interactive "*P") + (mh-mh-quote-unescaped-sharp) + (save-buffer) + (message "Running %s..." (if (mh-variant-p 'nmh) "mhbuild" "mhn")) + (cond + ((mh-variant-p 'nmh) + (mh-exec-cmd-error nil + "mhbuild" + (if extra-args mh-mh-to-mime-args) + buffer-file-name)) + (t + (mh-exec-cmd-error (format "mhdraft=%s" buffer-file-name) + "mhn" + (if extra-args mh-mh-to-mime-args) + buffer-file-name))) + (revert-buffer t t) + (message "Running %s...done" (if (mh-variant-p 'nmh) "mhbuild" "mhn")) + (run-hooks 'mh-mh-to-mime-hook)) + +(defun mh-mh-quote-unescaped-sharp () + "Quote \"#\" characters that haven't been quoted for \"mhbuild\". +If the \"#\" character is present in the first column, but it isn't +part of a MH-style directive then \"mhbuild\" gives an error. +This function will quote all such characters." + (save-excursion + (goto-char (point-min)) + (while (re-search-forward "^#" nil t) + (beginning-of-line) + (unless (mh-mh-directive-present-p (point) (line-end-position)) + (insert "#")) + (goto-char (line-end-position))))) + +;;;###mh-autoload +(defun mh-mh-to-mime-undo (noconfirm) + "Undo effects of \\[mh-mh-to-mime]. + +It does this by reverting to a backup file. You are prompted to +confirm this action, but you can avoid the confirmation by adding +a prefix argument NOCONFIRM." + (interactive "*P") + (if (null buffer-file-name) + (error "Buffer does not seem to be associated with any file")) + (let ((backup-strings '("," "#")) + backup-file) + (while (and backup-strings + (not (file-exists-p + (setq backup-file + (concat (file-name-directory buffer-file-name) + (car backup-strings) + (file-name-nondirectory buffer-file-name) + ".orig"))))) + (setq backup-strings (cdr backup-strings))) + (or backup-strings + (error "Backup file for %s no longer exists" buffer-file-name)) + (or noconfirm + (yes-or-no-p (format "Revert buffer from file %s? " + backup-file)) + (error "Revert not confirmed")) + (let ((buffer-read-only nil)) + (erase-buffer) + (insert-file-contents backup-file)) + (after-find-file nil))) ;; Shush compiler. -(eval-when-compile - (defvar mm-verify-function-alist nil) - (defvar mm-decrypt-function-alist nil)) +(eval-when-compile (defvar mh-identity-pgg-default-user-id)) -(defvar pressed-details) +;;;###mh-autoload +(defun mh-mml-secure-message-encrypt (method) + "Add tag to encrypt the message. -(defun mh-insert-mime-security-button (handle) - "Display buttons for PGP message, HANDLE." - (let* ((protocol (mm-handle-multipart-ctl-parameter handle 'protocol)) - (crypto-type (or (nth 2 (assoc protocol mm-verify-function-alist)) - (nth 2 (assoc protocol mm-decrypt-function-alist)) - "Unknown")) - (type (concat crypto-type - (if (equal (car handle) "multipart/signed") - " Signed" " Encrypted") - " Part")) - (info (or (mm-handle-multipart-ctl-parameter handle 'gnus-info) - "Undecided")) - (details (mm-handle-multipart-ctl-parameter handle 'gnus-details)) - pressed-details begin end face) - (setq details (if details (concat "\n" details) "")) - (setq pressed-details (if mh-mime-security-button-pressed details "")) - (setq face (mh-mime-security-button-face info)) - (unless (bolp) (insert "\n")) - (setq begin (point)) - (gnus-eval-format - mh-mime-security-button-line-format - mh-mime-security-button-line-format-alist - `(,@(gnus-local-map-property mh-mime-security-button-map) - mh-button-pressed ,mh-mime-security-button-pressed - mh-callback mh-mime-security-press-button - mh-line-format ,mh-mime-security-button-line-format - mh-data ,handle)) - (setq end (point)) - (widget-convert-button 'link begin end - :mime-handle handle - :action 'mh-widget-press-button - :button-keymap mh-mime-security-button-map - :button-face face - :help-echo "Mouse-2 click or press RET (in show buffer) to see security details.") - (dolist (ov (mh-funcall-if-exists overlays-in begin end)) - (mh-funcall-if-exists overlay-put ov 'evaporate t)) - (when (equal info "Failed") - (let* ((type (if (equal (car handle) "multipart/signed") - "verification" "decryption")) - (warning (if (equal type "decryption") - "(passphrase may be incorrect)" ""))) - (message "%s %s failed %s" crypto-type type warning))))) +A proper multipart message is created for you when you send the +message. Use the command \\[mh-mml-unsecure-message] to remove +this tag. Use a prefix argument METHOD to be prompted for one of +the possible security methods (see `mh-mml-method-default')." + (interactive (list (mh-mml-query-cryptographic-method))) + (mh-secure-message method "encrypt" mh-identity-pgg-default-user-id)) -(defun mh-mm-inline-message (handle) - "Display message, HANDLE. -The function decodes the message and displays it. It avoids -decoding the same message multiple times." - (let ((b (point)) - (clean-message-header mh-clean-message-header-flag) - (invisible-headers mh-invisible-header-fields-compiled) - (visible-headers nil)) +;;;###mh-autoload +(defun mh-mml-secure-message-sign (method) + "Add tag to sign the message. + +A proper multipart message is created for you when you send the +message. Use the command \\[mh-mml-unsecure-message] to remove +this tag. Use a prefix argument METHOD to be prompted for one of +the possible security methods (see `mh-mml-method-default')." + (interactive (list (mh-mml-query-cryptographic-method))) + (mh-secure-message method "sign" mh-identity-pgg-default-user-id)) + +;;;###mh-autoload +(defun mh-mml-secure-message-signencrypt (method) + "Add tag to encrypt and sign the message. + +A proper multipart message is created for you when you send the +message. Use the command \\[mh-mml-unsecure-message] to remove +this tag. Use a prefix argument METHOD to be prompted for one of +the possible security methods (see `mh-mml-method-default')." + (interactive (list (mh-mml-query-cryptographic-method))) + (mh-secure-message method "signencrypt" mh-identity-pgg-default-user-id)) + +(defvar mh-mml-cryptographic-method-history ()) + +(defun mh-mml-query-cryptographic-method () + "Read the cryptographic method to use." + (if current-prefix-arg + (let ((def (or (car mh-mml-cryptographic-method-history) + mh-mml-method-default))) + (completing-read (format "Method (default %s): " def) + '(("pgp") ("pgpmime") ("smime")) + nil t nil 'mh-mml-cryptographic-method-history def)) + mh-mml-method-default)) + +(defun mh-secure-message (method mode &optional identity) + "Add tag to encrypt or sign message. + +METHOD should be one of: \"pgpmime\", \"pgp\", \"smime\". +MODE should be one of: \"sign\", \"encrypt\", \"signencrypt\", \"none\". +IDENTITY is optionally the default-user-id to use." + (if (not mh-pgp-support-flag) + (error "Your version of Gnus does not support PGP/GPG") + ;; Check the arguments + (let ((valid-methods (list "pgpmime" "pgp" "smime")) + (valid-modes (list "sign" "encrypt" "signencrypt" "none"))) + (if (not (member method valid-methods)) + (error "Method %s is invalid" method)) + (if (not (member mode valid-modes)) + (error "Mode %s is invalid" mode)) + (mml-unsecure-message) + (if (not (string= mode "none")) + (save-excursion + (goto-char (point-min)) + (mh-goto-header-end 1) + (if mh-identity-pgg-default-user-id + (mml-insert-tag 'secure 'method method 'mode mode + 'sender mh-identity-pgg-default-user-id) + (mml-insert-tag 'secure 'method method 'mode mode))))))) + +;;;###mh-autoload +(defun mh-mml-to-mime () + "Compose MIME message from MML tags. + +Typically, you send a message with attachments just like any +other message. However, you may take a sneak preview of the MIME +encoding if you wish by running this command. + +This action can be undone by running \\[undo]." + (interactive) + (require 'message) + (when mh-pgp-support-flag ;; This is only needed for PGP + (message-options-set-recipient)) + (let ((saved-text (buffer-string)) + (buffer (current-buffer)) + (modified-flag (buffer-modified-p))) + (condition-case err (mml-to-mime) + (error + (with-current-buffer buffer + (delete-region (point-min) (point-max)) + (insert saved-text) + (set-buffer-modified-p modified-flag)) + (error (error-message-string err)))))) + +;;;###mh-autoload +(defun mh-mml-unsecure-message () + "Remove any secure message tags." + (interactive) + (if (not mh-pgp-support-flag) + (error "Your version of Gnus does not support PGP/GPG") + (mml-unsecure-message))) + + + +;;; Support Routines for MH-Letter Commands + +;;;###mh-autoload +(defun mh-mml-tag-present-p () + "Check if the current buffer has text which may be a MML tag." + (save-excursion + (goto-char (point-min)) + (re-search-forward + (concat + "\\(<#\\(mml\\|part\\)\\(.\\|\n\\)*>[ \n\t]*<#/\\(mml\\|part\\)>\\|" + "^<#secure.+>$\\)") + nil t))) + +(defvar mh-media-type-regexp + (concat (regexp-opt '("text" "image" "audio" "video" "application" + "multipart" "message") t) + "/[-.+a-zA-Z0-9]+") + "Regexp matching valid media types used in MIME attachment compositions.") + +;;;###mh-autoload +(defun mh-mh-directive-present-p (&optional begin end) + "Check if the text between BEGIN and END might be a MH-style directive. +The optional argument BEGIN defaults to the beginning of the +buffer, while END defaults to the the end of the buffer." + (unless begin (setq begin (point-min))) + (unless end (setq end (point-max))) + (save-excursion + (block 'search-for-mh-directive + (goto-char begin) + (while (re-search-forward "^#" end t) + (let ((s (buffer-substring-no-properties (point) (line-end-position)))) + (cond ((equal s "")) + ((string-match "^forw[ \t\n]+" s) + (return-from 'search-for-mh-directive t)) + (t (let ((first-token (car (split-string s "[ \t;@]")))) + (when (and first-token + (string-match mh-media-type-regexp + first-token)) + (return-from 'search-for-mh-directive t))))))) + nil))) + +(defun mh-minibuffer-read-type (filename &optional default) + "Return the content type associated with the given FILENAME. +If the \"file\" command exists and recognizes the given file, +then its value is returned\; otherwise, the user is prompted for +a type (see `mailcap-mime-types' and for Emacs 20, +`mh-mime-content-types'). +Optional argument DEFAULT is returned if a type isn't entered." + (mailcap-parse-mimetypes) + (let* ((default (or default + (mm-default-file-encoding filename) + "application/octet-stream")) + (probed-type (mh-file-mime-type filename)) + (type (or (and (not (equal probed-type "application/octet-stream")) + probed-type) + (completing-read + (format "Content type (default %s): " default) + (mapcar 'list (mailcap-mime-types)))))) + (if (not (equal type "")) + type + default))) + +;;;###mh-autoload +(defun mh-file-mime-type (filename) + "Return MIME type of FILENAME from file command. +Returns nil if file command not on system." + (cond + ((not (mh-have-file-command)) + nil) ;no file command, exit now + ((not (and (file-exists-p filename) + (file-readable-p filename))) + nil) ;no file or not readable, ditto + (t (save-excursion - (save-restriction - (narrow-to-region b b) - (mm-insert-part handle) - (mh-mime-display - (or (gethash handle (mh-mime-handles-cache (mh-buffer-data))) - (setf (gethash handle (mh-mime-handles-cache (mh-buffer-data))) - (let ((handles (mm-dissect-buffer nil))) - (if handles - (when (fboundp 'mm-uu-dissect-text-parts) - (mm-uu-dissect-text-parts handles)) - (setq handles (mm-uu-dissect))) - (setf (mh-mime-handles (mh-buffer-data)) - (mm-merge-handles - handles (mh-mime-handles (mh-buffer-data)))) - handles)))) + (let ((tmp-buffer (get-buffer-create mh-temp-buffer))) + (set-buffer tmp-buffer) + (unwind-protect + (progn + (call-process "file" nil '(t nil) nil "-b" "-i" + (expand-file-name filename)) + (goto-char (point-min)) + (if (not (re-search-forward mh-media-type-regexp nil t)) + nil + (mh-file-mime-type-substitute (match-string 0) filename))) + (kill-buffer tmp-buffer))))))) - (goto-char (point-min)) - (mh-show-xface) - (cond (clean-message-header - (mh-clean-msg-header (point-min) - invisible-headers - visible-headers) - (goto-char (point-min))) - (t - (mh-start-of-uncleaned-message))) - (mh-decode-message-header) - (mh-show-addr) - ;; The other highlighting types don't need anything special - (when (eq mh-highlight-citation-style 'gnus) - (mh-gnus-article-highlight-citation)) - (goto-char (point-min)) - (insert "\n------- Forwarded Message\n\n") - (mh-display-smileys) - (mh-display-emphasis) - (mm-handle-set-undisplayer - handle - `(lambda () - (let (buffer-read-only) - (if (fboundp 'remove-specifier) - ;; This is only valid on XEmacs. - (mapcar (lambda (prop) - (remove-specifier - (face-property 'default prop) (current-buffer))) - '(background background-pixmap foreground))) - (delete-region ,(point-min-marker) ,(point-max-marker))))))))) +(defvar mh-file-mime-type-substitutions + '(("application/msword" "\.xls" "application/ms-excel") + ("application/msword" "\.ppt" "application/ms-powerpoint") + ("text/plain" "\.vcf" "text/x-vcard")) + "Substitutions to make for Content-Type returned from file command. +The first element is the Content-Type returned by the file command. +The second element is a regexp matching the file name, usually the +extension. +The third element is the Content-Type to replace with.") + +(defun mh-file-mime-type-substitute (content-type filename) + "Return possibly changed CONTENT-TYPE on the FILENAME. +Substitutions are made from the `mh-file-mime-type-substitutions' +variable." + (let ((subst mh-file-mime-type-substitutions) + (type) (match) (answer content-type) + (case-fold-search t)) + (while subst + (setq type (car (car subst)) + match (elt (car subst) 1)) + (if (and (string-equal content-type type) + (string-match match filename)) + (setq answer (elt (car subst) 2) + subst nil) + (setq subst (cdr subst)))) + answer)) + +(defvar mh-have-file-command 'undefined + "Cached value of function `mh-have-file-command'. +Do not reference this variable directly as it might not have been +initialized. Always use the command `mh-have-file-command'.") + +;;;###mh-autoload +(defun mh-have-file-command () + "Return t if 'file' command is on the system. +'file -i' is used to get MIME type of composition insertion." + (when (eq mh-have-file-command 'undefined) + (setq mh-have-file-command + (and (fboundp 'executable-find) + (executable-find "file") ; file command exists + ; and accepts -i and -b args. + (zerop (call-process "file" nil nil nil "-i" "-b" + (expand-file-name "inc" mh-progs)))))) + mh-have-file-command) + + + +;;; MIME Cleanup + +;;;###mh-autoload +(defun mh-mime-cleanup () + "Free the decoded MIME parts." + (let ((mime-data (gethash (current-buffer) mh-globals-hash))) + ;; This is for Emacs, what about XEmacs? + (mh-funcall-if-exists remove-images (point-min) (point-max)) + (when mime-data + (mm-destroy-parts (mh-mime-handles mime-data)) + (remhash (current-buffer) mh-globals-hash)))) + +;;;###mh-autoload +(defun mh-destroy-postponed-handles () + "Free MIME data for externally displayed MIME parts." + (let ((mime-data (mh-buffer-data))) + (when mime-data + (mm-destroy-parts (mh-mime-handles mime-data))) + (remhash (current-buffer) mh-globals-hash))) (provide 'mh-mime) |