From e5bbcdb449f290a6249c0dd97726a573f2a9ab42 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 6 Dec 1998 22:09:40 +0000 Subject: [PATCH] Importing Pterodactyl Gnus v0.65. --- lisp/ChangeLog | 10 +++++ lisp/gnus-art.el | 18 ++------ lisp/gnus.el | 2 +- lisp/mailcap.el | 5 +-- lisp/mm-view.el | 1 + make.bat | 128 ++++++++++++++++++++++++++--------------------------- texi/gnus.texi | 6 +-- texi/message.texi | 6 +-- 8 files changed, 87 insertions(+), 89 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81df6b5..744da48 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +Sun Dec 6 19:36:53 1998 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.65 is released. + +1998-12-06 20:11:02 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-article-prepare-display): Don't init w3. + + * mm-view.el (mm-inline-text): Bind url-standalone-mode here. + Sat Dec 5 18:35:42 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.64 is released. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 4e60965..4369b36 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2287,9 +2287,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." (gnus-run-hooks 'gnus-tmp-internal-hook) (gnus-run-hooks 'gnus-article-prepare-hook) (when gnus-display-mime-function - (mm-setup-w3) - (let ((url-standalone-mode (not gnus-plugged))) - (funcall gnus-display-mime-function))) + (funcall gnus-display-mime-function)) ;; Perform the article display hooks. (gnus-run-hooks 'gnus-article-display-hook))) @@ -2386,9 +2384,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))) + (let ((data (get-text-property (point) 'gnus-data))) (mm-interactively-view-part data))) (defun gnus-mime-copy-part (&optional handle) @@ -2418,10 +2414,8 @@ 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)) (b (point)) buffer-read-only) (if (mm-handle-undisplayer data) @@ -2439,9 +2433,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) (mm-all-images-fit t) (rfc2047-default-charset gnus-newsgroup-default-charset) @@ -2454,9 +2446,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))) (mm-all-images-fit t) (rfc2047-default-charset gnus-newsgroup-default-charset) @@ -2595,9 +2585,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))) + (gnus-article-press-button)) (defun gnus-display-mime (&optional ihandles) "Insert MIME buttons in the buffer." diff --git a/lisp/gnus.el b/lisp/gnus.el index d9fd938..4477bae 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -254,7 +254,7 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "0.64" +(defconst gnus-version-number "0.65" "Version number for this version of Gnus.") (defconst gnus-version (format "Pterodactyl Gnus v%s" gnus-version-number) diff --git a/lisp/mailcap.el b/lisp/mailcap.el index 1145c64..a352f5b 100644 --- a/lisp/mailcap.el +++ b/lisp/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/mm-view.el b/lisp/mm-view.el index 75cb51b..0380cf3 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -69,6 +69,7 @@ (mm-setup-w3) (setq text (mm-get-part handle)) (let ((b (point)) + (url-standalone-mode t) (width (window-width))) (save-excursion (insert text) diff --git a/make.bat b/make.bat index c3c9e2e..b203277 100755 --- a/make.bat +++ b/make.bat @@ -1,64 +1,64 @@ -@echo off - -rem Written by David Charlap - -rem There are two catches, however. The emacs.bat batch file may not exist -rem in all distributions. It is part of the Voelker build of Emacs 19.34 -rem (http://www.cs.washington.edu/homes/voelker/ntemacs.html). If the user -rem installs Gnus with some other build, he may have to replace calls to -rem %1\emacs.bat with something else. -rem -rem Also, the emacs.bat file that Voelker ships does not accept more than 9 -rem parameters, so the attempts to compile the .texi files will fail. To -rem fix that (at least on NT. I don't know about Win95), the following -rem change should be made to emacs.bat: -rem -rem %emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9 -rem -rem should become -rem -rem %emacs_dir%\bin\emacs.exe %* -rem -rem which will allow the batch file to accept an unlimited number of -rem parameters. - -rem Clear PWD so emacs doesn't get confused -set GNUS_PWD_SAVE=%PWD% -set PWD= - -if "%1" == "" goto usage - -cd lisp -call %1\bin\emacs.bat -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile -if not "%2" == "copy" goto info -copy *.el* %1\lisp - -:info -cd ..\texi -call %1\bin\emacs.bat -batch -q -no-site-file gnus.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer -call %1\bin\emacs.bat -batch -q -no-site-file message.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer -if not "%2" == "copy" goto done -copy gnus %1\info -copy gnus-?? %1\info -copy message %1\info - -:etc -cd ..\etc -copy gnus-tut.txt %1\etc - -:done -cd .. -goto end - -:usage -echo Usage: make ^ [copy] -echo. -echo where: ^ is the directory you installed emacs in -echo eg. d:\emacs\19.34 -echo copy indicates that the compiled files should be copied to your -echo emacs lisp, info, and etc directories - -rem Restore PWD so whoever called this batch file doesn't get confused -set PWD=%GNUS_PWD_SAVE% -set GNUS_PWD_SAVE= -:end +@echo off + +rem Written by David Charlap + +rem There are two catches, however. The emacs.bat batch file may not exist +rem in all distributions. It is part of the Voelker build of Emacs 19.34 +rem (http://www.cs.washington.edu/homes/voelker/ntemacs.html). If the user +rem installs Gnus with some other build, he may have to replace calls to +rem %1\emacs.bat with something else. +rem +rem Also, the emacs.bat file that Voelker ships does not accept more than 9 +rem parameters, so the attempts to compile the .texi files will fail. To +rem fix that (at least on NT. I don't know about Win95), the following +rem change should be made to emacs.bat: +rem +rem %emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9 +rem +rem should become +rem +rem %emacs_dir%\bin\emacs.exe %* +rem +rem which will allow the batch file to accept an unlimited number of +rem parameters. + +rem Clear PWD so emacs doesn't get confused +set GNUS_PWD_SAVE=%PWD% +set PWD= + +if "%1" == "" goto usage + +cd lisp +call %1\bin\emacs.bat -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile +if not "%2" == "copy" goto info +copy *.el* %1\lisp + +:info +cd ..\texi +call %1\bin\emacs.bat -batch -q -no-site-file gnus.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer +call %1\bin\emacs.bat -batch -q -no-site-file message.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer +if not "%2" == "copy" goto done +copy gnus %1\info +copy gnus-?? %1\info +copy message %1\info + +:etc +cd ..\etc +copy gnus-tut.txt %1\etc + +:done +cd .. +goto end + +:usage +echo Usage: make ^ [copy] +echo. +echo where: ^ is the directory you installed emacs in +echo eg. d:\emacs\19.34 +echo copy indicates that the compiled files should be copied to your +echo emacs lisp, info, and etc directories + +rem Restore PWD so whoever called this batch file doesn't get confused +set PWD=%GNUS_PWD_SAVE% +set GNUS_PWD_SAVE= +:end diff --git a/texi/gnus.texi b/texi/gnus.texi index c04ee53..b1ed6de 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Pterodactyl Gnus 0.64 Manual +@settitle Pterodactyl Gnus 0.65 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.64 Manual +@title Pterodactyl Gnus 0.65 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.64. +This manual corresponds to Pterodactyl Gnus 0.65. @end ifinfo diff --git a/texi/message.texi b/texi/message.texi index ad1fa1f..7ef9c5a 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Pterodactyl Message 0.64 Manual +@settitle Pterodactyl Message 0.65 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.64 Manual +@title Pterodactyl Message 0.65 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.64. Message is +This manual corresponds to Pterodactyl Message 0.65. Message is distributed with the Gnus distribution bearing the same version number as this manual. -- 1.7.10.4