* blessed/master:
Add Ecosia to web-search plugin.
Use $HOME instead of tilde inside quotes
Cleanup update_terminalapp_cwd function
Quote all variables in if statements
Use a case structure to id terminal types
* upstream/master: (37 commits)
Added setting of the window title in Cygwin
Support all kinds of putty-like terminal strings.
Use shwordsplit in open_command()
Add empty string parameter to start command
make this work in the git-for-windows SDK
znt: twice as fast searching
znt: updated README.md
Updated README.md
Renamed README.txt to README.md
Add support for "putty" $TERM in termsupport.zsh
znt: n-history supports multi-line cmds and starts with current buffer
Fix open_command nohup call
z plugin: fix loading from custom location
history-substring-search: update to upstream version 2015-09-28
history-substring-search: add a script to automatically update OMZ from the upstream repo
termsupport: protect subshell with quotes
Drop the use of nohup on OSX for tmux compatibility
[wd] update minor version (v0.4.2)
Cleanup gradle plugin file
gradle plugin: also list tasks in subprojects
...
The old implementation would attempt to load both the default and custom
implementations, with the custom one coming first, so it would get clobbered
by the default version.
The zle-line-init and zle-line-finish definitions here were broken with
respect to smkx/rmkx because their "if" logic had fallthrough where it shouldn't,
so the mode was left in rmkx all the time. This just removes those widgets
entirely, because they're now defined (correctly) in lib/keybindings.zsh and
not needed in plugins.
Closes#4616
Changes the `plugins=(... mercurial ...)` to be closer to correct zsh syntax, removing commas and extra spaces.
Revises discussion on configuring themes to avoid sounding like users should modify the theme definition file in the main OMZ folder. Prioritizes the suggestion of using a theme which already supports hg_prompt_info.
Removes old completion setup that breaks with current _git and _hub completions.
Ruby is no longer required by hub; removes that test.
Does not define new completions for hub; they are now defined by hub itself.
Change the functions to use hub to create the repos on GitHub.
Add error checking to the functions.
Removes apparently-unused _github completion definition.
* robbyrussell/master: (75 commits)
Update custom location command and fix code format
Fix typo.
Fix backwards logic in uninstaller once and for all
Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh
Fix conditional in uninstall prompt
Fix syntax error in confirmation prompt of uninstall.sh
Fix syntax error in #4515 on certain shells
Revert "Make install script safer"
Fix "be" -> "b" typo in coffee plugin README.md.
Make install script safer
[FIX#4525]: Fix typo
Fixd bug for pyenv plugin
Fix install.sh/upgrade.sh for tput-less systems
Check for git before trying to upgrade, as per #4504
Enable pyenv rehash
Init pyenv virtualenvs too
Add option '--port' to 'rails server' alias.
Add an alias for upstream
autoenv: actually source autoenv once located
add alias to sort by version
...
