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

[Paul Eggert]

------------------------------------------------------------
revno: 106830
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-01-09 22:20:22 -0800
message:
  Spelling fixes.
modified:
  doc/emacs/custom.texi
  doc/emacs/display.texi
  doc/misc/org.texi
  lisp/erc/ChangeLog.03
  lisp/org/ChangeLog
  lisp/org/ob-fortran.el
  lisp/org/ob-latex.el
  lisp/org/ob-ledger.el
  lisp/org/org-agenda.el
  lisp/org/org-beamer.el
  lisp/org/org-capture.el
  lisp/org/org-clock.el
  lisp/org/org-compat.el
  lisp/org/org-ctags.el
  lisp/org/org-exp.el
  lisp/org/org-list.el
  lisp/org/org-lparse.el
  lisp/org/org-odt.el
  lisp/org/org-protocol.el
  lisp/org/org-publish.el
  lisp/org/org-table.el
  lisp/org/org-taskjuggler.el
  lisp/org/org.el
  lisp/progmodes/ada-xref.el
  lisp/progmodes/cc-fonts.el

=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi     2012-01-09 07:48:51 +0000
+++ b/doc/emacs/custom.texi     2012-01-10 06:20:22 +0000
@@ -141,7 +141,7 @@
   From the top-level customization buffer created by @kbd{M-x
 customize}, you can follow the links to the subgroups of the
 @samp{Emacs} customization group.  These subgroups may contain
-settings for you to customize; they may also contain futher subgroups,
+settings for you to customize; they may also contain further subgroups,
 dealing with yet more specialized subsystems of Emacs.  As you
 navigate the hierarchy of customization groups, you should find some
 settings that you want to customize.

=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi    2012-01-07 08:55:43 +0000
+++ b/doc/emacs/display.texi    2012-01-10 06:20:22 +0000
@@ -1078,7 +1078,7 @@
 @table @code
 @item face
 Enable all visualizations which use special faces.  This element has a
-special meaing: if it is absent from the list, none of the other
+special meaning: if it is absent from the list, none of the other
 visualizations take effect except @code{space-mark}, @code{tab-mark},
 and @code{newline-mark}.
 

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-01-05 09:46:05 +0000
+++ b/doc/misc/org.texi 2012-01-10 06:20:22 +0000
@@ -36,7 +36,7 @@
 
 @c orgkey{key}                        A key item
 @c orgcmd{key,cmd}                    Key with command name
address@hidden xorgcmd{key,cmmand}                Key with command name as 
@itemx
address@hidden xorgcmd{key,cmd}                   Key with command name as 
@itemx
 @c orgcmdnki{key,cmd}                 Like orgcmd, but do not index the key
 @c orgcmdtkc{text,key,cmd}            Like orgcmd,special text instead of key
 @c orgcmdkkc{key1,key2,cmd}           Two keys with one command name, use "or"
@@ -1004,8 +1004,8 @@
 
 Sometimes you might face a problem due to an error in your Emacs or Org mode
 setup.  Before reporting a bug, it is very helpful to start Emacs with minimal
-customisations and reproduce the problem.  Doing so often helps you determine
-if the problem is with your customisation or with Org mode itself.  You can
+customizations and reproduce the problem.  Doing so often helps you determine
+if the problem is with your customization or with Org mode itself.  You can
 start a typical minimal session with a command like the example below.
 
 @example
@@ -1241,7 +1241,7 @@
 and the hierarchy above.  Useful for working near a location that has been
 exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
 (@pxref{Agenda commands}).  With a prefix argument show, on each
-level, all sibling headings.  With a double prefix argument, also show the 
+level, all sibling headings.  With a double prefix argument, also show the
 entire subtree of the parent.
 @orgcmd{C-c C-k,show-branches}
 Expose all the headings of the subtree, CONTENT view for just one subtree.
@@ -3943,7 +3943,7 @@
 @end lisp
 
 While using a list with face properties as shown for CANCELED @emph{should}
