Merge from trunk.

20 files changed, 145 insertions, 65 deletions

diff --git a/autogen/configure b/autogen/configure
index a6f85b66e53..f751caec1f5 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -11140,23 +11140,23 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.26" >&5
-$as_echo_n "checking for glib-2.0 >= 2.26... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26" >&5
+$as_echo_n "checking for gio-2.0 >= 2.26... " >&6; }
 
-        if $PKG_CONFIG --exists "glib-2.0 >= 2.26" 2>&5; then
+        if $PKG_CONFIG --exists "gio-2.0 >= 2.26" 2>&5; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5
 $as_echo_n "checking GSETTINGS_CFLAGS... " >&6; }
-            GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'`
+            GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'`
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5
 $as_echo "$GSETTINGS_CFLAGS" >&6; }
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5
 $as_echo_n "checking GSETTINGS_LIBS... " >&6; }
-            GSETTINGS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'`
+            GSETTINGS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'`
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5
 $as_echo "$GSETTINGS_LIBS" >&6; }
         else
@@ -11166,7 +11166,7 @@ $as_echo "no" >&6; }
             GSETTINGS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.26"`
+            GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= 2.26"`
 
         fi
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9687f474286..38cbaafa45d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * widget.texi (Setting Up the Buffer): Remove mention of the
+        global keymap parent, which doesn't seem to be accurate
+        (bug#7045).
+
 2010-07-10  Kevin Ryde  <user42@zip.com.au>
 
         * cl.texi (For Clauses): Add destructuring example processing an
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index c4f5317e5a7..a778f491e76 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -450,7 +450,6 @@ There is a standard widget keymap which you might find useful.
 @findex widget-button-press
 @findex widget-button-click
 @defvr Const widget-keymap
-A keymap with the global keymap as its parent.@*
 @key{TAB} and @kbd{C-@key{TAB}} are bound to @code{widget-forward} and
 @code{widget-backward}, respectively.  @key{RET} and @kbd{Mouse-2}
 are bound to @code{widget-button-press} and
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d652931328..088323ee871 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,42 @@
+2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * rect.el (apply-on-rectangle): Return the point after the last
+        operation.
+        (string-rectangle): Go to the point after the last operation
+        (bug#7522).
+
+        * simple.el (current-kill): Clarify what
+        `interprogram-paste-function' does (bug#7500).
+
+        * printing.el (pr-toggle-region): Clarify the documentation
+        slightly (bug#7493).
+
+        * time.el (display-time-update): Allow
+        `display-time-mail-function' to return nil (bug#7158).  Fix
+        suggested by Detlev Zundel.
+
+        * vc/diff.el (diff): Clarify the order the file names are read
+        (bug#7111).
+
+        * mouse.el (mouse-set-region): Link to `mouse-drag-copy-region' in
+        the doc string (bug#7015).
+
+        * font-lock.el (font-lock-maximum-decoration): Mention what
+        numeric levels mean (bug#6935).
+
+        * startup.el (initial-buffer-choice): Don't mention the `none'
+        selection, which is against policy.
+
+2011-07-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-normalize-special): Replace
+        `dedicated' by `dedicate' to dedicate window (Bug#9072).
+
+2011-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (version<, version<=, version=): Mention "-CVS" and
+        "-12345" alpha version numbers.
+
 2011-07-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * bindings.el: Add advertised binding for set-mark-command
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6c76142c59d..6902ce98ab1 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -254,6 +254,7 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
 If nil, use the default decoration (typically the minimum available).
 If t, use the maximum decoration available.
 If a number, use that level of decoration (or if not available the maximum).
+The higher the number, the more decoration is done.
 If a list, each element should be a cons pair of the form (MAJOR-MODE . LEVEL),
 where MAJOR-MODE is a symbol or t (meaning the default).  For example:
  ((c-mode . t) (c++-mode . 2) (t . 1))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f780cf7b9f0..7c887dc5450 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-14  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnimap.el (nnimap-request-thread): Ensure search is performed in
+        correct group.
+
+        * gnus-int.el (gnus-request-thread): Add group argument.
+
+        * gnus-sum.el (gnus-request-thread): Use it.
+
 2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): `debbugs-*'
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index ef15a479892..b9b191cd09c 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -516,11 +516,12 @@ If BUFFER, insert the article in that group."
              article (gnus-group-real-name group)
              (nth 1 gnus-command-method) buffer)))
 
-(defun gnus-request-thread (header)
+(defun gnus-request-thread (header group)
   "Request the headers in the thread containing the article specified by HEADER."
-  (let ((gnus-command-method (gnus-find-method-for-group gnus-newsgroup-name)))
+  (let ((gnus-command-method (gnus-find-method-for-group group)))
     (funcall (gnus-get-function gnus-command-method 'request-thread)
-             header)))
+             header
+             (gnus-group-real-name group))))
 
 (defun gnus-warp-to-article ()
   "Warps from an article in a virtual group to the article in its
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 798ae964460..5a817e12104 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8970,7 +8970,7 @@ variable."
            'list gnus-newsgroup-headers
            (if (gnus-check-backend-function
                 'request-thread gnus-newsgroup-name)
-               (gnus-request-thread header)
+               (gnus-request-thread header gnus-newsgroup-name)
              (let* ((last (if (numberp limit)
                               (min (+ (mail-header-number header)
                                       limit)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 43a3cbd859d..ef5bee71629 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1565,8 +1565,9 @@ textual parts.")
 (declare-function gnus-fetch-headers "gnus-sum"
                   (articles &optional limit force-new dependencies))
 
-(deffoo nnimap-request-thread (header)
-  (let* ((id (mail-header-id header))
+(deffoo nnimap-request-thread (header &optional group server)
+  (when (nnimap-possibly-change-group group server)
+      (let* ((id (mail-header-id header))
          (refs (split-string
                 (or (mail-header-references header)
                     "")))
@@ -1584,7 +1585,7 @@ textual parts.")
       (gnus-fetch-headers
        (and (car result) (delete 0 (mapcar #'string-to-number
                                            (cdr (assoc "SEARCH" (cdr result))))))
-       nil t))))
+       nil t)))))
 
 (defun nnimap-possibly-change-group (group server)
   (let ((open-result t))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 4de3e175a4a..63395619f44 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -687,7 +687,9 @@ This should be bound to a mouse click event type."
 
 (defun mouse-set-region (click)
   "Set the region to the text dragged over, and copy to kill ring.
-This should be bound to a mouse drag event."
+This should be bound to a mouse drag event.
+See the `mouse-drag-copy-region' variable to control whether this
+command alters the kill ring or not."
   (interactive "e")
   (mouse-minibuffer-check click)
   (select-window (posn-window (event-start click)))
diff --git a/lisp/printing.el b/lisp/printing.el
index 76fdeaec500..9f98c2b6e29 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -4611,7 +4611,7 @@ bottom."
 
 ;;;###autoload
 (defun pr-toggle-region ()
-  "Toggle auto region."
+  "Toggle whether the region is automagically detected."
   (interactive)
   (pr-toggle-region-menu t))
 
diff --git a/lisp/rect.el b/lisp/rect.el
index ad914cab7d2..0756ec3bc0a 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -93,8 +93,9 @@ Point is at the end of the segment of this line within the rectangle."
   "Call FUNCTION for each line of rectangle with corners at START, END.
 FUNCTION is called with two arguments: the start and end columns of the
 rectangle, plus ARGS extra arguments.  Point is at the beginning of line when
-the function is called."
-  (let (startcol startpt endcol endpt)
+the function is called.
+The final point after the last operation will be returned."
+  (let (startcol startpt endcol endpt final-point)
     (save-excursion
       (goto-char start)
       (setq startcol (current-column))
@@ -112,8 +113,9 @@ the function is called."
       (goto-char startpt)
       (while (< (point) endpt)
         (apply function startcol endcol args)
+        (setq final-point (point))
         (forward-line 1)))
-    ))
+    final-point))
 
 (defun delete-rectangle-line (startcol endcol fill)
   (when (= (move-to-column startcol (if fill t 'coerce)) startcol)
@@ -323,7 +325,8 @@ Called from a program, takes three args; START, END and STRING."
                                 (or (car string-rectangle-history) ""))
                         nil 'string-rectangle-history
                         (car string-rectangle-history)))))
