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

Derive from prog-mode, use derived-mode-p, and fix up various

Browse source 
minor style issues in lisp/progmodes.

* lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init)
(vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable ->
make-local-hook.
* lisp/progmodes/sh-script.el (sh-require-final-newline): Remove.
(sh-set-shell): Don't set require-final-newline since it's already done
by prog-mode.
* lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column
since we never set it.
* lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation):
Use read-string and standard prompt.
* lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration.
* lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl.
(meta-common-mode-syntax-table): Rename from meta-mode-syntax-table.
(meta-common-mode-map): Rename from meta-mode-map.
Remove C-m binding, which is a user preference, not mode specific.
(meta-common-mode): New major mode; replace meta-common-initialization.
* lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing
around with font-lock.
* lisp/progmodes/etags.el (select-tags-table-mode):
Derive from special-mode.
* lisp/progmodes/octave-mod.el (octave-mode):
* lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode)
(gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode)
(gdb-frames-mode, gdb-locals-mode, gdb-registers-mode):
Let define-derived-mode do its job.
* lisp/progmodes/cpp.el (cpp-edit-mode-map):
Move initialization into declaration.
(cpp-edit-mode): Use define-derived-mode.
(cpp-edit-load): Use derived-mode-p.
* lisp/progmodes/mixal-mode.el (mixal-mode):
* lisp/progmodes/f90.el (f90-mode):
* lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting
require-final-newline since prog-mode does it already.
* lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string.
* lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup.
* lisp/progmodes/antlr-mode.el: Require cc-mode upfront.
(antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in
the declaration.
(antlr-directory-dependencies, antlr-show-makefile-rules):
Use derived-mode-p.
(antlr-language-option): Don't assume point-min==1.
(antlr-mode): Use define-derived-mode.
* lisp/progmodes/ada-mode.el: Use derived-mode-p.
(ada-mode): Use define-derived-mode.
Use hack-local-variables-hook.

* lisp/progmodes/vhdl-mode.el (vhdl-mode):
* lisp/progmodes/verilog-mode.el (verilog-mode):
* lisp/progmodes/vera-mode.el (vera-mode):
* lisp/progmodes/sql.el (sql-mode):
* lisp/progmodes/scheme.el (scheme-mode):
* lisp/progmodes/perl-mode.el (perl-mode):
* lisp/progmodes/octave-inf.el (inferior-octave-mode):
* lisp/progmodes/autoconf.el (autoconf-mode):
* lisp/progmodes/m4-mode.el (m4-mode):
* lisp/progmodes/inf-lisp.el (inferior-lisp-mode):
* lisp/progmodes/idlwave.el (idlwave-mode):
* lisp/progmodes/icon.el (icon-mode):
* lisp/progmodes/idlw-help.el (idlwave-help-mode):
* lisp/progmodes/dcl-mode.el (dcl-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode)
(ebrowse-member-mode, ebrowse-electric-position-mode):
Use define-derived-mode.

* lisp/progmodes/xscheme.el (xscheme-start)
(local-set-scheme-interaction-buffer, scheme-interaction-mode):
* lisp/progmodes/which-func.el (which-function):
* lisp/progmodes/vhdl-mode.el (vhdl-set-style):
* lisp/progmodes/verilog-mode.el (verilog-set-compile-command)
(verilog-modify-compile-command, verilog-error-regexp-add-xemacs)
(verilog-set-define, verilog-auto-reeval-locals):
* lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode):
* lisp/progmodes/simula.el (simula-mode):
* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode):
* lisp/progmodes/python.el (python-check, python-mode):
* lisp/progmodes/prolog.el (prolog-mode-variables):
* lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions):
* lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame):
* lisp/progmodes/delphi.el (delphi-mode):
* lisp/progmodes/cc-styles.el (c-setup-paragraph-variables):
* lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init)
(c-font-lock-init): Move make-local-variable to their setq.

* lisp/progmodes/xscheme.el (exit-scheme-interaction-mode)
(xscheme-enter-interaction-mode, xscheme-enter-debugger-mode)
(xscheme-debugger-mode-p, xscheme-send-string-1):
* lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word)
(tcl-load-file, tcl-restart-with-file):
* lisp/progmodes/ps-mode.el (ps-run-running):
* lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint):
* lisp/progmodes/js.el (js--get-all-known-symbols):
* lisp/progmodes/inf-lisp.el (inferior-lisp-proc):
* lisp/progmodes/idlwave.el (idlwave-beginning-of-statement)
(idlwave-template, idlwave-update-buffer-routine-info)
(idlwave-update-current-buffer-info)
(idlwave-get-routine-info-from-buffers, idlwave-choose)
(idlwave-scan-class-info, idlwave-fix-keywords)
(idlwave-list-buffer-load-path-shadows):
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add)
(idlwave-toolbar-remove):
* lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action)
(idlwave-shell-file-name, idlwave-shell-electric-debug-all-off)
(idlwave-shell-menu-def):
* lisp/progmodes/idlw-complete-structtag.el
(idlwave-prepare-structure-tag-completion):
* lisp/progmodes/gud.el (gud-set-buffer):
* lisp/progmodes/f90.el (f90-backslash-not-special):
* lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
This commit is contained in:
Stefan Monnier 2010-12-10 15:00:25 -05:00
parent fe646d2c4e
commit 175069efeb
47 changed files with 710 additions and 1016 deletions
Download patch file Download diff file Expand all files Collapse all files

