Skip to content

Commit b7a5354

Browse files
committed
Revert "Merge Augeas lens fix for continuations in section headings"
1 parent f86ae1c commit b7a5354

File tree

2 files changed

+4
-287
lines changed

2 files changed

+4
-287
lines changed

letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ autoload xfm
4545
let dels (s:string) = del s s
4646

4747
(* deal with continuation lines *)
48-
let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)/ " "
49-
let sep_osp = del /([ \t]*|[ \t]*\\\\\r?\n[ \t]*)/ ""
48+
let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)/ " "
49+
50+
let sep_osp = Sep.opt_space
5051
let sep_eq = del /[ \t]*=[ \t]*/ "="
5152

5253
let nmtoken = /[a-zA-Z:_][a-zA-Z0-9:_.-]*/
@@ -59,7 +60,7 @@ let indent = Util.indent
5960

6061
(* borrowed from shellvars.aug *)
6162
let char_arg_dir = /([^\\ '"{\t\r\n]|[^ '"{\t\r\n]+[^\\ \t\r\n])|\\\\"|\\\\'/
62-
let char_arg_sec = /[^\\ '"\t\r\n>]|\\\\"|\\\\'/
63+
let char_arg_sec = /[^ '"\t\r\n>]|\\\\"|\\\\'/
6364
let char_arg_wl = /([^\\ '"},\t\r\n]|[^ '"},\t\r\n]+[^\\ '"},\t\r\n])/
6465

6566
let cdot = /\\\\./

letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/section-continuations-2525.conf

Lines changed: 0 additions & 284 deletions
This file was deleted.

0 commit comments

Comments
 (0)