scanner: fix typo.

	* src/scan-skel.l (@`): s/emtpy/empty/.
	Reported by Tim Landscheidt.

Conflicts:

	src/scan-skel.l

diff --git a/ChangeLog b/ChangeLog
index 234df12bd26b72433a10b0455251909ddfcf9290..c6d666665ace9f86924e4b5898a8b0f4ca105fcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-11  Akim Demaille  <demaille@gostai.com>
+
+       scanner: fix typo.
+       * src/scan-skel.l (@`): s/emtpy/empty/.
+       Reported by Tim Landscheidt.
+
 2012-01-06  Jim Meyering  <meyering@redhat.com>
 
        build: avoid warnings about set-but-not-used variables

diff --git a/THANKS b/THANKS
index 17243d4930463e6d9f905033f99034f64b2b360a..7603762d034f6b3a7dd2d4ccd6813d8b109be874 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -100,6 +100,7 @@ Shura                     debil_urod@ngs.ru
 Steve Murphy              murf@parsetree.com
 Summum Bonum              sum@geekhouse.org
 Tim Josling               tej@melbpc.org.au
+Tim Landscheidt           tim@tim-landscheidt.de
 Tim Van Holder            tim.van.holder@pandora.be
 Tom Lane                  tgl@sss.pgh.pa.us
 Tom Tromey                tromey@cygnus.com

diff --git a/src/scan-skel.l b/src/scan-skel.l
index a89e13cc1f4d39a9050ca67b1c09e895d111c1d2..33c264a16af193dc37acaf2081686244c149d97d 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -72,7 +72,7 @@ static void fail_for_invalid_at (char const *at);
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);
-"@`" /* Emtpy.  Used by b4_cat in ../data/bison.m4.  */
+"@`" /* Empty.  Used by b4_cat in ../data/bison.m4.  */
 @\n  /* Likewise.  */
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);