Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25e3e7e..3b11760 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-03 19:55:55  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnweb.el (nnweb-decode-entities): Work for non-character
+       entities. 
+
+2000-09-26 09:20:08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.el: Message the quit parts.
+
 2000-10-03 08:08:29  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * 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  <simon@josefsson.org>
 
        * nnimap.el (nnimap-request-accept-article): Remove From[^:] lines.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index b282734..bd3790c 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -132,6 +132,8 @@
        form))
    ))
 
+(push srcdir load-path)
+
 ;; `char-after' and `char-before' must be well-behaved before lpath.el
 ;; is loaded.  Because it requires `poe' via `path-util'.
 (load (expand-file-name "lpath.el" srcdir) nil t t)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 0e74cb9..405642c 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1751,7 +1751,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 1bdc275..2d2acd1 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1407,7 +1407,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
@@ -1760,7 +1762,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 2d1ed3d..f7b00bd 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4335,7 +4335,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 0db5cd2..e571061 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -390,7 +390,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."
@@ -887,8 +891,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."
@@ -957,7 +962,10 @@ password contained in '~/.nntp-authinfo'."
          (condition-case ()
              (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 de3bb7f..e318ae4 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -723,16 +723,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