From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 6 Mar 2023 05:30:13 +0000 (+0100)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aad617870b45aa2e68159150c2354db6f7a8cf09;p=emacs.git

Merge from origin/emacs-29

1c67e4f895f Fix c-ts-mode indentation
d724d7d6785 Fix c-ts-mode indentation
7292b24c801 Fix c-ts-mode indentation
75cdc1afbe5 ; Change font-lock-variable-name-face to font-lock-variab...
b1b3af5b90b Update to Org 9.6.1-40-g3d817c
80e1037df44 Add string-interpolation feature to bash-ts-mode
5b8e0b31548 Fix tramp-sh-handle-insert-directory
2258ed01f42 ; Minor fix of last change
9c18af0cfaf * Warn when certain primitives are redefined (bug#61880)
5af695c7479 ; * lib-src/etags.c (print_help): Fix indentation.
---

aad617870b45aa2e68159150c2354db6f7a8cf09