Anthony Scopatz
6ca183580f
Merge branch 'gforsyth-master'
2015-10-26 11:26:18 -04:00
Gil Forsyth
c125785b84
fix envvars description of XONSHRC
...
default value is a tuple of the paths with the system-wide file defined
first, then the user config file
2015-10-26 11:18:54 -04:00
Gil Forsyth
e85a9f8951
change location of windows system-wide xonshrc
2015-10-26 10:34:09 -04:00
mdraw
f05c39a572
Make prompt_toolkit's auto_suggest optional
...
Introducing the new AUTO_SUGGEST environment variable for this,
which can either be True or False. Default is True.
In addition, make mouse_support a class variable of PromptToolkitShell
for consistency's sake.
2015-10-26 00:15:59 +01:00
Anthony Scopatz
ffcad78b3c
Merge branch 'master' of github.com:scopatz/xonsh
2015-10-25 12:01:49 -04:00
Anthony Scopatz
c98a380c9e
Merge branch 'multi-exit'
2015-10-25 12:01:38 -04:00
Anthony Scopatz
6e1de14fd7
prevent multiple exits
2015-10-24 13:03:32 -04:00
Gil Forsyth
79e2180d9d
move env outside of loop
2015-10-21 18:05:04 -04:00
Gil Forsyth
c9136c23b0
update docs description of XONSHRC
2015-10-21 17:17:05 -04:00
Gil Forsyth
214f599c89
swap try: except for if: continue
...
I learned something today! And this is much cleaner.
2015-10-21 17:16:34 -04:00
Gil Forsyth
30e7e7a8b7
add 'XONSHRC' to DEFAULT_ENSURERS dict
2015-10-21 17:00:25 -04:00
Gil Forsyth
bcabc7c019
fix formatting (PEP8) and env file execution order
...
Formatting:
One line was 100 characters long. Also swapped out \s for a set of
wrapping parentheses.
Execution order:
Since xonshrc_context loads the two environment files successively, I
swapped the order in which they're fed in so that the userspace xonshrc
will override any conflicts in the systemwide xonshrc
2015-10-21 16:15:33 -04:00
Gil Forsyth
67a2e92bc3
add support for windows system-wide xonshrc
...
pypa/pip had a similar conversation about this a few years ago
(see: https://github.com/pypa/pip/issues/309 ) and determined that
placing global configuration files in `%ALLUSERSPROFILE%\Application
Data` was the best solution without messing around with the registry.
Following their lead on this, specifically from
pypa/pip@2b5029c5
2015-10-21 15:45:12 -04:00
Gil Forsyth
6383654180
small change of kwarg to xonshrc_context
...
to keep things compatible with changes to environ.py which allow for a
system-wide xonshrc in addition to the user defined file
2015-10-21 14:57:05 -04:00
Gil Forsyth
3f769c85c5
add support for system xonshrc file to environ.py
...
Redefines the XONSHRC environment tuple to include the .xonshrc file in
user's home directory as well as a system-wide file that lives in
/etc/xonshrc (for Linux and OSX) and (TODO) somewhere else on Windows.
Then xonshrc_context does more or less what it always has, except now it
checks and places the contents of both files into the xonsh environment.
2015-10-21 14:55:07 -04:00
Anthony Scopatz
f30c7db25e
more test skipping
2015-10-20 17:53:12 -04:00
Anthony Scopatz
dffe71ae1a
don't actually run many parser tests
2015-10-20 17:26:06 -04:00
Anthony Scopatz
1e16843369
Merge pull request #428 from gforsyth/master
...
Add literal tab insert to prompt tk keybinding
2015-10-20 13:48:31 -04:00
Gil Forsyth
575c4ffa1f
use non-generic method name for insert literal tab
...
and consume caffeine before pushing
2015-10-20 10:12:31 -04:00
Gil Forsyth
882a1a4dbf
use non-generic name for private function
2015-10-20 07:05:31 -04:00
Gil Forsyth
eed1626be0
Add literal tab insert to prompt tk keybinding
2015-10-19 23:30:48 -04:00
Anthony Scopatz
fdab4ed280
Merge branch 'jonathanslenders-new-features'
2015-10-19 19:59:52 -04:00
Anthony Scopatz
c2cd870bb6
Some minor cleanup
2015-10-19 19:59:29 -04:00
Jonathan Slenders
880ada8052
Correctly handle 'tab' key binding.
2015-10-20 03:37:55 +02:00
Anthony Scopatz
835c558d1f
Merge pull request #427 from gforsyth/master
...
fix prompt_toolkit tab behavior on blank line
2015-10-19 18:50:56 -05:00
Gil Forsyth
dd0e8dff34
fix prompt_toolkit tab behavior on blank line
2015-10-19 16:04:32 -04:00
Jonathan Slenders
956a6202b5
Only generate completions when the user typed not a tab.
2015-10-18 21:09:54 +02:00
mdraw
3961310418
Made prompt_toolkit's mouse_support optional
...
Introducing a new environment variable MOUSE_SUPPORT for this,
which can either be True or False. Default is False.
2015-10-18 21:09:51 +02:00
Jonathan Slenders
781f1b5f97
Make aborted text (on Ctrl-C) gray.
2015-10-18 21:01:48 +02:00
Jonathan Slenders
9100db9a3c
Added auto-suggestion and mouse support.
2015-10-18 21:01:48 +02:00
Anthony Scopatz
641a767174
Merge branch 'csattr'
2015-10-16 11:03:41 -04:00
Anthony Scopatz
b2062c8e83
fixed attr cases sensitive completion
2015-10-16 10:50:18 -04:00
Anthony Scopatz
b918915e52
version bump
2015-10-12 11:17:07 -04:00
Anthony Scopatz
31f9636646
hot fix for environ
2015-10-12 11:16:02 -04:00
Anthony Scopatz
30ea4a557f
some doc fixes.
2015-10-12 00:45:03 -04:00
Anthony Scopatz
d7124b7723
version bump
2015-10-12 00:35:42 -04:00
Anthony Scopatz
d9e2c0fbf1
Merge branch 'master' of github.com:scopatz/xonsh
2015-10-12 00:24:59 -04:00
Anthony Scopatz
bcd9f0cce0
Merge branch 'teepipe'
2015-10-12 00:24:35 -04:00
Anthony Scopatz
ca7027414c
fixed typo
2015-10-12 00:22:28 -04:00
Anthony Scopatz
f4a99a15e0
Merge pull request #415 from rgaiacs/remove-future
...
Remove from __future__ import
2015-10-12 00:20:54 -04:00
Raniere Silva
07faad02b9
Remove from __future__ import
...
Python > 3.4 is required so no need for __future__.
2015-10-12 00:58:52 -03:00
Anthony Scopatz
6d2fecb3a1
defaults and docs
2015-10-11 14:23:30 -04:00
Anthony Scopatz
84fb672c61
added most of teepty delay
2015-10-11 14:01:15 -04:00
Anthony Scopatz
e78564b168
minor bug fix when not reading in xonshrc
2015-10-11 11:02:00 -04:00
Anthony Scopatz
502bce87ff
minor fixes from review
2015-10-11 10:51:26 -04:00
Anthony Scopatz
4b4d191936
more changes
2015-10-10 23:22:36 -04:00
Anthony Scopatz
bc1a54c1e6
hooked up aliases
2015-10-10 22:41:51 -04:00
Anthony Scopatz
a13773d237
have environment hookups
2015-10-10 22:34:30 -04:00
Anthony Scopatz
1f3fce8296
Merge branch 'fix-bash-aliases' of https://github.com/auscompgeek/xonsh into foreignsh
2015-10-10 20:45:18 -04:00
Anthony Scopatz
1e24bbb2ed
added tests for foreign shells
2015-10-10 19:52:53 -04:00
