Browse Source

Backport Paul's fixes from Emacs trunk (1/2)

See http://article.gmane.org/gmane.emacs.diffs/123123
Bastien Guerry 12 years ago
parent
commit
a6210cc9c2
16 changed files with 75 additions and 76 deletions
  1. 21 21
      doc/org.texi
  2. 8 8
      etc/ORG-NEWS
  3. 1 1
      lisp/ob-core.el
  4. 5 5
      lisp/ob-python.el
  5. 1 1
      lisp/org-agenda.el
  6. 1 1
      lisp/org-bibtex.el
  7. 1 1
      lisp/org-clock.el
  8. 1 1
      lisp/org-src.el
  9. 2 2
      lisp/org-table.el
  10. 3 3
      lisp/ox-ascii.el
  11. 2 2
      lisp/ox-html.el
  12. 5 5
      lisp/ox-latex.el
  13. 1 1
      lisp/ox-md.el
  14. 14 15
      lisp/ox-odt.el
  15. 5 5
      lisp/ox-texinfo.el
  16. 4 4
      lisp/ox.el

+ 21 - 21
doc/org.texi

@@ -689,7 +689,7 @@ Using header arguments
 * System-wide header arguments::  Set global default values
 * System-wide header arguments::  Set global default values
 * Language-specific header arguments::  Set default values by language
 * Language-specific header arguments::  Set default values by language
 * Header arguments in Org mode properties::  Set default values for a buffer or heading
 * Header arguments in Org mode properties::  Set default values for a buffer or heading
-* Language-specific header arguments in Org mode properties::  Set langugage-specific default values for a buffer or heading
+* Language-specific header arguments in Org mode properties::  Set language-specific default values for a buffer or heading
 * Code block specific header arguments::  The most common way to set values
 * Code block specific header arguments::  The most common way to set values
 * Header arguments in function calls::  The most specific level
 * Header arguments in function calls::  The most specific level
 
 
@@ -3875,7 +3875,7 @@ Jump to line 255.
 Search for a link target @samp{<<My Target>>}, or do a text search for
 Search for a link target @samp{<<My Target>>}, or do a text search for
 @samp{my target}, similar to the search in internal links, see
 @samp{my target}, similar to the search in internal links, see
 @ref{Internal links}.  In HTML export (@pxref{HTML export}), such a file
 @ref{Internal links}.  In HTML export (@pxref{HTML export}), such a file
-link will become a HTML reference to the corresponding named anchor in
+link will become an HTML reference to the corresponding named anchor in
 the linked file.
 the linked file.
 @item *My Target
 @item *My Target
 In an Org file, restrict search to headlines.
 In an Org file, restrict search to headlines.
@@ -8056,7 +8056,7 @@ You may also test for properties (@pxref{Properties and Columns}) at the same
 time as matching tags.  The properties may be real properties, or special
 time as matching tags.  The properties may be real properties, or special
 properties that represent other metadata (@pxref{Special properties}).  For
 properties that represent other metadata (@pxref{Special properties}).  For
 example, the ``property'' @code{TODO} represents the TODO keyword of the
 example, the ``property'' @code{TODO} represents the TODO keyword of the
-entry and the ``propety'' @code{PRIORITY} represents the PRIORITY keyword of
+entry and the ``property'' @code{PRIORITY} represents the PRIORITY keyword of
 the entry.  The ITEM special property cannot currently be used in tags/property
 the entry.  The ITEM special property cannot currently be used in tags/property
 searches@footnote{But @pxref{x-agenda-skip-entry-regexp,
 searches@footnote{But @pxref{x-agenda-skip-entry-regexp,
 ,skipping entries based on regexp}.}.
 ,skipping entries based on regexp}.}.
@@ -8548,7 +8548,7 @@ Limit the number of tagged entries.
 @end table
 @end table
 
 
 When set to a positive integer, each option will exclude entries from other
 When set to a positive integer, each option will exclude entries from other
-catogories: for example, @code{(setq org-agenda-max-effort 100)} will limit
+categories: for example, @code{(setq org-agenda-max-effort 100)} will limit
 the agenda to 100 minutes of effort and exclude any entry that as no effort
 the agenda to 100 minutes of effort and exclude any entry that as no effort
 property.  If you want to include entries with no effort property, use a
 property.  If you want to include entries with no effort property, use a
 negative value for @code{org-agenda-max-effort}.
 negative value for @code{org-agenda-max-effort}.
@@ -9633,7 +9633,7 @@ or on a per-file basis with a line like
 @end example
 @end example
 
 
 If you would like to move the table of contents to a different location, you
 If you would like to move the table of contents to a different location, you
