[Qemacs-commit] qemacs qe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/03/20 14:43:33

Modified files:
        .              : qe.c 

Log message:
        files: add -1 (--single-window) command line option
        - add command line options to prevent window splitting

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

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- qe.c        17 Mar 2017 16:26:16 -0000      1.254
+++ qe.c        20 Mar 2017 18:43:33 -0000      1.255
@@ -73,6 +73,7 @@
 static int screen_height = 0;
 static int no_init_file;
 int force_tty;
+int single_window;
 int use_session_file;
 #ifndef CONFIG_TINY
 static int free_everything;
@@ -8281,6 +8282,8 @@
       { .func_noarg = show_usage }},
     { "no-init-file", "q", NULL, CMD_OPT_BOOL, "do not load config files",
       { .int_ptr = &no_init_file }},
+    { "single-window", "1", NULL, CMD_OPT_BOOL, "keep a single window when 
loading multiple files",
+       { .int_ptr = &single_window }},
     { "no-windows", "nw", NULL, CMD_OPT_BOOL, "force tty terminal usage",
        { .int_ptr = &force_tty }},
     { "ttycharset", "c", "CHARSET", CMD_OPT_ARG, "specify tty charset",
@@ -8597,7 +8600,10 @@
         }
         /* load filename relative to qe current directory */
         /* XXX: should split windows evenly */
-        qe_load_file(s, arg, LF_CWD_RELATIVE | LF_SPLIT_WINDOW, 0);
+        qe_load_file(s, arg,
+                     single_window ? LF_CWD_RELATIVE :
+                     LF_CWD_RELATIVE | LF_SPLIT_WINDOW,
+                     0);
         s = qs->active_window;
         if (line_num)
             do_goto_line(s, line_num, col_num);