diff options
| author | Basil L. Contovounesios | 2024-03-04 07:19:22 +0100 |
|---|---|---|
| committer | Basil L. Contovounesios | 2024-03-04 07:19:22 +0100 |
| commit | 6dacb60bb135dbb002c2ce1c70f70430c5d1bbff (patch) | |
| tree | f0edf27fc203163a4bf542c32222550c79a0eaa8 | |
| parent | 2b5d43081a30f816dd38a16c7b5bfbad712a779b (diff) | |
| download | emacs-6dacb60bb135dbb002c2ce1c70f70430c5d1bbff.tar.gz emacs-6dacb60bb135dbb002c2ce1c70f70430c5d1bbff.zip | |
; Fix last major-mode-remap-defaults change.
| -rw-r--r-- | lisp/org/ox.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/c-ts-mode.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 8e2fdd22acd..bf2d9b569af 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el | |||
| @@ -6608,7 +6608,7 @@ use it to set a major mode there, e.g., | |||
| 6608 | (interactive) | 6608 | (interactive) |
| 6609 | (org-export-to-buffer \\='latex \"*Org LATEX Export*\" | 6609 | (org-export-to-buffer \\='latex \"*Org LATEX Export*\" |
| 6610 | async subtreep visible-only body-only ext-plist | 6610 | async subtreep visible-only body-only ext-plist |
| 6611 | (major-mode-remap 'latex-mode))) | 6611 | (major-mode-remap \\='latex-mode))) |
| 6612 | 6612 | ||
| 6613 | When expressed as an anonymous function, using `lambda', | 6613 | When expressed as an anonymous function, using `lambda', |
| 6614 | POST-PROCESS needs to be quoted. | 6614 | POST-PROCESS needs to be quoted. |
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 315bb68699e..38b72e59388 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el | |||
| @@ -1438,7 +1438,7 @@ should be used. | |||
| 1438 | This function attempts to use file contents to determine whether | 1438 | This function attempts to use file contents to determine whether |
| 1439 | the code is C or C++ and based on that chooses whether to enable | 1439 | the code is C or C++ and based on that chooses whether to enable |
| 1440 | `c-ts-mode' or `c++-ts-mode'." | 1440 | `c-ts-mode' or `c++-ts-mode'." |
| 1441 | (declare (obsolete c-or-c++-mode "30.1"))? | 1441 | (declare (obsolete c-or-c++-mode "30.1")) |
| 1442 | (interactive) | 1442 | (interactive) |
| 1443 | (let ((mode | 1443 | (let ((mode |
| 1444 | (if (save-excursion | 1444 | (if (save-excursion |
| @@ -1447,8 +1447,8 @@ the code is C or C++ and based on that chooses whether to enable | |||
| 1447 | (widen) | 1447 | (widen) |
| 1448 | (goto-char (point-min)) | 1448 | (goto-char (point-min)) |
| 1449 | (re-search-forward c-ts-mode--c-or-c++-regexp nil t)))) | 1449 | (re-search-forward c-ts-mode--c-or-c++-regexp nil t)))) |
| 1450 | 'c++-ts-mode) | 1450 | 'c++-ts-mode |
| 1451 | 'c-ts-mode)) | 1451 | 'c-ts-mode))) |
| 1452 | (funcall (major-mode-remap mode)))) | 1452 | (funcall (major-mode-remap mode)))) |
| 1453 | 1453 | ||
| 1454 | ;; The entries for C++ must come first to prevent *.c files be taken | 1454 | ;; The entries for C++ must come first to prevent *.c files be taken |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index e46ac2e2178..1a9d0907bd0 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -2910,8 +2910,8 @@ the code is C or C++ and based on that chooses whether to enable | |||
| 2910 | (goto-char (point-min)) | 2910 | (goto-char (point-min)) |
| 2911 | (re-search-forward c-or-c++-mode--regexp | 2911 | (re-search-forward c-or-c++-mode--regexp |
| 2912 | (+ (point) c-guess-region-max) t)))) | 2912 | (+ (point) c-guess-region-max) t)))) |
| 2913 | 'c++-mode) | 2913 | 'c++-mode |
| 2914 | 'c-mode)) | 2914 | 'c-mode))) |
| 2915 | (funcall (if (fboundp 'major-mode-remap) | 2915 | (funcall (if (fboundp 'major-mode-remap) |
| 2916 | (major-mode-remap mode) | 2916 | (major-mode-remap mode) |
| 2917 | mode)))) | 2917 | mode)))) |