From 5f199f2d5a6054cffbea5a869004a3af55b4f401 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Thu, 15 Aug 2013 20:40:38 -0700 Subject: [PATCH] misc/emacs: when defining prog-mode, define it like GNU Emacs 24 would Fixes #6156. R=adonovan CC=golang-dev https://golang.org/cl/13035043 --- misc/emacs/go-mode.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el index e4855c9d900..a896b143d8a 100644 --- a/misc/emacs/go-mode.el +++ b/misc/emacs/go-mode.el @@ -67,14 +67,14 @@ (defun go--old-completion-list-style (list) (mapcar (lambda (x) (cons x nil)) list)) -;; GNU Emacs 24 has prog-mode, older GNU Emacs and XEmacs do not. -;; Ideally we'd use defalias instead, but that breaks in XEmacs. -;; -;; TODO: If XEmacs decides to add prog-mode, change this to use -;; defalias to alias prog-mode or fundamental-mode to go--prog-mode -;; and use that in define-derived-mode. +;; GNU Emacs 24 has prog-mode, older GNU Emacs and XEmacs do not, so +;; copy its definition for those. (if (not (fboundp 'prog-mode)) - (define-derived-mode prog-mode fundamental-mode "" "")) + (define-derived-mode prog-mode fundamental-mode "Prog" + "Major mode for editing source code." + (set (make-local-variable 'require-final-newline) mode-require-final-newline) + (set (make-local-variable 'parse-sexp-ignore-comments) t) + (setq bidi-paragraph-direction 'left-to-right))) (defun go--regexp-enclose-in-symbol (s) ;; XEmacs does not support \_<, GNU Emacs does. In GNU Emacs we make