+2011-02-28 Julien Danjou <julien@danjou.info>
+
+ * 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 <larsi@gnus.org>
* gnus-group.el (gnus-import-other-newsrc-file): New function.
* gnus-demon.el (gnus-demon-init): run-with-timer should be called with
numerical parameters.
+2011-02-25 Julien Danjou <julien@danjou.info>
+
+ * 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 <tzz@lifelogs.com>
* auth-source.el (auth-source-creation-prompts): New variable to manage
(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)
(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
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)))
;; 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)))
(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)))
;; 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
(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))
"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
;; 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
(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
(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)
;; 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)
(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
;; 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
(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"
["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)
(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.
;; 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)))
;;;###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
projects / gnus / commitdiff