Merge changes from emacs-23 branch.

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

diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 76d6181349cacf5d039d479da392a723fd338407..8d168a7f3392203f5157be87799f094b0b32ddd7 100644 (file)
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -1,6 +1,6 @@
 ;;; srecode-dictionary.el --- Dictionary code for the semantic recoder.
 
-;; Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -28,6 +28,7 @@
 
 ;;; CLASSES
 
+(eval-when-compile (require 'cl))
 (require 'eieio)
 (require 'srecode)
 (require 'srecode/table)
@@ -239,7 +240,7 @@ You can add several dictionaries to the same section macro.
 For each dictionary added to a macro, the block of codes in the
 template will be repeated.
 
-If optional argument SHOW-ONLY is non-nil, then don't add a new dictionarly
+If optional argument SHOW-ONLY is non-nil, then don't add a new dictionary
 if there is already one in place.  Also, don't add FIRST/LAST entries.
 These entries are not needed when we are just showing a section.
 
@@ -401,7 +402,7 @@ FUNCTION and DICTIONARY are as for the baseclass."
 (defclass srecode-field-value (srecode-dictionary-compound-value)
   ((firstinserter :initarg :firstinserter
                  :documentation
-                 "The inserter object for the first occurance of this field.")
+                 "The inserter object for the first occurrence of this field.")
    (defaultvalue :initarg :defaultvalue
      :documentation
      "The default value for this inserter.")