projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch with Oort Gnus.
[elisp/gnus.git-]
/
lisp
/
nnspool.el
diff --git
a/lisp/nnspool.el
b/lisp/nnspool.el
index
5cbfed7
..
7ca4f7a
100644
(file)
--- a/
lisp/nnspool.el
+++ b/
lisp/nnspool.el
@@
-1,8
+1,11
@@
;;; nnspool.el --- spool access for GNU Emacs
;;; nnspool.el --- spool access for GNU Emacs
-;; Copyright (C) 1988,89,90,93,94,95,96,97,98 Free Software Foundation, Inc.
+
+;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
+;; 2000, 2002
+;; Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
-;; Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
;; Keywords: news
;; This file is part of GNU Emacs.
@@
-26,10
+29,12
@@
;;; Code:
;;; Code:
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
+
(require 'nnheader)
(require 'nntp)
(require 'nnoo)
(require 'nnheader)
(require 'nntp)
(require 'nnoo)
-(eval-when-compile (require 'cl))
(nnoo-declare nnspool)
(nnoo-declare nnspool)
@@
-47,7
+52,10
@@
If you are using Cnews, you probably should set this variable to nil.")
(defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
"Local news nov directory.")
(defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
"Local news nov directory.")
-(defvoo nnspool-lib-dir "/usr/lib/news/"
+(defvoo nnspool-lib-dir
+ (if (file-exists-p "/usr/lib/news/active")
+ "/usr/lib/news/"
+ "/var/lib/news/")
"Where the local news library files are stored.")
(defvoo nnspool-active-file (concat nnspool-lib-dir "active")
"Where the local news library files are stored.")
(defvoo nnspool-active-file (concat nnspool-lib-dir "active")
@@
-137,9
+145,8
@@
there.")
(inline (nnheader-insert-head file))
(goto-char beg)
(if (search-forward "\n\n" nil t)
(inline (nnheader-insert-head file))
(goto-char beg)
(if (search-forward "\n\n" nil t)
- (progn
- (forward-char -1)
- (insert ".\n"))
+ (progn (forward-char -1)
+ (insert ".\n"))
(goto-char (point-max))
(if (bolp)
(insert ".\n")
(goto-char (point-max))
(if (bolp)
(insert ".\n")
@@
-325,7
+332,8
@@
there.")
()
(nnheader-report 'nnspool "")
(set-process-sentinel proc 'nnspool-inews-sentinel)
()
(nnheader-report 'nnspool "")
(set-process-sentinel proc 'nnspool-inews-sentinel)
- (process-send-region proc (point-min) (point-max))
+ (mm-with-unibyte-current-buffer
+ (process-send-region proc (point-min) (point-max)))
;; We slap a condition-case around this, because the process may
;; have exited already...
(ignore-errors
;; We slap a condition-case around this, because the process may
;; have exited already...
(ignore-errors
@@
-357,7
+365,7
@@
there.")
(let ((nov (nnheader-group-pathname
nnspool-current-group nnspool-nov-directory ".overview"))
(arts articles)
(let ((nov (nnheader-group-pathname
nnspool-current-group nnspool-nov-directory ".overview"))
(arts articles)
- (nnheader-file-coding-system nnspool-file-coding-system)
+ (nnheader-file-coding-system nnspool-file-coding-system)
last)
(if (not (file-exists-p nov))
()
last)
(if (not (file-exists-p nov))
()
@@
-438,8
+446,8
@@
there.")
(set-buffer nntp-server-buffer)
(erase-buffer)
(condition-case ()
(set-buffer nntp-server-buffer)
(erase-buffer)
(condition-case ()
- (let ((coding-system-for-read nnspool-file-coding-system))
- (mm-insert-file-contents file)
+ (let ((nnheader-file-coding-system nnspool-file-coding-system))
+ (nnheader-insert-file-contents file)
t)
(file-error nil)))
t)
(file-error nil)))