Merge from emacs--rel--22

[gnu-emacs] / lisp / font-lock.el

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 4fd933e3191e9337f92ebfe79510026bd9c17e5a..9ceca1b014f8e116c4c975106da765a0496c2e29 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,