summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-12-06 19:34:32 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-12-06 19:34:32 +0000
commitc66f52bad9d5aac4a5b6dce95623a2576f9fc045 (patch)
tree34a7a830b12ba2c4fb918e857db23d7fa8a88944
parent8d00aca697066a70c38aa04eba19726cd8b2f3a7 (diff)
downloadzsh-c66f52bad9d5aac4a5b6dce95623a2576f9fc045.tar.gz
zsh-c66f52bad9d5aac4a5b6dce95623a2576f9fc045.tar.xz
zsh-c66f52bad9d5aac4a5b6dce95623a2576f9fc045.zip
Mikael: 28480: allow PROMPT_EOL_MARK to be an empty string
-rw-r--r--ChangeLog7
-rw-r--r--Src/utils.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d33f9cc29..2e7fdcd41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-06  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	*  Mikael: 28480: Doc/Zsh/params.yo, Src/utils.c: allow
+	PROMPT_EOL_MARK to be an empty string.
+
 2010-12-06  Peter Stephenson  <pws@csr.com>
 
 	* users/15622: Completion/Base/Utility/_pick_variant: use
@@ -13920,5 +13925,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5144 $
+* $Revision: 1.5145 $
 *****************************************************
diff --git a/Src/utils.c b/Src/utils.c
index 8e557fd4c..12ffc64e1 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -1285,7 +1285,7 @@ preprompt(void)
 	char *eolmark = getsparam("PROMPT_EOL_MARK");
 	char *str;
 	int percents = opts[PROMPTPERCENT], w = 0;
-	if (!eolmark || !*eolmark)
+	if (!eolmark)
 	    eolmark = "%B%S%#%s%b";
 	opts[PROMPTPERCENT] = 1;
 	str = promptexpand(eolmark, 1, NULL, NULL, NULL);