Mercurial > emacs
diff lisp/gnus/gnus-sum.el @ 49598:0d8b17d428b5
Trailing whitepace deleted.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 04 Feb 2003 13:24:35 +0000 |
parents | 735a1f4fc9e0 |
children | 695cf19ef79e d7ddb3e565de |
line wrap: on
line diff
--- a/lisp/gnus/gnus-sum.el Tue Feb 04 12:29:42 2003 +0000 +++ b/lisp/gnus/gnus-sum.el Tue Feb 04 13:24:35 2003 +0000 @@ -1825,7 +1825,7 @@ gnus-article-commands-menu gnus-article-mode-map "" (cons "Commands" innards)) ;; in Emacs, don't share menu. - (setq gnus-article-commands-menu + (setq gnus-article-commands-menu (copy-keymap gnus-summary-article-menu)) (define-key gnus-article-mode-map [menu-bar commands] (cons "Commands" gnus-article-commands-menu)))) @@ -3757,8 +3757,8 @@ threads (gnus-message 8 "Sorting threads...") (prog1 - (gnus-sort-threads-1 - threads + (gnus-sort-threads-1 + threads (gnus-make-sort-function gnus-thread-sort-functions)) (gnus-message 8 "Sorting threads...done")))) @@ -4196,7 +4196,7 @@ gnus-list-identifiers (mapconcat 'identity gnus-list-identifiers " *\\|")))) (dolist (header gnus-newsgroup-headers) - (when (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp + (when (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp " *\\)\\)+\\(Re: +\\)?\\)") (mail-header-subject header)) (mail-header-set-subject @@ -4418,7 +4418,7 @@ (gnus-sorted-complement gnus-newsgroup-unreads articles))) (when gnus-alter-articles-to-read-function (setq gnus-newsgroup-unreads - (sort + (sort (funcall gnus-alter-articles-to-read-function gnus-newsgroup-name gnus-newsgroup-unreads) '<))) @@ -4530,7 +4530,7 @@ (unless (memq (cdr type) uncompressed) (setq list (gnus-compress-sequence (set symbol (sort list '<)) t))) - + (when (gnus-check-backend-function 'request-set-mark gnus-newsgroup-name) ;; propagate flags to server, with the following exceptions: @@ -4549,7 +4549,7 @@ (push (list add 'add (list (cdr type))) delta-marks)) (when del (push (list del 'del (list (cdr type))) delta-marks))))) - + (when list (push (cons (cdr type) list) newmarked))) @@ -4557,7 +4557,7 @@ (unless (gnus-check-group gnus-newsgroup-name) (error "Can't open server for %s" gnus-newsgroup-name)) (gnus-request-set-mark gnus-newsgroup-name delta-marks)) - + ;; Enter these new marks into the info of the group. (if (nthcdr 3 info) (setcar (nthcdr 3 info) newmarked) @@ -4589,9 +4589,9 @@ (let* ((mformat (symbol-value (intern (format "gnus-%s-mode-line-format-spec" where)))) - (gnus-tmp-group-name (gnus-group-name-decode + (gnus-tmp-group-name (gnus-group-name-decode gnus-newsgroup-name - (gnus-group-name-charset + (gnus-group-name-charset nil gnus-newsgroup-name))) (gnus-tmp-article-number (or gnus-current-article 0)) @@ -6406,17 +6406,17 @@ (defun gnus-summary-limit-to-subject (subject &optional header not-matching) "Limit the summary buffer to articles that have subjects that match a regexp. If NOT-MATCHING, excluding articles that have subjects that match a regexp." - (interactive + (interactive (list (read-string (if current-prefix-arg "Exclude subject (regexp): " - "Limit to subject (regexp): ")) + "Limit to subject (regexp): ")) nil current-prefix-arg)) (unless header (setq header "subject")) (when (not (equal "" subject)) (prog1 (let ((articles (gnus-summary-find-matching - (or header "subject") subject 'all nil nil + (or header "subject") subject 'all nil nil not-matching))) (unless articles (error "Found no matches for \"%s\"" subject)) @@ -6426,10 +6426,10 @@ (defun gnus-summary-limit-to-author (from &optional not-matching) "Limit the summary buffer to articles that have authors that match a regexp. If NOT-MATCHING, excluding articles that have authors that match a regexp." - (interactive + (interactive (list (read-string (if current-prefix-arg "Exclude author (regexp): " - "Limit to author (regexp): ")) + "Limit to author (regexp): ")) current-prefix-arg)) (gnus-summary-limit-to-subject from "from" not-matching)) @@ -6487,14 +6487,14 @@ nil t)))) (list header - (read-string (format "%s header %s (regexp): " + (read-string (format "%s header %s (regexp): " (if current-prefix-arg "Exclude" "Limit to") header)) current-prefix-arg))) (when (not (equal "" regexp)) (prog1 (let ((articles (gnus-summary-find-matching - (cons 'extra header) regexp 'all nil nil + (cons 'extra header) regexp 'all nil nil not-matching))) (unless articles (error "Found no matches for \"%s\"" regexp)) @@ -7053,8 +7053,8 @@ ;; the parent article. (when (setq to-address (or (message-fetch-field "reply-to") (message-fetch-field "from"))) - (setq params (append - (list (cons 'to-address + (setq params (append + (list (cons 'to-address (funcall gnus-decode-encoded-word-function to-address)))))) (setq dig (nnheader-set-temp-buffer " *gnus digest buffer*")) @@ -7248,7 +7248,7 @@ BACKWARD is non-nil. If BACKWARD is `all', do all articles. If UNREAD is non-nil, only unread articles will be taken into consideration. If NOT-CASE-FOLD, case won't be folded -in the comparisons. If NOT-MATCHING, return a list of all articles that +in the comparisons. If NOT-MATCHING, return a list of all articles that not match REGEXP on HEADER." (let ((case-fold-search (not not-case-fold)) articles d func) @@ -7271,7 +7271,7 @@ (gnus-data-unread-p d)) ; Or just unreads. (vectorp (gnus-data-header d)) ; It's not a pseudo. (if not-matching - (not (string-match + (not (string-match regexp (funcall func (gnus-data-header d)))) (string-match regexp @@ -7936,13 +7936,13 @@ "Edit the current article. This will have permanent effect only in mail groups. If ARG is nil, edit the decoded articles. -If ARG is 1, edit the raw articles. +If ARG is 1, edit the raw articles. If ARG is 2, edit the raw articles even in read-only groups. Otherwise, allow editing of articles even in read-only groups." (interactive "P") (let (force raw) - (cond + (cond ((null arg)) ((eq arg 1) (setq raw t)) ((eq arg 2) (setq raw t @@ -7965,8 +7965,8 @@ (if (equal gnus-newsgroup-name "nndraft:drafts") (setq raw t)) (gnus-article-edit-article - (if raw 'ignore - #'(lambda () + (if raw 'ignore + #'(lambda () (let ((mbl mml-buffer-list)) (setq mml-buffer-list nil) (mime-to-mml) @@ -7977,17 +7977,17 @@ (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t)))) `(lambda (no-highlight) (let ((mail-parse-charset ',gnus-newsgroup-charset) - (mail-parse-ignored-charsets + (mail-parse-ignored-charsets ',gnus-newsgroup-ignored-charsets)) - ,(if (not raw) '(progn + ,(if (not raw) '(progn (mml-to-mime) (mml-destroy-buffers) - (remove-hook 'kill-buffer-hook + (remove-hook 'kill-buffer-hook 'mml-destroy-buffers t) (kill-local-variable 'mml-buffer-list))) (gnus-summary-edit-article-done ,(or (mail-header-references gnus-current-headers) "") - ,(gnus-group-read-only-p) + ,(gnus-group-read-only-p) ,gnus-summary-buffer no-highlight)))))))) (defalias 'gnus-summary-edit-article-postpone 'gnus-article-edit-exit) @@ -9349,12 +9349,12 @@ "Save parts matching TYPE to DIR. If REVERSE, save parts that do not match TYPE." (interactive - (list (read-string "Save parts of type: " + (list (read-string "Save parts of type: " (or (car gnus-summary-save-parts-type-history) gnus-summary-save-parts-default-mime) 'gnus-summary-save-parts-type-history) (setq gnus-summary-save-parts-last-directory - (read-file-name "Save to directory: " + (read-file-name "Save to directory: " gnus-summary-save-parts-last-directory nil t)) current-prefix-arg)) @@ -9697,7 +9697,7 @@ `(progn (gnus-info-set-marks ',info ',(gnus-info-marks info) t) (gnus-info-set-read ',info ',(gnus-info-read info)) - (gnus-get-unread-articles-in-group ',info + (gnus-get-unread-articles-in-group ',info (gnus-active ,group)) (gnus-group-update-group ,group t) ,setmarkundo)))) @@ -9848,7 +9848,7 @@ mark (car lway) lway name))) (setq func (eval func)) (define-key map (nth 4 lway) func))))) - + (defun gnus-summary-make-marking-command-1 (mark way lway name) `(defun ,(intern (format "gnus-summary-put-mark-as-%s%s" @@ -9865,7 +9865,7 @@ name (cadr lway)) (interactive "p") (gnus-summary-generic-mark n ,mark ',(nth 2 lway) ,(nth 3 lway)))) - + (defun gnus-summary-generic-mark (n mark move unread) "Mark N articles with MARK." (unless (eq major-mode 'gnus-summary-mode)