From dd5fefe22d6f32b19769fa52c38a7fa08f54d118 Mon Sep 17 00:00:00 2001
From: Daniel Spiljar <dspiljar@datatipp.se>
Date: Sat, 20 May 2023 20:34:23 +0200
Subject: [PATCH] Update the TODO list and bump the version to 0.7.12.

---
 NEWS.md           | 6 ++++++
 TODO.md           | 2 +-
 configure.ac      | 2 +-
 doc/mboxgrep.1    | 4 ++--
 doc/mboxgrep.info | 2 +-
 doc/mboxgrep.texi | 4 ++--
 src/mboxgrep.h    | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 04d8f05..ac7219a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,11 @@
 # Changes of mboxgrep
 
+## Changes since 0.7.11
+
+- Port to the pcre2 library (pcre1 is no longer supported).
+- Check command-line options for conflicting matchers and actions.
+- Various minor code cleanups.
+
 ## Changes since 0.7.10
 
 - GNU Automake is now utilized instead of manually written Makefile.in files.
diff --git a/TODO.md b/TODO.md
index 0f18d23..a51248c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,7 @@
 ## Behavior
 
 - [x] use cryptographic hashes for detecting duplicate messages
-- [ ] add checking for conflicting command-line options
+- [x] add checking for conflicting command-line options
 - [ ] support for deletion of messages after being matched and displayed
 - [x] ignore .overview when grepping Gnus folders
 - [x] inverted matching
diff --git a/configure.ac b/configure.ac
index d969ea3..06e1670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # Yawn.
-AC_INIT([mboxgrep], [0.7.11], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
+AC_INIT([mboxgrep], [0.7.12], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
 #AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([foreign])
 AC_LANG([C])
diff --git a/doc/mboxgrep.1 b/doc/mboxgrep.1
index 8933b5e..158ac14 100644
--- a/doc/mboxgrep.1
+++ b/doc/mboxgrep.1
@@ -1,4 +1,4 @@
-.TH MBOXGREP 1 "24 Mar 2023"
+.TH MBOXGREP 1 "20 May 2023"
 .SH NAME
 mboxgrep \- displays email messages matching a pattern
 .SH SYNOPSIS
@@ -10,7 +10,7 @@ mboxgrep \- displays email messages matching a pattern
 This manual page refers to
 .B mboxgrep
 version
-.BR 0.7.11 .
+.BR 0.7.12 .
 .PP
 .B mboxgrep
 scans a
diff --git a/doc/mboxgrep.info b/doc/mboxgrep.info
index 97ca442..c9e143c 100644
--- a/doc/mboxgrep.info
+++ b/doc/mboxgrep.info
@@ -9,7 +9,7 @@ END-INFO-DIR-ENTRY
 
 File: mboxgrep.info,  Node: Top,  Up: (dir)
 
-This file documents 'mboxgrep' (version 0.7.11), a mailbox scanning
+This file documents 'mboxgrep' (version 0.7.12), a mailbox scanning
 utility.
 
    Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar
diff --git a/doc/mboxgrep.texi b/doc/mboxgrep.texi
index d9b1a04..657ccd8 100644
--- a/doc/mboxgrep.texi
+++ b/doc/mboxgrep.texi
@@ -5,8 +5,8 @@
 @setchapternewpage odd
 
 @set EDITION 0.7
-@set VERSION 0.7.11
-@set UPDATED 24 Mar 2023
+@set VERSION 0.7.12
+@set UPDATED 20 May 2023
 
 @dircategory Mail
 @direntry
diff --git a/src/mboxgrep.h b/src/mboxgrep.h
index 52dc5dc..5b061fd 100644
--- a/src/mboxgrep.h
+++ b/src/mboxgrep.h
@@ -21,7 +21,7 @@
 #define MBOXGREP_H
 
 #define APPNAME "mboxgrep"
-#define VERSION "0.7.11"
+#define VERSION "0.7.12"
 #define BUGREPORT_ADDR "dspiljar AT datatipp.se"
 
 #define HOST_NAME_SIZE 256