To: vim_dev@googlegroups.com
Subject: Patch 7.4.995
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.995
Problem:    gdk_pixbuf_new_from_inline() is deprecated.
Solution:   Generate auto/gui_gtk_gresources.c. (Kazunobu Kazunobu,
            closes #507)
Files:      src/Makefile, src/auto/configure, src/config.h.in,
            src/config.mk.in, src/configure.in, src/gui_gtk.c,
            src/gui_gtk_gresources.xml, src/gui_gtk_x11.c,
            src/proto/gui_gtk_gresources.pro,
            pixmaps/stock_vim_build_tags.png, pixmaps/stock_vim_find_help.png,
            pixmaps/stock_vim_save_all.png,
            pixmaps/stock_vim_session_load.png,
            pixmaps/stock_vim_session_new.png,
            pixmaps/stock_vim_session_save.png, pixmaps/stock_vim_shell.png,
            pixmaps/stock_vim_window_maximize.png,
            pixmaps/stock_vim_window_maximize_width.png,
            pixmaps/stock_vim_window_minimize.png,
            pixmaps/stock_vim_window_minimize_width.png,
            pixmaps/stock_vim_window_split.png,
            pixmaps/stock_vim_window_split_vertical.png


*** ../vim-7.4.994/src/Makefile	2015-12-29 14:26:51.831787607 +0100
--- src/Makefile	2015-12-29 18:43:32.061907190 +0100
***************
*** 1199,1208 ****
  
  ### GTK GUI
  GTK_SRC		= gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \
! 			gui_beval.c
  GTK_OBJ		= objects/gui.o objects/gui_gtk.o objects/gui_gtk_x11.o \
  			objects/pty.o objects/gui_gtk_f.o \
! 			objects/gui_beval.o
  GTK_DEFS	= -DFEAT_GUI_GTK $(NARROW_PROTO)
  GTK_IPATH	= $(GUI_INC_LOC)
  GTK_LIBS_DIR	= $(GUI_LIB_LOC)
--- 1199,1208 ----
  
  ### GTK GUI
  GTK_SRC		= gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \
! 			gui_beval.c $(GRESOURCE_SRC)
  GTK_OBJ		= objects/gui.o objects/gui_gtk.o objects/gui_gtk_x11.o \
  			objects/pty.o objects/gui_gtk_f.o \
! 			objects/gui_beval.o $(GRESOURCE_OBJ)
  GTK_DEFS	= -DFEAT_GUI_GTK $(NARROW_PROTO)
  GTK_IPATH	= $(GUI_INC_LOC)
  GTK_LIBS_DIR	= $(GUI_LIB_LOC)
***************
*** 1527,1533 ****
  
  EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
  	    if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
! 	    gui_beval.c workshop.c wsdebug.c integration.c netbeans.c
  
  # Unittest files
  MEMFILE_TEST_SRC = memfile_test.c
--- 1527,1534 ----
  
  EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
  	    if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
! 	    gui_beval.c workshop.c wsdebug.c integration.c netbeans.c \
! 	    $(GRESOURCE_SRC)
  
  # Unittest files
  MEMFILE_TEST_SRC = memfile_test.c
***************
*** 1869,1874 ****
--- 1870,1878 ----
  if_perl.pro: auto/if_perl.c
  	$(CPROTO) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@
  
+ gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
+ 	$(CPROTO) -DFEAT_GUI $< > proto/$@
+ 	echo "/* vim: set ft=c : */" >> proto/$@
  
  notags:
  	-rm -f tags
***************
*** 2441,2447 ****
  # We support common typing mistakes for Juergen! :-)
  clean celan: testclean
  	-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
! 	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
  	-rm -f conftest* *~ auto/link.sed
  	-rm -f $(UNITTEST_TARGETS)
  	-rm -f runtime pixmaps
--- 2445,2451 ----
  # We support common typing mistakes for Juergen! :-)
  clean celan: testclean
  	-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
! 	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h
  	-rm -f conftest* *~ auto/link.sed
  	-rm -f $(UNITTEST_TARGETS)
  	-rm -f runtime pixmaps
***************
*** 2578,2583 ****
--- 2582,2592 ----
  	-@echo '";' >> $@
  	-@sh $(srcdir)/pathdef.sh
  
+ auto/gui_gtk_gresources.c: gui_gtk_gresources.xml
+ 	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
+ auto/gui_gtk_gresources.h: gui_gtk_gresources.xml
+ 	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
+ 
  # All the object files are put in the "objects" directory.  Since not all make
  # commands understand putting object files in another directory, it must be
  # specified for each file separately.
***************
*** 2663,2668 ****
--- 2672,2680 ----
  objects/gui_gtk_f.o: gui_gtk_f.c
  	$(CCC) -o $@ gui_gtk_f.c
  
+ objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
+ 	$(CCC) $(PERL_CFLAGS) -o $@ auto/gui_gtk_gresources.c
+ 
  objects/gui_gtk_x11.o: gui_gtk_x11.c
  	$(CCC) -o $@ gui_gtk_x11.c
  
***************
*** 3145,3150 ****
--- 3157,3172 ----
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
   globals.h farsi.h arabic.h gui_gtk_f.h
+ objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_gresources.xml \
+  ../pixmaps/stock_vim_build_tags.png ../pixmaps/stock_vim_find_help.png \
+  ../pixmaps/stock_vim_save_all.png ../pixmaps/stock_vim_session_load.png \
+  ../pixmaps/stock_vim_session_new.png ../pixmaps/stock_vim_session_save.png \
+  ../pixmaps/stock_vim_shell.png ../pixmaps/stock_vim_window_maximize.png \
+  ../pixmaps/stock_vim_window_maximize_width.png \
+  ../pixmaps/stock_vim_window_minimize.png \
+  ../pixmaps/stock_vim_window_minimize_width.png \
+  ../pixmaps/stock_vim_window_split.png \
+  ../pixmaps/stock_vim_window_split_vertical.png
  objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
***************
*** 3197,3203 ****
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
   globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \
!  ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
  objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
--- 3219,3225 ----
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
   globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \
!  ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm $(GRESOURCE_HDR)
  objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
*** ../vim-7.4.994/src/auto/configure	2015-12-17 15:34:49.936071729 +0100
--- src/auto/configure	2015-12-29 18:45:58.064329435 +0100
***************
*** 636,641 ****
--- 636,645 ----
  GUI_INC_LOC
  NARROW_PROTO
  MOTIF_LIBNAME
+ GRESOURCE_OBJ
+ GRESOURCE_SRC
+ GRESOURCE_HDR
+ GLIB_COMPILE_RESOURCES
  GNOME_INCLUDEDIR
  GNOME_LIBDIR
  GNOME_LIBS
***************
*** 8907,8912 ****
--- 8911,8996 ----
    fi
  fi
  
+ if test "x$GUITYPE" = "xGTK"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of Gdk-Pixbuf" >&5
+ $as_echo_n "checking version of Gdk-Pixbuf... " >&6; }
+   gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0`
+   if test "x$gdk_pixbuf_version" != x ; then
+     gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
+       sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`
+     if test "x$gdk_pixbuf_version_minor" != x -a \
+       $gdk_pixbuf_version_minor -ge 32 ; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5
+ $as_echo "OK." >&6; }
+       # Extract the first word of "glib-compile-resources", so it can be a program name with args.
+ set dummy glib-compile-resources; 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_path_GLIB_COMPILE_RESOURCES+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GLIB_COMPILE_RESOURCES in
+   [\\/]* | ?:[\\/]*)
+   ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path.
+   ;;
+   *)
+   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_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext"
+     $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_path_GLIB_COMPILE_RESOURCES" && ac_cv_path_GLIB_COMPILE_RESOURCES="no"
+   ;;
+ esac
+ fi
+ GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES
+ if test -n "$GLIB_COMPILE_RESOURCES"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5
+ $as_echo "$GLIB_COMPILE_RESOURCES" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5
+ $as_echo_n "checking glib-compile-resources... " >&6; }
+       if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5
+ $as_echo "cannot be found in PATH." >&6; }
+       else
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5
+ $as_echo "usable." >&6; }
+         $as_echo "#define USE_GRESOURCE 1" >>confdefs.h
+ 
+         GRESOURCE_HDR="auto/gui_gtk_gresources.h"
+         GRESOURCE_SRC="auto/gui_gtk_gresources.c"
+         GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
+       fi
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5
+ $as_echo "not usable." >&6; }
+     fi
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot obtain from pkg_config." >&5
+ $as_echo "cannot obtain from pkg_config." >&6; }
+   fi
+ fi
+ 
+ 
+ 
+ 
+ 
  
  if test -z "$SKIP_MOTIF"; then
    gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
