From df2508a8f61dc084071f0071cc3933bcf901d887 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 7 Jun 2026 09:52:30 +0300 Subject: [PATCH] Remove from CC Mode code that modifies 'major-mode-remap-defaults' * lisp/progmodes/cc-mode.el: Remove code that adds to 'major-mode-remap-defaults', as enabling and disabling tree-sitter based modes now goes through 'treesit-enabled-modes'. --- lisp/progmodes/cc-mode.el | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 6eed5b53c19..f930d2d34f3 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -3401,22 +3401,6 @@ Key bindings: (insert (format "Buffer Style: %s\nc-emacs-features: %s\n" style c-features))))))) - -;; Make entries in `major-mode-remap-defaults' to ensure that when CC -;; Mode has been loaded, the symbols `c-mode' etc., will call CC Mode's -;; modes rather than c-ts-mode etc.. -(when (boundp 'major-mode-remap-defaults) - (add-to-list 'major-mode-remap-defaults '(c++-mode . c++-ts-mode)) - (add-to-list 'major-mode-remap-defaults '(c-mode . c-ts-mode)) - (add-to-list 'major-mode-remap-defaults '(c-or-c++-mode . c-or-c++-ts-mode)) - (let (entry) - (dolist (mode '(c-mode c++-mode c-or-c++-mode)) - (if (and (setq entry (assq mode major-mode-remap-defaults)) - (null (cdr entry))) - (setq major-mode-remap-defaults - (delq entry major-mode-remap-defaults))) - (push (cons mode nil) major-mode-remap-defaults)))) - (cc-provide 'cc-mode)