[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] qemacs bufed.c buffer.c cfb.c charsetjis.c char...
|
From: |
Charlie Gordon |
|
Subject: |
[Qemacs-commit] qemacs bufed.c buffer.c cfb.c charsetjis.c char... |
|
Date: |
Thu, 06 Dec 2007 17:43:49 +0000 |
CVSROOT: /cvsroot/qemacs
Module name: qemacs
Changes by: Charlie Gordon <chqrlie> 07/12/06 17:43:49
Modified files:
. : bufed.c buffer.c cfb.c charsetjis.c
charsetmore.c cptoqe.c dired.c display.c
docbook.c fbfrender.c fbfrender.h fbftoqe.c
hex.c html.c html2png.c latex-mode.c libfbf.c
qe.c qe.h qeconfig.h unicode_join.c unihex.c
util.c x11.c
kmap : README
libqhtml : css.c css.h csstoqe.c xmlparse.c
Log message:
made more local variables static
fixed bug in cfb32_fill_rectangle
use c99 syntax for new style struct initializers instead of gcc
specific
simplified tolower unsigned char hacks
fixed various sparse warnings
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/bufed.c?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/qemacs/cfb.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/charsetjis.c?cvsroot=qemacs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/qemacs/charsetmore.c?cvsroot=qemacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/qemacs/cptoqe.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/display.c?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/docbook.c?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbfrender.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbfrender.h?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbftoqe.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/hex.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/html2png.c?cvsroot=qemacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qemacs/libfbf.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/qemacs/qeconfig.h?cvsroot=qemacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qemacs/unicode_join.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/unihex.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/util.c?cvsroot=qemacs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/qemacs/x11.c?cvsroot=qemacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qemacs/kmap/README?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/css.c?cvsroot=qemacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/css.h?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/csstoqe.c?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/xmlparse.c?cvsroot=qemacs&r1=1.9&r2=1.10
Patches:
Index: bufed.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/bufed.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- bufed.c 3 Dec 2007 16:10:38 -0000 1.7
+++ bufed.c 6 Dec 2007 17:43:47 -0000 1.8
@@ -30,7 +30,7 @@
int last_index;
} BufedState;
-ModeDef bufed_mode;
+static ModeDef bufed_mode;
static void build_bufed_list(EditState *s)
{
Index: buffer.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/buffer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- buffer.c 3 Dec 2007 16:10:38 -0000 1.13
+++ buffer.c 6 Dec 2007 17:43:47 -0000 1.14
@@ -26,7 +26,7 @@
static void eb_addlog(EditBuffer *b, enum LogOperation op,
int offset, int size);
-EditBufferDataType *first_buffer_data_type = NULL;
+static EditBufferDataType *first_buffer_data_type;
/************************************************************/
/* basic access to the edit buffer */
Index: cfb.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/cfb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cfb.c 3 Dec 2007 16:10:38 -0000 1.5
+++ cfb.c 6 Dec 2007 17:43:47 -0000 1.6
@@ -113,7 +113,7 @@
for (y = 0; y < h; y++) {
d = dest;
for (n = w; n != 0; n--) {
- ((short *)d)[0] ^= 0x00ffffff;
+ ((int *)d)[0] ^= 0x00ffffff;
d += 4;
}
dest += cfb->wrap;
Index: charsetjis.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/charsetjis.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- charsetjis.c 3 Dec 2007 16:16:24 -0000 1.1
+++ charsetjis.c 6 Dec 2007 17:43:47 -0000 1.2
@@ -149,8 +149,8 @@
decode_euc_jp_init,
decode_euc_jp_func,
encode_euc_jp,
- table_alloc : 1,
- eol_char: 10,
+ .table_alloc = 1,
+ .eol_char = 10,
};
@@ -223,8 +223,8 @@
decode_sjis_init,
decode_sjis_func,
encode_sjis,
- table_alloc : 1,
- eol_char: 10,
+ .table_alloc = 1,
+ .eol_char = 10,
};
int charset_jis_init(void)
Index: charsetmore.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/charsetmore.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- charsetmore.c 6 Dec 2007 15:28:30 -0000 1.8
+++ charsetmore.c 6 Dec 2007 17:43:47 -0000 1.9
@@ -45,17 +45,17 @@
0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
};
-QECharset charset_8859_2 = {
+static QECharset charset_8859_2 = {
"8859-2",
"ISO-8859-2|iso-ir-101|latin2|l2|iso-latin2|iso8859-2",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 255,
- private_table: table_8859_2,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 255,
+ .private_table = table_8859_2,
};
@@ -81,17 +81,17 @@
0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x016d, 0x015d, 0x02d9,
};
-QECharset charset_8859_3 = {
+static QECharset charset_8859_3 = {
"8859-3",
"ISO-8859-3",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 255,
- private_table: table_8859_3,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 255,
+ .private_table = table_8859_3,
};
@@ -117,17 +117,17 @@
0x0173, 0x00fa, 0x00fb, 0x00fc, 0x0169, 0x016b, 0x02d9,
};
-QECharset charset_8859_4 = {
+static QECharset charset_8859_4 = {
"8859-4",
"ISO-8859-4|iso-ir-110|latin4|l4|iso-latin4",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 255,
- private_table: table_8859_4,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 255,
+ .private_table = table_8859_4,
};
@@ -153,17 +153,17 @@
0x0459, 0x045a, 0x045b, 0x045c, 0x00a7, 0x045e, 0x045f,
};
-QECharset charset_8859_5 = {
+static QECharset charset_8859_5 = {
"8859-5",
"ISO-8859-5",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 255,
- private_table: table_8859_5,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 255,
+ .private_table = table_8859_5,
};
@@ -186,17 +186,17 @@
0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651, 0x0652,
};
-QECharset charset_8859_6 = {
+static QECharset charset_8859_6 = {
"8859-6",
"ISO-8859-6",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 172,
- max_char: 242,
- private_table: table_8859_6,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 172,
+ .max_char = 242,
+ .private_table = table_8859_6,
};
@@ -222,17 +222,17 @@
0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce,
};
-QECharset charset_8859_7 = {
+static QECharset charset_8859_7 = {
"8859-7",
"ISO-8859-7|iso-ir-126|elot-928",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 254,
- private_table: table_8859_7,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 254,
+ .private_table = table_8859_7,
};
@@ -257,17 +257,17 @@
0x05ea, 0x00fb, 0x00fc, 0x200e, 0x200f,
};
-QECharset charset_8859_8 = {
+static QECharset charset_8859_8 = {
"8859-8",
"ISO-8859-8",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 170,
- max_char: 254,
- private_table: table_8859_8,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 170,
+ .max_char = 254,
+ .private_table = table_8859_8,
};
@@ -287,17 +287,17 @@
0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f,
};
-QECharset charset_8859_9 = {
+static QECharset charset_8859_9 = {
"8859-9",
"ISO-8859-9",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 208,
- max_char: 254,
- private_table: table_8859_9,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 208,
+ .max_char = 254,
+ .private_table = table_8859_9,
};
@@ -323,17 +323,17 @@
0x0173, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x0138,
};
-QECharset charset_8859_10 = {
+static QECharset charset_8859_10 = {
"8859-10",
"ISO-8859-10",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 255,
- private_table: table_8859_10,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 255,
+ .private_table = table_8859_10,
};
@@ -359,17 +359,17 @@
0x0e59, 0x0e5a, 0x0e5b,
};
-QECharset charset_8859_11 = {
+static QECharset charset_8859_11 = {
"8859-11",
"ISO-8859-11",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 251,
- private_table: table_8859_11,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 251,
+ .private_table = table_8859_11,
};
@@ -395,17 +395,17 @@
0x0142, 0x015b, 0x016b, 0x00fc, 0x017c, 0x017e, 0x2019,
};
-QECharset charset_8859_13 = {
+static QECharset charset_8859_13 = {
"8859-13",
"ISO-8859-13|iso-ir-179|latin7|l7|iso-latin7",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 255,
- private_table: table_8859_13,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 255,
+ .private_table = table_8859_13,
};
@@ -431,17 +431,17 @@
0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x0177,
};
-QECharset charset_8859_14 = {
+static QECharset charset_8859_14 = {
"8859-14",
"ISO-8859-14",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 254,
- private_table: table_8859_14,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 254,
+ .private_table = table_8859_14,
};
@@ -459,17 +459,17 @@
0x0152, 0x0153, 0x0178,
};
-QECharset charset_8859_15 = {
+static QECharset charset_8859_15 = {
"8859-15",
"ISO-8859-15|latin9|l9|latin0|l0",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 164,
- max_char: 190,
- private_table: table_8859_15,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 164,
+ .max_char = 190,
+ .private_table = table_8859_15,
};
@@ -495,17 +495,17 @@
0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0119, 0x021b,
};
-QECharset charset_8859_16 = {
+static QECharset charset_8859_16 = {
"8859-16",
"ISO-8859-16|latin10|l10",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 161,
- max_char: 254,
- private_table: table_8859_16,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 161,
+ .max_char = 254,
+ .private_table = table_8859_16,
};
@@ -535,17 +535,17 @@
0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0,
};
-QECharset charset_cp437 = {
+static QECharset charset_cp437 = {
"cp437",
"437",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp437,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp437,
};
@@ -575,17 +575,17 @@
0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0,
};
-QECharset charset_cp737 = {
+static QECharset charset_cp737 = {
"cp737",
"737",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp737,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp737,
};
@@ -615,17 +615,17 @@
0x00b0, 0x00a8, 0x00b7, 0x00b9, 0x00b3, 0x00b2, 0x25a0, 0x00a0,
};
-QECharset charset_cp850 = {
+static QECharset charset_cp850 = {
"cp850",
"850",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp850,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp850,
};
@@ -655,17 +655,17 @@
0x00b0, 0x00a8, 0x02d9, 0x0171, 0x0158, 0x0159, 0x25a0, 0x00a0,
};
-QECharset charset_cp852 = {
+static QECharset charset_cp852 = {
"cp852",
"852",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp852,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp852,
};
@@ -695,17 +695,17 @@
0x00b0, 0x2219, 0x00b7, 0x221a, 0x2116, 0x00a4, 0x25a0, 0x00a0,
};
-QECharset charset_cp866 = {
+static QECharset charset_cp866 = {
"cp866",
"866",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp866,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp866,
};
@@ -735,17 +735,17 @@
0x0407, 0x0457, 0x00b7, 0x221a, 0x2116, 0x00a4, 0x25a0, 0x00a0,
};
-QECharset charset_cp1125 = {
+static QECharset charset_cp1125 = {
"cp1125",
"x-cp866-u|ruscii|1125",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp1125,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp1125,
};
@@ -775,17 +775,17 @@
0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
};
-QECharset charset_cp1250 = {
+static QECharset charset_cp1250 = {
"cp1250",
"windows-1250|1250",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp1250,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp1250,
};
@@ -815,17 +815,17 @@
0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
};
-QECharset charset_cp1251 = {
+static QECharset charset_cp1251 = {
"cp1251",
"windows-1251|1251",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp1251,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp1251,
};
@@ -843,17 +843,17 @@
0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x0000, 0x017e, 0x0178,
};
-QECharset charset_cp1252 = {
+static QECharset charset_cp1252 = {
"cp1252",
"windows-1252|1252",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 159,
- private_table: table_cp1252,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 159,
+ .private_table = table_cp1252,
};
@@ -883,17 +883,17 @@
0x0651, 0x00f9, 0x0652, 0x00fb, 0x00fc, 0x200e, 0x200f, 0x06d2,
};
-QECharset charset_cp1256 = {
+static QECharset charset_cp1256 = {
"cp1256",
"windows-1256|1256",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp1256,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp1256,
};
@@ -923,17 +923,17 @@
0x0173, 0x0142, 0x015b, 0x016b, 0x00fc, 0x017c, 0x017e, 0x02d9,
};
-QECharset charset_cp1257 = {
+static QECharset charset_cp1257 = {
"cp1257",
"windows-1257|1257",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_cp1257,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_cp1257,
};
@@ -963,17 +963,17 @@
0x00dd, 0x00fd, 0x0137, 0x017b, 0x0141, 0x017c, 0x0122, 0x02c7,
};
-QECharset charset_mac_latin2 = {
+static QECharset charset_mac_latin2 = {
"mac-latin2",
"x-mac-ce|mac-ce|macce|10029",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_mac_latin2,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_mac_latin2,
};
@@ -1003,17 +1003,17 @@
0x00af, 0x02d8, 0x02d9, 0x02da, 0x00b8, 0x02dd, 0x02db, 0x02c7,
};
-QECharset charset_mac_roman = {
+static QECharset charset_mac_roman = {
"mac-roman",
"x-mac|mac",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_mac_roman,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_mac_roman,
};
@@ -1059,17 +1059,17 @@
0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0,
};
-QECharset charset_kamen = {
+static QECharset charset_kamen = {
"kamen",
"x-kam-cs|kam|867|869",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 1,
- max_char: 255,
- private_table: table_kamen,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 1,
+ .max_char = 255,
+ .private_table = table_kamen,
};
@@ -1099,17 +1099,17 @@
0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a,
};
-QECharset charset_koi8_r = {
+static QECharset charset_koi8_r = {
"koi8-r",
"",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_koi8_r,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_koi8_r,
};
@@ -1139,17 +1139,17 @@
0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a,
};
-QECharset charset_koi8_u = {
+static QECharset charset_koi8_u = {
"koi8-u",
"",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 128,
- max_char: 255,
- private_table: table_koi8_u,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 128,
+ .max_char = 255,
+ .private_table = table_koi8_u,
};
@@ -1195,17 +1195,17 @@
0x1ef1, 0x1ef3, 0x1ef7, 0x1ef9, 0x00fd, 0x1ef5, 0x1ed0,
};
-QECharset charset_tcvn5712 = {
+static QECharset charset_tcvn5712 = {
"tcvn5712",
"TCVN-5712|TCVN|TCVN-0|TCVN-1",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 1,
- max_char: 255,
- private_table: table_tcvn5712,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 1,
+ .max_char = 255,
+ .private_table = table_tcvn5712,
};
@@ -1251,17 +1251,17 @@
0x00fa, 0x0169, 0x1ee7, 0x00fd, 0x1ee3, 0x1eee,
};
-QECharset charset_viscii = {
+static QECharset charset_viscii = {
"viscii",
"VISCII|VISCII-1|VISCII 1.1|VISCII-1.1|VISCII1.1-1",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 10,
- min_char: 2,
- max_char: 255,
- private_table: table_viscii,
+ .table_alloc = 1,
+ .eol_char = 10,
+ .min_char = 2,
+ .max_char = 255,
+ .private_table = table_viscii,
};
@@ -1307,17 +1307,17 @@
0x00dc, 0x00d9, 0x00da, 0x009f,
};
-QECharset charset_cp037 = {
+static QECharset charset_cp037 = {
"cp037",
"037|ebcdic-037",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 37,
- min_char: 4,
- max_char: 255,
- private_table: table_cp037,
+ .table_alloc = 1,
+ .eol_char = 37,
+ .min_char = 4,
+ .max_char = 255,
+ .private_table = table_cp037,
};
@@ -1363,17 +1363,17 @@
0x0000, 0x0000, 0x0000, 0x009f,
};
-QECharset charset_cp424 = {
+static QECharset charset_cp424 = {
"cp424",
"424|ebcdic-424",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 37,
- min_char: 4,
- max_char: 255,
- private_table: table_cp424,
+ .table_alloc = 1,
+ .eol_char = 37,
+ .min_char = 4,
+ .max_char = 255,
+ .private_table = table_cp424,
};
@@ -1419,17 +1419,17 @@
0x00dc, 0x00d9, 0x00da, 0x009f,
};
-QECharset charset_cp500 = {
+static QECharset charset_cp500 = {
"cp500",
"500|ebcdic-500",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 37,
- min_char: 4,
- max_char: 255,
- private_table: table_cp500,
+ .table_alloc = 1,
+ .eol_char = 37,
+ .min_char = 4,
+ .max_char = 255,
+ .private_table = table_cp500,
};
@@ -1475,17 +1475,17 @@
0x001a, 0x001a, 0x00bb, 0x009f,
};
-QECharset charset_cp875 = {
+static QECharset charset_cp875 = {
"cp875",
"875|ebcdic-875",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 37,
- min_char: 4,
- max_char: 255,
- private_table: table_cp875,
+ .table_alloc = 1,
+ .eol_char = 37,
+ .min_char = 4,
+ .max_char = 255,
+ .private_table = table_cp875,
};
@@ -1531,17 +1531,17 @@
0x0022, 0x00d9, 0x00da, 0x009f,
};
-QECharset charset_cp1026 = {
+static QECharset charset_cp1026 = {
"cp1026",
"1026|ebcdic-1026",
decode_8bit_init,
NULL,
encode_8bit,
- table_alloc: 1,
- eol_char: 37,
- min_char: 4,
- max_char: 255,
- private_table: table_cp1026,
+ .table_alloc = 1,
+ .eol_char = 37,
+ .min_char = 4,
+ .max_char = 255,
+ .private_table = table_cp1026,
};
int charset_more_init(void)
Index: cptoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/cptoqe.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cptoqe.c 6 Dec 2007 15:28:30 -0000 1.6
+++ cptoqe.c 6 Dec 2007 17:43:47 -0000 1.7
@@ -228,7 +228,7 @@
printf("};\n\n");
}
- printf("QECharset charset_%s = {\n"
+ printf("static QECharset charset_%s = {\n"
" \"%s\",\n",
name_id, name);
@@ -251,11 +251,11 @@
printf(" decode_8bit_init,\n"
" NULL,\n"
" encode_8bit,\n"
- " table_alloc: 1,\n"
- " eol_char: %d,\n"
- " min_char: %d,\n"
- " max_char: %d,\n"
- " private_table: table_%s,\n"
+ " .table_alloc = 1,\n"
+ " .eol_char = %d,\n"
+ " .min_char = %d,\n"
+ " .max_char = %d,\n"
+ " .private_table = table_%s,\n"
"};\n\n",
eol_char, min_code, max_code, name_id);
Index: dired.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/dired.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dired.c 3 Dec 2007 16:10:38 -0000 1.9
+++ dired.c 6 Dec 2007 17:43:47 -0000 1.10
@@ -177,7 +177,7 @@
const char *p;
for (p = sort_order; *p; p++) {
- switch (tolower(*(const unsigned char *)p)) {
+ switch (tolower((unsigned char)*p)) {
case 'n': /* name */
hs->sort_mode &= ~DIRED_SORT_MASK;
hs->sort_mode |= DIRED_SORT_NAME;
@@ -478,7 +478,7 @@
return 0;
}
-ModeDef dired_mode;
+static ModeDef dired_mode;
/* open dired window on the left. The directory of the current file is
used */
Index: display.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/display.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- display.c 3 Dec 2007 16:10:38 -0000 1.7
+++ display.c 6 Dec 2007 17:43:47 -0000 1.8
@@ -20,7 +20,7 @@
#include "qe.h"
-QEDisplay *first_dpy = NULL;
+static QEDisplay *first_dpy;
void fill_rectangle(QEditScreen *s,
int x1, int y1, int w, int h, QEColor color)
Index: docbook.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/docbook.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- docbook.c 3 Dec 2007 16:10:38 -0000 1.4
+++ docbook.c 6 Dec 2007 17:43:47 -0000 1.5
@@ -21,8 +21,6 @@
#include "qe.h"
#include "css.h"
-extern const char docbook_style[];
-
static int docbook_mode_probe(ModeProbeData *p1)
{
if (xml_mode_probe(p1) == 0)
@@ -39,7 +37,7 @@
docbook_style);
}
-ModeDef docbook_mode;
+static ModeDef docbook_mode;
static int docbook_init(void)
{
Index: fbfrender.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/fbfrender.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fbfrender.c 3 Dec 2007 16:10:38 -0000 1.5
+++ fbfrender.c 6 Dec 2007 17:43:47 -0000 1.6
@@ -472,8 +472,6 @@
return 0;
}
-extern const void *fbf_fonts[];
-
int fbf_render_init(__unused__ const char *font_path)
{
const void **pp;
Index: fbfrender.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/fbfrender.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fbfrender.h 3 Dec 2007 16:10:38 -0000 1.2
+++ fbfrender.h 6 Dec 2007 17:43:47 -0000 1.3
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifndef FBFRENDER_H
+#define FBFRENDER_H
+
/* glyph cache */
typedef struct GlyphCache {
struct GlyphCache *hash_next;
@@ -44,3 +47,7 @@
int fbf_render_init(const char *font_path);
void fbf_render_cleanup(void);
+
+extern const void *fbf_fonts[];
+
+#endif
Index: fbftoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/fbftoqe.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fbftoqe.c 3 Dec 2007 16:15:01 -0000 1.5
+++ fbftoqe.c 6 Dec 2007 17:43:47 -0000 1.6
@@ -84,8 +84,10 @@
int font_size[FONT_MAX];
int i;
- printf("/* This file was generated automatically by fbftoqe */\n\n");
- printf("#include \"qe.h\"\n\n");
+ printf("/* This file was generated automatically by fbftoqe */\n\n"
+ "#include \"qe.h\"\n"
+ "#include \"fbfrender.h\"\n"
+ "\n");
for (i = 1; i < argc; i++) {
filename = argv[i];
Index: hex.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/hex.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- hex.c 3 Dec 2007 16:10:39 -0000 1.9
+++ hex.c 6 Dec 2007 17:43:48 -0000 1.10
@@ -20,7 +20,7 @@
#include "qe.h"
-extern ModeDef hex_mode;
+static ModeDef hex_mode;
static int to_disp(int c)
{
@@ -294,42 +294,42 @@
return pos;
}
-ModeDef ascii_mode = {
+static ModeDef ascii_mode = {
"ascii",
- instance_size: 0,
- mode_probe: NULL,
- mode_init: ascii_mode_init,
- mode_close: text_mode_close,
- text_display: hex_display,
- text_backward_offset: hex_backward_offset,
-
- move_up_down: hex_move_up_down,
- move_left_right: hex_move_left_right,
- move_bol: hex_move_bol,
- move_eol: hex_move_eol,
- scroll_up_down: text_scroll_up_down,
- write_char: text_write_char,
- mouse_goto: text_mouse_goto,
- mode_line: hex_mode_line,
+ .instance_size = 0,
+ .mode_probe = NULL,
+ .mode_init = ascii_mode_init,
+ .mode_close = text_mode_close,
+ .text_display = hex_display,
+ .text_backward_offset = hex_backward_offset,
+
+ .move_up_down = hex_move_up_down,
+ .move_left_right = hex_move_left_right,
+ .move_bol = hex_move_bol,
+ .move_eol = hex_move_eol,
+ .scroll_up_down = text_scroll_up_down,
+ .write_char = text_write_char,
+ .mouse_goto = text_mouse_goto,
+ .mode_line = hex_mode_line,
};
-ModeDef hex_mode = {
+static ModeDef hex_mode = {
"hex",
- instance_size: 0,
- mode_probe: hex_mode_probe,
- mode_init: hex_mode_init,
- mode_close: text_mode_close,
- text_display: hex_display,
- text_backward_offset: hex_backward_offset,
-
- move_up_down: hex_move_up_down,
- move_left_right: hex_move_left_right,
- move_bol: hex_move_bol,
- move_eol: hex_move_eol,
- scroll_up_down: text_scroll_up_down,
- write_char: hex_write_char,
- mouse_goto: text_mouse_goto,
- mode_line: hex_mode_line,
+ .instance_size = 0,
+ .mode_probe = hex_mode_probe,
+ .mode_init = hex_mode_init,
+ .mode_close = text_mode_close,
+ .text_display = hex_display,
+ .text_backward_offset = hex_backward_offset,
+
+ .move_up_down = hex_move_up_down,
+ .move_left_right = hex_move_left_right,
+ .move_bol = hex_move_bol,
+ .move_eol = hex_move_eol,
+ .scroll_up_down = text_scroll_up_down,
+ .write_char = hex_write_char,
+ .mouse_goto = text_mouse_goto,
+ .mode_line = hex_mode_line,
};
static int hex_init(void)
Index: html.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/html.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- html.c 3 Dec 2007 16:10:39 -0000 1.7
+++ html.c 6 Dec 2007 17:43:48 -0000 1.8
@@ -44,8 +44,6 @@
int parse_flags; /* can contain XML_HTML and XML_IGNORE_CASE */
} HTMLState;
-extern const char html_style[];
-
/* recompute cursor offset so that it is visible (find closest box) */
typedef struct {
CSSContext *ctx;
@@ -875,18 +873,18 @@
ModeDef html_mode = {
"html",
- instance_size: sizeof(HTMLState),
- mode_probe: html_mode_probe,
- mode_init: html_mode_init,
- mode_close: html_mode_close,
- display: html_display,
- move_left_right: html_move_left_right_visual,
- move_up_down: html_move_up_down,
- move_bol: html_move_bol,
- move_eol: html_move_eol,
- scroll_up_down: html_scroll_up_down,
- write_char: text_write_char,
- mouse_goto: html_mouse_goto,
+ .instance_size = sizeof(HTMLState),
+ .mode_probe = html_mode_probe,
+ .mode_init = html_mode_init,
+ .mode_close = html_mode_close,
+ .display = html_display,
+ .move_left_right = html_move_left_right_visual,
+ .move_up_down = html_move_up_down,
+ .move_bol = html_move_bol,
+ .move_eol = html_move_eol,
+ .scroll_up_down = html_scroll_up_down,
+ .write_char = text_write_char,
+ .mouse_goto = html_mouse_goto,
};
static int html_init(void)
Index: html2png.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/html2png.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- html2png.c 3 Dec 2007 16:10:39 -0000 1.8
+++ html2png.c 6 Dec 2007 17:43:48 -0000 1.9
@@ -326,8 +326,6 @@
}
#endif
-extern const char html_style[];
-
static int html_test_abort(__unused__ void *opaque)
{
return 0;
@@ -354,8 +352,7 @@
/* prepare default style sheet */
s->style_sheet = css_new_style_sheet();
- css_parse_style_sheet_str(s->style_sheet, html_style,
- flags);
+ css_parse_style_sheet_str(s->style_sheet, html_style, flags);
/* default colors */
s->selection_bgcolor = QERGB(0x00, 0x00, 0xff);
Index: latex-mode.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- latex-mode.c 6 Dec 2007 15:28:30 -0000 1.14
+++ latex-mode.c 6 Dec 2007 17:43:48 -0000 1.15
@@ -230,7 +230,7 @@
char *p;
int len;
- if (cmd == 0) {
+ if (cmd == NULL) {
put_status(func->es, "aborted");
return;
}
Index: libfbf.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libfbf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libfbf.c 31 Dec 2006 19:34:01 -0000 1.6
+++ libfbf.c 6 Dec 2007 17:43:48 -0000 1.7
@@ -41,7 +41,7 @@
static inline void uf_free(UniFontData *uf, void *ptr)
{
- return uf->fbf_free(uf->mem_opaque, ptr);
+ uf->fbf_free(uf->mem_opaque, ptr);
}
/* totally unoptimised get bit functions */
Index: qe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- qe.c 6 Dec 2007 15:28:30 -0000 1.35
+++ qe.c 6 Dec 2007 17:43:48 -0000 1.36
@@ -2,6 +2,7 @@
* QEmacs, tiny but powerful multimode editor
*
* Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000-2007 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -65,10 +66,11 @@
static QEditScreen global_screen;
static int screen_width = 0;
static int screen_height = 0;
+static int no_init_file;
+static const char *user_option;
+
EditBuffer *trace_buffer;
int trace_buffer_state;
-int no_init_file;
-const char *user_option;
/* mode handling */
@@ -3699,7 +3701,7 @@
char buf[128];
} QEKeyContext;
-QEKeyContext key_ctx;
+static QEKeyContext key_ctx;
/*
* All typed keys are sent to the callback. Previous grab is aborted
@@ -4165,7 +4167,7 @@
free(s);
}
-const char *file_completion_ignore_extensions =
+static const char *file_completion_ignore_extensions =
"|bak|bin|dll|exe|o|obj|";
void file_completion(StringArray *cs, const char *input)
@@ -4268,9 +4270,7 @@
static int minibuffer_history_index;
static int minibuffer_history_saved_offset;
-ModeDef minibuffer_mode;
-
-extern CmdDef minibuffer_commands[];
+static ModeDef minibuffer_mode;
/* XXX: utf8 ? */
void do_completion(EditState *s)
@@ -4587,9 +4587,7 @@
/* less mode */
-ModeDef less_mode;
-
-extern CmdDef less_commands[];
+static ModeDef less_mode;
/* XXX: incorrect to save it. Should use a safer method */
static EditState *popup_saved_active;
@@ -4858,7 +4856,7 @@
probe_data.filename = b->filename;
probe_data.mode = mode;
- while (m != 0) {
+ while (m != NULL) {
if (m->mode_probe) {
percent = m->mode_probe(&probe_data);
if (percent > best_probe_percent) {
@@ -6477,22 +6475,22 @@
ModeDef text_mode = {
"text",
- instance_size: 0,
- mode_probe: text_mode_probe,
- mode_init: text_mode_init,
- mode_close: text_mode_close,
-
- text_display: text_display,
- text_backward_offset: text_backward_offset,
-
- move_up_down: text_move_up_down,
- move_left_right: text_move_left_right_visual,
- move_bol: text_move_bol,
- move_eol: text_move_eol,
- move_word_left_right: text_move_word_left_right,
- scroll_up_down: text_scroll_up_down,
- write_char: text_write_char,
- mouse_goto: text_mouse_goto,
+ .instance_size = 0,
+ .mode_probe = text_mode_probe,
+ .mode_init = text_mode_init,
+ .mode_close = text_mode_close,
+
+ .text_display = text_display,
+ .text_backward_offset = text_backward_offset,
+
+ .move_up_down = text_move_up_down,
+ .move_left_right = text_move_left_right_visual,
+ .move_bol = text_move_bol,
+ .move_eol = text_move_eol,
+ .move_word_left_right = text_move_word_left_right,
+ .scroll_up_down = text_scroll_up_down,
+ .write_char = text_write_char,
+ .mouse_goto = text_mouse_goto,
};
/* find a resource file */
@@ -6955,13 +6953,13 @@
static CmdOptionDef cmd_options[] = {
{ "help", "h", NULL, 0, "display this help message and exit",
- {func_noarg: show_usage}},
+ { .func_noarg = show_usage }},
{ "no-init-file", "q", NULL, CMD_OPT_BOOL, "do not load config files",
- {int_ptr: &no_init_file}},
+ { .int_ptr = &no_init_file }},
{ "user", "u", "USER", CMD_OPT_ARG, "load ~USER/.qe/config instead of your
own",
- {func_arg: set_user_option}},
+ { .func_arg = set_user_option }},
{ "version", "V", NULL, 0, "display version information and exit",
- {func_noarg: show_version}},
+ { .func_noarg = show_version }},
{ NULL, NULL, NULL, 0, NULL, { NULL }},
};
Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- qe.h 6 Dec 2007 15:28:30 -0000 1.29
+++ qe.h 6 Dec 2007 17:43:48 -0000 1.30
@@ -56,6 +56,14 @@
#define __unused__
#endif
+#ifdef __SPARSE__
+#define __bitwise__ __attribute__((bitwise))
+#define force_cast(type, expr) ((__attribute__((force)) type)(expr))
+#else
+#define __bitwise__
+#define force_cast(type, expr) ((type)(expr))
+#endif
+
/************************/
#include "cutils.h"
@@ -1011,13 +1019,13 @@
} CmdDef;
/* new command macros */
-#define CMD_(key, key_alt, name, func, args) { key, key_alt, name "\0" args, {
(void *)(func) }, 0 },
+#define CMD_(key, key_alt, name, func, args) { key, key_alt, name "\0" args, {
(void *)(func) }, NULL },
#define CMDV(key, key_alt, name, func, val, args) { key, key_alt, name "\0"
args, { (void *)(func) }, (void *)(val) },
/* old macros for compatibility */
#define CMD0(key, key_alt, name, func) { key, key_alt, name "\0", { (void
*)(func) }, NULL },
#define CMD1(key, key_alt, name, func, val) { key, key_alt, name "\0v", {
(void *)(func) }, (void*)(val) },
-#define CMD_DEF_END { 0, 0, NULL, { NULL }, 0 }
+#define CMD_DEF_END { 0, 0, NULL, { NULL }, NULL }
void qe_register_mode(ModeDef *m);
void mode_completion(StringArray *cs, const char *input);
@@ -1157,6 +1165,9 @@
void less_mode_init(void);
void minibuffer_init(void);
+extern CmdDef minibuffer_commands[];
+extern CmdDef less_commands[];
+
typedef void (*CompletionFunc)(StringArray *cs, const char *input);
typedef struct CompletionEntry {
Index: qeconfig.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qeconfig.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- qeconfig.h 3 Dec 2007 16:10:39 -0000 1.14
+++ qeconfig.h 6 Dec 2007 17:43:48 -0000 1.15
@@ -22,7 +22,7 @@
/*
* default qemacs configuration
*/
-CmdDef basic_commands[] = {
+static CmdDef basic_commands[] = {
CMDV( KEY_DEFAULT, KEY_NONE, "self-insert-command", do_char, ' ', "*v")
CMD_( KEY_CTRL('o'), KEY_NONE, "open-line", do_open_line, "*")
CMD1( KEY_CTRL('p'), KEY_UP, "previous-line", do_up_down, -1 )
Index: unicode_join.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/unicode_join.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- unicode_join.c 3 Dec 2007 16:12:40 -0000 1.5
+++ unicode_join.c 6 Dec 2007 17:43:48 -0000 1.6
@@ -127,7 +127,7 @@
const unsigned short *lig;
unsigned int buf[len];
- memcpy(buf, buf_out, len * sizeof(int));
+ memcpy(buf, buf_out, len * sizeof(unsigned int));
q = buf_out;
for (i = 0; i < len;) {
Index: unihex.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/unihex.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- unihex.c 3 Dec 2007 16:10:39 -0000 1.5
+++ unihex.c 6 Dec 2007 17:43:48 -0000 1.6
@@ -152,22 +152,22 @@
s->offset = eb_goto_char(s->b, pos);
}
-ModeDef unihex_mode = {
+static ModeDef unihex_mode = {
"unihex",
- instance_size: 0,
- mode_probe: NULL,
- mode_init: unihex_mode_init,
- mode_close: text_mode_close,
- text_display: unihex_display,
- text_backward_offset: unihex_backward_offset,
+ .instance_size = 0,
+ .mode_probe = NULL,
+ .mode_init = unihex_mode_init,
+ .mode_close = text_mode_close,
+ .text_display = unihex_display,
+ .text_backward_offset = unihex_backward_offset,
- move_up_down: unihex_move_up_down,
- move_left_right: unihex_move_left_right,
- move_bol: unihex_move_bol,
- move_eol: unihex_move_eol,
- scroll_up_down: text_scroll_up_down,
- write_char: hex_write_char,
- mouse_goto: text_mouse_goto,
+ .move_up_down = unihex_move_up_down,
+ .move_left_right = unihex_move_left_right,
+ .move_bol = unihex_move_bol,
+ .move_eol = unihex_move_eol,
+ .scroll_up_down = text_scroll_up_down,
+ .write_char = hex_write_char,
+ .mouse_goto = text_mouse_goto,
};
Index: util.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/util.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- util.c 6 Dec 2007 15:28:30 -0000 1.19
+++ util.c 6 Dec 2007 17:43:48 -0000 1.20
@@ -830,7 +830,7 @@
/* XXX: handle unicode */
while (*buf) {
- c = tolower(*(const unsigned char *)buf);
+ c = tolower((unsigned char)*buf);
*buf++ = c;
}
}
Index: x11.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/x11.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- x11.c 3 Dec 2007 16:10:39 -0000 1.10
+++ x11.c 6 Dec 2007 17:43:48 -0000 1.11
@@ -90,7 +90,7 @@
static int font_ptsize;
//} x11_state;
-const char *default_x11_fonts[NB_FONT_FAMILIES] = {
+static const char *default_x11_fonts[NB_FONT_FAMILIES] = {
#ifdef CONFIG_XFT
"mono",
#else
@@ -1718,13 +1718,13 @@
static CmdOptionDef cmd_options[] = {
{ "no-windows", "nw", NULL, CMD_OPT_BOOL, "force tty terminal usage",
- {int_ptr: &force_tty} },
+ { .int_ptr = &force_tty }},
{ "display", "d", "display", CMD_OPT_STRING | CMD_OPT_ARG, "set X11
display",
- {string_ptr: &display_str} },
+ { .string_ptr = &display_str }},
{ "geometry", "g", "WxH", CMD_OPT_STRING | CMD_OPT_ARG, "set X11 display
size",
- {string_ptr: &geometry_str} },
+ { .string_ptr = &geometry_str }},
{ "font-size", "fs", "ptsize", CMD_OPT_INT | CMD_OPT_ARG, "set default
font size",
- {int_ptr: &font_ptsize} },
+ { .int_ptr = &font_ptsize }},
{ NULL, NULL, NULL, 0, NULL, { NULL }},
};
Index: kmap/README
===================================================================
RCS file: /cvsroot/qemacs/qemacs/kmap/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- kmap/README 4 Dec 2007 09:22:50 -0000 1.3
+++ kmap/README 6 Dec 2007 17:43:48 -0000 1.4
@@ -55,3 +55,6 @@
3915 Jan 9 2001 Thai.kmap
7774 Jan 9 2001 VietnameseTelex.kmap
4339 Jan 9 2001 Welsh.kmap
+
+version 2.8.1 of yudit uses a compiled format.
+kmap files have moved to yudit-2.8.1/mytool/kmap
Index: libqhtml/css.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/css.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libqhtml/css.c 3 Dec 2007 16:12:40 -0000 1.8
+++ libqhtml/css.c 6 Dec 2007 17:43:49 -0000 1.9
@@ -271,7 +271,7 @@
static CSSIdentEntry **table_ident;
static int table_ident_nb, table_ident_allocated;
-const char css_idents[] =
+static char const css_idents[] =
"\0"
"*\0"
#define CSSID(id) #id "\0"
Index: libqhtml/css.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/css.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libqhtml/css.h 9 Dec 2006 19:04:15 -0000 1.4
+++ libqhtml/css.h 6 Dec 2007 17:43:49 -0000 1.5
@@ -624,6 +624,7 @@
CSSAbortFunc *abort_func, void *abort_opaque);
int find_entity(const char *str);
const char *find_entity_str(int code);
+
#endif
/* The following functions must be provided by the user */
@@ -642,3 +643,6 @@
int css_read(CSSFile *f, char *buf, int size);
void css_close(CSSFile *f);
+extern const char docbook_style[];
+extern const char html_style[];
+
Index: libqhtml/csstoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/csstoqe.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libqhtml/csstoqe.c 28 Dec 2006 11:27:30 -0000 1.4
+++ libqhtml/csstoqe.c 6 Dec 2007 17:43:49 -0000 1.5
@@ -13,7 +13,11 @@
exit(1);
}
- printf("/* Automatically generated file - do not edit */\n");
+ printf("/* Automatically generated file - do not edit */\n"
+ "\n"
+ "#include \"qe.h\"\n"
+ "#include \"css.h\"\n"
+ "\n");
printf("const char %s[] =\n", argv[1]);
n = 0;
got_space = 0;
Index: libqhtml/xmlparse.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/xmlparse.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libqhtml/xmlparse.c 3 Dec 2007 16:12:40 -0000 1.9
+++ libqhtml/xmlparse.c 6 Dec 2007 17:43:49 -0000 1.10
@@ -40,7 +40,7 @@
#define ENTITY(name, value) { #name, value },
-const XMLEntity html_entities[] = {
+static XMLEntity const html_entities[] = {
#include "htmlent.h"
{ NULL, 0 },
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] qemacs bufed.c buffer.c cfb.c charsetjis.c char...,
Charlie Gordon <=