updated for version 7.0138

runtime/doc/autocmd.txt

@@ -155,6 +155,17 @@ argument behavior differs from that for defining and removing autocommands.
 In order to list buffer-local autocommands, use a pattern in the form <buffer>
 or <buffer=N>.  See |autocmd-buflocal|.
 
+							*:autocmd-verbose*
+When 'verbose' is non-zero, listing an autocommand will also display where it
+was last defined. Example: >
+
+    :verbose autocmd BufEnter
+    FileExplorer  BufEnter
+	*         call s:LocalBrowse(expand("<amatch>"))
+	    Last set from /usr/share/vim/vim-7.0/plugin/NetrwPlugin.vim
+<
+See |:verbose-cmd| for more information.
+
 ==============================================================================
 5. Events					*autocmd-events* *E215* *E216*
 

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 23
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1100,7 +1100,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not available when compiled without the  |+linebreak|
 			feature}
 	This option lets you choose which characters might cause a line
-	break if 'linebreak' is on.
+	break if 'linebreak' is on.  Only works for ASCII and also for 8-bit
+	characters when 'encoding' is an 8-bit encoding.
 
 						*'browsedir'* *'bsdir'*
 'browsedir' 'bsdir'	string	(default: "last")
@@ -7282,7 +7283,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 				   *'wrapscan'* *'ws'* *'nowrapscan'* *'nows'*
 'wrapscan' 'ws'		boolean	(default on)			*E384* *E385*
 			global
-	Searches wrap around the end of the file.
+	Searches wrap around the end of the file.  Also applies to |]s| and
+	|[s|, searching for spelling mistakes.
 
 						   *'write'* *'nowrite'*
 'write'			boolean	(default on)

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 27
+*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Aug 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -756,6 +756,7 @@ Short explanation of each option:		*option-list*
 |'maxmempattern'| |'mmp'|    maximum memory (in Kbyte) used for pattern search
 |'maxmemtot'|	  |'mmt'|    maximum memory (in Kbyte) used for all buffers
 |'menuitems'|	  |'mis'|    maximum number of items in a menu
+|'mkspellmem'|    |'msm'|    memory used before |:mkspell| compresses the tree
 |'modeline'|	  |'ml'|     recognize modelines at start or end of file
 |'modelines'|	  |'mls'|    number of lines checked for modelines
 |'modifiable'|	  |'ma'|     changes to the text are not possible

runtime/doc/spell.txt

@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 25
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -43,6 +43,7 @@ To search for the next misspelled word:
 							*]s* *E756*
 ]s			Move to next misspelled word after the cursor.
 			A count before the command can be used to repeat.
