summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-09-21 00:23:36 -0400
committerKyle Meyer <kyle@kyleam.com>2015-09-21 18:38:18 -0400
commitd77a52a502ee45cd71aa19c87700a85e5c09b25f (patch)
tree75c27b37d3039788d6dff9ab3b51f96de7c3aca9
parent0cf9f17c557290af8de37242a7e3e4f7abe42952 (diff)
downloadorg-mode-d77a52a502ee45cd71aa19c87700a85e5c09b25f.tar.gz
Backport quote-related commits from Emacs
These changes are the combination of the commits below (in order applied). Unlike other backports, these are applied in one commit because they are closely related and because some of the later commits reverse changes in earlier commits. Changes to message and help quote display for Emacs 25 seem to be here to stay. The quote protections are required to ensure grave accents and apostrophes are displayed as intended in Emacs 25, and they should not affect earlier versions. Quoting fixes in lisp/org 6cd2629bd1b3ce77d29ac28e29237c94a4197116 Paul Eggert Mon Aug 31 00:29:40 2015 -0700 More-conservative ‘format’ quote restyling fbb5531fa11d13854b274d28ccd329c9b6652cfc Paul Eggert Sun Aug 23 22:39:06 2015 -0700 Prefer directed to neutral quotes 875a5d0ead827d3da32ecbd30e739a29f07bbc87 Paul Eggert Mon Aug 24 23:57:25 2015 -0700 Escape ` and ' in doc 19532d147b431a4fe34f088d6de07891c48e2c5c Paul Eggert Tue Sep 1 18:23:21 2015 -0700 Fix some more docstring etc. quoting problems 26bd978d87dfbf9baa115cd961a67d42b416c4bf Paul Eggert Thu Sep 3 15:32:54 2015 -0700 Go back to grave quoting in source-code docstrings etc. 6afef3f6ca2f3009c722b84e249903b7f807b044 Paul Eggert Mon Sep 7 16:09:27 2015 -0700
-rw-r--r--lisp/ob-core.el12
-rw-r--r--lisp/ob-exp.el2
-rw-r--r--lisp/ob-fortran.el2
-rw-r--r--lisp/ob-python.el2
-rw-r--r--lisp/ob-ref.el2
-rw-r--r--lisp/ob-scheme.el2
-rw-r--r--lisp/org-agenda.el30
-rw-r--r--lisp/org-bibtex.el2
-rw-r--r--lisp/org-capture.el6
-rw-r--r--lisp/org-clock.el17
-rw-r--r--lisp/org-compat.el4
-rw-r--r--lisp/org-ctags.el9
-rw-r--r--lisp/org-element.el10
-rw-r--r--lisp/org-feed.el3
-rw-r--r--lisp/org-habit.el2
-rw-r--r--lisp/org-irc.el4
-rw-r--r--lisp/org-mouse.el10
-rw-r--r--lisp/org-plot.el2
-rw-r--r--lisp/org-protocol.el24
-rw-r--r--lisp/org-src.el4
-rw-r--r--lisp/org-table.el6
-rwxr-xr-xlisp/org.el50
-rw-r--r--lisp/ox-html.el2
-rw-r--r--lisp/ox-latex.el12
-rw-r--r--lisp/ox-publish.el4
-rw-r--r--lisp/ox.el22
26 files changed, 126 insertions, 119 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index d238f7e..c5552ca 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -1754,7 +1754,7 @@ If the point is not on a source block then return nil."
(if point
;; taken from `org-open-at-point'
(progn (org-mark-ring-push) (goto-char point) (org-show-context))
- (message "source-code block '%s' not found in this buffer" name))))
+ (message "source-code block `%s' not found in this buffer" name))))
(defun org-babel-find-named-block (name)
"Find a named source-code block.
@@ -1788,7 +1788,7 @@ to `org-babel-named-src-block-regexp'."
(if point
;; taken from `org-open-at-point'
(progn (goto-char point) (org-show-context))
- (message "result '%s' not found in this buffer" name))))
+ (message "result `%s' not found in this buffer" name))))
(defun org-babel-find-named-result (name &optional point)
"Find a named result.
@@ -2409,7 +2409,7 @@ file's directory then expand relative links."
'org-babel-examplify-region "25.1")
(defun org-babel-examplify-region (beg end &optional results-switches)
- "Comment out region using the inline '==' or ': ' org example quote."
+ "Comment out region using the inline `==' or `: ' org example quote."
(interactive "*r")
(let ((chars-between (lambda (b e)
(not (string-match "^[\\s]*$"
@@ -2624,7 +2624,7 @@ CONTEXT may be one of :tangle, :export or :eval."
"Expand Noweb references in the body of the current source code block.
For example the following reference would be replaced with the
-body of the source-code block named 'example-block'.
+body of the source-code block named `example-block'.
<<example-block>>
@@ -2637,7 +2637,7 @@ This function must be called from inside of the buffer containing
the source-code block which holds BODY.
In addition the following syntax can be used to insert the
-results of evaluating the source-code block named 'example-block'.
+results of evaluating the source-code block named `example-block'.
<<example-block()>>
@@ -2848,7 +2848,7 @@ block but are passed literally to the \"example-block\"."
(defun org-babel-read (cell &optional inhibit-lisp-eval)
"Convert the string value of CELL to a number if appropriate.
Otherwise if CELL looks like lisp (meaning it starts with a
-\"(\", \"'\", \"\\=`\" or a \"[\") then read and evaluate it as
+\"(\", \"\\='\", \"\\=`\" or a \"[\") then read and evaluate it as
lisp, otherwise return it unmodified as a string. Optional
argument INHIBIT-LISP-EVAL inhibits lisp evaluation for
situations in which is it not appropriate."
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 1f01973..b07610b 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -99,7 +99,7 @@ be executed."
(defun org-babel-exp-src-block (&rest headers)
"Process source block for export.
-Depending on the 'export' headers argument, replace the source
+Depending on the `export' headers argument, replace the source
code block like this:
both ---- display the code and the results
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index d32092a..6390536 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -110,7 +110,7 @@ it's header arguments."
"Wrap body in a \"program ... end program\" block if none exists."
(if (string-match "^[ \t]*program[ \t]*.*" (capitalize body))
(let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
- (if vars (error "Cannot use :vars if 'program' statement is present"))
+ (if vars (error "Cannot use :vars if `program' statement is present"))
body)
(format "program main\n%s\nend program main\n" body)))
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index dd3cc66..435eea1 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -64,7 +64,7 @@ This will typically be either 'python or 'python-mode."
:type 'string)
(defcustom org-babel-python-None-to 'hline
- "Replace 'None' in python tables with this before returning."
+ "Replace `None' in python tables with this before returning."
:group 'org-babel
:version "24.4"
:package-version '(Org . "8.0")
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index b8a921e..0490e85 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -177,7 +177,7 @@ the variable."
;; buffer (marker-buffer id-loc)
;; loc (marker-position id-loc))
;; (move-marker id-loc nil)
- (error "Reference '%s' not found in this buffer" ref))
+ (error "Reference `%s' not found in this buffer" ref))
(cond
(lob-info (setq type 'lob))
(id (setq type 'id))
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index b10dfc3..2d7f3e6 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -109,7 +109,7 @@ For a named session, the buffer name will be the session name.
If the session is unnamed (nil), generate a name.
-If the session is 'none', use nil for the session name, and
+If the session is `none', use nil for the session name, and
org-babel-scheme-execute-with-geiser will use a temporary session."
(let ((result
(cond ((not name)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 384cf12..79e0f55 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -440,7 +440,7 @@ This will be spliced into the custom type of
(defcustom org-agenda-custom-commands
- '(("n" "Agenda and all TODO's" ((agenda "") (alltodo ""))))
+ '(("n" "Agenda and all TODOs" ((agenda "") (alltodo ""))))
"Custom commands for the agenda.
These commands will be offered on the splash screen displayed by the
agenda dispatcher \\[org-agenda]. Each entry is a list like this:
@@ -504,7 +504,7 @@ are prefix commands. For the dispatcher to display useful information, you
should provide a description for the prefix, like
(setq org-agenda-custom-commands
- '((\"h\" . \"HOME + Name tag searches\") ; describe prefix \"h\"
+ \\='((\"h\" . \"HOME + Name tag searches\") ; describe prefix \"h\"
(\"hl\" tags \"+HOME+Lisa\")
(\"hp\" tags \"+HOME+Peter\")
(\"hk\" tags \"+HOME+Kim\")))"
@@ -1211,7 +1211,7 @@ For example, 9:30am would become 09:30 rather than 9:30."
:type 'boolean)
(defun org-agenda-time-of-day-to-ampm (time)
- "Convert TIME of a string like '13:45' to an AM/PM style time string."
+ "Convert TIME of a string like `13:45' to an AM/PM style time string."
(let* ((hour-number (string-to-number (substring time 0 -3)))
(minute (substring time -2))
(ampm "am"))
@@ -1934,7 +1934,7 @@ list as second element:
For example, to display a 16px horizontal space for Emacs
category, you can use:
- (\"Emacs\" '(space . (:width (16))))"
+ (\"Emacs\" \\='(space . (:width (16))))"
:group 'org-agenda-line-format
:version "24.1"
:type '(alist :key-type (string :tag "Regexp matching category")
@@ -1993,8 +1993,8 @@ the lower-case version of all tags."
"Alist of characters and custom functions for bulk actions.
For example, this value makes those two functions available:
- '((?R set-category)
- (?C bulk-cut))
+ ((?R set-category)
+ (?C bulk-cut))
With selected entries in an agenda buffer, `B R' will call
the custom function `set-category' on the selected entries.
@@ -2550,7 +2550,7 @@ For example, if you have a custom agenda command \"p\" and you
want this command to be accessible only from plain text files,
use this:
- '((\"p\" ((in-file . \"\\\\.txt\\\\'\"))))
+ \\='((\"p\" ((in-file . \"\\\\.txt\\\\'\"))))
Here are the available contexts definitions:
@@ -2568,7 +2568,7 @@ accessible if there is at least one valid check.
You can also bind a key to another agenda custom command
depending on contextual rules.
- '((\"p\" \"q\" ((in-file . \"\\\\.txt\\\\'\"))))
+ \\='((\"p\" \"q\" ((in-file . \"\\\\.txt\\\\'\"))))
Here it means: in .txt files, use \"p\" as the key for the
agenda command otherwise associated with \"q\". (The command
@@ -3854,7 +3854,7 @@ FILTER-ALIST is an alist of filters we need to apply when
(defvar org-depend-tag-blocked)
(defun org-agenda-dim-blocked-tasks (&optional invisible)
- "Dim currently blocked TODO's in the agenda display.
+ "Dim currently blocked TODOs in the agenda display.
When INVISIBLE is non-nil, hide currently blocked TODO instead of
dimming them."
(interactive "P")
@@ -4980,13 +4980,13 @@ the `regexp' or `notregexp' element.
`todo' and `nottodo' accept as an argument a list of todo
keywords, which may include \"*\" to match any todo keyword.
- (org-agenda-skip-entry-if 'todo '(\"TODO\" \"WAITING\"))
+ (org-agenda-skip-entry-if \\='todo \\='(\"TODO\" \"WAITING\"))
would skip all entries with \"TODO\" or \"WAITING\" keywords.
Instead of a list, a keyword class may be given. For example:
- (org-agenda-skip-entry-if 'nottodo 'done)
+ (org-agenda-skip-entry-if \\='nottodo \\='done)
would skip entries that haven't been marked with any of \"DONE\"
keywords. Possible classes are: `todo', `done', `any'.
@@ -9695,7 +9695,7 @@ This is a command that has to be installed in `calendar-mode-map'."
"Hebrew: " (calendar-hebrew-date-string date) " (until sunset)\n"
"Islamic: " (calendar-islamic-date-string date) " (until sunset)\n"
"French: " (calendar-french-date-string date) "\n"
- "Baha'i: " (calendar-bahai-date-string date) " (until sunset)\n"
+ "Bahá’í: " (calendar-bahai-date-string date) " (until sunset)\n"
"Mayan: " (calendar-mayan-date-string date) "\n"
"Coptic: " (calendar-coptic-date-string date) "\n"
"Ethiopic: " (calendar-ethiopic-date-string date) "\n"
@@ -10112,10 +10112,10 @@ calling the function returns nil. This function takes one
argument: an entry from `org-agenda-get-day-entries'.
FILTER can also be an alist with the car of each cell being
-either 'headline or 'category. For example:
+either `headline' or `category'. For example:
- '((headline \"IMPORTANT\")
- (category \"Work\"))
+ ((headline \"IMPORTANT\")
+ (category \"Work\"))
will only add headlines containing IMPORTANT or headlines
belonging to the \"Work\" category.
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index d795c53..137303a 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -221,7 +221,7 @@
(defcustom org-bibtex-prefix nil
"Optional prefix for all bibtex property names.
-For example setting to 'BIB_' would allow interoperability with fireforg."
+For example setting to `BIB_' would allow interoperability with fireforg."
:group 'org-bibtex
:version "24.1"
:type '(choice
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 93a7f2a..d704cfd 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -462,7 +462,7 @@ For example, if you have a capture template \"c\" and you want
this template to be accessible only from `message-mode' buffers,
use this:
- '((\"c\" ((in-mode . \"message-mode\"))))
+ ((\"c\" ((in-mode . \"message-mode\"))))
Here are the available contexts definitions:
@@ -480,7 +480,7 @@ accessible if there is at least one valid check.
You can also bind a key to another agenda custom command
depending on contextual rules.
- '((\"c\" \"d\" ((in-mode . \"message-mode\"))))
+ ((\"c\" \"d\" ((in-mode . \"message-mode\"))))
Here it means: in `message-mode buffers', use \"c\" as the
key for the capture template otherwise associated with \"d\".
@@ -1610,7 +1610,7 @@ The template may still contain \"%?\" for cursor positioning."
(delete-region start end)
(condition-case error
(insert-file-contents filename)
- (error (insert (format "%%![Couldn't insert %s: %s]"
+ (error (insert (format "%%![Couldn not insert %s: %s]"
filename error)))))))
;; The current time
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 35a9085..f7c357b 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -401,8 +401,8 @@ nil current clock is not displayed"
(defcustom org-clock-frame-title-format '(t org-mode-line-string)
"The value for `frame-title-format' when clocking in.
-When `org-clock-clocked-in-display' is set to 'frame-title
-or 'both, clocking in will replace `frame-title-format' with
+When `org-clock-clocked-in-display' is set to `frame-title'
+or `both', clocking in will replace `frame-title-format' with
this value. Clocking out will restore `frame-title-format'.
`org-frame-title-string' is a format string using the same
@@ -779,8 +779,9 @@ Notification is shown only once."
(unless org-clock-notification-was-shown
(setq org-clock-notification-was-shown t)
(org-notify
- (format "Task '%s' should be finished by now. (%s)"
- org-clock-heading org-clock-effort) org-clock-sound))
+ (format-message "Task `%s' should be finished by now. (%s)"
+ org-clock-heading org-clock-effort)
+ org-clock-sound))
(setq org-clock-notification-was-shown nil)))))
(defun org-notify (notification &optional play-sound)
@@ -995,7 +996,7 @@ was started."
(org-clock-jump-to-current-clock clock))
(unless org-clock-resolve-expert
(with-output-to-temp-buffer "*Org Clock*"
- (princ "Select a Clock Resolution Command:
+ (princ (format-message "Select a Clock Resolution Command:
i/q Ignore this question; the same as keeping all the idle time.
@@ -1004,8 +1005,8 @@ k/K Keep X minutes of the idle time (default is all). If this
that many minutes after the time that idling began, and then
clocked back in at the present time.
-g/G Indicate that you \"got back\" X minutes ago. This is quite
- different from 'k': it clocks you out from the beginning of
+g/G Indicate that you “got back” X minutes ago. This is quite
+ different from `k': it clocks you out from the beginning of
the idle period and clock you back in X minutes ago.
s/S Subtract the idle time from the current clock. This is the
@@ -1017,7 +1018,7 @@ C Cancel the open timer altogether. It will be as though you
j/J Jump to the current clock, to make manual adjustments.
For all these options, using uppercase makes your final state
-to be CLOCKED OUT.")))
+to be CLOCKED OUT."))))
(org-fit-window-to-buffer (get-buffer-window "*Org Clock*"))
(let (char-pressed)
(when (featurep 'xemacs)
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index a762b8e..d4dcdff 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -404,6 +404,10 @@ Pass BUFFER to the XEmacs version of `move-to-column'."
(unless (fboundp 'user-error)
(defalias 'user-error 'error))
+;; ‘format-message’ is available only from 25 on
+(unless (fboundp 'format-message)
+ (defalias 'format-message 'format))
+
;; `font-lock-ensure' is only available from 24.4.50 on
(unless (fboundp 'font-lock-ensure)
(defalias 'font-lock-ensure 'font-lock-fontify-buffer))
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index a9baf04..e5435e3 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -394,7 +394,8 @@ the new file."
(org-open-file filename t))
((or (eql create t)
(and (eql create 'ask)
- (y-or-n-p (format "File `%s.org' not found; create?" name))))
+ (y-or-n-p (format-message
+ "File `%s.org' not found; create?" name))))
(org-ctags-open-file filename name))
(t ;; File does not exist, and we don't want to create it.
nil))))
@@ -433,8 +434,8 @@ the heading a destination for the tag `NAME'."
"This function is intended to be used in ORG-OPEN-LINK-FUNCTIONS.
Wrapper for org-ctags-append-topic, which first asks the user if they want
to append a new topic."
- (if (y-or-n-p (format "Topic `%s' not found; append to end of buffer?"
- name))
+ (if (y-or-n-p (format-message
+ "Topic `%s' not found; append to end of buffer?" name))
(org-ctags-append-topic name narrowp)
nil))
@@ -455,7 +456,7 @@ to rebuild (update) the TAGS file."
Wrapper for org-ctags-rebuild-tags-file-then-find-tag."
(if (and (buffer-file-name)
(y-or-n-p
- (format
+ (format-message
"Tag `%s' not found. Rebuild table `%s/TAGS' and look again?"
name
(file-name-directory (buffer-file-name)))))
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 4b85da1..5925e75 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4042,12 +4042,12 @@ 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
+ \(org-element-map tree \\='headline
\(lambda (hl)
\(and (= (org-element-property :level hl) 1)
\(member \"phone\" (org-element-property :tags hl))
@@ -4057,15 +4057,15 @@ of 1 and a \"phone\" tag, and will return its beginning position:
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
+ \(org-element-map tree \\='bold
\(lambda (b)
- \(and (org-element-map b 'latex-snippet #'identity nil t) 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.
(let* ((types (if (listp types) types (list types)))
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index 1ef0bff..6990e75 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -690,7 +690,8 @@ formatted as a string, not the original XML data."
(xml-node-children content)))))
(t
(setq entry (plist-put entry :description
- (format "Unknown '%s' content." type)))))))
+ (format-message
+ "Unknown `%s' content." type)))))))
entry))
(provide 'org-feed)
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index 338aabc..69d1912 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -181,7 +181,7 @@ This list represents a \"habit\" for the rest of this module."
(error "Habit %s has no scheduled date" habit-entry))
(unless scheduled-repeat
(error
- "Habit '%s' has no scheduled repeat period or has an incorrect one"
+ "Habit `%s' has no scheduled repeat period or has an incorrect one"
habit-entry))
(setq sr-days (org-habit-duration-to-days scheduled-repeat)
sr-type (progn (string-match "[\\.+]?\\+" scheduled-repeat)
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 62f3d95..1ec69d8 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -108,7 +108,7 @@ attributes that are found."
(defun org-irc-ellipsify-description (string &optional after)
"Remove unnecessary white space from STRING and add ellipses if necessary.
Strip starting and ending white space from STRING and replace any
-chars that the value AFTER with '...'"
+chars that the value AFTER with `...'"
(let* ((after (number-to-string (or after 30)))
(replace-map (list (cons "^[ \t]*" "")
(cons "[ \t]*$" "")
@@ -172,7 +172,7 @@ the session itself."
(org-store-link-props
:type "irc"
:link (concat "irc:/" link-text)
- :description (concat "irc session '" link-text "'")
+ :description (concat "irc session `" link-text "'")
:server (car (car link))
:port (or (string-to-number (cadr (pop link))) erc-default-port)
:nick (pop link))
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 3fe35bd..c2fa46a 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -377,7 +377,7 @@ nor a function, elements of KEYWORDS are used directly."
(defvar org-mouse-priority-regexp "\\[#\\([A-Z]\\)\\]"
"Regular expression matching the priority indicator.
Differs from `org-priority-regexp' in that it doesn't contain the
-leading '.*?'.")
+leading `.*?'.")
(defun org-mouse-get-priority (&optional default)
"Return the priority of the current headline.
@@ -538,7 +538,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
((stringp (nth 2 entry))
(concat (org-mouse-agenda-type (nth 1 entry))
(nth 2 entry)))
- (t "Agenda Command '%s'"))
+ (t "Agenda Command `%s'"))
30))))
"--"
["Delete Blank Lines" delete-blank-lines
@@ -565,7 +565,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
(save-excursion (org-apply-on-list wrap-fun nil)))))
(defun org-mouse-bolp ()
- "Return true if there only spaces, tabs, and '*' before point.
+ "Return true if there only spaces, tabs, and `*' before point.
This means, between the beginning of line and the point."
(save-excursion
(skip-chars-backward " \t*") (bolp)))
@@ -707,9 +707,9 @@ This means, between the beginning of line and the point."
((org-mouse-looking-at ":\\([A-Za-z0-9_]+\\):" "A-Za-z0-9_" -1) ;tags
(popup-menu
`(nil
- [,(format "Display '%s'" (match-string 1))
+ [,(format-message "Display `%s'" (match-string 1))
(org-tags-view nil ,(match-string 1))]
- [,(format "Sparse Tree '%s'" (match-string 1))
+ [,(format-message "Sparse Tree `%s'" (match-string 1))
(org-tags-sparse-tree nil ,(match-string 1))]
"--"
,@(org-mouse-tag-menu))))
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index a089f34..90a7f36 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -94,7 +94,7 @@ Return value is the point at the beginning of the table."
(goto-char (org-table-begin)))
(defun org-plot/collect-options (&optional params)
- "Collect options from an org-plot '#+Plot:' line.
+ "Collect options from an org-plot `#+Plot:' line.
Accepts an optional property list PARAMS, to which the options
will be added. Returns the resulting property list."
(interactive)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index d0750f7..339f2b7 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -197,7 +197,7 @@ Possible properties are:
Example:
(setq org-protocol-project-alist
- '((\"http://orgmode.org/worg/\"
+ \\='((\"http://orgmode.org/worg/\"
:online-suffix \".php\"
:working-suffix \".org\"
:base-url \"http://orgmode.org/worg/\"
@@ -251,7 +251,7 @@ kill-client - If t, kill the client immediately, once the sub-protocol is
Here is an example:
(setq org-protocol-protocol-alist
- '((\"my-protocol\"
+ \\='((\"my-protocol\"
:protocol \"my-protocol\"
:function my-protocol-handler-function)
(\"your-protocol\"
@@ -303,7 +303,7 @@ part."
(defun org-protocol-flatten-greedy (param-list &optional strip-path replacement)
"Greedy handlers might receive a list like this from emacsclient:
- '((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")
+ ((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\"))
where \"/dir/\" is the absolute path to emacsclients working directory. This
function transforms it into a flat list using `org-protocol-flatten' and
transforms the elements of that list as follows:
@@ -347,7 +347,7 @@ returned list."
(defun org-protocol-flatten (l)
"Greedy handlers might receive a list like this from emacsclient:
- '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")
+ ((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\"))
where \"/dir/\" is the absolute path to emacsclients working directory.
This function transforms it into a flat list."
(if (null l) ()
@@ -365,9 +365,9 @@ link's URL to the `kill-ring'.
The location for a browser's bookmark has to look like this:
- javascript:location.href='org-protocol://store-link://'+ \\
+ javascript:location.href=\\='org-protocol://store-link://\\='+ \\
encodeURIComponent(location.href)
- encodeURIComponent(document.title)+'/'+ \\
+ encodeURIComponent(document.title)+\\='/\\='+ \\
Don't use `escape()'! Use `encodeURIComponent()' instead. The title of the page
could contain slashes and the location definitely will.
@@ -394,18 +394,18 @@ The sub-protocol used to reach this function is set in
`org-protocol-protocol-alist'.
This function detects an URL, title and optional text, separated
-by '/'. The location for a browser's bookmark looks like this:
+by `/'. The location for a browser's bookmark looks like this:
- javascript:location.href='org-protocol://capture://'+ \\
- encodeURIComponent(location.href)+'/' \\
- encodeURIComponent(document.title)+'/'+ \\
+ javascript:location.href=\\='org-protocol://capture://\\='+ \\
+ encodeURIComponent(location.href)+\\='/\\=' \\
+ encodeURIComponent(document.title)+\\='/\\='+ \\
encodeURIComponent(window.getSelection())
By default, it uses the character `org-protocol-default-template-key',
which should be associated with a template in `org-capture-templates'.
But you may prepend the encoded URL with a character and a slash like so:
- javascript:location.href='org-protocol://capture://b/'+ ...
+ javascript:location.href=\\='org-protocol://capture://b/\\='+ ...
Now template ?b will be used."
(if (and (boundp 'org-stored-links)
@@ -455,7 +455,7 @@ in `org-protocol-project-alist'.
The location for a browser's bookmark should look like this:
- javascript:location.href='org-protocol://open-source://'+ \\
+ javascript:location.href=\\='org-protocol://open-source://\\='+ \\
encodeURIComponent(location.href)"
;; As we enter this function for a match on our protocol, the return value
;; defaults to nil.
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 163d726..9c205e1 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -657,9 +657,9 @@ This command is not bound to a key by default, to avoid conflicts
with language major mode bindings. To bind it to C-c @ in all
language major modes, you could use
- (add-hook 'org-src-mode-hook
+ (add-hook \\='org-src-mode-hook
(lambda () (define-key org-src-mode-map \"\\C-c@\"
- 'org-src-do-key-sequence-at-code-block)))
+ \\='org-src-do-key-sequence-at-code-block)))
In that case, for example, C-c @ t issued in code edit buffers
would tangle the current Org code block, C-c @ e would execute
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 8205581..0f4308e 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -563,9 +563,9 @@ slightly, to make sure a beginning of line in the first line is included.
SEPARATOR specifies the field separator in the lines. It can have the
following values:
-'(4) Use the comma as a field separator
-'(16) Use a TAB as field separator
-'(64) Prompt for a regular expression as field separator
+(4) Use the comma as a field separator
+(16) Use a TAB as field separator
+(64) Prompt for a regular expression as field separator
integer When a number, use that many spaces as field separator
regexp When a regular expression, use it to match the separator
nil When nil, the command tries to be smart and figure out the
diff --git a/lisp/org.el b/lisp/org.el
index d712b67..bc28c1f 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -680,7 +680,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
@@ -770,20 +770,20 @@ value of the variable, after updating it:
\(lambda (backend)
\(let ((name (org-export-backend-name backend)))
\(or (memq name val)
- \(catch 'parentp
+ \(catch \\='parentp
\(dolist (b val)
\(and (org-export-derived-backend-p b name)
- \(throw 'parentp t)))))))
+ \(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'\"
+ \(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)))
+ \(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."
@@ -1780,8 +1780,8 @@ links in Org-mode buffers can have an optional tag after a double colon, e.g.
[[linkkey:tag][description]]
-The 'linkkey' must be a word word, starting with a letter, followed
-by letters, numbers, '-' or '_'.
+The `linkkey' must be a word word, starting with a letter, followed
+by letters, numbers, `-' or `_'.
If REPLACE is a string, the tag will simply be appended to create the link.
If the string contains \"%s\", the tag will be inserted there. If the string
@@ -2210,7 +2210,7 @@ file identifier are
filename matches the regexp. If you want to
use groups here, use shy groups.
- Example: (\"\\.x?html\\'\" . \"firefox %s\")
+ Example: (\"\\.x?html\\\\='\" . \"firefox %s\")
(\"\\(?:xhtml\\|html\\)\" . \"firefox %s\")
to open *.html and *.xhtml with firefox.
@@ -2226,7 +2226,7 @@ file identifier are
In a custom lisp form, you can access the group matches with
(match-string n link).
- Example: (\"\\.pdf::\\(\\d+\\)\\'\" . \"evince -p %1 %s\")
+ Example: (\"\\.pdf::\\(\\d+\\)\\\\='\" . \"evince -p %1 %s\")
to open [[file:document.pdf::5]] with evince at page 5.
`directory' Matches a directory
@@ -2723,7 +2723,7 @@ TODO state changes
------------------
:type todo-state-change
:from previous state (keyword as a string), or nil, or a symbol
- 'todo' or 'done', to indicate the general type of state.
+ `todo' or `done', to indicate the general type of state.
:to new state, like in :from")
(defcustom org-enforce-todo-dependencies nil
@@ -3531,10 +3531,10 @@ Instead of customizing this variable directly, you might want to
set it locally for capture buffers, because there no list of
tags in that file can be created dynamically (there are none).
- (add-hook 'org-capture-mode-hook
+ (add-hook \\='org-capture-mode-hook
(lambda ()
(set (make-local-variable
- 'org-complete-tags-always-offer-all-agenda-tags)
+ \\='org-complete-tags-always-offer-all-agenda-tags)
t)))"
:group 'org-tags
:version "24.1"
@@ -4214,7 +4214,7 @@ lines to the buffer:
(defcustom org-hidden-keywords nil
"List of symbols corresponding to keywords to be hidden the org buffer.
-For example, a value '(title) for this list will make the document's title
+For example, a value \\='(title) for this list will make the document's title
appear in the buffer without the initial #+TITLE: keyword."
:group 'org-appearance
:version "24.1"
@@ -6756,7 +6756,7 @@ show the entire buffer, including any drawers.
;; Table: enter it or move to the next field.
((org-at-table-p 'any)
(if (org-at-table.el-p)
- (message (substitute-command-keys "\\<org-mode-map>\
+ (message "%s" (substitute-command-keys "\\<org-mode-map>\
Use \\[org-edit-special] to edit table.el tables"))
(if arg (org-table-edit-field t)
(org-table-justify-field-maybe)
@@ -11473,7 +11473,7 @@ org-open-file.
It assumes that is the case when the entry uses a regular
expression which has at least one grouping construct and the
action is either a lisp form or a command string containing
-'%1', i.e. using at least one subexpression match as a
+`%1', i.e. using at least one subexpression match as a
parameter."
(let ((selector (car entry))
(action (cdr entry)))
@@ -12508,11 +12508,11 @@ With a numeric prefix arg of 0, inhibit note taking for the change.
With a numeric prefix arg of -1, cancel repeater to allow marking as DONE.
When called through ELisp, arg is also interpreted in the following way:
-'none -> empty state
+`none' -> empty state
\"\"(empty string) -> switch to empty state
-'done -> switch to DONE
-'nextset -> switch to the next set of keywords
-'previousset -> switch to the previous set of keywords
+`done' -> switch to DONE
+`nextset' -> switch to the next set of keywords
+`previousset' -> switch to the previous set of keywords
\"WAITING\" -> switch to the specified keyword, but only if it
really is a member of `org-todo-keywords'."
(interactive "P")
@@ -17644,7 +17644,7 @@ days in order to avoid rounding problems."
(error (error "Bad timestamp `%s'%s\nError was: %s"
s (if (not (and buffer pos))
""
- (format " at %d in buffer `%s'" pos buffer))
+ (format-message " at %d in buffer `%s'" pos buffer))
(cdr errdata)))))
(defun org-time-string-to-seconds (s)
@@ -17673,7 +17673,7 @@ The variable `date' is bound by the calendar when this is called."
(error (error "Bad timestamp `%s'%s\nError was: %s"
s (if (not (and buffer pos))
""
- (format " at %d in buffer `%s'" pos buffer))
+ (format-message " at %d in buffer `%s'" pos buffer))
(cdr errdata))))))))
(defun org-days-to-iso-week (days)
@@ -21219,7 +21219,7 @@ This command does many different things, depending on context:
;; a `table.el' type, just give up. At a table row or
;; cell, maybe recalculate line but always align table.
(if (eq (org-element-property :type context) 'table.el)
- (message (substitute-command-keys "\\<org-mode-map>\
+ (message "%s" (substitute-command-keys "\\<org-mode-map>\
Use \\[org-edit-special] to edit table.el tables"))
(let ((org-enable-table-editor t))
(if (or (eq type 'table)
@@ -22651,8 +22651,8 @@ for the search purpose."
For example, in this alist:
-\(org-uniquify-alist '((a 1) (b 2) (a 3)))
- => '((a 1 3) (b 2))
+\(org-uniquify-alist \\='((a 1) (b 2) (a 3)))
+ => \\='((a 1 3) (b 2))
merge (a 1) and (a 3) into (a 1 3).
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 629c1cc..e4288dc 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -873,7 +873,7 @@ you can reuse them:
For example:
\(setq org-html-table-row-tags
- (cons '(cond (top-row-p \"<tr class=\\\"tr-top\\\">\")
+ (cons \\='(cond (top-row-p \"<tr class=\\\"tr-top\\\">\")
(bottom-row-p \"<tr class=\\\"tr-bottom\\\">\")
(t (if (= (mod row-number 2) 1)
\"<tr class=\\\"tr-odd\\\">\"
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index ddbbd33..91fbb96 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -879,21 +879,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 '(\"newfloat\" \"minted\"))
+ \(require \\='ox-latex)
+ \(add-to-list \\='org-latex-packages-alist \\='(\"newfloat\" \"minted\"))
In addition, it is necessary to install pygments
\(http://pygments.org), and to configure the variable
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 9f49f24..1367b1e 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -67,7 +67,7 @@ produced.")
(defcustom org-publish-project-alist nil
"Association list to control publishing behavior.
-Each element of the alist is a publishing 'project.' The CAR of
+Each element of the alist is a publishing “project”. The CAR of
each element is a string, uniquely identifying the project. The
CDR of each element is in one of the following forms:
@@ -717,7 +717,7 @@ If `:auto-sitemap' is set, publish the sitemap too. If
(defun org-publish-org-sitemap (project &optional sitemap-filename)
"Create a sitemap of pages in set defined by PROJECT.
Optionally set the filename of the sitemap with SITEMAP-FILENAME.
-Default for SITEMAP-FILENAME is 'sitemap.org'."
+Default for SITEMAP-FILENAME is `sitemap.org'."
(let* ((project-plist (cdr project))
(dir (file-name-as-directory
(plist-get project-plist :base-directory)))
diff --git a/lisp/ox.el b/lisp/ox.el
index bfdfeba..7b43c28 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1094,7 +1094,7 @@ keywords are understood:
Menu entry for the export dispatcher. It should be a list
like:
- '(KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU)
+ (KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU)
where :
@@ -1118,17 +1118,17 @@ keywords are understood:
If it is an alist, associations should follow the
pattern:
- '(KEY DESCRIPTION ACTION)
+ (KEY DESCRIPTION ACTION)
where KEY, DESCRIPTION and ACTION are described above.
Valid values include:
- '(?m \"My Special Back-end\" my-special-export-function)
+ (?m \"My Special Back-end\" my-special-export-function)
or
- '(?l \"Export to LaTeX\"
+ (?l \"Export to LaTeX\"
\(?p \"As PDF file\" org-latex-export-to-pdf)
\(?o \"As PDF file and open\"
\(lambda (a s v b)
@@ -1139,7 +1139,7 @@ keywords are understood:
or the following, which will be added to the previous
sub-menu,
- '(?l 1
+ (?l 1
\((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex)
\(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf)))
@@ -1215,12 +1215,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
- :translate-alist '((template . my-latex-template-fun)))
+ \(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))
@@ -5757,7 +5757,7 @@ and `org-export-to-file' for more specialized functions."
(kill-buffer proc-buffer))))
(org-export-add-to-stack proc-buffer nil p)
(ding)
- (message "Process '%s' exited abnormally" p))
+ (message "Process `%s' exited abnormally" p))
(unless org-export-async-debug
(delete-file ,,temp-file)))))))))))))
@@ -5793,7 +5793,7 @@ 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*\"
+ \(org-export-to-buffer \\='latex \"*Org LATEX Export*\"
async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode))))
This function returns BUFFER."
@@ -5854,7 +5854,7 @@ to send the output file through additional processing, e.g,
\(&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
+ \(org-export-to-file \\='latex outfile
async subtreep visible-only body-only ext-plist
\(lambda (file) (org-latex-compile file)))