From 41e9733d2fe2603572cc580fa8e7183027f1951e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 17 Sep 2015 12:28:45 -0700 Subject: [PATCH] Backport commit 753fbfb from Emacs master branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-bibtex.el (org-bibtex-fields): * lisp/org-docview.el (org-docview-export): * lisp/org-entities.el (org-entities): * lisp/ox-icalendar.el (org-icalendar-cleanup-string): Fix typo by replacing ‘\’ with ‘\\’ in a string literal. For example, to get the regular expression ‘\.’ use the string literal "\\.", not "\." (which is equivalent to "."). Fix several backslash typos in Elisp strings 753fbfbef484272bcde5214f75fb0846ee3f33df Paul Eggert Thu Sep 17 12:39:54 2015 -0700 --- lisp/org-bibtex.el | 2 +- lisp/org-docview.el | 2 +- lisp/org-entities.el | 4 ++-- lisp/ox-icalendar.el | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index 137303a6a..4622702a5 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -195,7 +195,7 @@ (:howpublished . "How something strange has been published. The first word should be capitalized.") (:institution . "The sponsoring institution of a technical report.") (:journal . "A journal name.") - (:key . "Used for alphabetizing, cross-referencing, and creating a label when the author information is missing. This field should not be confused with the key that appears in the \cite command and at the beginning of the database entry.") + (:key . "Used for alphabetizing, cross-referencing, and creating a label when the author information is missing. This field should not be confused with the key that appears in the \\cite command and at the beginning of the database entry.") (:month . "The month in which the work was published or, for an unpublished work, in which it was written. You should use the standard three-letter abbreviation,") (:note . "Any additional information that can help the reader. The first word should be capitalized.") (:number . "Any additional information that can help the reader. The first word should be capitalized.") diff --git a/lisp/org-docview.el b/lisp/org-docview.el index 479f4ffc4..e3bf5fdb1 100644 --- a/lisp/org-docview.el +++ b/lisp/org-docview.el @@ -61,7 +61,7 @@ (setq path (org-link-escape (expand-file-name path))) (cond ((eq format 'html) (format "%s" path desc)) - ((eq format 'latex) (format "\href{%s}{%s}" path desc)) + ((eq format 'latex) (format "\\href{%s}{%s}" path desc)) ((eq format 'ascii) (format "%s (%s)" desc path)) (t path))))) diff --git a/lisp/org-entities.el b/lisp/org-entities.el index cca42e348..112088d72 100644 --- a/lisp/org-entities.el +++ b/lisp/org-entities.el @@ -361,8 +361,8 @@ packages to be loaded, add these packages to `org-latex-packages-alist'." ("lessgtr" "\\lessgtr" t "≶" "[less than or greater than]" "[less than or greater than]" "≶") ("lesseqgtr" "\\lesseqgtr" t "⋚" "[less than or equal or greater than or equal]" "[less than or equal or greater than or equal]" "⋚") ("ll" "\\ll" t "≪" "<<" "<<" "≪") - ("Ll" "\lll" t "⋘" "<<<" "<<<" "⋘") - ("lll" "\lll" t "⋘" "<<<" "<<<" "⋘") + ("Ll" "\\lll" t "⋘" "<<<" "<<<" "⋘") + ("lll" "\\lll" t "⋘" "<<<" "<<<" "⋘") ("gg" "\\gg" t "≫" ">>" ">>" "≫") ("Gg" "\\ggg" t "⋙" ">>>" ">>>" "⋙") ("ggg" "\\ggg" t "⋙" ">>>" ">>>" "⋙") diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index ae161517f..aefddf8ba 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -450,7 +450,7 @@ or subject for the event." ;; characters with literal \n. (replace-regexp-in-string "[ \t]*\n" "\\n" - (replace-regexp-in-string "[\\,;]" "\\\&" s) + (replace-regexp-in-string "[\\,;]" "\\\\\\&" s) nil t))) (defun org-icalendar-fold-string (s)