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))))
d89cecd3423d3c93d4a7e762c5c65a3ea7'>commit</a><a href='/guix/diff/gnu/system/examples/desktop.tmpl?id=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/examples/desktop.tmpl'>
<input type='hidden' name='id' value='a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'/><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=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'>root</a>/<a href='/guix/log/gnu?id=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'>gnu</a>/<a href='/guix/log/gnu/system?id=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'>system</a>/<a href='/guix/log/gnu/system/examples?id=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'>examples</a>/<a href='/guix/log/gnu/system/examples/desktop.tmpl?id=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7'>desktop.tmpl</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/system/examples/desktop.tmpl?id=a387e1d89cecd3423d3c93d4a7e762c5c65a3ea7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-29 07:50:23 +0300'>2020-07-29</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=03914b9d8cc5918f495d1abeb97d783c8fc25fd7'>examples: Add password for Alice's brother.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/desktop.tmpl (users)[bob]: Add password.
</span></span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2019-04-10 12:40:58 +0200'>2019-04-10</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=5c32857f91b26846d202f07226f201fd49852619'>doc: Adjust desktop instructions for GDM.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/desktop.tmpl: Adjust comment that referred to SLiM.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-05 15:39:35 +0200'>2019-04-05</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=305a732a0a19c5810aab401aa7d70eba02ac386b'>services: xorg: Add 'set-xorg-configuration'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/xorg.scm (gdm-service-type)[compose, extend]: New fields.
(set-xorg-configuration): New procedure.
* doc/guix.texi (Keyboard Layout): Use it.
(X Window): Document it.
* gnu/system/examples/desktop.tmpl: Add 'keyboard-layout' fields.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-28 23:06:59 +0100'>2019-03-28</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=971e6560eb7b852ccc30d0891c2b7d26e5d0971a'>system: Fix typo in desktop example.</a><span class='msg-avail'>...<span class='msg-tooltip'>The typo was introduced in 391e0d65d7129d53c025963d2758724e75626eb4.

* gnu/system/examples/desktop.tmpl: Use XFCE-DESKTOP-SERVICE-TYPE, not
XFCE-DESKTOP-SERVICE.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-27 11:54:06 +0100'>2019-03-27</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=391e0d65d7129d53c025963d2758724e75626eb4'>services: Deprecate 'xfce-desktop-service'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/desktop.scm (xfce-desktop-service-type)[default-value]
[description]: New fields.
(xfce-desktop-service): Deprecate.
* gnu/system/examples/desktop.tmpl: Use the (service …) form.
* gnu/installer/services.scm (%desktop-environments): Add TODO comment.
* doc/guix.texi (Desktop Services): Adjust accordingly, and fix spelling
of "Xfce" throughout.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-27 11:54:06 +0100'>2019-03-27</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=ee05cc7fe353c1c9b45062343746ac215a29fed5'>services: Deprecate 'gnome-desktop-service'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/desktop.scm (gnome-desktop-service-type)[default-value]:
New field.
(gnome-desktop-service): Deprecate.
* gnu/installer/services.scm (%desktop-environments): Use the (service …)
form for GNOME.
* gnu/system/examples/desktop.tmpl: Likewise.
* doc/guix.texi (Desktop Services): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-25 23:37:06 +0100'>2019-03-25</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=cf848cc0a17a3a58d600116896f6e7abfb0440d4'>accounts: Add default value for the 'home-directory' field of &lt;user-account&gt;.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/accounts.scm (&lt;user-account&gt;)[home-directory]: Mark as
thunked and add a default value.
(default-home-directory): New procedure.
* doc/guix.texi (User Accounts): Remove 'home-directory' from example.
* gnu/system/examples/bare-bones.tmpl: Likewise.
* gnu/system/examples/beaglebone-black.tmpl: Likewise.
* gnu/system/examples/desktop.tmpl: Likewise.
* gnu/system/examples/docker-image.tmpl: Likewise.
* gnu/system/examples/lightweight-desktop.tmpl: Likewise.
* gnu/system/install.scm (installation-os): Likewise.
* gnu/tests.scm (%simple-os): Likewise.
* gnu/tests/install.scm (%minimal-os, %minimal-os-on-vda):
(%separate-home-os, %encrypted-root-os, %btrfs-root-os): Likewise.
* tests/accounts.scm ("allocate-passwd")
("allocate-passwd with previous state"): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>