Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
Copyright © 2017 Ludovic Courtès <ludo@gnu.org>

This patch adds highlighting for (guix) G-Expressions.

diff --git a/highlight-stages.el b/highlight-stages.el
index 3094c3c..e11260e 100644
--- a/highlight-stages.el
+++ b/highlight-stages.el
@@ -237,14 +237,14 @@ non-nil, (match-string 0) must be the expression matched."
 
 (defun highlight-stages-lisp-quote-matcher (&optional limit)
   (when (highlight-stages--search-forward-regexp
-         "\\(?:`\\|\\(#?'\\)\\)\\|([\s\t\n]*\\(?:backquote\\|\\(quote\\)\\)[\s\t\n]+" limit)
+         "\\(?:`\\|\\(#?'\\)\\)\\|([\s\t\n]*\\(?:backquote\\|\\(quote\\)\\)[\s\t\n]+\\|\\(?:#~\\)\\|([\s\t\n]*\\(?:gexp\\)[\s\t\n]+" limit)
     (prog1 (if (or (match-beginning 1) (match-beginning 2)) 'real t)
       (set-match-data
        (list (point)
              (progn (ignore-errors (forward-sexp 1)) (point)))))))
 
 (defun highlight-stages-lisp-escape-matcher (&optional limit)
-  (when (highlight-stages--search-forward-regexp ",@?\\|([\s\t\n]*\\\\,@?+[\s\t\n]+" limit)
+  (when (highlight-stages--search-forward-regexp ",@?\\|([\s\t\n]*\\\\,@?+[\s\t\n]+\\|\\(unquote\\)\\|\\(unquote-splicing\\)\\|\\(ungexp-native\\)\\|\\(ungexp-splicing\\)\\|\\(ungexp-native-splicing\\)\\|\\(ungexp\\)\\|#\\$" limit)
     (set-match-data
      (list (point)
            (progn (ignore-errors (forward-sexp 1)) (point))))
seFormat.patch?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>tree</a><a href='/guix/commit/gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>commit</a><a href='/guix/diff/gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch'>
<input type='hidden' name='id' value='4f204533b7183adadfe5cbe7f8bcd7d11c430b44'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>root</a>/<a href='/guix/log/gnu?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>gnu</a>/<a href='/guix/log/gnu/packages?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>patches</a>/<a href='/guix/log/gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44'>audiofile-Fail-on-error-in-parseFormat.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch?id=4f204533b7183adadfe5cbe7f8bcd7d11c430b44&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-12-26 16:44:53 +0100'>2019-12-26</span></td><td><a href='/guix/commit/gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch?id=a8e149434eb1500026256747b4ed21b8bab95926'>gnu: Add audiofile.</a><span class='msg-avail'>...<span class='msg-tooltip'>Patches should fix all CVEs reported by `guix lint`:
CVE-2015-7747; CVE-2017-6827, CVE-2017-6828, CVE-2017-6829,
CVE-2017-6830, CVE-2017-6831, CVE-2017-6832, CVE-2017-6833,
CVE-2017-6834, CVE-2017-6835, CVE-2017-6836, CVE-2017-6837,
CVE-2017-6838, CVE-2017-6839; CVE-2018-13440; CVE-2018-17095

Since the patches do not reference to CVEs, it's a bit hard to tell which
patch actually closes which CVE.  Debian reports all these to be closed by
the patches below and NixPkgs provides references.

* gnu/packages/audio.scm (audiofile): New variable.
* gnu/packages/patches/audiofile-fix-datatypes-in-tests.patch,
  gnu/packages/patches/audiofile-fix-sign-conversion.patch,
  gnu/packages/patches/audiofile-CVE-2015-7747.patch,
  gnu/packages/patches/audiofile-CVE-2018-13440.patch,
  gnu/packages/patches/audiofile-CVE-2018-17095.patch,
  gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch,
  gnu/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch,
  gnu/packages/patches/audiofile-Fix-index-overflow-in-IMA.cpp.patch,
  gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch,
  gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch,
  gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch,
  gnu/packages/patches/audiofile-hurd.patch,
  gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch:
  New files.
* gnu/local.mk: Add them.
</span></span></td><td>Hartmut Goebel</td></tr>