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/build-aux/update-NEWS.scm?id=5929668ee8b24d23a0d59b6380201bd634631226'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/update-NEWS.scm'>
<input type='hidden' name='id' value='5929668ee8b24d23a0d59b6380201bd634631226'/><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=5929668ee8b24d23a0d59b6380201bd634631226'>root</a>/<a href='/guix/log/build-aux?id=5929668ee8b24d23a0d59b6380201bd634631226'>build-aux</a>/<a href='/guix/log/build-aux/update-NEWS.scm?id=5929668ee8b24d23a0d59b6380201bd634631226'>update-NEWS.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/build-aux/update-NEWS.scm?id=5929668ee8b24d23a0d59b6380201bd634631226&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-20 11:50:21 +0200'>2019-05-20</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=996ecaf64e397341dbed70198032ce828040e5ac'>maint: update-NEWS: Track "gcc-toolchain", not "gcc".</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to d78010b81ee6ef4fd8803082e2f401b9e55b44db.

* build-aux/update-NEWS.scm (write-packages-updates)[important]: Replace
"gcc" by "gcc-toolchain".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-05 00:08:34 +0100'>2018-12-05</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=e3c03952be99419b958e98e5934fb3b86f71165d'>maint: update-NEWS: Don't produce full package lists.</a><span class='msg-avail'>...<span class='msg-tooltip'>The lists of new and upgraded packages in 'NEWS' had become way too long
and redundant with what 'guix pull' reports.

* build-aux/update-NEWS.scm (write-packages-added): Don't print ADDED.
(write-packages-updates)[important, table, latest, noteworthy]: New
variables.
Print NOTEWORTHY rather than all of UPGRADED.
(main): Print PREVIOUS-VERSION and NEW-VERSION.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-02 16:43:10 +0200'>2018-09-02</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=fe634eaf93ba40862acdf62d7f197c6f19f0651c'>Add (guix describe) and use it to initialize '%package-search-path'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/describe.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm (%default-package-module-path): New variable.
(%package-module-path): Honor 'package-path-entries'.
* build-aux/update-NEWS.scm (main): Use %DEFAULT-PACKAGE-MODULE-PATH
instead of (last (%package-module-path)).
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-18 16:24:02 +0200'>2017-05-18</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=920803fbf443f7e40ed299f433255f10a4ae9fb3'>maint: Add 'update-NEWS' target.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/update-NEWS.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
(GUIX_MAINTENANCE_DIRECTORY): New variable.
(update-NEWS): New target.
(.PHONY): Add it.
</span></span></td><td>Ludovic Courtès</td></tr>