New patches:
[Pick default config file that matches temporary keymap picked by the
user on first run.
mjga...@gmail.com**20100425182501
Ignore-this: 817a57804aa367838f96616f7679c5a
To maximize autoconfiguration, when user picks a default keymap, his
choice
is used to pick one of three default configuration files (~/.yi/yi.hs),
and thus give her favourite editor's looks upon next restart.
] addfile ./examples/yi-cua.hs
hunk ./examples/yi-cua.hs 1
+import Yi
+
+-- Preamble
+import Yi.Prelude
+import Prelude ()
+
+-- Import the desired UI as needed.
+-- Some are not complied in, so we import none here.
+
+-- import Yi.UI.Vty (start)
+-- import Yi.UI.Cocoa (start)
+-- import Yi.UI.Pango (start)
+
+myConfig = defaultCuaConfig -- replace with defaultVimConfig or
defaultCuaConfig
+
+defaultUIConfig = configUI myConfig
+
+-- Change the below to your needs, following the explanation in
comments. See
+-- module Yi.Config for more information on configuration. Other
configuration
+-- examples can be found in the examples directory. You can also use or
copy
+-- another user configuration, which can be found in modules Yi.Users.*
+
+main :: IO ()
+main = yi $ myConfig
+ {
+
+ -- Keymap Configuration
+ defaultKm = defaultKm myConfig,
+
+ -- UI Configuration
+ -- Override the default UI as such:
+ startFrontEnd = startFrontEnd myConfig,
+ -- Yi.UI.Vty.start -- for Vty
+ -- (can be overridden at the command line)
+ -- Options:
+ configUI = defaultUIConfig
+ {
+ configFontSize = Nothing,
+ -- 'Just 10' for specifying the size.
+ configTheme = configTheme defaultUIConfig,
+ -- darkBlueTheme -- Change the color scheme here.
+
+ configWindowFill = ' '
+ }
+ }
+
hunk ./examples/yi-vim.hs 9
import Yi.Prelude
import Prelude ()
+-- import Yi.UI.Vty (start)
+-- import Yi.UI.Cocoa (start)
+-- import Yi.UI.Pango (start)
+
-- Uncomment for Shim support
-- import qualified Yi.Mode.Shim as Shim
-- -- Shim.minorMode gives us emacs-like keybindings - what would be a
good
hunk ./src/Yi/Config/Default.hs 222
nilKeymap :: Keymap
nilKeymap = choice [
- char 'c' ?>> openCfg (Cua.keymap),
- char 'e' ?>> openCfg (Emacs.keymap),
- char 'v' ?>> openCfg (Vim.keymapSet),
+ char 'c' ?>> openCfg (Cua.keymap) "yi-cua.hs",
+ char 'e' ?>> openCfg (Emacs.keymap) "yi.hs",
+ char 'v' ?>> openCfg (Vim.keymapSet) "yi-vim.hs",
char 'q' ?>>! quitEditor,
char 'r' ?>>! reload,
char 'h' ?>>! configHelp
hunk ./src/Yi/Config/Default.hs 235
"To get a standard reasonable keymap, you
can run yi with either --as=cua, --as=vim or --as=emacs.",
"You should however create your own
~/.yi/yi.hs file: ",
"You can type 'c', 'e' or 'v' now to create
and edit it using a temporary cua, emacs or vim keymap."]
- openCfg km = write $ do
+ openCfg km kmName = write $ do
dataDir <- io $ getDataDir
hunk ./src/Yi/Config/Default.hs 237
- let exampleCfg = dataDir </> "examples" </> "yi.hs"
+ let exampleCfg = dataDir </> "examples" </> kmName
homeDir <- io $ getHomeDirectory
let cfgDir = homeDir </> ".yi"
cfgFile = cfgDir </> "yi.hs"
hunk ./yi.cabal 36
art/setup-script.png
art/setup-script.png
examples/yi.hs
+ examples/yi-vim.hs
+ examples/yi-cua.hs
examples/yi-simple.hs
extra-source-files: src/Yi/Lexer/common.hsinc
Context:
[Update C lexer for special comments (e.g. "/**")
jeffwhee...@gmail.com**20100423061210
Ignore-this: 281958beb016887d106e1697e1ac5333
I suspect there's a better way to do thos. What is it?
]
[added my config file to Users
anders...@gmail.com**20100422194545
Ignore-this: 79eddfaf6526c4158084aeaf44bb8d80
]
[Export some CUA functions and fix Gtk imports issue
Hamish Mackenzie <hamish.k.macken...@googlemail.com>**20100412063404
Ignore-this: ca47d5d9e15e04b98b40d2f0075529db
]
[More progress on Yi.UI.Pango.Control
Hamish Mackenzie <hamish.k.macken...@googlemail.com>**20100404103555
Ignore-this: 212c8aec438a6a0742f2690242f352a4
]
[IReader.hs: switch M-Del to M-0
gwe...@gmail.com**20100325154110
Ignore-this: 8a220d97977e5db509d7b6b344611ea
M-Del doesn't work with urxvt, it seems, and I am doubtful it works in
general.
But M-0 will work or fail with the other bindings.
]
[Cleanup syntax files
jeffwhee...@gmail.com**20100326043211
Ignore-this: 714d6df1f570a4de23fb052b04e93944
]
[Significant cleanup, -Wall to Yi.Syntax.Tree
jeffwhee...@gmail.com**20100325075221
Ignore-this: a106e842ae56b004edab83cf7dea5f0f
]
[Cleanup Yi.Syntax.Tree (replace local function with Control.Arrow's
`first`)
jeffwhee...@gmail.com**20100325063218
Ignore-this: 1819a1e305d5d52b0fef28b048141dfb
]
[Fix documentation formatting (remove broken linkification)
jeffwhee...@gmail.com**20100325063013
Ignore-this: 7bcc3f61408f4c6df696f76445aaeee3
]
[-Wall (RecursiveDo -> DoRec, requires 6.12)
jeffwhee...@gmail.com**20100325053035
Ignore-this: 36c0c99feadf155016ce86219f5f5580
]
[Display errors in configuration in both cold boot and reload
jeffwhee...@gmail.com**20100325031845
Ignore-this: 11b26dd4e1ab79736610723afe8b2cb0
]
[TAG 0.6.2.2
jeffwhee...@gmail.com**20100324171312
Ignore-this: 729a069566b7090ea9de3d2a9038f4c7
]
Patch bundle hash:
2748e6f77af0293ed6b4449974119461769f772b
--
Yi development mailing list
yi-devel@googlegroups.com
http://groups.google.com/group/yi-devel
