Merge branch 'master' into patch-1

This commit is contained in:
arshavindn 2018-09-06 17:00:23 +07:00
commit 68d908e567
8 changed files with 15 additions and 15 deletions

View file

@ -89,7 +89,7 @@ accompanying README files to learn of what is available.
window or tab. window or tab.
![sorin theme][2] ![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 list under `zstyle ':prezto:load' pmodule \ ` in your `.zpreztorc` to enable this module.
### External Modules ### External Modules
1. By default modules will be loaded from */modules* and */contrib*. 1. By default modules will be loaded from */modules* and */contrib*.

@ -1 +1 @@
Subproject commit 15931f04ffac91a2f9a1a044b6b3ee4050751064 Subproject commit d7c796719e6352666f7a9c94da9ddaed10f3217d

@ -1 +1 @@
Subproject commit 2a30b05a5cf724a2d1c4c140c302dbf93f6aa6f6 Subproject commit 7ec52769d3a0dd505d33d857511866d2b90d0eec

@ -1 +1 @@
Subproject commit b001fa529a874fbe8bd22a9d4526153138645289 Subproject commit da48ccb0e2ade777a10decfe214b5433d990d0d9

@ -1 +1 @@
Subproject commit 17c069d25ac7b24af6b5dc7ecb9597cef881f582 Subproject commit d031b3e03522d47607173ebda89e7558b622a322

@ -1 +1 @@
Subproject commit a95d55cc7d3a73fc562ac11e23c26113ed6d58cf Subproject commit fa9137ecec76d23fe76fd6fabe9c2f8ae0de9cf5

@ -1 +1 @@
Subproject commit 434af7b11dd33641231f1b48b8432e68eb472e46 Subproject commit db6cac391bee957c20ff3175b2f03c4817253e60

View file

@ -124,13 +124,6 @@ zstyle ':prezto:module:prompt' theme 'sorin'
# return codes. This is not supported by all prompts. # return codes. This is not supported by all prompts.
# zstyle ':prezto:module:prompt' show-return-val 'yes' # zstyle ':prezto:module:prompt' show-return-val 'yes'
#
# Ruby
#
# Auto switch the Ruby version on directory change.
# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
# #
# Python # Python
# #
@ -141,6 +134,13 @@ zstyle ':prezto:module:prompt' theme 'sorin'
# Automatically initialize virtualenvwrapper if pre-requisites are met. # Automatically initialize virtualenvwrapper if pre-requisites are met.
# zstyle ':prezto:module:python:virtualenv' initialize 'yes' # zstyle ':prezto:module:python:virtualenv' initialize 'yes'
#
# Ruby
#
# Auto switch the Ruby version on directory change.
# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
# #
# Screen # Screen
# #