Skip to content

Commit

Permalink
pulling latest changes (#2)
Browse files Browse the repository at this point in the history
* Ignore tmux autostart in vscode terminal

* Allow users to easily define LS_COLORS and LSCOLORS (sorin-ionescu#1546)

* Feat (git): add an alias displaying the commits yet to be applied to upstream (sorin-ionescu#1565)

* Revert "Only call reset-prompt when the appropriate zstyle is set"

This reverts commit 6d00fdf.

As unfortunate as it is, this workaround was a hack and doesn't take
into account prompts like spaceship which don't use $editor_info but
rely on $KEYMAP directly. We'll need to find a more consistent solution
to fix this.

* Add proper prompt_opts to smiley prompt

* Rename "Mac OS X" to "macOS" in comments

This only changes references in text for human consumption. It leaves
out renaming paths because that can cause breaking changes.

Related issue sorin-ionescu#1449.

* command-not-found: Directly source homebrew command-not-found handler

Fixes sorin-ionescu#1577, Fixes sorin-ionescu#1451

* Export VIRTUAL_ENV_DISABLE_PROMPT when enabling virutalenv

Adding `export` ensures the define is available in the shell so pyenv
or virtualenvwrapper do not duplicate the virtualenv name on the
prompt.

* Update cache files when .zpreztorc file is modified

Fixes sorin-ionescu#1581

* Document macOS support for `command-not-found`

Document macOS support for `command-not-found`

* Document `gpf` vs `gpF`

Document the difference between `gpf` and `gpF`. These were changed in sorin-ionescu#1040 / sorin-ionescu@ddfc870, but never documented.

* Remove zlogout's Apu quote (sorin-ionescu#1583)

* Remove zlogout's Apu quote

For questions about why, see https://en.wikipedia.org/wiki/The_Problem_with_Apu

* Add a couple of random sayings per feedback in sorin-ionescu#1583

* Fix spelling error in CONTRIBUTING.md (sorin-ionescu#1590)

* Fix path to global ssh known hosts file

The path to the global known hosts file is /etc/ssh/ssh_known_hosts, not
/etc/ssh_hosts.

* syntax-highlighting: Update README to clarify module load order

Fixes sorin-ionescu#1584

* completion: Compact path to global ssh known hosts file

* coreutils: update list of included coreutils (sorin-ionescu#1592)
  • Loading branch information
g1910 committed Jul 19, 2018
1 parent b68eda1 commit c8d3397
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions runcoms/zpreztorc
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ zstyle ':prezto:module:editor' ps-context 'yes'
# Allow the zsh prompt context to be shown.
#zstyle ':prezto:module:editor' ps-context 'yes'

# Allow the zsh prompt context to be shown.
#zstyle ':prezto:module:editor' ps-context 'yes'

#
# Git
#
Expand Down

0 comments on commit c8d3397

Please sign in to comment.