mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-02 10:11:05 -08:00
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.
445 lines
16 KiB
EmacsLisp
445 lines
16 KiB
EmacsLisp
;;; mh-junk.el --- MH-E interface to anti-spam measures
|
||
|
||
;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||
|
||
;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
|
||
;; Bill Wohler <wohler@newt.com>
|
||
;; Maintainer: Bill Wohler <wohler@newt.com>
|
||
;; Keywords: mail, spam
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software; you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published by
|
||
;; the Free Software Foundation; either version 2, or (at your option)
|
||
;; any later version.
|
||
|
||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;; GNU General Public License for more details.
|
||
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
||
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||
;; Boston, MA 02110-1301, USA.
|
||
|
||
;;; Commentary:
|
||
|
||
;; Spam handling in MH-E.
|
||
|
||
;;; Change Log:
|
||
|
||
;;; Code:
|
||
|
||
(require 'mh-e)
|
||
(require 'mh-scan)
|
||
(mh-require-cl)
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-junk-blacklist (range)
|
||
"Blacklist RANGE as spam.
|
||
|
||
This command trains the spam program in use (see the option
|
||
`mh-junk-program') with the content of RANGE and then handles the
|
||
message(s) as specified by the option `mh-junk-disposition'.
|
||
|
||
Check the documentation of `mh-interactive-range' to see how RANGE is
|
||
read in interactive use.
|
||
|
||
For more information about using your particular spam fighting
|
||
program, see:
|
||
|
||
- `mh-spamassassin-blacklist'
|
||
- `mh-bogofilter-blacklist'
|
||
- `mh-spamprobe-blacklist'"
|
||
(interactive (list (mh-interactive-range "Blacklist")))
|
||
(let ((blacklist-func (nth 1 (assoc mh-junk-choice mh-junk-function-alist))))
|
||
(unless blacklist-func
|
||
(error "Customize `mh-junk-program' appropriately"))
|
||
(let ((dest (cond ((null mh-junk-disposition) nil)
|
||
((equal mh-junk-disposition "") "+")
|
||
((eq (aref mh-junk-disposition 0) ?+)
|
||
mh-junk-disposition)
|
||
((eq (aref mh-junk-disposition 0) ?@)
|
||
(concat mh-current-folder "/"
|
||
(substring mh-junk-disposition 1)))
|
||
(t (concat "+" mh-junk-disposition)))))
|
||
(mh-iterate-on-range msg range
|
||
(message "Blacklisting message %d..." msg)
|
||
(funcall (symbol-function blacklist-func) msg)
|
||
(message "Blacklisting message %d...done" msg)
|
||
(if (not (memq msg mh-seen-list))
|
||
(setq mh-seen-list (cons msg mh-seen-list)))
|
||
(if dest
|
||
(mh-refile-a-msg nil (intern dest))
|
||
(mh-delete-a-msg nil)))
|
||
(mh-next-msg))))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-junk-whitelist (range)
|
||
"Whitelist RANGE as ham.
|
||
|
||
This command reclassifies the RANGE as ham if it were incorrectly
|
||
classified as spam (see the option `mh-junk-program'). It then
|
||
refiles the message into the \"+inbox\" folder.
|
||
|
||
Check the documentation of `mh-interactive-range' to see how
|
||
RANGE is read in interactive use."
|
||
(interactive (list (mh-interactive-range "Whitelist")))
|
||
(let ((whitelist-func (nth 2 (assoc mh-junk-choice mh-junk-function-alist))))
|
||
(unless whitelist-func
|
||
(error "Customize `mh-junk-program' appropriately"))
|
||
(mh-iterate-on-range msg range
|
||
(message "Whitelisting message %d..." msg)
|
||
(funcall (symbol-function whitelist-func) msg)
|
||
(message "Whitelisting message %d...done" msg)
|
||
(mh-refile-a-msg nil (intern mh-inbox)))
|
||
(mh-next-msg)))
|
||
|
||
|
||
|
||
;; Spamassassin Interface
|
||
|
||
(defvar mh-spamassassin-executable (executable-find "spamassassin"))
|
||
(defvar mh-sa-learn-executable (executable-find "sa-learn"))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-spamassassin-blacklist (msg)
|
||
"Blacklist MSG with SpamAssassin.
|
||
|
||
SpamAssassin is one of the more popular spam filtering programs.
|
||
Get it from your local distribution or from
|
||
http://spamassassin.org/.
|
||
|
||
To use SpamAssassin, add the following recipes to
|
||
\".procmailrc\":
|
||
|
||
MAILDIR=$HOME/`mhparam Path`
|
||
|
||
# Fight spam with SpamAssassin.
|
||
:0fw
|
||
| spamc
|
||
|
||
# Anything with a spam level of 10 or more is junked immediately.
|
||
:0:
|
||
* ^X-Spam-Level: ..........
|
||
/dev/null
|
||
|
||
:0:
|
||
* ^X-Spam-Status: Yes
|
||
spam/.
|
||
|
||
If you don't use \"spamc\", use \"spamassassin -P -a\".
|
||
|
||
Note that one of the recipes above throws away messages with a
|
||
score greater than or equal to 10. Here's how you can determine a
|
||
value that works best for you.
|
||
|
||
First, run \"spamassassin -t\" on every mail message in your
|
||
archive and use Gnumeric to verify that the average plus the
|
||
standard deviation of good mail is under 5, the SpamAssassin
|
||
default for \"spam\".
|
||
|
||
Using Gnumeric, sort the messages by score and view the messages
|
||
with the highest score. Determine the score which encompasses all
|
||
of your interesting messages and add a couple of points to be
|
||
conservative. Add that many dots to the \"X-Spam-Level:\" header
|
||
field above to send messages with that score down the drain.
|
||
|
||
In the example above, messages with a score of 5-9 are set aside
|
||
in the \"+spam\" folder for later review. The major weakness of
|
||
rules-based filters is a plethora of false positives so it is
|
||
worthwhile to check.
|
||
|
||
If SpamAssassin classifies a message incorrectly, or is unsure,
|
||
you can use the MH-E commands \\[mh-junk-blacklist] and
|
||
\\[mh-junk-whitelist].
|
||
|
||
The command \\[mh-junk-blacklist] adds a \"blacklist_from\" entry
|
||
to \"~/spamassassin/user_prefs\", deletes the message, and sends
|
||
the message to the Razor, so that others might not see this spam.
|
||
If the \"sa-learn\" command is available, the message is also
|
||
recategorized as spam.
|
||
|
||
The command \\[mh-junk-whitelist] adds a \"whitelist_from\" rule
|
||
to the \"~/.spamassassin/user_prefs\" file. If the \"sa-learn\"
|
||
command is available, the message is also recategorized as ham.
|
||
|
||
Over time, you'll observe that the same host or domain occurs
|
||
repeatedly in the \"blacklist_from\" entries, so you might think
|
||
that you could avoid future spam by blacklisting all mail from a
|
||
particular domain. The utility function
|
||
`mh-spamassassin-identify-spammers' helps you do precisely that.
|
||
This function displays a frequency count of the hosts and domains
|
||
in the \"blacklist_from\" entries from the last blank line in
|
||
\"~/.spamassassin/user_prefs\" to the end of the file. This
|
||
information can be used so that you can replace multiple
|
||
\"blacklist_from\" entries with a single wildcard entry such as:
|
||
|
||
blacklist_from *@*amazingoffersdirect2u.com
|
||
|
||
In versions of SpamAssassin (2.50 and on) that support a Bayesian
|
||
classifier, \\[mh-junk-blacklist] uses the program \"sa-learn\"
|
||
to recategorize the message as spam. Neither MH-E, nor
|
||
SpamAssassin, rebuilds the database after adding words, so you
|
||
will need to run \"sa-learn --rebuild\" periodically. This can be
|
||
done by adding the following to your crontab:
|
||
|
||
0 * * * * sa-learn --rebuild > /dev/null 2>&1"
|
||
(unless mh-spamassassin-executable
|
||
(error "Unable to find the spamassassin executable"))
|
||
(let ((current-folder mh-current-folder)
|
||
(msg-file (mh-msg-filename msg mh-current-folder))
|
||
(sender))
|
||
(save-excursion
|
||
(message "Reporting message %d..." msg)
|
||
(mh-truncate-log-buffer)
|
||
(call-process mh-spamassassin-executable msg-file mh-log-buffer nil
|
||
;;"--report" "--remove-from-whitelist"
|
||
"-r" "-R") ; spamassassin V2.20
|
||
(when mh-sa-learn-executable
|
||
(message "Recategorizing this message as spam...")
|
||
(call-process mh-sa-learn-executable msg-file mh-log-buffer nil
|
||
"--single" "--spam" "--local" "--no-rebuild"))
|
||
(message "Blacklisting message %d..." msg)
|
||
(set-buffer (get-buffer-create mh-temp-buffer))
|
||
(erase-buffer)
|
||
(call-process (expand-file-name mh-scan-prog mh-progs)
|
||
nil mh-junk-background nil
|
||
(format "%s" msg) current-folder
|
||
"-format" "%<(mymbox{from})%|%(addr{from})%>")
|
||
(goto-char (point-min))
|
||
(if (search-forward-regexp "^\\(.+\\)$" nil t)
|
||
(progn
|
||
(setq sender (match-string 0))
|
||
(mh-spamassassin-add-rule "blacklist_from" sender)
|
||
(message "Blacklisting message %d...done" msg))
|
||
(message "Blacklisting message %d...not done (from my address)" msg)))))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-spamassassin-whitelist (msg)
|
||
"Whitelist MSG with SpamAssassin.
|
||
|
||
The \\[mh-junk-whitelist] command adds a \"whitelist_from\" rule to
|
||
the \"~/.spamassassin/user_prefs\" file. If the \"sa-learn\" command
|
||
is available, the message is also recategorized as ham.
|
||
|
||
See `mh-spamassassin-blacklist' for more information."
|
||
(unless mh-spamassassin-executable
|
||
(error "Unable to find the spamassassin executable"))
|
||
(let ((msg-file (mh-msg-filename msg mh-current-folder))
|
||
(show-buffer (get-buffer mh-show-buffer))
|
||
from)
|
||
(save-excursion
|
||
(set-buffer (get-buffer-create mh-temp-buffer))
|
||
(erase-buffer)
|
||
(message "Removing spamassassin markup from message...")
|
||
(call-process mh-spamassassin-executable msg-file mh-temp-buffer nil
|
||
;; "--remove-markup"
|
||
"-d") ; spamassassin V2.20
|
||
(if show-buffer
|
||
(kill-buffer show-buffer))
|
||
(write-file msg-file)
|
||
(when mh-sa-learn-executable
|
||
(message "Recategorizing this message as ham...")
|
||
(call-process mh-sa-learn-executable msg-file mh-temp-buffer nil
|
||
"--single" "--ham" "--local --no-rebuild"))
|
||
(message "Whitelisting message %d..." msg)
|
||
(setq from
|
||
(car (mh-funcall-if-exists
|
||
ietf-drums-parse-address (mh-get-header-field "From:"))))
|
||
(kill-buffer nil)
|
||
(unless (or (null from) (equal from ""))
|
||
(mh-spamassassin-add-rule "whitelist_from" from))
|
||
(message "Whitelisting message %d...done" msg))))
|
||
|
||
(defun mh-spamassassin-add-rule (rule body)
|
||
"Add a new rule to \"~/.spamassassin/user_prefs\".
|
||
The name of the rule is RULE and its body is BODY."
|
||
(save-window-excursion
|
||
(let* ((line (format "%s\t%s\n" rule body))
|
||
(case-fold-search t)
|
||
(file (expand-file-name "~/.spamassassin/user_prefs"))
|
||
(buffer-exists (find-buffer-visiting file)))
|
||
(find-file file)
|
||
(if (not (search-forward (format "\n%s" line) nil t))
|
||
(progn
|
||
(goto-char (point-max))
|
||
(insert (if (bolp) "" "\n") line)
|
||
(save-buffer)))
|
||
(if (not buffer-exists)
|
||
(kill-buffer nil)))))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-spamassassin-identify-spammers ()
|
||
"Identify spammers who are repeat offenders.
|
||
|
||
This function displays a frequency count of the hosts and domains
|
||
in the \"blacklist_from\" entries from the last blank line in
|
||
\"~/.spamassassin/user_prefs\" to the end of the file. This
|
||
information can be used so that you can replace multiple
|
||
\"blacklist_from\" entries with a single wildcard entry such as:
|
||
|
||
blacklist_from *@*amazingoffersdirect2u.com"
|
||
(interactive)
|
||
(let* ((file (expand-file-name "~/.spamassassin/user_prefs"))
|
||
(domains (make-hash-table :test 'equal)))
|
||
(find-file file)
|
||
;; Only consider entries between last blank line and end of file.
|
||
(goto-char (1- (point-max)))
|
||
(search-backward-regexp "^$")
|
||
;; Perform frequency count.
|
||
(save-excursion
|
||
(while (search-forward-regexp "^blacklist_from\\s-*\\(.*\\)@\\(.*\\)$"
|
||
nil t)
|
||
(let ((host (match-string 2))
|
||
value)
|
||
;; Remove top-level-domain from hostname.
|
||
(setq host (cdr (reverse (split-string host "\\."))))
|
||
;; Add counts for each host and domain part.
|
||
(while host
|
||
(setq value (gethash (car host) domains))
|
||
(setf (gethash (car host) domains) (1+ (if (not value) 0 value)))
|
||
(setq host (cdr host))))))
|
||
|
||
;; Output
|
||
(delete-other-windows)
|
||
(pop-to-buffer (get-buffer-create "*MH-E Spammer Frequencies*"))
|
||
(erase-buffer)
|
||
(maphash '(lambda (key value) ""
|
||
(if (> value 2)
|
||
(insert (format "%s %s\n" key value))))
|
||
domains)
|
||
(sort-numeric-fields 2 (point-min) (point-max))
|
||
(reverse-region (point-min) (point-max))
|
||
(goto-char (point-min))))
|
||
|
||
|
||
|
||
;; Bogofilter Interface
|
||
|
||
(defvar mh-bogofilter-executable (executable-find "bogofilter"))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-bogofilter-blacklist (msg)
|
||
"Blacklist MSG with bogofilter.
|
||
|
||
Bogofilter is a Bayesian spam filtering program. Get it from your
|
||
local distribution or from http://bogofilter.sourceforge.net/.
|
||
|
||
Bogofilter is taught by running:
|
||
|
||
bogofilter -n < good-message
|
||
|
||
on every good message, and
|
||
|
||
bogofilter -s < spam-message
|
||
|
||
on every spam message. This is called a full training; three other
|
||
training methods are described in the FAQ that is distributed with
|
||
bogofilter. Note that most Bayesian filters need 1000 to 5000 of each
|
||
type of message to start doing a good job.
|
||
|
||
To use bogofilter, add the following recipes to \".procmailrc\":
|
||
|
||
MAILDIR=$HOME/`mhparam Path`
|
||
|
||
# Fight spam with bogofilter.
|
||
:0fw
|
||
| bogofilter -3 -e -p
|
||
|
||
:0:
|
||
* ^X-Bogosity: Yes, tests=bogofilter
|
||
spam/.
|
||
|
||
:0:
|
||
* ^X-Bogosity: Unsure, tests=bogofilter
|
||
spam/unsure/.
|
||
|
||
If bogofilter classifies a message incorrectly, or is unsure, you can
|
||
use the MH-E commands \\[mh-junk-blacklist] and \\[mh-junk-whitelist]
|
||
to update bogofilter's training.
|
||
|
||
The \"Bogofilter FAQ\" suggests that you run the following
|
||
occasionally to shrink the database:
|
||
|
||
bogoutil -d wordlist.db | bogoutil -l wordlist.db.new
|
||
mv wordlist.db wordlist.db.prv
|
||
mv wordlist.db.new wordlist.db
|
||
|
||
The \"Bogofilter tuning HOWTO\" describes how you can fine-tune Bogofilter."
|
||
(unless mh-bogofilter-executable
|
||
(error "Unable to find the bogofilter executable"))
|
||
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
|
||
(call-process mh-bogofilter-executable msg-file mh-junk-background
|
||
nil "-s")))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-bogofilter-whitelist (msg)
|
||
"Whitelist MSG with bogofilter.
|
||
|
||
See `mh-bogofilter-blacklist' for more information."
|
||
(unless mh-bogofilter-executable
|
||
(error "Unable to find the bogofilter executable"))
|
||
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
|
||
(call-process mh-bogofilter-executable msg-file mh-junk-background
|
||
nil "-n")))
|
||
|
||
|
||
|
||
;; Spamprobe Interface
|
||
|
||
(defvar mh-spamprobe-executable (executable-find "spamprobe"))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-spamprobe-blacklist (msg)
|
||
"Blacklist MSG with SpamProbe.
|
||
|
||
SpamProbe is a Bayesian spam filtering program. Get it from your local
|
||
distribution or from http://spamprobe.sourceforge.net.
|
||
|
||
To use SpamProbe, add the following recipes to \".procmailrc\":
|
||
|
||
MAILDIR=$HOME/`mhparam Path`
|
||
|
||
# Fight spam with SpamProbe.
|
||
:0
|
||
SCORE=| spamprobe receive
|
||
|
||
:0 wf
|
||
| formail -I \"X-SpamProbe: $SCORE\"
|
||
|
||
:0:
|
||
*^X-SpamProbe: SPAM
|
||
spam/.
|
||
|
||
If SpamProbe classifies a message incorrectly, you can use the
|
||
MH-E commands \\[mh-junk-blacklist] and \\[mh-junk-whitelist] to
|
||
update SpamProbe's training."
|
||
(unless mh-spamprobe-executable
|
||
(error "Unable to find the spamprobe executable"))
|
||
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
|
||
(call-process mh-spamprobe-executable msg-file mh-junk-background
|
||
nil "spam")))
|
||
|
||
;;;###mh-autoload
|
||
(defun mh-spamprobe-whitelist (msg)
|
||
"Whitelist MSG with SpamProbe.
|
||
|
||
See `mh-spamprobe-blacklist' for more information."
|
||
(unless mh-spamprobe-executable
|
||
(error "Unable to find the spamprobe executable"))
|
||
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
|
||
(call-process mh-spamprobe-executable msg-file mh-junk-background
|
||
nil "good")))
|
||
|
||
(provide 'mh-junk)
|
||
|
||
;; Local Variables:
|
||
;; indent-tabs-mode: nil
|
||
;; sentence-end-double-space: nil
|
||
;; End:
|
||
|
||
;; arch-tag: 603335f1-77ff-4306-8828-5d3dad51abe1
|
||
;;; mh-junk.el ends here
|