From 152a626929643da6eadabb07c00221e0469b96e0 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Mon, 22 Feb 2010 21:18:43 +0100
Subject: [PATCH] Caught some typos.

Rev: lib/master.pike.in:1.470
Rev: lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike:1.140
Rev: tools/pike.el:1.40
---
 lib/master.pike.in                                    | 4 ++--
 lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike | 6 +++---
 tools/pike.el                                         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/master.pike.in b/lib/master.pike.in
index 06795ef78b..2197bcb4de 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -6,7 +6,7 @@
 // Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 // for more information.
 //
-// $Id: master.pike.in,v 1.469 2009/12/28 14:16:30 mast Exp $
+// $Id: master.pike.in,v 1.470 2010/02/22 20:18:42 srb Exp $
 
 #pike __REAL_VERSION__
 //#pragma strict_types
@@ -3957,7 +3957,7 @@ void compile_warning(string file,int line,string err)
 }
 
 
-//! This function is called when an exception is catched during
+//! This function is called when an exception is caught during
 //! compilation. Its message is also reported to @[compile_error] if
 //! this function returns zero.
 int compile_exception (array|object trace)
diff --git a/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike b/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
index 6ad72eab3d..f127e9bb22 100755
--- a/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
@@ -1,7 +1,7 @@
 #! /usr/bin/env pike
 #pike __REAL_VERSION__
 
-/* $Id: test_pike.pike,v 1.139 2008/12/15 09:01:46 mast Exp $ */
+/* $Id: test_pike.pike,v 1.140 2010/02/22 20:18:43 srb Exp $ */
 
 constant description = "Executes tests according to testsuite files.";
 
@@ -987,8 +987,8 @@ int main(int argc, array(string) argv)
 	    err=catch {
 	      // Is it intentional that compilation errors are
 	      // considered success too? /mast
-	      // Yes, apparently it is. There are tests that doesn't
-	      // care whether the error is catched during compilation
+	      // Yes, apparently it is. There are tests that don't
+	      // care whether the error is caught during compilation
 	      // or evaluation. /mast
 	      a = compile_string(to_compile, testsuite)()->a();
 	    };
diff --git a/tools/pike.el b/tools/pike.el
index 358b3ae5b5..3bd37da272 100644
--- a/tools/pike.el
+++ b/tools/pike.el
@@ -1,5 +1,5 @@
 ;;; pike.el -- Font lock definitions for Pike and other LPC files.
-;;; $Id: pike.el,v 1.39 2002/08/02 05:07:15 jhs fake $
+;;; $Id: pike.el,v 1.40 2010/02/22 20:18:43 srb Exp $
 ;;; Copyright (C) 1995, 1996, 1997, 1998, 1999 Per Hedbor.
 ;;; This file is distributed as GPL
 
@@ -681,7 +681,7 @@ reposition the cursor to fontify more identifiers."
 	      pike-font-lock-identifier-regexp)
      1 font-lock-variable-name-face)
 
-    ;; Simple types that might not have been catched by the
+    ;; Simple types that might not have been caught by the
     ;; earlier rules.
     (,pike-font-lock-type-regexp
      1 font-lock-type-face)
-- 
GitLab