mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		
							
								
								
									
										10
									
								
								cmd-parse.y
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								cmd-parse.y
									
									
									
									
									
								
							@@ -1627,6 +1627,7 @@ yylex_token_tilde(char **buf, size_t *len)
 | 
				
			|||||||
static char *
 | 
					static char *
 | 
				
			||||||
yylex_token(int ch)
 | 
					yylex_token(int ch)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
						struct cmd_parse_state	*ps = &parse_state;
 | 
				
			||||||
	char			*buf;
 | 
						char			*buf;
 | 
				
			||||||
	size_t			 len;
 | 
						size_t			 len;
 | 
				
			||||||
	enum { START,
 | 
						enum { START,
 | 
				
			||||||
@@ -1650,9 +1651,12 @@ yylex_token(int ch)
 | 
				
			|||||||
				ch = '\r';
 | 
									ch = '\r';
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		if (state == NONE && ch == '\n') {
 | 
							if (ch == '\n') {
 | 
				
			||||||
			log_debug("%s: end at EOL", __func__);
 | 
								if (state == NONE) {
 | 
				
			||||||
			break;
 | 
									log_debug("%s: end at EOL", __func__);
 | 
				
			||||||
 | 
									break;
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								ps->input->line++;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		/* Whitespace or ; or } ends a token unless inside quotes. */
 | 
							/* Whitespace or ; or } ends a token unless inside quotes. */
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user