-work, this does not aways seem to be the case.  If necessary, define a
+work, this does not always seem to be the case.  If necessary, define a
 special face and use that.  A string is interpreted as a color.  The variable
 @code{org-faces-easy-properties} determines if that color is interpreted as a
 foreground or a background color.
@@ -4427,7 +4427,7 @@
 
 @table @kbd
 @orgcmd{C-c C-c,org-toggle-checkbox}
-Toggle checkbox status or (with prefix arg) checkbox presence at point.  
+Toggle checkbox status or (with prefix arg) checkbox presence at point.
 With a single prefix argument, add an empty checkbox or remove the current
 address@hidden C-c C-c' on the @emph{first} item of a list with no checkbox
 will add checkboxes to the rest of the list.}.  With a double prefix argument, 
set it to @samp{[-]}, which is
@@ -6326,7 +6326,7 @@
 @kindex ;
 
 Calling @code{org-timer-set-timer} from an Org mode buffer runs a countdown
-timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else.
+timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else.
 
 @code{org-timer-set-timer} prompts the user for a duration and displays a
 countdown timer in the modeline.  @code{org-timer-default-timer} sets the
@@ -9549,7 +9549,7 @@
 its structured editing functions to easily create @LaTeX{} files.  DocBook
 export makes it possible to convert Org files to many other formats using
 DocBook tools.  OpenDocument Text(@acronym{ODT}) export allows seamless
-colloboration across organizational boundaries.  For project management you
+collaboration across organizational boundaries.  For project management you
 can create gantt and resource charts by using TaskJuggler export.  To
 incorporate entries with associated times like deadlines or appointments into
 a desktop calendar program like iCal, Org mode can also produce extracts in
@@ -10998,9 +10998,9 @@
 
 @vindex org-export-odt-pixels-per-inch
 Note that the exporter specifies the desired size of the image in the final
-document in units of centimetres.  In order to scale the embedded images, the
+document in units of centimeters.  In order to scale the embedded images, the
 exporter needs to compute the size of the image.  This is done by retrieving
-the image size in pixels and converting the pixel units to centimetres using
+the image size in pixels and converting the pixel units to centimeters using
 @code{org-export-odt-pixels-per-inch}.  The default value of this variable is
 set to @code{display-pixels-per-inch}.  You can tweak this variable to
 achieve the best results.
@@ -12629,7 +12629,7 @@
 information on these safeguards (and on how to disable them) see @ref{Code
 evaluation security}.} and the results of evaluation optionally placed in the
 Org mode buffer.  By default, the evaluation facility is only enabled for
-Lisp code blocks specified as @code{emacs-lisp}. However, souce code blocks
+Lisp code blocks specified as @code{emacs-lisp}. However, source code blocks
 in many languages can be evaluated within Org mode (see @ref{Languages} for a
 list of supported languages and @ref{Structure of code blocks} for
 information on the syntax used to define a code block).
@@ -16434,7 +16434,7 @@
 @i{Jambunathan K} contributed the @acronym{ODT} exporter.
 @item
 @i{Sebastien Vauban} reported many issues with @LaTeX{} and BEAMER export and
-enabled source code highlighling in Gnus.
+enabled source code highlighting in Gnus.
 @item
 @i{Stefan Vollmar} organized a video-recorded talk at the
 Max-Planck-Institute for Neurology.  He also inspired the creation of a

=== modified file 'lisp/erc/ChangeLog.03'
--- a/lisp/erc/ChangeLog.03     2012-01-05 09:46:05 +0000
+++ b/lisp/erc/ChangeLog.03     2012-01-10 06:20:22 +0000
@@ -200,7 +200,7 @@
 
        * erc-autoaway.el 1.12 (erc-mode):
        Reset idletime on connect. Fixes an annoying bug which
-       flooded the server with aways on reconnect.
+       flooded the server with always on reconnect.
        (erc-autoway-reset-idletime): Accept optional args so we can hook it
        onto erc-server-001-hook.
 

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-01-05 18:18:05 +0000
+++ b/lisp/org/ChangeLog        2012-01-10 06:20:22 +0000
@@ -1749,7 +1749,7 @@
 
 2012-01-03  Suvayu Ali  <address@hidden>  (tiny change)
 
