comparison lisp/linum.el @ 110018:aa172fa85851

merge trunk
author Kenichi Handa <handa@m17n.org>
date Mon, 30 Aug 2010 09:15:54 +0900
parents a3e1f7134e6e
children 417b1e4d63cd
comparison
equal deleted inserted replaced
109990:7ab569e9f738 110018:aa172fa85851
3 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 3 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
4 4
5 ;; Author: Markus Triska <markus.triska@gmx.at> 5 ;; Author: Markus Triska <markus.triska@gmx.at>
6 ;; Maintainer: FSF 6 ;; Maintainer: FSF
7 ;; Keywords: convenience 7 ;; Keywords: convenience
8 ;; Version: 0.9x
8 9
9 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
10 11
11 ;; 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
12 ;; it under the terms of the GNU General Public License as published by 13 ;; it under the terms of the GNU General Public License as published by