*** ../vim-7.4.994/src/config.h.in	2015-09-08 20:00:17.531627716 +0200
--- src/config.h.in	2015-12-29 18:14:49.900506583 +0100
***************
*** 452,454 ****
--- 452,457 ----
  
  /* Define if Xutf8SetWMProperties() is in an X library. */
  #undef HAVE_XUTF8SETWMPROPERTIES
+ 
+ /* Define if GResource is used to load icons */
+ #undef USE_GRESOURCE
*** ../vim-7.4.994/src/config.mk.in	2014-08-17 17:05:39.155057796 +0200
--- src/config.mk.in	2015-12-29 18:14:49.900506583 +0100
***************
*** 158,163 ****
--- 158,168 ----
  MOTIF_LIBNAME	= @MOTIF_LIBNAME@
  GTK_LIBNAME	= @GTK_LIBNAME@
  
+ GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+ GRESOURCE_HDR = @GRESOURCE_HDR@
+ GRESOURCE_SRC = @GRESOURCE_SRC@
+ GRESOURCE_OBJ = @GRESOURCE_OBJ@
+ 
  ### Any OS dependent extra source and object file
  OS_EXTRA_SRC	= @OS_EXTRA_SRC@
  OS_EXTRA_OBJ	= @OS_EXTRA_OBJ@
*** ../vim-7.4.994/src/configure.in	2015-12-17 15:34:49.932071771 +0100
--- src/configure.in	2015-12-29 18:34:24.675821780 +0100
***************
*** 2500,2505 ****
--- 2500,2539 ----
    fi
  fi
  
+ dnl Check the version of Gdk-Pixbuf.  If the version is 2.32 or later and
+ dnl glib-compile-resources is found in PATH, use GResource.
+ if test "x$GUITYPE" = "xGTK"; then
+   AC_MSG_CHECKING([version of Gdk-Pixbuf])
+   gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0`
+   if test "x$gdk_pixbuf_version" != x ; then
+     gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
+       sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'`
+     if test "x$gdk_pixbuf_version_minor" != x -a \
+       $gdk_pixbuf_version_minor -ge 32 ; then
+       AC_MSG_RESULT([OK.])
+       AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no)
+       AC_MSG_CHECKING([glib-compile-resources])
+       if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
+         AC_MSG_RESULT([cannot be found in PATH.])
+       else
+ 	AC_MSG_RESULT([usable.])
+         AC_DEFINE(USE_GRESOURCE)
+         GRESOURCE_HDR="auto/gui_gtk_gresources.h"
+         GRESOURCE_SRC="auto/gui_gtk_gresources.c"
+         GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
+       fi
+     else
+       AC_MSG_RESULT([not usable.])
+     fi
+   else
+     AC_MSG_RESULT([cannot obtain from pkg_config.])
+   fi
+ fi
+ AC_SUBST(GLIB_COMPILE_RESOURCES)
+ AC_SUBST(GRESOURCE_HDR)
+ AC_SUBST(GRESOURCE_SRC)
+ AC_SUBST(GRESOURCE_OBJ)
+ 
  dnl Check for Motif include files location.
  dnl The LAST one found is used, this makes the highest version to be used,
  dnl e.g. when Motif1.2 and Motif2.0 are both present.
*** ../vim-7.4.994/src/gui_gtk.c	2013-07-03 11:49:42.000000000 +0200
--- src/gui_gtk.c	2015-12-29 18:20:42.516702748 +0100
***************
*** 140,145 ****
--- 140,170 ----
      /* 31 */ GTK_STOCK_QUIT
  };
  
+ #ifdef USE_GRESOURCE
+ typedef struct IconNames {
+     const char *icon_name;
+     const char *file_name;
+ } IconNames;
+ 
+ static IconNames stock_vim_icons[] = {
+     { "vim-build-tags", "stock_vim_build_tags.png" },
+     { "vim-find-help", "stock_vim_find_help.png" },
+     { "vim-save-all", "stock_vim_save_all.png" },
+     { "vim-session-load", "stock_vim_session_load.png" },
+     { "vim-session-new", "stock_vim_session_new.png" },
+     { "vim-session-save", "stock_vim_session_save.png" },
+     { "vim-shell", "stock_vim_shell.png" },
+     { "vim-window-maximize", "stock_vim_window_maximize.png" },
+     { "vim-window-maximize-width", "stock_vim_window_maximize_width.png" },
+     { "vim-window-minimize", "stock_vim_window_minimize.png" },
+     { "vim-window-minimize-width", "stock_vim_window_minimize_width.png" },
+     { "vim-window-split", "stock_vim_window_split.png" },
+     { "vim-window-split-vertical", "stock_vim_window_split_vertical.png" },
+     { NULL, NULL }
+ };
+ #endif
+ 
+ #ifndef USE_GRESOURCE
      static void
  add_stock_icon(GtkIconFactory	*factory,
  	       const char	*stock_id,
***************
*** 157,162 ****
--- 182,188 ----
      gtk_icon_set_unref(icon_set);
      g_object_unref(pixbuf);
  }
+ #endif
  
      static int
  lookup_menu_iconfile(char_u *iconfile, char_u *dest)
