diff options
| author | Phil Sainty <psainty@orcon.net.nz> | 2018-07-07 21:09:24 +1200 |
|---|---|---|
| committer | Phil Sainty <psainty@orcon.net.nz> | 2018-07-08 01:20:10 +1200 |
| commit | 9823f299bd556010b4cd8c4093c7b9f408fa5ff7 (patch) | |
| tree | e8667d0c3a10d00c58119f736128e218d6a4ffe3 | |
| parent | 6a4477d057e8e35698c34193e928089290b16a58 (diff) | |
| download | emacs-fix/bug-2034.tar.gz | |
Restore antlr-mode's intended mode-name constructfix/bug-2034
* lisp/progmodes/antlr-mode.el (antlr-mode): Restore antlr-mode's
intended mode-name, as CC mode now supports arbitrary mode line
constructs.
Note that the NAME supplied to 'define-derived-mode' should be a
string, so the original (commented) code wasn't quite right.
| -rw-r--r-- | lisp/progmodes/antlr-mode.el | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 775fd878725..ad6d45e0b4c 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -2553,11 +2553,7 @@ the default language." (car r))) ;;;###autoload -(define-derived-mode antlr-mode prog-mode - ;; FIXME: Since it uses cc-mode, it bumps into c-update-modeline's - ;; limitation to mode-name being a string. - ;; '("Antlr." (:eval (cadr (assq antlr-language antlr-language-alist)))) - "Antlr" +(define-derived-mode antlr-mode prog-mode "Antlr" "Major mode for editing ANTLR grammar files." :abbrev-table antlr-mode-abbrev-table (c-initialize-cc-mode) ; cc-mode is required @@ -2567,10 +2563,9 @@ the default language." (unless antlr-language (set (make-local-variable 'antlr-language) (or (antlr-language-option t) (antlr-language-option nil)))) - (if (stringp (cadr (assq antlr-language antlr-language-alist))) - (setq mode-name - (concat "Antlr." - (cadr (assq antlr-language antlr-language-alist))))) + (setq mode-name + '("Antlr." (:eval (cadr (assq antlr-language + antlr-language-alist))))) ;; indentation, for the C engine ------------------------------------------- (setq c-buffer-is-cc-mode antlr-language) (cond ((fboundp 'c-init-language-vars-for) ; cc-mode 5.30.5+ |