Marc Cornellà
ed484dfaf6
Delete cdablevars option by default
...
Fixes weird autocompletion of directories and named users.
Fix #4864
2016-05-12 13:22:27 +02:00
Aesop Wolf
69e1506ad9
Add git user profile functions for prompt display
2016-03-31 14:16:46 -07:00
Michele Bologna
87f8251388
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
...
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE variable which was removed in 9f55213
2016-01-13 15:36:59 +01:00
Marc Cornellà
0842384987
Put local var declaration in its own line in lib/git.zsh
...
In places, the local statement will override the exit code and the written
command won't have the effect intended when it was written.
For example, when it's not inside a git repo the exit code won't be true,
but the local statement will make it true regardless. See #4708 .
2015-12-17 18:37:49 +01:00
Andrew Janke
9f552130bd
Move current_branch() from git plugin to core lib/git.zsh
...
Fixes #4085 : core -> plugin dependency issue.
Rename it to git_current_branch for clarity that it's git-specific.
Update all plugins that were calling it to use new name.
Fix variable leaks by making more variables in lib/git.zsh local.
Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
2015-12-14 20:28:37 -05:00
moyamo
71deb74552
Fix indentation
2015-12-14 13:05:51 +02:00
moyamo
d779750341
Default to using terminfo to set the terminal title
...
Currently, the title is only set on supported terminals (i.e. xterm,
urxvt, screen etc.). Using terminfo entries to set the terminal title
adds support for many more terminals.
2015-12-14 12:59:04 +02:00
desrum_m
95aa9bd97b
Better research history with arrow keys
...
This change enables UP-arrow and DOWN-arrow full-line history completion.
For example, if you write `git clone` and press UP:
- Before this change,
it will use the last command that starts with `git`.
- After this change,
it will use the last command that starts with `git clone`.
2015-12-14 01:08:55 +01:00
Marc Cornellà
d54d896346
Merge pull request #3966 from apjanke/fix-spectrum-ls
...
Make spectrum_ls implementation consistent with $FG and spectrum_bls
2015-12-13 21:39:13 +01:00
Marc Cornellà
11de60fde9
Merge pull request #3965 from apjanke/spectrum-hide-codes
...
Hide spectrum.zsh var values to avoid junky output to terminal
2015-12-13 21:28:44 +01:00
Marc Cornellà
4fbfb149d3
Add back the - alias to go to the previous directory
...
The alias was removed in #3564 . A couple of users were using
it, so I'm adding it back.
2015-12-13 20:36:31 +01:00
Marc Cornellà
4e306887c2
Cleanup update_terminalapp_cwd function
2015-12-01 14:05:38 +01:00
Marc Cornellà
eca912e51a
Quote all variables in if statements
2015-12-01 14:05:18 +01:00
Marc Cornellà
103eb32721
Use a case structure to id terminal types
2015-12-01 14:04:12 +01:00
Dawid Ferenczy
63d7500cf1
Added setting of the window title in Cygwin
2015-12-01 13:52:52 +01:00
Marc Cornellà
b457ae2501
Merge pull request #4651 from ionelmc/patch-1
...
Add support for "putty" $TERM in termsupport.zsh
2015-12-01 00:05:17 +01:00
Ionel Cristian Mărieș
d55111f200
Support all kinds of putty-like terminal strings.
2015-12-01 00:59:35 +02:00
Marc Cornellà
584e0a6ef9
Use shwordsplit in open_command()
2015-11-30 21:27:58 +01:00
Marc Cornellà
afdfe2391e
Add empty string parameter to start command
...
Otherwise `start` will confuse the first parameter as the title of
a new command prompt if the parameter contains whitespace. That is
because the command to be run will be:
start "abc def"
which opens a new command prompt window with the title "abc def".
With the added empty string we force the start command to interpret
the passed parameter as the file / command:
start "" "abc def"
which will be interpreted like `""` is the title and the rest is
the file or command to start.
-------
**NOTE:** this wouldn't be necessary if the start script in msys
was defined differently; that is, if it had the empty string
already incorporated in the script (/usr/bin/start), like so:
```diff
-cmd //c start "${@//&/^&}"
+cmd //c start "" "${@//&/^&}"
```
Notice however that this would make it impossible to use start
setting a different title, so it's probably best to leave it as is.
More info: http://sourceforge.net/p/msys2/tickets/14/
-------
The change `${(z)open_cmd}` is necessary to force zsh to split the
variable by the spaces and interpret it as separate words.
More info: http://zsh.sourceforge.net/FAQ/zshfaq03.html#l17
2015-11-30 21:21:28 +01:00
Mark Ingalls
0a79f1e836
make this work in the git-for-windows SDK
...
Added an option for the msys value of $OSTYPE
2015-11-30 21:01:15 +01:00
Ionel Cristian Mărieș
711c1bcb40
Add support for "putty" $TERM in termsupport.zsh
2015-11-30 15:16:47 +02:00
Marc Cornellà
fea74b4b34
Fix open_command nohup call
...
There a syntax error if $cmd_var contains more than one word,
so we drop the current way to prepend nohup and use a simpler
if-else form.
2015-11-29 19:34:10 +01:00
Andrew Janke
f0981d564a
termsupport: protect subshell with quotes
2015-11-27 15:58:06 +01:00
Marc Cornellà
ebfba0e539
Drop the use of nohup on OSX for tmux compatibility
...
Apparently `nohup` is not needed in OSX, and using it has the side
that it may break under tmux with the error
nohup: can't detach from console: No such file or directory
For now, this commit only drops the use of `nohup` in OSX. But it
*may* not be necessary under other similar platforms.
2015-11-27 15:40:31 +01:00
Marc Cornellà
56345c26fb
Merge pull request #4473 from apjanke/5_1_1-bracketed-paste-hack
...
Disable bracketed-paste-magic in zsh 5.1.1, where it is buggy
2015-10-20 08:26:15 +02:00
Robby Russell
b28db6b475
Merge pull request #4475 from apjanke/diagdump-5.1-fix
...
diagnostics: fix for reserved-word changes in zsh 5.1
2015-10-13 18:01:52 -07:00
Robby Russell
dc06e96e9c
Merge pull request #4254 from apjanke/copyfile-portability
...
Cross-platform clipboard clipcopy() and clippaste()
2015-10-09 07:15:53 -07:00
Andrew Janke
d15521d09d
diagnostics: fix for reserved-word changes in zsh 5.1
...
Reference:
https://github.com/zsh-users/zsh/blob/zsh-5.1.1/NEWS#L20-L32
2015-10-08 22:31:39 -04:00
Andrew Janke
3551745792
Disable bracketed-paste-magic in zsh 5.1.1, where it is buggy
...
A bracketed-paste-magic bug breaks pasting of CJK and some other characters in zsh 5.1.1.
http://www.zsh.org/mla/workers/2015/msg02680.html
See #4434
2015-10-08 22:13:42 -04:00
Andrew Janke
b6d78df62c
clip*: add xsel support
2015-10-05 05:13:11 -04:00
Jeff Smith
2d9df4468f
Fix 'ack-grep' bug for non-ubuntu users
...
Redirect STDERR along with STDOUT when looking for ack-grep
2015-10-03 18:39:41 -07:00
Robby Russell
5d24ba4228
Merge pull request #3165 from hbin/fix-alias-afind-osx
...
The executable command on Mac OSX is 'ack' rather than 'ack-grep'.
2015-10-03 14:33:10 -07:00
Andrew Janke
e4fdb08365
Merge branch 'master' into copyfile-portability
2015-09-28 08:52:03 -04:00
Robby Russell
b5a5bc9ae5
Merge pull request #4337 from iCross/master
...
fix url-quote-magic not working issue
2015-09-26 09:35:12 -07:00
Robby Russell
f186b62704
Merge pull request #4387 from mbologna/fix_git_equal_remote
...
Uniform git prompt equal remote
2015-09-26 09:34:58 -07:00
shawn
7a636097f8
Correct repo dir
...
cvs's metadata is under CVS and not .cvs
2015-09-23 18:47:09 -04:00
Michele Bologna
12e99b5334
fix indentation
2015-09-23 11:14:14 +02:00
Michele Bologna
5323954c98
Uniform git prompt equal remote
...
Uniform git prompt equal remote to all others prompts, setting the correct symbol
(if applicable) to $git_remote_status, instead of echoing it.
It also solves the problem pointed out in #3911
2015-09-23 10:52:24 +02:00
Robby Russell
9bd88bb9aa
Merge pull request #4251 from mcornella/fix-completion-dots
...
Fix completion waiting dots function
2015-09-19 09:01:55 -07:00
Robby Russell
0bb3e0188c
Merge pull request #3940 from apjanke/diagnostic-dump-function
...
Add omz_diagnostic_dump() to help with bug reporting
2015-09-19 08:50:23 -07:00
Robby Russell
8cf88f2b04
Merge pull request #3911 from mbologna/git_remote_status_equal
...
added ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
2015-09-19 08:49:57 -07:00
Robby Russell
3c782f78f1
Merge pull request #3582 from apjanke/fold-terminalapp-plugin-into-termsupport
...
Fold terminalapp plugin in to lib/termsupport
2015-09-19 08:48:03 -07:00
Robby Russell
5e45c16701
Merge pull request #2751 from drm00/fix-openbsd-colorls
...
add check for colored ls on openbsd. (retry of #2225 )
2015-09-19 08:46:13 -07:00
Robby Russell
56cdec7534
Merge pull request #3889 from leycec/compaudit
...
Repair `zsh` Path Permissions on `oh-my-zsh` Startup under Cygwin
2015-09-19 08:40:34 -07:00
iCross
19c0b185ad
fix url-quote-magic not working issue
...
Incompatibilites between 5.0.8 and 5.1:
bracketed-paste-magic may also be necessary in order to apply url-quote-magic.
Reference:
a9df6aaa70/Functions/Zle/url-quote-magic (L11)
2015-09-10 14:08:02 +08:00
Marc Cornellà
b42efeb87e
Switch off line wrapping in case dots occupy extra line
...
This commit uses the (hopefully) standard rmam and smam escape sequences
which toggle off and on line wrapping respectively.
This is so that extra dots that don't fit the current line won't be
displayed in the next line, which would in turn make the shell
display a new prompt on the next line after the dots are hidden.
I've added a check for $terminfo rmam and smam values to be sure we have
them before printing them out.
If this commit breaks something post an issue with your terminal
emulator and $TERM value and we'll figure out what went wrong.
2015-09-05 22:47:50 +02:00
Marc Cornellà
6a8d406eaa
Use prompt expansion sequence to color red the output
...
This makes it clearer and possibly more portable for different
platforms.
2015-09-05 22:47:50 +02:00
Marc Cornellà
3976e04035
Use proper if comparison
2015-09-05 22:47:50 +02:00
Andrew Janke
46ddd88fe0
diagnostics: switch to shasum, filter sysinfo using lines
...
shasum seems more widely available than md5/md5sum, and we don't have to worry about dealing with the different signatures and output formats of md5 and md5sum then.
sysinfo outputs localized message labels, so we can't just grep for "OS Type". But OS is the first thing it outputs, so we can probably just grab those lines by line number. Switched to doing that.
2015-09-04 14:13:00 -04:00
Andrew Janke
5c8b0cc0c1
Add clipcopy() and clippaste() generic cross-platform CLI clipboard functions.
...
Change copydir, copyfile, and coffee plugins to use them, instead of the Mac-only `pbcopy` command.
2015-08-18 03:49:51 -04:00
Andrew Janke
00eb465830
Merge branch 'master' into fold-terminalapp-plugin-into-termsupport
2015-08-17 20:59:39 -04:00
Andrew Janke
47d19cc564
Add defensive emulate -L zsh to termsupport functions
2015-08-17 20:55:41 -04:00
Andrew Janke
96c34cebae
Add a deprecation comment.
2015-08-17 20:51:41 -04:00
Robby Russell
7c60da9e1f
Merge pull request #4233 from apjanke/apple-term-no-dupe-folder-in-title
...
termsupport: avoid repeated dir in window title in Terminal.app
2015-08-12 21:15:59 -07:00
Robby Russell
b8dbd9bfba
Merge pull request #4217 from mcornella/standard-open-command
...
Implement and use a standard, cross-platform open command
2015-08-12 21:14:27 -07:00
Robby Russell
f6a2b97356
Merge pull request #4203 from apjanke/title-protect-promptsubst
...
termsupport: protect title() with `emulate -L zsh` for portability
2015-08-12 21:12:21 -07:00
Robby Russell
d1ea849fdd
Merge pull request #2106 from adepasquale/master
...
Added ssh-like mosh window title
2015-08-12 21:01:00 -07:00
Andrew Janke
14b4ba83c3
Move urlencode/urldecode functions to core lib
2015-08-09 16:28:47 -04:00
Andrew Janke
17da983442
termsupport: avoid repeated dir in window title in Terminal.app
2015-08-09 15:15:12 -04:00
Marc Cornellà
2d0bfcf818
Implement cross-platform open function open_command()
...
For now this supports:
- Mac OS X
- Linux (presumably works on all versions)
- Cygwin (Windows)
2015-08-05 00:27:51 +02:00
Andrew Janke
90ea67edf0
termsupport: protect title() with emulate -L zsh
...
This prevents it from malfunctioning when `setopt prompt_subst` is off.
2015-07-31 22:23:12 -04:00
Andrew Janke
fa25445868
diagnostics: include output file name in dump output
2015-07-22 12:59:39 -04:00
leycec
dcb175d430
Insecure completion handler added.
...
A new "lib/compfix.zsh" script defining a new handle_completion_insecurities()
function has been added, which handles insecure completion directories by
notifying users of said insecurities and moving away all existing completion
caches to a temporary directory. While intended to be called at startup, this
function is generally callable at any time (e.g., for testing).
2015-07-11 01:52:04 -04:00
Bin Huang
775ac3ad9f
The executable command on Mac OSX is 'ack' rather than 'ack-grep'.
2015-07-11 09:32:05 +08:00
Andrew Janke
bca720fa95
diagnostics: include detailed OS version info if possible
2015-07-09 21:18:11 -04:00
Andrew Janke
9813ff5f24
omz_diagnostic_dump: Add umask and $fpath listing.
...
This helps catch issues with compinit and insecure directories.
2015-06-28 18:00:47 -04:00
Michele Bologna
01e355fb1e
In addition to the already existing variables ZSH_THEME_GIT_PROMPT for behind,
...
ahead and diverged remote, I added ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE.
2015-06-15 10:15:22 +02:00
Ali Afshar
f66a54fb78
Add missing space causing parse error.
2015-06-14 22:29:11 -07:00
Robby Russell
34d3680232
Merge pull request #3838 from forivall/hyphen-insensitive
...
Add hyphen insensitivity
2015-06-14 22:17:43 -07:00
Robby Russell
422db48e37
Merge pull request #3986 from evilhamsterman/master
...
Only load url-quote-magic if it is available.
2015-06-14 22:09:13 -07:00
Dan Mills
2fb326513a
Only load url-quote-magic if it is available.
...
Partially fixes #3614
2015-06-10 15:49:47 -07:00
Adam Lindberg
2d40cc0bb3
Add git_prompt_behind and git_prompt_exists
...
This adds two new theme functions for git:
* `git_prompt_behind` works in a identical fashion to `git_prompt_ahead`
and will output a format variable (`ZSH_THEME_GIT_PROMPT_BEHIND`) if
the branch is behind.
* `git_prompt_remote` will output one format variable if the branch
exists on remote (`ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS`), and another
if the branch is unpublished (`ZSH_THEME_GIT_PROMPT_REMOTE_MISSING`).
The old `git_prompt_ahead` has been changed. Using git log is subject
to formatting in .gitconfig, which can be overridden and will break
this function. Relying on rev-list is much more stable.
2015-06-10 14:36:55 +02:00
leif.hanack
70c4a27fd6
Added a possibility to display the remote branch and the number of commits you are ahead or behind
2015-06-10 14:36:54 +02:00
Tejas Bubane
1653545282
Recognize comments by default.
2015-06-10 14:36:54 +02:00
Andrew Janke
0bda651dfd
Fix the spectrum_ls implementation in spectrum.zsh
2015-06-08 07:19:57 -04:00
Andrew Janke
8142261261
Hide spectrum.zsh var values to avoid junky "set" output to terminal
2015-06-08 07:07:45 -04:00
Andrew Janke
af68165207
Fix name of backed-up zshrc
2015-06-06 11:50:05 -04:00
Andrew Janke
afadb5a7fb
diagnostics: add zstyle state to output
2015-06-06 11:04:14 -04:00
Andrew Janke
82c1288cb2
Include some bash rc files; improve formatting; more version info
2015-06-06 01:19:29 -04:00
Andrew Janke
ea6adc5a0a
Add omz_diagnostic_dump() to help with bug reports.
2015-05-29 23:22:07 -04:00
Jordan Klassen
66052e2d07
Add hyphen insensitivity
2015-04-29 15:37:39 -07:00
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
88f42b6132
Add support for variant "utf8" locale suffix spelling. Fix dumb bug in iconv call that would cause it to hang.
2015-02-21 16:25:28 -05:00
Andrew Janke
cb37c934c0
Remove unnecessary braces.
2015-02-21 16:00:40 -05:00
Andrew Janke
187cf07c91
For unspecified encodings, assume it's UTF-8 or compatible (e.g. ASCII) and muddle through without character encoding conversion.
2015-02-17 00:54:54 -05:00
Andrew Janke
702ff1ca91
Add support for non-UTF-8 encodings in caller's locale.
2015-02-17 00:49:53 -05: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
2015-02-15 11:37:28 -08:00
Andrew Janke
3a18c33f17
In termsupport, use LC_CTYPE instead of LANG to enable byte-by-byte text processing. LANG doesn't seem to actually work.
2015-02-14 20:30:03 -05:00
Andrew Janke
a9e97e5d2d
Remove terminalapp plugin and fold its implementation in to lib/termsupport.zsh. Replaces the redundant Terminal.app support that was recently added to termsupport.
2015-02-14 19:05:27 -05: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 81004dfaba9b811fb625#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
Fredrik Fornwall
dac2a6e27a
Replace /usr/bin/env with env
...
Some environments (such as Android) does not have /usr/bin.
2014-08-20 23:52:05 +02:00
Robby Russell
01da53e10f
Merge pull request #2828 from r3dDoX/master
...
removed a hardcoded 'origin' in git.zsh and added new function for number of commits ahead of remote
2014-07-15 07:38:55 -07:00
Moinak Ghosh
5e328e3a9c
Solaris portability tweaks.
2014-07-11 18:41:49 +05:30
Simon Buchan
2927ce3714
Fix POST_1_7_2_GIT check for parse_git_dirty submodules.
2014-07-03 14:45:49 +12:00
Simon Buchan
676fb4e420
Fix parse_git_dirty() when status.branch is set.
2014-07-03 14:38:19 +12:00
Albert Krewinkel
c5d9fc9968
git_prompt_info: ignore git-config errors
...
Merged from #2906
The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output. This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).
This fixes the issue by simply ignoring the stderr output.
2014-06-28 10:12:20 +02:00
Mikhail S. Pobolovets
49161e7847
Add missing command wrapper for git
...
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2014-06-28 10:12:19 +02:00
Will Boyce
09fdf76311
ignore usernames beginning with underscore
2014-06-10 13:33:33 +02:00
ncanceill
7fbbf28e6e
return 0 when not a git repo
...
before, 128 was returned, which could display an error,
but out of a git repo this should exit silently
fixes #2226
2014-06-10 09:52:57 +02:00
Andrea De Pasquale
12324856c6
Added ssh-like mosh window title
...
Display the hostname when running Mosh (http://mosh.mit.edu/ ).
Same thing as displaying "hostname" when running "ssh hostname".
2014-06-05 23:27:59 +02:00
r3dDoX
514693125b
added prefix/suffix variable for customizability
2014-05-26 10:47:51 +02:00
r3dDoX
59c8fcc712
added new function to get number of commits ahead of remote
2014-05-25 14:13:21 +02:00
r3dDoX
3c485db8c7
replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0
2014-05-25 14:13:07 +02:00
Simon Courtois
b64e695b35
Ordering nocorrect aliases alphabetically
2014-05-24 20:07:06 +02:00
Simon Courtois
cd8d5c4410
Defining nocorrect aliases only when ENABLE_CORRECTION is "true"
...
This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.
2014-05-24 20:07:05 +02:00
drm00
f516b7c7f5
add check for colored ls on openbsd. (retry of #2225 )
2014-04-25 14:15:14 +02:00
Robby Russell
01dcf51fdf
Merge pull request #2502 from UniIsland/patch-1
...
`fc -l 1` instead of `history` in zsh_stats, fixes #2501
2014-04-19 12:54:35 -07:00
Robby Russell
8aa6e6a412
Merge pull request #2650 from kemko/patch-1
...
don't add --exclude-dir to GREP_OPTIONS on FreeBSD
2014-04-19 12:53:42 -07:00
Dmitriy
9385b3ee0a
set exclude-dir or exclude grep flags only if available
2014-04-19 00:03:36 +04:00
Robby Russell
175310ae27
Merge pull request #2661 from mcornella/fix_title_tab_percent
...
Fix escaping of $CMD of automatic title
2014-03-27 21:31:04 -07:00
Andre Eriksson
9650861e56
Fix broken reverse-menu-complete keybinding.
...
Since e537ee9
2014-03-26 15:12:39 +09:00
Marc Cornellà
5137e0e509
Escape % in $CMD variable
...
Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:
- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:
$ a=`date +%s%N`
- A function (or command in general) that contains a percent symbol:
$ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
$ to% 2 of 10 # $CMD=to%
2014-03-25 21:14:20 +01:00
Robby Russell
27965fedec
Merge pull request #2390 from LFDM/updating_spectrum
...
Updates and refactors spectrum.zsh
2014-03-23 11:39:07 -07:00
Marc Cornellà
12e30faaca
Fix export syntax of $GREP_OPTIONS
...
Fixes #2641 , #2642
2014-03-23 02:09:38 +01:00
Robby Russell
393c805f7e
Merge pull request #1162 from nXqd/patch-1
...
avoid VCS folders
2014-03-22 16:07:51 -07:00
Robby Russell
9eacd7d589
Merge pull request #750 from blueyed/history-drop-default-append-history
...
`setopt append_history` is not necessary.
2014-03-22 13:59:19 -07:00
Alexei Danchenkov
32a7824182
Added a forward-delete fallback to bind Delete key
...
Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
2014-03-21 09:24:59 -07:00
Alexei Danchenkov
c5413d7dd1
Aligned comments
2014-03-20 19:34:43 -07:00
Alexei Danchenkov
55a9d685fd
Update key-bindings.zsh
...
Aligned comments
2014-03-20 19:29:06 -07:00
Alexei Danchenkov
e537ee9db9
added terminfo keys verification
2014-03-20 19:10:44 -07:00
Mariusz Fik
b56e8fb478
Ignore more users in ssh completion.
...
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-03-16 18:14:34 +01:00
Robby Russell
c9e7129341
Merge pull request #2602 from blueyed/use-default-hosts-completion-2
...
Use zsh's default for ':completion:*:hosts'
2014-03-15 16:03:30 -07:00
Robby Russell
552aab6939
Merge pull request #2591 from kevinxucs/remove-extra-aliases
...
Removed unsolicited aliases.
2014-03-13 13:29:12 -07:00
Daniel Hahler
71d9420637
Use zsh's default for ':completion:*:hosts'
...
The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337 ), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009 ).
The best option appears to be using zsh's default configuration for
':completion:*:hosts'.
While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2
2014-03-13 17:48:58 +01:00
Robby Russell
7adf66f942
Merge pull request #1355 from F30/key-bindings
...
Use terminfo key codes instead of hardcoded ones for key bindings
2014-03-13 08:07:24 -07:00
Kaiwen Xu
b71a2b9d0f
Removed unsolicited aliases.
...
Those aliases should be in user's .zshrc file, instead of being default.
2014-03-10 04:05:14 -04:00
Robby Russell
48579ebf2b
Merge pull request #2341 from mcornella/title_backticks
...
Avoid evaluating special chars in $LINE on title command (fixes #2234 )
2014-03-08 14:30:55 -08:00
Robby Russell
9bd9278b80
Merge pull request #2287 from rumpelsepp/master
...
Added/modified some useful aliases.
2014-03-08 08:10:34 -08:00
Marc Cornellà
a951600b4e
Avoid 'title:parse error' with single quotes in $CMD
...
Fixes #2182
2014-02-21 22:16:12 +01:00
Marc Cornellà
3e5de21dc5
Revert previous commit, escape %
2014-02-21 22:16:12 +01:00
Marc Cornellà
b73ced397f
Use single quotes also in $LINE definiton
2014-02-21 22:16:12 +01:00
Marc Cornellà
b0fbe0d11a
Avoid evaluating special chars in $LINE on title command ( fixes #2234 )
2014-02-21 22:16:12 +01:00
Huang, Tao
217d8f0540
fc -l 1 instead of history in zsh_stats #2501
...
$HIST_STAMP breaks zsh_stats. see #2501
2014-02-06 17:29:33 +08:00
LFDM
b0b79e0aba
No need to eval in rvm_prompt_info!
...
Just activate word-splitting.
2014-01-07 19:08:20 +01:00
LFDM
85fde31991
Renames the file to prompt_info_functions.zsh
2014-01-06 09:58:40 +01:00
LFDM
082607c165
Adds documentation.
2014-01-06 09:57:23 +01:00
LFDM
72392a2c27
Adds all other dummy implementations.
2014-01-06 09:57:09 +01:00
LFDM
6a40557a8b
Updates spectrum.zsh
2013-12-31 14:54:34 +01:00
LFDM
c6aacf611d
Refactors ruby_prompts.zsh
2013-12-31 02:45:09 +01:00
LFDM
8a887c5052
Joins ruby prompt files and adds ruby_prompt_info.
2013-12-31 02:11:02 +01:00
LFDM
7aa766168c
Adds chruby_prompt_info dummy function.
2013-12-31 01:44:51 +01:00
LFDM
ae6ded5ad7
Returns false when rbenv is not found.
2013-12-31 01:15:35 +01:00
LFDM
468b24a8d5
Returns false when rvm is not found.
2013-12-31 01:06:14 +01:00
LFDM
bbbff94cca
Fixes rvm_prompt_info() in lib/rvm.zsh
2013-12-31 00:35:57 +01:00
Michael Orr
9b811fb625
accidentally blew away a git config setting used for another purpose, renaming in order to distinguish
2013-12-06 17:31:35 -05:00
Bob Bonifield
f082d7a245
Making auto-correction off by default
...
- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
2013-12-04 20:59:57 -07:00
Robby Russell
f0a7adcd3d
Merge pull request #2176 from dejanlukan/spectrum
...
Added the spectrum_bls function, which prints all 256 colors set as the background.
2013-12-03 00:18:17 -08:00
Robby Russell
1dd9c43e12
Merge pull request #1134 from koraa/pull_req_helpers
...
Helpers for default variables and alias value access
2013-12-02 23:47:21 -08:00
Robby Russell
44c7fd976b
Merge pull request #1928 from dongweiming/add-hist-stamp
...
Add option for show in the command execution time stamp in the history
2013-12-02 23:38:26 -08:00
Robby Russell
273728901e
Merge pull request #513 from randy909/fix-edit-cmdline
...
Fix edit-command-line binding
2013-12-02 23:03:03 -08:00
Robby Russell
fb614a0e80
Merge pull request #2229 from prubianes/master
...
Bazaar Integration Lib
2013-12-02 22:37:28 -08:00
Robby Russell
9357f2f41d
Merge pull request #2236 from Isquariel/nvm
...
Added function to show current Node.js version and new Bureau theme
2013-12-02 22:35:41 -08:00
Robby Russell
ac838345f5
Merge pull request #2270 from michaelorr/slow-git-fix
...
Optionally disable git_prompt_info with git config option for very large repos
2013-12-02 22:28:11 -08:00
Stefan Tatschner
c9f2c947e4
Added/modified some useful aliases.
2013-11-29 14:25:46 +01:00
Michael Orr
fbd479b68e
adding a check for git config option to disable git_prompt_info() on a per repo basis
2013-11-20 12:30:55 -05:00
Petter Abrahamsson
a7540844d5
Add support for colored ls output on OpenBSD
2013-11-14 07:06:54 -05:00
isquariel
5c73cb671b
Added nvm.zsh to detect current Node.js version
2013-11-08 23:26:05 +04:00
Pablo Rubianes
efc37c1f71
Modification to the frisk theme to work with the BZR lib
2013-11-06 20:10:59 -02:00
dejan
f057737e57
Added the spectrum_bls function, which prints all 256 colors set as the
...
background.
We can easily see which color we want to set when changing the PS1 shell variable,
since the colors are more distinctive.
2013-10-16 12:36:48 +02:00
dongweiming
77cf869605
Add option for show in the command execution time stamp in the history
2013-06-30 20:54:23 +08:00
Robby Russell
4f8d6a8b15
Merge pull request #1773 from essembeh/master
...
Uncomment l alias
2013-06-25 09:10:05 -07:00
Robby Russell
0f2b24c1b8
Merge pull request #1887 from tgkokk/git-slow-fix
...
Fixed slow behavior when using GitHub wrappers
2013-06-21 07:07:26 -07:00
Theodore Kokkoris
9703eba66e
Fixed slow behavior when using GitHub wrappers
2013-06-12 20:04:08 +03:00
Ehren Kret
ab7604e5c2
Escape both % and $ in the command line
...
Fixes issue #1884
2013-06-11 11:37:35 -07:00
Christopher Roach
4ff861ee11
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
2013-05-19 12:55:10 -07:00
Sébastien M-B
f77a545a4b
Uncomment l alias
2013-04-28 16:34:36 +02:00
Robby Russell
b6ea876971
Merge pull request #690 from essembeh/master
...
Adding ~/.ssh/config parsing for host list and theme.
2013-04-23 21:27:51 -07:00
Robby Russell
8890df1251
Merge pull request #922 from sbfaulkner/master
...
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
Robby Russell
81ed0c4115
Resolving conflict with merge of #970
2013-04-23 20:44:35 -07:00
Robby Russell
685c746cc7
Merge pull request #1565 from serdardalgic/autoenv-plugin
...
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv.
2013-04-23 20:33:50 -07:00
Robby Russell
a2c8db9eb3
Resolving conflict in #1266 merge
2013-04-23 20:30:21 -07:00
Robby Russell
7cdb6d667c
Resolving conflict when merging in 1570
2013-04-23 20:21:18 -07:00
Robby Russell
b61555d7c0
Merge pull request #1582 from To1ne/pushdminus
...
use pushdminus
2013-04-23 20:16:41 -07:00
Robby Russell
8fea507b5c
Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
...
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
2013-04-23 20:04:08 -07:00
Robby Russell
30b0eb3ffa
Merge pull request #1740 from felipec/fc/git
...
git: fix parse_git_dirty()
2013-04-23 19:42:58 -07:00
Jeremy Attali
e41714d72c
Added option to allow untracked files as non dirty
...
In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
2013-04-22 10:59:08 +02:00
Felipe Contreras
d615f64374
git: fix parse_git_dirty()
...
If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2013-04-21 02:56:39 -05:00
Robby Russell
085af13b47
Merge pull request #1531 from lcosmin/master
...
Fixed 'ls' issue on NetBSD
2013-04-12 06:16:54 -07:00
Robby Russell
cd55560c74
Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6
...
parse_git_dirty() support for Git 1.6
2013-04-07 19:06:31 -07:00
Christian Höltje
8890450684
This fixes checking for git untracked items
...
The grep expression was incorrect for normal grep. Adding
the `-E` option fixed the escaping of the question marks.
2013-04-03 20:41:05 -04:00
Robby Russell
b8b241f630
Merge pull request #749 from blueyed/setopt-correct
...
Only `setopt correct`, not "correct_all".
2013-03-26 22:14:20 -07:00
Robby Russell
5cde893ce0
Merge pull request #1661 from hellerbarde/master
...
Fix some problems with git enabled prompts where they *always* claim to have untracked files
2013-03-26 22:11:04 -07:00
Robby Russell
a3a6b91818
Merge pull request #1616 from sxeraverx/master
...
pipe git version check error to /dev/null (for when git doesn't exist)
2013-03-26 21:56:35 -07:00
Flavius Aspra
3826c7bf85
allow setting a custom HISTFILE before oh-my-zsh is loaded
2013-03-15 22:07:47 +01:00
Philip Stark
56e835426b
fix git_prompt_status() to not say the repository has untracked files all the time
2013-03-14 00:31:14 +01:00
bertag
72ec24108a
Tweaked parse_git_dirty() in lib/git.zsh to support proper dirty/clean parsing against both git 1.6 and git 1.7+
2013-03-11 13:41:32 -06:00
Thomas Minor
3db22634a1
pipe git version check error to /dev/null (for when git doesn't exist)
2013-02-19 10:00:58 -08:00
Swanand Pagnis
fb3dc24ff4
Support for opening tabs and windows in the same This fixed #1498 for me on Mountain Lion
2013-02-14 14:07:58 +05:30
Yoav Weiss
9245a30868
Did a full circle and went back to # On branch master
...
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: git.zsh
#, ignoring untracked files, which seems to be the primary cause for slowness
2013-02-13 17:14:43 +01:00
Yoav Weiss
11576dd40b
Fixed dirty check to include files added to index
2013-02-13 11:28:13 +01:00
Sébastien M-B
2595484a97
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/aliases.zsh
2013-02-08 19:08:06 +01:00
Toon Claes
fe4c2379c4
use pushdminus
2013-02-04 22:21:34 +01:00
Yoav Weiss
171a76a3c4
Closer to original status command, using SUBMODULE SYNTAX
2013-01-30 09:32:01 +01:00
Yoav Weiss
2e213b9b8f
Faster dirty git status check (using git diff)
2013-01-27 14:50:33 +01:00
Serdar Dalgıç
4c91f6d13e
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv into
...
oh-my-zsh.
2013-01-25 13:23:40 +02:00
Robby Russell
9ef7e8a191
Merge pull request #1077 from Mezzle/add-option-to-show-git-status
...
Add option to disable status notification
2013-01-10 22:36:16 -08:00
Cosmin Lu?ă
e5736d3910
Fixed coding style
2013-01-03 14:44:17 +02:00
Robby Russell
c5ecb4e136
Fixes #1489
...
Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"
This reverts commit 8f89d4d5a5
2012-12-31 05:25:07 -08:00
Cosmin Lu?ă
fa355a798c
Fixed issue with NetBSD's ls
2012-12-31 14:02:22 +02:00
MAD
b9a989fea5
Add Stash toogle to display if there's some stash or not in git_prompt_status
2012-12-07 10:25:02 +01:00
Robby Russell
78e3f38db7
Merge pull request #1258 from caio/git-branch-status
...
Add branch status support to git_prompt_status
2012-12-04 06:56:43 -08:00
Robby Russell
5aed0aed4e
Merge pull request #875 from ttddyy/prompt_git-remove
...
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
Robby Russell
d88fad3392
Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
...
Fixed Mac OS X Terminal.app related issue with extra newlines echoed
2012-12-04 06:45:01 -08:00
