Merge branch 'master' into release

INSTALL.adoc

@@ -6,8 +6,8 @@ Download a tarball from https://github.com/jonas/tig/releases[] or clone the Tig
 repository https://github.com/jonas/tig[https://github.com/jonas/tig.git].
 
 The latest version is:
-https://github.com/jonas/tig/releases/download/tig-2.5.10/tig-2.5.10.tar.gz[tig-2.5.10]
-https://github.com/jonas/tig/releases/download/tig-2.5.10/tig-2.5.10.tar.gz.sha256[(sha256)]
+https://github.com/jonas/tig/releases/download/tig-2.5.11/tig-2.5.11.tar.gz[tig-2.5.11]
+https://github.com/jonas/tig/releases/download/tig-2.5.11/tig-2.5.11.tar.gz.sha256[(sha256)]
 
 *Note:* Do not use the tar.gz file for version 2.0 because it will fail
 to compile due to issue https://github.com/jonas/tig/pull/283[#283] and

Makefile

@@ -2,7 +2,7 @@
 
 # The last tagged version. Can be overridden either by the version from
 # git or from the value of the DIST_VERSION environment variable.
-VERSION	= 2.5.10
+VERSION	= 2.5.11
 
 all:
 
@@ -68,7 +68,8 @@ override CPPFLAGS += '-DTIG_USER_CONFIG="$(TIG_USER_CONFIG)"'
 endif
 
 ASCIIDOC ?= asciidoc
-ASCIIDOC_FLAGS = -aversion=$(VERSION) -asysconfdir=$(sysconfdir) -f doc/asciidoc.conf
+ASCIIDOC_FLAGS = -aversion=$(VERSION) -asysconfdir=$(sysconfdir) \
+		-arevdate=$(shell git show -s --format=%cs) -f doc/asciidoc.conf
 XMLTO ?= xmlto
 DOCBOOK2PDF ?= docbook2pdf
 
@@ -432,7 +433,7 @@ test/API.adoc: test/tools/libtest.sh
 %.7.xml : %.7.adoc doc/asciidoc.conf
 	$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
 
-%.html: ASCIIDOC_FLAGS += -adocext=html
+%.html: ASCIIDOC_FLAGS += -adocext=html -afooter-style=revdate
 %.html : %.adoc doc/asciidoc.conf
 	$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -n $<
 

NEWS.adoc

@@ -1,6 +1,34 @@
 Release notes
 =============
 
+tig-2.5.11
+----------
+
+Incompatibilities:
+
+ - Update remote repo variables. (#1358)
+
+Bug fixes:
+
+ - Fix various issues with `diff.noprefix` and `--no-prefix`.
+ - Fix `Ctrl-C` behavior within the Readline prompt. (#1342)
+ - Fix message upon edit from diffstat without patch.
+ - Fix missing dates in the refs view.
+ - Don't report an error when diff-highlight is killed intentionally.
+ - Fix parsing of reflog designator in timestamp format.
+
+Improvements:
+
+ - Open the blob corresponding to the diff line. (#1334)
+ - Keep cursor position in the main view when toggling
+   file-filter and rev-filter.
+ - Make errors visible in views showing Git output. (#1346)
+ - Allow different colors for all references types.
+ - Enable search in sections titles. (#1043)
+ - Show committer date by default in the date column. (#294)
+ - Only show stash, notes and prefetch in the refs view when
+   invoked with `tig refs --all`. (#1359)
+
 tig-2.5.10
 ----------
 

compat/compat.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2024 Jonas Fonseca <[email protected]>
+/* Copyright (c) 2006-2025 Jonas Fonseca <[email protected]>
  * Copyright (c) 2013 Drew Northup <[email protected]>
  *
  * This program is free software; you can redistribute it and/or

compat/utf8proc.c

@@ -101,7 +101,7 @@ UTF8PROC_DLLEXPORT const char *utf8proc_version(void) {
 }
 
 UTF8PROC_DLLEXPORT const char *utf8proc_unicode_version(void) {
-  return "15.1.0";
+  return "16.0.0";
 }
 
 UTF8PROC_DLLEXPORT const char *utf8proc_errmsg(utf8proc_ssize_t errcode) {
@@ -432,6 +432,10 @@ UTF8PROC_DLLEXPORT int utf8proc_charwidth(utf8proc_int32_t c) {
   return utf8proc_get_property(c)->charwidth;
 }
 
+UTF8PROC_DLLEXPORT utf8proc_bool utf8proc_charwidth_ambiguous(utf8proc_int32_t c) {
+  return utf8proc_get_property(c)->ambiguous_width;
+}
+
 UTF8PROC_DLLEXPORT utf8proc_category_t utf8proc_category(utf8proc_int32_t c) {
   return (utf8proc_category_t) utf8proc_get_property(c)->category;
 }
@@ -642,15 +646,13 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
   }
   if (options & UTF8PROC_COMPOSE) {
     utf8proc_int32_t *starter = NULL;
-    utf8proc_int32_t current_char;
-    const utf8proc_property_t *starter_property = NULL, *current_property;
+    const utf8proc_property_t *starter_property = NULL;
     utf8proc_propval_t max_combining_class = -1;
     utf8proc_ssize_t rpos;
     utf8proc_ssize_t wpos = 0;
-    utf8proc_int32_t composition;
     for (rpos = 0; rpos < length; rpos++) {
-      current_char = buffer[rpos];
-      current_property = unsafe_get_property(current_char);
+      utf8proc_int32_t current_char = buffer[rpos];
+      const utf8proc_property_t *current_property = unsafe_get_property(current_char);
       if (starter && current_property->combining_class > max_combining_class) {
         /* combination perhaps possible */
         utf8proc_int32_t hangul_lindex;
@@ -681,22 +683,29 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
         if (!starter_property) {
           starter_property = unsafe_get_property(*starter);
         }
-        if (starter_property->comb_index < 0x8000 &&
-            current_property->comb_index != UINT16_MAX &&
-            current_property->comb_index >= 0x8000) {
-          int sidx = starter_property->comb_index;
-          int idx = current_property->comb_index & 0x3FFF;
-          if (idx >= utf8proc_combinations[sidx] && idx <= utf8proc_combinations[sidx + 1] ) {
-            idx += sidx + 2 - utf8proc_combinations[sidx];
-            if (current_property->comb_index & 0x4000) {
-              composition = (utf8proc_combinations[idx] << 16) | utf8proc_combinations[idx+1];
-            } else
-              composition = utf8proc_combinations[idx];
-
-            if (composition > 0 && (!(options & UTF8PROC_STABLE) ||
-                !(unsafe_get_property(composition)->comp_exclusion))) {
-              *starter = composition;
-              starter_property = NULL;
+        int idx = starter_property->comb_index;
+        if (idx < 0x3FF && current_property->comb_issecond) {
+          int len = starter_property->comb_length;
+          utf8proc_int32_t max_second = utf8proc_combinations_second[idx + len - 1];
+          if (current_char <= max_second) {
+            int off;
+            // TODO: binary search? arithmetic search?
+            for (off = 0; off < len; ++off) {
+              utf8proc_int32_t second = utf8proc_combinations_second[idx + off];
+              if (current_char < second) {
+                /* not found */
+                break;
+              }
+              if (current_char == second) {
+                /* found */
+                utf8proc_int32_t composition = utf8proc_combinations_combined[idx + off];
+                *starter = composition;
+                starter_property = NULL;
+                break;
+              }
+            }
+            if (starter_property == NULL) {
+              /* found */
               continue;
             }
           }