diff options
| author | Chong Yidong | 2011-07-29 22:11:31 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-07-29 22:11:31 -0400 |
| commit | b4010ade6620f6145fae022fb0b1cf3988cc16cf (patch) | |
| tree | 112c17eaa4797d87cae17ee59a1d80ffae299b8d | |
| parent | 469d21499d26c720d22b358ff391bf13d0e708e3 (diff) | |
| download | emacs-b4010ade6620f6145fae022fb0b1cf3988cc16cf.tar.gz emacs-b4010ade6620f6145fae022fb0b1cf3988cc16cf.zip | |
Fix require statement in semantic/grammar.el.
* lisp/semantic/grammar.el (semantic-grammar-insert-defanalyzers): Fix
require.
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cedet/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cedet/semantic/grammar.el | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index e54e8d81b8a..6d89746ed05 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-07-30 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * grammars: New directory. | ||
| 4 | |||
| 1 | 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * NEWS: Document ## and #:. | 7 | * NEWS: Document ## and #:. |
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 60d7690a3c8..093e592c475 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-30 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * semantic/grammar.el (semantic-grammar-insert-defanalyzers): Fix | ||
| 4 | require. | ||
| 5 | |||
| 1 | 2011-07-04 Darren Hoo <darren.hoo@gmail.com> (tiny change) | 6 | 2011-07-04 Darren Hoo <darren.hoo@gmail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * semantic/db.el (semanticdb-file-table-object): Don't bug out on | 8 | * semantic/db.el (semanticdb-file-table-object): Don't bug out on |
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 270668e2959..1d1184e534f 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el | |||
| @@ -801,7 +801,7 @@ Block definitions are read from the current table of lexical types." | |||
| 801 | (with-current-buffer semantic--grammar-input-buffer | 801 | (with-current-buffer semantic--grammar-input-buffer |
| 802 | (setq tokens (semantic-grammar-tokens) | 802 | (setq tokens (semantic-grammar-tokens) |
| 803 | props (semantic-grammar-token-properties tokens))) | 803 | props (semantic-grammar-token-properties tokens))) |
| 804 | (insert "(require 'semantic-lex)\n\n") | 804 | (insert "(require 'semantic/lex)\n\n") |
| 805 | (let ((semantic-lex-types-obarray | 805 | (let ((semantic-lex-types-obarray |
| 806 | (semantic-lex-make-type-table tokens props)) | 806 | (semantic-lex-make-type-table tokens props)) |
| 807 | semantic-grammar--lex-block-specs) | 807 | semantic-grammar--lex-block-specs) |