# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1093889911 0
# Node ID 5ef78f4dd84f904440dc7593ff5589b22be4f815
# Parent  0d52d7d4bf25accd69b2d5fb1277dca6cfc6eaa4
[ Merge from Emacs trunk: ]

2004-08-30  Juanma Barranquero  <lektu@terra.es>

	* ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant.

	[Emacs/trunk 2003-02-18]

2004-08-30  Andreas Schwab  <schwab@suse.de>

	* nnlistserv.el (nnlistserv-kk-wash-article): Fix paren nesting.

	* gnus-score.el (gnus-summary-increase-score): Fix format string.

	[Emacs/trunk 2004-02-08]

2004-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>

	* nnimap.el (nnimap-demule): Avoid string-as-multibyte.

	[Emacs/trunk 2004-05-06]

2004-08-30  Kim F. Storm  <storm@cua.dk>

	* nntp.el (nntp-authinfo-file): Add :group 'nntp.

	* nnimap.el (nnimap-authinfo-file, nnimap-prune-cache):
	Add :group 'nnimap.

	[Emacs/trunk 2004-06-29]

diff -r 0d52d7d4bf25 -r 5ef78f4dd84f lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon Aug 23 14:13:39 2004 +0000
+++ b/lisp/gnus/ChangeLog	Mon Aug 30 18:18:31 2004 +0000
@@ -1,3 +1,32 @@
+2004-08-30  Juanma Barranquero  <lektu@terra.es>
+
+	* ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant.
+
+	[Emacs/trunk 2003-02-18]
+
+2004-08-30  Andreas Schwab  <schwab@suse.de>
+
+	* nnlistserv.el (nnlistserv-kk-wash-article): Fix paren nesting.
+
+	* gnus-score.el (gnus-summary-increase-score): Fix format string.
+
+	[Emacs/trunk 2004-02-08]
+	
+2004-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* nnimap.el (nnimap-demule): Avoid string-as-multibyte.
+
+	[Emacs/trunk 2004-05-06]
+
+2004-08-30  Kim F. Storm  <storm@cua.dk>
+
+	* nntp.el (nntp-authinfo-file): Add :group 'nntp.
+
+	* nnimap.el (nnimap-authinfo-file, nnimap-prune-cache):
+	Add :group 'nnimap.
+
+	[Emacs/trunk 2004-06-29]
+
 2004-08-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* mm-decode.el (mime-display, mime-security): Fix custom-manual
diff -r 0d52d7d4bf25 -r 5ef78f4dd84f lisp/gnus/gnus-score.el
--- a/lisp/gnus/gnus-score.el	Mon Aug 23 14:13:39 2004 +0000
+++ b/lisp/gnus/gnus-score.el	Mon Aug 30 18:18:31 2004 +0000
@@ -1,5 +1,5 @@
 ;;; gnus-score.el --- scoring code for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
@@ -627,7 +627,7 @@
 	      (gnus-score-insert-help "Match permanence" char-to-perm 2)))
 
 	  (gnus-score-kill-help-buffer)
-	  (if mimic (message "%c %c %c" prefix hchar tchar pchar)
+	  (if mimic (message "%c %c %c %c" prefix hchar tchar pchar)
 	    (message ""))
 	  (unless (setq temporary (cadr (assq pchar char-to-perm)))
 	    ;; Deal with der(r)ided superannuated paradigms.
diff -r 0d52d7d4bf25 -r 5ef78f4dd84f lisp/gnus/ietf-drums.el
--- a/lisp/gnus/ietf-drums.el	Mon Aug 23 14:13:39 2004 +0000
+++ b/lisp/gnus/ietf-drums.el	Mon Aug 30 18:18:31 2004 +0000
@@ -133,7 +133,7 @@
 	  (forward-sexp 1))
 	 ((eq c ?\()
 	  (forward-sexp 1))
-	 ((memq c '(? ?\t ?\n))
+	 ((memq c '(?\  ?\t ?\n))
 	  (delete-char 1))
 	 (t
 	  (forward-char 1))))
diff -r 0d52d7d4bf25 -r 5ef78f4dd84f lisp/gnus/nnimap.el
--- a/lisp/gnus/nnimap.el	Mon Aug 23 14:13:39 2004 +0000
+++ b/lisp/gnus/nnimap.el	Mon Aug 30 18:18:31 2004 +0000
@@ -1,5 +1,5 @@
 ;;; nnimap.el --- imap backend for Gnus
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
@@ -391,11 +391,13 @@
 					  (string :format "Login: %v"))
 				    (cons :format "%v"
 					  (const :format "" "password")
-					  (string :format "Password: %v")))))))
+					  (string :format "Password: %v"))))))
+  :group 'nnimap)
 
 (defcustom nnimap-prune-cache t
   "If non-nil, nnimap check whether articles still exist on server before using data stored in NOV cache."
-  :type 'boolean)
+  :type 'boolean
+  :group 'nnimap)
 
 (defvar nnimap-request-list-method 'imap-mailbox-list
   "Method to use to request a list of all folders from the server.
@@ -802,9 +804,12 @@
     (nnoo-status-message 'nnimap server)))
 
 (defun nnimap-demule (string)
-  (funcall (if (and (fboundp 'string-as-multibyte)
-		    (subrp (symbol-function 'string-as-multibyte)))
-	       'string-as-multibyte
+  ;; BEWARE: we used to use string-as-multibyte here which is braindead
+  ;; because it will turn accidental emacs-mule-valid byte sequences
+  ;; into multibyte chars.  --Stef
+  (funcall (if (and (fboundp 'string-to-multibyte)
+		    (subrp (symbol-function 'string-to-multibyte)))
+	       'string-to-multibyte
 	     'identity)
 	   (or string "")))
 
diff -r 0d52d7d4bf25 -r 5ef78f4dd84f lisp/gnus/nnlistserv.el
--- a/lisp/gnus/nnlistserv.el	Mon Aug 23 14:13:39 2004 +0000
+++ b/lisp/gnus/nnlistserv.el	Mon Aug 30 18:18:31 2004 +0000
@@ -1,6 +1,6 @@
 ;;; nnlistserv.el --- retrieving articles via web mailing list archives
 
-;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -122,7 +122,7 @@
     (mm-url-decode-entities)
     (while headers
       (goto-char (point-min))
-      (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers) nil t))
+      (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers)) nil t)
       (set (pop headers) (match-string 1)))
     (goto-char (point-min))
     (search-forward "<!-- body" nil t)