# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1258065478 0
# Node ID f4dc8b8f20d2e3a5c0c7ccebc34087238d4c01ac
# Parent  e28c9547f91d90f1d0adebe5bbc5a84995f7c18b
(dired-save-positions, dired-restore-positions): New funs.
(dired-revert): Use them (bug#4880).

diff -r e28c9547f91d -r f4dc8b8f20d2 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Nov 12 12:37:47 2009 +0000
+++ b/lisp/ChangeLog	Thu Nov 12 22:37:58 2009 +0000
@@ -1,3 +1,8 @@
+2009-11-12  Per Starbäck  <per@starback.se>  (tiny change)
+
+	* dired.el (dired-save-positions, dired-restore-positions): New funs.
+	(dired-revert): Use them (bug#4880).
+
 2009-11-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* tooltip.el (tooltip-frame-parameters): Undo previous change.
diff -r e28c9547f91d -r f4dc8b8f20d2 lisp/dired.el
--- a/lisp/dired.el	Thu Nov 12 12:37:47 2009 +0000
+++ b/lisp/dired.el	Thu Nov 12 22:37:58 2009 +0000
@@ -1104,8 +1104,7 @@
 Preserves old cursor, marks/flags, hidden-p."
   (widen)				; just in case user narrowed
   (let ((modflag (buffer-modified-p))
-	(opoint (point))
-	(ofile (dired-get-filename nil t))
+	(positions (dired-save-positions))
 	(mark-alist nil)		; save marked files
 	(hidden-subdirs (dired-remember-hidden))
 	(old-subdir-alist (cdr (reverse dired-subdir-alist))) ; except pwd
@@ -1125,9 +1124,7 @@
     ;; ... run the hook for the whole buffer, and only after markers
     ;; have been reinserted (else omitting in dired-x would omit marked files)
     (run-hooks 'dired-after-readin-hook)	; no need to narrow
-    (or (and ofile (dired-goto-file ofile)) ; move cursor to where it
-	(goto-char opoint))		; was before
-    (dired-move-to-filename)
+    (dired-restore-positions positions)
     (save-excursion			; hide subdirs that were hidden
       (dolist (dir hidden-subdirs)
 	(if (dired-goto-subdir dir)
@@ -1141,6 +1138,25 @@
 ;; Subroutines of dired-revert
 ;; Some of these are also used when inserting subdirs.
 
+(defun dired-save-positions ()
+  "Return the current positions in all windows displaying this dired buffer.
+The positions have the form (WINDOW FILENAME POINT)."
+  (mapcar (lambda (w)
+	    (list w
+		  (with-selected-window w
+		    (dired-get-filename nil t))
+		  (window-point w)))
+	  (get-buffer-window-list nil 0 t)))
+
+(defun dired-restore-positions (positions)
+  "Restore POSITIONS saved with `dired-save-positions'."
+  (dolist (win-file-pos positions)
+    (with-selected-window (car win-file-pos)
+      (unless (and (nth 1 win-file-pos)
+		   (dired-goto-file (nth 1 win-file-pos)))
+	(goto-char (nth 2 win-file-pos))
+	(dired-move-to-filename)))))
+
 (defun dired-remember-marks (beg end)
   "Return alist of files and their marks, from BEG to END."
   (if selective-display			; must unhide to make this work.