# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1266048910 0
# Node ID 21e3344fd9bc4c13fb63aee08e36d15f74042ec6
# Parent  88d0e81564e20945e0262f95b7875c858c344788# Parent  00c6bb12d924a57229bd40cb42bd3131e10187f8
Merge from mainline.

diff -r 88d0e81564e2 -r 21e3344fd9bc lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 12 15:35:37 2010 +0000
+++ b/lisp/ChangeLog	Sat Feb 13 08:15:10 2010 +0000
@@ -1,3 +1,12 @@
+2010-02-12  Juri Linkov  <juri@jurta.org>
+
+	* arc-mode.el (archive-unique-fname): Make directories for nested
+	archives.  (Bug#5540)
+
+2010-02-12  Juri Linkov  <juri@jurta.org>
+
+	* ffap.el (dired-at-point): Fix docstring.  (Bug#5565)
+
 2010-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* subr.el (copy-overlay): Handle deleted overlays.
diff -r 88d0e81564e2 -r 21e3344fd9bc lisp/arc-mode.el
--- a/lisp/arc-mode.el	Fri Feb 12 15:35:37 2010 +0000
+++ b/lisp/arc-mode.el	Sat Feb 13 08:15:10 2010 +0000
@@ -834,6 +834,11 @@
 	  ;; reconstructed in the temporary directory.
 	  (make-directory (file-name-directory tmpfile) t)
 	  (make-temp-file tmpfile))
+      ;; Maked sure all the leading directories in `fullname' exist
+      ;; under archive-tmpdir.  This is necessary for nested archives
+      ;; (`archive-extract' sets `archive-remote' to t in case
+      ;; an archive occurs inside another archive).
+      (make-directory (file-name-directory fullname) t)
       fullname)))
 
 (defun archive-maybe-copy (archive)
diff -r 88d0e81564e2 -r 21e3344fd9bc lisp/ffap.el
--- a/lisp/ffap.el	Fri Feb 12 15:35:37 2010 +0000
+++ b/lisp/ffap.el	Sat Feb 13 08:15:10 2010 +0000
@@ -1796,7 +1796,8 @@
 
 ;;;###autoload
 (defun dired-at-point (&optional filename)
-  "Start Dired, defaulting to file at point.  See `ffap'."
+  "Start Dired, defaulting to file at point.  See `ffap'.
+If `dired-at-point-require-prefix' is set, the prefix meaning is reversed."
   (interactive)
   (if (and (called-interactively-p 'interactive)
 	   (if dired-at-point-require-prefix