diff options
| author | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
| commit | 678fb7066698ebfe3aecba722294025ed26da01b (patch) | |
| tree | 951ac3055141d950974051d13c10e5d7c6a98e31 /lisp/progmodes/cpp.el | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge 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 |