qemacs: update to 0.5.0.20170701.

This commit is contained in:
Leah Neukirchen 2017-09-13 15:40:23 +02:00
parent b1a3effd59
commit 0d60ec141b
2 changed files with 8 additions and 38 deletions

View file

@ -1,31 +0,0 @@
diff --git tty.c tty.c
index bff0a97..21287a4 100644
--- tty.c
+++ tty.c
@@ -95,7 +95,6 @@ typedef struct TTYState {
/* input handling */
enum InputState input_state;
int input_param;
- int utf8_state;
int utf8_index;
unsigned char buf[10];
char *term_name;
@@ -413,12 +412,14 @@ static void tty_read_handler(void *opaque)
/* charset handling */
if (s->charset == &charset_utf8) {
- if (ts->utf8_state == 0) {
- const char *p = cs8(ts->buf);
+ /* Make sure utf8 input works correctly 20040314 <damm@opensource.se> */
+ ts->utf8_index++;
+ if (utf8_length[ts->buf[0]] == ts->utf8_index) {
+ const char *p;
+ p = (const char *)ts->buf;
ch = utf8_decode(&p);
- } else {
- ts->utf8_state = utf8_length[ts->buf[0]] - 1;
ts->utf8_index = 0;
+ } else {
return;
}
} else {

View file

@ -1,14 +1,14 @@
# Template file for 'qemacs'
pkgname=qemacs
version=0.4.0.20140809
revision=2
version=0.5.0.20170701
revision=1
wrksrc="${pkgname}"
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man
--disable-x11 --disable-plugins"
hostmakedepends="cvs"
short_desc="Small but powerful Emacs clone (feat. UTF-8, HTML, shell, dired)"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
short_desc="Small but powerful Emacs clone (with UTF-8, HTML, shell, dired)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1"
homepage="http://bellard.org/qemacs/"
@ -16,17 +16,18 @@ do_fetch() {
cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs \
co -D ${version##*.} qemacs
}
do_build() {
sed -i -e /HOST_CC/s/CFLAGS/HOST_CFLAGS/ -e /INSTALL/s/-s// \
Makefile */Makefile
echo CONFIG_HTML=yes >>config.mak
echo '#define CONFIG_HTML 1' >>config.h
make V=1 TARGETS=qe STRIP=echo CC="$CC" \
CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.." \
LDFLAGS="$LDFLAGS"
}
do_install() {
make TARGETS=qe DESTDIR="$DESTDIR" CONFIG_HTML= install
make V=1 TARGETS=qe STRIP=echo CC="$CC" \
CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.." \
LDFLAGS="$LDFLAGS" CONFIG_HTML= install
vdoc qe-doc.html
}