From ca37516cc36dbbced8e57953c2d64538f5aac30d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Maciej=20=C5=81aszcz?= Date: Mon, 12 Nov 2012 22:23:24 +0100 Subject: [PATCH] Update .vimrc --- .vimrc | 15 +++++-- haskellmode.config | 130 +++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 132 insertions(+), 13 deletions(-) diff --git a/.vimrc b/.vimrc index f31460d..eff289c 100644 --- a/.vimrc +++ b/.vimrc @@ -61,7 +61,14 @@ if has('gui_running') && !has('win32') set encoding=utf8 endif -"set list lcs=tab:>- +if match($TERM, "screen") != -1 + map OH + map OF + map! OH + map! OF +endif + +set lcs=tab:\|\ ,trail:x filetype plugin indent on syntax on @@ -112,7 +119,7 @@ augroup END command! -nargs=+ -complete=file Cpplint lexpr system("cpplint.py --filter=-whitespace/tab,-whitespace/braces " . ) -"au FileType cpp,c setl cursorline +au FileType cpp,c setl cursorline au FileType cpp,c :HighlightTags au BufEnter *.cpp,*.c,*.C let b:fswitchdst = 'h,hpp,hh,H,hxx' @@ -393,7 +400,7 @@ let g:easytags_dynamic_files=1 let g:easytags_on_cursorhold=0 let g:easytags_updatetime_min=800 "let g:easytags_updatetime_autodisable=1 -"let g:easytags_include_members=1 +let g:easytags_include_members=1 let g:easytags_resolve_links=1 @@ -432,7 +439,7 @@ let loaded_search_complete = 1 let g:c_gnu=1 let g:c_curly_error=1 -set cinoptions+=g0 +set cinoptions=g0,:0,l1,t0 """ Erlang let g:erlangCompletionGrep = 'bzgrep' diff --git a/haskellmode.config b/haskellmode.config index 76e2451..9fd3a61 100644 --- a/haskellmode.config +++ b/haskellmode.config @@ -1,13 +1,22 @@ --- 6.12.3 +-- 7.4.1 +AlternativeLayoutRule +AlternativeLayoutRuleTransitional Arrows BangPatterns +CApiFFI CPP ConstrainedClassMethods +ConstraintKinds +DataKinds +DatatypeContexts +DefaultSignatures DeriveDataTypeable DeriveFoldable DeriveFunctor +DeriveGeneric DeriveTraversable DisambiguateRecordFields +DoAndIfThenElse DoRec EmptyDataDecls ExistentialQuantification @@ -17,44 +26,134 @@ FlexibleContexts FlexibleInstances ForeignFunctionInterface FunctionalDependencies +GADTSyntax GADTs GHCForeignImportPrim GeneralizedNewtypeDeriving -Generics +Haskell2010 +Haskell98 ImplicitParams ImplicitPrelude ImpredicativeTypes IncoherentInstances +InterruptibleFFI KindSignatures LiberalTypeSynonyms MagicHash +MonadComprehensions MonoLocalBinds MonoPatBinds MonomorphismRestriction MultiParamTypeClasses NPlusKPatterns NamedFieldPuns -NewQualifiedOperators +NoAlternativeLayoutRule +NoAlternativeLayoutRuleTransitional +NoArrows +NoBangPatterns +NoCApiFFI +NoCPP +NoConstrainedClassMethods +NoConstraintKinds +NoDataKinds +NoDatatypeContexts +NoDefaultSignatures +NoDeriveDataTypeable +NoDeriveFoldable +NoDeriveFunctor +NoDeriveGeneric +NoDeriveTraversable +NoDisambiguateRecordFields +NoDoAndIfThenElse +NoDoRec +NoEmptyDataDecls +NoExistentialQuantification +NoExplicitForAll +NoExtendedDefaultRules +NoFlexibleContexts +NoFlexibleInstances +NoForeignFunctionInterface +NoFunctionalDependencies +NoGADTSyntax +NoGADTs +NoGHCForeignImportPrim +NoGeneralizedNewtypeDeriving +NoImplicitParams +NoImplicitPrelude +NoImpredicativeTypes +NoIncoherentInstances +NoInterruptibleFFI +NoKindSignatures +NoLiberalTypeSynonyms +NoMagicHash +NoMonadComprehensions +NoMonoLocalBinds +NoMonoPatBinds +NoMonomorphismRestriction +NoMultiParamTypeClasses +NoNPlusKPatterns +NoNamedFieldPuns +NoNondecreasingIndentation +NoOverlappingInstances +NoOverloadedStrings +NoPackageImports +NoParallelArrays +NoParallelListComp +NoPatternGuards +NoPatternSignatures +NoPolyKinds +NoPolymorphicComponents +NoPostfixOperators +NoQuasiQuotes +NoRank2Types +NoRankNTypes +NoRebindableSyntax +NoRecordPuns +NoRecordWildCards +NoRecursiveDo +NoRelaxedLayout +NoRelaxedPolyRec +NoScopedTypeVariables +NoStandaloneDeriving +NoTemplateHaskell +NoTraditionalRecordSyntax +NoTransformListComp +NoTupleSections +NoTypeFamilies +NoTypeOperators +NoTypeSynonymInstances +NoUnboxedTuples +NoUndecidableInstances +NoUnicodeSyntax +NoUnliftedFFITypes +NoViewPatterns +NondecreasingIndentation OverlappingInstances OverloadedStrings -PArr PackageImports +ParallelArrays ParallelListComp PatternGuards PatternSignatures +PolyKinds PolymorphicComponents PostfixOperators QuasiQuotes Rank2Types RankNTypes +RebindableSyntax RecordPuns RecordWildCards RecursiveDo +RelaxedLayout RelaxedPolyRec +Safe ScopedTypeVariables StandaloneDeriving TemplateHaskell +TraditionalRecordSyntax TransformListComp +Trustworthy TupleSections TypeFamilies TypeOperators @@ -63,67 +162,80 @@ UnboxedTuples UndecidableInstances UnicodeSyntax UnliftedFFITypes +Unsafe ViewPatterns -- --fasm-mangling -fdo-lambda-eta-expansion -fembed-manifest -fgen-manifest +-fghci-history +-fghci-sandbox +-fhelpful-errors -fignore-interface-pragmas -fimplicit-import-qualified --fmethod-sharing -fno-break-on-error -fno-break-on-exception -fno-building-cabal-package -fno-case-merge --fno-convert-to-zipper-and-back -fno-cse -fno-dicts-cheap -fno-do-eta-reduction -fno-eager-blackholing -fno-enable-rewrite-rules -fno-excess-precision +-fno-expose-all-unfoldings -fno-ext-core +-fno-float-in -fno-force-recomp -fno-full-laziness -fno-hpc-no-auto -fno-ignore-asserts --fno-inline-if-enough-args -fno-liberate-case -fno-new-codegen +-fno-pedantic-bottoms -fno-print-bind-result -fno-print-evld-with-show -fno-print-explicit-foralls +-fno-prof-cafs -fno-regs-graph -fno-regs-iterative -fno-rewrite-rules -fno-run-cps -fno-run-cpsz -fno-spec-constr +-fno-specialise -fno-static-argument-transformation -fno-strictness -fno-unbox-strict-fields -fno-vectorise +-fno-warn-auto-orphans -fno-warn-dodgy-exports -fno-warn-dodgy-imports -fno-warn-hi-shadowing +-fno-warn-identities -fno-warn-implicit-prelude -fno-warn-incomplete-patterns -fno-warn-incomplete-record-updates +-fno-warn-incomplete-uni-patterns +-fno-warn-missing-import-lists +-fno-warn-missing-local-sigs -fno-warn-missing-signatures -fno-warn-monomorphism-restriction -fno-warn-name-shadowing -fno-warn-orphans --fno-warn-simple-patterns +-fno-warn-safe -fno-warn-tabs -fno-warn-type-defaults +-fno-warn-unsafe -fno-warn-unused-binds -fno-warn-unused-do-bind -fno-warn-unused-imports -fno-warn-unused-matches -fomit-interface-pragmas -fprint-bind-contents +-fprof-count-entries -fshared-implib +-fwarn-alternative-layout-rule-transitional -fwarn-deprecated-flags -fwarn-deprecations -fwarn-dodgy-foreign-imports -- 2.11.4.GIT