projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-point-at-bol, gnus-point-at-eol): Remove.
[gnus]
/
lisp
/
nnml.el
diff --git
a/lisp/nnml.el
b/lisp/nnml.el
index
25b3913
..
4e8337e
100644
(file)
--- a/
lisp/nnml.el
+++ b/
lisp/nnml.el
@@
-1,5
+1,5
@@
;;; nnml.el --- mail spool access for Gnus
;;; nnml.el --- mail spool access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
, 2003
;; Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org> (adding MARKS)
;; Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org> (adding MARKS)
@@
-369,7
+369,10
@@
marks file will be regenerated properly by Gnus.")
(nnmail-check-syntax)
(let (result)
(when nnmail-cache-accepted-message-ids
(nnmail-check-syntax)
(let (result)
(when nnmail-cache-accepted-message-ids
- (nnmail-cache-insert (nnmail-fetch-field "message-id") group))
+ (nnmail-cache-insert (nnmail-fetch-field "message-id")
+ group
+ (nnmail-fetch-field "subject")
+ (nnmail-fetch-field "from")))
(if (stringp group)
(and
(nnmail-activate 'nnml)
(if (stringp group)
(and
(nnmail-activate 'nnml)
@@
-418,8
+421,7
@@
marks file will be regenerated properly by Gnus.")
(if (or (looking-at art)
(search-forward (concat "\n" art) nil t))
;; Delete the old NOV line.
(if (or (looking-at art)
(search-forward (concat "\n" art) nil t))
;; Delete the old NOV line.
- (delete-region (progn (beginning-of-line) (point))
- (progn (forward-line 1) (point)))
+ (gnus-delete-line)
;; The line isn't here, so we have to find out where
;; we should insert it. (This situation should never
;; occur, but one likes to make sure...)
;; The line isn't here, so we have to find out where
;; we should insert it. (This situation should never
;; occur, but one likes to make sure...)
@@
-570,7
+572,7
@@
marks file will be regenerated properly by Gnus.")
(search-forward id nil t)) ; We find the ID.
;; And the id is in the fourth field.
(if (not (and (search-backward "\t" nil t 4)
(search-forward id nil t)) ; We find the ID.
;; And the id is in the fourth field.
(if (not (and (search-backward "\t" nil t 4)
- (not (search-backward
"\t" (gnus-
point-at-bol) t))))
+ (not (search-backward
"\t" (
point-at-bol) t))))
(forward-line 1)
(beginning-of-line)
(setq found t)
(forward-line 1)
(beginning-of-line)
(setq found t)
@@
-619,8
+621,12
@@
marks file will be regenerated properly by Gnus.")
(defun nnml-save-mail (group-art)
"Called narrowed to an article."
(defun nnml-save-mail (group-art)
"Called narrowed to an article."
- (let (chars headers)
+ (let (chars headers
extension
)
(setq chars (nnmail-insert-lines))
(setq chars (nnmail-insert-lines))
+ (setq extension
+ (and nnml-use-compressed-files
+ (> chars 1000)
+ ".gz"))
(nnmail-insert-xref group-art)
(run-hooks 'nnmail-prepare-save-mail-hook)
(run-hooks 'nnml-prepare-save-mail-hook)
(nnmail-insert-xref group-art)
(run-hooks 'nnmail-prepare-save-mail-hook)
(run-hooks 'nnml-prepare-save-mail-hook)
@@
-635,7
+641,8
@@
marks file will be regenerated properly by Gnus.")
(nnml-possibly-create-directory (caar ga))
(let ((file (concat (nnmail-group-pathname
(caar ga) nnml-directory)
(nnml-possibly-create-directory (caar ga))
(let ((file (concat (nnmail-group-pathname
(caar ga) nnml-directory)
- (int-to-string (cdar ga)))))
+ (int-to-string (cdar ga))
+ extension)))
(if first
;; It was already saved, so we just make a hard link.
(funcall nnmail-crosspost-link-function first file t)
(if first
;; It was already saved, so we just make a hard link.
(funcall nnmail-crosspost-link-function first file t)
@@
-692,7
+699,7
@@
marks file will be regenerated properly by Gnus.")
(nnheader-insert-nov headers)))
(defsubst nnml-header-value ()
(nnheader-insert-nov headers)))
(defsubst nnml-header-value ()
- (buffer-substring (match-end 0) (p
rogn (end-of-line) (point)
)))
+ (buffer-substring (match-end 0) (p
oint-at-eol
)))
(defun nnml-parse-head (chars &optional number)
"Parse the head of the current buffer."
(defun nnml-parse-head (chars &optional number)
"Parse the head of the current buffer."
@@
-887,7
+894,8
@@
Use the nov database for that directory if available."
(defun nnml-current-group-article-to-file-alist ()
"Return an alist of article/file pairs in the current group.
Use the nov database for the current group if available."
(defun nnml-current-group-article-to-file-alist ()
"Return an alist of article/file pairs in the current group.
Use the nov database for the current group if available."
- (if (or gnus-nov-is-evil
+ (if (or nnml-use-compressed-files
+ gnus-nov-is-evil
nnml-nov-is-evil
(not (file-exists-p
(expand-file-name nnml-nov-file-name
nnml-nov-is-evil
(not (file-exists-p
(expand-file-name nnml-nov-file-name