Mercurial > emacs
comparison lisp/progmodes/mantemp.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 | e6fdae9180d4 c1ec1c8a8d2e |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
90995:9a391d85a79f | 90996:f55f9811f5d7 |
---|---|
9 | 9 |
10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published | 13 ;; it under the terms of the GNU General Public License as published |
14 ;; by the Free Software Foundation; either version 2, or (at your | 14 ;; by the Free Software Foundation; either version 3, or (at your |
15 ;; option) any later version. | 15 ;; option) any later version. |
16 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, but | 17 ;; GNU Emacs is distributed in the hope that it will be useful, but |
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |