Browse Source

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.

<http://permalink.gmane.org/gmane.emacs.orgmode/100896/>
Kyle Meyer 9 years ago
parent
commit
077810e521
5 changed files with 14 additions and 14 deletions
  1. 5 5
      lisp/org-agenda.el
  2. 2 2
      lisp/org-capture.el
  3. 1 1
      lisp/org-clock.el
  4. 1 1
      lisp/ox-publish.el
  5. 5 5
      lisp/ox.el

+ 5 - 5
lisp/org-agenda.el

@@ -1211,7 +1211,7 @@ For example, 9:30am would become 09:30 rather than  9:30."
   :type 'boolean)
   :type 'boolean)
 
 
 (defun org-agenda-time-of-day-to-ampm (time)
 (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)))
   (let* ((hour-number (string-to-number (substring time 0 -3)))
          (minute (substring time -2))
          (minute (substring time -2))
          (ampm "am"))
          (ampm "am"))
@@ -1993,8 +1993,8 @@ the lower-case version of all tags."
   "Alist of characters and custom functions for bulk actions.
   "Alist of characters and custom functions for bulk actions.
 For example, this value makes those two functions available:
 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
 With selected entries in an agenda buffer, `B R' will call
 the custom function `set-category' on the selected entries.
 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
 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
 will only add headlines containing IMPORTANT or headlines
 belonging to the \"Work\" category.
 belonging to the \"Work\" category.

+ 2 - 2
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,
 this template to be accessible only from `message-mode' buffers,
 use this:
 use this:
 
 
-   ((\"c\" ((in-mode . \"message-mode\"))))
+   \\='((\"c\" ((in-mode . \"message-mode\"))))
 
 
 Here are the available contexts definitions:
 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
 You can also bind a key to another agenda custom command
 depending on contextual rules.
 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
 Here it means: in `message-mode buffers', use \"c\" as the
 key for the capture template otherwise associated with \"d\".
 key for the capture template otherwise associated with \"d\".

+ 1 - 1
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
          that many minutes after the time that idling began, and then
          clocked back in at the present time.
          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
          different from `k': it clocks you out from the beginning of
          the idle period and clock you back in X minutes ago.
          the idle period and clock you back in X minutes ago.
 
 

+ 1 - 1
lisp/ox-publish.el

@@ -67,7 +67,7 @@ produced.")
 
 
 (defcustom org-publish-project-alist nil
 (defcustom org-publish-project-alist nil
   "Association list to control publishing behavior.
   "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
 each element is a string, uniquely identifying the project.  The
 CDR of each element is in one of the following forms:
 CDR of each element is in one of the following forms:
 
 

+ 5 - 5
lisp/ox.el

@@ -1094,7 +1094,7 @@ keywords are understood:
     Menu entry for the export dispatcher.  It should be a list
     Menu entry for the export dispatcher.  It should be a list
     like:
     like:
 
 
-      (KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU)
+      \\='(KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU)
 
 
     where :
     where :
 
 
@@ -1118,17 +1118,17 @@ keywords are understood:
       If it is an alist, associations should follow the
       If it is an alist, associations should follow the
       pattern:
       pattern:
 
 
-        (KEY DESCRIPTION ACTION)
+        \\='(KEY DESCRIPTION ACTION)
 
 
       where KEY, DESCRIPTION and ACTION are described above.
       where KEY, DESCRIPTION and ACTION are described above.
 
 
     Valid values include:
     Valid values include:
 
 
-       (?m \"My Special Back-end\" my-special-export-function)
+      \\='(?m \"My Special Back-end\" my-special-export-function)
 
 
       or
       or
 
 
-       (?l \"Export to LaTeX\"
+      \\='(?l \"Export to LaTeX\"
            \(?p \"As PDF file\" org-latex-export-to-pdf)
            \(?p \"As PDF file\" org-latex-export-to-pdf)
            \(?o \"As PDF file and open\"
            \(?o \"As PDF file and open\"
                \(lambda (a s v b)
                \(lambda (a s v b)
@@ -1139,7 +1139,7 @@ keywords are understood:
       or the following, which will be added to the previous
       or the following, which will be added to the previous
       sub-menu,
       sub-menu,
 
 
-       (?l 1
+      \\='(?l 1
           \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex)
           \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex)
            \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf)))
            \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf)))