about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/prompt.yo3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51078fb8a..ed5762394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-05  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 34836: Doc/Zsh/prompt.yo: fix description of '%-0<<'
+
 2015-04-01  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 34814: Completion/Unix/Command/_git: completion: git: Fix
diff --git a/Doc/Zsh/prompt.yo b/Doc/Zsh/prompt.yo
index 65372deec..08dcded24 100644
--- a/Doc/Zsh/prompt.yo
+++ b/Doc/Zsh/prompt.yo
@@ -367,7 +367,8 @@ truncated while turning off truncation from there on. For example, the
 prompt '%10<...<%~%<<%# ' will print a truncated representation of the
 current directory, followed by a `tt(%)' or `tt(#)', followed by a
 space.  Without the `tt(%<<)', those two characters would be included
-in the string to be truncated.  Note that `tt(%-0<<)' is a distinct
+in the string to be truncated.  Note that `tt(%-0<<)' is not equivalent
+to `tt(%<<)' but specifies that the prompt is truncated at the right margin.
 
 Truncation applies only within each individual line of the prompt, as
 delimited by embedded newlines (if any).  If the total length of any line