Merge branch 'master' of github.com:sparky4/16

Conflicts:
	pcxtest.exe
	scroll.exe
	test.exe
	test2.exe

diff --git a/Project 16.bfproject b/Project 16.bfproject
index a453f15dac453e54af7e4bc8660775d86154fc33..51d05af9964f5e29e1687f5f18651f258fb33bf6 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -1,67 +1,76 @@
-c2e.convert_special: 0
-e2c.convert_num: 0
-openfiles: /dos/z/16/src/scroll.c:0:378:1:
-snr_recursion_level: 0
-convertcolumn_horizontally: 0
-adv_open_matchname: 0
-show_mbhl: 1
-view_line_numbers: 1
-fb_show_backup_f: 0
-htmlbar_thumbnailwidth: 300
-view_left_panel: 0
-default_mime_type: text/plain
-e2c.convert_xml: 1
-c2e.convert_iso: 0
-opendir: file:///dos/z/16/src
-wrap_text_default: 0
-bookmarks_filename_mode: 1
-snr_casesens: 0
-view_blocks: 1
-name: Project 16
-fb_show_hidden_f: 0
-editor_tab_width: 4
-template: /usr/share/bluefish/templates/C_header_GPL
-show_visible_spacing: 0
-view_statusbar: 1
-display_right_margin: 1
-c2e.IE_apos_workaround: 0
-outputb_scroll_mode: 0
-leftpanel_active_tab: 0
-enable_syntax_scan: 1
-ssearch_regex: 0
-e2c.convert_iso: 0
-ssearch_casesens: 0
-charmap_block: 1
-snr_replacetype: 0
-savedir: file:///dos/z/16/src
-spell_check_default: 1
-spell_insert_entities: 0
-last_filefilter: 
-htmlbar_notebooktab: 0
-view_blockstack: 1
-snr_escape_chars: 0
-htmlbar_view: 1
-spell_lang: en
-ssearch_dotmatchall: 0
-autocomplete: 1
-outputb_show_all_output: 0
-bookmarks_show_mode: 0
-snippets_show_as_menu: 1
+view_main_toolbar: 1
+bmarksearchmode: 0
+snr_scope: 2
+snr_type: 0
+view_cline: 0
+editor_indent_wspaces: 0
+c2e.convert_xml: 1
+snr_dotmatchall: 0
+c2e.convert_symbol: 0
+filegloblist: *.xml
+filegloblist: *.txt
+filegloblist: *.shtml
+filegloblist: *.py
+filegloblist: *.pl
+filegloblist: *.php
+filegloblist: *.js
+filegloblist: *.java
+filegloblist: *.htm
+filegloblist: *.html
+filegloblist: *.h
+filegloblist: *.css
+filegloblist: *.cpp
+filegloblist: *.cgi
+filegloblist: *.c
+fb_focus_follow: 1
 adv_open_recursive: 0
+recent_dirs: file:///dos/z/16/src
 encoding: SHIFT_JIS
-e2c.convert_special: 0
 autoindent: 1
+e2c.convert_special: 0
 fb_viewmode: 0
-recent_dirs: file:///dos/z/16/src
-fb_focus_follow: 1
-ssearch_unescape: 0
-c2e.convert_symbol: 0
-snr_dotmatchall: 0
-c2e.convert_xml: 1
-editor_indent_wspaces: 0
-view_cline: 0
-snr_type: 0
-snr_scope: 2
-bmarksearchmode: 0
-view_main_toolbar: 1
+htmlbar_view: 1
+snippets_show_as_menu: 1
+bookmarks_show_mode: 0
+outputb_show_all_output: 0
+autocomplete: 1
+spell_lang: en
+snr_escape_chars: 0
+view_blockstack: 1
+htmlbar_notebooktab: 0
+last_filefilter: 
+spell_insert_entities: 0
+spell_check_default: 1
+savedir: file:///dos/z/16/src
+snr_replacetype: 0
+charmap_block: 1
+e2c.convert_iso: 0
+enable_syntax_scan: 1
+outputb_scroll_mode: 0
+leftpanel_active_tab: 0
+c2e.IE_apos_workaround: 0
+display_right_margin: 1
+template: /usr/share/bluefish/templates/C_header_GPL
+editor_tab_width: 4
+view_statusbar: 1
+fb_show_hidden_f: 0
+name: Project 16
+view_blocks: 1
+snr_casesens: 0
+c2e.convert_iso: 0
+bookmarks_filename_mode: 1
+wrap_text_default: 0
+opendir: file:///dos/z/16/src
+e2c.convert_xml: 1
+default_mime_type: text/plain
+view_left_panel: 0
+htmlbar_thumbnailwidth: 300
+fb_show_backup_f: 0
+view_line_numbers: 1
+show_mbhl: 1
+adv_open_matchname: 0
+convertcolumn_horizontally: 0
+snr_recursion_level: 0
 e2c.convert_symbol: 0
+e2c.convert_num: 0
+c2e.convert_special: 0

diff --git a/pcxtest.exe b/pcxtest.exe
index e13ada6699a6998caf703c0c328fb26139e7b2ce..41fd3d952e69cc4c121ab2f7ea191038e0dd41bf 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 05fc5f4ee122f71674ef41b6d0c4e8b5d238845d..706aea7d2f9d5f7435ccf5b582dcf20daa49ad81 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/test.exe b/test.exe
index 4dae76db4bea4ee902435dc7d92efcac58b7faff..2c0f7105232945723342088ffc42d31a2e1f3892 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 7878dbc4e243afe8c483edcb264dd4e3221ea4f1..20f665fbca47c00ee6f6905bef829f7fe54267a9 100644 (file)
Binary files a/test2.exe and b/test2.exe differ