From 426db3fde8078af0efa339b9547118256201d487 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 3 Oct 2000 16:55:23 +0000 Subject: [PATCH] * nnweb.el (nnweb-decode-entities): Work for non-character entities. --- lisp/ChangeLog | 10 ++++++++++ lisp/dgnushack.el | 2 +- lisp/gnus-group.el | 4 +++- lisp/gnus-start.el | 8 ++++++-- lisp/gnus-sum.el | 4 +++- lisp/nntp.el | 16 ++++++++++++---- lisp/nnweb.el | 9 +++++---- 7 files changed, 40 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25e3e7efe..3b117604b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2000-10-03 19:55:55 Lars Magne Ingebrigtsen + + * nnweb.el (nnweb-decode-entities): Work for non-character + entities. + +2000-09-26 09:20:08 Lars Magne Ingebrigtsen + + * gnus.el: Message the quit parts. + 2000-10-03 08:08:29 ShengHuo ZHU * mail-source.el (mail-source-fetch-maildir): Don't insert @@ -202,6 +211,7 @@ (mm-inline-message): Test for `remove-specifier'; don't use condition-case. +>>>>>>> 5.672 2000-09-24 Simon Josefsson * nnimap.el (nnimap-request-accept-article): Remove From[^:] lines. diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index f0ce33cb6..cf1f003db 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -84,7 +84,7 @@ (require 'bytecomp) (push srcdir load-path) -;(push "/usr/share/emacs/site-lisp" load-path) +(push "/usr/share/emacs/site-lisp" load-path) (load (expand-file-name "lpath.el" srcdir) nil t) (defalias 'device-sound-enabled-p 'ignore) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 3d580d9e2..ef2f7fa2c 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1743,7 +1743,9 @@ Return the name of the group if selection was successful." (when (gnus-group-read-group t t group select-articles) group) ;;(error nil) - (quit nil))))) + (quit + (message "Quit reading the ephemeral group") + nil))))) (defun gnus-group-jump-to-group (group) "Jump to newsgroup GROUP." diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 078233373..0632a40a0 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1385,7 +1385,9 @@ newsgroup." (condition-case () (inline (gnus-request-group group dont-check method)) ;;(error nil) - (quit nil)) + (quit + (message "Quit activating %s" group) + nil)) (setq active (gnus-parse-active)) ;; If there are no articles in the group, the GROUP ;; command may have responded with the `(0 . 0)'. We @@ -1738,7 +1740,9 @@ newsgroup." (gnus-read-active-file-1 method force) ;; We catch C-g so that we can continue past servers ;; that do not respond. - (quit nil))))))) + (quit + (message "Quit reading the active file") + nil))))))) (defun gnus-read-active-file-1 (method force) (let (where mesg) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 589629ea3..bfb0d346e 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -4302,7 +4302,9 @@ If SELECT-ARTICLES, only select those articles from GROUP." (if (string-match "^[ \t]*$" input) number input))) (t number)) - (quit nil)))))) + (quit + (message "Quit getting the articles to read") + nil)))))) (setq select (if (stringp select) (string-to-number select) select)) (if (or (null select) (zerop select)) select diff --git a/lisp/nntp.el b/lisp/nntp.el index ffb681244..a12821901 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -351,7 +351,11 @@ noticing asynchronous data.") (t t))) (error (nnheader-report 'nntp "Couldn't open connection to %s: %s" - address err)))))) + address err)) + (quit + (message "Quit retrieving data from nntp") + (signal 'quit nil) + nil))))) (defsubst nntp-send-command (wait-for &rest strings) "Send STRINGS to server and wait until WAIT-FOR returns." @@ -799,8 +803,9 @@ If SEND-IF-FORCE, only send authinfo to the server if the (or passwd nntp-authinfo-password (setq nntp-authinfo-password - (mail-source-read-passwd (format "NNTP (%s@%s) password: " - user nntp-address)))))))))) + (mail-source-read-passwd + (format "NNTP (%s@%s) password: " + user nntp-address)))))))))) (defun nntp-send-nosy-authinfo () "Send the AUTHINFO to the nntp server." @@ -872,7 +877,10 @@ password contained in '~/.nntp-authinfo'." (coding-system-for-write nntp-coding-system-for-write)) (funcall nntp-open-connection-function pbuffer)) (error nil) - (quit nil)))) + (quit + (message "Quit opening connection") + (signal 'quit nil) + nil)))) (when timer (nnheader-cancel-timer timer)) (when (and (buffer-name pbuffer) diff --git a/lisp/nnweb.el b/lisp/nnweb.el index 5304a3e4b..1f36d00c4 100644 --- a/lisp/nnweb.el +++ b/lisp/nnweb.el @@ -721,16 +721,17 @@ and `altavista'.") "Decode all HTML entities." (goto-char (point-min)) (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t) - (replace-match (char-to-string - (if (eq (aref (match-string 1) 0) ?\#) + (let ((elem (if (eq (aref (match-string 1) 0) ?\#) (let ((c (string-to-number (substring (match-string 1) 1)))) (if (mm-char-or-char-int-p c) c 32)) (or (cdr (assq (intern (match-string 1)) w3-html-entities)) - ?#))) - t t))) + ?#)))) + (unless (stringp elem) + (setq elem (char-to-string elem))) + (replace-match elem t t)))) (defun nnweb-decode-entities-string (str) (with-temp-buffer -- 2.25.1