Commit 0921e720 authored by Olivier Mengué's avatar Olivier Mengué
Browse files

Merge branch 'develop'

Merge changes from the develop branch:
- many fixes, in particular for MacOS X (battery)
- many speed improvments (Mercurial, Subversion)
- many reliability improvments (SHORTEN_PATH feature)
Ready for a release.
parents 4840795b 64f93eb5
......@@ -10,7 +10,7 @@ The main branch for development is `develop`. This is on top of this branch
that you must write your patches.
Any pull request built on top of `master` instead of `develop`
is additionnal merge work for maintainers, and you want to avoid this if you
is additional merge work for maintainers, and you want to avoid this if you
aim for quick integration of your work.
If you wrote your patch on the wrong branch the maintainers may choose to close
......@@ -41,7 +41,7 @@ How to do the right thing?
# Check that your local repo is up to date
$ git fetch
# Rebase your work on the lastest state of `develop`
# Rebase your work on the latest state of `develop`
$ git rebase upstream/develop
# Push
......
......@@ -92,7 +92,7 @@ git clone https://github.com/nojhan/liquidprompt.git
source liquidprompt/liquidprompt
```
To use it everytime you start a shell add the following line to your
To use it every time you start a shell add the following line to your
`.bashrc` (if you use bash) or `.zshrc` (if you use zsh):
`source ~/liquidprompt/liquidprompt`
......@@ -284,6 +284,7 @@ Set to a null string "" if you do not want color.
* Prompt mark
* `LP_COLOR_MARK` as user
* `LP_COLOR_MARK_ROOT` as root
* `LP_MARK_PREFIX="\n"` put the prompt on the second line
* Current user
* `LP_COLOR_USER_LOGGED` user who logged in
* `LP_COLOR_USER_ALT` user but not the one who logged in
......@@ -342,11 +343,11 @@ version 3.
* Browsing into very large subversion repositories may dramatically slow down
the display of the liquid prompt (use `LP_DISABLED_VCS_PATH` to avoid that).
* Subversion repository cannot display commits to be pushed, this is a
limitation of the Subversion versionning model.
limitation of the Subversion versioning model.
* The proxy detection only uses the `$http_proxy` environment variable.
* The window's title escape sequence may not work properly on some terminals
(like xterm-256)
* The analog clock necessitate a unicode-aware terminal and a at least one
* The analog clock necessitate a Unicode-aware terminal and a at least one
sufficiently complete font on your system.
The [Symbola](http://users.teilar.gr/~g1951d/) font, designed by Georges Douros,
is known to work well.
......
This diff is collapsed.
......@@ -122,7 +122,8 @@ LP_ENABLE_TEMP=1
LP_TIME_ANALOG=0
# Use the liquid prompt as the title of the terminal window
# This may not work properly on exotic terminals, thus the
# The content is not customizable, the implementation is very basic,
# and this may not work properly on exotic terminals, thus the
# recommended value is 0
# See LP_TITLE_OPEN and LP_TITLE_CLOSE to change escape characters to adapt this
# feature to your specific terminal.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment