Commit graph

2943 commits

Author SHA1 Message Date
Robby Russell
52177162f7 Merge pull request #3479 from faceleg/patch-1
Removing 'local' usage to prevent issue when installed with antigen
2015-02-10 11:20:52 -08:00
Robby Russell
49b4e675e0 Merge pull request #3547 from martong/vi_mode_trapwinch
Added trapwinch to vi-mode plugin.
2015-02-10 11:20:42 -08:00
Robby Russell
0a0a27857e Merge pull request #3413 from mcornella/fix-dircycle-plugin
dircycle plugin: clean and fix logic once and for all
2015-02-10 11:20:08 -08:00
Robby Russell
412a92e45e Merge pull request #3141 from muggenhor/sudo-maintain-cursor-pos
sudo: maintain cursor position
2015-02-10 11:18:32 -08:00
Robby Russell
ff823f810b Merge pull request #3564 from mcornella/LFDM-cleaning_lib
Repost #2422: cleaning lib
2015-02-10 11:17:17 -08:00
Marc Cornellà
2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
Marc Cornellà
51946eb3ce Implement deletion of sl alias as per #3055 2015-02-10 19:22:39 +01:00
LFDM
4b4292a496 Fix a typo 2015-02-10 19:22:39 +01:00
LFDM
724143c329 Deletes dot aliases from common-aliases.
They are implemented in lib anyway.
2015-02-10 19:22:39 +01:00
LFDM
83c4e06206 Moves a bindkey call from misc to key-bindings. 2015-02-10 19:22:39 +01:00
LFDM
101149b1ae Moves remaining aliases to misc and deletes file.
There were only three aliases left in aliases.zsh
File deleted!
2015-02-10 19:22:39 +01:00
LFDM
d33b0aae91 Refactors history alias and moves it.
More compact case statement instead of the ugly if elif... else
statement. Moves it to history.zsh
2015-02-10 19:22:39 +01:00
LFDM
ace98846ea Pushes autoenv code to its plugin.
Sources the activate.sh file or informs the user, that its not
available.
Overriding the cd function, as it was formerly done, is not needed
anymore, activate.sh does this by itself.
2015-02-10 19:22:38 +01:00
LFDM
25b1cd687b Brings all directory stuff to directories.zsh
- Cleans out aliases.zsh.
- Removes unneeded cd function.
2015-02-10 19:22:38 +01:00
Marc Cornellà
282240bf37 Account for iTerm2 sent keys in dircycle plugin 2015-02-10 19:18:15 +01:00
Marc Cornellà
999bab187c Emulate zsh in zlewidgets instead of static setopt command
This way the user can keep their preferred pushd syntax while enabling
us to use a standard syntax in our defined functions.

To explain further, without a clear value on the PUSHD_MINUS option, we
could be changing the +1/-0 values all we want, that some user would
find that it didn't work for him.

We have two options, then:
- Setting a particular value, which was my first approach.
- Using `emulate -L zsh` to ensure all options defined in the function's
  body won't be passed along to the main zsh instance.
  For more info see:
  http://zsh.sourceforge.net/Doc/Release/Shell-Builtin-Commands.html#index-emulate
2015-02-10 19:18:15 +01:00
Marc Cornellà
e93fd939ad Run pushd command directly and trigger prompt redraw 2015-02-10 19:18:15 +01:00
Marc Cornellà
5fe22fcbc6 Clean up and fix +1/-0 syntax to work as expected
This change follows this proposed behaviour:

 Ctrl+Shift+Left:  move to last visited directory
 Ctrl+Shift+Right: move to next visited directory

an alternative behaviour would be:

 Ctrl+Shift+Left:  move directory to the left in `dirs` output
 Ctrl+Shift+Right: move directory to the right in `dirs` output

It also introduces `setopt nopushdminus` as a way to standardise
pushd syntax. It's value wasn't clear before, which has been the
cause of so many pull requests regarding this plugin not working
in some environments.
2015-02-10 19:18:14 +01:00
Robby Russell
13e5afe805 Merge pull request #3164 from nailor/fix-deactivate-bug
virtualenvwrapper: Deactivate only if in virtualenv
2015-02-10 07:28:51 -08:00
Robby Russell
811f1f9eb9 Merge pull request #3329 from capeterson/master
Improved ant completion
2015-02-10 07:28:39 -08:00
Robby Russell
935f1914f9 Merge pull request #3419 from mcornella/fix-cake-target-cache
[Plugin: cake] switch newer-than logic to get the desired behavior
2015-02-10 07:28:01 -08:00
Robby Russell
c3eb54839a Merge pull request #3525 from apjanke/term-pwd-in-precmd
Move pwd update output to precmd to avoid contamination
2015-02-10 07:27:03 -08:00
Chris Peterson
349493a0b8 Fix for ant targets with leading dash
As suggested in https://github.com/robbyrussell/oh-my-zsh/pull/3329#issuecomment-72062236
2015-02-09 13:12:02 -08:00
Chris Peterson
013b2bffcf Change ant target enumeration
Make use of ant's project help feature instead of trying to parse XML with regex (see: http://stackoverflow.com/a/1732454/740787).
This is a behavioral change that does a few things:
 • adds support for ant imports, which were previously not recognized as possibly containing targets
 • supresses targets with no description, as these are conventionally for internal use only
