diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-19 14:59:15 -0700 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2015-07-26 23:29:31 -0400 |
| commit | 9dcbe163ccc20f59d3b91e0801b40b85d1f8e530 (patch) | |
| tree | bdd5a933be3f31bd669ce3f72a09e40c459b0c48 | |
| parent | 9347da11bf6c0383186dab9d66ebde935402ae7d (diff) | |
| download | org-mode-9dcbe163ccc20f59d3b91e0801b40b85d1f8e530.tar.gz | |
Backport commit 9d35bb8 from Emacs master branch
* lisp/org-compat.el (org-number-sequence):
* lisp/org.el (org-remove-highlights-with-change)
(org-structure-template-alist):
* lisp/ox-html.el (org-html-link-org-files-as-html):
Fix minor quoting problems in doc strings, e.g., missing quote,
``x'' where `x' was meant, etc.
Fix minor quoting problems in doc strings
9d35bb8d6518bb913ab08bace2af08963c003177
Paul Eggert
Tue May 19 15:01:16 2015 -0700
| -rw-r--r-- | lisp/org-bbdb.el | 2 | ||||
| -rw-r--r-- | lisp/org-compat.el | 2 | ||||
| -rw-r--r-- | lisp/org.el | 4 | ||||
| -rw-r--r-- | lisp/ox-html.el | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index cfd5b3b..78f9b71 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -37,7 +37,7 @@ ;; the diary using bbdb-anniv.el. ;; ;; Put the following in /somewhere/at/home/diary.org and make sure -;; that this file is in `org-agenda-files` +;; that this file is in `org-agenda-files'. ;; ;; %%(org-bbdb-anniversaries) ;; diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 77366b3..a90d04d 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -241,7 +241,7 @@ ignored in this case." (or window (selected-window))) (defun org-number-sequence (from &optional to inc) - "Call `number-sequence or emulate it." + "Call `number-sequence' or emulate it." (if (fboundp 'number-sequence) (number-sequence from to inc) (if (or (not to) (= from to)) diff --git a/lisp/org.el b/lisp/org.el index 15196f7..37f3d26 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1452,7 +1452,7 @@ changed by an edit command." (defcustom org-remove-highlights-with-change t "Non-nil means any change to the buffer will remove temporary highlights. Such highlights are created by `org-occur' and `org-clock-display'. -When nil, `C-c C-c needs to be used to get rid of the highlights. +When nil, `C-c C-c' needs to be used to get rid of the highlights. The highlights created by `org-preview-latex-fragment' always need `C-c C-c' to be removed." :group 'org-sparse-trees @@ -12081,7 +12081,7 @@ This is a list of abbreviation keys and values. The value gets inserted if you type `<' followed by the key and then press the completion key, usually `M-TAB'. %file will be replaced by a file name after prompting for the file using completion. The cursor will be placed at the position -of the `?` in the template. +of the `?' in the template. There are two templates for each key, the first uses the original Org syntax, the second uses Emacs Muse-like syntax tags. These Muse-like tags become the default when the /org-mtags.el/ module has been loaded. See also the diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 2959387..1e4444b 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -711,7 +711,7 @@ t Synonym for `mathjax'." When `org-mode' is exporting an `org-mode' file to HTML, links to non-html files are directly put into a href tag in HTML. However, links to other Org-mode files (recognized by the -extension `.org.) should become links to the corresponding html +extension `.org') should become links to the corresponding html file, assuming that the linked `org-mode' file will also be converted to HTML. When nil, the links still point to the plain `.org' file." |