procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m4-mode misc small cleanup

Browse source 
* lisp/progmodes/m4-mode.el (m4-program): Assume it is in PATH.
(m4-mode-syntax-table): Init in the defvar.
(m4-mode-abbrev-table): Let define-derived-mode define it.
This commit is contained in:
Glenn Morris 2013-05-07 23:56:37 -07:00
parent 3f555be861
commit 9ecf672a9f
2 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2013-05-08 Glenn Morris <rgm@gnu.org>
* progmodes/m4-mode.el (m4-program): Assume it is in PATH.
(m4-mode-syntax-table): Init in the defvar.
(m4-mode-abbrev-table): Let define-derived-mode define it.
2013-05-08 Tom Tromey <tromey@redhat.com>
* progmodes/m4-mode.el (m4-mode-syntax-table):

45
lisp/progmodes/m4-mode.el
View file

@ -45,15 +45,10 @@
:prefix "m4-"
:group 'languages)
(defcustom m4-program
(cond
((file-exists-p "/usr/local/bin/m4") "/usr/local/bin/m4")
((file-exists-p "/usr/bin/m4") "/usr/bin/m4")
((file-exists-p "/bin/m4") "/bin/m4")
((file-exists-p "/usr/ccs/bin/m4") "/usr/ccs/bin/m4")
( t "m4")
)
"File name of the m4 executable."
(defcustom m4-program "m4"
"File name of the m4 executable.
If m4 is not in your PATH, set this to an absolute file name."
:version "24.4"
:type 'file
:group 'm4)
@ -85,19 +80,20 @@
:group 'm4)
;;this may still need some work
(defvar m4-mode-syntax-table nil
(defvar m4-mode-syntax-table
(let ((table (make-syntax-table)))
(modify-syntax-entry ?` "('" table)
(modify-syntax-entry ?' ")`" table)
(modify-syntax-entry ?# "<\n" table)
(modify-syntax-entry ?\n ">#" table)
(modify-syntax-entry ?{ "_" table)
(modify-syntax-entry ?} "_" table)
(modify-syntax-entry ?* "w" table)
(modify-syntax-entry ?_ "_" table)
(modify-syntax-entry ?\" "w" table)
(modify-syntax-entry ?\" "w" table)
table)
"Syntax table used while in `m4-mode'.")
(setq m4-mode-syntax-table (make-syntax-table))
(modify-syntax-entry ?` "('" m4-mode-syntax-table)
(modify-syntax-entry ?' ")`" m4-mode-syntax-table)
(modify-syntax-entry ?# "<\n" m4-mode-syntax-table)
(modify-syntax-entry ?\n ">#" m4-mode-syntax-table)
(modify-syntax-entry ?{ "_" m4-mode-syntax-table)
(modify-syntax-entry ?} "_" m4-mode-syntax-table)
(modify-syntax-entry ?* "w" m4-mode-syntax-table)
(modify-syntax-entry ?_ "_" m4-mode-syntax-table)
(modify-syntax-entry ?\" "w" m4-mode-syntax-table)
(modify-syntax-entry ?\" "w" m4-mode-syntax-table)
(defvar m4-mode-map
(let ((map (make-sparse-keymap))
@ -117,12 +113,6 @@
:help "Send contents of the current region to m4"))
map))
(defvar m4-mode-abbrev-table nil
"Abbrev table used while in `m4-mode'.")
(unless m4-mode-abbrev-table
(define-abbrev-table 'm4-mode-abbrev-table ()))
(defun m4-m4-buffer ()
"Send contents of the current buffer to m4."
(interactive)
@ -151,7 +141,6 @@
;;;###autoload
(define-derived-mode m4-mode prog-mode "m4"
"A major mode to edit m4 macro files."
:abbrev-table m4-mode-abbrev-table
(setq-local comment-start "#")
(setq-local parse-sexp-ignore-comments t)
(setq-local add-log-current-defun-function #'m4-current-defun-name)