Commit Graph

362 Commits

Author SHA1 Message Date
Robby Russell ff6ca9b856 Merge pull request #3538 from TheLinuxKitten/grep-if-color
Test if --color=auto is a valid option for grep
2015-02-22 10:17:16 -08:00
Robby Russell efd6d4d593 Merge pull request #3597 from apjanke/no-dot-in-cdpath
Remove '.' from $cdpath to avoid Cygwin breakage
2015-02-21 17:04:24 -08:00
Andrew Janke 6ccf67a077 Do not put explicit dot in $cdpath, since it causes problems on Cygwin due to an underlying zsh bug. 2015-02-16 10:24:22 -05:00
Zhiming Wang 2790a5e565
Bring back -h option to ls variants
The -h options in l, ll, and la were lost in 25b1cd6. There's no reason
to remove them.
2015-02-15 11:37:28 -08:00
Marc Cornellà 3704fbb71e Extract CWD notifier back out of auto-title hooks 2015-02-13 15:57:18 +01:00
Robby Russell ef7e53a78d Merge pull request #3568 from mcornella/apjanke-title-disable-check
Repost #3426: move DISABLE_AUTO_TITLE check to hooks
2015-02-10 11:49:56 -08:00
Marc Cornellà 0edf416bea Temporarily delete over-engineered solution 2015-02-10 20:38:06 +01:00
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à 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
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 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 25b1cd687b Brings all directory stuff to directories.zsh
- Cleans out aliases.zsh.
- Removes unneeded cd function.
2015-02-10 19:22:38 +01: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
Andrew Janke be7028012e Reword comments on termsupport internal functions. 2015-02-04 01:00:51 -05:00
The Linux Kitten f2130fa1a3 Test if --color=auto is a valid option for grep 2015-02-02 20:49:24 +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
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
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
Andrew Janke 7295e38885 termsupport: add chpwd hook for setting pwd in Apple Terminal.app 2014-12-21 15:05:22 -05:00
Robby Russell 9b352030b7 Merge pull request #3409 from unixorn/prevent-variable-clobbering
Add quoting to nvm.sh
2014-12-19 20:21:33 -08:00
Joe Block 16d0768305 Quote path in case $HOME has a space in it.
I've seen stranger things on OS X, unfortunately.
This reverts commit 1f5cecee4768be192e439a72a873a6cfe8720927.
2014-12-16 13:22:31 -08:00
Robby Russell 1978a0923c Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this 2014-12-15 08:11:04 -08:00
Robby Russell 885e8187ad Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehist
Don't clobber $HISTSIZE and $SAVEHIST
2014-12-14 16:34:08 -08:00
Robby Russell eced76e0fd Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
2014-12-14 16:32:11 -08:00
Ondřej Súkup dd27087805 Change to alias and remove deprecated GREP_COLOR 2014-12-13 19:57:23 +01:00
Marc Cornellà 711843153d Tidy up the grep.zsh library 2014-12-13 19:52:49 +01:00
Marc Cornellà 0190eb084b Use unaliased grep in flag check 2014-12-13 19:45:04 +01:00
Marc Cornellà cf586b54b8 Ignore .bzr folders in grep too 2014-12-13 19:45:02 +01:00
Marc Cornellà 0bd3c9996f Extract VCS folders definition to avoid repetition 2014-12-13 19:44:38 +01:00
Joe Block 5bf715787a Existing code indents with spaces, not tabs, conform. 2014-11-30 17:39:21 -08:00
Joe Block 1ebc98b9ed Don't clobber HISTSIZE or SAVEHIST if they're already set 2014-11-30 17:37:47 -08:00
Marc Cornellà a301f567e3 Switch back to oh-my-zsh.hide-dirty setting again
Commit 81004dfaba reverted the change
in 9b811fb625 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q
2014-11-19 18:40:18 +01:00
DanielFGray 00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Marc Cornellà 74177c5320 Change all whoami calls for $USER variable
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
2014-11-06 18:33:56 +01:00
Robby Russell 57ff83db59 Merge pull request #2946 from moinakg/master
Solaris portability tweaks.
2014-11-06 09:26:48 -08:00
Robby Russell 81004dfaba 2928 merge conflict 2014-11-06 09:24:00 -08:00
Robby Russell 160abc9a8d Merge pull request #2323 from michaelorr/slow-git-fix
Renaming config for parse_git_dirty() to avoid collision
2014-11-06 09:15:00 -08:00
Marc Cornellà 36e05e95ad Don't set auto_name_dirs because it messes up prompts
From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4

> AUTO_NAME_DIRS
> Any parameter that is set to the absolute name of a directory immediately
> becomes a name for that directory, that will be used by the ‘%~’ and
> related prompt sequences, and will be available when completion is performed
> on a word starting with ‘~’.
> (Otherwise, the parameter must be used in the form ‘~param’ first.)

Explained in more detail in
https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194

Related issues:
https://github.com/robbyrussell/oh-my-zsh/issues/2857
https://github.com/robbyrussell/oh-my-zsh/issues/3238
https://github.com/wayneeseguin/rvm/issues/3091
2014-10-22 15:39:27 +02:00
Moinak Ghosh 5f38a537ce Update Solaris changes to use OSTYPE and zsh datetime module. 2014-09-16 22:29:52 +05:30
Robby Russell 958c8f4390 Merge pull request #3045 from fornwall/remove-usr-bin
Replace /usr/bin/env with env
2014-08-31 10:40:19 -07:00
Robby Russell be578d9e7a Merge pull request #3053 from jingweno/patch-1
Fix missing add-zsh-hook
2014-08-31 10:39:03 -07:00
Robby Russell a1c5abf6bf Merge pull request #3055 from sachin21/remove_alias
This alias is conflict cause.
2014-08-31 10:25:34 -07:00
sachin21 ac053f4211 This alias is conflict cause 2014-08-24 00:50:54 +09:00
Jingwen Owen Ou dc9e1764cf Fix missing add-zsh-hook
In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.
2014-08-22 15:59:17 -07:00