Merge from trunk.

[gnu-emacs] / lisp / cedet / srecode / ctxt.el

diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index f392379347aaa3b09da7f56be324bc3539b8829f..45f0d2b3afba2ab37a978a3cb4ce7a486dbd5775 100644 (file)
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -1,6 +1,6 @@
 ;;; srecode/ctxt.el --- Derive a context from the source buffer.
 
-;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -41,7 +41,7 @@
 (define-overload srecode-calculate-context ()
   "Calculate the context at the current point.
 The returned context is a list, with the top-most context first.
-Each returned context is a string that that would show up in a `context'
+Each returned context is a string that would show up in a `context'
 statement in an `.srt' file.
 
 Some useful context values used by the provided srecode templates are:
@@ -64,7 +64,7 @@ Some useful context values used by the provided srecode templates are:
      \"comment\"  - In a comment in a block of code
      -- these items show up at the end of the context list. --
      \"public\", \"protected\", \"private\" -
-                  In or near a section of public/pritected/private entries.
+                  In or near a section of public/protected/private entries.
   \"code\" - In a block of code.
      \"string\" - In a string in a block of code
      \"comment\"  - In a comment in a block of code