Merge from trunk.

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

diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index cd97c8805953f958f22fbc99ec3ffa217fa7a10c..5b65284660f58476efeb76a47d8bd483c5373fde 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.
+;;; srecode/dictionary.el --- Dictionary code for the semantic recoder.
 
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -202,7 +202,7 @@ associated with a buffer or parent."
                                              :size 20)
                   :origin   origin)))
        ;; Only set up the default variables if we are being built
-       ;; directroy for a particular buffer.
+       ;; directly for a particular buffer.
        (when initfrombuff
          ;; Variables from the table we are inserting from.
          ;; @todo - get a better tree of tables.
@@ -280,7 +280,7 @@ inserted dictionaries."
          (progn
            (srecode-dictionary-show-section new "FIRST")
            (srecode-dictionary-show-section new "LAST"))
-       ;; Not the very first one.  Lets clean up CAR.
+       ;; Not the very first one.  Let's clean up CAR.
        (let ((tail (car (last ov))))
          (srecode-dictionary-hide-section tail "LAST")
          (srecode-dictionary-show-section tail "NOTLAST")
@@ -436,8 +436,8 @@ The root dictionary is usually for a current or active insertion."
 
 ;;; COMPOUND VALUE METHODS
 ;;
-;; Compound values must provide at least the toStriong method
-;; for use in converting the compound value into sometehing insertable.
+;; Compound values must provide at least the toString method
+;; for use in converting the compound value into something insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
                                      function
@@ -708,5 +708,4 @@ STATE is the current compiler state."
 
 (provide 'srecode/dictionary)
 
-;; arch-tag: c664179c-171c-4709-9b56-d5a2fd30e457
 ;;; srecode/dictionary.el ends here