mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

must include all changed files..

Browse source
This commit is contained in:
laerus 2016-09-10 20:45:14 +03:00
parent d22762cc3a
commit ba486622c5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/tutorial.rst
View file

@ -1176,6 +1176,8 @@ function with the ``xonsh.proc.foreground`` decorator.
Aliasing is a powerful way that xonsh allows you to seamlessly interact to Aliasing is a powerful way that xonsh allows you to seamlessly interact to
with Python and subprocess. with Python and subprocess.
.. warning:: Foreign shell aliases that try to override xonsh aliases will be ignored
Up, Down, Tab Up, Down, Tab
============== ==============
The up and down keys search history matching from the start of the line, The up and down keys search history matching from the start of the line,

9
xonsh/foreign_shells.py
View file

@ -582,9 +582,10 @@ def load_foreign_aliases(shells=None, config=None, issue_warning=True):
_, shaliases = foreign_shell_data(**shell) _, shaliases = foreign_shell_data(**shell)
for alias in set(shaliases) & set(xonsh_aliases): for alias in set(shaliases) & set(xonsh_aliases):
del shaliases[alias] del shaliases[alias]
print('aliases: alias {!r} of shell {!r} ' if builtins.__xonsh_env__.get('XONSH_DEBUG'):
'tries to override xonsh alias, ' print('aliases: ignoring alias {!r} of shell {!r} '
'xonsh wins!'.format(alias, shell['shell']), 'which tries to override xonsh alias.'
file=sys.stderr) ''.format(alias, shell['shell']),
file=sys.stderr)
aliases.update(shaliases) aliases.update(shaliases)
return aliases return aliases