mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

Merge from trunk.

Browse Source
This commit is contained in:
Paul Eggert 2011-07-25 09:26:30 -07:00
commit ea8db5520c
11 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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

2
admin/ChangeLog
View File

@ -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,

2
leim/ChangeLog
View File

@ -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.

2
lib-src/ChangeLog
View File

@ -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.

4
lisp/ChangeLog
View File

@ -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

4
lisp/gnus/ChangeLog
View File

@ -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

10
lisp/gnus/nnimap.el
View File

@ -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)))))

4
lisp/image.el
View File

@ -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'

2
msdos/ChangeLog
View File

@ -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.

8
src/ChangeLog
View File

@ -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'

12
src/xdisp.c
View File

@ -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);
}