From b5e2a658e6fb187bbe3af3107468b393d876a8c5 Mon Sep 17 00:00:00 2001 From: ichikawa Date: Sun, 6 Dec 1998 02:42:39 +0000 Subject: [PATCH] Sync up with Pteroductyl Gnus 0.64 --- ChangeLog | 6 ++++ lisp/ChangeLog | 59 ++++++++++++++++++++++++++++++++ lisp/gnus-art.el | 11 +++++- lisp/gnus-mailcap.el | 5 ++- lisp/gnus-msg.el | 93 ++++++++++++++++++++++++++++---------------------- lisp/gnus-picon.el | 16 ++++++--- lisp/gnus.el | 4 +-- lisp/message.el | 13 ++++--- lisp/mm-util.el | 3 +- lisp/mm-view.el | 4 +-- texi/gnus-ja.texi | 6 ++-- texi/gnus.texi | 14 +++++--- texi/message-ja.texi | 6 ++-- texi/message.texi | 6 ++-- 14 files changed, 173 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index caec517..10e10d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-12-06 Tatsuya Ichikawa + + * lisp/gnus.el (gnus-version-number): Update to 6.10.049. + + * Sync up with Pterodactyl Gnus 0.64. + 1998-12-04 Katsumi Yamaoka * lisp/gnus-sum.el (gnus-summary-show-article): Don't use diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f708861..643a2a2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,62 @@ +Sat Dec 5 18:35:42 1998 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.64 is released. + +1998-12-05 18:51:13 Lars Magne Ingebrigtsen + + * mm-view.el (mm-setup-w3): Don't load. + + * gnus-msg.el (gnus-setup-message): Set group name. + (gnus-group-mail): Avoid leaking local vars. + + * message.el (message-attach-file): Renamed. + (message-mime-attach-file): Renamed again. + +1998-12-05 Hrvoje Niksic + + * gnus-art.el (article-decode-encoded-words): Bind + rfc2047-default-charset here. + + * gnus-art.el (gnus-insert-mime-button): Nix slashes in file name. + +1998-12-05 18:33:27 Lars Magne Ingebrigtsen + + * gnus-picon.el (gnus-picons-setup-buffer): Run picons hook. + (gnus-picons-setup-hook): New hook. + +1998-12-05 Per Abrahamsen + + * mailcap.el (mailcap-mime-data): Remove "*" from documentation + string. + (mailcap-mime-extensions): Ditto. Made first sentense fit a + line. + +1998-12-05 17:11:04 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-article-prepare-display): Setup w3. + (gnus-mime-view-part): Ditto. + (gnus-mime-inline-part): Dotii. + (gnus-mime-externalize-part): Daddo. + (gnus-mime-internalize-part): Tutti frutti. + (gnus-widget-press-button): Da da do. + + * mm-view.el (mm-setup-w3): Require url-vars. + +Fri Dec 4 12:13:12 1998 Shenghuo ZHU + + * message.el (message-draft-coding-system): Fix for XEmacs-NT. + * mm-util.el (mm-find-charset-region): Ditto. + +1998-12-05 16:30:01 Lars Magne Ingebrigtsen + + * message.el (message-send): Don't encode here. + (message-send-mail): But here. + (message-send-news): And here. + +1998-12-04 15:29:02 Lars Magne Ingebrigtsen + + * gnus-msg.el (gnus-message-insert-stylings): Don't insert twice. + Fri Dec 4 04:09:15 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.63 is released. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index e068b71..2c44f0c 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -944,7 +944,9 @@ always hide." (forward-line 1)))))) (defun article-treat-dumbquotes () - "Translate M******** sm*rtq**t*s into proper text." + "Translate M******** sm*rtq**t*s into proper text. +Note that this function guesses whether a character is a sm*rtq**t* or +not, so it should only be used interactively." (interactive) (article-translate-strings gnus-article-dumbquotes-map)) @@ -2467,6 +2469,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." "Interactively choose a view method for the MIME part under point." (interactive) (gnus-article-check-buffer) + (mm-setup-w3) (let ((data (get-text-property (point) 'gnus-data)) (url-standalone-mode (not gnus-plugged))) (mm-interactively-view-part data))) @@ -2498,6 +2501,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." "Insert the MIME part under point into the current buffer." (interactive "P") ; For compatibility reasons we are not using "z". (gnus-article-check-buffer) + (mm-setup-w3) (let* ((data (get-text-property (point) 'gnus-data)) contents (url-standalone-mode (not gnus-plugged)) @@ -2518,6 +2522,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." "View the MIME part under point with an external viewer." (interactive) (gnus-article-check-buffer) + (mm-setup-w3) (let* ((handle (or handle (get-text-property (point) 'gnus-data))) (url-standalone-mode (not gnus-plugged)) (mm-user-display-methods nil) @@ -2532,6 +2537,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." "View the MIME part under point with an internal viewer." (interactive) (gnus-article-check-buffer) + (mm-setup-w3) (let* ((handle (or handle (get-text-property (point) 'gnus-data))) (url-standalone-mode (not gnus-plugged)) (mm-user-display-methods '((".*" . inline))) @@ -2635,6 +2641,8 @@ If ALL-HEADERS is non-nil, no headers are hidden." (gnus-tmp-length (with-current-buffer (mm-handle-buffer handle) (buffer-size))) gnus-tmp-type-long b e) + (when (string-match ".*/" gnus-tmp-name) + (setq gnus-tmp-name (replace-match "" t t gnus-tmp-name))) (setq gnus-tmp-type-long (concat gnus-tmp-type (and (not (equal gnus-tmp-name "")) (concat "; " gnus-tmp-name)))) @@ -2670,6 +2678,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." (defun gnus-widget-press-button (elems el) (goto-char (widget-get elems :from)) + (mm-setup-w3) (let ((url-standalone-mode (not gnus-plugged))) (gnus-article-press-button))) diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index 57fbf36..be2a40c 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -210,7 +210,7 @@ (viewer . tar-mode) (type . "archive/tar") (test . (fboundp 'tar-mode))))) - "*The mailcap structure is an assoc list of assoc lists. + "The mailcap structure is an assoc list of assoc lists. 1st assoc list is keyed on the major content-type 2nd assoc list is keyed on the minor content-type (which can be a regexp) @@ -755,8 +755,7 @@ this type is returned." (".ai" . "application/postscript") (".jpe" . "image/jpeg") (".jpeg" . "image/jpeg")) - "*An assoc list of file extensions and the MIME content-types they -correspond to.") + "An assoc list of file extensions and corresponding MIME content-types.") (defun mailcap-parse-mimetypes (&optional path) ;; Parse out all the mimetypes specified in a unix-style path string PATH diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 6ee0f57..b3859ba 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -217,7 +217,7 @@ Thank you for your help in stamping out bugs. (setq gnus-message-buffer (current-buffer)) (set (make-local-variable 'gnus-message-group-art) (cons ,group ,article)) - (make-local-variable 'gnus-newsgroup-name) + (set (make-local-variable 'gnus-newsgroup-name) ,group) (gnus-run-hooks 'gnus-message-setup-hook)) (gnus-add-buffer) (gnus-configure-windows ,config t) @@ -251,15 +251,24 @@ Thank you for your help in stamping out bugs. If ARG, use the group under the point to find a posting style. If ARG is 1, prompt for a group name to find the posting style." (interactive "P") - (let ((gnus-newsgroup-name - (if arg - (if (= 1 (prefix-numeric-value arg)) - (completing-read "Use posting style of group: " - gnus-active-hashtb nil - (gnus-read-active-file-p)) - (gnus-group-group-name)) - ""))) - (gnus-setup-message 'message (message-mail)))) + ;; We can't `let' gnus-newsgroup-name here, since that leads + ;; to local variables leaking. + (let ((group gnus-newsgroup-name) + (buffer (current-buffer))) + (unwind-protect + (progn + (setq gnus-newsgroup-name + (if arg + (if (= 1 (prefix-numeric-value arg)) + (completing-read "Use posting style of group: " + gnus-active-hashtb nil + (gnus-read-active-file-p)) + (gnus-group-group-name)) + "")) + (gnus-setup-message 'message (message-mail))) + (save-excursion + (set-buffer buffer) + (setq gnus-newsgroup-name group))))) (defun gnus-group-post-news (&optional arg) "Start composing a news message. @@ -1126,30 +1135,31 @@ this is a reply." ;; If the group has a posting-style parameter, add it at the end with a ;; regexp matching everything, to be sure it takes precedence over all ;; the others. - (unless (eq 0 (length gnus-newsgroup-name)) - (let ((tmp-style (gnus-group-find-parameter gnus-newsgroup-name - 'posting-style t))) - (and tmp-style - (setq styles (append styles (list (cons ".*" tmp-style))))) - )) + (unless (zerop (length gnus-newsgroup-name)) + (let ((tmp-style (gnus-group-find-parameter + gnus-newsgroup-name 'posting-style t))) + (when tmp-style + (setq styles (append styles (list (cons ".*" tmp-style))))))) ;; Go through all styles and look for matches. (while styles (setq style (pop styles) match (pop style)) - (when (cond ((stringp match) - ;; Regexp string match on the group name. - (string-match match gnus-newsgroup-name)) - ((or (symbolp match) - (gnus-functionp match)) - (cond ((gnus-functionp match) - ;; Function to be called. - (funcall match)) - ((boundp match) - ;; Variable to be checked. - (symbol-value match)))) - ((listp match) - ;; This is a form to be evaled. - (eval match))) + (when (cond + ((stringp match) + ;; Regexp string match on the group name. + (string-match match gnus-newsgroup-name)) + ((or (symbolp match) + (gnus-functionp match)) + (cond + ((gnus-functionp match) + ;; Function to be called. + (funcall match)) + ((boundp match) + ;; Variable to be checked. + (symbol-value match)))) + ((listp match) + ;; This is a form to be evaled. + (eval match))) ;; We have a match, so we set the variables. (while style (setq attribute (pop style) @@ -1164,16 +1174,17 @@ this is a reply." (message "Couldn't find attribute %s" (car attribute)) ;; We get the value. (setq value-value - (cond ((stringp value) - value) - ((or (symbolp value) - (gnus-functionp value)) - (cond ((gnus-functionp value) - (funcall value)) - ((boundp value) - (symbol-value value)))) - ((listp value) - (eval value)))) + (cond + ((stringp value) + value) + ((or (symbolp value) + (gnus-functionp value)) + (cond ((gnus-functionp value) + (funcall value)) + ((boundp value) + (symbol-value value)))) + ((listp value) + (eval value)))) (if variable ;; This is an ordinary variable. (set (make-local-variable variable) value-value) @@ -1202,7 +1213,7 @@ this is a reply." (while (setq val (pop gnus-message-style-insertions)) (when (cdr val) (insert (car val) ": " (cdr val) "\n")) - (gnus-pull (car val) gnus-message-style-insertions))))) + (gnus-pull (car val) gnus-message-style-insertions t))))) ;;; @ for MIME Edit mode diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index ccbbfd9..26dbb0d 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -148,6 +148,11 @@ please tell me so that we can list it." "Face to show xbm picons in." :group 'picons) +(defcustom gnus-picons-setup-hook nil + "Hook run in Picons buffers." + :group 'picons + :type 'hook) + ;;; Internal variables: (defvar gnus-picons-processes-alist nil @@ -184,9 +189,9 @@ arguments necessary for the job.") (defun gnus-get-buffer-name (variable) "Returns the buffer name associated with the contents of a variable." - (let ((buf (gnus-get-buffer-create (gnus-window-to-buffer-helper - (cdr - (assq variable gnus-window-to-buffer)))))) + (let ((buf (gnus-get-buffer-create + (gnus-window-to-buffer-helper + (cdr (assq variable gnus-window-to-buffer)))))) (and buf (buffer-name buf)))) @@ -203,8 +208,8 @@ arguments necessary for the job.") (defun gnus-picons-kill-buffer () (let ((buf (get-buffer (gnus-picons-buffer-name)))) - (if (buffer-live-p buf) - (kill-buffer buf)))) + (when (buffer-live-p buf) + (kill-buffer buf)))) (defun gnus-picons-setup-buffer () (let ((name (gnus-picons-buffer-name))) @@ -214,6 +219,7 @@ arguments necessary for the job.") (set-buffer (gnus-get-buffer-create name)) (buffer-disable-undo) (setq buffer-read-only t) + (run-hooks 'gnus-picons-setup-hook) (add-hook 'gnus-summary-prepare-exit-hook 'gnus-picons-kill-buffer)) (current-buffer)))) diff --git a/lisp/gnus.el b/lisp/gnus.el index a1e2d28..224ee1c 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -259,10 +259,10 @@ is restarted, and sometimes reloaded." (defconst gnus-product-name "T-gnus" "Product name of this version of gnus.") -(defconst gnus-version-number "6.10.048" +(defconst gnus-version-number "6.10.049" "Version number for this version of gnus.") -(defconst gnus-original-version-number "v0.63" +(defconst gnus-original-version-number "v0.64" "Version number for this version of Gnus.") (defconst gnus-original-product-name "Pterodactyl Gnus" diff --git a/lisp/message.el b/lisp/message.el index da59745..9752ad7 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1037,8 +1037,12 @@ The cdr of ech entry is a function for applying the face to a region.") "Coding system to encode outgoing mail.") (defvar message-draft-coding-system - (if (string-match "XEmacs\\|Lucid" emacs-version) - 'escape-quoted 'emacs-mule) + (cond + ((not (fboundp 'coding-system-p)) nil) + ((coding-system-p 'emacs-mule) 'emacs-mule) + ((coding-system-p 'escape-quoted) 'escape-quoted) + ((coding-system-p 'no-conversion) 'no-conversion) + (t nil)) "Coding system to compose mail.") (defvar message-default-charset 'iso-8859-1 @@ -2289,7 +2293,8 @@ the user from the mailer." (message-do-fcc) ;;(when (fboundp 'mail-hist-put-headers-into-history) ;; (mail-hist-put-headers-into-history)) - (run-hooks 'message-sent-hook) + (save-excursion + (run-hooks 'message-sent-hook)) (message "Sending...done") ;; Mark the buffer as unmodified and delete autosave. (set-buffer-modified-p nil) @@ -4772,7 +4777,7 @@ regexp varstr." ;; I really think this function should be renamed. It is only useful ;; for inserting file attachments. -(defun message-insert-mime-part (file type description) +(defun message-mime-attach-file (file type description) "Attach a file to the outgoing MIME message. The file is not inserted or encoded until you send the message with `\\[message-send-and-exit]' or `\\[message-send]'. diff --git a/lisp/mm-util.el b/lisp/mm-util.el index b7811b2..13b5fdd 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -249,7 +249,8 @@ See also `with-temp-file' and `with-output-to-string'." "Return a list of charsets in the region." (cond ((and (boundp 'enable-multibyte-characters) - enable-multibyte-characters) + enable-multibyte-characters + (fboundp 'find-charset-region)) (find-charset-region b e)) ((not (boundp 'current-language-environment)) (save-excursion diff --git a/lisp/mm-view.el b/lisp/mm-view.el index ccc513c..75cb51b 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -45,9 +45,7 @@ (w3-do-setup) (require 'url) (require 'w3-vars) - (condition-case () - (load "url-misc.el") - (error nil)) + (require 'url-vars) (setq mm-w3-setup t))) (defun mm-inline-text (handle) diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index d68c8c4..d5ae6f1 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.10.048 Manual +@settitle Semi-gnus 6.10.049 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.10.048 Manual +@title Semi-gnus 6.10.049 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.10.048 $B$KBP1~$7$^$9!#(B +$B$3$N@bL@=q$O(B Semi-gnus 6.10.049 $B$KBP1~$7$^$9!#(B @end ifinfo diff --git a/texi/gnus.texi b/texi/gnus.texi index 2acc1ae..bd0de82 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Semi-gnus 6.10.048 Manual +@settitle Semi-gnus 6.10.049 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.10.048 Manual +@title Semi-gnus 6.10.049 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.10.048. +This manual corresponds to Semi-gnus 6.10.049. @end ifinfo @@ -6613,7 +6613,9 @@ Treat overstrike (@code{gnus-article-treat-overstrike}). @cindex Latin 1 Treat M******** sm*rtq**t*s according to @code{gnus-article-dumbquotes-map} -(@code{gnus-article-treat-dumbquotes}). +(@code{gnus-article-treat-dumbquotes}). Note that this function guesses +whether a character is a sm*rtq**t* or not, so it should only be used +interactively. @item W w @kindex W w (Summary) @@ -15580,6 +15582,10 @@ Defaults to @code{t}. Ordered list of suffixes on picon file names to try. Defaults to @code{("xpm" "gif" "xbm")} minus those not builtin your XEmacs. +@item gnus-picons-setup-hook +@vindex gnus-picons-setup-hook +Hook run in the picon buffer, if that is displayed. + @item gnus-picons-display-article-move-p @vindex gnus-picons-display-article-move-p Whether to move point to first empty line when displaying picons. This diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 211fae9..625299c 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message-ja -@settitle Message 6.10.048 Manual +@settitle Message 6.10.049 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -60,7 +60,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Message 6.10.048 Manual +@title Message 6.10.049 Manual @author by Lars Magne Ingebrigtsen @translated by members of Semi-gnus mailing-list @@ -112,7 +112,7 @@ Gnus $B$NA4$F$N%a%C%;!<%8$N:n@.(B ($B%a!<%k$H%K%e!<%9$NN>J}(B) $B$O%a%C%;!< * Key Index:: $B%a%C%;!<%8%b!<%I%-!<$N0lMw!#(B @end menu -$B$3$N%^%K%e%"%k$O(B Message 6.10.048 $B$KBP1~$7$^$9!#(BMessage $B$O$3$N%^%K%e%"%k$H(B +$B$3$N%^%K%e%"%k$O(B Message 6.10.049 $B$KBP1~$7$^$9!#(BMessage $B$O$3$N%^%K%e%"%k$H(B $BF1$8HGHV9f$N(B Gnus $B$NG[I[$H6&$KG[I[$5$l$^$9!#(B diff --git a/texi/message.texi b/texi/message.texi index 9a7f820..33a376d 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Message 6.10.048 Manual +@settitle Message 6.10.049 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 Message 6.10.048 Manual +@title Message 6.10.049 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 Message 6.10.048. Message is +This manual corresponds to Message 6.10.049. Message is distributed with the Gnus distribution bearing the same version number as this manual. -- 1.7.10.4