diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /test/cedet/tests/test.el | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'test/cedet/tests/test.el')
| -rw-r--r-- | test/cedet/tests/test.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cedet/tests/test.el b/test/cedet/tests/test.el index 8a95572c497..a07a9316f35 100644 --- a/test/cedet/tests/test.el +++ b/test/cedet/tests/test.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; test.el --- Unit test file for Semantic Emacs Lisp support. | 1 | ;;; test.el --- Unit test file for Semantic Emacs Lisp support. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
| @@ -144,7 +144,7 @@ | |||
| 144 | this | 144 | this |
| 145 | that) | 145 | that) |
| 146 | 146 | ||
| 147 | (define-mode-local-override a-overriden-function | 147 | (define-mode-local-override a-overridden-function |
| 148 | emacs-lisp-mode (tag) | 148 | emacs-lisp-mode (tag) |
| 149 | "A function that is overloaded." | 149 | "A function that is overloaded." |
| 150 | nil) | 150 | nil) |