diff -Nru kkedit-0.3.3/autom4te.cache/output.0 kkedit-0.4.1/autom4te.cache/output.0
--- kkedit-0.3.3/autom4te.cache/output.0	2016-05-23 09:23:38.000000000 +0000
+++ kkedit-0.4.1/autom4te.cache/output.0	2016-08-26 09:41:39.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.3.3.
+@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.4.1.
 @%:@
 @%:@ Report bugs to <PROJ>.
 @%:@ 
@@ -579,20 +579,27 @@
 # Identity of this package.
 PACKAGE_NAME='KKEdit'
 PACKAGE_TARNAME='KKEdit'
-PACKAGE_VERSION='0.3.3'
-PACKAGE_STRING='KKEdit 0.3.3'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='KKEdit 0.4.1'
 PACKAGE_BUGREPORT='PROJ'
 PACKAGE_URL=''
 
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIB@&t@OBJS
-with_debug_level
+ac_subst_vars='with_debug_level
 with_gsu_path
 MANPAGEEDITOR
 GTKSU
+SEDCOMMAND
+ICONV_LIBS
 CTAGS
+EXCTAGS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 ASPELL_LIBS
 with_qt5_docdir
 WEBKIT_LIBS
@@ -603,10 +610,17 @@
 GTKSRC_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
+PLUGVERSION
+GTKVERSION
 GTK3SUFFIX
 VTEVERS
-PLUGVERSION
-PLUGINCLUDES
+USE290
+NEWPLUGINCLUDES
+PLUGDIRS
+am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIB@&t@OBJS
 VTE_LIBS
 VTE_CFLAGS
 X11_LIBS
@@ -712,6 +726,7 @@
 enable_silent_rules
 enable_gtk3
 enable_plugins
+enable_unstable_plugins
 enable_docviewer
 with_qt5_docdir
 enable_aspell
@@ -1285,7 +1300,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures KKEdit 0.3.3 to adapt to many kinds of systems.
+\`configure' configures KKEdit 0.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1346,12 +1361,16 @@
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of KKEdit 0.3.3:";;
+     short | recursive ) echo "Configuration of KKEdit 0.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1367,6 +1386,8 @@
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-gtk3           Use GTK3.
   --enable-plugins        Build/Install plugins
+  --disable-unstable-plugins 
+                          Build/Install unstable/new plugins
   --enable-docviewer      Build the Gtk-Doc viewer
   --enable-aspell         Include spellchecker
 
@@ -1474,7 +1495,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-KKEdit configure 0.3.3
+KKEdit configure 0.4.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1646,7 +1667,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by KKEdit $as_me 0.3.3, which was
+It was created by KKEdit $as_me 0.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3083,7 +3104,7 @@
 
 # Define the identity of the package.
  PACKAGE='KKEdit'
- VERSION='0.3.3'
+ VERSION='0.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4651,6 +4672,7 @@
 	program_transform_name='s,\(^[kK].*t.*\),\1-3,'
 	PLUGVERSION=3
 	GTK3SUFFIX=-3
+	GTKVERSION=3
 else
 	GTK_MODULES="gtk+-2.0 >= 2.24.0"
 	GTKSRC_MODULES="gtksourceview-2.0 >= 2.9.9"
@@ -4658,6 +4680,8 @@
 $as_echo "@%:@define _EXECSUFFIX_ \"\"" >>confdefs.h
 
 	PLUGVERSION=2
+	GTKVERSION=2
+	GTK3SUFFIX=
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Build/Install plugins" >&5
@@ -4672,7 +4696,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_plugs" >&5
 $as_echo "$enable_plugs" >&6; }
 if test "$enable_plugs" = "yes"; then
-	PLUGINCLUDES="KKEdit/plugins/TerminalPane KKEdit/plugins/ClipboardPlugin KKEdit/plugins/FileBrowser KKEdit/plugins/SessionManager"
+	PLUGDIRS="KKEdit/plugins/TerminalPane KKEdit/plugins/SessionManager KKEdit/plugins/FileBrowser KKEdit/plugins/ClipboardPlugin"
 	if test "$enable_gtk3" = "yes"; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Finding vte version" >&5
 $as_echo_n "checking Finding vte version... " >&6; }
@@ -4688,12 +4712,13 @@
 fi
 		if test $usevte = 91; then
 			VTE_MODULES="vte-2.91 >= 0.40.0"
-			VTEVERS=2.91
+			VTEVERS="-2.91"
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $VTEVERS" >&5
 $as_echo "using $VTEVERS" >&6; }
 		else
 			VTE_MODULES="vte-2.90 >= 0.29.1"
-			VTEVERS=2.90
+			VTEVERS="-2.90"
+			USE290="-D_VTEVERS290_"
 			
 $as_echo "@%:@define _VTEVERS290_ \"\"" >>confdefs.h
 
@@ -4778,108 +4803,1590 @@
 	PLUGINCLUDES=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Build/Install unstable/new plugins" >&5
+$as_echo_n "checking Build/Install unstable/new plugins... " >&6; }
+@%:@ Check whether --enable-unstable-plugins was given.
+if test "${enable_unstable_plugins+set}" = set; then :
+  enableval=$enable_unstable_plugins; enable_new_plugs=$enableval
+else
+  enable_new_plugs="no"
+fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_new_plugs" >&5
+$as_echo "$enable_new_plugs" >&6; }
+if test "$enable_new_plugs" = "yes"; then
+	NEWPLUGINCLUDES=KKEdit/unstable-plugins/*Plugin
+	ac_config_files="$ac_config_files KKEdit/unstable-plugins/BrowserPlugin/Makefile KKEdit/unstable-plugins/MacroPlugin/Makefile"
 
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
+_ACEOF
 
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
 
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-if test -n "$GTK_CFLAGS"; then
-    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes 
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GTK_LIBS"; then
-    pkg_cv_GTK_LIBS="$GTK_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes 
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIB@&t@OBJS=$ac_libobjs
 
+LTLIBOBJS=$ac_ltlibobjs
 
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
 else
-        _pkg_short_errors_supported=no
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
-        else 
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($GTK_MODULES) were not met:
-
-$GTK_PKG_ERRORS
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
 
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5        
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
 
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }        
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	
+  case `(set -o) 2>/dev/null` in @%:@(
+  *posix*) :
+    set -o posix ;; @%:@(
+  *) :
+     ;;
+esac
 fi
 
 
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSRC" >&5
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in @%:@(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in @%:@((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD]
+@%:@ ----------------------------------------
+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+@%:@ script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} @%:@ as_fn_error
+
+
+@%:@ as_fn_set_status STATUS
+@%:@ -----------------------
+@%:@ Set @S|@? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} @%:@ as_fn_set_status
+
+@%:@ as_fn_exit STATUS
+@%:@ -----------------
+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} @%:@ as_fn_exit
+
+@%:@ as_fn_unset VAR
+@%:@ ---------------
+@%:@ Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+@%:@ as_fn_append VAR VALUE
+@%:@ ----------------------
+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
+@%:@ advantage of any shell optimizations that allow amortized linear growth over
+@%:@ repeated appends, instead of the typical quadratic growth present in naive
+@%:@ implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+@%:@ as_fn_arith ARG...
+@%:@ ------------------
+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+@%:@ as_fn_mkdir_p
+@%:@ -------------
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} @%:@ as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by KKEdit $as_me 0.4.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE] 
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE] 
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <PROJ>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+KKEdit config.status 0.4.1
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "KKEdit/unstable-plugins/BrowserPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/BrowserPlugin/Makefile" ;;
+    "KKEdit/unstable-plugins/MacroPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/MacroPlugin/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+  
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+else
+	NEWPLUGINCLUDES=
+fi
+
+
+
+
+
+
+
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes 
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes 
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
+        else 
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements ($GTK_MODULES) were not met:
+
+$GTK_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5        
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }        
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	
+fi
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSRC" >&5
 $as_echo_n "checking for GTKSRC... " >&6; }
 
 if test -n "$GTKSRC_CFLAGS"; then
@@ -5213,7 +6720,133 @@
 
 fi
 
-# Extract the first word of "ctags ", so it can be a program name with args.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+case $host_os in
+
+	*BSD* | *bsd* )
+		
+$as_echo "@%:@define _INBSD_ /**/" >>confdefs.h
+
+		# Extract the first word of "exctags ", so it can be a program name with args.
+set dummy exctags ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_EXCTAGS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$EXCTAGS"; then
+  ac_cv_prog_EXCTAGS="$EXCTAGS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_EXCTAGS="true"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_EXCTAGS" && ac_cv_prog_EXCTAGS="false"
+fi
+fi
+EXCTAGS=$ac_cv_prog_EXCTAGS
+if test -n "$EXCTAGS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXCTAGS" >&5
+$as_echo "$EXCTAGS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if test $EXCTAGS = false; then
+			as_fn_error $? "No exctags program found!" "$LINENO" 5
+		fi
+		ICONV_LIBS=-liconv
+		SEDCOMMAND="sed -i ''"
+		;;
+
+	*)
+		
+$as_echo "@%:@define _INLINUX_ /**/" >>confdefs.h
+
+		# Extract the first word of "ctags ", so it can be a program name with args.
 set dummy ctags ; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5251,9 +6884,16 @@
 fi
 
 
-if test $CTAGS = false; then
-	as_fn_error $? "No ctags program found!" "$LINENO" 5
-fi
+		if test $CTAGS = false; then
+			as_fn_error $? "No ctags program found!" "$LINENO" 5
+		fi
+		ICONV_LIBS=
+		SEDCOMMAND="sed -i"
+		;;
+esac
+
+
+
 
 # Extract the first word of "gtksu ", so it can be a program name with args.
 set dummy gtksu ; ac_word=$2
@@ -5374,7 +7014,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debug level to $with_debug_level" >&5
 $as_echo "Setting debug level to $with_debug_level" >&6; }
 
-ac_config_files="$ac_config_files Makefile KKEdit/app/Makefile"
+ac_config_files="$ac_config_files Makefile KKEdit/app/Makefile KKEdit/plugins/TerminalPane/Makefile KKEdit/plugins/SessionManager/Makefile KKEdit/plugins/FileBrowser/Makefile KKEdit/plugins/ClipboardPlugin/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5513,6 +7153,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
+  as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -5910,7 +7554,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by KKEdit $as_me 0.3.3, which was
+This file was extended by KKEdit $as_me 0.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5976,7 +7620,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-KKEdit config.status 0.3.3
+KKEdit config.status 0.4.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6107,8 +7751,14 @@
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "KKEdit/unstable-plugins/BrowserPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/BrowserPlugin/Makefile" ;;
+    "KKEdit/unstable-plugins/MacroPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/MacroPlugin/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "KKEdit/app/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/app/Makefile" ;;
+    "KKEdit/plugins/TerminalPane/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/TerminalPane/Makefile" ;;
+    "KKEdit/plugins/SessionManager/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/SessionManager/Makefile" ;;
+    "KKEdit/plugins/FileBrowser/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/FileBrowser/Makefile" ;;
+    "KKEdit/plugins/ClipboardPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/ClipboardPlugin/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff -Nru kkedit-0.3.3/autom4te.cache/output.1 kkedit-0.4.1/autom4te.cache/output.1
--- kkedit-0.3.3/autom4te.cache/output.1	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/autom4te.cache/output.1	2016-08-26 09:41:39.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.3.3.
+@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.4.1.
 @%:@
 @%:@ Report bugs to <PROJ>.
 @%:@ 
@@ -579,20 +579,27 @@
 # Identity of this package.
 PACKAGE_NAME='KKEdit'
 PACKAGE_TARNAME='KKEdit'
-PACKAGE_VERSION='0.3.3'
-PACKAGE_STRING='KKEdit 0.3.3'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='KKEdit 0.4.1'
 PACKAGE_BUGREPORT='PROJ'
 PACKAGE_URL=''
 
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIB@&t@OBJS
-with_debug_level
+ac_subst_vars='with_debug_level
 with_gsu_path
 MANPAGEEDITOR
 GTKSU
+SEDCOMMAND
+ICONV_LIBS
 CTAGS
+EXCTAGS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 ASPELL_LIBS
 with_qt5_docdir
 WEBKIT_LIBS
@@ -603,10 +610,17 @@
 GTKSRC_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
+PLUGVERSION
+GTKVERSION
 GTK3SUFFIX
 VTEVERS
-PLUGVERSION
-PLUGINCLUDES
+USE290
+NEWPLUGINCLUDES
+PLUGDIRS
+am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIB@&t@OBJS
 VTE_LIBS
 VTE_CFLAGS
 X11_LIBS
@@ -712,6 +726,7 @@
 enable_silent_rules
 enable_gtk3
 enable_plugins
+enable_unstable_plugins
 enable_docviewer
 with_qt5_docdir
 enable_aspell
@@ -1285,7 +1300,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures KKEdit 0.3.3 to adapt to many kinds of systems.
+\`configure' configures KKEdit 0.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1346,12 +1361,16 @@
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of KKEdit 0.3.3:";;
+     short | recursive ) echo "Configuration of KKEdit 0.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1367,6 +1386,8 @@
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-gtk3           Use GTK3.
   --enable-plugins        Build/Install plugins
+  --disable-unstable-plugins 
+                          Build/Install unstable/new plugins
   --enable-docviewer      Build the Gtk-Doc viewer
   --enable-aspell         Include spellchecker
 
@@ -1474,7 +1495,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-KKEdit configure 0.3.3
+KKEdit configure 0.4.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1646,7 +1667,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by KKEdit $as_me 0.3.3, which was
+It was created by KKEdit $as_me 0.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3083,7 +3104,7 @@
 
 # Define the identity of the package.
  PACKAGE='KKEdit'
- VERSION='0.3.3'
+ VERSION='0.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4651,6 +4672,7 @@
 	program_transform_name='s,\(^[kK].*t.*\),\1-3,'
 	PLUGVERSION=3
 	GTK3SUFFIX=-3
+	GTKVERSION=3
 else
 	GTK_MODULES="gtk+-2.0 >= 2.24.0"
 	GTKSRC_MODULES="gtksourceview-2.0 >= 2.9.9"
@@ -4658,6 +4680,8 @@
 $as_echo "@%:@define _EXECSUFFIX_ \"\"" >>confdefs.h
 
 	PLUGVERSION=2
+	GTKVERSION=2
+	GTK3SUFFIX=
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Build/Install plugins" >&5
@@ -4672,7 +4696,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_plugs" >&5
 $as_echo "$enable_plugs" >&6; }
 if test "$enable_plugs" = "yes"; then
-	PLUGINCLUDES="KKEdit/plugins/TerminalPane KKEdit/plugins/ClipboardPlugin KKEdit/plugins/FileBrowser KKEdit/plugins/SessionManager"
+	PLUGDIRS="KKEdit/plugins/TerminalPane KKEdit/plugins/SessionManager KKEdit/plugins/FileBrowser KKEdit/plugins/ClipboardPlugin"
 	if test "$enable_gtk3" = "yes"; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Finding vte version" >&5
 $as_echo_n "checking Finding vte version... " >&6; }
@@ -4688,12 +4712,13 @@
 fi
 		if test $usevte = 91; then
 			VTE_MODULES="vte-2.91 >= 0.40.0"
-			VTEVERS=2.91
+			VTEVERS="-2.91"
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $VTEVERS" >&5
 $as_echo "using $VTEVERS" >&6; }
 		else
 			VTE_MODULES="vte-2.90 >= 0.29.1"
-			VTEVERS=2.90
+			VTEVERS="-2.90"
+			USE290="-D_VTEVERS290_"
 			
 $as_echo "@%:@define _VTEVERS290_ \"\"" >>confdefs.h
 
@@ -4778,108 +4803,1590 @@
 	PLUGINCLUDES=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Build/Install unstable/new plugins" >&5
+$as_echo_n "checking Build/Install unstable/new plugins... " >&6; }
+@%:@ Check whether --enable-unstable-plugins was given.
+if test "${enable_unstable_plugins+set}" = set; then :
+  enableval=$enable_unstable_plugins; enable_new_plugs=$enableval
+else
+  enable_new_plugs="no"
+fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_new_plugs" >&5
+$as_echo "$enable_new_plugs" >&6; }
+if test "$enable_new_plugs" = "yes"; then
+	NEWPLUGINCLUDES=KKEdit/unstable-plugins/*Plugin
+	ac_config_files="$ac_config_files KKEdit/unstable-plugins/BrowserPlugin/Makefile KKEdit/unstable-plugins/MacroPlugin/Makefile"
 
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
+_ACEOF
 
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
 
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-if test -n "$GTK_CFLAGS"; then
-    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes 
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GTK_LIBS"; then
-    pkg_cv_GTK_LIBS="$GTK_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes 
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIB@&t@OBJS=$ac_libobjs
 
+LTLIBOBJS=$ac_ltlibobjs
 
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
 else
-        _pkg_short_errors_supported=no
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
-        else 
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($GTK_MODULES) were not met:
-
-$GTK_PKG_ERRORS
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
 
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5        
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
 
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }        
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	
+  case `(set -o) 2>/dev/null` in @%:@(
+  *posix*) :
+    set -o posix ;; @%:@(
+  *) :
+     ;;
+esac
 fi
 
 
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSRC" >&5
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in @%:@(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in @%:@((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD]
+@%:@ ----------------------------------------
+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+@%:@ script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} @%:@ as_fn_error
+
+
+@%:@ as_fn_set_status STATUS
+@%:@ -----------------------
+@%:@ Set @S|@? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} @%:@ as_fn_set_status
+
+@%:@ as_fn_exit STATUS
+@%:@ -----------------
+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} @%:@ as_fn_exit
+
+@%:@ as_fn_unset VAR
+@%:@ ---------------
+@%:@ Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+@%:@ as_fn_append VAR VALUE
+@%:@ ----------------------
+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
+@%:@ advantage of any shell optimizations that allow amortized linear growth over
+@%:@ repeated appends, instead of the typical quadratic growth present in naive
+@%:@ implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+@%:@ as_fn_arith ARG...
+@%:@ ------------------
+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+@%:@ as_fn_mkdir_p
+@%:@ -------------
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} @%:@ as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by KKEdit $as_me 0.4.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE] 
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE] 
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <PROJ>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+KKEdit config.status 0.4.1
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "KKEdit/unstable-plugins/BrowserPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/BrowserPlugin/Makefile" ;;
+    "KKEdit/unstable-plugins/MacroPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/MacroPlugin/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+  
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+else
+	NEWPLUGINCLUDES=
+fi
+
+
+
+
+
+
+
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes 
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes 
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
+        else 
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements ($GTK_MODULES) were not met:
+
+$GTK_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5        
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }        
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	
+fi
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSRC" >&5
 $as_echo_n "checking for GTKSRC... " >&6; }
 
 if test -n "$GTKSRC_CFLAGS"; then
@@ -5213,7 +6720,133 @@
 
 fi
 
-# Extract the first word of "ctags ", so it can be a program name with args.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+case $host_os in
+
+	*BSD* | *bsd* )
+		
+$as_echo "@%:@define _INBSD_ /**/" >>confdefs.h
+
+		# Extract the first word of "exctags ", so it can be a program name with args.
+set dummy exctags ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_EXCTAGS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$EXCTAGS"; then
+  ac_cv_prog_EXCTAGS="$EXCTAGS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_EXCTAGS="true"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_EXCTAGS" && ac_cv_prog_EXCTAGS="false"
+fi
+fi
+EXCTAGS=$ac_cv_prog_EXCTAGS
+if test -n "$EXCTAGS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXCTAGS" >&5
+$as_echo "$EXCTAGS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if test $EXCTAGS = false; then
+			as_fn_error $? "No exctags program found!" "$LINENO" 5
+		fi
+		ICONV_LIBS=-liconv
+		SEDCOMMAND="sed -i ''"
+		;;
+
+	*)
+		
+$as_echo "@%:@define _INLINUX_ /**/" >>confdefs.h
+
+		# Extract the first word of "ctags ", so it can be a program name with args.
 set dummy ctags ; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5251,9 +6884,16 @@
 fi
 
 
-if test $CTAGS = false; then
-	as_fn_error $? "No ctags program found!" "$LINENO" 5
-fi
+		if test $CTAGS = false; then
+			as_fn_error $? "No ctags program found!" "$LINENO" 5
+		fi
+		ICONV_LIBS=
+		SEDCOMMAND="sed -i"
+		;;
+esac
+
+
+
 
 # Extract the first word of "gtksu ", so it can be a program name with args.
 set dummy gtksu ; ac_word=$2
@@ -5374,7 +7014,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debug level to $with_debug_level" >&5
 $as_echo "Setting debug level to $with_debug_level" >&6; }
 
-ac_config_files="$ac_config_files Makefile KKEdit/app/Makefile"
+ac_config_files="$ac_config_files Makefile KKEdit/app/Makefile KKEdit/plugins/TerminalPane/Makefile KKEdit/plugins/SessionManager/Makefile KKEdit/plugins/FileBrowser/Makefile KKEdit/plugins/ClipboardPlugin/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5513,6 +7153,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
+  as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -5910,7 +7554,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by KKEdit $as_me 0.3.3, which was
+This file was extended by KKEdit $as_me 0.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5976,7 +7620,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-KKEdit config.status 0.3.3
+KKEdit config.status 0.4.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6107,8 +7751,14 @@
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "KKEdit/unstable-plugins/BrowserPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/BrowserPlugin/Makefile" ;;
+    "KKEdit/unstable-plugins/MacroPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/MacroPlugin/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "KKEdit/app/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/app/Makefile" ;;
+    "KKEdit/plugins/TerminalPane/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/TerminalPane/Makefile" ;;
+    "KKEdit/plugins/SessionManager/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/SessionManager/Makefile" ;;
+    "KKEdit/plugins/FileBrowser/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/FileBrowser/Makefile" ;;
+    "KKEdit/plugins/ClipboardPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/ClipboardPlugin/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff -Nru kkedit-0.3.3/autom4te.cache/requests kkedit-0.4.1/autom4te.cache/requests
--- kkedit-0.3.3/autom4te.cache/requests	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/autom4te.cache/requests	2016-08-26 09:41:40.000000000 +0000
@@ -35,54 +35,54 @@
                         'configure.ac'
                       ],
                       {
-                        'm4_pattern_forbid' => 1,
                         'AM_RUN_LOG' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        '_AM_SET_OPTION' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
                         'AC_DEFUN_ONCE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        '_AM_SET_OPTIONS' => 1,
+                        '_m4_warn' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_include' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
                         'AM_SANITY_CHECK' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_AM_PROG_TAR' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'PKG_INSTALLDIR' => 1,
+                        'AU_DEFUN' => 1,
+                        'm4_pattern_forbid' => 1,
                         '_AM_PROG_CC_C_O' => 1,
-                        'include' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_DEFUN' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         '_AM_IF_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_DEFUN' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
                         'AM_SILENT_RULES' => 1,
-                        'm4_include' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
                         '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'PKG_CHECK_VAR' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'PKG_INSTALLDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_m4_warn' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1
+                        'include' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -97,65 +97,65 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_MAINTAINER_MODE' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         '_AM_COND_IF' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AC_CANONICAL_TARGET' => 1,
-                        'sinclude' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_INIT' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'LT_INIT' => 1,
                         'AM_POT_TOOLS' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
                         'm4_pattern_forbid' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_SUBST_TRACE' => 1,
                         'AM_PROG_MKDIR_P' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_MOC' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_NLS' => 1,
+                        'm4_include' => 1,
                         'AC_FC_PP_DEFINE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_PROG_FC_C_O' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AM_NLS' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_INIT' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_SUBST' => 1,
-                        '_m4_warn' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'include' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
                         '_AM_COND_ELSE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_PROG_F77_C_O' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'AM_SILENT_RULES' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'm4_include' => 1
+                        'AM_PATH_GUILE' => 1,
+                        'include' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'sinclude' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'LT_INIT' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_PROG_AR' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AM_INIT_AUTOMAKE' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff -Nru kkedit-0.3.3/autom4te.cache/traces.0 kkedit-0.4.1/autom4te.cache/traces.0
--- kkedit-0.3.3/autom4te.cache/traces.0	2016-05-23 09:23:38.000000000 +0000
+++ kkedit-0.4.1/autom4te.cache/traces.0	2016-08-26 09:41:39.000000000 +0000
@@ -1078,80 +1078,107 @@
 m4trace:configure.ac:16: -1- m4_pattern_allow([^X11_CFLAGS$])
 m4trace:configure.ac:25: -1- m4_pattern_allow([^_USEGTK3_$])
 m4trace:configure.ac:26: -1- m4_pattern_allow([^_EXECSUFFIX_$])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^_EXECSUFFIX_$])
-m4trace:configure.ac:46: -1- PKG_CHECK_EXISTS([vte-2.91], [usevte=91], [usevte=90])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^_VTEVERS290_$])
-m4trace:configure.ac:60: -1- PKG_CHECK_MODULES([VTE], [$VTE_MODULES], [], [AC_MSG_ERROR([No VTE dev files found ... For debian install either libvte-dev for gtk2 build or for gtk3 build libvte-2.91-dev or libvte-2.90-dev, see INSTALL file for details.])])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^VTE_CFLAGS$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^VTE_LIBS$])
-m4trace:configure.ac:60: -1- PKG_CHECK_EXISTS([$VTE_MODULES], [pkg_cv_[]VTE_CFLAGS=`$PKG_CONFIG --[]cflags "$VTE_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:60: -1- PKG_CHECK_EXISTS([$VTE_MODULES], [pkg_cv_[]VTE_LIBS=`$PKG_CONFIG --[]libs "$VTE_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:60: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:65: -1- m4_pattern_allow([^PLUGINCLUDES$])
-m4trace:configure.ac:66: -1- m4_pattern_allow([^PLUGVERSION$])
-m4trace:configure.ac:67: -1- m4_pattern_allow([^VTEVERS$])
-m4trace:configure.ac:68: -1- m4_pattern_allow([^GTK3SUFFIX$])
-m4trace:configure.ac:70: -1- PKG_CHECK_MODULES([GTK], [$GTK_MODULES])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GTK_CFLAGS$])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GTK_LIBS$])
-m4trace:configure.ac:70: -1- PKG_CHECK_EXISTS([$GTK_MODULES], [pkg_cv_[]GTK_CFLAGS=`$PKG_CONFIG --[]cflags "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:70: -1- PKG_CHECK_EXISTS([$GTK_MODULES], [pkg_cv_[]GTK_LIBS=`$PKG_CONFIG --[]libs "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:70: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:71: -1- m4_pattern_allow([^GTK_CFLAGS$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^GTK_LIBS$])
-m4trace:configure.ac:74: -1- PKG_CHECK_MODULES([GTKSRC], [$GTKSRC_MODULES])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^GTKSRC_LIBS$])
-m4trace:configure.ac:74: -1- PKG_CHECK_EXISTS([$GTKSRC_MODULES], [pkg_cv_[]GTKSRC_CFLAGS=`$PKG_CONFIG --[]cflags "$GTKSRC_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:74: -1- PKG_CHECK_EXISTS([$GTKSRC_MODULES], [pkg_cv_[]GTKSRC_LIBS=`$PKG_CONFIG --[]libs "$GTKSRC_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:74: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:75: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
-m4trace:configure.ac:76: -1- m4_pattern_allow([^GTKSRC_LIBS$])
-m4trace:configure.ac:79: -1- PKG_CHECK_MODULES([GLIB], [$GLIB_MODULES])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^GLIB_CFLAGS$])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^GLIB_LIBS$])
-m4trace:configure.ac:79: -1- PKG_CHECK_EXISTS([$GLIB_MODULES], [pkg_cv_[]GLIB_CFLAGS=`$PKG_CONFIG --[]cflags "$GLIB_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:79: -1- PKG_CHECK_EXISTS([$GLIB_MODULES], [pkg_cv_[]GLIB_LIBS=`$PKG_CONFIG --[]libs "$GLIB_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:79: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:80: -1- m4_pattern_allow([^GLIB_CFLAGS$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^GLIB_LIBS$])
-m4trace:configure.ac:94: -1- PKG_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^WEBKIT_LIBS$])
-m4trace:configure.ac:94: -1- PKG_CHECK_EXISTS([$WEBKIT_MODULES], [pkg_cv_[]WEBKIT_CFLAGS=`$PKG_CONFIG --[]cflags "$WEBKIT_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:94: -1- PKG_CHECK_EXISTS([$WEBKIT_MODULES], [pkg_cv_[]WEBKIT_LIBS=`$PKG_CONFIG --[]libs "$WEBKIT_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:94: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:95: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
-m4trace:configure.ac:96: -1- m4_pattern_allow([^WEBKIT_LIBS$])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^_BUILDDOCVIEWER_$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^with_qt5_docdir$])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^ASPELL_LIBS$])
-m4trace:configure.ac:115: -1- m4_pattern_allow([^_ASPELL_$])
-m4trace:configure.ac:118: -1- m4_pattern_allow([^CTAGS$])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^GTKSU$])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^MANPAGEEDITOR$])
-m4trace:configure.ac:141: -1- m4_pattern_allow([^with_gsu_path$])
-m4trace:configure.ac:142: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:${as_lineno-$LINENO}: result: Setting path to graphical su app to \"$with_gsu_path\"], [])
-m4trace:configure.ac:142: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: Setting path to graphical su app to \"$with_gsu_path\"], [])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^with_debug_level$])
-m4trace:configure.ac:150: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:36: -1- m4_pattern_allow([^_EXECSUFFIX_$])
+m4trace:configure.ac:49: -1- PKG_CHECK_EXISTS([vte-2.91], [usevte=91], [usevte=90])
+m4trace:configure.ac:58: -1- m4_pattern_allow([^_VTEVERS290_$])
+m4trace:configure.ac:64: -1- PKG_CHECK_MODULES([VTE], [$VTE_MODULES], [], [AC_MSG_ERROR([No VTE dev files found ... For debian install either libvte-dev for gtk2 build or for gtk3 build libvte-2.91-dev or libvte-2.90-dev, see INSTALL file for details.])])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^VTE_CFLAGS$])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^VTE_LIBS$])
+m4trace:configure.ac:64: -1- PKG_CHECK_EXISTS([$VTE_MODULES], [pkg_cv_[]VTE_CFLAGS=`$PKG_CONFIG --[]cflags "$VTE_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:64: -1- PKG_CHECK_EXISTS([$VTE_MODULES], [pkg_cv_[]VTE_LIBS=`$PKG_CONFIG --[]libs "$VTE_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:64: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:74: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+You should run autoupdate.], [])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:74: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:74: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:74: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:74: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:74: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:79: -1- m4_pattern_allow([^PLUGDIRS$])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^NEWPLUGINCLUDES$])
+m4trace:configure.ac:81: -1- m4_pattern_allow([^USE290$])
+m4trace:configure.ac:82: -1- m4_pattern_allow([^VTEVERS$])
+m4trace:configure.ac:83: -1- m4_pattern_allow([^GTK3SUFFIX$])
+m4trace:configure.ac:84: -1- m4_pattern_allow([^GTKVERSION$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^PLUGVERSION$])
+m4trace:configure.ac:88: -1- PKG_CHECK_MODULES([GTK], [$GTK_MODULES])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^GTK_CFLAGS$])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^GTK_LIBS$])
+m4trace:configure.ac:88: -1- PKG_CHECK_EXISTS([$GTK_MODULES], [pkg_cv_[]GTK_CFLAGS=`$PKG_CONFIG --[]cflags "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:88: -1- PKG_CHECK_EXISTS([$GTK_MODULES], [pkg_cv_[]GTK_LIBS=`$PKG_CONFIG --[]libs "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:88: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:89: -1- m4_pattern_allow([^GTK_CFLAGS$])
+m4trace:configure.ac:90: -1- m4_pattern_allow([^GTK_LIBS$])
+m4trace:configure.ac:92: -1- PKG_CHECK_MODULES([GTKSRC], [$GTKSRC_MODULES])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^GTKSRC_LIBS$])
+m4trace:configure.ac:92: -1- PKG_CHECK_EXISTS([$GTKSRC_MODULES], [pkg_cv_[]GTKSRC_CFLAGS=`$PKG_CONFIG --[]cflags "$GTKSRC_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:92: -1- PKG_CHECK_EXISTS([$GTKSRC_MODULES], [pkg_cv_[]GTKSRC_LIBS=`$PKG_CONFIG --[]libs "$GTKSRC_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:92: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:93: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
+m4trace:configure.ac:94: -1- m4_pattern_allow([^GTKSRC_LIBS$])
+m4trace:configure.ac:97: -1- PKG_CHECK_MODULES([GLIB], [$GLIB_MODULES])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^GLIB_CFLAGS$])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^GLIB_LIBS$])
+m4trace:configure.ac:97: -1- PKG_CHECK_EXISTS([$GLIB_MODULES], [pkg_cv_[]GLIB_CFLAGS=`$PKG_CONFIG --[]cflags "$GLIB_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:97: -1- PKG_CHECK_EXISTS([$GLIB_MODULES], [pkg_cv_[]GLIB_LIBS=`$PKG_CONFIG --[]libs "$GLIB_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:97: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:98: -1- m4_pattern_allow([^GLIB_CFLAGS$])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^GLIB_LIBS$])
+m4trace:configure.ac:112: -1- PKG_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
+m4trace:configure.ac:112: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
+m4trace:configure.ac:112: -1- m4_pattern_allow([^WEBKIT_LIBS$])
+m4trace:configure.ac:112: -1- PKG_CHECK_EXISTS([$WEBKIT_MODULES], [pkg_cv_[]WEBKIT_CFLAGS=`$PKG_CONFIG --[]cflags "$WEBKIT_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:112: -1- PKG_CHECK_EXISTS([$WEBKIT_MODULES], [pkg_cv_[]WEBKIT_LIBS=`$PKG_CONFIG --[]libs "$WEBKIT_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:112: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:113: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^WEBKIT_LIBS$])
+m4trace:configure.ac:115: -1- m4_pattern_allow([^_BUILDDOCVIEWER_$])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^with_qt5_docdir$])
+m4trace:configure.ac:132: -1- m4_pattern_allow([^ASPELL_LIBS$])
+m4trace:configure.ac:133: -1- m4_pattern_allow([^_ASPELL_$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:140: -1- m4_pattern_allow([^_INBSD_$])
+m4trace:configure.ac:141: -1- m4_pattern_allow([^EXCTAGS$])
+m4trace:configure.ac:150: -1- m4_pattern_allow([^_INLINUX_$])
+m4trace:configure.ac:151: -1- m4_pattern_allow([^CTAGS$])
+m4trace:configure.ac:160: -1- m4_pattern_allow([^ICONV_LIBS$])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^SEDCOMMAND$])
+m4trace:configure.ac:163: -1- m4_pattern_allow([^GTKSU$])
+m4trace:configure.ac:170: -1- m4_pattern_allow([^MANPAGEEDITOR$])
+m4trace:configure.ac:181: -1- m4_pattern_allow([^with_gsu_path$])
+m4trace:configure.ac:182: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:${as_lineno-$LINENO}: result: Setting path to graphical su app to \"$with_gsu_path\"], [])
+m4trace:configure.ac:182: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: Setting path to graphical su app to \"$with_gsu_path\"], [])
+m4trace:configure.ac:187: -1- m4_pattern_allow([^with_debug_level$])
+m4trace:configure.ac:190: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:150: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:150: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:150: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:150: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:150: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:190: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:190: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:190: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:190: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff -Nru kkedit-0.3.3/autom4te.cache/traces.1 kkedit-0.4.1/autom4te.cache/traces.1
--- kkedit-0.3.3/autom4te.cache/traces.1	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/autom4te.cache/traces.1	2016-08-26 09:41:39.000000000 +0000
@@ -1,4 +1,4 @@
-m4trace:configure.ac:3: -1- AC_INIT([KKEdit], [0.3.3], [PROJ], [KKEdit])
+m4trace:configure.ac:3: -1- AC_INIT([KKEdit], [0.4.1], [PROJ], [KKEdit])
 m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:3: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -413,137 +413,220 @@
 m4trace:configure.ac:26: -1- m4_pattern_allow([^_EXECSUFFIX_$])
 m4trace:configure.ac:26: -1- AH_OUTPUT([_EXECSUFFIX_], [/* Use GTK3 */
 @%:@undef _EXECSUFFIX_])
-m4trace:configure.ac:35: -1- AC_DEFINE_TRACE_LITERAL([_EXECSUFFIX_])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^_EXECSUFFIX_$])
-m4trace:configure.ac:35: -1- AH_OUTPUT([_EXECSUFFIX_], [/* Use GTK3 */
+m4trace:configure.ac:36: -1- AC_DEFINE_TRACE_LITERAL([_EXECSUFFIX_])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^_EXECSUFFIX_$])
+m4trace:configure.ac:36: -1- AH_OUTPUT([_EXECSUFFIX_], [/* Use GTK3 */
 @%:@undef _EXECSUFFIX_])
-m4trace:configure.ac:54: -1- AC_DEFINE_TRACE_LITERAL([_VTEVERS290_])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^_VTEVERS290_$])
-m4trace:configure.ac:54: -1- AH_OUTPUT([_VTEVERS290_], [/* Use vte-2.90 */
+m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([_VTEVERS290_])
+m4trace:configure.ac:58: -1- m4_pattern_allow([^_VTEVERS290_$])
+m4trace:configure.ac:58: -1- AH_OUTPUT([_VTEVERS290_], [/* Use vte-2.90 */
 @%:@undef _VTEVERS290_])
-m4trace:configure.ac:60: -1- AC_SUBST([VTE_CFLAGS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([VTE_CFLAGS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^VTE_CFLAGS$])
-m4trace:configure.ac:60: -1- AC_SUBST([VTE_LIBS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([VTE_LIBS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^VTE_LIBS$])
-m4trace:configure.ac:65: -1- AC_SUBST([PLUGINCLUDES])
-m4trace:configure.ac:65: -1- AC_SUBST_TRACE([PLUGINCLUDES])
-m4trace:configure.ac:65: -1- m4_pattern_allow([^PLUGINCLUDES$])
-m4trace:configure.ac:66: -1- AC_SUBST([PLUGVERSION])
-m4trace:configure.ac:66: -1- AC_SUBST_TRACE([PLUGVERSION])
-m4trace:configure.ac:66: -1- m4_pattern_allow([^PLUGVERSION$])
-m4trace:configure.ac:67: -1- AC_SUBST([VTEVERS])
-m4trace:configure.ac:67: -1- AC_SUBST_TRACE([VTEVERS])
-m4trace:configure.ac:67: -1- m4_pattern_allow([^VTEVERS$])
-m4trace:configure.ac:68: -1- AC_SUBST([GTK3SUFFIX])
-m4trace:configure.ac:68: -1- AC_SUBST_TRACE([GTK3SUFFIX])
-m4trace:configure.ac:68: -1- m4_pattern_allow([^GTK3SUFFIX$])
-m4trace:configure.ac:70: -1- AC_SUBST([GTK_CFLAGS])
-m4trace:configure.ac:70: -1- AC_SUBST_TRACE([GTK_CFLAGS])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GTK_CFLAGS$])
-m4trace:configure.ac:70: -1- AC_SUBST([GTK_LIBS])
-m4trace:configure.ac:70: -1- AC_SUBST_TRACE([GTK_LIBS])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^GTK_LIBS$])
-m4trace:configure.ac:71: -1- AC_SUBST([GTK_CFLAGS])
-m4trace:configure.ac:71: -1- AC_SUBST_TRACE([GTK_CFLAGS])
-m4trace:configure.ac:71: -1- m4_pattern_allow([^GTK_CFLAGS$])
-m4trace:configure.ac:72: -1- AC_SUBST([GTK_LIBS])
-m4trace:configure.ac:72: -1- AC_SUBST_TRACE([GTK_LIBS])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^GTK_LIBS$])
-m4trace:configure.ac:74: -1- AC_SUBST([GTKSRC_CFLAGS])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([GTKSRC_CFLAGS])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
-m4trace:configure.ac:74: -1- AC_SUBST([GTKSRC_LIBS])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([GTKSRC_LIBS])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^GTKSRC_LIBS$])
-m4trace:configure.ac:75: -1- AC_SUBST([GTKSRC_CFLAGS])
-m4trace:configure.ac:75: -1- AC_SUBST_TRACE([GTKSRC_CFLAGS])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
-m4trace:configure.ac:76: -1- AC_SUBST([GTKSRC_LIBS])
-m4trace:configure.ac:76: -1- AC_SUBST_TRACE([GTKSRC_LIBS])
-m4trace:configure.ac:76: -1- m4_pattern_allow([^GTKSRC_LIBS$])
-m4trace:configure.ac:79: -1- AC_SUBST([GLIB_CFLAGS])
-m4trace:configure.ac:79: -1- AC_SUBST_TRACE([GLIB_CFLAGS])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^GLIB_CFLAGS$])
-m4trace:configure.ac:79: -1- AC_SUBST([GLIB_LIBS])
-m4trace:configure.ac:79: -1- AC_SUBST_TRACE([GLIB_LIBS])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^GLIB_LIBS$])
-m4trace:configure.ac:80: -1- AC_SUBST([GLIB_CFLAGS])
-m4trace:configure.ac:80: -1- AC_SUBST_TRACE([GLIB_CFLAGS])
-m4trace:configure.ac:80: -1- m4_pattern_allow([^GLIB_CFLAGS$])
-m4trace:configure.ac:81: -1- AC_SUBST([GLIB_LIBS])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([GLIB_LIBS])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^GLIB_LIBS$])
-m4trace:configure.ac:94: -1- AC_SUBST([WEBKIT_CFLAGS])
-m4trace:configure.ac:94: -1- AC_SUBST_TRACE([WEBKIT_CFLAGS])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
-m4trace:configure.ac:94: -1- AC_SUBST([WEBKIT_LIBS])
-m4trace:configure.ac:94: -1- AC_SUBST_TRACE([WEBKIT_LIBS])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^WEBKIT_LIBS$])
-m4trace:configure.ac:95: -1- AC_SUBST([WEBKIT_CFLAGS])
-m4trace:configure.ac:95: -1- AC_SUBST_TRACE([WEBKIT_CFLAGS])
-m4trace:configure.ac:95: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
-m4trace:configure.ac:96: -1- AC_SUBST([WEBKIT_LIBS])
-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([WEBKIT_LIBS])
-m4trace:configure.ac:96: -1- m4_pattern_allow([^WEBKIT_LIBS$])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([_BUILDDOCVIEWER_])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^_BUILDDOCVIEWER_$])
-m4trace:configure.ac:97: -1- AH_OUTPUT([_BUILDDOCVIEWER_], [/* Build gtk-doc viewer */
+m4trace:configure.ac:64: -1- AC_SUBST([VTE_CFLAGS])
+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([VTE_CFLAGS])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^VTE_CFLAGS$])
+m4trace:configure.ac:64: -1- AC_SUBST([VTE_LIBS])
+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([VTE_LIBS])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^VTE_LIBS$])
+m4trace:configure.ac:74: -1- AC_CONFIG_FILES([KKEdit/unstable-plugins/BrowserPlugin/Makefile KKEdit/unstable-plugins/MacroPlugin/Makefile])
+m4trace:configure.ac:74: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+You should run autoupdate.], [])
+m4trace:configure.ac:74: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:74: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:74: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:74: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:74: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:74: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:74: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:79: -1- AC_SUBST([PLUGDIRS])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([PLUGDIRS])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^PLUGDIRS$])
+m4trace:configure.ac:80: -1- AC_SUBST([NEWPLUGINCLUDES])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([NEWPLUGINCLUDES])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^NEWPLUGINCLUDES$])
+m4trace:configure.ac:81: -1- AC_SUBST([USE290])
+m4trace:configure.ac:81: -1- AC_SUBST_TRACE([USE290])
+m4trace:configure.ac:81: -1- m4_pattern_allow([^USE290$])
+m4trace:configure.ac:82: -1- AC_SUBST([VTEVERS])
+m4trace:configure.ac:82: -1- AC_SUBST_TRACE([VTEVERS])
+m4trace:configure.ac:82: -1- m4_pattern_allow([^VTEVERS$])
+m4trace:configure.ac:83: -1- AC_SUBST([GTK3SUFFIX])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([GTK3SUFFIX])
+m4trace:configure.ac:83: -1- m4_pattern_allow([^GTK3SUFFIX$])
+m4trace:configure.ac:84: -1- AC_SUBST([GTKVERSION])
+m4trace:configure.ac:84: -1- AC_SUBST_TRACE([GTKVERSION])
+m4trace:configure.ac:84: -1- m4_pattern_allow([^GTKVERSION$])
+m4trace:configure.ac:86: -1- AC_SUBST([PLUGVERSION])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([PLUGVERSION])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^PLUGVERSION$])
+m4trace:configure.ac:88: -1- AC_SUBST([GTK_CFLAGS])
+m4trace:configure.ac:88: -1- AC_SUBST_TRACE([GTK_CFLAGS])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^GTK_CFLAGS$])
+m4trace:configure.ac:88: -1- AC_SUBST([GTK_LIBS])
+m4trace:configure.ac:88: -1- AC_SUBST_TRACE([GTK_LIBS])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^GTK_LIBS$])
+m4trace:configure.ac:89: -1- AC_SUBST([GTK_CFLAGS])
+m4trace:configure.ac:89: -1- AC_SUBST_TRACE([GTK_CFLAGS])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^GTK_CFLAGS$])
+m4trace:configure.ac:90: -1- AC_SUBST([GTK_LIBS])
+m4trace:configure.ac:90: -1- AC_SUBST_TRACE([GTK_LIBS])
+m4trace:configure.ac:90: -1- m4_pattern_allow([^GTK_LIBS$])
+m4trace:configure.ac:92: -1- AC_SUBST([GTKSRC_CFLAGS])
+m4trace:configure.ac:92: -1- AC_SUBST_TRACE([GTKSRC_CFLAGS])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
+m4trace:configure.ac:92: -1- AC_SUBST([GTKSRC_LIBS])
+m4trace:configure.ac:92: -1- AC_SUBST_TRACE([GTKSRC_LIBS])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^GTKSRC_LIBS$])
+m4trace:configure.ac:93: -1- AC_SUBST([GTKSRC_CFLAGS])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([GTKSRC_CFLAGS])
+m4trace:configure.ac:93: -1- m4_pattern_allow([^GTKSRC_CFLAGS$])
+m4trace:configure.ac:94: -1- AC_SUBST([GTKSRC_LIBS])
+m4trace:configure.ac:94: -1- AC_SUBST_TRACE([GTKSRC_LIBS])
+m4trace:configure.ac:94: -1- m4_pattern_allow([^GTKSRC_LIBS$])
+m4trace:configure.ac:97: -1- AC_SUBST([GLIB_CFLAGS])
+m4trace:configure.ac:97: -1- AC_SUBST_TRACE([GLIB_CFLAGS])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^GLIB_CFLAGS$])
+m4trace:configure.ac:97: -1- AC_SUBST([GLIB_LIBS])
+m4trace:configure.ac:97: -1- AC_SUBST_TRACE([GLIB_LIBS])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^GLIB_LIBS$])
+m4trace:configure.ac:98: -1- AC_SUBST([GLIB_CFLAGS])
+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([GLIB_CFLAGS])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^GLIB_CFLAGS$])
+m4trace:configure.ac:99: -1- AC_SUBST([GLIB_LIBS])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([GLIB_LIBS])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^GLIB_LIBS$])
+m4trace:configure.ac:112: -1- AC_SUBST([WEBKIT_CFLAGS])
+m4trace:configure.ac:112: -1- AC_SUBST_TRACE([WEBKIT_CFLAGS])
+m4trace:configure.ac:112: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
+m4trace:configure.ac:112: -1- AC_SUBST([WEBKIT_LIBS])
+m4trace:configure.ac:112: -1- AC_SUBST_TRACE([WEBKIT_LIBS])
+m4trace:configure.ac:112: -1- m4_pattern_allow([^WEBKIT_LIBS$])
+m4trace:configure.ac:113: -1- AC_SUBST([WEBKIT_CFLAGS])
+m4trace:configure.ac:113: -1- AC_SUBST_TRACE([WEBKIT_CFLAGS])
+m4trace:configure.ac:113: -1- m4_pattern_allow([^WEBKIT_CFLAGS$])
+m4trace:configure.ac:114: -1- AC_SUBST([WEBKIT_LIBS])
+m4trace:configure.ac:114: -1- AC_SUBST_TRACE([WEBKIT_LIBS])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^WEBKIT_LIBS$])
+m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([_BUILDDOCVIEWER_])
+m4trace:configure.ac:115: -1- m4_pattern_allow([^_BUILDDOCVIEWER_$])
+m4trace:configure.ac:115: -1- AH_OUTPUT([_BUILDDOCVIEWER_], [/* Build gtk-doc viewer */
 @%:@undef _BUILDDOCVIEWER_])
-m4trace:configure.ac:104: -1- AC_SUBST([with_qt5_docdir])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([with_qt5_docdir])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^with_qt5_docdir$])
-m4trace:configure.ac:114: -1- AC_SUBST([ASPELL_LIBS])
-m4trace:configure.ac:114: -1- AC_SUBST_TRACE([ASPELL_LIBS])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^ASPELL_LIBS$])
-m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([_ASPELL_])
-m4trace:configure.ac:115: -1- m4_pattern_allow([^_ASPELL_$])
-m4trace:configure.ac:115: -1- AH_OUTPUT([_ASPELL_], [/* Include spellchecker */
+m4trace:configure.ac:122: -1- AC_SUBST([with_qt5_docdir])
+m4trace:configure.ac:122: -1- AC_SUBST_TRACE([with_qt5_docdir])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^with_qt5_docdir$])
+m4trace:configure.ac:132: -1- AC_SUBST([ASPELL_LIBS])
+m4trace:configure.ac:132: -1- AC_SUBST_TRACE([ASPELL_LIBS])
+m4trace:configure.ac:132: -1- m4_pattern_allow([^ASPELL_LIBS$])
+m4trace:configure.ac:133: -1- AC_DEFINE_TRACE_LITERAL([_ASPELL_])
+m4trace:configure.ac:133: -1- m4_pattern_allow([^_ASPELL_$])
+m4trace:configure.ac:133: -1- AH_OUTPUT([_ASPELL_], [/* Include spellchecker */
 @%:@undef _ASPELL_])
-m4trace:configure.ac:118: -1- AC_SUBST([CTAGS])
-m4trace:configure.ac:118: -1- AC_SUBST_TRACE([CTAGS])
-m4trace:configure.ac:118: -1- m4_pattern_allow([^CTAGS$])
-m4trace:configure.ac:123: -1- AC_SUBST([GTKSU])
-m4trace:configure.ac:123: -1- AC_SUBST_TRACE([GTKSU])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^GTKSU$])
-m4trace:configure.ac:130: -1- AC_SUBST([MANPAGEEDITOR])
-m4trace:configure.ac:130: -1- AC_SUBST_TRACE([MANPAGEEDITOR])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^MANPAGEEDITOR$])
-m4trace:configure.ac:141: -1- AC_SUBST([with_gsu_path])
-m4trace:configure.ac:141: -1- AC_SUBST_TRACE([with_gsu_path])
-m4trace:configure.ac:141: -1- m4_pattern_allow([^with_gsu_path$])
-m4trace:configure.ac:142: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:${as_lineno-$LINENO}: result: Setting path to graphical su app to \"$with_gsu_path\"], [])
-m4trace:configure.ac:142: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: Setting path to graphical su app to \"$with_gsu_path\"], [])
-m4trace:configure.ac:147: -1- AC_SUBST([with_debug_level])
-m4trace:configure.ac:147: -1- AC_SUBST_TRACE([with_debug_level])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^with_debug_level$])
-m4trace:configure.ac:150: -1- AC_CONFIG_FILES([Makefile KKEdit/app/Makefile])
-m4trace:configure.ac:150: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:136: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:136: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:136: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:136: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:136: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([build])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:136: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([build_cpu])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:136: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([build_vendor])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:136: -1- AC_SUBST([build_os])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([build_os])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:136: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([host])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:136: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([host_cpu])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:136: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([host_vendor])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:136: -1- AC_SUBST([host_os])
+m4trace:configure.ac:136: -1- AC_SUBST_TRACE([host_os])
+m4trace:configure.ac:136: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:140: -1- AC_DEFINE_TRACE_LITERAL([_INBSD_])
+m4trace:configure.ac:140: -1- m4_pattern_allow([^_INBSD_$])
+m4trace:configure.ac:140: -1- AH_OUTPUT([_INBSD_], [/* compiling for BSD */
+@%:@undef _INBSD_])
+m4trace:configure.ac:141: -1- AC_SUBST([EXCTAGS])
+m4trace:configure.ac:141: -1- AC_SUBST_TRACE([EXCTAGS])
+m4trace:configure.ac:141: -1- m4_pattern_allow([^EXCTAGS$])
+m4trace:configure.ac:150: -1- AC_DEFINE_TRACE_LITERAL([_INLINUX_])
+m4trace:configure.ac:150: -1- m4_pattern_allow([^_INLINUX_$])
+m4trace:configure.ac:150: -1- AH_OUTPUT([_INLINUX_], [/* compiling for linux */
+@%:@undef _INLINUX_])
+m4trace:configure.ac:151: -1- AC_SUBST([CTAGS])
+m4trace:configure.ac:151: -1- AC_SUBST_TRACE([CTAGS])
+m4trace:configure.ac:151: -1- m4_pattern_allow([^CTAGS$])
+m4trace:configure.ac:160: -1- AC_SUBST([ICONV_LIBS])
+m4trace:configure.ac:160: -1- AC_SUBST_TRACE([ICONV_LIBS])
+m4trace:configure.ac:160: -1- m4_pattern_allow([^ICONV_LIBS$])
+m4trace:configure.ac:161: -1- AC_SUBST([SEDCOMMAND])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([SEDCOMMAND])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^SEDCOMMAND$])
+m4trace:configure.ac:163: -1- AC_SUBST([GTKSU])
+m4trace:configure.ac:163: -1- AC_SUBST_TRACE([GTKSU])
+m4trace:configure.ac:163: -1- m4_pattern_allow([^GTKSU$])
+m4trace:configure.ac:170: -1- AC_SUBST([MANPAGEEDITOR])
+m4trace:configure.ac:170: -1- AC_SUBST_TRACE([MANPAGEEDITOR])
+m4trace:configure.ac:170: -1- m4_pattern_allow([^MANPAGEEDITOR$])
+m4trace:configure.ac:181: -1- AC_SUBST([with_gsu_path])
+m4trace:configure.ac:181: -1- AC_SUBST_TRACE([with_gsu_path])
+m4trace:configure.ac:181: -1- m4_pattern_allow([^with_gsu_path$])
+m4trace:configure.ac:182: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:${as_lineno-$LINENO}: result: Setting path to graphical su app to \"$with_gsu_path\"], [])
+m4trace:configure.ac:182: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: Setting path to graphical su app to \"$with_gsu_path\"], [])
+m4trace:configure.ac:187: -1- AC_SUBST([with_debug_level])
+m4trace:configure.ac:187: -1- AC_SUBST_TRACE([with_debug_level])
+m4trace:configure.ac:187: -1- m4_pattern_allow([^with_debug_level$])
+m4trace:configure.ac:190: -1- AC_CONFIG_FILES([Makefile KKEdit/app/Makefile KKEdit/plugins/TerminalPane/Makefile KKEdit/plugins/SessionManager/Makefile KKEdit/plugins/FileBrowser/Makefile KKEdit/plugins/ClipboardPlugin/Makefile ])
+m4trace:configure.ac:190: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:150: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:150: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:150: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:150: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:150: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:150: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:150: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:150: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:150: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:190: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:190: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:190: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:190: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:190: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([MKDIR_P])
diff -Nru kkedit-0.3.3/ChangeLog kkedit-0.4.1/ChangeLog
--- kkedit-0.3.3/ChangeLog	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/ChangeLog	2016-08-26 09:41:39.000000000 +0000
@@ -1,3 +1,63 @@
+0.4.1
+Fixed menu icons in gtk3 mucking up the text.
+Fixed not showing bookmark in gtk3 when using hotkey.
+Show menu icons in gtk3 now defaults to off.
+
+0.4.0
+About window now modal.
+Corrected a few menu labels.
+Made session manager name box modal.
+Standardized about boxes.
+Tweaked some plugin makefiles.
+Fixed some plugin translations not working.
+Fixed plugin translation files names for gtk3 version.
+Fixed some menus not being translated.
+Tweaking find/replace code.
+Added "Show Icons In Gtk3 Menus" to prefs.
+Code clean.
+Done popups.
+Done menus.
+Done Edit menu.
+Done File menu.
+Tweaked *.am files for plugs.
+Fixed occasional error when loading session.
+Fixed Session plugin for *bsd*.
+Done *bsd* clipboard/firlebrowser plugs.
+Done *bsd* term/session plugs.
+Started converting plugins for *bsd*.
+Fixed bsd sed -i not the same as linux sed -i.
+Fixed no file list in tab popup on *bsd*.
+Put "Find Definition" back into popup menu.
+More tweaks for *bsd*.
+Check for exctags in *bsd*.
+Don't close tabs if loading missing session file.
+Fixed crash on reloading session if session file is missing.
+Internal cleaning, readying for porting to BSD.
+Issue warning and exit gracefully if no room on /tmp.
+Set length of the scrollback buffer to infinite in terminalPlugin.
+Added hot key to toggle bookmark menu (^T).
+Fixed not resetting page dirty when saving after replace all.
+Updated email and web page links, again!
+Tweaked makefiles to install global external tools correctly with correct permissions.
+Added 'Find Next' to edit menu.
+Fixed changed web links.
+Fixed Find/Replace dialog blocking on first showing.
+Fixed warnings for debian packagers.
+Included plugins now respect CXXFLAGS/CPPFLAGS/LDFLAGS passed to configure.
+Unstable plugins now have to be specifically enabled with the --enable-unstable-plugins option to ./configure.
+Moved MacroPlugin to unstable-plugins.
+Fixed not closing all tabs.
+Added 'Macro' plugin.
+Install instructions for OpenSuse added to INSTALL file.
+Fixed symlinking to wrong files.
+Fixed some files not being uninstalled properly.
+Application icons now symlinked instead of installed.
+Corrected installed icon sizes.
+Tweaked .desktop files for compatability.
+Added requested manpage.
+Fixed defunct links in about box's for plugin's.
+Fixed defunct links in about box.
+
 0.3.3
 Changed format of session files, made future proof.
 Code clean.
diff -Nru kkedit-0.3.3/config.guess kkedit-0.4.1/config.guess
--- kkedit-0.3.3/config.guess	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/config.guess	2016-08-26 09:41:39.000000000 +0000
@@ -0,0 +1,1421 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-11-04'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -Nru kkedit-0.3.3/config.h.in kkedit-0.4.1/config.h.in
--- kkedit-0.3.3/config.h.in	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/config.h.in	2016-08-26 09:41:39.000000000 +0000
@@ -36,6 +36,12 @@
 /* Use GTK3 */
 #undef _EXECSUFFIX_
 
+/* compiling for BSD */
+#undef _INBSD_
+
+/* compiling for linux */
+#undef _INLINUX_
+
 /* Use GTK3 */
 #undef _USEGTK3_
 
diff -Nru kkedit-0.3.3/config.sub kkedit-0.4.1/config.sub
--- kkedit-0.3.3/config.sub	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/config.sub	2016-08-26 09:41:39.000000000 +0000
@@ -0,0 +1,1807 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-12-03'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -Nru kkedit-0.3.3/configure kkedit-0.4.1/configure
--- kkedit-0.3.3/configure	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/configure	2016-08-26 09:41:40.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for KKEdit 0.3.3.
+# Generated by GNU Autoconf 2.69 for KKEdit 0.4.1.
 #
 # Report bugs to <PROJ>.
 #
@@ -579,20 +579,27 @@
 # Identity of this package.
 PACKAGE_NAME='KKEdit'
 PACKAGE_TARNAME='KKEdit'
-PACKAGE_VERSION='0.3.3'
-PACKAGE_STRING='KKEdit 0.3.3'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='KKEdit 0.4.1'
 PACKAGE_BUGREPORT='PROJ'
 PACKAGE_URL=''
 
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-with_debug_level
+ac_subst_vars='with_debug_level
 with_gsu_path
 MANPAGEEDITOR
 GTKSU
+SEDCOMMAND
+ICONV_LIBS
 CTAGS
+EXCTAGS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 ASPELL_LIBS
 with_qt5_docdir
 WEBKIT_LIBS
@@ -603,10 +610,17 @@
 GTKSRC_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
+PLUGVERSION
+GTKVERSION
 GTK3SUFFIX
 VTEVERS
-PLUGVERSION
-PLUGINCLUDES
+USE290
+NEWPLUGINCLUDES
+PLUGDIRS
+am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
 VTE_LIBS
 VTE_CFLAGS
 X11_LIBS
@@ -712,6 +726,7 @@
 enable_silent_rules
 enable_gtk3
 enable_plugins
+enable_unstable_plugins
 enable_docviewer
 with_qt5_docdir
 enable_aspell
@@ -1285,7 +1300,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures KKEdit 0.3.3 to adapt to many kinds of systems.
+\`configure' configures KKEdit 0.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1346,12 +1361,16 @@
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of KKEdit 0.3.3:";;
+     short | recursive ) echo "Configuration of KKEdit 0.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1367,6 +1386,8 @@
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-gtk3           Use GTK3.
   --enable-plugins        Build/Install plugins
+  --disable-unstable-plugins
+                          Build/Install unstable/new plugins
   --enable-docviewer      Build the Gtk-Doc viewer
   --enable-aspell         Include spellchecker
 
@@ -1474,7 +1495,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-KKEdit configure 0.3.3
+KKEdit configure 0.4.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1646,7 +1667,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by KKEdit $as_me 0.3.3, which was
+It was created by KKEdit $as_me 0.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3083,7 +3104,7 @@
 
 # Define the identity of the package.
  PACKAGE='KKEdit'
- VERSION='0.3.3'
+ VERSION='0.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4651,6 +4672,7 @@
 	program_transform_name='s,\(^[kK].*t.*\),\1-3,'
 	PLUGVERSION=3
 	GTK3SUFFIX=-3
+	GTKVERSION=3
 else
 	GTK_MODULES="gtk+-2.0 >= 2.24.0"
 	GTKSRC_MODULES="gtksourceview-2.0 >= 2.9.9"
@@ -4658,6 +4680,8 @@
 $as_echo "#define _EXECSUFFIX_ \"\"" >>confdefs.h
 
 	PLUGVERSION=2
+	GTKVERSION=2
+	GTK3SUFFIX=
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Build/Install plugins" >&5
@@ -4672,7 +4696,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_plugs" >&5
 $as_echo "$enable_plugs" >&6; }
 if test "$enable_plugs" = "yes"; then
-	PLUGINCLUDES="KKEdit/plugins/TerminalPane KKEdit/plugins/ClipboardPlugin KKEdit/plugins/FileBrowser KKEdit/plugins/SessionManager"
+	PLUGDIRS="KKEdit/plugins/TerminalPane KKEdit/plugins/SessionManager KKEdit/plugins/FileBrowser KKEdit/plugins/ClipboardPlugin"
 	if test "$enable_gtk3" = "yes"; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Finding vte version" >&5
 $as_echo_n "checking Finding vte version... " >&6; }
@@ -4688,12 +4712,13 @@
 fi
 		if test $usevte = 91; then
 			VTE_MODULES="vte-2.91 >= 0.40.0"
-			VTEVERS=2.91
+			VTEVERS="-2.91"
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $VTEVERS" >&5
 $as_echo "using $VTEVERS" >&6; }
 		else
 			VTE_MODULES="vte-2.90 >= 0.29.1"
-			VTEVERS=2.90
+			VTEVERS="-2.90"
+			USE290="-D_VTEVERS290_"
 
 $as_echo "#define _VTEVERS290_ \"\"" >>confdefs.h
 
@@ -4778,110 +4803,1592 @@
 	PLUGINCLUDES=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Build/Install unstable/new plugins" >&5
+$as_echo_n "checking Build/Install unstable/new plugins... " >&6; }
+# Check whether --enable-unstable-plugins was given.
+if test "${enable_unstable_plugins+set}" = set; then :
+  enableval=$enable_unstable_plugins; enable_new_plugs=$enableval
+else
+  enable_new_plugs="no"
+fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_new_plugs" >&5
+$as_echo "$enable_new_plugs" >&6; }
+if test "$enable_new_plugs" = "yes"; then
+	NEWPLUGINCLUDES=KKEdit/unstable-plugins/*Plugin
+	ac_config_files="$ac_config_files KKEdit/unstable-plugins/BrowserPlugin/Makefile KKEdit/unstable-plugins/MacroPlugin/Makefile"
 
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
+_ACEOF
 
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
 
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-if test -n "$GTK_CFLAGS"; then
-    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GTK_LIBS"; then
-    pkg_cv_GTK_LIBS="$GTK_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
+DEFS=-DHAVE_CONFIG_H
 
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
 
+LTLIBOBJS=$ac_ltlibobjs
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
 else
-        _pkg_short_errors_supported=no
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
-        else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements ($GTK_MODULES) were not met:
 
-$GTK_PKG_ERRORS
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
 
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
 
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
 
 
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSRC" >&5
-$as_echo_n "checking for GTKSRC... " >&6; }
-
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by KKEdit $as_me 0.4.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <PROJ>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+KKEdit config.status 0.4.1
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "KKEdit/unstable-plugins/BrowserPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/BrowserPlugin/Makefile" ;;
+    "KKEdit/unstable-plugins/MacroPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/MacroPlugin/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+else
+	NEWPLUGINCLUDES=
+fi
+
+
+
+
+
+
+
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GTK_MODULES\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GTK_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
+        else
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GTK_MODULES" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements ($GTK_MODULES) were not met:
+
+$GTK_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSRC" >&5
+$as_echo_n "checking for GTKSRC... " >&6; }
+
 if test -n "$GTKSRC_CFLAGS"; then
     pkg_cv_GTKSRC_CFLAGS="$GTKSRC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
@@ -5213,7 +6720,133 @@
 
 fi
 
-# Extract the first word of "ctags ", so it can be a program name with args.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+case $host_os in
+
+	*BSD* | *bsd* )
+
+$as_echo "#define _INBSD_ /**/" >>confdefs.h
+
+		# Extract the first word of "exctags ", so it can be a program name with args.
+set dummy exctags ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_EXCTAGS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$EXCTAGS"; then
+  ac_cv_prog_EXCTAGS="$EXCTAGS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_EXCTAGS="true"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_EXCTAGS" && ac_cv_prog_EXCTAGS="false"
+fi
+fi
+EXCTAGS=$ac_cv_prog_EXCTAGS
+if test -n "$EXCTAGS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXCTAGS" >&5
+$as_echo "$EXCTAGS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if test $EXCTAGS = false; then
+			as_fn_error $? "No exctags program found!" "$LINENO" 5
+		fi
+		ICONV_LIBS=-liconv
+		SEDCOMMAND="sed -i ''"
+		;;
+
+	*)
+
+$as_echo "#define _INLINUX_ /**/" >>confdefs.h
+
+		# Extract the first word of "ctags ", so it can be a program name with args.
 set dummy ctags ; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5251,9 +6884,16 @@
 fi
 
 
-if test $CTAGS = false; then
-	as_fn_error $? "No ctags program found!" "$LINENO" 5
-fi
+		if test $CTAGS = false; then
+			as_fn_error $? "No ctags program found!" "$LINENO" 5
+		fi
+		ICONV_LIBS=
+		SEDCOMMAND="sed -i"
+		;;
+esac
+
+
+
 
 # Extract the first word of "gtksu ", so it can be a program name with args.
 set dummy gtksu ; ac_word=$2
@@ -5374,7 +7014,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debug level to $with_debug_level" >&5
 $as_echo "Setting debug level to $with_debug_level" >&6; }
 
-ac_config_files="$ac_config_files Makefile KKEdit/app/Makefile"
+ac_config_files="$ac_config_files Makefile KKEdit/app/Makefile KKEdit/plugins/TerminalPane/Makefile KKEdit/plugins/SessionManager/Makefile KKEdit/plugins/FileBrowser/Makefile KKEdit/plugins/ClipboardPlugin/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5513,6 +7153,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
+  as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -5910,7 +7554,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by KKEdit $as_me 0.3.3, which was
+This file was extended by KKEdit $as_me 0.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5976,7 +7620,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-KKEdit config.status 0.3.3
+KKEdit config.status 0.4.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6107,8 +7751,14 @@
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "KKEdit/unstable-plugins/BrowserPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/BrowserPlugin/Makefile" ;;
+    "KKEdit/unstable-plugins/MacroPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/unstable-plugins/MacroPlugin/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "KKEdit/app/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/app/Makefile" ;;
+    "KKEdit/plugins/TerminalPane/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/TerminalPane/Makefile" ;;
+    "KKEdit/plugins/SessionManager/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/SessionManager/Makefile" ;;
+    "KKEdit/plugins/FileBrowser/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/FileBrowser/Makefile" ;;
+    "KKEdit/plugins/ClipboardPlugin/Makefile") CONFIG_FILES="$CONFIG_FILES KKEdit/plugins/ClipboardPlugin/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff -Nru kkedit-0.3.3/configure.ac kkedit-0.4.1/configure.ac
--- kkedit-0.3.3/configure.ac	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/configure.ac	2016-08-26 09:41:36.000000000 +0000
@@ -1,6 +1,6 @@
 #
 #
-AC_INIT([KKEdit],[0.3.3],[PROJ],[KKEdit])
+AC_INIT([KKEdit],[0.4.1],[PROJ],[KKEdit])
 
 AC_CONFIG_HEADER([config.h])
 AC_PROG_CXX
@@ -29,28 +29,32 @@
 	program_transform_name='s,\(^[[kK]].*t.*\),\1-3,'
 	PLUGVERSION=3
 	GTK3SUFFIX=-3
+	GTKVERSION=3
 else
 	GTK_MODULES="gtk+-2.0 >= 2.24.0"
 	GTKSRC_MODULES="gtksourceview-2.0 >= 2.9.9"
 	AC_DEFINE([_EXECSUFFIX_], [""], [Use GTK3])
 	PLUGVERSION=2
+	GTKVERSION=2
+	GTK3SUFFIX=
 fi
 
 AC_MSG_CHECKING(Build/Install plugins)
 AC_ARG_ENABLE(plugins,AS_HELP_STRING([--enable-plugins],[Build/Install plugins]),[enable_plugs=$enableval],[enable_plugs="yes"])
 AC_MSG_RESULT($enable_plugs)
 if test "$enable_plugs" = "yes"; then
-	PLUGINCLUDES="KKEdit/plugins/TerminalPane KKEdit/plugins/ClipboardPlugin KKEdit/plugins/FileBrowser KKEdit/plugins/SessionManager"
+	PLUGDIRS="KKEdit/plugins/TerminalPane KKEdit/plugins/SessionManager KKEdit/plugins/FileBrowser KKEdit/plugins/ClipboardPlugin"
 	if test "$enable_gtk3" = "yes"; then
 		AC_MSG_CHECKING(Finding vte version)
 		PKG_CHECK_EXISTS(vte-2.91,[usevte=91],[usevte=90])
 		if test $usevte = 91; then
 			VTE_MODULES="vte-2.91 >= 0.40.0"
-			VTEVERS=2.91
+			VTEVERS="-2.91"
 			AC_MSG_RESULT(using $VTEVERS)
 		else
 			VTE_MODULES="vte-2.90 >= 0.29.1"
-			VTEVERS=2.90
+			VTEVERS="-2.90"
+			USE290="-D_VTEVERS290_"
 			AC_DEFINE([_VTEVERS290_], [""], [Use vte-2.90])
 			AC_MSG_RESULT(using $VTEVERS)
 		fi
@@ -62,10 +66,24 @@
 	PLUGINCLUDES=
 fi
 
-AC_SUBST(PLUGINCLUDES)
-AC_SUBST(PLUGVERSION)
+AC_MSG_CHECKING(Build/Install unstable/new plugins)
+AC_ARG_ENABLE(unstable-plugins,AS_HELP_STRING([--disable-unstable-plugins],[Build/Install unstable/new plugins]),[enable_new_plugs=$enableval],[enable_new_plugs="no"])
+AC_MSG_RESULT($enable_new_plugs)
+if test "$enable_new_plugs" = "yes"; then
+	NEWPLUGINCLUDES=KKEdit/unstable-plugins/*Plugin
+	AC_OUTPUT(KKEdit/unstable-plugins/BrowserPlugin/Makefile KKEdit/unstable-plugins/MacroPlugin/Makefile)
+else
+	NEWPLUGINCLUDES=
+fi
+
+AC_SUBST(PLUGDIRS)
+AC_SUBST(NEWPLUGINCLUDES)
+AC_SUBST(USE290)
 AC_SUBST(VTEVERS)
 AC_SUBST(GTK3SUFFIX)
+AC_SUBST(GTKVERSION)
+
+AC_SUBST(PLUGVERSION)
 
 PKG_CHECK_MODULES(GTK,$GTK_MODULES)
 AC_SUBST(GTK_CFLAGS)
@@ -115,10 +133,32 @@
 	AC_DEFINE([_ASPELL_], [], [Include spellchecker])
 fi
 
-AC_CHECK_PROG(CTAGS, ctags ,true,false)
-if test $CTAGS = false; then
-	AC_MSG_ERROR([No ctags program found!])
-fi
+AC_CANONICAL_HOST
+case $host_os in
+
+	*BSD* | *bsd* )
+		AC_DEFINE([_INBSD_], [], [compiling for BSD])
+		AC_CHECK_PROG(EXCTAGS, exctags ,true,false)
+		if test $EXCTAGS = false; then
+			AC_MSG_ERROR([No exctags program found!])
+		fi
+		ICONV_LIBS=-liconv
+		SEDCOMMAND="sed -i ''"
+		;;
+
+	*)
+		AC_DEFINE([_INLINUX_], [], [compiling for linux])
+		AC_CHECK_PROG(CTAGS, ctags ,true,false)
+		if test $CTAGS = false; then
+			AC_MSG_ERROR([No ctags program found!])
+		fi
+		ICONV_LIBS=
+		SEDCOMMAND="sed -i"
+		;;
+esac
+
+AC_SUBST(ICONV_LIBS)
+AC_SUBST(SEDCOMMAND)
 
 AC_CHECK_PROG(GTKSU, gtksu ,true,false)
 if test $GTKSU = false; then
@@ -147,6 +187,6 @@
 AC_SUBST(with_debug_level)
 AC_MSG_RESULT([Setting debug level to $with_debug_level])
 
-AC_OUTPUT(Makefile KKEdit/app/Makefile)
+AC_OUTPUT(Makefile KKEdit/app/Makefile KKEdit/plugins/TerminalPane/Makefile KKEdit/plugins/SessionManager/Makefile KKEdit/plugins/FileBrowser/Makefile KKEdit/plugins/ClipboardPlugin/Makefile )
 
 
diff -Nru kkedit-0.3.3/debian/changelog kkedit-0.4.1/debian/changelog
--- kkedit-0.3.3/debian/changelog	2016-05-25 07:28:31.000000000 +0000
+++ kkedit-0.4.1/debian/changelog	2016-08-26 10:04:14.000000000 +0000
@@ -1,7 +1,13 @@
-kkedit (0.3.3-1~webupd8~trusty0) trusty; urgency=medium
+kkedit (0.4.1-1~webupd8~trusty0) trusty; urgency=medium
  
   * New upstream release
-  * Build-depend on libvte-2.91-dev or libvte-2.90-dev
+
+ -- Alin Andrei <webupd8@gmail.com>  Fri, 26 Aug 2016 13:04:21 +0200
+
+kkedit (0.3.3-1~webupd8~vivid1) vivid; urgency=medium
+ 
+  * New upstream release
+  * Use libvte-2.90-dev on Vivid
 
  -- Alin Andrei <webupd8@gmail.com>  Wed, 25 May 2016 10:28:17 +0200
 
diff -Nru kkedit-0.3.3/debian/control kkedit-0.4.1/debian/control
--- kkedit-0.3.3/debian/control	2016-05-25 07:28:05.000000000 +0000
+++ kkedit-0.4.1/debian/control	2016-08-25 10:56:12.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Alin Andrei <webupd8@gmail.com>
-Build-Depends: debhelper, libglib2.0-dev, libgtk-3-dev, libgtksourceview-3.0-dev, libunique-dev, exuberant-ctags, libaspell-dev, libwebkitgtk-3.0-dev, man2html-base, automake, autoconf, libx11-dev, libvte-2.91-dev | libvte-2.90-dev
+Build-Depends: debhelper, libglib2.0-dev, libgtk-3-dev, libgtksourceview-3.0-dev, libunique-dev, exuberant-ctags, libaspell-dev, libwebkitgtk-3.0-dev, man2html-base, automake, autoconf, libx11-dev, libvte-2.90-dev | libvte-2.91-dev
 Standards-Version: 3.9.7
 Homepage: http://gnomefiles.org/content/show.php?content=158161
 
diff -Nru kkedit-0.3.3/INSTALL kkedit-0.4.1/INSTALL
--- kkedit-0.3.3/INSTALL	2016-05-23 09:23:37.000000000 +0000
+++ kkedit-0.4.1/INSTALL	2016-08-26 09:41:37.000000000 +0000
@@ -86,7 +86,31 @@
 make
 sudo make install
 
-You may need to adjust package names slightly depending on the version of debian/fedora that you have installed.
+******************
+
+OpenSuse ( Leap 42.x ) gtk2.
+
+sudo zypper install make gcc gcc-c++
+sudo zypper install xorg-x11-devel ctags gtksourceview2-devel gtk2-devel vte2-devel
+
+Optional installs
+sudo zypper install aspell-devel aspell aspell-en
+sudo zypper install libwebkitgtk-devel
+sudo zypper install hxtools-scripts
+
+OpenSuse ( Leap 42.x ) gtk3.
+
+sudo zypper install make gcc gcc-c++
+sudo zypper install xorg-x11-devel ctags gtksourceview-devel gtk3-devel vte-devel
+
+Optional installs
+sudo zypper install aspell-devel aspell aspell-en
+sudo zypper install libwebkitgtk3-devel
+sudo zypper install hxtools-scripts
+
+******************
+
+You may need to adjust package names slightly depending on the version of debian/fedora/opensuse that you have installed.
 
 Bugs and suggestions welcome please email to kdhedger68713@gmail.com
 For general info on compiling/installing software on your disro see the relevant forums.
diff -Nru kkedit-0.3.3/KKEdit/app/Makefile.am kkedit-0.4.1/KKEdit/app/Makefile.am
--- kkedit-0.3.3/KKEdit/app/Makefile.am	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/app/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -13,8 +13,8 @@
 helpfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/help
 helpfiles_DATA = ../resources/help/*
 
-scriptfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/tools
-scriptfiles_SCRIPTS = ../resources/tools/*
+scriptfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/scripts
+scriptfiles_SCRIPTS = ../resources/scripts/*
 
 docfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/docs
 docfiles_DATA = ../resources/docs/*
@@ -22,33 +22,43 @@
 stylefilesdir = $(pkgdatadir)$(GTK3SUFFIX)/styles
 stylefiles_DATA = ../resources/styles/*
 
+toolsdir = $(pkgdatadir)$(GTK3SUFFIX)/tools
+tools_DATA = ../resources/tools/*
+
+man1_MANS = ../resources/man/kkedit.1
+
 bin_PROGRAMS = kkedit KKEditProgressBar
 
 install-exec-hook:
-	install -D ../resources/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlug$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEdit$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditRoot$(GTK3SUFFIX).png
 
-	install -D ../resources/pixmaps/KKEdit.desktop $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
-	install -D ../resources/pixmaps/KKEditRoot.desktop $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
+	mkdir -p $(DESTDIR)${prefix}/share/pixmaps
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlug$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEdit$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditRoot$(GTK3SUFFIX).png
+
+	mkdir -vp $(DESTDIR)${prefix}/share/applications $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES $(DESTDIR)${includedir} ||true
+	install ../resources/pixmaps/KKEdit.desktop $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
+	install ../resources/pixmaps/KKEditRoot.desktop $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
 
-	install -D ../../po/fr_FR/LC_MESSAGES/kkedit.mo $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/kkedit$(GTK3SUFFIX).mo
-	install -D ../src/kkedit-plugins.h $(DESTDIR)${includedir}/kkedit-plugins$(GTK3SUFFIX).h
+	install ../../po/fr_FR/LC_MESSAGES/kkedit.mo $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/kkedit$(GTK3SUFFIX).mo
+	install -m 644 ../src/kkedit-plugins.h $(DESTDIR)${includedir}/kkedit-plugins$(GTK3SUFFIX).h
 
 	echo "Icon=KKEditRoot$(GTK3SUFFIX)" >> $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
 	echo "Exec=${with_gsu_path} kkedit$(GTK3SUFFIX) -m %f" >> $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
 	echo "Icon=KKEdit$(GTK3SUFFIX)" >> $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
 	echo "Exec=kkedit$(GTK3SUFFIX) %f" >> $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
 
-	install -D ../resources/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEdit$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditRoot$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditPlug$(GTK3SUFFIX).png
+	mkdir -p $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEdit$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditRoot$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditPlug$(GTK3SUFFIX).png
 
 	mkdir -vp "$(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)/Example External Tools"
 	cp -r "../resources/Example External Tools" "$(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)"
 
 install-data-hook:
-	sed -i 's/kkedit/kkedit$(GTK3SUFFIX)/g' $(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)/tools/*
+	$(SEDCOMMAND) 's/kkedit/kkedit$(GTK3SUFFIX)/g' $(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)/tools/*
+
 
 
diff -Nru kkedit-0.3.3/KKEdit/app/Makefile.in kkedit-0.4.1/KKEdit/app/Makefile.in
--- kkedit-0.3.3/KKEdit/app/Makefile.in	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/KKEdit/app/Makefile.in	2016-08-26 09:41:39.000000000 +0000
@@ -88,6 +88,8 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 bin_PROGRAMS = kkedit$(EXEEXT) KKEditProgressBar$(EXEEXT)
 subdir = KKEdit/app
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -100,8 +102,9 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptfilesdir)" \
-	"$(DESTDIR)$(docfilesdir)" "$(DESTDIR)$(helpfilesdir)" \
-	"$(DESTDIR)$(pixfilesdir)" "$(DESTDIR)$(stylefilesdir)"
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docfilesdir)" \
+	"$(DESTDIR)$(helpfilesdir)" "$(DESTDIR)$(pixfilesdir)" \
+	"$(DESTDIR)$(stylefilesdir)" "$(DESTDIR)$(toolsdir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_KKEditProgressBar_OBJECTS = ../pole/main.$(OBJEXT)
@@ -111,11 +114,11 @@
 	../src/callbacks.$(OBJEXT) ../src/completion.$(OBJEXT) \
 	../src/encoding.$(OBJEXT) ../src/files.$(OBJEXT) \
 	../src/globals.$(OBJEXT) ../src/guis.$(OBJEXT) \
-	../src/main.$(OBJEXT) ../src/navcallbacks.$(OBJEXT) \
-	../src/pages.$(OBJEXT) ../src/pluginclass.$(OBJEXT) \
-	../src/plugins.$(OBJEXT) ../src/searchcallbacks.$(OBJEXT) \
-	../src/sliceclass.$(OBJEXT) ../src/spellcheck.$(OBJEXT) \
-	../src/textbuffer.$(OBJEXT)
+	../src/internet.$(OBJEXT) ../src/main.$(OBJEXT) \
+	../src/navcallbacks.$(OBJEXT) ../src/pages.$(OBJEXT) \
+	../src/pluginclass.$(OBJEXT) ../src/plugins.$(OBJEXT) \
+	../src/searchcallbacks.$(OBJEXT) ../src/sliceclass.$(OBJEXT) \
+	../src/spellcheck.$(OBJEXT) ../src/textbuffer.$(OBJEXT)
 am_kkedit_OBJECTS = $(am__objects_1)
 kkedit_OBJECTS = $(am_kkedit_OBJECTS)
 kkedit_LDADD = $(LDADD)
@@ -183,8 +186,11 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man1_MANS)
 DATA = $(docfiles_DATA) $(helpfiles_DATA) $(pixfiles_DATA) \
-	$(stylefiles_DATA)
+	$(stylefiles_DATA) $(tools_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -230,6 +236,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
 EXEEXT = @EXEEXT@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
@@ -238,8 +245,10 @@
 GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
 GTKSRC_LIBS = @GTKSRC_LIBS@
 GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -252,12 +261,14 @@
 	$(GTKSRC_LIBS) \
 	$(WEBKIT_LIBS) \
 	$(GLIB_LIBS) \
-	$(ASPELL_LIBS)
+	$(ASPELL_LIBS) \
+	$(ICONV_LIBS)
 
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANPAGEEDITOR = @MANPAGEEDITOR@
 MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -270,11 +281,13 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUGINCLUDES = @PLUGINCLUDES@
+PLUGDIRS = @PLUGDIRS@
 PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE290 = @USE290@
 VERSION = @VERSION@
 VTEVERS = @VTEVERS@
 VTE_CFLAGS = @VTE_CFLAGS@
@@ -295,14 +308,22 @@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -330,7 +351,7 @@
 with_gsu_path = @with_gsu_path@
 with_qt5_docdir = @with_qt5_docdir@
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CXXFLAGS = -Wall -fvisibility=hidden
+AM_CCFLAGS = -Wall -fvisibility=hidden
 AM_CPPFLAGS = -I$(top_srcdir) \
 			$(GTK_CFLAGS) \
 			$(X11_CFLAGS) \
@@ -350,19 +371,22 @@
 			-DGTKSUPATH=\""${with_gsu_path}"\" \
 			-D_DEBUGLEVEL_=${with_debug_level}
 
-COMMONSRC = ../src/backclass.cpp ../src/bookmarks.cpp ../src/callbacks.cpp ../src/completion.cpp ../src/encoding.cpp ../src/files.cpp ../src/globals.cpp ../src/guis.cpp ../src/main.cpp ../src/navcallbacks.cpp ../src/pages.cpp ../src/pluginclass.cpp ../src/plugins.cpp ../src/searchcallbacks.cpp ../src/sliceclass.cpp ../src/spellcheck.cpp ../src/textbuffer.cpp
+COMMONSRC = ../src/backclass.cpp ../src/bookmarks.cpp ../src/callbacks.cpp ../src/completion.cpp ../src/encoding.cpp ../src/files.cpp ../src/globals.cpp ../src/guis.cpp ../src/internet.cpp ../src/main.cpp ../src/navcallbacks.cpp ../src/pages.cpp ../src/pluginclass.cpp ../src/plugins.cpp ../src/searchcallbacks.cpp ../src/sliceclass.cpp ../src/spellcheck.cpp ../src/textbuffer.cpp
 kkedit_SOURCES = $(COMMONSRC)
 KKEditProgressBar_SOURCES = ../pole/main.cpp
 pixfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/pixmaps
 pixfiles_DATA = ../resources/pixmaps/*
 helpfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/help
 helpfiles_DATA = ../resources/help/*
-scriptfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/tools
-scriptfiles_SCRIPTS = ../resources/tools/*
+scriptfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/scripts
+scriptfiles_SCRIPTS = ../resources/scripts/*
 docfilesdir = $(pkgdatadir)$(GTK3SUFFIX)/docs
 docfiles_DATA = ../resources/docs/*
 stylefilesdir = $(pkgdatadir)$(GTK3SUFFIX)/styles
 stylefiles_DATA = ../resources/styles/*
+toolsdir = $(pkgdatadir)$(GTK3SUFFIX)/tools
+tools_DATA = ../resources/tools/*
+man1_MANS = ../resources/man/kkedit.1
 all: all-am
 
 .SUFFIXES:
@@ -473,6 +497,8 @@
 	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/guis.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
+../src/internet.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/main.$(OBJEXT): ../src/$(am__dirstamp) \
 	../src/$(DEPDIR)/$(am__dirstamp)
 ../src/navcallbacks.$(OBJEXT): ../src/$(am__dirstamp) \
@@ -548,6 +574,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/files.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/globals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/guis.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/internet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/navcallbacks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/pages.Po@am__quote@
@@ -573,6 +600,47 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+install-man1: $(man1_MANS)
+	@$(NORMAL_INSTALL)
+	@list1='$(man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-docfilesDATA: $(docfiles_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(docfiles_DATA)'; test -n "$(docfilesdir)" || list=; \
@@ -657,6 +725,27 @@
 	@list='$(stylefiles_DATA)'; test -n "$(stylefilesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(stylefilesdir)'; $(am__uninstall_files_from_dir)
+install-toolsDATA: $(tools_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(tools_DATA)'; test -n "$(toolsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(toolsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(toolsdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(toolsdir)" || exit $$?; \
+	done
+
+uninstall-toolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(tools_DATA)'; test -n "$(toolsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(toolsdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -742,9 +831,9 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptfilesdir)" "$(DESTDIR)$(docfilesdir)" "$(DESTDIR)$(helpfilesdir)" "$(DESTDIR)$(pixfilesdir)" "$(DESTDIR)$(stylefilesdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptfilesdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docfilesdir)" "$(DESTDIR)$(helpfilesdir)" "$(DESTDIR)$(pixfilesdir)" "$(DESTDIR)$(stylefilesdir)" "$(DESTDIR)$(toolsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -804,8 +893,8 @@
 info-am:
 
 install-data-am: install-docfilesDATA install-helpfilesDATA \
-	install-pixfilesDATA install-scriptfilesSCRIPTS \
-	install-stylefilesDATA
+	install-man install-pixfilesDATA install-scriptfilesSCRIPTS \
+	install-stylefilesDATA install-toolsDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
@@ -823,7 +912,7 @@
 
 install-info-am:
 
-install-man:
+install-man: install-man1
 
 install-pdf: install-pdf-am
 
@@ -853,8 +942,11 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-docfilesDATA \
-	uninstall-helpfilesDATA uninstall-pixfilesDATA \
-	uninstall-scriptfilesSCRIPTS uninstall-stylefilesDATA
+	uninstall-helpfilesDATA uninstall-man uninstall-pixfilesDATA \
+	uninstall-scriptfilesSCRIPTS uninstall-stylefilesDATA \
+	uninstall-toolsDATA
+
+uninstall-man: uninstall-man1
 
 .MAKE: install-am install-data-am install-exec-am install-strip
 
@@ -866,46 +958,51 @@
 	install-data-hook install-docfilesDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-exec-hook \
 	install-helpfilesDATA install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pixfilesDATA install-ps install-ps-am \
-	install-scriptfilesSCRIPTS install-strip \
-	install-stylefilesDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-docfilesDATA \
-	uninstall-helpfilesDATA uninstall-pixfilesDATA \
-	uninstall-scriptfilesSCRIPTS uninstall-stylefilesDATA
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-pixfilesDATA install-ps \
+	install-ps-am install-scriptfilesSCRIPTS install-strip \
+	install-stylefilesDATA install-toolsDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-docfilesDATA \
+	uninstall-helpfilesDATA uninstall-man uninstall-man1 \
+	uninstall-pixfilesDATA uninstall-scriptfilesSCRIPTS \
+	uninstall-stylefilesDATA uninstall-toolsDATA
 
 .PRECIOUS: Makefile
 
 
 install-exec-hook:
-	install -D ../resources/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlug$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEdit$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditRoot$(GTK3SUFFIX).png
 
-	install -D ../resources/pixmaps/KKEdit.desktop $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
-	install -D ../resources/pixmaps/KKEditRoot.desktop $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
+	mkdir -p $(DESTDIR)${prefix}/share/pixmaps
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlug$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEdit$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/pixmaps/KKEditRoot$(GTK3SUFFIX).png
+
+	mkdir -vp $(DESTDIR)${prefix}/share/applications $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES $(DESTDIR)${includedir} ||true
+	install ../resources/pixmaps/KKEdit.desktop $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
+	install ../resources/pixmaps/KKEditRoot.desktop $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
 
-	install -D ../../po/fr_FR/LC_MESSAGES/kkedit.mo $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/kkedit$(GTK3SUFFIX).mo
-	install -D ../src/kkedit-plugins.h $(DESTDIR)${includedir}/kkedit-plugins$(GTK3SUFFIX).h
+	install ../../po/fr_FR/LC_MESSAGES/kkedit.mo $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/kkedit$(GTK3SUFFIX).mo
+	install -m 644 ../src/kkedit-plugins.h $(DESTDIR)${includedir}/kkedit-plugins$(GTK3SUFFIX).h
 
 	echo "Icon=KKEditRoot$(GTK3SUFFIX)" >> $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
 	echo "Exec=${with_gsu_path} kkedit$(GTK3SUFFIX) -m %f" >> $(DESTDIR)${prefix}/share/applications/KKEditRoot$(GTK3SUFFIX).desktop
 	echo "Icon=KKEdit$(GTK3SUFFIX)" >> $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
 	echo "Exec=kkedit$(GTK3SUFFIX) %f" >> $(DESTDIR)${prefix}/share/applications/KKEdit$(GTK3SUFFIX).desktop
 
-	install -D ../resources/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEdit$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditRoot$(GTK3SUFFIX).png
-	install -D ../resources/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditPlug$(GTK3SUFFIX).png
+	mkdir -p $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEdit$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEdit$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditRoot$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditRoot$(GTK3SUFFIX).png
+	ln -sf ${pkgdatadir}$(GTK3SUFFIX)/pixmaps/KKEditPlug$(GTK3SUFFIX).png $(DESTDIR)${prefix}/share/icons/hicolor/128x128/apps/KKEditPlug$(GTK3SUFFIX).png
 
 	mkdir -vp "$(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)/Example External Tools"
 	cp -r "../resources/Example External Tools" "$(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)"
 
 install-data-hook:
-	sed -i 's/kkedit/kkedit$(GTK3SUFFIX)/g' $(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)/tools/*
+	$(SEDCOMMAND) 's/kkedit/kkedit$(GTK3SUFFIX)/g' $(DESTDIR)${pkgdatadir}$(GTK3SUFFIX)/tools/*
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru kkedit-0.3.3/KKEdit/flagsandlibs kkedit-0.4.1/KKEdit/flagsandlibs
--- kkedit-0.3.3/KKEdit/flagsandlibs	2016-05-23 09:23:36.000000000 +0000
+++ kkedit-0.4.1/KKEdit/flagsandlibs	2016-08-26 09:41:35.000000000 +0000
@@ -1,5 +1,5 @@
 
-AM_CXXFLAGS = -Wall -fvisibility=hidden
+AM_CCFLAGS = -Wall -fvisibility=hidden
 
 AM_CPPFLAGS =	-I$(top_srcdir) \
 			$(GTK_CFLAGS) \
@@ -25,5 +25,6 @@
 	$(GTKSRC_LIBS) \
 	$(WEBKIT_LIBS) \
 	$(GLIB_LIBS) \
-	$(ASPELL_LIBS)
+	$(ASPELL_LIBS) \
+	$(ICONV_LIBS)
 
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/clipboardplugin.cpp kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/clipboardplugin.cpp
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/clipboardplugin.cpp	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/clipboardplugin.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -34,8 +34,6 @@
 #include "../common.h"
 #include "../kkedit-plugins.h"
 
-#define MYEMAIL "kdhedger68713@gmail.com"
-#define MYWEBSITE "http://kkedit.darktech.org"
 #define PLUGVERSION VERSION
 #define MAXCLIPS 10
 #define MAXCLIPMENULEN 43
@@ -63,6 +61,7 @@
 gulong			clipid;
 char*			currentdomain=NULL;
 bool			manual=false;
+int				sinkInt;
 
 int	(*module_plug_function)(gpointer globaldata);
 
@@ -132,7 +131,7 @@
 
 			if(strlen(clip[currentClip].text)>MAXCLIPMENULEN)
 				{
-					asprintf(&label,"%." CLIPENDLENSTR "s...%s",texthold,(char*)&texthold[strlen(texthold)-CLIPENDLEN]);
+					sinkInt=asprintf(&label,"%." CLIPENDLENSTR "s...%s",texthold,(char*)&texthold[strlen(texthold)-CLIPENDLEN]);
 					gtk_menu_item_set_label((GtkMenuItem*)clip[currentClip].menuItem,label);
 					free(label);
 				}
@@ -171,7 +170,7 @@
 
 	for(int j=0;j<MAXCLIPS;j++)
 		{
-			asprintf(&command,gettext("Clip Number. %i"),j+1);
+			sinkInt=asprintf(&command,gettext("Clip Number. %i"),j+1);
 			clip[j].menuItem=(GtkWidget*)gtk_menu_item_new_with_label(command);
 			free(command);
 			clip[j].text=NULL;
@@ -189,24 +188,22 @@
 
 extern "C" int doAbout(gpointer data)
 {
-	plugData*		plugdata=(plugData*)data;
-	char*			licencepath;
+	plugData		*plugdata=(plugData*)data;
+	char			*licencepath;
 	const char		copyright[] ="Copyright \xc2\xa9 2014 K.D.Hedger";
-	char*			licence;
-	GtkAboutDialog*	about;
-	char*			translators;
+	char			*licence;
+	GtkAboutDialog	*about;
+	char			*translators;
 
 	setTextDomain(true,plugdata);
 
-	const char*		aboutboxstring=gettext("Clipboard Plugin - Add's multiple clips");
-	const char*	authors[]= {"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,gettext("\nMore by the same author\n"),"Xfce-Theme-Manager\nhttp://xfce-look.org/content/show.php?content=149647\n","Xfce4-Composite-Editor\nhttp://gtk-apps.org/content/show.php/Xfce4-Composite-Editor?content=149523\n","Manpage Editor\nhttp://gtk-apps.org/content/show.php?content=160219\n","GtkSu\nhttp://gtk-apps.org/content/show.php?content=158974\n","ASpell GUI\nhttp://gtk-apps.org/content/show.php/?content=161353\n","Clipboard Viewer\nhttp://gtk-apps.org/content/show.php/?content=121667",NULL};
-
-	asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
-	asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
+	const char		*aboutboxstring=gettext("Clipboard Plugin - Add's multiple clips");
+	sinkInt=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
+	sinkInt=asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
 
 	g_file_get_contents(licencepath,&licence,NULL,NULL);
 	about=(GtkAboutDialog*)gtk_about_dialog_new();
-	gtk_about_dialog_set_program_name(about,"ClipboardPlugin");
+	gtk_about_dialog_set_program_name(about,gettext("ClipboardPlugin"));
 	gtk_about_dialog_set_authors(about,authors);
 	gtk_about_dialog_set_comments(about,aboutboxstring);
 	gtk_about_dialog_set_copyright(about,copyright);
@@ -215,6 +212,7 @@
 	gtk_about_dialog_set_logo_icon_name(about,ABOUTICON);
 	gtk_about_dialog_set_license(about,licence);
 	gtk_about_dialog_set_translator_credits(about,(const gchar*)translators);
+	gtk_window_set_transient_for((GtkWindow*)about,(GtkWindow*)plugdata->prefsWindow);
 
 	gtk_dialog_run(GTK_DIALOG(about));
 	gtk_widget_destroy((GtkWidget*)about);
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin_fr_FR.po kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin_fr_FR.po
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin_fr_FR.po	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin_fr_FR.po	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,74 @@
+# French translations for ClipboardPlugin package
+# Traductions françaises du paquet ClipboardPlugin.
+# Copyright (C) 2014 THE ClipboardPlugin'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ClipboardPlugin package.
+# Automatically generated, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ClipboardPlugin 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:44+0100\n"
+"PO-Revision-Date: 2016-08-23 12:46-0000\n"
+"Last-Translator: K. D. Hedger <kdhedger68713@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.6.11\n"
+
+#: clipboardplugin.cpp:166
+msgid "C_lipboard"
+msgstr "P_resse-papier"
+
+#: clipboardplugin.cpp:173
+#, c-format
+msgid "Clip Number. %i"
+msgstr "Emplacement %i"
+
+#: clipboardplugin.cpp:200
+msgid "Clipboard Plugin - Add's multiple clips"
+msgstr ""
+"Greffon presse-papier - Un presse-papier pour KKEdit avec 10 emplacements"
+
+#: clipboardplugin.cpp:201
+msgid "French Translation"
+msgstr "Traduction française"
+
+#: ../common.h:28
+msgid "Apply"
+msgstr "_Appliquer"
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr "_Annuler"
+
+#: ../common.h:30
+msgid "New"
+msgstr "Nouveau"
+
+#: ../common.h:31
+msgid "Help"
+msgstr "Aide"
+
+#: ../common.h:32
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../common.h:33
+msgid "Connect"
+msgstr "Relier"
+
+#: ../common.h:34
+msgid "OK"
+msgstr "OK"
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
+"\n"
+"Plus du même auteur\n"
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin.pot kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin.pot
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin.pot	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/ClipboardPlugin.pot	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,69 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ClipboardPlugin 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:46+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: clipboardplugin.cpp:166
+msgid "C_lipboard"
+msgstr ""
+
+#: clipboardplugin.cpp:173
+#, c-format
+msgid "Clip Number. %i"
+msgstr ""
+
+#: clipboardplugin.cpp:200
+msgid "Clipboard Plugin - Add's multiple clips"
+msgstr ""
+
+#: clipboardplugin.cpp:201
+msgid "French Translation"
+msgstr ""
+
+#: ../common.h:28
+msgid "Apply"
+msgstr ""
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr ""
+
+#: ../common.h:30
+msgid "New"
+msgstr ""
+
+#: ../common.h:31
+msgid "Help"
+msgstr ""
+
+#: ../common.h:32
+msgid "Open"
+msgstr ""
+
+#: ../common.h:33
+msgid "Connect"
+msgstr ""
+
+#: ../common.h:34
+msgid "OK"
+msgstr ""
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/Makefile kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/Makefile
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/Makefile	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-PACKAGENAME=$(shell /usr/bin/basename `pwd`)
-PLUGNAME=$(shell echo ${PACKAGENAME}|/usr/bin/tr A-Z a-z)
-MONAME=${PACKAGENAME}.mo
-PLATFORM=gtk
-GTKVERSION?=2
-EXTRAMAKEFLAGS?=
-GLOBAL?=0
-DEVELOP?=0
-
-PREFIX?=/usr
-
-ifeq (3,$(GTKVERSION))
-INSTALLSUFFIX=-3
-endif
-
-ifeq (0,$(GLOBAL))
-	LOCALEFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}/locale
-	INSTALLFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-else
-	LOCALEFOLDER=$(PREFIX)/share/locale
-	INSTALLFOLDER=$(PREFIX)/share/KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-endif
-
-ifeq (1,$(DEVELOP))
-	DEVMODE=-D_DEVMODE_
-endif
-
-all:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc
-
-clean: distclean
-
-distclean:
-	rm -f lib${PLUGNAME}.so||true
-	rm -f ${PLUGNAME}.o||true
-
-install:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc
-	mkdir -vp $(DESTDIR)${INSTALLFOLDER} $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES || true
-	cp -v lib${PLUGNAME}.so $(DESTDIR)$(INSTALLFOLDER)	
-	cp po/fr_FR/LC_MESSAGES/$(PACKAGENAME).mo $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo
-
-uninstall:
-	rm -rv $(DESTDIR)$(INSTALLFOLDER)/lib${PLUGNAME}.so $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo||true
-
-makepkg: clean
-	cd .. && tar -cvzhf ${PACKAGENAME}.tar.gz ${PACKAGENAME}
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/Makefile.am kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/Makefile.am
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,19 @@
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c clipboardplugin.cpp  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o clipboardplugin.o
+
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libclipboardplugin.so -o libclipboardplugin.so clipboardplugin.o -lc
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libclipboardplugin.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/ClipboardPlugin.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/ClipboardPlugin$(GTK3SUFFIX).mo
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/Makefile.in kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/Makefile.in
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/Makefile.in	2016-08-26 09:41:39.000000000 +0000
@@ -0,0 +1,452 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = KKEdit/plugins/ClipboardPlugin
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASPELL_LIBS = @ASPELL_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
+EXEEXT = @EXEEXT@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+GTK3SUFFIX = @GTK3SUFFIX@
+GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
+GTKSRC_LIBS = @GTKSRC_LIBS@
+GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANPAGEEDITOR = @MANPAGEEDITOR@
+MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGDIRS = @PLUGDIRS@
+PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE290 = @USE290@
+VERSION = @VERSION@
+VTEVERS = @VTEVERS@
+VTE_CFLAGS = @VTE_CFLAGS@
+VTE_LIBS = @VTE_LIBS@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_debug_level = @with_debug_level@
+with_gsu_path = @with_gsu_path@
+with_qt5_docdir = @with_qt5_docdir@
+AUTOMAKE_OPTIONS = subdir-objects
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu KKEdit/plugins/ClipboardPlugin/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu KKEdit/plugins/ClipboardPlugin/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c clipboardplugin.cpp  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o clipboardplugin.o
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libclipboardplugin.so -o libclipboardplugin.so clipboardplugin.o -lc
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libclipboardplugin.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/ClipboardPlugin.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/ClipboardPlugin$(GTK3SUFFIX).mo
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/makepo kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/makepo
--- kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/makepo	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/makepo	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+#©keithhedger Fri 3 Oct 17:38:03 BST 2014 kdhedger68713@gmail.com
+
+MAKEPOS=0
+MAKEMOS=0
+DOMAINNAME=ClipboardPlugin
+
+if [ "X$1" = "Xmakepos" ];then
+	MAKEPOS=1
+	MAKEMOS=0
+fi
+
+if [ "X$1" = "Xmakemos" ];then
+	MAKEPOS=0
+	MAKEMOS=1
+fi
+
+langs="fr_FR"
+
+rm ${DOMAINNAME}.pot||true
+xgettext --package-name  ${DOMAINNAME}  --package-version 1.2 --default-domain  ${DOMAINNAME} --output ${DOMAINNAME}.pot clipboardplugin.cpp ../common.h
+
+for arg in $langs
+	do
+		mkdir --parents po/${arg}/LC_MESSAGES
+		if [ $MAKEPOS -eq 1 ];then
+			msginit --no-translator --locale $arg --output-file ${DOMAINNAME}_${arg}.po --input ${DOMAINNAME}.pot
+		fi
+		if [ $MAKEMOS -eq 1 ];then
+			msgfmt --check --verbose --output-file po/${arg}/LC_MESSAGES/${DOMAINNAME}.mo ${DOMAINNAME}_${arg}.po
+		fi
+	done
\ No newline at end of file
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/plugins/ClipboardPlugin/po/fr_FR/LC_MESSAGES/ClipboardPlugin.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/plugins/ClipboardPlugin/po/fr_FR/LC_MESSAGES/ClipboardPlugin.mo differ
diff -Nru kkedit-0.3.3/KKEdit/plugins/common.h kkedit-0.4.1/KKEdit/plugins/common.h
--- kkedit-0.3.3/KKEdit/plugins/common.h	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/common.h	2016-08-26 09:41:34.000000000 +0000
@@ -18,6 +18,9 @@
  * along with Projects.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+//#include "../src/links.h"
+
+#include "../src/internet.h"
 #ifndef _COMMON_
 #define _COMMON_
 
@@ -36,7 +39,11 @@
 
 #endif
 
+#ifndef _ENUMS_
+#define _ENUMS_
 enum {NEWVBOX=0,NEWHBOX};
+#endif
+
 GtkWidget* createNewBox(int orient,bool homog,int spacing)
 {
 	GtkWidget	*retwidg=NULL;
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/filebrowser.cpp kkedit-0.4.1/KKEdit/plugins/FileBrowser/filebrowser.cpp
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/filebrowser.cpp	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/filebrowser.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -38,8 +38,6 @@
 #include "../common.h"
 #include "../kkedit-plugins.h"
 
-#define MYEMAIL "kdhedger68713@gmail.com"
-#define MYWEBSITE "http://kkedit.darktech.org"
 #define PLUGVERSION VERSION
 #define NUM_COLUMNS 3
 #define COLUMN_FILENAME 1
@@ -53,6 +51,17 @@
 #define ABOUTICON "KKEditPlug"
 #endif
 
+//#ifdef _USEGTK3_
+////gtk stock widget labels
+//#define GTK_STOCK_YES gettext("_Yes")
+//#define GTK_STOCK_NO gettext("_No")
+//#define GTK_STOCK_CANCEL gettext("_Cancel")
+//#define GTK_STOCK_OPEN_LABEL gettext("_Open")
+//#define GTK_STOCK_APPLY gettext("_Apply")
+//#define GTK_STOCK_EDIT "accessories-text-editor"
+//#define GTK_STOCK_OK gettext("_OK")
+//#endif
+
 int	(*module_plug_function)(gpointer globaldata);
 
 GtkWidget*		leftButton;
@@ -67,8 +76,8 @@
 int				colsize=0;
 bool			showInvisible;
 gchar*			node=NULL;
-char*			currentdomain=NULL;
-
+char			*currentdomain=NULL;
+int				sinkInt;
 extern "C" const gchar* g_module_check_init(GModule *module)
 {
 	currentdomain=strdup(textdomain(NULL));
@@ -106,7 +115,7 @@
 {
 	char*	filepath;
 
-	asprintf(&filepath,"%s/filebrowser.inv",pdata->lPlugFolder);
+	sinkInt=asprintf(&filepath,"%s/filebrowser.inv",pdata->lPlugFolder);
 	if(showInvisible==true)
 		touch(filepath);
 	else
@@ -126,7 +135,7 @@
 	vbox=createNewBox(NEWVBOX,false,0);
 	setTextDomain(true,plugdata);
 
-	dialog=gtk_dialog_new_with_buttons(gettext("File Browser Plug In Prefs"),NULL,GTK_DIALOG_MODAL,GTK_STOCK_APPLY,GTK_RESPONSE_APPLY,GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,NULL);
+	dialog=gtk_dialog_new_with_buttons(gettext("File Browser Plug In Prefs"),(GtkWindow*)plugdata->prefsWindow,GTK_DIALOG_MODAL,gettext(GTK_STOCK_APPLY),GTK_RESPONSE_APPLY,gettext(GTK_STOCK_CANCEL),GTK_RESPONSE_CANCEL,NULL);
 	dialogbox=gtk_dialog_get_content_area((GtkDialog*)dialog);
 	gtk_container_add(GTK_CONTAINER(dialogbox),vbox);
 
@@ -164,7 +173,7 @@
 			pix=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),*names,16,(GtkIconLookupFlags)(GTK_ICON_LOOKUP_USE_BUILTIN|GTK_ICON_LOOKUP_FORCE_SVG|GTK_ICON_LOOKUP_GENERIC_FALLBACK|GTK_ICON_LOOKUP_FORCE_SIZE),NULL);
 			if(pix==NULL)
 				{
-					asprintf(&newname,"gnome-mime-%s",*names);
+					sinkInt=asprintf(&newname,"gnome-mime-%s",*names);
 					pix=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),(const gchar*)newname,16,(GtkIconLookupFlags)(GTK_ICON_LOOKUP_USE_BUILTIN|GTK_ICON_LOOKUP_FORCE_SVG|GTK_ICON_LOOKUP_GENERIC_FALLBACK|GTK_ICON_LOOKUP_FORCE_SIZE),NULL);
 					debugFree(&newname);
 				}
@@ -202,9 +211,9 @@
 	char*				pathname;
 	
 	if(strcasecmp("/",folderpath)!=0)
-		asprintf(&pathname,"%s/%s",folderpath,filename);
+		sinkInt=asprintf(&pathname,"%s/%s",folderpath,filename);
 	else
-		asprintf(&pathname,"/%s",filename);
+		sinkInt=asprintf(&pathname,"/%s",filename);
 
 	model=gtk_tree_view_get_model(treeview);
 	gtk_tree_model_iter_parent(model,&parentiter,iter);
@@ -227,9 +236,9 @@
 	gtk_tree_model_iter_parent(model,&parentiter,iter);
 
 	if(showInvisible==true)
-		asprintf(&command,"ls -1 -A \"%s\"|sort",name);
+		sinkInt=asprintf(&command,"ls -1 -A \"%s\"|sort",name);
 	else
-		asprintf(&command,"ls -1 \"%s\"|sort",name);
+		sinkInt=asprintf(&command,"ls -1 \"%s\"|sort",name);
 
 	fp=popen(command,"r");
 	if(fp!=NULL)
@@ -325,7 +334,7 @@
 		{
 			gtk_tree_model_get(model,&iter,COLUMN_PATHNAME,&name,-1);
 			app=getApp(name);
-			asprintf(&command,"%s '%s'",app,name);
+			sinkInt=asprintf(&command,"%s '%s'",app,name);
 			
 			if (GDK_CONTROL_MASK & mask )
 				runCommand(command,NULL,false,TOOL_ASYNC,true,NULL);
@@ -342,7 +351,7 @@
 	char*	filepath;
 
 	setTextDomain(true,pdata);
-	asprintf(&filepath,"%s/filebrowser.rc",pdata->lPlugFolder);
+	sinkInt=asprintf(&filepath,"%s/filebrowser.rc",pdata->lPlugFolder);
 	if(showing==true)
 		{
 			gtk_widget_show_all(scrollbox);
@@ -383,7 +392,7 @@
 {
 	char*	filepath;
 
-	asprintf(&filepath,"%s/filebrowser.rc",pdata->lPlugFolder);
+	sinkInt=asprintf(&filepath,"%s/filebrowser.rc",pdata->lPlugFolder);
 	if(g_file_test(filepath,G_FILE_TEST_EXISTS))
 		showing=true;
 	else
@@ -391,7 +400,7 @@
 
 	debugFree(&filepath);
 
-	asprintf(&filepath,"%s/filebrowser.inv",pdata->lPlugFolder);
+	sinkInt=asprintf(&filepath,"%s/filebrowser.inv",pdata->lPlugFolder);
 	if(g_file_test(filepath,G_FILE_TEST_EXISTS))
 		showInvisible=true;
 	else
@@ -562,20 +571,18 @@
 
 extern "C" int doAbout(gpointer data)
 {
-	plugData*		plugdata=(plugData*)data;
-	char*			licencepath;
+	plugData		*plugdata=(plugData*)data;
+	char			*licencepath;
 	const char		copyright[] ="Copyright \xc2\xa9 2014 K.D.Hedger";
-	char*			licence;
-	GtkAboutDialog*	about;
+	char			*licence;
+	GtkAboutDialog	*about;
 	char*			translators;
 
 	setTextDomain(true,plugdata);
 
-	const char*		aboutboxstring=gettext("File Browser - Add's a simple file browser to the left pane");
-	const char*	authors[]= {"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,gettext("\nMore by the same author\n"),"Xfce-Theme-Manager\nhttp://xfce-look.org/content/show.php?content=149647\n","Xfce4-Composite-Editor\nhttp://gtk-apps.org/content/show.php/Xfce4-Composite-Editor?content=149523\n","Manpage Editor\nhttp://gtk-apps.org/content/show.php?content=160219\n","GtkSu\nhttp://gtk-apps.org/content/show.php?content=158974\n","ASpell GUI\nhttp://gtk-apps.org/content/show.php/?content=161353\n","Clipboard Viewer\nhttp://gtk-apps.org/content/show.php/?content=121667",NULL};
-
-	asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
-	asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
+	const char		*aboutboxstring=gettext("File Browser - Add's a simple file browser to the left pane");
+	sinkInt=asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
+	sinkInt=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
 
 	g_file_get_contents(licencepath,&licence,NULL,NULL);
 	about=(GtkAboutDialog*)gtk_about_dialog_new();
@@ -588,13 +595,13 @@
 	gtk_about_dialog_set_logo_icon_name(about,ABOUTICON);
 	gtk_about_dialog_set_license(about,licence);
 	gtk_about_dialog_set_translator_credits(about,(const gchar*)translators);
+	gtk_window_set_transient_for((GtkWindow*)about,(GtkWindow*)plugdata->prefsWindow);
 
 	gtk_dialog_run(GTK_DIALOG(about));
 	gtk_widget_destroy((GtkWidget*)about);
 	debugFree(&licence);
 	debugFree(&licencepath);
 	free(translators);
-
 	setTextDomain(false,plugdata);
 	return(0);
 }
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/FileBrowser_fr_FR.po kkedit-0.4.1/KKEdit/plugins/FileBrowser/FileBrowser_fr_FR.po
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/FileBrowser_fr_FR.po	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/FileBrowser_fr_FR.po	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,90 @@
+# French translations for FileBrowser package
+# Traductions françaises du paquet FileBrowser.
+# Copyright (C) 2014 THE FileBrowser'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the FileBrowser package.
+# Automatically generated, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: FileBrowser 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:20+0100\n"
+"PO-Revision-Date: 2016-08-23 12:46-0000\n"
+"Last-Translator: K. D. Hedger <kdhedger68713@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.6.11\n"
+
+#: filebrowser.cpp:140
+msgid "File Browser Plug In Prefs"
+msgstr "Préférences du navigateur de fichiers"
+
+#: filebrowser.cpp:144
+msgid "Show Invisible File/Folders"
+msgstr "Montrer les fichiers/dossiers cachés"
+
+#: filebrowser.cpp:363 filebrowser.cpp:518
+msgid "Hide Browser"
+msgstr "Cacher le navigateur"
+
+#: filebrowser.cpp:371
+msgid "Show Browser"
+msgstr "Montrer le navigateur"
+
+#: filebrowser.cpp:485 filebrowser.cpp:498
+msgid "Open In Browser"
+msgstr "Ouvrir dans le navigateur"
+
+#: filebrowser.cpp:585
+msgid "File Browser - Add's a simple file browser to the left pane"
+msgstr ""
+"Navigateur de fichiers - Ajoute un simple navigateur de fichiers sur le côté "
+"gauche"
+
+#: filebrowser.cpp:587
+msgid "French Translation"
+msgstr "Traduction française"
+
+#: filebrowser.cpp:591
+msgid "FileBrowser"
+msgstr "Navigateur de fichiers"
+
+#: ../common.h:28
+msgid "Apply"
+msgstr "_Appliquer"
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr "_Annuler"
+
+#: ../common.h:30
+msgid "New"
+msgstr "Nouveau"
+
+#: ../common.h:31
+msgid "Help"
+msgstr "Aide"
+
+#: ../common.h:32
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../common.h:33
+msgid "Connect"
+msgstr "Relier"
+
+#: ../common.h:34
+msgid "OK"
+msgstr "OK"
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
+"\n"
+"Plus du même auteur\n"
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/FileBrowser.pot kkedit-0.4.1/KKEdit/plugins/FileBrowser/FileBrowser.pot
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/FileBrowser.pot	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/FileBrowser.pot	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FileBrowser 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:47+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: filebrowser.cpp:138
+msgid "File Browser Plug In Prefs"
+msgstr ""
+
+#: filebrowser.cpp:142
+msgid "Show Invisible File/Folders"
+msgstr ""
+
+#: filebrowser.cpp:361 filebrowser.cpp:516
+msgid "Hide Browser"
+msgstr ""
+
+#: filebrowser.cpp:369
+msgid "Show Browser"
+msgstr ""
+
+#: filebrowser.cpp:483 filebrowser.cpp:496
+msgid "Open In Browser"
+msgstr ""
+
+#: filebrowser.cpp:583
+msgid "File Browser - Add's a simple file browser to the left pane"
+msgstr ""
+
+#: filebrowser.cpp:585
+msgid "French Translation"
+msgstr ""
+
+#: filebrowser.cpp:589
+msgid "FileBrowser"
+msgstr ""
+
+#: ../common.h:28
+msgid "Apply"
+msgstr ""
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr ""
+
+#: ../common.h:30
+msgid "New"
+msgstr ""
+
+#: ../common.h:31
+msgid "Help"
+msgstr ""
+
+#: ../common.h:32
+msgid "Open"
+msgstr ""
+
+#: ../common.h:33
+msgid "Connect"
+msgstr ""
+
+#: ../common.h:34
+msgid "OK"
+msgstr ""
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/Makefile kkedit-0.4.1/KKEdit/plugins/FileBrowser/Makefile
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/Makefile	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-PACKAGENAME=$(shell /usr/bin/basename `pwd`)
-PLUGNAME=$(shell echo ${PACKAGENAME}|/usr/bin/tr A-Z a-z)
-MONAME=${PACKAGENAME}.mo
-PLATFORM=gtk
-GTKVERSION?=2
-EXTRAMAKEFLAGS?=
-GLOBAL?=0
-DEVELOP?=0
-
-PREFIX?=/usr
-
-ifeq (3,$(GTKVERSION))
-INSTALLSUFFIX=-3
-endif
-
-ifeq (0,$(GLOBAL))
-	LOCALEFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}/locale
-	INSTALLFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-else
-	LOCALEFOLDER=$(PREFIX)/share/locale
-	INSTALLFOLDER=$(PREFIX)/share/KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-endif
-
-ifeq (1,$(DEVELOP))
-	DEVMODE=-D_DEVMODE_
-endif
-
-all:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc
-
-clean: distclean
-
-distclean:
-	rm -f lib${PLUGNAME}.so||true
-	rm -f ${PLUGNAME}.o||true
-
-install:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc
-
-	mkdir -vp $(DESTDIR)${INSTALLFOLDER} $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES || true
-	cp -v lib${PLUGNAME}.so $(DESTDIR)$(INSTALLFOLDER)	
-	cp po/fr_FR/LC_MESSAGES/$(PACKAGENAME).mo $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo
-
-uninstall:
-	rm -rv $(DESTDIR)$(INSTALLFOLDER)/lib${PLUGNAME}.so $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo||true
-
-makepkg: clean
-	cd .. && tar -cvzhf ${PACKAGENAME}.tar.gz ${PACKAGENAME}
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/Makefile.am kkedit-0.4.1/KKEdit/plugins/FileBrowser/Makefile.am
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,19 @@
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c filebrowser.cpp  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o filebrowser.o
+
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libfilebrowser.so -o libfilebrowser.so filebrowser.o -lc
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libfilebrowser.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/FileBrowser.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/FileBrowser$(GTK3SUFFIX).mo
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/Makefile.in kkedit-0.4.1/KKEdit/plugins/FileBrowser/Makefile.in
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/Makefile.in	2016-08-26 09:41:40.000000000 +0000
@@ -0,0 +1,452 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = KKEdit/plugins/FileBrowser
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASPELL_LIBS = @ASPELL_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
+EXEEXT = @EXEEXT@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+GTK3SUFFIX = @GTK3SUFFIX@
+GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
+GTKSRC_LIBS = @GTKSRC_LIBS@
+GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANPAGEEDITOR = @MANPAGEEDITOR@
+MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGDIRS = @PLUGDIRS@
+PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE290 = @USE290@
+VERSION = @VERSION@
+VTEVERS = @VTEVERS@
+VTE_CFLAGS = @VTE_CFLAGS@
+VTE_LIBS = @VTE_LIBS@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_debug_level = @with_debug_level@
+with_gsu_path = @with_gsu_path@
+with_qt5_docdir = @with_qt5_docdir@
+AUTOMAKE_OPTIONS = subdir-objects
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu KKEdit/plugins/FileBrowser/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu KKEdit/plugins/FileBrowser/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c filebrowser.cpp  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o filebrowser.o
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libfilebrowser.so -o libfilebrowser.so filebrowser.o -lc
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libfilebrowser.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/FileBrowser.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/FileBrowser$(GTK3SUFFIX).mo
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru kkedit-0.3.3/KKEdit/plugins/FileBrowser/makepo kkedit-0.4.1/KKEdit/plugins/FileBrowser/makepo
--- kkedit-0.3.3/KKEdit/plugins/FileBrowser/makepo	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/FileBrowser/makepo	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+#©keithhedger Fri 3 Oct 17:38:03 BST 2014 kdhedger68713@gmail.com
+
+MAKEPOS=0
+MAKEMOS=0
+DOMAINNAME=FileBrowser
+
+if [ "X$1" = "Xmakepos" ];then
+	MAKEPOS=1
+	MAKEMOS=0
+fi
+
+if [ "X$1" = "Xmakemos" ];then
+	MAKEPOS=0
+	MAKEMOS=1
+fi
+
+langs="fr_FR"
+
+rm ${DOMAINNAME}.pot||true
+xgettext --package-name  ${DOMAINNAME}  --package-version 1.2 --default-domain  ${DOMAINNAME} --output ${DOMAINNAME}.pot filebrowser.cpp ../common.h
+
+for arg in $langs
+	do
+		mkdir --parents po/${arg}/LC_MESSAGES
+		if [ $MAKEPOS -eq 1 ];then
+			msginit --no-translator --locale $arg --output-file ${DOMAINNAME}_${arg}.po --input ${DOMAINNAME}.pot
+		fi
+		if [ $MAKEMOS -eq 1 ];then
+			msgfmt --check --verbose --output-file po/${arg}/LC_MESSAGES/${DOMAINNAME}.mo ${DOMAINNAME}_${arg}.po
+		fi
+	done
\ No newline at end of file
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/plugins/FileBrowser/po/fr_FR/LC_MESSAGES/FileBrowser.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/plugins/FileBrowser/po/fr_FR/LC_MESSAGES/FileBrowser.mo differ
diff -Nru kkedit-0.3.3/KKEdit/plugins/kkedit-plugins.h kkedit-0.4.1/KKEdit/plugins/kkedit-plugins.h
--- kkedit-0.3.3/KKEdit/plugins/kkedit-plugins.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/kkedit-plugins.h	2016-08-26 09:41:34.000000000 +0000
@@ -55,6 +55,7 @@
 #define CLOSEALLMENUNAME "closeallmenu"
 #define SORTTABSMENUNAME "sorttabsmenu"
 #define SHOWTABSMENUNAME "showalltabsmenu"
+#define SELECTTABMENUNAME "selecttabsmenu"
 #define REVERTMENUNAME "revertmenu"
 #define QUITMENUNAME "quitmenu"
 #define UNDOMENUNAME "undomenu"
@@ -65,6 +66,7 @@
 #define COPYMENUNAME "copymenu"
 #define PASTEMENUNAME "pastemenu"
 #define FINDMENUNAME "findmenu"
+#define FINDNEXTMENUNAME "findnextmenu"
 #define PREFSMENUNAME "prefsmenu"
 #define PLUGPREFSMENUNAME "plugprefsmenu"
 #define SHOWDOCSMENUNAME "showdocsmenu"
@@ -83,10 +85,11 @@
 #define SEARCHDOXYMENUNAME "searchdoxymenu"
 #define GOBACKMENUNAME "gobackmenu"
 #define GOFORWARDMENUNAME "goforwardmenu"
+#define EXTOOLSMENUNAME "extoolsmenuname"
 #define ABOUTMENUNAME "aboutmenu"
-#define HELPMENUNAME "helpmenu"
+#define HELPLOCALMENUNAME "helplocalmenu"
+#define HELPONLINEMENUNAME "helponlinemenu"
 #define GETPLUGSMENUNAME "getplugsmenu"
-#define SELECTTABMENUNAME "selecttabmenu"
 
 #define VIEWSHOWLINENUMERS "viewshowlinenumbers"
 #define VIEWAUTOINDENT "viewautoindent"
@@ -100,7 +103,9 @@
 #ifndef _PAGESTRUCT_
 #define _PAGESTRUCT_
 
-struct args
+enum {NOTYPE=0,FROMFILEMENU,FROMEDITMENU,FROMNAVMENU,FROMFUNCMENU,FROMBOOKMARKMENU,FROMTOOLSMENU,FROMHELPMENU,FROMSELECTION,FROMGOTO,FROMBASICFIND};
+
+struct	args
 {
 	const char	*name;
 	int			type;
@@ -146,6 +151,9 @@
 	char				*replaceString;;
 	GtkWidget			*tabButton;
 	bool				hidden;
+	bool				restoreHidden;
+	int					startChar;
+	int					endChar;
 };
 #endif
 
@@ -164,7 +172,7 @@
 #endif
 
 //plugins
-struct plugMenuList
+struct	plugMenuList
 {
 	GtkWidget			*menuBar;
 	GtkWidget			*menuFile;
@@ -177,7 +185,19 @@
 	GtkWidget			*menuView;
 };
 
-struct plugData
+struct	plugUserData
+{
+	plugUserData():type(NOTYPE),userStr(NULL),userStr2(NULL),userInt(0),userData(NULL),userStart(-1),userEnd(-1) {}
+	int			type;
+	const char	*userStr;
+	const char	*userStr2;
+	int			userInt;
+	void		*userData;
+	int			userStart;
+	int			userEnd;
+};
+
+struct	plugData
 {
 //menus
 	plugMenuList		mlist;
@@ -235,6 +255,12 @@
 	int					bottomShow;
 //locale dir for gettext
 	const char			*locale;
+
+//user data passed to plugins.
+	plugUserData		userData;
+
+//plug prefs window
+	GtkWidget			*prefsWindow;
 };
 
 void		showDocView(int howtodisplay,char *text,const char *title);
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/exportmap kkedit-0.4.1/KKEdit/plugins/SessionManager/exportmap
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/exportmap	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/exportmap	2016-08-26 09:41:34.000000000 +0000
@@ -1,6 +1,7 @@
 {
 global:	addToGui;
 		doAbout;
+		loadPage;
 		enablePlug;
 		g_module_unload;
 		g_module_check_init;
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/Makefile kkedit-0.4.1/KKEdit/plugins/SessionManager/Makefile
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/Makefile	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-PACKAGENAME=$(shell /usr/bin/basename `pwd`)
-PLUGNAME=$(shell echo ${PACKAGENAME}|/usr/bin/tr A-Z a-z)
-MONAME=${PACKAGENAME}.mo
-PLATFORM=gtk
-GTKVERSION?=2
-EXTRAMAKEFLAGS?=
-GLOBAL?=0
-DEVELOP?=0
-
-PREFIX?=/usr
-
-ifeq (3,$(GTKVERSION))
-INSTALLSUFFIX=-3
-endif
-
-ifeq (0,$(GLOBAL))
-	LOCALEFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}/locale
-	INSTALLFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-else
-	LOCALEFOLDER=$(PREFIX)/share/locale
-	INSTALLFOLDER=$(PREFIX)/share/KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-endif
-
-ifeq (1,$(DEVELOP))
-	DEVMODE=-D_DEVMODE_
-endif
-
-all:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc
-
-clean: distclean
-
-distclean:
-	rm -f lib${PLUGNAME}.so||true
-	rm -f ${PLUGNAME}.o||true
-
-install:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc
-
-	mkdir -vp $(DESTDIR)${INSTALLFOLDER} $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES || true
-	cp -v lib${PLUGNAME}.so $(DESTDIR)$(INSTALLFOLDER)	
-	cp po/fr_FR/LC_MESSAGES/$(PACKAGENAME).mo $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo
-
-uninstall:
-	rm -rv $(DESTDIR)$(INSTALLFOLDER)/lib${PLUGNAME}.so $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo||true
-
-makepkg: clean
-	cd .. && tar -cvzhf ${PACKAGENAME}.tar.gz ${PACKAGENAME}
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/Makefile.am kkedit-0.4.1/KKEdit/plugins/SessionManager/Makefile.am
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,19 @@
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c sessionmanager.cpp  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o sessionmanager.o
+
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libsessionmanager.so -o libsessionmanager.so sessionmanager.o -lc
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libsessionmanager.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/SessionManager.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/SessionManager$(GTK3SUFFIX).mo
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/Makefile.in kkedit-0.4.1/KKEdit/plugins/SessionManager/Makefile.in
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/Makefile.in	2016-08-26 09:41:40.000000000 +0000
@@ -0,0 +1,452 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = KKEdit/plugins/SessionManager
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASPELL_LIBS = @ASPELL_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
+EXEEXT = @EXEEXT@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+GTK3SUFFIX = @GTK3SUFFIX@
+GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
+GTKSRC_LIBS = @GTKSRC_LIBS@
+GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANPAGEEDITOR = @MANPAGEEDITOR@
+MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGDIRS = @PLUGDIRS@
+PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE290 = @USE290@
+VERSION = @VERSION@
+VTEVERS = @VTEVERS@
+VTE_CFLAGS = @VTE_CFLAGS@
+VTE_LIBS = @VTE_LIBS@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_debug_level = @with_debug_level@
+with_gsu_path = @with_gsu_path@
+with_qt5_docdir = @with_qt5_docdir@
+AUTOMAKE_OPTIONS = subdir-objects
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu KKEdit/plugins/SessionManager/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu KKEdit/plugins/SessionManager/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c sessionmanager.cpp  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o sessionmanager.o
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libsessionmanager.so -o libsessionmanager.so sessionmanager.o -lc
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libsessionmanager.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/SessionManager.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/SessionManager$(GTK3SUFFIX).mo
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/makepo kkedit-0.4.1/KKEdit/plugins/SessionManager/makepo
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/makepo	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/makepo	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+#©keithhedger Fri 3 Oct 17:38:03 BST 2014 kdhedger68713@gmail.com
+
+MAKEPOS=0
+MAKEMOS=0
+DOMAINNAME=SessionManager
+
+if [ "X$1" = "Xmakepos" ];then
+	MAKEPOS=1
+	MAKEMOS=0
+fi
+
+if [ "X$1" = "Xmakemos" ];then
+	MAKEPOS=0
+	MAKEMOS=1
+fi
+
+langs="fr_FR"
+
+rm ${DOMAINNAME}.pot||true
+xgettext --package-name  ${DOMAINNAME}  --package-version 1.2 --default-domain  ${DOMAINNAME} --output ${DOMAINNAME}.pot sessionmanager.cpp ../common.h
+
+for arg in $langs
+	do
+		mkdir --parents po/${arg}/LC_MESSAGES
+		if [ $MAKEPOS -eq 1 ];then
+			msginit --no-translator --locale $arg --output-file ${DOMAINNAME}_${arg}.po --input ${DOMAINNAME}.pot
+		fi
+		if [ $MAKEMOS -eq 1 ];then
+			msgfmt --check --verbose --output-file po/${arg}/LC_MESSAGES/${DOMAINNAME}.mo ${DOMAINNAME}_${arg}.po
+		fi
+	done
\ No newline at end of file
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/plugins/SessionManager/po/fr_FR/LC_MESSAGES/SessionManager.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/plugins/SessionManager/po/fr_FR/LC_MESSAGES/SessionManager.mo differ
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/sessionmanager.cpp kkedit-0.4.1/KKEdit/plugins/SessionManager/sessionmanager.cpp
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/sessionmanager.cpp	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/sessionmanager.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -35,8 +35,6 @@
 #include "../common.h"
 #include "../kkedit-plugins.h"
 
-#define MYEMAIL "kdhedger68713@gmail.com"
-#define MYWEBSITE "http://kkedit.darktech.org"
 #define PLUGVERSION VERSION
 #define	MAXSESSIONS 16
 #ifdef _USEGTK3_
@@ -55,6 +53,7 @@
 GtkWidget*	holdWidget=NULL;
 GtkWidget*	menusm;
 char		*currentdomain=NULL;
+int			sinkInt;
 
 int	(*module_plug_function)(gpointer globaldata);
 
@@ -151,7 +150,7 @@
 	vbox=createNewBox(NEWVBOX,false,0);
 
 	setTextDomain(true,plugdata);
-	dialog=gtk_dialog_new_with_buttons(gettext("Session Manager"),NULL,GTK_DIALOG_MODAL,GTK_STOCK_APPLY,GTK_RESPONSE_APPLY,GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,NULL);
+	dialog=gtk_dialog_new_with_buttons(gettext("Session Manager"),(GtkWindow*)plugdata->mainWindow,GTK_DIALOG_MODAL,GTK_STOCK_APPLY,GTK_RESPONSE_APPLY,GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,NULL);
 	gtk_window_set_default_size((GtkWindow*)dialog,300,120);
 	dialogbox=gtk_dialog_get_content_area((GtkDialog*)dialog);
 	gtk_container_add(GTK_CONTAINER(dialogbox),vbox);
@@ -162,10 +161,10 @@
 	gtk_box_pack_start((GtkBox*)vbox,gtk_label_new(gettext("Session Name")),true,true,4);
 	gtk_box_pack_start((GtkBox*)vbox,prefs,true,true,4);
 
-	gtk_widget_show_all(dialog);
+	gtk_widget_show_all(vbox);
 	response=gtk_dialog_run(GTK_DIALOG(dialog));
 	if(response==GTK_RESPONSE_APPLY)
-		asprintf(&command,"%s",gtk_entry_get_text((GtkEntry*)prefs));
+		sinkInt=asprintf(&command,"%s",gtk_entry_get_text((GtkEntry*)prefs));
 	else
 		command=NULL;
 
@@ -178,7 +177,7 @@
 {
 	char			*filename;
 
-	asprintf(&filename,"%s/session-%i",plugdata->lPlugFolder,snum);
+	sinkInt=asprintf(&filename,"%s/session-%i",plugdata->lPlugFolder,snum);
 	saveSession(name,(const char*)filename);
 	debugFree(&filename);
 }
@@ -194,11 +193,11 @@
 	widgetname=gtk_widget_get_name(widget);
 	for(int j=0; j<MAXSESSIONS; j++)
 		{
-			asprintf(&sessionfile,"%s/session-%i",plugdata->lPlugFolder,j);
+			sinkInt=asprintf(&sessionfile,"%s/session-%i",plugdata->lPlugFolder,j);
 			fd=fopen(sessionfile,"r");
 			if(fd!=NULL)
 				{
-					fscanf(fd,"%a[^\n]s",&sname);
+					sinkInt=fscanf(fd,"%a[^\n]s",&sname);
 					if(strcmp(sname,widgetname)==0)
 						{
 							restoreSession(NULL,sessionfile);
@@ -226,7 +225,7 @@
 
 	for(int j=0; j<MAXSESSIONS; j++)
 		{
-			asprintf(&sessionname,"%s",sessionNames[j]);
+			sinkInt=asprintf(&sessionname,"%s",sessionNames[j]);
 			menuitem=gtk_menu_item_new_with_label(sessionname);
 			gtk_widget_set_name(menuitem,sessionNames[j]);
 			free(sessionname);
@@ -274,15 +273,15 @@
 	setTextDomain(true,plugdata);
 	for(int j=0; j<MAXSESSIONS; j++)
 		{
-			asprintf(&sessionfile,"%s/session-%i",plugdata->lPlugFolder,j);
+			sinkInt=asprintf(&sessionfile,"%s/session-%i",plugdata->lPlugFolder,j);
 			fd=fopen(sessionfile,"r");
 			if(fd!=NULL)
 				{
-					fscanf(fd,"%a[^\n]s",&sessionNames[j]);
+					sinkInt=fscanf(fd,"%a[^\n]s",&sessionNames[j]);
 					fclose(fd);
 				}
 			else
-				asprintf(&sessionNames[j],gettext("Session %i"),j);
+				sinkInt=asprintf(&sessionNames[j],gettext("Session %i"),j);
 		}
 
 	setTextDomain(false,plugdata);
@@ -299,7 +298,7 @@
 
 			for(int j=0; j<MAXSESSIONS; j++)
 				{
-					asprintf(&sessionname,"%s",sessionNames[j]);
+					sinkInt=asprintf(&sessionname,"%s",sessionNames[j]);
 					menuitem=gtk_menu_item_new_with_label(sessionname);
 					gtk_widget_set_name(menuitem,sessionNames[j]);
 					free(sessionname);
@@ -321,7 +320,7 @@
 
 			for(int j=0; j<MAXSESSIONS; j++)
 				{
-					asprintf(&sessionname,"%s",sessionNames[j]);
+					sinkInt=asprintf(&sessionname,"%s",sessionNames[j]);
 					menuitem=gtk_menu_item_new_with_label(sessionname);
 					gtk_widget_set_name(menuitem,sessionNames[j]);
 					free(sessionname);
@@ -336,7 +335,7 @@
 
 extern "C" int doAbout(gpointer data)
 {
-	plugData*		plugdata=(plugData*)data;
+	plugData		*plugdata=(plugData*)data;
 	char			*licencepath;
 	const char		copyright[] ="Copyright \xc2\xa9 2014 K.D.Hedger";
 	char			*licence;
@@ -346,10 +345,8 @@
 	setTextDomain(true,plugdata);
 
 	const char		*aboutboxstring=gettext("Session Manager - Adds multiple named sessions to KKEdit");
-	const char	*authors[]= {"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,gettext("\nMore by the same author\n"),"Xfce-Theme-Manager\nhttp://xfce-look.org/content/show.php?content=149647\n","Xfce4-Composite-Editor\nhttp://gtk-apps.org/content/show.php/Xfce4-Composite-Editor?content=149523\n","Manpage Editor\nhttp://gtk-apps.org/content/show.php?content=160219\n","GtkSu\nhttp://gtk-apps.org/content/show.php?content=158974\n","ASpell GUI\nhttp://gtk-apps.org/content/show.php/?content=161353\n","Clipboard Viewer\nhttp://gtk-apps.org/content/show.php/?content=121667",NULL};
-
-	asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
-	asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
+	sinkInt=asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
+	sinkInt=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
 
 	g_file_get_contents(licencepath,&licence,NULL,NULL);
 	about=(GtkAboutDialog*)gtk_about_dialog_new();
@@ -362,6 +359,7 @@
 	gtk_about_dialog_set_logo_icon_name(about,ABOUTICON);
 	gtk_about_dialog_set_license(about,licence);
 	gtk_about_dialog_set_translator_credits(about,(const gchar*)translators);
+	gtk_window_set_transient_for((GtkWindow*)about,(GtkWindow*)plugdata->prefsWindow);
 
 	gtk_dialog_run(GTK_DIALOG(about));
 	gtk_widget_destroy((GtkWidget*)about);
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/SessionManager_fr_FR.po kkedit-0.4.1/KKEdit/plugins/SessionManager/SessionManager_fr_FR.po
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/SessionManager_fr_FR.po	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/SessionManager_fr_FR.po	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,79 @@
+# French translations for SessionManager package
+# Traductions françaises du paquet SessionManager.
+# Copyright (C) 2014 THE SessionManager'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the SessionManager package.
+# Automatically generated, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: SessionManager 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:47+0100\n"
+"PO-Revision-Date: 2016-08-23 12:48-0000\n"
+"Last-Translator: K. D. Hedger <kdhedger68713@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.6.11\n"
+
+#: sessionmanager.cpp:153 sessionmanager.cpp:353
+msgid "Session Manager"
+msgstr "Gestionnaire de sessions"
+
+#: sessionmanager.cpp:161
+msgid "Session Name"
+msgstr "Nom de la session"
+
+#: sessionmanager.cpp:284
+#, c-format
+msgid "Session %i"
+msgstr "Session %i"
+
+#: sessionmanager.cpp:347
+msgid "Session Manager - Adds multiple named sessions to KKEdit"
+msgstr ""
+"Gestionnaire de sessions - Ajoute un menu de sauvegarde et de restauration "
+"de sessions pour KKEdit"
+
+#: sessionmanager.cpp:349
+msgid "French Translation"
+msgstr "Traduction française"
+
+#: ../common.h:28
+msgid "Apply"
+msgstr "_Appliquer"
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr "_Annuler"
+
+#: ../common.h:30
+msgid "New"
+msgstr "Nouveau"
+
+#: ../common.h:31
+msgid "Help"
+msgstr "Aide"
+
+#: ../common.h:32
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../common.h:33
+msgid "Connect"
+msgstr "Relier"
+
+#: ../common.h:34
+msgid "OK"
+msgstr "OK"
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
+"\n"
+"Plus du même auteur\n"
diff -Nru kkedit-0.3.3/KKEdit/plugins/SessionManager/SessionManager.pot kkedit-0.4.1/KKEdit/plugins/SessionManager/SessionManager.pot
--- kkedit-0.3.3/KKEdit/plugins/SessionManager/SessionManager.pot	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/SessionManager/SessionManager.pot	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SessionManager 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:48+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: sessionmanager.cpp:153 sessionmanager.cpp:353
+msgid "Session Manager"
+msgstr ""
+
+#: sessionmanager.cpp:161
+msgid "Session Name"
+msgstr ""
+
+#: sessionmanager.cpp:284
+#, c-format
+msgid "Session %i"
+msgstr ""
+
+#: sessionmanager.cpp:347
+msgid "Session Manager - Adds multiple named sessions to KKEdit"
+msgstr ""
+
+#: sessionmanager.cpp:349
+msgid "French Translation"
+msgstr ""
+
+#: ../common.h:28
+msgid "Apply"
+msgstr ""
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr ""
+
+#: ../common.h:30
+msgid "New"
+msgstr ""
+
+#: ../common.h:31
+msgid "Help"
+msgstr ""
+
+#: ../common.h:32
+msgid "Open"
+msgstr ""
+
+#: ../common.h:33
+msgid "Connect"
+msgstr ""
+
+#: ../common.h:34
+msgid "OK"
+msgstr ""
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/Makefile kkedit-0.4.1/KKEdit/plugins/TerminalPane/Makefile
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/Makefile	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-PACKAGENAME=$(shell /usr/bin/basename `pwd`)
-PLUGNAME=$(shell echo ${PACKAGENAME}|/usr/bin/tr A-Z a-z)
-MONAME=${PACKAGENAME}.mo
-PLATFORM=gtk
-GTKVERSION?=2
-EXTRAMAKEFLAGS?=
-GLOBAL?=0
-DEVELOP?=0
-
-PREFIX?=/usr
-VTESUFFIX=
-
-ifeq (3,$(GTKVERSION))
-INSTALLSUFFIX=-3
-VTESUFFIX=-$(VTEVERSION)
-endif
-
-ifeq (0,$(GLOBAL))
-	LOCALEFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}/locale
-	INSTALLFOLDER=${HOME}/.KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-else
-	LOCALEFOLDER=$(PREFIX)/share/locale
-	INSTALLFOLDER=$(PREFIX)/share/KKEdit${INSTALLSUFFIX}/plugins-${PLATFORM}
-endif
-
-ifeq (1,$(DEVELOP))
-	DEVMODE=-D_DEVMODE_
-endif
-
-ifeq (2.90,$(VTEVERSION))
-	USE290=-D_VTEVERS290_
-endif
-
-all:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0 vte${VTESUFFIX}` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) $(USE290) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc `pkg-config --libs vte${VTESUFFIX}`
-
-clean: distclean
-
-distclean:
-	rm -f lib${PLUGNAME}.so||true
-	rm -f ${PLUGNAME}.o||true
-
-install:
-	gcc ${EXTRAMAKEFLAGS} -fPIC -Wall -g -c ${PLUGNAME}.cpp `pkg-config --cflags --libs ${PLATFORM}+-${GTKVERSION}.0 gmodule-2.0 glib-2.0 gtksourceview-${GTKVERSION}.0 vte${VTESUFFIX}` -DLOCALEDIR=\"${LOCALEFOLDER}\" $(DEVMODE) $(USEGTK3) $(USE290) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o ${PLUGNAME}.o
-	gcc -shared -Wl,--version-script=exportmap,-soname,${PLUGNAME}.so -o lib${PLUGNAME}.so ${PLUGNAME}.o -lc `pkg-config --libs vte${VTESUFFIX}`
-	mkdir -vp $(DESTDIR)${INSTALLFOLDER} $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES || true
-	cp -v lib${PLUGNAME}.so $(DESTDIR)$(INSTALLFOLDER)	
-	cp po/fr_FR/LC_MESSAGES/$(PACKAGENAME).mo $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo
-
-uninstall:
-	rm -rv $(DESTDIR)$(INSTALLFOLDER)/lib${PLUGNAME}.so $(DESTDIR)$(LOCALEFOLDER)/fr_FR/LC_MESSAGES/$(PACKAGENAME)$(INSTALLSUFFIX).mo||true
-
-makepkg: clean
-	cd .. && tar -cvzhf ${PACKAGENAME}.tar.gz ${PACKAGENAME}
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/Makefile.am kkedit-0.4.1/KKEdit/plugins/TerminalPane/Makefile.am
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,19 @@
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c terminalpane.cpp `pkg-config --cflags --libs vte$(VTEVERS)` $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) $(USE290) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o terminalpane.o
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libterminalpane.so -o libterminalpane.so terminalpane.o -lc `pkg-config --libs vte${VTEVERS}`
+
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libterminalpane.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/TerminalPane.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/TerminalPane$(GTK3SUFFIX).mo
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/Makefile.in kkedit-0.4.1/KKEdit/plugins/TerminalPane/Makefile.in
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/Makefile.in	2016-08-26 09:41:40.000000000 +0000
@@ -0,0 +1,452 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = KKEdit/plugins/TerminalPane
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASPELL_LIBS = @ASPELL_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
+EXEEXT = @EXEEXT@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+GTK3SUFFIX = @GTK3SUFFIX@
+GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
+GTKSRC_LIBS = @GTKSRC_LIBS@
+GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANPAGEEDITOR = @MANPAGEEDITOR@
+MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGDIRS = @PLUGDIRS@
+PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE290 = @USE290@
+VERSION = @VERSION@
+VTEVERS = @VTEVERS@
+VTE_CFLAGS = @VTE_CFLAGS@
+VTE_LIBS = @VTE_LIBS@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_debug_level = @with_debug_level@
+with_gsu_path = @with_gsu_path@
+with_qt5_docdir = @with_qt5_docdir@
+AUTOMAKE_OPTIONS = subdir-objects
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu KKEdit/plugins/TerminalPane/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu KKEdit/plugins/TerminalPane/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c terminalpane.cpp `pkg-config --cflags --libs vte$(VTEVERS)` $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) $(USE290) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o terminalpane.o
+
+	gcc -shared -Wl,--version-script=exportmap,-soname,libterminalpane.so -o libterminalpane.so terminalpane.o -lc `pkg-config --libs vte${VTEVERS}`
+
+clean:
+	rm -f *.o *.so||true
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp libterminalpane.so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/TerminalPane.mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/TerminalPane$(GTK3SUFFIX).mo
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/makepo kkedit-0.4.1/KKEdit/plugins/TerminalPane/makepo
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/makepo	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/makepo	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+#©keithhedger Fri 3 Oct 17:38:03 BST 2014 kdhedger68713@gmail.com
+
+MAKEPOS=0
+MAKEMOS=0
+DOMAINNAME=TerminalPane
+
+if [ "X$1" = "Xmakepos" ];then
+	MAKEPOS=1
+	MAKEMOS=0
+fi
+
+if [ "X$1" = "Xmakemos" ];then
+	MAKEPOS=0
+	MAKEMOS=1
+fi
+
+langs="fr_FR"
+
+rm ${DOMAINNAME}.pot||true
+xgettext --package-name  ${DOMAINNAME}  --package-version 1.2 --default-domain  ${DOMAINNAME} --output ${DOMAINNAME}.pot terminalpane.cpp ../common.h
+
+for arg in $langs
+	do
+		mkdir --parents po/${arg}/LC_MESSAGES
+		if [ $MAKEPOS -eq 1 ];then
+			msginit --no-translator --locale $arg --output-file ${DOMAINNAME}_${arg}.po --input ${DOMAINNAME}.pot
+		fi
+		if [ $MAKEMOS -eq 1 ];then
+			msgfmt --check --verbose --output-file po/${arg}/LC_MESSAGES/${DOMAINNAME}.mo ${DOMAINNAME}_${arg}.po
+		fi
+	done
\ No newline at end of file
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/plugins/TerminalPane/po/fr_FR/LC_MESSAGES/TerminalPane.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/plugins/TerminalPane/po/fr_FR/LC_MESSAGES/TerminalPane.mo differ
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/terminalpane.cpp kkedit-0.4.1/KKEdit/plugins/TerminalPane/terminalpane.cpp
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/terminalpane.cpp	2016-05-23 09:23:35.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/terminalpane.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -42,8 +42,6 @@
 #include "../common.h"
 #include "../kkedit-plugins.h"
 
-#define MYEMAIL "kdhedger68713@gmail.com"
-#define MYWEBSITE "http://kkedit.darktech.org"
 #define PLUGVERSION VERSION
 #ifdef _USEGTK3_
 #define TEXTDOMAIN "TerminalPane-3" 
@@ -64,7 +62,8 @@
 char*		backColour=strdup("#ffffff");
 int			childPid=-999;
 GtkWidget*	contextMenu;
-char*			currentdomain=NULL;
+char		*currentdomain=NULL;
+int			sinkInt;
 
 args		mydata[]=
 				{
@@ -115,7 +114,7 @@
 {
 	char*	filepath;
 
-	asprintf(&filepath,"%s/terminal.rc",pdata->lPlugFolder);
+	sinkInt=asprintf(&filepath,"%s/terminal.rc",pdata->lPlugFolder);
 	if(g_file_test(filepath,G_FILE_TEST_EXISTS))
 		showing=true;
 	else
@@ -129,7 +128,7 @@
 	char*	filepath;
 
 	setTextDomain(true,plugdata);
-	asprintf(&filepath,"%s/terminal.rc",plugdata->lPlugFolder);
+	sinkInt=asprintf(&filepath,"%s/terminal.rc",plugdata->lPlugFolder);
 	if(showing==true)
 		{
 			gtk_widget_show_all(swindow);
@@ -261,11 +260,7 @@
 	GtkWidget*	menu;
 	plugData*	plugdata=(plugData*)data;
 #ifdef _USEGTK3_
-//#ifdef _VTEVERS291_
 	GdkRGBA		colour;
-//#else
-//	GdkColor	colour;
-//#endif
 #else
 	GdkColor	colour;
 #endif
@@ -281,8 +276,8 @@
 
 	terminal=vte_terminal_new();
 	vte_terminal_set_default_colors((VteTerminal*)terminal);
-
-	asprintf(&filename,"%s/terminalpane.rc",plugdata->lPlugFolder);
+	vte_terminal_set_scrollback_lines((VteTerminal*)terminal,-1);
+	sinkInt=asprintf(&filename,"%s/terminalpane.rc",plugdata->lPlugFolder);
 	loadVarsFromFile(filename,mydata);
 	debugFree(&filename);
 
@@ -362,7 +357,7 @@
 
 	setTextDomain(true,plugdata);
 	vbox=createNewBox(NEWVBOX,false,0);
-	dialog=gtk_dialog_new_with_buttons(gettext("Terminal Pane"),NULL,GTK_DIALOG_MODAL,GTK_STOCK_APPLY,GTK_RESPONSE_APPLY,GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,NULL);
+	dialog=gtk_dialog_new_with_buttons(gettext("Terminal Pane"),(GtkWindow*)plugdata->prefsWindow,GTK_DIALOG_MODAL,gettext(GTK_STOCK_APPLY),GTK_RESPONSE_APPLY,gettext(GTK_STOCK_CANCEL),GTK_RESPONSE_CANCEL,NULL);
 	gtk_window_set_default_size((GtkWindow*)dialog,300,120);
 	dialogbox=gtk_dialog_get_content_area((GtkDialog*)dialog);
 	gtk_container_add(GTK_CONTAINER(dialogbox),vbox);
@@ -377,6 +372,7 @@
 	gtk_box_pack_start((GtkBox*)vbox,gtk_label_new(gettext("Background Colour")),true,true,4);
 	gtk_box_pack_start((GtkBox*)vbox,bcolour,true,true,4);
 
+	gtk_window_set_transient_for((GtkWindow*)dialog,(GtkWindow*)plugdata->prefsWindow);
 	gtk_widget_show_all(dialog);
 	response=gtk_dialog_run(GTK_DIALOG(dialog));
 	if(response==GTK_RESPONSE_APPLY);
@@ -386,7 +382,7 @@
 			foreColour=strdup((char*)gtk_entry_get_text((GtkEntry*)fcolour));
 			backColour=strdup((char*)gtk_entry_get_text((GtkEntry*)bcolour));
 
-			asprintf(&filename,"%s/terminalpane.rc",plugdata->lPlugFolder);
+			sinkInt=asprintf(&filename,"%s/terminalpane.rc",plugdata->lPlugFolder);
 			saveVarsToFile(filename,mydata);
 			debugFree(&filename);
 			
@@ -420,20 +416,18 @@
 
 extern "C" int doAbout(gpointer data)
 {
-	plugData*		plugdata=(plugData*)data;
-	char*			licencepath;
+	plugData		*plugdata=(plugData*)data;
+	char			*licencepath;
 	const char		copyright[] ="Copyright \xc2\xa9 2014 K.D.Hedger";
-	char*			licence;
-	GtkAboutDialog*	about;
-	char*			translators;
+	char			*licence;
+	GtkAboutDialog	*about;
+	char			*translators;
 
 	setTextDomain(true,plugdata);
 
-	const char*		aboutboxstring=gettext("A Simple Terminal Pane For KKEdit");
-	const char*	authors[]= {"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,gettext("\nMore by the same author\n"),"Xfce-Theme-Manager\nhttp://xfce-look.org/content/show.php?content=149647\n","Xfce4-Composite-Editor\nhttp://gtk-apps.org/content/show.php/Xfce4-Composite-Editor?content=149523\n","Manpage Editor\nhttp://gtk-apps.org/content/show.php?content=160219\n","GtkSu\nhttp://gtk-apps.org/content/show.php?content=158974\n","ASpell GUI\nhttp://gtk-apps.org/content/show.php/?content=161353\n","Clipboard Viewer\nhttp://gtk-apps.org/content/show.php/?content=121667",NULL};
-
-	asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
-	asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
+	const char		*aboutboxstring=gettext("A Simple Terminal Pane For KKEdit");
+	sinkInt=asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
+	sinkInt=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
 
 	g_file_get_contents(licencepath,&licence,NULL,NULL);
 	about=(GtkAboutDialog*)gtk_about_dialog_new();
@@ -446,9 +440,11 @@
 	gtk_about_dialog_set_logo_icon_name(about,ABOUTICON);
 	gtk_about_dialog_set_license(about,licence);
 	gtk_about_dialog_set_translator_credits(about,(const gchar*)translators);
+	gtk_window_set_transient_for((GtkWindow*)about,(GtkWindow*)plugdata->prefsWindow);
 
 	gtk_dialog_run(GTK_DIALOG(about));
 	gtk_widget_destroy((GtkWidget*)about);
+
 	free(licence);
 	free(licencepath);
 	free(translators);
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/TerminalPane_fr_FR.po kkedit-0.4.1/KKEdit/plugins/TerminalPane/TerminalPane_fr_FR.po
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/TerminalPane_fr_FR.po	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/TerminalPane_fr_FR.po	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,100 @@
+# French translations for TerminalPane package
+# Traductions françaises du paquet TerminalPane.
+# Copyright (C) 2014 THE TerminalPane'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the TerminalPane package.
+# Automatically generated, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TerminalPane 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:27+0100\n"
+"PO-Revision-Date: 2016-08-23 12:49-0000\n"
+"Last-Translator: K. D. Hedger <kdhedger68713@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.6.11\n"
+
+#: terminalpane.cpp:138 terminalpane.cpp:236 terminalpane.cpp:272
+msgid "Hide Terminal"
+msgstr "Cacher le terminal"
+
+#: terminalpane.cpp:146
+msgid "Show Terminal"
+msgstr "Afficher le terminal"
+
+#: terminalpane.cpp:240
+msgid "CD To Page"
+msgstr "Se placer dans le répertoire du document en cours"
+
+#: terminalpane.cpp:244
+msgid "Copy"
+msgstr "Copier"
+
+#: terminalpane.cpp:248
+msgid "Paste"
+msgstr "Coller"
+
+#: terminalpane.cpp:252
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: terminalpane.cpp:360 terminalpane.cpp:433
+msgid "Terminal Pane"
+msgstr "Panel du terminal"
+
+#: terminalpane.cpp:370
+msgid "Foreground Colour"
+msgstr "Couleur de premier plan"
+
+#: terminalpane.cpp:372
+msgid "Background Colour"
+msgstr "Couleur d'arrière-plan"
+
+#: terminalpane.cpp:427
+msgid "A Simple Terminal Pane For KKEdit"
+msgstr "Un simple panel de terminal pour KKEdit"
+
+#: terminalpane.cpp:429
+msgid "French Translation"
+msgstr "Traduction française"
+
+#: ../common.h:28
+msgid "Apply"
+msgstr "_Appliquer"
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr "_Annuler"
+
+#: ../common.h:30
+msgid "New"
+msgstr "Nouveau"
+
+#: ../common.h:31
+msgid "Help"
+msgstr "Aide"
+
+#: ../common.h:32
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../common.h:33
+msgid "Connect"
+msgstr "Relier"
+
+#: ../common.h:34
+msgid "OK"
+msgstr "OK"
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
+"\n"
+"Plus du même auteur\n"
diff -Nru kkedit-0.3.3/KKEdit/plugins/TerminalPane/TerminalPane.pot kkedit-0.4.1/KKEdit/plugins/TerminalPane/TerminalPane.pot
--- kkedit-0.3.3/KKEdit/plugins/TerminalPane/TerminalPane.pot	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/plugins/TerminalPane/TerminalPane.pot	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: TerminalPane 1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-23 12:49+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: terminalpane.cpp:138 terminalpane.cpp:236 terminalpane.cpp:272
+msgid "Hide Terminal"
+msgstr ""
+
+#: terminalpane.cpp:146
+msgid "Show Terminal"
+msgstr ""
+
+#: terminalpane.cpp:240
+msgid "CD To Page"
+msgstr ""
+
+#: terminalpane.cpp:244
+msgid "Copy"
+msgstr ""
+
+#: terminalpane.cpp:248
+msgid "Paste"
+msgstr ""
+
+#: terminalpane.cpp:252
+msgid "Select All"
+msgstr ""
+
+#: terminalpane.cpp:360 terminalpane.cpp:433
+msgid "Terminal Pane"
+msgstr ""
+
+#: terminalpane.cpp:370
+msgid "Foreground Colour"
+msgstr ""
+
+#: terminalpane.cpp:372
+msgid "Background Colour"
+msgstr ""
+
+#: terminalpane.cpp:427
+msgid "A Simple Terminal Pane For KKEdit"
+msgstr ""
+
+#: terminalpane.cpp:429
+msgid "French Translation"
+msgstr ""
+
+#: ../common.h:28
+msgid "Apply"
+msgstr ""
+
+#: ../common.h:29
+msgid "Cancel"
+msgstr ""
+
+#: ../common.h:30
+msgid "New"
+msgstr ""
+
+#: ../common.h:31
+msgid "Help"
+msgstr ""
+
+#: ../common.h:32
+msgid "Open"
+msgstr ""
+
+#: ../common.h:33
+msgid "Connect"
+msgstr ""
+
+#: ../common.h:34
+msgid "OK"
+msgstr ""
+
+#: ../common.h:43
+msgid ""
+"\n"
+"More by the same author\n"
+msgstr ""
diff -Nru kkedit-0.3.3/KKEdit/resources/man/kkedit.1 kkedit-0.4.1/KKEdit/resources/man/kkedit.1
--- kkedit-0.3.3/KKEdit/resources/man/kkedit.1	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/resources/man/kkedit.1	2016-08-26 09:41:35.000000000 +0000
@@ -0,0 +1,89 @@
+.TH "kkedit" "1" "0.3.4" "K.D.Hedger" ""
+.SH "NAME"
+KKEdit — Source code text editor.
+.br
+.SH "SYNTAX"
+kkedit [\fIoption\fR] <file>
+.br
+.SH "DESCRIPTION"
+KKEdit is NOT a word processor or a web page editor, it is NOT
+.br
+and IDE! It won't right code for you, it wont insist on inserting
+.br
+brackets ( REALLY annoying! ), it wont force you to use any
+.br
+particular style, it doesn't need you to break all your fingers
+.br
+trying to hit weird and wonderful key combo's and it is not tied
+.br
+to one particular distro, oh yes and it won't cost you a penny!
+.br
+
+KKEdit is a deceptively simple text editor with syntax colouring.
+.br
+It also has a function menu which allows you to jump instantly to
+.br
+a function definition, a navigation menu which will look in all
+.br
+open files for a function definition and then switch to that tab
+.br
+and go to the relevant line if it can't find a definition in any
+.br
+open files it will do a recursive search from the folder of the
+.br
+currently selected document, you can also highlight a #include
+.br
+directive and it will search for and try to open the file,
+.br
+include files surrounded by <> will be looked for in /usr/include,
+.br
+files surrounded by "" will be looked for in the current folder.
+.br
+External tools can be added either globally or locally and when
+.br
+run can either replace the currently select text with their
+.br
+output, replace all the files text, be run in a terminal or you
+.br
+can choose to ignore the output form the script, BASH, python and
+.br
+perl can be used for the script language or any interpretor that
+.br
+uses '#' as a comment marker.
+.br
+
+You can drag and drop a file onto the main toolbar/menu to open a
+.br
+file. Session can be saved and reloaded. Any amount of bookmarks can
+.br
+be added anywhere, selecting a bookmark from the menu will switch to
+.br
+that tab and move to the appropriate line. Just type a line number
+.br
+into the edit box on the toolbar to jump straight to that line.
+.br
+.SH "OPTIONS"
+\fB-h, --help\fR
+.br
+		Show help options.
+.br
+
+\fB-m, --multiple\fR
+.br
+		Multiple instance mode.
+.br
+
+\fB-s, --safe\fR
+.br
+		Safe mode (disable all plugins and use new instance).
+.br
+
+<\fIfile\fR>
+.br
+		Opens specified <\fIfile\fR>.
+.br
+.SH "AUTHORS"
+Bugs, suggestions etc to:
+.br
+keithhedger@keithhedger.darktech.org
+.br
diff -Nru kkedit-0.3.3/KKEdit/resources/pixmaps/KKEdit.desktop kkedit-0.4.1/KKEdit/resources/pixmaps/KKEdit.desktop
--- kkedit-0.3.3/KKEdit/resources/pixmaps/KKEdit.desktop	2016-05-23 09:23:36.000000000 +0000
+++ kkedit-0.4.1/KKEdit/resources/pixmaps/KKEdit.desktop	2016-08-26 09:41:35.000000000 +0000
@@ -2,8 +2,9 @@
 Version=1.0
 Encoding=UTF-8
 Name=KKEdit
-Comment=A GTK2/3 text editor inspired ( but not based on ) BBEdit.
+GenericName=Advanced Text Editor
+Comment=A GTK2/3 text editor inspired by ( but not based on ) BBEdit.
 Terminal=false
 Type=Application
-Categories=GTK;GNOME;Utility;
-MimeType=text/plain
+Categories=Utility;GTK;TextEditor;
+MimeType=text/plain;
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/resources/pixmaps/KKEditPlug.png and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/resources/pixmaps/KKEditPlug.png differ
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/resources/pixmaps/KKEdit.png and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/resources/pixmaps/KKEdit.png differ
diff -Nru kkedit-0.3.3/KKEdit/resources/pixmaps/KKEditRoot.desktop kkedit-0.4.1/KKEdit/resources/pixmaps/KKEditRoot.desktop
--- kkedit-0.3.3/KKEdit/resources/pixmaps/KKEditRoot.desktop	2016-05-23 09:23:36.000000000 +0000
+++ kkedit-0.4.1/KKEdit/resources/pixmaps/KKEditRoot.desktop	2016-08-26 09:41:35.000000000 +0000
@@ -2,8 +2,9 @@
 Version=1.0
 Encoding=UTF-8
 Name=KKEdit - Root
-Comment=A GTK2/3 text editor inspired ( but not based on ) BBEdit.
+GenericName=Advanced Text Editor - Root Mode
+Comment=A GTK2/3 text editor inspired by ( but not based on ) BBEdit.
 Terminal=false
 Type=Application
-Categories=GTK;GNOME;System;
-MimeType=text/plain
+Categories=System;GTK;FileTools;
+MimeType=text/plain;
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/resources/pixmaps/KKEditRoot.png and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/resources/pixmaps/KKEditRoot.png differ
diff -Nru kkedit-0.3.3/KKEdit/resources/scripts/OpenManPage kkedit-0.4.1/KKEdit/resources/scripts/OpenManPage
--- kkedit-0.3.3/KKEdit/resources/scripts/OpenManPage	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/resources/scripts/OpenManPage	2016-08-26 09:41:35.000000000 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+#©keithhedger Sun 15 Dec 18:54:28 GMT 2013 kdhedger68713@gmail.com
+
+if man -w $KKEDIT_SELECTION &>/dev/null;then
+	man2html $(man -w $KKEDIT_SELECTION) > "$KKEDIT_HTMLFILE"
+else
+	rm "$KKEDIT_HTMLFILE" &>/dev/null
+fi
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/resources/src/manpage.mpz and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/resources/src/manpage.mpz differ
diff -Nru kkedit-0.3.3/KKEdit/resources/tools/OpenManPage kkedit-0.4.1/KKEdit/resources/tools/OpenManPage
--- kkedit-0.3.3/KKEdit/resources/tools/OpenManPage	2016-05-23 09:23:36.000000000 +0000
+++ kkedit-0.4.1/KKEdit/resources/tools/OpenManPage	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-#©keithhedger Sun 15 Dec 18:54:28 GMT 2013 kdhedger68713@gmail.com
-
-if man -w $KKEDIT_SELECTION &>/dev/null;then
-	man2html $(man -w $KKEDIT_SELECTION) > "$KKEDIT_HTMLFILE"
-else
-	rm "$KKEDIT_HTMLFILE" &>/dev/null
-fi
diff -Nru kkedit-0.3.3/KKEdit/resources/tools/Open-Man-Page kkedit-0.4.1/KKEdit/resources/tools/Open-Man-Page
--- kkedit-0.3.3/KKEdit/resources/tools/Open-Man-Page	2016-05-23 09:23:36.000000000 +0000
+++ kkedit-0.4.1/KKEdit/resources/tools/Open-Man-Page	2016-08-26 09:41:35.000000000 +0000
@@ -1,5 +1,5 @@
 name	Open Man Page
-command	./OpenManPage
+command	../scripts/OpenManPage
 comment	Opens the manpage for the selected text if available.
 flags	4
 interm	0
diff -Nru kkedit-0.3.3/KKEdit/sources kkedit-0.4.1/KKEdit/sources
--- kkedit-0.3.3/KKEdit/sources	2016-05-23 09:23:38.000000000 +0000
+++ kkedit-0.4.1/KKEdit/sources	2016-08-26 09:41:38.000000000 +0000
@@ -1 +1 @@
-COMMONSRC = ../src/backclass.cpp ../src/bookmarks.cpp ../src/callbacks.cpp ../src/completion.cpp ../src/encoding.cpp ../src/files.cpp ../src/globals.cpp ../src/guis.cpp ../src/main.cpp ../src/navcallbacks.cpp ../src/pages.cpp ../src/pluginclass.cpp ../src/plugins.cpp ../src/searchcallbacks.cpp ../src/sliceclass.cpp ../src/spellcheck.cpp ../src/textbuffer.cpp
+COMMONSRC = ../src/backclass.cpp ../src/bookmarks.cpp ../src/callbacks.cpp ../src/completion.cpp ../src/encoding.cpp ../src/files.cpp ../src/globals.cpp ../src/guis.cpp ../src/internet.cpp ../src/main.cpp ../src/navcallbacks.cpp ../src/pages.cpp ../src/pluginclass.cpp ../src/plugins.cpp ../src/searchcallbacks.cpp ../src/sliceclass.cpp ../src/spellcheck.cpp ../src/textbuffer.cpp
diff -Nru kkedit-0.3.3/KKEdit/src/bookmarks.cpp kkedit-0.4.1/KKEdit/src/bookmarks.cpp
--- kkedit-0.3.3/KKEdit/src/bookmarks.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/bookmarks.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -101,13 +101,13 @@
 
 	if(page==NULL)
 		return;
-
 	mark_type=MARK_TYPE_1;
 	if(titer==NULL)
 		{
 			mark=gtk_text_buffer_get_insert((GtkTextBuffer*)page->buffer);
 			gtk_text_buffer_get_iter_at_mark((GtkTextBuffer*)page->buffer,&siter,mark);
-			iter=&siter;
+			gtk_text_iter_set_line_offset(&siter,0);
+			iter=(GtkTextIter*)(&siter);
 		}
 	else
 		iter=titer;
@@ -136,12 +136,14 @@
 			ptr=newBookMarksList;
 			while(ptr!=NULL)
 				{
-					menuitem=createNewImageMenuItem(NULL,((bookMarksNew*)ptr->data)->label,false);
-					gtk_menu_shell_append(GTK_MENU_SHELL(bookMarkSubMenu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(jumpToMark),(void*)ptr->data);
+					menuData[MENUBLANK].menuLabel=((bookMarksNew*)ptr->data)->label;
+					menuData[MENUBLANK].cb=(void*)jumpToMark;
+					menuData[MENUBLANK].userData=(gpointer)ptr->data;
+					menuitem=newMenuItem(MENUBLANK,bookMarkSubMenu);
 					ptr=g_list_next(ptr);
 				}
 			gtk_widget_show_all(bookMarkMenu);
+			//gtk_source_view_set_show_line_marks(page->view,showBMBar);
 			g_slist_free(mark_list);
 		}
 	else
diff -Nru kkedit-0.3.3/KKEdit/src/callbacks.cpp kkedit-0.4.1/KKEdit/src/callbacks.cpp
--- kkedit-0.3.3/KKEdit/src/callbacks.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/callbacks.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "kkedit-includes.h"
+#include "guis.h"
 
 enum {DELTELINE=0,DELETETOEOL,DELETETOBOL,SELECTWORD,DELETEWORD,DUPLINE,SELECTLINE,MOVELINEUP,MOVELINEDOWN,SELECTTOEOL,SELECTTOBOL,MOVELSELECTIONUP,MOVESELECTIONDOWN,FORCECOMPLETE,HIDETABKEY};
 
@@ -234,9 +235,14 @@
 VISIBLE void closeAllTabs(GtkWidget *widget,gpointer data)
 {
 	ERRDATA
-	int	numtabs=gtk_notebook_get_n_pages(mainNotebook);
+
+	int numpages=gtk_notebook_get_n_pages(mainNotebook);
+
+	globalPlugins->setUserData("tsd",FROMFILEMENU,CLOSEALLMENUNAME,data);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 	showAllTabs(NULL,NULL);
-	for(int loop=0; loop<numtabs; loop++)
+	for(int loop=0;loop<numpages;loop++)
 		{
 			closingAll=true;
 			closeTab(NULL,0);
@@ -277,6 +283,12 @@
 
 VISIBLE void closeTab(GtkWidget *widget,gpointer data)
 {
+	if(closingAll==false)
+		{
+			globalPlugins->setUserData("tsd",FROMFILEMENU,CLOSEMENUNAME,data);
+			g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+		}
+
 	if(data!=NULL)
 		{
 			if(gtk_notebook_page_num(mainNotebook,(GtkWidget*)data)!=-1)
@@ -346,22 +358,22 @@
 VISIBLE void switchPage(GtkNotebook *notebook,gpointer arg1,guint thispage,gpointer user_data)
 {
 	ERRDATA
-	pageStruct	*page;
-	char		*functions=NULL;
-	GtkWidget	*menuitem;
-	int			linenum=-1;
-	char		*ts=NULL;
-	char		*lineptr=NULL;
-	bool		onefunc=false;
-	int			numtypes=0;
-	char		*typenames[50]= {NULL,};
-	bool		flag;
-	char		*newstr=NULL;
-	GtkWidget	*whattypemenu;
-	GtkWidget	*typesubmenus[50]= {NULL,};
-	GtkWidget	*submenu;
-	char		*correctedstr=NULL;
-	GtkTextIter	start_find,end_find;
+	pageStruct		*page;
+	char			*functions=NULL;
+	GtkWidget		*menuitem;
+	char			*lineptr=NULL;
+	bool			onefunc=false;
+	int				numtypes=0;
+	char			*typenames[50]= {NULL,};
+	bool			flag;
+	char			*newstr=NULL;
+	GtkWidget		*whattypemenu;
+	GtkWidget		*typesubmenus[50]= {NULL,};
+	GtkWidget		*submenu;
+	char			*correctedstr=NULL;
+	GtkTextIter		start_find,end_find;
+	functionData	*fd=NULL;
+	functionData	*tempfd=NULL;
 
 	if(loadingSession==true)
 		{
@@ -389,33 +401,31 @@
 
 	getRecursiveTagList(page->filePath,&functions);
 	lineptr=functions;
-
 	page->isFirst=true;
 	page->navSubMenu=(GtkMenuItem*)gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(funcMenu),(GtkWidget*)page->navSubMenu);
 
 	while((lineptr!=NULL) &&(strlen(lineptr)>0))
 		{
-			linenum=-1;
 			correctedstr=NULL;
-			ts=NULL;
-			sscanf(lineptr,"%*s %*s %i %a[^\n]s",&linenum,&ts);
-			if(linenum==-1)
+			fd=allocFStrings(FUNCDATA,lineptr);
+
+			if(fd->line==-1)
 				{
 					ERRDATA debugFree(&correctedstr);
-					ERRDATA debugFree(&ts);
+					ERRDATA destroyData(fd);
 				}
 			else
 				{
-					correctedstr=truncateWithElipses(ts,maxFuncDefs);
+					correctedstr=truncateWithElipses(fd->define,maxFuncDefs);
 				}
-
-			if(linenum>0)
+			if(fd->line>0)
 				{
 					if(listFunction==4)
 						{
-							newstr=NULL;
-							newstr=globalSlice->sliceBetween(lineptr,(char*)" ",(char*)" ");
+						tempfd=allocFStrings(FUNCDATA,lineptr);
+						
+							newstr=g_strstrip(tempfd->type);
 							if(newstr!=NULL)
 								{
 									flag=false;
@@ -432,13 +442,13 @@
 									if(flag==false)
 										{
 											typenames[numtypes]=strdup(newstr);
-											ERRDATA debugFree(&newstr);
+											destroyData(tempfd);
 											if(typenames[numtypes][strlen(typenames[numtypes])-1]=='s')
 												sinkReturn=asprintf(&newstr,"%s's",typenames[numtypes]);
 											else
 												sinkReturn=asprintf(&newstr,"%ss",typenames[numtypes]);
 											newstr[0]=toupper(newstr[0]);
-											submenu=createNewImageMenuItem(NULL,newstr,false);
+											submenu=gtk_menu_item_new_with_label(newstr);
 											typesubmenus[numtypes]=gtk_menu_new();
 											gtk_menu_item_set_submenu(GTK_MENU_ITEM(submenu),typesubmenus[numtypes]);
 											gtk_menu_shell_append(GTK_MENU_SHELL(page->navSubMenu),submenu);
@@ -449,24 +459,26 @@
 									ERRDATA debugFree(&newstr);
 
 									onefunc=true;
-									menuitem=createNewImageMenuItem(NULL,correctedstr,false);
-									gtk_menu_shell_append(GTK_MENU_SHELL(whattypemenu),menuitem);
-									g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(gotoLineSavePos),(void*)(long)linenum);
+									menuData[MENUBLANK].menuLabel=correctedstr;
+									menuData[MENUBLANK].cb=(void*)&gotoLineSavePos;
+									menuData[MENUBLANK].userData=(gpointer)(long)fd->line;
+									menuitem=newMenuItem(MENUBLANK,whattypemenu);
 								}
 						}
 					else
 						{
 							onefunc=true;
-							menuitem=createNewImageMenuItem(NULL,correctedstr,false);
-							gtk_menu_shell_append(GTK_MENU_SHELL(page->navSubMenu),menuitem);
-							g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(gotoLineSavePos),(void*)(long)linenum);
+							menuData[MENUBLANK].menuLabel=correctedstr;
+							menuData[MENUBLANK].cb=(void*)&gotoLineSavePos;
+							menuData[MENUBLANK].userData=(gpointer)(long)fd->line;
+							menuitem=newMenuItem(MENUBLANK,(GtkWidget*)page->navSubMenu);
 						}
 				}
 			lineptr=strchr(lineptr,'\n');
 			if(lineptr!=NULL)
 				lineptr++;
 			ERRDATA debugFree(&correctedstr);
-			ERRDATA debugFree(&ts);
+			ERRDATA destroyData(fd);
 		}
 
 	gtk_widget_show_all(page->tabVbox);
@@ -500,6 +512,8 @@
 
 	if(page==NULL)
 		return;
+	globalPlugins->setUserData("ts",FROMEDITMENU,COPYMENUNAME);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
 	gtk_text_buffer_copy_clipboard((GtkTextBuffer*)page->buffer,gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
 }
 
@@ -510,6 +524,10 @@
 
 	if(page==NULL)
 		return;
+
+	globalPlugins->setUserData("ts",FROMEDITMENU,CUTMENUNAME);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 	gtk_text_buffer_cut_clipboard((GtkTextBuffer*)page->buffer,gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),true);
 	setChangedSensitive((GtkTextBuffer*)page->buffer,page);
 }
@@ -525,6 +543,9 @@
 
 	if(page==NULL)
 		return;
+
+	globalPlugins->setUserData("ts",FROMEDITMENU,PASTEMENUNAME);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
 	mainclipboard=gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
 	clipdata=gtk_clipboard_wait_for_text(mainclipboard);
 	if(clipdata!=NULL)
@@ -827,36 +848,31 @@
 							g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(copyToClipboard),(void*)defineText);
 							destroyData(fdata);
 
-							menuitem=createNewImageMenuItem(GTK_STOCK_DIALOG_QUESTION,MENU_GOTO_DEFINE_LABEL,true);
+							menuitem=newImageMenuItem(MENUGOTODEF,NULL);
 							gtk_menu_shell_prepend(GTK_MENU_SHELL(menu),menuitem);
-							g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(goToDefinition),NULL);
 						}
 
 					if(gotDoxygen==0)
 						{
-							menuitem=createNewImageMenuItem(GTK_STOCK_FIND,MENU_FIND_IN_DOCS_LABEL,true);
+							menuitem=newImageMenuItem(MENUSEARCHDOXY,NULL);
 							gtk_menu_shell_prepend(GTK_MENU_SHELL(menu),menuitem);
-							g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(doxyDocs),NULL);
 						}
-					menuitem=createNewImageMenuItem(GTK_STOCK_FIND,MENU_FIND_IN_QTAPI_LABEL,true);
+					menuitem=newImageMenuItem(MENUSEARCHQT,NULL);
 					gtk_menu_shell_prepend(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(searchQT5Docs),NULL);
 
-					menuitem=createNewImageMenuItem(GTK_STOCK_FIND,MENU_FIND_IN_GTKAPI_LABEL,true);
+					menuitem=newImageMenuItem(MENUSEARCHGTK,NULL);
 					gtk_menu_shell_prepend(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(searchGtkDocs),NULL);
 
-					menuitem=createNewImageMenuItem(GTK_STOCK_EDIT,CUSTOM_WORD_CONTEXT_LABEL,true);
+					menuData[POPADDCUSTOM].userData=(gpointer)page;
+					menuitem=newImageMenuItem(POPADDCUSTOM,NULL);
 					gtk_menu_shell_prepend(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(addtoCustomWordList),(void*)page);
 
 #ifdef _ASPELL_
 //spell check
 					if((spellChecker!=NULL) &&(aspellConfig!=NULL))
 						{
-							menuitem=createNewImageMenuItem(GTK_STOCK_SPELL_CHECK,CHECK_SPELLING_CONTEXT_LABEL,true);
+							menuitem=newImageMenuItem(MENUSPELLCHECK,NULL);
 							gtk_menu_shell_prepend(GTK_MENU_SHELL(menu),menuitem);
-							g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(checkWord),NULL);
 						}
 #endif
 					menuitem=gtk_separator_menu_item_new();
@@ -867,12 +883,12 @@
 						{
 							if((((toolStruct*)ptr->data)->inPopUp==true) &&(((toolStruct*)ptr->data)->alwaysPopup==false))
 								{
-									menuitem=createNewImageMenuItem(NULL,((toolStruct*)ptr->data)->menuName,false);
+									menuData[MENUBLANK].menuLabel=((toolStruct*)ptr->data)->menuName;
+									menuData[MENUBLANK].cb=(void*)&externalTool;
+									menuData[MENUBLANK].userData=(gpointer)ptr->data;
+									menuitem=newMenuItem(MENUBLANK,(GtkWidget*)menu);
 									if(((toolStruct*)ptr->data)->comment!=NULL)
 										gtk_widget_set_tooltip_text((GtkWidget*)menuitem,((toolStruct*)ptr->data)->comment);
-
-									gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-									g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(externalTool),(void*)ptr->data);
 								}
 							ptr=g_list_next(ptr);
 						}
@@ -887,12 +903,13 @@
 		{
 			if((((toolStruct*)ptr->data)->alwaysPopup==true))
 				{
-					menuitem=createNewImageMenuItem(NULL,((toolStruct*)ptr->data)->menuName,false);
+					menuData[MENUBLANK].menuLabel=((toolStruct*)ptr->data)->menuName;
+					menuData[MENUBLANK].cb=(void*)&externalTool;
+					menuData[MENUBLANK].userData=(gpointer)ptr->data;
+					menuitem=newMenuItem(MENUBLANK,(GtkWidget*)menu);
 
 					if(((toolStruct*)ptr->data)->comment!=NULL)
 						gtk_widget_set_tooltip_text((GtkWidget*)menuitem,((toolStruct*)ptr->data)->comment);
-					gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(externalTool),(void*)ptr->data);
 				}
 			ptr=g_list_next(ptr);
 		}
@@ -960,7 +977,7 @@
 	FILE						*fp=NULL;
 	char						*command;
 	char						line[2048];
-	char						*name;
+	char						ticklang[128];
 
 	if(event->button==3 && event->type==GDK_BUTTON_PRESS)
 		{
@@ -968,24 +985,20 @@
 			page=(pageStruct*)user_data;
 
 //copy dirname
-			menuitem=createNewImageMenuItem(GTK_STOCK_COPY,COPY_FOLDER_PATH_LABEL,true);
-			gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
-			g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(doTabMenu),(void*)page->dirName);
+			menuData[TABFOLDERPATH].userData=(void*)page->dirName;
+			menuitem=newImageMenuItem(TABFOLDERPATH,tabMenu);
 //copy filepath
-			menuitem=createNewImageMenuItem(GTK_STOCK_COPY,COPY_FILE_PATH_LABEL,true);
-			gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
-			g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(doTabMenu),(void*)page->filePath);
+			menuData[TABFILEPATH].userData=(void*)page->filePath;
+			menuitem=newImageMenuItem(TABFILEPATH,tabMenu);
 //copy filename
-			menuitem=createNewImageMenuItem(GTK_STOCK_COPY,COPY_FILE_NAME_LABEL,true);
-			gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
-			g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(doTabMenu),(void*)page->fileName);
+			menuData[TABFILENAME].userData=(void*)page->fileName;
+			menuitem=newImageMenuItem(TABFILENAME,tabMenu);
 #ifdef _ASPELL_
 //check document
 			if((spellChecker!=NULL) &&(aspellConfig!=NULL) &&(gtk_text_buffer_get_modified((GtkTextBuffer*)page->buffer)==false))
 				{
-					menuitem=createNewImageMenuItem(GTK_STOCK_SPELL_CHECK,SPELL_CHECK_LABEL,true);
-					gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(doSpellCheckDoc),(void*)page->filePath);
+					menuData[TABSPELLCHECK].userData=(void*)page->filePath;
+					menuitem=newImageMenuItem(TABSPELLCHECK,tabMenu);
 				}
 #endif
 
@@ -993,8 +1006,7 @@
 			lm=gtk_source_language_manager_get_default();
 			ids=gtk_source_language_manager_get_language_ids(lm);
 
-			menuitem=createNewImageMenuItem(GTK_STOCK_SELECT_COLOR,SOURCE_HILITE_LABEL,true);
-			gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
+			menuitem=newImageMenuItem(TABSRCHILITE,tabMenu);
 			submenu=gtk_menu_new();
 			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),submenu);
 
@@ -1026,7 +1038,6 @@
 						}
 				}
 
-
 			for(int j=0; j<cnt; j++)
 				{
 					lang=gtk_source_language_manager_get_language(lm,idsort[j]);
@@ -1034,39 +1045,45 @@
 						{
 							langname=gtk_source_language_get_name(lang);
 
+							menuData[MENUBLANK].stockID=NULL;
 							if((page->lang!=NULL) &&(strcmp(page->lang,langname)==0))
-								menuids=createNewImageMenuItem(GTK_STOCK_APPLY,langname,false);
+								sprintf(ticklang,">> %s <<",langname);
 							else
-								menuids=gtk_menu_item_new_with_label(langname);
-
-							g_signal_connect(G_OBJECT(menuids),"activate",G_CALLBACK(changeSourceStyle),(void*)(long)idnum[j]);
-							gtk_menu_shell_append(GTK_MENU_SHELL(submenu),menuids);
+								sprintf(ticklang,"%s",langname);
+							menuData[MENUBLANK].menuLabel=ticklang;
+							menuData[MENUBLANK].userData=(gpointer)(long)idnum[j];
+							menuData[MENUBLANK].cb=(void*)changeSourceStyle;
+							menuids=newMenuItem(MENUBLANK,submenu);
 						}
 				}
-//hide tab
-			menuitem=createNewImageMenuItem(GTK_STOCK_REMOVE,MENU_HIDE_TAB_LABEL,true);
-			gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
-			g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(hideTab),(void*)page);
 
+//hide tab
+			menuData[TABHIDE].userData=(gpointer)page;
+			menuitem=newImageMenuItem(TABHIDE,tabMenu);
 //add files to tab
-			menuitem=createNewImageMenuItem(GTK_STOCK_OPEN,MENU_OPEN_LABEL,true);
-			gtk_menu_shell_append(GTK_MENU_SHELL(tabMenu),menuitem);
+			menuData[MENUOPEN].cb=NULL;
+			menuData[MENUOPEN].key=0;
+			menuitem=newImageMenuItem(MENUOPEN,tabMenu);
 
 			submenu=gtk_menu_new();
 			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),submenu);
 
+#ifdef _INBSD_
+			sinkReturn=asprintf(&command,"ls -Bp  \"%s\" | grep -v /|sort|sed -n '/^.*[^\\.o]$/p'",page->dirName);
+#else
 			sinkReturn=asprintf(&command,"ls --color=never -Bp  \"%s\" | grep -v /|sort|sed -n '/^.*[^\\.o]$/p'",page->dirName);
+#endif
+			menuData[MENUBLANK].cb=(void*)&openFromTab;
+			menuData[MENUBLANK].stockID=NULL;
 			fp=popen(command,"r");
 			if(fp!=NULL)
 				{
 					while(fgets(line,2048,fp))
 						{
 							line[strlen(line)-1]=0;
-							name=basename(line);
-							menuids=createNewImageMenuItem(NULL,strdup(name),false);
-
-							gtk_menu_shell_append(GTK_MENU_SHELL(submenu),menuids);
-							g_signal_connect(G_OBJECT(menuids),"activate",G_CALLBACK(openFromTab),(void*)page);
+							menuData[MENUBLANK].menuLabel=basename(line);
+							menuData[MENUBLANK].userData=(gpointer)page;
+							menuids=newMenuItem(MENUBLANK,submenu);
 						}
 					fclose(fp);
 				}
@@ -1082,7 +1099,6 @@
 			gtk_menu_attach_to_widget(GTK_MENU(tabMenu),widget,NULL);
 			gtk_menu_popup(GTK_MENU(tabMenu),NULL,NULL,NULL,NULL,event->button,event->time);
 			gtk_widget_show_all((GtkWidget*)tabMenu);
-
 			return(true);
 		}
 	else
@@ -1155,6 +1171,9 @@
 	int			result;
 	pageStruct	*page;
 
+	globalPlugins->setUserData("ts",FROMFILEMENU,SAVEALLMENUNAME);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 	for(int loop=0; loop<numpages; loop++)
 		{
 			page=getPageStructByIDFromPage(loop);
@@ -1245,7 +1264,7 @@
 {
 	ERRDATA
 	pageStruct	*tpage=getPageStructByIDFromPage(-1);
-	bool		*bools[MAXPREFSWIDGETS]={&indent,&lineNumbers,&lineWrap,&highLight,&noSyntax,&singleUse,&onExitSaveSession,&restoreBookmarks,&noDuplicates,&noWarnings,&readLinkFirst,&autoShowComps,&autoCheck,&nagScreen,&useGlobalPlugMenu,&autoSearchDocs,&showWhiteSpace};
+	bool		*bools[MAXPREFSWIDGETS]={&indent,&lineNumbers,&lineWrap,&highLight,&noSyntax,&singleUse,&onExitSaveSession,&restoreBookmarks,&noDuplicates,&noWarnings,&readLinkFirst,&autoShowComps,&autoCheck,&nagScreen,&useGlobalPlugMenu,&autoSearchDocs,&showWhiteSpace,&showMenuIcons};
 	unsigned	*ints[MAXPREFSINTWIDGETS]={&maxTabChars,&maxFRHistory,&depth,&autoShowMinChars,&tabWidth,&maxFuncDefs,&maxBMChars,&tabsSize,&maxJumpHistory};
 
 	if(strcmp(gtk_widget_get_name(widget),"style")==0)
@@ -1270,6 +1289,7 @@
 			gtk_widget_destroy(prefswin);
 		}
 
+bool holdmenuicons=showMenuIcons;
 	if(strcmp(gtk_widget_get_name(widget),"apply")==0)
 		{
 			for(int j=0;j<MAXPREFSWIDGETS;j++)
@@ -1280,6 +1300,7 @@
 
 #ifdef _USEGTK3_
 			char	*tabcss=NULL;
+
 			sinkReturn=asprintf(&tabcss,"* {\npadding: %ipx;\n}\n",tabsSize);
 			gtk_css_provider_load_from_data((GtkCssProvider*)tabBoxProvider,tabcss,-1,NULL);
 			debugFree(&tabcss);
@@ -1451,8 +1472,7 @@
 VISIBLE void doAbout(GtkWidget *widget,gpointer data)
 {
 	ERRDATA
-	const char	*authors[]={"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,"\nBig thanks to Sadi YumuÅŸak for all his help.",DIALOG_ABOUT_MORE_LABEL,"Xfce-Theme-Manager\nhttp://xfce-look.org/content/show.php?content=149647\n","Xfce4-Composite-Editor\nhttp://gtk-apps.org/content/show.php/Xfce4-Composite-Editor?content=149523\n","Manpage Editor\nhttp://gtk-apps.org/content/show.php?content=160219\n","GtkSu\nhttp://gtk-apps.org/content/show.php?content=158974\n","ASpell GUI\nhttp://gtk-apps.org/content/show.php/?content=161353\n","Clipboard Viewer\nhttp://gtk-apps.org/content/show.php/?content=121667",NULL};
-	const char	copyright[] ="Copyright \xc2\xa9 2013 K.D.Hedger \n" MYEMAIL;
+	const char	copyright[]=COPYRITE " \n" MYEMAIL;
 	const char	*aboutboxstring=DIALOG_ABOUT_KKEDIT_LABEL;
 	char		*licence;
 	char		*translators;
@@ -1461,7 +1481,7 @@
 	sinkReturn=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",DIALOG_ABOUT_FRENCH_LABEL);
 	g_file_get_contents(GDOCSFOLDER "/gpl-3.0.txt",&licence,NULL,NULL);
 
-	gtk_show_about_dialog(NULL,"authors",authors,"translator-credits",translators,"comments",aboutboxstring,"copyright",copyright,"version",VERSION,"website",MYWEBSITE,"website-label","KKEdit Homepage","program-name","KKEdit","logo-icon-name",ABOUTICON,"license",licence,"artists",artists,NULL);
+	gtk_show_about_dialog((GtkWindow*)mainWindow,"authors",authors,"translator-credits",translators,"comments",aboutboxstring,"copyright",copyright,"version",VERSION,"website",KKEDITPAGE,"website-label","KKEdit Homepage","program-name","KKEdit","logo-icon-name",ABOUTICON,"license",licence,"artists",artists,NULL);
 
 	ERRDATA debugFree(&licence);
 	ERRDATA debugFree(&translators);
diff -Nru kkedit-0.3.3/KKEdit/src/callbacks.h kkedit-0.4.1/KKEdit/src/callbacks.h
--- kkedit-0.3.3/KKEdit/src/callbacks.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/callbacks.h	2016-08-26 09:41:34.000000000 +0000
@@ -80,5 +80,6 @@
 void markRedo(GtkSourceUndoManager *manager,pageStruct *page);
 void markDirty(GtkTextBuffer *textbuffer,pageStruct *page);
 void realCloseTab(GtkNotebook *notebook,GtkWidget *child,guint page_num,gpointer user_data);
+void doTabMenu(GtkWidget *widget,gpointer user_data);
 
 #endif
diff -Nru kkedit-0.3.3/KKEdit/src/completion.cpp kkedit-0.4.1/KKEdit/src/completion.cpp
--- kkedit-0.3.3/KKEdit/src/completion.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/completion.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -181,16 +181,13 @@
 void addProp(pageStruct *page)
 {
 	ERRDATA
-	char		*functions=NULL;
-	char		tmpstr[1024];
-	char		*lineptr;
-	char		*correctedstr;
-	char		functype[63];
-	char		infostr[1024];
-	char		*holdstr;
-	FILE		*fd=NULL;
-	char		buffer[2048];
-	char		*customfile;
+	char			*functions=NULL;
+	char			*lineptr;
+	char			infostr[1024];
+	FILE			*fd=NULL;
+	char			buffer[2048];
+	char			*customfile;
+	functionData	*funcdata;
 
 	if(page->filePath==NULL)
 		{
@@ -221,23 +218,15 @@
 
 	while (lineptr!=NULL)
 		{
-			tmpstr[0]=0;
-			sscanf (lineptr,"%s",tmpstr);
-			sscanf (lineptr,"%*s %*s %*i %[^\n]s",infostr);
-			holdstr=strdup(tmpstr);
-			correctedstr=truncateWithElipses(tmpstr,maxFuncDefs);
-			sprintf(tmpstr,"%s",correctedstr);
-			if(strlen(tmpstr)>0)
+			funcdata=allocFStrings(FUNCDATA,lineptr);
+			if(strlen(funcdata->name)>0)
 				{
-					sscanf (lineptr,"%*s %s",functype);	
-					if(strcasecmp(functype,"function")==0)
-						funcProv->proposals=g_list_append(funcProv->proposals,gtk_source_completion_item_new(tmpstr,holdstr,NULL,infostr));
-					if(strcasecmp(functype,"variable")==0)
-						varsProv->proposals=g_list_append(varsProv->proposals,gtk_source_completion_item_new(tmpstr,holdstr,NULL,infostr));
+					if(strcasecmp(funcdata->type,"function")==0)
+						funcProv->proposals=g_list_append(funcProv->proposals,gtk_source_completion_item_new(funcdata->name,funcdata->name,NULL,infostr));
+					if(strcasecmp(funcdata->type,"variable")==0)
+						varsProv->proposals=g_list_append(varsProv->proposals,gtk_source_completion_item_new(funcdata->name,funcdata->name,NULL,infostr));
 				}
-			ERRDATA debugFree(&correctedstr);
-			ERRDATA debugFree(&holdstr);
-
+			ERRDATA destroyData(funcdata);
 			lineptr=strchr(lineptr,'\n');
 			if (lineptr!=NULL)
 				lineptr++;
diff -Nru kkedit-0.3.3/KKEdit/src/files.cpp kkedit-0.4.1/KKEdit/src/files.cpp
--- kkedit-0.3.3/KKEdit/src/files.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/files.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -65,7 +65,7 @@
 									{
 										if(strlen((char*)list->data)>0)
 											{
-												fprintf(fd,"%s\t%s\n",dataptr[cnt].name,(char*)list->data);
+												fprintf(fd,"%s %s\n",dataptr[cnt].name,(char*)list->data);
 											}
 										list=list->next;
 									}
@@ -84,10 +84,8 @@
 	FILE		*fd=NULL;
 	char		buffer[2048];
 	int			cnt;
-	char		*argname=NULL;
-	char		*strarg=NULL;
-	char		*liststr=NULL;
 	int			retval=NOERR;
+	varStrings	*vs=NULL;
 
 	fd=fopen(filepath,"r");
 	if(fd!=NULL)
@@ -96,37 +94,37 @@
 				{
 					buffer[0]=0;
 					sinkReturnStr=fgets(buffer,2048,fd);
-					sscanf(buffer,"%ms %ms",&argname,&strarg);
+					vs=allocVStrings(buffer);
 					cnt=0;
 					while(dataptr[cnt].name!=NULL)
 						{
-							if((strarg!=NULL) &&(argname!=NULL) &&(strcmp(argname,dataptr[cnt].name)==0))
+							if((vs->data!=NULL) &&(vs->name!=NULL) &&(strcmp(vs->name,dataptr[cnt].name)==0))
 								{
 									switch(dataptr[cnt].type)
 										{
 											case TYPEINT:
-												*(int*)dataptr[cnt].data=atoi(strarg);
+												*(int*)dataptr[cnt].data=atoi(vs->data);
 												break;
 											case TYPESTRING:
 												if(*(char**)(dataptr[cnt].data)!=NULL)
 													{
 														ERRDATA debugFree(&*(char**)(dataptr[cnt].data));
 													}
-												sscanf(buffer,"%*s %m[^\n]s",(char**)dataptr[cnt].data);
+												*(char**)(dataptr[cnt].data)=(char*)strdup(vs->data);
 												break;
 											case TYPEBOOL:
-												*(bool*)dataptr[cnt].data=(bool)atoi(strarg);
+												*(bool*)dataptr[cnt].data=(bool)atoi(vs->data);
 												break;
 											case TYPELIST:
-												sscanf(buffer,"%*s\t%m[^\n]s",&liststr);
-												*(GSList**)dataptr[cnt].data=g_slist_append(*(GSList**)dataptr[cnt].data,liststr);
+												*(GSList**)dataptr[cnt].data=g_slist_append(*(GSList**)dataptr[cnt].data,strdup(vs->data));
 												break;
 										}
 								}
 							cnt++;
 						}
-					freeAndNull(&argname);
-					freeAndNull(&strarg);
+					freeAndNull(&vs->name);
+					freeAndNull(&vs->data);
+					free(vs);
 				}
 			fclose(fd);
 		}
@@ -151,8 +149,6 @@
 	char		*correctedname;
 
 	hbox=createNewBox(NEWHBOX,false,0);
-	ERRDATA rebuildTabsMenu();
-
 	correctedname=truncateWithElipses(name,maxTabChars);
 
 	label=gtk_label_new(correctedname);
@@ -191,85 +187,6 @@
 	ERRDATA return(evbox);
 }
 
-#if 0
-
-const char *resetcss=" \
-* { \
-  color: inherit; \
-  font-size: inherit; \
-  background-color: initial; \
-  font-family: inherit; \
-  font-style: inherit; \
-  font-variant: inherit; \
-  font-weight: inherit; \
-  text-shadow: inherit; \
-  icon-shadow: inherit; \
-  box-shadow: initial; \
-  margin-top: initial; \
-  margin-left: initial; \
-  margin-bottom: initial; \
-  margin-right: initial; \
-  padding-top: initial; \
-  padding-left: initial; \
-  padding-bottom: initial; \
-  padding-right: initial; \
-  border-top-style: initial; \
-  border-top-width: initial; \
-  border-left-style: initial; \
-  border-left-width: initial; \
-  border-bottom-style: initial; \
-  border-bottom-width: initial; \
-  border-right-style: initial; \
-  border-right-width: initial; \
-  border-top-left-radius: initial; \
-  border-top-right-radius: initial; \
-  border-bottom-right-radius: initial; \
-  border-bottom-left-radius: initial; \
-  outline-style: initial; \
-  outline-width: initial; \
-  outline-offset: initial; \
-  background-clip: initial; \
-  background-origin: initial; \
-  background-size: initial; \
-  background-position: initial; \
-  border-top-color: initial; \
-  border-right-color: initial; \
-  border-bottom-color: initial; \
-  border-left-color: initial; \
-  outline-color:  initial; \
-  background-repeat: initial; \
-  background-image: initial; \
-  border-image-source: initial; \
-  border-image-repeat: initial; \
-  border-image-slice: initial; \
-  border-image-width: initial; \
-  transition-property: initial; \
-  transition-duration: initial; \
-  transition-timing-function: initial; \
-  transition-delay: initial; \
-  engine: initial; \
-  gtk-key-bindings: initial; \
- \
-  -GtkWidget-focus-line-width: 0; \
-  -GtkWidget-focus-padding: 0; \
-  -GtkNotebook-initial-gap: 0; \
-} \
- \
-* { \
-  color: green; \
-  font-family: Monospace; \
-  border: 100px solid; \
-} \
- \
-:selected { \
-  background-color: darkGreen; \
-  color: black; \
-} \
- \
-";
-
-#endif
-
 void setFilePrefs(pageStruct *page)
 {
 	ERRDATA
@@ -475,11 +392,18 @@
 	FILE		*fd=NULL;
 	GtkWidget	*dialog;
 
+	if(data==NULL)
+		globalPlugins->setUserData("tsd",FROMFILEMENU,SAVEMENUNAME,data);
+	else
+		globalPlugins->setUserData("tsd",FROMFILEMENU,SAVEASMENUNAME,data);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 	ERRDATA
 	page->itsMe=true;
 	gtk_text_buffer_get_start_iter((GtkTextBuffer*)page->buffer,&start);
 	gtk_text_buffer_get_end_iter((GtkTextBuffer*)page->buffer,&end);
 	text=gtk_text_buffer_get_text((GtkTextBuffer*)page->buffer,&start,&end,FALSE);
+
 	if(page->filePath!=NULL && data==NULL)
 		{
 			fd=fopen(page->filePath,"w");
@@ -549,6 +473,7 @@
 		}
 	if(page->lang==NULL)
 		setLanguage(page);
+
 	switchPage(mainNotebook,page->tabVbox,currentTabNumber,NULL);
 	setChangedSensitive((GtkTextBuffer*)page->buffer,page);
 	ERRDATA
@@ -611,6 +536,7 @@
 			setChangedSensitive((GtkTextBuffer*)page->buffer,page);
 		}
 
+	rebuildTabsMenu();
 	gtk_widget_destroy(dialog);
 	ERRDATA
 }
@@ -730,7 +656,7 @@
 
 	ERRDATA
 	loadingSession=true;
-	closeAllTabs(NULL,NULL);
+//	closeAllTabs(NULL,NULL);
 	showBarberPole(DIALOG_POLE_RESTORING);
 
 	if(data==NULL)
@@ -741,6 +667,7 @@
 	fd=fopen(filename,"r");
 	if(fd!=NULL)
 		{
+			closeAllTabs(NULL,NULL);
 			sinkReturnStr=fgets(buffer,2048,fd);
 			sinkReturn=fscanf(fd,"%i %i %i %i\n",&width,&hite,&winx,&winy);
 			gtk_window_resize((GtkWindow*)mainWindow,width,hite);
@@ -798,7 +725,6 @@
 
 	ERRDATA delete buf;
 	currentTabNumber=gtk_notebook_get_n_pages((GtkNotebook*)mainNotebook)-1;
-
 	for(int j=0;j<gtk_notebook_get_n_pages(mainNotebook);j++)
 		{
 			pageStruct *page=getPageStructByIDFromPage(j);
@@ -810,7 +736,8 @@
 				}
 		}
 	loadingSession=false;
-	updateStatusBar((GtkTextBuffer*)page->buffer,NULL,NULL,NULL);
+	if(page!=NULL)
+		updateStatusBar((GtkTextBuffer*)page->buffer,NULL,NULL,NULL);
 	killBarberPole();
 	ERRDATA
 }
@@ -921,6 +848,32 @@
 	return(false);
 }
 
+bool highLightText(GtkWidget *widget,GdkEvent *event,gpointer data)
+{
+	TextBuffer	*buf;
+	pageStruct	*page;
+	page=(pageStruct*)data;
+	if(page!=NULL)
+		{
+			buf=new TextBuffer((GtkTextBuffer*)page->buffer);
+			buf->getSelectionBounds();
+			if(buf->selectionStart==-1)
+				{
+					page->startChar=buf->charPos;
+					page->endChar=buf->charPos;
+				}
+			else
+				{
+					page->startChar=buf->selectionStart;
+					page->endChar=buf->selectionEnd;
+				}
+			globalPlugins->setUserData("tsdbe",FROMSELECTION,OPENMENUNAME,data,buf->selectionStart,buf->selectionEnd);
+			g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+			delete buf;
+		}
+	return(false);
+}
+
 pageStruct *makeNewPage(void)
 {
 	ERRDATA
@@ -945,6 +898,10 @@
 	gtk_style_context_add_provider(gtk_widget_get_style_context((GtkWidget*)page->view),provider,GTK_STYLE_PROVIDER_PRIORITY_USER);
 #endif
 
+	g_signal_connect(G_OBJECT(page->view),"button-release-event",G_CALLBACK(highLightText),(void*)page);
+//	g_signal_connect(G_OBJECT(evbox),"button-press-event",G_CALLBACK(tabPopUp),(void*)page);
+
+
 //completion
 	page->completion=gtk_source_view_get_completion(GTK_SOURCE_VIEW(page->view));
 	g_object_set(page->completion,"remember-info-visibility",true,NULL);
@@ -984,6 +941,8 @@
 	page->searchString=NULL;
 	page->replaceString=NULL;
 	page->hidden=false;
+	page->startChar=-1;
+	page->endChar=-1;
 
 	gtk_text_buffer_get_start_iter((GtkTextBuffer*)page->buffer,&iter);
 	gtk_text_buffer_add_mark(GTK_TEXT_BUFFER(page->buffer),page->backMark,&iter);
@@ -1175,7 +1134,7 @@
 
 	str=g_file_get_path(page->gFile);
 	recenturi=g_filename_to_uri(str,NULL,NULL);
-	gtk_recent_manager_add_item(gtk_recent_manager_get_default(),recenturi);
+	gtk_recent_manager_add_item(recentMan,recenturi);
 	ERRDATA debugFree(&filename);
 	ERRDATA debugFree(&recenturi);
 	ERRDATA debugFree(&str);
@@ -1225,7 +1184,8 @@
 	page->canRedo=false;
 	page->isDirty=false;
 	setPageSensitive();
-	
+	rebuildTabsMenu();
+
 	ERRDATA return(TRUE);
 }
 
@@ -1236,6 +1196,9 @@
 	GtkWidget	*label;
 	pageStruct	*page;
 
+	globalPlugins->setUserData("tsd",FROMFILEMENU,NEWMENUNAME,data);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 	page=makeNewPage();
 	page->tabVbox=createNewBox(NEWVBOX,true,4);
 	page->filePath=NULL;
@@ -1262,6 +1225,7 @@
 	currentPage++;
 	gtk_widget_show_all((GtkWidget*)page->tabVbox);
 	setFilePrefs(page);
+	rebuildTabsMenu();
 
 	globalPlugins->globalPlugData->page=page;
 	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"newFile");
@@ -1277,6 +1241,9 @@
 	GSList		*filenames;
 	GSList		*thisnext;
 
+	globalPlugins->setUserData("tsd",FROMFILEMENU,OPENMENUNAME,data);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 #ifdef _USEGTK3_
 	dialog=gtk_file_chooser_dialog_new(OPEN_TT_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,GTK_STOCK_OPEN_LABEL, GTK_RESPONSE_ACCEPT,NULL);
 #else
diff -Nru kkedit-0.3.3/KKEdit/src/globals.cpp kkedit-0.4.1/KKEdit/src/globals.cpp
--- kkedit-0.3.3/KKEdit/src/globals.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/globals.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -19,147 +19,165 @@
  */
 
 #include "kkedit-includes.h"
+//#include "internet.h"
 
-GApplication	*mainApp;
-bool			autoSeleced=false;
-bool			fromGOpen=false;
-char			*prefsFolder=NULL;
+const char			*thanks[]={
+								"Big thanks to Sadi YumuÅŸak and Thanh for all their help.",
+//								DIALOG_ABOUT_MORE_LABEL
+//								"XDecorations\nhttp://khapplications.darktech.org/pages/xdecorations/xdecorations.html\n",
+//								"Xfce-Theme-Manager\nhttp://khapplications.darktech.org/pages/apps.html#themeed\n",
+//								"Xfce4-Composite-Editor\nhttp://khapplications.darktech.org/pages/apps.html#xfcecomp\n",
+//								"Manpage Editor\nhttp://khapplications.darktech.org/pages/manpageeditor/help.html\n",
+//								"GtkSu\nhttp://khapplications.darktech.org/pages/gtksu/gtksu.html\n",
+//								"ASpell GUI\nhttp://khapplications.darktech.org/pages/aspellgui/aspelgui.html\n",
+//								"Clipboard Viewer\nhttp://khapplications.darktech.org/pages/clipviewer/clip.html"
+							};
+
+const char			*authorskk[]={"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,thanks[0],moreapps[0],moreapps[1],moreapps[2],moreapps[3],moreapps[4],moreapps[5],moreapps[6],moreapps[7],moreapps[8],moreapps[9],NULL};
 
 //app
+GApplication		*mainApp;
+bool				autoSeleced=false;
+bool				fromGOpen=false;
+char				*prefsFolder=NULL;
+GtkRecentManager	*recentMan=NULL;
+
 //main mainWindow
-GtkWidget		*mainWindow=NULL;
-GtkWidget		*menuBar=NULL;
-GtkToolbar		*toolBar;
-GtkWidget		*statusBarMenu=NULL;
-GtkNotebook		*mainNotebook=NULL;
+GtkWidget			*mainWindow=NULL;
+GtkWidget			*menuBar=NULL;
+GtkToolbar			*toolBar;
+GtkWidget			*statusBarMenu=NULL;
+GtkNotebook			*mainNotebook=NULL;
 
 //file menu
-GtkWidget		*fileMenu;
-GtkWidget		*menuItemOpen=NULL;
-GtkWidget		*saveMenu;
-GtkWidget		*saveAsMenu;
-GtkWidget		*saveAllMenu;
-GtkWidget		*closeMenu;
-GtkWidget		*closeAllMenu;
-GtkWidget		*revertMenu;
-GtkWidget		*printMenu;
+GtkWidget			*fileMenu=NULL;
+GtkWidget			*menuItemNew=NULL;
+GtkWidget			*menuItemOpen=NULL;
+GtkWidget			*saveMenu;
+GtkWidget			*saveAsMenu;
+GtkWidget			*saveAllMenu;
+GtkWidget			*closeMenu;
+GtkWidget			*closeAllMenu;
+GtkWidget			*revertMenu;
+GtkWidget			*printMenu;
 
 //edit menu
-GtkWidget		*editMenu;
-GtkWidget		*redoMenu;
-GtkWidget		*undoMenu;
-GtkWidget		*redoAllMenu;
-GtkWidget		*undoAllMenu;
-GtkWidget		*cutMenu;
-GtkWidget		*copyMenu;
-GtkWidget		*pasteMenu;
-GtkWidget		*sortTabsMenu=NULL;
-GtkWidget		*showAllTabsMenu=NULL;
+GtkWidget			*editMenu=NULL;
+GtkWidget			*redoMenu;
+GtkWidget			*undoMenu;
+GtkWidget			*redoAllMenu;
+GtkWidget			*undoAllMenu;
+GtkWidget			*cutMenu;
+GtkWidget			*copyMenu;
+GtkWidget			*pasteMenu;
+GtkWidget			*sortTabsMenu=NULL;
+GtkWidget			*showAllTabsMenu=NULL;
 
 //view menu
-GtkWidget		*viewMenu=NULL;
-GtkWidget		*viewTabMenu=NULL;
-GtkWidget		*viewTabSubMenu=NULL;
+GtkWidget			*viewMenu=NULL;
+GtkWidget			*viewTabMenu=NULL;
+GtkWidget			*viewTabSubMenu=NULL;
 
 //nav menu
-GtkWidget		*navMenu;
-GtkWidget		*goBackMenu;
-GtkWidget		*goForwardMenu;
-GtkWidget		*gotoDefMenu;
-GtkWidget		*searchInGtkDocsMenu;
-GtkWidget		*searchInQTDocsMenu;
-GtkWidget		*searchInDocsMenu;
+GtkWidget			*navMenu=NULL;
+GtkWidget			*goBackMenu;
+GtkWidget			*goForwardMenu;
+GtkWidget			*gotoDefMenu;
+GtkWidget			*searchInGtkDocsMenu;
+GtkWidget			*searchInQTDocsMenu;
+GtkWidget			*searchInDocsMenu;
 
 //func menu
-GtkWidget		*funcMenu;
+GtkWidget			*funcMenu=NULL;
 //bookmark menu
-GtkWidget		*bookMarkMenu;
-GtkWidget		*bookMarkSubMenu;
+GtkWidget			*bookMarkMenu=NULL;
+GtkWidget			*bookMarkSubMenu=NULL;
 //tools menu
-GtkWidget		*toolsMenu;
-GtkWidget		*toolOutMenu=NULL;
+GtkWidget			*toolsMenu=NULL;
+GtkWidget			*toolOutMenu=NULL;
 //plug menu
-GtkWidget		*globalPlugMenu=NULL;
+GtkWidget			*globalPlugMenu=NULL;
 //help menu
-GtkWidget		*helpMenu;
+GtkWidget			*helpMenu=NULL;
 
 //barber pole
-char			*barControl;
+char				*barControl;
 
-GtkAccelGroup	*accgroup=NULL;
+GtkAccelGroup		*accgroup=NULL;
 
-VISIBLE GList	*newBookMarksList=NULL;
-char			*highlightColour;
-char			*tmpHighlightColour;
-bool			showBMBar;
-GtkWidget		*bmHighlightBox;
-int				bmMarkNumber=0;
-unsigned		pageID=100;
-
-char			*toolBarLayout=NULL;
-GtkWidget		*toolBarBox;
-
-GtkWidget		*lineNumberWidget;
-GtkWidget		*findApiWidget;
-GtkWidget		*findQtApiWidget;
-GtkWidget		*findDefWidget;
-GtkWidget		*liveSearchWidget;
-
-int				currentPage=0;
-int				sinkReturn;
-char			*sinkReturnStr;
+VISIBLE GList		*newBookMarksList=NULL;
+char				*highlightColour;
+char				*tmpHighlightColour;
+bool				showBMBar;
+GtkWidget			*bmHighlightBox;
+int					bmMarkNumber=0;
+unsigned			pageID=100;
+
+char				*toolBarLayout=NULL;
+GtkWidget			*toolBarBox;
+
+GtkWidget			*lineNumberWidget;
+GtkWidget			*findApiWidget;
+GtkWidget			*findQtApiWidget;
+GtkWidget			*findDefWidget;
+GtkWidget			*liveSearchWidget;
+
+int					currentPage=0;
+int					sinkReturn;
+char				*sinkReturnStr;
 
 //nag
-bool			nagScreen;
-unsigned int	nagTime;
-unsigned int	lastNagTime=0;
-bool			timeToNag=true;
-unsigned int	lastUpdate=0;
-unsigned int	lastPlugUpdate=0;
-unsigned int	updateWait=2678400;
+bool				nagScreen;
+unsigned int		nagTime;
+unsigned int		lastNagTime=0;
+bool				timeToNag=true;
+unsigned int		lastUpdate=0;
+unsigned int		lastPlugUpdate=0;
+unsigned int		updateWait=2678400;
 
 //docview size and position
-int				docWindowWidth;
-int				docWindowHeight;
-int				docWindowX=-1;
-int				docWindowY=-1;
+int					docWindowWidth;
+int					docWindowHeight;
+int					docWindowX=-1;
+int					docWindowY=-1;
 
 //prefs
-GtkWidget		*prefswin;
-bool			indent;
-bool			lineNumbers;
-bool			lineWrap;
-bool			highLight;
-bool			noSyntax;
-bool			showWhiteSpace;
-bool			singleUse;
-unsigned int	tabWidth;
-unsigned int	tabsSize;
-char			*fontAndSize;
-char			*terminalCommand;
-char			*rootCommand;
-unsigned int	depth;
-bool			onExitSaveSession;
-bool			restoreBookmarks;
-char			*styleName=NULL;
-bool			noDuplicates;
-bool			noWarnings;
-bool			readLinkFirst;
-bool			autoShowComps;
-bool			autoSearchDocs;
-bool			autoCheck;
-unsigned int	autoShowMinChars;
-bool			useGlobalPlugMenu;
-unsigned int	maxTabChars=20;
-unsigned int	maxBMChars;
-unsigned int	maxJumpHistory;
-unsigned int	maxFuncDefs;
-
-GtkWidget		*fontButton;
-GtkWidget		*terminalBox;
-GtkWidget		*rootCommandBox;
-GtkWidget		*defaultBrowserBox;
-char			*browserCommand=strdup("firefox");
+GtkWidget			*prefswin;
+bool				indent;
+bool				lineNumbers;
+bool				lineWrap;
+bool				highLight;
+bool				noSyntax;
+bool				showWhiteSpace;
+bool				singleUse;
+unsigned int		tabWidth;
+unsigned int		tabsSize;
+char				*fontAndSize;
+char				*terminalCommand;
+char				*rootCommand;
+unsigned int		depth;
+bool				onExitSaveSession;
+bool				restoreBookmarks;
+char				*styleName=NULL;
+bool				noDuplicates;
+bool				noWarnings;
+bool				readLinkFirst;
+bool				autoShowComps;
+bool				autoSearchDocs;
+bool				autoCheck;
+unsigned int		autoShowMinChars;
+bool				useGlobalPlugMenu;
+unsigned int		maxTabChars=20;
+unsigned int		maxBMChars;
+unsigned int		maxJumpHistory;
+unsigned int		maxFuncDefs;
+
+GtkWidget			*fontButton;
+GtkWidget			*terminalBox;
+GtkWidget			*rootCommandBox;
+GtkWidget			*defaultBrowserBox;
+char				*browserCommand=strdup("firefox");
+bool				showMenuIcons=false;
 
 #ifdef _USEGTK3_
 GtkStyleProvider	*provider;
@@ -167,158 +185,159 @@
 #endif
 
 //key short cuts
-GtkWidget		*keysWindow=NULL;
+GtkWidget			*keysWindow=NULL;
 
-char			*tmpStyleName=NULL;
+char				*tmpStyleName=NULL;
 
-GtkWidget		*toolNameWidget;
-GtkWidget		*commandLineWidget;
-GtkWidget		*keyWidget;
-GtkWidget		*commentWidget;
-GtkWidget		*inTermWidget;
-GtkWidget		*inPopupWidget;
-GtkWidget		*alwaysPopupWidget;
-GtkWidget		*syncWidget;
-GtkWidget		*ignoreWidget;
-GtkWidget		*pasteWidget;
-GtkWidget		*replaceWidget;
-GtkWidget		*outputWidget;
-GtkWidget		*showDocWidget;
-GtkWidget		*toolSelect;
-GtkWidget		*clearViewWidget;
-GtkWidget		*runAsRootWidget;
-GtkWidget		*useBarWidget;
+GtkWidget			*toolNameWidget;
+GtkWidget			*commandLineWidget;
+GtkWidget			*keyWidget;
+GtkWidget			*commentWidget;
+GtkWidget			*inTermWidget;
+GtkWidget			*inPopupWidget;
+GtkWidget			*alwaysPopupWidget;
+GtkWidget			*syncWidget;
+GtkWidget			*ignoreWidget;
+GtkWidget			*pasteWidget;
+GtkWidget			*replaceWidget;
+GtkWidget			*outputWidget;
+GtkWidget			*showDocWidget;
+GtkWidget			*toolSelect;
+GtkWidget			*clearViewWidget;
+GtkWidget			*runAsRootWidget;
+GtkWidget			*useBarWidget;
 
-toolStruct		*selectedToolFromDrop=NULL;
+toolStruct			*selectedToolFromDrop=NULL;
 
 //view tool output
-GtkWidget		*mainVPane=NULL;
-bool			showToolOutWin=false;
-GtkWidget		*toolOutputView=NULL;
-GtkTextBuffer	*toolOutputBuffer=NULL;
-GtkWidget		*toolOutVBox=NULL;
-bool			showStatus;
-GtkWidget		*statusWidget=NULL;
+GtkWidget			*mainVPane=NULL;
+bool				showToolOutWin=false;
+GtkWidget			*toolOutputView=NULL;
+GtkTextBuffer		*toolOutputBuffer=NULL;
+GtkWidget			*toolOutVBox=NULL;
+bool				showStatus;
+GtkWidget			*statusWidget=NULL;
 
-GList			*toolsList=NULL;
+GList				*toolsList=NULL;
 
-GtkWidget		*restoreBMs;
+GtkWidget			*restoreBMs;
 
 //main mainWindow
-int				windowWidth;
-int				windowHeight;
-int				windowX=-1;
-int				windowY=-1;
-bool			wrapSearch;
-bool			insensitiveSearch;
-bool			useRegex;
-bool			replaceAll;
-bool			findInAllFiles;
-bool			hightlightAll;
-int				toolOutHeight=200;
-int				bottomVPaneHite=200;
-int				topVPaneHite=200;
-
-GtkWidget		*mainWindowScrollbox=NULL;
-
-GtkWidget		*mainWindowVBox=NULL;
-GtkWidget		*mainTopUserVBox=NULL;
-GtkWidget		*mainWindowHBox=NULL;
-GtkWidget		*mainLeftUserVBox=NULL;
-GtkWidget		*mainNotebookVBox=NULL;
-GtkWidget		*mainRightUserVBox=NULL;
-GtkWidget		*mainBottomUserVBox=NULL;
-
-GtkWidget		*mainWindowVPane=NULL;
-GtkWidget		*secondWindowVPane=NULL;
-
-GtkWidget		*mainWindowHPane=NULL;
-GtkWidget		*secondWindowHPane=NULL;
-
-int				currentTabNumber;
-int 			untitledNumber=1;
-
-GtkToolItem		*newButton=NULL;
-GtkToolItem		*openButton=NULL;
-GtkToolItem		*saveButton=NULL;
-GtkToolItem		*redoButton=NULL;
-GtkToolItem		*undoButton=NULL;
-GtkToolItem		*cutButton=NULL;
-GtkToolItem		*copyButton=NULL;
-GtkToolItem		*pasteButton=NULL;
-GtkToolItem		*findButton=NULL;
-GtkToolItem		*gotoDefButton=NULL;
-GtkToolItem		*backButton=NULL;
-GtkToolItem		*forwardButton=NULL;
-GtkToolItem		*gotoLineButton=NULL;
-GtkToolItem		*findApiButton=NULL;
-GtkToolItem		*findQtApiButton=NULL;
-GtkToolItem		*findFuncDefButton=NULL;
-GtkToolItem		*liveSearchButton=NULL;
+int					windowWidth;
+int					windowHeight;
+int					windowX=-1;
+int					windowY=-1;
+bool				wrapSearch;
+bool				insensitiveSearch;
+bool				useRegex;
+bool				replaceAll;
+bool				findInAllFiles;
+bool				hightlightAll;
+int					toolOutHeight=200;
+int					bottomVPaneHite=200;
+int					topVPaneHite=200;
+
+GtkWidget			*mainWindowScrollbox=NULL;
+
+GtkWidget			*mainWindowVBox=NULL;
+GtkWidget			*mainTopUserVBox=NULL;
+GtkWidget			*mainWindowHBox=NULL;
+GtkWidget			*mainLeftUserVBox=NULL;
+GtkWidget			*mainNotebookVBox=NULL;
+GtkWidget			*mainRightUserVBox=NULL;
+GtkWidget			*mainBottomUserVBox=NULL;
+
+GtkWidget			*mainWindowVPane=NULL;
+GtkWidget			*secondWindowVPane=NULL;
+
+GtkWidget			*mainWindowHPane=NULL;
+GtkWidget			*secondWindowHPane=NULL;
+
+int					currentTabNumber;
+int 				untitledNumber=1;
+
+GtkToolItem			*newButton=NULL;
+GtkToolItem			*openButton=NULL;
+GtkToolItem			*saveButton=NULL;
+GtkToolItem			*redoButton=NULL;
+GtkToolItem			*undoButton=NULL;
+GtkToolItem			*cutButton=NULL;
+GtkToolItem			*copyButton=NULL;
+GtkToolItem			*pasteButton=NULL;
+GtkToolItem			*findButton=NULL;
+GtkToolItem			*gotoDefButton=NULL;
+GtkToolItem			*backButton=NULL;
+GtkToolItem			*forwardButton=NULL;
+GtkToolItem			*gotoLineButton=NULL;
+GtkToolItem			*findApiButton=NULL;
+GtkToolItem			*findQtApiButton=NULL;
+GtkToolItem			*findFuncDefButton=NULL;
+GtkToolItem			*liveSearchButton=NULL;
 
 //back/forward history
 
 //find replace
-GtkWidget		*findReplaceDialog;
-GtkWidget		*findBox;
-GtkWidget		*replaceBox;
-GtkWidget		*findDropBox=NULL;
-GtkWidget		*replaceDropBox;
-GSList			*findList=NULL;
-GSList			*replaceList=NULL;
-unsigned int	maxFRHistory=5;
+GtkWidget			*findReplaceDialog;
+VISIBLE GtkWidget	*findBox;
+VISIBLE GtkWidget	*replaceBox;
+GtkWidget			*findDropBox=NULL;
+GtkWidget			*replaceDropBox;
+GSList				*findList=NULL;
+GSList				*replaceList=NULL;
+unsigned int		maxFRHistory=5;
 
 //custom toolbar
-GtkWidget		*fromHBox;
-GtkWidget		*iconViewBox;
-bool			showToolBar=true;
-
-int				listFunction=0;
-GtkWidget		*funcListDrop=NULL;
-
-char			*functionSearchText=NULL;
-char			*thePage=NULL;
-char			*htmlFile=NULL;
-char			*htmlURI=NULL;
-char			*tmpFolderName=NULL;
+GtkWidget			*fromHBox;
+GtkWidget			*iconViewBox;
+bool				showToolBar=true;
+
+int					listFunction=0;
+GtkWidget			*funcListDrop=NULL;
+
+char				*functionSearchText=NULL;
+VISIBLE char		*thePage=NULL;
+char				*htmlFile=NULL;
+char				*htmlURI=NULL;
+char				*tmpFolderName=NULL;
 
 //runtime deps
-int				gotManEditor;
-int				gotDoxygen;
+int					gotManEditor;
+int					gotDoxygen;
+char				*ctagsPath=NULL;
 
 GtkSourceStyleSchemeManager	*schemeManager;
-GtkSourceStyleScheme			*styleScheme;
+GtkSourceStyleScheme		*styleScheme;
 
 #ifdef _BUILDDOCVIEWER_
-GtkWidget		*docView;
-WebKitWebView	*webView;
-bool			showHideDocviewer;
-GtkWidget		*showDocViewWidget;
+GtkWidget			*docView;
+WebKitWebView		*webView;
+bool				showHideDocviewer;
+GtkWidget			*showDocViewWidget;
 #endif
 
 //spellcheck
-GtkWidget		*spellCheckWord;
-GtkWidget		*wordListDropbox;
-GtkWidget		*wordListEntrybox;
-char			*badWord=NULL;
-char			*goodWord=NULL;
+GtkWidget			*spellCheckWord;
+GtkWidget			*wordListDropbox;
+GtkWidget			*wordListEntrybox;
+char				*badWord=NULL;
+char				*goodWord=NULL;
 #ifdef _ASPELL_
-AspellConfig	*aspellConfig;
-AspellSpeller	*spellChecker=0;
+AspellConfig		*aspellConfig;
+AspellSpeller		*spellChecker=0;
 #endif
 
-const char		*localeLang;
+const char			*localeLang;
 
 //notebook
-int				openInThisTab=-1;
+int					openInThisTab=-1;
 
 //general app
-bool			loadingSession;
-HistoryClass	*globalHistory;
-StringSlice		*globalSlice;
-bool			doGoogleSearch;
+bool				loadingSession=false;
+HistoryClass		*globalHistory;
+StringSlice			*globalSlice;
+bool				doGoogleSearch;
 
-unsigned int	shortCuts[NUMSHORTCUTS][2]=
+unsigned int		shortCuts[NUMSHORTCUTS][2]=
 {
 	{121,0},
 	{63,1},
@@ -337,9 +356,9 @@
 	{104,14}
 };
 
-char			*shortCutStrings[NUMSHORTCUTS]={NULL,};
+char				*shortCutStrings[NUMSHORTCUTS]={NULL,};
 
-args			keybindings_rc[]=
+args				keybindings_rc[]=
 	{
 //string
 		{"deleteline",TYPESTRING,&shortCutStrings[0]},
@@ -360,22 +379,22 @@
 		{NULL,0,NULL}
 	};
 
-GtkWidget		*progressWindow;
-GtkWidget		*progressBar;
+GtkWidget			*progressWindow;
+GtkWidget			*progressBar;
 
-PluginClass	*globalPlugins=NULL;
+PluginClass			*globalPlugins=NULL;
 
 //save and load var lists
-char			*windowAllocData=NULL;
-char			*docWindowAllocData=NULL;
+char				*windowAllocData=NULL;
+char				*docWindowAllocData=NULL;
 
-args			kkedit_startup_vars[]=
+args				kkedit_startup_vars[]=
 {
 	{"singleuse",TYPEBOOL,&singleUse},
 	{NULL,0,NULL}
 };
 
-args			kkedit_window_rc[]=
+args				kkedit_window_rc[]=
 {
 	//bools
 	{"insenssearch",TYPEBOOL,&insensitiveSearch},
@@ -403,7 +422,7 @@
 	{NULL,0,NULL}
 };
 
-args			kkedit_rc[]=
+args				kkedit_rc[]=
 {
 	//bools
 	{"indentcode",TYPEBOOL,&indent},
@@ -423,6 +442,7 @@
 	{"autosearchdocs",TYPEBOOL,&autoSearchDocs},
 	{"updatecheck",TYPEBOOL,&autoCheck},
 	{"useplugmenu",TYPEBOOL,&useGlobalPlugMenu},
+	{"showmenuicons",TYPEBOOL,&showMenuIcons},
 	//strings
 	{"stylename",TYPESTRING,&styleName},
 	{"higlightcolour",TYPESTRING,&highlightColour},
@@ -445,19 +465,19 @@
 	{NULL,0,NULL}
 };
 
-int				intermarg=0;
-int				flagsarg=0;
-int				inpopup=0;
-int				alwayspopup=0;
-int				clearview=0;
-char			*commandarg=NULL;
-char			*commentarg=NULL;
-char			*menuname=NULL;
-int				rootarg=0;
-int				keycode=0;
-int				usebar=0;
+int					intermarg=0;
+int					flagsarg=0;
+int					inpopup=0;
+int					alwayspopup=0;
+int					clearview=0;
+char				*commandarg=NULL;
+char				*commentarg=NULL;
+char				*menuname=NULL;
+int					rootarg=0;
+int					keycode=0;
+int					usebar=0;
 
-args			tool_vars[]=
+args				tool_vars[]=
 {
 	//strings
 	{"name",TYPESTRING,&menuname},
@@ -687,7 +707,7 @@
 functionData *getFunctionByNameOpenFiles(char *name,bool casesensitive,bool wholefname)
 {
 	ERRDATA
-	pageStruct		*page;
+	pageStruct		*page=NULL;
 	int				numpages=gtk_notebook_get_n_pages(mainNotebook);
 	char			*lineptr;
 	char			*functions=NULL;
@@ -704,7 +724,10 @@
 
 	page=getPageStructByIDFromPage(-1);
 	if(page==NULL)
-		ERRDATA return(NULL);
+		{
+			ERRDATA
+			return(NULL);
+		}
 
 	loop=gtk_notebook_get_current_page(mainNotebook);
 	startpage=loop;
@@ -713,7 +736,8 @@
 	while(whileflag==true)
 		{
 			page=getPageStructByIDFromPage(loop);
-			if(page->filePath!=NULL)
+			
+			if((page!=NULL) && (page->filePath!=NULL))
 				{
 					getRecursiveTagList(page->filePath,&functions);
 					lineptr=functions;
@@ -942,6 +966,19 @@
 	ERRDATA
 }
 
+functionData* initFunctionData(void)
+{
+	functionData	*fd=(functionData*)calloc(1,sizeof(functionData));
+
+	fd->name=NULL;
+	fd->type=NULL;
+	fd->file=NULL;
+	fd->define=NULL;
+	fd->line=-1;
+
+	return(fd);
+}
+
 void getRecursiveTagListFileName(char *filepath,void *ptr)
 {
 	ERRDATA
@@ -955,7 +992,7 @@
 			ERRDATA return;
 		}
 
-	sinkReturn=asprintf(&command,"find \"%s\" -maxdepth %i|ctags -L - --excmd=number --format=1 -f -",filepath,depth);
+	sinkReturn=asprintf(&command,"find \"%s\" -maxdepth %i|%s -L - --excmd=number --format=1 -f -",filepath,depth,ctagsPath);
 	fp=popen(command, "r");
 	while(fgets(line,1024,fp))
 		{
@@ -1002,8 +1039,7 @@
 			break;
 		}
 
-	sinkReturn=asprintf(&command,"find \"%s\" -maxdepth %i|ctags -L - -x|%s|sed 's@ \\+@ @g'",filepath,depth,sort);
-
+	sinkReturn=asprintf(&command,"find \"%s\" -maxdepth %i|%s -L - -x|%s|sed 's@ \\+@ @g'",filepath,depth,ctagsPath,sort);
 	fp=popen(command, "r");
 	while(fgets(line,2048,fp))
 		{
@@ -1148,8 +1184,9 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(bookMarkSubMenu),menuitem);
 	g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(removeAllBookmarks),NULL);
 
-	menuitem=gtk_menu_item_new_with_label(MENU_BM_TOGGLE_BM_LABEL);
+	menuitem=gtk_menu_item_new_with_mnemonic(MENU_BM_TOGGLE_BM_LABEL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(bookMarkSubMenu),menuitem);
+	gtk_widget_add_accelerator((GtkWidget *)menuitem,"activate",accgroup,'T',GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
 	g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(toggleBookmark),NULL);
 
 	menuitem=gtk_separator_menu_item_new();
@@ -1253,24 +1290,29 @@
 	if(_DEBUGLEVEL_ == DBG1)
 		fp=stderr;
 
-	if((_DEBUGLEVEL_ == DBG2) ||(_DEBUGLEVEL_ == DBG3) ||(_DEBUGLEVEL_ == DBG4))
+	if((_DEBUGLEVEL_ == DBG2) ||(_DEBUGLEVEL_ == DBG3) ||(_DEBUGLEVEL_ == DBG5))
 		{
 			if(logFile!=NULL)
 				fp=fopen(logFile,"a");
 			else
 				fp=stderr;
 		}
+	else if( _DEBUGLEVEL_ == DBG4 )
+		{
+			fp=fopen(logFile,"w");
+		}
 
+	
 	fprintf(fp,"Traped signal %s\n",strsignal(signal));
 	fprintf(fp,"File: %s, Function: %s, Line: %i\n",errFile,errFunc,errLine);
 	fprintf(stderr,"Traped signal %s\n",strsignal(signal));
 	fprintf(stderr,"File: %s, Function: %s, Line: %i\n",errFile,errFunc,errLine);
-	if(_DEBUGLEVEL_ == DBG2)
+	if((_DEBUGLEVEL_ == DBG2) || (_DEBUGLEVEL_ == DBG5))
 		fclose(fp);
     exit(EXIT_FAILURE);
 }
  
-GtkWidget *createNewBox(int orient,bool homog,int spacing)
+VISIBLE GtkWidget *createNewBox(int orient,bool homog,int spacing)
 {
 	GtkWidget	*retwidg=NULL;
 
@@ -1290,41 +1332,6 @@
 	return(retwidg);
 }
 
-GtkWidget *createNewImageMenuItem(const char *stock,const char *label,bool useunderline)
-{
-	GtkWidget	*item;
-
-#ifdef _USEGTK3_
-	if(useunderline==true)
-		item=gtk_menu_item_new_with_mnemonic(label);
-	else
-		item=gtk_menu_item_new_with_label(label);
-#else
-	GtkWidget	*image;
-	if(useunderline==true)
-		item=gtk_image_menu_item_new_with_mnemonic(label);
-	else
-		item=gtk_image_menu_item_new_with_label(label);
-	image=gtk_image_new_from_stock(stock,GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image((GtkImageMenuItem *)item,image);
-#endif
-
-	return(item);
-}
-
-GtkWidget *createNewStockMenuItem(const char *stock,const char *label)
-{
-	GtkWidget	*item;
-
-#ifdef _USEGTK3_
-	item=gtk_menu_item_new_with_mnemonic(label);
-#else
-	item=gtk_image_menu_item_new_from_stock(stock,NULL);
-#endif
-
-	return(item);
-}
-
 GtkToolItem *createNewToolItem(const char *stock,const char *label)
 {
 	GtkToolItem	*button;
@@ -1340,7 +1347,7 @@
 	return(button);
 }
 
-GtkWidget *createNewStockButton(const char *stock,const char *label)
+VISIBLE GtkWidget *createNewStockButton(const char *stock,const char *label)
 {
 	GtkWidget	*button;
 #ifdef _USEGTK3_
@@ -1659,4 +1666,74 @@
 }
 #endif
 
+functionData* allocFStrings(unsigned what,char *string)
+{
+	int	namelen=0;
+	int	typelen=0;
+	int	deflen=0;
+	int	totalcnt=0;
+
+	functionData *fd=NULL;
+
+	switch(what)
+		{
+			case 0:
+//function name
+				fd=initFunctionData();
+				sscanf(string,"%*s%n",&namelen);
+				fd->name=strndup(string,namelen);
+				totalcnt=namelen;
+
+//function type
+				sscanf(string,"%*s %*s%n",&typelen);
+				typelen=typelen-totalcnt-1;
+				fd->type=strndup(&string[totalcnt+1],typelen);
+
+//function line
+				sscanf(string,"%*s %*s %i",&fd->line);
+
+//function define
+				sscanf(string,"%*s %*s %*i %n%*[^\n]s",&totalcnt);
+				deflen=(int)(long)((long)strchr(string,'\n')-(long)string)-totalcnt;
+				fd->define=strndup(&string[totalcnt],deflen-1);
+				break;
+		}
+
+	return(fd);
+	
+}
+
+varStrings* allocVStrings(char *string)
+{
+	int	namelen=0;
+	int	datalen=0;
+	int	totalcnt=0;
+
+	varStrings	*vs=(varStrings*)calloc(1,sizeof(varStrings));
+	vs->name=NULL;
+	vs->data=NULL;
+
+//var name
+	sscanf(string,"%*s%n",&namelen);
+	vs->name=strndup(string,namelen);
+	totalcnt=namelen;
+
+//var type
+	sscanf(string,"%*s %n%*[^\n]s",&totalcnt);
+	datalen=(int)(long)((long)strchr(string,'\n')-(long)string)-totalcnt;
+	vs->data=strndup(&string[totalcnt],datalen);
+
+	return(vs);
+}
+
+
+
+
+
+
+
+
+
+
+
 
diff -Nru kkedit-0.3.3/KKEdit/src/globals.h kkedit-0.4.1/KKEdit/src/globals.h
--- kkedit-0.3.3/KKEdit/src/globals.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/globals.h	2016-08-26 09:41:34.000000000 +0000
@@ -30,9 +30,10 @@
 #define DBG4 4 //only catch faults
 #define DBG5 5 //trace progflow
 
-#define REPLACE			100
-#define FINDNEXT		200
-#define FINDPREV		300
+#define REPLACENEXT		100
+#define REPLACEPREV		200
+#define FINDNEXT		400
+#define FINDPREV		800
 
 #if _DEBUGLEVEL_ == DBG0
 #define ERRDATA
@@ -44,12 +45,14 @@
 #endif
 #endif
 
-#define MYEMAIL "kdhedger68713@gmail.com"
-#define MYWEBSITE "http://kkedit.darktech.org/"
+//#define MYEMAIL "keithhedger@keithhedger.darktech.org"
+//#define MYWEBSITE "http://kkedit.darktech.org"
 
 #define PLUGINSLINK "https://sites.google.com/site/kkeditlinuxtexteditor/kkedit-plugins#getplugs"
 #define NAGTIMELINK "https://dl.dropboxusercontent.com/s/xcvp8af3qp7ffxg/NAGTIME"
 
+//#define COPYRITE "Copyright \xc2\xa9 2013-2016 K.D.Hedger"
+
 #define TOOL_ASYNC 8
 #define TOOL_IGNORE_OP 0
 #define TOOL_PASTE_OP 1
@@ -79,10 +82,18 @@
 #define ABOUTICON "KKEdit" _EXECSUFFIX_
 #define NUMSHORTCUTS	15
 
+#ifndef _ENUMS_
+#define _ENUMS_
 enum {PIXBUF_COLUMN,TEXT_COLUMN,BUTTON_NUM};
 enum {NEWVBOX=0,NEWHBOX};
 enum {NOERR=0,NOOPENFILE,NOSAVEFILE};
 enum {NAVLAST=0,NAVNEXT};
+enum {FUNCDATA=0};
+#endif
+
+
+//extern const char	*moreapps[];
+extern const char	*authorskk[];
 
 struct toolStruct
 {
@@ -111,18 +122,25 @@
 	int					intab;
 };
 
+struct varStrings
+{
+	char				*name;
+	char				*data;
+};
+
 extern int				errno;
 extern int				errLine;
 extern const char		*errFile;
 extern const char		*errFunc;
 extern char				*logFile;
 
+//app
 extern GApplication	*mainApp;
 extern bool				autoSeleced;
 extern bool				fromGOpen;
 extern char				*prefsFolder;
+extern GtkRecentManager	*recentMan;
 
-//app
 //main window
 extern GtkWidget		*mainWindow;
 extern GtkWidget		*menuBar;
@@ -132,6 +150,8 @@
 
 //file menu
 extern GtkWidget		*fileMenu;
+extern GtkWidget		*menuItemNew;
+extern GtkWidget		*menuItemOpen;
 extern GtkWidget		*saveMenu;
 extern GtkWidget		*saveAsMenu;
 extern GtkWidget		*saveAllMenu;
@@ -191,7 +211,6 @@
 extern char				*toolBarLayout;
 extern GtkWidget		*toolBarBox;
 
-extern GtkWidget		*menuItemOpen;
 
 extern GtkWidget		*lineNumberWidget;
 extern GtkWidget		*findApiWidget;
@@ -254,6 +273,7 @@
 extern GtkWidget		*rootCommandBox;
 extern GtkWidget		*defaultBrowserBox;
 extern char				*browserCommand;
+extern bool				showMenuIcons;
 
 #ifdef _USEGTK3_
 extern GtkStyleProvider	*provider;
@@ -371,15 +391,16 @@
 extern int				listFunction;
 extern GtkWidget		*funcListDrop;
 
-extern char			*functionSearchText;
-extern char			*thePage;
-extern char			*htmlFile;
-extern char			*htmlURI;
-extern char			*tmpFolderName;
+extern char				*functionSearchText;
+extern char				*thePage;
+extern char				*htmlFile;
+extern char				*htmlURI;
+extern char				*tmpFolderName;
 
 //runtime deps
 extern int				gotManEditor;
 extern int				gotDoxygen;
+extern char				*ctagsPath;
 
 extern GtkSourceStyleSchemeManager	*schemeManager;
 extern GtkSourceStyleScheme		*styleScheme;
@@ -443,7 +464,6 @@
 extern StringSlice		*globalSlice;
 extern bool				doGoogleSearch;
 
-
 void plugRunFunction(gpointer data,gpointer funcname);
 
 void getMimeType(char *filepath,void *ptr);
@@ -469,7 +489,6 @@
 void freeAndNull(char** ptr);
 
 GtkWidget *createNewBox(int orient,bool homog,int spacing);
-GtkWidget *createNewImageMenuItem(const char *stock,const char *label,bool useunderline);
 GtkToolItem *createNewToolItem(const char *stock,const char *label);
 GtkWidget *createNewStockButton(const char *stock,const char *label);
 GdkPixbuf *createNewIcon(const char *stock,GtkWidget *widg);
@@ -487,6 +506,10 @@
 void applyCSS (GtkWidget *widget, GtkStyleProvider *widgprovider);
 #endif
 
+functionData* allocFStrings(unsigned what,char *string);
+functionData* initFunctionData(void);
+varStrings* allocVStrings(char *string);
+
 #endif
 
 
diff -Nru kkedit-0.3.3/KKEdit/src/guis.cpp kkedit-0.4.1/KKEdit/src/guis.cpp
--- kkedit-0.3.3/KKEdit/src/guis.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/guis.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -39,6 +39,306 @@
 GtkWidget	*prefsWidgets[MAXPREFSWIDGETS];
 GObject	*prefsIntWidgets[MAXPREFSINTWIDGETS];
 
+menuDataStruct	menuData[]=
+	{
+//file
+		{MENU_NEW_LABEL,GTK_STOCK_NEW,GDK_KEY_N,GDK_CONTROL_MASK,(void*)&newFile,NEWMENUNAME,NULL},
+		{MENU_OPEN_LABEL,GTK_STOCK_OPEN,GDK_KEY_O,GDK_CONTROL_MASK,(void*)&doOpenFile,OPENMENUNAME,NULL},
+		{MENU_OPEN_AS_HEXDUMP_LABEL,GTK_STOCK_OPEN,0,0,(void*)&openAsHexDump,HEXDUMPMENUNAME,NULL},
+		{MENU_NEW_ADMIN_LABEL,ROOTEDITPNG,0,0,(void*)&newEditor,NEWADMINMENUNAME,(gpointer)NEWROOTEDITOR},
+		{MENU_NEW_EDITOR_LABEL,MENUKKEDITPNG,0,0,(void*)&newEditor,NEWEDITORMENUNAME,(gpointer)NEWEDITOR},
+		{MENU_MANPAGE_EDITOR_LABEL,MANPAGEEDITPNG,0,0,(void*)&newEditor,MANEDITORMENUNAME,(gpointer)NEWMANPAGEEDITOR},
+		{MENU_BUILD_DOCS_LABEL,GTK_STOCK_COPY,0,0,(void*)&doDoxy,DOXYBUILDMENUNAME,(gpointer)1},
+		{MENU_RECENT_FILES_LABEL,NULL,0,0,NULL,RECENTMENUNAME,NULL},
+		{MENU_SAVE_LABEL,GTK_STOCK_SAVE,GDK_KEY_S,GDK_CONTROL_MASK,(void*)&saveFile,SAVEMENUNAME,NULL},
+		{MENU_SAVE_AS_LABEL,GTK_STOCK_SAVE_AS,GDK_KEY_S,GDK_CONTROL_MASK+GDK_SHIFT_MASK,(void*)&saveFile,SAVEASMENUNAME,(void*)1},
+		{MENU_SAVE_ALL_LABEL,GTK_STOCK_SAVE,0,0,(void*)&doSaveAll,SAVEALLMENUNAME,NULL},
+		{MENU_SAVE_SESSION_LABEL,GTK_STOCK_SAVE,0,0,(void*)&saveSession,SAVESESSIONMENUNAME,NULL},
+		{MENU_RESTORE_SESSION_LABEL,GTK_STOCK_OPEN,0,0,(void*)&restoreSession,RESTORESESSIONMENUNAME,NULL},
+		{MENU_PRINT_LABEL,GTK_STOCK_PRINT,GDK_KEY_P,GDK_CONTROL_MASK,(void*)&printFile,PRINTMENUNAME,NULL},
+		{MENU_CLOSE_LABEL,GTK_STOCK_CLOSE,GDK_KEY_W,GDK_CONTROL_MASK,(void*)&closeTab,CLOSEMENUNAME,NULL},
+		{MENU_CLOSE_ALL_LABEL,GTK_STOCK_CLOSE,0,0,(void*)&closeAllTabs,CLOSEALLMENUNAME,NULL},
+		{MENU_REVERT_TO_SAVED_LABEL,GTK_STOCK_REVERT_TO_SAVED,0,0,(void*)&reloadFile,REVERTMENUNAME,NULL},
+		{MENU_QUIT_LABEL,GTK_STOCK_QUIT,GDK_KEY_Q,GDK_CONTROL_MASK,(void*)&doShutdown,QUITMENUNAME,NULL},
+//edit
+		{MENU_UNDO_LABEL,GTK_STOCK_UNDO,GDK_KEY_Z,GDK_CONTROL_MASK,(void*)&undo,UNDOMENUNAME,NULL},
+		{MENU_REDO_LABEL,GTK_STOCK_REDO,GDK_KEY_Z,GDK_CONTROL_MASK+GDK_SHIFT_MASK,(void*)&redo,REDOMENUNAME,NULL},
+		{MENU_UNDO_ALL_LABEL,GTK_STOCK_UNDO,0,0,(void*)&unRedoAll,UNDOALLMENUNAME,(void*)0},
+		{MENU_REDO_ALL_LABEL,GTK_STOCK_REDO,0,0,(void*)&unRedoAll,REDOALLMENUNAME,(void*)1},
+		{MENU_CUT_LABEL,GTK_STOCK_CUT,GDK_KEY_X,GDK_CONTROL_MASK,(void*)&cutToClip,CUTMENUNAME,NULL},
+		{MENU_COPY_LABEL,GTK_STOCK_COPY,GDK_KEY_C,GDK_CONTROL_MASK,(void*)&copyToClip,COPYMENUNAME,NULL},
+		{MENU_PASTE_LABEL,GTK_STOCK_PASTE,GDK_KEY_V,GDK_CONTROL_MASK,(void*)&pasteFromClip,PASTEMENUNAME,NULL},
+//find
+		{MENU_FIND_LABEL,GTK_STOCK_FIND,GDK_KEY_F,GDK_CONTROL_MASK,(void*)&find,FINDMENUNAME,NULL},
+		{MENU_FIND_NEXT_LABEL,GTK_STOCK_GO_FORWARD,GDK_KEY_G,GDK_CONTROL_MASK,(void*)&findNext,FINDNEXTMENUNAME,NULL},
+//tabs
+		{MENU_SORT_TABS_LABEL,GTK_STOCK_SORT_ASCENDING,0,0,(void*)&sortTabs,SORTTABSMENUNAME,NULL},
+		{MENU_SHOW_ALL_TABS_LABEL,GTK_STOCK_ADD,0,0,(void*)&showAllTabs,SHOWTABSMENUNAME,NULL},
+		{MENU_SELECT_TAB_LABEL,GTK_STOCK_EDIT,0,0,NULL,SELECTTABMENUNAME,NULL},
+//prefs
+		{MENU_PREFERENCES_LABEL,GTK_STOCK_PREFERENCES,0,0,(void*)&doPrefs,PREFSMENUNAME,NULL},
+		{MENU_PLUG_PREFS_LABEL,GTK_STOCK_PREFERENCES,0,0,(void*)&doPlugPrefs,PLUGPREFSMENUNAME,NULL},
+//view
+		{MENU_SHOW_DOCS_LABEL,NULL,0,0,(void*)&doDoxy,SHOWDOCSMENUNAME,NULL},
+		{MENU_SHOW_BM_BAR_LABEL,NULL,0,0,(void*)&toggleBookMarkBar,SHOWDOCSMENUNAME,NULL},
+		{MENU_HIDE_BM_BAR_LABEL,NULL,0,0,(void*)&toggleBookMarkBar,SHOWDOCSMENUNAME,NULL},
+		{MENU_HIDE_TOOLBAR_LABEL,NULL,0,0,(void*)&toggleToolBar,SHOWTOOLBARMENUNAME,NULL},
+		{MENU_SHOW_TOOLBAR_LABEL,NULL,0,0,(void*)&toggleToolBar,SHOWTOOLBARMENUNAME,NULL},
+		{MENU_SHOW_TOOL_OP_LABEL,NULL,0,0,(void*)&toggleToolOutput,SHOWTOOLOUTMENUNAME,NULL},
+		{MENU_SHOW_TOOL_OP_LABEL,NULL,0,0,(void*)&toggleToolOutput,SHOWTOOLOUTMENUNAME,NULL},
+		{MENU_HIDE_STATUS_LABEL,NULL,0,0,(void*)&toggleStatusBar,SHOWSTATUSMENUNAME,NULL},
+		{MENU_SHOW_STATUS_LABEL,NULL,0,0,(void*)&toggleStatusBar,SHOWSTATUSMENUNAME,NULL},
+#ifdef _BUILDDOCVIEWER_
+		{MENU_SHOW_DOCVIEWER_LABEL,NULL,0,0,(void*)&toggleDocviewer,SHOWDOCVIEWERMENUNAME,NULL},
+#else
+		{"",NULL,0,0,NULL,NULL,NULL},
+#endif
+
+//toggles
+		{MENU_SHOW_LINE_NUMBERS_LABEL,NULL,0,0,(void*)&toggleLineNumbers,VIEWSHOWLINENUMERS,NULL},
+		{MENU_WRAP_LINES_LABEL,NULL,0,0,(void*)&toggleWrapLines,VIEWWRAPLINES,NULL},
+		{MENU_HIGHLIGHT_LINE_LABEL,NULL,0,0,(void*)&toggleHighlightCurrent,VIEWHIGHLIGHT,NULL},
+		{MENU_NO_SYNTAX_LABEL,NULL,0,0,(void*)&toggleSyntax,VIEWNOSYNTAX,NULL},
+		{MENU_SHOW_SPACES_LABEL,NULL,0,0,(void*)&toggleWhitespace,VIEWWHITESPACE,NULL},
+		{MENU_SHOW_AUTO_COMPLETE,NULL,0,0,(void*)&toggleAutoComplete,VIEWAUTOCOMPLETE,NULL},
+//nav
+		{MENU_GOTO_DEFINE_LABEL,GTK_STOCK_EXECUTE,0,0,(void*)&goToDefinition,GOTODEFMENUNAME,NULL},
+		{MENU_OPEN_INCLUDE_LABEL,GTK_STOCK_OPEN,GDK_KEY_I,GDK_CONTROL_MASK,(void*)&findFile,OPENINCLUDEMENUNAME,NULL},
+		{MENU_GOTO_LINE_LABEL,GTK_STOCK_GO_DOWN,0,0,(void*)&jumpToLine,GOTOLINEMENUNAME,NULL},
+		{MENU_FIND_DEFINE_LABEL,GTK_STOCK_FIND,0,0,(void*)&functionSearch,SEARCHFORDEFMENUNAME,NULL},
+		{MENU_FIND_IN_GTKAPI_LABEL,GTK_STOCK_FIND,0,0,(void*)&searchGtkDocs,SEARCHGTKMENUNAME,NULL},
+		{MENU_FIND_IN_QTAPI_LABEL,GTK_STOCK_FIND,0,0,(void*)&searchQT5Docs,SEARCHQT5MENUNAME,NULL},
+		{MENU_FIND_IN_DOCS_LABEL,GTK_STOCK_FIND,0,0,(void*)&doxyDocs,SEARCHDOXYMENUNAME,NULL},
+		{MENU_GO_BACK_LABEL,GTK_STOCK_GO_BACK,0,0,(void*)&navigateHistory,GOBACKMENUNAME,(void*)NAVLAST},
+		{MENU_GO_FORWARD_LABEL,GTK_STOCK_GO_FORWARD,0,0,(void*)&navigateHistory,GOFORWARDMENUNAME,(void*)NAVNEXT},
+//functions
+//bookmarks
+//tools
+		{MENU_EXT_TOOLS_LABEL,GTK_STOCK_EDIT,0,0,(void*)&doMakeTool,EXTOOLSMENUNAME,NULL},
+//help
+		{MENU_ABOUT_LABEL,GTK_STOCK_ABOUT,0,0,(void*)&doAbout,ABOUTMENUNAME,NULL},
+		{MENU_HELP_LABEL,GTK_STOCK_HELP,0,0,(void*)&openHelp,HELPLOCALMENUNAME,(void*)0},
+		{MENU_HELP_ONLINE_LABEL,GTK_STOCK_HELP,0,0,(void*)&openHelp,HELPONLINEMENUNAME,(void*)1},
+		{MENU_GET_PLUGS_LABEL,PLUGMENUPNG,0,0,(void*)&getPlugins,GETPLUGSMENUNAME,NULL},
+
+//context menus
+		{CUSTOM_WORD_CONTEXT_LABEL,GTK_STOCK_EDIT,0,0,(void*)&addtoCustomWordList,NULL,NULL},
+//other
+		{"",NULL,0,0,NULL,NULL,NULL},
+#ifdef _ASPELL_
+		{CHECK_SPELLING_CONTEXT_LABEL,GTK_STOCK_SPELL_CHECK,0,0,(void*)&checkWord,NULL,NULL},
+#else
+		{"",NULL,0,0,NULL,NULL,NULL},
+#endif
+
+//tab popups
+		{COPY_FOLDER_PATH_LABEL,GTK_STOCK_COPY,0,0,(void*)&doTabMenu,NULL,NULL},
+		{COPY_FILE_PATH_LABEL,GTK_STOCK_COPY,0,0,(void*)&doTabMenu,NULL,NULL},
+		{COPY_FILE_NAME_LABEL,GTK_STOCK_COPY,0,0,(void*)&doTabMenu,NULL,NULL},
+#ifdef _ASPELL_
+		{SPELL_CHECK_LABEL,GTK_STOCK_SPELL_CHECK,0,0,(void*)&doSpellCheckDoc,NULL,NULL},
+#else
+		{NULL,NULL,0,0,NULL,NULL,NULL},
+#endif
+		{SOURCE_HILITE_LABEL,GTK_STOCK_PREFERENCES,0,0,NULL,NULL,NULL},
+		{MENU_HIDE_TAB_LABEL,GTK_STOCK_REMOVE,0,0,(void*)&hideTab,NULL,NULL},
+
+		{NULL,NULL,0,0,NULL,NULL,NULL}
+	};
+
+char	keyStrBuffer[32];
+void setHotKeyString(unsigned menunumber)
+{
+	const char	*ckeystr="";
+	const char	*skeystr="";
+
+	if(menuData[menunumber].key!=0)
+		{
+			if(GDK_CONTROL_MASK & menuData[menunumber].mod)
+				ckeystr="Ctrl+";
+			if(GDK_SHIFT_MASK & menuData[menunumber].mod)
+				skeystr="Shift+";
+
+			sprintf(keyStrBuffer,"%s%s%s",skeystr,ckeystr,gdk_keyval_name(menuData[menunumber].key));
+		}
+	else
+		keyStrBuffer[0]=0;
+}
+
+GtkWidget* newCheckMenuItem(unsigned menunumber,GtkWidget *parent,bool initial)
+{
+	GtkWidget	*menu;
+
+	menu=gtk_check_menu_item_new_with_label(gettext(menuData[menunumber].menuLabel));
+	gtk_check_menu_item_set_active((GtkCheckMenuItem*)menu,initial);
+
+	if(menuData[menunumber].key>0)
+		gtk_widget_add_accelerator((GtkWidget *)menu,"activate",accgroup,menuData[menunumber].key,(GdkModifierType)menuData[menunumber].mod,GTK_ACCEL_VISIBLE);
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(parent),menu);
+	g_signal_connect(G_OBJECT(menu),"activate",G_CALLBACK(menuData[menunumber].cb),menuData[menunumber].userData);
+	gtk_widget_set_name(menu,menuData[menunumber].widgetName);
+
+	return(menu);
+}
+
+GtkWidget* newMenuItem(unsigned menunumber,GtkWidget *parent)
+{
+	GtkWidget	*menu;
+#ifdef _USEGTK3_
+	char		*menulabel;
+	GtkWidget	*menuhbox;
+	GtkWidget	*pad;
+	GtkWidget	*image;
+	GtkWidget	*ritelabel;
+	char		*labelwithspace;
+
+	menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel));
+	if((showMenuIcons==true) && (menuData[menunumber].stockID!=NULL))
+		{
+			setHotKeyString(menunumber);
+			gtk_widget_destroy(gtk_bin_get_child(GTK_BIN(menu)));
+			menuhbox=createNewBox(NEWHBOX,false,0);
+			pad=createNewBox(NEWHBOX,false,0);
+
+			image=gtk_image_new_from_icon_name(menuData[menunumber].stockID,GTK_ICON_SIZE_MENU);
+			gtk_box_pack_start((GtkBox*)menuhbox,image,false,false,0);
+
+			//gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0);
+			asprintf(&labelwithspace," %s",gettext(menuData[menunumber].menuLabel));
+//			gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0);
+			gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(labelwithspace),false,false,0);
+			free(labelwithspace);
+			gtk_box_pack_start(GTK_BOX(menuhbox),pad,true,true,0);
+
+			ritelabel=gtk_label_new(keyStrBuffer);
+			gtk_widget_set_sensitive(ritelabel,false);
+			gtk_box_pack_start(GTK_BOX(menuhbox),ritelabel,false,false,8);
+
+			gtk_container_add(GTK_CONTAINER(menu),menuhbox);
+		}
+#else
+	if(menuData[menunumber].stockID!=NULL)
+		menu=gtk_image_menu_item_new_from_stock(menuData[menunumber].stockID,NULL);
+	else
+		menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel));
+#endif
+	if(menuData[menunumber].key>0)
+		gtk_widget_add_accelerator((GtkWidget *)menu,"activate",accgroup,menuData[menunumber].key,(GdkModifierType)menuData[menunumber].mod,GTK_ACCEL_VISIBLE);
+
+	if(parent!=NULL)
+		gtk_menu_shell_append(GTK_MENU_SHELL(parent),menu);
+	g_signal_connect(G_OBJECT(menu),"activate",G_CALLBACK(menuData[menunumber].cb),menuData[menunumber].userData);
+	gtk_widget_set_name(menu,menuData[menunumber].widgetName);
+
+	return(menu);
+}
+
+GtkWidget* newImageMenuItem(unsigned menunumber,GtkWidget *parent)
+{
+	GtkWidget	*menu;
+#ifdef _USEGTK3_
+	char		*menulabel;
+	GtkWidget	*menuhbox;
+	GtkWidget	*pad;
+	GtkWidget	*image;
+	GtkWidget	*ritelabel;
+	char		*labelwithspace;
+
+	menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel));
+	if(showMenuIcons==true)
+		{
+			setHotKeyString(menunumber);
+			gtk_widget_destroy(gtk_bin_get_child(GTK_BIN(menu)));
+			menuhbox=createNewBox(NEWHBOX,false,0);
+			pad=createNewBox(NEWHBOX,false,0);
+
+			image=gtk_image_new_from_icon_name(menuData[menunumber].stockID,GTK_ICON_SIZE_MENU);
+			gtk_box_pack_start((GtkBox*)menuhbox,image,false,false,0);
+
+			//gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0);
+			asprintf(&labelwithspace," %s",gettext(menuData[menunumber].menuLabel));
+			//gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0);
+			gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(labelwithspace),false,false,0);
+			free(labelwithspace);
+			gtk_box_pack_start(GTK_BOX(menuhbox),pad,true,true,0);
+
+			ritelabel=gtk_label_new(keyStrBuffer);
+			gtk_widget_set_sensitive(ritelabel,false);
+			gtk_box_pack_start(GTK_BOX(menuhbox),ritelabel,false,false,8);
+
+			gtk_container_add(GTK_CONTAINER(menu),menuhbox);
+		}
+#else
+	GtkWidget	*image;
+	menu=gtk_image_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel));
+	image=gtk_image_new_from_stock(menuData[menunumber].stockID,GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image((GtkImageMenuItem *)menu,image);
+#endif
+	if(menuData[menunumber].key>0)
+		gtk_widget_add_accelerator((GtkWidget *)menu,"activate",accgroup,menuData[menunumber].key,(GdkModifierType)menuData[menunumber].mod,GTK_ACCEL_VISIBLE);
+
+	if(parent!=NULL)
+		gtk_menu_shell_append(GTK_MENU_SHELL(parent),menu);
+	if(menuData[menunumber].cb!=NULL)
+		g_signal_connect(G_OBJECT(menu),"activate",G_CALLBACK(menuData[menunumber].cb),menuData[menunumber].userData);
+	if(menuData[menunumber].widgetName!=NULL)
+		gtk_widget_set_name(menu,menuData[menunumber].widgetName);
+
+	return(menu);
+}
+
+GtkWidget* newPixmapMenuItem(unsigned menunumber,GtkWidget *parent)
+{
+	GtkWidget	*menu;
+#ifdef _USEGTK3_
+	char		*menulabel;
+	GtkWidget	*menuhbox;
+	GtkWidget	*pad;
+	GtkWidget	*image;
+	GtkWidget	*ritelabel;
+	char		*labelwithspace;
+
+	menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel));
+	if(showMenuIcons==true)
+		{
+			setHotKeyString(menunumber);
+			gtk_widget_destroy(gtk_bin_get_child(GTK_BIN(menu)));
+			menuhbox=createNewBox(NEWHBOX,false,0);
+			pad=createNewBox(NEWHBOX,false,0);
+
+			image=gtk_image_new_from_file(menuData[menunumber].stockID);
+			gtk_box_pack_start((GtkBox*)menuhbox,image,false,false,0);
+
+			//gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0);
+			asprintf(&labelwithspace," %s",gettext(menuData[menunumber].menuLabel));
+//			gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0);
+			gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(labelwithspace),false,false,0);
+			free(labelwithspace);
+			gtk_box_pack_start(GTK_BOX(menuhbox),pad,true,true,0);
+
+			ritelabel=gtk_label_new(keyStrBuffer);
+			gtk_widget_set_sensitive(ritelabel,false);
+			gtk_box_pack_start(GTK_BOX(menuhbox),ritelabel,false,false,8);
+
+			gtk_container_add(GTK_CONTAINER(menu),menuhbox);
+		}
+#else
+	GtkWidget	*image;
+	menu=gtk_image_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel));
+	image=gtk_image_new_from_file(menuData[menunumber].stockID);
+	gtk_image_menu_item_set_image((GtkImageMenuItem *)menu,image);
+#endif
+	if(menuData[menunumber].key>0)
+		gtk_widget_add_accelerator((GtkWidget *)menu,"activate",accgroup,menuData[menunumber].key,(GdkModifierType)menuData[menunumber].mod,GTK_ACCEL_VISIBLE);
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(parent),menu);
+	g_signal_connect(G_OBJECT(menu),"activate",G_CALLBACK(menuData[menunumber].cb),menuData[menunumber].userData);
+	gtk_widget_set_name(menu,menuData[menunumber].widgetName);
+
+	return(menu);
+}
+
 void findTool(toolStruct *data,char *toolname)
 {
 	ERRDATA
@@ -530,23 +830,23 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(toolsMenu),menu);
 
 //addtool
-	menuitem=createNewImageMenuItem(GTK_STOCK_EDIT,MENU_EXT_TOOLS_LABEL,true);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-	g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(doMakeTool),NULL);
+	menuitem=newImageMenuItem(MENUTOOLS,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 	ptr=toolsList;
+	menuData[MENUBLANK].cb=(void*)externalTool;
+	menuData[MENUBLANK].stockID=NULL;
+	menuData[MENUBLANK].key=0;
 	while(ptr!=NULL)
 		{
 			if(((toolStruct*)ptr->data)->global==true)
 				{
 					gotglobal=true;
-					menuitem=createNewImageMenuItem(NULL,((toolStruct*)ptr->data)->menuName,false);
-					gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(externalTool),(void*)ptr->data);
-
+					menuData[MENUBLANK].menuLabel=((toolStruct*)ptr->data)->menuName;
+					menuData[MENUBLANK].userData=(gpointer)ptr->data;
+					menuitem=newMenuItem(MENUBLANK,menu);
 					if( (((toolStruct*)ptr->data)->keyCode!=GDK_KEY_VoidSymbol) && (((toolStruct*)ptr->data)->keyCode!=0) )
 						{
 							keyflags=0;
@@ -568,14 +868,18 @@
 		}
 
 	ptr=toolsList;
+	menuData[MENUBLANK].cb=(void*)externalTool;
+	menuData[MENUBLANK].stockID=NULL;
+	menuData[MENUBLANK].key=0;
 	while(ptr!=NULL)
 		{
 			if(((toolStruct*)ptr->data)->global==false)
 				{
-					menuitem=createNewImageMenuItem(NULL,((toolStruct*)ptr->data)->menuName,false);
-					gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(externalTool),(void*)ptr->data);
-
+					menuData[MENUBLANK].menuLabel=((toolStruct*)ptr->data)->menuName;
+					menuData[MENUBLANK].userData=(gpointer)ptr->data;
+					menuitem=newMenuItem(MENUBLANK,menu);
+//TODO//
+//needs tidying
 					if( (((toolStruct*)ptr->data)->keyCode!=GDK_KEY_VoidSymbol) && (((toolStruct*)ptr->data)->keyCode!=0) )
 						{
 							keyflags=0;
@@ -938,56 +1242,6 @@
 	ERRDATA
 }
 
-GtkWidget	*makeMenuItem(const char *stocklabel,GtkWidget *parent,void *function,char hotkey,const char *name,int setimage,const char *menulabel,void *userdata,bool toggle)
-{
-	ERRDATA
-	GtkWidget	*widg;
-#ifndef _USEGTK3_
-	GtkWidget	*image;
-#endif
-
-	switch(setimage)
-		{
-			case STOCKMENU:
-				widg=createNewStockMenuItem(stocklabel,menulabel);
-				break;
-
-			case IMAGEMENU:
-				widg=createNewImageMenuItem(stocklabel,menulabel,true);
-				break;
-
-			case PIXMAPMENU:
-#ifdef _USEGTK3_
-				widg=gtk_menu_item_new_with_mnemonic(menulabel);
-#else
-				widg=gtk_image_menu_item_new_with_mnemonic(menulabel);
-				image=gtk_image_new_from_file(stocklabel);
-				gtk_image_menu_item_set_image((GtkImageMenuItem *)widg,image);
-#endif
-				break;
-
-			case CHECKMENU:
-				widg=gtk_check_menu_item_new_with_label(stocklabel);
-				gtk_check_menu_item_set_active((GtkCheckMenuItem*)widg,toggle);
-				break;
-
-			default:
-				widg=createNewImageMenuItem(NULL,stocklabel,true);
-		}
-
-	gtk_menu_shell_append(GTK_MENU_SHELL(parent),widg);
-	g_signal_connect(G_OBJECT(widg),"activate",G_CALLBACK(function),userdata);
-
-	if(hotkey>0)
-		gtk_widget_add_accelerator((GtkWidget *)widg,"activate",accgroup,hotkey,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
-
-	if(hotkey<0)
-		gtk_widget_add_accelerator((GtkWidget *)widg,"activate",accgroup,hotkey*-1,(GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK),GTK_ACCEL_VISIBLE);
-
-	gtk_widget_set_name(widg,name);
-	ERRDATA return(widg);
-}
-
 void makePrefsDial(int widgnum,const char *label,const char *name,int value,int minvalue,int maxvalue)
 {
 	ERRDATA
@@ -1129,6 +1383,16 @@
 	makePrefBox(true,true);
 	makePrefsCheck(AUTOSEARCH,PREFS_AUTO_SEARCH_LABEL,"autosearchdocs",autoSearchDocs,true,true);
 
+//show menu icons
+	makePrefBox(true,true);
+	makePrefsCheck(SHOWMENUICONS,PREFS_SHOW_MENU_ICONS_LABEL,"showmenuicons",showMenuIcons,true,true);
+#ifdef _USEGTK3_
+	gtk_widget_set_sensitive(prefsWidgets[SHOWMENUICONS],true);
+#else
+	gtk_toggle_button_set_active((GtkToggleButton*)prefsWidgets[SHOWMENUICONS],false);
+	gtk_widget_set_sensitive(prefsWidgets[SHOWMENUICONS],false);
+#endif
+
 	gtk_notebook_append_page(prefsnotebook,pagevbox,gtk_label_new(PREFS_GEN_APPEARANCE_LABEL));
 	gtk_box_pack_start(GTK_BOX(vbox),(GtkWidget*)prefsnotebook,true,true,0);
 
@@ -1316,6 +1580,8 @@
 	ERRDATA
 }
 
+//TODO//
+//not working properly
 void addRecentToMenu(GtkRecentChooser *chooser,GtkWidget *menu)
 {
 	ERRDATA
@@ -1338,90 +1604,28 @@
 
 			menuname=gtk_recent_info_get_display_name(info);
 			uri=gtk_recent_info_get_uri(info);
+			menuData[MENUBLANK].cb=(void*)recentFileMenu;
+			menuData[MENUBLANK].stockID=NULL;
+			menuData[MENUBLANK].key=0;
 			if(uri!=NULL)
 				{
 					filename=g_filename_from_uri((const gchar*)uri,NULL,NULL);
-					menuitem=createNewImageMenuItem(NULL,menuname,false);
-					gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(recentFileMenu),(void*)filename);
+					menuData[MENUBLANK].userData=(void*)filename;
+					menuData[MENUBLANK].menuLabel=menuname;
+					menuitem=newMenuItem(MENUBLANK,menu);
 				}
 		}
 	ERRDATA
 }
 
-void buildMainGui(void)
+void buildMenus(void)
 {
-	ERRDATA
 	GtkWidget		*menuitem;
 	GtkWidget		*menu;
 	GtkWidget		*menurecent;
 	GtkWidget		*plugsubmenu=NULL;
 
-	mainWindowVBox=createNewBox(NEWVBOX,false,0);
-	mainTopUserVBox=createNewBox(NEWVBOX,false,0);
-	mainLeftUserVBox=createNewBox(NEWVBOX,false,0);
-	mainNotebookVBox=createNewBox(NEWVBOX,false,0);
-	mainRightUserVBox=createNewBox(NEWVBOX,false,0);
-	mainBottomUserVBox=createNewBox(NEWVBOX,false,0);
-
-	mainWindowHBox=createNewBox(NEWHBOX,false,0);
-
-#ifdef _USEGTK3_
-	mainWindowHPane=gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
-	secondWindowHPane=gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
-#else
-	mainWindowHPane=gtk_hpaned_new();
-	secondWindowHPane=gtk_hpaned_new();
-#endif
-
-	mainWindow=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size((GtkWindow*)mainWindow,windowWidth,windowHeight);
-	if(windowX!=-1 && windowY!=-1)
-		gtk_window_move((GtkWindow *)mainWindow,windowX,windowY);
-
-//TODO//?
-	g_signal_connect(G_OBJECT(mainWindow),"delete-event",G_CALLBACK(gtk_widget_hide_on_delete),NULL);
-	//g_signal_connect_after(G_OBJECT(mainWindow),"delete-event",G_CALLBACK(doShutdown),NULL);
-	g_signal_connect_after(G_OBJECT(mainWindow),"unmap",G_CALLBACK(doShutdown),NULL);
-	g_signal_connect(G_OBJECT(mainWindow),"key-press-event",G_CALLBACK(keyShortCut),NULL);
-
-	accgroup=gtk_accel_group_new();
-	gtk_window_add_accel_group((GtkWindow*)mainWindow,accgroup);
-
-	mainNotebook=(GtkNotebook*)gtk_notebook_new();
-	gtk_notebook_set_scrollable(mainNotebook,true);
-	g_signal_connect(G_OBJECT(mainNotebook),"switch-page",G_CALLBACK(switchPage),NULL);
-	g_signal_connect(G_OBJECT(mainNotebook),"page-reordered",G_CALLBACK(switchPage),NULL);
-	g_signal_connect(G_OBJECT(mainNotebook),"page-removed",G_CALLBACK(realCloseTab),NULL);
-
-	globalHistory=new HistoryClass(mainNotebook,maxJumpHistory);
-
-#ifdef _USEGTK3_
-	char	*notebookcss=NULL;
-	GtkStyleProvider	*nbprovider;
-
-	nbprovider=GTK_STYLE_PROVIDER(gtk_css_provider_new());
-	sinkReturn=asprintf(&notebookcss,"GtkNotebook {\n \
-    padding: 0px;\n \
-}\n");
-
-	gtk_css_provider_load_from_data((GtkCssProvider*)nbprovider,notebookcss,-1,NULL);
-	applyCSS((GtkWidget*)mainNotebook,nbprovider);
-	gtk_style_context_reset_widgets(gdk_screen_get_default());
-	debugFree(&notebookcss);
-#endif
-
 	menuBar=gtk_menu_bar_new();
-	toolBarBox=createNewBox(NEWHBOX,true,0);
-	toolBar=(GtkToolbar*)gtk_toolbar_new();
-
-//dnd
-	gtk_drag_dest_set(mainWindowVBox,GTK_DEST_DEFAULT_ALL,NULL,0,GDK_ACTION_COPY);
-	gtk_drag_dest_add_uri_targets(mainWindowVBox);
-	g_signal_connect(G_OBJECT(mainWindowVBox),"drag_data_received",G_CALLBACK(dropUri),NULL);
-
-	setUpToolBar();
-	gtk_box_pack_start(GTK_BOX(toolBarBox),(GtkWidget*)toolBar,true,true,0);
 
 //menus
 //file menu
@@ -1429,126 +1633,124 @@
 	gtk_menu_item_set_use_underline((GtkMenuItem*)fileMenu,true);
 	menu=gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(fileMenu),menu);
-
 //new
-	menuitem=makeMenuItem(GTK_STOCK_NEW,menu,(void*)newFile,'N',NEWMENUNAME,STOCKMENU,MENU_NEW_LABEL,NULL,false);
+	menuItemNew=newMenuItem(MENUNEW,menu);
 //open
-	menuItemOpen=makeMenuItem(GTK_STOCK_OPEN,menu,(void*)doOpenFile,'O',OPENMENUNAME,STOCKMENU,MENU_OPEN_LABEL,NULL,false);
+	menuItemOpen=newMenuItem(MENUOPEN,menu);
 //open as hexdump
-	menuitem=makeMenuItem(GTK_STOCK_OPEN,menu,(void*)openAsHexDump,0,HEXDUMPMENUNAME,IMAGEMENU,MENU_OPEN_AS_HEXDUMP_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUOPENHEX,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //extras
-	menuitem=makeMenuItem(ROOTEDITPNG,menu,(void*)newEditor,0,NEWADMINMENUNAME,PIXMAPMENU,MENU_NEW_ADMIN_LABEL,(void*)NEWROOTEDITOR,false);
-	menuitem=makeMenuItem(MENUKKEDITPNG,menu,(void*)newEditor,0,NEWEDITORMENUNAME,PIXMAPMENU, MENU_NEW_EDITOR_LABEL,(void*)NEWEDITOR,false);
+	menuitem=newPixmapMenuItem(MENUNEWADMIN,menu);
+	menuitem=newPixmapMenuItem(MENUNEWED,menu);
 	if(gotManEditor==0)
-		menuitem=makeMenuItem(MANPAGEEDITPNG,menu,(void*)newEditor,0,MANEDITORMENUNAME,PIXMAPMENU,MENU_MANPAGE_EDITOR_LABEL,(void*)NEWMANPAGEEDITOR,false);
+		menuitem=newPixmapMenuItem(MENUMANED,menu);
 
 //doxy
 	if(gotDoxygen==0)
-		menuitem=makeMenuItem(GTK_STOCK_COPY,menu,(void*)doDoxy,0,DOXYBUILDMENUNAME,IMAGEMENU,MENU_BUILD_DOCS_LABEL,(void*)1,false);
+		menuitem=newImageMenuItem(MENUDOXY,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //recent menu
-	menuitem=createNewImageMenuItem(NULL,MENU_RECENT_FILES_LABEL,true);
+	menuitem=gtk_menu_item_new_with_mnemonic(gettext(menuData[MENURECENT].menuLabel));
 	menurecent=gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),menurecent);
 	addRecentToMenu((GtkRecentChooser*)recent,menurecent);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-	gtk_widget_set_name(menuitem,RECENTMENUNAME);
+	gtk_widget_set_name(menuitem,menuData[MENURECENT].widgetName);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //save
-	saveMenu=makeMenuItem(GTK_STOCK_SAVE,menu,(void*)saveFile,'S',SAVEMENUNAME,STOCKMENU,MENU_SAVE_LABEL,NULL,false);
+	saveMenu=newMenuItem(MENUSAVE,menu);
 //savas
-	saveAsMenu=makeMenuItem(GTK_STOCK_SAVE_AS,menu,(void*)saveFile,-'S',SAVEASMENUNAME,STOCKMENU,MENU_SAVE_AS_LABEL,(void*)1,false);
+	saveAsMenu=newMenuItem(MENUSAVEAS,menu);
 //save all
-	saveAllMenu=makeMenuItem(GTK_STOCK_SAVE,menu,(void*)doSaveAll,0,SAVEALLMENUNAME,IMAGEMENU,MENU_SAVE_ALL_LABEL,NULL,false);
+	saveAllMenu=newImageMenuItem(MENUSAVEALL,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //save session
-	menuitem=makeMenuItem(GTK_STOCK_SAVE,menu,(void*)saveSession,0,SAVESESSIONMENUNAME,IMAGEMENU,MENU_SAVE_SESSION_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUSAVESESSION,menu);
 //restore session
-	menuitem=makeMenuItem(GTK_STOCK_OPEN,menu,(void*)restoreSession,0,RESTORESESSIONMENUNAME,IMAGEMENU,MENU_RESTORE_SESSION_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENURESTORESESSION,menu);
 //printfile
-	printMenu=makeMenuItem(GTK_STOCK_PRINT,menu,(void*)printFile,'P',PRINTMENUNAME,STOCKMENU,PRINT_LABEL,NULL,false);
+	printMenu=newMenuItem(MENUPRINT,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //close
-	closeMenu=makeMenuItem(GTK_STOCK_CLOSE,menu,(void*)closeTab,'W',CLOSEMENUNAME,STOCKMENU,CLOSE_LABEL,NULL,false);
+	closeMenu=newMenuItem(MENUCLOSE,menu);
 //close-all
-	closeAllMenu=makeMenuItem(GTK_STOCK_CLOSE,menu,(void*)closeAllTabs,0,CLOSEALLMENUNAME,IMAGEMENU,MENU_CLOSE_ALL_LABEL,NULL,false);
+	closeAllMenu=newImageMenuItem(MENUCLOSEALL,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 //reload file
-	revertMenu=makeMenuItem(GTK_STOCK_REVERT_TO_SAVED,menu,(void*)reloadFile,0,REVERTMENUNAME,STOCKMENU,REVERT_TO_SAVED_LABEL,NULL,false);
+	revertMenu=newMenuItem(MENUREVERT,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //quit
-	menuitem=makeMenuItem(GTK_STOCK_QUIT,menu,(void*)doShutdown,'Q',QUITMENUNAME,STOCKMENU,QUIT_LABEL,NULL,false);
-
+	menuitem=newMenuItem(MENUQUIT,menu);
 //edit menu
 	editMenu=gtk_menu_item_new_with_label(MENU_EDIT_MENU_LABEL);
 	gtk_menu_item_set_use_underline((GtkMenuItem*)editMenu,true);
 	menu=gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(editMenu),menu);
 //undo
-	undoMenu=makeMenuItem(GTK_STOCK_UNDO,menu,(void*)undo,'Z',UNDOMENUNAME,STOCKMENU,MENU_UNDO_LABEL,NULL,false);
+	undoMenu=newMenuItem(MENUUNDO,menu);
 //redo
-	redoMenu=makeMenuItem(GTK_STOCK_REDO,menu,(void*)redo,-'Z',REDOMENUNAME,STOCKMENU,MENU_REDO_LABEL,NULL,false);
+	redoMenu=newMenuItem(MENUREDO,menu);
 //undoall
-	undoAllMenu=makeMenuItem(GTK_STOCK_UNDO,menu,(void*)unRedoAll,0,UNDOALLMENUNAME,IMAGEMENU,MENU_UNDO_ALL_LABEL,(void*)0,false);
+	undoAllMenu=newImageMenuItem(MENUUNDOALL,menu);
 //redoall
-	redoAllMenu=makeMenuItem(GTK_STOCK_REDO,menu,(void*)unRedoAll,0,REDOALLMENUNAME,IMAGEMENU,MENU_REDO_ALL_LABEL,(void*)1,false);
+	redoAllMenu=newImageMenuItem(MENUREDOALL,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //cut
-	cutMenu=makeMenuItem(GTK_STOCK_CUT,menu,(void*)cutToClip,'X',CUTMENUNAME,STOCKMENU,MENU_CUT_LABEL,NULL,false);
+	cutMenu=newMenuItem(MENUCUT,menu);
 //copy
-	copyMenu=makeMenuItem(GTK_STOCK_COPY,menu,(void*)copyToClip,'C',COPYMENUNAME,STOCKMENU,MENU_COPY_LABEL,NULL,false);
+	copyMenu=newMenuItem(MENUCOPY,menu);
 //paste
-	pasteMenu=makeMenuItem(GTK_STOCK_PASTE,menu,(void*)pasteFromClip,'V',PASTEMENUNAME,STOCKMENU,MENU_PASTE_LABEL,NULL,false);
+	pasteMenu=newMenuItem(MENUPASTE,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
-
 //find
-	menuitem=makeMenuItem(GTK_STOCK_FIND,menu,(void*)find,'F',FINDMENUNAME,STOCKMENU,MENU_FIND_LABEL,NULL,false);
+	menuitem=newMenuItem(MENUFIND,menu);
+//find next
+	menuitem=newImageMenuItem(MENUNEXT,menu);
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //sort
-	sortTabsMenu=makeMenuItem(GTK_STOCK_SORT_ASCENDING,menu,(void*)sortTabs,0,SORTTABSMENUNAME,IMAGEMENU,MENU_SORT_TABS_LABEL,NULL,false);
+	sortTabsMenu=newImageMenuItem(MENUSORTTABS,menu);
 //show all tabs
-	showAllTabsMenu=makeMenuItem(GTK_STOCK_ADD,menu,(void*)showAllTabs,0,SORTTABSMENUNAME,IMAGEMENU,MENU_SHOW_ALL_TABS_LABEL,NULL,false);
+	showAllTabsMenu=newImageMenuItem(MENUSHOWTABS,menu);
 //jump to tab
-	viewTabMenu=createNewImageMenuItem(GTK_STOCK_EDIT,MENU_SELECT_TAB_LABEL,true);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),viewTabMenu);
+	viewTabMenu=newImageMenuItem(MENUSELECTTAB,menu);
 	rebuildTabsMenu();
 
 	menuitem=gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuitem);
 
 //prefs
-	menuitem=makeMenuItem(GTK_STOCK_PREFERENCES,menu,(void*)doPrefs,0,PREFSMENUNAME,STOCKMENU,MENU_PREFERENCES_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUPREFS,menu);
 //plugs
-	menuitem=makeMenuItem(GTK_STOCK_PREFERENCES,menu,(void*)doPlugPrefs,0,PLUGPREFSMENUNAME,IMAGEMENU,MENU_PLUG_PREFS_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUPLUGPREFS,menu);
 
 //view menu
 	viewMenu=gtk_menu_item_new_with_label(MENU_VIEW_MENU_LABEL);
@@ -1557,49 +1759,48 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(viewMenu),menu);
 
 //show docs
-	menuitem=makeMenuItem(MENU_SHOW_DOCS_LABEL,menu,(void*)doDoxy,0,SHOWDOCSMENUNAME,NORMALMENU,NULL,(void*)2,false);
+	menuitem=newMenuItem(MENUSHOWDOCS,menu);
 //toggle bookmark bar
 	if(showBMBar)
-		menuitem=makeMenuItem(MENU_HIDE_BM_BAR_LABEL,menu,(void*)toggleBookMarkBar,0,SHOWBMBARMENUNAME,NORMALMENU,NULL,NULL,false);
+		menuitem=newMenuItem(MENUHIDEBMBAR,menu);
 	else
-		menuitem=makeMenuItem(MENU_SHOW_BM_BAR_LABEL,menu,(void*)toggleBookMarkBar,0,SHOWBMBARMENUNAME,NORMALMENU,NULL,NULL,false);
+		menuitem=newMenuItem(MENUSHOWBMBAR,menu);
 //toggle toolbar bar
 	if(showToolBar)
-		menuitem=makeMenuItem(MENU_HIDE_TOOLBAR_LABEL,menu,(void*)toggleToolBar,0,SHOWTOOLBARMENUNAME,NORMALMENU,NULL,NULL,false);
+		menuitem=newMenuItem(MENUHIDETOOLBAR,menu);
 	else
-		menuitem=makeMenuItem(MENU_SHOW_TOOLBAR_LABEL,menu,(void*)toggleToolBar,0,SHOWTOOLBARMENUNAME,NORMALMENU,NULL,NULL,false);
+		menuitem=newMenuItem(MENUSHOWTOOLBAR,menu);
 //tooloutput
 	if(showToolOutWin)
-		toolOutMenu=makeMenuItem(MENU_HIDE_TOOL_OP_LABEL,menu,(void*)toggleToolOutput,0,SHOWTOOLOUTMENUNAME,NORMALMENU,NULL,NULL,false);
+		toolOutMenu=newMenuItem(MENUHIDETOOLOUT,menu);
 	else
-		toolOutMenu=makeMenuItem(MENU_SHOW_TOOL_OP_LABEL,menu,(void*)toggleToolOutput,0,SHOWTOOLOUTMENUNAME,NORMALMENU,NULL,NULL,false);
+		toolOutMenu=newMenuItem(MENUSHOWTOOLOUT,menu);
 //toggle statusbar
 	if(showStatus)
-		statusBarMenu=makeMenuItem(MENU_HIDE_STATUS_LABEL,menu,(void*)toggleStatusBar,0,SHOWSTATUSMENUNAME,NORMALMENU,NULL,NULL,false);
+		statusBarMenu=newMenuItem(MENUHIDESTATUS,menu);
 	else
-		statusBarMenu=makeMenuItem(MENU_SHOW_STATUS_LABEL,menu,(void*)toggleStatusBar,0,SHOWSTATUSMENUNAME,NORMALMENU,NULL,NULL,false);
+		statusBarMenu=newMenuItem(MENUSHOWSTATUS,menu);
 
 #ifdef _BUILDDOCVIEWER_
 //toggle docviewer
-	showDocViewWidget=makeMenuItem(MENU_SHOW_DOCVIEWER_LABEL,menu,(void*)toggleDocviewer,0,SHOWDOCVIEWERMENUNAME,NORMALMENU,NULL,NULL,false);
+	showDocViewWidget=newMenuItem(MENUSHOWVIEWER,menu);
 #endif
 
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),gtk_separator_menu_item_new());
 //toggle line nubers
-		menuitem=makeMenuItem(MENU_SHOW_LINE_NUMBERS_LABEL,menu,(void*)toggleLineNumbers,0,VIEWSHOWLINENUMERS,CHECKMENU,NULL,NULL,lineNumbers);
+		menuitem=newCheckMenuItem(MENUTOGGLENUMBERS,menu,lineNumbers);
 //toggle wrap lines
-	menuitem=makeMenuItem( MENU_WRAP_LINES_LABEL,menu,(void*)toggleWrapLines,0,VIEWWRAPLINES,CHECKMENU,NULL,NULL,lineWrap);
+	menuitem=newCheckMenuItem(MENUWRAPLINES,menu,lineWrap);
 //toggle higlight current line
-	menuitem=makeMenuItem(MENU_HIGHLIGHT_LINE_LABEL,menu,(void*)toggleHighlightCurrent,0,VIEWHIGHLIGHT,CHECKMENU,NULL,NULL,highLight);
+	menuitem=newCheckMenuItem(MENUHILITELINE,menu,highLight);
 //toggle syntax highlight
-	menuitem=makeMenuItem(MENU_NO_SYNTAX_LABEL,menu,(void*)toggleSyntax,0,VIEWNOSYNTAX,CHECKMENU,NULL,NULL,noSyntax);
+	menuitem=newCheckMenuItem(MENUSYNTAXHILITE,menu,noSyntax);
 //toggle show spaces
-	menuitem=makeMenuItem(MENU_SHOW_SPACES_LABEL,menu,(void*)toggleWhitespace,0,VIEWWHITESPACE,CHECKMENU,NULL,NULL,showWhiteSpace);
+	menuitem=newCheckMenuItem(MENUSHOWSPACE,menu,showWhiteSpace);
 //toggle auto show comps
-	menuitem=makeMenuItem(MENU_SHOW_AUTO_COMPLETE,menu,(void*)toggleAutoComplete,0,VIEWAUTOCOMPLETE,CHECKMENU,NULL,NULL,autoShowComps);
+	menuitem=newCheckMenuItem(MENUSHOWCOMPS,menu,autoShowComps);
 
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),gtk_separator_menu_item_new());
-
 //navigation menu
 	navMenu=gtk_menu_item_new_with_label(MENU_NAV_MENU_LABEL);
 	gtk_menu_item_set_use_underline((GtkMenuItem*)navMenu,true);
@@ -1607,24 +1808,24 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(navMenu),menu);
 
 //goto define
-	gotoDefMenu=makeMenuItem(GTK_STOCK_DIALOG_QUESTION,menu,(void*)goToDefinition,'D',GOTODEFMENUNAME,IMAGEMENU,MENU_GOTO_DEFINE_LABEL,NULL,false);
+	gotoDefMenu=newImageMenuItem(MENUGOTODEF,menu);
 //open include
-	menuitem=makeMenuItem(GTK_STOCK_OPEN,menu,(void*)findFile,'I',OPENINCLUDEMENUNAME,IMAGEMENU,MENU_OPEN_INCLUDE_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUOPENINC,menu);
 //goto line number
-	menuitem=makeMenuItem(GTK_STOCK_GO_DOWN,menu,(void*)jumpToLine,0,GOTOLINEMENUNAME,IMAGEMENU,MENU_GOTO_LINE_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUGOTOLINE,menu);
 //find define
-	menuitem=makeMenuItem(GTK_STOCK_FIND,menu,(void*)functionSearch,0,SEARCHFORDEFMENUNAME,IMAGEMENU,MENU_FIND_DEFINE_LABEL,NULL,false);
+	menuitem=newImageMenuItem(MENUSEARCHDEF,menu);
 //find gtkdoc
-	searchInGtkDocsMenu=makeMenuItem(GTK_STOCK_FIND,menu,(void*)searchGtkDocs,0,SEARCHGTKMENUNAME,IMAGEMENU,MENU_FIND_IN_GTKAPI_LABEL,NULL,false);
+	searchInGtkDocsMenu=newImageMenuItem(MENUSEARCHGTK,menu);
 //find qt5
-	searchInQTDocsMenu=makeMenuItem(GTK_STOCK_FIND,menu,(void*)searchQT5Docs,0,SEARCHQT5MENUNAME,IMAGEMENU,MENU_FIND_IN_QTAPI_LABEL,NULL,false);
+	searchInQTDocsMenu=newImageMenuItem(MENUSEARCHQT,menu);
 //goto doxy docs
 	if(gotDoxygen==0)
-		searchInDocsMenu=makeMenuItem(GTK_STOCK_FIND,menu,(void*)doxyDocs,0,SEARCHDOXYMENUNAME,IMAGEMENU,MENU_FIND_IN_DOCS_LABEL,NULL,false);
+		searchInDocsMenu=newImageMenuItem(MENUSEARCHDOXY,menu);
 //go back
-	goBackMenu=makeMenuItem(GTK_STOCK_GO_BACK,menu,(void*)navigateHistory,0,GOBACKMENUNAME,STOCKMENU,MENU_GO_BACK_LABEL,(void*)NAVLAST,false);
+	goBackMenu=newMenuItem(MENUBACK,menu);
 //go foward
-	goForwardMenu=makeMenuItem(GTK_STOCK_GO_FORWARD,menu,(void*)navigateHistory,0,GOBACKMENUNAME,STOCKMENU,MENU_GO_FORWARD_LABEL,(void*)NAVNEXT,false);
+	goForwardMenu=newMenuItem(MENUFORWARD,menu);
 
 //function menu
 	funcMenu=gtk_menu_item_new_with_label(MENU_FUNC_MENU_LABEL);
@@ -1647,13 +1848,13 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(helpMenu),menu);
 
 //about
-	menuitem=makeMenuItem(GTK_STOCK_ABOUT,menu,(void*)doAbout,0,ABOUTMENUNAME,STOCKMENU,MENU_ABOUT_LABEL,NULL,false);
+	menuitem=newMenuItem(MENUABOUT,menu);
 //help local
-	menuitem=makeMenuItem(GTK_STOCK_HELP,menu,(void*)openHelp,0,HELPMENUNAME,STOCKMENU,MENU_HELP_LABEL,(void*)0,false);
+	menuitem=newMenuItem(MENULOCALHELP,menu);
 //help online
-	menuitem=makeMenuItem(GTK_STOCK_HELP,menu,(void*)openHelp,0,HELPMENUNAME,IMAGEMENU,MENU_HELP_ONLINE_LABEL,(void*)1,false);
+	menuitem=newImageMenuItem(MENUONLINE,menu);
 //get plugins
-	menuitem=makeMenuItem(PLUGMENUPNG,menu,(void*)getPlugins,0,GETPLUGSMENUNAME,PIXMAPMENU,MENU_GET_PLUGS_LABEL,NULL,false);
+	menuitem=newPixmapMenuItem(MENUGETPLUGS,menu);
 
 	gtk_menu_shell_append(GTK_MENU_SHELL(menuBar),fileMenu);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menuBar),editMenu);
@@ -1670,12 +1871,92 @@
 			gtk_menu_item_set_use_underline((GtkMenuItem*)globalPlugMenu,true);
 			plugsubmenu=gtk_menu_new();
 			gtk_menu_item_set_submenu(GTK_MENU_ITEM(globalPlugMenu),plugsubmenu);
+			globalPlugins->globalPlugData->mlist.menuBar=plugsubmenu;
 			gtk_menu_shell_append(GTK_MENU_SHELL(menuBar),globalPlugMenu);
 		}
 	else
-		globalPlugMenu=NULL;
+		{
+			globalPlugMenu=NULL;
+			globalPlugins->globalPlugData->mlist.menuBar=menuBar;
+		}
 
 	gtk_menu_shell_append(GTK_MENU_SHELL(menuBar),helpMenu);
+}
+
+void buildMainGui(void)
+{
+	ERRDATA
+	GtkWidget		*menuitem;
+	GtkWidget		*menu;
+	GtkWidget		*menurecent;
+	GtkWidget		*plugsubmenu=NULL;
+
+	mainWindowVBox=createNewBox(NEWVBOX,false,0);
+	mainTopUserVBox=createNewBox(NEWVBOX,false,0);
+	mainLeftUserVBox=createNewBox(NEWVBOX,false,0);
+	mainNotebookVBox=createNewBox(NEWVBOX,false,0);
+	mainRightUserVBox=createNewBox(NEWVBOX,false,0);
+	mainBottomUserVBox=createNewBox(NEWVBOX,false,0);
+
+	mainWindowHBox=createNewBox(NEWHBOX,false,0);
+
+#ifdef _USEGTK3_
+	mainWindowHPane=gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+	secondWindowHPane=gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+#else
+	mainWindowHPane=gtk_hpaned_new();
+	secondWindowHPane=gtk_hpaned_new();
+#endif
+
+	mainWindow=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size((GtkWindow*)mainWindow,windowWidth,windowHeight);
+	if(windowX!=-1 && windowY!=-1)
+		gtk_window_move((GtkWindow *)mainWindow,windowX,windowY);
+
+//TODO//?
+	g_signal_connect(G_OBJECT(mainWindow),"delete-event",G_CALLBACK(gtk_widget_hide_on_delete),NULL);
+	//g_signal_connect_after(G_OBJECT(mainWindow),"delete-event",G_CALLBACK(doShutdown),NULL);
+	g_signal_connect_after(G_OBJECT(mainWindow),"unmap",G_CALLBACK(doShutdown),NULL);
+	g_signal_connect(G_OBJECT(mainWindow),"key-press-event",G_CALLBACK(keyShortCut),NULL);
+
+	accgroup=gtk_accel_group_new();
+	gtk_window_add_accel_group((GtkWindow*)mainWindow,accgroup);
+
+	mainNotebook=(GtkNotebook*)gtk_notebook_new();
+	gtk_notebook_set_scrollable(mainNotebook,true);
+	g_signal_connect(G_OBJECT(mainNotebook),"switch-page",G_CALLBACK(switchPage),NULL);
+	g_signal_connect(G_OBJECT(mainNotebook),"page-reordered",G_CALLBACK(switchPage),NULL);
+	g_signal_connect(G_OBJECT(mainNotebook),"page-removed",G_CALLBACK(realCloseTab),NULL);
+
+	globalHistory=new HistoryClass(mainNotebook,maxJumpHistory);
+
+#ifdef _USEGTK3_
+	char	*notebookcss=NULL;
+	GtkStyleProvider	*nbprovider;
+
+	nbprovider=GTK_STYLE_PROVIDER(gtk_css_provider_new());
+	sinkReturn=asprintf(&notebookcss,"GtkNotebook {\n \
+    padding: 0px;\n \
+}\n");
+
+	gtk_css_provider_load_from_data((GtkCssProvider*)nbprovider,notebookcss,-1,NULL);
+	applyCSS((GtkWidget*)mainNotebook,nbprovider);
+	gtk_style_context_reset_widgets(gdk_screen_get_default());
+	debugFree(&notebookcss);
+#endif
+
+	toolBarBox=createNewBox(NEWHBOX,true,0);
+	toolBar=(GtkToolbar*)gtk_toolbar_new();
+
+//dnd
+	gtk_drag_dest_set(mainWindowVBox,GTK_DEST_DEFAULT_ALL,NULL,0,GDK_ACTION_COPY);
+	gtk_drag_dest_add_uri_targets(mainWindowVBox);
+	g_signal_connect(G_OBJECT(mainWindowVBox),"drag_data_received",G_CALLBACK(dropUri),NULL);
+
+	setUpToolBar();
+	gtk_box_pack_start(GTK_BOX(toolBarBox),(GtkWidget*)toolBar,true,true,0);
+
+	buildMenus();
 
 //tooloutputwindow
 #ifdef _USEGTK3_
@@ -1774,10 +2055,6 @@
 	globalPlugins->globalPlugData->mlist.menuHelp=helpMenu;
 	globalPlugins->globalPlugData->mlist.menuBookMark=bookMarkMenu;
 	globalPlugins->globalPlugData->mlist.menuView=viewMenu;
-	if(useGlobalPlugMenu==true)
-		globalPlugins->globalPlugData->mlist.menuBar=plugsubmenu;
-	else
-		globalPlugins->globalPlugData->mlist.menuBar=menuBar;
 
 	globalPlugins->globalPlugData->topUserBox=mainTopUserVBox;
 	globalPlugins->globalPlugData->leftUserBox=mainLeftUserVBox;
@@ -1817,9 +2094,9 @@
 	GtkWidget	*item;
 
 #ifdef _USEGTK3_
-	findReplaceDialog=gtk_dialog_new_with_buttons(FIND_FIND_REPLACE_LABEL,(GtkWindow*)mainWindow, GTK_DIALOG_DESTROY_WITH_PARENT,DIALOG_GO_FORWARD_LABEL,FINDNEXT,MENU_GO_BACK_LABEL,FINDPREV,FIND_REPLACE_LABEL,REPLACE,NULL);
+	findReplaceDialog=gtk_dialog_new_with_buttons(FIND_FIND_REPLACE_LABEL,(GtkWindow*)mainWindow, GTK_DIALOG_DESTROY_WITH_PARENT,DIALOG_GO_FORWARD_LABEL,FINDNEXT,MENU_GO_BACK_LABEL,FINDPREV,FIND_REPLACE_LABEL,REPLACENEXT,NULL);
 #else
-	findReplaceDialog=gtk_dialog_new_with_buttons(FIND_FIND_REPLACE_LABEL,(GtkWindow*)mainWindow, GTK_DIALOG_DESTROY_WITH_PARENT,GTK_STOCK_GO_FORWARD,FINDNEXT,GTK_STOCK_GO_BACK,FINDPREV,FIND_REPLACE_LABEL,REPLACE,NULL);
+	findReplaceDialog=gtk_dialog_new_with_buttons(FIND_FIND_REPLACE_LABEL,(GtkWindow*)mainWindow, GTK_DIALOG_DESTROY_WITH_PARENT,GTK_STOCK_GO_FORWARD,FINDNEXT,GTK_STOCK_GO_BACK,FINDPREV,FIND_REPLACE_LABEL,REPLACENEXT,NULL);
 #endif
 
 	g_signal_connect(G_OBJECT(findReplaceDialog),"response",G_CALLBACK(doFindReplace),NULL);
@@ -1896,12 +2173,12 @@
 	gtk_box_pack_start(GTK_BOX(vbox),hbox,true,true,0);
 	gtk_box_pack_start(GTK_BOX(content_area),vbox,true,true,0);
 
-	replace=gtk_dialog_get_widget_for_response((GtkDialog*)findReplaceDialog,REPLACE);
+	replace=gtk_dialog_get_widget_for_response((GtkDialog*)findReplaceDialog,REPLACENEXT);
 #ifndef _USEGTK3_
 	image=gtk_image_new_from_icon_name(GTK_STOCK_FIND_AND_REPLACE,GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image((GtkButton*)replace,image);
 #endif	
-	replace=gtk_dialog_get_widget_for_response((GtkDialog*)findReplaceDialog,REPLACE);
+	replace=gtk_dialog_get_widget_for_response((GtkDialog*)findReplaceDialog,REPLACENEXT);
 	if(replaceAll==true)
 		gtk_button_set_label((GtkButton*)replace,FIND_REPLACE_ALL_MNEMONIC);
 	else
@@ -2040,7 +2317,7 @@
 	hbox=createNewBox(NEWHBOX,false,4);
 
 	webView=WEBKIT_WEB_VIEW(webkit_web_view_new());
-	g_signal_connect(G_OBJECT(webView),"navigation-policy-decision-requested",G_CALLBACK(docLinkTrap),NULL);
+//	g_signal_connect(G_OBJECT(webView),"navigation-policy-decision-requested",G_CALLBACK(docLinkTrap),NULL);
 
 	settings=webkit_web_view_get_settings(webView);
 	g_object_set((gpointer)settings,"enable-file-access-from-file-uris",true,NULL);
@@ -2098,8 +2375,9 @@
 	gtk_container_add(GTK_CONTAINER(docView),vbox);
 	gtk_widget_grab_focus(GTK_WIDGET(webView));
 
+#ifdef _BUILDDOCVIEWER_
 	g_signal_connect_object(G_OBJECT(docView),"delete-event",G_CALLBACK(toggleDocviewer),G_OBJECT(docView),G_CONNECT_SWAPPED);
-
+#endif
 	const char *lang;
 
 	if(strncmp(localeLang,"en",2)==0)
diff -Nru kkedit-0.3.3/KKEdit/src/guis.h kkedit-0.4.1/KKEdit/src/guis.h
--- kkedit-0.3.3/KKEdit/src/guis.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/guis.h	2016-08-26 09:41:34.000000000 +0000
@@ -21,7 +21,34 @@
 #ifndef _GUIS_
 #define _GUIS_
 
-enum	{AUTOINDENT=0,SHOWNUMS,WRAP,HIGHLIGHT,NOSYNTAX,USESINGLE,AUTOSAVE,AUTOBM,NODUPLICATE,NOWARN,READLINK,AUTOSHOW,UPDATECHECK,BEKIND,GLOBALPLUGMENU,AUTOSEARCH,SHOWWHITESPACE,MAXPREFSWIDGETS};
+//MENU_NEW_LABEL gettext("_New")
+//#define GTK_STOCK_NEW "document-new"
+//hot key
+//hot modifier
+//hotkey strings
+//callbacks
+enum {MENUNEW=0,MENUOPEN,MENUOPENHEX,MENUNEWADMIN,MENUNEWED,MENUMANED,MENUDOXY,MENURECENT,MENUSAVE,MENUSAVEAS,MENUSAVEALL,MENUSAVESESSION,MENURESTORESESSION,MENUPRINT,MENUCLOSE,MENUCLOSEALL,MENUREVERT,MENUQUIT,MENUUNDO,MENUREDO,MENUUNDOALL,MENUREDOALL,MENUCUT,MENUCOPY,MENUPASTE,MENUFIND,MENUNEXT,MENUSORTTABS,MENUSHOWTABS,MENUSELECTTAB,MENUPREFS,MENUPLUGPREFS,MENUSHOWDOCS,MENUSHOWBMBAR,MENUHIDEBMBAR,MENUHIDETOOLBAR,MENUSHOWTOOLBAR,MENUHIDETOOLOUT,MENUSHOWTOOLOUT,MENUHIDESTATUS,MENUSHOWSTATUS,MENUSHOWVIEWER, \
+MENUTOGGLENUMBERS,MENUWRAPLINES,MENUHILITELINE,MENUSYNTAXHILITE,MENUSHOWSPACE,MENUSHOWCOMPS \
+,MENUGOTODEF,MENUOPENINC,MENUGOTOLINE,MENUSEARCHDEF,MENUSEARCHGTK,MENUSEARCHQT,MENUSEARCHDOXY,MENUBACK,MENUFORWARD,MENUTOOLS,MENUABOUT,MENULOCALHELP,MENUONLINE,MENUGETPLUGS, \
+POPADDCUSTOM,MENUBLANK,MENUSPELLCHECK, \
+TABFOLDERPATH,TABFILEPATH,TABFILENAME,TABSPELLCHECK,TABSRCHILITE,TABHIDE \
+};
+
+struct	menuDataStruct
+{
+	const char		*menuLabel;
+	const char		*stockID;
+	char			key;
+	long			mod;
+	void			*cb;
+	const char		*widgetName;
+	gpointer		userData;
+	
+};
+
+extern menuDataStruct	menuData[];
+
+enum	{AUTOINDENT=0,SHOWNUMS,WRAP,HIGHLIGHT,NOSYNTAX,USESINGLE,AUTOSAVE,AUTOBM,NODUPLICATE,NOWARN,READLINK,AUTOSHOW,UPDATECHECK,BEKIND,GLOBALPLUGMENU,AUTOSEARCH,SHOWWHITESPACE,SHOWMENUICONS,MAXPREFSWIDGETS};
 enum {MAXTABCHARS=0,MAXHISTORY,MAXFUNCDEPTH,COMPLETIONSIZE,TABWIDTH,MENUWIDTH,MAXBMWIDTH,NOTETABSSIZE,MAXJUMPHISTORY,MAXPREFSINTWIDGETS};
 
 extern	GtkWidget	*prefsWidgets[MAXPREFSWIDGETS];
@@ -41,4 +68,10 @@
 #endif
 void setUpToolBar(void);
 char *makeToolBarList(void);
+void doPrefs(GtkWidget *widget,gpointer data);
+void doMakeTool(void);
+GtkWidget* newImageMenuItem(unsigned menunumber,GtkWidget *parent);
+GtkWidget* newMenuItem(unsigned menunumber,GtkWidget *parent);
+void buildMenus(void);
+
 #endif
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/src/internet.cpp kkedit-0.4.1/KKEdit/src/internet.cpp
--- kkedit-0.3.3/KKEdit/src/internet.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/internet.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ *
+ * ©K. D. Hedger. Tue 28 Jun 10:44:42 BST 2016 kdhedger68713@gmail.com
+ 
+ * Projects is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+
+ * Projects is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Projects.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include <stdlib.h>
+
+#include "config.h"
+#include "internet.h"
+
+const char	*moreapps[]={
+								"\nMore by the same author\n",
+								"KKEdit\nhttp://kkedit.darktech.org/\n",
+								"KKTerminal\nhttp://khapplications.darktech.org/pages/kkterminal/kkterminal.html\n",
+								"XDecorations\nhttp://khapplications.darktech.org/pages/xdecorations/xdecorations.html\n",
+								"Xfce-Theme-Manager\nhttp://khapplications.darktech.org/pages/apps.html#themeed\n",
+								"Xfce4-Composite-Editor\nhttp://khapplications.darktech.org/pages/apps.html#xfcecomp\n",
+								"Manpage Editor\nhttp://khapplications.darktech.org/pages/manpageeditor/help.html\n",
+								"GtkSu\nhttp://khapplications.darktech.org/pages/gtksu/gtksu.html\n",
+								"ASpell GUI\nhttp://khapplications.darktech.org/pages/aspellgui/aspelgui.html\n",
+								"Clipboard Viewer\nhttp://khapplications.darktech.org/pages/clipviewer/clip.html\n",
+								"\nDevelopment versions can be found here:\nhttp://github.com/KeithDHedger\n"
+							};
+
+const char	*authors[]={"K.D.Hedger <" MYEMAIL ">",MYWEBSITE,moreapps[0],moreapps[1],moreapps[2],moreapps[3],moreapps[4],moreapps[5],moreapps[6],moreapps[7],moreapps[8],moreapps[9],moreapps[10],NULL};
diff -Nru kkedit-0.3.3/KKEdit/src/internet.h kkedit-0.4.1/KKEdit/src/internet.h
--- kkedit-0.3.3/KKEdit/src/internet.h	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/internet.h	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ *
+ * ©K. D. Hedger. Tue 28 Jun 10:44:42 BST 2016 kdhedger68713@gmail.com
+ 
+ * Projects is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+
+ * Projects is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Projects.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _INTERNET_
+#define _INTERNET_
+
+#define MYEMAIL "keithhedger@keithhedger.darktech.org"
+#define MYWEBSITE "http://khapplications.darktech.org/index.html"
+#define GLOBALWEBSITE "http://khapplications.darktech.org"
+#define ASPELLPAGE GLOBALWEBSITE "/pages/aspellgui/aspelgui.html"
+#define MANPAGEPAGE GLOBALWEBSITE "/pages/manpageeditor/help.html"
+#define CLIPVIEW GLOBALWEBSITE "/pages/clipviewer/clip.html"
+#define THEMEMANAGER GLOBALWEBSITE "/pages/apps.html#themeed"
+#define COMPMANAGER GLOBALWEBSITE "/pages/apps.html#xfcecomp"
+#define KKEDITPAGE "http://kkedit.darktech.org"
+#define KKTERMINALPAGE "http://khapplications.darktech.org/index.html"
+
+#define COPYRITE "Copyright \xc2\xa9 2013-2016 K.D.Hedger"
+
+extern const char	*moreapps[];
+extern const char	*authors[];
+
+#endif
diff -Nru kkedit-0.3.3/KKEdit/src/kkedit-includes.h kkedit-0.4.1/KKEdit/src/kkedit-includes.h
--- kkedit-0.3.3/KKEdit/src/kkedit-includes.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/kkedit-includes.h	2016-08-26 09:41:34.000000000 +0000
@@ -73,7 +73,7 @@
 #define GTK_STOCK_DIALOG_QUESTION "dialog-question"
 #define GTK_STOCK_ADD "list-add"
 #define GTK_STOCK_SORT_ASCENDING "view-sort-ascending"
-
+#define GTK_STOCK_DIALOG_INFO "dialog-information"
 //navigation
 #define GTK_STOCK_GO_BACK "go-previous"
 #define GTK_STOCK_GO_HOME "go-home"
@@ -88,13 +88,15 @@
 #define GTK_STOCK_NO gettext("_No")
 #define GTK_STOCK_CANCEL gettext("_Cancel")
 #define GTK_STOCK_OPEN_LABEL gettext("_Open")
-#define GTK_STOCK_SELECT_COLOR gettext("Select Colour")
 #define GTK_STOCK_APPLY gettext("_Apply")
-#define GTK_STOCK_EDIT gettext("_Edit")
+#define GTK_STOCK_EDIT "accessories-text-editor"
 #define GTK_STOCK_OK gettext("_OK")
 
 #endif
 
+//button labels
+#define CLOSE_LABEL gettext("_Close")
+
 //menus labels
 //file menu
 #define MENU_FILE_MENU_LABEL gettext("_File")
@@ -111,11 +113,11 @@
 #define MENU_SAVE_ALL_LABEL gettext("Save A_ll")
 #define MENU_SAVE_SESSION_LABEL gettext("Sa_ve Session")
 #define MENU_RESTORE_SESSION_LABEL gettext("Res_tore Session")
-#define PRINT_LABEL gettext("_Print...")
-#define CLOSE_LABEL gettext("_Close")
+#define MENU_PRINT_LABEL gettext("_Print...")
+#define MENU_CLOSE_LABEL gettext("_Close")
 #define MENU_CLOSE_ALL_LABEL gettext("Close All Ta_bs")
-#define REVERT_TO_SAVED_LABEL gettext("Re_vert")
-#define QUIT_LABEL gettext("_Quit")
+#define MENU_REVERT_TO_SAVED_LABEL gettext("Re_vert")
+#define MENU_QUIT_LABEL gettext("_Quit")
 
 //edit menu
 #define MENU_EDIT_MENU_LABEL gettext("_Edit")
@@ -127,6 +129,7 @@
 #define MENU_COPY_LABEL gettext("_Copy")
 #define MENU_PASTE_LABEL gettext("_Paste")
 #define MENU_FIND_LABEL gettext("_Find")
+#define MENU_FIND_NEXT_LABEL gettext("Find Ne_xt")
 #define MENU_SORT_TABS_LABEL gettext("_Sort Tabs")
 #define MENU_SHOW_ALL_TABS_LABEL gettext("S_how All Tabs")
 #define MENU_HIDE_TAB_LABEL gettext("_Hide Tab")
@@ -171,7 +174,7 @@
 
 //bookmarks menu
 #define MENU_BM_MENU_LABEL gettext("_Bookmarks")
-#define MENU_BM_TOGGLE_BM_LABEL gettext("Toggle Bookmark")
+#define MENU_BM_TOGGLE_BM_LABEL gettext("_Toggle Bookmark")
 #define MENU_BM_REMOVE_BMS gettext("Remove All Bookmarks")
 
 //tools menu
@@ -311,6 +314,7 @@
 #define PREFS_NO_WARN_LABEL gettext("Don't Warn On File Change")
 #define PREFS_READ_LINK_LABEL gettext("Read Link Before Opening File")
 #define PREFS_AUTO_COMPLETE_LABEL gettext("Auto Show Completions")
+#define PREFS_SHOW_MENU_ICONS_LABEL gettext("Show Icons In Gtk3 Menus ( Requires Restart )")
 #define PREFS_AUTO_SEARCH_LABEL gettext("Auto Search Docs")
 #define PREFS_GEN_APPEARANCE_LABEL gettext("General Appearance")
 #define PREFS_TAB_WIDTH_LABEL gettext("Tab width:")
@@ -455,6 +459,8 @@
 #include <libintl.h>
 #include <locale.h>
 
+//#include "../src/links.h"
+
 #include "sliceclass.h"
 #include "kkedit-plugins.h"
 
@@ -472,6 +478,7 @@
 #endif
 
 #include "globals.h"
+#include "internet.h"
 #include "pages.h"
 #include "navcallbacks.h"
 
@@ -484,6 +491,7 @@
 #include "encoding.h"
 #include "completion.h"
 
+
 #define VISIBLE __attribute__((visibility("default")))
 #define PROTECTED __attribute__((visibility("protected")))
 
diff -Nru kkedit-0.3.3/KKEdit/src/kkedit-plugins.h kkedit-0.4.1/KKEdit/src/kkedit-plugins.h
--- kkedit-0.3.3/KKEdit/src/kkedit-plugins.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/kkedit-plugins.h	2016-08-26 09:41:34.000000000 +0000
@@ -55,6 +55,7 @@
 #define CLOSEALLMENUNAME "closeallmenu"
 #define SORTTABSMENUNAME "sorttabsmenu"
 #define SHOWTABSMENUNAME "showalltabsmenu"
+#define SELECTTABMENUNAME "selecttabsmenu"
 #define REVERTMENUNAME "revertmenu"
 #define QUITMENUNAME "quitmenu"
 #define UNDOMENUNAME "undomenu"
@@ -65,6 +66,7 @@
 #define COPYMENUNAME "copymenu"
 #define PASTEMENUNAME "pastemenu"
 #define FINDMENUNAME "findmenu"
+#define FINDNEXTMENUNAME "findnextmenu"
 #define PREFSMENUNAME "prefsmenu"
 #define PLUGPREFSMENUNAME "plugprefsmenu"
 #define SHOWDOCSMENUNAME "showdocsmenu"
@@ -83,10 +85,11 @@
 #define SEARCHDOXYMENUNAME "searchdoxymenu"
 #define GOBACKMENUNAME "gobackmenu"
 #define GOFORWARDMENUNAME "goforwardmenu"
+#define EXTOOLSMENUNAME "extoolsmenuname"
 #define ABOUTMENUNAME "aboutmenu"
-#define HELPMENUNAME "helpmenu"
+#define HELPLOCALMENUNAME "helplocalmenu"
+#define HELPONLINEMENUNAME "helponlinemenu"
 #define GETPLUGSMENUNAME "getplugsmenu"
-#define SELECTTABMENUNAME "selecttabmenu"
 
 #define VIEWSHOWLINENUMERS "viewshowlinenumbers"
 #define VIEWAUTOINDENT "viewautoindent"
@@ -100,7 +103,9 @@
 #ifndef _PAGESTRUCT_
 #define _PAGESTRUCT_
 
-struct args
+enum {NOTYPE=0,FROMFILEMENU,FROMEDITMENU,FROMNAVMENU,FROMFUNCMENU,FROMBOOKMARKMENU,FROMTOOLSMENU,FROMHELPMENU,FROMSELECTION,FROMGOTO,FROMBASICFIND};
+
+struct	args
 {
 	const char	*name;
 	int			type;
@@ -146,6 +151,9 @@
 	char				*replaceString;;
 	GtkWidget			*tabButton;
 	bool				hidden;
+	bool				restoreHidden;
+	int					startChar;
+	int					endChar;
 };
 #endif
 
@@ -164,7 +172,7 @@
 #endif
 
 //plugins
-struct plugMenuList
+struct	plugMenuList
 {
 	GtkWidget			*menuBar;
 	GtkWidget			*menuFile;
@@ -177,7 +185,19 @@
 	GtkWidget			*menuView;
 };
 
-struct plugData
+struct	plugUserData
+{
+	plugUserData():type(NOTYPE),userStr(NULL),userStr2(NULL),userInt(0),userData(NULL),userStart(-1),userEnd(-1) {}
+	int			type;
+	const char	*userStr;
+	const char	*userStr2;
+	int			userInt;
+	void		*userData;
+	int			userStart;
+	int			userEnd;
+};
+
+struct	plugData
 {
 //menus
 	plugMenuList		mlist;
@@ -235,6 +255,12 @@
 	int					bottomShow;
 //locale dir for gettext
 	const char			*locale;
+
+//user data passed to plugins.
+	plugUserData		userData;
+
+//plug prefs window
+	GtkWidget			*prefsWindow;
 };
 
 void		showDocView(int howtodisplay,char *text,const char *title);
diff -Nru kkedit-0.3.3/KKEdit/src/main.cpp kkedit-0.4.1/KKEdit/src/main.cpp
--- kkedit-0.3.3/KKEdit/src/main.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/main.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -26,6 +26,26 @@
 bool	singleOverRide=false;
 bool	loadPluginsFlag=true;
 
+char* oneLiner(const char *command)
+{
+	FILE	*fp=NULL;
+	char	*retstr=(char*)calloc(1,256);
+	fp=popen(command,"r");
+	if(fp!=NULL)
+		{
+			sinkReturnStr=fgets(retstr,256,fp);
+			pclose(fp);
+		}
+	if(sinkReturnStr==NULL)
+		debugFree(&retstr);
+	else
+		{
+			if(retstr[strlen(retstr)-1]=='\n')
+				retstr[strlen(retstr)-1]=0;
+		}
+	return(retstr);
+}
+
 void readConfig(void)
 {
 	ERRDATA
@@ -43,11 +63,19 @@
 void init(void)
 {
 	ERRDATA
-	char		*filename;
+	char		*filename=NULL;
 	int			exitstatus;
 	char		tmpfoldertemplate[]="/tmp/KKEdit-XXXXXX";
 
-	tmpFolderName=strdup(mkdtemp(tmpfoldertemplate));
+	filename=mkdtemp(tmpfoldertemplate);
+	if(filename!=NULL)
+		tmpFolderName=strdup(filename);
+	else
+		{
+			infoMessage("Can't create tempory files!\nClear some space on /tmp.\nQuiting ...");
+			exit(0);
+		}
+	filename=NULL;
 	sinkReturn=asprintf(&logFile,"%s.log",tmpFolderName);
 
 //nag times
@@ -105,16 +133,24 @@
 	hightlightAll=true;
 	maxFuncDefs=64;
 	maxBMChars=64;
+	showMenuIcons=false;
 
 	openInThisTab=-1;
 	loadingSession=false;
 	doGoogleSearch=true;
 
+	recentMan=gtk_recent_manager_get_default();
+
 //runtime deps
 	exitstatus=system("which manpageeditor 2>&1 >/dev/null");
-	gotManEditor=WEXITSTATUS(exitstatus);
+	gotManEditor=(bool)exitstatus;
 	exitstatus=system("which doxygen 2>&1 >/dev/null");
-	gotDoxygen=WEXITSTATUS(exitstatus);
+	gotDoxygen=(bool)exitstatus;
+#ifdef _INBSD_
+	ctagsPath=oneLiner("which exctags");
+#else
+	ctagsPath=oneLiner("which ctags");
+#endif
 
 	if(getuid()!=0)
 		styleName=strdup("classic");
@@ -176,7 +212,7 @@
 	globalPlugins->globalPlugData->tmpFolder=tmpFolderName;
 	globalPlugins->globalPlugData->kkeditVersion=VERSION;
 
-	/*
+/*	
 		for(int j=0;j<globalPlugins->plugCount;j++)
 			{
 				struct pluginData
@@ -192,7 +228,8 @@
 				printf("num %i enabled=%i\n",j,(int)pd->enabled);
 				printf("num %i path=%s\n",j,pd->path);
 			}
-	*/
+*/
+
 //time to nag?
 
 	timeToNag=false;
@@ -269,14 +306,14 @@
 	ERRDATA debugFree(&control);
 
 	exitstatus=system("which curl 2>&1 >/dev/null");
-	gotcurl=WEXITSTATUS(exitstatus);
+	gotcurl=(bool)exitstatus;
 
 	if(gotcurl==0)
 		sinkReturn=asprintf(&command,"curl %s -s -o -",NAGTIMELINK);
 	else
 		{
 			exitstatus=system("which wget 2>&1 >/dev/null");
-			gotwget=WEXITSTATUS(exitstatus);
+			gotwget=(bool)exitstatus;
 			if(gotwget==0)
 				sinkReturn=asprintf(&command,"wget %s -O - -q",NAGTIMELINK);
 		}
diff -Nru kkedit-0.3.3/KKEdit/src/navcallbacks.cpp kkedit-0.4.1/KKEdit/src/navcallbacks.cpp
--- kkedit-0.3.3/KKEdit/src/navcallbacks.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/navcallbacks.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -183,13 +183,16 @@
 	ERRDATA
 }
 
-void gotoLine(GtkWidget *widget,gpointer data)
+VISIBLE void gotoLine(GtkWidget *widget,gpointer data)
 {
 	ERRDATA
 	int			line=(long)data;
 	TextBuffer	*buf;
 	pageStruct	*page=getPageStructByIDFromPage(-1);
 
+	globalPlugins->setUserData("td",FROMGOTO,data);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
 	if(page!=NULL)
 		{
 			buf=new TextBuffer((GtkTextBuffer*)page->buffer);
@@ -686,7 +689,11 @@
 		}
 	else
 		{
+//TODO//
 			gtk_notebook_set_current_page(mainNotebook,(int)(long)data);
+			//gtk_menu_item_get_label((GtkMenuItem*)widget);
+			//globalPlugins->setUserData("ts",FROMEDITMENU,gtk_menu_item_get_label((GtkMenuItem*)widget));
+			//g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
 		}
 
 	page=getPageStructByIDFromPage(-1);
@@ -700,7 +707,8 @@
 
 	ERRDATA
 }
-
+//TODO//
+//segfaults?
 //rebuild tabs menu
 void rebuildTabsMenu(void)
 {
@@ -715,9 +723,11 @@
 	if(submenu!=NULL)
 		gtk_menu_item_set_submenu((GtkMenuItem*)viewTabMenu,NULL);
 
+	ERRDATA
 	viewTabSubMenu=gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(viewTabMenu),viewTabSubMenu);
 
+	ERRDATA
 	for(int j=0;j<numtabs;j++)
 		{
 			page=getPageStructByIDFromPage(j);
@@ -728,6 +738,7 @@
 					g_signal_connect(G_OBJECT(menuitem),"activate",G_CALLBACK(selectTab),(gpointer)(long)j);
 				}
 		}
+	ERRDATA
 	gtk_widget_show_all(viewTabMenu);
 	ERRDATA
 }
diff -Nru kkedit-0.3.3/KKEdit/src/pages.cpp kkedit-0.4.1/KKEdit/src/pages.cpp
--- kkedit-0.3.3/KKEdit/src/pages.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/pages.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -45,7 +45,7 @@
 	int			thispage=-1;
 	GtkWidget	*pageBox=NULL;
 	unsigned	pageid=0;
-
+ERRDATA
 	if(pagenum==-1)
 		thispage=gtk_notebook_get_current_page(mainNotebook);
 	else
@@ -57,6 +57,9 @@
 	else
 		pageid=(unsigned)(long)g_object_get_data((GObject*)pageBox,"pageid");
 
+	if(pageid==0)
+		return(NULL);
+	
 	list=pages;
 	while(list!=NULL)
 		{
@@ -65,5 +68,58 @@
 				return(page);
 			list=list->next;
 		}			
+ERRDATA
 	return(NULL);
 }
+
+pageListData* getCurrentPageListData(void)
+{
+	pageStruct		*page=NULL;
+	GList			*list;
+	int				thispage;
+	GtkWidget		*pageBox=NULL;
+	pageListData	*data=NULL;
+	unsigned		pageid=0;
+	unsigned		cnt=0;
+
+	thispage=gtk_notebook_get_current_page(mainNotebook);
+	pageBox=gtk_notebook_get_nth_page(mainNotebook,thispage);
+	if(pageBox==NULL)
+		return(NULL);
+	else
+		pageid=(unsigned)(long)g_object_get_data((GObject*)pageBox,"pageid");
+
+	list=pages;
+	while(list!=NULL)
+		{
+			page=(pageStruct*)list->data;
+			if((page!=NULL) && (page->pageID==pageid))
+				{
+					data=(pageListData*)calloc(1,sizeof(pageListData));
+					data->page=page;
+					data->list=list;
+					data->listNum=cnt;
+					return(data);
+				}
+			cnt++;
+			list=list->next;
+		}			
+	return(NULL);
+}
+
+#if 0
+pageListData* getNextPage(pageListData *pagedata)
+{
+	pageListData	data=NULL;
+	if(pagedata!=NULL)
+		{
+			if(pagedata->list>next!=NULL)
+				XXXXXXXXXXXXXX
+		}
+	else
+		data=getCurrentPageListData();
+
+	return(sata);
+}
+#endif
+
diff -Nru kkedit-0.3.3/KKEdit/src/pages.h kkedit-0.4.1/KKEdit/src/pages.h
--- kkedit-0.3.3/KKEdit/src/pages.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/pages.h	2016-08-26 09:41:34.000000000 +0000
@@ -21,9 +21,17 @@
 #ifndef _PAGES_
 #define _PAGES_
 
+struct pageListData
+{
+	pageStruct	*page;
+	GList		*list;
+	int			listNum;
+};
+
 extern GList	*pages;
 
 pageStruct *getPageStructByIDFromList(unsigned pageid);
 pageStruct *getPageStructByIDFromPage(int pagenum);
+pageListData *getCurrentPageListData(void);
 
 #endif
diff -Nru kkedit-0.3.3/KKEdit/src/pluginclass.cpp kkedit-0.4.1/KKEdit/src/pluginclass.cpp
--- kkedit-0.3.3/KKEdit/src/pluginclass.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/pluginclass.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -176,9 +176,13 @@
 	else
 		{
 			this->plugCount=0;
-			for(int j=0;j<2;j++)
+		for(int j=0;j<2;j++)
 				{
+#ifdef _INBSD_
+					sinkReturn=asprintf(&command,"find %s -follow -iname \"*.so\" | sort",plugFolderPaths[j]);
+#else
 					sinkReturn=asprintf(&command,"find %s -follow -iname \"*.so\" -printf '%%f/%%p\n' 2>/dev/null| sort -n -t /|cut -f2- -d/",plugFolderPaths[j]);
+#endif
 					pf=popen(command,"r");
 					if(pf!=NULL)
 						{
@@ -308,3 +312,39 @@
 	ERRDATA return(false);
 }
 
+void PluginClass::setUserData(const char *fmt,...)
+{
+	va_list	ap;
+	va_start(ap,fmt);
+
+	while(*fmt)
+		switch(*fmt++)
+			{
+				case 't':
+					this->globalPlugData->userData.type=va_arg(ap,int);
+					break;
+				case 's':
+					this->globalPlugData->userData.userStr=strdup(va_arg(ap,char *));
+        			break;
+				case 'S':
+					this->globalPlugData->userData.userStr2=strdup(va_arg(ap,char *));
+        			break;
+				case 'd':
+					this->globalPlugData->userData.userData=va_arg(ap,void*);
+					break;
+				case 'b':
+					this->globalPlugData->userData.userStart=va_arg(ap,int);
+					break;
+				case 'e':
+					this->globalPlugData->userData.userEnd=va_arg(ap,int);
+					break;
+				case 'i':
+					this->globalPlugData->userData.userInt=va_arg(ap,int);
+					break;
+			}
+	va_end(ap);
+}
+
+
+
+
diff -Nru kkedit-0.3.3/KKEdit/src/pluginclass.h kkedit-0.4.1/KKEdit/src/pluginclass.h
--- kkedit-0.3.3/KKEdit/src/pluginclass.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/pluginclass.h	2016-08-26 09:41:34.000000000 +0000
@@ -19,6 +19,7 @@
  */
 
 #include <gmodule.h>
+#include <stdarg.h>
 
 #include "kkedit-includes.h"
 
@@ -60,6 +61,8 @@
 		bool			enablePlugin(char* name,bool wanttounload);
 		bool			checkForFunction(char* name,const char* func);
 
+		void			setUserData(const char *fmt,...);
+
 	private:
 		GList*			plugEnabledList;
 
diff -Nru kkedit-0.3.3/KKEdit/src/plugins.cpp kkedit-0.4.1/KKEdit/src/plugins.cpp
--- kkedit-0.3.3/KKEdit/src/plugins.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/plugins.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -148,6 +148,7 @@
 	GtkTreeIter			iter;
 	char				*plugname;
 
+	globalPlugins->globalPlugData->prefsWindow=plugwindow;
 	switch(long(data))
 		{
 			case 1:
@@ -263,6 +264,10 @@
 
 	gtk_container_add(GTK_CONTAINER(vbox),hbox);
 	gtk_container_add(GTK_CONTAINER(plugwindow),vbox);
+	gtk_window_set_transient_for((GtkWindow*)plugwindow,(GtkWindow*)mainWindow);
+//gtk_dialog_run ((GtkDialog*)plugwindow);
+
+gtk_window_set_modal ((GtkWindow*)plugwindow,true);
 	gtk_widget_show_all(plugwindow);
 	ERRDATA
 }
diff -Nru kkedit-0.3.3/KKEdit/src/searchcallbacks.cpp kkedit-0.4.1/KKEdit/src/searchcallbacks.cpp
--- kkedit-0.3.3/KKEdit/src/searchcallbacks.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/searchcallbacks.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -20,15 +20,17 @@
 
 #include "kkedit-includes.h"
 
-int currentFindPage=-1;
-int firstPage=-1;
-int pagesChecked=0;
-int	itemsReplaced=-1;
+int				currentFindPage=-1;
+int				firstPage=-1;
+int				pagesChecked=0;
+int				itemsReplaced=-1;
+pageListData	*pageData=NULL;
 
 #ifdef _BUILDDOCVIEWER_
 
 void webKitGoBack(GtkWidget *widget,gpointer data)
 {
+printf("XXXXXXXXX\n");
 	webkit_web_view_go_back((WebKitWebView*)data);
 }
 
@@ -64,7 +66,7 @@
 					else
 						return;
 				}
-			webkit_web_view_load_uri(webView,thePage);
+			webkit_web_view_load_uri(webView,thePage);		
 		}
 
 	if(howtodisplay==USEFILE)
@@ -223,7 +225,7 @@
 		}
 	if((selection!=NULL) &&(data==NULL))
 		{
-			ERRDATA debugFree(&selection);
+			//ERRDATA debugFree(&selection);
 		}
 
 	return(retval);
@@ -858,7 +860,7 @@
 					}
 				break;
 
-			case REPLACE:
+			case REPLACENEXT:
 				fromregexreplace=false;
 				fromregexsinglereplace=false;
 				if(replaceAll==true)
@@ -962,7 +964,220 @@
 		regexFind(FINDPREV);
 }
 
-void basicFind(int dowhat)
+bool	wrapFlag=false;
+
+void showOnStatus(const char *from,const char *to)
+{
+	char	*message=NULL;
+
+	if((showStatus==false))
+		{
+			ERRDATA return;
+		}
+
+	loadingSession=true;
+	gtk_statusbar_remove_all ((GtkStatusbar*)statusWidget,0);
+	sinkReturn=asprintf(&message,REPLACE_INFO_LABEL,itemsReplaced+1,from,to);
+	gtk_statusbar_push((GtkStatusbar*)statusWidget,0,message);
+	loadingSession=false;
+}
+
+bool searchForward(GtkTextIter *start_find,const char *srchtxt,long flags,GtkTextIter *start_match,GtkTextIter *end_match,GtkTextIter *limit)
+{
+#ifdef _USEGTK3_
+	return(gtk_text_iter_forward_search(start_find,srchtxt,(GtkTextSearchFlags)flags,start_match,end_match,limit));
+#else
+	return(gtk_source_iter_forward_search(start_find,srchtxt,(GtkSourceSearchFlags)flags,start_match,end_match,limit));
+#endif
+}
+
+bool searchBackward(GtkTextIter *start_find,const char *srchtxt,long flags,GtkTextIter *start_match,GtkTextIter *end_match,GtkTextIter *limit)
+{
+#ifdef _USEGTK3_
+	return(gtk_text_iter_backward_search(start_find,srchtxt,(GtkTextSearchFlags)flags,start_match,end_match,limit));
+#else
+	return(gtk_source_iter_backward_search(start_find,srchtxt,(GtkSourceSearchFlags)flags,start_match,end_match,limit));
+#endif
+}
+
+#if 0
+void replaceSelectedText(pageStruct *page,const char *reptxt,GtkTextIter start,GtkTextIter end)
+{
+	gtk_text_buffer_delete((GtkTextBuffer*)page->buffer,&start,&end);
+	gtk_text_buffer_insert((GtkTextBuffer*)page->buffer,&start,reptxt,-1);
+	TextBuffer	*buf=new TextBuffer((GtkTextBuffer*)page->buffer);
+	buf->scroll2CentreScreen((GtkTextView*)page->view,true);
+	delete buf;
+}
+
+bool findInPageNoRegex(pageListData *pagedata,const char *srchtxt,const char *reptxt,long srchflags,int dowhat)
+{
+	GtkTextBuffer	*buffer=(GtkTextBuffer*)pagedata->page->buffer;
+	pageStruct		*page=pagedata->page;
+	GtkTextIter		start_find,end_find;
+	GtkTextIter		start_match,end_match;
+	int				offset;
+	bool			foundmatch=false;
+
+	if((dowhat==REPLACENEXT) && (replaceAll==true))
+		{
+			char		*pagetext=NULL;
+			char		*newtxt=NULL;
+			StringSlice	*str=new StringSlice;
+			gtk_text_buffer_get_start_iter(buffer,&start_find);
+			gtk_text_buffer_get_end_iter(buffer,&end_find);
+			pagetext=gtk_text_buffer_get_text (buffer,&start_find,&end_find,true);
+			str->setCaseless(insensitiveSearch);
+			str->setReturnDupString(true);
+			newtxt=str->replaceAllSlice(pagetext,(char*)srchtxt,(char*)reptxt);
+			gtk_text_buffer_begin_user_action (buffer);
+				gtk_text_buffer_set_text (buffer,newtxt,-1);
+			gtk_text_buffer_end_user_action (buffer);
+			debugFree(&pagetext);
+			debugFree(&newtxt);
+			itemsReplaced=str->getResult()*-1;
+			delete str;
+			return;
+		}
+
+	if(page->startChar==-1)
+		{
+			gtk_text_buffer_get_selection_bounds(buffer,&start_find,&end_find);
+			page->startChar=gtk_text_iter_get_offset(&start_find);
+			page->endChar=gtk_text_iter_get_offset(&end_find);
+		}
+
+	gtk_text_buffer_get_start_iter(buffer,&start_find);
+	gtk_text_buffer_get_end_iter(buffer,&end_find);
+	gtk_text_buffer_remove_tag_by_name(buffer,"highlighttag",&start_find,&end_find);  
+
+	if(hightlightAll==true)
+		{
+			while(searchForward(&start_find,srchtxt,srchflags,&start_match,&end_match))
+				{
+					gtk_text_buffer_apply_tag_by_name(buffer,"highlighttag",&start_match,&end_match);
+					offset=gtk_text_iter_get_offset(&end_match);
+					gtk_text_buffer_get_iter_at_offset(buffer,&start_find,offset);
+				}
+		}
+
+//check for already selected txt for replacement
+	if((dowhat==REPLACENEXT) && (gtk_text_buffer_get_has_selection(buffer)))
+		{
+			char	*selectedtxt=NULL;
+			bool	searchresult=false;
+			gtk_text_buffer_get_selection_bounds(buffer,&start_match,&end_match);
+			selectedtxt=gtk_text_buffer_get_text(buffer,&start_match,&end_match,true);
+			
+			if(insensitiveSearch==true)
+				searchresult=((selectedtxt!=NULL) && (strcasecmp(selectedtxt,srchtxt)==0));
+			else
+				searchresult=((selectedtxt!=NULL) && (strcmp(selectedtxt,srchtxt)==0));
+
+			if(searchresult==true)
+				{
+					replaceSelectedText(page,reptxt,start_match,end_match);
+					dowhat=FINDNEXT;
+				}
+		}
+//search forward
+	if((dowhat==FINDNEXT) || (dowhat==REPLACENEXT))
+		{
+			gtk_text_buffer_get_iter_at_offset(buffer,&start_find,page->endChar);
+			foundmatch=searchForward(&start_find,srchtxt,srchflags,&start_match,&end_match);
+		}
+
+//search back
+	if((dowhat==FINDPREV) || (dowhat==REPLACEPREV))
+		{
+			gtk_text_buffer_get_iter_at_offset(buffer,&start_find,page->startChar);
+			foundmatch=searchBackward(&start_find,srchtxt,srchflags,&start_match,&end_match);
+		}
+
+	if(foundmatch==true)
+		{
+			gtk_text_buffer_apply_tag_by_name(buffer,"highlighttag",&start_match,&end_match);
+			page->startChar=gtk_text_iter_get_offset(&start_match);
+			page->endChar=gtk_text_iter_get_offset(&end_match);
+			gtk_text_buffer_select_range (buffer,&start_match,&end_match);
+			TextBuffer	*buf=new TextBuffer(buffer);
+			buf->scroll2CentreScreen((GtkTextView*)page->view,true);
+			delete buf;
+			if(dowhat==REPLACENEXT)
+				replaceSelectedText(page,reptxt,start_match,end_match);
+			
+		}
+	else
+		{
+			if((dowhat==FINDNEXT)  || (dowhat==REPLACENEXT))
+				{
+					if(findInAllFiles==true)
+						{
+							
+						}
+					else
+						{
+							if((wrapSearch==true)
+							if(wrapFlag==false)
+								{
+									wrapFlag=true;
+									page->startChar=0;
+									page->endChar=0;
+									findInPageNoRegex(pagedata,srchtxt,reptxt,srchflags,FINDNEXT);
+								}
+						}
+				}
+		}
+	wrapFlag=false;
+}
+
+VISIBLE void findNoRegex(int dowhat)
+{
+	pageStruct				*page=NULL;
+	char					*searchtext=NULL;
+	char					*replacetext=NULL;
+	bool					founditem=false;
+
+#ifdef _USEGTK3_
+	GtkTextSearchFlags		flags=GTK_TEXT_SEARCH_TEXT_ONLY;
+#else
+	GtkSourceSearchFlags	flags=GTK_SOURCE_SEARCH_TEXT_ONLY;
+#endif
+
+	if(gtk_entry_get_text_length((GtkEntry*)findBox)==0)
+		return;
+
+	if(insensitiveSearch==true)
+#ifdef _USEGTK3_
+		flags=(GtkTextSearchFlags)(GTK_TEXT_SEARCH_TEXT_ONLY|GTK_TEXT_SEARCH_CASE_INSENSITIVE);
+#else
+		flags=(GtkSourceSearchFlags)(GTK_SOURCE_SEARCH_TEXT_ONLY|GTK_SOURCE_SEARCH_CASE_INSENSITIVE);
+#endif
+
+	searchtext=g_strcompress(gtk_entry_get_text((GtkEntry*)findBox));
+	replacetext=g_strcompress(gtk_entry_get_text((GtkEntry*)replaceBox));
+
+	if(pageData==NULL)
+		pagedata=getCurrentPageListData();
+
+	if(pagedata==NULL)
+		return;
+
+//	if(findInAllFiles==false)
+//		{
+			findInPageNoRegex(pagedata,searchtext,replacetext,(long)flags,dowhat);
+//		}
+//	else
+//		{
+//			while
+//		}
+	if(itemsReplaced>-1)
+		showOnStatus(gtk_entry_get_text((GtkEntry*)findBox),gtk_entry_get_text((GtkEntry*)replaceBox));
+	
+}
+#endif
+
+VISIBLE void basicFind(int dowhat)
 {
 	pageStruct				*page=NULL;
 	char					*searchtext=NULL;
@@ -1024,11 +1239,7 @@
 
 	if(hightlightAll==true)
 		{
-#ifdef _USEGTK3_
-			while(gtk_text_iter_forward_search(&start_find,searchtext,flags,&start_match,&end_match,NULL))
-#else
-			while(gtk_source_iter_forward_search(&start_find,searchtext,flags,&start_match,&end_match,NULL))
-#endif
+			while(searchForward(&start_find,searchtext,flags,&start_match,&end_match,NULL))
 				{
 					gtk_text_buffer_apply_tag_by_name((GtkTextBuffer*)page->buffer,"highlighttag",&start_match,&end_match);
 					offset=gtk_text_iter_get_offset(&end_match);
@@ -1047,11 +1258,7 @@
 			else
 				autoSeleced=true;
 
-#ifdef _USEGTK3_
-			if(gtk_text_iter_forward_search(&page->match_end,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-			if(gtk_source_iter_forward_search(&page->match_end,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+			if(searchForward(&page->match_end,searchtext,flags,&page->match_start,&page->match_end,NULL))
 				{
 					found=true;
 					gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
@@ -1063,11 +1270,7 @@
 					if((wrapSearch==true) &&(findInAllFiles==false))
 						{
 							gtk_text_buffer_get_start_iter((GtkTextBuffer*)page->buffer,&page->iter);
-#ifdef _USEGTK3_
-							if(gtk_text_iter_forward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-							if(gtk_source_iter_forward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+							if(searchForward(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
 								{
 									found=true;
 									gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
@@ -1085,11 +1288,7 @@
 
 		if(dowhat==FINDPREV)
 			{
-#ifdef _USEGTK3_
-				if(gtk_text_iter_backward_search(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-				if(gtk_source_iter_backward_search(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+				if(searchBackward(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,NULL))
 					{
 						found=true;
 						gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
@@ -1101,18 +1300,13 @@
 						if((wrapSearch==true) &&(findInAllFiles==false))
 							{
 								gtk_text_buffer_get_end_iter((GtkTextBuffer*)page->buffer,&page->iter);
-#ifdef _USEGTK3_
-								if(gtk_text_iter_backward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-								if(gtk_source_iter_backward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+								if(searchBackward(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
 									{
 										found=true;
 										gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
 										scrollToIterInPane(page,&page->match_start);
 										page->iter=page->match_start;
 									}
-							//	gtk_text_buffer_end_user_action((GtkTextBuffer*)page->buffer);
 								ERRDATA debugFree(&searchtext);
 								ERRDATA debugFree(&replacetext);
 								ERRDATA return;
@@ -1122,15 +1316,13 @@
 					}
 			}
 
-		if((dowhat==REPLACE) &&(replaceAll==false))
+		if((dowhat==REPLACENEXT) &&(replaceAll==false))
 			{
+//	globalPlugins->setUserData("tsSi",FROMBASICFIND,searchtext,replacetext,dowhat);
+//	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
 				if(gtk_text_buffer_get_selection_bounds((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end))
 					{
-#ifdef _USEGTK3_
-						if(gtk_text_iter_forward_search(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,&page->match_end))
-#else
-						if(gtk_source_iter_forward_search(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,&page->match_end))
-#endif
+						if(searchForward(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,&page->match_end))
 							{
 								gtk_text_buffer_delete((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
 								gtk_text_buffer_insert((GtkTextBuffer*)page->buffer,&page->match_start,replacetext,-1);
@@ -1139,7 +1331,7 @@
 				basicFind(FINDNEXT);
 			}
 
-		if((dowhat==REPLACE) &&(findInAllFiles==true) &&(replaceAll==true))
+		if((dowhat==REPLACENEXT) &&(findInAllFiles==true) &&(replaceAll==true))
 			{
 				if(yesNo((char*)DIALOG_YESNO_REPLACE_IN_ALL_FILES,(char*)"")==GTK_RESPONSE_CANCEL)
 					{
@@ -1149,12 +1341,12 @@
 						for(int j=0;j<gtk_notebook_get_n_pages(mainNotebook);j++)
 							{
 								gtk_notebook_set_current_page(mainNotebook,j);
-								basicFind(REPLACE);
+								basicFind(REPLACENEXT);
 							}
 						findInAllFiles=true;
 			}
 
-		if((dowhat==REPLACE) &&(replaceAll==true))
+		if((dowhat==REPLACENEXT) &&(replaceAll==true))
 			{
 
 			if((gtk_text_buffer_get_has_selection((GtkTextBuffer*)page->buffer)==true) &&(autoSeleced==false))
@@ -1196,21 +1388,6 @@
 	gtk_entry_set_text((GtkEntry*)data,gtk_combo_box_text_get_active_text((GtkComboBoxText*)widget));
 }
 
-void showOnStatus(const char *from,const char *to)
-{
-	char	*message=NULL;
-
-	if((showStatus==false))
-		{
-			ERRDATA return;
-		}
-
-	loadingSession=true;
-	gtk_statusbar_remove_all ((GtkStatusbar*)statusWidget,0);
-	sinkReturn=asprintf(&message,REPLACE_INFO_LABEL,itemsReplaced+1,from,to);
-	gtk_statusbar_push((GtkStatusbar*)statusWidget,0,message);
-}
-
 void doFindReplace(GtkDialog *dialog,gint response_id,gpointer user_data)
 {
 	bool		flag=false;
@@ -1223,7 +1400,7 @@
 	if(response_id==GTK_RESPONSE_DELETE_EVENT)
 		return;
 
-	if(response_id!=REPLACE)
+	if(response_id!=REPLACENEXT)
 		{
 			drop=findDropBox;
 			entry=findBox;
@@ -1266,12 +1443,13 @@
 	currentFindPage=gtk_notebook_get_current_page(mainNotebook);
 	pagesChecked=0;
 
-	if(response_id!=REPLACE)
+	if(response_id!=REPLACENEXT)
 		findList=list;
 	else
 		replaceList=list;
 
 	if(useRegex==false)
+		//findNoRegex(response_id);
 		basicFind(response_id);
 	else
 		regexFind(response_id);
@@ -1282,8 +1460,18 @@
 
 VISIBLE void find(GtkWidget *widget,gpointer data)
 {
-	gtk_widget_show(findReplaceDialog);
-	gtk_dialog_run((GtkDialog *)findReplaceDialog);
+	globalPlugins->setUserData("ts",FROMEDITMENU,FINDMENUNAME);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
+	gtk_window_present((GtkWindow*)findReplaceDialog);
+}
+
+VISIBLE void findNext(GtkWidget *widget,gpointer data)
+{
+	globalPlugins->setUserData("ts",FROMEDITMENU,FINDNEXTMENUNAME);
+	g_list_foreach(globalPlugins->plugins,plugRunFunction,(gpointer)"informPlugin");
+
+	basicFind(FINDNEXT);
 }
 
 void doSearchPrefs(GtkWidget *widget,gpointer data)
@@ -1300,7 +1488,7 @@
 				break;
 			case 3:
 				replaceAll=gtk_toggle_button_get_active((GtkToggleButton*)widget);
-				button=gtk_dialog_get_widget_for_response((GtkDialog*)findReplaceDialog,REPLACE);
+				button=gtk_dialog_get_widget_for_response((GtkDialog*)findReplaceDialog,REPLACENEXT);
 				if(replaceAll==false)
 					gtk_button_set_label((GtkButton*)button,FIND_REPLACE_LABEL);
 				else
@@ -1343,12 +1531,7 @@
 		{
 			if(!gtk_text_buffer_get_selection_bounds((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end))
 				gtk_text_buffer_get_iter_at_mark((GtkTextBuffer*)page->buffer,&page->iter,gtk_text_buffer_get_insert((GtkTextBuffer*)page->buffer));
-
-#ifdef _USEGTK3_
-			if(gtk_text_iter_forward_search(&page->match_end,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-			if(gtk_source_iter_forward_search(&page->match_end,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+			if(searchForward(&page->match_end,searchtext,flags,&page->match_start,&page->match_end,NULL))
 				{
 					gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
 					scrollToIterInPane(page,&page->match_start);
@@ -1357,11 +1540,7 @@
 			else
 				{
 					gtk_text_buffer_get_start_iter((GtkTextBuffer*)page->buffer,&page->iter);
-#ifdef _USEGTK3_
-					if(gtk_text_iter_forward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-					if(gtk_source_iter_forward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+					if(searchForward(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
 						{
 							gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
 							scrollToIterInPane(page,&page->match_start);
@@ -1373,11 +1552,7 @@
 		{
 			if(!gtk_text_buffer_get_selection_bounds((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end))
 				gtk_text_buffer_get_iter_at_mark((GtkTextBuffer*)page->buffer,&page->iter,gtk_text_buffer_get_insert((GtkTextBuffer*)page->buffer));
-#ifdef _USEGTK3_
-			if(gtk_text_iter_backward_search(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-			if(gtk_source_iter_backward_search(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+			if(searchBackward(&page->match_start,searchtext,flags,&page->match_start,&page->match_end,NULL))
 				{
 					gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
 					scrollToIterInPane(page,&page->match_start);
@@ -1386,11 +1561,7 @@
 			else
 				{
 					gtk_text_buffer_get_end_iter((GtkTextBuffer*)page->buffer,&page->iter);
-#ifdef _USEGTK3_
-					if(gtk_text_iter_backward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#else
-					if(gtk_source_iter_backward_search(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
-#endif
+					if(searchBackward(&page->iter,searchtext,flags,&page->match_start,&page->match_end,NULL))
 						{
 							gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&page->match_start,&page->match_end);
 							scrollToIterInPane(page,&page->match_start);
diff -Nru kkedit-0.3.3/KKEdit/src/searchcallbacks.h kkedit-0.4.1/KKEdit/src/searchcallbacks.h
--- kkedit-0.3.3/KKEdit/src/searchcallbacks.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/searchcallbacks.h	2016-08-26 09:41:34.000000000 +0000
@@ -31,6 +31,7 @@
 
 void doFindReplace(GtkDialog *dialog,gint response_id,gpointer user_data);
 void find(GtkWidget *widget,gpointer data);
+void findNext(GtkWidget *widget,gpointer data);
 void doSearchPrefs(GtkWidget *widget,gpointer data);
 void docSearchFromBar(GtkWidget *widget,gpointer data);
 bool defSearchFromBar(GtkWidget *widget,gpointer data);
diff -Nru kkedit-0.3.3/KKEdit/src/textbuffer.cpp kkedit-0.4.1/KKEdit/src/textbuffer.cpp
--- kkedit-0.3.3/KKEdit/src/textbuffer.cpp	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/textbuffer.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -248,4 +248,23 @@
 	ERRDATA gtk_text_view_scroll_to_iter(view,&iter,0,true,0,0.5);
 }
 
+void TextBuffer::getSelectionBounds(void)
+{
+	bool		gotbounds=false;
+	GtkTextIter	start;
+	GtkTextIter	end;
+
+	gotbounds=gtk_text_buffer_get_selection_bounds(this->textBuffer,&start,&end);
+	if(gotbounds==true)
+		{
+			this->selectionStart=gtk_text_iter_get_offset(&start);
+			this->selectionEnd=gtk_text_iter_get_offset(&end);
+		}
+	else
+		{
+			this->selectionStart=-1;
+			this->selectionEnd=-1;
+		}
+}
+
 
diff -Nru kkedit-0.3.3/KKEdit/src/textbuffer.h kkedit-0.4.1/KKEdit/src/textbuffer.h
--- kkedit-0.3.3/KKEdit/src/textbuffer.h	2016-05-23 09:23:34.000000000 +0000
+++ kkedit-0.4.1/KKEdit/src/textbuffer.h	2016-08-26 09:41:34.000000000 +0000
@@ -39,6 +39,9 @@
 		int				column;
 		int				charPos;
 
+		int				selectionStart;
+		int				selectionEnd;
+
 		void getLineData(void);
 
 		void getVisibleLine(void);
@@ -68,6 +71,8 @@
 		void scroll2CentreScreen(GtkTextView *view,bool doupdate);
 
 		char *getLineText(void);
+		void getSelectionBounds(void);
+
 	private:
 };
 
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/browserplugin.cpp kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/browserplugin.cpp
--- kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/browserplugin.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/browserplugin.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,572 @@
+/*
+ *
+ * ©K. D. Hedger. Sun  7 Aug 13:01:41 BST 2016 kdhedger68713@gmail.com
+
+ * This file (browserplugin.cpp) is part of plugins.
+
+ * plugins is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+
+ * plugins is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with plugins.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <gmodule.h>
+#include <libgen.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+//#include <vte/vte.h>
+//#include <gdk/gdkkeysyms.h>
+#include <webkit/webkit.h>
+//#include <webkit2/webkit2.h>
+#include <libintl.h>
+#include <locale.h>
+
+#include "../config.h"
+#include "../common.h"
+#include "../kkedit-plugins.h"
+
+#define PLUGVERSION VERSION
+#ifdef _USEGTK3_
+#define TEXTDOMAIN "browserplugin-3" 
+#define ABOUTICON "KKEditPlug-3"
+#else
+#define TEXTDOMAIN "browserplugin" 
+#define ABOUTICON "KKEditPlug"
+#endif
+
+#define GHELPFOLDER DATADIR _EXECSUFFIX_ "/help"
+
+//#define MENU_GO_BACK_LABEL gettext("_Back")
+//#define MENU_GO_FORWARD_LABEL DIALOG_GO_FORWARD_LABEL
+extern GtkWidget *createNewStockButton(const char *stock,const char *label);
+extern char	*thePage;
+
+int	(*module_plug_function)(gpointer globaldata);
+
+WebKitWebView	*browser=NULL;
+GtkWidget		*hideMenu=NULL;
+bool			showing=false;
+//GtkWidget		*swindow;
+GtkWidget		*webWindow=NULL;
+//GtkWidget		*mainBrowserWindow=NULL;
+char			*currentdomain=NULL;
+int				sinkInt;
+
+//args		mydata[]=
+//				{
+//					{"forecol",TYPESTRING,&foreColour},
+//					{"backcol",TYPESTRING,&backColour},
+//					{NULL,0,NULL}
+//				};
+
+void setTextDomain(bool plugdomain,plugData* pdata)
+{
+	if(plugdomain==true)
+		{
+			//set domain to plug
+			bindtextdomain(TEXTDOMAIN,LOCALEDIR);
+			textdomain(TEXTDOMAIN);
+			bind_textdomain_codeset(TEXTDOMAIN,"UTF-8");
+		}
+	else
+		{
+			//resetdomain
+			bindtextdomain(currentdomain,pdata->locale);
+			textdomain(currentdomain);
+			bind_textdomain_codeset(currentdomain,"UTF-8");	
+		}
+}
+//G_DEFINE_TYPE(WebKitWebView, webkit_web_view, GTK_TYPE_CONTAINER)
+
+void touch(char* path)
+{
+	int	fd;
+
+	fd=open(path,O_WRONLY|O_CREAT,DEFFILEMODE);
+	if(fd!=-1)
+		close(fd);
+}
+
+extern "C" const gchar* g_module_check_init(GModule *module)
+{
+	currentdomain=strdup(textdomain(NULL));
+	return(NULL);
+}
+
+extern "C" void g_module_unload(GModule *module)
+{
+	return;
+}
+
+void doStartUpCheck(plugData* pdata)
+{
+	char*	filepath;
+
+	sinkInt=asprintf(&filepath,"%s/browser.rc",pdata->lPlugFolder);
+	if(g_file_test(filepath,G_FILE_TEST_EXISTS))
+		showing=true;
+	else
+		showing=false;
+
+	debugFree(&filepath);
+}
+
+void showHideBrowser(plugData* plugdata,bool startup)
+{
+	char*	filepath;
+
+	setTextDomain(true,plugdata);
+	sinkInt=asprintf(&filepath,"%s/browser.rc",plugdata->lPlugFolder);
+	if(showing==true)
+		{
+			gtk_widget_show_all((GtkWidget*)browser);
+			if(plugdata->bottomShow==0 && startup==false)
+				showTop(false);
+			touch(filepath);
+			gtk_menu_item_set_label((GtkMenuItem*)hideMenu,gettext("Hide Browser"));
+		}
+	else
+		{
+			gtk_widget_show_all((GtkWidget*)browser);
+			unlink(filepath);
+			if(plugdata->bottomShow==1 && startup==false)
+				hideTop(false);
+			gtk_menu_item_set_label((GtkMenuItem*)hideMenu,gettext("Show Browser"));
+		}
+	setTextDomain(false,plugdata);
+	debugFree(&filepath);
+}
+
+extern "C" int loadPage(plugData* pdata)
+{
+//	if(thePage!=NULL)
+//		webkit_web_view_load_uri(browser,thePage);
+
+webkit_web_view_load_uri(browser,"file:///usr/local/share/KKEdit/help/help.en.html");
+	return(0);
+}
+
+void toggleBrowser(GtkWidget* widget,gpointer data)
+{
+
+	showing=!showing;
+	showHideBrowser((plugData*)data,false);
+}
+
+
+//gboolean doButton(GtkWidget *widget, GdkEventButton *event,gpointer data)
+//{
+//	int button, event_time;
+//
+//	gtk_widget_set_can_focus(terminal,true);
+//	gtk_widget_grab_focus(terminal);
+//
+/////* Ignore double-clicks and triple-clicks */
+//  if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+//    {
+//		gtk_widget_show_all(contextMenu);
+//		if (event)
+//			{
+//				button=event->button;
+//				event_time=event->time;
+//			}
+//		else
+//			{
+//				button=0;
+//				event_time=gtk_get_current_event_time();
+//				}
+//
+//		gtk_menu_popup(GTK_MENU(contextMenu),NULL,NULL,NULL,NULL,button,event_time);
+//	}
+//	return(false);
+//}
+//
+//gboolean on_key_press (GtkWidget *terminal, GdkEventKey *event)
+//{
+//	if (event->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK))
+//		{
+//			switch (event->keyval)
+//				{
+//				case GDK_C:
+//					vte_terminal_copy_clipboard (VTE_TERMINAL (terminal));
+//					return true;
+//				case GDK_V:
+//					vte_terminal_paste_clipboard (VTE_TERMINAL (terminal));
+//					return true;
+//				}
+//		}
+//	return false;
+//}
+//
+//void copyFromTerm(GtkWidget* widget,gpointer data)
+//{
+//	vte_terminal_copy_clipboard((VteTerminal*)terminal);
+//}
+//
+//void pasteToTerm(GtkWidget* widget,gpointer data)
+//{
+//	vte_terminal_paste_clipboard((VteTerminal*)terminal);
+//}
+//
+//void selectAllInTerm(GtkWidget* widget,gpointer data)
+//{
+//	vte_terminal_select_all((VteTerminal*)terminal);
+//}
+
+//void makeMenu(gpointer plugdata)
+//{
+//	GtkWidget *popmenuitem;
+//
+//	contextMenu=gtk_menu_new ();
+//
+//	setTextDomain(true,(plugData*)plugdata);
+//	popmenuitem=gtk_menu_item_new_with_label(gettext("Hide Browser"));
+//	g_signal_connect(G_OBJECT(popmenuitem),"activate",G_CALLBACK(toggleBrowser),plugdata);
+//	gtk_menu_shell_append(GTK_MENU_SHELL(contextMenu),popmenuitem);
+//
+//	popmenuitem=gtk_menu_item_new_with_label(gettext("CD To Page"));
+//	g_signal_connect(G_OBJECT(popmenuitem),"activate",G_CALLBACK(cdHere),plugdata);
+//	gtk_menu_shell_append(GTK_MENU_SHELL(contextMenu),popmenuitem);
+//
+//	popmenuitem=gtk_menu_item_new_with_label(gettext("Copy"));
+//	g_signal_connect(G_OBJECT(popmenuitem),"activate",G_CALLBACK(copyFromTerm),plugdata);
+//	gtk_menu_shell_append(GTK_MENU_SHELL(contextMenu),popmenuitem);
+//
+//	popmenuitem=gtk_menu_item_new_with_label(gettext("Paste"));
+//	g_signal_connect(G_OBJECT(popmenuitem),"activate",G_CALLBACK(pasteToTerm),plugdata);
+//	gtk_menu_shell_append(GTK_MENU_SHELL(contextMenu),popmenuitem);
+//
+//	popmenuitem=gtk_menu_item_new_with_label(gettext("Select All"));
+//	g_signal_connect(G_OBJECT(popmenuitem),"activate",G_CALLBACK(selectAllInTerm),plugdata);
+//	gtk_menu_shell_append(GTK_MENU_SHELL(contextMenu),popmenuitem);
+//	setTextDomain(false,(plugData*)plugdata);
+//}
+
+void webKitGoBack(GtkWidget *widget,gpointer data)
+{
+printf("XXXXXXXXX\n");
+	webkit_web_view_go_back((WebKitWebView*)data);
+}
+
+GtkWidget* buildGtkDocViewer(void)
+{
+	GtkWidget	*vbox;
+	GtkWidget	*hbox;
+	GtkWidget	*button;
+	GtkWidget	*scrolledWindow;
+	GtkWidget	*entry;
+	GtkWidget	*findbutton;
+	GtkWidget	*findnextinpage;
+	WebKitWebSettings	*settings;
+	GtkWidget	*webVBox=NULL;
+
+//TODO//
+//	docView=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+//	gtk_window_set_title((GtkWindow*)docView,DOCVIEW_DOCVIEWER_LABEL);
+
+//	gtk_window_set_default_size((GtkWindow*)docView,docWindowWidth,docWindowHeight);
+//	if(docWindowX!=-1 && docWindowY!=-1)
+//		gtk_window_move((GtkWindow *)docView,docWindowX,docWindowY);
+
+	webVBox=createNewBox(NEWVBOX,false,0);
+	hbox=createNewBox(NEWHBOX,false,4);
+//	gtk_box_pack_start(GTK_BOX(webVBox),hbox,false,false,4);
+
+	webWindow=gtk_scrolled_window_new(NULL,NULL);
+	browser=WEBKIT_WEB_VIEW(webkit_web_view_new());
+	gtk_container_add(GTK_CONTAINER(webWindow),(GtkWidget*)browser);
+
+//	g_signal_connect(G_OBJECT(webView),"navigation-policy-decision-requested",G_CALLBACK(docLinkTrap),NULL);
+
+//	settings=webkit_web_view_get_settings(browser);
+//	g_object_set((gpointer)settings,"enable-file-access-from-file-uris",true,NULL);
+//	g_object_set((gpointer)settings,"enable-page-cache",true,NULL);
+//	g_object_set((gpointer)settings,"enable-plugins",false,NULL);
+//	g_object_set((gpointer)settings,"enable-caret-browsing",true,NULL);
+//	g_object_set((gpointer)settings,"enable-private-browsing",true,NULL);
+//	g_object_set((gpointer)settings,"enable-java-applet",false,NULL);
+//
+//	scrolledWindow=gtk_scrolled_window_new(NULL,NULL);
+//	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow),GTK_POLICY_ALWAYS,GTK_POLICY_ALWAYS);
+////	gtk_container_add_with_viewport(GTK_CONTAINER(scrolledWindow),GTK_WIDGET(browser));
+//gtk_scrolled_window_add_with_viewport((GtkScrolledWindow*)scrolledWindow,GTK_WIDGET(browser));
+
+//
+//	//button=createNewStockButton(GTK_STOCK_GO_BACK,MENU_GO_BACK_LABEL);
+	button=createNewStockButton(GTK_STOCK_GO_BACK,"Back");
+	gtk_box_pack_start(GTK_BOX(hbox),button,false,false,4);
+	g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(webKitGoBack),(void*)browser);	
+//
+//spacer
+	gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(" "),true,false,0);
+
+////	button=createNewStockButton(GTK_STOCK_HOME,DOCVIEW_HOME_LABEL);
+	button=createNewStockButton(GTK_STOCK_HOME,"Home");
+	gtk_box_pack_start(GTK_BOX(hbox),button,false,false,4);
+//	g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(webKitGoHome),(void*)webView);	
+ 
+//spacer
+	gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(" "),true,false,0);
+
+	entry=gtk_entry_new();
+//	//findbutton=createNewStockButton(GTK_STOCK_FIND,MENU_FIND_LABEL);
+	findbutton=createNewStockButton(GTK_STOCK_FIND,"Find");
+	gtk_box_pack_start(GTK_BOX(hbox),findbutton,false,false,0);
+//	g_signal_connect(G_OBJECT(findbutton),"clicked",G_CALLBACK(docSearchFromBar),(void*)entry);	
+
+	gtk_box_pack_start(GTK_BOX(hbox),entry,false,true,0);
+//	g_signal_connect_after(G_OBJECT(entry),"activate",G_CALLBACK(docSearchFromBar),(void*)entry);
+
+//	//findnextinpage=createNewStockButton(GTK_STOCK_GO_DOWN,DOCVIEW_GO_DOWN_LABEL);
+	findnextinpage=createNewStockButton(GTK_STOCK_GO_DOWN,"Down");
+	gtk_box_pack_start(GTK_BOX(hbox),findnextinpage,false,false,0);
+//	g_signal_connect(G_OBJECT(findnextinpage),"clicked",G_CALLBACK(docSearchInPageFoward),(void*)entry);
+
+//	//findbutton=createNewStockButton(GTK_STOCK_GO_UP,DOCVIEW_GO_UP_LABEL);
+	findbutton=createNewStockButton(GTK_STOCK_GO_UP,"Up");
+	gtk_box_pack_start(GTK_BOX(hbox),findbutton,false,false,0);
+//	g_signal_connect(G_OBJECT(findbutton),"clicked",G_CALLBACK(docSearchInPageBack),(void*)entry);
+
+//spacer
+	gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(" "),true,false,0);
+
+////	button=createNewStockButton(GTK_STOCK_GO_FORWARD,DIALOG_GO_FORWARD_LABEL);
+	button=createNewStockButton(GTK_STOCK_GO_FORWARD,"Forward");
+	gtk_box_pack_start(GTK_BOX(hbox),button,false,false,4);
+//	g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(webKitGoForward),(void*)webView);	
+
+//
+////	gtk_container_add(GTK_CONTAINER(docView),vbox);
+//	gtk_widget_grab_focus(GTK_WIDGET(browser));
+//
+////	g_signal_connect_object(G_OBJECT(docView),"delete-event",G_CALLBACK(toggleDocviewer),G_OBJECT(docView),G_CONNECT_SWAPPED);
+//
+//	const char *lang;
+////
+////	if(strncmp(localeLang,"en",2)==0)
+//		lang="en";
+////	else
+////		lang="fr";
+//
+//	//sinkInt=asprintf(&thePage,"file://%s/help.%s.html",GHELPFOLDER,lang);
+//	//webkit_web_view_load_uri(browser,"file:///usr/share/KKEdit/help/help.en.html");
+//	//freeAndNull(&thePage);
+//	//free(thePage);
+//	//thePage=NULL;
+//// gtk_widget_grab_focus(GTK_WIDGET(browser));
+
+	
+	gtk_box_pack_start((GtkBox*)webVBox,webWindow,true,true,0);
+	gtk_box_pack_start(GTK_BOX(webVBox),hbox,false,false,4);
+
+	return(webVBox);
+}
+
+extern "C" int addToGui(gpointer data)
+{
+	GtkWidget*	menu;
+	plugData*	plugdata=(plugData*)data;
+	char*		filename;
+
+	setTextDomain(true,plugdata);
+	menu=gtk_menu_item_get_submenu((GtkMenuItem*)plugdata->mlist.menuView);
+	hideMenu=gtk_menu_item_new_with_label(gettext("Hide Browser"));
+	g_signal_connect(G_OBJECT(hideMenu),"activate",G_CALLBACK(toggleBrowser),plugdata);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu),hideMenu);
+	gtk_widget_show_all(plugdata->mlist.menuView);
+
+//TODO//
+//	sinkInt=asprintf(&filename,"%s/terminalpane.rc",plugdata->lPlugFolder);
+//	loadVarsFromFile(filename,mydata);
+//	debugFree(&filename);
+//
+
+//	webWindow=gtk_scrolled_window_new(NULL,NULL);
+	//buildGtkDocViewer();
+//	gtk_container_add(GTK_CONTAINER(webWindow),(GtkWidget*)browser);
+	//gtk_widget_show_all(widg);
+	
+//	gtk_box_pack_start((GtkBox*)plugdata->bottomUserBox,(GtkWidget*)browser,true,true,0);
+	gtk_box_pack_start((GtkBox*)plugdata->bottomUserBox,buildGtkDocViewer(),true,true,0);
+	
+	gtk_widget_show_all(plugdata->bottomUserBox);
+
+//	g_signal_connect(terminal,"key-press-event",G_CALLBACK(on_key_press),NULL);
+//	g_signal_connect(terminal,"button-press-event",G_CALLBACK(doButton),(void*)plugdata);
+//	startterm[0]=vte_get_user_shell();
+//
+//#ifdef _USEGTK3_
+//
+//#ifdef _VTEVERS290_
+//	vte_terminal_fork_command_full((VteTerminal *)terminal,VTE_PTY_DEFAULT,NULL,startterm,NULL,(GSpawnFlags)(G_SPAWN_DEFAULT|G_SPAWN_LEAVE_DESCRIPTORS_OPEN),NULL,NULL,&childPid,NULL);
+//#else
+//	vte_terminal_spawn_sync((VteTerminal *)terminal,VTE_PTY_DEFAULT,NULL,startterm,NULL,(GSpawnFlags)(G_SPAWN_DEFAULT|G_SPAWN_LEAVE_DESCRIPTORS_OPEN),NULL,NULL,&childPid,NULL,NULL);
+//#endif
+//
+//#else
+//	vte_terminal_fork_command_full((VteTerminal *)terminal,VTE_PTY_DEFAULT,NULL,startterm,NULL,(GSpawnFlags)(G_SPAWN_LEAVE_DESCRIPTORS_OPEN),NULL,NULL,&childPid,NULL);
+//#endif
+
+	doStartUpCheck(plugdata);
+	showHideBrowser(plugdata,true);
+	if(showing==true)
+		showTop(false);
+	else
+		hideTop(false);
+
+	//makeMenu(plugdata);
+	setTextDomain(false,plugdata);
+//	webkit_web_view_load_uri(browser,"file:///usr/share/KKEdit/help/help.en.html");
+//	webkit_web_view_load_uri(browser,"file:///usr/local/share/KKEdit/help/help.en.html");
+	webkit_web_view_load_uri(browser,"http://google.com");
+    gtk_widget_grab_focus(GTK_WIDGET(browser));
+	return(0);
+}
+
+extern "C" int plugPrefs(gpointer data)
+{
+#if 0
+	GtkWidget*	dialog;
+	GtkWidget*	dialogbox;
+	GtkWidget*	fcolour;
+	GtkWidget*	bcolour;
+	GtkWidget*	vbox;
+	int			response;
+#ifdef _USEGTK3_
+	GdkRGBA		colour;
+#else
+	GdkColor	colour;
+#endif
+	char*		filename;
+
+	plugData*	plugdata=(plugData*)data;
+
+	setTextDomain(true,plugdata);
+	vbox=createNewBox(NEWVBOX,false,0);
+	dialog=gtk_dialog_new_with_buttons(gettext("Browser Pane"),NULL,GTK_DIALOG_MODAL,GTK_STOCK_APPLY,GTK_RESPONSE_APPLY,GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,NULL);
+	gtk_window_set_default_size((GtkWindow*)dialog,300,120);
+	dialogbox=gtk_dialog_get_content_area((GtkDialog*)dialog);
+	gtk_container_add(GTK_CONTAINER(dialogbox),vbox);
+
+	fcolour=gtk_entry_new();
+	bcolour=gtk_entry_new();
+
+	gtk_entry_set_text((GtkEntry*)fcolour,foreColour);
+	gtk_entry_set_text((GtkEntry*)bcolour,backColour);
+	gtk_box_pack_start((GtkBox*)vbox,gtk_label_new(gettext("Foreground Colour")),true,true,4);
+	gtk_box_pack_start((GtkBox*)vbox,fcolour,true,true,4);
+	gtk_box_pack_start((GtkBox*)vbox,gtk_label_new(gettext("Background Colour")),true,true,4);
+	gtk_box_pack_start((GtkBox*)vbox,bcolour,true,true,4);
+
+	gtk_widget_show_all(dialog);
+	response=gtk_dialog_run(GTK_DIALOG(dialog));
+	if(response==GTK_RESPONSE_APPLY);
+		{
+			free(foreColour);
+			free(backColour);
+			foreColour=strdup((char*)gtk_entry_get_text((GtkEntry*)fcolour));
+			backColour=strdup((char*)gtk_entry_get_text((GtkEntry*)bcolour));
+
+			sinkInt=asprintf(&filename,"%s/terminalpane.rc",plugdata->lPlugFolder);
+			saveVarsToFile(filename,mydata);
+			debugFree(&filename);
+			
+			vte_terminal_set_default_colors((VteTerminal*)terminal);
+#ifdef _USEGTK3_
+			gdk_rgba_parse(&colour,(const gchar*)foreColour);
+#ifdef _VTEVERS290_
+			vte_terminal_set_color_foreground_rgba((VteTerminal*)terminal,(const GdkRGBA*)&colour);
+#else
+			vte_terminal_set_color_foreground((VteTerminal*)terminal,(const GdkRGBA*)&colour);
+#endif
+			gdk_rgba_parse(&colour,(const gchar*)backColour);
+#ifdef _VTEVERS290_
+			vte_terminal_set_color_background_rgba((VteTerminal*)terminal,(const GdkRGBA*)&colour);
+#else
+			vte_terminal_set_color_background((VteTerminal*)terminal,(const GdkRGBA*)&colour);
+#endif
+#else
+			gdk_color_parse((const gchar*)foreColour,&colour);
+			vte_terminal_set_color_foreground((VteTerminal*)terminal,(const GdkColor*)&colour);
+			gdk_color_parse((const gchar*)backColour,&colour);
+			vte_terminal_set_color_background((VteTerminal*)terminal,(const GdkColor*)&colour);
+#endif
+			gtk_widget_show_all(terminal);
+		}
+	gtk_widget_destroy((GtkWidget*)dialog);
+
+	setTextDomain(false,plugdata);
+#endif
+	return(0);
+}
+
+extern "C" int doAbout(gpointer data)
+{
+	plugData		*plugdata=(plugData*)data;
+	char			*licencepath;
+	const char		copyright[] ="Copyright \xc2\xa9 2014 K.D.Hedger";
+	char			*licence;
+	GtkAboutDialog	*about;
+	char			*translators;
+
+	setTextDomain(true,plugdata);
+
+	const char*		aboutboxstring=gettext("A Simple Browser Pane For KKEdit");
+	sinkInt=asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
+	sinkInt=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
+
+	g_file_get_contents(licencepath,&licence,NULL,NULL);
+	about=(GtkAboutDialog*)gtk_about_dialog_new();
+	gtk_about_dialog_set_program_name(about,gettext("Browser Pane"));
+	gtk_about_dialog_set_authors(about,authors);
+	gtk_about_dialog_set_comments(about,aboutboxstring);
+	gtk_about_dialog_set_copyright(about,copyright);
+	gtk_about_dialog_set_version(about,PLUGVERSION);
+	gtk_about_dialog_set_website(about,MYWEBSITE);
+	gtk_about_dialog_set_logo_icon_name(about,ABOUTICON);
+	gtk_about_dialog_set_license(about,licence);
+	gtk_about_dialog_set_translator_credits(about,(const gchar*)translators);
+
+	gtk_dialog_run(GTK_DIALOG(about));
+	gtk_widget_destroy((GtkWidget*)about);
+	free(licence);
+	free(licencepath);
+	free(translators);
+	setTextDomain(false,plugdata);
+	return(0);
+}
+
+extern "C" int enablePlug(gpointer data)
+{
+	plugData*		plugdata=(plugData*)data;
+
+	if(plugdata->modData->unload==true)
+		{
+			return(1);
+		}
+	else
+		{
+			if(g_module_symbol(plugdata->modData->module,"addToGui",(gpointer*)&module_plug_function))
+				module_plug_function(data);
+			gtk_widget_show_all(plugdata->mlist.menuBar);
+		}
+	return(0);
+}
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/exportmap kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/exportmap
--- kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/exportmap	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/exportmap	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,12 @@
+{
+global:	addToGui;
+		doAbout;
+		enablePlug;
+		loadPage;
+		plugPrefs;
+		g_module_unload;
+		g_module_check_init;
+
+local: *;
+
+};
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/Makefile.am kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/Makefile.am
--- kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,21 @@
+PLUGNAME = browserplugin
+SONAME = libbrowserplugin
+SRCFILES = $(PLUGNAME).cpp
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c $(SRCFILES) $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) $(WEBKIT_CFLAGS) $(WEBKIT_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o $(PLUGNAME).o
+
+	gcc -nodefaultlibs -shared -Wl,-rpath=/usr/local/lib/gcc49,--version-script=exportmap,-soname,$(SONAME).so -o $(SONAME).so $(PLUGNAME).o -lc
+
+
+clean: distclean
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp $(SONAME).so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/$(PLUGNAME).mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/Makefile.in kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/Makefile.in
--- kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/Makefile.in	2016-08-26 09:41:40.000000000 +0000
@@ -0,0 +1,454 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = KKEdit/unstable-plugins/BrowserPlugin
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASPELL_LIBS = @ASPELL_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
+EXEEXT = @EXEEXT@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+GTK3SUFFIX = @GTK3SUFFIX@
+GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
+GTKSRC_LIBS = @GTKSRC_LIBS@
+GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANPAGEEDITOR = @MANPAGEEDITOR@
+MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGDIRS = @PLUGDIRS@
+PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE290 = @USE290@
+VERSION = @VERSION@
+VTEVERS = @VTEVERS@
+VTE_CFLAGS = @VTE_CFLAGS@
+VTE_LIBS = @VTE_LIBS@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_debug_level = @with_debug_level@
+with_gsu_path = @with_gsu_path@
+with_qt5_docdir = @with_qt5_docdir@
+PLUGNAME = browserplugin
+SONAME = libbrowserplugin
+SRCFILES = $(PLUGNAME).cpp
+AUTOMAKE_OPTIONS = subdir-objects
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu KKEdit/unstable-plugins/BrowserPlugin/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu KKEdit/unstable-plugins/BrowserPlugin/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c $(SRCFILES) $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) $(WEBKIT_CFLAGS) $(WEBKIT_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o $(PLUGNAME).o
+
+	gcc -nodefaultlibs -shared -Wl,-rpath=/usr/local/lib/gcc49,--version-script=exportmap,-soname,$(SONAME).so -o $(SONAME).so $(PLUGNAME).o -lc
+
+clean: distclean
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp $(SONAME).so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/$(PLUGNAME).mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/unstable-plugins/BrowserPlugin/po/fr_FR/LC_MESSAGES/browserplugin.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/unstable-plugins/BrowserPlugin/po/fr_FR/LC_MESSAGES/browserplugin.mo differ
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/common.h kkedit-0.4.1/KKEdit/unstable-plugins/common.h
--- kkedit-0.3.3/KKEdit/unstable-plugins/common.h	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/common.h	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ *
+ * ©K. D. Hedger. Mon 28 Mar 16:34:26 BST 2016 kdhedger68713@gmail.com
+
+ * This file (common.h) is part of KKEditPlugins.
+
+ * Projects is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+
+ * Projects is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with Projects.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+//#include "../src/links.h"
+
+#include "../src/internet.h"
+#ifndef _COMMON_
+#define _COMMON_
+
+#ifdef _USEGTK3_
+
+#define GTK_STOCK_APPLY gettext("Apply")
+#define GTK_STOCK_CANCEL gettext("Cancel")
+#define GTK_STOCK_NEW gettext("New")
+#define GTK_STOCK_HELP gettext("Help")
+#define GTK_STOCK_OPEN gettext("Open")
+#define GTK_STOCK_CONNECT gettext("Connect")
+#define GTK_STOCK_OK gettext("OK")
+
+#define GDK_C GDK_KEY_C
+#define GDK_V GDK_KEY_V
+
+#endif
+
+#ifndef _ENUMS_
+#define _ENUMS_
+enum {NEWVBOX=0,NEWHBOX};
+#endif
+
+GtkWidget* createNewBox(int orient,bool homog,int spacing)
+{
+	GtkWidget	*retwidg=NULL;
+
+#ifdef _USEGTK3_
+	if(orient==NEWVBOX)
+		retwidg=gtk_box_new(GTK_ORIENTATION_VERTICAL,spacing);
+	else
+		retwidg=gtk_box_new(GTK_ORIENTATION_HORIZONTAL,spacing);
+	gtk_box_set_homogeneous((GtkBox*)retwidg,homog);
+#else
+	if(orient==NEWVBOX)
+		retwidg=gtk_vbox_new(homog,spacing);
+	else
+		retwidg=gtk_hbox_new(homog,spacing);
+#endif
+
+	return(retwidg);
+}
+
+GtkWidget* createNewStockMenuItem(const char* stock,const char* label)
+{
+	GtkWidget*	item;
+
+#ifdef _USEGTK3_
+	item=gtk_menu_item_new_with_mnemonic(label);
+#else
+	item=gtk_image_menu_item_new_from_stock(stock,NULL);
+#endif
+
+	return(item);
+}
+
+GtkWidget* createNewImageMenuItem(const char* stock,const char* label)
+{
+	GtkWidget	*item;
+
+#ifdef _USEGTK3_
+	item=gtk_menu_item_new_with_label(label);
+#else
+	GtkWidget	*image;
+	item=gtk_image_menu_item_new_with_label(label);
+	image=gtk_image_new_from_stock(stock,GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image((GtkImageMenuItem *)item,image);
+#endif
+
+	return(item);
+}
+
+#endif
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/kkedit-plugins.h kkedit-0.4.1/KKEdit/unstable-plugins/kkedit-plugins.h
--- kkedit-0.3.3/KKEdit/unstable-plugins/kkedit-plugins.h	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/kkedit-plugins.h	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,282 @@
+/*
+ *
+ * ©K. D. Hedger. Fri  6 May 10:49:55 BST 2016 kdhedger68713@gmail.com
+
+ * This file (kkedit-plugins.h) is part of KKEdit.
+
+ * KKEdit is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+
+ * KKEdit is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with KKEdit.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _PLUGINS_
+#define _PLUGINS_
+
+#include <gtksourceview/gtksourceview.h>
+
+#define GLOBALPLUGS			1
+#define LOCALPLUGS			0
+
+#define TOOL_ASYNC			8
+#define TOOL_IGNORE_OP		0
+#define TOOL_PASTE_OP		1
+#define TOOL_REPLACE_OP		2
+#define TOOL_SHOW_DOC		4
+#define	TOOL_INSERT_MASK	0b10111
+#define	TOOL_VIEW_OP 		16
+#define USEFILE				-2
+#define USEURI				-1
+
+#define NEWMENUNAME "newmenu"
+#define OPENMENUNAME "openmenu"
+#define HEXDUMPMENUNAME "hexdumpmenu"
+#define NEWADMINMENUNAME "newadminmenu"
+#define NEWEDITORMENUNAME "neweditormenu"
+#define MANEDITORMENUNAME "maneditormenu"
+#define DOXYBUILDMENUNAME "doxybuildmenu"
+#define RECENTMENUNAME "recentmenu"
+#define SAVEMENUNAME "savemenu"
+#define SAVEASMENUNAME "saveasmenu"
+#define SAVEALLMENUNAME "saveallmenu"
+#define SAVESESSIONMENUNAME "savesessionmenu"
+#define RESTORESESSIONMENUNAME "restoresessionmenu"
+#define RESTORESESSIONBMMENUNAME "restoresessionbmmenu"
+#define PRINTMENUNAME "printmenu"
+#define CLOSEMENUNAME "closemenu"
+#define CLOSEALLMENUNAME "closeallmenu"
+#define SORTTABSMENUNAME "sorttabsmenu"
+#define SHOWTABSMENUNAME "showalltabsmenu"
+#define SELECTTABMENUNAME "selecttabsmenu"
+#define REVERTMENUNAME "revertmenu"
+#define QUITMENUNAME "quitmenu"
+#define UNDOMENUNAME "undomenu"
+#define REDOMENUNAME "redomenu"
+#define UNDOALLMENUNAME "undoallmenu"
+#define REDOALLMENUNAME "redoallmenu"
+#define CUTMENUNAME "cutmenu"
+#define COPYMENUNAME "copymenu"
+#define PASTEMENUNAME "pastemenu"
+#define FINDMENUNAME "findmenu"
+#define FINDNEXTMENUNAME "findnextmenu"
+#define PREFSMENUNAME "prefsmenu"
+#define PLUGPREFSMENUNAME "plugprefsmenu"
+#define SHOWDOCSMENUNAME "showdocsmenu"
+#define SHOWBMBARMENUNAME "showbmbarmenu"
+#define SHOWTOOLBARMENUNAME "showtoolbarmenu"
+#define SHOWTOOLOUTMENUNAME "showtoolout"
+#define SHOWSTATUSMENUNAME "showstatusmenu"
+#define SHOWDOCVIEWERMENUNAME "showdocviewer"
+#define GOTODEFMENUNAME "gotodefinemenu"
+#define OPENINCLUDEMENUNAME "openincludemenu"
+#define GOTOLINEMENUNAME "gotolinemenu"
+#define SEARCHFORDEFMENUNAME "searchfordefmenu"
+#define SEARCHGTKMENUNAME "searchgtkmenu"
+#define SEARCHQT5MENUNAME "searchqt5menu"
+#define SEARCHQT5ASSISTMENUNAME "searchqt5assistmenu"
+#define SEARCHDOXYMENUNAME "searchdoxymenu"
+#define GOBACKMENUNAME "gobackmenu"
+#define GOFORWARDMENUNAME "goforwardmenu"
+#define EXTOOLSMENUNAME "extoolsmenuname"
+#define ABOUTMENUNAME "aboutmenu"
+#define HELPLOCALMENUNAME "helplocalmenu"
+#define HELPONLINEMENUNAME "helponlinemenu"
+#define GETPLUGSMENUNAME "getplugsmenu"
+
+#define VIEWSHOWLINENUMERS "viewshowlinenumbers"
+#define VIEWAUTOINDENT "viewautoindent"
+#define VIEWWRAPLINES "viewwraplines"
+#define VIEWNOSYNTAX "viewnosyntax"
+#define VIEWWHITESPACE "viewwhitespace"
+#define VIEWAUTOCOMPLETE "viewautocomplete"
+#define VIEWHIGHLIGHT "viewhighlight"
+
+
+#ifndef _PAGESTRUCT_
+#define _PAGESTRUCT_
+
+enum {NOTYPE=0,FROMFILEMENU,FROMEDITMENU,FROMNAVMENU,FROMFUNCMENU,FROMBOOKMARKMENU,FROMTOOLSMENU,FROMHELPMENU,FROMSELECTION,FROMGOTO,FROMBASICFIND};
+
+struct	args
+{
+	const char	*name;
+	int			type;
+	void		*data;
+};
+
+enum {TYPEINT=1,TYPESTRING,TYPEBOOL,TYPELIST};
+
+struct pageStruct
+{
+	GtkScrolledWindow	*pageWindow;
+	GtkSourceBuffer		*buffer;
+	GtkSourceView		*view;
+	char				*fileName;
+	char				*filePath;
+	char				*realFilePath;
+	char				*dirName;
+	GtkMenuItem			*navSubMenu;
+	bool				rebuildMenu;
+	GtkWidget			*tabName;
+	GtkTextIter			iter;
+	GtkTextIter			match_start;
+	GtkTextIter			match_end;
+	bool				isFirst;
+	GFile				*gFile; 
+	GFileMonitor		*monitor;
+	bool				itsMe;
+	GList				*markList;
+	const char			*lang;
+	GtkWidget			*tabVbox;
+	bool				showingChanged;
+	GtkTextMark			*backMark;
+	GtkTextTag			*highlightTag;
+	GList				*userDataList;
+	GtkSourceCompletion	*completion;
+	GSList				*regexList;
+	int					regexMatchNumber;
+	bool				canUndo;
+	bool				canRedo;
+	bool				isDirty;
+	unsigned			pageID;
+	char				*searchString;
+	char				*replaceString;;
+	GtkWidget			*tabButton;
+	bool				hidden;
+	bool				restoreHidden;
+	int					startChar;
+	int					endChar;
+};
+#endif
+
+
+#ifndef _PLUGINDATA_
+#define _PLUGINDATA_
+struct moduleData
+{
+	char				*name;
+	bool				enabled;
+	GModule				*module;
+	bool				loaded;
+	char				*path;
+	bool				unload;
+};
+#endif
+
+//plugins
+struct	plugMenuList
+{
+	GtkWidget			*menuBar;
+	GtkWidget			*menuFile;
+	GtkWidget			*menuEdit;
+	GtkWidget			*menuFunc;
+	GtkWidget			*menuNav;
+	GtkWidget			*menuTools;
+	GtkWidget			*menuHelp;
+	GtkWidget			*menuBookMark;
+	GtkWidget			*menuView;
+};
+
+struct	plugUserData
+{
+	plugUserData():type(NOTYPE),userStr(NULL),userStr2(NULL),userInt(0),userData(NULL),userStart(-1),userEnd(-1) {}
+	int			type;
+	const char	*userStr;
+	const char	*userStr2;
+	int			userInt;
+	void		*userData;
+	int			userStart;
+	int			userEnd;
+};
+
+struct	plugData
+{
+//menus
+	plugMenuList		mlist;
+	moduleData			*modData;
+//	GList			*plugins;
+//install location of KKEdit data
+	const char			*dataDir;
+//global plugin folder defaults to DATADIR/plugins
+	char				*gPlugFolder;
+//local plugin folder defaults to ~/.KKEdit/plugins
+	char				*lPlugFolder;
+//kkedit version string
+	const char			*kkeditVersion;
+//unused
+	char				*htmlFile;
+//location of variable that holds the uri to be disp[layed by showDoc
+	char**				thePage;
+//main mainNotebook
+	GtkNotebook			*notebook;
+//current page MAYBE NULL!!
+	pageStruct			*page;
+//cuurent tab
+	int					currentTab;
+//KKEdits temp folder
+	char				*tmpFolder;
+//kkedits main window user box's
+//top
+	GtkWidget			*topUserBox;
+	GtkWidget			*mainWindowVPane;
+//left
+	GtkWidget			*leftUserBox;
+	GtkWidget			*mainWindowHPane;
+//right
+	GtkWidget			*rightUserBox;
+	GtkWidget			*secondWindowHPane;
+//bottom
+	GtkWidget			*bottomUserBox;
+	GtkWidget			*secondWindowVPane;
+//kkedit main window
+	GtkWidget			*mainWindow;
+//tool output window buffer;
+	GtkTextBuffer		*toolOutBuffer;
+//tool output window
+	GtkWidget			*toolOutWindow;
+//tab popup menu
+	GtkWidget			*tabPopUpMenu;
+//right click popup menu
+	GtkWidget			*contextPopUpMenu;
+
+//leftright user box visiblity ref
+	int					leftShow;
+	int					rightShow;
+//topbottom user box visiblity ref
+	int					topShow;
+	int					bottomShow;
+//locale dir for gettext
+	const char			*locale;
+
+//user data passed to plugins.
+	plugUserData		userData;
+
+//plug prefs window
+	GtkWidget			*prefsWindow;
+};
+
+void		showDocView(int howtodisplay,char *text,const char *title);
+pageStruct	*getPageStructByIDFromPage(int pagenum);
+void		showToolOutput(bool immediate);
+void		hideToolOutput(bool immediate);
+void		showSide(bool left);
+void		hideSide(bool left);
+void		showTop(bool top);
+void		hideTop(bool top);
+void		runCommand(char *commandtorun,void *ptr,bool interm,int flags,int useroot,char *title);
+void		debugFree(char** ptr);
+bool		openFile(const gchar *filepath,int linenumber,bool warn);
+bool		saveFile(GtkWidget *widget,gpointer data);
+void		newFile(GtkWidget *widget,gpointer data);
+int			loadVarsFromFile(char *filepath,args *dataptr);
+void		saveVarsToFile(char *filepath,args *dataptr);
+
+#endif
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/exportmap kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/exportmap
--- kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/exportmap	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/exportmap	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,11 @@
+{
+global:	addToGui;
+		doAbout;
+		enablePlug;
+		g_module_unload;
+		g_module_check_init;
+		informPlugin;
+
+local: *;
+
+};
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/macroplugin.cpp kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/macroplugin.cpp
--- kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/macroplugin.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/macroplugin.cpp	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,300 @@
+/*
+ *
+ * ©K. D. Hedger. Wed 20 Apr 17:13:14 BST 2016 kdhedger68713@gmail.com
+
+ * This file (macroplugin.cpp) is part of KKEdit.
+
+ * plugins is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+
+ * plugins is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with plugins.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <gmodule.h>
+#include <libgen.h>
+#include <string.h>
+#include <ctype.h>
+#include <libintl.h>
+#include <locale.h>
+
+#include "../config.h"
+#include "../common.h"
+#include "../kkedit-plugins.h"
+
+#define PLUGVERSION VERSION
+#ifdef _USEGTK3_
+#define TEXTDOMAIN "macroplugin-3" 
+#define ABOUTICON "KKEditPlug-3"
+#else
+#define TEXTDOMAIN "macroplugin" 
+#define ABOUTICON "KKEditPlug"
+#endif
+
+typedef plugUserData macroData;
+
+enum {STARTRECORDING=1,STOPRECORDING,PAUSERECORDING,PLAYBACK};
+enum {DOOPEN=1};
+
+macroData	recording[100];
+unsigned	commandNum=0;
+bool		paused=false;
+unsigned	commandCnt=0;
+bool		isRecording=false;
+
+GtkWidget	*menuStart;
+GtkWidget	*menuStop;
+GtkWidget	*menuPause;
+GtkWidget	*menuPlayback;
+GtkWidget	*holdWidget=NULL;
+
+GtkWidget	*menuPlug;
+plugData	*globalPlugData;
+char		*currentdomain=NULL;
+int			sinkInt;
+
+int	(*module_plug_function)(gpointer globaldata);
+extern void gotoLine(GtkWidget *widget,gpointer data);
+extern void basicFind(int dowhat);
+
+extern GtkWidget	*findBox;
+extern GtkWidget	*replaceBox;
+
+GtkWidget* findMenu(GtkWidget* parent, const gchar* name)
+{
+	const gchar	*mname=NULL;
+
+	if ( (GTK_IS_MENU_ITEM(parent)) && !(GTK_IS_SEPARATOR_MENU_ITEM(parent)) )
+		{
+			mname=gtk_widget_get_name((GtkWidget*)parent);
+			if(mname!=NULL)
+				{
+			//printf("name=%s,mname=%s\n",name,mname);
+					if(strcmp(name,mname)==0)
+						holdWidget=parent;
+				}
+		}
+
+	if (GTK_IS_CONTAINER(parent))
+		{
+			GList	*children=gtk_container_get_children(GTK_CONTAINER(parent));
+			while(children != NULL)
+				{
+					GtkWidget	*widget=findMenu((GtkWidget*)children->data, name);
+
+					if (widget!=NULL)
+						return widget;
+					children=g_list_next(children);
+				}
+			g_list_free(children);
+		}
+	return NULL;
+}
+
+void recordMacro(GtkMenuItem *menuitem,gpointer what)
+{
+	switch((long)what)
+		{
+			case STARTRECORDING:
+				commandNum=0;
+				commandCnt=0;
+				isRecording=true;
+printf("--->STARTRECORDING<--\n");
+				break;
+			case STOPRECORDING:
+				commandCnt=commandNum;
+				commandNum=0;
+				isRecording=false;
+printf("--->STOPRECORDING=<--\n");
+				break;
+			case PAUSERECORDING:
+				commandCnt=commandNum;
+				paused=!paused;
+printf("--->PAUSERECORDING<--\n");
+				break;
+			case PLAYBACK:
+				printf("Playing back %i commands ..\n",commandCnt);
+				for(unsigned j=0;j<commandCnt;j++)
+					{
+						holdWidget=NULL;
+						switch(recording[j].type)
+							{
+								case FROMFILEMENU:
+									findMenu(gtk_menu_item_get_submenu((GtkMenuItem*)globalPlugData->mlist.menuFile),recording[j].userStr);
+									if(holdWidget!=NULL)
+										g_signal_emit_by_name((gpointer)holdWidget,"activate",recording[j].userData,NULL);
+									break;
+
+								case FROMEDITMENU:
+									findMenu(gtk_menu_item_get_submenu((GtkMenuItem*)globalPlugData->mlist.menuEdit),recording[j].userStr);
+									if(holdWidget!=NULL)
+										g_signal_emit_by_name((gpointer)holdWidget,"activate",NULL,NULL);
+									break;
+
+								case FROMSELECTION:
+									if((recording[j].userStart!=-1) && (recording[j].userEnd!=-1))
+										{
+											pageStruct	*page=getPageStructByIDFromPage(-1);
+											if(page!=NULL)
+												{
+													GtkTextIter sc,ec;
+													gtk_text_buffer_get_start_iter((GtkTextBuffer*)page->buffer,&sc);
+													gtk_text_buffer_get_start_iter((GtkTextBuffer*)page->buffer,&ec);
+													gtk_text_iter_set_offset(&sc,recording[j].userStart);
+													gtk_text_iter_set_offset(&ec,recording[j].userEnd);
+													gtk_text_buffer_select_range((GtkTextBuffer*)page->buffer,&sc,&ec);
+												}
+										}
+									break;
+
+								case FROMGOTO:
+									gotoLine(NULL,(gpointer)recording[j].userData);
+									break;
+
+								case FROMBASICFIND:
+								printf("user str1=%s,userstr2=%s dowaht=%i\n",recording[j].userStr,recording[j].userStr2,recording[j].userInt);
+									gtk_entry_set_text((GtkEntry*)findBox,recording[j].userStr);
+									gtk_entry_set_text((GtkEntry*)replaceBox,recording[j].userStr2);
+								//	searchtext=g_strcompress(gtk_entry_get_text((GtkEntry*)findBox));
+//	replacetext=g_strcompress(gtk_entry_get_text((GtkEntry*)replaceBox));
+									basicFind(recording[j].userInt);
+									break;
+							}
+					}
+				printf("Finished.\n");
+				break;
+		}
+}
+
+extern "C" int informPlugin(plugData *plugdata)
+{
+	if(isRecording && !paused)
+		recording[commandNum++]=plugdata->userData;
+	return(0);
+}
+             
+extern "C" const gchar* g_module_check_init(GModule *module)
+{
+	currentdomain=strdup(textdomain(NULL));
+	return(NULL);
+}
+
+void setTextDomain(bool plugdomain,plugData* pdata)
+{
+	if(plugdomain==true)
+		{
+			//set domain to plug
+			bindtextdomain(TEXTDOMAIN,LOCALEDIR);
+			textdomain(TEXTDOMAIN);
+			bind_textdomain_codeset(TEXTDOMAIN,"UTF-8");
+		}
+	else
+		{
+			//resetdomain
+			bindtextdomain(currentdomain,pdata->locale);
+			textdomain(currentdomain);
+			bind_textdomain_codeset(currentdomain,"UTF-8");	
+		}
+}
+
+extern "C" void g_module_unload(GModule *module)
+{
+	return;
+}
+
+extern "C" int addToGui(gpointer data)
+{
+	GtkWidget*	menu;
+
+	globalPlugData=(plugData*)data;
+	setTextDomain(true,globalPlugData);
+
+	menuPlug=gtk_menu_item_new_with_label(gettext("_Macro"));
+	gtk_menu_item_set_use_underline((GtkMenuItem*)menuPlug,true);
+	menu=gtk_menu_new();
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuPlug),menu);
+
+	menuStart=gtk_menu_item_new_with_label("Start Recording");
+	g_signal_connect(G_OBJECT(menuStart),"activate",G_CALLBACK(recordMacro),(void*)(long)STARTRECORDING);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuStart);
+	menuStop=gtk_menu_item_new_with_label("Stop Recording");
+	g_signal_connect(G_OBJECT(menuStop),"activate",G_CALLBACK(recordMacro),(void*)(long)STOPRECORDING);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuStop);
+	menuPause=gtk_menu_item_new_with_label("Pause Recording");
+	g_signal_connect(G_OBJECT(menuPause),"activate",G_CALLBACK(recordMacro),(void*)(long)PAUSERECORDING);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuPause);
+	menuPlayback=gtk_menu_item_new_with_label("Playback");
+	g_signal_connect(G_OBJECT(menuPlayback),"activate",G_CALLBACK(recordMacro),(void*)(long)PLAYBACK);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menuPlayback);
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(globalPlugData->mlist.menuBar),menuPlug);					
+
+	setTextDomain(false,globalPlugData);
+	return(0);
+}
+
+extern "C" int doAbout(gpointer data)
+{
+	plugData		*plugdata=(plugData*)data;
+	char			*licencepath;
+	const char		copyright[] ="Copyright \xc2\xa9 2014 K.D.Hedger";
+	char			*licence;
+	GtkAboutDialog	*about;
+	char			*translators;
+
+	setTextDomain(true,plugdata);
+
+	const char		*aboutboxstring=gettext("Macro Plugin - Add's macro recording/playback");
+	sinkInt=asprintf(&translators,"%s:\nNguyen Thanh Tung <thngtong@gmail.com>",gettext("French Translation"));
+	sinkInt=asprintf(&licencepath,"%s/docs/gpl-3.0.txt",plugdata->dataDir);
+
+	g_file_get_contents(licencepath,&licence,NULL,NULL);
+	about=(GtkAboutDialog*)gtk_about_dialog_new();
+	gtk_about_dialog_set_program_name(about,"MacroPlugin");
+	gtk_about_dialog_set_authors(about,authors);
+	gtk_about_dialog_set_comments(about,aboutboxstring);
+	gtk_about_dialog_set_copyright(about,copyright);
+	gtk_about_dialog_set_version(about,PLUGVERSION);
+	gtk_about_dialog_set_website(about,MYWEBSITE);
+	gtk_about_dialog_set_logo_icon_name(about,ABOUTICON);
+	gtk_about_dialog_set_license(about,licence);
+	gtk_about_dialog_set_translator_credits(about,(const gchar*)translators);
+
+	gtk_dialog_run(GTK_DIALOG(about));
+	gtk_widget_destroy((GtkWidget*)about);
+	free(licence);
+	free(licencepath);
+	free(translators);
+	setTextDomain(false,plugdata);
+	return(0);
+}
+
+extern "C" int enablePlug(gpointer data)
+{
+	plugData*		plugdata=(plugData*)data;
+
+	if(plugdata->modData->unload==true)
+		{
+			gtk_widget_destroy(menuPlug);
+			gtk_widget_show_all(plugdata->mlist.menuBar);	
+		}
+	else
+		{
+			if(g_module_symbol(plugdata->modData->module,"addToGui",(gpointer*)&module_plug_function))
+				module_plug_function(data);
+			gtk_widget_show_all(plugdata->mlist.menuBar);
+		}
+	return(0);
+}
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/Makefile.am kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/Makefile.am
--- kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/Makefile.am	2016-08-26 09:41:34.000000000 +0000
@@ -0,0 +1,22 @@
+PLUGNAME = macroplugin
+SONAME = libMacroPlugin
+SRCFILES = $(PLUGNAME).cpp
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c $(SRCFILES)  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o $(PLUGNAME).o
+
+
+	gcc -nodefaultlibs -shared -Wl,--version-script=exportmap,-soname,$(SONAME).so -o $(SONAME).so $(PLUGNAME).o -lc
+
+
+clean: distclean
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp $(SONAME).so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/$(PLUGNAME).mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
\ No newline at end of file
diff -Nru kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/Makefile.in kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/Makefile.in
--- kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/Makefile.in	2016-08-26 09:41:40.000000000 +0000
@@ -0,0 +1,454 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = KKEdit/unstable-plugins/MacroPlugin
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASPELL_LIBS = @ASPELL_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
+EXEEXT = @EXEEXT@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+GTK3SUFFIX = @GTK3SUFFIX@
+GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
+GTKSRC_LIBS = @GTKSRC_LIBS@
+GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANPAGEEDITOR = @MANPAGEEDITOR@
+MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGDIRS = @PLUGDIRS@
+PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE290 = @USE290@
+VERSION = @VERSION@
+VTEVERS = @VTEVERS@
+VTE_CFLAGS = @VTE_CFLAGS@
+VTE_LIBS = @VTE_LIBS@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_debug_level = @with_debug_level@
+with_gsu_path = @with_gsu_path@
+with_qt5_docdir = @with_qt5_docdir@
+PLUGNAME = macroplugin
+SONAME = libMacroPlugin
+SRCFILES = $(PLUGNAME).cpp
+AUTOMAKE_OPTIONS = subdir-objects
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu KKEdit/unstable-plugins/MacroPlugin/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu KKEdit/unstable-plugins/MacroPlugin/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+all:
+	gcc ${EXTRAMAKEFLAGS} $(CONFCXXFLAGS) $(CONFCPPFLAGS) $(CONFLDFLAGS) -fPIC -Wall -g -c $(SRCFILES)  $(GLIB_CFLAGS) $(GLIB_LIBS) $(GTK_CFLAGS) $(GTK_LIBS) $(GTKSRC_CFLAGS) $(GTKSRC_LIBS) -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${pkgdatadir}\" $(DEVMODE) $(USEGTK3) -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -o $(PLUGNAME).o
+
+	gcc -nodefaultlibs -shared -Wl,--version-script=exportmap,-soname,$(SONAME).so -o $(SONAME).so $(PLUGNAME).o -lc
+
+clean: distclean
+
+distclean:
+	rm -f *.o *.so Makefile||true
+
+install: all
+	mkdir -vp $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+	cp $(SONAME).so $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)/plugins-gtk
+	cp po/fr_FR/LC_MESSAGES/$(PLUGNAME).mo  $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/KKEdit/unstable-plugins/MacroPlugin/po/fr_FR/LC_MESSAGES/macroplugin.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/KKEdit/unstable-plugins/MacroPlugin/po/fr_FR/LC_MESSAGES/macroplugin.mo differ
diff -Nru kkedit-0.3.3/kkedit_fr_FR.po kkedit-0.4.1/kkedit_fr_FR.po
--- kkedit-0.3.3/kkedit_fr_FR.po	2016-05-23 09:23:36.000000000 +0000
+++ kkedit-0.4.1/kkedit_fr_FR.po	2016-08-26 09:41:36.000000000 +0000
@@ -8,477 +8,477 @@
 msgstr ""
 "Project-Id-Version: kkedit 1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-17 11:46+0100\n"
-"PO-Revision-Date: 2016-05-18 11:04+0100\n"
-"Last-Translator: Thanh Tung Nguyen <thngtong@gmail.com>\n"
+"POT-Creation-Date: 2016-08-22 17:27+0100\n"
+"PO-Revision-Date: 2016-08-22 17:27-0000\n"
+"Last-Translator: K. D. Hedger <kdhedger68713@gmail.com>\n"
 "Language-Team: none\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.11\n"
 
 #: KKEdit/src/kkedit-includes.h:87
 msgid "_Yes"
 msgstr "_Oui"
 
-#: KKEdit/src/kkedit-includes.h:88 KKEdit/src/kkedit-includes.h:217
+#: KKEdit/src/kkedit-includes.h:88 KKEdit/src/kkedit-includes.h:220
 msgid "_No"
 msgstr "_Non"
 
-#: KKEdit/src/kkedit-includes.h:89 KKEdit/src/kkedit-includes.h:218
+#: KKEdit/src/kkedit-includes.h:89 KKEdit/src/kkedit-includes.h:221
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: KKEdit/src/kkedit-includes.h:90 KKEdit/src/kkedit-includes.h:101
+#: KKEdit/src/kkedit-includes.h:90 KKEdit/src/kkedit-includes.h:103
 msgid "_Open"
 msgstr "_Ouvrir"
 
 #: KKEdit/src/kkedit-includes.h:91
-msgid "Select Colour"
-msgstr "Sélectionner la couleur"
-
-#: KKEdit/src/kkedit-includes.h:92
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: KKEdit/src/kkedit-includes.h:93 KKEdit/src/kkedit-includes.h:121
-msgid "_Edit"
-msgstr "É_diter"
-
-#: KKEdit/src/kkedit-includes.h:94
+#: KKEdit/src/kkedit-includes.h:93
 msgid "_OK"
 msgstr "_OK"
 
-#: KKEdit/src/kkedit-includes.h:100
+#: KKEdit/src/kkedit-includes.h:98 KKEdit/src/kkedit-includes.h:117
+msgid "_Close"
+msgstr "Fer_mer"
+
+#: KKEdit/src/kkedit-includes.h:102
 msgid "_File"
 msgstr "_Fichier"
 
-#: KKEdit/src/kkedit-includes.h:102
+#: KKEdit/src/kkedit-includes.h:104
 msgid "Open As He_xdump"
 msgstr "Ouvrir en vue he_xadécimale"
 
-#: KKEdit/src/kkedit-includes.h:103
+#: KKEdit/src/kkedit-includes.h:105
 msgid "_New"
 msgstr "_Nouveau"
 
-#: KKEdit/src/kkedit-includes.h:104
+#: KKEdit/src/kkedit-includes.h:106
 msgid "New A_dmin Editor"
 msgstr "Nouvelle fenêtre (_administrateur)"
 
-#: KKEdit/src/kkedit-includes.h:105
+#: KKEdit/src/kkedit-includes.h:107
 msgid "New _Editor"
 msgstr "Nouvelle _fenêtre"
 
-#: KKEdit/src/kkedit-includes.h:106
+#: KKEdit/src/kkedit-includes.h:108
 msgid "_Manpage Editor"
 msgstr "Éditeur de pages de _manuel"
 
-#: KKEdit/src/kkedit-includes.h:107
+#: KKEdit/src/kkedit-includes.h:109
 msgid "B_uild Documentation"
 msgstr "_Construire la documentation"
 
-#: KKEdit/src/kkedit-includes.h:108
+#: KKEdit/src/kkedit-includes.h:110
 msgid "_Recent Files"
 msgstr "Fichiers _récents"
 
-#: KKEdit/src/kkedit-includes.h:109
+#: KKEdit/src/kkedit-includes.h:111
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: KKEdit/src/kkedit-includes.h:110
+#: KKEdit/src/kkedit-includes.h:112
 msgid "Save _As..."
 msgstr "Enre_gistrer sous..."
 
-#: KKEdit/src/kkedit-includes.h:111
+#: KKEdit/src/kkedit-includes.h:113
 msgid "Save A_ll"
 msgstr "_Tout enregistrer"
 
-#: KKEdit/src/kkedit-includes.h:112
+#: KKEdit/src/kkedit-includes.h:114
 msgid "Sa_ve Session"
 msgstr "Enregistrer la _session"
 
-#: KKEdit/src/kkedit-includes.h:113
+#: KKEdit/src/kkedit-includes.h:115
 msgid "Res_tore Session"
 msgstr "_Restaurer la session"
 
-#: KKEdit/src/kkedit-includes.h:114
+#: KKEdit/src/kkedit-includes.h:116
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: KKEdit/src/kkedit-includes.h:115
-msgid "_Close"
-msgstr "Fer_mer"
-
-#: KKEdit/src/kkedit-includes.h:116
+#: KKEdit/src/kkedit-includes.h:118
 msgid "Close All Ta_bs"
 msgstr "Fermer tous les ong_lets"
 
-#: KKEdit/src/kkedit-includes.h:117
+#: KKEdit/src/kkedit-includes.h:119
 msgid "Re_vert"
 msgstr "Rétablir"
 
-#: KKEdit/src/kkedit-includes.h:118
+#: KKEdit/src/kkedit-includes.h:120
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: KKEdit/src/kkedit-includes.h:122
+#: KKEdit/src/kkedit-includes.h:123
+msgid "_Edit"
+msgstr "É_diter"
+
+#: KKEdit/src/kkedit-includes.h:124
 msgid "_Undo"
 msgstr "Annuler"
 
-#: KKEdit/src/kkedit-includes.h:123
+#: KKEdit/src/kkedit-includes.h:125
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: KKEdit/src/kkedit-includes.h:124
+#: KKEdit/src/kkedit-includes.h:126
 msgid "U_ndo All"
 msgstr "Tout a_nnuler"
 
-#: KKEdit/src/kkedit-includes.h:125
+#: KKEdit/src/kkedit-includes.h:127
 msgid "Re_do All"
 msgstr "Tout réta_blir"
 
-#: KKEdit/src/kkedit-includes.h:126
+#: KKEdit/src/kkedit-includes.h:128
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: KKEdit/src/kkedit-includes.h:127
+#: KKEdit/src/kkedit-includes.h:129
 msgid "_Copy"
 msgstr "Co_pier"
 
-#: KKEdit/src/kkedit-includes.h:128
+#: KKEdit/src/kkedit-includes.h:130
 msgid "_Paste"
 msgstr "Co_ller"
 
-#: KKEdit/src/kkedit-includes.h:129
+#: KKEdit/src/kkedit-includes.h:131
 msgid "_Find"
 msgstr "Re_chercher"
 
-#: KKEdit/src/kkedit-includes.h:130
+#: KKEdit/src/kkedit-includes.h:132
+msgid "Find Ne_xt"
+msgstr "Rechercher le sui_vant"
+
+#: KKEdit/src/kkedit-includes.h:133
 msgid "_Sort Tabs"
 msgstr "_Trier les onglets"
 
-#: KKEdit/src/kkedit-includes.h:131
+#: KKEdit/src/kkedit-includes.h:134
 msgid "S_how All Tabs"
 msgstr "_Afficher tous les onglets"
 
-#: KKEdit/src/kkedit-includes.h:132
+#: KKEdit/src/kkedit-includes.h:135
 msgid "_Hide Tab"
 msgstr "_Cacher l'onglet"
 
-#: KKEdit/src/kkedit-includes.h:133
+#: KKEdit/src/kkedit-includes.h:136
 msgid "Se_lect Tab"
 msgstr "_Sélectionnez l'onglet"
 
-#: KKEdit/src/kkedit-includes.h:134
+#: KKEdit/src/kkedit-includes.h:137
 msgid "Pr_eferences"
 msgstr "_Préférences"
 
-#: KKEdit/src/kkedit-includes.h:135
+#: KKEdit/src/kkedit-includes.h:138
 msgid "Plu_gin Prefs"
 msgstr "Préférences des _greffons"
 
-#: KKEdit/src/kkedit-includes.h:138
+#: KKEdit/src/kkedit-includes.h:141
 msgid "_View"
 msgstr "_Affichage"
 
-#: KKEdit/src/kkedit-includes.h:139
+#: KKEdit/src/kkedit-includes.h:142
 msgid "Show Documentation"
 msgstr "Montrer la documentation"
 
-#: KKEdit/src/kkedit-includes.h:140
+#: KKEdit/src/kkedit-includes.h:143
 msgid "Hide Bookmarks Bar"
 msgstr "Cacher la barre des signets"
 
-#: KKEdit/src/kkedit-includes.h:141
+#: KKEdit/src/kkedit-includes.h:144
 msgid "Show Bookmarks Bar"
 msgstr "Montrer la barre des signets"
 
-#: KKEdit/src/kkedit-includes.h:142
+#: KKEdit/src/kkedit-includes.h:145
 msgid "Hide Tool Bar"
 msgstr "Cacher la barre d'outils"
 
-#: KKEdit/src/kkedit-includes.h:143
+#: KKEdit/src/kkedit-includes.h:146
 msgid "Show Tool Bar"
 msgstr "Montrer la barre d'outils"
 
-#: KKEdit/src/kkedit-includes.h:144
+#: KKEdit/src/kkedit-includes.h:147
 msgid "Hide Tool Output"
 msgstr "Cacher la sortie des outils"
 
-#: KKEdit/src/kkedit-includes.h:145
+#: KKEdit/src/kkedit-includes.h:148
 msgid "Show Tool Output"
 msgstr "Montrer la sortie des outils"
 
-#: KKEdit/src/kkedit-includes.h:146
+#: KKEdit/src/kkedit-includes.h:149
 msgid "Hide Status Bar"
 msgstr "Cacher la barre d'état"
 
-#: KKEdit/src/kkedit-includes.h:147
+#: KKEdit/src/kkedit-includes.h:150
 msgid "Show Status Bar"
 msgstr "Montrer la barre d'état"
 
-#: KKEdit/src/kkedit-includes.h:148
+#: KKEdit/src/kkedit-includes.h:151
 msgid "Show Docviewer"
 msgstr "Montrer le visionneur de documents"
 
-#: KKEdit/src/kkedit-includes.h:149
+#: KKEdit/src/kkedit-includes.h:152
 msgid "Hide Docviewer"
 msgstr "Cacher le visionneur de documents"
 
-#: KKEdit/src/kkedit-includes.h:150 KKEdit/src/kkedit-includes.h:302
+#: KKEdit/src/kkedit-includes.h:153 KKEdit/src/kkedit-includes.h:305
 msgid "Show Line Numbers"
 msgstr "Montrer le numéro des lignes"
 
-#: KKEdit/src/kkedit-includes.h:151 KKEdit/src/kkedit-includes.h:303
+#: KKEdit/src/kkedit-includes.h:154 KKEdit/src/kkedit-includes.h:306
 msgid "Wrap Lines"
 msgstr "Activer le retour à la ligne"
 
-#: KKEdit/src/kkedit-includes.h:152
+#: KKEdit/src/kkedit-includes.h:155
 msgid "Hightlght Current Line"
 msgstr "Surligner la ligne en cours"
 
-#: KKEdit/src/kkedit-includes.h:153 KKEdit/src/kkedit-includes.h:305
+#: KKEdit/src/kkedit-includes.h:156 KKEdit/src/kkedit-includes.h:308
 msgid "No Syntax Highlighting"
 msgstr "Désactiver la coloration syntaxique"
 
-#: KKEdit/src/kkedit-includes.h:154 KKEdit/src/kkedit-includes.h:306
+#: KKEdit/src/kkedit-includes.h:157 KKEdit/src/kkedit-includes.h:309
 msgid "Show Whitespace"
 msgstr "Afficher les blancs"
 
-#: KKEdit/src/kkedit-includes.h:155 KKEdit/src/kkedit-includes.h:313
+#: KKEdit/src/kkedit-includes.h:158 KKEdit/src/kkedit-includes.h:316
 msgid "Auto Show Completions"
 msgstr "Montrer automatiquement les complétions"
 
-#: KKEdit/src/kkedit-includes.h:158
+#: KKEdit/src/kkedit-includes.h:161
 msgid "_Navigation"
 msgstr "_Navigation"
 
-#: KKEdit/src/kkedit-includes.h:159
+#: KKEdit/src/kkedit-includes.h:162
 msgid "Go To _Definition"
 msgstr "Aller à la définition"
 
-#: KKEdit/src/kkedit-includes.h:160
+#: KKEdit/src/kkedit-includes.h:163
 msgid "Open Include File"
 msgstr "Ouvrir l'en-tête"
 
-#: KKEdit/src/kkedit-includes.h:161
+#: KKEdit/src/kkedit-includes.h:164
 msgid "_Go To Line"
 msgstr "Aller à la _ligne..."
 
-#: KKEdit/src/kkedit-includes.h:162 KKEdit/src/kkedit-includes.h:273
+#: KKEdit/src/kkedit-includes.h:165 KKEdit/src/kkedit-includes.h:276
 msgid "Search For Define"
 msgstr "Chercher une définition"
 
-#: KKEdit/src/kkedit-includes.h:163
+#: KKEdit/src/kkedit-includes.h:166
 msgid "_Search In Gtk Docs"
 msgstr "Chercher dans les documents _Gtk"
 
-#: KKEdit/src/kkedit-includes.h:164
+#: KKEdit/src/kkedit-includes.h:167
 msgid "S_earch In Qt5 Docs"
 msgstr "Chercher dans les documents _Qt5"
 
-#: KKEdit/src/kkedit-includes.h:165
+#: KKEdit/src/kkedit-includes.h:168
 msgid "_Find In Documentation"
 msgstr "_Rechercher dans la documentation"
 
-#: KKEdit/src/kkedit-includes.h:166
+#: KKEdit/src/kkedit-includes.h:169
 msgid "_Back"
 msgstr "_Précédent"
 
-#: KKEdit/src/kkedit-includes.h:170
+#: KKEdit/src/kkedit-includes.h:173
 msgid "Fun_ctions"
 msgstr "Fon_ctions"
 
-#: KKEdit/src/kkedit-includes.h:173
+#: KKEdit/src/kkedit-includes.h:176
 msgid "_Bookmarks"
 msgstr "_Signets"
 
-#: KKEdit/src/kkedit-includes.h:174
-msgid "Toggle Bookmark"
-msgstr "Placer un signet"
+#: KKEdit/src/kkedit-includes.h:177
+msgid "_Toggle Bookmark"
+msgstr "_Placer un signet"
 
-#: KKEdit/src/kkedit-includes.h:175
+#: KKEdit/src/kkedit-includes.h:178
 msgid "Remove All Bookmarks"
 msgstr "Retirer tous les signets"
 
-#: KKEdit/src/kkedit-includes.h:178
+#: KKEdit/src/kkedit-includes.h:181
 msgid "_Tools"
 msgstr "_Outils"
 
-#: KKEdit/src/kkedit-includes.h:179
+#: KKEdit/src/kkedit-includes.h:182
 msgid "Manage External Tools"
 msgstr "Gérer les outils externes"
 
-#: KKEdit/src/kkedit-includes.h:182
+#: KKEdit/src/kkedit-includes.h:185
 msgid "Plu_gins"
 msgstr "_Greffons"
 
-#: KKEdit/src/kkedit-includes.h:185 KKEdit/src/kkedit-includes.h:187
+#: KKEdit/src/kkedit-includes.h:188 KKEdit/src/kkedit-includes.h:190
 msgid "_Help"
 msgstr "A_ide"
 
-#: KKEdit/src/kkedit-includes.h:186
+#: KKEdit/src/kkedit-includes.h:189
 msgid "_About"
 msgstr "À _propos"
 
-#: KKEdit/src/kkedit-includes.h:188
+#: KKEdit/src/kkedit-includes.h:191
 msgid "_Online Help"
 msgstr "Aide en _ligne"
 
-#: KKEdit/src/kkedit-includes.h:189
+#: KKEdit/src/kkedit-includes.h:192
 msgid "_Get Plugins"
 msgstr "_Obtenir des greffons"
 
-#: KKEdit/src/kkedit-includes.h:192
+#: KKEdit/src/kkedit-includes.h:195
 msgid "Definition"
 msgstr "Aller à la _définition"
 
-#: KKEdit/src/kkedit-includes.h:193
+#: KKEdit/src/kkedit-includes.h:196
 msgid "Open"
 msgstr "Ouvrir"
 
-#: KKEdit/src/kkedit-includes.h:194
+#: KKEdit/src/kkedit-includes.h:197
 msgid "Close"
 msgstr "Fermer"
 
-#: KKEdit/src/kkedit-includes.h:195
+#: KKEdit/src/kkedit-includes.h:198
 msgid "New"
 msgstr "Nouveau"
 
-#: KKEdit/src/kkedit-includes.h:196
+#: KKEdit/src/kkedit-includes.h:199
 msgid "Save"
 msgstr "Enregistrer"
 
-#: KKEdit/src/kkedit-includes.h:197 KKEdit/src/kkedit-includes.h:262
+#: KKEdit/src/kkedit-includes.h:200 KKEdit/src/kkedit-includes.h:265
 msgid "Undo"
 msgstr "Annuler"
 
-#: KKEdit/src/kkedit-includes.h:198 KKEdit/src/kkedit-includes.h:263
+#: KKEdit/src/kkedit-includes.h:201 KKEdit/src/kkedit-includes.h:266
 msgid "Redo"
 msgstr "Rétablir"
 
-#: KKEdit/src/kkedit-includes.h:199 KKEdit/src/kkedit-includes.h:259
+#: KKEdit/src/kkedit-includes.h:202 KKEdit/src/kkedit-includes.h:262
 msgid "Cut"
 msgstr "Couper"
 
-#: KKEdit/src/kkedit-includes.h:200 KKEdit/src/kkedit-includes.h:260
+#: KKEdit/src/kkedit-includes.h:203 KKEdit/src/kkedit-includes.h:263
 msgid "Copy"
 msgstr "Copier"
 
-#: KKEdit/src/kkedit-includes.h:201 KKEdit/src/kkedit-includes.h:261
+#: KKEdit/src/kkedit-includes.h:204 KKEdit/src/kkedit-includes.h:264
 msgid "Paste"
 msgstr "Coller"
 
-#: KKEdit/src/kkedit-includes.h:202 KKEdit/src/kkedit-includes.h:264
+#: KKEdit/src/kkedit-includes.h:205 KKEdit/src/kkedit-includes.h:267
 msgid "Find"
 msgstr "Trouver"
 
-#: KKEdit/src/kkedit-includes.h:203
+#: KKEdit/src/kkedit-includes.h:206
 msgid "Back"
 msgstr "Précédent"
 
-#: KKEdit/src/kkedit-includes.h:204
+#: KKEdit/src/kkedit-includes.h:207
 msgid "Forward"
 msgstr "Suivant"
 
-#: KKEdit/src/kkedit-includes.h:207
+#: KKEdit/src/kkedit-includes.h:210
 msgid "_Add To Custom Word List"
 msgstr "_Ajouter à la liste des mots personnalisés"
 
-#: KKEdit/src/kkedit-includes.h:208
+#: KKEdit/src/kkedit-includes.h:211
 msgid "C_heck Spellling"
 msgstr "_Vérifier l'orthographe"
 
-#: KKEdit/src/kkedit-includes.h:209
+#: KKEdit/src/kkedit-includes.h:212
 msgid "Copy Folder Path"
 msgstr "Copier le chemin du dossier parent"
 
-#: KKEdit/src/kkedit-includes.h:210
+#: KKEdit/src/kkedit-includes.h:213
 msgid "Copy Filepath"
 msgstr "Copier le chemin du fichier"
 
-#: KKEdit/src/kkedit-includes.h:211
+#: KKEdit/src/kkedit-includes.h:214
 msgid "Copy FileName"
 msgstr "Copier le nom du fichier"
 
-#: KKEdit/src/kkedit-includes.h:212
+#: KKEdit/src/kkedit-includes.h:215
 msgid "Source Highlight"
 msgstr "Coloration syntaxique"
 
-#: KKEdit/src/kkedit-includes.h:215
+#: KKEdit/src/kkedit-includes.h:218
 msgid "Spell Check Document"
 msgstr "Vérifier l'orthographe du document"
 
-#: KKEdit/src/kkedit-includes.h:216
+#: KKEdit/src/kkedit-includes.h:219
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: KKEdit/src/kkedit-includes.h:221
+#: KKEdit/src/kkedit-includes.h:224
 msgid "Bookmark"
 msgstr "Signet"
 
-#: KKEdit/src/kkedit-includes.h:222
+#: KKEdit/src/kkedit-includes.h:225
 msgid "Checking for updates ..."
 msgstr "Recherche de mises à jour ..."
 
 # it goes with "from"
-#: KKEdit/src/kkedit-includes.h:223
+#: KKEdit/src/kkedit-includes.h:226
 msgid "KKEdit update available to"
 msgstr "Mises à jour pour KKEdit disponibles de"
 
 # it goes with "KKEdit update available to"
-#: KKEdit/src/kkedit-includes.h:224
+#: KKEdit/src/kkedit-includes.h:227
 msgid "from"
 msgstr "vers"
 
-#: KKEdit/src/kkedit-includes.h:225
+#: KKEdit/src/kkedit-includes.h:228
 msgid "From here"
 msgstr "vers"
 
-#: KKEdit/src/kkedit-includes.h:226
+#: KKEdit/src/kkedit-includes.h:229
 msgid "Plugin updates are available from here"
 msgstr "Des mises à jour pour les greffons sont disponibles ici"
 
-#: KKEdit/src/kkedit-includes.h:227
+#: KKEdit/src/kkedit-includes.h:230
 msgid "Updates Available"
 msgstr "Mises à jour disponibles"
 
-#: KKEdit/src/kkedit-includes.h:228
+#: KKEdit/src/kkedit-includes.h:231
 #, c-format
 msgid "Replaced %i instances of '%s' with '%s'"
 msgstr "%i instances de '%s' remplacées par '%s'"
 
-#: KKEdit/src/kkedit-includes.h:229
+#: KKEdit/src/kkedit-includes.h:232
 #, c-format
 msgid "Save file %s before closing?"
 msgstr "Enregistrer le fichier %s avant de fermer?"
 
-#: KKEdit/src/kkedit-includes.h:230
+#: KKEdit/src/kkedit-includes.h:233
 msgid "Warning unsaved data!"
 msgstr "Attention, données non enregistrées"
 
-#: KKEdit/src/kkedit-includes.h:231
+#: KKEdit/src/kkedit-includes.h:234
 #, c-format
 msgid "Line %i Column %i \t\tSyntax Highlighting %s\t\tFilePath %s"
 msgstr ""
 "Ligne %i Colonne %i \t\tColoration syntaxique %s\t\tChemin du fichier %s"
 
-#: KKEdit/src/kkedit-includes.h:232
+#: KKEdit/src/kkedit-includes.h:235
 msgid "Untitled"
 msgstr "Sans nom"
 
-#: KKEdit/src/kkedit-includes.h:233
+#: KKEdit/src/kkedit-includes.h:236
 #, c-format
 msgid "Can't save file '%s' :("
 msgstr "Impossible d'enregistrer le fichier '%s' :("
 
-#: KKEdit/src/kkedit-includes.h:236
+#: KKEdit/src/kkedit-includes.h:239
 msgid "Define Keyboard Shortcuts"
 msgstr "Définir des raccourcis clavier"
 
-#: KKEdit/src/kkedit-includes.h:237
+#: KKEdit/src/kkedit-includes.h:240
 msgid ""
 "To set a custom shortcut:\n"
 "Click in the appropriate box and press CONTROL(and optionally SHIFT ) plus "
@@ -493,127 +493,127 @@
 "Cliquez sur 'Appliquer' pour garder les changements ou sur 'Annuler' pour "
 "annuler toute modification."
 
-#: KKEdit/src/kkedit-includes.h:238
+#: KKEdit/src/kkedit-includes.h:241
 msgid "Delete Current Line"
 msgstr "Supprimer la ligne en cours"
 
-#: KKEdit/src/kkedit-includes.h:239
+#: KKEdit/src/kkedit-includes.h:242
 msgid "Delete To End Of Line"
 msgstr "Supprimer jusqu'à la fin de la ligne"
 
-#: KKEdit/src/kkedit-includes.h:240
+#: KKEdit/src/kkedit-includes.h:243
 msgid "Delete To Beginning Of Line"
 msgstr "Supprimer jusqu'au début de la ligne"
 
-#: KKEdit/src/kkedit-includes.h:241
+#: KKEdit/src/kkedit-includes.h:244
 msgid "Select Word Under Cursor"
 msgstr "Sélectionner le mot sous le curseur"
 
-#: KKEdit/src/kkedit-includes.h:242
+#: KKEdit/src/kkedit-includes.h:245
 msgid "Delete Word Under Cursor"
 msgstr "Supprimer le mot sous le curseur"
 
-#: KKEdit/src/kkedit-includes.h:243
+#: KKEdit/src/kkedit-includes.h:246
 msgid "Duplicate Current Line"
 msgstr "Dupliquer la ligne"
 
-#: KKEdit/src/kkedit-includes.h:244
+#: KKEdit/src/kkedit-includes.h:247
 msgid "Select Current Line"
 msgstr "Sélectionner la ligne en cours"
 
-#: KKEdit/src/kkedit-includes.h:245
+#: KKEdit/src/kkedit-includes.h:248
 msgid "Move Current Line Up"
 msgstr "Déplacer la ligne en haut"
 
-#: KKEdit/src/kkedit-includes.h:246
+#: KKEdit/src/kkedit-includes.h:249
 msgid "Move Current Line Down"
 msgstr "Déplacer la ligne en bas"
 
-#: KKEdit/src/kkedit-includes.h:247
+#: KKEdit/src/kkedit-includes.h:250
 msgid "Select From Cursor To End Of Line"
 msgstr "Sélectionner du curseur jusqu'à la fin de la ligne"
 
-#: KKEdit/src/kkedit-includes.h:248
+#: KKEdit/src/kkedit-includes.h:251
 msgid "Select From Beginning Of Line To Cursor"
 msgstr "Sélectionner du début de la ligne jusqu'au curseur"
 
-#: KKEdit/src/kkedit-includes.h:249
+#: KKEdit/src/kkedit-includes.h:252
 msgid "Move Selection Up"
 msgstr "Déplacer la sélection à la ligne du dessus"
 
-#: KKEdit/src/kkedit-includes.h:250
+#: KKEdit/src/kkedit-includes.h:253
 msgid "Move Selection Down"
 msgstr "Déplacer la sélection à la ligne du dessous"
 
-#: KKEdit/src/kkedit-includes.h:251
+#: KKEdit/src/kkedit-includes.h:254
 msgid "Show Completion"
 msgstr "Montrer la complétion"
 
-#: KKEdit/src/kkedit-includes.h:252
+#: KKEdit/src/kkedit-includes.h:255
 msgid "Hide Tab"
 msgstr "Cacher l'onglet"
 
-#: KKEdit/src/kkedit-includes.h:255
+#: KKEdit/src/kkedit-includes.h:258
 msgid "New File"
 msgstr "Nouveau"
 
-#: KKEdit/src/kkedit-includes.h:256
+#: KKEdit/src/kkedit-includes.h:259
 msgid "Open File"
 msgstr "Ouvrir"
 
-#: KKEdit/src/kkedit-includes.h:257
+#: KKEdit/src/kkedit-includes.h:260
 msgid "Save File"
 msgstr "Enregistrer"
 
-#: KKEdit/src/kkedit-includes.h:258
+#: KKEdit/src/kkedit-includes.h:261
 msgid "Open Recent File"
 msgstr "Ouvrir un fichier récent"
 
-#: KKEdit/src/kkedit-includes.h:265
+#: KKEdit/src/kkedit-includes.h:268
 msgid "Go To Definition"
 msgstr "Aller à la définition"
 
-#: KKEdit/src/kkedit-includes.h:266
+#: KKEdit/src/kkedit-includes.h:269
 msgid "Go Back"
 msgstr "Vue précédente"
 
-#: KKEdit/src/kkedit-includes.h:267
+#: KKEdit/src/kkedit-includes.h:270
 msgid "Back To"
 msgstr "Revenir à"
 
-#: KKEdit/src/kkedit-includes.h:268
+#: KKEdit/src/kkedit-includes.h:271
 msgid "Go Forward"
 msgstr "Aller en avant"
 
-#: KKEdit/src/kkedit-includes.h:269
+#: KKEdit/src/kkedit-includes.h:272
 msgid "Forward To"
 msgstr "Avancer à"
 
-#: KKEdit/src/kkedit-includes.h:270 KKEdit/src/kkedit-includes.h:372
+#: KKEdit/src/kkedit-includes.h:273 KKEdit/src/kkedit-includes.h:376
 msgid "Go To Line"
 msgstr "Aller à la ligne..."
 
-#: KKEdit/src/kkedit-includes.h:271
+#: KKEdit/src/kkedit-includes.h:274
 msgid "Find API In Gtk Docs"
 msgstr "Trouver l'API dans les documents Gtk"
 
-#: KKEdit/src/kkedit-includes.h:272
+#: KKEdit/src/kkedit-includes.h:275
 msgid "Find API In Qt5 Docs"
 msgstr "Trouver l'API dans la documentation Qt5"
 
-#: KKEdit/src/kkedit-includes.h:274
+#: KKEdit/src/kkedit-includes.h:277
 msgid "Live Search"
 msgstr "Recherche rapide"
 
-#: KKEdit/src/kkedit-includes.h:275
+#: KKEdit/src/kkedit-includes.h:278
 msgid "Separator"
 msgstr "Séparateur"
 
-#: KKEdit/src/kkedit-includes.h:276
+#: KKEdit/src/kkedit-includes.h:279
 msgid "Expander"
 msgstr "Étendre"
 
-#: KKEdit/src/kkedit-includes.h:279
+#: KKEdit/src/kkedit-includes.h:282
 msgid ""
 "PLACEHOLDERS:\n"
 "%t - Currently selected text. Passed to command as $KKEDIT_SELECTION\n"
@@ -640,232 +640,236 @@
 "%l - Langage pour la coloration syntaxique. Passé à la commande par "
 "$KKEDIT_SOURCE_LANG"
 
-#: KKEdit/src/kkedit-includes.h:280
+#: KKEdit/src/kkedit-includes.h:283
 msgid "Edit External Tools"
 msgstr "Éditer les outils externes"
 
-#: KKEdit/src/kkedit-includes.h:281
+#: KKEdit/src/kkedit-includes.h:284
 msgid "Tool Name:\t"
 msgstr "Nom de l'outil:\t"
 
-#: KKEdit/src/kkedit-includes.h:282
+#: KKEdit/src/kkedit-includes.h:285
 msgid "Command: \t"
 msgstr "Commande:    \t"
 
-#: KKEdit/src/kkedit-includes.h:283
+#: KKEdit/src/kkedit-includes.h:286
 msgid "Shortcut:\t\t"
 msgstr "Raccourci:\t\t"
 
-#: KKEdit/src/kkedit-includes.h:284
+#: KKEdit/src/kkedit-includes.h:287
 msgid "Comment:  \t"
 msgstr "Commentaire: \t"
 
-#: KKEdit/src/kkedit-includes.h:285
+#: KKEdit/src/kkedit-includes.h:288
 msgid "Run Tool In Terminal"
 msgstr "Exécuter dans un terminal"
 
-#: KKEdit/src/kkedit-includes.h:286
+#: KKEdit/src/kkedit-includes.h:289
 msgid "Show Tool In Pop-Up Menu"
 msgstr "Montrer l'outil dans le menu pop-up"
 
-#: KKEdit/src/kkedit-includes.h:287
+#: KKEdit/src/kkedit-includes.h:290
 msgid "Always Show Tool In Pop-Up Menu"
 msgstr "Toujours montrer l'outil dans le menu pop-up"
 
-#: KKEdit/src/kkedit-includes.h:288
+#: KKEdit/src/kkedit-includes.h:291
 msgid "Run Tool Synchronously"
 msgstr "Exécuter de manière synchrone"
 
-#: KKEdit/src/kkedit-includes.h:289
+#: KKEdit/src/kkedit-includes.h:292
 msgid "Show HTML Doc"
 msgstr "Montrer la documentation HTML"
 
-#: KKEdit/src/kkedit-includes.h:290
+#: KKEdit/src/kkedit-includes.h:293
 msgid "Clear Tool Output First"
 msgstr "Effacer d'abord la sortie des outils"
 
-#: KKEdit/src/kkedit-includes.h:291
+#: KKEdit/src/kkedit-includes.h:294
 msgid "Run Tool As Root"
 msgstr "Exécuter en tant qu'administrateur"
 
-#: KKEdit/src/kkedit-includes.h:292
+#: KKEdit/src/kkedit-includes.h:295
 msgid "Use Progress Bar"
 msgstr "Utiliser une barre de progression"
 
-#: KKEdit/src/kkedit-includes.h:293
+#: KKEdit/src/kkedit-includes.h:296
 msgid "Ignore Output"
 msgstr "Ignorer la sortie"
 
-#: KKEdit/src/kkedit-includes.h:294
+#: KKEdit/src/kkedit-includes.h:297
 msgid "Paste Output"
 msgstr "Coller la sortie"
 
-#: KKEdit/src/kkedit-includes.h:295
+#: KKEdit/src/kkedit-includes.h:298
 msgid "Replace All Contents"
 msgstr "Remplacer tous les contenus"
 
-#: KKEdit/src/kkedit-includes.h:296
+#: KKEdit/src/kkedit-includes.h:299
 msgid "View Output"
 msgstr "Afficher la sortie"
 
-#: KKEdit/src/kkedit-includes.h:297
+#: KKEdit/src/kkedit-includes.h:300
 msgid "Delete"
 msgstr "Supprimer"
 
-#: KKEdit/src/kkedit-includes.h:300
+#: KKEdit/src/kkedit-includes.h:303
 msgid "<b>Customize Tool Bar</b>"
 msgstr "<b>Personnaliser la barre d'outils</b>"
 
-#: KKEdit/src/kkedit-includes.h:301
+#: KKEdit/src/kkedit-includes.h:304
 msgid "Auto Indent Lines"
 msgstr "Auto-indentation"
 
-#: KKEdit/src/kkedit-includes.h:304
+#: KKEdit/src/kkedit-includes.h:307
 msgid "Highlight Current Line"
 msgstr "Surligner la ligne en cours"
 
-#: KKEdit/src/kkedit-includes.h:307
+#: KKEdit/src/kkedit-includes.h:310
 msgid "Use Single Instance"
 msgstr "Autoriser une seule instance"
 
-#: KKEdit/src/kkedit-includes.h:308
+#: KKEdit/src/kkedit-includes.h:311
 msgid "Auto Save/Restore Session"
 msgstr "Enregistrer/Restaurer automatiquement la session"
 
-#: KKEdit/src/kkedit-includes.h:309
+#: KKEdit/src/kkedit-includes.h:312
 msgid "Restore Session Bookmarks"
 msgstr "Restaurer la session avec les signets"
 
-#: KKEdit/src/kkedit-includes.h:310
+#: KKEdit/src/kkedit-includes.h:313
 msgid "Don't Open Duplicate File"
 msgstr "Ne pas ouvrir deux fois le même fichier"
 
-#: KKEdit/src/kkedit-includes.h:311
+#: KKEdit/src/kkedit-includes.h:314
 msgid "Don't Warn On File Change"
 msgstr "Ne pas avertir lorsqu'un fichier a été modifié"
 
-#: KKEdit/src/kkedit-includes.h:312
+#: KKEdit/src/kkedit-includes.h:315
 msgid "Read Link Before Opening File"
 msgstr "Suivre les liens avant d'ouvrir un fichier"
 
-#: KKEdit/src/kkedit-includes.h:314
+#: KKEdit/src/kkedit-includes.h:317
+msgid "Show Icons In Gtk3 Menus ( Requires Restart )"
+msgstr "Afficher les icônes dans les menus Gtk3 ( Nécessite un redémarrage )"
+
+#: KKEdit/src/kkedit-includes.h:318
 msgid "Auto Search Docs"
 msgstr "Chercher automatiquement dans les documents"
 
-#: KKEdit/src/kkedit-includes.h:315
+#: KKEdit/src/kkedit-includes.h:319
 msgid "General Appearance"
 msgstr "Apparence général"
 
-#: KKEdit/src/kkedit-includes.h:316
+#: KKEdit/src/kkedit-includes.h:320
 msgid "Tab width:"
 msgstr "Largeur de tabulation:"
 
-#: KKEdit/src/kkedit-includes.h:317
+#: KKEdit/src/kkedit-includes.h:321
 msgid "Theme:"
 msgstr "Thème:"
 
-#: KKEdit/src/kkedit-includes.h:318
+#: KKEdit/src/kkedit-includes.h:322
 msgid "Font:"
 msgstr "Police:"
 
-#: KKEdit/src/kkedit-includes.h:319
+#: KKEdit/src/kkedit-includes.h:323
 msgid "Bookmark Highlight Colour:"
 msgstr "Couleur de surlignage:"
 
-#: KKEdit/src/kkedit-includes.h:320
+#: KKEdit/src/kkedit-includes.h:324
 msgid "Completion Minimum Word Size:"
 msgstr "Taille minimale des mots pour la complétion:"
 
-#: KKEdit/src/kkedit-includes.h:321
+#: KKEdit/src/kkedit-includes.h:325
 msgid "Notebook Tab Size:"
 msgstr "Taille des onglets:"
 
-#: KKEdit/src/kkedit-includes.h:322
+#: KKEdit/src/kkedit-includes.h:326
 msgid "Display functions etc in menu by type and alphabetically"
 msgstr ""
 "Afficher les fonctions dans le menu selon leur type et par ordre alphabétique"
 
-#: KKEdit/src/kkedit-includes.h:323
+#: KKEdit/src/kkedit-includes.h:327
 msgid "Display functions etc in menu by type and file position"
 msgstr "Afficher les fonctions dans le menu selon leur type et leur position"
 
-#: KKEdit/src/kkedit-includes.h:324
+#: KKEdit/src/kkedit-includes.h:328
 msgid "Display functions etc in menu by file position"
 msgstr "Afficher les fonctions dans le menu selon leur position"
 
-#: KKEdit/src/kkedit-includes.h:325
+#: KKEdit/src/kkedit-includes.h:329
 msgid "Display functions etc in menu alphabetically"
 msgstr "Afficher les fonctions dans le menu par ordre alphabétique"
 
-#: KKEdit/src/kkedit-includes.h:326
+#: KKEdit/src/kkedit-includes.h:330
 msgid "Display functions etc in menu in categorised format"
 msgstr "Afficher les fonctions dans le menu par catégorie"
 
-#: KKEdit/src/kkedit-includes.h:327
+#: KKEdit/src/kkedit-includes.h:331
 msgid "Customize Keyboard Shortcuts"
 msgstr "Personnaliser les raccourcis clavier"
 
-#: KKEdit/src/kkedit-includes.h:328
+#: KKEdit/src/kkedit-includes.h:332
 msgid "Text Style"
 msgstr "Style du texte"
 
-#: KKEdit/src/kkedit-includes.h:329
+#: KKEdit/src/kkedit-includes.h:333
 msgid "Tag File Search Depth:"
 msgstr "Profondeur de recherche dans les sous-répertoires:"
 
-#: KKEdit/src/kkedit-includes.h:330
+#: KKEdit/src/kkedit-includes.h:334
 msgid "Terminal Command:"
 msgstr "Commande de terminal:"
 
-#: KKEdit/src/kkedit-includes.h:331
+#: KKEdit/src/kkedit-includes.h:335
 msgid "Run As Root Command:"
 msgstr "Commande d’exécution en tant qu'administrateur:"
 
-#: KKEdit/src/kkedit-includes.h:332
+#: KKEdit/src/kkedit-includes.h:336
 msgid "Default Browser:"
 msgstr "Navigateur web par défaut:"
 
-#: KKEdit/src/kkedit-includes.h:333
+#: KKEdit/src/kkedit-includes.h:337
 msgid "Max Find/Replace History:"
 msgstr "Max Rechercher / Remplacer Histoire"
 
-#: KKEdit/src/kkedit-includes.h:334
+#: KKEdit/src/kkedit-includes.h:338
 msgid "Max Characters In Tab:"
 msgstr "Max Caractères dans Tab:"
 
-#: KKEdit/src/kkedit-includes.h:335
+#: KKEdit/src/kkedit-includes.h:339
 msgid "Max Characters In Function Defs:"
 msgstr "Caractères max de la fonction Defs:"
 
-#: KKEdit/src/kkedit-includes.h:336
+#: KKEdit/src/kkedit-includes.h:340
 msgid "Max Characters In Bookmarks:"
 msgstr "Caractères max dans les signets:"
 
-#: KKEdit/src/kkedit-includes.h:337
+#: KKEdit/src/kkedit-includes.h:341
 msgid "Max Back/Forward History:"
 msgstr "Maximum de retours en arrière/avant de l'historique:"
 
-#: KKEdit/src/kkedit-includes.h:338
+#: KKEdit/src/kkedit-includes.h:342
 msgid "Check For Updates"
 msgstr "Rechercher des mises à jour"
 
-#: KKEdit/src/kkedit-includes.h:339
+#: KKEdit/src/kkedit-includes.h:343
 msgid "Use Global Plugins Menu( Requires Restart )"
 msgstr "Utilisez le menu général des greffons ( Nécessite un redémarrage )"
 
-#: KKEdit/src/kkedit-includes.h:340
+#: KKEdit/src/kkedit-includes.h:344
 msgid "Administration"
 msgstr "Administration"
 
-#: KKEdit/src/kkedit-includes.h:341
+#: KKEdit/src/kkedit-includes.h:345
 msgid "<b>Be Kind To Poor Programmers</b>"
 msgstr "<b>Soyez gentil envers les programmeurs pauvres</b>"
 
-#: KKEdit/src/kkedit-includes.h:342
+#: KKEdit/src/kkedit-includes.h:346
 msgid "I have donated"
 msgstr "J'ai déjà fait un don"
 
-#: KKEdit/src/kkedit-includes.h:343
+#: KKEdit/src/kkedit-includes.h:347
 msgid ""
 "I have really donated some some money to the author.\n"
 "My conscience is clear and my Karma is squeaky clean :)"
@@ -873,84 +877,84 @@
 "J'ai vraiment déjà fait un don à l'auteur.\n"
 "Ma conscience est tranquille et mon Karma est irréprochable :)"
 
-#: KKEdit/src/kkedit-includes.h:346
+#: KKEdit/src/kkedit-includes.h:350
 msgid "Find/Replace"
 msgstr "Trouver/Remplacer"
 
-#: KKEdit/src/kkedit-includes.h:347
+#: KKEdit/src/kkedit-includes.h:351
 msgid "Find Text"
 msgstr "Trouver"
 
-#: KKEdit/src/kkedit-includes.h:348
+#: KKEdit/src/kkedit-includes.h:352
 msgid "Replace With"
 msgstr "Remplacer par"
 
-#: KKEdit/src/kkedit-includes.h:349
+#: KKEdit/src/kkedit-includes.h:353
 msgid "Case insensitive"
 msgstr "Casse insensible"
 
-#: KKEdit/src/kkedit-includes.h:350
+#: KKEdit/src/kkedit-includes.h:354
 msgid "Use Regex"
 msgstr "Expression régulière"
 
-#: KKEdit/src/kkedit-includes.h:351
+#: KKEdit/src/kkedit-includes.h:355
 msgid "Wrap"
 msgstr "Recherche circulaire"
 
-#: KKEdit/src/kkedit-includes.h:352
+#: KKEdit/src/kkedit-includes.h:356
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: KKEdit/src/kkedit-includes.h:353
+#: KKEdit/src/kkedit-includes.h:357
 msgid "Highlight All"
 msgstr "Tout surligner"
 
-#: KKEdit/src/kkedit-includes.h:354
+#: KKEdit/src/kkedit-includes.h:358
 msgid "Replace All"
 msgstr "Tout remplacer"
 
-#: KKEdit/src/kkedit-includes.h:355
+#: KKEdit/src/kkedit-includes.h:359
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: KKEdit/src/kkedit-includes.h:356
+#: KKEdit/src/kkedit-includes.h:360
 msgid "_Replace All"
 msgstr "Tout re_mplacer"
 
-#: KKEdit/src/kkedit-includes.h:359
+#: KKEdit/src/kkedit-includes.h:363
 msgid "Spell check word"
 msgstr "Vérifier l'orthographe du mot"
 
-#: KKEdit/src/kkedit-includes.h:360
+#: KKEdit/src/kkedit-includes.h:364
 #, c-format
 msgid "Change <i><b>%s</b></i> to: "
 msgstr "Changer <i><b>%s</b></i> en:"
 
-#: KKEdit/src/kkedit-includes.h:361
+#: KKEdit/src/kkedit-includes.h:365
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: KKEdit/src/kkedit-includes.h:362
+#: KKEdit/src/kkedit-includes.h:366
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: KKEdit/src/kkedit-includes.h:365
+#: KKEdit/src/kkedit-includes.h:369
 msgid "Enter Function Name"
 msgstr "Donnez le nom d'une fonction"
 
-#: KKEdit/src/kkedit-includes.h:366
+#: KKEdit/src/kkedit-includes.h:370
 msgid "Find Function"
 msgstr "Trouver une fonction"
 
-#: KKEdit/src/kkedit-includes.h:367
+#: KKEdit/src/kkedit-includes.h:371
 msgid "For_ward"
 msgstr "_Suivant"
 
-#: KKEdit/src/kkedit-includes.h:368
+#: KKEdit/src/kkedit-includes.h:372
 msgid "Please donate"
 msgstr "Faites un don, s'il vous plaît"
 
-#: KKEdit/src/kkedit-includes.h:369
+#: KKEdit/src/kkedit-includes.h:373
 msgid ""
 "If you have a PayPal account you can donate any amount you like by logging "
 "into yor account and click the 'Send Money' tab, enter my email address"
@@ -959,35 +963,35 @@
 "quel montant en vous connectant à votre compte et en allant dans l'onglet "
 "'Envoi d'argent'. Entrez mon adresse courriel"
 
-#: KKEdit/src/kkedit-includes.h:370
+#: KKEdit/src/kkedit-includes.h:374
 msgid "and then send it."
 msgstr " et envoyez."
 
-#: KKEdit/src/kkedit-includes.h:371
+#: KKEdit/src/kkedit-includes.h:375
 msgid "Thank you for helping to support Free software."
 msgstr "Merci d'aider à soutenir le logiciel libre."
 
-#: KKEdit/src/kkedit-includes.h:373
+#: KKEdit/src/kkedit-includes.h:377
 msgid "Enter Line Number"
 msgstr "Donnez le numéro d'une ligne"
 
-#: KKEdit/src/kkedit-includes.h:374
+#: KKEdit/src/kkedit-includes.h:378
 msgid "Building Documentaion ..."
 msgstr "Documentation en construction ..."
 
-#: KKEdit/src/kkedit-includes.h:375
+#: KKEdit/src/kkedit-includes.h:379
 msgid "Do you want to replace in ALL open files?"
 msgstr "Voulez-vous remplacer dans TOUS les fichiers ouverts ?"
 
-#: KKEdit/src/kkedit-includes.h:376
+#: KKEdit/src/kkedit-includes.h:380
 msgid "What Do You Want To Do?"
 msgstr "Que voulez-vous faire?"
 
-#: KKEdit/src/kkedit-includes.h:377
+#: KKEdit/src/kkedit-includes.h:381
 msgid "Are you sure you want to delete"
 msgstr "Êtes-vous sûr de vouloir supprimer"
 
-#: KKEdit/src/kkedit-includes.h:378
+#: KKEdit/src/kkedit-includes.h:382
 msgid ""
 "\n"
 "More by the same author\n"
@@ -995,23 +999,23 @@
 "\n"
 "Plus du même auteur\n"
 
-#: KKEdit/src/kkedit-includes.h:379
+#: KKEdit/src/kkedit-includes.h:383
 msgid "KKEdit Code Text Editor"
 msgstr "Éditeur de code source KKEdit"
 
-#: KKEdit/src/kkedit-includes.h:380
+#: KKEdit/src/kkedit-includes.h:384
 msgid "French Translation"
 msgstr "Traduction française"
 
-#: KKEdit/src/kkedit-includes.h:381
+#: KKEdit/src/kkedit-includes.h:385
 msgid "GTK3 Application Icon"
 msgstr "Icône de l'application GTK3"
 
-#: KKEdit/src/kkedit-includes.h:382
+#: KKEdit/src/kkedit-includes.h:386
 msgid "Restoring Session ..."
 msgstr "Restaurer la session ..."
 
-#: KKEdit/src/kkedit-includes.h:383
+#: KKEdit/src/kkedit-includes.h:387
 #, c-format
 msgid ""
 "File %s Has Changed on disk\n"
@@ -1020,61 +1024,61 @@
 "Le fichier %s a été modifié\n"
 "Voulez-vous le recharger?"
 
-#: KKEdit/src/kkedit-includes.h:384
+#: KKEdit/src/kkedit-includes.h:388
 msgid "Warning file changed!"
 msgstr "Attention le fichier a été modifié!"
 
-#: KKEdit/src/kkedit-includes.h:385
+#: KKEdit/src/kkedit-includes.h:389
 #, c-format
 msgid "File '%s' doesn't exist :("
 msgstr "Le fichier '%s' n'existe pas :("
 
-#: KKEdit/src/kkedit-includes.h:386
+#: KKEdit/src/kkedit-includes.h:390
 #, c-format
 msgid "Can't open file '%s' :("
 msgstr "Impossible d'ouvrir le fichier '%s' :("
 
-#: KKEdit/src/kkedit-includes.h:387
+#: KKEdit/src/kkedit-includes.h:391
 msgid "Contains non text data,continue loading?\n"
 msgstr "Contient des données non textuelles, continuer le chargement?\n"
 
-#: KKEdit/src/kkedit-includes.h:390
+#: KKEdit/src/kkedit-includes.h:394
 msgid "Doc Viewer"
 msgstr "Visionneur de documents"
 
-#: KKEdit/src/kkedit-includes.h:391
+#: KKEdit/src/kkedit-includes.h:395
 msgid "_Home"
 msgstr "_Accueil"
 
-#: KKEdit/src/kkedit-includes.h:392
+#: KKEdit/src/kkedit-includes.h:396
 msgid "_Down"
 msgstr "_Descendre"
 
-#: KKEdit/src/kkedit-includes.h:393
+#: KKEdit/src/kkedit-includes.h:397
 msgid "_Up"
 msgstr "En haut"
 
-#: KKEdit/src/kkedit-includes.h:394
+#: KKEdit/src/kkedit-includes.h:398
 msgid "Gtk Docs"
 msgstr "Documents Gtk"
 
-#: KKEdit/src/kkedit-includes.h:395
+#: KKEdit/src/kkedit-includes.h:399
 msgid "Doxygen Docs"
 msgstr "Documents Doxygen"
 
-#: KKEdit/src/kkedit-includes.h:396
+#: KKEdit/src/kkedit-includes.h:400
 msgid "Qt5 Docs"
 msgstr "Documentation Qt5"
 
-#: KKEdit/src/kkedit-includes.h:397
+#: KKEdit/src/kkedit-includes.h:401
 msgid "KKEdit Help"
 msgstr "_Aide"
 
-#: KKEdit/src/kkedit-includes.h:398
+#: KKEdit/src/kkedit-includes.h:402
 msgid "Searching Google..."
 msgstr "Recherche sur Google en cours ..."
 
-#: KKEdit/src/kkedit-includes.h:401
+#: KKEdit/src/kkedit-includes.h:405
 #, c-format
 msgid ""
 "Plugin '%s' cannot be unloaded yet.\n"
@@ -1083,26 +1087,29 @@
 "Le greffon '%s' ne peut pas être décharger maintenant.\n"
 "Relancer KKEdit pour ce faire."
 
-#: KKEdit/src/kkedit-includes.h:402
+#: KKEdit/src/kkedit-includes.h:406
 msgid "Enable"
 msgstr "Activer"
 
-#: KKEdit/src/kkedit-includes.h:403
+#: KKEdit/src/kkedit-includes.h:407
 msgid "Plug In"
 msgstr "Greffon"
 
-#: KKEdit/src/kkedit-includes.h:406
+#: KKEdit/src/kkedit-includes.h:410
 msgid "Functions"
 msgstr "Fonctions"
 
-#: KKEdit/src/kkedit-includes.h:407
+#: KKEdit/src/kkedit-includes.h:411
 msgid "Variables"
 msgstr "Variables"
 
-#: KKEdit/src/kkedit-includes.h:408
+#: KKEdit/src/kkedit-includes.h:412
 msgid "Custom Words"
 msgstr "Mots personnalisés"
 
+#~ msgid "Select Colour"
+#~ msgstr "Sélectionner la couleur"
+
 #~ msgid "Un-Split View"
 #~ msgstr "Unifier l'affichage"
 
diff -Nru kkedit-0.3.3/Makefile.am kkedit-0.4.1/Makefile.am
--- kkedit-0.3.3/Makefile.am	2016-05-23 09:23:37.000000000 +0000
+++ kkedit-0.4.1/Makefile.am	2016-08-26 09:41:37.000000000 +0000
@@ -1,9 +1,11 @@
 
 export GLOBAL = 1
-export GTKVERSION = $(PLUGVERSION)
 export VTEVERSION = $(VTEVERS)
+export CONFCXXFLAGS = $(CXXFLAGS)
+export CONFCPPFLAGS = $(CPPFLAGS)
+export CONFLDFLAGS = $(LDFLAGS)
 
-SUBDIRS = KKEdit/app $(PLUGINCLUDES)
+SUBDIRS = KKEdit/app $(PLUGDIRS) $(NEWPLUGINCLUDES)
 
 remake:
 	$(shell ./remakesourcelist)
@@ -20,6 +22,7 @@
 	rm -f $(DESTDIR)${prefix}/share/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png||true
 	rm -fr $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)||true
 	rm -fr $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/kkedit$(GTK3SUFFIX).mo||true
+	rm -f $(DESTDIR)${includedir}/kkedit-plugins$(GTK3SUFFIX).h||true
 
 update-icons:
-	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+	gtk-update-icon-cache -q -t -f ${prefix}/share/icons/hicolor
diff -Nru kkedit-0.3.3/Makefile.in kkedit-0.4.1/Makefile.in
--- kkedit-0.3.3/Makefile.in	2016-05-23 09:23:39.000000000 +0000
+++ kkedit-0.4.1/Makefile.in	2016-08-26 09:41:40.000000000 +0000
@@ -85,6 +85,8 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -155,8 +157,8 @@
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS README compile depcomp \
-	install-sh missing
+	COPYING ChangeLog INSTALL NEWS README compile config.guess \
+	config.sub depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -223,6 +225,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+EXCTAGS = @EXCTAGS@
 EXEEXT = @EXEEXT@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
@@ -231,8 +234,10 @@
 GTKSRC_CFLAGS = @GTKSRC_CFLAGS@
 GTKSRC_LIBS = @GTKSRC_LIBS@
 GTKSU = @GTKSU@
+GTKVERSION = @GTKVERSION@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
+ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -245,6 +250,7 @@
 MAKEINFO = @MAKEINFO@
 MANPAGEEDITOR = @MANPAGEEDITOR@
 MKDIR_P = @MKDIR_P@
+NEWPLUGINCLUDES = @NEWPLUGINCLUDES@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -257,11 +263,13 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUGINCLUDES = @PLUGINCLUDES@
+PLUGDIRS = @PLUGDIRS@
 PLUGVERSION = @PLUGVERSION@
+SEDCOMMAND = @SEDCOMMAND@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE290 = @USE290@
 VERSION = @VERSION@
 VTEVERS = @VTEVERS@
 VTE_CFLAGS = @VTE_CFLAGS@
@@ -282,14 +290,22 @@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -316,7 +332,7 @@
 with_debug_level = @with_debug_level@
 with_gsu_path = @with_gsu_path@
 with_qt5_docdir = @with_qt5_docdir@
-SUBDIRS = KKEdit/app $(PLUGINCLUDES)
+SUBDIRS = KKEdit/app $(PLUGDIRS) $(NEWPLUGINCLUDES)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -792,8 +808,10 @@
 
 
 export GLOBAL = 1
-export GTKVERSION = $(PLUGVERSION)
 export VTEVERSION = $(VTEVERS)
+export CONFCXXFLAGS = $(CXXFLAGS)
+export CONFCPPFLAGS = $(CPPFLAGS)
+export CONFLDFLAGS = $(LDFLAGS)
 
 remake:
 	$(shell ./remakesourcelist)
@@ -810,9 +828,10 @@
 	rm -f $(DESTDIR)${prefix}/share/pixmaps/KKEditPlugMenu$(GTK3SUFFIX).png||true
 	rm -fr $(DESTDIR)$(pkgdatadir)$(GTK3SUFFIX)||true
 	rm -fr $(DESTDIR)${localedir}/fr_FR/LC_MESSAGES/kkedit$(GTK3SUFFIX).mo||true
+	rm -f $(DESTDIR)${includedir}/kkedit-plugins$(GTK3SUFFIX).h||true
 
 update-icons:
-	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+	gtk-update-icon-cache -q -t -f ${prefix}/share/icons/hicolor
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Binary files /tmp/tmpWrH2kW/ZPalYfeYhD/kkedit-0.3.3/po/fr_FR/LC_MESSAGES/kkedit.mo and /tmp/tmpWrH2kW/fREMJA3jNi/kkedit-0.4.1/po/fr_FR/LC_MESSAGES/kkedit.mo differ