aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
authorPaul Eggert2015-09-17 16:08:20 -0700
committerPaul Eggert2015-09-17 16:09:39 -0700
commit284c470ef752967fcd8bae6a450dc138462b1e49 (patch)
tree83e8bcfe4c756e741ee9d4ecdf80f6b8d0e73c91 /lisp/org
parentd149ff5233805c0a09b6067e0cf27549291cc83a (diff)
downloademacs-284c470ef752967fcd8bae6a450dc138462b1e49.tar.gz
emacs-284c470ef752967fcd8bae6a450dc138462b1e49.zip
Backslash cleanup in Elisp source files
This patch should not change behavior. It typically omits backslashes where they are redundant (e.g., in the string literal "^\$"). In a few places, insert backslashes where they make regular expressions clearer: e.g., replace "^\*" (equivalent to "^*") with "^\\*", which has the same effect as a regular expression. Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs, and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with RCS IDs, as that makes it clearer that the backslash is intended.
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ob-core.el4
-rw-r--r--lisp/org/ob-dot.el2
-rw-r--r--lisp/org/ob-lilypond.el2
-rw-r--r--lisp/org/ob-lob.el8
-rw-r--r--lisp/org/ob-octave.el4
-rw-r--r--lisp/org/ob-ref.el4
-rw-r--r--lisp/org/ob-sql.el4
-rw-r--r--lisp/org/ob-sqlite.el2
-rw-r--r--lisp/org/ob-tangle.el2
-rw-r--r--lisp/org/org-agenda.el3
-rw-r--r--lisp/org/org-clock.el2
-rw-r--r--lisp/org/org-colview.el4
-rw-r--r--lisp/org/org-element.el20
-rw-r--r--lisp/org/org-footnote.el2
-rw-r--r--lisp/org/org-list.el28
-rw-r--r--lisp/org/org-table.el6
-rw-r--r--lisp/org/org.el62
-rw-r--r--lisp/org/ox-html.el2
-rw-r--r--lisp/org/ox-latex.el52
-rw-r--r--lisp/org/ox-man.el4
-rw-r--r--lisp/org/ox-odt.el38
-rw-r--r--lisp/org/ox-publish.el4
-rw-r--r--lisp/org/ox-texinfo.el40
-rw-r--r--lisp/org/ox.el56
24 files changed, 178 insertions, 177 deletions
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 799e58b6af2..11cd2530dd7 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -502,7 +502,7 @@ be saved in the second match data.")
502 502
503(defvar org-babel-result-w-name-regexp 503(defvar org-babel-result-w-name-regexp
504 (concat org-babel-result-regexp 504 (concat org-babel-result-regexp
505 "\\([^ ()\f\t\n\r\v]+\\)\\(\(\\(.*\\)\)\\|\\)")) 505 "\\([^ ()\f\t\n\r\v]+\\)\\((\\(.*\\))\\|\\)"))
506 506
507(defvar org-babel-min-lines-for-block-output 10 507(defvar org-babel-min-lines-for-block-output 10
508 "The minimum number of lines for block output. 508 "The minimum number of lines for block output.
@@ -2456,7 +2456,7 @@ block but are passed literally to the \"example-block\"."
2456 (setq index (point)) 2456 (setq index (point))
2457 (while (and (re-search-forward (org-babel-noweb-wrap) nil t)) 2457 (while (and (re-search-forward (org-babel-noweb-wrap) nil t))
2458 (save-match-data (setf source-name (match-string 1))) 2458 (save-match-data (setf source-name (match-string 1)))
2459 (save-match-data (setq evaluate (string-match "\(.*\)" source-name))) 2459 (save-match-data (setq evaluate (string-match "(.*)" source-name)))
2460 (save-match-data 2460 (save-match-data
2461 (setq prefix 2461 (setq prefix
2462 (buffer-substring (match-beginning 0) 2462 (buffer-substring (match-beginning 0)
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 21a40b34f49..f4953a39eac 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -53,7 +53,7 @@
53 (value (cdr pair))) 53 (value (cdr pair)))
54 (setq body 54 (setq body
55 (replace-regexp-in-string 55 (replace-regexp-in-string
56 (concat "\$" (regexp-quote name)) 56 (concat "$" (regexp-quote name))
57 (if (stringp value) value (format "%S" value)) 57 (if (stringp value) value (format "%S" value))
58 body)))) 58 body))))
59 vars) 59 vars)
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 5391edff5fc..04eab7c31dd 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -111,7 +111,7 @@ blocks")
111 (value (cdr pair))) 111 (value (cdr pair)))
112 (setq body 112 (setq body
113 (replace-regexp-in-string 113 (replace-regexp-in-string
114 (concat "\$" (regexp-quote name)) 114 (concat "$" (regexp-quote name))
115 (if (stringp value) value (format "%S" value)) 115 (if (stringp value) value (format "%S" value))
116 body)))) 116 body))))
117 vars) 117 vars)
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index b083011bbf2..c25470666c8 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -64,14 +64,14 @@ To add files to this list use the `org-babel-lob-ingest' command."
64 64
65(defconst org-babel-block-lob-one-liner-regexp 65(defconst org-babel-block-lob-one-liner-regexp
66 (concat 66 (concat
67 "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" 67 "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^()\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)"
68 "\(\\([^\n]*?\\)\)\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?") 68 "(\\([^\n]*?\\))\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?")
69 "Regexp to match non-inline calls to predefined source block functions.") 69 "Regexp to match non-inline calls to predefined source block functions.")
70 70
71(defconst org-babel-inline-lob-one-liner-regexp 71(defconst org-babel-inline-lob-one-liner-regexp
72 (concat 72 (concat
73 "\\([^\n]*?\\)call_\\([^\(\)\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)" 73 "\\([^\n]*?\\)call_\\([^()\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)"
74 "\(\\([^\n]*?\\)\)\\(\\[\\(.*?\\)\\]\\)?") 74 "(\\([^\n]*?\\))\\(\\[\\(.*?\\)\\]\\)?")
75 "Regexp to match inline calls to predefined source block functions.") 75 "Regexp to match inline calls to predefined source block functions.")
76 76
77(defconst org-babel-lob-one-liner-regexp 77(defconst org-babel-lob-one-liner-regexp
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index e0775dba3bd..7ad474dfb4d 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -61,7 +61,7 @@ if ischar(ans), fid = fopen('%s', 'w'); fprintf(fid, '%%s\\n', ans); fclose(fid)
61else, dlmwrite('%s', ans, '\\t') 61else, dlmwrite('%s', ans, '\\t')
62end") 62end")
63 63
64(defvar org-babel-octave-eoe-indicator "\'org_babel_eoe\'") 64(defvar org-babel-octave-eoe-indicator "'org_babel_eoe'")
65 65
66(defvar org-babel-octave-eoe-output "ans = org_babel_eoe") 66(defvar org-babel-octave-eoe-output "ans = org_babel_eoe")
67 67
@@ -127,7 +127,7 @@ specifying a variable of the same value."
127 (if (listp (car var)) "; " ",")) "]") 127 (if (listp (car var)) "; " ",")) "]")
128 (cond 128 (cond
129 ((stringp var) 129 ((stringp var)
130 (format "\'%s\'" var)) 130 (format "'%s'" var))
131 (t 131 (t
132 (format "%s" var))))) 132 (format "%s" var)))))
133 133
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 3e79592f5a0..5c1e13142da 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -138,7 +138,7 @@ the variable."
138 (setq ref (substring ref 0 (match-beginning 0)))) 138 (setq ref (substring ref 0 (match-beginning 0))))
139 ;; assign any arguments to pass to source block 139 ;; assign any arguments to pass to source block
140 (when (string-match 140 (when (string-match
141 "^\\(.+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)\(\\(.*\\)\)$" ref) 141 "^\\(.+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)(\\(.*\\))$" ref)
142 (setq new-refere (match-string 1 ref)) 142 (setq new-refere (match-string 1 ref))
143 (setq new-header-args (match-string 3 ref)) 143 (setq new-header-args (match-string 3 ref))
144 (setq new-referent (match-string 5 ref)) 144 (setq new-referent (match-string 5 ref))
@@ -224,7 +224,7 @@ returned, or an empty string or \"*\" both of which are
224interpreted to mean the entire range and as such are equivalent 224interpreted to mean the entire range and as such are equivalent
225to \"0:-1\"." 225to \"0:-1\"."
226 (if (and (> (length index) 0) (string-match "^\\([^,]*\\),?" index)) 226 (if (and (> (length index) 0) (string-match "^\\([^,]*\\),?" index))
227 (let* ((ind-re "\\(\\([-[:digit:]]+\\):\\([-[:digit:]]+\\)\\|\*\\)") 227 (let* ((ind-re "\\(\\([-[:digit:]]+\\):\\([-[:digit:]]+\\)\\|\\*\\)")
228 (lgth (length lis)) 228 (lgth (length lis))
229 (portion (match-string 1 index)) 229 (portion (match-string 1 index))
230 (remainder (substring index (match-end 0))) 230 (remainder (substring index (match-end 0)))
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 7ed61b153e7..6dff9adca86 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -106,7 +106,7 @@ This function is called by `org-babel-execute-src-block'."
106 ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" 106 ('dbi (format "dbish --batch %s < %s | sed '%s' > %s"
107 (or cmdline "") 107 (or cmdline "")
108 (org-babel-process-file-name in-file) 108 (org-babel-process-file-name in-file)
109 "/^+/d;s/^\|//;s/(NULL)/ /g;$d" 109 "/^+/d;s/^|//;s/(NULL)/ /g;$d"
110 (org-babel-process-file-name out-file))) 110 (org-babel-process-file-name out-file)))
111 ('monetdb (format "mclient -f tab %s < %s > %s" 111 ('monetdb (format "mclient -f tab %s < %s > %s"
112 (or cmdline "") 112 (or cmdline "")
@@ -186,7 +186,7 @@ This function is called by `org-babel-execute-src-block'."
186 (lambda (pair) 186 (lambda (pair)
187 (setq body 187 (setq body
188 (replace-regexp-in-string 188 (replace-regexp-in-string
189 (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! 189 (format "$%s" (car pair))
190 (let ((val (cdr pair))) 190 (let ((val (cdr pair)))
191 (if (listp val) 191 (if (listp val)
192 (let ((data-file (org-babel-temp-file "sql-data-"))) 192 (let ((data-file (org-babel-temp-file "sql-data-")))
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 33c8d9b59fc..18d7fc8fd6a 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -119,7 +119,7 @@ This function is called by `org-babel-execute-src-block'."
119 (lambda (pair) 119 (lambda (pair)
120 (setq body 120 (setq body
121 (replace-regexp-in-string 121 (replace-regexp-in-string
122 (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! 122 (format "$%s" (car pair))
123 (let ((val (cdr pair))) 123 (let ((val (cdr pair)))
124 (if (listp val) 124 (if (listp val)
125 (let ((data-file (org-babel-temp-file "sqlite-data-"))) 125 (let ((data-file (org-babel-temp-file "sqlite-data-")))
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index c0846f9cd82..732522c3773 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -302,7 +302,7 @@ Insert the source-code specified by SPEC into the current source
302code file. This function uses `comment-region' which assumes 302code file. This function uses `comment-region' which assumes
303that the appropriate major-mode is set. SPEC has the form: 303that the appropriate major-mode is set. SPEC has the form:
304 304
305 \(start-line file link source-name params body comment)" 305 (start-line file link source-name params body comment)"
306 (let* ((start-line (nth 0 spec)) 306 (let* ((start-line (nth 0 spec))
307 (file (nth 1 spec)) 307 (file (nth 1 spec))
308 (link (nth 2 spec)) 308 (link (nth 2 spec))
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index ae5a252d8af..0b3be562489 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -4603,7 +4603,8 @@ in `org-agenda-text-search-extra-files'."
4603 (goto-char (1- end)) 4603 (goto-char (1- end))
4604 (throw :skip t))) 4604 (throw :skip t)))
4605 (if todo-only 4605 (if todo-only
4606 (cons (concat "^\*+[ \t]+" org-not-done-regexp) 4606 (cons (concat "^\\*+[ \t]+"
4607 org-not-done-regexp)
4607 regexps+) 4608 regexps+)
4608 regexps+)) 4609 regexps+))
4609 (goto-char beg) 4610 (goto-char beg)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 9489edf98bf..b386eb11652 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1235,7 +1235,7 @@ make this the default behavior.)"
1235 (looking-at 1235 (looking-at
1236 (concat "^[ \t]*" org-clock-string 1236 (concat "^[ \t]*" org-clock-string
1237 " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}" 1237 " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}"
1238 " *\\sw+\.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$"))) 1238 " *\\sw+.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")))
1239 (message "Matched %s" (match-string 1)) 1239 (message "Matched %s" (match-string 1))
1240 (setq ts (concat "[" (match-string 1) "]")) 1240 (setq ts (concat "[" (match-string 1) "]"))
1241 (goto-char (match-end 1)) 1241 (goto-char (match-end 1))
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index e938ab4ae4b..396aa3711d3 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -354,7 +354,7 @@ CPHR is the complex heading regexp to use for parsing ITEM."
354 (let (fixitem) 354 (let (fixitem)
355 (if (not cphr) 355 (if (not cphr)
356 item 356 item
357 (unless (string-match "^\*+ " item) 357 (unless (string-match "^\\*+ " item)
358 (setq item (concat "* " item) fixitem t)) 358 (setq item (concat "* " item) fixitem t))
359 (if (string-match cphr item) 359 (if (string-match cphr item)
360 (setq item 360 (setq item
@@ -369,7 +369,7 @@ CPHR is the complex heading regexp to use for parsing ITEM."
369 0 (1+ (match-end 1)) 369 0 (1+ (match-end 1))
370 (list 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1)))))) 370 (list 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1))))))
371 item)) 371 item))
372 (if fixitem (replace-regexp-in-string "^\*+ " "" item) item)))) 372 (if fixitem (replace-regexp-in-string "^\\*+ " "" item) item))))
373 373
374(defun org-columns-compact-links (s) 374(defun org-columns-compact-links (s)
375 "Replace [[link][desc]] with [desc] or [link]." 375 "Replace [[link][desc]] with [desc] or [link]."
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 573d7eeca2d..9f4cfa3ec66 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -4141,30 +4141,30 @@ Assuming TREE is a variable containing an Org buffer parse tree,
4141the following example will return a flat list of all `src-block' 4141the following example will return a flat list of all `src-block'
4142and `example-block' elements in it: 4142and `example-block' elements in it:
4143 4143
4144 \(org-element-map tree \\='(example-block src-block) \\='identity) 4144 (org-element-map tree \\='(example-block src-block) \\='identity)
4145 4145
4146The following snippet will find the first headline with a level 4146The following snippet will find the first headline with a level
4147of 1 and a \"phone\" tag, and will return its beginning position: 4147of 1 and a \"phone\" tag, and will return its beginning position:
4148 4148
4149 \(org-element-map tree \\='headline 4149 (org-element-map tree \\='headline
4150 \(lambda (hl) 4150 (lambda (hl)
4151 \(and (= (org-element-property :level hl) 1) 4151 (and (= (org-element-property :level hl) 1)
4152 \(member \"phone\" (org-element-property :tags hl)) 4152 (member \"phone\" (org-element-property :tags hl))
4153 \(org-element-property :begin hl))) 4153 (org-element-property :begin hl)))
4154 nil t) 4154 nil t)
4155 4155
4156The next example will return a flat list of all `plain-list' type 4156The next example will return a flat list of all `plain-list' type
4157elements in TREE that are not a sub-list themselves: 4157elements in TREE that are not a sub-list themselves:
4158 4158
4159 \(org-element-map tree \\='plain-list \\='identity nil nil \\='plain-list) 4159 (org-element-map tree \\='plain-list \\='identity nil nil \\='plain-list)
4160 4160
4161Eventually, this example will return a flat list of all `bold' 4161Eventually, this example will return a flat list of all `bold'
4162type objects containing a `latex-snippet' type object, even 4162type objects containing a `latex-snippet' type object, even
4163looking into captions: 4163looking into captions:
4164 4164
4165 \(org-element-map tree \\='bold 4165 (org-element-map tree \\='bold
4166 \(lambda (b) 4166 (lambda (b)
4167 \(and (org-element-map b \\='latex-snippet \\='identity nil t) b)) 4167 (and (org-element-map b \\='latex-snippet \\='identity nil t) b))
4168 nil nil nil t)" 4168 nil nil nil t)"
4169 ;; Ensure TYPES and NO-RECURSION are a list, even of one element. 4169 ;; Ensure TYPES and NO-RECURSION are a list, even of one element.
4170 (unless (listp types) (setq types (list types))) 4170 (unless (listp types) (setq types (list types)))
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 0f086975aa7..5d853e62bc1 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -243,7 +243,7 @@ positions, and the definition, when inlined."
243 243
244This matches only pure definitions like [1] or [fn:name] at the 244This matches only pure definitions like [1] or [fn:name] at the
245beginning of a line. It does not match references like 245beginning of a line. It does not match references like
246\[fn:name:definition], where the footnote text is included and 246[fn:name:definition], where the footnote text is included and
247defined locally. 247defined locally.
248 248
249The return value will be nil if not at a footnote definition, and 249The return value will be nil if not at a footnote definition, and
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 28bed8dcc59..c8266500fe3 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -230,7 +230,7 @@ This variable needs to be set before org.el is loaded. If you
230need to make a change while Emacs is running, use the customize 230need to make a change while Emacs is running, use the customize
231interface or run the following code after updating it: 231interface or run the following code after updating it:
232 232
233 \(when (featurep \\='org-element) (load \"org-element\" t t))" 233 (when (featurep \\='org-element) (load \"org-element\" t t))"
234 :group 'org-plain-lists 234 :group 'org-plain-lists
235 :version "24.1" 235 :version "24.1"
236 :type 'boolean 236 :type 'boolean
@@ -620,11 +620,11 @@ point-at-bol:
620 620
621will get the following structure: 621will get the following structure:
622 622
623\(\(1 0 \"- \" nil \"[X]\" nil 97\) 623 ((1 0 \"- \" nil \"[X]\" nil 97)
624 \(18 2 \"1. \" nil nil nil 34\) 624 (18 2 \"1. \" nil nil nil 34)
625 \(34 2 \"5. \" \"5\" nil nil 55\) 625 (34 2 \"5. \" \"5\" nil nil 55)
626 \(97 0 \"- \" nil nil nil 131\) 626 (97 0 \"- \" nil nil nil 131)
627 \(109 2 \"+ \" nil nil \"tag\" 131\) 627 (109 2 \"+ \" nil nil \"tag\" 131))
628 628
629Assume point is at an item." 629Assume point is at an item."
630 (save-excursion 630 (save-excursion
@@ -2015,7 +2015,7 @@ previous item, plus ARGS extra arguments.
2015 2015
2016FUNCTION is applied on items in reverse order. 2016FUNCTION is applied on items in reverse order.
2017 2017
2018As an example, \(org-apply-on-list \(lambda \(result\) \(1+ result\)\) 0\) 2018As an example, \(org-apply-on-list \(lambda \(result) \(1+ result)) 0)
2019will return the number of items in the current list. 2019will return the number of items in the current list.
2020 2020
2021Sublists of the list are skipped. Cursor is always at the 2021Sublists of the list are skipped. Cursor is always at the
@@ -2931,13 +2931,13 @@ For example, the following list:
2931 2931
2932will be parsed as: 2932will be parsed as:
2933 2933
2934\(ordered 2934 (ordered
2935 \(nil \"first item\" 2935 (nil \"first item\"
2936 \(unordered 2936 (unordered
2937 \(nil \"sub-item one\"\) 2937 (nil \"sub-item one\")
2938 \(nil \"[CBON] sub-item two\"\)\) 2938 (nil \"[CBON] sub-item two\"))
2939 \"more text in first item\"\) 2939 \"more text in first item\")
2940 \(3 \"last item\"\)\) 2940 (3 \"last item\"))
2941 2941
2942Point is left at list end." 2942Point is left at list end."
2943 (defvar parse-item) ;FIXME: Or use `cl-labels' or `letrec'. 2943 (defvar parse-item) ;FIXME: Or use `cl-labels' or `letrec'.
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 478ad933ae2..174e36ed632 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -440,8 +440,8 @@ available parameters."
440 "Check if the table has a marking column. 440 "Check if the table has a marking column.
441If yes remove the column and the special lines." 441If yes remove the column and the special lines."
442 (let ((special (if maybe-quoted 442 (let ((special (if maybe-quoted
443 "^[ \t]*| *\\\\?[\#!$*_^/ ] *|" 443 "^[ \t]*| *\\\\?[#!$*_^/ ] *|"
444 "^[ \t]*| *[\#!$*_^/ ] *|")) 444 "^[ \t]*| *[#!$*_^/ ] *|"))
445 (ignore (if maybe-quoted 445 (ignore (if maybe-quoted
446 "^[ \t]*| *\\\\?[!$_^/] *|" 446 "^[ \t]*| *\\\\?[!$_^/] *|"
447 "^[ \t]*| *[!$_^/] *|"))) 447 "^[ \t]*| *[!$_^/] *|")))
@@ -3248,7 +3248,7 @@ formulas that use a range of rows or columns, it may often be better
3248to anchor the formula with \"I\" row markers, or to offset from the 3248to anchor the formula with \"I\" row markers, or to offset from the
3249borders of the table using the @< @> $< $> makers." 3249borders of the table using the @< @> $< $> makers."
3250 (let (n nmax len char (start 0)) 3250 (let (n nmax len char (start 0))
3251 (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^\)]+)\\)" 3251 (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^)]+)\\)"
3252 s start) 3252 s start)
3253 (if (match-end 3) 3253 (if (match-end 3)
3254 (setq start (match-end 3)) 3254 (setq start (match-end 3))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c7b64cccb19..7a6d6cc1b3f 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -381,7 +381,7 @@ core modules, nor modules from the CONTRIB directory). Just add symbols
381to the end of the list. If the package is called org-xyz.el, then you need 381to the end of the list. If the package is called org-xyz.el, then you need
382to add the symbol `xyz', and the package must have a call to: 382to add the symbol `xyz', and the package must have a call to:
383 383
384 \(provide \\='org-xyz) 384 (provide \\='org-xyz)
385 385
386For export specific modules, see also `org-export-backends'." 386For export specific modules, see also `org-export-backends'."
387 :group 'org 387 :group 'org
@@ -465,26 +465,26 @@ need to make a change while Emacs is running, use the customize
465interface or run the following code, where VAL stands for the new 465interface or run the following code, where VAL stands for the new
466value of the variable, after updating it: 466value of the variable, after updating it:
467 467
468 \(progn 468 (progn
469 \(setq org-export--registered-backends 469 (setq org-export--registered-backends
470 \(org-remove-if-not 470 (org-remove-if-not
471 \(lambda (backend) 471 (lambda (backend)
472 \(let ((name (org-export-backend-name backend))) 472 (let ((name (org-export-backend-name backend)))
473 \(or (memq name val) 473 (or (memq name val)
474 \(catch \\='parentp 474 (catch \\='parentp
475 \(dolist (b val) 475 (dolist (b val)
476 \(and (org-export-derived-backend-p b name) 476 (and (org-export-derived-backend-p b name)
477 \(throw \\='parentp t))))))) 477 (throw \\='parentp t)))))))
478 org-export--registered-backends)) 478 org-export--registered-backends))
479 \(let ((new-list (mapcar \\='org-export-backend-name 479 (let ((new-list (mapcar \\='org-export-backend-name
480 org-export--registered-backends))) 480 org-export--registered-backends)))
481 \(dolist (backend val) 481 (dolist (backend val)
482 \(cond 482 (cond
483 \((not (load (format \"ox-%s\" backend) t t)) 483 ((not (load (format \"ox-%s\" backend) t t))
484 \(message \"Problems while trying to load export back-end \\=`%s\\='\" 484 (message \"Problems while trying to load export back-end \\=`%s\\='\"
485 backend)) 485 backend))
486 \((not (memq backend new-list)) (push backend new-list)))) 486 ((not (memq backend new-list)) (push backend new-list))))
487 \(set-default \\='org-export-backends new-list))) 487 (set-default \\='org-export-backends new-list)))
488 488
489Adding a back-end to this list will also pull the back-end it 489Adding a back-end to this list will also pull the back-end it
490depends on, if any." 490depends on, if any."
@@ -2957,7 +2957,7 @@ its value is 0.
2957 2957
2958For example, 2958For example,
2959 2959
2960 \(:days \"%dd\" :hours \"%d\" :require-hours t :minutes \":%02d\" 2960 (:days \"%dd\" :hours \"%d\" :require-hours t :minutes \":%02d\"
2961 :require-minutes t) 2961 :require-minutes t)
2962 2962
2963means durations longer than a day will be expressed in days, 2963means durations longer than a day will be expressed in days,
@@ -2967,7 +2967,7 @@ hour).
2967 2967
2968The value 2968The value
2969 2969
2970 \(:days \"%dd\" :minutes \"%dm\") 2970 (:days \"%dd\" :minutes \"%dm\")
2971 2971
2972means durations longer than a day will be expressed in days and 2972means durations longer than a day will be expressed in days and
2973minutes, and durations less than a day will be expressed entirely 2973minutes, and durations less than a day will be expressed entirely
@@ -3802,8 +3802,8 @@ images at the same place."
3802 3802
3803(defcustom org-format-latex-header "\\documentclass{article} 3803(defcustom org-format-latex-header "\\documentclass{article}
3804\\usepackage[usenames]{color} 3804\\usepackage[usenames]{color}
3805\[PACKAGES] 3805[PACKAGES]
3806\[DEFAULT-PACKAGES] 3806[DEFAULT-PACKAGES]
3807\\pagestyle{empty} % do not remove 3807\\pagestyle{empty} % do not remove
3808% The settings below are copied from fullpage.sty 3808% The settings below are copied from fullpage.sty
3809\\setlength{\\textwidth}{\\paperwidth} 3809\\setlength{\\textwidth}{\\paperwidth}
@@ -3889,7 +3889,7 @@ a string.
3889 3889
3890A cell is of the format: 3890A cell is of the format:
3891 3891
3892 \( \"options\" \"package\" SNIPPET-FLAG). 3892 ( \"options\" \"package\" SNIPPET-FLAG).
3893 3893
3894If SNIPPET-FLAG is non-nil, the package also needs to be included 3894If SNIPPET-FLAG is non-nil, the package also needs to be included
3895when compiling LaTeX snippets into images for inclusion into 3895when compiling LaTeX snippets into images for inclusion into
@@ -3917,7 +3917,7 @@ Each element is either a cell or a string.
3917 3917
3918A cell is of the format: 3918A cell is of the format:
3919 3919
3920 \(\"options\" \"package\" SNIPPET-FLAG) 3920 (\"options\" \"package\" SNIPPET-FLAG)
3921 3921
3922SNIPPET-FLAG, when non-nil, indicates that this package is also 3922SNIPPET-FLAG, when non-nil, indicates that this package is also
3923needed when turning LaTeX snippets into images for inclusion into 3923needed when turning LaTeX snippets into images for inclusion into
@@ -7302,7 +7302,7 @@ Optional arguments START and END can be used to limit the range."
7302(defconst org-goto-help 7302(defconst org-goto-help
7303 "Browse buffer copy, to find location or copy text.%s 7303 "Browse buffer copy, to find location or copy text.%s
7304RET=jump to location C-g=quit and return to previous location 7304RET=jump to location C-g=quit and return to previous location
7305\[Up]/[Down]=next/prev headline TAB=cycle visibility [/] org-occur") 7305[Up]/[Down]=next/prev headline TAB=cycle visibility [/] org-occur")
7306 7306
7307(defvar org-goto-start-pos) ; dynamically scoped parameter 7307(defvar org-goto-start-pos) ; dynamically scoped parameter
7308 7308
@@ -7682,7 +7682,7 @@ command."
7682 (re-search-forward org-outline-regexp-bol) 7682 (re-search-forward org-outline-regexp-bol)
7683 (beginning-of-line 0)) 7683 (beginning-of-line 0))
7684 (skip-chars-backward " \r\n") 7684 (skip-chars-backward " \r\n")
7685 (and (not (looking-back "^\*+" (line-beginning-position))) 7685 (and (not (looking-back "^\\*+" (line-beginning-position)))
7686 (looking-at "[ \t]+") (replace-match "")) 7686 (looking-at "[ \t]+") (replace-match ""))
7687 (unless (eobp) (forward-char 1)) 7687 (unless (eobp) (forward-char 1))
7688 (when (looking-at "^\\*") 7688 (when (looking-at "^\\*")
@@ -11389,7 +11389,7 @@ on the system \"/user@host:\"."
11389 (setq level (org-reduced-level 11389 (setq level (org-reduced-level
11390 (- (match-end 1) (match-beginning 1))) 11390 (- (match-end 1) (match-beginning 1)))
11391 txt (org-link-display-format (match-string 4)) 11391 txt (org-link-display-format (match-string 4))
11392 txt (replace-regexp-in-string "\\( *\[[0-9]+/?[0-9]*%?\]\\)+$" "" txt) 11392 txt (replace-regexp-in-string "\\( *[[0-9]+/?[0-9]*%?]\\)+$" "" txt)
11393 re (format org-complex-heading-regexp-format 11393 re (format org-complex-heading-regexp-format
11394 (regexp-quote (match-string 4)))) 11394 (regexp-quote (match-string 4))))
11395 (when org-refile-use-outline-path 11395 (when org-refile-use-outline-path
@@ -16355,7 +16355,7 @@ While prompting, a calendar is popped up - you can also select the
16355date with the mouse (button 1). The calendar shows a period of three 16355date with the mouse (button 1). The calendar shows a period of three
16356months. To scroll it to other months, use the keys `>' and `<'. 16356months. To scroll it to other months, use the keys `>' and `<'.
16357If you don't like the calendar, turn it off with 16357If you don't like the calendar, turn it off with
16358 \(setq org-read-date-popup-calendar nil) 16358 (setq org-read-date-popup-calendar nil)
16359 16359
16360With optional argument TO-TIME, the date will immediately be converted 16360With optional argument TO-TIME, the date will immediately be converted
16361to an internal time. 16361to an internal time.
@@ -17912,7 +17912,7 @@ If EXCLUDE-TMP is non-nil, ignore temporary buffers."
17912 ((eq predicate 'files) 17912 ((eq predicate 'files)
17913 (lambda (b) (with-current-buffer b (derived-mode-p 'org-mode)))) 17913 (lambda (b) (with-current-buffer b (derived-mode-p 'org-mode))))
17914 ((eq predicate 'export) 17914 ((eq predicate 'export)
17915 (lambda (b) (string-match "\*Org .*Export" (buffer-name b)))) 17915 (lambda (b) (string-match "\\*Org .*Export" (buffer-name b))))
17916 ((eq predicate 'agenda) 17916 ((eq predicate 'agenda)
17917 (lambda (b) 17917 (lambda (b)
17918 (with-current-buffer b 17918 (with-current-buffer b
@@ -17921,7 +17921,7 @@ If EXCLUDE-TMP is non-nil, ignore temporary buffers."
17921 (member (file-truename bfn) agenda-files))))) 17921 (member (file-truename bfn) agenda-files)))))
17922 (t (lambda (b) (with-current-buffer b 17922 (t (lambda (b) (with-current-buffer b
17923 (or (derived-mode-p 'org-mode) 17923 (or (derived-mode-p 'org-mode)
17924 (string-match "\*Org .*Export" 17924 (string-match "\\*Org .*Export"
17925 (buffer-name b))))))))) 17925 (buffer-name b)))))))))
17926 (delq nil 17926 (delq nil
17927 (mapcar 17927 (mapcar
@@ -23005,7 +23005,7 @@ no special treatment. In particular, a simple \\[universal-argument] prefix \
23005will just 23005will just
23006plainly yank the text as it is. 23006plainly yank the text as it is.
23007 23007
23008\[1] The test checks if the first non-white line is a heading 23008[1] The test checks if the first non-white line is a heading
23009 and if there are no other headings with fewer stars." 23009 and if there are no other headings with fewer stars."
23010 (interactive "P") 23010 (interactive "P")
23011 (org-yank-generic 'yank arg)) 23011 (org-yank-generic 'yank arg))
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index fc4f574a4c4..2b2d92ee2fc 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -2598,7 +2598,7 @@ Bind `org-html-standalone-image-predicate' to constrain paragraph
2598further. For example, to check for only captioned standalone 2598further. For example, to check for only captioned standalone
2599images, set it to: 2599images, set it to:
2600 2600
2601 \(lambda (paragraph) (org-element-property :caption paragraph))" 2601 (lambda (paragraph) (org-element-property :caption paragraph))"
2602 (let ((paragraph (case (org-element-type element) 2602 (let ((paragraph (case (org-element-type element)
2603 (paragraph element) 2603 (paragraph element)
2604 (link (org-export-get-parent element))))) 2604 (link (org-export-get-parent element)))))
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index cea02ff4548..91a864eee6e 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -212,9 +212,9 @@
212If #+LATEX_CLASS is set in the buffer, use its value and the 212If #+LATEX_CLASS is set in the buffer, use its value and the
213associated information. Here is the structure of each cell: 213associated information. Here is the structure of each cell:
214 214
215 \(class-name 215 (class-name
216 header-string 216 header-string
217 \(numbered-section . unnumbered-section) 217 (numbered-section . unnumbered-section)
218 ...) 218 ...)
219 219
220The header string 220The header string
@@ -281,11 +281,11 @@ section string and will be replaced by the title of the section.
281Instead of a cons cell (numbered . unnumbered), you can also 281Instead of a cons cell (numbered . unnumbered), you can also
282provide a list of 2 or 4 elements, 282provide a list of 2 or 4 elements,
283 283
284 \(numbered-open numbered-close) 284 (numbered-open numbered-close)
285 285
286or 286or
287 287
288 \(numbered-open numbered-close unnumbered-open unnumbered-close) 288 (numbered-open numbered-close unnumbered-open unnumbered-close)
289 289
290providing opening and closing strings for a LaTeX environment 290providing opening and closing strings for a LaTeX environment
291that should represent the document section. The opening clause 291that should represent the document section. The opening clause
@@ -591,18 +591,18 @@ The function should return the string to be exported.
591For example, the variable could be set to the following function 591For example, the variable could be set to the following function
592in order to mimic default behavior: 592in order to mimic default behavior:
593 593
594\(defun org-latex-format-inlinetask \(todo type priority name tags contents\) 594\(defun org-latex-format-inlinetask (todo type priority name tags contents)
595\"Format an inline task element for LaTeX export.\" 595\"Format an inline task element for LaTeX export.\"
596 \(let ((full-title 596 (let ((full-title
597 \(concat 597 (concat
598 \(when todo 598 (when todo
599 \(format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo)) 599 (format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo))
600 \(when priority (format \"\\\\framebox{\\\\#%c} \" priority)) 600 (when priority (format \"\\\\framebox{\\\\#%c} \" priority))
601 title 601 title
602 \(when tags 602 (when tags
603 \(format \"\\\\hfill{}\\\\textsc{:%s:}\" 603 (format \"\\\\hfill{}\\\\textsc{:%s:}\"
604 \(mapconcat \\='identity tags \":\"))))) 604 (mapconcat \\='identity tags \":\")))))
605 \(format (concat \"\\\\begin{center}\\n\" 605 (format (concat \"\\\\begin{center}\\n\"
606 \"\\\\fbox{\\n\" 606 \"\\\\fbox{\\n\"
607 \"\\\\begin{minipage}[c]{.6\\\\textwidth}\\n\" 607 \"\\\\begin{minipage}[c]{.6\\\\textwidth}\\n\"
608 \"%s\\n\\n\" 608 \"%s\\n\\n\"
@@ -626,21 +626,21 @@ listings package, and if you want to have color, the color
626package. Just add these to `org-latex-packages-alist', for 626package. Just add these to `org-latex-packages-alist', for
627example using customize, or with something like: 627example using customize, or with something like:
628 628
629 \(require \\='ox-latex) 629 (require \\='ox-latex)
630 \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\")) 630 (add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\"))
631 \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\")) 631 (add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\"))
632 632
633Alternatively, 633Alternatively,
634 634
635 \(setq org-latex-listings \\='minted) 635 (setq org-latex-listings \\='minted)
636 636
637causes source code to be exported using the minted package as 637causes source code to be exported using the minted package as
638opposed to listings. If you want to use minted, you need to add 638opposed to listings. If you want to use minted, you need to add
639the minted package to `org-latex-packages-alist', for example 639the minted package to `org-latex-packages-alist', for example
640using customize, or with 640using customize, or with
641 641
642 \(require \\='ox-latex) 642 (require \\='ox-latex)
643 \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"minted\")) 643 (add-to-list \\='org-latex-packages-alist \\='(\"\" \"minted\"))
644 644
645In addition, it is necessary to install pygments 645In addition, it is necessary to install pygments
646\(http://pygments.org), and to configure the variable 646\(http://pygments.org), and to configure the variable
@@ -689,9 +689,9 @@ These options are supplied as a comma-separated list to the
689a list containing two strings: the name of the option, and the 689a list containing two strings: the name of the option, and the
690value. For example, 690value. For example,
691 691
692 \(setq org-latex-listings-options 692 (setq org-latex-listings-options
693 '((\"basicstyle\" \"\\\\small\") 693 '((\"basicstyle\" \"\\\\small\")
694 \(\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\"))) 694 (\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\")))
695 695
696will typeset the code in a small size font with underlined, bold 696will typeset the code in a small size font with underlined, bold
697black keywords. 697black keywords.
@@ -736,8 +736,8 @@ These options are supplied within square brackets in
736be a list containing two strings: the name of the option, and the 736be a list containing two strings: the name of the option, and the
737value. For example, 737value. For example,
738 738
739 \(setq org-latex-minted-options 739 (setq org-latex-minted-options
740 '\((\"bgcolor\" \"bg\") \(\"frame\" \"lines\"))) 740 '((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
741 741
742will result in src blocks being exported with 742will result in src blocks being exported with
743 743
@@ -757,8 +757,8 @@ options will be applied to blocks of all languages."
757It is used during export of src blocks by the listings and minted 757It is used during export of src blocks by the listings and minted
758latex packages. For example, 758latex packages. For example,
759 759
760 \(setq org-latex-custom-lang-environments 760 (setq org-latex-custom-lang-environments
761 '\(\(python \"pythoncode\"\)\)\) 761 '((python \"pythoncode\")))
762 762
763would have the effect that if org encounters begin_src python 763would have the effect that if org encounters begin_src python
764during latex export it will output 764during latex export it will output
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index 8b4ddc7e651..d7adcd5486d 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -206,8 +206,8 @@ in this list - but it does not hurt if it is present."
206It is used during export of src blocks by the listings and 206It is used during export of src blocks by the listings and
207man packages. For example, 207man packages. For example,
208 208
209 \(setq org-man-custom-lang-environments 209 (setq org-man-custom-lang-environments
210 '\(\(python \"pythoncode\"\)\)\) 210 '((python \"pythoncode\")))
211 211
212would have the effect that if org encounters begin_src python 212would have the effect that if org encounters begin_src python
213during man export." 213during man export."
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index a0281420317..1ee201ba23f 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -231,13 +231,13 @@ standard Emacs.")
231(defvar org-odt-automatic-styles '() 231(defvar org-odt-automatic-styles '()
232 "Registry of automatic styles for various OBJECT-TYPEs. 232 "Registry of automatic styles for various OBJECT-TYPEs.
233The variable has the following form: 233The variable has the following form:
234\(\(OBJECT-TYPE-A 234 ((OBJECT-TYPE-A
235 \(\(OBJECT-NAME-A.1 OBJECT-PROPS-A.1\) 235 ((OBJECT-NAME-A.1 OBJECT-PROPS-A.1)
236 \(OBJECT-NAME-A.2 OBJECT-PROPS-A.2\) ...\)\) 236 (OBJECT-NAME-A.2 OBJECT-PROPS-A.2) ...))
237 \(OBJECT-TYPE-B 237 (OBJECT-TYPE-B
238 \(\(OBJECT-NAME-B.1 OBJECT-PROPS-B.1\) 238 ((OBJECT-NAME-B.1 OBJECT-PROPS-B.1)
239 \(OBJECT-NAME-B.2 OBJECT-PROPS-B.2\) ...\)\) 239 (OBJECT-NAME-B.2 OBJECT-PROPS-B.2) ...))
240 ...\). 240 ...).
241 241
242OBJECT-TYPEs could be \"Section\", \"Table\", \"Figure\" etc. 242OBJECT-TYPEs could be \"Section\", \"Table\", \"Figure\" etc.
243OBJECT-PROPS is (typically) a plist created by passing 243OBJECT-PROPS is (typically) a plist created by passing
@@ -292,7 +292,7 @@ according to the default face identified by the `htmlfontify'.")
292 292
293This is an alist where each element is of the form: 293This is an alist where each element is of the form:
294 294
295 \(STYLE-NAME ATTACH-FMT REF-MODE REF-FMT) 295 (STYLE-NAME ATTACH-FMT REF-MODE REF-FMT)
296 296
297ATTACH-FMT controls how labels and captions are attached to an 297ATTACH-FMT controls how labels and captions are attached to an
298entity. It may contain following specifiers - %e and %c. %e is 298entity. It may contain following specifiers - %e and %c. %e is
@@ -319,7 +319,7 @@ See also `org-odt-format-label'.")
319 319
320This is a list where each entry is of the form: 320This is a list where each entry is of the form:
321 321
322 \(CATEGORY-HANDLE OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE) 322 (CATEGORY-HANDLE OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE)
323 323
324CATEGORY_HANDLE identifies the captionable entity in question. 324CATEGORY_HANDLE identifies the captionable entity in question.
325 325
@@ -670,11 +670,11 @@ The default value simply returns the value of CONTENTS."
670 "Function to format headline text. 670 "Function to format headline text.
671 671
672This function will be called with 5 arguments: 672This function will be called with 5 arguments:
673TODO the todo keyword \(string or nil\). 673TODO the todo keyword (string or nil).
674TODO-TYPE the type of todo \(symbol: `todo', `done', nil\) 674TODO-TYPE the type of todo (symbol: `todo', `done', nil)
675PRIORITY the priority of the headline \(integer or nil\) 675PRIORITY the priority of the headline (integer or nil)
676TEXT the main headline text \(string\). 676TEXT the main headline text (string).
677TAGS the tags string, separated with colons \(string or nil\). 677TAGS the tags string, separated with colons (string or nil).
678 678
679The function result will be used as headline text." 679The function result will be used as headline text."
680 :group 'org-export-odt 680 :group 'org-export-odt
@@ -852,11 +852,11 @@ ON-OR-OFF := t | nil
852For example, with the following configuration 852For example, with the following configuration
853 853
854\(setq org-odt-table-styles 854\(setq org-odt-table-styles
855 '\(\(\"TableWithHeaderRowsAndColumns\" \"Custom\" 855 '((\"TableWithHeaderRowsAndColumns\" \"Custom\"
856 \(\(use-first-row-styles . t\) 856 ((use-first-row-styles . t)
857 \(use-first-column-styles . t\)\)\) 857 (use-first-column-styles . t)))
858 \(\"TableWithHeaderColumns\" \"Custom\" 858 (\"TableWithHeaderColumns\" \"Custom\"
859 \(\(use-first-column-styles . t\)\)\)\)\) 859 ((use-first-column-styles . t)))))
860 860
8611. A table associated with \"TableWithHeaderRowsAndColumns\" 8611. A table associated with \"TableWithHeaderRowsAndColumns\"
862 style will use the following table-cell styles - 862 style will use the following table-cell styles -
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 08762fbbfdd..52d925adbf9 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -69,12 +69,12 @@ CDR of each element is in one of the following forms:
69 alternating keys and values, specifying parameters for the 69 alternating keys and values, specifying parameters for the
70 publishing process. 70 publishing process.
71 71
72 \(:property value :property value ... ) 72 (:property value :property value ... )
73 73
742. A meta-project definition, specifying of a list of 742. A meta-project definition, specifying of a list of
75 sub-projects: 75 sub-projects:
76 76
77 \(:components (\"project-1\" \"project-2\" ...)) 77 (:components (\"project-1\" \"project-2\" ...))
78 78
79When the CDR of an element of org-publish-project-alist is in 79When the CDR of an element of org-publish-project-alist is in
80this second form, the elements of the list after `:components' 80this second form, the elements of the list after `:components'
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index d5e650afb79..5130329d4b4 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -137,9 +137,9 @@ If nil it will default to `buffer-file-coding-system'."
137If #+TEXINFO_CLASS is set in the buffer, use its value and the 137If #+TEXINFO_CLASS is set in the buffer, use its value and the
138associated information. Here is the structure of each cell: 138associated information. Here is the structure of each cell:
139 139
140 \(class-name 140 (class-name
141 header-string 141 header-string
142 \(numbered-section . unnumbered-section) 142 (numbered-section . unnumbered-section)
143 ...) 143 ...)
144 144
145 145
@@ -210,14 +210,14 @@ order to reproduce the default set-up:
210 210
211\(defun org-texinfo-format-headline (todo todo-type priority text tags) 211\(defun org-texinfo-format-headline (todo todo-type priority text tags)
212 \"Default format function for a headline.\" 212 \"Default format function for a headline.\"
213 \(concat (when todo 213 (concat (when todo
214 \(format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo)) 214 (format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo))
215 \(when priority 215 (when priority
216 \(format \"\\\\framebox{\\\\#%c} \" priority)) 216 (format \"\\\\framebox{\\\\#%c} \" priority))
217 text 217 text
218 \(when tags 218 (when tags
219 \(format \"\\\\hfill{}\\\\textsc{%s}\" 219 (format \"\\\\hfill{}\\\\textsc{%s}\"
220 \(mapconcat \\='identity tags \":\"))))" 220 (mapconcat \\='identity tags \":\"))))"
221 :group 'org-export-texinfo 221 :group 'org-export-texinfo
222 :type 'function) 222 :type 'function)
223 223
@@ -337,18 +337,18 @@ The function should return the string to be exported.
337For example, the variable could be set to the following function 337For example, the variable could be set to the following function
338in order to mimic default behavior: 338in order to mimic default behavior:
339 339
340\(defun org-texinfo-format-inlinetask \(todo type priority name tags contents\) 340\(defun org-texinfo-format-inlinetask (todo type priority name tags contents)
341\"Format an inline task element for Texinfo export.\" 341\"Format an inline task element for Texinfo export.\"
342 \(let ((full-title 342 (let ((full-title
343 \(concat 343 (concat
344 \(when todo 344 (when todo
345 \(format \"@strong{%s} \" todo)) 345 (format \"@strong{%s} \" todo))
346 \(when priority (format \"#%c \" priority)) 346 (when priority (format \"#%c \" priority))
347 title 347 title
348 \(when tags 348 (when tags
349 \(format \":%s:\" 349 (format \":%s:\"
350 \(mapconcat \\='identity tags \":\"))))) 350 (mapconcat \\='identity tags \":\")))))
351 \(format (concat \"@center %s\n\n\" 351 (format (concat \"@center %s\n\n\"
352 \"%s\" 352 \"%s\"
353 \"\n\")) 353 \"\n\"))
354 full-title contents))" 354 full-title contents))"
@@ -1578,7 +1578,7 @@ none."
1578 (re-search-forward "requires a sectioning" nil t)) 1578 (re-search-forward "requires a sectioning" nil t))
1579 (setq errors (concat errors " [invalid section command]"))) 1579 (setq errors (concat errors " [invalid section command]")))
1580 (when (save-excursion 1580 (when (save-excursion
1581 (re-search-forward "\\[unexpected\]" nil t)) 1581 (re-search-forward "\\[unexpected\ ]" nil t))
1582 (setq errors (concat errors " [unexpected error]"))) 1582 (setq errors (concat errors " [unexpected error]")))
1583 (when (save-excursion 1583 (when (save-excursion
1584 (re-search-forward "misplaced " nil t)) 1584 (re-search-forward "misplaced " nil t))
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 3493b837cec..2fa03866281 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -849,7 +849,7 @@ output is restricted to body only, \"s\" when it is restricted to
849the current subtree, \"v\" when only visible elements are 849the current subtree, \"v\" when only visible elements are
850considered for export, \"f\" when publishing functions should be 850considered for export, \"f\" when publishing functions should be
851passed the FORCE argument and \"a\" when the export should be 851passed the FORCE argument and \"a\" when the export should be
852asynchronous). Also, \[?] allows to switch back to standard 852asynchronous). Also, [?] allows to switch back to standard
853mode." 853mode."
854 :group 'org-export-general 854 :group 'org-export-general
855 :version "24.4" 855 :version "24.4"
@@ -1095,19 +1095,19 @@ keywords are understood:
1095 or 1095 or
1096 1096
1097 (?l \"Export to LaTeX\" 1097 (?l \"Export to LaTeX\"
1098 \(?p \"As PDF file\" org-latex-export-to-pdf) 1098 (?p \"As PDF file\" org-latex-export-to-pdf)
1099 \(?o \"As PDF file and open\" 1099 (?o \"As PDF file and open\"
1100 \(lambda (a s v b) 1100 (lambda (a s v b)
1101 \(if a (org-latex-export-to-pdf t s v b) 1101 (if a (org-latex-export-to-pdf t s v b)
1102 \(org-open-file 1102 (org-open-file
1103 \(org-latex-export-to-pdf nil s v b))))))) 1103 (org-latex-export-to-pdf nil s v b)))))))
1104 1104
1105 or the following, which will be added to the previous 1105 or the following, which will be added to the previous
1106 sub-menu, 1106 sub-menu,
1107 1107
1108 (?l 1 1108 (?l 1
1109 \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) 1109 ((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex)
1110 \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) 1110 (?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf)))
1111 1111
1112 :options-alist 1112 :options-alist
1113 1113
@@ -1180,12 +1180,12 @@ keywords are understood:
1180As an example, here is how one could define \"my-latex\" back-end 1180As an example, here is how one could define \"my-latex\" back-end
1181as a variant of `latex' back-end with a custom template function: 1181as a variant of `latex' back-end with a custom template function:
1182 1182
1183 \(org-export-define-derived-backend \\='my-latex \\='latex 1183 (org-export-define-derived-backend \\='my-latex \\='latex
1184 :translate-alist \\='((template . my-latex-template-fun))) 1184 :translate-alist \\='((template . my-latex-template-fun)))
1185 1185
1186The back-end could then be called with, for example: 1186The back-end could then be called with, for example:
1187 1187
1188 \(org-export-to-buffer \\='my-latex \"*Test my-latex*\")" 1188 (org-export-to-buffer \\='my-latex \"*Test my-latex*\")"
1189 (declare (indent 2)) 1189 (declare (indent 2))
1190 (let (blocks filters menu-entry options transcoders contents) 1190 (let (blocks filters menu-entry options transcoders contents)
1191 (while (keywordp (car body)) 1191 (while (keywordp (car body))
@@ -1962,7 +1962,7 @@ DATA is the parse tree. OPTIONS is the plist holding export
1962options. 1962options.
1963 1963
1964Return an alist whose key is a headline and value is its 1964Return an alist whose key is a headline and value is its
1965associated numbering \(in the shape of a list of numbers\) or nil 1965associated numbering \(in the shape of a list of numbers) or nil
1966for a footnotes section." 1966for a footnotes section."
1967 (let ((numbering (make-vector org-export-max-depth 0))) 1967 (let ((numbering (make-vector org-export-max-depth 0)))
1968 (org-element-map data 'headline 1968 (org-element-map data 'headline
@@ -3314,7 +3314,7 @@ lines, include only those lines.
3314Optional argument IND, when non-nil, is an integer specifying the 3314Optional argument IND, when non-nil, is an integer specifying the
3315global indentation of returned contents. Since its purpose is to 3315global indentation of returned contents. Since its purpose is to
3316allow an included file to stay in the same environment it was 3316allow an included file to stay in the same environment it was
3317created \(i.e. a list item), it doesn't apply past the first 3317created \(i.e., a list item), it doesn't apply past the first
3318headline encountered. 3318headline encountered.
3319 3319
3320Optional argument MINLEVEL, when non-nil, is an integer 3320Optional argument MINLEVEL, when non-nil, is an integer
@@ -3893,7 +3893,7 @@ PATH is the link path. DESC is its description."
3893Optional argument is a set of RULES defining inline images. It 3893Optional argument is a set of RULES defining inline images. It
3894is an alist where associations have the following shape: 3894is an alist where associations have the following shape:
3895 3895
3896 \(TYPE . REGEXP) 3896 (TYPE . REGEXP)
3897 3897
3898Applying a rule means apply REGEXP against LINK's path when its 3898Applying a rule means apply REGEXP against LINK's path when its
3899type is TYPE. The function will return a non-nil value if any of 3899type is TYPE. The function will return a non-nil value if any of
@@ -3952,7 +3952,7 @@ Return value can be an object, an element, or nil:
3952- If LINK path matches a target object (i.e. <<path>>) return it. 3952- If LINK path matches a target object (i.e. <<path>>) return it.
3953 3953
3954- If LINK path exactly matches the name affiliated keyword 3954- If LINK path exactly matches the name affiliated keyword
3955 \(i.e. #+NAME: path) of an element, return that element. 3955 (i.e. #+NAME: path) of an element, return that element.
3956 3956
3957- If LINK path exactly matches any headline name, return that 3957- If LINK path exactly matches any headline name, return that
3958 element. If more than one headline share that name, priority 3958 element. If more than one headline share that name, priority
@@ -5586,10 +5586,10 @@ no argument. It is always called within the current process,
5586from BUFFER, with point at its beginning. Export back-ends can 5586from BUFFER, with point at its beginning. Export back-ends can
5587use it to set a major mode there, e.g, 5587use it to set a major mode there, e.g,
5588 5588
5589 \(defun org-latex-export-as-latex 5589 (defun org-latex-export-as-latex
5590 \(&optional async subtreep visible-only body-only ext-plist) 5590 (&optional async subtreep visible-only body-only ext-plist)
5591 \(interactive) 5591 (interactive)
5592 \(org-export-to-buffer \\='latex \"*Org LATEX Export*\" 5592 (org-export-to-buffer \\='latex \"*Org LATEX Export*\"
5593 async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode)))) 5593 async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode))))
5594 5594
5595This function returns BUFFER." 5595This function returns BUFFER."
@@ -5646,13 +5646,13 @@ argument and happens asynchronously when ASYNC is non-nil. It
5646has to return a file name, or nil. Export back-ends can use this 5646has to return a file name, or nil. Export back-ends can use this
5647to send the output file through additional processing, e.g, 5647to send the output file through additional processing, e.g,
5648 5648
5649 \(defun org-latex-export-to-latex 5649 (defun org-latex-export-to-latex
5650 \(&optional async subtreep visible-only body-only ext-plist) 5650 (&optional async subtreep visible-only body-only ext-plist)
5651 \(interactive) 5651 (interactive)
5652 \(let ((outfile (org-export-output-file-name \".tex\" subtreep))) 5652 (let ((outfile (org-export-output-file-name \".tex\" subtreep)))
5653 \(org-export-to-file \\='latex outfile 5653 (org-export-to-file \\='latex outfile
5654 async subtreep visible-only body-only ext-plist 5654 async subtreep visible-only body-only ext-plist
5655 \(lambda (file) (org-latex-compile file))) 5655 (lambda (file) (org-latex-compile file)))
5656 5656
5657The function returns either a file name returned by POST-PROCESS, 5657The function returns either a file name returned by POST-PROCESS,
5658or FILE." 5658or FILE."
@@ -5985,7 +5985,7 @@ is nil when this menu hasn't been selected yet.
5985 5985
5986EXPERTP, when non-nil, triggers expert UI. In that case, no help 5986EXPERTP, when non-nil, triggers expert UI. In that case, no help
5987buffer is provided, but indications about currently active 5987buffer is provided, but indications about currently active
5988options are given in the prompt. Moreover, \[?] allows to switch 5988options are given in the prompt. Moreover, [?] allows to switch
5989back to standard interface." 5989back to standard interface."
5990 (let* ((fontify-key 5990 (let* ((fontify-key
5991 (lambda (key &optional access-key) 5991 (lambda (key &optional access-key)
@@ -6037,8 +6037,8 @@ back to standard interface."
6037 (concat 6037 (concat
6038 ;; Options are hard-coded. 6038 ;; Options are hard-coded.
6039 (format "[%s] Body only: %s [%s] Visible only: %s 6039 (format "[%s] Body only: %s [%s] Visible only: %s
6040\[%s] Export scope: %s [%s] Force publishing: %s 6040[%s] Export scope: %s [%s] Force publishing: %s
6041\[%s] Async export: %s\n\n" 6041[%s] Async export: %s\n\n"
6042 (funcall fontify-key "C-b" t) 6042 (funcall fontify-key "C-b" t)
6043 (funcall fontify-value 6043 (funcall fontify-value
6044 (if (memq 'body options) "On " "Off")) 6044 (if (memq 'body options) "On " "Off"))