k-takata

diff -r 04c692d60494 runtime/macros/less.sh
--- a/runtime/macros/less.sh	Fri Apr 20 19:47:05 2012 +0200
+++ b/runtime/macros/less.sh	Wed Apr 25 07:02:19 2012 +0900
@@ -1,16 +1,24 @@
 #!/bin/sh
 # Shell script to start Vim with less.vim.
-# Read stdin if no arguments were given.
+# Read stdin if no arguments were given and stdin was redirected.
 
 if test -t 1; then

k-takata

@echo off
rem batch file to start Vim with less.vim.
rem Read stdin if no arguments were given.

if "%1"=="" (
  vim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" -
) else (
  vim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" %*
)

k-takata

--- corrigenda.md.org	2012-04-28 20:50:22.037863000 +0900
+++ corrigenda.md	2012-04-28 21:03:25.379036700 +0900
@@ -5,7 +5,7 @@
 # 1-2 project.vimを使いやすくする
 * P.26 「インストール・設定」を差し替えます。<br />
 
-> 誤：本Tipsを利用するには、リスト1の設定をVimエディタの設定ファイルに追加してください。<br />
+> 誤：本Tipsを利用するには、リスト1の設定をVimエディタの設定ファイルに追加してください。<br />
 > 正：本Tipsを利用するには、設定ファイルディレクトリにafter/pluginディレクトリを作成し、project.vimという名前でリスト1の設定ファイルを用意してください。<br />
 

k-takata

diff --git a/doc/quickref.jax b/doc/quickref.jax
index ce533d2..c930cdd 100644
--- a/doc/quickref.jax
+++ b/doc/quickref.jax
@@ -369,8 +369,8 @@
 
 |r|	  N  r{char}	N 文字を{char}に置換
 |gr|	  N  gr{char}	N 文字をレイアウトに影響を与えずに置換
-訳注: "あ"を"ra"で置換->"a"
-訳注: "あ"を"gra"で置換->"a "

k-takata

diff -r 1be42b88900e runtime/doc/helphelp.txt
--- a/runtime/doc/helphelp.txt	Thu Apr 26 20:17:03 2012 +0200
+++ b/runtime/doc/helphelp.txt	Tue May 01 01:03:01 2012 +0900
@@ -218,11 +218,12 @@
 This is only available when compiled with the |+multi_lang| feature.
 
 At this moment translations are available for:
-	Chinese - multiple authors
-	French  - translated by David Blanchet
-	Italian - translated by Antonio Colombo

k-takata

<?xml version="1.0" encoding="Shift_JIS" ?>
<!--
	Japanese localization for Notepad++ 6.2.3
	Last Update: Saturday 29 Dec 2012
-->

<NotepadPlus>
	<Native-Langue name="Japanese" filename="japanese.xml" >
		<Menu>
			<Main>

k-takata

diff -r 1c6b099ead89 src/po/ja.po
--- a/src/po/ja.po	Sun May 27 00:37:51 2012 +0200
+++ b/src/po/ja.po	Tue May 29 00:06:52 2012 +0900
@@ -10,10 +10,11 @@
 msgstr ""
 "Project-Id-Version: Vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 20:58+0900\n"
+"POT-Creation-Date: 2012-05-26 16:00+0900\n"
 "PO-Revision-Date: 2011-03-23 21:20+0900\n"

k-takata

diff -r 942df3a8051b -r 1dd8790a0648 runtime/filetype.vim
--- a/runtime/filetype.vim	Mon Jul 16 19:27:29 2012 +0200
+++ b/runtime/filetype.vim	Thu Aug 02 00:50:57 2012 +0900
@@ -1119,6 +1119,9 @@
 " Maya Extension Language
 au BufNewFile,BufRead *.mel			setf mel
 
+" Mercurial (hg) commit file
+au BufNewFile,BufRead hg-editor-*.txt		setf hgcommit
+

k-takata

diff -r 536aa8b0c934 -r d6b9170d0b1c src/os_win32.c
--- a/src/os_win32.c	Wed Aug 15 17:43:31 2012 +0200
+++ b/src/os_win32.c	Tue Aug 21 22:36:45 2012 +0900
@@ -2718,6 +2718,12 @@
 mch_is_linked(char_u *fname)
 {
     BY_HANDLE_FILE_INFORMATION info;
+    int perm;
+
+    perm = mch_getperm(fname);

k-takata

diff --git a/src/fileio.c b/src/fileio.c
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3778,12 +3778,12 @@
 	    }
 	}
 
-# ifdef UNIX
 	/*
 	 * Break symlinks and/or hardlinks if we've been asked to.