Mercurial > emacs
comparison lisp/progmodes/cc-menus.el @ 90996:f55f9811f5d7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 27 Jul 2007 10:52:18 +0000 |
| parents | 95d0cdf160ea c1ec1c8a8d2e |
| children | 1251cabc40b7 |
comparison
equal
deleted
inserted
replaced
| 90995:9a391d85a79f | 90996:f55f9811f5d7 |
|---|---|
| 15 | 15 |
| 16 ;; This file is part of GNU Emacs. | 16 ;; This file is part of GNU Emacs. |
| 17 | 17 |
| 18 ;; GNU Emacs is free software; you can redistribute it and/or modify | 18 ;; GNU Emacs is free software; you can redistribute it and/or modify |
| 19 ;; it under the terms of the GNU General Public License as published by | 19 ;; it under the terms of the GNU General Public License as published by |
| 20 ;; the Free Software Foundation; either version 2, or (at your option) | 20 ;; the Free Software Foundation; either version 3, or (at your option) |
| 21 ;; any later version. | 21 ;; any later version. |
| 22 | 22 |
| 23 ;; GNU Emacs is distributed in the hope that it will be useful, | 23 ;; GNU Emacs is distributed in the hope that it will be useful, |
| 24 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 24 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 25 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 25 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |