Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-512

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 101-102)

   - Update from CVS

2005-08-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>

   * lisp/gnus/gnus-art.el (article-unsplit-urls): Don't anchor urls to the
   start of the lines.
   (gnus-picon-databases): Add /usr/share/picons.

2005-08-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp): New variable
   taken from `gnus-button-mid-or-mail-regexp'.
   (gnus-button-mid-or-mail-regexp, gnus-button-alist): Use it.
   (gnus-button-alist): Improve regexp for domain part of the MIDs
   for news:localpart@domain buttons.
   (gnus-button-ctan-directory-regexp): Update.

   * lisp/gnus/message.el (message-kill-buffer): Raise the current frame.
   (message-bury): Use `window-dedicated-p'.

2005-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/sieve-manage.el (sieve-manage-interactive-login): Use
   make-local-variable rather than make-variable-buffer-local.
   (sieve-manage-open): Ditto.
   (sieve-manage-authenticate): Ditto.

1 files changed, 6 insertions, 6 deletions

diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 2afa49c79a7..5c0712420a0 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -1,5 +1,5 @@
 ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
-;; Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -184,8 +184,8 @@ LOGINFUNC is passed a username and a password, it should return t if
 it where sucessful authenticating itself to the server, nil otherwise.
 Returns t if login was successful, nil otherwise."
   (with-current-buffer buffer
-    (make-variable-buffer-local 'sieve-manage-username)
-    (make-variable-buffer-local 'sieve-manage-password)
+    (make-local-variable 'sieve-manage-username)
+    (make-local-variable 'sieve-manage-password)
     (let (user passwd ret reason)
       ;;      (condition-case ()
       (while (or (not user) (not passwd))
@@ -370,7 +370,7 @@ Optional variable BUFFER is buffer (buffer, or string naming buffer)
 to work in."
   (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000))))
   (with-current-buffer (get-buffer-create buffer)
-    (mapcar 'make-variable-buffer-local sieve-manage-local-variables)
+    (mapcar 'make-local-variable sieve-manage-local-variables)
     (sieve-manage-disable-multibyte)
     (buffer-disable-undo)
     (setq sieve-manage-server (or server sieve-manage-server))
@@ -458,8 +458,8 @@ password is remembered in the buffer."
   (with-current-buffer (or buffer (current-buffer))
     (if (not (eq sieve-manage-state 'nonauth))
 	(eq sieve-manage-state 'auth)
-      (make-variable-buffer-local 'sieve-manage-username)
-      (make-variable-buffer-local 'sieve-manage-password)
+      (make-local-variable 'sieve-manage-username)
+      (make-local-variable 'sieve-manage-password)
       (if user (setq sieve-manage-username user))
       (if passwd (setq sieve-manage-password passwd))
       (if (funcall (nth 2 (assq sieve-manage-auth