Mercurial > emacs
comparison lisp/generic-x.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | 1fea8c5cd259 |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; generic-x.el --- A collection of generic modes | 1 ;;; generic-x.el --- A collection of generic modes |
2 | 2 |
3 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 3 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
4 ;; 2008, 2009 Free Software Foundation, Inc. | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Peter Breton <pbreton@cs.umb.edu> | 6 ;; Author: Peter Breton <pbreton@cs.umb.edu> |
7 ;; Created: Tue Oct 08 1996 | 7 ;; Created: Tue Oct 08 1996 |
8 ;; Keywords: generic, comment, font-lock | 8 ;; Keywords: generic, comment, font-lock |
9 | 9 |