File tree Expand file tree Collapse file tree 7 files changed +322
-315
lines changed
gedit/share/gtksourceview-3.0/language-specs Expand file tree Collapse file tree 7 files changed +322
-315
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: 695cb9fc2b1bb98a9affac3887806925f962c0aa
8
+ refs/heads/try2: 07167826d6b7b30c96cc9d6227fbe01b65e980f8
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change 845
845
846
846
# Disable unused LLVM features
847
847
LLVM_OPTS=" $LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
848
+ # Disable term-info, linkage of which comes in multiple forms,
849
+ # making our snapshots incompatible (#9334)
850
+ LLVM_OPTS=" $LLVM_OPTS --disable-terminfo"
848
851
849
852
case " $CFG_C_COMPILER " in
850
853
(" ccache clang" )
Original file line number Diff line number Diff line change 39
39
<keyword >assert</keyword >
40
40
<keyword >break</keyword >
41
41
<keyword >const</keyword >
42
- <keyword >copy</keyword >
43
42
<keyword >do</keyword >
44
43
<keyword >drop</keyword >
45
44
<keyword >else</keyword >
Original file line number Diff line number Diff line change 18
18
<list name =" keywords" >
19
19
<item > as </item >
20
20
<item > break </item >
21
- <item > copy </item >
22
21
<item > do </item >
23
22
<item > drop </item >
24
23
<item > else </item >
Original file line number Diff line number Diff line change @@ -18,9 +18,8 @@ syn keyword rustOperator as
18
18
19
19
syn match rustAssert " \< assert\(\w\) *!" contained
20
20
syn match rustFail " \< fail\(\w\) *!" contained
21
- syn keyword rustKeyword break copy do extern
21
+ syn keyword rustKeyword break do extern
22
22
syn keyword rustKeyword in if impl let log
23
- syn keyword rustKeyword copy do extern
24
23
syn keyword rustKeyword for impl let log
25
24
syn keyword rustKeyword loop mod once priv pub
26
25
syn keyword rustKeyword return
You can’t perform that action at this time.
0 commit comments