-  (apply-on-rectangle 'string-rectangle-line start end string t))
+  (goto-char
+   (apply-on-rectangle 'string-rectangle-line start end string t)))
 
 ;;;###autoload
 (defalias 'replace-rectangle 'string-rectangle)
diff --git a/lisp/startup.el b/lisp/startup.el
index 66deb11623a..6953ed25ed4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -43,14 +43,12 @@
 If the value is nil and `inhibit-startup-screen' is nil, show the
 startup screen.  If the value is string, visit the specified file
 or directory using `find-file'.  If t, open the `*scratch*'
-buffer.  If `none', don't select anything, but show the
-buffer (if any) selected by the startup file."
+buffer."
   :type '(choice
           (const     :tag "Startup screen" nil)
           (directory :tag "Directory" :value "~/")
           (file      :tag "File" :value "~/.emacs")
-          (const     :tag "Lisp scratch buffer" t)
-          (const     :tag "Select no buffer" 'none))
+          (const     :tag "Lisp scratch buffer" t))
   :version "23.1"
   :group 'initialization)
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 5c890eefa29..94b28c007d1 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4087,7 +4087,8 @@ If all LST elements are zeros or LST is nil, return zero."
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
 etc.  That is, the trailing \".0\"s are insignificant.  Also, version
 string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
-which is higher than \"1alpha\"."
+which is higher than \"1alpha\".  Also, \"-CVS\" and \"-NNN\" are treated
+as alpha versions."
   (version-list-< (version-to-list v1) (version-to-list v2)))
 
 
@@ -4097,7 +4098,8 @@ which is higher than \"1alpha\"."
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
 etc.  That is, the trailing \".0\"s are insignificant.  Also, version
 string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
-which is higher than \"1alpha\"."
+which is higher than \"1alpha\".  Also, \"-CVS\" and \"-NNN\" are treated
+as alpha versions."
   (version-list-<= (version-to-list v1) (version-to-list v2)))
 
 (defun version= (v1 v2)
@@ -4106,7 +4108,8 @@ which is higher than \"1alpha\"."
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
 etc.  That is, the trailing \".0\"s are insignificant.  Also, version
 string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
-which is higher than \"1alpha\"."
+which is higher than \"1alpha\".  Also, \"-CVS\" and \"-NNN\" are treated
+as alpha versions."
   (version-list-= (version-to-list v1) (version-to-list v2)))
 
 
diff --git a/lisp/time.el b/lisp/time.el
index 7d752c85d4d..b158ef64691 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -423,30 +423,31 @@ update which can wait for the next redisplay."
                               (getenv "MAIL")
                               (concat rmail-spool-directory
                                       (user-login-name))))
-         (mail (or (and display-time-mail-function
-                        (funcall display-time-mail-function))
-                   (and display-time-mail-directory
-                        (display-time-mail-check-directory))
-                   (and (stringp mail-spool-file)
-                        (or (null display-time-server-down-time)
-                            ;; If have been down for 20 min, try again.
-                            (> (- (nth 1 now) display-time-server-down-time)
-                               1200)
-                            (and (< (nth 1 now) display-time-server-down-time)
-                                 (> (- (nth 1 now)
-                                       display-time-server-down-time)
-                                    -64336)))
-                        (let ((start-time (current-time)))
-                          (prog1
-                              (display-time-file-nonempty-p mail-spool-file)
-                            (if (> (- (nth 1 (current-time))
-                                      (nth 1 start-time))
-                                   20)
-                                ;; Record that mail file is not accessible.
-                                (setq display-time-server-down-time
-                                      (nth 1 (current-time)))
-                              ;; Record that mail file is accessible.
-                              (setq display-time-server-down-time nil)))))))
+         (mail (cond
+                (display-time-mail-function
+                 (funcall display-time-mail-function))
+                (display-time-mail-directory
+                 (display-time-mail-check-directory))
+                ((and (stringp mail-spool-file)
+                      (or (null display-time-server-down-time)
+                          ;; If have been down for 20 min, try again.
+                          (> (- (nth 1 now) display-time-server-down-time)
+                             1200)
+                          (and (< (nth 1 now) display-time-server-down-time)
+                               (> (- (nth 1 now)
+                                     display-time-server-down-time)
+                                  -64336))))
+                 (let ((start-time (current-time)))
+                   (prog1
+                       (display-time-file-nonempty-p mail-spool-file)
+                     (if (> (- (nth 1 (current-time))
+                               (nth 1 start-time))
+                            20)
+                         ;; Record that mail file is not accessible.
+                         (setq display-time-server-down-time
+                               (nth 1 (current-time)))
+                       ;; Record that mail file is accessible.
+                       (setq display-time-server-down-time nil)))))))
          (24-hours (substring time 11 13))
          (hour (string-to-number 24-hours))
          (12-hours (int-to-string (1+ (% (+ hour 11) 12))))
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 9655ce64a99..fd24558da6a 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -76,10 +76,10 @@ delete the temporary files so named."
 ;;;###autoload
 (defun diff (old new &optional switches no-async)
   "Find and display the differences between OLD and NEW files.
-When called interactively, read OLD and NEW using the minibuffer;
-the default for NEW is the current buffer's file name, and the
-default for OLD is a backup file for NEW, if one exists.
-If NO-ASYNC is non-nil, call diff synchronously.
+When called interactively, read NEW, then OLD, using the
+minibuffer.  The default for NEW is the current buffer's file
+name, and the default for OLD is a backup file for NEW, if one
+exists.  If NO-ASYNC is non-nil, call diff synchronously.
 
 When called interactively with a prefix argument, prompt
 interactively for diff switches.  Otherwise, the switches
diff --git a/lisp/window.el b/lisp/window.el
index 593fa14d215..0302a672521 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5317,12 +5317,12 @@ user preferences expressed in `display-buffer-alist'."
        (unless display-buffer-mark-dedicated
          ;; Don't make anything created above dedicated unless requested.
          ;; Otherwise the dedication request below gets in our way.
-         '((dedicated . nil)))
+         '((dedicate . nil)))
        `((pop-up-frame t)
          ,(append '(pop-up-frame-alist)
                   (when (listp args) args)
                   special-display-frame-alist)
-         (dedicated . t))))))
+         (dedicate . t))))))
 
 (defun display-buffer-normalize-default (buffer-or-name)
   "Subroutine of `display-buffer-normalize-specifiers'.
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));
 }