From ff1ebe8ed969a1644ca81c39fdbb89521a0e2bb9 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Thu, 15 Nov 2012 13:35:22 +0900
Subject: [PATCH] update dired line moving functions

---
 emacs.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/emacs.el b/emacs.el
index 642d7d4..04aa6cd 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1290,11 +1290,12 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit."
   (if (> arg 0)
       (progn
         ;; (ignore 'my-dired-print-current-dir-and-file)
-        (forward-line -1)
-        (when (eq (line-number-at-pos)
+        (if (eq (line-number-at-pos)
                   1)
-          (goto-char (point-max)))
-        (my-dired-previous-line (if (dired-get-filename nil t)
+            (goto-char (point-max))
+          (forward-line -1))
+        (my-dired-previous-line (if (or (dired-get-filename nil t)
+                                        (dired-get-subdir))
                                     (- arg 1)
                                   arg)))
     (dired-move-to-filename)))
@@ -1305,11 +1306,12 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit."
   (if (> arg 0)
       (progn
         ;; (ignore 'my-dired-print-current-dir-and-file)
-        (forward-line 1)
-        (when (eq (point)
+        (if (eq (point)
                   (point-max))
-          (goto-char (point-min)))
-        (my-dired-next-line (if (dired-get-filename nil t)
+            (goto-char (point-min))
+          (forward-line 1))
+        (my-dired-next-line (if (or (dired-get-filename nil t)
+                                    (dired-get-subdir))
                                     (- arg 1)
                                   arg)))
     (dired-move-to-filename)))