diff options
| author | Stefan Monnier | 2010-08-18 13:01:15 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-08-18 13:01:15 +0200 |
| commit | 9acd1bdcb92f77cb7d5312d69d47ff2942751132 (patch) | |
| tree | e3250e5ae91a72a13d518c55ea97a8f72a96192a | |
| parent | 8723cfa464656bd17dbae6c7ef5c11539603ce55 (diff) | |
| download | emacs-9acd1bdcb92f77cb7d5312d69d47ff2942751132.tar.gz emacs-9acd1bdcb92f77cb7d5312d69d47ff2942751132.zip | |
* lisp/progmodes/prolog.el (smie): Require.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/prolog.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a6982c9751..85d7dda3395 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-08-18 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2010-08-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * progmodes/prolog.el (smie): Require. | ||
| 4 | |||
| 3 | * emacs-lisp/smie.el (smie-default-backward-token) | 5 | * emacs-lisp/smie.el (smie-default-backward-token) |
| 4 | (smie-default-forward-token): Strip properties. | 6 | (smie-default-forward-token): Strip properties. |
| 5 | (smie-next-sexp): Be more careful with associative operators. | 7 | (smie-next-sexp): Be more careful with associative operators. |
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 64277dc4f82..77e334ca8d8 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | (defvar comint-prompt-regexp) | 32 | (defvar comint-prompt-regexp) |
| 33 | (defvar comint-process-echoes) | 33 | (defvar comint-process-echoes) |
| 34 | (defvar smie-indent-basic) | 34 | (require 'smie) |
| 35 | 35 | ||
| 36 | (defgroup prolog nil | 36 | (defgroup prolog nil |
| 37 | "Major mode for editing and running Prolog under Emacs." | 37 | "Major mode for editing and running Prolog under Emacs." |