diff options
Diffstat (limited to 'lisp/progmodes/dcl-mode.el')
| -rw-r--r-- | lisp/progmodes/dcl-mode.el | 162 |
1 files changed, 71 insertions, 91 deletions
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index dd7aa0eddfb..9aea53705cd 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -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) - - (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)) + (set (make-local-variable 'font-lock-defaults) dcl-font-lock-defaults) + + (tempo-use-tag-list 'dcl-tempo-tags)) ;;; *** Movement commands *************************************************** |