Merge from mainline.

2 files changed, 17 insertions, 6 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 695a51b7f4f..3908a734136 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/prolog.prolog: Add tokenizing tests.
+
 2011-01-13  Christian Ohler  <ohler@gnu.org>
 
         * automated: New directory for automated tests.
@@ -229,7 +233,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+    Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog
index 8b96cd56a33..6cb5535fe8d 100644
--- a/test/indent/prolog.prolog
+++ b/test/indent/prolog.prolog
@@ -1,11 +1,18 @@
-%% -*- mode: prolog; coding: utf-8 -*-
+%% -*- mode: prolog; coding: utf-8; fill-column: 78 -*-
+
+%% Testing correct tokenizing.
+foo(X) :- 0'= = X.
+foo(X) :- 8'234 = X.
+foo(X) :- '\x45\' = X.
+foo(X) :- 'test 0'=X.
+foo(X) :- 'test 8'=X.
 
 %% wf(+E)
 %% Vérifie que E est une expression syntaxiquement correcte.
-wf(X) :- atom(X); integer(X); var(X).           %Une variable ou un entier.
-wf(lambda(X, T, B)) :- atom(X), wf(T), wf(B).   %Une fonction.
-wf(app(E1, E2)) :- wf(E1), wf(E2).              %Un appel de fonction.
-wf(pi(X, T, B)) :- atom(X), wf(T), wf(B).       %Le type d'une fonction.
+wf(X) :- atom(X); integer(X); var(X).         %Une variable ou un entier.
+wf(lambda(X, T, B)) :- atom(X), wf(T), wf(B). %Une fonction.
+wf(app(E1, E2)) :- wf(E1), wf(E2).            %Un appel de fonction.
+wf(pi(X, T, B)) :- atom(X), wf(T), wf(B).     %Le type d'une fonction.
 
 %% Éléments additionnels utilisés dans le langage source.
 wf(lambda(X, B)) :- atom(X), wf(B).