***************
*** 262,272 ****
      void
  gui_gtk_register_stock_icons(void)
  {
! #   include "../pixmaps/stock_icons.h"
      GtkIconFactory *factory;
  
      factory = gtk_icon_factory_new();
! #   define ADD_ICON(Name, Data) add_stock_icon(factory, Name, Data, (int)sizeof(Data))
  
      ADD_ICON("vim-build-tags",		  stock_vim_build_tags);
      ADD_ICON("vim-find-help",		  stock_vim_find_help);
--- 288,299 ----
      void
  gui_gtk_register_stock_icons(void)
  {
! #ifndef USE_GRESOURCE
! # include "../pixmaps/stock_icons.h"
      GtkIconFactory *factory;
  
      factory = gtk_icon_factory_new();
! # define ADD_ICON(Name, Data) add_stock_icon(factory, Name, Data, (int)sizeof(Data))
  
      ADD_ICON("vim-build-tags",		  stock_vim_build_tags);
      ADD_ICON("vim-find-help",		  stock_vim_find_help);
***************
*** 282,288 ****
      ADD_ICON("vim-window-split",	  stock_vim_window_split);
      ADD_ICON("vim-window-split-vertical", stock_vim_window_split_vertical);
  
! #   undef ADD_ICON
      gtk_icon_factory_add_default(factory);
      g_object_unref(factory);
  }
--- 309,336 ----
      ADD_ICON("vim-window-split",	  stock_vim_window_split);
      ADD_ICON("vim-window-split-vertical", stock_vim_window_split_vertical);
  
! # undef ADD_ICON
! #else
!     GtkIconFactory * const factory = gtk_icon_factory_new();
!     const char * const path_prefix = "/org/vim/gui/icon";
!     IconNames *names;
! 
!     for (names = stock_vim_icons; names->icon_name != NULL; names++)
!     {
!         char path[MAXPATHL];
!         GdkPixbuf *pixbuf;
! 
!         vim_snprintf(path, MAXPATHL, "%s/%s", path_prefix, names->file_name);
!         pixbuf = gdk_pixbuf_new_from_resource(path, NULL);
!         if (pixbuf != NULL)
!         {
!             GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf(pixbuf);
!             gtk_icon_factory_add(factory, names->icon_name, icon_set);
!             gtk_icon_set_unref(icon_set);
!             g_object_unref(pixbuf);
!         }
!     }
! #endif
      gtk_icon_factory_add_default(factory);
      g_object_unref(factory);
  }
*** ../vim-7.4.994/src/gui_gtk_gresources.xml	2015-12-29 18:50:39.949280523 +0100
--- src/gui_gtk_gresources.xml	2015-12-29 18:14:49.900506583 +0100
***************
*** 0 ****
--- 1,18 ----
+ <?xml version="1.0" encoding="UTF-8"?>
+ <gresources>
+     <gresource prefix="/org/vim/gui/icon">
+         <file>stock_vim_build_tags.png</file>
+         <file>stock_vim_find_help.png</file>
+         <file>stock_vim_save_all.png</file>
+         <file>stock_vim_session_load.png</file>
+         <file>stock_vim_session_new.png</file>
+         <file>stock_vim_session_save.png</file>
+         <file>stock_vim_shell.png</file>
+         <file>stock_vim_window_maximize.png</file>
+         <file>stock_vim_window_maximize_width.png</file>
+         <file>stock_vim_window_minimize.png</file>
+         <file>stock_vim_window_minimize_width.png</file>
+         <file>stock_vim_window_split.png</file>
+         <file>stock_vim_window_split_vertical.png</file>
+     </gresource>
+ </gresources>
*** ../vim-7.4.994/src/gui_gtk_x11.c	2015-11-24 15:38:39.691489300 +0100
--- src/gui_gtk_x11.c	2015-12-29 18:14:49.900506583 +0100
***************
*** 22,27 ****
--- 22,30 ----
   */
  
  #include "vim.h"
+ #ifdef USE_GRESOURCE
+ #include "auto/gui_gtk_gresources.h"
+ #endif
  
  #ifdef FEAT_GUI_GNOME
  /* Gnome redefines _() and N_().  Grrr... */
***************
*** 1434,1439 ****
--- 1437,1445 ----
  	EMSG(_((char *)e_opendisp));
  	return FAIL;
      }
+ #ifdef USE_GRESOURCE
+     gui_gtk_register_resource();
+ #endif
      return OK;
  }
  
***************
*** 3620,3625 ****
--- 3626,3634 ----
  		IOSIZE - 1);
  	preserve_exit();
      }
+ #ifdef USE_GRESOURCE
+     gui_gtk_unregister_resource();
+ #endif
  }
  
  
