aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-11-08 21:04:43 +0000
committerDave Love2000-11-08 21:04:43 +0000
commitcd942edc7cebadd339775a22ee42eb900ebdd6a8 (patch)
tree6a52b166c098b098c74fbd80af760cf51eb688ce
parent62e8183ec88cde4cd8291f9e1e6110f37143aa90 (diff)
downloademacs-cd942edc7cebadd339775a22ee42eb900ebdd6a8.tar.gz
emacs-cd942edc7cebadd339775a22ee42eb900ebdd6a8.zip
2000-11-09 Lars Magne Ingebrigtsen <larsi@gnus.org>
* nnweb.el (nnweb-decode-entities): Work for non-character entities. 2000-10-08 10:59:13 ShengHuo ZHU <zsh@cs.rochester.edu> * nnweb.el (nnweb-url-retrieve-asynch): url-retrieve is asynchronous in Exp version.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/nnweb.el15
2 files changed, 16 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cc5446d2dca..adf3829a1b3 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
12000-11-09 Simon Josefsson <simon@josefsson.org>
2
3 * rfc2104.el: Add SHA-1 example.
4 (rfc2104-hexstring-to-bitstring): New function.
5 (rfc2104-hash): Use it.
6
12000-11-08 ShengHuo ZHU <zsh@cs.rochester.edu> 72000-11-08 ShengHuo ZHU <zsh@cs.rochester.edu>
2 8
3 * gnus-score.el (gnus-score-body): Don't score body when 9 * gnus-score.el (gnus-score-body): Don't score body when
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 54ed5a56fc8..c4ff7248e6b 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -350,9 +350,13 @@ and `altavista'.")
350 (setq url-current-callback-data data 350 (setq url-current-callback-data data
351 url-be-asynchronous t 351 url-be-asynchronous t
352 url-current-callback-func callback) 352 url-current-callback-func callback)
353 (url-retrieve url)) 353 (url-retrieve url nil))
354 (setq-default url-be-asynchronous old-asynch))) 354 (setq-default url-be-asynchronous old-asynch)))
355 355
356(if (fboundp 'url-retrieve-synchronously)
357 (defun nnweb-url-retrieve-asynch (url callback &rest data)
358 (url-retrieve url callback data)))
359
356;;; 360;;;
357;;; DejaNews functions. 361;;; DejaNews functions.
358;;; 362;;;
@@ -723,16 +727,17 @@ and `altavista'.")
723 "Decode all HTML entities." 727 "Decode all HTML entities."
724 (goto-char (point-min)) 728 (goto-char (point-min))
725 (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t) 729 (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
726 (replace-match (char-to-string 730 (let ((elem (if (eq (aref (match-string 1) 0) ?\#)
727 (if (eq (aref (match-string 1) 0) ?\#)
728 (let ((c 731 (let ((c
729 (string-to-number (substring 732 (string-to-number (substring
730 (match-string 1) 1)))) 733 (match-string 1) 1))))
731 (if (mm-char-or-char-int-p c) c 32)) 734 (if (mm-char-or-char-int-p c) c 32))
732 (or (cdr (assq (intern (match-string 1)) 735 (or (cdr (assq (intern (match-string 1))
733 w3-html-entities)) 736 w3-html-entities))
734 ?#))) 737 ?#))))
735 t t))) 738 (unless (stringp elem)
739 (setq elem (char-to-string elem)))
740 (replace-match elem t t))))
736 741
737(defun nnweb-decode-entities-string (str) 742(defun nnweb-decode-entities-string (str)
738 (with-temp-buffer 743 (with-temp-buffer