[Qemacs-commit] qemacs qe.c dired.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        15/05/09 22:25:05

Modified files:
        .              : qe.c dired.c 

Log message:
        changed dired and use BF_PREVIEW flag to improve source code navigation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.50&r2=1.51

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- qe.c        5 Apr 2015 15:10:03 -0000       1.186
+++ qe.c        9 May 2015 22:25:04 -0000       1.187
@@ -928,12 +928,25 @@
 
 void do_up_down(EditState *s, int dir)
 {
+#ifndef CONFIG_TINY
+    if (s->b->flags & BF_PREVIEW) {
+        if (s->mode->scroll_up_down)
+            s->mode->scroll_up_down(s, dir);
+    } else
+#endif
     if (s->mode->move_up_down)
         s->mode->move_up_down(s, dir);
 }
 
 void do_left_right(EditState *s, int dir)
 {
+#ifndef CONFIG_TINY
+    if (s->b->flags & BF_PREVIEW) {
+        EditState *e = find_window(s, KEY_LEFT);
+        if (e && (e->b->flags & BF_DIRED) && dir < 0)
+            s->qe_state->active_window = e;
+    } else
+#endif
     if (s->mode->move_left_right)
         s->mode->move_left_right(s, dir);
 }

Index: dired.c
===================================================================
RCS file: /sources/qemacs/qemacs/dired.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- dired.c     1 Jun 2014 13:54:58 -0000       1.50
+++ dired.c     9 May 2015 22:25:05 -0000       1.51
@@ -837,10 +837,14 @@
         /* do explore files pointed to by symlinks */
         e = find_window(s, KEY_RIGHT);
         if (e) {
+#if 1
+            s->qe_state->active_window = e;
+#else
             /* delete dired window */
             do_delete_window(s, 1);
             /* XXX: should keep BF_PREVIEW flag and set pager-mode */
             e->b->flags &= ~BF_PREVIEW;
+#endif
         } else {
             do_find_file(s, filename);
         }