diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /lisp/progmodes/cpp.el | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.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 |