*** ../vim-7.4.994/src/proto/gui_gtk_gresources.pro	2015-12-29 18:50:39.961280393 +0100
--- src/proto/gui_gtk_gresources.pro	2015-12-29 18:14:49.900506583 +0100
***************
*** 0 ****
--- 1,5 ----
+ /* auto/gui_gtk_gresources.c */
+ GResource *gui_gtk_get_resource __ARGS((void));
+ void gui_gtk_register_resource __ARGS((void));
+ void gui_gtk_unregister_resource __ARGS((void));
+ /* vim: set ft=c : */
*** ../vim-7.4.994/pixmaps/stock_vim_build_tags.png	2015-12-29 18:50:39.965280350 +0100
--- pixmaps/stock_vim_build_tags.png	2015-12-29 18:08:43.860447369 +0100
***************
*** 0 ****
--- 1,3 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ
nIDATH‰íU=‹Â@}Éz¥„€pÝý±€¿MÁ¿b#¨…XZXA´8±! ¤ƒÌçí¹Îø
w^åƒæe2oçÍn<qÁYÌJ΀×c¾¹PûK@C§ÓQù~¿/¸ÍfÃÞ¿–4•,˼øp8ò<|š¦^jç0ƨ|Q‚cö]t»]äyŽ0]‘Õj"Bóù\ðãñØ[¸h4¢mcjµšÚÅ9Ç1Úí¶kí.‹~ƒ‡‹ƒ
²,C©ôóh±X¨/¯×kŒF#oؓÉìEz½®nImÃáÕjÕãâ8F«ÕrñŸ[d­€·‡	œZ(õz=ì÷{··ƒ Àr¹™]
"RÏÇt:½.$‰˜
3«3ÐÎG¹\F³Ùtñ]‘ÊkŸŠ›ív;o[Zk1›ÍP©TD±4ME‘+ÊÌØn·^Î=ÿƒÓgz+r±À˕Ü'þŸ¾åᨃÚ^IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_find_help.png	2015-12-29 18:50:39.973280264 +0100
--- pixmaps/stock_vim_find_help.png	2015-12-29 18:09:18.840071105 +0100
***************
*** 0 ****
--- 1,6 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆlIDATH‰}–}PTçÆ÷îeqwх8-ZE>5"BuŒiŠ¶Sí©Edl'™é´c¬4’©ÖŒ±3Ilb¨&DMÔÔNR­š	N±T,"Ð4ĕ¯h€–…]öóîÝ}ûÇî2tÚé3sfîÌ}ç}žsÎsνa<|ð
ïMG^:¸Ä:>±³¯ïþæ¾û–ü±1«Àl6Odf¤ÝMOKû«>6ö÷§Ï¼7
€ÍÀ g¶
àMà<0¹uKåIEQyⓛ¶‰1ឝΛør¨_\¾ô¡Xµj¥e9°qƓÀ0Lc€y>Áyà€£G~³öñ¼¦¤¤ˆ€Ï-BšO¨>·p»Âé˜Î›pLO
+ ‡}RLŒ
+ K߉ññ£ˀ$àðRôrøH|ùð¯rÞzåµæŒŽÇ½YpØqÎÎât:q¹\ø¼~TUCÓBhÁ:Y&Ñë¤g‘Ÿ˜<©]m·ÿXZZ¼øØ%Ð
v`­£§û§/¯^¼jëï¢)zìg_ŕS†ÇãÆãõ T@ ëtH’„¨ªÐ»gÈ2éðzµ¸cžPÈ
$g£S;r3Ë;ì¾íg._%0mÃqíöþ{Ø&§°'š±Ü·ÐßoAõûÑëõècb~ôtßME/K¬0È4ŒªK%HžF€Ç0+
õê)¡vÞO=µQa4Dee… E€HNNG^Ø/,Å&a{q§ßY$¾*3‰Áu&qz¹^š"˅€	å¡©™ê]uuÊlaëŸÛKUÕwik»ÂõëØ´©Œìì•{4M+
Šl6{UýÑWù̀Oïg*w¡KZŠ¢ƒÜŸ×#˲N…ž‰XW§KX¸ðàñão¬¨ÙSKmm›7?ɒ%˱Z¿$.ÎHrr&“ñ{ËàáH¿†2ÓÓOßµÿ,O	²jE:1ùë‘ö½Ž¼<›ææ?35e—€ŸÜg±ä™ŒFnÝꠤ䛤¦fÓÛ{·ÛƒËåá±Ç–ÑÒrÀLŸø]ƒwpxøQuuUÅÙá¤Üuèø<!ãBDHPXð
 Pä±1«9&F
$Ünöâryp»Ã‘””Œ,Ë~@Û¶íûÀÿ·›­íw‚zô¥O
+ Ñ4
¿êÇgXè
jlØPL{{7÷ðx¼¸Ý-ZJFF›6•
„RR—Ù€Ù¼42Š¢Pýøý>f.ô÷ϟ1I6›—LLOÏpüõΝ»HW×çÌκIHHÆlþEEkijjáê•ËçõŽu»ke™`0„ߧâñ¸im½M¤Wa”•­o¾|éCá°OŠq눨¬¬˜³iyy¹øžç…$IB’$ñþù³]Cƒtw~š••%ºßù­PU¯}(º:?W®\ŒÚú@(g¤¥µüòÀ‹ø
Â¹·N1p –ží…döµ“›—;'¦f×î¢ÖOZ«wÖÔöæiVçdá½ØˆÇ6A@õÓÝÙ=Ú¨@ºÝ»–ɲ°ô}!¬—N‰ñº1¹›˜>¶OLÚ#Îä/S	`.“g„ÿn»˜½ô¶ܞ#Ú×ÄLJ÷GՁ'¯	PÖ=±¦±ýNg]ï#ñ†”eiÄd¬&ö[[Aõ£=QŸÀÂø¤¹l&êñ^ÿ€ë6ŸàÙû^,>¦€rÂkÛ!o©üŽh¿ÓéLM0=xwDÅá >Àû÷&fOÔ0Å“°˜€À圙#pþ©‘뎀Lã#ôòþˆEã
/”?nº¦é…¥e5oÛ°6«ŒzB¨
?6_Î:œÎi\nÖq+½=ŸÓÝÕÁ`JœAö~%ñ{`8)‘>27!P€¡kךÿàBgwãÉIoö;™1¬Ü»ŸÄ‰qDHàõùp¹\¨ªŠÓéàŽ!c÷Z#÷`
EÔkÀ¿"DH‘ŒkÀL†Sn¯ïǒ„.##ƒ‚ülââ⦭­cþ8„€^`áÕ~y÷Hò"$‹äðÊ}
h#ü×"1	ÜN•‘稃:ï¡9Hü7¤ˆšXÂ+×@øoAOxü£ÊÕH}ü@j„8*äÿD!G"†pŸtóÎGýÍ*ø¿Jðo71?àÃsèIEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_save_all.png	2015-12-29 18:50:39.977280220 +0100
--- pixmaps/stock_vim_save_all.png	2015-12-29 18:09:36.103885407 +0100
***************
*** 0 ****
--- 1,6 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ´IDATH‰µ–Kh\UÇ÷Ü;¯ÌL2™&‘(Š ÒMI…F+âc!º¨ uYÅeqaD]t£»ª;««®²¨¡(хEml‚V%µB*y`’™ÌÜç9ßqqçÎÜâÆ´õ—ó¸‡ïñû¾à0`oà÷99€=ûk‡¿ü‹§NðÚÓ£\+‚ø>(zkà(°’ŽŽB+¼÷é—<tä6[;¼ph_f׌Úü~™õMZߞ…î6è8†R	âJtBÜ
p°X×Åow°bØÒ£\øåKç—óÁW€À°ÖAŒpåʟÜöñ‡\“>ú ¿²½ñE@‹`=aá‹3Ü`\'=Hø?pyYF¶—T†«\*³Ú1¸IĂSÀI,¶P¥³Þ¢>R£ªÍQüµU+å&E§HœX¤gÐë F“ÇU­»Ü÷Æñ]—âócÇPJ!:@
H(•"Ê㺙^À@¤@Äô~
p---a³ÅP»Ý à¹DQ<p 
+ –¢“Êpmoo3==½ëÈçççS;yD±±„qšR†«ÑhìÚx&k-¶G$½h‰%ŠÒ<®Ý"
+ ð?ñr5P	ia3\þêê5!š››CÁè$—A
ĤQg¸JwÏ0;;KEÿŽT[<žç]µïû>Åáq\å°ÖÀ¢{m•áª7¦PÍ[©)'H,ÖZ<WQŒêC¥>>¥‰6L–‹Q‚ç*t”C$–~kf¸6Û>J)–?;‰ƒKc´Icl/ÆŒI#ˆÑX,I±dkƒ™ÃG¹}rH®Mµ6ýÂöqYÃÊW§yö‰ƒ<þäSxžG¹2”ž±–ng‡íÖqðãòyÎ]¤ÛÜÏ¥K+Ø¿‘\
~úz®Â%‚ßéðÈ£Q®”yëÍ×ÙX_àíwÞessƒ(ð	Ÿ{îSg¾aè–	Rñ,&L(àÞÇ_åòϋäqÝÔ]¹2D¥y¦ÎN›$N4÷ŒS¯
S®TèÝUJjpV
KÖ§?yŸ<.Iaà#Ɛ$šõµÕC‡ˆÑTku&nž¢><‚Ö	Ø1šµÀRr50À9`he¸ºZHâˆÀ÷ñ}£M¿k¢0`´9ÆøÄ$¥R™(
+ 1ÄQLA,"k7Ùh÷p}è™#ÔM¦î¸“¿cjjŠ—_:ÊØޛ¨Ö†©×Gð¼Û[óÛÅ¢0¤†‹‰Cb%Ø>° ÌpO—»ÌæÏÿ\=‘抪IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_session_load.png	2015-12-29 18:50:39.981280177 +0100
--- pixmaps/stock_vim_session_load.png	2015-12-29 18:09:51.611718597 +0100
***************
*** 0 ****
--- 1,13 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆÌIDATH‰Ý–ilUEÇsï}}m*ݐR¢€%¥»ÅYJS(&Ÿ€ˆˆ†/~rà Š˜˜( 	i\ŠÐ@ü€RBk¥PÃRiK[^ûÚ÷Úׇ}Kß»÷Îø¡¥¡ô›ÿädÎ̜œ3çœùOþÀ½À) 
ð
êo2Ðþ­s
8uøÈWs¦M˽ɠ´tß8ÌÕf·ÓçóEï4€1uZFqScÇøÜÜ,¼=MCJ)²sîcoi”¾¾ßç'3ºmh@xÅG;ÞI‡Âƒ!Âá~"‘(¦i2æž$2³'’œ2úù¬¬ýŽ3¶,ž3g&Mç	†BضB×4tCÃáp „ '7ƒ.·· ²¢®H²‡ñ·8ô×1éþñæ÷e_.Õ`š&‘þ(º®a8”TH©°mۖÄŎ".6
GŒMœN'1Nºnà÷÷°¸à)ÒÓÓ
—ËeeÐÕÙm蚎ÛíÁ錥?B
ÃÐQ(lK⌍!6ÎIÔ
+ éëCÙ
+ ¡	””ØRa™6¾Þë$%ˆs¹2Ø+#cZŸ×OÄ4ùtç~¼ߝ–zçÏ7T`pÐP
+ ‚áU•µTŸ9͈‘¶´nÛ©R
+ ˲0MË´2Á‘ùè#OΘÉƀ‰M(æ\]ÉÉI\iùñ¶œÎšúØÐü§3û°L‹H4ŠßßG$DÂȸ‰CìüíòUΞ=M¨ÿ:RJ”R(¥†t)%­­ÌÍ[Éܼ•\¼Ðˆaè”9Œaè\øõ
+ K
+ Ö²léª*jh¿ÖyR!R)%µÕ
¤¦¦r¹©‚þ@¡1PÆU¿Ê[›ÞÀëéaÝ›(ȟG»«…‚üyl|yoozÝ%%ìüx/qqÎ6!DÀhm¹Æš5«ˆFvƒÅ(J¢	
[Ú(ùàóõ›=y¨<EE…,_^LWg'ÑÔئîªØ]€ÿúuÖ¯_K͹²ŽØ)å€>8*©Ø¼u#òɎ
8z¬gŒÎ”¬ü½„ÂaŽ¯T‡ñ˘1£km[õý¡qñ1ƒa,ËƶN{#ˆ”’çV¿À’Â…TTTàñxiooçâÅ6lXG]]-…óEÙ±“™µµ
?ääLH3
+ q¥én·Ó´±,k°±j0#PlYY“éêt‰Ú47_¥«Ëè„Q,YºŒÖ–fúǏãÙgž¸ûó/÷÷øý¦É¬ÙSžææ÷X)Zœ¯>+Ù¥¶½·Yå͞®RS“ÕÛ·©«Íê¥W«¢Åù
+ èf€lB̚ù0ˆxÀ
J!†½ûOï„kmo:¸?ö\]5yÎeúŒèõõP~ü(õõçÙ]²'ï,NLL©t¹\¶˜933$ˆWJ‰ŠP[séÛïŠ}´¶4
+ ‡
pwzðzº9rôD(=-->,m=€R>%m¯&´nÀ{+q»»_Ù»ï@½®ki[¶nÇÆ:‰I£©¯¿È¥ãƍ9RVþ3
+ ¼Ë ›DV"DŒ›>l‰jj:&Y–¬
Ð4Q ¥:¸(ÿ¡ôòU.!X¡ÇMgM7ütñçg åV%Òn$xh~IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_session_new.png	2015-12-29 18:50:39.985280133 +0100
--- pixmaps/stock_vim_session_new.png	2015-12-29 18:10:09.699524038 +0100
***************
*** 0 ****
--- 1,9 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆÁIDATH‰½–ML\UÇoê0¯R‡°iiW˜Ú¸èˆ3J˜¸€¤]¸5ՅÑď¸rCZ—5˜ºQÀŠm6­CƒN	
+ ±I±Ðš
+ ¦‘"2y÷^oæ1Ún<ÉÉ}÷NòûßsνçüÖ¨Gô€]+ æççU&“Qÿeº®«……ÕÛÛ«€8PhvÐÒE•Édðx<µ›D"×ëÅét‰D<€^ˆÌ2GéäAp¥”5J)ÑuP(DCCYÀ]‰£Šd–R"¥(ïß_Ãívioo§¿¿ S)²£@5¸Ôét—Ë@8&288ð
à*Š<f6]¢…Ñ\Ó4sD)¶¶ò„B!»½u
ïy­œ­¨c	hæ
+ )$©TŠtz“?——IÞMríÚéî1ðù×{€õª¤¬+J*4‡†’æšT’W
†á¢©©‰ºp˜P(ȍë3E”GJpñ[š¹¦B¼·Ã0† ®ãvMMµË¶RvûüÖ|cc½¤Úvd%E7ƒ`Џy¤e¼â):˜žžÆétró÷8N¦¦¦hhx‚ÆÆ},..Vóù-”2çÁ@¯×k+0“J¥8sæ+:wÑmf<~¶h3ÝÝ=¼÷îÛD"‡im}¦êÈTšß·»ln¥hôûa677øôÔ'֏ÏÒÓÓÍjr…ڐ0s¯”Â0òÖ]QRR¨b‡Å^{ý
~c?]$£o	V“+d²Y.OLòÝÈ0†‘GÃ’Ò•!L/ïD¦€&;ž‹
ÇI¥î‘¸2ÍзCì?pl6Gkó1^~åUGžD
+ RÒo_Î
+ z1Ekk9¿Ž³š¼‹¾%XZºÅêjŠ@0Àó/ðÇí%rû©¯¯ãìè¦}¨’6R•¢ÚÚ½úéS§
8zô)×âóûxëäIô\Žå•$wî,3zî‡ÃÚuLñ[)*ƒp`^ˆæÇ.±§v/Ùôß|ðáûÌÎÎÒÙÙÁ£#\ž˜äË/>ãêô•í ¢²b³;E—Ο!½¹Éþ™LL0™˜ “͐ÓuZ›ÑÛw‚ßæg
+ §¦üPPè¼ÊV€ã]/Ò×ûCÃgi‹¶päH„¹¹ëü<þ±X7o!ƒñ‹ç`ÍÊw*•dêêvvóE²ô¶XË£þ
(õ7z(Þ˜0Ì°}Gž¶Ý҃-¬¹
}ïÈzŸË5¯IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_session_save.png	2015-12-29 18:50:39.989280090 +0100
--- pixmaps/stock_vim_session_save.png	2015-12-29 18:10:27.927327836 +0100
***************
*** 0 ****
--- 1,11 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ·IDATH‰¥–mLÕUÀ÷ïåÞ\DCZ³¹bMK{]ˆn9«YMGö‰A›[aëƒ8_šN˹¦››s¬1í~rY3Â%‘«© 0lf3à^ˆ7½÷ÿoçœ>À½€Y=Û³ç^~çyÎsÎówñÿELk»ìÔþÂK{“º
+ °¾½¨
ö¤ï[:°P¨wvîܬªz?´”–ûúþè¡´¤Ø´9| m€Ë5	PW:#ôëã´Ôd÷–b4·%%R×As䝷éu¾»ÜÀÈÈ0áÐ@­ññ1|>?áP?W¯Ý ¾¡1Ì÷Ä*Bïo=
Ž0~õ
+ DÇ@‚cYà c1¬@
+ Ÿoߺ¢õœ<u€†K—ñ%¹y:ÿÆFûÑc1ê
Þ¼	€R.¤ø}~BÛN©ÀåÅe+”7…ÕûŽ
°¡¤€¦¦&‡èëëãÖ­.*+Ëim½AiI1õ
µ@RàH‰òHR‚nÖì=8ëéº}ƧŸ&?áЦ%èîþpx´yilظ™ÞžnŒ%ñî;oåԞ97œÈ"7 Mùä™ê={9qü+W® +3ƒÔ`*îڅiôõ‡¸{·Ú3ç†
陚ªPj¢ÕÖֆŠÓ¤¹¹™ÎÎNÊËË©¨¬ ·§›ýö±²à9FG†ùú«óñ3Ø
|ŸÈ¢o:hný™Þ+uÔÔÔÌéAZZçê΍DˆDîÓÛÓ
€‹
0dhðOê£@vÂiH„&IOOÿÇ0<t”Çóó克½¼†åËóéè¸Å宲¾øŸ$¦RŠ‡†àìÙ³lÛ¶öövNŸ>MUU–ms½¹òÝG9õññ¡g4¯"Éz(DAAÁœ»/,,$&쪪*:nþ‚‚ì¼'yõíœÿ¢ wÀ
+ Ãrð­ZKuu5¦iþmqÃQxx<S¹QVV†®ë$¥eáÖ\„£3çM]4[aš‚`z.ZF©šGH„T(¥ð¸5’L›`²/>MÓ°AŽ?‰˜iãqk8¦3;@³A"¹§£iíõµ¸p“>?ƒô̅!ÂF
+ ‰
+ …m˜„
bíÖ
+ žÈYҚÃ/H!@	ºš.ðæÆ"J7mÆãñà$OŒQŠhä>cã£XFŒŽöV.5ß&š±‚;wº(\‘”öìP8Â
)Ñ#Ö¿²
ÀÏþ}{pøÈ1FF†0c:FLçÙç_¢îâO$/ÉÆv…0fO…T $MÖ$ ™ÀäÎã¹ۚAƂ,‚©iø
â·Õ7Kùšz쁔)$FLG
+ m;†CH9ñFY–)©A.ZŒßŸŒãظ•….Â1…Ï5ÇÜüñ^¼D‰m™Ät]׎Hdiʟ‘IVv>ŸÓ4R`™^©R¡„˜°úäÁ®¯{m;Áôr—.ãFË5rssy¯²‚Ì…‹HIM#œ‡Çãelt˜_owa©¸–¥IT"`¨A/ðèuyV}ª°(Þ.
8ÎÅDIHžTï´ïÿVQ ör
]˜ꅐIEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_shell.png	2015-12-29 18:50:39.993280048 +0100
--- pixmaps/stock_vim_shell.png	2015-12-29 18:10:42.363172360 +0100
***************
*** 0 ****
--- 1,14 ----
+ ‰PNG
+ 
+ 
IHDR00Wù‡sBIT|dˆ@IDAThí™ï«e×YÇ?kíµ÷9÷N&w&‚4¶ÒjÛ¡˜J(ÂØôo”€ü„â‹‚¿h)´öU©…¾¾+©BE#…ª5!Ó8Ž¡Ñj"M:$N’™{ï̽gïµ×ZÏê‹g­µÏMgro
}ÑuÙ÷ìsö9{?ßçy¾Ï¯?^?^ok™­WX +¯fëú›¿ÿN¬ü¦óÊkÞþŽ~ÑZ›1yëâÚñ(p°*2›ªQ„ïüÏÿ½{n÷ƒ}?`Œi‡dQsX{wuåLJ‰,‰œõ½BÎ ’ gBLÓDJ)EbL¤¤G,¯!x$%$	ó<óâ‹/¼ô»Ÿüì{wGÀDWžß
ì]¸øÁW®½ˆµkm
`1¶€Á,N”ó‚?뿜!“É’ŒˆDTD„£
+ DˆQ?‹‘˜")&|ðH”,r||üÞòä= –#U¶Jb¬Y6[Î)ï‚‚%“!ç-­K
"
+  ‹ZCr&‹´óv=×Ï
+ ÀÉ¢ME
~ž«±ï6ÀØ
+ ÀE˃áæþ>‡Ø-WÚR?¹h’3dQ
}/)‘å¤%Rªˆ„˜ŠEbq'!†ÀýïúI’¨K‰¤
+ `ª×œ´€¡i|Ÿ_}ô7îêóïÄúË?ÿSÞ¸q£úqÞÆmÿÀlGÉ >öËÃ9Gg;:×aÅ:‹³N-ÓéoŒ1-Vú°T´ŸsVn¤Œ$!~„”°s åƒ÷ž˜"/üç¬W+$&RáLY–­0@FýÒâq3òñßüxãÅBnƒˆ0ù	ï=Þ{ÆÍÈèGÆqÄOžãñ˜Íføٌ›…"HBRqVòzïõ}ˆM
1Æ™d@óçRŒHJ`mp~ï<«õ
+ Û©à]§Vð³'å¤d.Ä.uô«ž#Ã0bÂ9Çî=»JÒ ÷
1 Yð“'„€÷ž¾ë	)få€$)”;wZ'-PⵐiüÆb “c~òøÙ3‡™à>¨Ó81ù‰q™&=÷£oùA…Ì%¾'IøI]fö3sÔ{ÎA#Nͱä‡Þ~'”‡‘f²½½=vÖ;d2a$Iԅº¡ceWKØíôpα³»CÞËD‰ ê’Uë9ebŠ„ðǞ9ÍLÓDô‘Í´¡Ût‹•ˆ•b<Ý’…”"ÆØfÍ¸áÖ­[ªñ d‹)*éR"Ä@Œê¿~ö¸)¥×q“RLÌóL‘q[†®Vmbl¹àt’‰1al&EpñÂEb҇
+ ‚±‹¥7=‡½Å¹t®Åìœss!†¨×$!QUæÀp<0Ǚþ¨grS‹l'¤³X %B˜é:G,&;Úñú¯7!jèÓD¥Z±¥F2fypµY	›bÒ£€Œ!âg=ó<7
*!Fò–K¿%€ÉÄ¤ÅXŒ	î»pÙf¬±vhißõŽ¡42•ð*"­J1µP)Q9$‘Bbò1Æzû£žÕjÅæhƒ±ªˆXj$ùA,R$Ó
Ü>àúõëÍ9g°Ð÷=}ß3'
äV^¥‘·¹CL-ê„9°ñæif܌xï™6£‹K‹†ö™S
Ē­µ
À…½d“¡ƒÎu¬‡5ýгZ¯ú
ç}ß+«Ù¸fIš;E‰ª„ nègÏ4N¬§5ÇGÇôCÏíÃÛª€RZ¦Â•\îsºJ©kŒ!‡‡‡Lӄí,C?0­'œs¬V+†A
t®£³¶³
€fu½_“‚˜ýÌfÕø4©ö'ÏfÜà7¾q –D–s>[JI+AcMó¹/йŽ•[áVêóÃ0°^¯ú~豝mÚ`4i•’¡†Î
+  L¡%ÁяŒ›‘ÞõŒý¨
+ 0èksé„äL’³X ÄwkM«GöèlÇ¿ðEž~úi¾þÏ_çèèˆa”Cë]×éÍmÝX
£-|ÆÈ<τ˜çYµ>©Ö'?1û™i31ÏK&nï,Q(Æ@u¡{ÎßCïzøÀ<ðxì×ãÊ¿]á©gžâhs¤p½æ‡BäJbUÊÒ¤„¨uN-¦qbŽûcºMG×udrË­ì3r ‰fGÛÙÖTìÐ=ŸøíOpéÒ%>üЇyä—ᣗ>ÊÕç®ò̳Ïðü<O×uZŽ×¶¹rAԅZš#>zÍ^‰<“ÖW^AU´ pÖLf-Œ˜–Îß{×9nܼÁWÿþ«<ùµ'¹ÿþûyìÑÇøÈÃáá_x˜O}öSXc¡+.Tš‰,Ú„´²L‘¸Šô¾gòÎjŸQý¾ö•K7vÆjt<>"Ā»D¡ýC¬³¼ï§ßÇC=ă>È#—Á9Ç7žúO~íI®ÿïu-äÊß6€ê>5‘‰ˆ60)´Zh»¤ö“oü“R…V.n ¦6@(.´{~gÿÉã¼öÚk|ù+_æ›ÿúMŽŽ1ΰÞ]«ß–©„Á,Í<™>õ„pâˆ!bœÑ–\´—È9—:Ó1u“øA-0%™1´òõ捛¸Îqõ߯òÄß<Áå˗Ѭµ:K9ý¹Ï|Ž÷ÿÌû釾µ¤Ï^y–'þú	®\½¢9a+;·ú*hE›‚fëÚHΚ‰ÏšæÒ¨Xkˆ%uïìì`­åÓði¬³ô¶Ç9œu`”°Ÿÿ£ÏC†”µpË9·Wç6[f;cBÑz“
I}î±(²Ž<
+ o–ùÒ©D„"Ö,.tkÿ–rUÛÆà:§ZG±V¢
½ˆ`Œi½ALQêÐj!I¥CCÚg5_Ô¤%9ÁsãÕ[a&T”L|ùéËwüá;±Ôw¼®ï'qcøùýõc1dkX¦¢¦”˲Ô<IG‰uòV‡X©6B¥°kýqí‰ÑB­ÖM"u²§™üðÖÑ© ¿ß…bÀËK/_㥗¿Û&rê³%<’O”)‰öÓ":He
+ WJ€êV™–Ñb.BK¹wì‘Õa*ÊCO0ùI9P§Ð9—¹¨ž—RTµ‰´´Š1‰lµ“µs[„mà·,H|ïÞ=î»ï'ÈÀµkßÅûi±»½óÖÄÉ(ä½Äm›…¶	´Â7è¨}/›‚‘6ݞ‘æ­;77¡h¼Þ=óSï~Ïë92p|<²»»^°Xã1ÜևHN9Ij£t³õMÓ~™Aê4ºøwV%—é4MP¶@/“ì"X
ôü·žãöíc$gΟ?wBÓ;ëu.blïМðòË×^}åÕëﱦ[¶>Š+-{
¹i¤jTÚy
#%Žk0©~}҂uÊ]÷ªÆnîßj7zç6À9`F÷ÈUÌàׁ?«?úýßûQdÞécè&/çz\òºahãwõo!E!Kj\БLjQF›ôe`¥å¶ZA'ž“3ÆÀ·¿ý_áïþáû-Uþ!ðàU`˜ªð·ÀÏïþåððpzåÚwÈ]ç\i—F¾ï{z7Ð9e™EˆiéƤdјâ‰	[í;ê¾@írÙʪ5Õë¯ßœ€ø-à
à5à­¤" Û{dC1ÑEàW€/ñ£±þø'àF9XöÈRP·WW¨;݋îE]@w×(È»ïòýß·`ïá3ªá©{X¿n/ùr=o“8•²u~T
À;µO\
„â˜e_,ù2[$fK¸®=*xÏÉÍï»­ÿO€*²‚¨G‹>õwwzèYwíߎÐwZoR…¼ëîüi˜S¾óÃp§»ñán×ޖ?,>¼uýü¦õ=!¶Æ÷zLIEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_window_maximize.png	2015-12-29 18:50:40.001279961 +0100
--- pixmaps/stock_vim_window_maximize.png	2015-12-29 18:10:58.626997198 +0100
***************
*** 0 ****
--- 1,5 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ
ÓIDATH‰Õ•¿kAÇ?³®H‚]æHe#	)‚EŒØ,	v‚\î „4¢)Ó¤²±M%A¸ä:I˜F)B{\0‚µWÌ5*FÉeŸÅrƒK²{s‹|áÁìÛ÷ÞwÞ¯]¸êPïä2âEÖ"rN.Ò·ÛíÜa¿+u:wÖZ#;s(¥°Ö:}£ÑÈõ/Ìàoh­‘¥I¸yÙ.¡µöòó"ÐZ#•qxxB#ÃÈî¼Ißõ°ùõ¼Ø£üò
ëk‡œ&^~^½zk­)'ð´zŒµ–Òëþ¾Þ=èAÝ};½#xõø6²;_hl­u’©ŒS=OpízC!²]膙àK“°p'£S²¿˜R%]¿Q3[""™=ÈCÇDQ„ì-(B‚$-géasù#œtáýgÔÌÖ¿¥ðýŠõµC׫l“7ŽP«¹þZk'AÍÖà¤ë=Â""b­uˆì/
+ Ñc„œ£÷&מÝãMe¨NbM\î&?2
C!$Bye
+ 6Ž¨xøye`­EݝŸé”}ø‚ª~*܇Él-áÕ¯àЧD­V‹f³éž1¨(ÂCÇN_¯×scü÷_æÕÇ¢Ã܆v]IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_window_maximize_width.png	2015-12-29 18:50:40.005279917 +0100
--- pixmaps/stock_vim_window_maximize_width.png	2015-12-29 18:11:15.006820788 +0100
***************
*** 0 ****
--- 1,4 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ
¹IDATH‰Í•¿JQÆw\	JºÜ°
+ Q,%•!]‚MY3(²/à;ØX̟*H`M@”m‚’B$°¬ÈVV[-w5¸Î—bvM†™qïh„|p‹{æ;ç;œ9çøß ½J!~ɗ¸67ÎÐp
TgÆwú_
í,ÂH	"ÁEÖ0ÕÁ~¯€yñ:çÐly¿´=_ˆÿw‰ôoS‰c'J$éÞ§Õj%TR]Ôétî•v³ÙLÜs²µkíÀ€ƒx™ÖZNÞôûmX›G;‹¹")
k-Zž†¥©[3ìۇ†)¡­r&/ÕEڞ‡Ç d 0yþç\:‘½Jœb¤x>Î~a^}͊H m•¥ýŠ>†ê	Ë9—8}{ufLú¾ -OP­VëË.‘sóú\t¹¾ŠpÎ¥²ïónìë˜wû™¼ÌÇÎ9‡éÕ³ü!‹ñáî1aÏ'¹¯ižCQ^B ÝnÓh4¼ç¡^¯'îþyï ž7Ïàô2nxï…“0û4ž'£ñò€÷ÊÜhÀÊÞ®¾äÓûŸ\_E¾®ÅPté?8~ÿ0æ­UW”!IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_window_minimize.png	2015-12-29 18:50:40.009279874 +0100
--- pixmaps/stock_vim_window_minimize.png	2015-12-29 18:12:01.598319013 +0100
***************
*** 0 ****
--- 1,5 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ
IDATH‰í–±JA†¿=OD±ó¬lkKƒµµ)ò¾ƒMzKâÓF,Rlj\eeqÕÁ5Z˜ä·õ4™3bã;°óÿ3;3ì|Ч}°8DN
4ê¸ÎÇVÞ³Ãm––#ˆ ··	 Öí3ÌÉĔ& 
Û°ÃTð6†ËBïq.‡õŠBh\Aù
+ cAÿÉD^Ò )ªÅ^8\ä_S\dd
fÔ@ҏVžç¾™mZ–eí°³,«ØîAóâ_àï¾uQQ¤iZ›0I’ŠýëƒV® ¼5M—ˆG@:مõtsd±
+ H­8؂8ÀƶM"Ö'“ëüNï8îîsq~Ïä}juuAu\Ž·•Üߖԃ—•ÁÿöIEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_window_minimize_width.png	2015-12-29 18:50:40.013279831 +0100
--- pixmaps/stock_vim_window_minimize_width.png	2015-12-29 18:12:18.010142266 +0100
***************
*** 0 ****
--- 1,4 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ
(IDATH‰í•½JÄPFÏĈ>„½ –’Ê2¬ Š âXú‚‚U°Ñµ³ÓNìD$!
Ÿ EŠ­V1f,bboÜ°…‹¤¸sïœo2Üø—Ab˜×®˔©ª_’$Fg»MyƒÁ`d<Cc®ñºjº”ö»æ'Õ8¥ÁÑÆz»ÝLT·—9[[,Vá83kÁ¼^mŽk¢º¿
+ »+åP
Tïör«L!UxyCzý¯,mܦ¾ïãºn¾îzæÀ°2ÇË[$ŽÇùÁ
S¸|*à¦S^•H¯ϯ`	'Ljã
yÝRÂN‘Ãûß¿MÖ/`˜òñž©‚Š¾×b-[ÔÈ©^ãT=J5Îtä‰Èx]ÇqLE#ç‚ 0LüEûûúLiuŽ,όIEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_window_split.png	2015-12-29 18:50:40.021279745 +0100
--- pixmaps/stock_vim_window_split.png	2015-12-29 18:12:33.669973619 +0100
***************
*** 0 ****
--- 1,7 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ­IDATH‰í”A
+ à EŸ¥wpãMsÆàÆ#ÌFÁ3LW	A#¤¤ÐЂ‚ü§èÜUÐ3CU«ÇŽˆ,’ŽçÞ
œsÔZM§I)­s!„°®¦„le—Zþ‚·t¿h¡”BŒÑ2ϳ]PJ
À{o
+ ?"ûŸ´
+  kÃGVUó؆¶…6|d8×*Z~¿n(X
+ í,m¡¹Á>Í9jÓ4íæ
¦äžQÞu¼Œê²OcEJIEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/pixmaps/stock_vim_window_split_vertical.png	2015-12-29 18:50:40.025279701 +0100
--- pixmaps/stock_vim_window_split_vertical.png	2015-12-29 18:11:45.010497656 +0100
***************
*** 0 ****
--- 1,4 ----
+ ‰PNG
+ 
+ 
IHDRàw=øsBIT|dˆ{IDATH‰í”A
+ € E¿Ò­=£¸ñÎ…g°Ufñ‚ó@yúg”ßPkmóÕÈ9ÓΆ9fµ˜×ö]°•±îÒG–R†¥„NkŒk‡Æ‹h€h@÷’E1Æ¡è½Ç÷óÏn?½²{æhW$"€”ÒmëÎ9ÊQhVþٖðXɪ;IEND®B`‚
\ No newline at end of file
*** ../vim-7.4.994/src/version.c	2015-12-29 17:11:11.769335920 +0100
--- src/version.c	2015-12-29 18:16:45.111266008 +0100
***************
*** 743,744 ****
--- 743,746 ----
  {   /* Add new patch number below this line */
+ /**/
+     995,
  /**/

-- 
WOMAN:   Dennis, there's some lovely filth down here.  Oh -- how d'you do?
ARTHUR:  How do you do, good lady.  I am Arthur, King of the Britons.
         Who's castle is that?
WOMAN:   King of the who?
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///