From 6e907f8ec2d8d0cbd22b7fdee6ed73e01172fc93 Mon Sep 17 00:00:00 2001 From: ichikawa Date: Mon, 1 Feb 1999 05:39:42 +0000 Subject: [PATCH] * lisp/gnus-offline.el (gnus-offline-gnus-get-new-news): Modify for pGnus with mail-source.el. * lisp/gnus-offline.el: Use (running-pterodactyl-gnus-0_73-or-later) to check pGnus 0.73 or later instead of (locate-library "mail-source") --- ChangeLog | 9 ++++++++ lisp/gnus-offline.el | 58 +++++++++++++++++++++++--------------------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 189af40..b99ef1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1999-02-01 Tatsuya Ichikawa + Tsukamoto Tetsuo + + * lisp/gnus-offline.el (gnus-offline-gnus-get-new-news): Modify for + pGnus with mail-source.el. + + * lisp/gnus-offline.el: Use (running-pterodactyl-gnus-0_73-or-later) + to check pGnus 0.73 or later instead of (locate-library "mail-source") + 1999-02-01 Katsumi Yamaoka * lisp/nndoc.el (nndoc-mime-parts-type-p): Strip leading white diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el index 568e2c5..0b5e4b3 100644 --- a/lisp/gnus-offline.el +++ b/lisp/gnus-offline.el @@ -1,5 +1,5 @@ ;;; gnus-offline.el --- To process mail & news at offline environment. -;;; $Id: gnus-offline.el,v 1.1.2.5.2.28 1999-01-31 23:06:20 yamaoka Exp $ +;;; $Id: gnus-offline.el,v 1.1.2.5.2.30 1999-02-01 05:39:42 ichikawa Exp $ ;;; Copyright (C) 1998 Tatsuya Ichikawa ;;; Yukihiro Ito @@ -384,30 +384,26 @@ If value is nil , dialup line is disconnected status.") (if (functionp gnus-offline-dialup-function) (funcall gnus-offline-dialup-function)) (gnus-offline-get-new-news-function) - (if (not (locate-library "mail-source")) - (progn - (let (buffer) - (unwind-protect - (progn - (save-excursion - (or pop3-fma-password - (when gnus-offline-pop-password-file - (setq pop3-fma-save-password-information t) - (setq buffer (get-buffer-create "*offline-temp*")) - (set-buffer buffer) - (erase-buffer) - (insert-file-contents-as-binary gnus-offline-pop-password-file) - (and gnus-offline-pop-password-decoding-function - (funcall gnus-offline-pop-password-decoding-function)) - (eval-buffer)))) - (gnus-group-get-new-news arg)) - (when gnus-offline-pop-password-file - (setq pop3-fma-password nil) - (setq pop3-fma-save-password-information nil) - (kill-buffer buffer))))) - ;; - ;; Use mail-source.el - (gnus-group-get-new-news arg))) + (if (featurep 'running-pterodactyl-gnus-0_73-or-later) + (gnus-group-get-new-news arg) + (let ((buffer (get-buffer-create "*offline-temp*"))) + (unwind-protect + (progn + (if (boundp 'pop3-fma-password) + (setq pop3-fma-save-password-information t)) + (save-excursion + (set-buffer buffer) + (erase-buffer) + (insert-file-contents-as-binary gnus-offline-pop-password-file) + (and gnus-offline-pop-password-decoding-function + (funcall gnus-offline-pop-password-decoding-function)) + (eval-buffer)) + (gnus-group-get-new-news arg)) + (if (boundp 'pop3-fma-password) + (setq pop3-fma-password nil + pop3-fma-save-password-information nil) + (setq mail-source-password-cache nil)) + (kill-buffer buffer))))) ;; ;; dialup... @@ -544,7 +540,7 @@ If value is nil , dialup line is disconnected status.") (defun gnus-offline-enable-fetch-mail () "*Set to fetch mail." (setq gnus-offline-mail-fetch-method 'nnmail) - (if (not (locate-library "mail-source")) + (if (not (featurep 'running-pterodactyl-gnus-0_73-or-later)) (progn (setq nnmail-movemail-program 'pop3-fma-movemail) (setq nnmail-spool-file (append @@ -797,7 +793,7 @@ If value is nil , dialup line is disconnected status.") (add-hook 'gnus-group-mode-hook '(lambda () (local-set-key "\C-coh" 'gnus-offline-set-unplugged-state) - (if (not (locate-library "mail-source")) + (if (not (featurep 'running-pterodactyl-gnus-0_73-or-later)) (local-set-key "\C-com" 'gnus-offline-toggle-movemail-program)) (local-set-key "\C-cof" 'gnus-offline-toggle-articles-to-fetch) (local-set-key "\C-coo" 'gnus-offline-toggle-on/off-send-mail) @@ -850,7 +846,7 @@ If value is nil , dialup line is disconnected status.") "----" ("Gnus Offline" ["movemail の切替え" gnus-offline-toggle-movemail-program - (not (locate-library "mail-source"))] + (not (featurep 'running-pterodactyl-gnus-0_73-or-later)) ["取得記事種類の変更" gnus-offline-toggle-articles-to-fetch t] ["Mail 送信方法(On/Off)の切替え" gnus-offline-toggle-on/off-send-mail t] ["自動切断の切替え" gnus-offline-toggle-auto-hangup t] @@ -872,7 +868,7 @@ If value is nil , dialup line is disconnected status.") "----" ("Gnus Offline" ["Toggle movemail program" gnus-offline-toggle-movemail-program - (not (locate-library "mail-source"))] + (not (featurep 'running-pterodactyl-gnus-0_73-or-later)) ["Toggle articles to fetch" gnus-offline-toggle-articles-to-fetch t] ["Toggle online/offline send mail" gnus-offline-toggle-on/off-send-mail t] ["Toggle auto hangup" gnus-offline-toggle-auto-hangup t] @@ -896,7 +892,7 @@ If value is nil , dialup line is disconnected status.") (if (featurep 'meadow) '("Offline" ["movemail の切替え" gnus-offline-toggle-movemail-program - (not (locate-library "mail-source"))] + (not (featurep 'running-pterodactyl-gnus-0_73-or-later)) ["取得記事種類の変更" gnus-offline-toggle-articles-to-fetch t] ["Mail 送信方法(On/Off)の切替え" gnus-offline-toggle-on/off-send-mail t] ["自動切断の切替え" gnus-offline-toggle-auto-hangup t] @@ -907,7 +903,7 @@ If value is nil , dialup line is disconnected status.") ["回線の切断" gnus-offline-set-unplugged-state gnus-offline-connected]) '("Offline" ["Toggle movemail program" gnus-offline-toggle-movemail-program - (not (locate-library "mail-source"))] + (not (featurep 'running-pterodactyl-gnus-0_73-or-later)) ["Toggle articles to fetch" gnus-offline-toggle-articles-to-fetch t] ["Toggle online/offline send mail" gnus-offline-toggle-on/off-send-mail t] ["Toggle auto hangup" gnus-offline-toggle-auto-hangup t] -- 1.7.10.4