diff options
| author | Stefan Monnier | 2010-05-15 00:08:03 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-05-15 00:08:03 -0400 |
| commit | 13973643c9e26a06239a6da13cc72cbd4a5ec22a (patch) | |
| tree | 2df68f5d45e695e040b244d2d078b8128a3ce46f | |
| parent | c26ea4b2a3136ad1870770c39969eda447e11e00 (diff) | |
| download | emacs-13973643c9e26a06239a6da13cc72cbd4a5ec22a.tar.gz emacs-13973643c9e26a06239a6da13cc72cbd4a5ec22a.zip | |
* progmodes/prolog.el (prolog-mode): Use define-derived-mode.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/prolog.el | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83e4012424b..32785d928cc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-05-15 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2010-05-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * progmodes/prolog.el (prolog-mode): Use define-derived-mode. | ||
| 4 | |||
| 3 | * pcomplete.el (pcomplete-completions-at-point): New function, | 5 | * pcomplete.el (pcomplete-completions-at-point): New function, |
| 4 | extracted from pcomplete-std-complete. | 6 | extracted from pcomplete-std-complete. |
| 5 | (pcomplete-std-complete): Use it. | 7 | (pcomplete-std-complete): Use it. |
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 197b41506bd..5bca3502af9 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el | |||
| @@ -136,26 +136,18 @@ When nil, send actual operating system end of file." | |||
| 136 | )) | 136 | )) |
| 137 | 137 | ||
| 138 | ;;;###autoload | 138 | ;;;###autoload |
| 139 | (defun prolog-mode () | 139 | (define-derived-mode prolog-mode prog-mode "Prolog" |
| 140 | "Major mode for editing Prolog code for Prologs. | 140 | "Major mode for editing Prolog code for Prologs. |
| 141 | Blank lines and `%%...' separate paragraphs. `%'s start comments. | 141 | Blank lines and `%%...' separate paragraphs. `%'s start comments. |
| 142 | Commands: | 142 | Commands: |
| 143 | \\{prolog-mode-map} | 143 | \\{prolog-mode-map} |
| 144 | Entry to this mode calls the value of `prolog-mode-hook' | 144 | Entry to this mode calls the value of `prolog-mode-hook' |
| 145 | if that value is non-nil." | 145 | if that value is non-nil." |
| 146 | (interactive) | ||
| 147 | (kill-all-local-variables) | ||
| 148 | (use-local-map prolog-mode-map) | ||
| 149 | (set-syntax-table prolog-mode-syntax-table) | ||
| 150 | (setq major-mode 'prolog-mode) | ||
| 151 | (setq mode-name "Prolog") | ||
| 152 | (prolog-mode-variables) | 146 | (prolog-mode-variables) |
| 153 | (set (make-local-variable 'comment-add) 1) | 147 | (set (make-local-variable 'comment-add) 1) |
| 154 | ;; font lock | ||
| 155 | (setq font-lock-defaults '(prolog-font-lock-keywords | 148 | (setq font-lock-defaults '(prolog-font-lock-keywords |
| 156 | nil nil nil | 149 | nil nil nil |
| 157 | beginning-of-line)) | 150 | beginning-of-line))) |
| 158 | (run-mode-hooks 'prolog-mode-hook)) | ||
| 159 | 151 | ||
| 160 | (defun prolog-indent-line () | 152 | (defun prolog-indent-line () |
| 161 | "Indent current line as Prolog code. | 153 | "Indent current line as Prolog code. |