branch: externals/csharp-mode
commit 2215140a77cf62c6499cd4d91ef1b0d839a3da3c
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Implement patch from Stefan Monnier <monn...@iro.umontreal.ca>
Fix issues with (back)quoted lambda in csharp-mode.el:
--
Hi,
I was annoyed at the backquoted lambda in `csharp-mode.el` and tracked
down its origin to a bug in CC-mode. While waiting for CC-mode to be
fixed, the patch below replaces this workaround with another one that
allows the code to be properly byte-compiled.
---
csharp-mode.el | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/csharp-mode.el b/csharp-mode.el
index 74d3bfa01d..281a3cda1e 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -1,6 +1,6 @@
;;; csharp-mode.el --- C# mode derived mode -*- lexical-binding: t; -*-
-;; Copyright (C) 2020-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2020-2022 Free Software Foundation, Inc.
;; Author : Theodor Thornhill <t...@thornhill.no>
;; Maintainer : Jostein Kjønigsen <jost...@gmail.com>
@@ -68,12 +68,16 @@
(eval-and-compile
(c-add-language 'csharp-mode 'java-mode))
+(defun csharp--make-mode-syntax-table ()
+ (let ((table (make-syntax-table)))
+ (c-populate-syntax-table table)
+ (modify-syntax-entry ?@ "_" table)
+ table))
+(defvar csharp--make-mode-syntax-table #'csharp--make-mode-syntax-table
+ "Workaround for Emacs bug#57065.")
+
(c-lang-defconst c-make-mode-syntax-table
- csharp `(lambda ()
- (let ((table (make-syntax-table)))
- (c-populate-syntax-table table)
- (modify-syntax-entry ?@ "_" table)
- table)))
+ csharp #'csharp--make-mode-syntax-table)
(c-lang-defconst c-identifier-syntax-modifications
csharp (append '((?@ . "w"))
@@ -563,14 +567,14 @@ compilation and evaluation time conflicts."
(defvar csharp-mode-syntax-table
(funcall (c-lang-const c-make-mode-syntax-table csharp))
- "Syntax table used in csharp-mode buffers.")
+ "Syntax table used in `csharp-mode' buffers.")
(defvar csharp-mode-map
(let ((map (c-make-inherited-keymap)))
map)
- "Keymap used in csharp-mode buffers.")
+ "Keymap used in `csharp-mode' buffers.")
-(easy-menu-define csharp-mode-menu csharp-mode-map "C# Mode Commands"
+(easy-menu-define csharp-mode-menu csharp-mode-map "C# Mode Commands."
(cons "C#" (c-lang-const c-mode-menu csharp)))
;;;###autoload
