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/packages/ots.scm?id=b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/ots.scm'>
<input type='hidden' name='id' value='b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5'/><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=b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5'>root</a>/<a href='/guix/log/gnu?id=b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5'>gnu</a>/<a href='/guix/log/gnu/packages?id=b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5'>packages</a>/<a href='/guix/log/gnu/packages/ots.scm?id=b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5'>ots.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/packages/ots.scm?id=b4c6b9eb83f96b980ee1e3a4e45c5b3cf8c0a5c5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>