From 7fb3afa55c811660367e3b4e6cc6dccc808a9932 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Mon, 30 Aug 2004 18:13:58 +0000 Subject: [PATCH] [ Merge from Emacs (gnus-5_10-branch): ] 2004-08-30 Juanma Barranquero * ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant. 2004-08-30 Stefan Monnier * nnimap.el (nnimap-demule): Avoid string-as-multibyte. 2004-08-30 Kim F. Storm * nntp.el (nntp-authinfo-file): Add :group 'nntp. * nnimap.el (nnimap-authinfo-file, nnimap-prune-cache): Add :group 'nnimap. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/ietf-drums.el | 2 +- lisp/nnimap.el | 17 +++++++++++------ lisp/nnlistserv.el | 2 +- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff64a2d50..221cd13c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2004-08-30 Juanma Barranquero + + * ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant. + +2004-08-30 Stefan Monnier + + * nnimap.el (nnimap-demule): Avoid string-as-multibyte. + +2004-08-30 Kim F. Storm + + * nntp.el (nntp-authinfo-file): Add :group 'nntp. + + * nnimap.el (nnimap-authinfo-file, nnimap-prune-cache): + Add :group 'nnimap. + 2004-08-30 Simon Josefsson * rfc2231.el (rfc2231-parse-string): Restore whitespace syntax for diff --git a/lisp/ietf-drums.el b/lisp/ietf-drums.el index d21c6e670..645a79ad5 100644 --- a/lisp/ietf-drums.el +++ b/lisp/ietf-drums.el @@ -143,7 +143,7 @@ backslash and doublequote.") (forward-sexp 1)) ((eq c ?\() (forward-sexp 1)) - ((memq c '(? ?\t ?\n)) + ((memq c '(?\ ?\t ?\n)) (delete-char 1)) (t (forward-char 1)))) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index e5a4529c5..43b96c4ab 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -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 @@ -391,11 +391,13 @@ just like \"ticked\" articles, in other IMAP clients.") (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. @@ -845,9 +847,12 @@ function is generally only called when Gnus is shutting down." (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 --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el index 068621713..770bb02d0 100644 --- a/lisp/nnlistserv.el +++ b/lisp/nnlistserv.el @@ -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 ;; Keywords: news, mail -- 2.25.1