Merge from trunk.

4 files changed, 15 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f03b9b97d5..93674179121 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-25  Deniz Dogan  <deniz@dogan.se>
+
+        * image.el (insert-image): Clarifying docstring.
+
 2011-07-24  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-barf-unless-okay): Return the value of
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 400abd51c27..f90e180b128 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-24  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnimap.el (nnimap-make-thread-query): Quote message-ids for gmail.
+
 2011-07-23  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnir.el (nnir-search-thread): New function to make an nnir group
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 8a0d635ef7b..52de48869d8 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1947,13 +1947,13 @@ textual parts.")
          (refs (split-string
                 (or (mail-header-references header)
                     "")))
-        (value
-         (format
-          "(OR HEADER REFERENCES %s HEADER Message-Id %s)"
-          id id)))
+         (value
+          (format
+           "(OR HEADER REFERENCES %S HEADER Message-Id %S)"
+           id id)))
     (dolist (refid refs value)
       (setq value (format
-                   "(OR (OR HEADER Message-Id %s HEADER REFERENCES %s) %s)"
+                   "(OR (OR HEADER Message-Id %S HEADER REFERENCES %S) %s)"
                    refid refid value)))))
 
 
diff --git a/lisp/image.el b/lisp/image.el
index c6862622639..30362251664 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -413,8 +413,8 @@ means display it in the right marginal area."
 (defun insert-image (image &optional string area slice)
   "Insert IMAGE into current buffer at point.
 IMAGE is displayed by inserting STRING into the current buffer
-with a `display' property whose value is the image.  STRING is
-defaulted if you omit it.
+with a `display' property whose value is the image.  STRING
+defaults to the empty string if you omit it.
 AREA is where to display the image.  AREA nil or omitted means
 display it in the text area, a value of `left-margin' means
 display it in the left marginal area, a value of `right-margin'