Merge from trunk.

3 files changed, 25 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f1670d1db06..e0de5edda9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -119,7 +119,7 @@
         * bidi.c: Integer signedness and overflow fixes.
         (bidi_cache_idx, bidi_cache_last_idx, bidi_cache_fetch_state)
         (bidi_cache_search, bidi_cache_find_level_change)
-p       (bidi_cache_iterator_state, bidi_cache_find)
+        (bidi_cache_iterator_state, bidi_cache_find)
         (bidi_find_other_level_edge, bidi_dump_cached_states):
         Don't arbitrarily limit cache indexes to int; use ptrdiff_t instead.
         (bidi_cache_size): Use ptrdiff_t rather than size_t, as we prefer
@@ -193,6 +193,16 @@ p	(bidi_cache_iterator_state, bidi_cache_find)
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * editfns.c (Fdelete_region): Clarify the use of the named
+        parameters (bug#6788).
+
+2011-07-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * indent.c (Fvertical_motion): Set and restore w->pointm when
+        saving and restoring the window's buffer (Bug#9006).
+
 2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * editfns.c (Fstring_to_char): Clarify just what is returned
diff --git a/src/editfns.c b/src/editfns.c
index 6aba319d5b2..18fefa5e3b5 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3160,10 +3160,9 @@ It returns the number of characters changed.  */)
 }
 
 DEFUN ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r",
-       doc: /* Delete the text between point and mark.
-
-When called from a program, expects two arguments,
-positions (integers or markers) specifying the stretch to be deleted.  */)
+       doc: /* Delete the text between START and END.
+If called interactively, delete the region between point and mark.
+This command deletes buffer text without modifying the kill ring.  */)
   (Lisp_Object start, Lisp_Object end)
 {
   validate_region (&start, &end);
diff --git a/src/indent.c b/src/indent.c
index 5c5966175aa..02eeb7f17d4 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1985,7 +1985,8 @@ whether or not it is currently displayed in some window.  */)
   struct text_pos pt;
   struct window *w;
   Lisp_Object old_buffer;
-  struct gcpro gcpro1;
+  EMACS_INT old_charpos, old_bytepos;
+  struct gcpro gcpro1, gcpro2, gcpro3;
   Lisp_Object lcols = Qnil;
   double cols IF_LINT (= 0);
 
@@ -2005,12 +2006,16 @@ whether or not it is currently displayed in some window.  */)
   w = XWINDOW (window);
 
   old_buffer = Qnil;
-  GCPRO1 (old_buffer);
+  GCPRO3 (old_buffer, old_charpos, old_bytepos);
   if (XBUFFER (w->buffer) != current_buffer)
     {
       /* Set the window's buffer temporarily to the current buffer.  */
       old_buffer = w->buffer;
+      old_charpos = XMARKER (w->pointm)->charpos;
+      old_bytepos = XMARKER (w->pointm)->bytepos;
       XSETBUFFER (w->buffer, current_buffer);
+      set_marker_both
+        (w->pointm, w->buffer, BUF_PT (current_buffer), BUF_PT_BYTE (current_buffer));
     }
 
   if (noninteractive)
@@ -2131,7 +2136,10 @@ whether or not it is currently displayed in some window.  */)
     }
 
   if (BUFFERP (old_buffer))
-    w->buffer = old_buffer;
+    {
+      w->buffer = old_buffer;
+      set_marker_both (w->pointm, w->buffer, old_charpos, old_bytepos);
+    }
 
   RETURN_UNGCPRO (make_number (it.vpos));
 }