Commit graph

5875 commits

Author SHA1 Message Date
frozen_dude
448e966129 Fix for bad LC_CTYPE entry
LANG is a colon-separated list of prefered locales; LC_CTYPE is single entry,
therefore we need to remove all but one entry.

Also, there is no need setting it if it is already set (LC_ALL also sets
LC_CTYPE, so we check it too).
2015-02-10 20:37:35 +01:00
Marc Cornellà
732c7b8070 Simplify adding workon_cwd to chpwd hook 2015-02-10 20:32:52 +01:00
Marc Cornellà
b62911660d Organize error checking in virtualenwrapper plugin 2015-02-10 20:32:52 +01:00
Brandon Sandrowicz
4161aa4f9d Fixing virtualenvwrapper plugin for Ubuntu (and Debian)
Ubuntu and Debian store the system-installed virtualenvwrapper in
/etc/bash_completion.d/virtualenvwrapper, so that it gets automatically sourced
at startup in Bash. By not putting it somewhere in $PATH, they end up excluding
others (e.g. Zsh) that might want to use that file. Oops!

The virtualenvwrapper plugin should account for this so that Ubuntu (or Debian)
users don't end up with this message:

zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh. Please install with `pip install virtualenvwrapper`.

even when they have a virtualenvwrapper installed to a known location.
2015-02-10 20:32:52 +01:00
Robby Russell
8830f65c4d Merge pull request #3467 from mcornella/fix-composer-plugin
[Plugin composer] Multiple fixes
2015-02-10 11:22:40 -08:00
Robby Russell
f0bbd308fe Merge pull request #3443 from mcornella/better-web-search-plugin
Refactor and improve web-search plugin
2015-02-10 11:22:25 -08:00
Robby Russell
aab7532747 Merge pull request #3566 from mcornella/pfault-master
Repost #2606: fix git status in rkj-repos theme
2015-02-10 11:21:45 -08:00
Robby Russell
9b8e88d5ac Merge pull request #3483 from ai/fedora-not-found
Add Fedora support for command-not-found plugin
2015-02-10 11:21:36 -08:00
Robby Russell
d2667bd0a2 Merge pull request #3353 from mizabrik/master
Save ZSH path in newly created .zshrc
2015-02-10 11:21:15 -08:00
Robby Russell
17216bee9c Merge pull request #3143 from roramirez/theme-linux
remove path not found for linuxonly theme
2015-02-10 11:21:12 -08:00
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à
2e41d06b76 Use quoted $TERM value everywhere 2015-02-10 19:53:40 +01:00
Marc Cornellà
b7e5dd35ef Quick-fix code style 2015-02-10 19:52:58 +01:00
Andrew Janke
4fc6dccb42 term: Move DISABLE_AUTO_TITLE check to hooks
Move the DISABLE_AUTO_TITLE check from title() to the preX hook
functions that call it, to allow the title() function to be used
directly by user or other callers.
2015-02-10 19:38:11 +01:00
Martin Schrodi
f04246aa48 rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella) 2015-02-10 19:35:00 +01:00
Martin Schrodi
c3940cf44a Fixed breakage in new git repo without commits 2015-02-10 19:35:00 +01:00
Marc Cornellà
6fb866183d Remove composer.json file requirement
This is because we can't be sure which arguments require a json file
and which don't, so the `else' statement will always be difficult to
check for correctness.
2015-02-10 19:32:59 +01:00
Maxime Fabre
ef220f0928 Add aliases for composer global 2015-02-10 19:32:59 +01:00
Andrey Janzen
5f4e8e57da Allow completion for 'composer.phar', not only 'composer'
Use $_comp_command1 for command list generation instead of 'composer':

  `$_comp_command1` contains the command written in the command line.
  This allows us to have a different composer name
2015-02-10 19:32:59 +01:00
Julien Pepy
0cc3afe277 Fix get command list for recent composer versions 2015-02-10 19:32:59 +01:00
Marc Cornellà
02d75684f3 Force using https in Yandex search engine 2015-02-10 19:32:52 +01:00
Marc Cornellà
e8daf8150e Fix yahoo search URL in web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
c45885093f Add support for cygwin open in web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
adaea31ca0 Silence nohup output in web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
80ba54a94f Add Yandex support to web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
80d856e165 Clean up web-search plugin logic to allow easier changes 2015-02-10 19:32:52 +01: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