chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
016f452
)
subst: Always substitute dollars in mformat 2 text
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 15 May 2022 11:47:50 +0000
(12:47 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 15 May 2022 14:19:55 +0000
(15:19 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/shapelib.rs
patch
|
blob
|
history
diff --git
a/src/shapelib.rs
b/src/shapelib.rs
index ef46c23b0be7a1b2f3647db1506688b6ae8a743e..bf03ff149404c374dcb0c732b554aa69fda8443a 100644
(file)
--- a/
src/shapelib.rs
+++ b/
src/shapelib.rs
@@
-1288,6
+1288,8
@@
fn process_files_entry(
move |input| Ok(
if let Some((keyword, val)) = kv {
subst(input.mky(mformat, dollars), keyword, val)?.into()
+ } else if dollars.enabled(mformat) {
+ input.mky(mformat, dollars).into()
} else {
input
}