diff options
| author | Glenn Morris | 2013-09-04 20:22:45 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-09-04 20:22:45 -0400 |
| commit | 2a6f417413360a4910bac0b096534571bc938071 (patch) | |
| tree | 594545a313b526ddf35f2b846bdc84ebf3bb3ea8 /lisp | |
| parent | bd15c390244427b448f19d80d96fad188e195d3b (diff) | |
| download | emacs-2a6f417413360a4910bac0b096534571bc938071.tar.gz emacs-2a6f417413360a4910bac0b096534571bc938071.zip | |
* semantic/fw.el (semantic-make-local-hook): Simplify by dropping Emacs <= 20.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/cedet/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cedet/semantic/fw.el | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index c39a8a700ef..50467fa6e37 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-09-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * semantic/fw.el (semantic-make-local-hook): | ||
| 4 | Simplify by dropping Emacs <= 20. | ||
| 5 | |||
| 1 | 2013-07-29 David Engster <deng@randomsample.de> | 6 | 2013-07-29 David Engster <deng@randomsample.de> |
| 2 | 7 | ||
| 3 | * lisp/cedet/cedet.el (cedet-packages): Remove speedbar since its | 8 | * lisp/cedet/cedet.el (cedet-packages): Remove speedbar since its |
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index dadf181ce21..7850e0462b2 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el | |||
| @@ -123,8 +123,7 @@ | |||
| 123 | 123 | ||
| 124 | 124 | ||
| 125 | (defalias 'semantic-make-local-hook | 125 | (defalias 'semantic-make-local-hook |
| 126 | (if (and (not (featurep 'xemacs)) | 126 | (if (featurep 'emacs) |
| 127 | (>= emacs-major-version 21)) | ||
| 128 | #'identity #'make-local-hook)) | 127 | #'identity #'make-local-hook)) |
| 129 | 128 | ||
| 130 | (defalias 'semantic-mode-line-update | 129 | (defalias 'semantic-mode-line-update |