diff options
| author | Paul Eggert | 2012-01-07 11:51:13 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-07 11:51:13 -0800 |
| commit | 9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch) | |
| tree | 3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /lisp/progmodes/cpp.el | |
| parent | dbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff) | |
| parent | 6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff) | |
| download | emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/progmodes/cpp.el')
| -rw-r--r-- | lisp/progmodes/cpp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index e5bfda54728..8ecfe79de3b 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cpp.el --- highlight or hide text according to cpp conditionals | 1 | ;;; cpp.el --- highlight or hide text according to cpp conditionals |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-1995, 2001-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-1995, 2001-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> | 5 | ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> |
| 6 | ;; Keywords: c, faces, tools | 6 | ;; Keywords: c, faces, tools |