diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2015-09-21 00:25:13 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2015-09-21 18:38:39 -0400 |
| commit | fbf4fa8cc786cf6c24ea4fcc9e38895cff46acbb (patch) | |
| tree | 98cc6ed78e3201cb6bc84d0ebdd2483d2316dc40 | |
| parent | c86a10b0bcc930379ebc9364e6e9e22ba082a64f (diff) | |
| download | org-mode-fbf4fa8cc786cf6c24ea4fcc9e38895cff46acbb.tar.gz | |
Partially revert backport of commit 284c470
Revert cases in the last backport that converted "\[" in strings to "[",
which results in an error when eval-defun is called on them.
| -rw-r--r-- | lisp/org-footnote.el | 2 | ||||
| -rwxr-xr-x | lisp/org.el | 8 | ||||
| -rw-r--r-- | lisp/ox.el | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 119459b..10e95ee 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -259,7 +259,7 @@ positions, and the definition, when inlined." This matches only pure definitions like [1] or [fn:name] at the beginning of a line. It does not match references like -[fn:name:definition], where the footnote text is included and +\[fn:name:definition], where the footnote text is included and defined locally. The return value will be nil if not at a footnote definition, and diff --git a/lisp/org.el b/lisp/org.el index e3bc123..004e809 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -4041,8 +4041,8 @@ images at the same place." (defcustom org-format-latex-header "\\documentclass{article} \\usepackage[usenames]{color} -[PACKAGES] -[DEFAULT-PACKAGES] +\[PACKAGES] +\[DEFAULT-PACKAGES] \\pagestyle{empty} % do not remove % The settings below are copied from fullpage.sty \\setlength{\\textwidth}{\\paperwidth} @@ -7441,7 +7441,7 @@ a block. Return a non-nil value when toggling is successful." (defconst org-goto-help "Browse buffer copy, to find location or copy text.%s RET=jump to location C-g=quit and return to previous location -[Up]/[Down]=next/prev headline TAB=cycle visibility [/] org-occur") +\[Up]/[Down]=next/prev headline TAB=cycle visibility [/] org-occur") (defvar org-goto-start-pos) ; dynamically scoped parameter @@ -24087,7 +24087,7 @@ no special treatment. In particular, a simple \\[universal-argument] prefix \ will just plainly yank the text as it is. -[1] The test checks if the first non-white line is a heading +\[1] The test checks if the first non-white line is a heading and if there are no other headings with fewer stars." (interactive "P") (org-yank-generic 'yank arg)) @@ -6238,8 +6238,8 @@ back to standard interface." (concat ;; Options are hard-coded. (format "[%s] Body only: %s [%s] Visible only: %s -[%s] Export scope: %s [%s] Force publishing: %s -[%s] Async export: %s\n\n" +\[%s] Export scope: %s [%s] Force publishing: %s +\[%s] Async export: %s\n\n" (funcall fontify-key "C-b" t) (funcall fontify-value (if (memq 'body options) "On " "Off")) |