[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104624: Use define-derived-mode in d
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104624: Use define-derived-mode in delphi-mode. |
Date: |
Sat, 18 Jun 2011 12:23:11 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104624
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-06-18 12:23:11 -0400
message:
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.
modified:
lisp/ChangeLog
lisp/progmodes/delphi.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-18 15:14:35 +0000
+++ b/lisp/ChangeLog 2011-06-18 16:23:11 +0000
@@ -1,3 +1,9 @@
+2011-06-18 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* window.el (display-buffer-default-specifiers): Remove
=== modified file 'lisp/progmodes/delphi.el'
--- a/lisp/progmodes/delphi.el 2011-04-22 18:44:26 +0000
+++ b/lisp/progmodes/delphi.el 2011-06-18 16:23:11 +0000
@@ -1959,12 +1959,12 @@
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 @@
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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104624: Use define-derived-mode in delphi-mode.,
Chong Yidong <=