diff options
Diffstat (limited to 'lisp/org')
-rw-r--r-- | lisp/org/ob-core.el | 4 | ||||
-rw-r--r-- | lisp/org/ob-dot.el | 2 | ||||
-rw-r--r-- | lisp/org/ob-lilypond.el | 2 | ||||
-rw-r--r-- | lisp/org/ob-lob.el | 8 | ||||
-rw-r--r-- | lisp/org/ob-octave.el | 4 | ||||
-rw-r--r-- | lisp/org/ob-ref.el | 4 | ||||
-rw-r--r-- | lisp/org/ob-sql.el | 4 | ||||
-rw-r--r-- | lisp/org/ob-sqlite.el | 2 | ||||
-rw-r--r-- | lisp/org/ob-tangle.el | 2 | ||||
-rw-r--r-- | lisp/org/org-agenda.el | 3 | ||||
-rw-r--r-- | lisp/org/org-clock.el | 2 | ||||
-rw-r--r-- | lisp/org/org-colview.el | 4 | ||||
-rw-r--r-- | lisp/org/org-element.el | 20 | ||||
-rw-r--r-- | lisp/org/org-footnote.el | 2 | ||||
-rw-r--r-- | lisp/org/org-list.el | 28 | ||||
-rw-r--r-- | lisp/org/org-table.el | 6 | ||||
-rw-r--r-- | lisp/org/org.el | 62 | ||||
-rw-r--r-- | lisp/org/ox-html.el | 2 | ||||
-rw-r--r-- | lisp/org/ox-latex.el | 52 | ||||
-rw-r--r-- | lisp/org/ox-man.el | 4 | ||||
-rw-r--r-- | lisp/org/ox-odt.el | 38 | ||||
-rw-r--r-- | lisp/org/ox-publish.el | 4 | ||||
-rw-r--r-- | lisp/org/ox-texinfo.el | 40 | ||||
-rw-r--r-- | lisp/org/ox.el | 56 |
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.") (defvar org-babel-result-w-name-regexp (concat org-babel-result-regexp - "\\([^ ()\f\t\n\r\v]+\\)\\(\(\\(.*\\)\)\\|\\)")) + "\\([^ ()\f\t\n\r\v]+\\)\\((\\(.*\\))\\|\\)")) (defvar org-babel-min-lines-for-block-output 10 "The minimum number of lines for block output. @@ -2456,7 +2456,7 @@ block but are passed literally to the \"example-block\"." (setq index (point)) (while (and (re-search-forward (org-babel-noweb-wrap) nil t)) (save-match-data (setf source-name (match-string 1))) - (save-match-data (setq evaluate (string-match "\(.*\)" source-name))) + (save-match-data (setq evaluate (string-match "(.*)" source-name))) (save-match-data (setq prefix (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 @@ (value (cdr pair))) (setq body (replace-regexp-in-string - (concat "\$" (regexp-quote name)) + (concat "$" (regexp-quote name)) (if (stringp value) value (format "%S" value)) body)))) 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") (value (cdr pair))) (setq body (replace-regexp-in-string - (concat "\$" (regexp-quote name)) + (concat "$" (regexp-quote name)) (if (stringp value) value (format "%S" value)) body)))) 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." (defconst org-babel-block-lob-one-liner-regexp (concat - "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" - "\(\\([^\n]*?\\)\)\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?") + "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^()\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" + "(\\([^\n]*?\\))\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?") "Regexp to match non-inline calls to predefined source block functions.") (defconst org-babel-inline-lob-one-liner-regexp (concat - "\\([^\n]*?\\)call_\\([^\(\)\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)" - "\(\\([^\n]*?\\)\)\\(\\[\\(.*?\\)\\]\\)?") + "\\([^\n]*?\\)call_\\([^()\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)" + "(\\([^\n]*?\\))\\(\\[\\(.*?\\)\\]\\)?") "Regexp to match inline calls to predefined source block functions.") (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) else, dlmwrite('%s', ans, '\\t') end") -(defvar org-babel-octave-eoe-indicator "\'org_babel_eoe\'") +(defvar org-babel-octave-eoe-indicator "'org_babel_eoe'") (defvar org-babel-octave-eoe-output "ans = org_babel_eoe") @@ -127,7 +127,7 @@ specifying a variable of the same value." (if (listp (car var)) "; " ",")) "]") (cond ((stringp var) - (format "\'%s\'" var)) + (format "'%s'" var)) (t (format "%s" var))))) 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." (setq ref (substring ref 0 (match-beginning 0)))) ;; assign any arguments to pass to source block (when (string-match - "^\\(.+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)\(\\(.*\\)\)$" ref) + "^\\(.+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)(\\(.*\\))$" ref) (setq new-refere (match-string 1 ref)) (setq new-header-args (match-string 3 ref)) (setq new-referent (match-string 5 ref)) @@ -224,7 +224,7 @@ returned, or an empty string or \"*\" both of which are interpreted to mean the entire range and as such are equivalent to \"0:-1\"." (if (and (> (length index) 0) (string-match "^\\([^,]*\\),?" index)) - (let* ((ind-re "\\(\\([-[:digit:]]+\\):\\([-[:digit:]]+\\)\\|\*\\)") + (let* ((ind-re "\\(\\([-[:digit:]]+\\):\\([-[:digit:]]+\\)\\|\\*\\)") (lgth (length lis)) (portion (match-string 1 index)) (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'." ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" (or cmdline "") (org-babel-process-file-name in-file) - "/^+/d;s/^\|//;s/(NULL)/ /g;$d" + "/^+/d;s/^|//;s/(NULL)/ /g;$d" (org-babel-process-file-name out-file))) ('monetdb (format "mclient -f tab %s < %s > %s" (or cmdline "") @@ -186,7 +186,7 @@ This function is called by `org-babel-execute-src-block'." (lambda (pair) (setq body (replace-regexp-in-string - (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! + (format "$%s" (car pair)) (let ((val (cdr pair))) (if (listp val) (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'." (lambda (pair) (setq body (replace-regexp-in-string - (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! + (format "$%s" (car pair)) (let ((val (cdr pair))) (if (listp val) (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 code file. This function uses `comment-region' which assumes that the appropriate major-mode is set. SPEC has the form: - \(start-line file link source-name params body comment)" + (start-line file link source-name params body comment)" (let* ((start-line (nth 0 spec)) (file (nth 1 spec)) (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'." (goto-char (1- end)) (throw :skip t))) (if todo-only - (cons (concat "^\*+[ \t]+" org-not-done-regexp) + (cons (concat "^\\*+[ \t]+" + org-not-done-regexp) regexps+) regexps+)) (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.)" (looking-at (concat "^[ \t]*" org-clock-string " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}" - " *\\sw+\.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$"))) + " *\\sw+.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$"))) (message "Matched %s" (match-string 1)) (setq ts (concat "[" (match-string 1) "]")) (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." (let (fixitem) (if (not cphr) item - (unless (string-match "^\*+ " item) + (unless (string-match "^\\*+ " item) (setq item (concat "* " item) fixitem t)) (if (string-match cphr item) (setq item @@ -369,7 +369,7 @@ CPHR is the complex heading regexp to use for parsing ITEM." 0 (1+ (match-end 1)) (list 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1)))))) item)) - (if fixitem (replace-regexp-in-string "^\*+ " "" item) item)))) + (if fixitem (replace-regexp-in-string "^\\*+ " "" item) item)))) (defun org-columns-compact-links (s) "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, the following example will return a flat list of all `src-block' and `example-block' elements in it: - \(org-element-map tree \\='(example-block src-block) \\='identity) + (org-element-map tree \\='(example-block src-block) \\='identity) The following snippet will find the first headline with a level of 1 and a \"phone\" tag, and will return its beginning position: - \(org-element-map tree \\='headline - \(lambda (hl) - \(and (= (org-element-property :level hl) 1) - \(member \"phone\" (org-element-property :tags hl)) - \(org-element-property :begin hl))) + (org-element-map tree \\='headline + (lambda (hl) + (and (= (org-element-property :level hl) 1) + (member \"phone\" (org-element-property :tags hl)) + (org-element-property :begin hl))) nil t) The next example will return a flat list of all `plain-list' type elements in TREE that are not a sub-list themselves: - \(org-element-map tree \\='plain-list \\='identity nil nil \\='plain-list) + (org-element-map tree \\='plain-list \\='identity nil nil \\='plain-list) Eventually, this example will return a flat list of all `bold' type objects containing a `latex-snippet' type object, even looking into captions: - \(org-element-map tree \\='bold - \(lambda (b) - \(and (org-element-map b \\='latex-snippet \\='identity nil t) b)) + (org-element-map tree \\='bold + (lambda (b) + (and (org-element-map b \\='latex-snippet \\='identity nil t) b)) nil nil nil t)" ;; Ensure TYPES and NO-RECURSION are a list, even of one element. (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." 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/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 need to make a change while Emacs is running, use the customize interface or run the following code after updating it: - \(when (featurep \\='org-element) (load \"org-element\" t t))" + (when (featurep \\='org-element) (load \"org-element\" t t))" :group 'org-plain-lists :version "24.1" :type 'boolean @@ -620,11 +620,11 @@ point-at-bol: will get the following structure: -\(\(1 0 \"- \" nil \"[X]\" nil 97\) - \(18 2 \"1. \" nil nil nil 34\) - \(34 2 \"5. \" \"5\" nil nil 55\) - \(97 0 \"- \" nil nil nil 131\) - \(109 2 \"+ \" nil nil \"tag\" 131\) + ((1 0 \"- \" nil \"[X]\" nil 97) + (18 2 \"1. \" nil nil nil 34) + (34 2 \"5. \" \"5\" nil nil 55) + (97 0 \"- \" nil nil nil 131) + (109 2 \"+ \" nil nil \"tag\" 131)) Assume point is at an item." (save-excursion @@ -2015,7 +2015,7 @@ previous item, plus ARGS extra arguments. FUNCTION is applied on items in reverse order. -As an example, \(org-apply-on-list \(lambda \(result\) \(1+ result\)\) 0\) +As an example, \(org-apply-on-list \(lambda \(result) \(1+ result)) 0) will return the number of items in the current list. Sublists of the list are skipped. Cursor is always at the @@ -2931,13 +2931,13 @@ For example, the following list: will be parsed as: -\(ordered - \(nil \"first item\" - \(unordered - \(nil \"sub-item one\"\) - \(nil \"[CBON] sub-item two\"\)\) - \"more text in first item\"\) - \(3 \"last item\"\)\) + (ordered + (nil \"first item\" + (unordered + (nil \"sub-item one\") + (nil \"[CBON] sub-item two\")) + \"more text in first item\") + (3 \"last item\")) Point is left at list end." (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." "Check if the table has a marking column. If yes remove the column and the special lines." (let ((special (if maybe-quoted - "^[ \t]*| *\\\\?[\#!$*_^/ ] *|" - "^[ \t]*| *[\#!$*_^/ ] *|")) + "^[ \t]*| *\\\\?[#!$*_^/ ] *|" + "^[ \t]*| *[#!$*_^/ ] *|")) (ignore (if maybe-quoted "^[ \t]*| *\\\\?[!$_^/] *|" "^[ \t]*| *[!$_^/] *|"))) @@ -3248,7 +3248,7 @@ formulas that use a range of rows or columns, it may often be better to anchor the formula with \"I\" row markers, or to offset from the borders of the table using the @< @> $< $> makers." (let (n nmax len char (start 0)) - (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^\)]+)\\)" + (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^)]+)\\)" s start) (if (match-end 3) (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 to the end of the list. If the package is called org-xyz.el, then you need to add the symbol `xyz', and the package must have a call to: - \(provide \\='org-xyz) + (provide \\='org-xyz) For export specific modules, see also `org-export-backends'." :group 'org @@ -465,26 +465,26 @@ need to make a change while Emacs is running, use the customize interface or run the following code, where VAL stands for the new value of the variable, after updating it: - \(progn - \(setq org-export--registered-backends - \(org-remove-if-not - \(lambda (backend) - \(let ((name (org-export-backend-name backend))) - \(or (memq name val) - \(catch \\='parentp - \(dolist (b val) - \(and (org-export-derived-backend-p b name) - \(throw \\='parentp t))))))) + (progn + (setq org-export--registered-backends + (org-remove-if-not + (lambda (backend) + (let ((name (org-export-backend-name backend))) + (or (memq name val) + (catch \\='parentp + (dolist (b val) + (and (org-export-derived-backend-p b name) + (throw \\='parentp t))))))) org-export--registered-backends)) - \(let ((new-list (mapcar \\='org-export-backend-name + (let ((new-list (mapcar \\='org-export-backend-name org-export--registered-backends))) - \(dolist (backend val) - \(cond - \((not (load (format \"ox-%s\" backend) t t)) - \(message \"Problems while trying to load export back-end \\=`%s\\='\" + (dolist (backend val) + (cond + ((not (load (format \"ox-%s\" backend) t t)) + (message \"Problems while trying to load export back-end \\=`%s\\='\" backend)) - \((not (memq backend new-list)) (push backend new-list)))) - \(set-default \\='org-export-backends new-list))) + ((not (memq backend new-list)) (push backend new-list)))) + (set-default \\='org-export-backends new-list))) Adding a back-end to this list will also pull the back-end it depends on, if any." @@ -2957,7 +2957,7 @@ its value is 0. For example, - \(:days \"%dd\" :hours \"%d\" :require-hours t :minutes \":%02d\" + (:days \"%dd\" :hours \"%d\" :require-hours t :minutes \":%02d\" :require-minutes t) means durations longer than a day will be expressed in days, @@ -2967,7 +2967,7 @@ hour). The value - \(:days \"%dd\" :minutes \"%dm\") + (:days \"%dd\" :minutes \"%dm\") means durations longer than a day will be expressed in days and minutes, and durations less than a day will be expressed entirely @@ -3802,8 +3802,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} @@ -3889,7 +3889,7 @@ a string. A cell is of the format: - \( \"options\" \"package\" SNIPPET-FLAG). + ( \"options\" \"package\" SNIPPET-FLAG). If SNIPPET-FLAG is non-nil, the package also needs to be included when compiling LaTeX snippets into images for inclusion into @@ -3917,7 +3917,7 @@ Each element is either a cell or a string. A cell is of the format: - \(\"options\" \"package\" SNIPPET-FLAG) + (\"options\" \"package\" SNIPPET-FLAG) SNIPPET-FLAG, when non-nil, indicates that this package is also needed 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." (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 @@ -7682,7 +7682,7 @@ command." (re-search-forward org-outline-regexp-bol) (beginning-of-line 0)) (skip-chars-backward " \r\n") - (and (not (looking-back "^\*+" (line-beginning-position))) + (and (not (looking-back "^\\*+" (line-beginning-position))) (looking-at "[ \t]+") (replace-match "")) (unless (eobp) (forward-char 1)) (when (looking-at "^\\*") @@ -11389,7 +11389,7 @@ on the system \"/user@host:\"." (setq level (org-reduced-level (- (match-end 1) (match-beginning 1))) txt (org-link-display-format (match-string 4)) - txt (replace-regexp-in-string "\\( *\[[0-9]+/?[0-9]*%?\]\\)+$" "" txt) + txt (replace-regexp-in-string "\\( *[[0-9]+/?[0-9]*%?]\\)+$" "" txt) re (format org-complex-heading-regexp-format (regexp-quote (match-string 4)))) (when org-refile-use-outline-path @@ -16355,7 +16355,7 @@ While prompting, a calendar is popped up - you can also select the date with the mouse (button 1). The calendar shows a period of three months. To scroll it to other months, use the keys `>' and `<'. If you don't like the calendar, turn it off with - \(setq org-read-date-popup-calendar nil) + (setq org-read-date-popup-calendar nil) With optional argument TO-TIME, the date will immediately be converted to an internal time. @@ -17912,7 +17912,7 @@ If EXCLUDE-TMP is non-nil, ignore temporary buffers." ((eq predicate 'files) (lambda (b) (with-current-buffer b (derived-mode-p 'org-mode)))) ((eq predicate 'export) - (lambda (b) (string-match "\*Org .*Export" (buffer-name b)))) + (lambda (b) (string-match "\\*Org .*Export" (buffer-name b)))) ((eq predicate 'agenda) (lambda (b) (with-current-buffer b @@ -17921,7 +17921,7 @@ If EXCLUDE-TMP is non-nil, ignore temporary buffers." (member (file-truename bfn) agenda-files))))) (t (lambda (b) (with-current-buffer b (or (derived-mode-p 'org-mode) - (string-match "\*Org .*Export" + (string-match "\\*Org .*Export" (buffer-name b))))))))) (delq nil (mapcar @@ -23005,7 +23005,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)) 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 further. For example, to check for only captioned standalone images, set it to: - \(lambda (paragraph) (org-element-property :caption paragraph))" + (lambda (paragraph) (org-element-property :caption paragraph))" (let ((paragraph (case (org-element-type element) (paragraph element) (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 @@ If #+LATEX_CLASS is set in the buffer, use its value and the associated information. Here is the structure of each cell: - \(class-name + (class-name header-string - \(numbered-section . unnumbered-section) + (numbered-section . unnumbered-section) ...) The header string @@ -281,11 +281,11 @@ section string and will be replaced by the title of the section. Instead of a cons cell (numbered . unnumbered), you can also provide a list of 2 or 4 elements, - \(numbered-open numbered-close) + (numbered-open numbered-close) or - \(numbered-open numbered-close unnumbered-open unnumbered-close) + (numbered-open numbered-close unnumbered-open unnumbered-close) providing opening and closing strings for a LaTeX environment that should represent the document section. The opening clause @@ -591,18 +591,18 @@ The function should return the string to be exported. For example, the variable could be set to the following function in order to mimic default behavior: -\(defun org-latex-format-inlinetask \(todo type priority name tags contents\) +\(defun org-latex-format-inlinetask (todo type priority name tags contents) \"Format an inline task element for LaTeX export.\" - \(let ((full-title - \(concat - \(when todo - \(format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo)) - \(when priority (format \"\\\\framebox{\\\\#%c} \" priority)) + (let ((full-title + (concat + (when todo + (format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo)) + (when priority (format \"\\\\framebox{\\\\#%c} \" priority)) title - \(when tags - \(format \"\\\\hfill{}\\\\textsc{:%s:}\" - \(mapconcat \\='identity tags \":\"))))) - \(format (concat \"\\\\begin{center}\\n\" + (when tags + (format \"\\\\hfill{}\\\\textsc{:%s:}\" + (mapconcat \\='identity tags \":\"))))) + (format (concat \"\\\\begin{center}\\n\" \"\\\\fbox{\\n\" \"\\\\begin{minipage}[c]{.6\\\\textwidth}\\n\" \"%s\\n\\n\" @@ -626,21 +626,21 @@ listings package, and if you want to have color, the color package. Just add these to `org-latex-packages-alist', for example using customize, or with something like: - \(require \\='ox-latex) - \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\")) - \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\")) + (require \\='ox-latex) + (add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\")) + (add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\")) Alternatively, - \(setq org-latex-listings \\='minted) + (setq org-latex-listings \\='minted) causes source code to be exported using the minted package as opposed to listings. If you want to use minted, you need to add the minted package to `org-latex-packages-alist', for example using customize, or with - \(require \\='ox-latex) - \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"minted\")) + (require \\='ox-latex) + (add-to-list \\='org-latex-packages-alist \\='(\"\" \"minted\")) In addition, it is necessary to install pygments \(http://pygments.org), and to configure the variable @@ -689,9 +689,9 @@ These options are supplied as a comma-separated list to the a list containing two strings: the name of the option, and the value. For example, - \(setq org-latex-listings-options + (setq org-latex-listings-options '((\"basicstyle\" \"\\\\small\") - \(\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\"))) + (\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\"))) will typeset the code in a small size font with underlined, bold black keywords. @@ -736,8 +736,8 @@ These options are supplied within square brackets in be a list containing two strings: the name of the option, and the value. For example, - \(setq org-latex-minted-options - '\((\"bgcolor\" \"bg\") \(\"frame\" \"lines\"))) + (setq org-latex-minted-options + '((\"bgcolor\" \"bg\") (\"frame\" \"lines\"))) will result in src blocks being exported with @@ -757,8 +757,8 @@ options will be applied to blocks of all languages." It is used during export of src blocks by the listings and minted latex packages. For example, - \(setq org-latex-custom-lang-environments - '\(\(python \"pythoncode\"\)\)\) + (setq org-latex-custom-lang-environments + '((python \"pythoncode\"))) would have the effect that if org encounters begin_src python during 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." It is used during export of src blocks by the listings and man packages. For example, - \(setq org-man-custom-lang-environments - '\(\(python \"pythoncode\"\)\)\) + (setq org-man-custom-lang-environments + '((python \"pythoncode\"))) would have the effect that if org encounters begin_src python during 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.") (defvar org-odt-automatic-styles '() "Registry of automatic styles for various OBJECT-TYPEs. The variable has the following form: -\(\(OBJECT-TYPE-A - \(\(OBJECT-NAME-A.1 OBJECT-PROPS-A.1\) - \(OBJECT-NAME-A.2 OBJECT-PROPS-A.2\) ...\)\) - \(OBJECT-TYPE-B - \(\(OBJECT-NAME-B.1 OBJECT-PROPS-B.1\) - \(OBJECT-NAME-B.2 OBJECT-PROPS-B.2\) ...\)\) - ...\). + ((OBJECT-TYPE-A + ((OBJECT-NAME-A.1 OBJECT-PROPS-A.1) + (OBJECT-NAME-A.2 OBJECT-PROPS-A.2) ...)) + (OBJECT-TYPE-B + ((OBJECT-NAME-B.1 OBJECT-PROPS-B.1) + (OBJECT-NAME-B.2 OBJECT-PROPS-B.2) ...)) + ...). OBJECT-TYPEs could be \"Section\", \"Table\", \"Figure\" etc. OBJECT-PROPS is (typically) a plist created by passing @@ -292,7 +292,7 @@ according to the default face identified by the `htmlfontify'.") This is an alist where each element is of the form: - \(STYLE-NAME ATTACH-FMT REF-MODE REF-FMT) + (STYLE-NAME ATTACH-FMT REF-MODE REF-FMT) ATTACH-FMT controls how labels and captions are attached to an entity. It may contain following specifiers - %e and %c. %e is @@ -319,7 +319,7 @@ See also `org-odt-format-label'.") This is a list where each entry is of the form: - \(CATEGORY-HANDLE OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE) + (CATEGORY-HANDLE OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE) CATEGORY_HANDLE identifies the captionable entity in question. @@ -670,11 +670,11 @@ The default value simply returns the value of CONTENTS." "Function to format headline text. This function will be called with 5 arguments: -TODO the todo keyword \(string or nil\). -TODO-TYPE the type of todo \(symbol: `todo', `done', nil\) -PRIORITY the priority of the headline \(integer or nil\) -TEXT the main headline text \(string\). -TAGS the tags string, separated with colons \(string or nil\). +TODO the todo keyword (string or nil). +TODO-TYPE the type of todo (symbol: `todo', `done', nil) +PRIORITY the priority of the headline (integer or nil) +TEXT the main headline text (string). +TAGS the tags string, separated with colons (string or nil). The function result will be used as headline text." :group 'org-export-odt @@ -852,11 +852,11 @@ ON-OR-OFF := t | nil For example, with the following configuration \(setq org-odt-table-styles - '\(\(\"TableWithHeaderRowsAndColumns\" \"Custom\" - \(\(use-first-row-styles . t\) - \(use-first-column-styles . t\)\)\) - \(\"TableWithHeaderColumns\" \"Custom\" - \(\(use-first-column-styles . t\)\)\)\)\) + '((\"TableWithHeaderRowsAndColumns\" \"Custom\" + ((use-first-row-styles . t) + (use-first-column-styles . t))) + (\"TableWithHeaderColumns\" \"Custom\" + ((use-first-column-styles . t))))) 1. A table associated with \"TableWithHeaderRowsAndColumns\" 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: alternating keys and values, specifying parameters for the publishing process. - \(:property value :property value ... ) + (:property value :property value ... ) 2. A meta-project definition, specifying of a list of sub-projects: - \(:components (\"project-1\" \"project-2\" ...)) + (:components (\"project-1\" \"project-2\" ...)) When the CDR of an element of org-publish-project-alist is in this 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'." If #+TEXINFO_CLASS is set in the buffer, use its value and the associated information. Here is the structure of each cell: - \(class-name + (class-name header-string - \(numbered-section . unnumbered-section) + (numbered-section . unnumbered-section) ...) @@ -210,14 +210,14 @@ order to reproduce the default set-up: \(defun org-texinfo-format-headline (todo todo-type priority text tags) \"Default format function for a headline.\" - \(concat (when todo - \(format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo)) - \(when priority - \(format \"\\\\framebox{\\\\#%c} \" priority)) + (concat (when todo + (format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo)) + (when priority + (format \"\\\\framebox{\\\\#%c} \" priority)) text - \(when tags - \(format \"\\\\hfill{}\\\\textsc{%s}\" - \(mapconcat \\='identity tags \":\"))))" + (when tags + (format \"\\\\hfill{}\\\\textsc{%s}\" + (mapconcat \\='identity tags \":\"))))" :group 'org-export-texinfo :type 'function) @@ -337,18 +337,18 @@ The function should return the string to be exported. For example, the variable could be set to the following function in order to mimic default behavior: -\(defun org-texinfo-format-inlinetask \(todo type priority name tags contents\) +\(defun org-texinfo-format-inlinetask (todo type priority name tags contents) \"Format an inline task element for Texinfo export.\" - \(let ((full-title - \(concat - \(when todo - \(format \"@strong{%s} \" todo)) - \(when priority (format \"#%c \" priority)) + (let ((full-title + (concat + (when todo + (format \"@strong{%s} \" todo)) + (when priority (format \"#%c \" priority)) title - \(when tags - \(format \":%s:\" - \(mapconcat \\='identity tags \":\"))))) - \(format (concat \"@center %s\n\n\" + (when tags + (format \":%s:\" + (mapconcat \\='identity tags \":\"))))) + (format (concat \"@center %s\n\n\" \"%s\" \"\n\")) full-title contents))" @@ -1578,7 +1578,7 @@ none." (re-search-forward "requires a sectioning" nil t)) (setq errors (concat errors " [invalid section command]"))) (when (save-excursion - (re-search-forward "\\[unexpected\]" nil t)) + (re-search-forward "\\[unexpected\ ]" nil t)) (setq errors (concat errors " [unexpected error]"))) (when (save-excursion (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 the current subtree, \"v\" when only visible elements are considered for export, \"f\" when publishing functions should be passed the FORCE argument and \"a\" when the export should be -asynchronous). Also, \[?] allows to switch back to standard +asynchronous). Also, [?] allows to switch back to standard mode." :group 'org-export-general :version "24.4" @@ -1095,19 +1095,19 @@ keywords are understood: or (?l \"Export to LaTeX\" - \(?p \"As PDF file\" org-latex-export-to-pdf) - \(?o \"As PDF file and open\" - \(lambda (a s v b) - \(if a (org-latex-export-to-pdf t s v b) - \(org-open-file - \(org-latex-export-to-pdf nil s v b))))))) + (?p \"As PDF file\" org-latex-export-to-pdf) + (?o \"As PDF file and open\" + (lambda (a s v b) + (if a (org-latex-export-to-pdf t s v b) + (org-open-file + (org-latex-export-to-pdf nil s v b))))))) or the following, which will be added to the previous sub-menu, (?l 1 - \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) - \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) + ((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) + (?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) :options-alist @@ -1180,12 +1180,12 @@ keywords are understood: As an example, here is how one could define \"my-latex\" back-end as a variant of `latex' back-end with a custom template function: - \(org-export-define-derived-backend \\='my-latex \\='latex + (org-export-define-derived-backend \\='my-latex \\='latex :translate-alist \\='((template . my-latex-template-fun))) The back-end could then be called with, for example: - \(org-export-to-buffer \\='my-latex \"*Test my-latex*\")" + (org-export-to-buffer \\='my-latex \"*Test my-latex*\")" (declare (indent 2)) (let (blocks filters menu-entry options transcoders contents) (while (keywordp (car body)) @@ -1962,7 +1962,7 @@ DATA is the parse tree. OPTIONS is the plist holding export options. Return an alist whose key is a headline and value is its -associated numbering \(in the shape of a list of numbers\) or nil +associated numbering \(in the shape of a list of numbers) or nil for a footnotes section." (let ((numbering (make-vector org-export-max-depth 0))) (org-element-map data 'headline @@ -3314,7 +3314,7 @@ lines, include only those lines. Optional argument IND, when non-nil, is an integer specifying the global indentation of returned contents. Since its purpose is to allow an included file to stay in the same environment it was -created \(i.e. a list item), it doesn't apply past the first +created \(i.e., a list item), it doesn't apply past the first headline encountered. Optional argument MINLEVEL, when non-nil, is an integer @@ -3893,7 +3893,7 @@ PATH is the link path. DESC is its description." Optional argument is a set of RULES defining inline images. It is an alist where associations have the following shape: - \(TYPE . REGEXP) + (TYPE . REGEXP) Applying a rule means apply REGEXP against LINK's path when its type 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: - If LINK path matches a target object (i.e. <<path>>) return it. - If LINK path exactly matches the name affiliated keyword - \(i.e. #+NAME: path) of an element, return that element. + (i.e. #+NAME: path) of an element, return that element. - If LINK path exactly matches any headline name, return that element. If more than one headline share that name, priority @@ -5586,10 +5586,10 @@ no argument. It is always called within the current process, from BUFFER, with point at its beginning. Export back-ends can use it to set a major mode there, e.g, - \(defun org-latex-export-as-latex - \(&optional async subtreep visible-only body-only ext-plist) - \(interactive) - \(org-export-to-buffer \\='latex \"*Org LATEX Export*\" + (defun org-latex-export-as-latex + (&optional async subtreep visible-only body-only ext-plist) + (interactive) + (org-export-to-buffer \\='latex \"*Org LATEX Export*\" async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode)))) This function returns BUFFER." @@ -5646,13 +5646,13 @@ argument and happens asynchronously when ASYNC is non-nil. It has to return a file name, or nil. Export back-ends can use this to send the output file through additional processing, e.g, - \(defun org-latex-export-to-latex - \(&optional async subtreep visible-only body-only ext-plist) - \(interactive) - \(let ((outfile (org-export-output-file-name \".tex\" subtreep))) - \(org-export-to-file \\='latex outfile + (defun org-latex-export-to-latex + (&optional async subtreep visible-only body-only ext-plist) + (interactive) + (let ((outfile (org-export-output-file-name \".tex\" subtreep))) + (org-export-to-file \\='latex outfile async subtreep visible-only body-only ext-plist - \(lambda (file) (org-latex-compile file))) + (lambda (file) (org-latex-compile file))) The function returns either a file name returned by POST-PROCESS, or FILE." @@ -5985,7 +5985,7 @@ is nil when this menu hasn't been selected yet. EXPERTP, when non-nil, triggers expert UI. In that case, no help buffer is provided, but indications about currently active -options are given in the prompt. Moreover, \[?] allows to switch +options are given in the prompt. Moreover, [?] allows to switch back to standard interface." (let* ((fontify-key (lambda (key &optional access-key) @@ -6037,8 +6037,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")) |