From 4af3f74b2f4786e443ed0b9f43b5425943e1b348 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 9 Sep 1998 11:00:33 +0000 Subject: [PATCH] Importing pgnus-0.23. --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/gnus-msg.el | 29 +++++++++++------------------ lisp/gnus-sum.el | 2 +- lisp/gnus-util.el | 4 ++-- lisp/gnus.el | 2 +- lisp/message.el | 15 ++++++--------- lisp/mm-util.el | 4 ++-- lisp/nnheader.el | 1 + lisp/nntp.el | 2 +- texi/gnus.texi | 6 +++--- texi/message.texi | 6 +++--- 11 files changed, 50 insertions(+), 40 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb4a22f..81e28ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +Wed Sep 9 12:25:48 1998 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.23 is released. + +1998-09-09 12:14:47 Lars Magne Ingebrigtsen + + * gnus-util.el (gnus-parent-id): Ditto. + (gnus-put-text-property-excluding-newlines): Ditto. + + * gnus-sum.el (gnus-dependencies-add-header): Make into subst. + +1998-09-08 Karl Kleinpaste + + * message.el (message-generate-headers): Generate User-Agent + instead of X-Mailer & X-Newsreader. + + * gnus-msg.el (gnus-extended-version): Reformat for USEFOR + User-Agent header format. + Tue Sep 8 22:38:27 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.22 is released. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 1330288..8e91b2d 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -537,38 +537,31 @@ If SILENT, don't prompt the user." -;; Dummy to avoid byte-compile warning. +;; Dummies to avoid byte-compile warning. (defvar nnspool-rejected-article-hook) (defvar xemacs-codename) -;;; Since the X-Newsreader/X-Mailer are ``vanity'' headers, they might -;;; as well include the Emacs version as well. -;;; The following function works with later GNU Emacs, and XEmacs. (defun gnus-extended-version () "Stringified Gnus version and Emacs version." (interactive) (concat - gnus-version - "/" + "Gnus/" (prin1-to-string (gnus-continuum-version gnus-version) t) + " " (cond ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version) - (concat "Emacs " (substring emacs-version - (match-beginning 1) - (match-end 1)))) + (concat "Emacs/" (match-string 1 emacs-version))) ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?" emacs-version) - (concat (substring emacs-version - (match-beginning 1) - (match-end 1)) - (format " %d.%d" emacs-major-version emacs-minor-version) + (concat (match-string 1 emacs-version) + (format "/%d.%d" emacs-major-version emacs-minor-version) (if (match-beginning 3) - (substring emacs-version - (match-beginning 3) - (match-end 3)) + (match-string 3 emacs-version) "") (if (boundp 'xemacs-codename) - (concat " - \"" xemacs-codename "\"")))) - (t emacs-version)))) + (concat " (" xemacs-codename ")") + ""))) + (t emacs-version)) + " (" gnus-version ")")) ;;; diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index a5429c0..bae4300 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2880,7 +2880,7 @@ If NO-DISPLAY, don't generate a summary buffer." threads)) ;; Build the thread tree. -(defun gnus-dependencies-add-header (header dependencies force-new) +(defsubst gnus-dependencies-add-header (header dependencies force-new) "Enter HEADER into the DEPENDENCIES table if it is not already there. If FORCE-NEW is not nil, enter HEADER into the DEPENDENCIES table even diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index ee52653..da80c81 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -386,7 +386,7 @@ jabbering all the time." ids)) (nreverse ids))) -(defun gnus-parent-id (references &optional n) +(defsubst gnus-parent-id (references &optional n) "Return the last Message-ID in REFERENCES. If N, return the Nth ancestor instead." (when references @@ -539,7 +539,7 @@ Bind `print-quoted' and `print-readably' to t while printing." (setq string (replace-match "" t t string))) string) -(defun gnus-put-text-property-excluding-newlines (beg end prop val) +(defsubst gnus-put-text-property-excluding-newlines (beg end prop val) "The same as `put-text-property', but don't put this prop on any newlines in the region." (save-match-data (save-excursion diff --git a/lisp/gnus.el b/lisp/gnus.el index 99d55e9..5d9af27 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -250,7 +250,7 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "0.22" +(defconst gnus-version-number "0.23" "Version number for this version of Gnus.") (defconst gnus-version (format "Pterodactyl Gnus v%s" gnus-version-number) diff --git a/lisp/message.el b/lisp/message.el index c92e62b..397210b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -173,11 +173,11 @@ shorten-followup-to existing-newsgroups buffer-file-name unchanged." (defcustom message-required-news-headers '(From Newsgroups Subject Date Message-ID (optional . Organization) Lines - (optional . X-Newsreader)) + (optional . User-Agent)) "*Headers to be generated or prompted for when posting an article. RFC977 and RFC1036 require From, Date, Newsgroups, Subject, Message-ID. Organization, Lines, In-Reply-To, Expires, and -X-Newsreader are optional. If don't you want message to insert some +User-Agent are optional. If don't you want message to insert some header, remove it from this list." :group 'message-news :group 'message-headers @@ -185,10 +185,10 @@ header, remove it from this list." (defcustom message-required-mail-headers '(From Subject Date (optional . In-Reply-To) Message-ID Lines - (optional . X-Mailer)) + (optional . User-Agent)) "*Headers to be generated or prompted for when mailing a message. RFC822 required that From, Date, To, Subject and Message-ID be -included. Organization, Lines and X-Mailer are optional." +included. Organization, Lines and User-Agent are optional." :group 'message-mail :group 'message-headers :type '(repeat sexp)) @@ -939,8 +939,7 @@ The cdr of ech entry is a function for applying the face to a region.") (Expires) (Message-ID) (References . message-shorten-references) - (X-Mailer) - (X-Newsreader)) + (User-Agent)) "Alist used for formatting headers.") (eval-and-compile @@ -2891,9 +2890,7 @@ Headers already prepared in the buffer are not modified." (To nil) (Distribution (message-make-distribution)) (Lines (message-make-lines)) - (X-Newsreader message-newsreader) - (X-Mailer (and (not (message-fetch-field "X-Newsreader")) - message-mailer)) + (User-Agent message-newsreader) (Expires (message-make-expires)) (case-fold-search t) header value elem) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index c8800b0..d806104 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -167,7 +167,7 @@ used as the line break code type of the coding system." (setq idx (1+ idx))) string)) -(defun mm-enable-multibyte () +(defsubst mm-enable-multibyte () "Enable multibyte in the current buffer." (when (fboundp 'set-buffer-multibyte) (set-buffer-multibyte t))) @@ -196,7 +196,7 @@ used as the line break code type of the coding system." (point-min) (point-max))))) (mm-mule-charset-to-mime-charset charset))) -(defun mm-multibyte-p () +(defsubst mm-multibyte-p () "Say whether multibyte is enabled." (and (boundp 'enable-multibyte-characters) enable-multibyte-characters)) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index cb6a44c..9064be7 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -399,6 +399,7 @@ the line could be found." (save-excursion (unless (gnus-buffer-live-p nntp-server-buffer) (setq nntp-server-buffer (get-buffer-create " *nntpd*"))) + (mm-enable-multibyte) (set-buffer nntp-server-buffer) (erase-buffer) (kill-all-local-variables) diff --git a/lisp/nntp.el b/lisp/nntp.el index 1fb9960..228f50a 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -821,7 +821,7 @@ password contained in '~/.nntp-authinfo'." (format " *server %s %s %s*" nntp-address nntp-port-number (gnus-buffer-exists-p buffer)))) - (buffer-disable-undo (current-buffer)) + (mm-enable-multibyte) (set (make-local-variable 'after-change-functions) nil) (set (make-local-variable 'nntp-process-wait-for) nil) (set (make-local-variable 'nntp-process-callback) nil) diff --git a/texi/gnus.texi b/texi/gnus.texi index 57d5efb..d68f064 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Pterodactyl Gnus 0.22 Manual +@settitle Pterodactyl Gnus 0.23 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 Pterodactyl Gnus 0.22 Manual +@title Pterodactyl Gnus 0.23 Manual @author by Lars Magne Ingebrigtsen @page @@ -354,7 +354,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local spool or your mbox file. All at the same time, if you want to push your luck. -This manual corresponds to Pterodactyl Gnus 0.22. +This manual corresponds to Pterodactyl Gnus 0.23. @end ifinfo diff --git a/texi/message.texi b/texi/message.texi index 36abb0c..3d26101 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Pterodactyl Message 0.22 Manual +@settitle Pterodactyl Message 0.23 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -42,7 +42,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Pterodactyl Message 0.22 Manual +@title Pterodactyl Message 0.23 Manual @author by Lars Magne Ingebrigtsen @page @@ -83,7 +83,7 @@ Message mode buffers. * Key Index:: List of Message mode keys. @end menu -This manual corresponds to Pterodactyl Message 0.22. Message is +This manual corresponds to Pterodactyl Message 0.23. Message is distributed with the Gnus distribution bearing the same version number as this manual. -- 1.7.10.4