diff -ur --binary howm_vim/plugin/howm-date.vim howm_vim_new/plugin/howm-date.vim
--- howm_vim/plugin/howm-date.vim	2006-06-04 21:26:21.000000000 +0900
+++ howm_vim_new/plugin/howm-date.vim	2008-03-20 14:11:15.423758000 +0900
@@ -1,11 +1,175 @@
 "
 " howm-date.vim - howm-mode.vim 用の日付処理ライブラリ
 "
-" Last Change: 04-Jun-2006.
+" Last Change: 20-Mar-2008.
 " Written By: Kouichi NANASHIMA <claymoremine@anet.ne.jp>
 
 scriptencoding euc-jp
 
+if !exists('*strftime') || 
+      \ strftime('%Y-%m-%d %H:%M:%S') !~# '^\d\{4}-\d\d-\d\d \d\d:\d\d:\d\d$'
+  finish
+endif
+
+" 注意: HowmDate2Int() とは基準日時も返り値の種類も違う
+"
+" format にしたがって書かれた日付 date を解釈し ( TimeZone を考慮する ),
+" 1970-01-01 00:00:00 からの経過秒数を返す.
+" 1970-01-01 00:00:00 以前や,
+" 2038-01-01 00:00:00 以降のデータの場合は -1 を返す.
+" その他, 解釈できなかった場合も -1 を返す.
+" 既定値: 年:1970, 月:1, 日:1, 時:0, 分:0, 秒:0, TimeZone:+09:00
+function! HowmDateTime2Int(datetime, format)
+  " TimeZone の設定
+  if !exists('g:howm_timezone_hour') ||
+        \ g:howm_timezone_hour < -12 || 13 < g:howm_timezone_hour
+    let tz_hour = 9
+  endif
+  if !exists('g:howm_timezone_min') ||
+        \ g:howm_timezone_min < 0 || 59 < g:howm_timezone_min
+    let tz_min = 0
+  endif
+
+  let format = '\V' . escape(a:format, '\')
+  let format = substitute(format, '\C%F', escape('%Y-%m-%d', '\~&'), 'g')
+  let format = substitute(format, '\C%T', escape('%H:%M:%S', '\~&'), 'g')
+  let format = substitute(format, '\C%R', escape('%H:%M', '\~&'), 'g')
+
+  let pat = format
+  let pat = substitute(pat, '\C%Y', escape('\m\d\{4}\V', '\~&'), 'g')
+  let pat = substitute(pat, '\C%m', escape('\m\d\{2}\V', '\~&'), 'g')
+  let pat = substitute(pat, '\C%d', escape('\m\d\{2}\V', '\~&'), 'g')
+  let pat = substitute(pat, '\C%H', escape('\m\d\{2}\V', '\~&'), 'g')
+  let pat = substitute(pat, '\C%M', escape('\m\d\{2}\V', '\~&'), 'g')
+  let pat = substitute(pat, '\C%S', escape('\m\d\{2}\V', '\~&'), 'g')
+  if a:datetime !~ pat | return -1 | endif
+  let date_pat = pat
+
+  " %Y
+  if format !~# '%Y'
+    let year = 1970
+  else
+    let pat = format
+    let pat = substitute(pat, '\C%Y', escape('\m\(\d\{4}\)\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%m', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%d', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%H', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%M', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%S', escape('\m\d\{2}\V', '\~&'), 'g')
+    let year = substitute(a:datetime, pat, '\1', 'g') + 0
+    if year < 1970 || 2038 <= year | return -1 | endif
+  endif
+  " ec 'year: ' . year
+
+  " %m
+  if format !~# '%m'
+    let month = 1
+  else
+    let pat = format
+    let pat = substitute(pat, '\C%Y', escape('\m\d\{4}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%m', escape('\m\(\d\{2}\)\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%d', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%H', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%M', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%S', escape('\m\d\{2}\V', '\~&'), 'g')
+    let month = substitute(a:datetime, pat, '\1', 'g') + 0
+    if month < 1 || 12 < month | return -1 | endif
+  endif
+  " ec 'month: ' . month
+
+  " %d
+  if format !~# '%d'
+    let day = 1
+  else
+    let pat = format
+    let pat = substitute(pat, '\C%Y', escape('\m\d\{4}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%m', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%d', escape('\m\(\d\{2}\)\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%H', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%M', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%S', escape('\m\d\{2}\V', '\~&'), 'g')
+    let day = substitute(a:datetime, pat, '\1', 'g') + 0
+    if day < 1 || 31 < day | return -1 | endif
+    if 28 < day
+      if month =~ '^\%(\<2\|4\|6\|9\|11\)$' && 30 < day | return -1 | endif
+      if month == '2'
+        if (year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0))
+          if 29 < day | return -1 | endif
+        else
+          if 28 < day | return -1 | endif
+        endif
+      endif
+    endif
+  endif
+  " ec 'day: ' . day
+
+  " %H
+  if format !~# '%H'
+    let hour = 0
+  else
+    let pat = format
+    let pat = substitute(pat, '\C%Y', escape('\m\d\{4}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%m', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%d', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%H', escape('\m\(\d\{2}\)\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%M', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%S', escape('\m\d\{2}\V', '\~&'), 'g')
+    let hour = substitute(a:datetime, pat, '\1', 'g') + 0
+    if hour < 0 || 23 < hour | return -1 | endif
+  endif
+  " ec 'hour: ' . hour
+
+  " %M
+  if format !~# '%M'
+    let min = 0
+  else
+    let pat = format
+    let pat = substitute(pat, '\C%Y', escape('\m\d\{4}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%m', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%d', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%H', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%M', escape('\m\(\d\{2}\)\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%S', escape('\m\d\{2}\V', '\~&'), 'g')
+    let min = substitute(a:datetime, pat, '\1', 'g') + 0
+    if min < 0 || 59 < min | return -1 | endif
+  endif
+  " ec 'min: ' . min
+
+  " %S
+  if format !~# '%S'
+    let sec = 0
+  else
+    let pat = format
+    let pat = substitute(pat, '\C%Y', escape('\m\d\{4}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%m', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%d', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%H', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%M', escape('\m\d\{2}\V', '\~&'), 'g')
+    let pat = substitute(pat, '\C%S', escape('\m\(\d\{2}\)\V', '\~&'), 'g')
+    let sec = substitute(a:datetime, pat, '\1', 'g') + 0
+    if sec < 0 || 59 < sec | return -1 | endif
+  endif
+  " ec 'sec: ' . sec
+
+  " 719527 : HowmDate2Int('1970-01-01', '%Y-%m-%d')
+  "  86400 : 60 * 60 * 24
+  let retval = (s:ymd2int(year, month, day) - s:ymd2int(1970, 1, 1)) * 86400
+  if format =~# '%H' || format =~# '%M' || format =~# '%S'
+    " TimeZone を考慮
+    let retval = retval + hour * 60 * 60 - (tz_hour * 60 * 60)
+    if tz_hour > 0
+      let retval = retval + min * 60 + (tz_min * 60)
+    else
+      let retval = retval + min * 60 - (tz_min * 60)
+    endif
+  end
+  let retval = retval + sec
+  if retval < 0 | return -1 | endif
+  " echo strftime('%Y-%m-%d %H:%M:%S', retval)
+
+  return retval
+endfunction
+
 " dateFormat のフォーマットで書かれた日付 date を解釈し，
 " 西暦 0 年 1 月 1 日からの経過日数を返す．
 function! HowmDate2Int(date, dateFormat)
@@ -74,132 +238,203 @@
 
 " 単体テスト用関数 {{{
 if exists('g:howm_debug') && g:howm_debug
-function! TestHowmDate()
-	call TestHowmDate2Int()
-	call Test_date2ymd()
-	call Test_ymd2int()
-endfunction
-
-" HowmDate2Int() テスト {{{
-function! TestHowmDate2Int()
-  " 正常処理テスト
-  call VUAssertEquals(30, HowmDate2Int('0000-01-31', '%Y-%m-%d'), '%Y-%m-%dパターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('0000-31-01', '%Y-%d-%m'), '%Y-%d-%mパターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('01-0000-31', '%m-%Y-%d'), '%m-%Y-%dパターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('01-31-0000', '%m-%d-%Y'), '%m-%d-%Yパターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('31-0000-01', '%d-%Y-%m'), '%d-%Y-%mパターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('31-01-0000', '%d-%m-%Y'), '%d-%m-%Yパターンのテスト')
-
-  call VUAssertEquals(30, HowmDate2Int('[0000-01-31]@', '[%Y-%m-%d]@'), '[%Y-%m-%d]@パターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('[0000-31-01]@', '[%Y-%d-%m]@'), '[%Y-%d-%m]@パターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('[01-0000-31]@', '[%m-%Y-%d]@'), '[%m-%Y-%d]@パターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('[01-31-0000]@', '[%m-%d-%Y]@'), '[%m-%d-%Y]@パターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('[31-0000-01]@', '[%d-%Y-%m]@'), '[%d-%Y-%m]@パターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('[31-01-0000]@', '[%d-%m-%Y]@'), '[%d-%m-%Y]@パターンのテスト')
-
-  call VUAssertEquals(30, HowmDate2Int('[0000-01-31]@ a', '[%Y-%m-%d]@'), '後ろに余分な文字のあるパターンのテスト')
-  call VUAssertEquals(30, HowmDate2Int('a[0000-01-31]@', '[%Y-%m-%d]@'), '前に余分な文字のあるパターンのテスト')
-  " 異常処理テスト
-  call VUAssertEquals(-1, HowmDate2Int('2004-06-26', '%m-%Y-%d'), 'パターンと違う順番で日付が出現する場合のテスト')
-  call VUAssertEquals(-1, HowmDate2Int('aaaa-bb-cc', '%Y-%m-%d'), '内容が日付でない場合のテスト')
-endfunction
-" HowmDate2Int() テスト }}}
-" s:date2ymd() テスト {{{
-function! Test_date2ymd()
-  " 正常処理テスト
-  call VUAssertEquals(1, s:date2ymd('2004-06-26', '%Y-%m-%d', 's:date'), '%Y-%m-%dパターンのテスト')
-	call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('2004-26-06', '%Y-%d-%m', 's:date'), '%Y-%d-%mパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('06-2004-26', '%m-%Y-%d', 's:date'), '%m-%Y-%dパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('06-26-2004', '%m-%d-%Y', 's:date'), '%m-%d-%Yパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('26-2004-06', '%d-%Y-%m', 's:date'), '%d-%Y-%mパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('26-06-2004', '%d-%m-%Y', 's:date'), '%d-%m-%Yパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('[2004-06-26]@', '[%Y-%m-%d]@', 's:date'), '[%Y-%m-%d]@パターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('[06-2004-26]@', '[%m-%Y-%d]@', 's:date'), '[%Y-%d-%m]@パターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('[06-26-2004]@', '[%m-%d-%Y]@', 's:date'), '[%m-%Y-%d]@パターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  call VUAssertEquals(1, s:date2ymd('[26-06-2004]@', '[%d-%m-%Y]@', 's:date'), '[%m-%d-%Y]@パターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-	call VUAssertEquals(1, s:date2ymd('[26-2004-06]@', '[%d-%Y-%m]@', 's:date'), '[%d-%Y-%m]@パターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-	call VUAssertEquals(1, s:date2ymd('[2004-26-06]@', '[%Y-%d-%m]@', 's:date'), '[%d-%m-%Y]@パターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-	call VUAssertEquals(1, s:date2ymd('2004-06-26a', '%Y-%m-%d', 's:date'), '後ろに余分な文字のあるパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-	call VUAssertEquals(1, s:date2ymd('a2004-06-26', '%Y-%m-%d', 's:date'), '前に余分な文字のあるパターンのテスト')
-  call VUAssertEquals(2004, s:date_year)
-  call VUAssertEquals(6, s:date_month)
-  call VUAssertEquals(26, s:date_day)
-  " 異常処理テスト
-  call VUAssertEquals(0, s:date2ymd('2004-06-26', '%m-%Y-%d', 's:date'), 'パターンと違う順番で日付が出現する場合のテスト')
-  call VUAssertEquals(0, s:date2ymd('aaaa-bb-cc', '%Y-%m-%d', 's:date'), '内容が日付でない場合のテスト')
-  " 後片付け
-  unlet s:date_year
-  unlet s:date_month
-  unlet s:date_day
-endfunction
-" s:date2ymd() テスト }}}
-" s:ymd2int() テスト {{{
-function! Test_ymd2int()
-  " 基準日テスト
-  call VUAssertEquals(0, s:ymd2int(0, 1, 1), '基準日テスト')
-  " 月変わり処理テスト
-  call VUAssertEquals(1, s:ymd2int(1, 2, 1) - s:ymd2int(1, 1, 31), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 3, 1) - s:ymd2int(1, 2, 28), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 4, 1) - s:ymd2int(1, 3, 31), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 5, 1) - s:ymd2int(1, 4, 30), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 6, 1) - s:ymd2int(1, 5, 31), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 7, 1) - s:ymd2int(1, 6, 30), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 8, 1) - s:ymd2int(1, 7, 31), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1, 9, 1) - s:ymd2int(1, 8, 31), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1,10, 1) - s:ymd2int(1, 9, 30), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1,11, 1) - s:ymd2int(1,10, 31), '月変わり処理テスト')
-  call VUAssertEquals(1, s:ymd2int(1,12, 1) - s:ymd2int(1,11, 30), '月変わり処理テスト')
-  " 年変わり処理テスト
-  call VUAssertEquals(1, s:ymd2int(2, 1, 1) - s:ymd2int(1,12, 31), '年変わり処理テスト')
-  " 閏年処理テスト
-  call VUAssertEquals(1, s:ymd2int(4, 3, 1) - s:ymd2int(4, 2, 29), '閏年処理テスト')
-  call VUAssertEquals(1, s:ymd2int(8, 3, 1) - s:ymd2int(8, 2, 29), '閏年処理テスト')
-  call VUAssertEquals(1, s:ymd2int(100, 3, 1) - s:ymd2int(100, 2, 28), '閏年処理テスト')
-  call VUAssertEquals(1, s:ymd2int(200, 3, 1) - s:ymd2int(200, 2, 28), '閏年処理テスト')
-  call VUAssertEquals(1, s:ymd2int(400, 3, 1) - s:ymd2int(400, 2, 29), '閏年処理テスト')
-endfunction
-" s:ymd2int() テスト }}}
+  function! TestHowmDate()
+    call TestHowmDate2Int()
+    call Test_date2ymd()
+    call Test_ymd2int()
+  endfunction
+
+  " HowmDateTime2Int() テスト {{{
+  function! TestHowmDateTime()
+    " 年
+    call VUAssertEquals(-1, HowmDateTime2Int('1969', '%Y'), '無効な年(下限1)')
+    call VUAssertEquals(0, HowmDateTime2Int('1970', '%Y'), '有効な年(下限2)')
+    call VUAssertEquals('1970', 
+          \ strftime('%Y', HowmDateTime2Int('1970', '%Y')), '有効な年(下限3)')
+    call VUAssertEquals('2037',
+          \ strftime('%Y', HowmDateTime2Int('2037', '%Y')), '有効な年(上限1)')
+    call VUAssertEquals(-1, HowmDateTime2Int('2038', '%Y'), '無効な年(上限2)')
+    " 月
+    call VUAssertEquals(-1, HowmDateTime2Int('00', '%m'), '無効な月(下限1)')
+    call VUAssertEquals('01',
+          \ strftime('%m', HowmDateTime2Int('01', '%m')), '有効な月(下限2)')
+    call VUAssertEquals('12',
+          \ strftime('%m', HowmDateTime2Int('12', '%m')), '有効な月(上限1)')
+    call VUAssertEquals(-1, HowmDateTime2Int('13', '%m'), '無効な月(上限2)')
+    " 日
+    call VUAssertEquals(-1, HowmDateTime2Int('01-00', '%m-%d'),
+          \ '無効な日付(下限1)')
+    call VUAssertEquals('01-01',
+          \ strftime('%m-%d', HowmDateTime2Int('01-01', '%m-%d')),
+          \ '有効な日付(下限2)')
+    call VUAssertEquals('01-31',
+          \ strftime('%m-%d', HowmDateTime2Int('01-31', '%m-%d')),
+          \ '有効な日付(上限1)')
+    call VUAssertEquals(-1, HowmDateTime2Int('01-32', '%m-%d'),
+          \ '無効な日付(上限2)')
+    call VUAssertEquals('04-30',
+          \ strftime('%m-%d', HowmDateTime2Int('04-30', '%m-%d')),
+          \ '有効な日付(上限3)')
+    call VUAssertEquals(-1, HowmDateTime2Int('04-31', '%m-%d'),
+          \ '無効な日付(上限4)')
+    call VUAssertEquals('2008-02-29',
+          \ strftime('%Y-%m-%d', HowmDateTime2Int('2008-02-29', '%Y-%m-%d')),
+          \ '有効な日付(上限5)')
+    call VUAssertEquals(-1, HowmDateTime2Int('2007-02-29', '%Y-%m-%d'),
+          \ '無効な日付(上限6)')
+    " 日時
+    call VUAssertEquals('2008-01-01 00:00:00',
+          \ strftime('%Y-%m-%d %H:%M:%S',
+          \ HowmDateTime2Int('2008-01-01 00:00:00', '%Y-%m-%d %H:%M:%S')),
+          \ '有効な日時')
+    " timezone の関係に無効になる
+    call VUAssertEquals(-1,
+          \ HowmDateTime2Int('1970-01-01 00:00:00', '%Y-%m-%d %H:%M:%S'),
+          \ '無効な日時')
+    call VUAssertEquals('1970-01-01 09:00:00',
+          \ strftime('%Y-%m-%d %H:%M:%S',
+          \ HowmDateTime2Int('1970-01-01 09:00:00', '%Y-%m-%d %H:%M:%S')),
+          \ '有効な日時')
+    " %F, %T, %R
+    call VUAssertEquals('2008-03-19',
+          \ strftime('%Y-%m-%d', HowmDateTime2Int('2008-03-19', '%F')),
+          \ '%Fのテスト')
+    call VUAssertEquals('2008-03-19 20:30:48',
+          \ strftime('%Y-%m-%d %H:%M:%S',
+          \ HowmDateTime2Int('2008-03-19 20:30:48', '%F %T')),
+          \ '%Tのテスト')
+    call VUAssertEquals('2008-03-19 20:30',
+          \ strftime('%Y-%m-%d %H:%M',
+          \ HowmDateTime2Int('2008-03-19 20:30', '%F %R')),
+          \ '%Rのテスト')
+    " 無駄な文字をいれてみる
+    call VUAssertEquals('2008-03-19 20:30:48',
+          \ strftime('%Y-%m-%d %H:%M:%S',
+          \ HowmDateTime2Int('[2008-03-19T20:30:48]', '[%FT%T]')),
+          \ '無駄な文字を含めてみる')
+
+  endfunction
+  " HowmDateTime2Int() テスト }}}
+  " HowmDate2Int() テスト {{{
+  function! TestHowmDate2Int()
+    " 正常処理テスト
+    call VUAssertEquals(30, HowmDate2Int('0000-01-31', '%Y-%m-%d'), '%Y-%m-%dパターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('0000-31-01', '%Y-%d-%m'), '%Y-%d-%mパターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('01-0000-31', '%m-%Y-%d'), '%m-%Y-%dパターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('01-31-0000', '%m-%d-%Y'), '%m-%d-%Yパターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('31-0000-01', '%d-%Y-%m'), '%d-%Y-%mパターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('31-01-0000', '%d-%m-%Y'), '%d-%m-%Yパターンのテスト')
+
+    call VUAssertEquals(30, HowmDate2Int('[0000-01-31]@', '[%Y-%m-%d]@'), '[%Y-%m-%d]@パターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('[0000-31-01]@', '[%Y-%d-%m]@'), '[%Y-%d-%m]@パターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('[01-0000-31]@', '[%m-%Y-%d]@'), '[%m-%Y-%d]@パターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('[01-31-0000]@', '[%m-%d-%Y]@'), '[%m-%d-%Y]@パターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('[31-0000-01]@', '[%d-%Y-%m]@'), '[%d-%Y-%m]@パターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('[31-01-0000]@', '[%d-%m-%Y]@'), '[%d-%m-%Y]@パターンのテスト')
+
+    call VUAssertEquals(30, HowmDate2Int('[0000-01-31]@ a', '[%Y-%m-%d]@'), '後ろに余分な文字のあるパターンのテスト')
+    call VUAssertEquals(30, HowmDate2Int('a[0000-01-31]@', '[%Y-%m-%d]@'), '前に余分な文字のあるパターンのテスト')
+    " 異常処理テスト
+    call VUAssertEquals(-1, HowmDate2Int('2004-06-26', '%m-%Y-%d'), 'パターンと違う順番で日付が出現する場合のテスト')
+    call VUAssertEquals(-1, HowmDate2Int('aaaa-bb-cc', '%Y-%m-%d'), '内容が日付でない場合のテスト')
+  endfunction
+  " HowmDate2Int() テスト }}}
+  " s:date2ymd() テスト {{{
+  function! Test_date2ymd()
+    " 正常処理テスト
+    call VUAssertEquals(1, s:date2ymd('2004-06-26', '%Y-%m-%d', 's:date'), '%Y-%m-%dパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('2004-26-06', '%Y-%d-%m', 's:date'), '%Y-%d-%mパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('06-2004-26', '%m-%Y-%d', 's:date'), '%m-%Y-%dパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('06-26-2004', '%m-%d-%Y', 's:date'), '%m-%d-%Yパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('26-2004-06', '%d-%Y-%m', 's:date'), '%d-%Y-%mパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('26-06-2004', '%d-%m-%Y', 's:date'), '%d-%m-%Yパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('[2004-06-26]@', '[%Y-%m-%d]@', 's:date'), '[%Y-%m-%d]@パターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('[06-2004-26]@', '[%m-%Y-%d]@', 's:date'), '[%Y-%d-%m]@パターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('[06-26-2004]@', '[%m-%d-%Y]@', 's:date'), '[%m-%Y-%d]@パターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('[26-06-2004]@', '[%d-%m-%Y]@', 's:date'), '[%m-%d-%Y]@パターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('[26-2004-06]@', '[%d-%Y-%m]@', 's:date'), '[%d-%Y-%m]@パターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('[2004-26-06]@', '[%Y-%d-%m]@', 's:date'), '[%d-%m-%Y]@パターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('2004-06-26a', '%Y-%m-%d', 's:date'), '後ろに余分な文字のあるパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    call VUAssertEquals(1, s:date2ymd('a2004-06-26', '%Y-%m-%d', 's:date'), '前に余分な文字のあるパターンのテスト')
+    call VUAssertEquals(2004, s:date_year)
+    call VUAssertEquals(6, s:date_month)
+    call VUAssertEquals(26, s:date_day)
+    " 異常処理テスト
+    call VUAssertEquals(0, s:date2ymd('2004-06-26', '%m-%Y-%d', 's:date'), 'パターンと違う順番で日付が出現する場合のテスト')
+    call VUAssertEquals(0, s:date2ymd('aaaa-bb-cc', '%Y-%m-%d', 's:date'), '内容が日付でない場合のテスト')
+    " 後片付け
+    unlet s:date_year
+    unlet s:date_month
+    unlet s:date_day
+  endfunction
+  " s:date2ymd() テスト }}}
+  " s:ymd2int() テスト {{{
+  function! Test_ymd2int()
+    " 基準日テスト
+    call VUAssertEquals(0, s:ymd2int(0, 1, 1), '基準日テスト')
+    " 月変わり処理テスト
+    call VUAssertEquals(1, s:ymd2int(1, 2, 1) - s:ymd2int(1, 1, 31), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 3, 1) - s:ymd2int(1, 2, 28), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 4, 1) - s:ymd2int(1, 3, 31), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 5, 1) - s:ymd2int(1, 4, 30), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 6, 1) - s:ymd2int(1, 5, 31), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 7, 1) - s:ymd2int(1, 6, 30), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 8, 1) - s:ymd2int(1, 7, 31), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1, 9, 1) - s:ymd2int(1, 8, 31), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1,10, 1) - s:ymd2int(1, 9, 30), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1,11, 1) - s:ymd2int(1,10, 31), '月変わり処理テスト')
+    call VUAssertEquals(1, s:ymd2int(1,12, 1) - s:ymd2int(1,11, 30), '月変わり処理テスト')
+    " 年変わり処理テスト
+    call VUAssertEquals(1, s:ymd2int(2, 1, 1) - s:ymd2int(1,12, 31), '年変わり処理テスト')
+    " 閏年処理テスト
+    call VUAssertEquals(1, s:ymd2int(4, 3, 1) - s:ymd2int(4, 2, 29), '閏年処理テスト')
+    call VUAssertEquals(1, s:ymd2int(8, 3, 1) - s:ymd2int(8, 2, 29), '閏年処理テスト')
+    call VUAssertEquals(1, s:ymd2int(100, 3, 1) - s:ymd2int(100, 2, 28), '閏年処理テスト')
+    call VUAssertEquals(1, s:ymd2int(200, 3, 1) - s:ymd2int(200, 2, 28), '閏年処理テスト')
+    call VUAssertEquals(1, s:ymd2int(400, 3, 1) - s:ymd2int(400, 2, 29), '閏年処理テスト')
+  endfunction
+  " s:ymd2int() テスト }}}
 
 endif
 " 単体テスト用関数 }}}
 
-" vim:set ts=2 sts=2 sw=2 tw=0 fdm=marker:
+" vim:set et ts=2 sts=2 sw=2 tw=0 fdm=marker:
diff -ur --binary howm_vim/plugin/howm-mode.vim howm_vim_new/plugin/howm-mode.vim
--- howm_vim/plugin/howm-mode.vim	2006-06-04 21:26:21.000000000 +0900
+++ howm_vim_new/plugin/howm-mode.vim	2008-04-16 21:30:17.392062000 +0900
@@ -3,442 +3,1231 @@
 " - howm(Hitoride Otegaru Wiki Modoki)
 "   http://howm.sourceforge.jp/index-j.html
 "
-" Last Change: 04-Jun-2006.
+" Last Change: 16-Apr-2008.
 " Written By: Kouichi NANASHIMA <claymoremine@anet.ne.jp>
+"
+" 使用条件
+" - Vim6 以降
+" - strftime() が使える
+" - strftime() の format に %Y, %m, %d, %H, %M, %S が使える
 
 scriptencoding euc-jp
 
-" variables {{{
-if !exists('g:howm_dir')
-  let g:howm_dir = "~/howm/"
-endif
-if !exists('g:howm_filename')
-  let g:howm_filename = "%Y/%m/%d/%Y-%m-%d-%H%M%S.howm"
-endif
-if !exists('g:howm_fileencoding')
-  " let g:howm_fileencoding = "euc-jp"
-  let g:howm_fileencoding = &enc
-endif
-if !exists('g:howm_fileformat')
-  " let g:howm_fileformat = "unix"
-  let g:howm_fileformat = &ff
-endif
-if !exists('g:howm_keywordfile')
-  let g:howm_keywordfile = '~/.howm-keys'
-endif
-if !exists('g:howm_mapleader')
-  let g:howm_mapleader = ','
-endif
-if !exists('g:howm_instantpreview')
-  let g:howm_instantpreview = 0
-endif
-if !exists('g:howm_hidefile_regexp')
-  let g:howm_hidefile_regexp = '\(^\|/\)\.\|[~#]$\|\.bak$\|/CVS/'
-endif
-if !exists('g:howm_reminder_old_format')
-  let g:howm_reminder_old_format = 0
-endif
-if !exists('g:howm_removeEmpty')
-  let g:howm_removeEmpty = 0
-endif
-if !exists('g:howm_debug')
-  let g:howm_debug = 0
+if v:version < 600 ||
+      \ (!exists('*strftime') ||
+      \ strftime('%Y-%m-%d %H:%M:%S') !~# '^\d\{4}-\d\d-\d\d \d\d:\d\d:\d\d$')
+  finish
 endif
 
-" variables-pattern {{{
-" 日付のパターン
-" 予定や ToDo などに使用．
-if !exists('g:howm_date_pattern')
-  let g:howm_date_pattern='%Y-%m-%d'
-endif
-" TODO:match() とか使って自動化
-if !exists('g:howm_date_yearpos')
-  let g:howm_date_yearpos=1
-endif
-if !exists('g:howm_date_monthpos')
-  let g:howm_date_monthpos=2
-endif
-if !exists('g:howm_date_daypos')
-  let g:howm_date_daypos=3
-endif
-" メモタイトルのパターン
-if !exists('g:howm_title_pattern')
-  let g:howm_title_pattern='='
-endif
-" goto リンクのパターン
-if !exists('g:howm_glink_pattern')
-  let g:howm_glink_pattern='>>>'
-endif
-if !exists('g:howm_clink_pattern')
-  let g:howm_clink_pattern='<<<'
-endif
-" Preview ヘッダのパターン
-if !exists('g:howm_previewheader_pattern')
-  let g:howm_previewheader_pattern = "\<NL>==========================>>> %file%\<NL>"
-endif
-" variables-pattern }}}
-" variables-grep {{{
-if !exists('g:howm_grepprg')
-  if has('win32')
-    let g:howm_grepprg = ''
-  else
-    let g:howm_grepprg = 'grep'
+if !exists('s:did_load')
+  let s:enable_vimgrep = 0
+  if (v:version >= 700) && has('quickfix') && (exists(':vimgrep') == 2)
+    let s:enable_vimgrep = 1
+  endif
+  let s:enable_migemo = 0
+  if s:enable_vimgrep && has('migemo') && exists('*migemo')
+    let s:enable_migemo = 1
   endif
-endif
-" Grep 実行用コマンド群
-" #prg# は g:howm_grepprg で指定したプログラムに置換される
-" #searchWord# は検索語に置換される
-" #searchWordFile# は検索語を保存した作業用ファイル名に置換される
-"                  （コマンドラインでうまくマルチバイト文字が扱えないときに有効）
-" #searchPath# は検索対象パスに置換される
-" CYGWIN GNU Grep 用設定
-if !exists('g:howm_grepcmd_regexp')
-  let g:howm_grepcmd_regexp        = '#prg# -HInrE -f #searchWordFile# #searchPath#'
-endif
-if !exists('g:howm_grepcmd_regexp_ignore')
-  let g:howm_grepcmd_regexp_ignore = '#prg# -HInrEi -f #searchWordFile# #searchPath#'
-endif
-if !exists('g:howm_grepcmd_fix')
-  let g:howm_grepcmd_fix           = '#prg# -HInrF -f #searchWordFile# #searchPath#'
-endif
-if !exists('g:howm_grepcmd_fix_ignore')
-  let g:howm_grepcmd_fix_ignore    = '#prg# -HInrFi -f #searchWordFile# #searchPath#'
-endif
 
-" variables-grep }}}
-" variables-find {{{
-" old variables
-if !exists('g:howm_findprg')
-  " let g:howm_findprg = 'find'
-  if has('win32')
-    let g:howm_findprg = ''
-  else
-    let g:howm_findprg = 'find'
+  " variables {{{
+  if !exists('g:howm_dir')
+    let g:howm_dir = "~/howm/"
+  endif
+  if !exists('g:howm_filename')
+    let g:howm_filename = "%Y/%m/%d/%Y-%m-%d-%H%M%S.howm"
+  endif
+  if !exists('g:howm_fileencoding')
+    " let g:howm_fileencoding = "euc-jp"
+    let g:howm_fileencoding = &enc
+  endif
+  if !exists('g:howm_fileformat')
+    " let g:howm_fileformat = "unix"
+    let g:howm_fileformat = &ff
+  endif
+  if !exists('g:howm_keywordfile')
+    let g:howm_keywordfile = '~/.howm-keys'
+  endif
+  if !exists('g:howm_schedulefile')
+    let g:howm_schedulefile = '~/.howm-schedules'
+  endif
+  if !exists('g:howm_mapleader')
+    let g:howm_mapleader = ','
+  endif
+  if !exists('g:howm_hidefile_regexp')
+    let g:howm_hidefile_regexp = '\(^\|/\)\.\|[~#]$\|\.bak$\|/CVS/'
+  endif
+  if !exists('g:howm_removeEmpty')
+    let g:howm_removeEmpty = 0
+  endif
+  if !exists('g:howm_debug')
+    let g:howm_debug = 0
+  endif
+  if !exists('g:howm_lineFormat')
+    let g:howm_lineFormat = "%filename% | %content%"
+  endif
+  if !exists('g:howm_lineFormatShowDirectory')
+    let g:howm_lineFormatShowDirectory = "%filename% | %content%"
+  endif
+  if v:version >= 700 && !exists('g:howm_actionlock_list')
+    let g:howm_actionlock_list = []
+  endif
+  if v:version >= 700 && !exists('g:howm_searchinfo_format')
+    let fmt = ''
+    let fmt = fmt . 'type: %TYPE%' . "\n"
+    let fmt = fmt . 'migemo: %MIGEMO%' . "\n"
+    let fmt = fmt . 'qtype: %QTYPE%' . "\n"
+    let fmt = fmt . 'case: %CASE%' . "\n"
+    let fmt = fmt . 'sort: %SORT%(%ORDER%)' . "\n"
+    let fmt = fmt . 'time: %time% [sec]' . "\n"
+    let fmt = fmt . 'query: %query%' . "\n"
+    let fmt = fmt . 'rquery: %rquery%' . "\n"
+    let g:howm_searchinfo_format = fmt
+    unlet fmt
+  endif
+  if s:enable_vimgrep && !exists('g:howm_vimgrep_usehide')
+    let g:howm_vimgrep_usehide = 1
+  endif
+  if !exists('g:howm_ignore_done')
+    let g:howm_ignore_done = 0
+  endif
+  if !exists('g:howm_auto_show_preview')
+    let g:howm_auto_show_preview = 0
+  endif
+  if !exists('g:howm_auto_hide_preview')
+    let g:howm_auto_hide_preview = 0
+  endif
+  if !exists('g:howm_append_editing')
+    let g:howm_append_editing = 1
+  endif
+  if !exists('g:howm_wildignore')
+    let g:howm_wildignore = ''
   endif
-endif
-let g:howm_findcmd   = '#prg# #searchPath# -type f -print'
-" variables-find }}}
-" variables-migemo {{{
-if !exists('g:howm_migemoprg')
-  let g:howm_migemoprg = 'migemo'
-endif
-if !exists('g:howm_migemoopt')
-  " ruby migemo
-  let g:howm_migemoopt   = '-t egrep -d /usr/share/migemo/migemo-dict'
-  " cmigemo
-  " let g:howm_migemoopt = '-q -d /usr/local/share/migemo/euc-jp/migemo-dict'
-endif
-" variables-migemo }}}
 
-" variables }}}
-" constant {{{
-let s:prefix_howm               = "howm "
-let s:buftitle_ftresult         = "Search result"
-let s:buftitle_preview          = "Preview"
-let s:buftitle_summary          = "Summary"
-let s:buftitle_webimport        = "Web import"
-let s:prompt_search_egrep       = "Full text search(grep): "
-let s:prompt_search_fgrep       = "Full text search(fgrep): "
-let s:prompt_search_migemo      = "Full text search(migemo): "
-let s:prompt_input_sortkey      = "Sort by: "
-let s:prompt_input_matchpattern = "Regexp: "
-let s:prompt_lzchange           = "RET (done), x (canceled), symbol (type), num (laziness): "
-let s:msg_ftnomatch             = "No match"
-let s:msg_wait_search           = "Searching..."
-let s:msg_wait_parse            = "Parsing..."
-let s:msg_wait_sort             = "Sorting..."
-let s:msg_wait_format           = "Formatting..."
-let s:msg_done                  = "done."
-let s:errmsg_inexecutable       = "'%prg%' isn't executable. Please assign valid value to the variable '%var%'."
+  " variables-pattern {{{
+  " 日付のパターン
+  " 予定や ToDo などに使用．
+  " TODO:%F(%Y-%m-%d), %T(%H:%M:%S), %R(%H:%M), %% を使えるようにする
+  if !exists('g:howm_date_pattern')
+    let g:howm_date_pattern = '%Y-%m-%d'
+  endif
+  " メモタイトルのパターン
+  if !exists('g:howm_title_pattern')
+    let g:howm_title_pattern = '='
+  endif
+  " goto リンクのパターン
+  if !exists('g:howm_glink_pattern')
+    let g:howm_glink_pattern = '>>>'
+  endif
+  if !exists('g:howm_clink_pattern')
+    let g:howm_clink_pattern = '<<<'
+  endif
+  " Preview ヘッダのパターン
+  if !exists('g:howm_previewheader_pattern')
+    let g:howm_previewheader_pattern = 
+          \ "\<NL>==========================>>> %file%\<NL>"
+  endif
+  " variables-pattern }}}
+  " variables-grep {{{
+  if !exists('g:howm_grepprg')
+    if has('win32')
+      let g:howm_grepprg = ''
+    else
+      let g:howm_grepprg = 'grep'
+    endif
+  endif
+  " Grep 実行用コマンド群
+  " #prg# は g:howm_grepprg で指定したプログラムに置換される
+  " #searchWord# は検索語に置換される
+  " #searchWordFile# は検索語を保存した作業用ファイル名に置換される
+  "   （コマンドラインでうまくマルチバイト文字が扱えないときに有効）
+  " #searchPath# は検索対象パスに置換される
+  " CYGWIN GNU Grep 用設定
+  if !exists('g:howm_grepcmd_regexp')
+    if has('win32')
+      let g:howm_grepcmd_regexp        =
+            \ '#prg# -HInrE -f #searchWordFile# "#searchPath#"'
+    else
+      let g:howm_grepcmd_regexp        =
+            \ '#prg# -HInrE -f #searchWordFile# #searchPath#'
+    endif
+  endif
+  if !exists('g:howm_grepcmd_regexp_ignore')
+    if has('win32')
+      let g:howm_grepcmd_regexp_ignore =
+            \ '#prg# -HInrEi -f #searchWordFile# "#searchPath#"'
+    else
+      let g:howm_grepcmd_regexp_ignore =
+            \ '#prg# -HInrEi -f #searchWordFile# #searchPath#'
+    endif
+  endif
+  if !exists('g:howm_grepcmd_fix')
+    if has('win32')
+      let g:howm_grepcmd_fix           =
+            \ '#prg# -HInrF -f #searchWordFile# "#searchPath#"'
+    else
+      let g:howm_grepcmd_fix           =
+            \ '#prg# -HInrF -f #searchWordFile# #searchPath#'
+    endif
+  endif
+  if !exists('g:howm_grepcmd_fix_ignore')
+    if has('win32')
+      let g:howm_grepcmd_fix_ignore    =
+            \ '#prg# -HInrFi -f #searchWordFile# "#searchPath#"'
+    else
+      let g:howm_grepcmd_fix_ignore    =
+            \ '#prg# -HInrFi -f #searchWordFile# #searchPath#'
+    endif
+  endif
 
-let s:pattern_date = g:howm_date_pattern
+  " variables-grep }}}
+  " variables-find {{{
+  " old variables
+  if !exists('g:howm_findprg')
+    " let g:howm_findprg = 'find'
+    if has('win32')
+      let g:howm_findprg = ''
+    else
+      let g:howm_findprg = 'find'
+    endif
+  endif
+  if !exists('g:howm_findcmd')
+    if has("win32")
+      let g:howm_findcmd   = '#prg# "#searchPath#" -type f -print'
+    else
+      let g:howm_findcmd   = '#prg# #searchPath# -type f -print'
+    endif
+  endif
+  " variables-find }}}
+  " variables-migemo {{{
+  if !exists('g:howm_migemoprg')
+    let g:howm_migemoprg = 'migemo'
+  endif
+  if !exists('g:howm_migemoopt')
+    " ruby migemo
+    let g:howm_migemoopt   = '-t egrep -d /usr/share/migemo/migemo-dict'
+    " cmigemo
+    " let g:howm_migemoopt = '-q -d /usr/local/share/migemo/euc-jp/migemo-dict'
+  endif
+  if !exists('g:howm_migemocmd')
+    let g:howm_migemocmd = "echo #searchWord# | #prg# #opt#"
+  endif
+  " variables-migemo }}}
+
+  " variables }}}
+  " constant {{{
+  let s:prefix_howm               = "howm "
+  let s:buftitle_menu             = "Menu"
+  let s:buftitle_ftresult         = "Search result"
+  let s:buftitle_preview          = "Preview"
+  let s:buftitle_summary          = "Summary"
+  let s:buftitle_webimport        = "Web import"
+  let s:prompt_search_egrep       = "Full text search(grep): "
+  let s:prompt_search_fgrep       = "Full text search(fgrep): "
+  let s:prompt_search_vgrep       = "Full text search(vgrep): "
+  let s:prompt_search_migemo      = "Full text search(migemo): "
+  let s:prompt_input_sortkey      = "Sort by: "
+  let s:prompt_input_matchpattern = "Regexp: "
+  let s:prompt_lzchange           =
+        \ "RET (done), x (canceled), symbol (type), num (laziness): "
+  let s:prompt_dtchange           =
+        \ 'RET (goto), +num (shift), yymmdd (set), . (today): '
+  let s:msg_ftnomatch             = "No match"
+  let s:msg_wait_search           = "Searching..."
+  let s:msg_wait_parse            = "Parsing..."
+  let s:msg_wait_sort             = "Sorting..."
+  let s:msg_wait_format           = "Formatting..."
+  let s:msg_wait_rebuild          = "Rebuilding..."
+  let s:msg_done                  = "done."
+  let s:errmsg_inexecutable       =
+        \ "'%prg%' isn't executable. " . 
+        \ "Please assign valid value to the variable '%var%'."
+  let s:errmsg_cantmkdir          = "cannot create directory '%dir%'"
+  let s:errmsg_migemo             =
+        \ "migemo検索はASCIIの印字可能文字を2文字以上入力してください"
+  let s:errmsg_invalidstype       = "sortType が不正です"
+  let s:errmsg_invalidqtype       = "searchWordType が不正です"
+  let s:errmsg_regexpgrep         =
+        \ "g:howm_grepprg 以外では正規表現(grep)は扱えません"
+  let s:errmsg_regexpvim          =
+        \ ":vimgrep 以外では正規表現(Vim)は扱えません"
+  let s:pattern_date = g:howm_date_pattern
   let s:pattern_date = substitute(s:pattern_date, '%Y', '\\(\\d\\{4}\\)', '')
   let s:pattern_date = substitute(s:pattern_date, '%m', '\\(\\d\\{2}\\)', '')
   let s:pattern_date = substitute(s:pattern_date, '%d', '\\(\\d\\{2}\\)', '')
 
-function! s:CountLines(str)
-  let i = 0
-  let idx = match(a:str, "\<NL>")
-  while idx != -1
-    let i = i + 1
-    let idx = match(a:str, "\<NL>", idx + 1)
-  endwhile
-
-  return i
-endfunction
-let s:num_previewheader_lines = s:CountLines(g:howm_previewheader_pattern)
-
-" constant-actionlock {{{
-let s:actionlock_pat1   = g:howm_glink_pattern.' *.*$'
-let s:actionlock_func1  = 's:ActionLockGotoLink'
-let s:actionlock_pat2   = g:howm_clink_pattern
-let s:actionlock_func2  = 's:ActionLockComeFromLink'
-let s:actionlock_pat3   = ''
-let s:actionlock_func3  = 's:ActionLockKeyword'
-let s:actionlock_pat4   = '{[ *-]}'
-let s:actionlock_func4  = 's:ActionLockCheckOff'
-let s:actionlock_pat5   = '{_}'
-let s:actionlock_func5  = 's:ActionLockTimeStamp'
-let s:actionlock_pat6   = "s\\?https\\?://[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]\\+"
-let s:actionlock_func6  = 's:ActionLockURL'
-let s:actionlock_pat7   = '\(\['.s:pattern_date.'\]\)\@<=[-!+@]\d*'
-let s:actionlock_func7  = 's:ActionLockImportantDate'
-let s:actionlock_pat8   = "{s\\?https\\?://[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]\\+}"
-let s:actionlock_func8  = 's:ActionLockWebImport'
-let s:actionlock_pat9   = s:pattern_date
-let s:actionlock_func9  = 's:ActionLockDate'
-
-if g:howm_reminder_old_format != 0
-  " TODO:番号直指定がいや
-  let s:actionlock_pat7   = '@\['.s:pattern_date.'\]\(-\d\+\|[\!+@]\(\d*\)\)\?'
+  function! s:CountLines(str)
+    let i = 0
+    let idx = match(a:str, "\<NL>")
+    while idx != -1
+      let i = i + 1
+      let idx = match(a:str, "\<NL>", idx + 1)
+    endwhile
+    return i
+  endfunction
+  let s:num_previewheader_lines = s:CountLines(g:howm_previewheader_pattern)
+
+  " constant-actionlock {{{
+  let s:actionlock_pat1   = g:howm_glink_pattern . ' *.*$'
+  let s:actionlock_func1  = 's:ActionLockGotoLink'
+  let s:actionlock_pat2   = g:howm_clink_pattern
+  let s:actionlock_func2  = 's:ActionLockComeFromLink'
+  let s:actionlock_pat3   = s:pattern_date
+  let s:actionlock_func3  = 's:ActionLockDate'
+  let s:actionlock_pat4   = '{[ *-]}'
+  let s:actionlock_func4  = 's:ActionLockCheckOff'
+  let s:actionlock_pat5   = '{_}'
+  let s:actionlock_func5  = 's:ActionLockTimeStamp'
+  let s:actionlock_pat6   =
+        \ "s\\?https\\?://[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]\\+"
+  let s:actionlock_func6  = 's:ActionLockURL'
+  let s:actionlock_pat7   = '\(\[' . s:pattern_date . '\]\)\@<=[-!+@]\d*'
+  let s:actionlock_func7  = 's:ActionLockImportantDate'
+  let s:actionlock_pat8   =
+        \ "{s\\?https\\?://[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]\\+}"
+  let s:actionlock_func8  = 's:ActionLockWebImport'
+  let s:actionlock_pat9   = ''
+  let s:actionlock_func9  = 's:ActionLockKeyword'
+
+  " constant-actionlock }}}
+  " constant-sort {{{
+  let s:laziness_normal    = 1
+  let s:laziness_todo      = 7
+  let s:init_todo          = -7
+  let s:laziness_deadline  = 7
+  let s:init_deadline      = -2
+  let s:laziness_schedule  = 1
+  " constant-sort }}}
+
+  " constant }}}
+  " commands {{{
+  command! -nargs=? HowmSchedule
+        \ :call HowmCommand('ShowScheduleA', <q-args>)
+  command! -nargs=? HowmSearchF
+        \ :call HowmCommand('FullTextSearchInputFgrepA', <q-args>)
+  command! -nargs=? HowmSearchE
+        \ :call HowmCommand('FullTextSearchInputEgrepA', <q-args>)
+  command! -nargs=? HowmSearchV
+        \ :call HowmCommand('FullTextSearchInputVgrepA', <q-args>)
+  command! -nargs=? HowmSearchM
+        \ :call HowmCommand('FullTextSearchInputMigemoA', <q-args>)
+  " commands }}}
+  " keymaps {{{
+  if exists('g:mapleader')
+    let s:leader = g:mapleader
+  endif
+  let g:mapleader = g:howm_mapleader
+  if !hasmapto('<Plug>HOWM_ShowDirectory')
+    silent! nmap <unique> <silent> <Leader>,a <Plug>HOWM_ShowDirectory
+  endif
+  if !hasmapto('<Plug>HOWM_OpenMemo')
+    silent! nmap <unique> <silent> <Leader>,c <Plug>HOWM_OpenMemo
+  endif
+  if !hasmapto('<Plug>HOWM_SearchF')
+    silent! nmap <unique> <silent> <Leader>,s <Plug>HOWM_SearchF
+  endif
+  if !hasmapto('<Plug>HOWM_SearchE')
+    silent! nmap <unique> <silent> <Leader>,g <Plug>HOWM_SearchE
+  endif
+  if !hasmapto('<Plug>HOWM_SearchV')
+    silent! nmap <unique> <silent> <Leader>,v <Plug>HOWM_SearchV
+  endif
+  if !hasmapto('<Plug>HOWM_SearchM')
+    silent! nmap <unique> <silent> <Leader>,m <Plug>HOWM_SearchM
+  endif
+  if !hasmapto('<Plug>HOWM_ShowSchedule')
+    silent! nmap <unique> <silent> <Leader>,y <Plug>HOWM_ShowSchedule
+  endif
+  if !hasmapto('<Plug>HOWM_ShowTodo')
+    silent! nmap <unique> <silent> <Leader>,t <Plug>HOWM_ShowTodo
+  endif
+  if !hasmapto('<Plug>HOWM_ShowMenu')
+    silent! nmap <unique> <silent> <Leader>,, <Plug>HOWM_ShowMenu
+  endif
+  if !hasmapto('<Plug>HOWM_RebuildKeywordFile')
+    silent! nmap <unique> <silent> <Leader>,rk <Plug>HOWM_RebuildKeywordFile
+  endif
+  if !hasmapto('<Plug>HOWM_RebuildScheduleFile')
+    silent! nmap <unique> <silent> <Leader>,ry <Plug>HOWM_RebuildScheduleFile
+  endif
+  noremap <silent> <script> <Plug>HOWM_OpenMemo
+        \ :call HowmCommand('OpenMemo')<CR>
+  noremap <silent> <script> <Plug>HOWM_ShowDirectory
+        \ :call HowmCommand('ShowDirectory')<CR>
+  noremap <silent> <script> <Plug>HOWM_ShowSchedule
+        \ :call HowmCommand('ShowSchedule')<CR>
+  noremap <silent> <script> <Plug>HOWM_ShowTodo
+        \ :call HowmCommand('ShowTodo')<CR>
+  noremap <silent> <script> <Plug>HOWM_ShowMenu
+        \ :call HowmCommand('ShowMenu')<CR>
+  noremap <silent> <script> <Plug>HOWM_SearchF
+        \ :call HowmCommand('FullTextSearchInputFgrep')<CR>
+  noremap <silent> <script> <Plug>HOWM_SearchE
+        \ :call HowmCommand('FullTextSearchInputEgrep')<CR>
+  noremap <silent> <script> <Plug>HOWM_SearchV
+        \ :call HowmCommand('FullTextSearchInputVgrep')<CR>
+  noremap <silent> <script> <Plug>HOWM_SearchM
+        \ :call HowmCommand('FullTextSearchInputMigemo')<CR>
+  noremap <silent> <script> <Plug>HOWM_RebuildKeywordFile
+        \ :call HowmCommand('RebuildKeywordFile')<CR>
+  noremap <silent> <script> <Plug>HOWM_RebuildScheduleFile
+        \ :call HowmCommand('RebuildScheduleFile')<CR>
+  if exists('s:leader')
+    let g:mapleader = s:leader
+  else
+    unlet g:mapleader
+  endif
+  " keymaps }}}
+  " autocommands {{{
+  augroup howm
+    autocmd!
+    if g:howm_auto_show_preview
+      let searchbufname = escape(s:prefix_howm . s:buftitle_ftresult, ' ')
+      let menubufname = escape(s:prefix_howm . s:buftitle_menu, ' ')
+      exe 'autocmd CursorHold ' . searchbufname . ' call s:ShowPreview()'
+      exe 'autocmd BufEnter ' . searchbufname .
+            \ ' let b:updatetime=&updatetime|set updatetime=1'
+      exe 'autocmd BufLeave ' . searchbufname .
+            \ ' silent! exe "set updatetime=".b:updatetime'
+      exe 'autocmd CursorHold ' . menubufname . ' call s:ShowPreview()'
+      exe 'autocmd BufEnter ' . menubufname .
+            \ ' let b:updatetime=&updatetime|set updatetime=1'
+      exe 'autocmd BufLeave ' . menubufname . 
+            \ ' silent! exe "set updatetime=".b:updatetime'
+      unlet! searchbufname
+      unlet! menubufname
+    endif
+    exe 'autocmd BufDelete ' .
+          \ escape(s:prefix_howm . s:buftitle_ftresult, ' ') .
+          \ ' call s:ClosePreviewWindow()'
+    exe 'autocmd BufDelete ' .
+          \ escape(s:prefix_howm . s:buftitle_menu, ' ') .
+          \ ' call s:ClosePreviewWindow()'
+    autocmd FileType howm_memo nmap <silent> <buffer> <CR>
+          \ :call <SID>DoActionLock()<CR>
+    autocmd BufEnter *.howm setlocal ft=howm_memo
+    autocmd BufWritePost,FileWritePost *.howm call <SID>HowmWriteEvent()
+  augroup END
+  " autocommands }}}
+
+  let s:did_load = 1
+  exe "autocmd FuncUndefined HowmCommand* source " . expand('<sfile>')
+  finish
 endif
 
-" constant-actionlock }}}
-" constant-sort {{{
-let s:laziness_normal    = 1
-let s:laziness_todo      = 7
-let s:init_todo          = -7
-let s:laziness_deadline  = 7
-let s:init_deadline      = -2
-let s:laziness_schedule  = 1
-" constant-sort }}}
-
-" constant }}}
-" keymaps {{{
-if exists('g:mapleader')
-  let s:leader = g:mapleader
-endif
-let g:mapleader = g:howm_mapleader
-nmap <unique> <silent> <Leader>,a :call <SID>ShowDirectory()<CR>
-nmap <unique> <silent> <Leader>,c :call <SID>OpenMemo(<SID>GetFilePath(0), 0)<CR>
-nmap <unique> <silent> <Leader>,g :call <SID>FullTextSearchInput('egrep')<CR>
-nmap <unique> <silent> <Leader>,m :call <SID>FullTextSearchInput('migemo')<CR>
-nmap <unique> <silent> <Leader>,y :call <SID>ShowSchedule()<CR>
-nmap <unique> <silent> <Leader>,t :call <SID>ShowTodo()<CR>
-if exists('s:leader')
-  let g:mapleader = s:leader
-else
-  unlet g:mapleader
-endif
+" functions {{{
+function! HowmCommand(cmd, ...)
+  let arg = exists('a:1') ? a:1 : ''
+  if a:cmd == 'OpenMemo'
+    call s:OpenMemo(s:GetFilePath(0), 0)
+  elseif a:cmd == 'ShowDirectory'
+    call s:ShowDirectory()
+  elseif a:cmd == 'ShowSchedule'
+    call s:ShowSchedule()
+  elseif a:cmd == 'ShowTodo'
+    call s:ShowTodo()
+  elseif a:cmd == 'ShowMenu'
+    call s:ShowMenu()
+  elseif a:cmd == 'FullTextSearchInputFgrep'
+    call s:FullTextSearchInput('fgrep')
+  elseif a:cmd == 'FullTextSearchInputEgrep'
+    call s:FullTextSearchInput('egrep')
+  elseif a:cmd == 'FullTextSearchInputVgrep'
+    call s:FullTextSearchInput('vgrep')
+  elseif a:cmd == 'FullTextSearchInputMigemo'
+    call s:FullTextSearchInput('migemo')
+  elseif a:cmd == 'RebuildKeywordFile'
+    call s:RebuildKeywordFile()
+  elseif a:cmd == 'RebuildScheduleFile'
+    call s:RebuildScheduleFile()
+  elseif a:cmd == 'ShowPreview'
+    call s:ShowPreview()
+  elseif a:cmd == 'ShowScheduleA'
+    call s:ShowSchedule(arg)
+  elseif a:cmd == 'FullTextSearchInputFgrepA'
+    call s:FullTextSearchInput('fgrep', arg)
+  elseif a:cmd == 'FullTextSearchInputEgrepA'
+    call s:FullTextSearchInput('egrep', arg)
+  elseif a:cmd == 'FullTextSearchInputVgrepA'
+    call s:FullTextSearchInput('vgrep', arg)
+  elseif a:cmd == 'FullTextSearchInputMigemoA'
+    call s:FullTextSearchInput('migemo', arg)
+  endif
+endfunction
 
-" keymaps }}}
-" autocommands {{{
-augroup howm
-autocmd!
-exe 'autocmd CursorHold '.escape(s:prefix_howm.s:buftitle_ftresult, ' ').' call s:ShowPreview()'
-if g:howm_instantpreview == 1
-  exe 'autocmd BufEnter '.escape(s:prefix_howm.s:buftitle_ftresult, ' ').' let b:updatetime=&updatetime|set updatetime=1'
-  exe 'autocmd BufLeave '.escape(s:prefix_howm.s:buftitle_ftresult, ' ').' silent! exe "set updatetime=".b:updatetime'
-endif
-exe 'autocmd BufDelete '.escape(s:prefix_howm.s:buftitle_ftresult, ' ').' call s:EliminateWindow(escape(s:prefix_howm.s:buftitle_preview, " "))'
-autocmd FileType howm_memo nmap <silent> <buffer> <CR> :call <SID>DoActionLock()<CR>
-autocmd BufEnter *.howm setlocal ft=howm_memo
-autocmd BufWritePost,FileWritePost *.howm call s:RemoveEmpty(expand("%:p"))
-autocmd BufWritePost,FileWritePost *.howm call s:UpdateKeyword()
+function! s:HowmWriteEvent()
+  call s:RemoveEmpty(expand("%:p"))
+  call s:UpdateKeyword()
+  " call s:UpdateSchedule()
+endfunction
+
+" schedule {{{
+" s:RebuildScheduleFile()
+" s:LoadSchedule()
+" s:UpdateSchedule()
+" s:SaveSchedule()
+
+" TODO:FullTextSearch が grepcmd にも対応できるようにする
+function! s:RebuildScheduleFile()
+  " TODO:メッセージ
+  " プレビューを開かないよう eventignore を設定
+  let save_ei = &eventignore
+  set eventignore=all
+  let markers = '!@.'
+  let searchWord = '\[' . s:GetDatePattern(2) . '\][' . markers . ']\d*'
+  call s:FullTextSearch(searchWord, 2)
+  let s:schedule_num = b:searchResultNum
+  let i = 1
+  while i <= s:schedule_num
+    let s:schedule_file{i} = b:file{i}
+    let s:schedule_line{i} = b:line{i}
+    let s:schedule_content{i} = b:content{i}
+    let i = i + 1
+  endwhile
+  call s:CloseSearchWindow()
+  call delete(expand(g:howm_schedulefile))
+  call s:SaveSchedule()
+  let &eventignore = save_ei
+  " TODO:メッセージ
+endfunction
 
-augroup END
-" autocommands }}}
-" functions {{{
+function! s:LoadSchedule()
+  if exists('s:schedule_num') | return | endif
+  call s:OpenTemporalWindow(g:howm_schedulefile, 0)
+  let lnum = line('$')
+  let s:schedule_num = 0
+  let i = 1
+  while i <= lnum
+    let str = getline(i)
+    if str =~ '^$'
+      let i = i + 1
+      continue
+    endif
+    " シングルクオートのアンエスケープ処理ここから
+    let path = ''
+    let n = strlen(substitute(str, '.', 'x', 'g'))
+    let sqflg = 0
+    let j = 1 " 0 じゃないのは 最初の ' を読み飛ばしている
+    while j < n
+      let c = substitute(str, '^.\{' . j . '}\(.\).*$', '\1', '')
+      if sqflg
+        if c == "'"
+          let sqflg = 0
+          let path = path . "'"
+        else
+          break
+        endif
+      else
+        if c == "'"
+          let sqflg = 1
+        else
+          let sqflg = 0
+          let path = path . c
+        endif
+      endif
+      let j = j + 1
+    endwhile
+    " ここまで
+    let s:schedule_num = s:schedule_num + 1
+    let s:schedule_file{s:schedule_num} = path
+    let s:schedule_line{s:schedule_num} =
+          \ substitute(str, '^.\{' . j . '}:\(\d*\):\(.*\)$', '\1', '')
+    let s:schedule_content{s:schedule_num} =
+          \ substitute(str, '^.\{' . j . '}:\(\d*\):\(.*\)$', '\2', '')
+    let i = i + 1
+  endwhile
+  call s:SafeClose()
+endfunction
 
-" ファイル内のキーワードを検索し、新たなキーワードがあったら
-" g:howm_keyword と g:howm_keywordfile の内容を更新。
-function! s:UpdateKeyword()
-	let line = line('.')
-	let col = col('.')
-	let winline = winline()
-	let wincol = wincol()
-	let start = localtime()
-	let keyword = GrepBuffer(g:howm_clink_pattern, '', 0, 0)
-	let end = localtime()
-	" 検索時間表示
-	call HowmDebugLog('UpdateKeyword:'.(end - start).'[mSec]')
-
-	" 新たなキーワード候補を 1 つずつ検証
-	let newKeyword = ''
-	while keyword != ''
-		let pos = match(keyword, "\<NL>")
-		let word = strpart(keyword, 0, pos)
-    let word = matchstr(word, '\('.g:howm_clink_pattern.'\s*\)\@<=\S.*\(\s*\)\@=$')
-		let word = HowmEscapeVimPattern(word)
-		let keyword = strpart(keyword, pos + 1)
-		" g:howm_keyword に含まれていないものは
-		" 新たなキーワードとして g:howm_keyword に追加
-		if g:howm_keyword == '' || word !~ '\v('.g:howm_keyword.')'
-			let newKeyword = newKeyword.word."\<NL>"
-			let g:howm_keyword = g:howm_keyword.'|'.word
-		endif
-	endwhile
-  let s:actionlock_pat3 = '\v('.g:howm_keyword.')'
-	setlocal ft=howm_memo
+function! s:UpdateSchedule()
+  let markers = '!@'
+  let markers = markers . (g:howm_ignore_done ? '' : '.')
+  let searchWord = '\[' . s:GetDatePattern(2) . '\][' . markers . ']\d*'
+  let keyword = GrepBuffer(searchWord, '', 1, 1)
+  let file = s:HowmExpand('%:p')
 
-	call s:AddKeyword(newKeyword)
+  if !exists('s:schedule_num') | let s:schedule_num = 0 | endif
 
-" 2005-05-28 木原さんのパッチを適用 begin
-	call s:RestoreWinPos(line, col, winline, wincol)
-endfunction
+  " 同一ファイル名の情報をすべて削除
+  let i = 1
+  while i <= s:schedule_num
+    if s:schedule_file{i} == file
+      let j = i + 1
+      while j <= s:schedule_num
+        let s:schedule_file{j - 1} = s:schedule_file{j}
+        let s:schedule_line{j - 1} = s:schedule_line{j}
+        let s:schedule_content{j - 1} = s:schedule_content{j}
+        let j = j + 1
+      endwhile
+      let s:schedule_num = s:schedule_num - 1
+    else
+      let i = i + 1
+    endif
+  endwhile
 
-" 画面上に表示されているページ内容をスクロールして元の状態に戻す
-function! s:RestoreWinPos(line, col, winline, wincol)
-	call cursor(a:line, a:col)
+  while keyword != ''
+    let pos = match(keyword, "\<NL>")
+    let word = strpart(keyword, 0, pos)
+
+    let s:schedule_num = s:schedule_num + 1
+    let s:schedule_file{s:schedule_num} = file
+    let s:schedule_line{s:schedule_num} = 
+          \ substitute(word, ':\([^:]*\):\(.*\)$', '\1', '')
+    let s:schedule_content{s:schedule_num} = 
+          \ substitute(word, ':\([^:]*\):\(.*\)$', '\2', '')
 
-	let dif = winline() - a:winline
-	if dif > 0
-		let cmd = "\<C-E>"
-	else
-		let cmd = "\<C-Y>"
-	endif
-	let prevdif = dif
-	" wrapされた行があると1回の<C-E>/<C-Y>で複数行スクロールするので、
-	" 行きすぎないように1行ずつスクロールする。
-	" 行きつ戻りつになって収束しない状態になるのはまずいので
-	" スクロール方向が変わったら中断する(元状態後に、前後の行をwrapするくらいの
-	" 長さに書き換えた場合に発生しうるが、まず気にしなくても良さそうではある)
-	while dif * prevdif > 0
-		exe 'normal! '.cmd
-		let prevdif = dif
-		let dif = winline() - a:winline
-		" <C-E>/<C-Y>でカーソル位置が移動しなかった?
-		" 画面の端か、scrolloff設定のスクロール領域の端にぶつかった可能性あり
-		" (a:winline,a:wincolの記録後に'scrolloff'を大きく設定した場合等)
-		if dif == prevdif
-			break
-		endif
-	endwhile
-
-	if !&wrap
-		let dif = wincol() - a:wincol
-		if dif > 0
-			let cmd = 'zl'
-		else
-			let cmd = 'zh'
-		endif
-		let prevdif = dif
-		while dif * prevdif > 0
-			exe 'normal! '.cmd
-			let prevdif = dif
-			let dif = wincol() - a:wincol
-			if dif == prevdif
-				break
-			endif
-		endwhile
-	endif
-
-	" 念のためカーソル位置の最終チェック
-	" ずれていたらwinline,wincolの調整は断念して、カーソル位置だけでも合わせる
-	let line = line('.')
-	let col = col('.')
-	if line != a:line || col != a:col
-		call cursor(a:line, a:col)
-	endif
+    let keyword = strpart(keyword, pos + 1)
+  endwhile
+  call s:SaveSchedule()
 endfunction
-" 2005-05-28 木原さんのパッチを適用 end
 
-" g:howm_keywordfile のファイルに newKeyword で指定された
-" キーワードを追加する。
-"	
-"	- newKeyword 追加されるキーワード
-function s:AddKeyword(newKeyword)
-  call s:OpenWindow(g:howm_keywordfile, 0)
-	let newKeyword = a:newKeyword
-	while newKeyword != ''
-		let pos = match(newKeyword, "\<NL>")
-		let word = strpart(newKeyword, 0, pos)
-		let newKeyword = strpart(newKeyword, pos + 1)
-		call s:HowmAppend(word)
-	endwhile
-	silent! write
-	silent! bdelete
+function! s:SaveSchedule()
+  if !exists('s:schedule_num') | return | endif
+  call s:OpenWindow(g:howm_schedulefile, 0)
+  silent! exe 'g/^/d_'
+  let i = 1
+  while i <= s:schedule_num
+    let line = "'" . s:replace(s:schedule_file{i}, "'", "''") . "'"
+    let line = line . ':' . s:schedule_line{i}
+    let line = line . ':' . s:schedule_content{i}
+    call s:HowmAppend(line)
+    let i = i + 1
+  endwhile
+  silent! write
+  silent! bdelete
 endfunction
+" }}}
 
-function! RevertKeyword()
-  call s:FullTextSearch(g:howm_clink_pattern, 0)
+" keyword {{{
+" s:RebuildKeywordFile()
+" s:LoadKeyword()
+" s:UpdateKeyword()
+" s:RestoreWinPos(line, col, winline, wincol)
+" s:SaveKeyword(newKeyword)
+"
+" g:howm_keywordfile
+"  キーワードを改行で区切って保存したファイル ( のファイル名 )
+" g:howm_keyword
+"  キーワードの \ をエスケープしたものを \| で結合したもの
+" s:actionlock_pat9
+"  '\V\%(' . g:howm_keyword . '\)'
+
+" すべてのファイルを読み、g:howm_keyword を設定し、g:howm_keywordfile に書き込む
+function! s:RebuildKeywordFile()
+  redraw | echo s:prefix_howm . s:msg_wait_rebuild
+  let save_ei = &eventignore
+  let save_lz = &lazyredraw
+  let save_wig = g:howm_wildignore
+  set eventignore=all
+  set lazyredraw
+  let g:howm_wildignore = ''
+  silent! call s:FullTextSearch(g:howm_clink_pattern, 0)
   let lnum = b:searchResultNum
   let i = 1
   let g:howm_keyword = ''
-	let newKeyword = ''
+  let newKeyword = ''
+  let matchstr_pat = g:howm_clink_pattern . '\s*\zs.\{-}\ze\s*$'
   while i <= lnum
-    let word = matchstr(b:content{i}, '\('.g:howm_clink_pattern.'\s*\)\@<=\S.*\(\s*\)\@=$')
-		let word = HowmEscapeVimPattern(word)
-    if g:howm_keyword == '' || word !~ '\v('.g:howm_keyword.')'
-      if g:howm_keyword != ''
-        let g:howm_keyword = g:howm_keyword.'|'
+    let word = matchstr(b:content{i}, matchstr_pat)
+    if g:howm_keyword == '' || word !~ '\V\%(' . g:howm_keyword . '\)'
+      if g:howm_keyword == ''
+        let sep = ''
+      else
+        let sep = '\|'
       endif
-      let g:howm_keyword = g:howm_keyword.word
-			let newKeyword = newKeyword.word."\<NL>"
+      let g:howm_keyword = g:howm_keyword . sep . escape(word, '\')
+      let newKeyword = newKeyword . word . "\<NL>"
     endif
     let i = i + 1
   endwhile
-  call s:SafeClose()
-
-	call delete(expand(g:howm_keywordfile))
-	call s:AddKeyword(newKeyword)
-  
+  call s:CloseSearchWindow()
+  call delete(expand(g:howm_keywordfile))
+  call s:SaveKeyword(newKeyword)
   " TODO:いやだなぁ…
-  let s:actionlock_pat3 = '\v('.g:howm_keyword.')'
+  let s:actionlock_pat9 = '\V\%(' . g:howm_keyword . '\)'
+  let g:howm_wildignore = save_wig
+  let &lazyredraw = save_lz
+  let &eventignore = save_ei
+  redraw | echo s:prefix_howm . s:msg_wait_rebuild . s:msg_done
 endfunction
 
-function! s:ParseKeyword()
+" g:howm_keywordfile を読み、g:howm_keyword と s:actionlock_pat9 を設定する
+function! s:LoadKeyword()
   call s:OpenTemporalWindow(g:howm_keywordfile, 0)
   let lnum = line('$')
   let i = 1
-  let g:howm_keyword=''
+  let g:howm_keyword = ''
   while i <= lnum
-    if i != 1
-      let g:howm_keyword = g:howm_keyword.'|'
+    if i == 1
+      let sep = ''
+    else
+      let sep = '\|'
     endif
-    let g:howm_keyword = g:howm_keyword.getline(i)
+    let g:howm_keyword = g:howm_keyword . sep . getline(i)
     let i = i + 1
   endwhile
   call s:SafeClose()
 
   " TODO:いやだなぁ…
-  let s:actionlock_pat3 = '\v('.g:howm_keyword.')'
+  let s:actionlock_pat9 = '\V\%(' . g:howm_keyword . '\)'
+endfunction
+
+" ファイル内のキーワードを検索し、新たなキーワードがあったら
+" g:howm_keyword と g:howm_keywordfile の内容を更新。
+function! s:UpdateKeyword()
+  let line = line('.')
+  let col = col('.')
+  let winline = winline()
+  let wincol = wincol()
+  let start   = s:getTime()
+  let keyword = GrepBuffer(g:howm_clink_pattern, '', 0, 0)
+  let end     = s:getTime()
+  let time    = s:diffTime(end, start)
+  " 検索時間表示
+  call HowmDebugLog('UpdateKeyword:' . time . '[mSec]')
+
+  " 新たなキーワード候補を 1 つずつ検証
+  let matchstr_pat = g:howm_clink_pattern . '\s*\zs.\{-}\ze\s*$'
+  let newKeyword = ''
+  while keyword != ''
+    let pos = match(keyword, "\<NL>")
+    let word = strpart(keyword, 0, pos)
+    let word = matchstr(word, matchstr_pat)
+    let keyword = strpart(keyword, pos + 1)
+    if g:howm_keyword == '' || word !~ '\V\%(' . g:howm_keyword . '\)'
+      if g:howm_keyword == ''
+        let sep = ''
+      else
+        let sep = '\|'
+      endif
+      let g:howm_keyword = g:howm_keyword . sep . escape(word, '\')
+      let newKeyword = newKeyword . word . "\<NL>"
+    endif
+  endwhile
+  let s:actionlock_pat9 = '\V\%(' . g:howm_keyword . '\)'
+  setlocal ft=howm_memo
+  call s:SaveKeyword(newKeyword)
+  " 2005-05-28 木原さんのパッチを適用 begin
+  call s:RestoreWinPos(line, col, winline, wincol)
+endfunction
+
+" 画面上に表示されているページ内容をスクロールして元の状態に戻す
+function! s:RestoreWinPos(line, col, winline, wincol)
+  call cursor(a:line, a:col)
+
+  let dif = winline() - a:winline
+  if dif > 0
+    let cmd = "\<C-E>"
+  else
+    let cmd = "\<C-Y>"
+  endif
+  let prevdif = dif
+  " wrapされた行があると1回の<C-E>/<C-Y>で複数行スクロールするので、
+  " 行きすぎないように1行ずつスクロールする。
+  " 行きつ戻りつになって収束しない状態になるのはまずいので
+  " スクロール方向が変わったら中断する(元状態後に、前後の行をwrapするくらいの
+  " 長さに書き換えた場合に発生しうるが、まず気にしなくても良さそうではある)
+  while dif * prevdif > 0
+    exe 'normal! ' . cmd
+    let prevdif = dif
+    let dif = winline() - a:winline
+    " <C-E>/<C-Y>でカーソル位置が移動しなかった?
+    " 画面の端か、scrolloff設定のスクロール領域の端にぶつかった可能性あり
+    " (a:winline,a:wincolの記録後に'scrolloff'を大きく設定した場合等)
+    if dif == prevdif
+      break
+    endif
+  endwhile
+
+  if !&wrap
+    let dif = wincol() - a:wincol
+    if dif > 0
+      let cmd = 'zl'
+    else
+      let cmd = 'zh'
+    endif
+    let prevdif = dif
+    while dif * prevdif > 0
+      exe 'normal! ' . cmd
+      let prevdif = dif
+      let dif = wincol() - a:wincol
+      if dif == prevdif
+        break
+      endif
+    endwhile
+  endif
+
+  " 念のためカーソル位置の最終チェック
+  " ずれていたらwinline,wincolの調整は断念して、カーソル位置だけでも合わせる
+  let line = line('.')
+  let col = col('.')
+  if line != a:line || col != a:col
+    call cursor(a:line, a:col)
+  endif
+endfunction
+" 2005-05-28 木原さんのパッチを適用 end
+
+" g:howm_keywordfile のファイルに newKeyword で指定された
+" キーワードを追加する。重複の確認は行わない。
+"
+" - newKeyword 追加されるキーワード ( "\<NL>" を区切りとするリスト )
+function! s:SaveKeyword(newKeyword)
+  call s:OpenWindow(g:howm_keywordfile, 0)
+  let newKeyword = a:newKeyword
+  while newKeyword != ''
+    let pos = match(newKeyword, "\<NL>")
+    let word = strpart(newKeyword, 0, pos)
+    let newKeyword = strpart(newKeyword, pos + 1)
+    call s:HowmAppend(word)
+  endwhile
+  silent! write
+  silent! bdelete
 endfunction
 
+" }}}
+
 " filepath を howm のメモファイルとして開く
 " linenum == 0 の時には新しいメモのテンプレートを追加した状態で開く
 " linenum != 0 の時にはその行にキャレットを置いた状態で開く
 function! s:OpenMemo(filepath, linenum)
-	let editing = s:HowmExpand("%:p")
+  let editing = s:HowmExpand("%:p")
   let filepath = s:HowmExpand(a:filepath)
 
-	if editing != filepath
-    let howm_dir = s:HowmExpand(g:howm_dir)
-    let idx = matchend(filepath, howm_dir)
+  if editing != filepath
+    let idx = matchend(filepath, '\V' . escape(s:HowmExpand(g:howm_dir), '\'))
     if idx != -1
-      " 存在しないディレクトリ下のファイルを指定されたら，ディレクトリを作る
-      call s:MakeDirectory(substitute(strpart(filepath, idx), '[^/]*$', '', ''))
-      " TODO:エラー処理
+      let dir = substitute(strpart(filepath, idx), '[^/]*$', '', '')
+      if v:version >= 700 && exists('*mkdir')
+        let dir_fp = s:HowmExpand(g:howm_dir) . dir
+        if !isdirectory(dir_fp)
+          silent! call mkdir(dir_fp, 'p')
+          echo 'mkdir("' . dir_fp. '", "p")'
+        endif
+      else
+        " 存在しないディレクトリ下のファイルを指定されたら，ディレクトリを作る
+        let retval = s:MakeDirectory(dir)
+        if retval != ''
+          let errmsg = s:errmsg_cantmkdir
+          let errmsg = s:replace(errmsg, '%dir%', dir)
+          let errmsg = s:prefix_howm . errmsg
+          redraw | echohl WarningMsg | echomsg errmsg | echohl None
+          return
+        endif
+      endif
     endif
     call s:OpenWindow(a:filepath, 1)
-	endif
-	if a:linenum == 0
+  endif
+  if a:linenum == 0
     " 新しいメモのテンプレートを追加
-		call s:HowmAppend(g:howm_title_pattern.' ')
-		if editing != '' && editing != filepath && match(s:HowmExpand("%:p:t"), s:prefix_howm) != 0
-			call s:HowmAppend(s:GetTimeStamp(0).' '.g:howm_glink_pattern.' '.editing)
-		else
-			call s:HowmAppend(s:GetTimeStamp(0))
-		endif
-		call s:HowmAppend('')
-		call cursor(line('$') - 2, col('$'))
-		startinsert!
-	elseif a:linenum > 0
+    call s:HowmAppend(g:howm_title_pattern . ' ')
+    if exists('g:howm_append_editing') && g:howm_append_editing &&
+          \ editing != '' && editing != filepath &&
+          \ match(s:HowmExpand("%:p:t"), s:prefix_howm) != 0
+      let line = s:GetTimeStamp(0) . ' ' . g:howm_glink_pattern . ' ' . editing
+    else
+      let line = s:GetTimeStamp(0)
+    endif
+    call s:HowmAppend(line)
+    call s:HowmAppend('')
+    call cursor(line('$') - 2, col('$'))
+    startinsert!
+  elseif a:linenum > 0
     " 指定行へ飛ぶ
     call cursor(a:linenum, '1')
-	endif
+  endif
   normal! zz
 endfunction
 
+" type:
+"   menu
+"   search
+"   preview
+function! s:SetHowmBuftype(type)
+  if a:type !~# '\%(menu\|search\|preview\)' | return | endif
+  let b:howm_buftype = a:type
+endfunction
+
+" return:
+"   menu
+"   search
+"   preview
+function! s:GetHowmBuftype()
+  return getbufvar(bufnr('%'), 'howm_buftype')
+endfunction
+
+function! s:GetFile(line)
+  let l = a:line
+  if s:GetHowmBuftype() == 'menu'
+    if 2 + 1 < l && l <= 2 + 1 + b:schedule_count
+      if exists('b:schedule_file' . (l - (2 + 1)))
+        return b:schedule_file{l - (2 + 1)}
+      else
+        return ''
+      endif
+    elseif 2 + 1 + b:schedule_count + 1 < l &&
+          \ l <= 2 + 1 + b:schedule_count + 1 + b:todo_count
+      if exists('b:todo_file' . (l - (2 + 1 + b:schedule_count + 1)))
+        return b:todo_file{l - (2 + 1 + b:schedule_count + 1)}
+      else
+        return ''
+      endif
+    else
+      return ''
+    endif
+  else
+    if exists('b:file' . l)
+      return b:file{l}
+    else
+      return ''
+    endif
+  endif
+endfunction
+
+function! s:GetLine(line)
+  let l = a:line
+  if s:GetHowmBuftype() == 'menu'
+    if 2 + 1 < l && l <= 2 + 1 + b:schedule_count
+      if exists('b:schedule_line' . (l - (2 + 1)))
+        return b:schedule_line{l - (2 + 1)}
+      else
+        return ''
+      endif
+    elseif 2 + 1 + b:schedule_count + 1 < l &&
+          \ l <= 2 + 1 + b:schedule_count + 1 + b:todo_count
+      if exists('b:todo_line' . (l - (2 + 1 + b:schedule_count + 1)))
+        return b:todo_line{l - (2 + 1 + b:schedule_count + 1)}
+      else
+        return ''
+      endif
+    else
+      return ''
+    endif
+  else
+    if exists('b:line' . l)
+      return b:line{l}
+    else
+      return ''
+    endif
+  endif
+endfunction
+
+" qtype:
+"  - 1: regexp(grep)
+"  - 2: regexp(Vim)
+function! s:GetDatePattern(qtype)
+  let dp = g:howm_date_pattern
+  if a:qtype == 1
+    let dp = s:replace(dp, '%Y', '[0-9]{4}')
+    let dp = s:replace(dp, '%m', '[0-9]{2}')
+    let dp = s:replace(dp, '%d', '[0-9]{2}')
+  elseif a:qtype == 2
+    let dp = s:replace(dp, '%Y', '\d\{4}')
+    let dp = s:replace(dp, '%m', '\d\{2}')
+    let dp = s:replace(dp, '%d', '\d\{2}')
+  else
+    let dp = s:replace(dp, '%Y', '[0-9]{4}')
+    let dp = s:replace(dp, '%m', '[0-9]{2}')
+    let dp = s:replace(dp, '%d', '[0-9]{2}')
+  endif
+  return dp
+endfunction
+
+function! s:OpenMenuLine(bOpenWindow, bClosePreviewWindow)
+  let lnum = line('.')
+  if lnum > 3
+    return s:OpenSearchLine(a:bOpenWindow, a:bClosePreviewWindow)
+  else
+    if lnum == 1 || lnum == 2
+      " '[新規] 検索([固定] [正規] [Vim] [roma])'
+      " '[一覧] [予定] [Todo]'
+      let word = ''
+      let line = getline('.')
+      let idx_c = col('.') - 1
+      let idx_s = match(line, '\V[\.\{-}]')
+      while idx_s != -1
+        let idx_e = matchend(line, '\V[\.\{-}]')
+        if idx_s <= idx_c && idx_c < idx_e
+          let word = strpart(line, idx_s, idx_e - idx_s)
+          break
+        endif
+        let idx_c = idx_c - (idx_e + 1)
+        let line = strpart(line, idx_e + 1)
+        let idx_s = match(line, '\[.\{-}\]')
+      endwhile
+      " echo word
+      if word == '[新規]'
+        call HowmCommand('OpenMemo')
+      elseif word == '[固定]'
+        call HowmCommand('FullTextSearchInputFgrep')
+      elseif word == '[正規]'
+        call HowmCommand('FullTextSearchInputEgrep')
+      elseif word == '[Vim]'
+        call HowmCommand('FullTextSearchInputVgrep')
+      elseif word == '[roma]'
+        call HowmCommand('FullTextSearchInputMigemo')
+      elseif word == '[一覧]'
+        call HowmCommand('ShowDirectory')
+      elseif word == '[予定]'
+        call HowmCommand('ShowSchedule')
+      elseif word == '[Todo]'
+        call HowmCommand('ShowTodo')
+      elseif word == '[menu更新]'
+        call HowmCommand('ShowMenu')
+      endif
+    endif
+  endif
+endfunction
+
+" type:
+"   menu
+"   search
+"   preview
+function! s:OpenWindow2(type)
+  if a:type !~# '\%(menu\|search\|preview\)' | return 0 | endif
+  if &encoding != g:howm_fileencoding && !has('iconv')
+    " TODO:エラーメッセージ
+    return 0
+  endif
+  let searchbufname  = s:prefix_howm . s:buftitle_ftresult
+  let menubufname    = s:prefix_howm . s:buftitle_menu
+  let previewbufname = s:prefix_howm . s:buftitle_preview
+  if a:type == 'menu'
+    let bufname = menubufname
+  elseif a:type == 'search'
+    let bufname = searchbufname
+  elseif a:type == 'preview'
+    let bufname = previewbufname
+  endif
+  let winnr = bufwinnr(escape(bufname, ' '))
+  if winnr != -1
+    execute winnr . 'wincmd w'
+    let save_ei = &eventignore
+    set eventignore=BufDelete
+    enew
+    let &eventignore = save_ei
+  else
+    wincmd b
+  endif
+  if s:HowmExpand('%:p') == '' && !&modified && !has('vim_starting')
+    let cmd = 'edit'
+  else
+    let cmd = 'belowright new'
+    if a:type == 'menu'
+      " let cmd = 'belowright new'
+    elseif a:type == 'search'
+      if s:GetHowmBuftype() == 'menu'
+        let cmd = 'aboveleft new'
+      endif
+    elseif a:type == 'preview'
+      let cmd = 'aboveleft new'
+      let winnr = bufwinnr(escape(searchbufname, ' '))
+      if winnr != -1
+        execute winnr . 'wincmd w'
+      else
+        let winnr = bufwinnr(escape(menubufname, ' '))
+        if winnr != -1
+          execute winnr . 'wincmd w'
+        endif
+      endif
+    endif
+  endif
+  let opt = '++enc=' . g:howm_fileencoding . ' ++ff=' . g:howm_fileformat
+  silent execute cmd opt escape(bufname, ' ')
+  call s:SetHowmBuftype(a:type)
+  setlocal bt=nofile bh=delete noswf
+  if a:type == 'menu'
+    setlocal nowrap filetype=howm_importantdate
+    nnoremap <silent> <buffer> <CR> :call <SID>OpenMenuLine(0, 1)<CR>
+    nnoremap <silent> <buffer> <S-CR> :call <SID>OpenMenuLine(1,1)<CR>
+    nnoremap <silent> <buffer> j j:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> k k:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> <Down> <Down>:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> <Up> <Up>:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> p :call <SID>ShowPreview()<CR>
+    nnoremap <silent> <buffer> P :call <SID>ToggleAutoShowPreview()<CR>
+    nmap <silent> <buffer> r <Plug>HOWM_ShowMenu
+    nnoremap <silent> <buffer> q :close<CR>
+    let i = 1
+    while i <= 2
+      let pat = '\(\%' . i . 'l\)\@<=\[.\{-}\]'
+      exe 'syntax match howmMenuLink ''' . pat . ''' display'
+      let i = i + 1
+    endwhile
+    hi def link howmMenuLink Underlined
+  elseif a:type == 'search'
+    setlocal nowrap
+    nnoremap <silent> <buffer> <CR> :call <SID>OpenSearchLine()<CR>
+    nnoremap <silent> <buffer> <S-CR> :call <SID>OpenSearchLine(1, 1)<CR>
+    nnoremap <silent> <buffer> j j:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> k k:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> <Down> <Down>:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> <Up> <Up>:call <SID>HidePreview()<CR>
+    nnoremap <silent> <buffer> p :call <SID>ShowPreview()<CR>
+    nnoremap <silent> <buffer> P :call <SID>ToggleAutoShowPreview()<CR>
+    nnoremap <silent> <buffer> @ :call <SID>ShowSummary()<CR>
+    nnoremap <silent> <buffer> <S-s> :call <SID>Sort2('input', '')<CR>
+    nnoremap <silent> <buffer> <S-r>
+          \ :call <SID>Sort2('reverse', '')<CR>
+          \ :call <SID>FormatSearchResult()<CR>
+    if v:version >= 700
+      nnoremap <silent> <buffer> i :call <SID>ShowSearchInfo()<CR>
+    endif
+    nnoremap <silent> <buffer> q :close<CR>
+  elseif a:type == 'preview'
+    nnoremap <silent> <buffer> q :close<CR>
+  endif
+endfunction
+
+function! s:ShowMenu()
+  " OpenMenuWindow
+  call s:OpenWindow2('menu')
+  " Search & Parse
+  " b:schedule_(count|file|line|content)
+  " b:todo_(count|file|line|content)
+  " TODO:regexp(Vim)固定を止める
+  let p = g:howm_date_pattern
+  let d = localtime()
+  let t = 86400
+  let markers = '@!' . (g:howm_ignore_done ? '' : '.')
+  if s:enable_vimgrep
+    let query = '\V[\%('
+    let query = query . '\%(' . escape(strftime(p, d + t * 0), '\') . '\)\|'
+    let query = query . '\%(' . escape(strftime(p, d + t * 1), '\') . '\)\|'
+    let query = query . '\%(' . escape(strftime(p, d + t * 2), '\') . '\)\|'
+    let query = query . '\%(' . escape(strftime(p, d + t * 3), '\') . '\)\|'
+    let query = query . '\%(' . escape(strftime(p, d + t * 4), '\') . '\)\|'
+    let query = query . '\%(' . escape(strftime(p, d + t * 5), '\') . '\)\|'
+    let query = query . '\%(' . escape(strftime(p, d + t * 6), '\') . '\)\)'
+    let query = query . ']\[' . markers . ']'
+    let qtype = 2
+  else
+    let query = '\[('
+    let query = query . '(' . strftime(p, d + t * 0) . ')|'
+    let query = query . '(' . strftime(p, d + t * 1) . ')|'
+    let query = query . '(' . strftime(p, d + t * 2) . ')|'
+    let query = query . '(' . strftime(p, d + t * 3) . ')|'
+    let query = query . '(' . strftime(p, d + t * 4) . ')|'
+    let query = query . '(' . strftime(p, d + t * 5) . ')|'
+    let query = query . '(' . strftime(p, d + t * 6) . '))'
+    let query = query . '\][' . markers . ']'
+    let qtype = 1
+  endif
+  let b:schedule_count = 0
+  if s:ParseSearchResult(s:Search2('grep', query, qtype)) > 0
+    let pat = '\[' . s:pattern_date . '\][@!]'
+    let b:schedule_count = b:searchResultNum
+    let i = 1
+    while i <= b:schedule_count
+      let b:content{i} = strpart(b:content{i}, match(b:content{i}, pat))
+      let i = i + 1
+    endwhile
+    call s:Sort2('content', '')
+    let i = 1
+    while i <= b:schedule_count
+      let b:schedule_file{i} = b:file{i}
+      let b:schedule_line{i} = b:line{i}
+      let b:schedule_content{i} = b:content{i}
+      let i = i + 1
+    endwhile
+  endif
+  let markers = '-!+' . (g:howm_ignore_done ? '' : '.')
+  if s:enable_vimgrep
+    let qtype = 2
+    let query = '\[' . s:GetDatePattern(qtype) . '\][' . markers . ']\d*'
+  else
+    let qtype = 1
+    let query = '\[' . s:GetDatePattern(qtype) . '\][' . markers . '][0-9]*'
+  endif
+  let b:todo_count = 0
+  if s:ParseSearchResult(s:Search2('grep', query, qtype)) > 0
+    let pat = '\[' . s:pattern_date . '\]'
+    let b:todo_count = b:searchResultNum
+    let i = 1
+    while i <= b:todo_count
+      let b:content{i} = strpart(b:content{i}, match(b:content{i}, pat))
+      let i = i + 1
+    endwhile
+    call s:Sort2('priority', '')
+    let i = 1
+    while i <= b:todo_count && i <= 50
+      let b:todo_file{i} = b:file{i}
+      let b:todo_line{i} = b:line{i}
+      let b:todo_content{i} = b:content{i}
+      let i = i + 1
+    endwhile
+  endif
+
+  " FormatSearchResult
+  "* 一覧
+  "  MG [一覧] (C-c , a) → ★ 全てのメモ一覧
+  "  MG [最近] (C-c , l) → ★ 最近のメモの連結表示( 最近 n 日を指定可能 )
+  "  ML [前後] (C-c , A) → 　 前後のメモの一覧 (見てたメモを中心に全メモの日付順一覧)
+  "  MG [予定] (C-c , y) → ★ 予定の一覧
+  "  MG [Todo] (C-c , t) → ★ Todoの一覧
+  "  MG [今日] (C-c , .) → ★ 今日のメモ一覧( n 日前を指定可能 )
+  "  MG [昨日] (C-c , :) → ★ 昨日のメモ一覧( n 日前を指定可能 )
+  "  MG [履歴] (C-c , h) → ★ 検索履歴の一覧
+  "* 特別
+  "  ML [menu 更新] (R) → メニューの予定表などを更新
+  "  ML [menu 編集] ( ) → メニューを編集
+  "  MG [全消]      (C-c , Q) → ★ howm-mode なバッファをすべて消す (未保存は除く)
+  " call append(0, '[新規] 検索([固定] [正規] [Vim] [roma]) [複製] [題↑] [名↑] [日↓] [鍵↓] [更新]')
+  " call append(1, '[今日] [昨日] [一覧] [最近] [予定] [Todo] [menu更新]')
+  " call append(0, '[新規] 検索([固定] [正規] [Vim] [roma])')
+  " call append(1, '[一覧] [予定] [Todo] [menu更新]')
+  if s:enable_vimgrep
+    call s:HowmAppend('[新規] 検索([固定] [正規] [Vim] [roma])')
+  else
+    call s:HowmAppend('[新規] 検索([固定] [正規] [roma])')
+  endif
+  call s:HowmAppend('[一覧] [予定] [Todo] [menu更新]')
+  let sep = '------------------------------------------------------------'
+  call s:HowmAppend(sep)
+  redraw | echo s:prefix_howm . s:msg_wait_format
+  setlocal modifiable
+  let i = 1
+  while i <= b:schedule_count
+    call s:HowmAppend(b:schedule_content{i})
+    let i = i + 1
+  endwhile
+  call s:HowmAppend(sep)
+  let i = 1
+  while i <= b:todo_count && i <= 50
+    call s:HowmAppend(b:todo_content{i})
+    let i = i + 1
+  endwhile
+  call s:HowmAppend(sep)
+  setlocal nomodifiable
+  redraw | echo s:prefix_howm . s:msg_wait_format . s:msg_done
+  call cursor(1, 1)
+  call s:SyntaxMatchToday(strftime(g:howm_date_pattern))
+endfunction
+
+" today_s:
+"  基準日を表す文字列 ( g:howm_date_pattern に従っていること )
+function! s:SyntaxMatchToday(today_s)
+  let today_s = a:today_s
+  let today = HowmDate2Int(today_s, g:howm_date_pattern)
+  " 719527 = HowmDate2Int('1970-01-01', '%Y-%m-%d')
+  let today_i = (today - 719527) * 86400
+  let today_pat = '\%(\[' .
+        \ strftime(g:howm_date_pattern, today_i) .
+        \ '\][-!@+.]\d*\)\@<=.*$'
+  let tomorrow_pat = '\%(\[' .
+        \ strftime(g:howm_date_pattern, today_i + 86400) .
+        \ '\][-!@+.]\d*\)\@<=.*$'
+  exe 'syntax match howmToday display "' . today_pat . '"'
+  exe 'syntax match howmTomorrow display "' . tomorrow_pat . '"'
+endfunction
+
 function! s:RemoveEmpty(file)
   if &ft == 'howm_memo' && g:howm_removeEmpty == 1 && getfsize(a:file) == 0
     call delete(a:file)
   endif
 endfunction
 
-" g:howm_dir.str のディレクトリを作る．
+" g:howm_dir . str のディレクトリを作る．
 function! s:MakeDirectory(str)
-  if isdirectory(s:HowmExpand(g:howm_dir).a:str) || a:str == ""
+  if isdirectory(s:HowmExpand(g:howm_dir) . a:str) || a:str == ""
     let retval = ""
   elseif a:str !~ "/$"
     " TODO:変数に…
@@ -446,17 +1235,17 @@
   else
     let retval = s:MakeDirectory(substitute(a:str, '[^/]*/$', '', ''))
     if retval == ""
-      let path = s:HowmExpand(g:howm_dir).a:str
+      let path = s:HowmExpand(g:howm_dir) . a:str
       " TODO:ホントにこれで大丈夫なのかなぁ…？
       if has('win32') && system("echo $OSTYPE") !~ 'cygwin'
-        let path = '"'.substitute(path, '/', '\\', 'g').'"'
+        let path = '"' . substitute(path, '/', '\\', 'g') . '"'
       endif
       " TODO:Windows と UNIX 系以外でもこれでいけるのか？
       if path =~# '\\$'
         let path = strpart(path, 0, strlen(path) - 1)
       endif
-      echo "mkdir ".path
-      let retval = system("mkdir ".path)
+      echo "mkdir " . path
+      let retval = system("mkdir " . path)
     endif
   endif
   return retval
@@ -465,105 +1254,183 @@
 " 今日の日付から offset 日だけずれた日付に対応した howm ファイルのパスを返
 " す．
 function! s:GetFilePath(offset)
-	let time = localtime() + a:offset * 86400
+  let time = localtime() + a:offset * 86400
   let howm_dir = s:HowmExpand(g:howm_dir)
-	return s:HowmExpand(howm_dir.strftime(g:howm_filename, time))
+  return s:HowmExpand(howm_dir . strftime(g:howm_filename, time))
 endfunction
 
 function! s:GetTimeStamp(bDateOnly)
-  if a:bDateOnly
-    return strftime("[".g:howm_date_pattern."]")
-  else
-    return strftime("[".g:howm_date_pattern." %H:%M]")
-  endif
-endfunction
-
-" TODO: 引数を考え直した方がいいかも
-function! s:FullTextSearch(searchWord, bRegexp)
-  if a:searchWord != ''
-    call s:OpenSearchWindow(a:searchWord)
-    let path = s:HowmExpand(a:searchWord)
-    if !filereadable(path) || isdirectory(path)
-      let path = ''
-    endif
-    if s:ParseSearchResult(s:GrepSearch(b:searchWord, a:bRegexp)) > 0 || path != ''
-      call s:SortByMtime()
-      " 検索語にマッチするファイルがある場合
-      " TODO:汚いなぁ…
-      if path != ''
-        let i = b:searchResultNum
-        while i >= 1
-          let b:file{i + 1} = b:file{i}
-          let b:line{i + 1} = b:line{i}
-          let b:content{i + 1} = b:content{i}
-          let i = i - 1
-        endwhile
-        let b:file1 = path
-        let b:line1 = 0
-        let b:content1 = ""
-        let b:searchResultNum = b:searchResultNum + 1
-      endif
-      call s:FormatSearchResult()
-      call cursor(1, 1)
-      let retval = 1
-    else
-      redraw!
-      echo s:prefix_howm.s:msg_ftnomatch
-      call s:SafeClose()
-      let retval = 0
-    endif
+  if a:bDateOnly
+    return strftime("[" . g:howm_date_pattern . "]")
   else
-    let retval = 0
+    return strftime("[" . g:howm_date_pattern . " %H:%M]")
   endif
+endfunction
 
+" qtype: query の種類
+"  0: 固定文字列
+"  1: 正規表現 ( grep )
+"  2: 正規表現 ( Vim )
+"  3: migemo
+function! s:FullTextSearch(query, qtype)
+  let start  = s:getTime()
+  let retval = s:Search3('grep', a:query, a:qtype, 'mtime', '', '', '')
+  let end    = s:getTime()
+  let time   = s:diffTime(end, start)
+  let log = 'FullTextSearch: Search3() type=' . a:qtype . ' time=' . time
+  call HowmDebugLog(log)
+  if retval
+    execute 'nnoremap <silent> <buffer> r :call <SID>FullTextSearch(''' .
+          \ s:replace(a:query, "'", "''") . ''', ' . a:qtype . ')<CR>'
+  endif
   return retval
 endfunction
 
 " ユーザから検索語を受け取り，全文検索を行う．
-" s:fulltext_prompt を使うのでいちいち関数を作った．
-function! s:FullTextSearchInput(searchType)
-  if a:searchType == 'egrep'
-    let searchWord = input(s:prefix_howm.s:prompt_search_egrep)
-    call s:FullTextSearch(searchWord, 1)
-  elseif a:searchType == 'fgrep'
-    let searchWord = input(s:prefix_howm.s:prompt_search_fgrep)
-    call s:FullTextSearch(searchWord, 0)
+" s:prompt_search_* を使うのでいちいち関数を作った．
+" searchType:
+"  - fgrep
+"  - egrep
+"  - vgrep
+"  - migemo
+function! s:FullTextSearchInput(searchType, ...)
+  let searchWord = exists('a:1') ? a:1 : ''
+  let searchWordType = 0
+  if a:searchType == 'fgrep'
+    if searchWord == ''
+      let searchWord = input(s:prefix_howm . s:prompt_search_fgrep)
+    endif
+    let searchWordType = 0
+  elseif a:searchType == 'egrep'
+    if searchWord == ''
+      let searchWord = input(s:prefix_howm . s:prompt_search_egrep)
+    endif
+    let searchWordType = 1
+  elseif a:searchType == 'vgrep'
+    if searchWord == ''
+      let searchWord = input(s:prefix_howm . s:prompt_search_vgrep)
+    endif
+    let searchWordType = 2
   elseif a:searchType == 'migemo'
-    if !executable(g:howm_migemoprg)
-      " TODO: エラーメッセージ
+    if !executable(g:howm_migemoprg) && !s:enable_migemo
+      call HowmDebugLog('FullTextSearchInput:Can^t Execute g:howm_migemoprg=' .
+            \ g:howm_migemoprg)
+      let errmsg = s:errmsg_inexecutable
+      let errmsg = s:replace(errmsg, '%prg%', g:howm_migemoprg)
+      let errmsg = s:replace(errmsg, '%var%', 'howm_migemoprg')
+      let errmsg = s:prefix_howm . errmsg
+      redraw | echohl WarningMsg | echomsg errmsg | echohl None
       return
     endif
-    let searchWord = input(s:prefix_howm.s:prompt_search_migemo)
-    let searchWord = system("echo ".searchWord." | ".g:howm_migemoprg." ".g:howm_migemoopt)
-    let searchWord = substitute(searchWord, "\\(\<CR>\\|\<NL>\\)", '', 'g')
-    call s:FullTextSearch(searchWord, 1)
+    if searchWord == ''
+      let searchWord = input(s:prefix_howm . s:prompt_search_migemo)
+    endif
+    " 2文字以上 && ASCII の印字可能文字 ( 0x20-0x7e ) のみで構成される
+    " cpoptions に l があると /\[] 内で \ が使えない
+    try
+      let save_cpo = &cpoptions
+      set cpoptions&vim
+      " [\x1a] は version7 から
+      " if searchWord !~ '^[\x20-\x7e]\{2,}$'
+      if searchWord !~ '^[ -~]\{2,}$'
+        let errmsg = s:prefix_howm . s:errmsg_migemo
+        redraw | echohl WarningMsg | echomsg errmsg | echohl None
+        return
+      endif
+    finally
+      if exists('save_cpo') | let &cpoptions = save_cpo | endif
+    endtry
+    let searchWordType = 3
   else
-    " TODO: エラーメッセージ
+    " TODO:エラーメッセージ
     return
   endif
+  call s:FullTextSearch(searchWord, searchWordType)
 endfunction
 
-function! s:ShowSchedule()
-  if g:howm_reminder_old_format != 0
-    return s:ShowScheduleOld()
-  endif
+function! s:ShowSchedule(...)
+  " if 0
+  "   " TODO:スケジュールファイルを利用した高速化のテスト
+  "   if !exists('s:schedule_num') | call s:LoadSchedule() | endif
+  "   if s:schedule_num == 0 | call s:RebuildScheduleFile() | endif
+  "   if !exists('g:howm_test_schedule') | let g:howm_test_schedule = 1 | endif
+  "   call s:OpenWindow2('search')
+  "   let i = 1
+  "   while i <= s:schedule_num
+  "     let b:file{i} = s:schedule_file{i}
+  "     let b:line{i} = s:schedule_line{i}
+  "     let b:content{i} = s:schedule_content{i}
+  "     let i = i + 1
+  "   endwhile
+  "   let b:searchResultNum = i - 1
+
+  "   call s:ShowScheduleParse()
+
+  "   call s:Sort2('content', '')
+
+  "   call s:FormatSearchResult()
+
+  "   let lnum = 1
+  "   if exists('a:1') && (
+  "         \ ((searchWordType == 1) && (a:1 =~ '\v' . pattern_date)) ||
+  "         \ ((searchWordType == 2) && (a:1 =~ pattern_date))
+  "         \ )
+  "     let today_s = a:1
+  "   else
+  "     let today_s = strftime(g:howm_date_pattern)
+  "   endif
+  "   let today = HowmDate2Int(today_s, g:howm_date_pattern)
+  "   let day = s:GetDaysFromContent(b:content{lnum})
+  "   while today > day && lnum < b:searchResultNum
+  "     let lnum = lnum + 1
+  "     let day = s:GetDaysFromContent(b:content{lnum})
+  "   endwhile
+  "   call cursor(lnum, 1)
+  "   normal! zz
+
+  "   setlocal filetype=howm_importantdate
+  "   if exists('a:1') && (
+  "         \ ((searchWordType == 1) && (a:1 =~ '\v' . pattern_date)) ||
+  "         \ ((searchWordType == 2) && (a:1 =~ pattern_date))
+  "         \ )
+  "     let today_s = a:1
+  "   else
+  "     let today_s = strftime(g:howm_date_pattern)
+  "   endif
+  "   call s:SyntaxMatchToday(today_s)
+  "   return
+  " endif
+
   " grep 検索用のパターンを生成
-  let pattern_date      = g:howm_date_pattern
-  let pattern_date      = substitute(pattern_date, '%Y', '[0-9]{4}', '')
-  let pattern_date      = substitute(pattern_date, '%m', '[0-9]{2}', '')
-  let pattern_date      = substitute(pattern_date, '%d', '[0-9]{2}', '')
-  call s:OpenSearchWindow('')
-  if s:ParseSearchResult(s:GrepSearch('\['.pattern_date.'\][!@.][0-9]*', 1)) != 0
-    setlocal filetype=howm_importantdate
-    let i = 1
-    while i <= b:searchResultNum
-      let b:content{i} = strpart(b:content{i}, match(b:content{i}, '\['.s:pattern_date.'\][!@.]'))
-      let i = i + 1
-    endwhile
-    call s:SortByContent()
-    call s:FormatSearchResult()
-    let today = HowmDate2Int(strftime(g:howm_date_pattern), g:howm_date_pattern)
+  let markers = '!@'
+  let markers = markers . (g:howm_ignore_done ? '' : '.')
+  if s:enable_vimgrep
+    let searchWordType = 2
+    let pattern_date = s:GetDatePattern(searchWordType)
+    let searchWord = '\[' . pattern_date . '\][' . markers . ']\d*'
+  else
+    let searchWordType = 1
+    let pattern_date = s:GetDatePattern(searchWordType)
+    let searchWord = '\[' . pattern_date . '\][' . markers . '][0-9]*'
+  endif
+  let start  = s:getTime()
+  let retval = s:Search3('grep', searchWord, searchWordType, 'content', '', '',
+        \ 's:ShowScheduleParse')
+  let end    = s:getTime()
+  let time   = s:diffTime(end, start)
+  let log = 'ShowSchedule: Search3() type=' . searchWordType . ' time=' . time
+  call HowmDebugLog(log)
+  if retval
     let lnum = 1
+    if exists('a:1') && (
+          \ ((searchWordType == 1) && (a:1 =~ '\v' . pattern_date)) ||
+          \ ((searchWordType == 2) && (a:1 =~ pattern_date))
+          \ )
+      let today_s = a:1
+    else
+      let today_s = strftime(g:howm_date_pattern)
+    endif
+    let today = HowmDate2Int(today_s, g:howm_date_pattern)
     let day = s:GetDaysFromContent(b:content{lnum})
     while today > day && lnum < b:searchResultNum
       let lnum = lnum + 1
@@ -571,55 +1438,74 @@
     endwhile
     call cursor(lnum, 1)
     normal! zz
-    let retval = 1
-  else
-    redraw!
-    echo s:prefix_howm.s:msg_ftnomatch
-    call s:SafeClose()
-    let retval = 0
-  endif
 
+    nmap <silent> <buffer> r <Plug>HOWM_ShowSchedule
+    setlocal filetype=howm_importantdate
+    if exists('a:1') && (
+          \ ((searchWordType == 1) && (a:1 =~ '\v' . pattern_date)) ||
+          \ ((searchWordType == 2) && (a:1 =~ pattern_date))
+          \ )
+      let today_s = a:1
+    else
+      let today_s = strftime(g:howm_date_pattern)
+    endif
+    call s:SyntaxMatchToday(today_s)
+  endif
   return retval
 endfunction
 
 function! s:ShowTodo()
-  if g:howm_reminder_old_format != 0
-    return s:ShowTodoOld()
-  endif
   " grep 検索用のパターンを生成
-  let pattern_date      = g:howm_date_pattern
-  let pattern_date      = substitute(pattern_date, '%Y', '[0-9]{4}', '')
-  let pattern_date      = substitute(pattern_date, '%m', '[0-9]{2}', '')
-  let pattern_date      = substitute(pattern_date, '%d', '[0-9]{2}', '')
-  call s:OpenSearchWindow('')
-  if s:ParseSearchResult(s:GrepSearch('\['.pattern_date.'\][-!+.][0-9]*', 1)) != 0
+  let markers = '-!+'
+  let markers = markers . (g:howm_ignore_done ? '' : '.')
+  if s:enable_vimgrep
+    let searchWordType = 2
+    let pattern_date = s:GetDatePattern(searchWordType)
+    let searchWord = '\[' . pattern_date . '\][' . markers . ']\d*'
+  else
+    let searchWordType = 1
+    let pattern_date = s:GetDatePattern(searchWordType)
+    let searchWord = '\[' . pattern_date . '\][' . markers . '][0-9]*'
+  endif
+  let start  = s:getTime()
+  let retval = s:Search3('grep', searchWord, searchWordType, 'priority', '',
+        \ '', 's:ShowTodoParse')
+  let end    = s:getTime()
+  let time   = s:diffTime(end, start)
+  let log = 'ShowTodo: Search3() type=' . searchWordType . ' time=' . time
+  call HowmDebugLog(log)
+  if retval
+    nmap <silent> <buffer> r <Plug>HOWM_ShowTodo
     setlocal filetype=howm_importantdate
-    let i = 1
-    while i <= b:searchResultNum
-      let b:content{i} = strpart(b:content{i}, match(b:content{i}, '\['.s:pattern_date.'\]'))
-      let i = i + 1
-    endwhile
-    call s:SortByPriority()
-    call s:FormatSearchResult()
-    call cursor(1, 1)
-    let retval = 1
-  else
-    redraw!
-    echo s:prefix_howm.s:msg_ftnomatch
-    call s:SafeClose()
-    let retval = 0
   endif
-
   return retval
 endfunction
 
+function! s:ShowScheduleParse()
+  let pat = '\[' . s:GetDatePattern(2) . '\][!@.]'
+  let i = 1
+  while i <= b:searchResultNum
+    let b:content{i} = strpart(b:content{i}, match(b:content{i}, pat))
+    let i = i + 1
+  endwhile
+endfunction
+
+function! s:ShowTodoParse()
+  let pat = '\[' . s:GetDatePattern(2) . '\]'
+  let i = 1
+  while i <= b:searchResultNum
+    let b:content{i} = strpart(b:content{i}, match(b:content{i}, pat))
+    let i = i + 1
+  endwhile
+endfunction
+
 " 通常ウィンドウを開く
 " TODO:通常ウィンドウとは？作業用ウィンドウとは？
 function! s:OpenWindow(filepath, bEliminateDup)
-	if &encoding != g:howm_fileencoding && !has('iconv')
+  if &encoding != g:howm_fileencoding && !has('iconv')
     " TODO:エラーメッセージ
     return 0
-	endif
+  endif
   if a:bEliminateDup
     call s:EliminateWindow(a:filepath)
   endif
@@ -629,23 +1515,84 @@
     let cmd = "new"
   endif
   " TODO:文字コード固定で開くかどうかフラグで判定する
-" 2005-05-28 木原さんのパッチを適用 begin
-	silent exe cmd.' ++enc='.g:howm_fileencoding.' ++ff='.g:howm_fileformat.' '.a:filepath
-" 2005-05-28 木原さんのパッチを適用 end
+  " 2005-05-28 木原さんのパッチを適用 begin
+  let plus_cmd = '++enc=' . g:howm_fileencoding . ' ' .
+        \ '++ff=' . g:howm_fileformat
+  silent exe cmd plus_cmd a:filepath
+  " 2005-05-28 木原さんのパッチを適用 end
+endfunction
+
+" preview window は一つのみという設定
+function! s:ClosePreviewWindow()
+  let prvbuf = s:prefix_howm . s:buftitle_preview
+  let srcbuf = s:prefix_howm . s:buftitle_ftresult
+  let mnubuf = s:prefix_howm . s:buftitle_menu
+  let bufnr = bufnr('%')
+  let winnr = bufwinnr(escape(prvbuf, ' '))
+  if winnr == -1 | return | endif
+  " なぜか最後にメニューや検索結果画面を閉じると致命的エラーなので,
+  " それを回避するため, プレビューや検索結果や
+  let n = s:GetWinNum()
+  let i = 1
+  while i <= n
+    execute i . 'wincmd w'
+    let bufname = bufname('%')
+    if (bufname !~# prvbuf) && (bufname !~# srcbuf) && (bufname !~# mnubuf)
+      break
+    endif
+    let i = i + 1
+  endwhile
+  if i > n | new | endif
+  if s:GetWinNum() > 1
+    execute winnr . 'wincmd w'
+    silent! close
+    let winnr = bufwinnr(bufnr)
+    if winnr != -1
+      execute winnr . 'wincmd w'
+    endif
+  else
+    enew
+  endif
 endfunction
 
 " 指定したバッファ名のウィンドウを全て閉じる．
 function! s:EliminateWindow(name)
-	let nr = bufwinnr(a:name)
-	while nr != -1
-		exe nr.'wincmd w'
+  let curbufnr = bufnr('%')
+  let bufnr = bufnr(a:name)
+  if bufnr == -1 | return | endif
+  let ei = &eventignore
+  set eventignore=all
+  let winnr = bufwinnr(bufnr)
+  while winnr != -1
+    execute winnr . 'wincmd w'
     if s:SafeClose() == 0
       break
     endif
-		let nr = bufwinnr(a:name)
-	endwhile
+    let winnr = bufwinnr(bufnr)
+  endwhile
+  let &eventignore = ei
+  let winnr = bufwinnr(curbufnr)
+  if winnr != -1
+    execute winnr . 'wincmd w'
+  endif
+endfunction
+
+function! s:CloseSearchWindow()
+  let bufnr = bufnr(escape(s:prefix_howm . s:buftitle_ftresult, ' '))
+  if bufnr == -1 | return | endif
+  let save_ei = &eventignore
+  set eventignore=BufDelete
+  let winnr = bufwinnr(bufnr)
+  while winnr != -1
+    execute winnr . 'wincmd w'
+    enew
+    silent! close
+    let winnr = bufwinnr(bufnr)
+  endwhile
+  let &eventignore = save_ei
 endfunction
 
+" TODO:全然Safeじゃないので修正する
 function! s:SafeClose()
   let retval = 0
   if &modified != 1
@@ -661,10 +1608,10 @@
 function! s:GetWinNum()
   let winnum = 1
   let nr = winnr()
-  silent! exe "wincmd \<C-w>"
+  silent! execute 'wincmd w'
   while nr != winnr()
     let winnum = winnum + 1
-    silent! exe "wincmd \<C-w>"
+    silent! execute 'wincmd w'
   endwhile
   return winnum
 endfunction
@@ -672,34 +1619,14 @@
 " 作業用ウィンドウを開く
 function! s:OpenTemporalWindow(filepath, bEliminateDup)
   call s:OpenWindow(a:filepath, a:bEliminateDup)
-	setlocal bt=nofile bh=delete noswf
-endfunction
-
-" 検索結果表示用ウィンドウを開く
-" searchWord が空でなければ searchWord をハイライト．
-function! s:OpenSearchWindow(searchWord)
-  call s:OpenTemporalWindow(escape(s:prefix_howm.s:buftitle_ftresult, ' '), 1)
-  setlocal nowrap
-  let b:searchWord = a:searchWord
-  if b:searchWord != ""
-    exe 'syntax match howmSearchWord display "\c\v'.escape(b:searchWord, '=~@%').'"'
-    hi howmSearchWord ctermfg=Red ctermbg=Grey guifg=Red guibg=bg
-  endif
-  nnoremap <silent> <buffer> <CR> :call <SID>OpenSearchLine()<CR>
-  if g:howm_instantpreview == 0
-    nnoremap <silent> <buffer> p :call <SID>ShowPreview()<CR>
-  endif
-  nnoremap <silent> <buffer> @ :call <SID>ShowSummary()<CR>
-  nnoremap <silent> <buffer> <S-s> :call <SID>SortKeyInput()<CR>
-  nnoremap <silent> <buffer> <S-r> :call <SID>Reverse()<CR>:call <SID>FormatSearchResult()<CR>
+  setlocal bt=nofile bh=delete noswf
 endfunction
 
 " GrepSearch() や FindSearch() の検索結果を解析して，
 " b:file{i}, b:line{i}, b:content{i} に格納．
 " 格納できた数を返す．
 function! s:ParseSearchResult(searchResult)
-  redraw!
-  echo s:prefix_howm.s:msg_wait_parse
+  redraw | echo s:prefix_howm . s:msg_wait_parse
   let searchResult = a:searchResult
 
   let i = 1
@@ -719,8 +1646,9 @@
     let b:line{i} = strpart(buf, 0, bufidx - 1)
     let buf = strpart(buf, bufidx)
     let b:content{i} = strpart(buf, match(buf, '\S'))
-    let b:content{i} = substitute(b:content{i}, "\\(\<CR>\\|\<NL>\\)", '', 'g')
-    if b:file{i} != '' && b:line{i} =~ '^\d\+$' && b:file{i} !~ g:howm_hidefile_regexp
+    let b:content{i} = substitute(b:content{i}, '\%(\r\|\n\)', '', 'g')
+    if b:file{i} != '' && b:line{i} =~ '^\d\+$' &&
+          \ b:file{i} !~ g:howm_hidefile_regexp
       let b:line{i} = b:line{i} + 0
       let i = i + 1
     else
@@ -740,32 +1668,30 @@
   endwhile
   let b:searchResultNum = i - 1
 
-  redraw!
-  echo s:prefix_howm.s:msg_wait_parse.s:msg_done
+  redraw | echo s:prefix_howm . s:msg_wait_parse . s:msg_done
   return i - 1
 endfunction
 
 " grep によって全文検索した結果を整形する．
-function! s:FormatSearchResult()
-  redraw!
-  echo s:prefix_howm.s:msg_wait_format
-  let lineFormat = "%filename% | %content%"
+" TODO:第一引数の扱いがイマイチ
+function! s:FormatSearchResult(...)
+  redraw | echo s:prefix_howm . s:msg_wait_format
+  let lineFormat = (exists('a:1') ? a:1 : g:howm_lineFormat)
   setlocal modifiable
   silent! exe 'g/^/d_'
   let i = 1
   while i <= b:searchResultNum
     let filename = strpart(b:file{i}, match(b:file{i}, '[^/]*$'))
     let buf = lineFormat
-    let buf = substitute(buf, '%filename%', escape(filename, '\~&'), 'g')
-    let buf = substitute(buf, '%file%', escape(b:file{i}, '\~&'), 'g')
-    let buf = substitute(buf, '%line%', b:line{i}, 'g')
-    let buf = substitute(buf, '%content%', escape(b:content{i}, '\~&'), 'g')
+    let buf = s:replace(buf, '%filename%', filename)
+    let buf = s:replace(buf, '%file%', b:file{i})
+    let buf = s:replace(buf, '%line%', b:line{i})
+    let buf = s:replace(buf, '%content%', b:content{i})
     call s:HowmAppend(buf)
     let i = i + 1
   endwhile
-	setlocal nomodifiable
-  redraw!
-  echo s:prefix_howm.s:msg_wait_format.s:msg_done
+  setlocal nomodifiable
+  redraw | echo s:prefix_howm . s:msg_wait_format . s:msg_done
 endfunction
 
 function! s:DoActionLock()
@@ -774,25 +1700,80 @@
   let func = ''
   let matched = ''
   let i = 1
-  while exists('s:actionlock_pat'.i) && exists('s:actionlock_func'.i) && func == ''
-		let j = 0
-		let head = match(str, s:actionlock_pat{i})
-		let tail = matchend(str, s:actionlock_pat{i})
-		while head != -1 && cur >= j && func == ''
-			if head <= cur && cur < tail
-				let func = s:actionlock_func{i}
-				let matched = matchstr(str, s:actionlock_pat{i}, j)
-			elseif j != tail
-				let j = tail
-				let head = match(str, s:actionlock_pat{i}, j)
-				let tail = matchend(str, s:actionlock_pat{i}, j)
-			else
-				break
-			endif
-		endwhile
+  while exists('s:actionlock_pat' . i) && exists('s:actionlock_func' . i) &&
+        \ func == ''
+    let j = 0
+    let head = match(str, s:actionlock_pat{i})
+    let tail = matchend(str, s:actionlock_pat{i})
+    while head != -1 && cur >= j && func == ''
+      if head <= cur && cur < tail
+        let func = s:actionlock_func{i}
+        let matched = matchstr(str, s:actionlock_pat{i}, j)
+      elseif j != tail
+        let j = tail
+        let head = match(str, s:actionlock_pat{i}, j)
+        let tail = matchend(str, s:actionlock_pat{i}, j)
+      else
+        break
+      endif
+    endwhile
     let i = i + 1
   endwhile
 
+  if v:version >= 700 && func == ''
+    for actionlock in g:howm_actionlock_list
+      if has_key(actionlock, 'func') && has_key(actionlock, 'pat')
+        let j = 0
+        let head = match(str, actionlock['pat'])
+        let tail = matchend(str, actionlock['pat'])
+        while head != -1 && cur >= j && func == ''
+          if head <= cur && cur < tail
+            call call(actionlock['func'], [matchstr(str, actionlock['pat'], j),
+                  \ head + 1])
+            return
+          elseif j != tail
+            let j = tail
+            let head = match(str, actionlock['pat'], j)
+            let tail = matchend(str, actionlock['pat'], j)
+          else
+            break
+          endif
+        endwhile
+      elseif has_key(actionlock, 'list')
+        " actionlock['list'] のうちからマッチするか確認し、
+        " マッチしたら、マッチした次の要素と切り替える
+        let head = -1
+        let idx = -1
+        let len = -1
+        for i in range(len(actionlock['list']))
+          let word = actionlock['list'][i]
+          let len = strlen(word)
+          let sidx = stridx(str, word)
+          while sidx != -1
+            if (sidx <= cur) && (cur < sidx + len)
+              let head = sidx
+              break
+            endif
+            let sidx = stridx(str, word, sidx + len)
+          endwhile
+          if head != -1
+            let idx = i
+            break
+          endif
+        endfor
+        if idx != -1 && head != -1 && len != -1
+          let next = actionlock['list'][(idx + 1) % len(actionlock['list'])]
+          call cursor(line('.'), head + 1)
+          silent! exe "normal! c" . len . "l" . next . "\<ESC>"
+          call cursor(line('.'), cur + 1)
+          return
+        endif
+      else
+        " TODO:エラーメッセージ
+      endif
+    endfor
+  endif
+
   if func != ''
     " マッチした文字列とカーソル位置を渡す．
     call {func}(matched, head + 1)
@@ -802,47 +1783,42 @@
 endfunction
 
 function! s:ActionLockGotoLink(str, head)
-  let str = substitute(a:str, '^'.g:howm_glink_pattern.' *', '', '')
+  call s:SetSearchInfo('query', a:str)
+  let str = substitute(a:str, '^' . g:howm_glink_pattern . ' *', '', '')
   call s:FullTextSearch(str, 0)
 endfunction
 
 function! s:ActionLockComeFromLink(str, head)
   let str = strpart(getline('.'), a:head - 1)
-  let str = substitute(str, '^'.g:howm_clink_pattern.'\s*', '', '')
+  call s:SetSearchInfo('query', str)
+  let str = substitute(str, '^' . g:howm_clink_pattern . '\s*', '', '')
   call s:FullTextSearch(str, 0)
-  call s:SortByContentMatch(g:howm_clink_pattern)
+  call s:Sort2('content-match', g:howm_clink_pattern)
   call s:FormatSearchResult()
 endfunction
 
 function! s:ActionLockKeyword(str, head)
+  call s:SetSearchInfo('query', a:str)
   call s:FullTextSearch(a:str, 0)
-  call s:SortByContentMatch(g:howm_clink_pattern)
+  call s:Sort2('content-match', g:howm_clink_pattern)
   call s:FormatSearchResult()
 endfunction
 
 function! s:ActionLockCheckOff(str, head)
+  let marklist = substitute(s:actionlock_pat4, '{\[\(.*\)\]}', '\1', '')
   let mark = substitute(a:str, '{\(.*\)}', '\1', '')
-  " TODO:もっとスマートに…
-  if mark == ' '
-    let newmark = '*'
-  elseif mark == '*'
-    let newmark = '-'
-  elseif mark == '-'
-    let newmark = ' '
-  else
-    let newmark = ''
-  endif
-
-  if newmark != ''
+  let idx = stridx(marklist, mark)
+  if idx != -1
+    let newmark = marklist[((idx+1)%strlen(marklist))]
     call cursor(line('.'), a:head)
-    silent! exe "normal! c".strlen(a:str)."l{".newmark."}\<ESC>"
+    silent! exe "normal! c" . strlen(a:str) . "l{" . newmark . "}\<ESC>"
     call cursor(line('.'), a:head)
   endif
 endfunction
 
 function! s:ActionLockTimeStamp(str, head)
   call cursor(line('.'), a:head)
-  silent! exe "normal! c".strlen(a:str)."l".s:GetTimeStamp(0)."\<ESC>"
+  silent! exe "normal! c" . strlen(a:str) . "l" . s:GetTimeStamp(0) . "\<ESC>"
   call cursor(line('.'), a:head)
 endfunction
 
@@ -855,42 +1831,39 @@
     call AL_open_url(a:str, cmd)
   else
     " MODIFIED:高山さん
-		" AL_open_url がないときは直接コマンドラインへコマンドを渡す
+    " AL_open_url がないときは直接コマンドラインへコマンドを渡す
     let cmd = substitute(cmd, '%s', a:str, '')
     let cmd = escape(cmd, '%#')
-    exe '!'.cmd
+    exe '!' . cmd
   endif
 endfunction
 
 function! s:ActionLockImportantDate(str, head)
-  if g:howm_reminder_old_format != 0
-    call s:ActionLockImportantDateOld(a:str, a:head)
-    return
-  endif
-  let input = input(s:prefix_howm.s:prompt_lzchange)
+  let input = input(s:prefix_howm . s:prompt_lzchange)
   call cursor(line('.'), a:head)
   if input == ''
     silent! exe 'normal! i:'
-    call search('\['.s:pattern_date.'\]', 'bW')
-    silent! exe 'normal! i'.s:GetTimeStamp(1).'. '
+    call search('\[' . s:GetDatePattern(2) . '\]', 'bW')
+    silent! exe 'normal! i' . s:GetTimeStamp(1) . '. '
   elseif input == 'x'
     silent! exe 'normal! i:'
-    call search('\['.s:pattern_date.'\]', 'bW')
-    silent! exe 'normal! i'.s:GetTimeStamp(1).'. cancel '
+    call search('\[' . s:GetDatePattern(2) . '\]', 'bW')
+    silent! exe 'normal! i' . s:GetTimeStamp(1) . '. cancel '
   elseif input =~ '^[-!+@.]$'
-    silent! exe 'normal! r'.input
+    silent! exe 'normal! r' . input
   elseif input =~ '^\d\+$'
     if strlen(a:str) > 1
       let len = strlen(a:str) - 1
-      let cmd = 'l"_c'.len.'l'
+      let cmd = 'l"_c' . len . 'l'
     else
       let cmd = 'a'
     endif
     let newlazy = input + 0
-    silent! exe 'normal! '.cmd.newlazy
+    silent! exe 'normal! ' . cmd . newlazy
   else
-    redraw!
-    echo "Can't understand ".input
+    let errmsg = "Can't understand " . input
+    let errmsg = s:prefix_howm . errmsg
+    redraw | echohl WarningMsg | echomsg errmsg | echohl None
   endif
   call cursor(line('.'), a:head)
 endfunction
@@ -905,18 +1878,18 @@
   let line = line(".")
   let col  = a:head
   let url  = substitute(a:str, "{\\([^}]*\\)}", "\\1", "")
-  call s:OpenTemporalWindow(escape(s:prefix_howm.s:buftitle_webimport, ' '), 1)
+  let bufname = escape(s:prefix_howm . s:buftitle_webimport, ' ')
+  call s:OpenTemporalWindow(bufname, 1)
   let b:buf  = buf
   let b:line = line
   let b:col  = col
   let b:url  = url
-	"	MODIFIED:高山さん
-	"	うまく動かないらしい 'y \|' を '"zy' に置き換え
+  " MODIFIED:高山さん
+  " うまく動かないらしい 'y \|' を '"zy' に置き換え
   " vnoremap <silent> <buffer> <CR> y \| :call <SID>WebImport()<CR>
   vnoremap <silent> <buffer> <CR> "zy :call <SID>WebImport()<CR>
-  let url = escape(url, '~&')
-  let cmd = substitute(g:howm_html2txtcmd, '%s', url, "g")
-  silent! exe "0r!".cmd
+  let cmd = s:replace(g:howm_html2txtcmd, '%s', url)
+  silent! exe "0r!" . escape(cmd, '%#')
   setlocal nomodifiable
   call cursor(1, 1)
 endfunction
@@ -928,15 +1901,18 @@
   let col  = b:col
   let url  = b:url
   call s:SafeClose()
-  silent! exe bufwinnr(buf)."wincmd w"
+  let winnr = bufwinnr(buf)
+  if winnr != -1
+    execute winnr . 'wincmd w'
+  endif
   call cursor(line, col)
   let sol = matchstr(getline("."), "^\\s*")
   if exists('g:howm_quotemark')
-    let sol = sol.g:howm_quotemark
+    let sol = sol . g:howm_quotemark
   endif
-  silent! exe "normal! o".url
-  let @z = substitute(@z, "^", "".sol, "g")
-  let @z = substitute(@z, "\\(\n\\|\r\n\\?\\)\\($\\)\\@!", "\\1".sol, "g")
+  silent! exe "normal! o" . url
+  let @z = substitute(@z, "^", "" . sol, "g")
+  let @z = substitute(@z, "\\(\n\\|\r\n\\?\\)\\($\\)\\@!", "\\1" . sol, "g")
   let @z = substitute(@z, "\\s*\\(\n\\|\r\n\\?\\|$\\)", "\\1", "g")
   silent! put! z
   call cursor(line, col)
@@ -947,89 +1923,314 @@
 endfunction
 
 function! s:ActionLockDate(str, head)
-  call s:FullTextSearch(a:str, 0)
+  let input = input(s:prefix_howm . s:prompt_dtchange)
+  if input == ''
+    let str = a:str
+    call s:SetSearchInfo('query', str)
+    call s:FullTextSearch(str, 0)
+    call s:Sort2('content-match', g:howm_clink_pattern)
+    call s:FormatSearchResult()
+    return
+  endif
+  let result = ''
+  if input =~ '^\d\{1,}$'
+    let b = a:str
+    let b = (HowmDate2Int(b, g:howm_date_pattern) - 719527) * 86400
+    if input =~ '^\d$'
+      let pat = '^\(\d\)$'
+    elseif input =~ '^\d\d$'
+      let pat = '^\(\d\d\)$'
+    elseif input =~ '^\d\{3}$'
+      let pat = '^\(\d\)\(\d\d\)$'
+    elseif input =~ '^\d\{4}$'
+      let pat = '^\(\d\d\)\(\d\d\)$'
+    elseif input =~ '^\d\{5}$'
+      let pat = '^\(\d\)\(\d\d\)\(\d\d\)$'
+    elseif input =~ '^\d\{6}$'
+      let pat = '^\(\d\d\)\(\d\d\)\(\d\d\)$'
+    endif
+    if input =~ '^\d\{1,2}$'
+      " set dd
+      let d = substitute(input, pat, '\1', '')
+      let d = printf('%02d', d + 0)
+      let f = g:howm_date_pattern
+      let f = substitute(f, '\C\V%d', d, 'g')
+    elseif input =~ '^\d\{3,4}$'
+      " set mmdd
+      let m = substitute(input, pat, '\1', '')
+      let d = substitute(input, pat, '\2', '')
+      let m = printf('%02d', m + 0)
+      let d = printf('%02d', d + 0)
+      let f = g:howm_date_pattern
+      let f = substitute(f, '\C\V%m', m, 'g')
+      let f = substitute(f, '\C\V%d', d, 'g')
+    elseif input =~ '^\d\{5,6}$'
+      " set yymmdd
+      let y = substitute(input, pat, '\1', '') + 0
+      let m = substitute(input, pat, '\2', '')
+      let d = substitute(input, pat, '\3', '')
+      echo y
+      if 38 < y && y < 70
+        return
+      elseif y >= 70
+        let y = y + 1900
+      elseif y <= 38
+        let y = y + 2000
+      endif
+      let y = printf('%04d', y)
+      let m = printf('%02d', m + 0)
+      let d = printf('%02d', d + 0)
+      let f = g:howm_date_pattern
+      let f = substitute(f, '\C\V%Y', y, 'g')
+      let f = substitute(f, '\C\V%m', m, 'g')
+      let f = substitute(f, '\C\V%d', d, 'g')
+    endif
+    let d = strftime(f, b)
+    let d = HowmDate2Int(d, g:howm_date_pattern)
+    let d = strftime(g:howm_date_pattern, (d - 719527) * 86400)
+    let result = d
+  elseif input =~ '^[+-]\d\{1,3}$'
+    " shift +num
+    let d = a:str
+    let d = HowmDate2Int(d, g:howm_date_pattern)
+    let d = eval('(' . (d - 719527) . input . ') * 86400')
+    let result = strftime(g:howm_date_pattern, d)
+  elseif input =~ '^\.$'
+    " today .
+    let result = strftime(g:howm_date_pattern)
+  endif
+  let col = col('.')
+  call cursor(line('.'), a:head)
+  execute 'normal c' . strlen(a:str) . 'l' . result
+  call cursor(line('.'), col)
 endfunction
 
-function! s:OpenSearchLine()
-  let file = b:file{line('.')}
-  let line = b:line{line('.')}
-  call s:EliminateWindow(bufname("%"))
+" 検索結果の一覧を表示するためウィンドウから, 検索結果のファイルに飛ぶために使
+" われている関数.
+"
+" 第1引数: 新しいウィンドウで開くか否か
+"   ( 既定値: 0 ( 現在のウィンドウで開く ) )
+" 第2引数: プレビューを閉じるか否か
+"   ( 既定値: 1 ( プレビューを閉じる ) )
+"
+" 第1引数は実装的には検索結果を閉じるか否かなので, 真偽を逆にして解釈している.
+" 第2引数の既定値は :autocmd で検索結果を閉じる際に, 同時に閉じられるため 1 に
+" した.
+function! s:OpenSearchLine(...)
+  let file = s:GetFile(line('.'))
+  let line = s:GetLine(line('.'))
+  if file == '' || line !~ '^\d*$' | return | endif
+  let bCloseSearchWindow = (exists('a:1') ? !a:1 : 1)
+  let bClosePreviewWindow = (exists('a:2') ? a:2 : 1)
+  let bVimOpen = 0
+  if bCloseSearchWindow | call s:EliminateWindow(bufname("%")) | endif
+  if bClosePreviewWindow
+    call s:EliminateWindow(escape(s:prefix_howm . s:buftitle_preview, " "))
+  endif
   " TODO:テキトー．バグありそう．
   if line == 0
     let ft = substitute(file, '.*\.\(.\{-}\)', '\1', '')
-    if exists('g:howm_opencmd_'.ft)
+    if exists('g:howm_opencmd_' . ft)
       let file = escape(file, '~&')
       let cmd = substitute(g:howm_opencmd_{ft}, '%s', file, 'g')
     else
       " 以前開いたカーソル位置を有効にする
       let cmd = "call s:OpenMemo(file, -1)"
+      let bVimOpen = 1
     endif
   else
     let cmd = "call s:OpenMemo(file, line)"
+    let bVimOpen = 1
   endif
   exe cmd
+  if bVimOpen | let &l:swapfile = &g:swapfile | endif
+endfunction
+
+function! s:ToggleAutoShowPreview()
+  " TODO:メッセージを定数にする
+  let srcbuf = escape(s:prefix_howm . s:buftitle_ftresult, ' ')
+  let mnubuf = escape(s:prefix_howm . s:buftitle_menu, ' ')
+  let prvbuf = escape(s:prefix_howm . s:buftitle_preview, ' ')
+
+  let g:howm_auto_show_preview = !g:howm_auto_show_preview
+  if g:howm_auto_show_preview
+    let b:updatetime = &updatetime
+    set updatetime=1
+    augroup howm
+      exe 'autocmd CursorHold ' . srcbuf . ' call s:ShowPreview()'
+      exe 'autocmd BufEnter ' . srcbuf .
+            \ ' let b:updatetime=&updatetime|set updatetime=1'
+      exe 'autocmd BufLeave ' . srcbuf .
+            \ ' silent! exe "set updatetime=".b:updatetime'
+      exe 'autocmd CursorHold ' . mnubuf . ' call s:ShowPreview()'
+      exe 'autocmd BufEnter ' . mnubuf .
+            \ ' let b:updatetime=&updatetime|set updatetime=1'
+      exe 'autocmd BufLeave ' . mnubuf . 
+            \ ' silent! exe "set updatetime=".b:updatetime'
+    augroup END
+    echo s:prefix_howm . 'g:howm_auto_show_preview を ON にしました'
+  else
+    if exists('b:updatetime')
+      let &updatetime = b:updatetime
+    endif
+    augroup howm
+      exe 'autocmd! CursorHold ' . srcbuf
+      exe 'autocmd! BufEnter   ' . srcbuf
+      exe 'autocmd! BufLeave   ' . srcbuf
+      exe 'autocmd! CursorHold ' . mnubuf
+      exe 'autocmd! BufEnter   ' . mnubuf
+      exe 'autocmd! BufLeave   ' . mnubuf
+    augroup END
+    let bufnr = bufnr('%')
+    let winnr = bufwinnr(prvbuf)
+    if winnr != -1
+      execute winnr . 'wincmd w'
+      silent! close
+      let winnr = bufwinnr(bufnr)
+      if winnr != -1
+        execute winnr . 'wincmd w'
+      endif
+    endif
+    echo s:prefix_howm . 'g:howm_auto_show_preview を OFF にしました'
+  endif
+endfunction
+
+
+function! s:HidePreview()
+  if !g:howm_auto_show_preview && g:howm_auto_hide_preview
+    let bufnr = bufnr('%')
+    let prvbuf = escape(s:prefix_howm . s:buftitle_preview, ' ')
+    let winnr = bufwinnr(prvbuf)
+    if winnr != -1
+      execute winnr . 'wincmd w'
+      silent! close
+      let winnr = bufwinnr(bufnr)
+      if winnr != -1
+        execute winnr . 'wincmd w'
+      endif
+    endif
+  endif
 endfunction
 
 " TODO:howm_dir 以下のファイルは howm_fileencoding でプレビューして，それ以
 " 外の判別は Vim に任せる？
+" 同一ファイル同一行をプレビュー && すでにプレビューが存在する &&
+"   自動プレビュー機能が無効(有効だと閉じた直後にまた開く)である場合は, 閉じる
 function! s:ShowPreview()
-  let previewList = b:file{line('.')}.':'.b:line{line('.')}."\<NL>"
-  let searchWord = b:searchWord
-  let buf = bufname('%')
-  call s:OpenTemporalWindow(escape(s:prefix_howm.s:buftitle_preview, ' '), 1)
-  call s:HighlightPreview(searchWord)
-  call s:ParsePreviewList(previewList)
+  let prvbuf = escape(s:prefix_howm . s:buftitle_preview, ' ')
+  let curbufnr = bufnr('%')
+  let winnr = bufwinnr(prvbuf)
+  let l = line('.')
+  let file = s:GetFile(l)
+  let line = s:GetLine(l)
+  if file == '' || line !~ '^\d\{1,}$' | return | endif
+  if exists('b:lastprvfile') && (b:lastprvfile == file) &&
+        \ exists('b:lastprvline') && (b:lastprvline == l) &&
+        \ (winnr != -1) && !g:howm_auto_show_preview
+    execute winnr . 'wincmd w'
+    silent! close
+    let winnr = bufwinnr(curbufnr)
+    if winnr != -1
+      execute winnr . 'wincmd w'
+    endif
+    return
+  endif
+  let b:lastprvfile = file
+  let b:lastprvline = l
+  if winnr != -1
+    execute winnr . 'wincmd w'
+  else
+    call s:OpenWindow2('preview')
+    " call s:OpenTemporalWindow(prvbuf, 1)
+  endif
+  call s:HighlightPreview()
+  call s:ParsePreviewList(file . ':' . line . "\<NL>")
   call s:FormatPreviewList()
   let head = strpart(b:region1, 0, matchend(b:region1, '\d*')) + 0
   call cursor(b:line1 - head + s:num_previewheader_lines + 1, 1)
   silent! normal! zz
-  silent! exe bufwinnr(buf).'wincmd w'
+  let winnr = bufwinnr(curbufnr)
+  if winnr != -1
+    execute winnr . 'wincmd w'
+  endif
 endfunction
 
 function! s:ShowDirectory()
-  call s:OpenSearchWindow('')
-  if s:ParseSearchResult(s:FindSearch()) != 0
-    call s:SortByMtime()
-    call s:FormatSearchResult()
-    call cursor(1, 1)
-    let retval = 1
-  else
-    redraw!
-    echo s:prefix_howm.s:msg_ftnomatch
-    call s:SafeClose()
-    let retval = 0
+  let start  = s:getTime()
+  let retval = s:Search3('find', '', 0, 'mtime', '',
+        \ g:howm_lineFormatShowDirectory, '')
+  let end    = s:getTime()
+  let time   = s:diffTime(end, start)
+  let log = 'ShowDirectory: Search3() time=' . time
+  call HowmDebugLog(log)
+  if retval
+    nmap <silent> <buffer> r <Plug>HOWM_ShowDirectory
   endif
+  return retval
 endfunction
 
 function! s:ShowSummary()
   let i = 1
   let previewList = ''
   while i <= b:searchResultNum
-    let previewList = previewList.b:file{i}.':'.b:line{i}."\<NL>"
+    let previewList = previewList . b:file{i} . ':' . b:line{i} . "\<NL>"
     let i = i + 1
   endwhile
-  let searchWord = b:searchWord
-  let buf = bufname("%")
-  call s:OpenTemporalWindow(escape(s:prefix_howm.s:buftitle_summary, ' '), 1)
-  call s:HighlightPreview(searchWord)
+  let bufnr = bufnr('%')
+  call s:OpenTemporalWindow(escape(s:prefix_howm . s:buftitle_summary, ' '), 1)
+  call s:HighlightPreview()
   call s:ParsePreviewList(previewList)
   call s:FormatPreviewList()
   call cursor(1, 1)
-  silent! exe bufwinnr(buf).'wincmd w'
+  let winnr = bufwinnr(bufnr)
+  if winnr != -1
+    execute winnr . 'wincmd w'
+  endif
+endfunction
+
+" NOTE:テストコード.使わないように
+" NOTE::peditはVim6でも使用可能
+function! OpenPreviewWindow()
+  let opt = '++enc=' . g:howm_fileencoding . ' ++ff=' . g:howm_fileformat
+  let cmd = '+setlocal\ buftype=nofile\ nomodifiable\ noswapfile'
+  let file = escape(s:prefix_howm . s:buftitle_preview, ' ')
+  silent execute 'pedit!' opt cmd file
 endfunction
 
-" TODO:OpenPreviewWindow() にする．
-function! s:HighlightPreview(searchWord)
+" ShowPreview(), ShowSummary() から呼ばれる
+function! s:HighlightPreview()
   let hlpattern = substitute(g:howm_previewheader_pattern, '%file%', '.*', 'g')
-	exe 'syntax match howmPreviewHeader display '.hlpattern
-	hi howmPreviewHeader ctermfg=Red ctermbg=Grey guifg=Red guibg=bg
-  if a:searchWord != ""
-    exe 'syntax match howmSearchWord display "'.'\c\v'.escape(a:searchWord, '=~@%').'"'
-    hi howmSearchWord ctermfg=Red ctermbg=Grey guifg=Red guibg=bg
+  exe 'syntax match howmPreviewHeader display ' . hlpattern
+  hi howmPreviewHeader ctermfg=Red ctermbg=Grey guifg=Red guibg=bg
+  call s:HighlightSearchWord()
+endfunction
+
+" b:searchWord にしたがって、ハイライトを設定する
+" b:searchWordType を見て b:searchWord の解釈を変える
+"  0: 固定文字列
+"  1: 正規表現 ( grep ) 既定値
+"  2: 正規表現 ( Vim )
+function! s:HighlightSearchWord()
+  let searchWord = exists('b:searchWord') ? b:searchWord : ''
+  let searchWordType = exists('b:searchWordType') ? b:searchWordType : 1
+  if searchWord == '' | return | endif
+  if searchWordType == 0
+    let pat = '\c\V' . escape(searchWord, '\')
+  elseif searchWordType == 1
+    let pat = '\c\v' . escape(searchWord, '=~@%')
+  elseif searchWordType == 2
+    let pat = searchWord
+  else
+    let errmsg = s:prefix_howm . s:errmsg_invalidqtype
+    redraw | echohl WarningMsg | echomsg errmsg | echohl None
+    return
   endif
+  exe 'syntax match howmSearchWord display "' . escape(pat, '"') . '"'
+  hi howmSearchWord ctermfg=Red ctermbg=Grey guifg=Red guibg=bg
 endfunction
 
 function! s:ParsePreviewList(previewList)
+  " redraw | echo s:prefix_howm . s:msg_wait_parse
   let previewList = a:previewList
 
   let i = 1
@@ -1060,8 +2261,9 @@
         let b:memo{i} = strpart(clip, idx + 1)
         let b:file{i} = file
         let b:line{i} = line
-        let oldBeginLine = substitute(b:region{i}, '^\(\d\+\),\(\d\+\)$', '\1', '') + 0
-        let oldEndLine   = substitute(b:region{i}, '^\(\d\+\),\(\d\+\)$', '\2', '') + 0
+        let pat = '^\(\d\+\),\(\d\+\)$'
+        let oldBeginLine = substitute(b:region{i}, pat, '\1', '') + 0
+        let oldEndLine   = substitute(b:region{i}, pat, '\2', '') + 0
         let oldFile = file
         let i = i + 1
       endif
@@ -1077,6 +2279,7 @@
   endwhile
   let b:previewListNum = i - 1
 
+  " echo s:prefix_howm . s:msg_wait_parse . s:msg_done
   return i - 1
 endfunction
 
@@ -1084,25 +2287,25 @@
   setlocal modifiable
   silent! exe 'g/^/d_'
   let readcmd = '$r'
-  let readcmd = readcmd.' ++enc='.g:howm_fileencoding
-  let readcmd = readcmd.' ++ff='.g:howm_fileformat
-  silent! exe readcmd.' '.a:filepath
+  let readcmd = readcmd . ' ++enc=' . g:howm_fileencoding
+  let readcmd = readcmd . ' ++ff=' . g:howm_fileformat
+  silent! exe readcmd . ' ' . a:filepath
   silent! 1delete _
   if a:linenum == 0
     let head = 1
     let tail = line("$")
   else
     call cursor(a:linenum, 1)
-    if getline(a:linenum) =~ '^'.g:howm_title_pattern.'\( .*\)\?$'
+    if getline(a:linenum) =~ '^' . g:howm_title_pattern . '\( .*\)\?$'
       let head = a:linenum
     else
-      let head = search('^'.g:howm_title_pattern.'\( .*\)\?$', 'bW')
+      let head = search('^' . g:howm_title_pattern . '\( .*\)\?$', 'bW')
       if head == 0
         let head = 1
       endif
     endif
     call cursor(a:linenum, 1)
-    let tail = search('^'.g:howm_title_pattern.'\( .*\)\?$', 'W')
+    let tail = search('^' . g:howm_title_pattern . '\( .*\)\?$', 'W')
     if tail == 0
       let tail = line('$')
     else
@@ -1110,12 +2313,11 @@
     endif
   endif
   let i = head
-  let retval = head.','.tail."\<NL>"
+  let retval = head . ',' . tail . "\<NL>"
   while i <= tail
-    let retval = retval.getline(i)."\<NL>"
+    let retval = retval . getline(i) . "\<NL>"
     let i = i + 1
   endwhile
-
   return retval
 endfunction!
 
@@ -1127,15 +2329,18 @@
     " ヘッダ書き出し
     " TODO:ヘッダのところだけメモの ID 番号を付けておいて，
     " ヘッダの行数（数えるルーチンを書く）と beginline から飛び先行を計算する．
-    let header = substitute(g:howm_previewheader_pattern, '%file%', b:file{i}, 'g')
+    let header = substitute(g:howm_previewheader_pattern, '%file%', b:file{i},
+          \ 'g')
 
     " メモ書き出し
     let regbak = @z
-    let @z = header.b:memo{i}
+    let @z = header . b:memo{i}
     silent! $put z
     let @z = regbak
     if i == 1
-      silent! 1delete _
+      " 1つめの場合に1行目が空行になる分と
+      " howm_previewheader_pattern の先頭に含まれる \<NL> の分で2行削除
+      silent! 1,2delete _
     endif
     "let idx = match(memo, "\<NL>")
     "if idx != -1
@@ -1159,17 +2364,17 @@
     "endwhile
     let i = i + 1
   endwhile
-	setlocal nomodifiable
+  setlocal nomodifiable
 endfunction
 
 " 新しくファイルを作った時には 1 行目に文字列を書いて，それ以外の時は行末に
 " 文字列を追加する．
 function! s:HowmAppend(str)
-	if line('$') != 1 || getline('1') != ''
-		call append('$', a:str)
-	else
-		call setline('1', a:str)
-	endif
+  if line('$') != 1 || getline('1') != ''
+    call append('$', a:str)
+  else
+    call setline('1', a:str)
+  endif
 endfunction
 
 " expand() の処理の他に，'\\ ' を ' ' にする．
@@ -1180,73 +2385,285 @@
   let retval = substitute(retval, '\\ ', ' ', 'g')
   let retval = substitute(retval, '\\', '/', 'g')
   if isdirectory(retval) && retval !~ "/$"
-    let retval = retval."/"
+    let retval = retval . "/"
   endif
   return retval
 endfunction
 
 " functions - grep/find search {{{
-" GNU grep（windows では cygwin の GNU grep）を使ってメモファイルを全文検索
-" する．
-function! s:GrepSearch(searchWord, bRegexp)
-  redraw!
-  echo s:prefix_howm.s:msg_wait_search
-	let searchWord = a:searchWord
+
+" 以下のように動作できるよう Search3() を作成する
+" ShowMenu()            => Search2()
+" ShowDirectory()       => Search3() => Search2()
+" ShowSchedule()        => Search3() => Search2()
+" ShowTodo()            => Search3() => Search2()
+" FullTextSearchInput() => FullTextSearch() => Search3() => Search2()
+" ActionLock*()         => FullTextSearch() => Search3() => Search2()
+"
+" 検索結果用のウィンドウを開き、検索を行い、ソートを行う
+" 必要以上のハイライトは行わない
+" type: 検索の種類
+"  * find
+"  * grep
+" query: 検索クエリ ( type が find の場合は無視 )
+" qtype: 検索クエリの種類 ( type が find の場合は無視 )
+"  * fixed-string : 0 ... 固定文字列
+"  * regexp(grep) : 1 ... 正規表現(grep)
+"  * regexp(Vim)  : 2 ... 正規表現(Vim) ( :vimgrep が有効な場合のみ )
+"  * migemo       : 3 ... migemo ( migemo を使って展開する )
+function! s:Search3(type, query, qtype, stype, smatch, lformat, myparse)
+  if a:type != 'find' && a:type != 'grep' | return 0 | endif
+  if a:type == 'grep' && a:query == '' | return 0 | endif
+  if a:type == 'grep' && a:qtype !~ '^[0-3]$' | return 0 | endif
+  let query = (a:type == 'find' ? '' : a:query)
+  let qtype = (a:type == 'find' ? 0 : a:qtype)
+  call s:OpenWindow2('search')
+  " 特別な処理(FullTextSearch): path の展開
+  let path = ''
+  if qtype == 0
+    let path = s:HowmExpand(query)
+    if !filereadable(path) || isdirectory(path)
+      let path = ''
+    endif
+  endif
+
+  call s:SetSearchInfo('query', query)
+  call s:SetSearchInfo('migemo', 0)
+  if qtype == 3
+    call s:SetSearchInfo('migemo', 1)
+    if executable(g:howm_migemoprg)
+      let cmd = g:howm_migemocmd
+      let cmd = s:replace(cmd, '#prg#', g:howm_migemoprg)
+      let cmd = s:replace(cmd, '#opt#', g:howm_migemoopt)
+      let cmd = s:replace(cmd, '#searchWord#', query)
+      let query = system(cmd)
+      " let query = substitute(query, "\\(\<CR>\\|\<NL>\\)", '', 'g')
+      let query = substitute(query, '\%(\r\|\n\)', '', 'g')
+      let qtype = 1
+    elseif s:enable_migemo
+      let query = migemo(query)
+      let qtype = 2
+    else
+      " TODO:エラーメッセージ
+      return 0
+    endif
+  endif
+
+  " 特別な処理(FullTextSearch): path が != じゃないときもリストを表示
+  if s:ParseSearchResult(s:Search2(a:type, query, qtype)) > 0 ||
+        \ path != ''
+
+    if a:myparse != ''
+      call {a:myparse}()
+    endif
+
+    call s:Sort2(a:stype, a:smatch)
+
+    " 特別な処理(FullTextSearch): path を上に挿入する
+    if path != ''
+      let i = b:searchResultNum
+      while i >= 1
+        let b:file{i + 1} = b:file{i}
+        let b:line{i + 1} = b:line{i}
+        let b:content{i + 1} = b:content{i}
+        let i = i - 1
+      endwhile
+      let b:file1 = path
+      let b:line1 = 0
+      let b:content1 = ""
+      let b:searchResultNum = b:searchResultNum + 1
+    endif
+
+    if a:lformat != ''
+      call s:FormatSearchResult(a:lformat)
+    else
+      call s:FormatSearchResult()
+    endif
+    call cursor(1, 1)
+    normal! zz
+
+    let b:searchWord = query
+    let b:searchWordType = qtype
+    call s:HighlightSearchWord()
+
+    let retval = 1
+  else
+    redraw | echo s:prefix_howm . s:msg_ftnomatch
+    call s:SafeClose()
+    let retval = 0
+  endif
+  return retval
+endfunction
+
+" すべての検索は Search2() を経由して行う。
+"  ( Search2() => FindSearch() の形で呼び出される )
+"              => GrepSearch()
+" type: 検索の種類
+"   find そのまんま find
+"   grep そのまんま grep
+" searchWord: grep で使用する検索パターン
+" searchWordType: grep で使用する検索パターンの種類
+"
+function! s:Search2(type, searchWord, searchWordType)
+  let start = s:getTime()
+  let retval = ''
+  call s:SetSearchInfo('type', a:type)
+  call s:SetSearchInfo('rquery', a:searchWord)
+  call s:SetSearchInfo('qtype', a:searchWordType)
+  if a:type == 'find'
+    let retval = s:FindSearch()
+  elseif a:type == 'grep'
+    " grep では SearchInfo を再設定する
+    let retval = s:GrepSearch(a:searchWord, a:searchWordType)
+  else
+    " TODO:エラーメッセージ
+    let retval = ''
+  endif
+  let end  = s:getTime()
+  let time = s:diffTime(end, start)
+  call s:SetSearchInfo('time', time)
+  return retval
+endfunction
+
+" grepを使用してメモファイルを全文検索する．
+"
+" 固定文字列・正規表現 ( Vim ) の場合は
+"  :vimgrep > g:howm_grepprg
+" 正規表現 ( grep ) の場合は
+"  g:howm_grepprg
+" という優先順位で使用する.
+"
+" g:howm_grepprg の既定値は GNU grep ( windows では cygwin の GNU grep )
+"
+" searchWordType: searchWord の種類
+"  0: 固定文字列
+"  1: 正規表現 ( grep )
+"  2: 正規表現 ( Vim )
+function! s:GrepSearch(searchWord, searchWordType)
+  if a:searchWord =~ '^\s*$' | return '' | endif
+  if a:searchWordType !~ '^[0-2]$' | return '' | endif
+  redraw | echo s:prefix_howm . s:msg_wait_search
+  let searchWord = a:searchWord
   let retval = ""
-	let searchPath = s:HowmExpand(g:howm_dir)
+  let searchPath = s:HowmExpand(g:howm_dir)
   " 検索語の中に大文字が入っていなかったら大文字小文字を区別しない．
   let bIgnore = searchWord !~ '\C[A-Z]'
+  call s:SetSearchInfo('case', bIgnore)
 
-  if g:howm_grepprg == ""
+  " TODO:grepcmd > :vimgrep > grep.vim
+  if a:searchWordType == 2 && !s:enable_vimgrep
+    let errmsg = s:prefix_howm . s:errmsg_regexpvim
+    redraw | echohl WarningMsg | echomsg errmsg | echohl None
+    return ''
+  endif
+  if a:searchWordType == 0
+    " grepprg > :vimgrep > grep.vim
+    if executable(g:howm_grepprg)
+    elseif s:enable_vimgrep
+    else
+    endif
+  elseif a:searchWordType == 1
+    " grepprg > grep.vim
+    if executable(g:howm_grepprg)
+    else
+    endif
+  elseif a:searchWordType == 2
+    " :vimgrep
+  else
+    " TODO:エラーメッセージ
+  endif
+
+  " :vimgrep が使用可能 && ( 固定文字列 || 正規表現(Vim) )
+  if s:enable_vimgrep && (a:searchWordType == 0 || a:searchWordType == 2)
+    " TODO:HInr のうち I に対応できていない
+    " TODO:&lazyredraw に意味があるか確認する
+    " TODO:filename が若干違う
+    call s:SetSearchInfo('type', 'vimgrep')
+    if a:searchWordType == 0
+      let searchWord = '\V' . escape(searchWord, '\/')
+    endif
+    let searchWord = ( bIgnore ? '\c' : '\C' ) . searchWord
+    let save_lazyredraw = &lazyredraw
+    set lazyredraw
+    let save_qflist = deepcopy(getqflist())
+    call setqflist([])
+    let hide = ''
+    if g:howm_vimgrep_usehide
+      let hide = 'hide'
+      let save_global_swapfile = &g:swapfile
+      setglobal noswapfile
+    endif
+    let save_wildignore = &wildignore
+    let &wildignore = g:howm_wildignore
+    try
+      for file in split(globpath(searchPath, '**/*.*'), "\<NL>")
+        if isdirectory(file) | continue | endif
+        let file = escape(file, ' ')
+        silent! execute hide 'vimgrepadd /'. searchWord .'/j' file
+      endfor
+    finally
+      let &wildignore = save_wildignore
+      if g:howm_vimgrep_usehide
+        execute 'setglobal ' . (save_global_swapfile ? '' : 'no') . 'swapfile'
+      endif
+      let fname = "fnamemodify(bufname(v:val['bufnr']),':p:.:gs?\\?/?')"
+      let lnum = "v:val['lnum']"
+      let content = "v:val['text']"
+      let s = fname . ".':'." . lnum . ".':'." . content
+      let retval = join(map(getqflist(), s), "\n")
+      call setqflist(save_qflist)
+      let &lazyredraw = save_lazyredraw
+    endtry
+    return retval
+  elseif g:howm_grepprg == ""
+    call s:SetSearchInfo('type', 'grep')
     if &encoding != g:howm_fileencoding
       let searchWord = iconv(searchWord, &encoding, g:howm_fileencoding)
     endif
     let grepopt = ''
-    if a:bRegexp
-      let grepopt = grepopt.'E'
+    if a:searchWordType == 1
+      let grepopt = grepopt . 'E'
     else
-      let grepopt = grepopt.'F'
+      let grepopt = grepopt . 'F'
     endif
     if bIgnore
-      let grepopt = grepopt.'i'
+      let grepopt = grepopt . 'i'
     endif
-    let retval = retval.GrepSearch(searchWord, searchPath, grepopt)
+    let retval = retval . GrepSearch(searchWord, searchPath, grepopt)
     let retval = iconv(retval, g:howm_fileencoding, &encoding)
   elseif !executable(g:howm_grepprg)
-    call HowmDebugLog('GrepSearch:Can^t Execute g:howm_grepprg='.g:howm_grepprg)
+    call HowmDebugLog('GrepSearch:Can^t Execute g:howm_grepprg=' .
+          \ g:howm_grepprg)
     let errmsg = s:errmsg_inexecutable
-    let errmsg = substitute(errmsg, '%prg%', g:howm_grepprg, 'g')
-    let errmsg = substitute(errmsg, '%var%', 'howm_grepprg', 'g')
-    redraw!
-    echomsg s:prefix_howm.errmsg
+    let errmsg = s:replace(errmsg, '%prg%', g:howm_grepprg)
+    let errmsg = s:replace(errmsg, '%var%', 'howm_grepprg')
+    let errmsg = s:prefix_howm . errmsg
+    redraw | echohl WarningMsg | echomsg errmsg | echohl None
     return ''
   else
-    if has("win32")
-      let searchPath = '"'.searchPath.'"'
-    endif
+    call s:SetSearchInfo('type', 'usergrep')
     let grepcmd = 'g:howm_grepcmd'
-    if a:bRegexp
-      let grepcmd = grepcmd.'_regexp'
+    if a:searchWordType == 1
+      let grepcmd = grepcmd . '_regexp'
     else
-      let grepcmd = grepcmd.'_fix'
+      let grepcmd = grepcmd . '_fix'
     endif
     if bIgnore
-      let grepcmd = grepcmd.'_ignore'
+      let grepcmd = grepcmd . '_ignore'
     endif
-    call HowmDebugLog('GrepSearch:GrepCmd'.grepcmd)
-    let retval = retval.HowmExecuteSearchPrg({grepcmd}, g:howm_grepprg, searchPath, searchWord, &encoding, g:howm_fileencoding)
+    call HowmDebugLog('GrepSearch:GrepCmd' . grepcmd)
+    let retval = retval . HowmExecuteSearchPrg({grepcmd}, g:howm_grepprg,
+          \ searchPath, searchWord, &encoding, g:howm_fileencoding)
   endif
-  redraw!
-  echo s:prefix_howm.s:msg_wait_search.s:msg_done
-  call HowmDebugLog('FindSearch:Retval='.retval)
+  redraw | echo s:prefix_howm . s:msg_wait_search . s:msg_done
+  call HowmDebugLog('GrepSearch:Retval=' . retval)
   return retval
 endfunction
 
 function! s:FindSearch()
-  redraw!
-  echo s:prefix_howm.s:msg_wait_search
+  redraw | echo s:prefix_howm . s:msg_wait_search
   let retval = ""
-	let searchPath = s:HowmExpand(g:howm_dir)
+  let searchPath = s:HowmExpand(g:howm_dir)
   if g:howm_findprg == ''
     let howm_dir = s:HowmExpand(g:howm_dir)
     let pathList = strpart(howm_dir, match(howm_dir, "\\S"))
@@ -1262,15 +2679,15 @@
       let file = s:HowmExpand(file)
       if isdirectory(file)
         if file !~ "[\\/]$"
-          let file = file."/"
+          let file = file . "/"
         endif
-        let file = file."*"
+        let file = file . "*"
         let file = substitute(s:HowmExpand(file), "\<NL>", " ", "g")
-        let pathList = file.pathList
+        let pathList = file . pathList
       elseif filereadable(file)
         if has('win32') && substitute(file, '.*\.\(.\{-}\)', '\1', '') == 'lnk'
           " Win32 のショートカットを追うための処理
-          silent! exe "new ".file
+          silent! exe "new " . file
           let linkto = s:HowmExpand("%:p")
           silent! close
           if file != linkto
@@ -1278,7 +2695,7 @@
             continue
           endif
         endif
-        let retval = retval.file.":0:\<NL>"
+        let retval = retval . file . ":0:\<NL>"
       endif
       let pathList = strpart(pathList, match(pathList, "\\S"))
       let idx = match(pathList, "\\s")
@@ -1292,22 +2709,19 @@
     endwhile
   elseif !executable(g:howm_findprg)
     let errmsg = s:errmsg_inexecutable
-    let errmsg = substitute(errmsg, '%prg%', g:howm_findprg, 'g')
-    let errmsg = substitute(errmsg, '%var%', 'howm_findprg', 'g')
-    redraw!
-    echomsg s:prefix_howm.errmsg
-  else
-    if has("win32")
-      let searchPath = '"'.searchPath.'"'
-    endif
-    call HowmDebugLog('FindSearch:FindCmd='.g:howm_findprg)
-    let retval = retval.HowmExecuteSearchPrg(g:howm_findcmd, g:howm_findprg, searchPath, '', &encoding, &encoding)
+    let errmsg = s:replace(errmsg, '%prg%', g:howm_findprg)
+    let errmsg = s:replace(errmsg, '%var%', 'howm_findprg')
+    let errmsg = s:prefix_howm . errmsg
+    redraw | echohl WarningMsg | echomsg errmsg | echohl None
+  else
+    call HowmDebugLog('FindSearch:FindCmd=' . g:howm_findprg)
+    let retval = retval . HowmExecuteSearchPrg(g:howm_findcmd, g:howm_findprg,
+          \ searchPath, '', &encoding, &encoding)
     let retval = substitute(retval, '\n', ':0:\n', 'g')
   endif
 
-  redraw!
-  echo s:prefix_howm.s:msg_wait_search.s:msg_done
-  call HowmDebugLog('FindSearch:Retval='.retval)
+  redraw | echo s:prefix_howm . s:msg_wait_search . s:msg_done
+  call HowmDebugLog('FindSearch:Retval=' . retval)
   return retval
 endfunction
 
@@ -1345,12 +2759,12 @@
     return
   else
     let mid = (a:beginNum + a:endNum) / 2
-    call s:SortIter(a:beginNum, mid, a:compare, a:eval, a:buffer.'L')
-    call s:SortIter(mid + 1, a:endNum, a:compare, a:eval, a:buffer.'R')
+    call s:SortIter(a:beginNum, mid, a:compare, a:eval, a:buffer . 'L')
+    call s:SortIter(mid + 1, a:endNum, a:compare, a:eval, a:buffer . 'R')
     let i = 1
     let j = 1
     let k = 1
-    while  exists(a:buffer.'L'.i) && exists(a:buffer.'R'.j)
+    while  exists(a:buffer . 'L' . i) && exists(a:buffer . 'R' . j)
       if {a:compare}({a:eval}({a:buffer}R{j}), {a:eval}({a:buffer}L{i}))
         let {a:buffer}{k} = {a:buffer}R{j}
         unlet {a:buffer}R{j}
@@ -1362,13 +2776,13 @@
       endif
       let k = k + 1
     endwhile
-    while exists(a:buffer.'L'.i)
+    while exists(a:buffer . 'L' . i)
       let {a:buffer}{k} = {a:buffer}L{i}
       unlet {a:buffer}L{i}
       let i = i + 1
       let k = k + 1
     endwhile
-    while exists(a:buffer.'R'.j)
+    while exists(a:buffer . 'R' . j)
       let {a:buffer}{k} = {a:buffer}R{j}
       unlet {a:buffer}R{j}
       let j = j + 1
@@ -1377,124 +2791,140 @@
   endif
 endfunction
 " function! s:Sort(beginNum, endNum, compare, eval, swap)
-  " insert sort
-  " let i = a:beginNum + 1
-  " while i <= a:endNum
-    " let j = i
-    " while j > a:beginNum
-      " if {a:compare}({a:eval}(j), {a:eval}(j - 1))
-        " call {a:swap}(j, j - 1)
-      " endif
-      " let j = j - 1
-    " endwhile
-    " let i = i + 1
-  " endwhile
-  " quick sort
-  " TODO:安定に整列するために merge sort か insert sort にした方がいい？
-  " N^2 と N logN の差が効くほど検索結果の数は増えないかも…？
-  " →大嘘．かなり違う．
-  " if a:beginNum < a:endNum
-    " let mid = (a:beginNum + a:endNum) / 2
-    " call {a:swap}(a:beginNum, mid)
-    " let p = a:beginNum
-    " let i = a:beginNum + 1
-    " while i <= a:endNum
-      " if {a:compare}({a:eval}(i), {a:eval}(a:beginNum))
-        " let p = p + 1
-        " call {a:swap}(i, p)
-      " endif
-      " let i = i + 1
-    " endwhile
-    " call {a:swap}(a:beginNum, p)
-    " call s:Sort(a:beginNum, p - 1, a:compare, a:eval, a:swap)
-    " call s:Sort(p + 1, a:endNum, a:compare, a:eval, a:swap)
-  " endif
+" insert sort
+" let i = a:beginNum + 1
+" while i <= a:endNum
+" let j = i
+" while j > a:beginNum
+" if {a:compare}({a:eval}(j), {a:eval}(j - 1))
+" call {a:swap}(j, j - 1)
+" endif
+" let j = j - 1
+" endwhile
+" let i = i + 1
+" endwhile
+" quick sort
+" TODO:安定に整列するために merge sort か insert sort にした方がいい？
+" N^2 と N logN の差が効くほど検索結果の数は増えないかも…？
+" →大嘘．かなり違う．
+" if a:beginNum < a:endNum
+" let mid = (a:beginNum + a:endNum) / 2
+" call {a:swap}(a:beginNum, mid)
+" let p = a:beginNum
+" let i = a:beginNum + 1
+" while i <= a:endNum
+" if {a:compare}({a:eval}(i), {a:eval}(a:beginNum))
+" let p = p + 1
+" call {a:swap}(i, p)
+" endif
+" let i = i + 1
+" endwhile
+" call {a:swap}(a:beginNum, p)
+" call s:Sort(a:beginNum, p - 1, a:compare, a:eval, a:swap)
+" call s:Sort(p + 1, a:endNum, a:compare, a:eval, a:swap)
+" endif
 " endfunction
 
-function! s:SortKeyInput()
-  let key = input(s:prefix_howm.s:prompt_input_sortkey)
-  if key == 'name'
-    call s:SortByName()
-  elseif key == 'name-match'
-    call s:SortByNameMatch(input(s:prefix_howm.s:prompt_input_matchpattern))
-  elseif key == 'mtime'
-    call s:SortByMtime()
-  elseif key == 'content'
-    call s:SortByContent()
-  elseif key == 'content-match'
-    call s:SortByContentMatch(input(s:prefix_howm.s:prompt_input_matchpattern))
-  elseif key == 'reverse'
-    call s:Reverse()
-  else
-    " TODO:エラーメッセージ
-    return
-  endif
-  call s:FormatSearchResult()
-endfunction
-
-" 現在と逆順にする．
-function! s:Reverse()
-  let i = 1
-  let endval = b:searchResultNum / 2
-  while i <= endval
-    call s:SwapSearchResult(i, b:searchResultNum - i + 1)
-    let i = i + 1
-  endwhile
-endfunction
-
-" ファイル名を元にソート．
-function! s:SortByName()
-  call s:SortSearchResult('s:LessThan', 's:LoadFileName', 's:PickSearchResultEval', 's:BackSearchResultEval')
-endfunction
-
-" 指定したファイル名を上位に移す．
-function! s:SortByNameMatch(matchPattern)
-  let b:matchPattern = a:matchPattern
-  call s:SortSearchResult('s:GreaterThan', 's:MatchFileName', 's:PickSearchResultEval', 's:BackSearchResultEval')
-  unlet b:matchPattern
-endfunction
-
-" ファイルの更新日時をもとにソート．
-function! s:SortByMtime()
-  call s:SortSearchResult('s:GreaterThan', 's:LoadMtime', 's:PickSearchResultEval', 's:BackSearchResultEval')
-endfunction
-
-" 検索結果の内容をもとにソート．
-function! s:SortByContent()
-  call s:SortSearchResult('s:LessThan', 's:LoadContent', 's:PickSearchResultEval', 's:BackSearchResultEval')
-endfunction
-
-" 指定した検索結果の内容を上位に移す．
-function! s:SortByContentMatch(matchPattern)
-  let b:matchPattern = a:matchPattern
-  call s:SortSearchResult('s:GreaterThan', 's:MatchContent', 's:PickSearchResultEval', 's:BackSearchResultEval')
-  unlet b:matchPattern
-endfunction
-
-" Todo の優先度をもとにソート．
-function! s:SortByPriority()
-  call s:SortSearchResult('s:CompareFraction', 's:Priority', 's:PickSearchResultEval', 's:BackSearchResultEval')
-endfunction
-
 " s:ParseSearchResult() で解析された検索結果をソート．
 function! s:SortSearchResult(compare, eval, pick, back)
-  " let bt = localtime()
-  redraw!
-  echo s:prefix_howm.s:msg_wait_sort
+  redraw | echo s:prefix_howm . s:msg_wait_sort
   let i = 1
   while i <= b:searchResultNum
     let b:eval{i} = {a:eval}(i)
     let i = i + 1
   endwhile
-  call s:Sort(1, b:searchResultNum, a:compare, 's:LoadSearchResultEval', a:pick, a:back)
+  call s:Sort(1, b:searchResultNum, a:compare, 's:LoadSearchResultEval',
+        \ a:pick, a:back)
   let i = 1
   while i <= b:searchResultNum
     unlet b:eval{i}
     let i = i + 1
   endwhile
-  redraw!
-  echo s:prefix_howm.s:msg_wait_sort.s:msg_done
-  " echo localtime() - bt
+  redraw | echo s:prefix_howm . s:msg_wait_sort . s:msg_done
+endfunction
+
+" すべてのソートは Sort2() を経由して行う。
+"  ( Sort2() => SortSearchResult() => Sort() の形で呼び出される )
+" type: ソートの種類
+"   input         ソートの種類の入力を求める
+"   name          ファイル名
+"   name-match    ファイル名 ( 指定したファイル名を上位に )
+"   mtime         ファイルの更新日時
+"   content       検索結果の内容
+"   content-match 検索結果の内容 ( 指定した検索結果の内容を上位に )
+"   priority      TODOの優先度
+"   reverse       逆順
+" match: 正規表現(Vim)
+"   name-match, content-match で使用する検索パターン
+"
+function! s:Sort2(type, match)
+  if a:type == 'input'
+    " TODO:補完するか、候補を表示した方が良い
+    let key = input(s:prefix_howm . s:prompt_input_sortkey)
+    if key == 'name' || key == 'mtime' || key == 'content' || key == 'reverse'
+      call s:Sort2(key, '')
+    elseif key == 'name-match' || key =='content-match'
+      call s:Sort2(key, input(s:prefix_howm . s:prompt_input_matchpattern))
+    else
+      let errmsg = s:prefix_howm . s:errmsg_invalidstype
+      redraw | echohl WarningMsg | echomsg errmsg | echohl None
+      return
+    endif
+    call s:FormatSearchResult()
+    return
+  endif
+
+  if a:type == 'reverse'
+    let order = s:GetSearchInfo('order', '')
+    if order == '+'
+      call s:SetSearchInfo('order', '-')
+    elseif order == '-'
+      call s:SetSearchInfo('order', '+')
+    endif
+    let i = 1
+    let endval = b:searchResultNum / 2
+    while i <= endval
+      call s:SwapSearchResult(i, b:searchResultNum - i + 1)
+      let i = i + 1
+    endwhile
+    return
+  endif
+
+  call s:SetSearchInfo('sort', a:type)
+
+  if a:type == 'name'
+    call s:SetSearchInfo('order', '+')
+    call s:SortSearchResult('s:LessThan', 's:LoadFileName',
+          \ 's:PickSearchResultEval', 's:BackSearchResultEval')
+  elseif a:type == 'name-match'
+    call s:SetSearchInfo('order', '-')
+    let b:matchPattern = a:match
+    call s:SortSearchResult('s:GreaterThan', 's:MatchFileName',
+          \ 's:PickSearchResultEval', 's:BackSearchResultEval')
+    unlet b:matchPattern
+  elseif a:type == 'mtime'
+    call s:SetSearchInfo('order', '-')
+    call s:SortSearchResult('s:GreaterThan', 's:LoadMtime',
+          \ 's:PickSearchResultEval', 's:BackSearchResultEval')
+  elseif a:type == 'content'
+    call s:SetSearchInfo('order', '+')
+    call s:SortSearchResult('s:LessThan', 's:LoadContent',
+          \ 's:PickSearchResultEval', 's:BackSearchResultEval')
+  elseif a:type == 'content-match'
+    call s:SetSearchInfo('order', '-')
+    let b:matchPattern = a:match
+    call s:SortSearchResult('s:GreaterThan', 's:MatchContent',
+          \ 's:PickSearchResultEval', 's:BackSearchResultEval')
+    unlet b:matchPattern
+  elseif a:type == 'priority'
+    call s:SetSearchInfo('order', '-')
+    call s:SortSearchResult('s:CompareFraction', 's:Priority',
+          \ 's:PickSearchResultEval', 's:BackSearchResultEval')
+  else
+    let errmsg = s:prefix_howm . s:errmsg_invalidstype
+    redraw | echohl WarningMsg | echomsg errmsg | echohl None
+    return
+  endif
 endfunction
 
 function! s:LoadSearchResultEval(x)
@@ -1591,17 +3021,16 @@
 endfunction
 
 function! s:Priority(x)
-  if g:howm_reminder_old_format != 0
-    return s:PriorityOld(a:x)
-  endif
+  let pat = '\[' . s:GetDatePattern(2) . '\]'
   let content = b:content{a:x}
-  let content = strpart(content, match(content, '\['.s:pattern_date.'\]'))
-  let date = matchstr(content, s:pattern_date)
+  let content = strpart(content, match(content, pat))
+  let date = matchstr(content, s:GetDatePattern(2))
   let day = HowmDate2Int(date, g:howm_date_pattern)
   let today = HowmDate2Int(strftime(g:howm_date_pattern), g:howm_date_pattern)
   let late = today - day
-  let type = substitute(content, '\['.s:pattern_date.'\]\(.\)\(\d*\).*$', '\4', '')
-  let lazy = substitute(content, '\['.s:pattern_date.'\]\(.\)\(\d*\).*$', '\5', '') + 0
+  let pat = '\[' . s:GetDatePattern(2) . '\]\(.\)\(\d*\).*$'
+  let type = substitute(content, pat, '\1', '')
+  let lazy = substitute(content, pat, '\2', '') + 0
 
   if type == '-'
     let func = 's:PriorityNormal'
@@ -1634,9 +3063,9 @@
     let lz = a:lazy
   endif
   if a:late < 0
-    return (a:late - 77777 * lz).'/'.lz
+    return (a:late - 77777 * lz) . '/' . lz
   else
-    return (a:late * -1).'/'.lz
+    return (a:late * -1) . '/' . lz
   endif
 endfunction
 
@@ -1647,9 +3076,9 @@
     let lz = a:lazy
   endif
   if a:late < 0
-    return (a:late - 77777 * lz).'/'.lz
+    return (a:late - 77777 * lz) . '/' . lz
   else
-    return (-1 * s:init_todo * (a:late - lz)).'/'.lz
+    return (-1 * s:init_todo * (a:late - lz)) . '/' . lz
   endif
 endfunction
 
@@ -1662,11 +3091,11 @@
   " TODO:ホントはちょっと違う．厳密には late の計算方法を変えるべき．
   "      本家は late 計算の today に時刻まで使ってる．
   if a:late >= 0
-    return (a:late + 77777 * lz).'/'.lz
+    return (a:late + 77777 * lz) . '/' . lz
   elseif a:late < (-1 * lz)
-    return (a:late - 77777 * lz).'/'.lz
+    return (a:late - 77777 * lz) . '/' . lz
   else
-    return (-1 * s:init_deadline * a:late).'/'.lz
+    return (-1 * s:init_deadline * a:late) . '/' . lz
   endif
 endfunction
 
@@ -1677,27 +3106,189 @@
     let lz = a:lazy
   endif
   if a:late > 0
-    return (a:late - 77777 * lz).'/'.lz
+    return (a:late - 77777 * lz) . '/' . lz
   else
-    return a:late.'/'.lz
+    return a:late . '/' . lz
   endif
 endfunction
 
 function! s:PriorityDone(late, lazy)
-  return (a:late - 88888).'/1'
+  return (a:late - 88888) . '/1'
 endfunction
 
 " functions - sort }}}
+" functions - searchinfo {{{
+function! s:SetSearchInfo(key, value)
+  if v:version < 700 | return | endif
+  if !exists('b:searchinfo') | let b:searchinfo = {} | endif
+  let b:searchinfo[a:key] = a:value
+endfunction
+
+function! s:GetSearchInfo(key, default)
+  if v:version < 700 | return a:default | endif
+  if !exists('b:searchinfo') | let b:searchinfo = {} | endif
+  return get(b:searchinfo, a:key, a:default)
+endfunction
+
+"
+" howm_searchinfo_format 
+" %type%    プログラムのタイプ
+"  * F:find     ... find
+"  * G:grep     ... grep.vim
+"  * V:vimgrep  ... :vimgrep
+"  * U:usergrep ... grep
+" %migemo%  migemo か否か
+"  *  :         ... %type% が F:find の場合は表示されない
+"  * n:normal   ... 非 migemo
+"  * m:migemo   ... migemo
+" %qtype%   検索クエリのタイプ
+"  *  :             ... %type% が F:find の場合は表示されない
+"  * f:fixed-string ... 固定文字列
+"  * e:regexp(grep) ... 正規表現(grep)
+"  * v:regexp(Vim)  ... 正規表現(Vim)
+" %case%    大文字小文字の区別の有無
+"  *  :             ... %type% が F:find の場合は表示されない
+"  * c:ignorecase   ... 区別しない
+"  * C:noignorecase ... 区別する
+" %sort%    ソートの種類
+"  * N:name     ... ファイル名
+"  * M:mtime    ... ファイルの更新日時
+"  * C:content  ... 検索結果の内容
+"  * P:priority ... TODOの優先度
+" %order%   昇順降順
+"  * +:ascend  ... 昇順
+"  * -:descend ... 降順
+" %query%   検索文字列 ( migemo 変換前 )
+" %rquery%  検索文字列 ( migemo 変換後 )
+" %time%    検索にかかった時間
+"
+" NOTE:%sort% と %case% の C を除いて省略記法は被っていない
+"
+" TODO:%prg% に対応する ( grep -o )
+" TODO:%dir% に対応する
+function! s:ShowSearchInfo()
+  if v:version < 700 | return | endif
+  let howm_searchinfo_format = g:howm_searchinfo_format
+  let type = s:GetSearchInfo('type', '')
+  let type_full = ''
+  if type == 'find'
+    let type = 'F'
+    let type_full = 'find'
+  elseif type == 'grep'
+    let type = 'G'
+    let type_full = 'grep.vim'
+  elseif type == 'vimgrep'
+    let type = 'V'
+    let type_full = ':vimgrep'
+  elseif type == 'usergrep'
+    let type = 'U'
+    let type_full = 'usergrep'
+  else
+    let type = ''
+    let type_full = ''
+  endif
+  let migemo = s:GetSearchInfo('migemo', -1)
+  let migemo_full = ''
+  if type == 'F'
+    let migemo = ''
+    let migemo_full = ''
+  elseif migemo
+    let migemo = 'm'
+    let migemo_full = 'migemo'
+  else
+    let migemo = 'n'
+    let migemo_full = 'normal'
+  endif
+  let case = s:GetSearchInfo('case', -1)
+  let case_full = ''
+  if type == 'F'
+    let case = ''
+    let case_full = ''
+  elseif case
+    let case = 'c'
+    let case_full = 'ignorecase'
+  else
+    let case = 'C'
+    let case_full = 'noignorecase'
+  endif
+  let sort = s:GetSearchInfo('sort', '')
+  let sort_full = ''
+  if sort == 'name' || sort == 'name-match'
+    let sort = 'N'
+    let sort_full = 'name'
+  elseif sort == 'mtime'
+    let sort = 'M'
+    let sort_full = 'mtime'
+  elseif sort == 'content' || sort == 'content-match'
+    let sort = 'C'
+    let sort_full = 'content'
+  elseif sort == 'priority'
+    let sort = 'P'
+    let sort_full = 'priority'
+  endif
+  let order = s:GetSearchInfo('order', '')
+  let order_full = ''
+  if order == '+'
+    let order_full = 'ascend'
+  else
+    let order_full = 'descend'
+  endif
+  let qtype = s:GetSearchInfo('qtype', -1)
+  let qtype_full = ''
+  if type == 'F'
+    let qtype = ''
+  elseif qtype == 0
+    let qtype = 'f'
+    let qtype_full = 'fixed-string'
+  elseif qtype == 1
+    let qtype = 'e'
+    let qtype_full = 'regexp(grep)'
+  elseif qtype == 2
+    let qtype = 'v'
+    let qtype_full = 'regexp(Vim)'
+  endif
+  let query = s:GetSearchInfo('query', '')
+  let rquery = s:GetSearchInfo('rquery', '')
+  let time = substitute(s:GetSearchInfo('time', ''), ' ', '', 'g')
+  let s = howm_searchinfo_format
+  let s = s:replace(s, '%migemo%', migemo)
+  let s = s:replace(s, '%MIGEMO%', migemo_full)
+  let s = s:replace(s, '%type%', type)
+  let s = s:replace(s, '%TYPE%', type_full)
+  let s = s:replace(s, '%case%', case)
+  let s = s:replace(s, '%CASE%', case_full)
+  let s = s:replace(s, '%sort%', sort)
+  let s = s:replace(s, '%SORT%', sort_full)
+  let s = s:replace(s, '%order%', order)
+  let s = s:replace(s, '%ORDER%', order_full)
+  let s = s:replace(s, '%qtype%', qtype)
+  let s = s:replace(s, '%QTYPE%', qtype_full)
+  let s = s:replace(s, '%query%', query)
+  let s = s:replace(s, '%rquery%', rquery)
+  let s = s:replace(s, '%time%', time)
+  echo s
+endfunction
+" }}}
 
 function! s:GetDaysFromContent(content)
-  if g:howm_reminder_old_format != 0
-    return s:GetDaysFromContentOld(a:content)
-  endif
-  let content = strpart(a:content, match(a:content, '\['.s:pattern_date.'\]'))
-  let date = matchstr(content, s:pattern_date)
+  let pat = '\[' . s:GetDatePattern(2) . '\]'
+  let content = strpart(a:content, match(a:content, pat))
+  let date = matchstr(content, s:GetDatePattern(2))
   return HowmDate2Int(date, g:howm_date_pattern)
 endfunction
 
+function! s:getTime()
+  return has('reltime') ? reltime() : localtime()
+endfunction
+
+function! s:diffTime(t1, t2)
+  return has('reltime') ? reltimestr(reltime(a:t2, a:t1)) : (a:t1 - a:t2)
+endfunction
+
+function! s:replace(s, t, r)
+  return substitute(a:s, '\C\V' . escape(a:t, '\'), escape(a:r, '&~\'), 'g')
+endfunction
+
 " functions - debug {{{
 function! HowmDebugLog(msg)
   if !g:howm_debug
@@ -1706,24 +3297,24 @@
   if !exists('g:howm_debug_log')
     let g:howm_debug_log = ''
   endif
-  let g:howm_debug_log = g:howm_debug_log.s:prefix_howm.a:msg."\<NL>"
+  let g:howm_debug_log = g:howm_debug_log . s:prefix_howm . a:msg . "\<NL>"
 endfunction
 
 function! HowmOutputLog()
-	if !g:howm_debug || !exists('g:howm_debug_log')
-		return
-	endif
-	call s:OpenTemporalWindow(s:prefix_howm.'Debug Log', 1)
+  if !g:howm_debug || !exists('g:howm_debug_log')
+    return
+  endif
+  call s:OpenTemporalWindow(s:prefix_howm . 'Debug Log', 1)
   let regbak = @z
   let @z = g:howm_debug_log
-	silent! $put z
+  silent! $put z
   let @z = regbak
-	unlet g:howm_debug_log
+  unlet g:howm_debug_log
 endfunction
 " functions - debug }}}
 
 " functions }}}
 
-call s:ParseKeyword()
+call s:LoadKeyword()
 
-" vim:set ts=2 sts=2 sw=2 tw=0 fdm=marker:
+" vim:set et nowrap ts=2 sts=2 sw=2 tw=0 fdm=marker:
diff -ur --binary howm_vim/syntax/howm_importantdate.vim howm_vim_new/syntax/howm_importantdate.vim
--- howm_vim/syntax/howm_importantdate.vim	2006-06-04 21:26:22.000000000 +0900
+++ howm_vim_new/syntax/howm_importantdate.vim	2008-04-08 14:11:38.884380000 +0900
@@ -1,7 +1,7 @@
 "
 " howm_importantdate.vim - vim 用 howm の 予定や Todo に関するシンタックス．
 "
-" Last Change: 04-Jun-2006.
+" Last Change: 08-Apr-2008.
 " Written By: Kouichi NANASHIMA <claymoremine@anet.ne.jp>
 
 scriptencoding euc-jp
@@ -16,23 +16,12 @@
 exe 'syntax match howmDeadline display "\['.s:pattern_date.'\]!\d*"'
 exe 'syntax match howmSchedule display "\['.s:pattern_date.'\]@"'
 exe 'syntax match howmFinished display "\['.s:pattern_date.'\]\."'
-exe 'syntax match howmToday display "\(\[' . strftime(g:howm_date_pattern) . '\][-!@+.]\d*\)\@<=.*$"'
-exe 'syntax match howmTomorrow display "\(\[' . strftime(g:howm_date_pattern, localtime() + 86400) . '\][-!@+.]\d*\)\@<=.*$"'
-
-if g:howm_reminder_old_format != 0
-  exe 'syntax match howmNote display "@\['.s:pattern_date.'\]\(-\d\+\)\?"'
-  exe 'syntax match howmTodo display "@\['.s:pattern_date.'\]+\d*"'
-  exe 'syntax match howmDeadline display "@\['.s:pattern_date.'\]!\d*"'
-  exe 'syntax match howmSchedule display "@\['.s:pattern_date.'\]@"'
-  exe 'syntax match howmFinished display "@\['.s:pattern_date.'\]\."'
-  exe 'syntax match howmToday display "\(@\[' . strftime(g:howm_date_pattern) . '\]\(-\d\+\|[!@+.]\d*\)\?\)\@<=.*$"'
-  exe 'syntax match howmTomorrow display "\(@\[' . strftime(g:howm_date_pattern, localtime() + 86400) . '\]\(-\d\+\|[!@+.]\d*\)\?\)\@<=.*$"'
-endif
+" howmToday, howmTomorrow は howm-mode.vim の ShowSchedule で match
 
 hi howmNote ctermfg=Blue ctermbg=Grey guifg=Blue guibg=#d0d0d0
 hi howmTodo ctermfg=Yellow ctermbg=Grey guifg=Yellow guibg=#d0d0d0
 hi howmDeadline ctermfg=Red ctermbg=Grey guifg=Red guibg=#d0d0d0
-hi howmSchedule ctermfg=Green ctermbg=Grey guifg=Green guibg=#d0d0d0
+hi howmSchedule ctermfg=DarkGreen ctermbg=Grey guifg=DarkGreen guibg=#d0d0d0
 hi howmFinished ctermfg=DarkGrey ctermbg=Grey guifg=DarkGrey guibg=#d0d0d0
 hi howmToday ctermfg=Black ctermbg=Yellow guifg=Black guibg=Orange
 hi howmTomorrow ctermfg=Black ctermbg=DarkYellow guifg=White guibg=Brown
diff -ur --binary howm_vim/syntax/howm_memo.vim howm_vim_new/syntax/howm_memo.vim
--- howm_vim/syntax/howm_memo.vim	2006-06-04 21:26:22.000000000 +0900
+++ howm_vim_new/syntax/howm_memo.vim	2008-04-08 14:11:38.884380000 +0900
@@ -1,7 +1,7 @@
 "
 " howm.vim - vim 用 howm のシンタックス．
 "
-" Last Change: 04-Jun-2006.
+" Last Change: 08-Apr-2008.
 " Written By: Kouichi NANASHIMA <claymoremine@anet.ne.jp>
 
 scriptencoding euc-jp
@@ -18,16 +18,27 @@
   let s:pattern_date      = substitute(s:pattern_date, '%m', '\\(\\d\\{2}\\)', '')
   let s:pattern_date      = substitute(s:pattern_date, '%d', '\\(\\d\\{2}\\)', '')
 
-exe 'syntax match howmMemoTitle display "\(^'.g:howm_title_pattern.' \)\@<=.*"'
+exe 'syntax match howmMemoTitle display "^'.g:howm_title_pattern.'\zs .*\ze" contains=ALL'
 exe 'syntax match howmActionLock display "'.g:howm_glink_pattern.'.*"'
 exe 'syntax match howmActionLock display "'.g:howm_clink_pattern.'"'
-if g:howm_keyword != '\V\(\)'
-  exe 'syntax match howmActionLock display "\v('.g:howm_keyword.')"'
+if g:howm_keyword != ''
+  exe 'syntax match howmActionLock display "\V\%('.g:howm_keyword.'\)"'
 endif
 exe 'syntax match howmActionLock display "'.s:pattern_date.'"'
 syntax match howmActionLock display "s\?https\?:\/\/[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]\+"
 syntax match howmActionLock display "{_}"
 syntax match howmActionLock display "{[-* ]}"
+if v:version >= 700
+  for actionlock in g:howm_actionlock_list
+    if has_key(actionlock, 'pat')
+      exe 'syntax match howmActionLock display "'.actionlock['pat'].'"'
+    elseif has_key(actionlock, 'list')
+      for word in actionlock['list']
+        exe 'syntax match howmActionLock display "\V'.escape(word,'\').'"'
+      endfor
+    endif
+  endfor
+endif
 
 hi def link howmMemoTitle Title
 hi def link howmActionLock      howmUnderlined