summaryrefslogtreecommitdiffabout
path: root/src/ellinika
authorSergey Poznyakoff <gray@gnu.org>2018-09-10 06:55:17 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-09-10 07:00:57 (GMT)
commit3c71deb63229da1bf3e75470499048bdce378966 (patch) (side-by-side diff)
treeac07a8074ead739f9d04b187682667919cbdff95 /src/ellinika
parent9c24462716287ee5b1903dbfb77238fda0af31db (diff)
downloadellinika-3c71deb63229da1bf3e75470499048bdce378966.tar.gz
ellinika-3c71deb63229da1bf3e75470499048bdce378966.tar.bz2
Minor changes
* elisp/ellinika-dict-mode.el: Use deactivate-input-method instead of deprecated inactivate-input-method. * elisp/ellinika-mode.el: Likewise. * src/ellinika/Makefile.am: Fix dependencies. * src/ellinika/elmorph.c: Minor changes for switch to Guile 2.2
Diffstat (limited to 'src/ellinika') (more/less context) (ignore whitespace changes)
-rw-r--r--src/ellinika/Makefile.am3
-rw-r--r--src/ellinika/elmorph.c12
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am
index 5f476ef..99a2918 100644
--- a/src/ellinika/Makefile.am
+++ b/src/ellinika/Makefile.am
@@ -75,2 +75,5 @@ DISTCLEANFILES = $(DOT_X_FILES)
+phoneme.h phoneme.c: phoneme.y
+elchr.c: phoneme.h
+
pkglibnames=elmorph
diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c
index 5094db8..ab5dea4 100644
--- a/src/ellinika/elmorph.c
+++ b/src/ellinika/elmorph.c
@@ -131,3 +131,3 @@ _elstr_dup(struct elstr *elstr)
if (!elnew->str)
- scm_memory_error("_elstr_dup");
+ scm_report_out_of_memory();
memcpy(elnew->str, elstr->str, sizeof(elstr->str[0]) * elstr->len);
@@ -140,3 +140,3 @@ _elstr_dup(struct elstr *elstr)
free(elnew->str);
- scm_memory_error("_elstr_dup");
+ scm_report_out_of_memory();
}
@@ -152,3 +152,3 @@ _elstr_dup(struct elstr *elstr)
free(elnew->str);
- scm_memory_error("_elstr_dup");
+ scm_report_out_of_memory();
}
@@ -175,3 +175,3 @@ _elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name)
if (!wp)
- scm_memory_error(func_name);
+ scm_report_out_of_memory();
dest->str = wp;
@@ -183,3 +183,3 @@ _elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name)
-static scm_sizet
+static size_t
_elstr_free(SCM smob)
@@ -791,3 +791,3 @@ _elstr_thema_aoristoy(SCM el, int destructive, const char *func_name)
if (elmorph_thema_aoristoy(elstr->str, elstr->len, &wc, &wclen))
- scm_memory_error(func_name);
+ scm_report_out_of_memory();
free(elstr->str);

Return to:

Send suggestions and report system problems to the System administrator.