summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-06-24 14:10:49 -0400
committerJune McEnroe <june@causal.agency>2021-06-24 14:10:49 -0400
commit60ff44cf4e68e326b6c94a4b68e39b65d14726ef (patch)
tree711b85774738818e57a16ac5f53bbcdd5ad739b2
parentReplace SIGWINCH XXX comment with better explanation (diff)
downloadcatgirl-60ff44cf4e68e326b6c94a4b68e39b65d14726ef.tar.gz
catgirl-60ff44cf4e68e326b6c94a4b68e39b65d14726ef.zip
Stop at previous \ when expanding macros
There was no reason to ever require whitespace before the macro
name.
Diffstat (limited to '')
-rw-r--r--edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/edit.c b/edit.c
index 559bb06..f33bf0a 100644
--- a/edit.c
+++ b/edit.c
@@ -111,7 +111,7 @@ void editCompleteAdd(void) {
 
 static void macroExpand(void) {
 	size_t macro = pos;
-	while (macro && !iswspace(buf[macro - 1])) macro--;
+	while (macro && buf[macro] != L'\\') macro--;
 	if (macro == pos) return;
 	for (size_t i = 0; i < ARRAY_LEN(Macros); ++i) {
 		if (wcsncmp(Macros[i].name, &buf[macro], pos - macro)) continue;
match nested parentheses in Tag for CJune McEnroe Fixes mistaken highlight of: pngWrite(file, (uint8_t []) { 0, 0, 0 }, 3); 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe