[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-draft.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-draft.el |
Date: |
Sat, 04 Sep 2004 09:48:05 -0400 |
Index: emacs/lisp/gnus/gnus-draft.el
diff -c emacs/lisp/gnus/gnus-draft.el:1.6 emacs/lisp/gnus/gnus-draft.el:1.7
*** emacs/lisp/gnus/gnus-draft.el:1.6 Mon Sep 1 15:45:24 2003
--- emacs/lisp/gnus/gnus-draft.el Sat Sep 4 13:13:43 2004
***************
*** 1,5 ****
;;; gnus-draft.el --- draft message support for Gnus
! ;; Copyright (C) 1997, 1998, 1999, 2000
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,5 ----
;;; gnus-draft.el --- draft message support for Gnus
! ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 46,51 ****
--- 46,52 ----
(gnus-define-keys gnus-draft-mode-map
"Dt" gnus-draft-toggle-sending
+ "e" gnus-draft-edit-message ;; Use `B w' for `gnus-summary-edit-article'
"De" gnus-draft-edit-message
"Ds" gnus-draft-send-message
"DS" gnus-draft-send-all-messages))
***************
*** 94,106 ****
(defun gnus-draft-edit-message ()
"Enter a mail/post buffer to edit and send the draft."
(interactive)
! (let ((article (gnus-summary-article-number)))
(gnus-summary-mark-as-read article gnus-canceled-mark)
! (gnus-draft-setup article gnus-newsgroup-name t)
(set-buffer-modified-p t)
(save-buffer)
(let ((gnus-verbose-backends nil))
! (gnus-request-expire-articles (list article) gnus-newsgroup-name t))
(push
`((lambda ()
(when (gnus-buffer-exists-p ,gnus-summary-buffer)
--- 95,112 ----
(defun gnus-draft-edit-message ()
"Enter a mail/post buffer to edit and send the draft."
(interactive)
! (let ((article (gnus-summary-article-number))
! (group gnus-newsgroup-name))
(gnus-summary-mark-as-read article gnus-canceled-mark)
! (gnus-draft-setup article group t)
(set-buffer-modified-p t)
+ (save-excursion
+ (save-restriction
+ (message-narrow-to-headers)
+ (message-remove-header "date")))
(save-buffer)
(let ((gnus-verbose-backends nil))
! (gnus-request-expire-articles (list article) group t))
(push
`((lambda ()
(when (gnus-buffer-exists-p ,gnus-summary-buffer)
***************
*** 126,133 ****
(defun gnus-draft-send (article &optional group interactive)
"Send message ARTICLE."
! (let ((message-syntax-checks (if interactive nil
'dont-check-for-anything-just-trust-me))
(message-inhibit-body-encoding (or (not group)
(equal group "nndraft:queue")
message-inhibit-body-encoding))
--- 132,140 ----
(defun gnus-draft-send (article &optional group interactive)
"Send message ARTICLE."
! (let ((message-syntax-checks (if interactive message-syntax-checks
'dont-check-for-anything-just-trust-me))
+ (message-hidden-headers nil)
(message-inhibit-body-encoding (or (not group)
(equal group "nndraft:queue")
message-inhibit-body-encoding))
***************
*** 135,147 ****
message-send-hook))
(message-setup-hook (and group (not (equal group "nndraft:queue"))
message-setup-hook))
! type method)
(gnus-draft-setup article (or group "nndraft:queue"))
;; We read the meta-information that says how and where
;; this message is to be sent.
(save-restriction
(message-narrow-to-head)
(when (re-search-forward
(concat "^" (regexp-quote gnus-agent-meta-information-header) ":")
nil t)
(setq type (ignore-errors (read (current-buffer)))
--- 142,161 ----
message-send-hook))
(message-setup-hook (and group (not (equal group "nndraft:queue"))
message-setup-hook))
! type method move-to)
(gnus-draft-setup article (or group "nndraft:queue"))
;; We read the meta-information that says how and where
;; this message is to be sent.
(save-restriction
(message-narrow-to-head)
(when (re-search-forward
+ (concat "^" (regexp-quote gnus-agent-target-move-group-header)
+ ":") nil t)
+ (skip-syntax-forward "-")
+ (setq move-to (buffer-substring (point) (gnus-point-at-eol)))
+ (message-remove-header gnus-agent-target-move-group-header))
+ (goto-char (point-min))
+ (when (re-search-forward
(concat "^" (regexp-quote gnus-agent-meta-information-header) ":")
nil t)
(setq type (ignore-errors (read (current-buffer)))
***************
*** 159,166 ****
(message-this-is-mail (eq type 'mail))
(gnus-post-method method)
(message-post-method method))
! (message-send-and-exit))
! (message-send-and-exit)))
(let ((gnus-verbose-backends nil))
(gnus-request-expire-articles
(list article) (or group "nndraft:queue") t)))))
--- 173,184 ----
(message-this-is-mail (eq type 'mail))
(gnus-post-method method)
(message-post-method method))
! (if move-to
! (gnus-inews-do-gcc move-to)
! (message-send-and-exit)))
! (if move-to
! (gnus-inews-do-gcc move-to)
! (message-send-and-exit))))
(let ((gnus-verbose-backends nil))
(gnus-request-expire-articles
(list article) (or group "nndraft:queue") t)))))
***************
*** 168,177 ****
(defun gnus-draft-send-all-messages ()
"Send all the sendable drafts."
(interactive)
! (gnus-uu-mark-buffer)
! (gnus-draft-send-message))
! (defun gnus-group-send-drafts ()
"Send all sendable articles from the queue group."
(interactive)
(gnus-activate-group "nndraft:queue")
--- 186,199 ----
(defun gnus-draft-send-all-messages ()
"Send all the sendable drafts."
(interactive)
! (when (or
! gnus-expert-user
! (gnus-y-or-n-p
! "Send all drafts? "))
! (gnus-uu-mark-buffer)
! (gnus-draft-send-message)))
! (defun gnus-group-send-queue ()
"Send all sendable articles from the queue group."
(interactive)
(gnus-activate-group "nndraft:queue")
***************
*** 181,186 ****
--- 203,209 ----
(cdr (assq 'unsend
(gnus-info-marks
(gnus-get-info "nndraft:queue"))))))
+ (gnus-posting-styles nil)
(total (length articles))
article)
(while (setq article (pop articles))
***************
*** 190,195 ****
--- 213,232 ----
(- total (length articles)) total)))
(gnus-draft-send article)))))))
+ ;;;###autoload
+ (defun gnus-draft-reminder ()
+ "Reminder user if there are unsent drafts."
+ (interactive)
+ (if (gnus-alive-p)
+ (let (active)
+ (catch 'continue
+ (dolist (group '("nndraft:drafts" "nndraft:queue"))
+ (setq active (gnus-activate-group group))
+ (if (and active (>= (cdr active) (car active)))
+ (if (y-or-n-p "There are unsent drafts. Confirm to exit? ")
+ (throw 'continue t)
+ (error "Stop!"))))))))
+
;;; Utility functions
;;;!!!If this is byte-compiled, it fails miserably.
***************
*** 199,219 ****
(progn
(defun gnus-draft-setup (narticle group &optional restore)
! (gnus-setup-message 'forward
! (let ((article narticle))
! (message-mail)
! (erase-buffer)
! (if (not (gnus-request-restore-buffer article group))
! (error "Couldn't restore the article")
! (if (and restore (equal group "nndraft:queue"))
(mime-to-mml))
! ;; Insert the separator.
! (goto-char (point-min))
! (search-forward "\n\n")
! (forward-char -1)
! (insert mail-header-separator)
! (forward-line 1)
! (message-set-auto-save-file-name))))))
(defun gnus-draft-article-sendable-p (article)
"Say whether ARTICLE is sendable."
--- 236,276 ----
(progn
(defun gnus-draft-setup (narticle group &optional restore)
! (let (ga)
! (gnus-setup-message 'forward
! (let ((article narticle))
! (message-mail)
! (erase-buffer)
! (if (not (gnus-request-restore-buffer article group))
! (error "Couldn't restore the article")
! (when (and restore
! (equal group "nndraft:queue"))
(mime-to-mml))
! ;; Insert the separator.
! (goto-char (point-min))
! (search-forward "\n\n")
! (forward-char -1)
! (insert mail-header-separator)
! (forward-line 1)
! (setq ga (message-fetch-field gnus-draft-meta-information-header))
! (message-set-auto-save-file-name))))
! (gnus-backlog-remove-article group narticle)
! (when (and ga
! (ignore-errors (setq ga (car (read-from-string ga)))))
! (setq gnus-newsgroup-name
! (if (equal (car ga) "") nil (car ga)))
! (gnus-configure-posting-styles)
! (setq gnus-message-group-art (cons gnus-newsgroup-name (cadr ga)))
! (setq message-post-method
! `(lambda (arg)
! (gnus-post-method arg ,(car ga))))
! (unless (equal (cadr ga) "")
! (message-add-action
! `(progn
! (gnus-add-mark ,(car ga) 'replied ,(cadr ga))
! (gnus-request-set-mark ,(car ga) (list (list (list ,(cadr ga))
! 'add '(reply)))))
! 'send))))))
(defun gnus-draft-article-sendable-p (article)
"Say whether ARTICLE is sendable."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/gnus/gnus-draft.el,
Miles Bader <=