-       * org-inlinetask.el (org-inlinetask): New customisable face
+       * org-inlinetask.el (org-inlinetask): New customizable face
        for inlinetasks
 
 2012-01-03  Bastien Guerry  <address@hidden>

=== modified file 'lisp/org/ob-fortran.el'
--- a/lisp/org/ob-fortran.el    2012-01-05 08:00:08 +0000
+++ b/lisp/org/ob-fortran.el    2012-01-10 06:20:22 +0000
@@ -110,7 +110,7 @@
   "Wrap body in a \"program ... end program\" block if none exists."
   (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body))
        (let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
-        (if vars (error "cannot use :vars if 'program' statment is present"))
+        (if vars (error "cannot use :vars if 'program' statement is present"))
         body)
     (format "program main\n%s\nend program main\n" body)))
 
@@ -127,7 +127,7 @@
 ;; helper functions
 
 (defun org-babel-fortran-var-to-fortran (pair)
-  "fortranonvert an elisp val into a string of fortran code specifying a var
+  "Convert an elisp val into a string of fortran code specifying a var
 of the same value."
   ;; TODO list support
   (let ((var (car pair))

=== modified file 'lisp/org/ob-latex.el'
--- a/lisp/org/ob-latex.el      2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-latex.el      2012-01-10 06:20:22 +0000
@@ -132,7 +132,7 @@
              (when (file-exists-p transient-pdf-file)
                (delete-file transient-pdf-file))))))
          ((string-match "\\.\\([^\\.]+\\)$" out-file)
-          (error "can not create %s files, please specify a .png or .pdf file 
or try the :imagemagick header arguement"
+          (error "can not create %s files, please specify a .png or .pdf file 
or try the :imagemagick header argument"
                 (match-string 1 out-file))))
         nil) ;; signal that output has already been written to file
     body))

=== modified file 'lisp/org/ob-ledger.el'
--- a/lisp/org/ob-ledger.el     2012-01-04 14:49:41 +0000
+++ b/lisp/org/ob-ledger.el     2012-01-10 06:20:22 +0000
@@ -29,7 +29,7 @@
 ;;
 ;; 1) there is no such thing as a "session" in ledger
 ;;
-;; 2) we are generally only going to return output from the leger program
+;; 2) we are generally only going to return output from the ledger program
 ;;
 ;; 3) we are adding the "cmdline" header argument
 ;;

=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el    2012-01-05 17:02:29 +0000
+++ b/lisp/org/org-agenda.el    2012-01-10 06:20:22 +0000
@@ -28,7 +28,7 @@
 ;;
 ;; The functions `org-batch-agenda', `org-batch-agenda-csv', and
 ;; `org-batch-store-agenda-views' are implemented as macros to provide
-;; a conveniant way for extracting agenda information from the command
+;; a convenient way for extracting agenda information from the command
 ;; line. The Lisp does not evaluate parameters of a macro call; thus
 ;; it is not necessary to quote the parameters passed to one of those
 ;; functions. E.g. you can write:
@@ -1088,7 +1088,7 @@
              (const :tag "Sunday" 0)))
 
 (defcustom org-agenda-move-date-from-past-immediately-to-today t
-  "Non-nil means jumpt to today when moving a past date forward in time.
+  "Non-nil means jump to today when moving a past date forward in time.
 When using S-right in the agenda to move a a date forward, and the date
 stamp currently points to the past, the first key press will move it
 to today.  WHen nil, just move one day forward even if the date stays
@@ -1660,7 +1660,7 @@
 the icon should be displayed.
 FILE-OR-DATA either a file path or a string containing image data.
 
-The other fields can be omited safely if not needed:
+The other fields can be omitted safely if not needed:
 TYPE indicates the image type.
 DATA-P is a boolean indicating whether the FILE-OR-DATA string is
 image data.
@@ -3064,7 +3064,7 @@
 the global options and expect it to be applied to the entire view.")
 
 (defvar org-agenda-category-filter-preset nil
-  "A preset of the categeory filter used for secondary agenda filtering.
+  "A preset of the category filter used for secondary agenda filtering.
 This must be a list of strings, each string must be a single category
 preceded by \"+\" or \"-\".
 This variable should not be set directly, but agenda custom commands can
@@ -4922,7 +4922,7 @@
 SKIP-WEEKS is any number of ISO weeks in the block period for which the
 item should be skipped.  If any of the SKIP-WEEKS arguments is the symbol
 `holidays', then any date that is known by the Emacs calendar to be a
