Mercurial > emacs
view lisp/mail/rmailkwd.el @ 57856:df80d19d7a2e
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
2004-11-01 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-msg.el (gnus-summary-resend-default-address): Add :version.
* lisp/gnus/tls.el (tls-process-connection-type, tls-success)
(tls-certtool-program): Add :version.
* lisp/gnus/starttls.el (starttls-gnutls-program, starttls-use-gnutls)
(starttls-extra-arguments, starttls-process-connection-type)
(starttls-connect, starttls-failure, starttls-success):
* lisp/gnus/spam-stat.el (spam-stat): Add :version.
* lisp/gnus/sieve.el (sieve): Add :version.
* lisp/gnus/sha1.el (sha1): Added :version.
(sha1-use-external): Removed redundant version.
* lisp/gnus/nnmail.el (nnmail-split-fancy-with-parent-ignore-groups)
(nnmail-cache-ignore-groups, nnmail-spool-hook)
(nnmail-split-fancy-match-partial-words)
(nnmail-split-lowercase-expanded):
* lisp/gnus/nndiary.el (nndiary): Add :version.
* lisp/gnus/mml2015.el (mml2015-unabbrev-trust-alist): Add :version.
* lisp/gnus/mml-sec.el (mml-default-sign-method)
(mml-default-encrypt-method, mml-signencrypt-style-alist): Add
:version.
* lisp/gnus/mm-uu.el (mm-uu-diff-groups-regexp): Add :version.
* lisp/gnus/mm-url.el (mm-url-use-external, mm-url-program)
(mm-url-arguments): Add :version.
* lisp/gnus/mm-decode.el (mm-inline-text-html-with-w3m-keymap)
(mm-attachment-file-modes, mm-decrypt-option)
(mm-w3m-safe-url-regexp): Add :version.
* lisp/gnus/message.el (message-cite-prefix-regexp)
(message-sendmail-envelope-from, message-minibuffer-local-map)
(message-user-fqdn, message-completion-alist): Add :version.
* lisp/gnus/gnus-win.el (gnus-configure-windows-hook)
(gnus-use-frames-on-any-display): Add :version.
* lisp/gnus/gnus-art.el (gnus-article-address-banner-alist)
(gnus-treat-unsplit-urls, gnus-treat-unfold-headers)
(gnus-treat-from-picon, gnus-treat-mail-picon)
(gnus-treat-x-pgp-sig): Add :version.
* lisp/gnus/gnus-sum.el (gnus-spam-mark, gnus-recent-mark)
(gnus-undownloaded-mark, gnus-summary-article-move-hook)
(gnus-summary-article-delete-hook)
(gnus-summary-display-while-building): Add :version.
* lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-hooks)
(gnus-get-top-new-news-hook):Add :version.
* lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face): Add :version.
* lisp/gnus/gnus-registry.el (gnus-registry): Add :version.
* lisp/gnus/gnus-spec.el (gnus-use-correct-string-widths)
(gnus-make-format-preserve-properties): Add :version.
* lisp/gnus/gnus.el (gnus-group-charter-alist)
(gnus-group-fetch-control-use-browse-url)
(gnus-install-group-spam-parameters): Add :version.
* lisp/gnus/gnus-diary.el (gnus-diary): Add :version.
* lisp/gnus/gnus-delay.el (gnus-delay): Add :version.
* lisp/gnus/gnus-cite.el (gnus-cite-unsightly-citation-regexp)
(gnus-cite-ignore-quoted-from, gnus-cite-attribution-face)
(gnus-cite-blank-line-after-header, gnus-article-boring-faces):
Add :version.
* lisp/gnus/gnus-agent.el (gnus-agent-max-fetch-size)
(gnus-agent-enable-expiration, gnus-agent-queue-mail)
(gnus-agent-prompt-send-queue): Add :version.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :version.
* lisp/gnus/html2text.el: Beautify code. Improve doc strings. Some checkdoc
cleanup.
(html2text-get-attr, html2text-fix-paragraph): Simplify code.
(html2text-format-tag-list): Added "strong" and "em". From
"Alfred M. Szmidt" <ams@kemisten.nu> (tiny change).
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 01 Nov 2004 23:06:36 +0000 |
parents | 695cf19ef79e |
children | 18a818a2ee7c 375f2633d815 |
line wrap: on
line source
;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs ;; Copyright (C) 1985, 1988, 1994, 2001 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail ;; 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., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;;; Code: ;; Global to all RMAIL buffers. It exists primarily for the sake of ;; completion. It is better to use strings with the label functions ;; and let them worry about making the label. (defvar rmail-label-obarray (make-vector 47 0)) ;; Named list of symbols representing valid message attributes in RMAIL. (defconst rmail-attributes (cons 'rmail-keywords (mapcar (function (lambda (s) (intern s rmail-label-obarray))) '("deleted" "answered" "filed" "forwarded" "unseen" "edited" "resent")))) (defconst rmail-deleted-label (intern "deleted" rmail-label-obarray)) ;; Named list of symbols representing valid message keywords in RMAIL. (defvar rmail-keywords) ;;;###autoload (defun rmail-add-label (string) "Add LABEL to labels associated with current RMAIL message. Completion is performed over known labels when reading." (interactive (list (rmail-read-label "Add label"))) (rmail-set-label string t)) ;;;###autoload (defun rmail-kill-label (string) "Remove LABEL from labels associated with current RMAIL message. Completion is performed over known labels when reading." (interactive (list (rmail-read-label "Remove label"))) (rmail-set-label string nil)) ;;;###autoload (defun rmail-read-label (prompt) (with-current-buffer rmail-buffer (if (not rmail-keywords) (rmail-parse-file-keywords)) (let ((result (completing-read (concat prompt (if rmail-last-label (concat " (default " (symbol-name rmail-last-label) "): ") ": ")) rmail-label-obarray nil nil))) (if (string= result "") rmail-last-label (setq rmail-last-label (rmail-make-label result t)))))) (defun rmail-set-label (l state &optional n) (with-current-buffer rmail-buffer (rmail-maybe-set-message-counters) (if (not n) (setq n rmail-current-message)) (aset rmail-summary-vector (1- n) nil) (let* ((attribute (rmail-attribute-p l)) (keyword (and (not attribute) (or (rmail-keyword-p l) (rmail-install-keyword l)))) (label (or attribute keyword))) (if label (let ((omax (- (buffer-size) (point-max))) (omin (- (buffer-size) (point-min))) (buffer-read-only nil) (case-fold-search t)) (unwind-protect (save-excursion (widen) (goto-char (rmail-msgbeg n)) (forward-line 1) (if (not (looking-at "[01],")) nil (let ((start (1+ (point))) (bound)) (narrow-to-region (point) (progn (end-of-line) (point))) (setq bound (point-max)) (search-backward ",," nil t) (if attribute (setq bound (1+ (point))) (setq start (1+ (point)))) (goto-char start) ; (while (re-search-forward "[ \t]*,[ \t]*" nil t) ; (replace-match ",")) ; (goto-char start) (if (re-search-forward (concat ", " (rmail-quote-label-name label) ",") bound 'move) (if (not state) (replace-match ",")) (if state (insert " " (symbol-name label) ","))) (if (eq label rmail-deleted-label) (rmail-set-message-deleted-p n state))))) (narrow-to-region (- (buffer-size) omin) (- (buffer-size) omax)) (if (= n rmail-current-message) (rmail-display-labels)))))))) ;; Commented functions aren't used by RMAIL but might be nice for user ;; packages that do stuff with RMAIL. Note that rmail-message-labels-p ;; is in rmail.el now. ;(defun rmail-message-label-p (label &optional n) ; "Returns symbol if LABEL (attribute or keyword) on NTH or current message." ; (rmail-message-labels-p (or n rmail-current-message) (regexp-quote label))) ;(defun rmail-parse-message-labels (&optional n) ; "Returns labels associated with NTH or current RMAIL message. ;The result is a list of two lists of strings. The first is the ;message attributes and the second is the message keywords." ; (let (atts keys) ; (save-restriction ; (widen) ; (goto-char (rmail-msgbeg (or n rmail-current-message))) ; (forward-line 1) ; (or (looking-at "[01],") (error "Malformed label line")) ; (forward-char 2) ; (while (looking-at "[ \t]*\\([^ \t\n,]+\\),") ; (setq atts (cons (buffer-substring (match-beginning 1) (match-end 1)) ; atts)) ; (goto-char (match-end 0))) ; (or (looking-at ",") (error "Malformed label line")) ; (forward-char 1) ; (while (looking-at "[ \t]*\\([^ \t\n,]+\\),") ; (setq keys (cons (buffer-substring (match-beginning 1) (match-end 1)) ; keys)) ; (goto-char (match-end 0))) ; (or (looking-at "[ \t]*$") (error "Malformed label line")) ; (list (nreverse atts) (nreverse keys))))) (defun rmail-attribute-p (s) (let ((symbol (rmail-make-label s))) (if (memq symbol (cdr rmail-attributes)) symbol))) (defun rmail-keyword-p (s) (let ((symbol (rmail-make-label s))) (if (memq symbol (cdr (rmail-keywords))) symbol))) (defun rmail-make-label (s &optional forcep) (cond ((symbolp s) s) (forcep (intern (downcase s) rmail-label-obarray)) (t (intern-soft (downcase s) rmail-label-obarray)))) (defun rmail-force-make-label (s) (intern (downcase s) rmail-label-obarray)) (defun rmail-quote-label-name (label) (regexp-quote (symbol-name (rmail-make-label label t)))) ;; Motion on messages with keywords. ;;;###autoload (defun rmail-previous-labeled-message (n labels) "Show previous message with one of the labels LABELS. LABELS should be a comma-separated list of label names. If LABELS is empty, the last set of labels specified is used. With prefix argument N moves backward N messages with these labels." (interactive "p\nsMove to previous msg with labels: ") (rmail-next-labeled-message (- n) labels)) ;;;###autoload (defun rmail-next-labeled-message (n labels) "Show next message with one of the labels LABELS. LABELS should be a comma-separated list of label names. If LABELS is empty, the last set of labels specified is used. With prefix argument N moves forward N messages with these labels." (interactive "p\nsMove to next msg with labels: ") (if (string= labels "") (setq labels rmail-last-multi-labels)) (or labels (error "No labels to find have been specified previously")) (set-buffer rmail-buffer) (setq rmail-last-multi-labels labels) (rmail-maybe-set-message-counters) (let ((lastwin rmail-current-message) (current rmail-current-message) (regexp (concat ", ?\\(" (mail-comma-list-regexp labels) "\\),"))) (save-restriction (widen) (while (and (> n 0) (< current rmail-total-messages)) (setq current (1+ current)) (if (rmail-message-labels-p current regexp) (setq lastwin current n (1- n)))) (while (and (< n 0) (> current 1)) (setq current (1- current)) (if (rmail-message-labels-p current regexp) (setq lastwin current n (1+ n))))) (rmail-show-message lastwin) (if (< n 0) (message "No previous message with labels %s" labels)) (if (> n 0) (message "No following message with labels %s" labels)))) ;;; Manipulate the file's Labels option. ;; Return a list of symbols for all ;; the keywords (labels) recorded in this file's Labels option. (defun rmail-keywords () (or rmail-keywords (rmail-parse-file-keywords))) ;; Set rmail-keywords to a list of symbols for all ;; the keywords (labels) recorded in this file's Labels option. (defun rmail-parse-file-keywords () (save-restriction (save-excursion (widen) (goto-char 1) (setq rmail-keywords (if (search-forward "\nLabels:" (rmail-msgbeg 1) t) (progn (narrow-to-region (point) (progn (end-of-line) (point))) (goto-char (point-min)) (cons 'rmail-keywords (mapcar 'rmail-force-make-label (mail-parse-comma-list))))))))) ;; Add WORD to the list in the file's Labels option. ;; Any keyword used for the first time needs this done. (defun rmail-install-keyword (word) (let ((keyword (rmail-make-label word t)) (keywords (rmail-keywords))) (if (not (or (rmail-attribute-p keyword) (rmail-keyword-p keyword))) (let ((omin (- (buffer-size) (point-min))) (omax (- (buffer-size) (point-max)))) (unwind-protect (save-excursion (widen) (goto-char 1) (let ((case-fold-search t) (buffer-read-only nil)) (or (search-forward "\nLabels:" nil t) (progn (end-of-line) (insert "\nLabels:"))) (delete-region (point) (progn (end-of-line) (point))) (setcdr keywords (cons keyword (cdr keywords))) (while (setq keywords (cdr keywords)) (insert (symbol-name (car keywords)) ",")) (delete-char -1))) (narrow-to-region (- (buffer-size) omin) (- (buffer-size) omax))))) keyword)) ;;; arch-tag: b26b3392-99ca-4e1d-933a-dab59b04e9a8 ;;; rmailkwd.el ends here