qemacs-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemacs-commit] qemacs archive.c extra-modes.c latex-mode.c mpe...


From: Charlie Gordon
Subject: [Qemacs-commit] qemacs archive.c extra-modes.c latex-mode.c mpe...
Date: Tue, 27 May 2014 12:05:56 +0000

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/05/27 12:05:56

Modified files:
        .              : archive.c extra-modes.c latex-mode.c mpeg.c 
                         script.c bufed.c hex.c lisp.c orgmode.c shell.c 
                         clang.c html.c list.c perl.c unihex.c dired.c 
                         htmlsrc.c makemode.c qe.c video.c docbook.c 
                         image.c markdown.c qe.h xml.c 

Log message:
        add mode flags to specify different types of modes
        
        * add  mode_flags as extra argument to qe_register_mode
        * change all mode registration calls accordingly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/archive.c?cvsroot=qemacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/qemacs/extra-modes.c?cvsroot=qemacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/qemacs/mpeg.c?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/script.c?cvsroot=qemacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/qemacs/bufed.c?cvsroot=qemacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/qemacs/hex.c?cvsroot=qemacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/qemacs/lisp.c?cvsroot=qemacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/qemacs/orgmode.c?cvsroot=qemacs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/qemacs/list.c?cvsroot=qemacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qemacs/perl.c?cvsroot=qemacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemacs/unihex.c?cvsroot=qemacs&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/qemacs/htmlsrc.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/makemode.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.173&r2=1.174
http://cvs.savannah.gnu.org/viewcvs/qemacs/video.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/docbook.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/image.c?cvsroot=qemacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/qemacs/markdown.c?cvsroot=qemacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/qemacs/xml.c?cvsroot=qemacs&r1=1.20&r2=1.21

Patches:
Index: archive.c
===================================================================
RCS file: /sources/qemacs/qemacs/archive.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- archive.c   26 May 2014 20:29:09 -0000      1.11
+++ archive.c   27 May 2014 12:05:52 -0000      1.12
@@ -163,7 +163,7 @@
     archive_types = archive_type_array;
 
     eb_register_data_type(&archive_data_type);
-    qe_register_mode(&archive_mode);
+    qe_register_mode(&archive_mode, MODEF_DATATYPE | MODEF_SHELLPROC);
 
     return 0;
 }
@@ -262,7 +262,7 @@
     compress_types = compress_type_array;
 
     eb_register_data_type(&compress_data_type);
-    qe_register_mode(&compress_mode);
+    qe_register_mode(&compress_mode, MODEF_DATATYPE | MODEF_SHELLPROC);
 
     return 0;
 }
@@ -333,7 +333,7 @@
     wget_mode.data_type = &wget_data_type;
 
     eb_register_data_type(&wget_data_type);
-    qe_register_mode(&wget_mode);
+    qe_register_mode(&wget_mode, MODEF_DATATYPE | MODEF_SHELLPROC);
 
     return 0;
 }
@@ -417,7 +417,7 @@
     man_mode.data_type = &man_data_type;
 
     eb_register_data_type(&man_data_type);
-    qe_register_mode(&man_mode);
+    qe_register_mode(&man_mode, MODEF_DATATYPE | MODEF_SHELLPROC);
 
     return 0;
 }

Index: extra-modes.c
===================================================================
RCS file: /sources/qemacs/qemacs/extra-modes.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- extra-modes.c       26 May 2014 20:29:10 -0000      1.20
+++ extra-modes.c       27 May 2014 12:05:52 -0000      1.21
@@ -229,7 +229,7 @@
     asm_mode.mode_probe = asm_mode_probe;
     asm_mode.colorize_func = asm_colorize_line;
 
