Revision: 2799
http://tmux.svn.sourceforge.net/tmux/?rev=2799&view=rev
Author: tcunha
Date: 2012-05-22 20:50:51 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Sync OpenBSD patchset 1113:
Ignore line continuation when escaped as \\, from Simon Nicolussi.
Modified Paths:
--------------
trunk/cfg.c
trunk/tmux.1
Modified: trunk/cfg.c
===================================================================
--- trunk/cfg.c 2012-05-22 20:50:03 UTC (rev 2798)
+++ trunk/cfg.c 2012-05-22 20:50:51 UTC (rev 2799)
@@ -109,7 +109,9 @@
len = strlen(line);
if (len > 0 && line[len - 1] == '\\') {
line[len - 1] = '\0';
- continue;
+ /* Ignore escaped backslash at EOL. */
+ if (len > 1 && line[len - 2] != '\\')
+ continue;
}
buf = line;
line = NULL;
Modified: trunk/tmux.1
===================================================================
--- trunk/tmux.1 2012-05-22 20:50:03 UTC (rev 2798)
+++ trunk/tmux.1 2012-05-22 20:50:51 UTC (rev 2799)
@@ -497,7 +497,8 @@
.Em command sequence .
Each command should be separated by spaces and a semicolon;
commands are executed sequentially from left to right and
-lines ending with a backslash continue on to the next line.
+lines ending with a backslash continue on to the next line,
+except when escaped by another backslash.
A literal semicolon may be included by escaping it with a backslash (for
example, when specifying a command sequence to
.Ic bind-key ) .
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
