[Emacs-diffs] /srv/bzr/emacs/trunk r111235: Spelling fixes.

[Paul Eggert]

------------------------------------------------------------
revno: 111235
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-14 12:05:03 -0800
message:
  Spelling fixes.
  
  My favorite was that the word "dictionary" was misspelled.
  Also, correct the title in the DeRemer & Pennello 1982 citation,
  and add a URL.
modified:
  doc/misc/org.texi
  doc/misc/srecode.texi
  doc/misc/wisent.texi
  lisp/json.el
  lisp/progmodes/ruby-mode.el
  src/ChangeLog
  src/dispnew.c

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-12-12 16:47:07 +0000
+++ b/doc/misc/org.texi 2012-12-14 20:05:03 +0000
@@ -946,7 +946,7 @@
 Installing Info files is system dependent, because of differences in the
 @file{install-info} program.  The Info documentation is installed together
 with the rest of Org mode.  If you don't install Org mode, it is possible to
-install the Info documentation seperately (you need to have
+install the Info documentation separately (you need to have
 address@hidden output from install-info (if any) is system
 dependent.  In particular Debian and its derivatives use two different
 versions of install-info and you may see the message:
@@ -16698,7 +16698,7 @@
 opened the doors for many new ideas and features.
 
 @item Jambunathan K
-Jambunathan contributed the ODT exporter, definitly a killer feature of
+Jambunathan contributed the ODT exporter, definitely a killer feature of
 Org mode.  He also contributed the new HTML exporter, which is another core
 feature of Org.  Here too, I knew I could rely on him to fix bugs in these
 areas and to patiently explain the users what was the problems and solutions.
@@ -16706,7 +16706,7 @@
 @item Achim Gratz
 Achim rewrote the building process of Org, turning some @emph{ad hoc} tools
 into a flexible and conceptually clean process.  He patiently coped with the
-many hicups that such a change can create for users.
+many hiccups that such a change can create for users.
 
 @item Nick Dokos
 The Org mode mailing list would not be such a nice place without Nick, who

=== modified file 'doc/misc/srecode.texi'
--- a/doc/misc/srecode.texi     2012-12-12 17:19:20 +0000
+++ b/doc/misc/srecode.texi     2012-12-14 20:05:03 +0000
@@ -226,7 +226,7 @@
 current buffer.  Template files are sorted by priority, with user
 templates being found first, and system level default templates last.
 Templates are also sorted by application.  Each application has its
-own templates, and are kept seperate from the generic templates.
+own templates, and are kept separate from the generic templates.
 
 @section Dictionary
 Dictionaries contain values associated with variable.  Variables are
@@ -312,7 +312,7 @@
 
 By default, when inserting a template, if the user needs to enter text
 to fill in a part of the template, then the minibuffer is used to
-query for that information.  SRecode also supports a field-edting mode
+query for that information.  SRecode also supports a field-editing mode
 that can be used instead.  To enable it set:
 
 @defun srecode-insert-ask-variable-method
@@ -344,7 +344,7 @@
 fields are cancelled.
 
 @b{NOTE}: Some conveniences in templates, such as completion, or
-character restrictins are lost when using field editing mode.
+character restrictions are lost when using field editing mode.
 
 @node Template Writing
 @chapter Template Writing
@@ -401,7 +401,7 @@
 @end example
 
 Note that a VARIABLE is a name in a dictionary that can be used in a
-MACRO in a template.  The macro referernces some variable by name.
+MACRO in a template.  The macro references some variable by name.
 
 @menu
 * String Values::       Basic Variable values
@@ -420,7 +420,7 @@
 @code{\n}, @code{\t}, and @code{\"} work.
 
 When a string is inserted as part of a template, nothing within the
-string is interperted, such as template escape characters.
+string is interpreted, such as template escape characters.
 
 @node Multi-string Values
 @subsection Multi-string Values
@@ -545,7 +545,7 @@
 priority that is set between SRecode base templates, and user defined
 templates.
 
-Templates can be compiled via a project system, such as EDE.  EDE
+Templates can be compiled via a project system, such as address@hidden  EDE
 loaded templates will get a @var{project} set automatically.
 
 Example:
@@ -599,7 +599,7 @@
 A template represents a text pattern that can be inserted into
 a buffer.
 
-A basic template is declaired like this:
+A basic template is declared like this:
 
 @example
 template TEMPLATENAME :arg1 :arg2
@@ -621,7 +621,7 @@
 
 @menu
 * Template Section Dictionaries::  Template Scoped Macro values
-* Template Macros::     Macros occuring in template patterns
+* Template Macros::     Macros occurring in template patterns
 @end menu
 
 @node Template Section Dictionaries
@@ -644,7 +644,7 @@
 @end example
 
 In this example, the @var{NAME} variable gets the value ``foo'', but
-only while it is inside section macro A.  The outer scoped NAME will
+only while it is inside section macro address@hidden  The outer scoped NAME 
will
 be empty.
 
 This is particularly useful while using an include macro to pull in a
@@ -847,7 +847,7 @@
 
 context C2
 
-temlate foo
+template foo
 "Foo template in C2"
 ----
 ----
@@ -858,13 +858,13 @@
 
 This is useful if there are multiple ways to declare something like a
 function or variable that differ only by where it is in the syntax of
-the lanugage.  The name @code{foo} is not ambiguous because each is in
+the language.  The name @code{foo} is not ambiguous because each is in
 a different context.
 
 @node Prompts
 @section Prompt
 
-Some templates use promtping macro insertion.  A macro that needs a
+Some templates use prompting macro insertion.  A macro that needs a
 prompt looks like this:
 
 @example
@@ -881,7 +881,7 @@
 
 For such macros, you can pre-define prompts for any dictionary entry.
 When that dictionary entry is first encountered, the user is prompted,
-and subsequent occurances of that dictionary entry use the same value.
+and subsequent occurrences of that dictionary entry use the same value.
 
 To get a different prompt, use a prompt command like this:
 
@@ -926,7 +926,7 @@
 prompt VARNAME "Varname: " defaultmacro "PREFIX"
 @end example
 
-now, when it attempts to read in VARNAME, it will pre-populte the text
+now, when it attempts to read in VARNAME, it will pre-populate the text
 editing section with whatever the value of PREFIX is.
 
 Some language arguments may supply possible prefixes for prompts.
@@ -972,7 +972,7 @@
 your dictionary values yourself.  There are several utility functions
 for this.
 
-In the simplest form, you can assocate a string with a variable.
+In the simplest form, you can associate a string with a variable.
 
 @defun srecode-dictionary-set-value dict name value
 @anchor{srecode-dictionary-set-value}
@@ -997,8 +997,9 @@
 For each dictionary added to a variable, the block of codes in
 the template will be repeated.
 
-If optional argument @var{SHOW-ONLY} is address@hidden, then don't add a new 
dictionarly
-if there is already one in place.  Also, don't add @var{FIRST}/@var{LAST} 
entries.
+If optional argument @var{SHOW-ONLY} is address@hidden, then don't add
+a new dictionary if there is already one in place.  Also, don't add
address@hidden/@var{LAST} entries.
 These entries are not needed when we are just showing a section.
 
 Each dictionary added will automatically get values for positional macros
@@ -1126,7 +1127,7 @@
 @node Querying a Dictionary
 @section Querying a Dictionary
 
-When creating a new argument, it may be useful to ask the dicitonary
+When creating a new argument, it may be useful to ask the dictionary
 what entries are already set there, and conditionally create new
 entries based on those.
 
@@ -1234,7 +1235,7 @@
 @item HOUR12
 The current hour in 12 hour format.
 @item AMPM
-Locale equivalent of AM or PM.  Usefule with HOUR12.
+Locale equivalent of AM or address@hidden  Useful with HOUR12.
 @item MINUTE
 The current minute.
 @item SECOND
@@ -1331,7 +1332,7 @@
 
 @table @code
 @item ARGS
-A Loop macro value.  Each argument is inserted in ARGS.  To create a
+A Loop macro value.  Each argument is inserted in address@hidden  To create a
 comma separated list of arguments, you might do this:
 
 @example
@@ -1412,7 +1413,7 @@
 Converts the filename into text that would be suitable as a class-name
 for the main class in the file.
 @item CURRENT_PACKAGE
-Finds the occurance of ``package'' and gets its value.
+Finds the occurrence of ``package'' and gets its value.
 @end table
 
 @subsubsection Argument :el
@@ -1430,7 +1431,7 @@
 The name of the Emacs Custom group that instances of @code{defcustom}
 ought to use.
 @item FACEGROUP
-The name of the Emacs Custom group that faces delcared with
+The name of the Emacs Custom group that faces declared with
 @code{defface} ought to use.
 @end table
 
@@ -1551,7 +1552,7 @@
 @end defun
 
 For purposes of an @srecode{} application, it is important to decide
-what to call yoru application, and use that with this method call.
+what to call your application, and use that with this method call.
 
 @section Creating dictionaries
 
@@ -1582,7 +1583,7 @@
 @node Template Naming Conventions
 @chapter Template Naming Conventions
 
-For @srecode{} to work across langauges reliably, templates need to
+For @srecode{} to work across languages reliably, templates need to
 follow a predictable pattern.  For every language of similar nature
 (OO, functional, doc based) if they all provide the same base
 templates, then an application can be written against the base
@@ -1613,7 +1614,7 @@
 @item function
 A standalone function.  Not a method, external method, or other.
 @item method
-A method belonging to some class declaired outside the textual bounds
+A method belonging to some class declared outside the textual bounds
 of that class' declaration.
 @item variable
 A global variable.
@@ -1685,7 +1686,7 @@
 
 @table @var
 @item TAG
-A special insertion value TAG.  You can use semantic functions to turn
+A special insertion value address@hidden  You can use semantic functions to 
turn
 the tag into a string.
 @item HAVEDEFAULT
 @itemx DEFAULT

=== modified file 'doc/misc/wisent.texi'
--- a/doc/misc/wisent.texi      2012-12-13 04:47:14 +0000
+++ b/doc/misc/wisent.texi      2012-12-14 20:05:03 +0000
@@ -134,10 +134,11 @@
 
 @item
 For generating the lookahead sets, Wisent uses the well-known
-technique of F. DeRemer and A. Pennello they described in:
+technique of F. DeRemer and A. Pennello described in:
 @quotation
address@hidden Construction of LALR(1) Lookahead address@hidden
-October 1982, ACM TOPLS Vol 4 No 4.
address@hidden Computation of LALR(1) Look-Ahead address@hidden
+October 1982, ACM TOPLAS Vol 4 No 4, 615--49,
address@hidden://dx.doi.org/10.1145/69622.357187}.
 @end quotation
 
 @item
@@ -284,7 +285,7 @@
 
 Says that two groupings of type @samp{exp}, with a @samp{+} token in
 between, can be combined into a larger grouping of type @samp{exp}.
- 
+
 @cindex grammar coding conventions
 By convention, a nonterminal symbol should be in lower case, such as
 @samp{exp}, @samp{stmt} or @samp{declaration}.  Terminal symbols
@@ -1217,7 +1218,7 @@
 
 @item start
 @itemx end
-Are the optionals beginning and end positions of @var{value} in the
+Are the optional beginning and ending positions of @var{value} in the
 input stream.
 @end table
 
@@ -1340,8 +1341,8 @@
 
 @example
 @group
-(stmnt (( error ?; )) ;; on error, skip until ';' is read
-       )
+(statement (( error ?; )) ;; on error, skip until ';' is read
+           )
 @end group
 @end example
 

=== modified file 'lisp/json.el'
--- a/lisp/json.el      2012-12-14 14:57:37 +0000
+++ b/lisp/json.el      2012-12-14 20:05:03 +0000
@@ -100,7 +100,7 @@
 this around your call to `json-read' instead of `setq'ing it.")
 
 (defvar json-encoding-separator ","
-  "Value to use as an element seperator when encoding.")
+  "Value to use as an element separator when encoding.")
 
 (defvar json-encoding-default-indentation "  "
   "The default indentation level for encoding.

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2012-12-14 06:58:15 +0000
+++ b/lisp/progmodes/ruby-mode.el       2012-12-14 20:05:03 +0000
@@ -1340,7 +1340,7 @@
         (goto-char start)
         ;; Find all expression expansions and
         ;; - save the match data to a text property, for font-locking later,
-        ;; - set the syntax of all double quotes and backticks to puctuation.
+        ;; - set the syntax of all double quotes and backticks to punctuation.
         (while (re-search-forward ruby-expression-expansion-re end 'move)
           (let ((beg (match-beginning 2))
                 (end (match-end 2)))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-14 19:43:12 +0000
+++ b/src/ChangeLog     2012-12-14 20:05:03 +0000
@@ -10687,7 +10687,7 @@
 2012-05-09  Michael Albinus  <address@hidden>
 
        * dbusbind.c (xd_registered_buses): New internal Lisp object.
-       Rename all occurences of Vdbus_registered_buses to xd_registered_buses.
+       Rename all occurrences of Vdbus_registered_buses to xd_registered_buses.
        (syms_of_dbusbind): Remove declaration of Vdbus_registered_buses.
        Initialize xd_registered_buses.
 

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2012-12-12 15:33:30 +0000
+++ b/src/dispnew.c     2012-12-14 20:05:03 +0000
@@ -4017,7 +4017,7 @@
     }
 
   /* Window cursor can be out of sync for horizontally split windows.
-     Horisontal position is -1 when cursor is on the left fringe.   */
+     Horizontal position is -1 when cursor is on the left fringe.   */
   hpos = clip_to_bounds (-1, hpos, w->current_matrix->matrix_w - 1);
   vpos = clip_to_bounds (0, vpos, w->current_matrix->nrows - 1);
   rif->cursor_to (vpos, hpos, cy, cx);