# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1265988937 0
# Node ID 88d0e81564e20945e0262f95b7875c858c344788
# Parent  1f72eef0d33f12d60db308602d9e91616b351a5c# Parent  8f56cb06f5284a952e92f8b9379fa455cd526204
Merge from mainline.

diff -r 1f72eef0d33f -r 88d0e81564e2 etc/NEWS
--- a/etc/NEWS	Thu Feb 11 10:21:09 2010 +0000
+++ b/etc/NEWS	Fri Feb 12 15:35:37 2010 +0000
@@ -273,6 +273,11 @@
 
 To disable this check, set compose-mail-user-agent-warnings to nil.
 
+** The default value of mail-interactive is t, since Emacs 23.1.
+(This was not announced at the time.)  It means that when sending mail,
+Emacs will wait for the process sending mail to return.  If you
+experience delays when sending mail, you may wish to set this to nil.
+
 ** nXML mode is now the default for editing XML files.
 
 ** Shell
diff -r 1f72eef0d33f -r 88d0e81564e2 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 11 10:21:09 2010 +0000
+++ b/lisp/ChangeLog	Fri Feb 12 15:35:37 2010 +0000
@@ -1,3 +1,10 @@
+2010-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* subr.el (copy-overlay): Handle deleted overlays.
+
+	* man.el (Man-completion-table): Don't signal an error if we can't run
+	manual-program (bug#4056).
+
 2010-02-10  Juanma Barranquero  <lekktu@gmail.com>
 
 	* textmodes/artist.el (artist-mt): Fix typos in docstring.
diff -r 1f72eef0d33f -r 88d0e81564e2 lisp/man.el
--- a/lisp/man.el	Thu Feb 11 10:21:09 2010 +0000
+++ b/lisp/man.el	Fri Feb 12 15:35:37 2010 +0000
@@ -771,8 +771,13 @@
           ;; quote anything.
           (let ((process-environment (copy-sequence process-environment)))
             (setenv "COLUMNS" "999") ;; don't truncate long names
-            (call-process manual-program nil '(t nil) nil
-                          "-k" (concat "^" prefix)))
+            ;; manual-program might not even exist.  And since it's
+            ;; run differently in Man-getpage-in-background, an error
+            ;; here may not necessarily mean that we'll also get an
+            ;; error later.
+            (ignore-errors
+              (call-process manual-program nil '(t nil) nil
+                            "-k" (concat "^" prefix))))
           (goto-char (point-min))
           (while (re-search-forward "^\\([^ \t\n]+\\)\\(?: ?\\((.+?)\\)\\(?:[ \t]+- \\(.*\\)\\)?\\)?" nil t)
             (push (propertize (concat (match-string 1) (match-string 2))
diff -r 1f72eef0d33f -r 88d0e81564e2 lisp/subr.el
--- a/lisp/subr.el	Thu Feb 11 10:21:09 2010 +0000
+++ b/lisp/subr.el	Fri Feb 12 15:35:37 2010 +0000
@@ -2232,10 +2232,14 @@
 
 (defun copy-overlay (o)
   "Return a copy of overlay O."
-  (let ((o1 (make-overlay (overlay-start o) (overlay-end o)
-			  ;; FIXME: there's no easy way to find the
-			  ;; insertion-type of the two markers.
-			  (overlay-buffer o)))
+  (let ((o1 (if (overlay-buffer o)
+                (make-overlay (overlay-start o) (overlay-end o)
+                              ;; FIXME: there's no easy way to find the
+                              ;; insertion-type of the two markers.
+                              (overlay-buffer o))
+              (let ((o1 (make-overlay (point-min) (point-min))))
+                (delete-overlay o1)
+                o1)))
 	(props (overlay-properties o)))
     (while props
       (overlay-put o1 (pop props) (pop props)))