[Qemacs-commit] qemacs qe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        16/06/07 06:50:44

Modified files:
        .              : qe.c 

Log message:
        dired: load directories in dired pane

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.223&r2=1.224

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- qe.c        27 May 2016 18:20:30 -0000      1.223
+++ qe.c        7 Jun 2016 06:50:44 -0000       1.224
@@ -6302,9 +6302,19 @@
     EOLType eol_type = EOL_UNIX;
     QECharset *charset = &charset_utf8;
 
+    if (load_resource) {
+        if (find_resource_file(filename, sizeof(filename), filename1)) {
+            /* XXX: issue error message? */
+            return -1;
+        }
+    } else {
+        /* compute full name */
+        canonicalize_absolute_path(filename, sizeof(filename), filename1);
+    }
+
 #ifndef CONFIG_TINY
     /* avoid messing with the dired pane */
-    if ((s->flags & WF_POPLEFT) && s->x1 == 0) {
+    if ((s->flags & WF_POPLEFT) && s->x1 == 0 && !is_directory(filename)) {
         EditState *e = find_window(s, KEY_RIGHT, NULL);
         if (e) {
             if (s->qe_state->active_window == s)
@@ -6314,16 +6324,6 @@
     }
 #endif
 
-    if (load_resource) {
-        if (find_resource_file(filename, sizeof(filename), filename1)) {
-            /* XXX: issue error message? */
-            return -1;
-        }
-    } else {
-        /* compute full name */
-        canonicalize_absolute_path(filename, sizeof(filename), filename1);
-    }
-
     /* If file already loaded in existing buffer, switch to that */
     b = eb_find_file(filename);
     if (b != NULL) {