[Emacs-diffs] /srv/bzr/emacs/trunk r101576: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101576
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-24 00:38:10 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-html.el (gnus-html-encode-url-chars): New function, that's an alias to 
browse-url-url-encode-chars if any.
  nnir.el: Silence the byte compiler.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el
  lisp/gnus/nnir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-23 23:14:02 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-24 00:38:10 +0000
@@ -1,3 +1,11 @@
+2010-09-24  Katsumi Yamaoka  <address@hidden>
+
+       * nnir.el: Silence the byte compiler.
+
+       * gnus-html.el (gnus-html-encode-url-chars): New function, that's an
+       alias to browse-url-url-encode-chars if any.
+       (gnus-html-encode-url): Use it.
+
 2010-09-23  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-start.el (gnus-use-backend-marks): New variable.

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-09-23 23:14:02 +0000
+++ b/lisp/gnus/gnus-html.el    2010-09-24 00:38:10 +0000
@@ -88,9 +88,27 @@
     (define-key map [tab] 'widget-forward)
     map))
 
+(eval-and-compile
+  (defalias 'gnus-html-encode-url-chars
+    (if (fboundp 'browse-url-url-encode-chars)
+       'browse-url-url-encode-chars
+      (lambda (text chars)
+       "URL-encode the chars in TEXT that match CHARS.
+CHARS is a regexp-like character alternative (e.g., \"[)$]\")."
+       (let ((encoded-text (copy-sequence text))
+             (s 0))
+         (while (setq s (string-match chars encoded-text s))
+           (setq encoded-text
+                 (replace-match (format "%%%x"
+                                        (string-to-char
+                                         (match-string 0 encoded-text)))
+                                t t encoded-text)
+                 s (1+ s)))
+         encoded-text)))))
+
 (defun gnus-html-encode-url (url)
   "Encode URL."
-  (browse-url-url-encode-chars url "[)$ ]"))
+  (gnus-html-encode-url-chars url "[)$ ]"))
 
 (defun gnus-html-cache-expired (url ttl)
   "Check if URL is cached for more than TTL."

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2010-09-23 23:14:02 +0000
+++ b/lisp/gnus/nnir.el 2010-09-24 00:38:10 +0000
@@ -956,6 +956,11 @@
 (autoload 'imap-search "imap")
 (autoload 'imap-quote-specials "imap")
 
+(eval-when-compile
+  (autoload 'nnimap-buffer "nnimap")
+  (autoload 'nnimap-command "nnimap")
+  (autoload 'nnimap-possibly-change-group "nnimap"))
+
 (defun nnir-run-imap (query srv &optional group-option)
   "Run a search against an IMAP back-end server.
 This uses a custom query language parser; see `nnir-imap-make-query' for