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))))
/diff/gnu/services/vpn.scm?id=e151f94467250c87bfeb22b5ac41f20d296bd579'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/vpn.scm'>
<input type='hidden' name='id' value='e151f94467250c87bfeb22b5ac41f20d296bd579'/><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=e151f94467250c87bfeb22b5ac41f20d296bd579'>root</a>/<a href='/guix/log/gnu?id=e151f94467250c87bfeb22b5ac41f20d296bd579'>gnu</a>/<a href='/guix/log/gnu/services?id=e151f94467250c87bfeb22b5ac41f20d296bd579'>services</a>/<a href='/guix/log/gnu/services/vpn.scm?id=e151f94467250c87bfeb22b5ac41f20d296bd579'>vpn.scm</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/services/vpn.scm?id=e151f94467250c87bfeb22b5ac41f20d296bd579&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-07-07 10:20:28 -0400'>2021-07-07</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=02562e2f1e1b0fcc4ae17a54885f67b38fc1be46'>services: Add bitmask-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (bitmask-service-type): New variable.
* doc/guix.texi: Document it.

Co-authored-by: jgart &lt;jgart@dismail.de&gt;
</span></span></td><td>Raghav Gururajan</td></tr>
<tr><td><span title='2021-06-25 13:27:10 +0200'>2021-06-25</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=abb77e6d4c2403a3b85671001cfc4636c83ea61c'>Remove unused module imports from (gnu services vpn).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm: Remove (gnu packages networking) and (guix utils) imports.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-06-25 00:39:32 +0200'>2021-06-25</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=66be80fabb9af0a570aee4c2e96886267a613e8e'>gnu: Add strongswan service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (&lt;strongswan-configuration&gt;): New record type.
(charon-plugins, strongswan-configuration-file)
(strongswan-shepherd-service, strongswan-service-type): New variables.
* doc/guix.tex (VPN Services): Document them all.
</span></span></td><td>Domagoj Stolfa</td></tr>
<tr><td><span title='2021-05-24 10:00:54 +0200'>2021-05-24</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=ac95609208c0afe55d68bf42993ccb9b58ad44ce'>gnu: services: Add missing wireguard related exports.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm: Export 'wireguard-peer-public-key' and
  'wireguard-peer-keep-alive'.

Signed-off-by: Guillaume Le Vaillant &lt;glv@posteo.net&gt;
</span></span></td><td>Solene Rapenne</td></tr>
<tr><td><span title='2021-04-20 14:32:53 +0200'>2021-04-20</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=3313f61e18cbb4a89ec6c980b39f8e5fcad2b890'>services: wireguard: Add keep-alive support.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (&lt;wireguard-peer&gt;): Add 'keep-alive' field.
  (wireguard-configuration-file): Use it.
* doc/guix.texi (VPN Services): Document it.
</span></span></td><td>Guillaume Le Vaillant</td></tr>
<tr><td><span title='2021-02-17 10:32:15 +0100'>2021-02-17</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=43b2e440c38a39eb64088bd6c08771c060aa10fc'>services: wireguard: New service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (wireguard-peer, wireguard-configuration): New records.
(wireguard-service-type): New variable.
* doc/guix.texi (VPN Services): Document it.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-11-18 15:05:41 +0100'>2020-11-18</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=5221df34149465c5bbc1a76f83cb09f8911279f5'>gnu: vpn: Make ca, key and cert optional.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (openvpn-client-configuration)
(openvpn-server-configuration): Make ca, key an cert fields optional.
* doc/guix.texi (VPN Services): Document the change.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-02-19 04:08:55 +0100'>2020-02-19</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=c6c447701c9cfdeedf77224399faa9c07b12d045'>gnu: services: Add openvpn options.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (openvpn-client-configuration)
(openvpn-server-configuration): Add fast-io? and auth-user-pass options.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-02-19 04:08:40 +0100'>2020-02-19</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=0372dd1a1e51e39382ee5d1aa968589b40506b8f'>gnu: services: Fix openvpn boolean fields.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (serialize-boolean): Do not print #t to the file.
</span></span></td><td>Julien Lepiller</td></tr>