-should turn off the detault table using @code{org-export-with-toc} or
+should turn off the default table using @code{org-export-with-toc} or
 @code{#+OPTIONS} and insert @code{#+TOC: headlines N} at the desired
 @code{#+OPTIONS} and insert @code{#+TOC: headlines N} at the desired
 location(s).
 location(s).
 
 
@@ -10857,7 +10857,7 @@ recognized.  See @ref{@LaTeX{} and PDF export} for more information.
 @cindex #+BEAMER_INNER_THEME
 @cindex #+BEAMER_INNER_THEME
 @cindex #+BEAMER_OUTER_THEME
 @cindex #+BEAMER_OUTER_THEME
 Beamer export introduces a number of keywords to insert code in the
 Beamer export introduces a number of keywords to insert code in the
-document's header.  Four control appearance of the presentantion:
+document's header.  Four control appearance of the presentation:
 @code{#+BEAMER_THEME}, @code{#+BEAMER_COLOR_THEME},
 @code{#+BEAMER_THEME}, @code{#+BEAMER_COLOR_THEME},
 @code{#+BEAMER_FONT_THEME}, @code{#+BEAMER_INNER_THEME} and
 @code{#+BEAMER_FONT_THEME}, @code{#+BEAMER_INNER_THEME} and
 @code{#+BEAMER_OUTER_THEME}.  All of them accept optional arguments
 @code{#+BEAMER_OUTER_THEME}.  All of them accept optional arguments
@@ -10976,7 +10976,7 @@ Here is a simple example Org document that is intended for Beamer export.
 @section HTML export
 @section HTML export
 @cindex HTML export
 @cindex HTML export
 
 
-Org mode contains a HTML (XHTML 1.0 strict) exporter with extensive
+Org mode contains an HTML (XHTML 1.0 strict) exporter with extensive
 HTML formatting, in ways similar to John Gruber's @emph{markdown}
 HTML formatting, in ways similar to John Gruber's @emph{markdown}
 language, but with additional support for tables.
 language, but with additional support for tables.
 
 
@@ -10999,11 +10999,11 @@ language, but with additional support for tables.
 
 
 @table @kbd
 @table @kbd
 @orgcmd{C-c C-e h h,org-html-export-to-html}
 @orgcmd{C-c C-e h h,org-html-export-to-html}
-Export as a HTML file.  For an Org file @file{myfile.org},
+Export as an HTML file.  For an Org file @file{myfile.org},
 the HTML file will be @file{myfile.html}.  The file will be overwritten
 the HTML file will be @file{myfile.html}.  The file will be overwritten
 without warning.
 without warning.
 @kbd{C-c C-e h o}
 @kbd{C-c C-e h o}
-Export as a HTML file and immediately open it with a browser.
+Export as an HTML file and immediately open it with a browser.
 @orgcmd{C-c C-e h H,org-html-export-as-html}
 @orgcmd{C-c C-e h H,org-html-export-as-html}
 Export to a temporary buffer.  Do not create a file.
 Export to a temporary buffer.  Do not create a file.
 @end table
 @end table
@@ -11030,7 +11030,7 @@ Export to a temporary buffer.  Do not create a file.
 Org can export to various (X)HTML flavors.
 Org can export to various (X)HTML flavors.
 
 
 Setting the variable @code{org-html-doctype} allows you to export to different
 Setting the variable @code{org-html-doctype} allows you to export to different
-(X)HTML variants.  The exported HTML will be adjusted according to the sytax
+(X)HTML variants.  The exported HTML will be adjusted according to the syntax
 requirements of that variant.  You can either set this variable to a doctype
 requirements of that variant.  You can either set this variable to a doctype
 string directly, in which case the exporter will try to adjust the syntax
 string directly, in which case the exporter will try to adjust the syntax
 automatically, or you can use a ready-made doctype.  The ready-made options
 automatically, or you can use a ready-made doctype.  The ready-made options
@@ -11177,7 +11177,7 @@ includes automatic links created by radio targets (@pxref{Radio
 targets}).  Links to external files will still work if the target file is on
 targets}).  Links to external files will still work if the target file is on
 the same @i{relative} path as the published Org file.  Links to other
 the same @i{relative} path as the published Org file.  Links to other
 @file{.org} files will be translated into HTML links under the assumption
 @file{.org} files will be translated into HTML links under the assumption
-that a HTML version also exists of the linked file, at the same relative
+that an HTML version also exists of the linked file, at the same relative
 path.  @samp{id:} links can then be used to jump to specific entries across
 path.  @samp{id:} links can then be used to jump to specific entries across
 files.  For information related to linking files while publishing them to a
 files.  For information related to linking files while publishing them to a
 publishing directory see @ref{Publishing links}.
 publishing directory see @ref{Publishing links}.
@@ -11774,10 +11774,10 @@ attribute.  You may set it to:
 @code{t}: if you want to make the source block a float.  It is the default
 @code{t}: if you want to make the source block a float.  It is the default
 value when a caption is provided.
 value when a caption is provided.
 @item
 @item
-@code{mulicolumn}: if you wish to include a source block which spans multiple
-colums in a page.
+@code{multicolumn}: if you wish to include a source block which spans multiple
+columns in a page.
 @item
 @item
-@code{nil}: if you need to avoid any floating evironment, even when a caption
+@code{nil}: if you need to avoid any floating environment, even when a caption
 is provided.  It is useful for source code that may not fit in a single page.
 is provided.  It is useful for source code that may not fit in a single page.
 @end itemize
 @end itemize
 
 
@@ -11839,7 +11839,7 @@ respectively, @code{:width} and @code{:thickness} attributes:
 @section Markdown export
 @section Markdown export
 @cindex Markdown export
 @cindex Markdown export
 
 
-@code{md} export back-end generates Markdown syntax@footnote{Vanilla flavour,
+@code{md} export back-end generates Markdown syntax@footnote{Vanilla flavor,
 as defined at @url{http://daringfireball.net/projects/markdown/}.} for an Org
 as defined at @url{http://daringfireball.net/projects/markdown/}.} for an Org
 mode buffer.
 mode buffer.
 
 
@@ -12862,7 +12862,7 @@ you are using.  The FAQ covers this issue.
 @cindex export back-ends, built-in
 @cindex export back-ends, built-in
 @vindex org-export-backends
 @vindex org-export-backends
 
 
-On top of the aforemetioned back-ends, Org comes with other built-in ones: 
+On top of the aforementioned back-ends, Org comes with other built-in ones:
 
 
 @itemize
 @itemize
 @item @file{ox-man.el}: export to a man page.
 @item @file{ox-man.el}: export to a man page.
@@ -12895,8 +12895,8 @@ Convert the selected region into @code{Texinfo}.
 Convert the selected region into @code{MarkDown}.
 Convert the selected region into @code{MarkDown}.
 @end table
 @end table
 
 
-This is particularily useful for converting tables and lists in foreign
-buffers.  E.g., in a HTML buffer, you can turn on @code{orgstruct-mode}, then
+This is particularly useful for converting tables and lists in foreign
+buffers.  E.g., in an HTML buffer, you can turn on @code{orgstruct-mode}, then
 use Org commands for editing a list, and finally select and convert the list
 use Org commands for editing a list, and finally select and convert the list
 with @code{M-x org-html-convert-region-to-html RET}.
 with @code{M-x org-html-convert-region-to-html RET}.
 
 
@@ -17274,8 +17274,8 @@ to become slow.  Below are some tips on how to speed up the agenda commands.
 
 
 @enumerate
 @enumerate
 @item
 @item
-Reduce the number of Org agenda files: this will reduce the slowliness caused
-by accessing to a hard drive.
+Reduce the number of Org agenda files: this will reduce the slowness caused
+by accessing a hard drive.
 @item
 @item
 Reduce the number of DONE and archived headlines: this way the agenda does
 Reduce the number of DONE and archived headlines: this way the agenda does
 not need to skip them.
 not need to skip them.
@@ -17913,7 +17913,7 @@ inspired some of the early development, including HTML export.  He also
 asked for a way to narrow wide table columns.
 asked for a way to narrow wide table columns.
 @item
 @item
 @i{Jason Dunsmore} has been maintaining the Org-Mode server at Rackspace for
 @i{Jason Dunsmore} has been maintaining the Org-Mode server at Rackspace for
-several years now.  He also sponsered the hosting costs until Rackspace
+several years now.  He also sponsored the hosting costs until Rackspace
 started to host us for free.
 started to host us for free.
 @item
 @item
 @i{Thomas S. Dye} contributed documentation on Worg and helped integrating
 @i{Thomas S. Dye} contributed documentation on Worg and helped integrating

+ 8 - 8
etc/ORG-NEWS

@@ -101,7 +101,7 @@ of the list.
 Add support for ell, imath, jmath, varphi, varpi, aleph, gimel, beth,
 Add support for ell, imath, jmath, varphi, varpi, aleph, gimel, beth,
 dalet, cdots, S (§), dag, ddag, colon, therefore, because, triangleq,
 dalet, cdots, S (§), dag, ddag, colon, therefore, because, triangleq,
 leq, geq, lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq,
 leq, geq, lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq,
-preccurleyeq, succ, succeq, succurleyeq, setminus, nexist(s), mho,
+preccurlyeq, succ, succeq, succurlyeq, setminus, nexist(s), mho,
 check, frown, diamond.  Changes loz, vert, checkmark, smile and tilde.
 check, frown, diamond.  Changes loz, vert, checkmark, smile and tilde.
 
 
 *** Anonymous export back-ends
 *** Anonymous export back-ends
@@ -146,7 +146,7 @@ This makes java executable configurable for ditaa blocks.
 
 
 This enables SVG generation from latex code blocks.
 This enables SVG generation from latex code blocks.
 
 
-*** New option: [[doc:org-habit-show-done-alwyays-green][org-habit-show-done-alwyays-green]]
+*** New option: [[doc:org-habit-show-done-always-green][org-habit-show-done-always-green]]
 
 
 See [[http://lists.gnu.org/archive/html/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha.
 See [[http://lists.gnu.org/archive/html/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha.
 
 
@@ -277,8 +277,8 @@ manual for details and check [[http://orgmode.org/worg/org-8.0.html][this Worg p
      moved some contributions into the =contrib/= directory.
      moved some contributions into the =contrib/= directory.
 
 
      The rationale for deciding that these files should live in =contrib/=
      The rationale for deciding that these files should live in =contrib/=
-     is either because they rely on third-part softwares that are not
-     included in Emacs, or because they are not targetting a significant
+     is either because they rely on third-party software that is not
+     included in Emacs, or because they are not targeting a significant
      user-base.
      user-base.
 
 
      - org-colview-xemacs.el
      - org-colview-xemacs.el
@@ -395,7 +395,7 @@ Among the new/updated export options, three are of particular importance:
 
 
 - [[doc:org-export-allow-bind-keywords][org-export-allow-bind-keywords]] :: This option replaces the old option
 - [[doc:org-export-allow-bind-keywords][org-export-allow-bind-keywords]] :: This option replaces the old option
      =org-export-allow-BIND= and the default value is =nil=, not =confirm=.
      =org-export-allow-BIND= and the default value is =nil=, not =confirm=.
-     You will need to explicitely set this to =t= in your initialization
+     You will need to explicitly set this to =t= in your initialization
      file if you want to allow =#+BIND= keywords.
      file if you want to allow =#+BIND= keywords.
 
 
 - [[doc:org-export-with-planning][org-export-with-planning]] :: This new option controls the export of
 - [[doc:org-export-with-planning][org-export-with-planning]] :: This new option controls the export of
@@ -654,7 +654,7 @@ headlines and their content (but not subheadings) into the new file.
 This is useful when you want to quickly share an agenda containing the full
 This is useful when you want to quickly share an agenda containing the full
 list of notes.
 list of notes.
 
 
-**** New commands to drag an agenda line forward (=M-<down>=) or backard (=M-<up>=)
+**** New commands to drag an agenda line forward (=M-<down>=) or backward (=M-<up>=)
 
 
 It sometimes handy to move agenda lines around, just to quickly reorganize
 It sometimes handy to move agenda lines around, just to quickly reorganize
 your tasks, or maybe before saving the agenda to a file.  Now you can use
 your tasks, or maybe before saving the agenda to a file.  Now you can use
@@ -717,7 +717,7 @@ string is important to keep the agenda alignment clean.
 
 
 When [[doc:org-agenda-skip-scheduled-if-deadline-is-shown][org-agenda-skip-scheduled-if-deadline-is-shown]] is set to
 When [[doc:org-agenda-skip-scheduled-if-deadline-is-shown][org-agenda-skip-scheduled-if-deadline-is-shown]] is set to
 =repeated-after-deadline=, the agenda will skip scheduled items if they are
 =repeated-after-deadline=, the agenda will skip scheduled items if they are
-repeated beyond the current dealine.
+repeated beyond the current deadline.
 
 
 **** New option for [[doc:org-agenda-skip-deadline-prewarning-if-scheduled][org-agenda-skip-deadline-prewarning-if-scheduled]]
 **** New option for [[doc:org-agenda-skip-deadline-prewarning-if-scheduled][org-agenda-skip-deadline-prewarning-if-scheduled]]
 
 
@@ -757,7 +757,7 @@ check against the name of the buffer.
 
 
 Using =#+TAGS: { Tag1 : Tag2 Tag3 }= will define =Tag1= as a /group tag/
 Using =#+TAGS: { Tag1 : Tag2 Tag3 }= will define =Tag1= as a /group tag/
 (note the colon after =Tag1=).  If you search for =Tag1=, it will return
 (note the colon after =Tag1=).  If you search for =Tag1=, it will return
-headlines containing either =Tag1=, =Tag2= or =Tag3= (or any combinaison
+headlines containing either =Tag1=, =Tag2= or =Tag3= (or any combination
 of those tags.)
 of those tags.)
 
 
 You can use group tags for sparse tree in an Org buffer, for creating
 You can use group tags for sparse tree in an Org buffer, for creating

+ 1 - 1
lisp/ob-core.el

@@ -318,7 +318,7 @@ Do not query the user."
 	   (message (format "Evaluation of this%scode-block%sis disabled."
 	   (message (format "Evaluation of this%scode-block%sis disabled."
 			    code-block block-name))))))
 			    code-block block-name))))))
 
 
- ;; dynamically scoped for asynchroneous export
+ ;; dynamically scoped for asynchronous export
 (defvar org-babel-confirm-evaluate-answer-no)
 (defvar org-babel-confirm-evaluate-answer-no)
 
 
 (defsubst org-babel-confirm-evaluate (info)
 (defsubst org-babel-confirm-evaluate (info)

+ 5 - 5
lisp/ob-python.el

@@ -156,14 +156,14 @@ Emacs-lisp table, otherwise return the results as a string."
   "Return the buffer associated with SESSION."
   "Return the buffer associated with SESSION."
   (cdr (assoc session org-babel-python-buffers)))
   (cdr (assoc session org-babel-python-buffers)))
 
 
-(defun org-babel-python-with-earmufs (session)
+(defun org-babel-python-with-earmuffs (session)
   (let ((name (if (stringp session) session (format "%s" session))))
   (let ((name (if (stringp session) session (format "%s" session))))
     (if (and (string= "*" (substring name 0 1))
     (if (and (string= "*" (substring name 0 1))
 	     (string= "*" (substring name (- (length name) 1))))
 	     (string= "*" (substring name (- (length name) 1))))
 	name
 	name
       (format "*%s*" name))))
       (format "*%s*" name))))
 
 
-(defun org-babel-python-without-earmufs (session)
+(defun org-babel-python-without-earmuffs (session)
   (let ((name (if (stringp session) session (format "%s" session))))
   (let ((name (if (stringp session) session (format "%s" session))))
     (if (and (string= "*" (substring name 0 1))
     (if (and (string= "*" (substring name 0 1))
 	     (string= "*" (substring name (- (length name) 1))))
 	     (string= "*" (substring name (- (length name) 1))))
@@ -190,9 +190,9 @@ then create.  Return the initialized session."
 	(if (not (version< "24.1" emacs-version))
 	(if (not (version< "24.1" emacs-version))
 	    (run-python cmd)
 	    (run-python cmd)
 	  (unless python-buffer
 	  (unless python-buffer
-	    (setq python-buffer (org-babel-python-with-earmufs session)))
+	    (setq python-buffer (org-babel-python-with-earmuffs session)))
 	  (let ((python-shell-buffer-name
 	  (let ((python-shell-buffer-name
-		 (org-babel-python-without-earmufs python-buffer)))
+		 (org-babel-python-without-earmuffs python-buffer)))
 	    (run-python cmd))))
 	    (run-python cmd))))
        ((and (eq 'python-mode org-babel-python-mode)
        ((and (eq 'python-mode org-babel-python-mode)
 	     (fboundp 'py-shell)) ; python-mode.el
 	     (fboundp 'py-shell)) ; python-mode.el
@@ -208,7 +208,7 @@ then create.  Return the initialized session."
 			  (concat "Python-" (symbol-name session))))
 			  (concat "Python-" (symbol-name session))))
 	       (py-which-bufname bufname))
 	       (py-which-bufname bufname))
 	  (py-shell)
 	  (py-shell)
-	  (setq python-buffer (org-babel-python-with-earmufs bufname))))
+	  (setq python-buffer (org-babel-python-with-earmuffs bufname))))
        (t
        (t
 	(error "No function available for running an inferior Python")))
 	(error "No function available for running an inferior Python")))
       (setq org-babel-python-buffers
       (setq org-babel-python-buffers

+ 1 - 1
lisp/org-agenda.el

@@ -863,7 +863,7 @@ When set to the symbol `not-today', skip scheduled previously,
 but not scheduled today.
 but not scheduled today.
 
 
 When set to the symbol `repeated-after-deadline', skip scheduled
 When set to the symbol `repeated-after-deadline', skip scheduled
-items if they are repeated beyond the current dealine."
+items if they are repeated beyond the current deadline."
   :group 'org-agenda-skip
   :group 'org-agenda-skip
   :group 'org-agenda-daily/weekly
   :group 'org-agenda-daily/weekly
   :type '(choice
   :type '(choice

+ 1 - 1
lisp/org-bibtex.el

@@ -44,7 +44,7 @@
 ;; Here is an example of a capture template that use some of this
 ;; Here is an example of a capture template that use some of this
 ;; information (:author :year :title :journal :pages):
 ;; information (:author :year :title :journal :pages):
 ;;
 ;;
-;; (setq org-capure-templates
+;; (setq org-capture-templates
 ;;   '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n   \
 ;;   '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n   \
 ;;          In %:journal, %:pages.")))
 ;;          In %:journal, %:pages.")))
 ;;
 ;;

+ 1 - 1
lisp/org-clock.el

@@ -667,7 +667,7 @@ previous clocking intervals."
 VALUE can be a number of minutes, or a string with format hh:mm or mm.
 VALUE can be a number of minutes, or a string with format hh:mm or mm.
 When the string starts with a + or a - sign, the current value of the effort
 When the string starts with a + or a - sign, the current value of the effort
 property will be changed by that amount.  If the effort value is expressed
 property will be changed by that amount.  If the effort value is expressed
-as an `org-effort-durations' (e.g. \"3h\"), the modificied value will be
+as an `org-effort-durations' (e.g. \"3h\"), the modified value will be
 converted to a hh:mm duration.
 converted to a hh:mm duration.
 
 
 This command will update the \"Effort\" property of the currently
 This command will update the \"Effort\" property of the currently

+ 1 - 1
lisp/org-src.el

@@ -69,7 +69,7 @@ there are kept outside the narrowed region."
 This will save the content of the source code editing buffer into
 This will save the content of the source code editing buffer into
 a newly created file, not the base buffer for this source block.
 a newly created file, not the base buffer for this source block.
 
 
-If you want to regularily save the base buffer instead of the source
+If you want to regularly save the base buffer instead of the source
 code editing buffer, see `org-edit-src-auto-save-idle-delay' instead."
 code editing buffer, see `org-edit-src-auto-save-idle-delay' instead."
   :group 'org-edit-structure
   :group 'org-edit-structure
   :version "24.4"
   :version "24.4"

+ 2 - 2
lisp/org-table.el

@@ -97,11 +97,11 @@ this variable requires a restart of Emacs to become effective."
 Each template must define lines that will be treated as a comment and that
 Each template must define lines that will be treated as a comment and that
 must contain the \"BEGIN RECEIVE ORGTBL %n\" and \"END RECEIVE ORGTBL\"
 must contain the \"BEGIN RECEIVE ORGTBL %n\" and \"END RECEIVE ORGTBL\"
 lines where \"%n\" will be replaced with the name of the table during
 lines where \"%n\" will be replaced with the name of the table during
-insertion of the tempate.  The transformed table will later be inserted
+insertion of the template.  The transformed table will later be inserted
 between these lines.
 between these lines.
 
 
 The template should also contain a minimal table in a multiline comment.
 The template should also contain a minimal table in a multiline comment.
-If multiline comments are not possible in the buffer language, 
+If multiline comments are not possible in the buffer language,
 you can pack it into a string that will not be used when the code
 you can pack it into a string that will not be used when the code
 is compiled or executed.  Above the table will you need a line with
 is compiled or executed.  Above the table will you need a line with
 the fixed string \"#+ORGTBL: SEND\", followed by instruction on how to
 the fixed string \"#+ORGTBL: SEND\", followed by instruction on how to

+ 3 - 3
lisp/ox-ascii.el

@@ -459,7 +459,7 @@ Empty lines are not indented."
 
 
 (defun org-ascii--box-string (s info)
 (defun org-ascii--box-string (s info)
   "Return string S with a partial box to its left.
   "Return string S with a partial box to its left.
-INFO is a plist used as a communicaton channel."
+INFO is a plist used as a communication channel."
   (let ((utf8p (eq (plist-get info :ascii-charset) 'utf-8)))
   (let ((utf8p (eq (plist-get info :ascii-charset) 'utf-8)))
     (format (if utf8p "╭────\n%s\n╰────" ",----\n%s\n`----")
     (format (if utf8p "╭────\n%s\n╰────" ",----\n%s\n`----")
 	    (replace-regexp-in-string
 	    (replace-regexp-in-string
@@ -680,7 +680,7 @@ generation.  INFO is a plist used as a communication channel."
      (let ((text-width
      (let ((text-width
 	    (if keyword (org-ascii--current-text-width keyword info)
 	    (if keyword (org-ascii--current-text-width keyword info)
 	      (- org-ascii-text-width org-ascii-global-margin)))
 	      (- org-ascii-text-width org-ascii-global-margin)))
-	   ;; Use a counter instead of retreiving ordinal of each
+	   ;; Use a counter instead of retrieving ordinal of each
 	   ;; src-block.
 	   ;; src-block.
 	   (count 0))
 	   (count 0))
        (mapconcat
        (mapconcat
@@ -718,7 +718,7 @@ generation.  INFO is a plist used as a communication channel."
      (let ((text-width
      (let ((text-width
 	    (if keyword (org-ascii--current-text-width keyword info)
 	    (if keyword (org-ascii--current-text-width keyword info)
 	      (- org-ascii-text-width org-ascii-global-margin)))
 	      (- org-ascii-text-width org-ascii-global-margin)))
-	   ;; Use a counter instead of retreiving ordinal of each
+	   ;; Use a counter instead of retrieving ordinal of each
 	   ;; src-block.
 	   ;; src-block.
 	   (count 0))
 	   (count 0))
        (mapconcat
        (mapconcat

+ 2 - 2
lisp/ox-html.el

@@ -153,7 +153,7 @@
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
     ("xhtml-transitional" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"
     ("xhtml-transitional" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
-    ("xhtml-framset" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"
+    ("xhtml-frameset" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">")
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">")
     ("xhtml-11" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
     ("xhtml-11" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml11.dtd\">")
 \"http://www.w3.org/TR/xhtml1/DTD/xhtml11.dtd\">")
@@ -3078,7 +3078,7 @@ CONTENTS is the contents of the object.  INFO is a plist holding
 contextual information."
 contextual information."
   (format "<sup>%s</sup>" contents))
   (format "<sup>%s</sup>" contents))
 
 
-;;;; Tabel Cell
+;;;; Table Cell
 
 
 (defun org-html-table-cell (table-cell contents info)
 (defun org-html-table-cell (table-cell contents info)
   "Transcode a TABLE-CELL element from Org to HTML.
   "Transcode a TABLE-CELL element from Org to HTML.

+ 5 - 5
lisp/ox-latex.el

@@ -1319,13 +1319,13 @@ holding contextual information."
     (let* ((class (plist-get info :latex-class))
     (let* ((class (plist-get info :latex-class))
 	   (level (org-export-get-relative-level headline info))
 	   (level (org-export-get-relative-level headline info))
 	   (numberedp (org-export-numbered-headline-p headline info))
 	   (numberedp (org-export-numbered-headline-p headline info))
-	   (class-sectionning (assoc class org-latex-classes))
+	   (class-sectioning (assoc class org-latex-classes))
 	   ;; Section formatting will set two placeholders: one for
 	   ;; Section formatting will set two placeholders: one for
 	   ;; the title and the other for the contents.
 	   ;; the title and the other for the contents.
 	   (section-fmt
 	   (section-fmt
-	    (let ((sec (if (functionp (nth 2 class-sectionning))
-			   (funcall (nth 2 class-sectionning) level numberedp)
-			 (nth (1+ level) class-sectionning))))
+	    (let ((sec (if (functionp (nth 2 class-sectioning))
+			   (funcall (nth 2 class-sectioning) level numberedp)
+			 (nth (1+ level) class-sectioning))))
 	      (cond
 	      (cond
 	       ;; No section available for that LEVEL.
 	       ;; No section available for that LEVEL.
 	       ((not sec) nil)
 	       ((not sec) nil)
@@ -1616,7 +1616,7 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
 	  (value (org-remove-indentation
 	  (value (org-remove-indentation
 		  (org-element-property :value latex-environment))))
 		  (org-element-property :value latex-environment))))
       (if (not (org-string-nw-p label)) value
       (if (not (org-string-nw-p label)) value
-	;; Environment is labelled: label must be within the environment
+	;; Environment is labeled: label must be within the environment
 	;; (otherwise, a reference pointing to that element will count
 	;; (otherwise, a reference pointing to that element will count
 	;; the section instead).
 	;; the section instead).
 	(with-temp-buffer
 	(with-temp-buffer

+ 1 - 1
lisp/ox-md.el

@@ -22,7 +22,7 @@
 
 
 ;;; Commentary:
 ;;; Commentary:
 
 
-;; This library implements a Markdown back-end (vanilla flavour) for
+;; This library implements a Markdown back-end (vanilla flavor) for
 ;; Org exporter, based on `html' back-end.  See Org manual for more
 ;; Org exporter, based on `html' back-end.  See Org manual for more
 ;; information.
 ;; information.
 
 

+ 14 - 15
lisp/ox-odt.el

@@ -597,7 +597,7 @@ INPUT-FMT-LIST in to a single class.
 Note that this variable inherently captures how LibreOffice based
 Note that this variable inherently captures how LibreOffice based
 converters work.  LibreOffice maps documents of various formats
 converters work.  LibreOffice maps documents of various formats
 to classes like Text, Web, Spreadsheet, Presentation etc and
 to classes like Text, Web, Spreadsheet, Presentation etc and
-allow document of a given class (irrespective of it's source
+allow document of a given class (irrespective of its source
 format) to be converted to any of the export formats associated
 format) to be converted to any of the export formats associated
 with that class.
 with that class.
 
 
@@ -920,7 +920,7 @@ Specifically, locale-dependent specifiers like \"%c\", \"%x\" are
 formatted as canonical Org timestamps.  For finer control, avoid
 formatted as canonical Org timestamps.  For finer control, avoid
 these %-specifiers.
 these %-specifiers.
 
 
-Textutal specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\"
+Textual specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\"
 etc., are displayed by the application in the default language
 etc., are displayed by the application in the default language
 and country specified in `org-odt-styles-file'.  Note that the
 and country specified in `org-odt-styles-file'.  Note that the
 default styles file uses language \"en\" and country \"GB\".  You
 default styles file uses language \"en\" and country \"GB\".  You
@@ -1439,7 +1439,7 @@ original parsed data.  INFO is a plist holding export options."
   ;; Update content.xml.
   ;; Update content.xml.
 
 
   (let* ( ;; `org-display-custom-times' should be accessed right
   (let* ( ;; `org-display-custom-times' should be accessed right
-	 ;; within the context of the Org buffer.  So obtain it's
+	 ;; within the context of the Org buffer.  So obtain its
 	 ;; value before moving on to temp-buffer context down below.
 	 ;; value before moving on to temp-buffer context down below.
 	 (custom-time-fmts
 	 (custom-time-fmts
 	  (if org-display-custom-times
 	  (if org-display-custom-times
@@ -1720,7 +1720,7 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
        (and (eq (org-element-type prev) 'footnote-reference)
        (and (eq (org-element-type prev) 'footnote-reference)
 	    (format "<text:span text:style-name=\"%s\">%s</text:span>"
 	    (format "<text:span text:style-name=\"%s\">%s</text:span>"
 		    "OrgSuperscript" ",")))
 		    "OrgSuperscript" ",")))
-     ;; Trancode footnote reference.
+     ;; Transcode footnote reference.
      (let ((n (org-export-get-footnote-number footnote-reference info)))
      (let ((n (org-export-get-footnote-number footnote-reference info)))
        (cond
        (cond
 	((not (org-export-footnote-first-reference-p footnote-reference info))
 	((not (org-export-footnote-first-reference-p footnote-reference info))
@@ -2194,7 +2194,7 @@ SHORT-CAPTION are strings."
 	       (concat
 	       (concat
 		;; Sneak in a bookmark.  The bookmark is used when the
 		;; Sneak in a bookmark.  The bookmark is used when the
 		;; labeled element is referenced with a link that
 		;; labeled element is referenced with a link that
-		;; provides it's own description.
+		;; provides its own description.
 		(format "\n<text:bookmark text:name=\"%s\"/>" label)
 		(format "\n<text:bookmark text:name=\"%s\"/>" label)
 		;; Label definition: Typically formatted as below:
 		;; Label definition: Typically formatted as below:
 		;;     CATEGORY SEQ-NO: LONG CAPTION
 		;;     CATEGORY SEQ-NO: LONG CAPTION
@@ -2341,7 +2341,6 @@ used as a communication channel."
 	 (user-frame-params
 	 (user-frame-params
 	  (list user-frame-style user-frame-attrs user-frame-anchor))
 	  (list user-frame-style user-frame-attrs user-frame-anchor))
 	 ;; (embed-as (or embed-as user-frame-anchor "paragraph"))
 	 ;; (embed-as (or embed-as user-frame-anchor "paragraph"))
-	 ;; extrac
 	 ;;
 	 ;;
 	 ;; Handle `:width', `:height' and `:scale' properties.  Read
 	 ;; Handle `:width', `:height' and `:scale' properties.  Read
 	 ;; them as numbers since we need them for computations.
 	 ;; them as numbers since we need them for computations.
@@ -2371,7 +2370,7 @@ used as a communication channel."
 	 (title (and replaces (capitalize
 	 (title (and replaces (capitalize
 			       (symbol-name (org-element-type replaces)))))
 			       (symbol-name (org-element-type replaces)))))
 
 
-	 ;; If yes, note down it's contents.  It will go in to frame
+	 ;; If yes, note down its contents.  It will go in to frame
 	 ;; description.  This quite useful for debugging.
 	 ;; description.  This quite useful for debugging.
 	 (desc (and replaces (org-element-property :value replaces))))
 	 (desc (and replaces (org-element-property :value replaces))))
     (org-odt--render-image/formula entity href width height
     (org-odt--render-image/formula entity href width height
@@ -2409,7 +2408,7 @@ used as a communication channel."
 	 (title (and replaces (capitalize
 	 (title (and replaces (capitalize
 			       (symbol-name (org-element-type replaces)))))
 			       (symbol-name (org-element-type replaces)))))
 
 
-	 ;; If yes, note down it's contents.  It will go in to frame
+	 ;; If yes, note down its contents.  It will go in to frame
 	 ;; description.  This quite useful for debugging.
 	 ;; description.  This quite useful for debugging.
 	 (desc (and replaces (org-element-property :value replaces)))
 	 (desc (and replaces (org-element-property :value replaces)))
 	 width height)
 	 width height)
@@ -2613,12 +2612,12 @@ used as a communication channel."
 INFO is a plist holding contextual information.
 INFO is a plist holding contextual information.
 
 
 Return non-nil, if ELEMENT is of type paragraph satisfying
 Return non-nil, if ELEMENT is of type paragraph satisfying
-PARAGRAPH-PREDICATE and it's sole content, save for whitespaces,
+PARAGRAPH-PREDICATE and its sole content, save for whitespaces,
 is a link that satisfies LINK-PREDICATE.
 is a link that satisfies LINK-PREDICATE.
 
 
 Return non-nil, if ELEMENT is of type link satisfying
 Return non-nil, if ELEMENT is of type link satisfying
-LINK-PREDICATE and it's containing paragraph satisfies
-PARAGRAPH-PREDICATE inaddtion to having no other content save for
+LINK-PREDICATE and its containing paragraph satisfies
+PARAGRAPH-PREDICATE in addition to having no other content save for
 leading and trailing whitespaces.
 leading and trailing whitespaces.
 
 
 Return nil, otherwise."
 Return nil, otherwise."
@@ -2707,7 +2706,7 @@ Return nil, otherwise."
 					    (concat (number-to-string n) ".")))
 					    (concat (number-to-string n) ".")))
 			      item-numbers "")))))
 			      item-numbers "")))))
      ;; Case 2: Locate a regular and numbered headline in the
      ;; Case 2: Locate a regular and numbered headline in the
-     ;; hierarchy.  Display it's section number.
+     ;; hierarchy.  Display its section number.
      (let ((headline (loop for el in (cons destination genealogy)
      (let ((headline (loop for el in (cons destination genealogy)
 			   when (and (eq (org-element-type el) 'headline)
 			   when (and (eq (org-element-type el) 'headline)
 				     (not (org-export-low-level-p el info))
 				     (not (org-export-low-level-p el info))
@@ -2720,7 +2719,7 @@ Return nil, otherwise."
 		 (mapconcat 'number-to-string (org-export-get-headline-number
 		 (mapconcat 'number-to-string (org-export-get-headline-number
 					       headline info) "."))))
 					       headline info) "."))))
      ;; Case 4: Locate a regular headline in the hierarchy.  Display
      ;; Case 4: Locate a regular headline in the hierarchy.  Display
-     ;; it's title.
+     ;; its title.
      (let ((headline (loop for el in (cons destination genealogy)
      (let ((headline (loop for el in (cons destination genealogy)
 			   when (and (eq (org-element-type el) 'headline)
 			   when (and (eq (org-element-type el) 'headline)
 				     (not (org-export-low-level-p el info)))
 				     (not (org-export-low-level-p el info)))
@@ -3100,9 +3099,9 @@ holding contextual information."
 
 
 (defun org-odt-hfy-face-to-css (fn)
 (defun org-odt-hfy-face-to-css (fn)
   "Create custom style for face FN.
   "Create custom style for face FN.
-When FN is the default face, use it's foreground and background
+When FN is the default face, use its foreground and background
 properties to create \"OrgSrcBlock\" paragraph style.  Otherwise
 properties to create \"OrgSrcBlock\" paragraph style.  Otherwise
-use it's color attribute to create a character style whose name
+use its color attribute to create a character style whose name
 is obtained from FN.  Currently all attributes of FN other than
 is obtained from FN.  Currently all attributes of FN other than
 color are ignored.
 color are ignored.
 
 

+ 5 - 5
lisp/ox-texinfo.el

@@ -957,7 +957,7 @@ holding contextual information."
   (let* ((class (plist-get info :texinfo-class))
   (let* ((class (plist-get info :texinfo-class))
 	 (level (org-export-get-relative-level headline info))
 	 (level (org-export-get-relative-level headline info))
 	 (numberedp (org-export-numbered-headline-p headline info))
 	 (numberedp (org-export-numbered-headline-p headline info))
-	 (class-sectionning (assoc class org-texinfo-classes))
+	 (class-sectioning (assoc class org-texinfo-classes))
 	 ;; Find the index type, if any
 	 ;; Find the index type, if any
 	 (index (org-element-property :INDEX headline))
 	 (index (org-element-property :INDEX headline))
 	 ;; Check if it is an appendix
 	 ;; Check if it is an appendix
@@ -993,10 +993,10 @@ holding contextual information."
 	 ;; Section formatting will set two placeholders: one for the
 	 ;; Section formatting will set two placeholders: one for the
 	 ;; title and the other for the contents.
 	 ;; title and the other for the contents.
 	 (section-fmt
 	 (section-fmt
-	  (let ((sec (if (and (symbolp (nth 2 class-sectionning))
-			      (fboundp (nth 2 class-sectionning)))
-			 (funcall (nth 2 class-sectionning) level numberedp)
-		       (nth (1+ level) class-sectionning))))
+	  (let ((sec (if (and (symbolp (nth 2 class-sectioning))
+			      (fboundp (nth 2 class-sectioning)))
+			 (funcall (nth 2 class-sectioning) level numberedp)
+		       (nth (1+ level) class-sectioning))))
 	    (cond
 	    (cond
 	     ;; No section available for that LEVEL.
 	     ;; No section available for that LEVEL.
 	     ((not sec) nil)
 	     ((not sec) nil)

+ 4 - 4
lisp/ox.el

@@ -2870,7 +2870,7 @@ The copy will preserve local variables, visibility, contents and
 narrowing of the original buffer.  If a region was active in
 narrowing of the original buffer.  If a region was active in
 BUFFER, contents will be narrowed to that region instead.
 BUFFER, contents will be narrowed to that region instead.
 
 
-The resulting function can be evaled at a later time, from
+The resulting function can be evaluated at a later time, from
 another buffer, effectively cloning the original buffer there.
 another buffer, effectively cloning the original buffer there.
 
 
 The function assumes BUFFER's major mode is `org-mode'."
 The function assumes BUFFER's major mode is `org-mode'."
@@ -4682,7 +4682,7 @@ INFO is a plist used as a communication channel."
   "Return TABLE-ROW number.
   "Return TABLE-ROW number.
 INFO is a plist used as a communication channel.  Return value is
 INFO is a plist used as a communication channel.  Return value is
 zero-based and ignores separators.  The function returns nil for
 zero-based and ignores separators.  The function returns nil for
-special colums and separators."
+special columns and separators."
   (when (and (eq (org-element-property :type table-row) 'standard)
   (when (and (eq (org-element-property :type table-row) 'standard)
 	     (not (org-export-table-row-is-special-p table-row info)))
 	     (not (org-export-table-row-is-special-p table-row info)))
     (let ((number 0))
     (let ((number 0))
@@ -5874,7 +5874,7 @@ files or buffers, only the display.
   "Export dispatcher for Org mode.
   "Export dispatcher for Org mode.
 
 
 It provides an access to common export related tasks in a buffer.
 It provides an access to common export related tasks in a buffer.
-Its interface comes in two flavours: standard and expert.
+Its interface comes in two flavors: standard and expert.
 
 
 While both share the same set of bindings, only the former
 While both share the same set of bindings, only the former
 displays the valid keys associations in a dedicated buffer.
 displays the valid keys associations in a dedicated buffer.
@@ -5882,7 +5882,7 @@ Scrolling (resp. line-wise motion) in this buffer is done with
 SPC and DEL (resp. C-n and C-p) keys.
 SPC and DEL (resp. C-n and C-p) keys.
 
 
 Set variable `org-export-dispatch-use-expert-ui' to switch to one
 Set variable `org-export-dispatch-use-expert-ui' to switch to one
-flavour or the other.
+flavor or the other.
 
 
 When ARG is \\[universal-argument], repeat the last export action, with the same set
 When ARG is \\[universal-argument], repeat the last export action, with the same set
 of options used back then, on the current buffer.
 of options used back then, on the current buffer.