Merge branch 'master' into config-file
Conflicts: config.h
This commit is contained in:
		
						commit
						ca2f60b977
					
				@ -21,7 +21,7 @@ KEYBINDINGS
 | 
			
		||||
* ``ctrl-shift-p``: jump to previous search match
 | 
			
		||||
* ``ctrl-tab``: start scrollback completion
 | 
			
		||||
 | 
			
		||||
During scrollback search, The current selection is changed to the search match
 | 
			
		||||
During scrollback search, the current selection is changed to the search match
 | 
			
		||||
and copied to the PRIMARY clipboard buffer.
 | 
			
		||||
 | 
			
		||||
With the scrollback completion/widget open, up/down cycle through completions,
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								config.h
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								config.h
									
									
									
									
									
								
							@ -1,4 +1,4 @@
 | 
			
		||||
static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*";
 | 
			
		||||
static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+()]*";
 | 
			
		||||
 | 
			
		||||
#define URL_COMMAND(URL_MATCH) {"/usr/bin/firefox", URL_MATCH, NULL}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user