From: Benno Schulenberg Date: Thu, 28 May 2015 18:56:31 +0000 (+0000) Subject: Allowing a CD name to contain any character. X-Git-Tag: v2.4.2~44 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d297784b8796a50e23b70554bd1447d742ef17b6;p=nano.git Allowing a CD name to contain any character. Changes were suggested by Dani Moller. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5233 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index db9ce17b..922c463f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ * src/prompt.c (do_yesno_prompt): Use 'width' instead of hardcoded 16. Also always first set the string and then position the cursor. * TODO: Mark window resizes and better file-type detection as done. + * doc/syntax/debian.nanorc: Allow a CD name to contain any character. + This addresses Debian bug #688892 reported by Dani Moller. 2015-05-28 Mahyar Abbaspour * src/nano.c (handle_sigwinch, regenerate_screen), src/global.c, diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc index f87e2246..1019a1bb 100644 --- a/doc/syntax/debian.nanorc +++ b/doc/syntax/debian.nanorc @@ -6,14 +6,13 @@ syntax "apt/sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.* # components -- well, everything, and thus also the components. color brightmagenta "^deb.*" # Distribution -- well, everything, except the components. -color brightred "^deb(-src)? ((http(s)?|ftp|rsh|ssh|file|copy|tor|spacewalk):/[^ ]+|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+" +color brightred "^deb(-src)?\s+((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+" # URIs. -color brightgreen "(http(s)?|ftp|rsh|ssh|file|copy|tor|spacewalk):/[^ ]+" +color brightgreen "^deb(-src)?\s+(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+" # CDroms. -color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/" +color brightgreen "^deb(-src)?\s+cdrom:\[.+\]/" # And finally the initial deb tag. color yellow "^deb(-src)?" # Comments. color brightblue "#.*" -