From 02c1ff49ee866544d2918d446fcc0b3412821c33 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 4 Jul 2000 22:20:26 +0000 Subject: [PATCH] Synch. --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/gnus-art.el | 8 ++++---- lisp/mm-bodies.el | 14 +++++++------- lisp/mm-uu.el | 3 ++- lisp/mm-view.el | 5 ++++- lisp/nnmail.el | 6 +++--- lisp/nnslashdot.el | 10 ++++++---- lisp/nnsoup.el | 28 +++++++++++++++++----------- texi/gnus-ja.texi | 3 +++ texi/gnus.texi | 3 +++ 10 files changed, 66 insertions(+), 31 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bfaf179..00185f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2000-07-03 00:12:26 Lars Magne Ingebrigtsen + + * nnsoup.el: Use expand-file-name throughtout. + +2000-07-03 00:07:51 Kjetil Torgrim Homme + + * nnmail.el (nnmail-read-incoming-hook): New example. + +2000-07-02 23:17:23 Lars Magne Ingebrigtsen + + * mm-view.el (mm-inline-text): Check whether the text has already + been decoded. + +2000-07-04 15:17:05 ShengHuo ZHU + + * nnslashdot.el (nnslashdot-sid-strip): To strip or not to strip? + 2000-07-03 Stainless Steel Rat * gnus-sum.el (gnus-recenter): Fix horizontal recenter. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 9e01c05..8f88fa1 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1629,10 +1629,10 @@ If PROMPT (the prefix), prompt for a coding system to use." (forward-line 1) (save-restriction (narrow-to-region (point) (point-max)) - (if (and (eq mail-parse-charset 'gnus-decoded) - (eq (mm-body-7-or-8) '8bit)) - ;; The text code could have been decoded. - (setq charset mail-parse-charset)) + (when (and (eq mail-parse-charset 'gnus-decoded) + (eq (mm-body-7-or-8) '8bit)) + ;; The text code could have been decoded. + (setq charset mail-parse-charset)) (when (and (or (not ctl) (equal (car ctl) "text/plain")) (not format)) ;; article with format will decode later. diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 410d9f8..f90f74c 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -231,13 +231,13 @@ The characters in CHARSET should then be decoded." (defun mm-decode-string (string charset) "Decode STRING with CHARSET." - (if (stringp charset) - (setq charset (intern (downcase charset)))) - (if (or (not charset) - (eq 'gnus-all mail-parse-ignored-charsets) - (memq 'gnus-all mail-parse-ignored-charsets) - (memq charset mail-parse-ignored-charsets)) - (setq charset mail-parse-charset)) + (when (stringp charset) + (setq charset (intern (downcase charset)))) + (when (or (not charset) + (eq 'gnus-all mail-parse-ignored-charsets) + (memq 'gnus-all mail-parse-ignored-charsets) + (memq charset mail-parse-ignored-charsets)) + (setq charset mail-parse-charset)) (or (when (featurep 'mule) (let ((mule-charset (mm-charset-to-coding-system charset))) diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index 731e588..a97cced 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -191,7 +191,8 @@ To disable dissecting shar codes, for instance, add ((eq type 'uu) (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) (list (or (and file-name - (string-match "\\.[^\\.]+$" file-name) + (string-match "\\.[^\\.]+$" + file-name) (mailcap-extension-to-mime (match-string 0 file-name))) "application/octet-stream")) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 6fb7289..6b21d71 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -151,7 +151,10 @@ (let ((b (point)) (charset (mail-content-type-get (mm-handle-type handle) 'charset))) - (if (eq charset 'gnus-decoded) + (if (or (eq charset 'gnus-decoded) + ;; This is probably not entirely correct, but + ;; makes rfc822 parts with embedded multiparts work. + (eq mail-parse-charset 'gnus-decoded)) (mm-insert-part handle) (insert (mm-decode-string (mm-get-part handle) charset))) (when (and (equal type "plain") diff --git a/lisp/nnmail.el b/lisp/nnmail.el index b4df106..ca36dd3 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -237,9 +237,9 @@ running (\"xwatch\", etc.) Eg. \(add-hook 'nnmail-read-incoming-hook - (lambda () - (start-process \"mailsend\" nil - \"/local/bin/mailsend\" \"read\" \"mbox\"))) + (lambda () + (call-process \"/local/bin/mailsend\" nil nil nil + \"read\" nnmail-spool-file))) If you have xwatch running, this will alert it that mail has been read. diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index 013fabc..0aca640 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -540,10 +540,12 @@ (defun nnslashdot-lose (why) (error "Slashdot HTML has changed; please get a new version of nnslashdot")) -(defun nnslashdot-sid-strip (sid) - (if (string-match "^00/" sid) - (substring sid (match-end 0)) - sid)) +;(defun nnslashdot-sid-strip (sid) +; (if (string-match "^00/" sid) +; (substring sid (match-end 0)) +; sid)) + +(defalias 'nnslashdot-sid-strip 'identity) (provide 'nnslashdot) diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index 8fbe994..4a91c60 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -45,7 +45,7 @@ ("/tmp/")) "*Where nnsoup will store temporary files.") -(defvoo nnsoup-replies-directory (concat nnsoup-directory "replies/") +(defvoo nnsoup-replies-directory (expand-file-name "replies/" nnsoup-directory) "*Directory where outgoing packets will be composed.") (defvoo nnsoup-replies-format-type ?u ;; u is USENET news format. @@ -54,7 +54,7 @@ (defvoo nnsoup-replies-index-type ?n "*Index type of the replies packages.") -(defvoo nnsoup-active-file (concat nnsoup-directory "active") +(defvoo nnsoup-active-file (expand-file-name "active" nnsoup-directory) "Active file.") (defvoo nnsoup-packer "tar cf - %s | gzip > $HOME/Soupin%d.tgz" @@ -423,12 +423,15 @@ backend for the messages.") (setq cur-prefix (nnsoup-next-prefix)) (nnheader-message 5 "Incorporating file %s..." cur-prefix) (when (file-exists-p - (setq file (concat nnsoup-tmp-directory - (gnus-soup-area-prefix area) ".IDX"))) + (setq file + (expand-file-name + (concat (gnus-soup-area-prefix area) ".IDX") + nnsoup-tmp-directory))) (rename-file file (nnsoup-file cur-prefix))) (when (file-exists-p - (setq file (concat nnsoup-tmp-directory - (gnus-soup-area-prefix area) ".MSG"))) + (setq file (expand-file-name + (concat (gnus-soup-area-prefix area) ".MSG") + nnsoup-tmp-directory))) (rename-file file (nnsoup-file cur-prefix t)) (gnus-soup-set-area-prefix area cur-prefix) ;; Find the number of new articles in this area. @@ -532,17 +535,19 @@ backend for the messages.") (let* ((file (concat prefix (if message ".MSG" ".IDX"))) (buffer-name (concat " *nnsoup " file "*"))) (or (get-buffer buffer-name) ; File already loaded. - (when (file-exists-p (concat nnsoup-directory file)) + (when (file-exists-p (expand-file-name file nnsoup-directory)) (save-excursion ; Load the file. (set-buffer (get-buffer-create buffer-name)) (buffer-disable-undo) (push (cons nnsoup-current-group (current-buffer)) nnsoup-buffers) - (nnheader-insert-file-contents (concat nnsoup-directory file)) + (nnheader-insert-file-contents + (expand-file-name file nnsoup-directory)) (current-buffer)))))) (defun nnsoup-file (prefix &optional message) (expand-file-name - (concat nnsoup-directory prefix (if message ".MSG" ".IDX")))) + (concat prefix (if message ".MSG" ".IDX")) + nnsoup-directory)) (defun nnsoup-message-buffer (prefix) (nnsoup-index-buffer prefix 'msg)) @@ -723,7 +728,7 @@ backend for the messages.") (unless nnsoup-replies-list (setq nnsoup-replies-list (gnus-soup-parse-replies - (concat nnsoup-replies-directory "REPLIES")))) + (expand-file-name "REPLIES" nnsoup-replies-directory)))) (let ((replies nnsoup-replies-list)) (while (and replies (not (string= kind (gnus-soup-reply-kind (car replies))))) @@ -802,7 +807,8 @@ backend for the messages.") ;; Sort and delete the files. (setq non-files (sort non-files 'string<)) (map-y-or-n-p "Delete file %s? " - (lambda (file) (delete-file (concat nnsoup-directory file))) + (lambda (file) (delete-file + (expand-file-name file nnsoup-directory))) non-files))) (provide 'nnsoup) diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 261c7f7..2eb2c84 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -9742,6 +9742,9 @@ Buffer})。 (nnmh-get-new-mail nil)) @end lisp +@cindex proxy +@cindex firewall + 防壁 (firewall) の中にいて、防壁マシンからの @sc{nntp} サーバーへの接続 しかないのであれば、gnus に防壁マシンに @code{rlogin} して、そこから @sc{nntp} サーバーに telnet をするように指示する事ができます。 diff --git a/texi/gnus.texi b/texi/gnus.texi index d9cae26..026e7e1 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -10130,6 +10130,9 @@ Here's the method for a public spool: (nnmh-get-new-mail nil)) @end lisp +@cindex proxy +@cindex firewall + If you are behind a firewall and only have access to the @sc{nntp} server from the firewall machine, you can instruct Gnus to @code{rlogin} on the firewall machine and telnet from there to the @sc{nntp} server. -- 1.7.10.4