From 96b9daf8aa454d95b8987002952032786e6fa4d5 Mon Sep 17 00:00:00 2001 From: keiichi Date: Wed, 9 Dec 1998 07:41:43 +0000 Subject: [PATCH] Sync up with gnus-6_9. * lisp/smtp.el (smtp-via-smtp): Use `open-network-stream-as-binary' instead of `open-network-stream'. * lisp/pop3.el (pop3-open-server): Likewise. * lisp/nntp.el (nntp-open-network-stream): Likewise. * lisp/gnus-gl.el (bbb-connect-to-bbbd): Likewise. --- lisp/gnus-art.el | 12 ++++-------- lisp/gnus-gl.el | 3 ++- lisp/gnus-msg.el | 5 +++-- lisp/message.el | 31 ++++++++++++++++++++++++------- lisp/nndb.el | 6 ------ lisp/nntp.el | 40 ++++++++++++++++------------------------ lisp/pop3-fma.el | 2 ++ lisp/pop3.el | 7 ++----- texi/gnus-ja.texi | 8 ++++---- texi/gnus.texi | 6 +++--- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 3504acc..3d5aca3 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1968,15 +1968,11 @@ commands: (defun gnus-article-display-mime-message () "Article display method for MIME message." ;; called from `gnus-original-article-buffer'. - (let ((charset (with-current-buffer gnus-summary-buffer - default-mime-charset))) - (make-local-variable 'default-mime-charset) - (setq default-mime-charset charset) + (let ((default-mime-charset (save-excursion + (set-buffer gnus-summary-buffer) + default-mime-charset))) (mime-display-message mime-message-structure - gnus-article-buffer nil gnus-article-mode-map) - (make-local-variable 'default-mime-charset) - (setq default-mime-charset charset) - ) + gnus-article-buffer nil gnus-article-mode-map)) ;; `mime-display-message' changes current buffer to `gnus-article-buffer'. (make-local-variable 'mime-button-mother-dispatcher) (setq mime-button-mother-dispatcher diff --git a/lisp/gnus-gl.el b/lisp/gnus-gl.el index 93ef915..de68a6d 100644 --- a/lisp/gnus-gl.el +++ b/lisp/gnus-gl.el @@ -257,7 +257,8 @@ If this times out we give up and assume that something has died..." ) (catch 'done (condition-case error (setq grouplens-bbb-process - (open-network-stream "BBBD" grouplens-bbb-buffer host port)) + (open-network-stream-as-binary + "BBBD" grouplens-bbb-buffer host port)) (error (gnus-message 3 "Error: Failed to connect to BBB") nil)) (and (null grouplens-bbb-process) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 56503c0..d2bcbfa 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -145,6 +145,7 @@ Please describe the bug in annoying, painstaking detail. Thank you for your help in stamping out bugs. " + gnus-product-name (if (string= gnus-product-name "Semi-gnus") "" @@ -351,7 +352,8 @@ post using the current select method." This is done simply by taking the old article and adding a Supersedes header line with the old Message-ID." (interactive) - (let ((article (gnus-summary-article-number))) + (let ((article (gnus-summary-article-number)) + gnus-message-setup-hook) (gnus-setup-message 'reply-yank (gnus-summary-select-article t) (set-buffer gnus-original-article-buffer) @@ -547,7 +549,6 @@ If SILENT, don't prompt the user." ;;(defvar nnspool-rejected-article-hook) ;;(defvar xemacs-codename) -;;; Since the User-Agent is ``vanity'' headers. (defun gnus-extended-version () "Stringified gnus version." (interactive) diff --git a/lisp/message.el b/lisp/message.el index 896226f..f12a272 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -236,13 +236,19 @@ included. Organization, Lines and User-Agent are optional." :group 'message-headers :type 'regexp) -(defcustom message-ignored-supersedes-headers "^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-Complaints-To:\\|Return-Path:\\|^Supersedes:" +(defcustom message-ignored-supersedes-headers "^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-Complaints-To:\\|Return-Path:\\|^Supersedes:\\|^X-Trace:\\|^X-Complaints-To:" "*Header lines matching this regexp will be deleted before posting. It's best to delete old Path and Date headers before posting to avoid any confusion." :group 'message-interface :type 'regexp) +(defcustom message-supersede-setup-function + 'message-supersede-setup-for-mime-edit + "Function to setup a supersede message." + :group 'message-sending + :type 'function) + (defcustom message-subject-re-regexp "^[ \t]*\\([Rr][Ee]:[ \t]*\\)*[ \t]*" "*Regexp matching \"Re: \" in the subject line." :group 'message-various @@ -493,6 +499,12 @@ The function `message-bounce' runs this hook." :group 'message-various :type 'hook) +(defcustom message-supersede-setup-hook nil + "Normal hook, run each time a supersede message is initialized. +The function `message-supersede' runs this hook." + :group 'message-various + :type 'hook) + (defcustom message-mode-hook nil "Hook run in message mode buffers." :group 'message-various @@ -501,8 +513,8 @@ The function `message-bounce' runs this hook." (defcustom message-header-hook nil "Hook run in a message mode before header encode. Buffer narrowed to the headers." - :group 'message-various - :type 'hook) + :group 'message-various + :type 'hook) (defcustom message-header-encode-function 'eword-encode-header @@ -3842,6 +3854,10 @@ responses here are directed to other newsgroups.")) (message "Canceling your article...done")) (kill-buffer buf))))) +(defun message-supersede-setup-for-mime-edit () + (set (make-local-variable 'message-setup-hook) nil) + (mime-edit-again)) + ;;;###autoload (defun message-supersede () "Start composing a message to supersede the current message. @@ -3875,7 +3891,11 @@ header line with the old Message-ID." (goto-char (point-max)) (insert mail-header-separator) (widen) - (forward-line 1))) + (when message-supersede-setup-function + (funcall message-supersede-setup-function)) + (run-hooks 'message-supersede-setup-hook) + (goto-char (point-min)) + (search-forward (concat "\n" mail-header-separator "\n") nil t))) ;;;###autoload (defun message-recover () @@ -4062,9 +4082,6 @@ Optional NEWS will use news to forward instead of mail." (message "Resending message to %s...done" address))) (defun message-bounce-setup-for-mime-edit () - (goto-char (point-min)) - (when (search-forward (concat "\n" mail-header-separator "\n") nil t) - (replace-match "\n\n")) (set (make-local-variable 'message-setup-hook) nil) (mime-edit-again)) diff --git a/lisp/nndb.el b/lisp/nndb.el index 0a0f3ef..007d8e5 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -59,12 +59,6 @@ (eval-when-compile (require 'cl)) (eval-and-compile - (unless (fboundp 'open-network-stream) - (require 'tcp))) - -(eval-when-compile (require 'cl)) - -(eval-and-compile (autoload 'news-setup "rnewspost") (autoload 'news-reply-mode "rnewspost") (autoload 'cancel-timer "timer") diff --git a/lisp/nntp.el b/lisp/nntp.el index 9c5523d..d7665b5 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -30,10 +30,6 @@ (nnoo-declare nntp) -(eval-and-compile - (unless (fboundp 'open-network-stream) - (require 'tcp))) - (eval-when-compile (require 'cl)) (defvoo nntp-address nil @@ -154,12 +150,6 @@ server there that you can connect to. See also (defvoo nntp-warn-about-losing-connection t "*If non-nil, beep when a server closes connection.") -(defvoo nntp-coding-system-for-read 'binary - "*Coding system to read from NNTP.") - -(defvoo nntp-coding-system-for-write 'binary - "*Coding system to write to NNTP.") - (defcustom nntp-authinfo-file "~/.authinfo" ".netrc-like file that holds nntp authinfo passwords." :type @@ -847,9 +837,7 @@ password contained in '~/.nntp-authinfo'." (kill-buffer ,pbuffer)))))) (process (condition-case () - (let ((coding-system-for-read nntp-coding-system-for-read) - (coding-system-for-write nntp-coding-system-for-write)) - (funcall nntp-open-connection-function pbuffer)) + (funcall nntp-open-connection-function pbuffer) (error nil) (quit nil)))) (when timer @@ -875,7 +863,8 @@ password contained in '~/.nntp-authinfo'." nil)))) (defun nntp-open-network-stream (buffer) - (open-network-stream "nntpd" buffer nntp-address nntp-port-number)) + (open-network-stream-as-binary + "nntpd" buffer nntp-address nntp-port-number)) (defun nntp-open-ssl-stream (buffer) (let* ((ssl-program-arguments '("-connect" (concat host ":" service))) @@ -1174,9 +1163,10 @@ password contained in '~/.nntp-authinfo'." (save-excursion (set-buffer buffer) (erase-buffer) - (let ((proc (apply - 'start-process - "nntpd" buffer nntp-telnet-command nntp-telnet-switches)) + (let ((proc (as-binary-process + (apply + 'start-process + "nntpd" buffer nntp-telnet-command nntp-telnet-switches))) (case-fold-search t)) (when (memq (process-status proc) '(open run)) (process-send-string proc "set escape \^X\n") @@ -1221,13 +1211,15 @@ password contained in '~/.nntp-authinfo'." (defun nntp-open-rlogin (buffer) "Open a connection to SERVER using rsh." (let ((proc (if nntp-rlogin-user-name - (apply 'start-process - "nntpd" buffer nntp-rlogin-program - nntp-address "-l" nntp-rlogin-user-name - nntp-rlogin-parameters) - (apply 'start-process - "nntpd" buffer nntp-rlogin-program nntp-address - nntp-rlogin-parameters)))) + (as-binary-process + (apply 'start-process + "nntpd" buffer nntp-rlogin-program + nntp-address "-l" nntp-rlogin-user-name + nntp-rlogin-parameters)) + (as-binary-process + (apply 'start-process + "nntpd" buffer nntp-rlogin-program nntp-address + nntp-rlogin-parameters))))) (save-excursion (set-buffer buffer) (nntp-wait-for-string "^\r*20[01]") diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el index 072a509..293efe6 100644 --- a/lisp/pop3-fma.el +++ b/lisp/pop3-fma.el @@ -398,3 +398,5 @@ Argument PROMPT ." (provide 'pop3-fma) ;; ;; pop3-fma.el ends here. + + diff --git a/lisp/pop3.el b/lisp/pop3.el index 7756da3..d51e847 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -123,17 +123,14 @@ Used for APOP authentication.") Returns the process associated with the connection." (let ((process-buffer (get-buffer-create (format "trace of POP session to %s" mailhost))) - (process) - (coding-system-for-read 'binary) ;; because 0000n0000 S000l 0a0 - (coding-system-for-write 'binary) ;; is st00pid - ) + (process)) (save-excursion (set-buffer process-buffer) (erase-buffer) (setq pop3-read-point (point-min)) ) (setq process - (open-network-stream "POP" process-buffer mailhost port)) + (open-network-stream-as-binary "POP" process-buffer mailhost port)) (let ((response (pop3-read-response process t))) (setq pop3-timestamp (substring response (or (string-match "<" response) 0) diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 7b11e3e..ad2cba7 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus-ja -@settitle Semi-gnus 6.8.20 Manual +@settitle Semi-gnus 6.9.1 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -345,7 +345,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.8.20 Manual +@title Semi-gnus 6.9.1 Manual @author by Lars Magne Ingebrigtsen @author by members of Semi-gnus mailing-list @@ -399,7 +399,7 @@ Semi-gnus $B$O!"Bg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C(B $B$J8@8l7w$r:9JL$7$^$;$s!#$"$"!"%/%j%s%4%s$NJ}$O(B Unicode Next Generation$B$r(B $B$*BT$A$/$@$5$$!#(B -$B$3$N@bL@=q$O(B Semi-gnus 6.8.20 $B$KBP1~$7$^$9!#(B +$B$3$N@bL@=q$O(B Semi-gnus 6.9.1 $B$KBP1~$7$^$9!#(B @end ifinfo @@ -18126,7 +18126,7 @@ Gnus $B$OH"$+$i=P$7$F$9$0$K(B @emph{$BHs>o$K(B} $B$h$/F0:n$7$^$9(B---$B2? @item @kbd{M-x gnus-version} $B$r;n$7$F2<$5$$!#$b$7!"(B -@samp{Semi-gnus 6.8.20 (based on Gnus 5.6.44; for SEMI 1.8, FLIM 1.9/1.9)} +@samp{Semi-gnus 6.9.1 (based on Gnus 5.6.45; for SEMI 1.11, FLIM 1.12)} $B$N$h$&$J$b$N$,=P$F$-$?$J$i!"@5$7$$%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#(B $B$b$7!"(B@samp{NNTP 3.x} $B$d(B @samp{nntp flee} $B$N$h$&$J$b$N$,=P$F$-$?$H$-$O!"(B $B$=$3$K$"$k$$$/$D$+$N8E$$(B @file{.el} $B%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#$=$l$i(B diff --git a/texi/gnus.texi b/texi/gnus.texi index 9276a1d..932f108 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Semi-gnus 6.8.20 Manual +@settitle Semi-gnus 6.9.1 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -318,7 +318,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.8.20 Manual +@title Semi-gnus 6.9.1 Manual @author by Lars Magne Ingebrigtsen @page @@ -361,7 +361,7 @@ internationalization/localization and multiscript features based on MULE API. So Semi-gnus does not discriminate various language communities. Oh, if you are a Klingon, please wait Unicode Next Generation. -This manual corresponds to Semi-gnus 6.8.20. +This manual corresponds to Semi-gnus 6.9.1. @end ifinfo -- 1.7.10.4