projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-summary-make-menu-bar): Add
[gnus]
/
lisp
/
nnbabyl.el
diff --git
a/lisp/nnbabyl.el
b/lisp/nnbabyl.el
index
2d41d4c
..
a0a8d8b
100644
(file)
--- a/
lisp/nnbabyl.el
+++ b/
lisp/nnbabyl.el
@@
-1,10
+1,10
@@
;;; nnbabyl.el --- rmail mbox access for Gnus
;;; nnbabyl.el --- rmail mbox access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000
-;;
Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000
, 2001, 2002, 2003,
+;;
2004, 2005, 2006
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
;; Keywords: news, mail
;; This file is part of GNU Emacs.
@@
-21,8
+21,8
@@
;; 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
;; 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., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-43,25
+43,17
@@
(nnoo-declare nnbabyl)
(defvoo nnbabyl-mbox-file (expand-file-name "~/RMAIL")
(nnoo-declare nnbabyl)
(defvoo nnbabyl-mbox-file (expand-file-name "~/RMAIL")
- "The name of the rmail box file in the users home directory.
-
-This variable is a virtual server slot. See the Gnus manual for details.")
+ "The name of the rmail box file in the users home directory.")
(defvoo nnbabyl-active-file (expand-file-name "~/.rmail-active")
(defvoo nnbabyl-active-file (expand-file-name "~/.rmail-active")
- "The name of the active file for the rmail box.
-
-This variable is a virtual server slot. See the Gnus manual for details.")
+ "The name of the active file for the rmail box.")
(defvoo nnbabyl-get-new-mail t
(defvoo nnbabyl-get-new-mail t
- "If non-nil, nnbabyl will check the incoming mail file and split the mail.
-
-This variable is a virtual server slot. See the Gnus manual for details.")
+ "If non-nil, nnbabyl will check the incoming mail file and split the mail.")
(defvoo nnbabyl-prepare-save-mail-hook nil
(defvoo nnbabyl-prepare-save-mail-hook nil
- "Hook run narrowed to an article before saving.
-
-This variable is a virtual server slot. See the Gnus manual for details.")
+ "Hook run narrowed to an article before saving.")
\f
\f
@@
-78,9
+70,6
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(defvoo nnbabyl-previous-buffer-mode nil)
(defvoo nnbabyl-previous-buffer-mode nil)
-(eval-and-compile
- (autoload 'gnus-set-text-properties "gnus-ems"))
-
\f
;;; Interface functions
\f
;;; Interface functions
@@
-279,7
+268,7
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(save-excursion
(set-buffer nnbabyl-mbox-buffer)
(save-excursion
(set-buffer nnbabyl-mbox-buffer)
- (
gnus-
set-text-properties (point-min) (point-max) nil)
+ (set-text-properties (point-min) (point-max) nil)
(while (and articles is-old)
(goto-char (point-min))
(when (search-forward (nnbabyl-article-string (car articles)) nil t)
(while (and articles is-old)
(goto-char (point-min))
(when (search-forward (nnbabyl-article-string (car articles)) nil t)
@@
-296,7
+285,8
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(current-buffer))
(let ((nnml-current-directory nil))
(nnmail-expiry-target-group
(current-buffer))
(let ((nnml-current-directory nil))
(nnmail-expiry-target-group
- nnmail-expiry-target newsgroup))))
+ nnmail-expiry-target newsgroup)))
+ (nnbabyl-possibly-change-newsgroup newsgroup server))
(nnheader-message 5 "Deleting article %d in %s..."
(car articles) newsgroup)
(nnbabyl-delete-mail))
(nnheader-message 5 "Deleting article %d in %s..."
(car articles) newsgroup)
(nnbabyl-delete-mail))
@@
-315,7
+305,7
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(nconc rest articles))))
(deffoo nnbabyl-request-move-article
(nconc rest articles))))
(deffoo nnbabyl-request-move-article
- (article group server accept-form &optional last)
+ (article group server accept-form &optional last
move-is-internal
)
(let ((buf (get-buffer-create " *nnbabyl move*"))
result)
(and
(let ((buf (get-buffer-create " *nnbabyl move*"))
result)
(and
@@
-356,7
+346,10
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
(delete-region (point) (progn (forward-line 1) (point)))))
(when nnmail-cache-accepted-message-ids
(while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
(delete-region (point) (progn (forward-line 1) (point)))))
(when nnmail-cache-accepted-message-ids
- (nnmail-cache-insert (nnmail-fetch-field "message-id")))
+ (nnmail-cache-insert (nnmail-fetch-field "message-id")
+ group
+ (nnmail-fetch-field "subject")
+ (nnmail-fetch-field "from")))
(setq result
(if (stringp group)
(list (cons group (nnbabyl-active-number group)))
(setq result
(if (stringp group)
(list (cons group (nnbabyl-active-number group)))
@@
-372,7
+365,10
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(insert-buffer-substring buf)
(when last
(when nnmail-cache-accepted-message-ids
(insert-buffer-substring buf)
(when last
(when nnmail-cache-accepted-message-ids
- (nnmail-cache-insert (nnmail-fetch-field "message-id")))
+ (nnmail-cache-insert (nnmail-fetch-field "message-id")
+ group
+ (nnmail-fetch-field "subject")
+ (nnmail-fetch-field "from")))
(save-buffer)
(nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))
result))))
(save-buffer)
(nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))
result))))
@@
-494,7
+490,7
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
nil t)
(cons (buffer-substring (match-beginning 1) (match-end 1))
(when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
nil t)
(cons (buffer-substring (match-beginning 1) (match-end 1))
- (string-to-
int
+ (string-to-
number
(buffer-substring (match-beginning 2) (match-end 2)))))))
(defun nnbabyl-insert-lines ()
(buffer-substring (match-beginning 2) (match-end 2)))))))
(defun nnbabyl-insert-lines ()
@@
-669,4
+665,5
@@
This variable is a virtual server slot. See the Gnus manual for details.")
(provide 'nnbabyl)
(provide 'nnbabyl)
+;;; arch-tag: aa7ddedb-8c07-4c0e-beb0-58e795c2b81b
;;; nnbabyl.el ends here
;;; nnbabyl.el ends here