aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
authorPaul Eggert2013-11-16 23:51:24 -0800
committerPaul Eggert2013-11-16 23:51:24 -0800
commitd1389828747d3e78ed968ea4a3341e61e8df4a1d (patch)
treee67f48fbed424ee161db2602e8865b71a2a8757b /lisp/org
parent014690de705b6be7c55aa0b9ea85694c4fa1fd73 (diff)
downloademacs-d1389828747d3e78ed968ea4a3341e61e8df4a1d.tar.gz
emacs-d1389828747d3e78ed968ea4a3341e61e8df4a1d.zip
Spelling fixes.
* lisp/org/ob-python.el (org-babel-python-with-earmuffs): Rename from org-babel-python-with-earmufs. All uses changed. (org-babel-python-without-earmuffs): Rename from org-babel-python-without-earmufs. All uses changed.
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog26
-rw-r--r--lisp/org/ob-core.el2
-rw-r--r--lisp/org/ob-python.el10
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/org/org-bibtex.el2
-rw-r--r--lisp/org/org-clock.el2
-rw-r--r--lisp/org/org-src.el2
-rw-r--r--lisp/org/org-table.el4
-rw-r--r--lisp/org/org.el10
-rw-r--r--lisp/org/ox-ascii.el6
-rw-r--r--lisp/org/ox-html.el4
-rw-r--r--lisp/org/ox-latex.el10
-rw-r--r--lisp/org/ox-md.el2
-rw-r--r--lisp/org/ox-odt.el29
-rw-r--r--lisp/org/ox-texinfo.el10
-rw-r--r--lisp/org/ox.el8
16 files changed, 68 insertions, 61 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 135ac7fec71..a9d2731892f 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,11 @@
12013-11-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 Spelling fixes.
4 * ob-python.el (org-babel-python-with-earmuffs):
5 Rename from org-babel-python-with-earmufs. All uses changed.
6 (org-babel-python-without-earmuffs):
7 Rename from org-babel-python-without-earmufs. All uses changed.
8
12013-11-12 Bastien Guerry <bzg@gnu.org> 92013-11-12 Bastien Guerry <bzg@gnu.org>
2 10
3 * org-agenda.el (org-agenda-set-restriction-lock): Autoload. 11 * org-agenda.el (org-agenda-set-restriction-lock): Autoload.
@@ -1887,7 +1895,7 @@
1887 when `org-prefix-has-breadcrumbs' is non-nil. 1895 when `org-prefix-has-breadcrumbs' is non-nil.
1888 1896
1889 * org.el (org-mode): Don't make characters from 1897 * org.el (org-mode): Don't make characters from
1890 `org-emphasis-alist' word constituants. 1898 `org-emphasis-alist' word constituents.
1891 (org-mode-transpose-word-syntax-table): Rename from 1899 (org-mode-transpose-word-syntax-table): Rename from
1892 `org-syntax-table'. 1900 `org-syntax-table'.
1893 (org-transpose-words): Use 1901 (org-transpose-words): Use
@@ -3394,7 +3402,7 @@
3394 (org-export--get-buffer-attributes): Store a default title. 3402 (org-export--get-buffer-attributes): Store a default title.
3395 (org-export-as): Apply function removal. 3403 (org-export-as): Apply function removal.
3396 (org-export--get-global-options): Do not set a property with an 3404 (org-export--get-global-options): Do not set a property with an
3397 explicitely nil value. 3405 explicitly nil value.
3398 3406
3399 * ox-publish.el (org-publish-sitemap-sort-files) 3407 * ox-publish.el (org-publish-sitemap-sort-files)
3400 (org-publish-sitemap-sort-folders) 3408 (org-publish-sitemap-sort-folders)
@@ -4526,7 +4534,7 @@
4526 the string returned will end with a single one. 4534 the string returned will end with a single one.
4527 4535
4528 * ox-latex.el (org-latex-headline): When a function returns a 4536 * ox-latex.el (org-latex-headline): When a function returns a
4529 sectionning command, only one placeholder should be required. 4537 sectioning command, only one placeholder should be required.
4530 4538
4531 * org-element.el (org-element-nested-p): Do not inline function. 4539 * org-element.el (org-element-nested-p): Do not inline function.
4532 4540
@@ -5262,8 +5270,8 @@
5262 * org-entities.el (org-entities): Add support for ell, imath, 5270 * org-entities.el (org-entities): Add support for ell, imath,
5263 jmath, varphi, varpi, aleph, gimel, beth, dalet, cdots, S (§), 5271 jmath, varphi, varpi, aleph, gimel, beth, dalet, cdots, S (§),
5264 dag, ddag, colon, therefore, because, triangleq, leq, geq, 5272 dag, ddag, colon, therefore, because, triangleq, leq, geq,
5265 lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq, preccurleyeq, 5273 lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq, preccurlyeq,
5266 succ, succeq, succurleyeq, setminus, nexist(s), mho, check, frown, 5274 succ, succeq, succurlyeq, setminus, nexist(s), mho, check, frown,
5267 diamond. Changes loz, vert, checkmark, smile and tilde. 5275 diamond. Changes loz, vert, checkmark, smile and tilde.
5268 5276
5269 * ob-C.el: Added C++ to `org-babel-load-languages' automatically 5277 * ob-C.el: Added C++ to `org-babel-load-languages' automatically
@@ -6358,7 +6366,7 @@
6358 6366
6359 * org.el (org-reload): Simplify file-re (orgtbl-*.el files do not 6367 * org.el (org-reload): Simplify file-re (orgtbl-*.el files do not
6360 exist anymore). Keep org-*.el at the end of the files list. 6368 exist anymore). Keep org-*.el at the end of the files list.
6361 Explicitely load org-version.el (since it doesn't provide feature 6369 Explicitly load org-version.el (since it doesn't provide feature
6362 'org-version) at the very end, but ignore errors when it doesn't 6370 'org-version) at the very end, but ignore errors when it doesn't
6363 exist. Add parameters 'full and 'message to the call of 6371 exist. Add parameters 'full and 'message to the call of
6364 (org-version) so that after reload the full version information is 6372 (org-version) so that after reload the full version information is
@@ -8147,7 +8155,7 @@
8147 * org.el (org-read-date): Set cursor-type to nil in the calendar. 8155 * org.el (org-read-date): Set cursor-type to nil in the calendar.
8148 8156
8149 * org-faces.el (org-date-selected): Use inverse video. 8157 * org-faces.el (org-date-selected): Use inverse video.
8150 Don't explicitely set bold to nil as it causes `customize-face' to show 8158 Don't explicitly set bold to nil as it causes `customize-face' to show
8151 the weight property and thus encourage the user to change it. 8159 the weight property and thus encourage the user to change it.
8152 Warn in the docstring that using bold might cause problems when 8160 Warn in the docstring that using bold might cause problems when
8153 displaying the calendar. 8161 displaying the calendar.
@@ -9228,7 +9236,7 @@
9228 * org-agenda.el (org-agenda-skip-timestamp-if-deadline-is-shown): 9236 * org-agenda.el (org-agenda-skip-timestamp-if-deadline-is-shown):
9229 Skip timestamp items in agenda view if item is already shown as a 9237 Skip timestamp items in agenda view if item is already shown as a
9230 deadline item. 9238 deadline item.
9231 (org-agenda-skip-dealine-if-done): Pass deadline results to 9239 (org-agenda-skip-deadline-if-done): Pass deadline results to
9232 org-agenda-get-timestamps. 9240 org-agenda-get-timestamps.
9233 (org-agenda-get-timestamps): Optionally take list of deadline 9241 (org-agenda-get-timestamps): Optionally take list of deadline
9234 results, so that timestamp results can be skipped if already 9242 results, so that timestamp results can be skipped if already
@@ -12430,7 +12438,7 @@
124302012-01-03 Nicolas Goaziou <n.goaziou@gmail.com> 124382012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
12431 12439
12432 * org-footnote.el (org-footnote-create-definition): 12440 * org-footnote.el (org-footnote-create-definition):
12433 Explicitely move point after tag, if it has just been 12441 Explicitly move point after tag, if it has just been
12434 inserted. 12442 inserted.
12435 12443
124362012-01-03 Eric Schulte <schulte.eric@gmail.com> 124442012-01-03 Eric Schulte <schulte.eric@gmail.com>
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 0ec945d6ad8..84caed7ea3b 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -318,7 +318,7 @@ Do not query the user."
318 (message (format "Evaluation of this%scode-block%sis disabled." 318 (message (format "Evaluation of this%scode-block%sis disabled."
319 code-block block-name)))))) 319 code-block block-name))))))
320 320
321 ;; dynamically scoped for asynchroneous export 321 ;; dynamically scoped for asynchronous export
322(defvar org-babel-confirm-evaluate-answer-no) 322(defvar org-babel-confirm-evaluate-answer-no)
323 323
324(defsubst org-babel-confirm-evaluate (info) 324(defsubst org-babel-confirm-evaluate (info)
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index b8f8a6daafa..99c35ce2863 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -156,14 +156,14 @@ Emacs-lisp table, otherwise return the results as a string."
156 "Return the buffer associated with SESSION." 156 "Return the buffer associated with SESSION."
157 (cdr (assoc session org-babel-python-buffers))) 157 (cdr (assoc session org-babel-python-buffers)))
158 158
159(defun org-babel-python-with-earmufs (session) 159(defun org-babel-python-with-earmuffs (session)
160 (let ((name (if (stringp session) session (format "%s" session)))) 160 (let ((name (if (stringp session) session (format "%s" session))))
161 (if (and (string= "*" (substring name 0 1)) 161 (if (and (string= "*" (substring name 0 1))
162 (string= "*" (substring name (- (length name) 1)))) 162 (string= "*" (substring name (- (length name) 1))))
163 name 163 name
164 (format "*%s*" name)))) 164 (format "*%s*" name))))
165 165
166(defun org-babel-python-without-earmufs (session) 166(defun org-babel-python-without-earmuffs (session)
167 (let ((name (if (stringp session) session (format "%s" session)))) 167 (let ((name (if (stringp session) session (format "%s" session))))
168 (if (and (string= "*" (substring name 0 1)) 168 (if (and (string= "*" (substring name 0 1))
169 (string= "*" (substring name (- (length name) 1)))) 169 (string= "*" (substring name (- (length name) 1))))
@@ -190,9 +190,9 @@ then create. Return the initialized session."
190 (if (not (version< "24.1" emacs-version)) 190 (if (not (version< "24.1" emacs-version))
191 (run-python cmd) 191 (run-python cmd)
192 (unless python-buffer 192 (unless python-buffer
193 (setq python-buffer (org-babel-python-with-earmufs session))) 193 (setq python-buffer (org-babel-python-with-earmuffs session)))
194 (let ((python-shell-buffer-name 194 (let ((python-shell-buffer-name
195 (org-babel-python-without-earmufs python-buffer))) 195 (org-babel-python-without-earmuffs python-buffer)))
196 (run-python cmd)))) 196 (run-python cmd))))
197 ((and (eq 'python-mode org-babel-python-mode) 197 ((and (eq 'python-mode org-babel-python-mode)
198 (fboundp 'py-shell)) ; python-mode.el 198 (fboundp 'py-shell)) ; python-mode.el
@@ -208,7 +208,7 @@ then create. Return the initialized session."
208 (concat "Python-" (symbol-name session)))) 208 (concat "Python-" (symbol-name session))))
209 (py-which-bufname bufname)) 209 (py-which-bufname bufname))
210 (py-shell) 210 (py-shell)
211 (setq python-buffer (org-babel-python-with-earmufs bufname)))) 211 (setq python-buffer (org-babel-python-with-earmuffs bufname))))
212 (t 212 (t
213 (error "No function available for running an inferior Python"))) 213 (error "No function available for running an inferior Python")))
214 (setq org-babel-python-buffers 214 (setq org-babel-python-buffers
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 3af1947bd33..5ef92f7aaeb 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -863,7 +863,7 @@ When set to the symbol `not-today', skip scheduled previously,
863but not scheduled today. 863but not scheduled today.
864 864
865When set to the symbol `repeated-after-deadline', skip scheduled 865When set to the symbol `repeated-after-deadline', skip scheduled
866items if they are repeated beyond the current dealine." 866items if they are repeated beyond the current deadline."
867 :group 'org-agenda-skip 867 :group 'org-agenda-skip
868 :group 'org-agenda-daily/weekly 868 :group 'org-agenda-daily/weekly
869 :type '(choice 869 :type '(choice
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 52643994879..def9340e430 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -44,7 +44,7 @@
44;; Here is an example of a capture template that use some of this 44;; Here is an example of a capture template that use some of this
45;; information (:author :year :title :journal :pages): 45;; information (:author :year :title :journal :pages):
46;; 46;;
47;; (setq org-capure-templates 47;; (setq org-capture-templates
48;; '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n \ 48;; '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n \
49;; In %:journal, %:pages."))) 49;; In %:journal, %:pages.")))
50;; 50;;
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 0b2037d0725..978bde475d4 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -667,7 +667,7 @@ previous clocking intervals."
667VALUE can be a number of minutes, or a string with format hh:mm or mm. 667VALUE can be a number of minutes, or a string with format hh:mm or mm.
668When the string starts with a + or a - sign, the current value of the effort 668When the string starts with a + or a - sign, the current value of the effort
669property will be changed by that amount. If the effort value is expressed 669property will be changed by that amount. If the effort value is expressed
670as an `org-effort-durations' (e.g. \"3h\"), the modificied value will be 670as an `org-effort-durations' (e.g. \"3h\"), the modified value will be
671converted to a hh:mm duration. 671converted to a hh:mm duration.
672 672
673This command will update the \"Effort\" property of the currently 673This command will update the \"Effort\" property of the currently
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 99038576ff7..259186c0ce3 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -69,7 +69,7 @@ there are kept outside the narrowed region."
69This will save the content of the source code editing buffer into 69This will save the content of the source code editing buffer into
70a newly created file, not the base buffer for this source block. 70a newly created file, not the base buffer for this source block.
71 71
72If you want to regularily save the base buffer instead of the source 72If you want to regularly save the base buffer instead of the source
73code editing buffer, see `org-edit-src-auto-save-idle-delay' instead." 73code editing buffer, see `org-edit-src-auto-save-idle-delay' instead."
74 :group 'org-edit-structure 74 :group 'org-edit-structure
75 :version "24.4" 75 :version "24.4"
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 246cf8d605c..1ef90443935 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -97,11 +97,11 @@ this variable requires a restart of Emacs to become effective."
97Each template must define lines that will be treated as a comment and that 97Each template must define lines that will be treated as a comment and that
98must contain the \"BEGIN RECEIVE ORGTBL %n\" and \"END RECEIVE ORGTBL\" 98must contain the \"BEGIN RECEIVE ORGTBL %n\" and \"END RECEIVE ORGTBL\"
99lines where \"%n\" will be replaced with the name of the table during 99lines where \"%n\" will be replaced with the name of the table during
100insertion of the tempate. The transformed table will later be inserted 100insertion of the template. The transformed table will later be inserted
101between these lines. 101between these lines.
102 102
103The template should also contain a minimal table in a multiline comment. 103The template should also contain a minimal table in a multiline comment.
104If multiline comments are not possible in the buffer language, 104If multiline comments are not possible in the buffer language,
105you can pack it into a string that will not be used when the code 105you can pack it into a string that will not be used when the code
106is compiled or executed. Above the table will you need a line with 106is compiled or executed. Above the table will you need a line with
107the fixed string \"#+ORGTBL: SEND\", followed by instruction on how to 107the fixed string \"#+ORGTBL: SEND\", followed by instruction on how to
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 8e23ec9f87f..50d3842e03d 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -713,7 +713,7 @@ the following lines anywhere in the buffer:
713 "Non-nil means preview LaTeX fragments when loading a new Org file. 713 "Non-nil means preview LaTeX fragments when loading a new Org file.
714 714
715This can also be configured on a per-file basis by adding one of 715This can also be configured on a per-file basis by adding one of
716the followinglines anywhere in the buffer: 716the following lines anywhere in the buffer:
717 #+STARTUP: latexpreview 717 #+STARTUP: latexpreview
718 #+STARTUP: nolatexpreview" 718 #+STARTUP: nolatexpreview"
719 :group 'org-startup 719 :group 'org-startup
@@ -1037,7 +1037,7 @@ commands in the Help buffer using the `?' speed command."
1037 :last-refile "org-refile-last-stored" 1037 :last-refile "org-refile-last-stored"
1038 :last-capture-marker "org-capture-last-stored-marker") 1038 :last-capture-marker "org-capture-last-stored-marker")
1039 "Names for bookmarks automatically set by some Org commands. 1039 "Names for bookmarks automatically set by some Org commands.
1040This can provide strings as names for a number of bookmakrs Org sets 1040This can provide strings as names for a number of bookmarks Org sets
1041automatically. The following keys are currently implemented: 1041automatically. The following keys are currently implemented:
1042 :last-capture 1042 :last-capture
1043 :last-capture-marker 1043 :last-capture-marker
@@ -19542,7 +19542,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
19542 "Transpose words for Org. 19542 "Transpose words for Org.
19543This uses the `org-mode-transpose-word-syntax-table' syntax 19543This uses the `org-mode-transpose-word-syntax-table' syntax
19544table, which interprets characters in `org-emphasis-alist' as 19544table, which interprets characters in `org-emphasis-alist' as
19545word constituants." 19545word constituents."
19546 (interactive) 19546 (interactive)
19547 (with-syntax-table org-mode-transpose-word-syntax-table 19547 (with-syntax-table org-mode-transpose-word-syntax-table
19548 (call-interactively 'transpose-words))) 19548 (call-interactively 'transpose-words)))
@@ -20401,7 +20401,7 @@ If `org-special-ctrl-o' is nil, just call `open-line' everywhere."
20401 (open-line n)) 20401 (open-line n))
20402 ((org-at-table-p) 20402 ((org-at-table-p)
20403 (org-table-insert-row)) 20403 (org-table-insert-row))
20404 (t 20404 (t
20405 (open-line n)))) 20405 (open-line n))))
20406 20406
20407(defun org-return (&optional indent) 20407(defun org-return (&optional indent)
@@ -21148,7 +21148,7 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
21148 (message "The following feature%s found in load-path, please check if that's correct:\n%s" 21148 (message "The following feature%s found in load-path, please check if that's correct:\n%s"
21149 (if (> (length load-uncore) 1) "s were" " was") load-uncore)) 21149 (if (> (length load-uncore) 1) "s were" " was") load-uncore))
21150 (if load-misses 21150 (if load-misses
21151 (message "Some error occured while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" 21151 (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s"
21152 (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) 21152 (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full))
21153 (message "Successfully reloaded Org\n%s" (org-version nil 'full))))) 21153 (message "Successfully reloaded Org\n%s" (org-version nil 'full)))))
21154 21154
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 430bc6e618b..5b41d2d3989 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/ox-ascii.el
@@ -489,7 +489,7 @@ Empty lines are not indented."
489 489
490(defun org-ascii--box-string (s info) 490(defun org-ascii--box-string (s info)
491 "Return string S with a partial box to its left. 491 "Return string S with a partial box to its left.
492INFO is a plist used as a communicaton channel." 492INFO is a plist used as a communication channel."
493 (let ((utf8p (eq (plist-get info :ascii-charset) 'utf-8))) 493 (let ((utf8p (eq (plist-get info :ascii-charset) 'utf-8)))
494 (format (if utf8p "╭────\n%s\n╰────" ",----\n%s\n`----") 494 (format (if utf8p "╭────\n%s\n╰────" ",----\n%s\n`----")
495 (replace-regexp-in-string 495 (replace-regexp-in-string
@@ -710,7 +710,7 @@ generation. INFO is a plist used as a communication channel."
710 (let ((text-width 710 (let ((text-width
711 (if keyword (org-ascii--current-text-width keyword info) 711 (if keyword (org-ascii--current-text-width keyword info)
712 (- org-ascii-text-width org-ascii-global-margin))) 712 (- org-ascii-text-width org-ascii-global-margin)))
713 ;; Use a counter instead of retreiving ordinal of each 713 ;; Use a counter instead of retrieving ordinal of each
714 ;; src-block. 714 ;; src-block.
715 (count 0)) 715 (count 0))
716 (mapconcat 716 (mapconcat
@@ -748,7 +748,7 @@ generation. INFO is a plist used as a communication channel."
748 (let ((text-width 748 (let ((text-width
749 (if keyword (org-ascii--current-text-width keyword info) 749 (if keyword (org-ascii--current-text-width keyword info)
750 (- org-ascii-text-width org-ascii-global-margin))) 750 (- org-ascii-text-width org-ascii-global-margin)))
751 ;; Use a counter instead of retreiving ordinal of each 751 ;; Use a counter instead of retrieving ordinal of each
752 ;; src-block. 752 ;; src-block.
753 (count 0)) 753 (count 0))
754 (mapconcat 754 (mapconcat
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 5aeaaf7bccf..b4094d3e44c 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -153,7 +153,7 @@
153\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">") 153\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
154 ("xhtml-transitional" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" 154 ("xhtml-transitional" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"
155\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">") 155\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
156 ("xhtml-framset" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" 156 ("xhtml-frameset" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"
157\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">") 157\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">")
158 ("xhtml-11" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" 158 ("xhtml-11" . "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
159\"http://www.w3.org/TR/xhtml1/DTD/xhtml11.dtd\">") 159\"http://www.w3.org/TR/xhtml1/DTD/xhtml11.dtd\">")
@@ -3069,7 +3069,7 @@ CONTENTS is the contents of the object. INFO is a plist holding
3069contextual information." 3069contextual information."
3070 (format "<sup>%s</sup>" contents)) 3070 (format "<sup>%s</sup>" contents))
3071 3071
3072;;;; Tabel Cell 3072;;;; Table Cell
3073 3073
3074(defun org-html-table-cell (table-cell contents info) 3074(defun org-html-table-cell (table-cell contents info)
3075 "Transcode a TABLE-CELL element from Org to HTML. 3075 "Transcode a TABLE-CELL element from Org to HTML.
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 4dc0fd07376..6766b8583f1 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -1325,13 +1325,13 @@ holding contextual information."
1325 (let* ((class (plist-get info :latex-class)) 1325 (let* ((class (plist-get info :latex-class))
1326 (level (org-export-get-relative-level headline info)) 1326 (level (org-export-get-relative-level headline info))
1327 (numberedp (org-export-numbered-headline-p headline info)) 1327 (numberedp (org-export-numbered-headline-p headline info))
1328 (class-sectionning (assoc class org-latex-classes)) 1328 (class-sectioning (assoc class org-latex-classes))
1329 ;; Section formatting will set two placeholders: one for 1329 ;; Section formatting will set two placeholders: one for
1330 ;; the title and the other for the contents. 1330 ;; the title and the other for the contents.
1331 (section-fmt 1331 (section-fmt
1332 (let ((sec (if (functionp (nth 2 class-sectionning)) 1332 (let ((sec (if (functionp (nth 2 class-sectioning))
1333 (funcall (nth 2 class-sectionning) level numberedp) 1333 (funcall (nth 2 class-sectioning) level numberedp)
1334 (nth (1+ level) class-sectionning)))) 1334 (nth (1+ level) class-sectioning))))
1335 (cond 1335 (cond
1336 ;; No section available for that LEVEL. 1336 ;; No section available for that LEVEL.
1337 ((not sec) nil) 1337 ((not sec) nil)
@@ -1622,7 +1622,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
1622 (value (org-remove-indentation 1622 (value (org-remove-indentation
1623 (org-element-property :value latex-environment)))) 1623 (org-element-property :value latex-environment))))
1624 (if (not (org-string-nw-p label)) value 1624 (if (not (org-string-nw-p label)) value
1625 ;; Environment is labelled: label must be within the environment 1625 ;; Environment is labeled: label must be within the environment
1626 ;; (otherwise, a reference pointing to that element will count 1626 ;; (otherwise, a reference pointing to that element will count
1627 ;; the section instead). 1627 ;; the section instead).
1628 (with-temp-buffer 1628 (with-temp-buffer
diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el
index 811c4e5805e..78420170b8a 100644
--- a/lisp/org/ox-md.el
+++ b/lisp/org/ox-md.el
@@ -22,7 +22,7 @@
22 22
23;;; Commentary: 23;;; Commentary:
24 24
25;; This library implements a Markdown back-end (vanilla flavour) for 25;; This library implements a Markdown back-end (vanilla flavor) for
26;; Org exporter, based on `html' back-end. See Org manual for more 26;; Org exporter, based on `html' back-end. See Org manual for more
27;; information. 27;; information.
28 28
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index eb7856b296a..d5d03e49b50 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -596,7 +596,7 @@ INPUT-FMT-LIST in to a single class.
596Note that this variable inherently captures how LibreOffice based 596Note that this variable inherently captures how LibreOffice based
597converters work. LibreOffice maps documents of various formats 597converters work. LibreOffice maps documents of various formats
598to classes like Text, Web, Spreadsheet, Presentation etc and 598to classes like Text, Web, Spreadsheet, Presentation etc and
599allow document of a given class (irrespective of it's source 599allow document of a given class (irrespective of its source
600format) to be converted to any of the export formats associated 600format) to be converted to any of the export formats associated
601with that class. 601with that class.
602 602
@@ -919,7 +919,7 @@ Specifically, locale-dependent specifiers like \"%c\", \"%x\" are
919formatted as canonical Org timestamps. For finer control, avoid 919formatted as canonical Org timestamps. For finer control, avoid
920these %-specifiers. 920these %-specifiers.
921 921
922Textutal specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\" 922Textual specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\"
923etc., are displayed by the application in the default language 923etc., are displayed by the application in the default language
924and country specified in `org-odt-styles-file'. Note that the 924and country specified in `org-odt-styles-file'. Note that the
925default styles file uses language \"en\" and country \"GB\". You 925default styles file uses language \"en\" and country \"GB\". You
@@ -1436,7 +1436,7 @@ original parsed data. INFO is a plist holding export options."
1436 ;; Update content.xml. 1436 ;; Update content.xml.
1437 1437
1438 (let* ( ;; `org-display-custom-times' should be accessed right 1438 (let* ( ;; `org-display-custom-times' should be accessed right
1439 ;; within the context of the Org buffer. So obtain it's 1439 ;; within the context of the Org buffer. So obtain its
1440 ;; value before moving on to temp-buffer context down below. 1440 ;; value before moving on to temp-buffer context down below.
1441 (custom-time-fmts 1441 (custom-time-fmts
1442 (if org-display-custom-times 1442 (if org-display-custom-times
@@ -1721,7 +1721,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
1721 (and (eq (org-element-type prev) 'footnote-reference) 1721 (and (eq (org-element-type prev) 'footnote-reference)
1722 (format "<text:span text:style-name=\"%s\">%s</text:span>" 1722 (format "<text:span text:style-name=\"%s\">%s</text:span>"
1723 "OrgSuperscript" ","))) 1723 "OrgSuperscript" ",")))
1724 ;; Trancode footnote reference. 1724 ;; Transcode footnote reference.
1725 (let ((n (org-export-get-footnote-number footnote-reference info))) 1725 (let ((n (org-export-get-footnote-number footnote-reference info)))
1726 (cond 1726 (cond
1727 ((not (org-export-footnote-first-reference-p footnote-reference info)) 1727 ((not (org-export-footnote-first-reference-p footnote-reference info))
@@ -2195,7 +2195,7 @@ SHORT-CAPTION are strings."
2195 (concat 2195 (concat
2196 ;; Sneak in a bookmark. The bookmark is used when the 2196 ;; Sneak in a bookmark. The bookmark is used when the
2197 ;; labeled element is referenced with a link that 2197 ;; labeled element is referenced with a link that
2198 ;; provides it's own description. 2198 ;; provides its own description.
2199 (format "\n<text:bookmark text:name=\"%s\"/>" label) 2199 (format "\n<text:bookmark text:name=\"%s\"/>" label)
2200 ;; Label definition: Typically formatted as below: 2200 ;; Label definition: Typically formatted as below:
2201 ;; CATEGORY SEQ-NO: LONG CAPTION 2201 ;; CATEGORY SEQ-NO: LONG CAPTION
@@ -2342,7 +2342,6 @@ used as a communication channel."
2342 (user-frame-params 2342 (user-frame-params
2343 (list user-frame-style user-frame-attrs user-frame-anchor)) 2343 (list user-frame-style user-frame-attrs user-frame-anchor))
2344 ;; (embed-as (or embed-as user-frame-anchor "paragraph")) 2344 ;; (embed-as (or embed-as user-frame-anchor "paragraph"))
2345 ;; extrac
2346 ;; 2345 ;;
2347 ;; Handle `:width', `:height' and `:scale' properties. Read 2346 ;; Handle `:width', `:height' and `:scale' properties. Read
2348 ;; them as numbers since we need them for computations. 2347 ;; them as numbers since we need them for computations.
@@ -2372,7 +2371,7 @@ used as a communication channel."
2372 (title (and replaces (capitalize 2371 (title (and replaces (capitalize
2373 (symbol-name (org-element-type replaces))))) 2372 (symbol-name (org-element-type replaces)))))
2374 2373
2375 ;; If yes, note down it's contents. It will go in to frame 2374 ;; If yes, note down its contents. It will go in to frame
2376 ;; description. This quite useful for debugging. 2375 ;; description. This quite useful for debugging.
2377 (desc (and replaces (org-element-property :value replaces)))) 2376 (desc (and replaces (org-element-property :value replaces))))
2378 (org-odt--render-image/formula entity href width height 2377 (org-odt--render-image/formula entity href width height
@@ -2410,7 +2409,7 @@ used as a communication channel."
2410 (title (and replaces (capitalize 2409 (title (and replaces (capitalize
2411 (symbol-name (org-element-type replaces))))) 2410 (symbol-name (org-element-type replaces)))))
2412 2411
2413 ;; If yes, note down it's contents. It will go in to frame 2412 ;; If yes, note down its contents. It will go in to frame
2414 ;; description. This quite useful for debugging. 2413 ;; description. This quite useful for debugging.
2415 (desc (and replaces (org-element-property :value replaces))) 2414 (desc (and replaces (org-element-property :value replaces)))
2416 width height) 2415 width height)
@@ -2614,12 +2613,12 @@ used as a communication channel."
2614INFO is a plist holding contextual information. 2613INFO is a plist holding contextual information.
2615 2614
2616Return non-nil, if ELEMENT is of type paragraph satisfying 2615Return non-nil, if ELEMENT is of type paragraph satisfying
2617PARAGRAPH-PREDICATE and it's sole content, save for whitespaces, 2616PARAGRAPH-PREDICATE and its sole content, save for whitespaces,
2618is a link that satisfies LINK-PREDICATE. 2617is a link that satisfies LINK-PREDICATE.
2619 2618
2620Return non-nil, if ELEMENT is of type link satisfying 2619Return non-nil, if ELEMENT is of type link satisfying
2621LINK-PREDICATE and it's containing paragraph satisfies 2620LINK-PREDICATE and its containing paragraph satisfies
2622PARAGRAPH-PREDICATE inaddtion to having no other content save for 2621PARAGRAPH-PREDICATE in addition to having no other content save for
2623leading and trailing whitespaces. 2622leading and trailing whitespaces.
2624 2623
2625Return nil, otherwise." 2624Return nil, otherwise."
@@ -2708,7 +2707,7 @@ Return nil, otherwise."
2708 (concat (number-to-string n) "."))) 2707 (concat (number-to-string n) ".")))
2709 item-numbers ""))))) 2708 item-numbers "")))))
2710 ;; Case 2: Locate a regular and numbered headline in the 2709 ;; Case 2: Locate a regular and numbered headline in the
2711 ;; hierarchy. Display it's section number. 2710 ;; hierarchy. Display its section number.
2712 (let ((headline (loop for el in (cons destination genealogy) 2711 (let ((headline (loop for el in (cons destination genealogy)
2713 when (and (eq (org-element-type el) 'headline) 2712 when (and (eq (org-element-type el) 'headline)
2714 (not (org-export-low-level-p el info)) 2713 (not (org-export-low-level-p el info))
@@ -2721,7 +2720,7 @@ Return nil, otherwise."
2721 (mapconcat 'number-to-string (org-export-get-headline-number 2720 (mapconcat 'number-to-string (org-export-get-headline-number
2722 headline info) ".")))) 2721 headline info) "."))))
2723 ;; Case 4: Locate a regular headline in the hierarchy. Display 2722 ;; Case 4: Locate a regular headline in the hierarchy. Display
2724 ;; it's title. 2723 ;; its title.
2725 (let ((headline (loop for el in (cons destination genealogy) 2724 (let ((headline (loop for el in (cons destination genealogy)
2726 when (and (eq (org-element-type el) 'headline) 2725 when (and (eq (org-element-type el) 'headline)
2727 (not (org-export-low-level-p el info))) 2726 (not (org-export-low-level-p el info)))
@@ -3101,9 +3100,9 @@ holding contextual information."
3101 3100
3102(defun org-odt-hfy-face-to-css (fn) 3101(defun org-odt-hfy-face-to-css (fn)
3103 "Create custom style for face FN. 3102 "Create custom style for face FN.
3104When FN is the default face, use it's foreground and background 3103When FN is the default face, use its foreground and background
3105properties to create \"OrgSrcBlock\" paragraph style. Otherwise 3104properties to create \"OrgSrcBlock\" paragraph style. Otherwise
3106use it's color attribute to create a character style whose name 3105use its color attribute to create a character style whose name
3107is obtained from FN. Currently all attributes of FN other than 3106is obtained from FN. Currently all attributes of FN other than
3108color are ignored. 3107color are ignored.
3109 3108
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index dcc9b790763..0126170ec82 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -963,7 +963,7 @@ holding contextual information."
963 (let* ((class (plist-get info :texinfo-class)) 963 (let* ((class (plist-get info :texinfo-class))
964 (level (org-export-get-relative-level headline info)) 964 (level (org-export-get-relative-level headline info))
965 (numberedp (org-export-numbered-headline-p headline info)) 965 (numberedp (org-export-numbered-headline-p headline info))
966 (class-sectionning (assoc class org-texinfo-classes)) 966 (class-sectioning (assoc class org-texinfo-classes))
967 ;; Find the index type, if any 967 ;; Find the index type, if any
968 (index (org-element-property :INDEX headline)) 968 (index (org-element-property :INDEX headline))
969 ;; Check if it is an appendix 969 ;; Check if it is an appendix
@@ -999,10 +999,10 @@ holding contextual information."
999 ;; Section formatting will set two placeholders: one for the 999 ;; Section formatting will set two placeholders: one for the
1000 ;; title and the other for the contents. 1000 ;; title and the other for the contents.
1001 (section-fmt 1001 (section-fmt
1002 (let ((sec (if (and (symbolp (nth 2 class-sectionning)) 1002 (let ((sec (if (and (symbolp (nth 2 class-sectioning))
1003 (fboundp (nth 2 class-sectionning))) 1003 (fboundp (nth 2 class-sectioning)))
1004 (funcall (nth 2 class-sectionning) level numberedp) 1004 (funcall (nth 2 class-sectioning) level numberedp)
1005 (nth (1+ level) class-sectionning)))) 1005 (nth (1+ level) class-sectioning))))
1006 (cond 1006 (cond
1007 ;; No section available for that LEVEL. 1007 ;; No section available for that LEVEL.
1008 ((not sec) nil) 1008 ((not sec) nil)
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 69dca685464..6b88f1a908b 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -2862,7 +2862,7 @@ The copy will preserve local variables, visibility, contents and
2862narrowing of the original buffer. If a region was active in 2862narrowing of the original buffer. If a region was active in
2863BUFFER, contents will be narrowed to that region instead. 2863BUFFER, contents will be narrowed to that region instead.
2864 2864
2865The resulting function can be evaled at a later time, from 2865The resulting function can be evaluated at a later time, from
2866another buffer, effectively cloning the original buffer there. 2866another buffer, effectively cloning the original buffer there.
2867 2867
2868The function assumes BUFFER's major mode is `org-mode'." 2868The function assumes BUFFER's major mode is `org-mode'."
@@ -4674,7 +4674,7 @@ INFO is a plist used as a communication channel."
4674 "Return TABLE-ROW number. 4674 "Return TABLE-ROW number.
4675INFO is a plist used as a communication channel. Return value is 4675INFO is a plist used as a communication channel. Return value is
4676zero-based and ignores separators. The function returns nil for 4676zero-based and ignores separators. The function returns nil for
4677special colums and separators." 4677special columns and separators."
4678 (when (and (eq (org-element-property :type table-row) 'standard) 4678 (when (and (eq (org-element-property :type table-row) 'standard)
4679 (not (org-export-table-row-is-special-p table-row info))) 4679 (not (org-export-table-row-is-special-p table-row info)))
4680 (let ((number 0)) 4680 (let ((number 0))
@@ -5866,7 +5866,7 @@ files or buffers, only the display.
5866 "Export dispatcher for Org mode. 5866 "Export dispatcher for Org mode.
5867 5867
5868It provides an access to common export related tasks in a buffer. 5868It provides an access to common export related tasks in a buffer.
5869Its interface comes in two flavours: standard and expert. 5869Its interface comes in two flavors: standard and expert.
5870 5870
5871While both share the same set of bindings, only the former 5871While both share the same set of bindings, only the former
5872displays the valid keys associations in a dedicated buffer. 5872displays the valid keys associations in a dedicated buffer.
@@ -5874,7 +5874,7 @@ Scrolling (resp. line-wise motion) in this buffer is done with
5874SPC and DEL (resp. C-n and C-p) keys. 5874SPC and DEL (resp. C-n and C-p) keys.
5875 5875
5876Set variable `org-export-dispatch-use-expert-ui' to switch to one 5876Set variable `org-export-dispatch-use-expert-ui' to switch to one
5877flavour or the other. 5877flavor or the other.
5878 5878
5879When ARG is \\[universal-argument], repeat the last export action, with the same set 5879When ARG is \\[universal-argument], repeat the last export action, with the same set
5880of options used back then, on the current buffer. 5880of options used back then, on the current buffer.