160
lisp/progmodes/dcl-mode.el
View file

@ -296,72 +296,69 @@ See `imenu-generic-expression' for details."
)
(defvar dcl-mode-map ()
(defvar dcl-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "\e\n" 'dcl-split-line)
(define-key map "\e\t" 'tempo-complete-tag)
(define-key map "\e^" 'dcl-delete-indentation)
(define-key map "\em" 'dcl-back-to-indentation)
(define-key map "\ee" 'dcl-forward-command)
(define-key map "\ea" 'dcl-backward-command)
(define-key map "\e\C-q" 'dcl-indent-command)
(define-key map "\t" 'dcl-tab)
(define-key map ":" 'dcl-electric-character)
(define-key map "F" 'dcl-electric-character)
(define-key map "f" 'dcl-electric-character)
(define-key map "E" 'dcl-electric-character)
(define-key map "e" 'dcl-electric-character)
(define-key map "\C-c\C-o" 'dcl-set-option)
(define-key map "\C-c\C-f" 'tempo-forward-mark)
(define-key map "\C-c\C-b" 'tempo-backward-mark)
(define-key map [menu-bar] (make-sparse-keymap))
(define-key map [menu-bar dcl]
(cons "DCL" (make-sparse-keymap "DCL")))
;; Define these in bottom-up order
(define-key map [menu-bar dcl tempo-backward-mark]
'("Previous template mark" . tempo-backward-mark))
(define-key map [menu-bar dcl tempo-forward-mark]
'("Next template mark" . tempo-forward-mark))
(define-key map [menu-bar dcl tempo-complete-tag]
'("Complete template tag" . tempo-complete-tag))
(define-key map [menu-bar dcl dcl-separator-tempo]
'("--"))
(define-key map [menu-bar dcl dcl-save-all-options]
'("Save all options" . dcl-save-all-options))
(define-key map [menu-bar dcl dcl-save-nondefault-options]
'("Save changed options" . dcl-save-nondefault-options))
(define-key map [menu-bar dcl dcl-set-option]
'("Set option" . dcl-set-option))
(define-key map [menu-bar dcl dcl-separator-option]
'("--"))
(define-key map [menu-bar dcl dcl-delete-indentation]
'("Delete indentation" . dcl-delete-indentation))
(define-key map [menu-bar dcl dcl-split-line]
'("Split line" . dcl-split-line))
(define-key map [menu-bar dcl dcl-indent-command]
'("Indent command" . dcl-indent-command))
(define-key map [menu-bar dcl dcl-tab]
'("Indent line/insert tab" . dcl-tab))
(define-key map [menu-bar dcl dcl-back-to-indentation]
'("Back to indentation" . dcl-back-to-indentation))
(define-key map [menu-bar dcl dcl-forward-command]
'("End of statement" . dcl-forward-command))
(define-key map [menu-bar dcl dcl-backward-command]
'("Beginning of statement" . dcl-backward-command))
;; imenu is only supported for versions with imenu-generic-expression
(if (boundp 'imenu-generic-expression)
(progn
(define-key map [menu-bar dcl dcl-separator-movement]
'("--"))
(define-key map [menu-bar dcl imenu]
'("Buffer index menu" . imenu))))
map)
"Keymap used in DCL-mode buffers.")
(if dcl-mode-map
()
(setq dcl-mode-map (make-sparse-keymap))
(define-key dcl-mode-map "\e\n" 'dcl-split-line)
(define-key dcl-mode-map "\e\t" 'tempo-complete-tag)
(define-key dcl-mode-map "\e^" 'dcl-delete-indentation)
(define-key dcl-mode-map "\em" 'dcl-back-to-indentation)
(define-key dcl-mode-map "\ee" 'dcl-forward-command)
(define-key dcl-mode-map "\ea" 'dcl-backward-command)
(define-key dcl-mode-map "\e\C-q" 'dcl-indent-command)
(define-key dcl-mode-map "\t" 'dcl-tab)
(define-key dcl-mode-map ":" 'dcl-electric-character)
(define-key dcl-mode-map "F" 'dcl-electric-character)
(define-key dcl-mode-map "f" 'dcl-electric-character)
(define-key dcl-mode-map "E" 'dcl-electric-character)
(define-key dcl-mode-map "e" 'dcl-electric-character)
(define-key dcl-mode-map "\C-c\C-o" 'dcl-set-option)
(define-key dcl-mode-map "\C-c\C-f" 'tempo-forward-mark)
(define-key dcl-mode-map "\C-c\C-b" 'tempo-backward-mark)
(define-key dcl-mode-map [menu-bar] (make-sparse-keymap))
(define-key dcl-mode-map [menu-bar dcl]
(cons "DCL" (make-sparse-keymap "DCL")))
;; Define these in bottom-up order
(define-key dcl-mode-map [menu-bar dcl tempo-backward-mark]
'("Previous template mark" . tempo-backward-mark))
(define-key dcl-mode-map [menu-bar dcl tempo-forward-mark]
'("Next template mark" . tempo-forward-mark))
(define-key dcl-mode-map [menu-bar dcl tempo-complete-tag]
'("Complete template tag" . tempo-complete-tag))
(define-key dcl-mode-map [menu-bar dcl dcl-separator-tempo]
'("--"))
(define-key dcl-mode-map [menu-bar dcl dcl-save-all-options]
'("Save all options" . dcl-save-all-options))
(define-key dcl-mode-map [menu-bar dcl dcl-save-nondefault-options]
'("Save changed options" . dcl-save-nondefault-options))
(define-key dcl-mode-map [menu-bar dcl dcl-set-option]
'("Set option" . dcl-set-option))
(define-key dcl-mode-map [menu-bar dcl dcl-separator-option]
'("--"))
(define-key dcl-mode-map [menu-bar dcl dcl-delete-indentation]
'("Delete indentation" . dcl-delete-indentation))
(define-key dcl-mode-map [menu-bar dcl dcl-split-line]
'("Split line" . dcl-split-line))
(define-key dcl-mode-map [menu-bar dcl dcl-indent-command]
'("Indent command" . dcl-indent-command))
(define-key dcl-mode-map [menu-bar dcl dcl-tab]
'("Indent line/insert tab" . dcl-tab))
(define-key dcl-mode-map [menu-bar dcl dcl-back-to-indentation]
'("Back to indentation" . dcl-back-to-indentation))
(define-key dcl-mode-map [menu-bar dcl dcl-forward-command]
'("End of statement" . dcl-forward-command))
(define-key dcl-mode-map [menu-bar dcl dcl-backward-command]
'("Beginning of statement" . dcl-backward-command))
;; imenu is only supported for versions with imenu-generic-expression
(if (boundp 'imenu-generic-expression)
(progn
(define-key dcl-mode-map [menu-bar dcl dcl-separator-movement]
'("--"))
(define-key dcl-mode-map [menu-bar dcl imenu]
'("Buffer index menu" . imenu))))
)
(defcustom dcl-ws-r
"\\([ \t]*-[ \t]*\\(!.*\\)*\n\\)*[ \t]*"
@ -475,7 +472,7 @@ Preloaded with all known option names from dcl-option-alist")
;;;###autoload
(defun dcl-mode ()
(define-derived-mode dcl-mode prog-mode "DCL"
"Major mode for editing DCL-files.
This mode indents command lines in blocks. (A block is commands between
@ -593,29 +590,17 @@ $
There is some minimal font-lock support (see vars
`dcl-font-lock-defaults' and `dcl-font-lock-keywords')."
(interactive)
(kill-all-local-variables)
(set-syntax-table dcl-mode-syntax-table)
(make-local-variable 'indent-line-function)
(setq indent-line-function 'dcl-indent-line)
(make-local-variable 'comment-start)
(setq comment-start "!")
(make-local-variable 'comment-end)
(setq comment-end "")
(make-local-variable 'comment-multi-line)
(setq comment-multi-line nil)
(set (make-local-variable 'indent-line-function) 'dcl-indent-line)
(set (make-local-variable 'comment-start) "!")
(set (make-local-variable 'comment-end) "")
(set (make-local-variable 'comment-multi-line) nil)
;; This used to be "^\\$[ \t]*![ \t]*" which looks more correct.
;; The drawback was that you couldn't make empty comment lines by pressing
;; C-M-j repeatedly - only the first line became a comment line.
;; This version has the drawback that the "$" can be anywhere in the line,
;; and something inappropriate might be interpreted as a comment.
(make-local-variable 'comment-start-skip)
(setq comment-start-skip "\\$[ \t]*![ \t]*")
(set (make-local-variable 'comment-start-skip) "\\$[ \t]*![ \t]*")
(if (boundp 'imenu-generic-expression)
(progn (setq imenu-generic-expression dcl-imenu-generic-expression)
@ -636,14 +621,9 @@ There is some minimal font-lock support (see vars
(make-local-variable 'dcl-electric-reindent-regexps)
;; font lock
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults dcl-font-lock-defaults)
(set (make-local-variable 'font-lock-defaults) dcl-font-lock-defaults)
(setq major-mode 'dcl-mode)
(setq mode-name "DCL")
(use-local-map dcl-mode-map)
(tempo-use-tag-list 'dcl-tempo-tags)
(run-mode-hooks 'dcl-mode-hook))
(tempo-use-tag-list 'dcl-tempo-tags))
;;; *** Movement commands ***************************************************