configs  Check-in [549f806987]

Overview
Comment:Update vim configs
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 549f80698700c57d54e74c2a8b700bc6fa34af23d79333d5073c1349a11609ec
User & Date: js 2017-06-05 20:24:36
Context
2017-06-05
20:25
Update gitconfig check-in: 50633ddd0e user: js tags: trunk
20:24
Update vim configs check-in: 549f806987 user: js tags: trunk
2016-09-28
19:26
zshrc: Switch to vi mode with some emacs bindings check-in: e63f67d956 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to vim/syntax/objc.vim.

︙︙
26
27
28
29
30
31
32
33

34
35
36


37
38
39
40
41
42
43

"
" NOTE: Objective C is abbreviated to ObjC/objc
" and uses *.h, *.m as file extensions!


" ObjC keywords, types, type qualifiers etc.
syn keyword objcStatement	self super _cmd
syn keyword objcType		id Class SEL IMP BOOL nonnull nullable

syn keyword objcTypeModifier	bycopy in out inout oneway OF_GENERIC OF_INLINE
syn keyword objcTypeModifier	OF_CONST_FUNC OF_NO_RETURN
syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER OF_NULLABLE_PROPERTY


syn keyword objcTypeModifier	_Nonnull _Nullable _Null_unspecified __kindof
syn keyword objcConstant	nil Nil

" Match the ObjC #import directive (like C's #include)
syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
syn match  objcImported display contained "<[-_0-9a-zA-Z.\/]*>"
syn match  objcImport display "^\s*\(%:\|#\)\s*import\>\s*["<]" contains=objcImported








|
>

|

>
>








26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

"
" NOTE: Objective C is abbreviated to ObjC/objc
" and uses *.h, *.m as file extensions!


" ObjC keywords, types, type qualifiers etc.
syn keyword objcStatement	self super _cmd
syn keyword objcType		id Class SEL IMP BOOL
syn keyword objcType		nonnull nullable null_unspecified
syn keyword objcTypeModifier	bycopy in out inout oneway OF_GENERIC OF_INLINE
syn keyword objcTypeModifier	OF_KINDOF OF_CONST_FUNC OF_NO_RETURN
syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER OF_NULLABLE_PROPERTY
syn keyword objcTypeModifier	OF_NULL_RESETTABLE_PROPERTY OF_UNAVAILABLE
syn keyword objcTypeModifier	OF_DESIGNATED_INITIALIZER OF_METHOD_FAMILY
syn keyword objcTypeModifier	_Nonnull _Nullable _Null_unspecified __kindof
syn keyword objcConstant	nil Nil

" Match the ObjC #import directive (like C's #include)
syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
syn match  objcImported display contained "<[-_0-9a-zA-Z.\/]*>"
syn match  objcImport display "^\s*\(%:\|#\)\s*import\>\s*["<]" contains=objcImported
︙︙
114
115
116
117
118
119
120
121

122
123
124
125
126
127
128

" vim: ts=8
" Author:       Michael Sanders (msanders42 [at] gmail [dot] com)
"		Some modifications by Jonathan Schleifer <js@webkeks.org>
" Description:  Better syntax highlighting for Objective-C files (part of the
"               cocoa.vim plugin).
" Last Updated: May 3, 2015

syn match objcDirective '@synthesize\|@property\|@optional\|@required\|@autoreleasepool' display

syn keyword objcType IBOutlet IBAction Method __block instancetype
syn keyword objcType __unsafe_unretained __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak
syn keyword objcType of_unichar_t of_char16_t of_char32_t of_comparison_result_t
syn keyword objcType of_byte_order_t of_range_t of_point_t of_dimension_t
syn keyword objcType of_mutex_t of_rmutex_t of_rectangle_t of_string_encoding_t
syn keyword objcType of_time_interval_t of_resolver_result_t
syn keyword objcType of_udp_socket_address_t of_offset_t of_stat_t of_socket_t








|
>








117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132

" vim: ts=8
" Author:       Michael Sanders (msanders42 [at] gmail [dot] com)
"		Some modifications by Jonathan Schleifer <js@webkeks.org>
" Description:  Better syntax highlighting for Objective-C files (part of the
"               cocoa.vim plugin).
" Last Updated: May 3, 2015

syn match objcDirective '@synthesize\|@dynamic\|@property' display
syn match objcDirective '@optional\|@required\|@autoreleasepool' display
syn keyword objcType IBOutlet IBAction Method __block instancetype
syn keyword objcType __unsafe_unretained __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak
syn keyword objcType of_unichar_t of_char16_t of_char32_t of_comparison_result_t
syn keyword objcType of_byte_order_t of_range_t of_point_t of_dimension_t
syn keyword objcType of_mutex_t of_rmutex_t of_rectangle_t of_string_encoding_t
syn keyword objcType of_time_interval_t of_resolver_result_t
syn keyword objcType of_udp_socket_address_t of_offset_t of_stat_t of_socket_t
︙︙

Changes to vimrc. 

1
2
3
4
5
6
7
8

source /usr/share/vim/vim73/vimrc_example.vim

set t_Co=256
set background=dark
let g:inkpot_black_background=1
colorscheme inkpot

set cinoptions=+4,(4,u4,w4

|








1
2
3
4
5
6
7
8

source /usr/share/vim/vim74/vimrc_example.vim

set t_Co=256
set background=dark
let g:inkpot_black_background=1
colorscheme inkpot

set cinoptions=+4,(4,u4,w4
︙︙
17
18
19
20
21
22
23

24
25
26
27
28
29

set mouse=

au BufNewFile,BufRead */haiku/* :se ts=4 sw=4
au BufNewFile,BufRead */LLVM/* :se ts=2 sw=2 et
au BufNewFile,BufRead *.c :se ft=c.doxygen
au BufNewFile,BufRead *.h :se ft=objc.doxygen
au BufNewFile,BufRead *.m :se ft=objc.doxygen

au BufNewFile,BufRead *.v :se ts=4 sw=4
au BufNewFile,BufRead *.vhd :se ts=4 sw=4
au BufNewFile,BufRead *.py :se ts=4 sw=4 et
au BufNewFile,BufRead *.cs :se ts=4 sw=4
au BufNewFile,BufRead *.pas :se ts=2 sw=2 et
au BufNewFile,BufRead *.rb :se ts=2 sw=2 et








>







17
18
19
20
21
22
23
24
25
26
27
28
29
30

set mouse=

au BufNewFile,BufRead */haiku/* :se ts=4 sw=4
au BufNewFile,BufRead */LLVM/* :se ts=2 sw=2 et
au BufNewFile,BufRead *.c :se ft=c.doxygen
au BufNewFile,BufRead *.h :se ft=objc.doxygen
au BufNewFile,BufRead *.m :se ft=objc.doxygen
au BufNewFile,BufRead *.mm :se ft=objcpp
au BufNewFile,BufRead *.v :se ts=4 sw=4
au BufNewFile,BufRead *.vhd :se ts=4 sw=4
au BufNewFile,BufRead *.py :se ts=4 sw=4 et
au BufNewFile,BufRead *.cs :se ts=4 sw=4
au BufNewFile,BufRead *.pas :se ts=2 sw=2 et
au BufNewFile,BufRead *.rb :se ts=2 sw=2 et