* nnheader.el (nnheader-parse-overview-file): New function.
(nnheader-write-overview-file): New function.
2002-01-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.el (gnus-group-fast-parameter): Check better if expansion
in wanted.
* nnweb.el (nnweb-type-definition): Clean up.
2002-01-21 Alastair Burt <burt@dfki.de>
* gnus-art.el (gnus-mm-display-part): Make sure that the summary
buffer exists before jumping to it.
2002-01-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-art.el (gnus-article-wash-html-with-w3): Made into own
function.
(article-wash-html): Use it.
(gnus-article-wash-function): New variable.
(gnus-article-wash-html-with-w3m): New function.
2002-01-20 Björn Torkelsson <torkel@acc.umu.se>
* dgnushack.el (dgnushack-compile): Compile smiley-ems for
XEmacs.
2002-01-20 John H. Palmieri <palmieri@math.washington.edu>
* gnus-fun.el (gnus-convert-image-to-gray-x-face): More standard
command line.
+2002-01-22 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * nnheader.el (nnheader-parse-overview-file): New function.
+ (nnheader-write-overview-file): New function.
+
+2002-01-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * gnus.el (gnus-group-fast-parameter): Check better if expansion
+ in wanted.
+
+ * nnweb.el (nnweb-type-definition): Clean up.
+
+2002-01-21 Alastair Burt <burt@dfki.de>
+
+ * gnus-art.el (gnus-mm-display-part): Make sure that the summary
+ buffer exists before jumping to it.
+
+2002-01-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * gnus-art.el (gnus-article-wash-html-with-w3): Made into own
+ function.
+ (article-wash-html): Use it.
+ (gnus-article-wash-function): New variable.
+ (gnus-article-wash-html-with-w3m): New function.
+
+2002-01-20 Bj\e,Av\e(Brn Torkelsson <torkel@acc.umu.se>
+
+ * dgnushack.el (dgnushack-compile): Compile smiley-ems for
+ XEmacs.
+
+2002-01-20 John H. Palmieri <palmieri@math.washington.edu>
+
+ * gnus-fun.el (gnus-convert-image-to-gray-x-face): More standard
+ command line.
+
2002-01-21 Simon Josefsson <jas@extundo.com>
* canlock.el (base64-encode-string): Autoload it from base64.
(setq files (delete "nnrss.el" files))))
(dolist (file
(if (featurep 'xemacs)
- '("md5.el" "smiley-ems.el")
+ '("md5.el")
'("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el" "smiley.el")))
(setq files (delete file files)))
:type 'string
:group 'mime-security)
+(defcustom gnus-article-wash-function 'gnus-article-wash-html-with-w3
+ "Function used for converting HTML into text."
+ :type '(radio (function-item gnus-article-wash-html-with-w3)
+ (function-item gnus-article-wash-html-with-w3m))
+ :group 'gnus-article)
+
;;; Internal variables
(defvar gnus-english-month-names
(save-window-excursion
(save-restriction
(narrow-to-region (point) (point-max))
- (mm-setup-w3)
- (let ((w3-strict-width (window-width))
- (url-standalone-mode t)
- (w3-honor-stylesheets nil)
- (w3-delay-image-loads t))
- (condition-case var
- (w3-region (point-min) (point-max))
- (error))))))))
-
+ (funcall gnus-article-wash-function))))))
+
+(defun gnus-article-wash-html-with-w3 ()
+ "Wash the current buffer with w3."
+ (mm-setup-w3)
+ (let ((w3-strict-width (window-width))
+ (url-standalone-mode t)
+ (w3-honor-stylesheets nil)
+ (w3-delay-image-loads t))
+ (condition-case var
+ (w3-region (point-min) (point-max))
+ (error))))
+
+(defun gnus-article-wash-html-with-w3m ()
+ "Wash the current buffer with w3m."
+ (shell-command-on-region
+ (point) (point-max) "w3m -T text/html" t t))
+
(defun article-hide-list-identifiers ()
"Remove list identifies from the Subject header.
The `gnus-list-identifiers' variable specifies what to do."
(let ((window (selected-window))
(mail-parse-charset gnus-newsgroup-charset)
(mail-parse-ignored-charsets
- (save-excursion (set-buffer gnus-summary-buffer)
- gnus-newsgroup-ignored-charsets)))
+ (if (gnus-buffer-live-p gnus-summary-buffer)
+ (save-excursion
+ (set-buffer gnus-summary-buffer)
+ gnus-newsgroup-ignored-charsets)
+ nil)))
(save-excursion
(unwind-protect
(let ((win (gnus-get-buffer-window (current-buffer) t))
(insert (if (zerop (logand bits mask)) "0 " "1 ")))
(shell-command-on-region
(point-min) (point-max)
- "pbmtoxbm | compface"
+ ;; the following is taken from xbmtoikon:
+ "pbmtoicon | sed '/^[ ]*[*\\\\/]/d; s/[ ]//g; s/,$//' | tr , '\\012' | sed 's/^0x//; s/^/0x/' | pr -l1 -t -w22 -3 -s, | sed 's/,*$/,/' | compface"
(current-buffer) t)
(push (buffer-string) x-faces))))
(dotimes (i (length x-faces))
("nnfolder" mail respool address)
("nngateway" post-mail address prompt-address physical-address)
("nnweb" none)
+ ("nngoogle" post)
("nnslashdot" post)
("nnultimate" none)
("nnrss" none)
symbol allow-list))
(when result
;; Expand if necessary.
- (if (and (stringp result) (string-match "\\\\" result))
+ (if (and (stringp result) (string-match "\\\\[0-9&]" result))
(setq result (gnus-expand-group-parameter (car head)
result group)))
;; Exit the loop early.
;;; Commentary:
-;; Jaap-Henk Hoepman (jhh@xs4all.nl):
-;;
-;; Added support for delayed destroy of external MIME viewers. All external
-;; viewers for mime types in mm-keep-viewer-alive-types will remain active
-;; after switching articles or groups, and will only be removed when exiting
-;; gnus.
-;;
-
;;; Code:
(require 'mail-parse)
(eval-when-compile (require 'cl))
(require 'mm-util)
+;;(require 'url)
+(require 'w3)
(eval-and-compile
(autoload 'executable-find "executable")
- (autoload 'url-insert-file-contents "url-handlers"))
+ ;;(autoload 'url-insert-file-contents "url-handlers")
+ (autoload 'url-insert-file-contents "url")
+ )
(defgroup mm-url nil
"A wrapper of url package and external url command for Gnus."
:group 'gnus)
-(defcustom mm-url-use-external (not
- (condition-case nil
- (require 'url-handlers)
- (error nil)))
+(defcustom mm-url-use-external nil
"*If not-nil, use external grab program `mm-url-program'."
:type 'boolean
:group 'mm-url)
(if (string-match "^file:/+" url)
(insert-file-contents (substring url (1- (match-end 0))))
(mm-url-insert-file-contents-external url))
- (require 'url-handlers)
+ ;;(require 'url-handlers)
(let ((name buffer-file-name))
(prog1
(url-insert-file-contents url)
(defun mm-url-fetch-form (url pairs)
"Fetch a form from URL with PAIRS as the data using the POST method."
- (require 'url-handlers)
+ ;;(require 'url-handlers)
(let ((url-request-data (mm-url-encode-www-form-urlencoded pairs))
(url-request-method "POST")
(url-request-extra-headers
t)
(defun mm-url-fetch-simple (url content)
- (require 'url-handlers)
+ ;;(require 'url-handlers)
(let ((url-request-data content)
(url-request-method "POST")
(url-request-extra-headers
(delete-char 1))
(forward-line 1)))
+(defun nnheader-parse-overview-file (file)
+ "Parse FILE and return a list of headers."
+ (mm-with-unibyte-buffer
+ (nnheader-insert-file-contents file)
+ (goto-char (point-min))
+ (let (headers)
+ (while (not (eobp))
+ (push (nnheader-parse-nov) headers)
+ (forward-line 1))
+ (nreverse headers))))
+
+(defun nnheader-write-overview-file (file headers)
+ "Write HEADERS to FILE."
+ (with-temp-file file
+ (mapcar 'nnheader-insert-nov headers)))
+
(defun nnheader-insert-header (header)
(insert
"Subject: " (or (mail-header-subject header) "(none)") "\n"
(or (funcall nnmail-split-methods)
'("bogus"))
(error
- (nnheader-message 5
- "Error in `nnmail-split-methods'; using `bogus' mail group")
+ (nnheader-message
+ 5 "Error in `nnmail-split-methods'; using `bogus' mail group")
(sit-for 1)
'("bogus")))))
(setq split (gnus-remove-duplicates split))
(let ((value (nth 1 split)))
(if (symbolp value)
(setq value (cdr (assq value nnmail-split-abbrev-alist))))
- ;; Someone might want to do a \N sub on this match, so get the
+ ;; Someone might want to do a \N sub on this match, so get the
;; correct match positions.
(re-search-backward value start-of-value))
(dolist (sp (nnmail-split-it (car split-rest)))
(require 'nnmail)
(require 'mm-util)
(require 'mm-url)
+(require 'url)
(autoload 'w3-parse-buffer "w3-parse")
(nnoo-declare nnweb)
and `altavista'.")
(defvar nnweb-type-definition
- '(
- (google
- ;;(article . nnweb-google-wash-article)
- ;;(id . "http://groups.google.com/groups?as_umsgid=%s")
+ '((google
(article . ignore)
(id . "http://groups.google.com/groups?selm=%s&output=gplain")
- ;;(reference . nnweb-google-reference)
(reference . identity)
(map . nnweb-google-create-mapping)
(search . nnweb-google-search)
(search . nnweb-google-search)
(address . "http://groups.google.com/groups")
(identifier . nnweb-google-identity))
-;;; (dejanews
-;;; (article . ignore)
-;;; (id . "http://search.dejanews.com/msgid.xp?MID=%s&fmt=text")
-;;; (map . nnweb-dejanews-create-mapping)
-;;; (search . nnweb-dejanews-search)
-;;; (address . "http://www.deja.com/=dnc/qs.xp")
-;;; (identifier . nnweb-dejanews-identity))
-;;; (dejanewsold
-;;; (article . ignore)
-;;; (map . nnweb-dejanews-create-mapping)
-;;; (search . nnweb-dejanewsold-search)
-;;; (address . "http://www.deja.com/dnquery.xp")
-;;; (identifier . nnweb-dejanews-identity))
(reference
(article . nnweb-reference-wash-article)
(map . nnweb-reference-create-mapping)