From 077810e5216790b737cd1bb1e313f4242e5f29d9 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 21 Sep 2015 00:23:58 -0400 Subject: [PATCH] Modify quote-related backport These changes are in line with the changes proposed on the mailing list, but many of those changes weren't necessary because they had already been reverted in the Emacs repo. --- lisp/org-agenda.el | 10 +++++----- lisp/org-capture.el | 4 ++-- lisp/org-clock.el | 2 +- lisp/ox-publish.el | 2 +- lisp/ox.el | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 79e0f5580..3def19e87 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -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")) @@ -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. @@ -10114,8 +10114,8 @@ 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: - ((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-capture.el b/lisp/org-capture.el index d704cfdcd..67dc31931 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\". diff --git a/lisp/org-clock.el b/lisp/org-clock.el index f7c357bb0..e0d573fff 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1005,7 +1005,7 @@ 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 +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. diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 1367b1e14..ed353865e 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: diff --git a/lisp/ox.el b/lisp/ox.el index 7b43c283e..26ee6e767 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)))