From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 15 Apr 2023 17:05:04 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc61a1afdd6c3ba8a605ed46ae97b1e36b40f951;p=emacs.git

Merge from origin/emacs-29

b7023da6627 Make image-map bindings available on image links
d9e96c029bb * CONTRIBUTE: Fix a typo
3f71a2a0cf6 ; * lisp/progmodes/c-ts-mode.el (treesit-node-next-siblin...
adf9c956c28 Add to Eglot support for additional language-servers.
b3603b84bd9 Partial support for DEFUN in c-ts-mode (bug#62825)

# Conflicts:
#	lisp/progmodes/c-ts-mode.el
---

bc61a1afdd6c3ba8a605ed46ae97b1e36b40f951
diff --cc lisp/progmodes/c-ts-mode.el
index 5a38d714e5a,c2d68086f33..e93a0fec707
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@@ -1064,11 -1102,13 +1137,13 @@@ recommended to enable `electric-pair-mo
      ;; Indent.
      (setq-local treesit-simple-indent-rules
                  (c-ts-mode--get-indent-style 'cpp))
 +
      ;; Font-lock.
      (setq-local treesit-font-lock-settings (c-ts-mode--font-lock-settings 'cpp))
- 
-     (treesit-major-mode-setup)))
+     (treesit-major-mode-setup)
 -
+     (when c-ts-mode-emacs-devel
+       (setq-local add-log-current-defun-function
+                   #'c-ts-mode--emacs-current-defun-name))))
  
  (easy-menu-define c-ts-mode-menu (list c-ts-mode-map c++-ts-mode-map)
    "Menu for `c-ts-mode' and `c++-ts-mode'."