-holidy will also be skipped."
+holiday will also be skipped."
   (let* ((date1 (calendar-absolute-from-gregorian (list m1 d1 y1)))
         (date2 (calendar-absolute-from-gregorian (list m2 d2 y2)))
         (d (calendar-absolute-from-gregorian date)))
@@ -8507,7 +8507,7 @@
          (org-agenda-remove-flag hdmarker)
          (let ((win (get-buffer-window "*Flagging Note*")))
            (and win (delete-window win)))
-         (message "Entry unflaged"))
+         (message "Entry unflagged"))
       (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
       (unless note
        (error "No flagging note"))
@@ -8530,7 +8530,7 @@
       (org-entry-delete nil "THEFLAGGINGNOTE")
       (setq newhead (org-get-heading)))
     (org-agenda-change-all-lines newhead marker)
-    (message "Entry unflaged")))
+    (message "Entry unflagged")))
 
 (defun org-agenda-get-any-marker (&optional pos)
   (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker)

=== modified file 'lisp/org/org-beamer.el'
--- a/lisp/org/org-beamer.el    2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-beamer.el    2012-01-10 06:20:22 +0000
@@ -410,7 +410,7 @@
 
 
 ;; Functions to initialize and post-process
-;; These fuctions will be hooked into various places in the export process
+;; These functions will be hooked into various places in the export process
 
 (defun org-beamer-initialize-open-trackers ()
   "Reset variables that track if certain environments are open during export."
@@ -450,7 +450,7 @@
      ((stringp org-beamer-frame-level-now)
       (setq org-beamer-frame-level-now
            (string-to-number org-beamer-frame-level-now))))
-    ;; Find the header additons, most likely theme commands
+    ;; Find the header additions, most likely theme commands
     (setq org-beamer-header-extra
          (or (and (org-region-active-p)
                   (save-excursion

=== modified file 'lisp/org/org-capture.el'
--- a/lisp/org/org-capture.el   2012-01-04 15:20:49 +0000
+++ b/lisp/org/org-capture.el   2012-01-10 06:20:22 +0000
@@ -374,7 +374,7 @@
   (plist-get (if local org-capture-current-plist org-capture-plist) prop))
 
 (defun org-capture-member (prop &optional local)
-  "Is PROP a preperty in `org-capture-plist'.
+  "Is PROP a property in `org-capture-plist'.
 When LOCAL is set, use the local variable `org-capture-current-plist',
 this is necessary after initialization of the capture process,
 to avoid conflicts with other active capture processes."
@@ -1455,7 +1455,7 @@
       (goto-char (point-min))
       (while (looking-at "[ \t]*\n") (replace-match ""))
       (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n"))
-      ;; Return the expanded tempate and kill the temporary buffer
+      ;; Return the expanded template and kill the temporary buffer
       (untabify (point-min) (point-max))
       (set-buffer-modified-p nil)
       (prog1 (buffer-string) (kill-buffer (current-buffer))))))

=== modified file 'lisp/org/org-clock.el'
--- a/lisp/org/org-clock.el     2012-01-04 15:20:49 +0000
+++ b/lisp/org/org-clock.el     2012-01-10 06:20:22 +0000
@@ -2128,7 +2128,7 @@
   "Write out a clock table at position IPOS in the current buffer.
 TABLES is a list of tables with clocking data as produced by
 `org-clock-get-table-data'.  PARAMS is the parameter property list obtained
-from the dynamic block defintion."
+from the dynamic block definition."
   ;; This function looks quite complicated, mainly because there are a
   ;; lot of options which can add or remove columns.  I have massively
   ;; commented this function, the I hope it is understandable.  If

=== modified file 'lisp/org/org-compat.el'
--- a/lisp/org/org-compat.el    2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-compat.el    2012-01-10 06:20:22 +0000
@@ -275,7 +275,7 @@
     nil))
 
 (defmacro org-xemacs-without-invisibility (&rest body)
-  "Turn off exents with invisibility while executing BODY."
+  "Turn off extents with invisibility while executing BODY."
   `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol)
                               'all-extents-closed-open 'invisible))
         ext-inv-specs)

=== modified file 'lisp/org/org-ctags.el'
--- a/lisp/org/org-ctags.el     2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-ctags.el     2012-01-10 06:20:22 +0000
@@ -35,7 +35,7 @@
 ;; links to these 'tagged' destinations, allowing seamless navigation between
 ;; multiple org-mode files. Topics can be created in any org mode file and
 ;; will always be found by plain links from other files. Other file types
-;; recognised by ctags (source code files, latex files, etc) will also be
+;; recognized by ctags (source code files, latex files, etc) will also be
 ;; available as destinations for plain links, and similarly, org-mode links
 ;; will be available as tags from source files. Finally, the function
 ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using

=== modified file 'lisp/org/org-exp.el'
--- a/lisp/org/org-exp.el       2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-exp.el       2012-01-10 06:20:22 +0000
@@ -2800,7 +2800,7 @@
 REPLACE-LABELS is dual-purpose.
 1. It controls the retention of labels in the exported block.
 2. It specifies in what manner the links (or references) to a
-   labelled line be formatted.
+   labeled line be formatted.
 
 REPLACE-LABELS is the symbol `keep' if the literal example
 specifies \"-k\" option, is numeric if the literal example
@@ -2808,12 +2808,12 @@
 
 Handle REPLACE-LABELS as below:
 - If nil, retain labels in the exported block and use
-  user-provided labels for referencing the labelled lines.
+  user-provided labels for referencing the labeled lines.
 - If it is a number, remove labels in the exported block and use
-  one of line numbers or labels for referencing labelled lines based
+  one of line numbers or labels for referencing labeled lines based
   on NUMBER option.
 - If it is a keep, retain labels in the exported block and use
-  one of line numbers or labels for referencing labelled lines
+  one of line numbers or labels for referencing labeled lines
   based on NUMBER option.
 
 LABEL-FORMAT is the value of \"-l\" switch associated with
@@ -2823,8 +2823,8 @@
 block numbering.  When non-nil do the following:
 - do not number the lines
 - always strip the labels from exported block
-- do not make the labelled line a target of an incoming link.
-  Instead mark the labelled line with `org-coderef' property and
+- do not make the labeled line a target of an incoming link.
+  Instead mark the labeled line with `org-coderef' property and
   store the label in it."
   (setq skip1 (or skip1 0) skip2 (or skip2 0))
   (if (and number (not cont)) (setq org-export-last-code-line-counter-value 0))
@@ -3021,7 +3021,7 @@
          (org-load-modules-maybe)
          (unless org-local-vars
            (setq org-local-vars (org-get-local-variables)))
-         (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode'
+         (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
           (list 'let org-local-vars
                 (list (intern (format "org-export-as-%s" fmt))
                       nil nil nil ''string t))))

=== modified file 'lisp/org/org-list.el'
--- a/lisp/org/org-list.el      2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-list.el      2012-01-10 06:20:22 +0000
@@ -71,7 +71,7 @@
 ;; few thousand lines long).  Thus, code should follow the rule:
 ;; "collect once, use many".  As a corollary, it is usually a bad idea
 ;; to use directly an interactive function inside the code, as those,
-;; being independant entities, read the whole list structure another
+;; being independent entities, read the whole list structure another
 ;; time.
 
 ;;; Code:
@@ -685,7 +685,7 @@
              (cond
               ((<= (point) lim-up)
                ;; At upward limit: if we ended at an item, store it,
-               ;; else dimiss useless data recorded above BEG-CELL.
+               ;; else dismiss useless data recorded above BEG-CELL.
                ;; Jump to part 2.
                (throw 'exit
                       (setq itm-lst
@@ -2674,7 +2674,7 @@
 (defvar org-tab-ind-state)
 (defun org-cycle-item-indentation ()
   "Cycle levels of indentation of an empty item.
-The first run indents the item, if applicable.  Subsequents runs
+The first run indents the item, if applicable.  Subsequent runs
 outdent it at meaningful levels in the list.  When done, item is
 put back at its original position with its original bullet.
 
@@ -3047,7 +3047,7 @@
 
 Alternatively, each parameter can also be a form returning
 a string.  These sexp can use keywords `counter' and `depth',
-reprensenting respectively counter associated to the current
+representing respectively counter associated to the current
 item, and depth of the current sub-list, starting at 0.
 Obviously, `counter' is only available for parameters applying to
 items."

=== modified file 'lisp/org/org-lparse.el'
--- a/lisp/org/org-lparse.el    2012-01-05 08:00:08 +0000
+++ b/lisp/org/org-lparse.el    2012-01-10 06:20:22 +0000
@@ -854,7 +854,7 @@
            (throw 'nextline nil))
 
          ;; Notes: The baseline version of org-html.el (git commit
-         ;; 3d802e), while encoutering a *line-long* protected text,
+         ;; 3d802e), while encountering a *line-long* protected text,
          ;; does one of the following two things based on the state
          ;; of the export buffer.
 
@@ -869,10 +869,10 @@
          ;; I think --->
 
          ;; Scenario 1 mentioned above kicks in when a block of
-         ;; protected text has to be inserted enbloc. For example,
+         ;; protected text has to be inserted en bloc. For example,
          ;; this happens, when inserting an source or example block
          ;; or preformatted content enclosed in #+backend,
-         ;; #+begin_bakend ... #+end_backend)
+         ;; #+begin_backend ... #+end_backend)
 
          ;; Scenario 2 mentioned above kicks in when the protected
          ;; text is part of a running sentence. For example this
@@ -1189,7 +1189,7 @@
        (t (current-buffer))))))
 
 (defun org-lparse-format-table (lines olines)
-  "Retuns backend-specific code for org-type and table-type tables."
+  "Returns backend-specific code for org-type and table-type tables."
   (if (stringp lines)
       (setq lines (org-split-string lines "\n")))
   (if (string-match "^[ \t]*|" (car lines))

=== modified file 'lisp/org/org-odt.el'
--- a/lisp/org/org-odt.el       2012-01-05 08:00:08 +0000
+++ b/lisp/org/org-odt.el       2012-01-10 06:20:22 +0000
@@ -284,7 +284,7 @@
 Use options 1, 2 or 3 only if styles.xml alone suffices for
 achieving the desired formatting.  Use option 4, if the styles.xml
 references additional files like header and footer images for
-achieving the desired formattting.
+achieving the desired formatting.
 
 Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on
 a per-file basis.  For example,
@@ -1878,7 +1878,7 @@
     (cons width height)))
 
 (defvar org-odt-entity-labels-alist nil
-  "Associate Labels with the Labelled entities.
+  "Associate Labels with the Labeled entities.
 Each element of the alist is of the form (LABEL-NAME
 CATEGORY-NAME SEQNO LABEL-STYLE-NAME).  LABEL-NAME is same as
 that specified by \"#+LABEL: ...\" line.  CATEGORY-NAME is the
@@ -2213,7 +2213,7 @@
   (with-current-buffer
       (find-file-noselect (expand-file-name "styles.xml") t)
     ;; Don't make automatic backup of styles.xml file. This setting
-    ;; prevents the backedup styles.xml file from being zipped in to
+    ;; prevents the backed-up styles.xml file from being zipped in to
     ;; odt file. This is more of a hackish fix. Better alternative
     ;; would be to fix the zip command so that the output odt file
     ;; includes only the needed files and excludes any auto-generated
@@ -2228,7 +2228,7 @@
     (org-odt-configure-outline-numbering
      (if org-export-with-section-numbers org-export-headline-levels 0)))
 
-  ;; Write custom stlyes for source blocks
+  ;; Write custom styles for source blocks
   (org-odt-insert-custom-styles-for-srcblocks
    (mapconcat
     (lambda (style)
@@ -2479,7 +2479,7 @@
 ;; `org-export-preprocess-after-blockquote-hook'. Note that this hook
 ;; is the one that is closest and well before the call to
 ;; `org-export-attach-captions-and-attributes' in
-;; `org-export-preprocess-stirng'.  The above arrangement permits
+;; `org-export-preprocess-string'.  The above arrangement permits
 ;; captions, labels and attributes to be attached to png images
 ;; generated out of latex equations.
 (add-hook 'org-export-preprocess-after-blockquote-hook

=== modified file 'lisp/org/org-protocol.el'
--- a/lisp/org/org-protocol.el  2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-protocol.el  2012-01-10 06:20:22 +0000
@@ -145,8 +145,8 @@
 (defgroup org-protocol nil
   "Intercept calls from emacsclient to trigger custom actions.
 
-This is done by advising `server-visit-files' to scann the list of filenames
-for `org-protocol-the-protocol' and sub-procols defined in
+This is done by advising `server-visit-files' to scan the list of filenames
+for `org-protocol-the-protocol' and sub-protocols defined in
 `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
   :version "22.1"
   :group 'convenience

=== modified file 'lisp/org/org-publish.el'
--- a/lisp/org/org-publish.el   2012-01-04 15:20:49 +0000
+++ b/lisp/org/org-publish.el   2012-01-10 06:20:22 +0000
@@ -277,12 +277,12 @@
   :type 'string)
 
 (defcustom org-publish-sitemap-file-entry-format "%t"
-  "How a sitemap file entry is formated.
+  "How a sitemap file entry is formatted.
 You could use brackets to delimit on what part the link will be.
 
 %t is the title.
 %a is the author.
-%d is the date formated using `org-publish-sitemap-date-format'."
+%d is the date formatted using `org-publish-sitemap-date-format'."
   :group 'org-publish
   :type 'string)
 

=== modified file 'lisp/org/org-table.el'
--- a/lisp/org/org-table.el     2012-01-04 15:20:49 +0000
+++ b/lisp/org/org-table.el     2012-01-10 06:20:22 +0000
@@ -50,7 +50,7 @@
 (defvar orgtbl-after-send-table-hook nil
   "Hook for functions attaching to `C-c C-c', if the table is sent.
 This can be used to add additional functionality after the table is sent
-to the receiver position, othewise, if table is not sent, the functions
+to the receiver position, otherwise, if table is not sent, the functions
 are not run.")
 
 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)
@@ -1299,7 +1299,7 @@
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matchin dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely the reference was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))
@@ -2671,7 +2671,7 @@
            (prog1 (org-trim (org-table-get-field c1))
              (if highlight (org-table-highlight-rectangle (point) (point)))))
        ;; A range, return a vector
-       ;; First sort the numbers to get a regular ractangle
+       ;; First sort the numbers to get a regular rectangle
        (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
        (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
        (if corners-only
@@ -2931,7 +2931,7 @@
 
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can chose a different value
+The maximum number of iterations is 10, but you can choose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))

=== modified file 'lisp/org/org-taskjuggler.el'
--- a/lisp/org/org-taskjuggler.el       2012-01-04 15:20:49 +0000
+++ b/lisp/org/org-taskjuggler.el       2012-01-10 06:20:22 +0000
@@ -69,7 +69,7 @@
 ;; "taskjuggler_project" (or whatever you customized
 ;; `org-export-taskjuggler-project-tag' to). You are now ready to
 ;; export the project plan with `org-export-as-taskjuggler-and-open'
-;; which will export the project plan and open a gant chart in
+;; which will export the project plan and open a Gantt chart in
 ;; TaskJugglerUI.
 ;;
 ;; * Resources
@@ -572,7 +572,7 @@
     (and filtered-items (mapconcat 'identity filtered-items "\n"))))
 
 (defun org-taskjuggler-get-attributes (item attributes)
-  "Return all attribute as a single formated string. ITEM is an
+  "Return all attribute as a single formatted string. ITEM is an
 alist representing either a resource or a task. ATTRIBUTES is a
 list of symbols. Only entries from ITEM are considered that are
 listed in ATTRIBUTES."

=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el   2012-01-04 14:14:29 +0000
+++ b/lisp/org/org.el   2012-01-10 06:20:22 +0000
@@ -4717,7 +4717,7 @@
                    "\\(?: +" org-todo-regexp "\\)?"
                    "\\(?: +\\(\\[#.\\]\\)\\)?"
                    "\\(?: +"
-                   ;; Stats cookies can be sticked to body.
+                   ;; Stats cookies can be stuck to body.
                    "\\(?:\\[[0-9%%/]+\\] *\\)?"
                    "\\(%s\\)"
                    "\\(?: *\\[[0-9%%/]+\\]\\)?"
@@ -5241,7 +5241,7 @@
 (defvar org-emph-face nil)
 
 (defun org-do-emphasis-faces (limit)
-  "Run through the buffer and add overlays to emphasised strings."
+  "Run through the buffer and add overlays to emphasized strings."
   (let (rtn a)
     (while (and (not rtn) (re-search-forward org-emph-re limit t))
       (if (not (= (char-after (match-beginning 3))
@@ -5737,7 +5737,7 @@
 
 (defvar org-font-lock-set-keywords-hook nil
   "Functions that can manipulate `org-font-lock-extra-keywords'.
-This is calles after `org-font-lock-extra-keywords' is defined, but before
+This is called after `org-font-lock-extra-keywords' is defined, but before
 it is installed to be used by font lock.  This can be useful if something
 needs to be inserted at a specific position in the font-lock sequence.")
 
@@ -5854,7 +5854,7 @@
   (org-set-local 'org-pretty-entities (not org-pretty-entities))
   (org-restart-font-lock)
   (if org-pretty-entities
-      (message "Entities are displayed as UTF8 characers")
+      (message "Entities are displayed as UTF8 characters")
     (save-restriction
       (widen)
       (org-decompose-region (point-min) (point-max))
@@ -11441,7 +11441,7 @@
                     (forward-line 1)
                     (re-search-forward org-not-done-heading-regexp pos t))
            (throw 'dont-block nil))  ; block, there is an older sibling not 
done.
-         ;; Search further up the hierarchy, to see if an anchestor is blocked
+         ;; Search further up the hierarchy, to see if an ancestor is blocked
          (while t
            (goto-char parent-pos)
            (if (not (looking-at org-not-done-heading-regexp))
@@ -15123,7 +15123,7 @@
       (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
                               t nil ans)))
 
-    ;; Help matching dottet european dates
+    ;; Help matching dotted european dates
     (when (string-match
           "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. 
?\\([1-9][0-9][0-9][0-9]\\)?" ans)
       (setq year (if (match-end 3)

=== modified file 'lisp/progmodes/ada-xref.el'
--- a/lisp/progmodes/ada-xref.el        2012-01-05 09:46:05 +0000
+++ b/lisp/progmodes/ada-xref.el        2012-01-10 06:20:22 +0000
@@ -1533,7 +1533,7 @@
   ;;      .ali file for a spec file.  If we are, go to step 3.
   ;;   3- If the file is not found or step 2 failed:
   ;;      find the name of the "other file", ie the body, and look
-  ;;      for its associated .ali file by subtituting the extension
+  ;;      for its associated .ali file by substituting the extension
   ;;
   ;; We must also handle the case of separate packages and subprograms:
   ;;   4- If no ali file was found, we try to modify the file name by removing

=== modified file 'lisp/progmodes/cc-fonts.el'
--- a/lisp/progmodes/cc-fonts.el        2012-01-08 12:49:44 +0000
+++ b/lisp/progmodes/cc-fonts.el        2012-01-10 06:20:22 +0000
@@ -1429,7 +1429,7 @@
              nil)
 
             ((and (not c-enums-contain-decls)
-                  ;; An optimisation quickly to eliminate scans of long enum
+                  ;; An optimization quickly to eliminate scans of long enum
                   ;; declarations in the next cond arm.
                   (let ((paren-state (c-parse-state)))
                     (and