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))))
>commit</a><a href='/guix/diff/nix/libstore/store-api.hh?id=e94b95473ea5dadea76be9763b7f8b34d400e863'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/store-api.hh'>
<input type='hidden' name='id' value='e94b95473ea5dadea76be9763b7f8b34d400e863'/><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=e94b95473ea5dadea76be9763b7f8b34d400e863'>root</a>/<a href='/guix/log/nix?id=e94b95473ea5dadea76be9763b7f8b34d400e863'>nix</a>/<a href='/guix/log/nix/libstore?id=e94b95473ea5dadea76be9763b7f8b34d400e863'>libstore</a>/<a href='/guix/log/nix/libstore/store-api.hh?id=e94b95473ea5dadea76be9763b7f8b34d400e863'>store-api.hh</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/nix/libstore/store-api.hh?id=e94b95473ea5dadea76be9763b7f8b34d400e863&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=ea0a06cee2ba05451f94714a4f913db02efbe92c'>Remove 'guix-register' and its traces.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-30 23:42:07 +0200'>2018-03-30</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=c7589cce8d3f9fcb7769e424f341dba8fb3545d0'>daemon: Remove dead code.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=b1fd0ab73425e682a0a1404da6963f47a033bb34'>daemon: Improve the SQLite wrapper API.</a><span class='msg-avail'>...</span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-12-13 19:20:01 +0100'>2015-12-13</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=f3ff1da42479eda7826d1bcb10e3a067e62a2daa'>daemon: Better distinguish build statuses.</a><span class='msg-avail'>...</span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-12-08 23:58:12 +0100'>2015-12-08</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=b23b4d394a39b60188ed74ecdf1027bc7dd5b9b3'>daemon: Allow builds to be repeated.</a><span class='msg-avail'>...</span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-06-03 22:59:02 +0200'>2015-06-03</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=54c260e6ecc81f1836bda844ec8e661d51bfb867'>Merge branch 'nix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>