diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-06-18 12:23:11 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-06-18 12:23:11 -0400 |
| commit | 6d10d800bd766822d7563b0cbb16b51ccd7f79ed (patch) | |
| tree | 581048db06f56ff52b0f1536ee34dea8ea1ca93b /lisp | |
| parent | 28dec25a9fa1823e27276b717257d3dcbff16f9f (diff) | |
| download | emacs-6d10d800bd766822d7563b0cbb16b51ccd7f79ed.tar.gz emacs-6d10d800bd766822d7563b0cbb16b51ccd7f79ed.tar.bz2 emacs-6d10d800bd766822d7563b0cbb16b51ccd7f79ed.zip | |
Use define-derived-mode in delphi-mode.
* lisp/progmodes/delphi.el (delphi-mode-syntax-table): Use defvar.
(delphi-mode): Use define-derived-mode to inherit from prog-mode.
Remove unused argument.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/delphi.el | 24 |
2 files changed, 14 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c707a4b97bd..755afbfeff6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-06-18 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/delphi.el (delphi-mode-syntax-table): Use defvar. + (delphi-mode): Use define-derived-mode to inherit from prog-mode. + Remove unused argument. + 2011-06-18 Martin Rudalics <rudalics@gmx.at> * window.el (display-buffer-default-specifiers): Remove diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index c809079381f..e8e2f8ffbf0 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -1959,12 +1959,12 @@ comment block. If not in a // comment, just does a normal newline." kmap) "Keymap used in Delphi mode.") -(defconst delphi-mode-syntax-table (make-syntax-table) +(defvar delphi-mode-syntax-table nil "Delphi mode's syntax table. It is just a standard syntax table. This is ok since we do our own keyword/comment/string face coloring.") ;;;###autoload -(defun delphi-mode (&optional skip-initial-parsing) +(define-derived-mode delphi-mode prog-mode "Delphi" "Major mode for editing Delphi code. \\<delphi-mode-map> \\[delphi-tab]\t- Indents the current line (or region, if Transient Mark mode \t is enabled and the region is active) of Delphi code. @@ -2007,14 +2007,6 @@ Coloring: Turning on Delphi mode calls the value of the variable `delphi-mode-hook' with no args, if that value is non-nil." - (interactive) - (kill-all-local-variables) - (use-local-map delphi-mode-map) - (setq major-mode 'delphi-mode) ;FIXME: Use define-derived-mode. - (setq mode-name "Delphi") - - (setq local-abbrev-table delphi-mode-abbrev-table) - (set-syntax-table delphi-mode-syntax-table) ;; Buffer locals: (mapc #'(lambda (var) @@ -2033,12 +2025,12 @@ with no args, if that value is non-nil." (add-hook 'after-change-functions 'delphi-after-change nil t) (widen) - (unless skip-initial-parsing - (delphi-save-excursion - (let ((delphi-verbose t)) - (delphi-progress-start) - (delphi-parse-region (point-min) (point-max)) - (delphi-progress-done)))) + + (delphi-save-excursion + (let ((delphi-verbose t)) + (delphi-progress-start) + (delphi-parse-region (point-min) (point-max)) + (delphi-progress-done))) (run-mode-hooks 'delphi-mode-hook)) |