+			'wrapscan' applies.
 
 							*[s*
 [s			Like "]s" but search backwards, find the misspelled
@@ -514,7 +515,7 @@ used spelling files, use this command:
 
 							*:spelldump* *:spelld*
 :spelld[ump]		Open a new window and fill it with all currently valid
-			words.
+			words.  Compound words are not included.
 			Note: For some languages the result may be enormous,
 			causing Vim to run out of memory.
 
@@ -915,6 +916,12 @@ word itself is not a good word.  Example:
 
 	NEEDAFFIX + ~
 
+							*spell-NEEDCOMPOUND*
+The NEEDCOMPOUND flag is used to require that a word is used as part of a
+compound word The word itself is not a good word.  Example:
+
+	NEEDCOMPOUND & ~
+
 
 COMPOUND WORDS						*spell-compound*
 
@@ -988,13 +995,13 @@ A specific example: Allow a compound to be made of two words and a dash:
 This allows for the word "start-end", but not "startend".
 
 							*spell-COMPOUNDMIN*
-The minimal byte length of a word used for concatenation is specified with
+The minimal character length of a word used for compounding is specified with
 COMPOUNDMIN.  Example:
 	COMPOUNDMIN 5 ~
 
-When omitted a minimal length of 3 bytes is used.  Obviously you could just
-leave out the compound flag from short words instead, this feature is present
-for compatibility with Myspell.
+When omitted there is no minimal length.  Obviously you could just leave out
+the compound flag from short words instead, this feature is present for
+compatibility with Myspell.
 
 							*spell-COMPOUNDMAX*
 The maximum number of words that can be concatenated into a compound word is

runtime/doc/tags

@@ -4226,6 +4226,7 @@ autocmd-patterns	autocmd.txt	/*autocmd-patterns*
 autocmd-remove	autocmd.txt	/*autocmd-remove*
 autocmd-searchpat	autocmd.txt	/*autocmd-searchpat*
 autocmd-use	autocmd.txt	/*autocmd-use*
+autocmd-verbose	autocmd.txt	/*autocmd-verbose*
 autocmd.txt	autocmd.txt	/*autocmd.txt*
 autocmds-kept	version5.txt	/*autocmds-kept*
 autocommand	autocmd.txt	/*autocommand*

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 06
+*term.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -291,6 +291,7 @@ Added by Vim (there are no standard codes for these):
 	t_WS	set window size (height, width) in characters	*t_WS* *'t_WS'*
 	t_SI    start insert mode (bar cursor shape)            *t_SI* *'t_SI'*
 	t_EI    end insert mode (block cursor shape)            *t_EI* *'t_EI'*
+		|termcap-cursor-shape|
 	t_RV	request terminal version string (for xterm)	*t_RV* *'t_RV'*
 		|xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes|
 
@@ -427,6 +428,7 @@ Example for an xterm, this changes the color of the cursor: >
     endif
 NOTE: When Vim exits the shape for Normal mode will remain.  The shape from
 before Vim started will not be restored.
+{not available when compiled without the +cursorshape feature}
 
 							*termcap-title*
 The 't_ts' and 't_fs' options are used to set the window title if the terminal

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 25
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -31,21 +31,14 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 -------------------- Known bugs and current work -----------------------
 
 Spelling:
-- Use 'wrapscan' for "[s" and "]s"?
-
-- Is there a way to avoid compound IDs taking two utf-8 bytes?
-
-- Make COMPOUNDMIN 3 characters instead of 3 bytes.
-
 - Check support of flags of two characters, numbers (comma separated) and HUH.
   When using many compound flags, does regexp still work?
 
+- "zg" doesn't work for Thai?
+
 - Compound word is accepted if nr of words is <= COMPOUNDMAX OR nr of
   syllables <= COMPOUNDSYLMAX.  Specify AND in the affix file?
 
-- ONLYINCOMPOUND -> NEEDCOMPOUND (also used for affix? or use "needcomp"
-  after affix)
-
 - COMPOUNDMAX -> COMPOUNDWORDMAX?
 
 - Support flags on a suffix.  Used for second level affixes.
@@ -54,6 +47,8 @@ Spelling:
   flags of the word are not used.
   Instead of "SFX a 0 add/FLAGS ." we could use "SFX a 0 add . /FLAGS".
 
+- NEEDCOMPOUND also used for affix?  Or use "needcomp" after affix?
+
 - Do we need a flag for the rule that when compounding is done the following
   word doesn't have a capital after a word character, even for Onecap words?
 
@@ -1482,6 +1477,10 @@ Multi-byte characters:
 7   In "-- INSERT (lang) --" show the name of the keymap used instead of
     "lang". (Ilya Dogolazky)
 -   Make 'langmap' accept multi-byte characters.
+-   Make 'breakat' accept multi-byte characters.  Problem: can't use a lookup
+    table anymore (breakat_flags[]).
+    Simplistic solution: when 'formatoptions' contains "m" also break a line
+    at a multi-byte character >= 0x100.
 -   Do we need the reverse of 'keymap', like 'langmap' but with files and
     multi-byte characters?  E.g., when using a Russian keyboard.
 -   Add the possibility to enter mappings which are used whenever normal text

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 22
+*various.txt*   For Vim version 7.0aa.  Last change: 2005 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -268,6 +268,8 @@ N  *+cmdline_info*	|'showcmd'| and |'ruler'|
 N  *+comments*		|'comments'| support
 N  *+cryptv*		encryption support |encryption|
 B  *+cscope*		|cscope| support
+m  *+cursorshape*	|termcap-cursor-shape| support
+m  *+debug*		Compiled for debugging.
 N  *+dialog_gui*	Support for |:confirm| with GUI dialog.
 N  *+dialog_con*	Support for |:confirm| with console dialog.
 N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.
@@ -487,10 +489,11 @@ N  *+X11*		Unix only: can restore window title |X11|
 
 							*:verbose-cmd*
 When 'verbose' is non-zero, listing the value of a Vim option or a key map or
-a user-defined function or a command or a highlight group will also display
-where it was last defined.  If it was defined manually then there will be no
-"Last set" message.  When it was defined while executing a function, user
-command or autocommand, the script in which it was defined is reported.
+a user-defined function or a command or a highlight group or an autocommand
+will also display where it was last defined.  If it was defined manually then
+there will be no "Last set" message.  When it was defined while executing a
+function, user command or autocommand, the script in which it was defined is
+reported.
 {not available when compiled without the +eval feature}
 
 							*K*

runtime/doc/version7.txt

@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Aug 24
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Aug 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -327,7 +327,7 @@ Various new items					*new-items-7*
 Normal mode commands: ~
 
 a", a' and a`		New text objects to select quoted strings. |a'|
-i", i' and i'		(Taro Muraoka)
+i", i' and i`		(Taro Muraoka)
 
 CTRL-W <Enter>		In the quickfix window: opens a new window to show the
 			location of the error under the cursor.
@@ -565,8 +565,8 @@ For xterm most combinations of modifiers with function keys are recognized.
 
 When 'verbose' is set the output of ":highlight" will show where a highlight
 item was last set.
-When 'verbose' is set the output of ":map", ":command" and ":function"
-commands will show where it was last defined. (Yegappan Lakshmanan)
+When 'verbose' is set the output of the ":map", ":command", ":function" and
+":autocmd" commands will show where it was last defined. (Yegappan Lakshmanan)
 
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
@@ -774,6 +774,11 @@ sorted: user commands, variables, syntax names, etc.
 When no locale is set, thus using the "C" locale, Vim will work with latin1
 characters, using it's own isupper()/toupper()/etc. functions.
 
+When using an rxvt terminal emulator guess the value of 'background' using the
+COLORFGBG environment variable. (Ciaran McCreesh)
+
+Also support t_SI and t_EI on Unix with normal features. (Ciaran McCreesh)
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Aug 24
+" Last Change:	2005 Aug 29
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1200,7 +1200,7 @@ function! s:FTprogress_asm()
   " This function checks for an assembly comment the first ten lines.
   " If not found, assume Progress.
   let lnum = 1
-  while lnum <= 10
+  while lnum <= 10 && lnum < line('$')
     let line = getline(lnum)
     if line =~ '^\s*;' || line =~ '^\*'
       call s:FTasm()
@@ -1227,9 +1227,9 @@ function! s:FTprogress_pascal()
   " Look for either an opening comment or a program start.
   " If not found, assume Progress.
   let lnum = 1
-  while lnum <= 10
+  while lnum <= 10 && lnum < line('$')
     let line = getline(lnum)
-    if line =~ '^\s*\(program\|procedure\|function\|const\|type\|var\)\>'
+    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
 	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
       setf pascal
       return

runtime/optwin.vim

@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jul 11
+" Last Change:	2005 Aug 29
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -403,6 +403,8 @@ if has("syntax")
   call <SID>OptionL("spc")
   call append("$", "spellsuggest\tmethods used to suggest corrections")
   call <SID>OptionG("sps", &sps)
+  call append("$", "mkspellmem\tamount of memory used by :mkspell before compressing")
+  call <SID>OptionG("msm", &msm)
 endif
 
 

runtime/spell/bg/main.aap

@@ -19,7 +19,6 @@ $SPELLDIR/bg.utf-8.spl : $FILES
 
 ../README_bg.txt: README_bg_BG.txt
         :copy $source $target
-        :sys $VIM $target -e -c "set ff=unix" -c wq
 
 #
 # Fetching the files from OpenOffice.org.
@@ -35,8 +34,9 @@ bg_BG.aff bg_BG.dic: {buildcheck=}
         :fetch bg_BG.zip
         :sys $UNZIP bg_BG.zip
         :delete bg_BG.zip
-        :sys $VIM bg_BG.aff -c "set ff=unix" -c "update" -c q
-        :sys $VIM bg_BG.dic -c "set ff=unix" -c "update" -c q
+        :sys $VIM bg_BG.aff -e -c "set ff=unix" -c update -c q
+        :sys $VIM bg_BG.dic -e -c "set ff=unix" -c update -c q
+        :sys $VIM README_bg_BG.txt -e -c "set ff=unix" -c update -c q
         @if not os.path.exists('bg_BG.orig.aff'):
             :copy bg_BG.aff bg_BG.orig.aff
         @if not os.path.exists('bg_BG.orig.dic'):

runtime/spell/main.aap

@@ -4,7 +4,8 @@
 # aap        generate all the .spl files
 # aap diff   create all the diff files
 
-LANG = af am bg ca cs da de el en eo es fr fo gl he hr it nl ny pl sk th yi hu
+LANG = af am bg ca cs da de el en eo es fr fo gl he hr it nl ny pl ru sk
+       th yi hu
 
 # "hu" is at the end, because it takes very long.
 #

runtime/spell/ru/main.aap

@@ -0,0 +1,104 @@
+# Aap recipe for Russian Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+REGIONS = RU IE YO
+SPELLDIR = ..
+FILES    = ru_$*(REGIONS).aff ru_$*(REGIONS).dic
+
+all: $SPELLDIR/ru.koi8-r.spl $SPELLDIR/ru.utf-8.spl \
+        $SPELLDIR/ru.cp1251.spl ../README_ru.txt
+
+$SPELLDIR/ru.koi8-r.spl : $FILES
+        :sys env LANG=ru_RU.KOI8-R $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q
+
+$SPELLDIR/ru.utf-8.spl : $FILES
+        :sys env LANG=ru_RU.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q
+
+$SPELLDIR/ru.cp1251.spl : $FILES
+        :sys env LANG=ru_RU.CP1251 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q
+
+../README_ru.txt: README_ru_$*(REGIONS).txt
+        :print ru_RU >! $target
+        :cat README_ru_RU.txt >> $target
+        :print =================================================== >>$target
+        :print ru_IE >> $target
+        :cat README_ru_IE.txt >> $target
+        :print =================================================== >>$target
+        :print ru_YO >> $target
+        :cat README_ru_YO.txt >> $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} ru_RU.zip ru_RU_ye.zip ru_RU_yo.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# This is a bit tricky, since the file name includes the date.
+ru_RU.aff ru_RU.dic: {buildcheck=}
+        :assertpkg unzip
+        :fetch ru_RU.zip
+        :sys unzip ru_RU.zip
+        :delete ru_RU.zip
+        @if not os.path.exists('ru_RU.orig.aff'):
+            :copy ru_RU.aff ru_RU.orig.aff
+        @if not os.path.exists('ru_RU.orig.dic'):
+            :copy ru_RU.dic ru_RU.orig.dic
+        @if os.path.exists('ru_RU.diff'):
+            :sys patch <ru_RU.diff
+
+ru_IE.aff ru_IE.dic: {buildcheck=}
+        :assertpkg unzip
+        :fetch ru_RU_ye.zip
+        :sys unzip ru_RU_ye.zip
+        :delete ru_RU_ye.zip
+        :move ru_RU_ie.aff ru_IE.aff
+        :move ru_RU_ie.dic ru_IE.dic
+        :move README_ru_RU_ie.txt README_ru_IE.txt
+        @if not os.path.exists('ru_IE.orig.aff'):
+            :copy ru_IE.aff ru_IE.orig.aff
+        @if not os.path.exists('ru_IE.orig.dic'):
+            :copy ru_IE.dic ru_IE.orig.dic
+        @if os.path.exists('ru_IE.diff'):
+            :sys patch <ru_IE.diff
+
+ru_YO.aff ru_YO.dic: {buildcheck=}
+        :assertpkg unzip
+        :fetch ru_RU_yo.zip
+        :sys unzip ru_RU_yo.zip
+        :delete ru_RU_yo.zip
+        :move ru_RU_yo.aff ru_YO.aff
+        :move ru_RU_yo.dic ru_YO.dic
+        :move README_ru_RU_yo.txt README_ru_YO.txt
+        @if not os.path.exists('ru_YO.orig.aff'):
+            :copy ru_YO.aff ru_YO.orig.aff
+        @if not os.path.exists('ru_YO.orig.dic'):
+            :copy ru_YO.dic ru_YO.orig.dic
+        @if os.path.exists('ru_YO.diff'):
+            :sys patch <ru_YO.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 ru_RU.orig.aff ru_RU.aff >ru_RU.diff
+        :sys {force} diff -a -C 1 ru_RU.orig.dic ru_RU.dic >>ru_RU.diff
+        :sys {force} diff -a -C 1 ru_IE.orig.aff ru_IE.aff >ru_IE.diff
+        :sys {force} diff -a -C 1 ru_IE.orig.dic ru_IE.dic >>ru_IE.diff
+        :sys {force} diff -a -C 1 ru_YO.orig.aff ru_YO.aff >ru_YO.diff
+        :sys {force} diff -a -C 1 ru_YO.orig.dic ru_YO.dic >>ru_YO.diff
+
+
+# Check for updated spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :print Doesn't work yet.

runtime/spell/ru/ru_RU.diff

@@ -0,0 +1,32 @@
+*** ru_RU.orig.dic	Sat Aug 27 22:54:55 2005
+--- ru_RU.dic	Sun Aug 28 11:46:34 2005
+***************
+*** 8767,8769 ****
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/F
+- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/AZ
+--- 8767,8768 ----
+***************
+*** 98086,98088 ****
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/AES
+- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/AS
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
+--- 98085,98086 ----
+***************
+*** 115007,115009 ****
+  <20><><EFBFBD><EFBFBD><EFBFBD>/B
+- <20><><EFBFBD><EFBFBD><EFBFBD>/O
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L
+--- 115005,115006 ----
+***************
+*** 119209,119211 ****
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ASX
+- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/AX
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
+--- 119206,119207 ----
+***************
+*** 120603,120605 ****
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ASX
+- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/AX
+  <20><><EFBFBD><EFBFBD>/L
+--- 120599,120600 ----

runtime/spell/ru/ru_YO.diff

@@ -0,0 +1,14 @@
+*** ru_YO.orig.dic	Sat Aug 27 22:54:55 2005
+--- ru_YO.dic	Sun Aug 28 11:46:58 2005
+***************
+*** 86471,86473 ****
+  <20><><EFBFBD>ԣ<EFBFBD><D4A3><EFBFBD><EFBFBD>/AS
+- <20><><EFBFBD><EFBFBD><EFBFBD>
+  <20><><EFBFBD><EFBFBD><EFBFBD>/B
+--- 86471,86472 ----
+***************
+*** 115246,115248 ****
+  <20><><EFBFBD><EFBFBD><EFBFBD>/B
+- <20><><EFBFBD><EFBFBD><EFBFBD>/O
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L
+--- 115245,115246 ----