2015-02-09 13:12:02 -08:00
Chris Peterson
7f636ba590 Backwards logic in newer check.
Regen .ant_targets only if it's newer than build.xml? Yeah, that seems wrong.
2015-02-09 13:12:02 -08:00
Gabor Marton
7de44dbdb7 Added trapwinch to vi-mode plugin. 2015-02-04 12:56:58 +01:00
Andrew Janke
be7028012e Reword comments on termsupport internal functions. 2015-02-04 01:00:51 -05:00
Michael Robinson
8ccfc3d444 Removing 'local' usage to prevent issue when installed with antigen
Error encountered when installed with antigen: "chpwd:2: no such file or directory:".  Solution described in https://github.com/zsh-users/antigen/issues/75
2015-02-02 11:52:07 +13:00
Marc Cornellà
e60458793a Switch newer-than logic to get the desired behavior
In the old version, the function returned true (0) if the cache file
was newer than the Cakefile, which was *always* unless the Cakefile
had been updated. Therefore we generated the file every time unless
the Cakefile was updated, which was precisely when we needed to
regenerate the cache file.

Now it generates the cache file only when the Cakefile has been
updated.
2015-02-01 23:32:38 +01:00
Robby Russell
550ccca91c Merge pull request #3478 from stephenrjohnson/custom_cache_dir
Allow custom cache dir
2015-01-31 06:23:50 -06:00
Robby Russell
1ac2f8645e Merge pull request #3493 from NicholasTD07/patch-1
Fast installation time by shallow copying git repo
2015-01-31 06:10:21 -06:00
Robby Russell
147ebd60d9 Merge pull request #3490 from lmartins/master
Fix Plugin commands
2015-01-31 06:09:01 -06:00
Robby Russell
65afcb7951 Merge pull request #3489 from sunlight07/patch-1
activate django plugin on command "django-admin"
2015-01-31 06:08:09 -06:00
Andrew Janke
5f79ab5547 Move chpwd update output from chpwd hook to precmd to avoid
contaminating script/function output
2015-01-27 21:00:07 -06:00
Nicholas T.
5cb0ed98d1 Fast installation time by shallow copying git repo
Use `--depth=1` to clone just the lastest version rather than every version in git.
2015-01-15 09:09:41 +10:00
Luis Martins
3abc2a4375 Fix Plugin commands 2015-01-12 17:26:04 +00:00
Yu Jiang
3c4998319a Update django.plugin.zsh
activate django plugin on command "django-admin"
2015-01-12 21:57:00 +08:00
Robby Russell
c78277fd8b Merge pull request #3429 from apjanke/termsupport-apple-chpwd
termsupport: add chpwd hook for setting pwd in Apple Terminal.app
2015-01-09 02:45:12 -06:00
Stephen
ceb42ecdb6 Update /home/srj/.oh-my-zsh/cache references 2015-01-08 16:38:05 +00:00
Stephen
bf7b9165fd Allow custom cache dir
We are running oh-my-zsh on a shared install and the only issue is each
user having a custom cache dir. This will allow us to set the cache dir
to ZSH_CACHE_DIR=~/oh-my-zsh/cache/ .
2015-01-08 16:01:16 +00:00
Jyrki Pulliainen
833e6f5958 virtualenvwrapper: Deactivate only if in virtualenv
If user manually deactivates the virtualenv when using this mode, zsh
will produce following error:

    deactivate:12: command not found: virtualenv_deactivate

To avoid this, check that the VIRTUAL_ENV flag is set before trying to
automatically deactivate the virtual environment.

Fixes #2185
2015-01-07 18:17:29 +01:00
Andrew Janke
7295e38885 termsupport: add chpwd hook for setting pwd in Apple Terminal.app 2014-12-21 15:05:22 -05:00
Robby Russell
175b4a8073 Merge pull request #3407 from rawberg/mira-theme
mira theme shows active node, ruby and java versions
2014-12-20 12:41:25 -08:00
Robby Russell
da1ca8876e Merge pull request #3404 from ekaragodin/master
Added Yii2 command completion
2014-12-20 12:40:47 -08:00
Robby Russell
0c47d8cfe4 Merge pull request #3146 from typekpb/tmux-aliases
additional tmux aliases
2014-12-20 12:38:43 -08:00
Robby Russell
304e8f0480 Merge pull request #3338 from eripa/chruby_fix
Fix chruby plugin to not complain if chruby is *not* installed
2014-12-20 12:37:18 -08:00
Robby Russell
b0ad3d7c70 Merge pull request #3352 from benjaoming/virtualenvwrapper_workon_unset
Throw an error message when $WORKON_HOME is not set
2014-12-20 12:37:05 -08:00
Robby Russell
fe2ccb30af Merge pull request #3397 from peteches/master
Fixed output issues webith websearch plugin.
2014-12-20 12:36:27 -08:00
Robby Russell
c63f27a9f2 Merge pull request #3412 from mcornella/feltnerm-patch-1
Disable sourcing .profile when checking for available updates
2014-12-19 20:31:49 -08:00
Robby Russell
5167450ef9 Merge pull request #3424 from bergvandenp/docker_exec
added exec command to docker plugin
2014-12-19 20:30:59 -08:00