Merge from trunk.

11 files changed, 35 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c85cf769cb..5b9dc4d88b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, using build-aux to remove clutter.
         * m4/largefile.m4: New file, so that Emacs does not mess up when
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 8b0ed10cb3b..c934a3c1b57 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib.
         * notes/copyright: The files compile, config.guess, config.sub,
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 634ae719db7..ce25372c69b 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (install): install-sh is now in build-aux.
 
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fe624bb80ac..aff4dc7630c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
         to build-aux.
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'
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index f01a60333ad..1b737575d94 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
         from top level to build-aux/snippet.
diff --git a/src/ChangeLog b/src/ChangeLog
index 883c0d84bf6..dc81626038d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,13 @@
-2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (gl-stamp): move-if-change is now in build-aux.
 
+2011-07-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (compute_display_string_pos): Fix logic of caching
+        previous display string position.  Initialize cached_prev_pos to
+        -1.  Fixes slow-down at the beginning of a buffer.
+
 2011-07-24  Eli Zaretskii  <eliz@gnu.org>
 
         * xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
diff --git a/src/xdisp.c b/src/xdisp.c
index 8b164008c3f..7493fbff008 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3137,7 +3137,7 @@ next_overlay_change (EMACS_INT pos)
 /* Record one cached display string position found recently by
    compute_display_string_pos.  */
 static EMACS_INT cached_disp_pos;
-static EMACS_INT cached_prev_pos;
+static EMACS_INT cached_prev_pos = -1;
 static struct buffer *cached_disp_buffer;
 static int cached_disp_modiff;
 static int cached_disp_overlay_modiff;
@@ -3184,18 +3184,22 @@ compute_display_string_pos (struct text_pos *position,
           && BUF_MODIFF (b) == cached_disp_modiff
           && BUF_OVERLAY_MODIFF (b) == cached_disp_overlay_modiff)
         {
-          if (cached_prev_pos
+          if (cached_prev_pos >= 0
               && cached_prev_pos < charpos && charpos <= cached_disp_pos)
             return cached_disp_pos;
           /* Handle overstepping either end of the known interval.  */
           if (charpos > cached_disp_pos)
             cached_prev_pos = cached_disp_pos;
           else  /* charpos <= cached_prev_pos */
-            cached_prev_pos = max (charpos - 1, BEGV);
+            cached_prev_pos = max (charpos - 1, 0);
         }
 
       /* Record new values in the cache.  */
-      cached_disp_buffer = b;
+      if (b != cached_disp_buffer)
+        {
+          cached_disp_buffer = b;
+          cached_prev_pos = max (charpos - 1, 0);
+        }
       cached_disp_modiff = BUF_MODIFF (b);
       cached_disp_overlay_modiff = BUF_OVERLAY_MODIFF (b);
     }