From: Ted Zlatanov Date: Tue, 1 Mar 2011 10:16:23 +0000 (-0600) Subject: Merge branch 'master' of https://git.gnus.org/gnus X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=15bf5ed4d82563f869a58b1add7815bbd5f9b616;hp=b08ebdb5c143bb1c297053785480985d9e25e1c8 Merge branch 'master' of https://git.gnus.org/gnus --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bebba74f..1632895f9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2011-02-28 Julien Danjou + + * sieve.el (sieve-buffer-script-name): New local variable to store + sieve script name. + (sieve-edit-script): Store sieve script name. + (sieve-upload): Use sieve script name when uploading. + (sieve-upload): Use substitute-command-keys. + (sieve-edit-script): Use substitute-command-keys. + (sieve-refresh-scriptlist): Use substitute-command-keys. + (sieve-manage-mode-map): Define keymap properly. + (sieve-manage-mode): Do not set mode name manually, change mode-name to + (sieve-refresh-scriptlist): Use substitute-command-keys."Sieve-manage". + Remove commented code about cvs. + (sieve-manage-quit): New function. + (sieve-manage-mode-map): Bind 'q' to sieve-manage-quit. + 2011-02-27 Lars Magne Ingebrigtsen * gnus-group.el (gnus-import-other-newsrc-file): New function. @@ -26,6 +42,13 @@ * gnus-demon.el (gnus-demon-init): run-with-timer should be called with numerical parameters. +2011-02-25 Julien Danjou + + * gnus-gravatar.el: Use gnus-with-article-buffer. + + * gnus-art.el (gnus-with-article-buffer): Check that the + gnus-article-buffer is alive. + 2011-02-24 Teodor Zlatanov * auth-source.el (auth-source-creation-prompts): New variable to manage diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 204d63d37..989488c09 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -441,7 +441,7 @@ manipulated as follows: (setf (gnus-agent-cat-groups old-category) (delete group (gnus-agent-cat-groups old-category)))))) - ;; Purge cache as preceeding loop invalidated it. + ;; Purge cache as preceding loop invalidated it. (setq gnus-category-group-cache nil)) (setcdr (or (assq 'agent-groups category) @@ -1195,7 +1195,7 @@ downloadable." (mapc #'gnus-summary-remove-process-mark (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded)) - ;; The preceeding call to (gnus-agent-summary-fetch-group) + ;; The preceding call to (gnus-agent-summary-fetch-group) ;; updated the temporary gnus-newsgroup-downloadable to ;; remove each article successfully fetched. Now, I ;; update the real gnus-newsgroup-downloadable to only @@ -1520,14 +1520,14 @@ downloaded into the agent." header-number) ;; Check each article (while (setq article (pop articles)) - ;; Skip alist entries preceeding this article + ;; Skip alist entries preceding this article (while (> article (or (caar alist) (1+ article))) (setq alist (cdr alist))) ;; Prune off articles that we have already fetched. (unless (and (eq article (caar alist)) (cdar alist)) - ;; Skip headers preceeding this article + ;; Skip headers preceding this article (while (> article (setq header-number (let* ((header (car headers))) @@ -3437,7 +3437,7 @@ missing NOV entry. Run gnus-agent-regenerate-group to restore it."))) ;; If considering all articles is set, I can only ;; expire article IDs that are no longer in the - ;; active range (That is, articles that preceed the + ;; active range (That is, articles that precede the ;; first article in the new alist). (if (and gnus-agent-consider-all-articles (>= article-number (car active))) @@ -3715,7 +3715,7 @@ has been fetched." (gnus-agent-append-to-list tail-uncached v1)) (setq arts (cdr arts)) (setq ref (cdr ref))) - (t ; reference article (v2) preceeds the list being filtered + (t ; reference article (v2) precedes the list being filtered (setq ref (cdr ref)))))) (while arts (gnus-agent-append-to-list tail-uncached (pop arts))) @@ -4020,7 +4020,7 @@ If REREAD is not nil, downloaded articles are marked as unread." ;; article (with the exception of the last ID in the list - it's ;; special) that no longer appears in the overview. In this ;; situtation, the last article ID in the list implies that it, - ;; and every article ID preceeding it, have been fetched from the + ;; and every article ID preceding it, have been fetched from the ;; server. (if gnus-agent-consider-all-articles diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 5b3489a72..250ebaf3f 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1725,9 +1725,10 @@ Initialized from `text-mode-syntax-table.") (put 'gnus-with-article-headers 'edebug-form-spec '(body)) (defmacro gnus-with-article-buffer (&rest forms) - `(with-current-buffer gnus-article-buffer - (let ((inhibit-read-only t)) - ,@forms))) + `(when (buffer-live-p gnus-article-buffer) + (with-current-buffer gnus-article-buffer + (let ((inhibit-read-only t)) + ,@forms)))) (put 'gnus-with-article-buffer 'lisp-indent-function 0) (put 'gnus-with-article-buffer 'edebug-form-spec '(body)) diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el index 7208889a1..98b1f3bd1 100644 --- a/lisp/gnus-gravatar.el +++ b/lisp/gnus-gravatar.el @@ -80,9 +80,8 @@ If nil, default to `gravatar-size'." "Insert GRAVATAR for ADDRESS in HEADER in current article buffer. Set image category to CATEGORY." (unless (eq gravatar 'error) - (with-current-buffer gnus-article-buffer + (gnus-with-article-buffer (let ((mark (point-marker)) - (inhibit-read-only t) (inhibit-point-motion-hooks t) (case-fold-search t)) (save-restriction diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el index 794d1642c..ce5a837ea 100644 --- a/lisp/gnus-range.el +++ b/lisp/gnus-range.el @@ -116,10 +116,10 @@ Both ranges must be in ascending order." ;; All done with range2 (setq r nil)) ((< max1 min2) - ;; No overlap: range1 preceeds range2 + ;; No overlap: range1 precedes range2 (pop r)) ((< max2 min1) - ;; No overlap: range2 preceeds range1 + ;; No overlap: range2 precedes range1 (pop range2)) ((and (<= min2 min1) (<= max1 max2)) ;; Complete overlap: range1 removed @@ -232,10 +232,10 @@ RANGE1 and RANGE2 have to be sorted over <." (setq range1 (cdr range1) range2 (cdr range2)) (while (and min1 min2) - (cond ((< max1 min2) ; range1 preceeds range2 + (cond ((< max1 min2) ; range1 precedes range2 (setq range1 (cdr range1) min1 nil)) - ((< max2 min1) ; range2 preceeds range1 + ((< max2 min1) ; range2 precedes range1 (setq range2 (cdr range2) min2 nil)) (t ; some sort of overlap is occurring diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index d1ed23f79..ebfa53f84 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1513,7 +1513,7 @@ If SCAN, request a scan of that group as well." (num 0)) ;; These checks are present in gnus-activate-group but skipped - ;; due to setting dont-check in the preceeding call. + ;; due to setting dont-check in the preceding call. ;; If a cache is present, we may have to alter the active info. (when (and gnus-use-cache info) @@ -1887,7 +1887,7 @@ If SCAN, request a scan of that group as well." ;; OK - I'm done (setq articles nil)) ((< range article) - ;; this range preceeds the article. Leave the range unmodified. + ;; this range precedes the article. Leave the range unmodified. (pop ranges) ranges) ((= range article) @@ -1910,11 +1910,11 @@ If SCAN, request a scan of that group as well." (setcar ranges min) ranges) ((< max article) - ;; this range preceeds the article. Leave the range unmodified. + ;; this range precedes the article. Leave the range unmodified. (pop ranges) ranges) ((< article min) - ;; this article preceeds the range. Return null to move to the + ;; this article precedes the range. Return null to move to the ;; next article nil) (t diff --git a/lisp/nntp.el b/lisp/nntp.el index 09ecfb8f6..66a6365cb 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -1672,7 +1672,7 @@ password contained in '~/.nntp-authinfo'." ;; Some nntp servers seem to have an extension to the XOVER ;; extension. On these servers, requesting an article range - ;; preceeding the active range does not return an error as + ;; preceding the active range does not return an error as ;; specified in the RFC. What we instead get is the NOV entry ;; for the first available article. Obviously, a client can ;; use that entry to avoid making unnecessary requests. The diff --git a/lisp/sieve.el b/lisp/sieve.el index 31b2665a6..2111d34ea 100644 --- a/lisp/sieve.el +++ b/lisp/sieve.el @@ -98,39 +98,40 @@ require \"fileinto\"; (defvar sieve-manage-buffer nil) (defvar sieve-buffer-header-end nil) +(defvar sieve-buffer-script-name nil + "The real script name of the buffer.") +(make-local-variable 'sieve-buffer-script-name) ;; Sieve-manage mode: -(defvar sieve-manage-mode-map nil +(defvar sieve-manage-mode-map + (let ((map (make-sparse-keymap))) + ;; various + (define-key map "?" 'sieve-help) + (define-key map "h" 'sieve-help) + (define-key map "q" 'sieve-bury-buffer) + ;; activating + (define-key map "m" 'sieve-activate) + (define-key map "u" 'sieve-deactivate) + (define-key map "\M-\C-?" 'sieve-deactivate-all) + ;; navigation keys + (define-key map "\C-p" 'sieve-prev-line) + (define-key map [up] 'sieve-prev-line) + (define-key map "\C-n" 'sieve-next-line) + (define-key map [down] 'sieve-next-line) + (define-key map " " 'sieve-next-line) + (define-key map "n" 'sieve-next-line) + (define-key map "p" 'sieve-prev-line) + (define-key map "\C-m" 'sieve-edit-script) + (define-key map "f" 'sieve-edit-script) + (define-key map "o" 'sieve-edit-script-other-window) + (define-key map "r" 'sieve-remove) + (define-key map "q" 'sieve-manage-quit) + (define-key map [(down-mouse-2)] 'sieve-edit-script) + (define-key map [(down-mouse-3)] 'sieve-manage-mode-menu) + map) "Keymap for `sieve-manage-mode'.") -(if sieve-manage-mode-map - () - (setq sieve-manage-mode-map (make-sparse-keymap)) - (suppress-keymap sieve-manage-mode-map) - ;; various - (define-key sieve-manage-mode-map "?" 'sieve-help) - (define-key sieve-manage-mode-map "h" 'sieve-help) - (define-key sieve-manage-mode-map "q" 'sieve-bury-buffer) - ;; activating - (define-key sieve-manage-mode-map "m" 'sieve-activate) - (define-key sieve-manage-mode-map "u" 'sieve-deactivate) - (define-key sieve-manage-mode-map "\M-\C-?" 'sieve-deactivate-all) - ;; navigation keys - (define-key sieve-manage-mode-map "\C-p" 'sieve-prev-line) - (define-key sieve-manage-mode-map [up] 'sieve-prev-line) - (define-key sieve-manage-mode-map "\C-n" 'sieve-next-line) - (define-key sieve-manage-mode-map [down] 'sieve-next-line) - (define-key sieve-manage-mode-map " " 'sieve-next-line) - (define-key sieve-manage-mode-map "n" 'sieve-next-line) - (define-key sieve-manage-mode-map "p" 'sieve-prev-line) - (define-key sieve-manage-mode-map "\C-m" 'sieve-edit-script) - (define-key sieve-manage-mode-map "f" 'sieve-edit-script) - (define-key sieve-manage-mode-map "o" 'sieve-edit-script-other-window) - (define-key sieve-manage-mode-map "r" 'sieve-remove) - (define-key sieve-manage-mode-map [(down-mouse-2)] 'sieve-edit-script) - (define-key sieve-manage-mode-map [(down-mouse-3)] 'sieve-manage-mode-menu)) - (easy-menu-define sieve-manage-mode-menu sieve-manage-mode-map "Sieve Menu." '("Manage Sieve" @@ -138,21 +139,21 @@ require \"fileinto\"; ["Activate script" sieve-activate t] ["Deactivate script" sieve-deactivate t])) -(define-derived-mode sieve-manage-mode fundamental-mode "SIEVE" +(define-derived-mode sieve-manage-mode fundamental-mode "Sieve-manage" "Mode used for sieve script management." - (setq mode-name "SIEVE") (buffer-disable-undo (current-buffer)) (setq truncate-lines t) (easy-menu-add sieve-manage-mode-menu sieve-manage-mode-map)) (put 'sieve-manage-mode 'mode-class 'special) -;; This is necessary to allow correct handling of \\[cvs-mode-diff-map] -;; in substitute-command-keys. -;(fset 'sieve-manage-mode-map sieve-manage-mode-map) - ;; Commands used in sieve-manage mode: +(defun sieve-manage-quit () + "Quit." + (interactive) + (kill-buffer (current-buffer))) + (defun sieve-activate (&optional pos) (interactive "d") (let ((name (sieve-script-at-point)) err) @@ -204,7 +205,10 @@ require \"fileinto\"; (switch-to-buffer (get-buffer-create "template.siv")) (insert sieve-template)) (sieve-mode) - (message "Press C-c C-l to upload script to server."))) + (setq sieve-buffer-script-name name) + (message + (substitute-command-keys + "Press \\[sieve-upload] to upload script to server.")))) (defmacro sieve-change-region (&rest body) "Turns off sieve-region before executing BODY, then re-enables it after. @@ -337,13 +341,18 @@ Server : " server ":" (or port "2000") " ;; get list of script names and print them (let ((scripts (sieve-manage-listscripts sieve-manage-buffer))) (if (null scripts) - (insert (format (concat "No scripts on server, press RET on %s to " - "create a new script.\n") sieve-new-script)) - (insert (format (concat "%d script%s on server, press RET on a script " - "name edits it, or\npress RET on %s to create " - "a new script.\n") (length scripts) - (if (eq (length scripts) 1) "" "s") - sieve-new-script))) + (insert + (substitute-command-keys + (format + "No scripts on server, press \\[sieve-edit-script] on %s to create a new script.\n" + sieve-new-script))) + (insert + (substitute-command-keys + (format (concat "%d script%s on server, press \\[sieve-edit-script] on a script " + "name edits it, or\npress \\[sieve-edit-script] on %s to create " + "a new script.\n") (length scripts) + (if (eq (length scripts) 1) "" "s") + sieve-new-script)))) (save-excursion (sieve-insert-scripts (list sieve-new-script)) (sieve-insert-scripts scripts))) @@ -363,15 +372,15 @@ Server : " server ":" (or port "2000") " ;;;###autoload (defun sieve-upload (&optional name) (interactive) - (unless name - (setq name (buffer-name))) (when (or (get-buffer sieve-buffer) (call-interactively 'sieve-manage)) (let ((script (buffer-string)) err) (with-current-buffer (get-buffer sieve-buffer) - (setq err (sieve-manage-putscript name script sieve-manage-buffer)) + (setq err (sieve-manage-putscript + (or name sieve-buffer-script-name (buffer-name)) + script sieve-manage-buffer)) (if (sieve-manage-ok-p err) - (message (concat - "Sieve upload done. Use `C-c RET' to manage scripts.")) + (message (substitute-command-keys + "Sieve upload done. Use \\[sieve-manage] to manage scripts.")) (message "Sieve upload failed: %s" (nth 2 err))))))) ;;;###autoload