[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] qemacs charset.c clang.c ebnf.c extra-modes.c e...
From: |
Charlie Gordon |
Subject: |
[Qemacs-commit] qemacs charset.c clang.c ebnf.c extra-modes.c e... |
Date: |
Sun, 16 Apr 2017 17:51:20 -0400 (EDT) |
CVSROOT: /sources/qemacs
Module name: qemacs
Changes by: Charlie Gordon <chqrlie> 17/04/16 17:51:20
Modified files:
. : charset.c clang.c ebnf.c extra-modes.c extras.c
hex.c html.c icon.c image.c lisp.c markdown.c
orgmode.c qe.c qe.h rust.c video.c xml.c
libqhtml : xmlparse.c
Log message:
basic: reduce global variable clutter
- make more registered objects static
- document some non static global objects
- remove some global variables
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/charset.c?cvsroot=qemacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/qemacs/ebnf.c?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/extra-modes.c?cvsroot=qemacs&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/qemacs/extras.c?cvsroot=qemacs&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/qemacs/hex.c?cvsroot=qemacs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/qemacs/icon.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/image.c?cvsroot=qemacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/qemacs/lisp.c?cvsroot=qemacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/qemacs/markdown.c?cvsroot=qemacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/qemacs/orgmode.c?cvsroot=qemacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.268&r2=1.269
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.250&r2=1.251
http://cvs.savannah.gnu.org/viewcvs/qemacs/rust.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/video.c?cvsroot=qemacs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/qemacs/xml.c?cvsroot=qemacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/xmlparse.c?cvsroot=qemacs&r1=1.28&r2=1.29
Patches:
Index: charset.c
===================================================================
RCS file: /sources/qemacs/qemacs/charset.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- charset.c 22 Mar 2017 17:13:10 -0000 1.48
+++ charset.c 16 Apr 2017 21:51:19 -0000 1.49
@@ -136,7 +136,7 @@
static int probe_8859_1(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
const u8 *p = buf;
@@ -361,7 +361,7 @@
static int probe_utf8(qe__unused__ QECharset *charset, const u8 *buf, int size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
const u8 *p = buf;
@@ -560,7 +560,7 @@
static int probe_ucs2le(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
const u8 *p = buf;
@@ -691,7 +691,7 @@
static int probe_ucs2be(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
const u8 *p = buf;
@@ -835,7 +835,7 @@
static int probe_ucs4le(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
const u8 *p = buf;
@@ -965,7 +965,7 @@
static int probe_ucs4be(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
const u8 *p = buf;
@@ -1500,7 +1500,7 @@
has_binary = 0;
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U <<
'\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U <<
'\033') |
(1U << 0x0e) | (1U << 0x0f) | (1U <<
0x1f);
Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- clang.c 15 Apr 2017 09:39:02 -0000 1.124
+++ clang.c 16 Apr 2017 21:51:20 -0000 1.125
@@ -1250,7 +1250,7 @@
/* XXX: support Yacc / Bison syntax extensions */
-ModeDef yacc_mode = {
+static ModeDef yacc_mode = {
.name = "Yacc",
.extensions = "y|yacc",
.colorize_func = c_colorize_line,
@@ -1264,7 +1264,7 @@
/* XXX: support Lex / Flex syntax extensions */
-ModeDef lex_mode = {
+static ModeDef lex_mode = {
.name = "Lex",
.extensions = "l|lex",
.colorize_func = c_colorize_line,
@@ -1343,7 +1343,7 @@
"float32|float64|"
};
-ModeDef c2_mode = {
+static ModeDef c2_mode = {
.name = "C2",
.extensions = "c2|c2h|c2t",
.colorize_func = c_colorize_line,
@@ -1387,7 +1387,7 @@
return 1;
}
-ModeDef objc_mode = {
+static ModeDef objc_mode = {
.name = "ObjC", /* Objective C */
.extensions = "m|mm",
.mode_probe = objc_mode_probe,
@@ -1446,7 +1446,7 @@
"char|double|float|int|long|unsigned|short|signed|void|"
};
-ModeDef awk_mode = {
+static ModeDef awk_mode = {
.name = "awk",
.extensions = "awk",
.colorize_func = c_colorize_line,
@@ -1489,7 +1489,7 @@
"|"
};
-ModeDef less_mode = {
+static ModeDef less_mode = {
.name = "less",
.extensions = "less",
.colorize_func = c_colorize_line,
@@ -1817,7 +1817,7 @@
return 1;
}
-ModeDef json_mode = {
+static ModeDef json_mode = {
.name = "json",
.extensions = "json",
.mode_probe = json_mode_probe,
@@ -1851,7 +1851,7 @@
"Class|Interface|"
};
-ModeDef as_mode = {
+static ModeDef as_mode = {
.name = "Actionscript",
.extensions = "as",
.colorize_func = c_colorize_line,
@@ -1970,7 +1970,7 @@
/* Go identifiers start with a Unicode letter or _ */
-ModeDef go_mode = {
+static ModeDef go_mode = {
.name = "Go",
.extensions = "go",
.colorize_func = c_colorize_line,
@@ -2007,7 +2007,7 @@
"|cent|ucent|string|wstring|dstring|size_t|ptrdiff_t|"
};
-ModeDef d_mode = {
+static ModeDef d_mode = {
.name = "D",
.extensions = "d|di",
.colorize_func = c_colorize_line,
@@ -2031,7 +2031,7 @@
"big|byte|int|real|string|"
};
-ModeDef limbo_mode = {
+static ModeDef limbo_mode = {
.name = "Limbo",
.extensions = "m",
.colorize_func = c_colorize_line,
@@ -2064,7 +2064,7 @@
"@extensible|@tagged"
};
-ModeDef cyclone_mode = {
+static ModeDef cyclone_mode = {
.name = "Cyclone",
.extensions = "cyc|cyl|cys",
.colorize_func = c_colorize_line,
@@ -2086,7 +2086,7 @@
"complex|"
};
-ModeDef ch_mode = {
+static ModeDef ch_mode = {
.name = "Ch",
.extensions = "chf",
.colorize_func = c_colorize_line,
@@ -2110,7 +2110,7 @@
"local|"
};
-ModeDef squirrel_mode = {
+static ModeDef squirrel_mode = {
.name = "Squirrel",
.extensions = "nut",
.colorize_func = c_colorize_line,
@@ -2134,7 +2134,7 @@
"auto|"
};
-ModeDef ici_mode = {
+static ModeDef ici_mode = {
.name = "ICI",
.extensions = "ici",
.colorize_func = c_colorize_line,
@@ -2173,7 +2173,7 @@
"void|variant|boolean|int|number|string|Error|"
};
-ModeDef jsx_mode = {
+static ModeDef jsx_mode = {
.name = "JSX",
.extensions = "jsx",
.colorize_func = c_colorize_line,
@@ -2199,7 +2199,7 @@
"Iterator|"
};
-ModeDef haxe_mode = {
+static ModeDef haxe_mode = {
.name = "Haxe",
.extensions = "hx",
.colorize_func = c_colorize_line,
@@ -2233,7 +2233,7 @@
"Dynamic|Exception|Error|AssertionError|TypeError|FallThroughError|"
};
-ModeDef dart_mode = {
+static ModeDef dart_mode = {
.name = "Dart",
.extensions = "dart",
.colorize_func = c_colorize_line,
@@ -2260,7 +2260,7 @@
"variant|void|"
};
-ModeDef pike_mode = {
+static ModeDef pike_mode = {
.name = "Pike",
.extensions = "pike",
.colorize_func = c_colorize_line,
@@ -2317,7 +2317,7 @@
"|"
};
-ModeDef calc_mode = {
+static ModeDef calc_mode = {
.name = "calc", /* GNU Calc */
.extensions = "cal|calc",
.shell_handlers = "calc",
@@ -2352,7 +2352,7 @@
return 1;
}
-ModeDef enscript_mode = {
+static ModeDef enscript_mode = {
.name = "Enscript", /* GNU Enscript */
.extensions = "st", /* syntax files */
.mode_probe = enscript_mode_probe,
@@ -2390,7 +2390,7 @@
return 1;
}
-ModeDef qscript_mode = {
+static ModeDef qscript_mode = {
.name = "QScript",
.extensions = "qe|qs",
.shell_handlers = "qscript|qs",
@@ -2418,7 +2418,7 @@
"string|static_string|array|callback|symbol|"
};
-ModeDef ec_mode = {
+static ModeDef ec_mode = {
.name = "elastiC",
.extensions = "ec",
.colorize_func = c_colorize_line,
@@ -2440,7 +2440,7 @@
"variable|"
};
-ModeDef sl_mode = {
+static ModeDef sl_mode = {
.name = "Jed", /* S-Lang */
.extensions = "sl",
.colorize_func = c_colorize_line,
@@ -2463,7 +2463,7 @@
"var|void|string|int|"
};
-ModeDef csl_mode = {
+static ModeDef csl_mode = {
.name = "CSL",
.extensions = "csl",
.shell_handlers = "csl",
@@ -2488,7 +2488,7 @@
"var|"
};
-ModeDef neko_mode = {
+static ModeDef neko_mode = {
.name = "Neko",
.extensions = "neko",
.shell_handlers = NULL,
@@ -2514,7 +2514,7 @@
"var|int|float|string|bool|char|void|"
};
-ModeDef nml_mode = {
+static ModeDef nml_mode = {
.name = "NekoML",
.extensions = "nml",
.shell_handlers = NULL,
@@ -2540,7 +2540,7 @@
"u8|u16|u32|u64|i8|i16|i32|i64|f64|f32|"
};
-ModeDef alloy_mode = {
+static ModeDef alloy_mode = {
.name = "Alloy",
.extensions = "ay",
.shell_handlers = NULL,
@@ -2578,7 +2578,7 @@
return 1;
}
-ModeDef scilab_mode = {
+static ModeDef scilab_mode = {
.name = "SciLab",
.extensions = "sce|sci",
.shell_handlers = NULL,
@@ -2684,7 +2684,7 @@
"double|va_list|unichar|"
};
-ModeDef vala_mode = {
+static ModeDef vala_mode = {
.name = "Vala",
.mode_name = "vala",
.extensions = "vala|vapi",
@@ -2744,7 +2744,7 @@
return 1;
}
-ModeDef pawn_mode = {
+static ModeDef pawn_mode = {
.name = "Pawn",
.mode_name = "pawn",
.extensions = "p",
@@ -2779,7 +2779,7 @@
"int|void|"
};
-ModeDef cminus_mode = {
+static ModeDef cminus_mode = {
.name = "C-minus",
.mode_name = "cminus",
.extensions = "cm",
Index: ebnf.c
===================================================================
RCS file: /sources/qemacs/qemacs/ebnf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ebnf.c 25 Mar 2017 18:15:01 -0000 1.4
+++ ebnf.c 16 Apr 2017 21:51:20 -0000 1.5
@@ -195,7 +195,7 @@
}
}
-ModeDef ebnf_mode = {
+static ModeDef ebnf_mode = {
.name = "ebnf",
.extensions = "ebnf",
.keywords = ebnf_keywords,
@@ -203,7 +203,7 @@
.colorize_func = ebnf_colorize_line,
};
-ModeDef antlr_mode = {
+static ModeDef antlr_mode = {
.name = "antlr",
.extensions = "antlr",
.keywords = ebnf_keywords,
Index: extra-modes.c
===================================================================
RCS file: /sources/qemacs/qemacs/extra-modes.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- extra-modes.c 15 Apr 2017 09:39:02 -0000 1.59
+++ extra-modes.c 16 Apr 2017 21:51:20 -0000 1.60
@@ -3841,7 +3841,7 @@
cp->colorize_state = state;
}
-ModeDef elixir_mode = {
+static ModeDef elixir_mode = {
.name = "Elixir",
.extensions = "ex|exs",
.shell_handlers = "elixir",
Index: extras.c
===================================================================
RCS file: /sources/qemacs/qemacs/extras.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- extras.c 12 Apr 2017 07:33:20 -0000 1.67
+++ extras.c 16 Apr 2017 21:51:20 -0000 1.68
@@ -498,7 +498,7 @@
/* Return the matching delimiter for all pairs */
static int matching_delimiter(int c) {
- static const char pairs[] = "(){}[]<>";
+ const char *pairs = "(){}[]<>";
int i;
for (i = 0; pairs[i]; i++) {
Index: hex.c
===================================================================
RCS file: /sources/qemacs/qemacs/hex.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- hex.c 19 Mar 2017 15:39:25 -0000 1.51
+++ hex.c 16 Apr 2017 21:51:20 -0000 1.52
@@ -26,6 +26,8 @@
HEX_STYLE_DUMP = QE_STYLE_FUNCTION,
};
+static ModeDef hex_mode;
+
static int to_disp(int c)
{
#if 1
@@ -193,7 +195,7 @@
static int detect_binary(const unsigned char *buf, int size)
{
- static const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
+ const uint32_t magic = (1U << '\b') | (1U << '\t') | (1U << '\f') |
(1U << '\n') | (1U << '\r') | (1U << '\033')
|
(1U << 0x0e) | (1U << 0x0f) | (1U << 0x1f);
int i, c;
@@ -342,7 +344,7 @@
.get_mode_line = hex_mode_line,
};
-ModeDef hex_mode = {
+static ModeDef hex_mode = {
.name = "hex",
.mode_probe = hex_mode_probe,
.mode_init = hex_mode_init,
Index: html.c
===================================================================
RCS file: /sources/qemacs/qemacs/html.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- html.c 16 Apr 2017 17:31:14 -0000 1.41
+++ html.c 16 Apr 2017 21:51:20 -0000 1.42
@@ -858,7 +858,7 @@
/* search for HTML tag */
static int html_mode_probe(ModeDef *mode, ModeProbeData *p1)
{
- static const uint32_t magic = (1U << '\r') | (1U << '\n') | (1U << '\t') |
(1U << '\033');
+ const uint32_t magic = (1U << '\r') | (1U << '\n') | (1U << '\t') | (1U <<
'\033');
const unsigned char *p = p1->buf;
int c, score;
Index: icon.c
===================================================================
RCS file: /sources/qemacs/qemacs/icon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- icon.c 25 Mar 2017 18:15:01 -0000 1.5
+++ icon.c 16 Apr 2017 21:51:20 -0000 1.6
@@ -193,7 +193,7 @@
cp->colorize_state = state;
}
-ModeDef icon_mode = {
+static ModeDef icon_mode = {
.name = "Icon",
.extensions = "icn",
.shell_handlers = "iconc",
Index: image.c
===================================================================
RCS file: /sources/qemacs/qemacs/image.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- image.c 25 Mar 2017 18:15:01 -0000 1.32
+++ image.c 16 Apr 2017 21:51:20 -0000 1.33
@@ -931,7 +931,7 @@
image_buffer_close,
};
-ModeDef image_mode = {
+static ModeDef image_mode = {
.name = "image",
.buffer_instance_size = sizeof(ImageBufferState),
.window_instance_size = sizeof(ImageState),
Index: lisp.c
===================================================================
RCS file: /sources/qemacs/qemacs/lisp.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- lisp.c 25 Mar 2017 18:15:00 -0000 1.27
+++ lisp.c 16 Apr 2017 21:51:20 -0000 1.28
@@ -452,7 +452,7 @@
.colorize_flags = LISP_LANG_LISP,
};
-ModeDef elisp_mode = {
+static ModeDef elisp_mode = {
.name = "ELisp",
.extensions = "el",
.keywords = elisp_keywords,
@@ -463,7 +463,7 @@
.fallback = &lisp_mode,
};
-ModeDef scheme_mode = {
+static ModeDef scheme_mode = {
.name = "Scheme",
.extensions = "scm|sch|ss",
.keywords = scheme_keywords,
@@ -473,7 +473,7 @@
.fallback = &lisp_mode,
};
-ModeDef racket_mode = {
+static ModeDef racket_mode = {
.name = "Racket",
.extensions = "rkt|rktd",
.keywords = racket_keywords,
@@ -483,7 +483,7 @@
.fallback = &lisp_mode,
};
-ModeDef clojure_mode = {
+static ModeDef clojure_mode = {
.name = "Clojure",
.extensions = "clj",
.keywords = clojure_keywords,
@@ -493,7 +493,7 @@
.fallback = &lisp_mode,
};
-ModeDef sandbox_mode = {
+static ModeDef sandbox_mode = {
.name = "Sandbox", /* MacOS, Tinyscheme based? */
.extensions = "sb",
.keywords = sandbox_keywords,
Index: markdown.c
===================================================================
RCS file: /sources/qemacs/qemacs/markdown.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- markdown.c 31 Jan 2017 20:18:55 -0000 1.26
+++ markdown.c 16 Apr 2017 21:51:20 -0000 1.27
@@ -20,7 +20,7 @@
#include "qe.h"
-extern ModeDef litcoffee_mode;
+static ModeDef litcoffee_mode;
enum {
/* TODO: define specific styles */
@@ -56,7 +56,7 @@
MKD_LEVEL_MAX = 7,
};
-ModeDef *mkd_lang_def[MKD_LANG_MAX + 1];
+static ModeDef *mkd_lang_def[MKD_LANG_MAX + 1];
#define MKD_BULLET_STYLES 4
static int MkdBulletStyles[MKD_BULLET_STYLES] = {
@@ -844,7 +844,7 @@
return 0;
}
-ModeDef mkd_mode = {
+static ModeDef mkd_mode = {
.name = "markdown",
.extensions = "mkd|md|markdown",
.mode_init = mkd_mode_init,
@@ -862,7 +862,7 @@
return 0;
}
-ModeDef litcoffee_mode = {
+static ModeDef litcoffee_mode = {
.name = "LitCoffee",
.extensions = "litcoffee",
.mode_init = litcoffee_mode_init,
Index: orgmode.c
===================================================================
RCS file: /sources/qemacs/qemacs/orgmode.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- orgmode.c 25 Mar 2017 18:15:01 -0000 1.26
+++ orgmode.c 16 Apr 2017 21:51:20 -0000 1.27
@@ -731,7 +731,7 @@
CMD_DEF_END,
};
-ModeDef org_mode = {
+static ModeDef org_mode = {
.name = "org",
.extensions = "org",
.colorize_func = org_colorize_line,
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -b -r1.268 -r1.269
--- qe.c 16 Apr 2017 17:31:14 -0000 1.268
+++ qe.c 16 Apr 2017 21:51:20 -0000 1.269
@@ -5781,9 +5781,11 @@
int history_saved_offset;
};
-static struct MinibufState minibuffer;
static ModeDef minibuffer_mode;
+/* XXX: should be opaque mode data */
+static struct MinibufState minibuffer;
+
void do_completion(EditState *s, int type)
{
QEmacsState *qs = s->qe_state;
Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -b -r1.250 -r1.251
--- qe.h 16 Apr 2017 17:31:15 -0000 1.250
+++ qe.h 16 Apr 2017 21:51:20 -0000 1.251
@@ -2249,13 +2249,11 @@
/* hex.c */
-extern ModeDef hex_mode;
-
void hex_write_char(EditState *s, int key);
/* lisp.c */
-extern ModeDef lisp_mode;
+extern ModeDef lisp_mode; /* used for org_mode */
/* list.c */
@@ -2278,12 +2276,12 @@
extern ModeDef php_mode;
extern ModeDef csharp_mode;
extern ModeDef css_mode;
-extern ModeDef xml_mode;
+extern ModeDef xml_mode; /* used in docbook_mode */
extern ModeDef htmlsrc_mode;
/* html.c */
-extern ModeDef html_mode;
+extern ModeDef html_mode; /* used in docbook_mode */
/* flags from libqhtml/css.h */
int gxml_mode_init(EditBuffer *b, int flags, const char *default_stylesheet);
Index: rust.c
===================================================================
RCS file: /sources/qemacs/qemacs/rust.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- rust.c 25 Mar 2017 18:15:00 -0000 1.6
+++ rust.c 16 Apr 2017 21:51:20 -0000 1.7
@@ -265,7 +265,7 @@
cp->colorize_state = state;
}
-ModeDef rust_mode = {
+static ModeDef rust_mode = {
.name = "Rust",
.extensions = "rs",
.shell_handlers = "rustc",
Index: video.c
===================================================================
RCS file: /sources/qemacs/qemacs/video.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- video.c 27 Aug 2015 15:32:24 -0000 1.21
+++ video.c 16 Apr 2017 21:51:20 -0000 1.22
@@ -997,7 +997,7 @@
CMD_DEF_END,
};
-ModeDef video_mode = {
+static ModeDef video_mode = {
.name = "av",
.window_instance_size = sizeof(VideoState),
.mode_probe = video_mode_probe,
Index: xml.c
===================================================================
RCS file: /sources/qemacs/qemacs/xml.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- xml.c 25 Mar 2017 18:15:00 -0000 1.26
+++ xml.c 16 Apr 2017 21:51:20 -0000 1.27
@@ -130,6 +130,7 @@
start = i;
if (state & IN_XML_SCRIPT) {
/* javascript coloring */
+ /* XXX: should support actual scripting language if
supported */
parse_script:
for (; str[i] != '\0'; i++) {
if (str[i] == '<'
Index: libqhtml/xmlparse.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/xmlparse.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libqhtml/xmlparse.c 16 Sep 2015 22:18:26 -0000 1.28
+++ libqhtml/xmlparse.c 16 Apr 2017 21:51:20 -0000 1.29
@@ -338,7 +338,7 @@
static const char *css_attr_strlower(CSSBox *box, CSSIdent attr_id)
{
- static char buf[200];
+ static char buf[200]; /* ugly patch to return a string */
const char *value;
value = css_attr_str(box, attr_id);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] qemacs charset.c clang.c ebnf.c extra-modes.c e...,
Charlie Gordon <=