Merge remote-tracking branch 'upstream/master'

# By Kaleb Elwert (80) and others
# Via GitHub (2) and Kaleb Elwert (1)
* upstream/master: (322 commits)
  prompt: update powerlevel10k submodule to v1.12.0
  git-info: use tab as separator for splitting ahead_and_behind (sorin-ionescu#902)
  Ask pyenv whether pip exists if installed (sorin-ionescu#1848)
  Remove `--all` from git alias `glg` (sorin-ionescu#1853)
  Make .zcomp* location configurable (sorin-ionescu#1842)
  prompt: update powerlevel10k submodule to v1.11.0
  prompt: update powerlevel10k submodule to v1.10.0
  [git] Add git pull autostash alias
  Do not source history-substring-search if already loaded (sorin-ionescu#1830)
  prompt: update powerlevel10k submodule to v1.7.0
  homebrew: load helper dependency
  Use shallow clone for powerlevel9k and powerlevel10k submodules (sorin-ionescu#1819)
  fix: regression in homebrew module (sorin-ionescu#1816)
  prompt: fix usage of zsh-async in sorin prompt (sorin-ionescu#1810)
  Fix missing dependency on helper module for helpers added in sorin-ionescu#1793 (sorin-ionescu#1811)
  prompt: update powerlevel10k submodule to v1.5.0
  feat(helper): add os-type helper functions
  Update syntax-highlighting module
  prompt: update powerlevel10k submodule to v1.4.0
  prompt: update powerlevel10k submodule to v1.3.0
  ...

# Conflicts:
#	modules/autosuggestions/external
#	modules/completion/external
#	modules/prompt/external/agnoster
#	modules/prompt/external/pure
#	modules/syntax-highlighting/external
#	modules/utility/init.zsh

.editorconfig

@@ -0,0 +1,9 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[{.gitattributes,.gitignore,.gitmodules}]
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -1,16 +1,15 @@
-Please check if a similar issue already exists or has been closed before before opening your issue.
+<!-- Please check if a similar issue already exists or has been closed before before opening your issue. -->
 
 ### Description
-
-[Description of the bug or feature]
+<!-- Provide a general description of the bug or feature -->
 
 ### Expected behavior
 
-[What you expected to happen]
+<!-- What you expected to happen -->
 
 ### Actual behavior
 
-[What actually happened]
+<!-- What actually happened -->
 
 ### Steps to Reproduce
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,5 @@
-Please be sure to check out our [contributing guidelines](https://github.com/sorin-ionescu/prezto/blob/master/CONTRIBUTING.md) before submitting your pull request.
+Please be sure to check out our [contributing guidelines](https://github.com/sorin-ionescu/prezto/blob/master/CONTRIBUTING.md)
+before submitting your pull request.
 
 Fixes #
 

.gitignore

@@ -1,3 +1,4 @@
 *.zwc
 *.zwc.old
 modules/*/cache.zsh
+contrib

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "modules/autosuggestions/external"]
 	path = modules/autosuggestions/external
-	url = https://github.com/zsh-users/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions.git
 [submodule "modules/history-substring-search/external"]
 	path = modules/history-substring-search/external
 	url = https://github.com/zsh-users/zsh-history-substring-search.git
@@ -19,3 +19,17 @@
 [submodule "modules/prompt/functions/pure"]
 	path = modules/prompt/external/pure
 	url = https://github.com/sindresorhus/pure.git
+[submodule "modules/fasd/external"]
+	path = modules/fasd/external
+	url = https://github.com/clvv/fasd.git
+[submodule "modules/prompt/external/async"]
+	path = modules/prompt/external/async
+	url = https://github.com/mafredri/zsh-async.git
+[submodule "modules/prompt/external/powerlevel9k"]
+	path = modules/prompt/external/powerlevel9k
+	url = https://github.com/bhilburn/powerlevel9k.git
+	shallow = true
+[submodule "modules/prompt/external/powerlevel10k"]
+	path = modules/prompt/external/powerlevel10k
+	url = https://github.com/romkatv/powerlevel10k.git
+	shallow = true

CONTRIBUTING.md

@@ -25,15 +25,36 @@ improve its performance, do not hesitate to fork and send pull requests.
 
 #### Code Style
 
-   - Indent using 2 spaces. No tabs.
-   - Put `; do` and `; then` on the same line as the `while`, `for` or `if`.
+This project follows the [Google Shell Style Guide][5] when possible. However,
+there are a number of additional things to keep in mind.
+
    - Local variables should be used whenever possible.
-   - Use `snake_case` for variable and function naming.
-   - Local variables should be lower cased.
-   - Global variables should be upper cased.
-   - Use `$(command)` instead of backticks.
-   - Avoid `eval` if possible.
    - Prefer `zstyle` over environment variables for configuration.
+   - Prefer (( ... )) over [[ ... ]] for arithmetic expression.
+   - Use the function keyword to define functions.
+   - The 80 character hard limit can be waived for readability.
+
+#### Using an Alternative zprezto Directory
+
+To work on zprezto without messing with your current configuration:
+
+```sh
+mkdir devel-zprezto
+cd devel-zprezto
+git clone --recursive https://github.com/sorin-ionescu/prezto.git .zprezto
+ZDOTDIR=$(pwd)
+echo "Your development ZDOTDIR is $ZDOTDIR"
+setopt EXTENDED_GLOB
+for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+    ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+done
+```
+
+Then to start zsh in this development environment you will run:
+
+```sh
+ZDOTDIR=/path/to/devel-zprezto zsh
+```
 
 #### Modules
 
@@ -44,10 +65,11 @@ improve its performance, do not hesitate to fork and send pull requests.
 #### Themes
 
    - A screenshots section must be present in the file header.
-   - The pull request description must have [embedded screenshots][5].
+   - The pull request description must have [embedded screenshots][6].
 
 [1]: https://github.com/sorin-ionescu/prezto/contributors
 [2]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
 [3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [4]: https://help.github.com/articles/using-pull-requests
-[5]: http://daringfireball.net/projects/markdown/syntax#img
+[5]: https://google.github.io/styleguide/shell.xml
+[6]: http://daringfireball.net/projects/markdown/syntax#img

README.md

@@ -9,35 +9,42 @@ Installation
 ------------
 
 Prezto will work with any recent release of Zsh, but the minimum required
-version is 4.3.17.
+version is 4.3.11.
 
   1. Launch Zsh:
 
-        `zsh`
+     ```console
+     zsh
+     ```
 
   2. Clone the repository:
 
-        `git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"`
+     ```console
+     git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+     ```
 
   3. Create a new Zsh configuration by copying the Zsh configuration files
      provided:
 
-        ```
-        setopt EXTENDED_GLOB
-        for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
-          ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
-        done
-        ```
-
-     Note: If you already have any of the given config files, ln will error. In
-     simple cases you can add `source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"` to
-     the bottom of your `.zshrc` to load prezto but keep your config intact. For
-     more complicated setups, it is recommended that you back up your original
+     ```sh
+     setopt EXTENDED_GLOB
+     for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+       ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+     done
+     ```
+
+     Note: If you already have any of the given configuration files, `ln` will
+     cause error. In simple cases you can load prezto by adding the line
+     `source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"` to the bottom of your
+     `.zshrc` and keep the rest of your Zsh configuration intact. For more
+     complicated setups, it is recommended that you back up your original
      configs and replace them with the provided prezto runcoms.
 
   4. Set Zsh as your default shell:
 
-        `chsh -s /bin/zsh`
+     ```console
+     chsh -s /bin/zsh
+     ```
 
   5. Open a new Zsh terminal window or tab.
 
@@ -50,9 +57,18 @@ window or tab.
 Updating
 --------
 
-Pull the latest changes and update submodules.
+Run `zprezto-update` to automatically check if there is an update to zprezto.
+If there are no file conflicts, zprezto and its submodules will be
+automatically updated. If there are conflicts you will instructed to go into
+the `$ZPREZTODIR` directory and resolve them yourself.
 
-    git pull && git submodule update --init --recursive
+To pull the latest changes and update submodules manually:
+
+```console
+cd $ZPREZTODIR
+git pull
+git submodule update --init --recursive
+```
 
 Usage
 -----
@@ -74,6 +90,23 @@ accompanying README files to learn of what is available.
      window or tab.
 
      ![sorin theme][2]
+     Note that the 'git' module may be required for special symbols to appear,
+     such as those on the right of the above image. Add `'git'` to the `pmodule`
+     list (under `zstyle ':prezto:load' pmodule \` in your *~/.zpreztorc*) to
+     enable this module.
+
+### External Modules
+
+  1. By default modules will be loaded from */modules* and */contrib*.
+  2. Additional module directories can be added to the
+     `:prezto:load:pmodule-dirs` setting in *~/.zpreztorc*.
+
+     Note that module names need to be unique or they will cause an error when
+     loading.
+
+     ```sh
+     zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
+     ```
 
 Customization
 -------------
@@ -98,6 +131,6 @@ This project is licensed under the MIT License.
 [3]: http://git-scm.com
 [4]: https://github.com
 [5]: http://gitimmersion.com
-[6]: http://gitref.org
+[6]: https://git.github.io/git-reference/
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html