-    qe_register_mode(&asm_mode);
+    qe_register_mode(&asm_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -348,7 +348,7 @@
     basic_mode.mode_probe = basic_mode_probe;
     basic_mode.colorize_func = basic_colorize_line;
 
-    qe_register_mode(&basic_mode);
+    qe_register_mode(&basic_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -607,7 +607,7 @@
     vim_mode.mode_probe = vim_mode_probe;
     vim_mode.colorize_func = vim_colorize_line;
 
-    qe_register_mode(&vim_mode);
+    qe_register_mode(&vim_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -786,7 +786,7 @@
     pascal_mode.mode_probe = pascal_mode_probe;
     pascal_mode.colorize_func = pascal_colorize_line;
 
-    qe_register_mode(&pascal_mode);
+    qe_register_mode(&pascal_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -916,7 +916,7 @@
     ini_mode.mode_probe = ini_mode_probe;
     ini_mode.colorize_func = ini_colorize_line;
 
-    qe_register_mode(&ini_mode);
+    qe_register_mode(&ini_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -974,7 +974,7 @@
     sharp_mode.mode_probe = sharp_mode_probe;
     sharp_mode.colorize_func = sharp_colorize_line;
 
-    qe_register_mode(&sharp_mode);
+    qe_register_mode(&sharp_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -1098,7 +1098,7 @@
     ps_mode.mode_probe = ps_mode_probe;
     ps_mode.colorize_func = ps_colorize_line;
 
-    qe_register_mode(&ps_mode);
+    qe_register_mode(&ps_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -1204,7 +1204,7 @@
     sql_mode.mode_probe = sql_mode_probe;
     sql_mode.colorize_func = sql_colorize_line;
 
-    qe_register_mode(&sql_mode);
+    qe_register_mode(&sql_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -1394,7 +1394,7 @@
     lua_mode.mode_probe = lua_mode_probe;
     lua_mode.colorize_func = lua_colorize_line;
 
-    qe_register_mode(&lua_mode);
+    qe_register_mode(&lua_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -1670,7 +1670,7 @@
     julia_mode.mode_probe = julia_mode_probe;
     julia_mode.colorize_func = julia_colorize_line;
 
-    qe_register_mode(&julia_mode);
+    qe_register_mode(&julia_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -1889,7 +1889,7 @@
     haskell_mode.mode_probe = haskell_mode_probe;
     haskell_mode.colorize_func = haskell_colorize_line;
 
-    qe_register_mode(&haskell_mode);
+    qe_register_mode(&haskell_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -2118,7 +2118,7 @@
     python_mode.mode_probe = python_mode_probe;
     python_mode.colorize_func = python_colorize_line;
 
-    qe_register_mode(&python_mode);
+    qe_register_mode(&python_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -2599,7 +2599,7 @@
     ruby_mode.mode_probe = ruby_mode_probe;
     ruby_mode.colorize_func = ruby_colorize_line;
 
-    qe_register_mode(&ruby_mode);
+    qe_register_mode(&ruby_mode, MODEF_SYNTAX);
 
     return 0;
 }
@@ -2824,7 +2824,7 @@
     ocaml_mode.mode_probe = ocaml_mode_probe;
     ocaml_mode.colorize_func = ocaml_colorize_line;
 
-    qe_register_mode(&ocaml_mode);
+    qe_register_mode(&ocaml_mode, MODEF_SYNTAX);
 
     return 0;
 }

Index: latex-mode.c
===================================================================
RCS file: /sources/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- latex-mode.c        22 Apr 2014 08:08:48 -0000      1.47
+++ latex-mode.c        27 May 2014 12:05:52 -0000      1.48
@@ -336,7 +336,7 @@
     latex_mode.mode_probe = latex_mode_probe;
     latex_mode.colorize_func = latex_colorize_line;
 
-    qe_register_mode(&latex_mode);
+    qe_register_mode(&latex_mode, MODEF_SYNTAX);
     qe_register_cmd_table(latex_commands, &latex_mode);
     register_completion("latex", latex_completion);
 

Index: mpeg.c
===================================================================
RCS file: /sources/qemacs/qemacs/mpeg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- mpeg.c      15 Jan 2014 15:54:27 -0000      1.7
+++ mpeg.c      27 May 2014 12:05:52 -0000      1.8
@@ -172,7 +172,7 @@
 
 static int mpeg_init(void)
 {
-    qe_register_mode(&mpeg_mode);
+    qe_register_mode(&mpeg_mode, MODEF_MAJOR | MODEF_VIEW);
     return 0;
 }
 

Index: script.c
===================================================================
RCS file: /sources/qemacs/qemacs/script.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- script.c    26 May 2014 20:29:10 -0000      1.12
+++ script.c    27 May 2014 12:05:52 -0000      1.13
@@ -130,7 +130,7 @@
     script_mode.mode_probe = script_mode_probe;
     script_mode.colorize_func = script_colorize_line;
 
-    qe_register_mode(&script_mode);
+    qe_register_mode(&script_mode, MODEF_SYNTAX);
 
     return 0;
 }

Index: bufed.c
===================================================================
RCS file: /sources/qemacs/qemacs/bufed.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- bufed.c     1 Apr 2014 07:55:49 -0000       1.29
+++ bufed.c     27 May 2014 12:05:52 -0000      1.30
@@ -417,7 +417,7 @@
     bufed_mode.display_hook = bufed_display_hook;
 
     /* first register mode */
-    qe_register_mode(&bufed_mode);
+    qe_register_mode(&bufed_mode, MODEF_VIEW);
 
     qe_register_cmd_table(bufed_commands, &bufed_mode);
     qe_register_cmd_table(bufed_global_commands, NULL);

Index: hex.c
===================================================================
RCS file: /sources/qemacs/qemacs/hex.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- hex.c       26 May 2014 20:39:31 -0000      1.39
+++ hex.c       27 May 2014 12:05:53 -0000      1.40
@@ -357,8 +357,8 @@
 static int hex_init(void)
 {
     /* first register mode(s) */
-    qe_register_mode(&binary_mode);
-    qe_register_mode(&hex_mode);
+    qe_register_mode(&binary_mode, MODEF_VIEW);
+    qe_register_mode(&hex_mode, MODEF_VIEW);
 
     /* commands and default keys */
     qe_register_cmd_table(hex_commands, &hex_mode);

Index: lisp.c
===================================================================
RCS file: /sources/qemacs/qemacs/lisp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- lisp.c      26 May 2014 20:29:10 -0000      1.13
+++ lisp.c      27 May 2014 12:05:53 -0000      1.14
@@ -381,7 +381,7 @@
     lisp_mode.mode_init = lisp_mode_init;
     lisp_mode.colorize_func = lisp_colorize_line;
 
-    qe_register_mode(&lisp_mode);
+    qe_register_mode(&lisp_mode, MODEF_SYNTAX);
 
     return 0;
 }

Index: orgmode.c
===================================================================
RCS file: /sources/qemacs/qemacs/orgmode.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- orgmode.c   5 Apr 2014 15:49:15 -0000       1.19
+++ orgmode.c   27 May 2014 12:05:53 -0000      1.20
@@ -751,7 +751,7 @@
     org_mode.mode_probe = org_mode_probe;
     org_mode.colorize_func = org_colorize_line;
 
-    qe_register_mode(&org_mode);
+    qe_register_mode(&org_mode, MODEF_SYNTAX);
     qe_register_cmd_table(org_commands, &org_mode);
 
     return 0;

Index: shell.c
===================================================================
RCS file: /sources/qemacs/qemacs/shell.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- shell.c     17 Apr 2014 17:14:09 -0000      1.90
+++ shell.c     27 May 2014 12:05:53 -0000      1.91
@@ -1990,9 +1990,8 @@
     shell_mode.move_bol = shell_move_bol;
     shell_mode.move_eol = shell_move_eol;
     shell_mode.write_char = shell_write_char;
-    shell_mode.mode_flags |= MODEF_NOCMD;
 
-    qe_register_mode(&shell_mode);
+    qe_register_mode(&shell_mode, MODEF_NOCMD | MODEF_VIEW);
     qe_register_cmd_table(shell_commands, &shell_mode);
 
     /* global shell related commands and default keys */
@@ -2003,9 +2002,8 @@
     pager_mode.name = "pager";
     pager_mode.mode_probe = NULL;
     pager_mode.mode_init = pager_mode_init;
-    pager_mode.mode_flags |= MODEF_NOCMD;
 
-    qe_register_mode(&pager_mode);
+    qe_register_mode(&pager_mode, MODEF_NOCMD | MODEF_VIEW);
 
     qe_mode_set_key(&pager_mode, "DEL", "scroll-down");
     qe_mode_set_key(&pager_mode, "SPC", "scroll-up");

Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- clang.c     20 May 2014 07:15:15 -0000      1.68
+++ clang.c     27 May 2014 12:05:53 -0000      1.69
@@ -1504,7 +1504,7 @@
     c_mode.indent_func = c_indent_line;
     c_mode.auto_indent = 1;
 
-    qe_register_mode(&c_mode);
+    qe_register_mode(&c_mode, MODEF_SYNTAX);
     qe_register_cmd_table(c_commands, &c_mode);
     for (p = ";:#&|"; *p; p++) {
         qe_register_binding(*p, "c-electric-key", &c_mode);

Index: html.c
===================================================================
RCS file: /sources/qemacs/qemacs/html.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- html.c      15 Apr 2014 08:01:05 -0000      1.31
+++ html.c      27 May 2014 12:05:54 -0000      1.32
@@ -900,7 +900,7 @@
 {
     css_init();
 
-    qe_register_mode(&html_mode);
+    qe_register_mode(&html_mode, MODEF_VIEW);
     qe_register_cmd_table(html_commands, &html_mode);
 
     return 0;

Index: list.c
===================================================================
RCS file: /sources/qemacs/qemacs/list.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- list.c      5 Apr 2014 15:49:15 -0000       1.14
+++ list.c      27 May 2014 12:05:54 -0000      1.15
@@ -103,9 +103,8 @@
     list_mode.name = "list";
     list_mode.mode_probe = NULL;
     list_mode.mode_init = list_mode_init;
-    list_mode.mode_flags = MODEF_NOCMD;
 
-    qe_register_mode(&list_mode);
+    qe_register_mode(&list_mode, MODEF_NOCMD | MODEF_VIEW);
 
     return 0;
 }

Index: perl.c
===================================================================
RCS file: /sources/qemacs/qemacs/perl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- perl.c      26 May 2014 20:29:10 -0000      1.18
+++ perl.c      27 May 2014 12:05:54 -0000      1.19
@@ -362,7 +362,7 @@
     perl_mode.mode_probe = perl_mode_probe;
     perl_mode.colorize_func = perl_colorize_line;
 
-    qe_register_mode(&perl_mode);
+    qe_register_mode(&perl_mode, MODEF_SYNTAX);
 
     return 0;
 }

Index: unihex.c
===================================================================
RCS file: /sources/qemacs/qemacs/unihex.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- unihex.c    26 May 2014 20:39:32 -0000      1.24
+++ unihex.c    27 May 2014 12:05:54 -0000      1.25
@@ -240,7 +240,7 @@
 static int unihex_init(void)
 {
     /* first register mode(s) */
-    qe_register_mode(&unihex_mode);
+    qe_register_mode(&unihex_mode, MODEF_VIEW);
 
     /* additional mode specific keys */
     qe_register_binding(KEY_CTRL_LEFT, "decrease-width", &unihex_mode);

Index: dired.c
===================================================================
RCS file: /sources/qemacs/qemacs/dired.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- dired.c     25 Apr 2014 20:05:32 -0000      1.46
+++ dired.c     27 May 2014 12:05:54 -0000      1.47
@@ -1164,7 +1164,7 @@
     dired_mode.display_hook = dired_display_hook;
 
     /* first register mode */
-    qe_register_mode(&dired_mode);
+    qe_register_mode(&dired_mode, /* MODEF_DATATYPE | */ MODEF_MAJOR | 
MODEF_VIEW);
 
     qe_register_cmd_table(dired_commands, &dired_mode);
     qe_register_cmd_table(dired_global_commands, NULL);

Index: htmlsrc.c
===================================================================
RCS file: /sources/qemacs/qemacs/htmlsrc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- htmlsrc.c   20 May 2014 07:14:23 -0000      1.17
+++ htmlsrc.c   27 May 2014 12:05:54 -0000      1.18
@@ -398,8 +398,8 @@
         return 85;
 
     /* then try buffer contents */
-    if (p->buf_size >= 5 &&
-        (!html_tagcmp(buf, "<HTML") ||
+    if (buf[0] == '<'
+    &&  (!html_tagcmp(buf, "<HTML") ||
          !html_tagcmp(buf, "<SCRIPT") ||
          !html_tagcmp(buf, "<?XML") ||
          !html_tagcmp(buf, "<!DOCTYPE"))) {
@@ -426,7 +426,7 @@
     htmlsrc_mode.mode_probe = htmlsrc_mode_probe;
     htmlsrc_mode.colorize_func = htmlsrc_colorize_line;
 
-    qe_register_mode(&htmlsrc_mode);
+    qe_register_mode(&htmlsrc_mode, MODEF_SYNTAX);
     qe_register_cmd_table(htmlsrc_commands, &htmlsrc_mode);
 
     return 0;

Index: makemode.c
===================================================================
RCS file: /sources/qemacs/qemacs/makemode.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- makemode.c  26 May 2014 20:29:10 -0000      1.17
+++ makemode.c  27 May 2014 12:05:55 -0000      1.18
@@ -183,7 +183,7 @@
     makefile_mode.mode_init = makefile_mode_init;
     makefile_mode.colorize_func = makefile_colorize_line;
 
-    qe_register_mode(&makefile_mode);
+    qe_register_mode(&makefile_mode, MODEF_SYNTAX);
 
     return 0;
 }

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- qe.c        26 May 2014 20:39:48 -0000      1.173
+++ qe.c        27 May 2014 12:05:55 -0000      1.174
@@ -79,11 +79,13 @@
 
 /* mode handling */
 
-void qe_register_mode(ModeDef *m)
+void qe_register_mode(ModeDef *m, int flags)
 {
     QEmacsState *qs = &qe_state;
     ModeDef **p;
 
+    m->flags |= flags;
+
     /* register mode in mode list (at end) */
     p = &qs->first_mode;
     while (*p != NULL)
@@ -106,7 +108,7 @@
         m->get_mode_line = text_mode_line;
 
     /* add a new command to switch to that mode */
-    if (!(m->mode_flags & MODEF_NOCMD)) {
+    if (!(m->flags & MODEF_NOCMD)) {
         char buf[64];
         int size;
         CmdDef *def;
@@ -5395,7 +5397,7 @@
     minibuffer_mode.name = "minibuffer";
     minibuffer_mode.mode_probe = NULL;
     minibuffer_mode.scroll_up_down = minibuf_complete_scroll_up_down;
-    qe_register_mode(&minibuffer_mode);
+    qe_register_mode(&minibuffer_mode, MODEF_NOCMD | MODEF_VIEW);
     qe_register_cmd_table(minibuffer_commands, &minibuffer_mode);
 }
 
@@ -5468,7 +5470,7 @@
     memcpy(&less_mode, &text_mode, sizeof(ModeDef));
     less_mode.name = "less";
     less_mode.mode_probe = NULL;
-    qe_register_mode(&less_mode);
+    qe_register_mode(&less_mode, MODEF_VIEW);
     qe_register_cmd_table(less_commands, &less_mode);
 }
 
@@ -7941,7 +7943,7 @@
 #endif
 
     /* init basic modules */
-    qe_register_mode(&text_mode);
+    qe_register_mode(&text_mode, MODEF_VIEW);
     qe_register_cmd_table(basic_commands, NULL);
     qe_register_cmd_line_options(cmd_options);
 

Index: video.c
===================================================================
RCS file: /sources/qemacs/qemacs/video.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- video.c     23 Jan 2014 12:56:23 -0000      1.17
+++ video.c     27 May 2014 12:05:55 -0000      1.18
@@ -967,7 +967,7 @@
 int video_init(void)
 {
     eb_register_data_type(&video_data_type);
-    qe_register_mode(&video_mode);
+    qe_register_mode(&video_mode, MODEF_DATATYPE | MODEF_VIEW);
     qe_register_cmd_table(video_commands, &video_mode);
     /* additional mode specific keys */
     qe_register_binding('f', "toggle-full-screen", &video_mode);

Index: docbook.c
===================================================================
RCS file: /sources/qemacs/qemacs/docbook.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- docbook.c   10 Feb 2014 03:24:35 -0000      1.9
+++ docbook.c   27 May 2014 12:05:55 -0000      1.10
@@ -49,7 +49,7 @@
     docbook_mode.mode_probe = docbook_mode_probe;
     docbook_mode.mode_init = docbook_mode_init;
 
-    qe_register_mode(&docbook_mode);
+    qe_register_mode(&docbook_mode, MODEF_VIEW);
     return 0;
 }
 

Index: image.c
===================================================================
RCS file: /sources/qemacs/qemacs/image.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- image.c     16 Jan 2014 14:00:28 -0000      1.25
+++ image.c     27 May 2014 12:05:55 -0000      1.26
@@ -845,7 +845,7 @@
 {
     av_register_all();
     eb_register_data_type(&image_data_type);
-    qe_register_mode(&image_mode);
+    qe_register_mode(&image_mode, MODEF_DATATYPE | MODEF_VIEW);
     qe_register_cmd_table(image_commands, &image_mode);
     register_completion("pixel_format", pixel_format_completion);
     /* additional mode specific keys */

Index: markdown.c
===================================================================
RCS file: /sources/qemacs/qemacs/markdown.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- markdown.c  5 Apr 2014 15:49:16 -0000       1.11
+++ markdown.c  27 May 2014 12:05:56 -0000      1.12
@@ -829,7 +829,7 @@
     mkd_mode.mode_init = mkd_mode_init;
     mkd_mode.colorize_func = mkd_colorize_line;
 
-    qe_register_mode(&mkd_mode);
+    qe_register_mode(&mkd_mode, MODEF_SYNTAX);
     qe_register_cmd_table(mkd_commands, &mkd_mode);
 
     return 0;

Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- qe.h        26 May 2014 14:35:38 -0000      1.175
+++ qe.h        27 May 2014 12:05:56 -0000      1.176
@@ -1213,6 +1213,14 @@
     const char *name;
     const char *extensions;
     //const char *mode_line;
+
+    int flags;
+#define MODEF_NOCMD      0x8000 /* do not register xxx-mode command 
automatically */
+#define MODEF_VIEW       0x01
+#define MODEF_SYNTAX     0x02
+#define MODEF_MAJOR      0x04
+#define MODEF_DATATYPE   0x10
+#define MODEF_SHELLPROC  0x20
     int instance_size; /* size of malloced instance */
 
     /* return the percentage of confidence */
@@ -1246,8 +1254,6 @@
     void (*write_char)(EditState *, int);
     void (*mouse_goto)(EditState *, int x, int y);
 
-    int mode_flags;
-#define MODEF_NOCMD 0x0001 /* do not register xxx-mode command automatically */
     int auto_indent;
 
     EditBufferDataType *data_type; /* native buffer data type (NULL = raw) */
@@ -1486,7 +1492,7 @@
 #define CMD_DEF_END \
     { 0, 0, NULL, { NULL }, CMD_void, 0 }
 
-void qe_register_mode(ModeDef *m);
+void qe_register_mode(ModeDef *m, int flags);
 void mode_completion(CompleteState *cp);
 void qe_register_cmd_table(CmdDef *cmds, ModeDef *m);
 int qe_register_binding(int key, const char *cmd_name, ModeDef *m);

Index: xml.c
===================================================================
RCS file: /sources/qemacs/qemacs/xml.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- xml.c       15 Apr 2014 08:08:01 -0000      1.20
+++ xml.c       27 May 2014 12:05:56 -0000      1.21
@@ -201,7 +201,7 @@
     xml_mode.mode_probe = xml_mode_probe;
     xml_mode.colorize_func = xml_colorize_line;
 
-    qe_register_mode(&xml_mode);
+    qe_register_mode(&xml_mode, MODEF_SYNTAX);
 
     return 0;
 }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]