saitoha

diff -r 3bd553b9e4bf runtime/doc/eval.txt
--- a/runtime/doc/eval.txt	Sat Mar 14 15:35:52 2015 +0100
+++ b/runtime/doc/eval.txt	Tue Mar 17 02:26:11 2015 +0900
@@ -6123,11 +6123,8 @@
 		list items converted to NULs).  
 		Pipes are not used.
 
-		When prepended by |:silent| the shell will not be set to
-		cooked mode.  This is meant to be used for commands that do
-		not need the user to type.  It avoids stray characters showing

saitoha

" Use vsplit mode
if has("vim_starting") && !has('gui_running') && has('vertsplit')
  function! EnableVsplitMode()
    " enable origin mode and left/right margins
    let &t_CS = "y"
    let &t_ti = &t_ti . "\e[?6;69h"
    let &t_te = "\e[?6;69l\e[999H" . &t_te
    let &t_CV = "\e[%i%p1%d;%p2%ds"
    call writefile([ "\e[?6;69h" ], "/dev/tty", "a")
  endfunction

saitoha

diff -r 930ad67c0414 src/os_unix.c
--- a/src/os_unix.c	Tue Jan 27 14:09:37 2015 +0100
+++ b/src/os_unix.c	Sun Feb 01 21:48:34 2015 +0900
@@ -2223,7 +2223,6 @@
 
 /*
  * Return TRUE if "name" looks like some xterm name.
- * Seiichi Sato mentioned that "mlterm" works like xterm.
  */
     int

saitoha

diff -r 930ad67c0414 runtime/doc/term.txt
--- a/runtime/doc/term.txt	Tue Jan 27 14:09:37 2015 +0100
+++ b/runtime/doc/term.txt	Tue Jan 27 22:16:32 2015 +0900
@@ -224,10 +224,11 @@
 the last two characters of the option name.  Only one termcap code is
 required: Cursor motion, 't_cm'.
 
-The options 't_da', 't_db', 't_ms', 't_xs' represent flags in the termcap.
-When the termcap flag is present, the option will be set to "y".  But any
-non-empty string means that the flag is set.  An empty string means that the

saitoha

--- screen.c.orig     2013-06-15 17:29:09.000000000 +0900
+++ screen.c	2013-06-15 17:45:44.000000000 +0900
@@ -9020,6 +9020,7 @@
     int		j;
     unsigned	temp;
     int		cursor_row;
+    int		cursor_col = 0;
     int		type;
     int		result_empty;
     int		can_ce = can_clear(T_CE);

saitoha

--- xterm-313/graphics.c	2014-11-29 06:00:04.000000000 +0900
+++ xterm-313/graphics.c	2014-12-30 16:23:31.000000000 +0900
@@ -587,22 +587,22 @@
 	break;
     case 340:
     default:
-	set_color_register(color_registers, 0, 0, 0, 0);
-	set_color_register(color_registers, 1, 20, 20, 80);
-	set_color_register(color_registers, 2, 80, 13, 13);
-	set_color_register(color_registers, 3, 20, 80, 20);

saitoha

$ vim --version                              
VIM - Vi IMproved 7.4 (2013 Aug 10, compiled Nov 12 2014 23:56:58)
Included patches: 1-507
Compiled by [email protected]
Normal version with GTK2 GUI.  Features included (+) or not (-):
+acl             -farsi           -mouse_netterm   +syntax
-arabic          +file_in_path    -mouse_sgr       +tag_binary
+autocmd         +find_in_path    -mouse_sysmouse  +tag_old_static
+balloon_eval    +float           -mouse_urxvt     -tag_any_white
+browse          +folding         +mouse_xterm     -tcl

saitoha

--- putty-0.63/unix/uxpty.c	2013-07-21 16:40:28.000000000 +0900
+++ putty-0.63/unix/uxpty.c	2014-10-13 01:49:46.000000000 +0900
@@ -373,7 +373,9 @@
     strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
 #endif
 
+#if !defined(__OSX__)
     nonblock(pty->master_fd);
+#endif
 

saitoha

Index: coders/sixel.c
===================================================================
--- coders/sixel.c	(revision 16656)
+++ coders/sixel.c	(working copy)
@@ -15,7 +15,7 @@
 %                              Software Design                                %
 %                               Hayaki Saito                                  %
 %                              September 2014                                 %
-%                     Based on kmiya@culti's sixel decoder                    %
+%                     Based on kmiya's sixel(2014-3-28)                       %

saitoha

diff -r 9b913f4b870d terms.c
--- a/terms.c	Thu Sep 25 23:21:41 2014 +0900
+++ b/terms.c	Fri Sep 26 23:14:47 2014 +0900
@@ -508,7 +508,7 @@
     return p;
 }
 
-static void
+static int
 save_first_animation_frame(const char *path)