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</a></td><td class='form'><form class='right' method='get' action='/guix/log/.mailmap'>
<input type='hidden' name='id' value='808cb58f86700ec5d6fa9652e01e7f520e3f31bb'/><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=808cb58f86700ec5d6fa9652e01e7f520e3f31bb'>root</a>/<a href='/guix/log/.mailmap?id=808cb58f86700ec5d6fa9652e01e7f520e3f31bb'>.mailmap</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/.mailmap?id=808cb58f86700ec5d6fa9652e01e7f520e3f31bb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-04-20 17:29:25 +0200'>2017-04-20</span></td><td><a href='/guix/commit/.mailmap?id=9a14cd7f354f9d48e9231be03023b3f68b53ae21'>mailmap: Update entries for ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2017-01-27 15:04:01 +0100'>2017-01-27</span></td><td><a href='/guix/commit/.mailmap?id=a74b49765b366fb92222a9a202e1811f25c746c6'>Update .mailmap entries for ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2017-01-01 11:47:08 +0300'>2017-01-01</span></td><td><a href='/guix/commit/.mailmap?id=6f7bcaad6aabd1b0780e4d711c94e6ab56d4e723'>Update .mailmap.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2016-12-20 15:55:50 +0100'>2016-12-20</span></td><td><a href='/guix/commit/.mailmap?id=3a35070c50696c65b93c589da44866c5cf5f191c'>mailmap: Add alias for Marius Bakke.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-11-26 01:00:58 -0500'>2016-11-26</span></td><td><a href='/guix/commit/.mailmap?id=75675e4556fe4779687251d0a792925a11a7305c'>mailmap: Associate all commits by ng0 with ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2016-10-11 12:02:21 +0300'>2016-10-11</span></td><td><a href='/guix/commit/.mailmap?id=75fa19125fb2f79541fb22347fcb2a7545317cc1'>Update e-mail address for ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2016-10-05 16:41:27 -0400'>2016-10-05</span></td><td><a href='/guix/commit/.mailmap?id=4ae1f8cf394dd462ec3395a74b55965c9d019ede'>Update e-mail address for ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2016-07-15 14:29:22 +0200'>2016-07-15</span></td><td><a href='/guix/commit/.mailmap?id=e05647add7d4ebddf68626b84fa640956ee35301'>Update e-mail address for Tobias Geerinckx-Rice.</a><span class='msg-avail'>...</span></td><td>Andreas Enge</td></tr>
<tr><td><span title='2016-07-03 23:48:32 +0200'>2016-07-03</span></td><td><a href='/guix/commit/.mailmap?id=679b535b03ff2c9408ebfaa3baae70736c8455ec'>Update name for ng0.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2016-05-19 11:42:03 +0300'>2016-05-19</span></td><td><a href='/guix/commit/.mailmap?id=21f05134fc35edf5a15baf4fdb2e62905f3848e9'>Update name for Kei Kebreau.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2016-05-04 23:08:39 +0300'>2016-05-04</span></td><td><a href='/guix/commit/.mailmap?id=ee5f1e520430142a28a2a9e3d50fa61a650d8fe2'>Update .mailmap.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2016-03-24 18:50:11 +0300'>2016-03-24</span></td><td><a href='/guix/commit/.mailmap?id=98db8e89ff0bbe85ba6d240bf788c20377a8dfae'>Update .mailmap.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>