Merge branch 'clareb'

diff --git a/pctb/README b/pctb/README
index 185a022ec3665e0fb3b58377b999f78139d7f747..e6d7707616b4049b2f1d40d3e7957fc70e1bf93e 100644 (file)
--- a/pctb/README
+++ b/pctb/README
@@ -80,7 +80,10 @@ This program has quite a few dependencies:
  - Perl interpreter and basic modules                  perl (usu.installed)
 
 On other Linux distros the packages may have different names, but
-these should be roughly right for Debian and its derivatives.
+these should be roughly right for Debian and its derivatives.  You can
+install them with this rune:
+  sudo apt-get install build-essential libnetpbm10-dev netpbm libx11-dev libxtst-dev libpcre3-dev tk8.4 libxml-parser-perl libjson-perl
+
 
 The supplied helper programs
   dictionary-manager

diff --git a/pctb/convert.c b/pctb/convert.c
index 3250d183a940caa8397b75e502ed3237b5303e67..3c5af994c3f7c9db88c8cc22875b7979f6384bad 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -66,7 +66,9 @@ FILE *screenshot_file;
 const char *o_ocean, *o_pirate;
 int o_quiet;
 
-enum flags o_flags= ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
+enum flags o_flags=
+   ff_charset_allowedit |
+   ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
 
 static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
 static void vbadusage(const char *fmt, va_list al) {