diff options
| author | Paul Eggert | 2015-09-03 15:31:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-09-03 15:32:54 -0700 |
| commit | 26bd978d87dfbf9baa115cd961a67d42b416c4bf (patch) | |
| tree | 20f3d063895796f54b9f521c0b35f65bbcd418c4 /lisp/org | |
| parent | 944d77f070da388b0c6e6578a9f868e88c088940 (diff) | |
| download | emacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.tar.gz emacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.zip | |
Fix some more docstring etc. quoting problems
Mostly these fixes prevent the transliteration of apostrophes
that should stay apostrophes. Also, prefer curved quotes in
Bahá’í proper names, as that’s the preferred Bahá’í style and
these names are chock-full of non-ASCII characters anyway.
* lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload)
(eieio-defclass-internal):
* lisp/emacs-lisp/eieio.el (defclass):
* lisp/hi-lock.el (hi-lock-mode):
Don’t transliterate Lisp apostrophes when generating a
doc string or diagnostic.
* lisp/international/mule-diag.el (list-coding-systems-1):
* lisp/international/ogonek.el (ogonek-jak, ogonek-how):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/vc/ediff-mult.el (ediff-redraw-registry-buffer):
* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map):
Substitute quotes before putting them in the help buffer.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-agenda.el | 10 | ||||
| -rw-r--r-- | lisp/org/org-capture.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-protocol.el | 18 | ||||
| -rw-r--r-- | lisp/org/org-src.el | 6 | ||||
| -rw-r--r-- | lisp/org/org-table.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 18 | ||||
| -rw-r--r-- | lisp/org/ox.el | 10 |
7 files changed, 35 insertions, 35 deletions
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 3a87f6bedbd..9a64089059c 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el | |||
| @@ -497,7 +497,7 @@ are prefix commands. For the dispatcher to display useful information, you | |||
| 497 | should provide a description for the prefix, like | 497 | should provide a description for the prefix, like |
| 498 | 498 | ||
| 499 | (setq org-agenda-custom-commands | 499 | (setq org-agenda-custom-commands |
| 500 | '((\"h\" . \"HOME + Name tag searches\") ; describe prefix \"h\" | 500 | \\='((\"h\" . \"HOME + Name tag searches\") ; describe prefix \"h\" |
| 501 | (\"hl\" tags \"+HOME+Lisa\") | 501 | (\"hl\" tags \"+HOME+Lisa\") |
| 502 | (\"hp\" tags \"+HOME+Peter\") | 502 | (\"hp\" tags \"+HOME+Peter\") |
| 503 | (\"hk\" tags \"+HOME+Kim\")))" | 503 | (\"hk\" tags \"+HOME+Kim\")))" |
| @@ -1932,7 +1932,7 @@ list as second element: | |||
| 1932 | For example, to display a 16px horizontal space for Emacs | 1932 | For example, to display a 16px horizontal space for Emacs |
| 1933 | category, you can use: | 1933 | category, you can use: |
| 1934 | 1934 | ||
| 1935 | (\"Emacs\" '(space . (:width (16))))" | 1935 | (\"Emacs\" \\='(space . (:width (16))))" |
| 1936 | :group 'org-agenda-line-format | 1936 | :group 'org-agenda-line-format |
| 1937 | :version "24.1" | 1937 | :version "24.1" |
| 1938 | :type '(alist :key-type (string :tag "Regexp matching category") | 1938 | :type '(alist :key-type (string :tag "Regexp matching category") |
| @@ -2538,7 +2538,7 @@ For example, if you have a custom agenda command \"p\" and you | |||
| 2538 | want this command to be accessible only from plain text files, | 2538 | want this command to be accessible only from plain text files, |
| 2539 | use this: | 2539 | use this: |
| 2540 | 2540 | ||
| 2541 | '((\"p\" ((in-file . \"\\.txt\")))) | 2541 | \\='((\"p\" ((in-file . \"\\.txt\")))) |
| 2542 | 2542 | ||
| 2543 | Here are the available contexts definitions: | 2543 | Here are the available contexts definitions: |
| 2544 | 2544 | ||
| @@ -2556,7 +2556,7 @@ accessible if there is at least one valid check. | |||
| 2556 | You can also bind a key to another agenda custom command | 2556 | You can also bind a key to another agenda custom command |
| 2557 | depending on contextual rules. | 2557 | depending on contextual rules. |
| 2558 | 2558 | ||
| 2559 | '((\"p\" \"q\" ((in-file . \"\\.txt\")))) | 2559 | \\='((\"p\" \"q\" ((in-file . \"\\.txt\")))) |
| 2560 | 2560 | ||
| 2561 | Here it means: in .txt files, use \"p\" as the key for the | 2561 | Here it means: in .txt files, use \"p\" as the key for the |
| 2562 | agenda command otherwise associated with \"q\". (The command | 2562 | agenda command otherwise associated with \"q\". (The command |
| @@ -9596,7 +9596,7 @@ This is a command that has to be installed in `calendar-mode-map'." | |||
| 9596 | "Hebrew: " (calendar-hebrew-date-string date) " (until sunset)\n" | 9596 | "Hebrew: " (calendar-hebrew-date-string date) " (until sunset)\n" |
| 9597 | "Islamic: " (calendar-islamic-date-string date) " (until sunset)\n" | 9597 | "Islamic: " (calendar-islamic-date-string date) " (until sunset)\n" |
| 9598 | "French: " (calendar-french-date-string date) "\n" | 9598 | "French: " (calendar-french-date-string date) "\n" |
| 9599 | "Baha'i: " (calendar-bahai-date-string date) " (until sunset)\n" | 9599 | "Bahá’í: " (calendar-bahai-date-string date) " (until sunset)\n" |
| 9600 | "Mayan: " (calendar-mayan-date-string date) "\n" | 9600 | "Mayan: " (calendar-mayan-date-string date) "\n" |
| 9601 | "Coptic: " (calendar-coptic-date-string date) "\n" | 9601 | "Coptic: " (calendar-coptic-date-string date) "\n" |
| 9602 | "Ethiopic: " (calendar-ethiopic-date-string date) "\n" | 9602 | "Ethiopic: " (calendar-ethiopic-date-string date) "\n" |
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index 7b4b6eadc5e..6a4b2bafb01 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el | |||
| @@ -460,7 +460,7 @@ For example, if you have a capture template \"c\" and you want | |||
| 460 | this template to be accessible only from `message-mode' buffers, | 460 | this template to be accessible only from `message-mode' buffers, |
| 461 | use this: | 461 | use this: |
| 462 | 462 | ||
| 463 | '((\"c\" ((in-mode . \"message-mode\")))) | 463 | ((\"c\" ((in-mode . \"message-mode\")))) |
| 464 | 464 | ||
| 465 | Here are the available contexts definitions: | 465 | Here are the available contexts definitions: |
| 466 | 466 | ||
| @@ -478,7 +478,7 @@ accessible if there is at least one valid check. | |||
| 478 | You can also bind a key to another agenda custom command | 478 | You can also bind a key to another agenda custom command |
| 479 | depending on contextual rules. | 479 | depending on contextual rules. |
| 480 | 480 | ||
| 481 | '((\"c\" \"d\" ((in-mode . \"message-mode\")))) | 481 | ((\"c\" \"d\" ((in-mode . \"message-mode\")))) |
| 482 | 482 | ||
| 483 | Here it means: in `message-mode buffers', use \"c\" as the | 483 | Here it means: in `message-mode buffers', use \"c\" as the |
| 484 | key for the capture template otherwise associated with \"d\". | 484 | key for the capture template otherwise associated with \"d\". |
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index ae0f4946832..339f2b74afd 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el | |||
| @@ -303,7 +303,7 @@ part." | |||
| 303 | 303 | ||
| 304 | (defun org-protocol-flatten-greedy (param-list &optional strip-path replacement) | 304 | (defun org-protocol-flatten-greedy (param-list &optional strip-path replacement) |
| 305 | "Greedy handlers might receive a list like this from emacsclient: | 305 | "Greedy handlers might receive a list like this from emacsclient: |
| 306 | '((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") | 306 | ((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")) |
| 307 | where \"/dir/\" is the absolute path to emacsclients working directory. This | 307 | where \"/dir/\" is the absolute path to emacsclients working directory. This |
| 308 | function transforms it into a flat list using `org-protocol-flatten' and | 308 | function transforms it into a flat list using `org-protocol-flatten' and |
| 309 | transforms the elements of that list as follows: | 309 | transforms the elements of that list as follows: |
| @@ -347,7 +347,7 @@ returned list." | |||
| 347 | 347 | ||
| 348 | (defun org-protocol-flatten (l) | 348 | (defun org-protocol-flatten (l) |
| 349 | "Greedy handlers might receive a list like this from emacsclient: | 349 | "Greedy handlers might receive a list like this from emacsclient: |
| 350 | '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") | 350 | ((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")) |
| 351 | where \"/dir/\" is the absolute path to emacsclients working directory. | 351 | where \"/dir/\" is the absolute path to emacsclients working directory. |
| 352 | This function transforms it into a flat list." | 352 | This function transforms it into a flat list." |
| 353 | (if (null l) () | 353 | (if (null l) () |
| @@ -365,9 +365,9 @@ link's URL to the `kill-ring'. | |||
| 365 | 365 | ||
| 366 | The location for a browser's bookmark has to look like this: | 366 | The location for a browser's bookmark has to look like this: |
| 367 | 367 | ||
| 368 | javascript:location.href='org-protocol://store-link://'+ \\ | 368 | javascript:location.href=\\='org-protocol://store-link://\\='+ \\ |
| 369 | encodeURIComponent(location.href) | 369 | encodeURIComponent(location.href) |
| 370 | encodeURIComponent(document.title)+'/'+ \\ | 370 | encodeURIComponent(document.title)+\\='/\\='+ \\ |
| 371 | 371 | ||
| 372 | Don't use `escape()'! Use `encodeURIComponent()' instead. The title of the page | 372 | Don't use `escape()'! Use `encodeURIComponent()' instead. The title of the page |
| 373 | could contain slashes and the location definitely will. | 373 | could contain slashes and the location definitely will. |
| @@ -396,16 +396,16 @@ The sub-protocol used to reach this function is set in | |||
| 396 | This function detects an URL, title and optional text, separated | 396 | This function detects an URL, title and optional text, separated |
| 397 | by `/'. The location for a browser's bookmark looks like this: | 397 | by `/'. The location for a browser's bookmark looks like this: |
| 398 | 398 | ||
| 399 | javascript:location.href='org-protocol://capture://'+ \\ | 399 | javascript:location.href=\\='org-protocol://capture://\\='+ \\ |
| 400 | encodeURIComponent(location.href)+'/' \\ | 400 | encodeURIComponent(location.href)+\\='/\\=' \\ |
| 401 | encodeURIComponent(document.title)+'/'+ \\ | 401 | encodeURIComponent(document.title)+\\='/\\='+ \\ |
| 402 | encodeURIComponent(window.getSelection()) | 402 | encodeURIComponent(window.getSelection()) |
| 403 | 403 | ||
| 404 | By default, it uses the character `org-protocol-default-template-key', | 404 | By default, it uses the character `org-protocol-default-template-key', |
| 405 | which should be associated with a template in `org-capture-templates'. | 405 | which should be associated with a template in `org-capture-templates'. |
| 406 | But you may prepend the encoded URL with a character and a slash like so: | 406 | But you may prepend the encoded URL with a character and a slash like so: |
| 407 | 407 | ||
| 408 | javascript:location.href='org-protocol://capture://b/'+ ... | 408 | javascript:location.href=\\='org-protocol://capture://b/\\='+ ... |
| 409 | 409 | ||
| 410 | Now template ?b will be used." | 410 | Now template ?b will be used." |
| 411 | (if (and (boundp 'org-stored-links) | 411 | (if (and (boundp 'org-stored-links) |
| @@ -455,7 +455,7 @@ in `org-protocol-project-alist'. | |||
| 455 | 455 | ||
| 456 | The location for a browser's bookmark should look like this: | 456 | The location for a browser's bookmark should look like this: |
| 457 | 457 | ||
| 458 | javascript:location.href='org-protocol://open-source://'+ \\ | 458 | javascript:location.href=\\='org-protocol://open-source://\\='+ \\ |
| 459 | encodeURIComponent(location.href)" | 459 | encodeURIComponent(location.href)" |
| 460 | ;; As we enter this function for a match on our protocol, the return value | 460 | ;; As we enter this function for a match on our protocol, the return value |
| 461 | ;; defaults to nil. | 461 | ;; defaults to nil. |
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index 8a6c77a8182..c970fe6c851 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el | |||
| @@ -166,10 +166,10 @@ other-frame Use `switch-to-buffer-other-frame' to display edit buffer. | |||
| 166 | (const reorganize-frame))) | 166 | (const reorganize-frame))) |
| 167 | 167 | ||
| 168 | (defvar org-src-mode-hook nil | 168 | (defvar org-src-mode-hook nil |
| 169 | "Hook run after Org switched a source code snippet to its Emacs mode. | 169 | "Hook run after Org switched a source code snippet to its Emacs mode. |
| 170 | This hook will run | 170 | This hook will run |
| 171 | 171 | ||
| 172 | - when editing a source code snippet with \"C-c '\". | 172 | - when editing a source code snippet with `\\[org-src-mode-map]'. |
| 173 | - When formatting a source code snippet for export with htmlize. | 173 | - When formatting a source code snippet for export with htmlize. |
| 174 | 174 | ||
| 175 | You may want to use this hook for example to turn off `outline-minor-mode' | 175 | You may want to use this hook for example to turn off `outline-minor-mode' |
| @@ -226,7 +226,7 @@ the existing edit buffer." | |||
| 226 | (define-minor-mode org-src-mode | 226 | (define-minor-mode org-src-mode |
| 227 | "Minor mode for language major mode buffers generated by org. | 227 | "Minor mode for language major mode buffers generated by org. |
| 228 | This minor mode is turned on in two situations: | 228 | This minor mode is turned on in two situations: |
| 229 | - when editing a source code snippet with \"C-c '\". | 229 | - when editing a source code snippet with `\\[org-src-mode-map]'. |
| 230 | - When formatting a source code snippet for export with htmlize. | 230 | - When formatting a source code snippet for export with htmlize. |
| 231 | There is a mode hook, and keybindings for `org-edit-src-exit' and | 231 | There is a mode hook, and keybindings for `org-edit-src-exit' and |
| 232 | `org-edit-src-save'") | 232 | `org-edit-src-save'") |
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index fb593674ec4..f05ab7ad1c4 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el | |||
| @@ -545,8 +545,8 @@ slightly, to make sure a beginning of line in the first line is included. | |||
| 545 | SEPARATOR specifies the field separator in the lines. It can have the | 545 | SEPARATOR specifies the field separator in the lines. It can have the |
| 546 | following values: | 546 | following values: |
| 547 | 547 | ||
| 548 | '(4) Use the comma as a field separator | 548 | (4) Use the comma as a field separator |
| 549 | '(16) Use a TAB as field separator | 549 | (16) Use a TAB as field separator |
| 550 | integer When a number, use that many spaces as field separator | 550 | integer When a number, use that many spaces as field separator |
| 551 | nil When nil, the command tries to be smart and figure out the | 551 | nil When nil, the command tries to be smart and figure out the |
| 552 | separator in the following way: | 552 | separator in the following way: |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 963da77f592..587d7654409 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -1982,7 +1982,7 @@ file identifier are | |||
| 1982 | filename matches the regexp. If you want to | 1982 | filename matches the regexp. If you want to |
| 1983 | use groups here, use shy groups. | 1983 | use groups here, use shy groups. |
| 1984 | 1984 | ||
| 1985 | Example: (\"\\.x?html\\'\" . \"firefox %s\") | 1985 | Example: (\"\\.x?html\\\\='\" . \"firefox %s\") |
| 1986 | (\"\\(?:xhtml\\|html\\)\" . \"firefox %s\") | 1986 | (\"\\(?:xhtml\\|html\\)\" . \"firefox %s\") |
| 1987 | to open *.html and *.xhtml with firefox. | 1987 | to open *.html and *.xhtml with firefox. |
| 1988 | 1988 | ||
| @@ -1998,7 +1998,7 @@ file identifier are | |||
| 1998 | In a custom lisp form, you can access the group matches with | 1998 | In a custom lisp form, you can access the group matches with |
| 1999 | (match-string n link). | 1999 | (match-string n link). |
| 2000 | 2000 | ||
| 2001 | Example: (\"\\.pdf::\\(\\d+\\)\\'\" . \"evince -p %1 %s\") | 2001 | Example: (\"\\.pdf::\\(\\d+\\)\\\\='\" . \"evince -p %1 %s\") |
| 2002 | to open [[file:document.pdf::5]] with evince at page 5. | 2002 | to open [[file:document.pdf::5]] with evince at page 5. |
| 2003 | 2003 | ||
| 2004 | `directory' Matches a directory | 2004 | `directory' Matches a directory |
| @@ -12222,13 +12222,13 @@ With a triple \\[universal-argument] prefix, circumvent any state blocking. | |||
| 12222 | With a numeric prefix arg of 0, inhibit note taking for the change. | 12222 | With a numeric prefix arg of 0, inhibit note taking for the change. |
| 12223 | 12223 | ||
| 12224 | For calling through lisp, arg is also interpreted in the following way: | 12224 | For calling through lisp, arg is also interpreted in the following way: |
| 12225 | 'none -> empty state | 12225 | `none' -> empty state |
| 12226 | \"\"(empty string) -> switch to empty state | 12226 | \"\" (empty string) -> switch to empty state |
| 12227 | 'done -> switch to DONE | 12227 | `done' -> switch to DONE |
| 12228 | 'nextset -> switch to the next set of keywords | 12228 | `nextset' -> switch to the next set of keywords |
| 12229 | 'previousset -> switch to the previous set of keywords | 12229 | `previousset' -> switch to the previous set of keywords |
| 12230 | \"WAITING\" -> switch to the specified keyword, but only if it | 12230 | \"WAITING\" -> switch to the specified keyword, but only if it |
| 12231 | really is a member of `org-todo-keywords'." | 12231 | really is a member of `org-todo-keywords'." |
| 12232 | (interactive "P") | 12232 | (interactive "P") |
| 12233 | (if (and (org-region-active-p) org-loop-over-headlines-in-active-region) | 12233 | (if (and (org-region-active-p) org-loop-over-headlines-in-active-region) |
| 12234 | (let ((cl (if (eq org-loop-over-headlines-in-active-region 'start-level) | 12234 | (let ((cl (if (eq org-loop-over-headlines-in-active-region 'start-level) |
diff --git a/lisp/org/ox.el b/lisp/org/ox.el index a0573d04c10..5d8e48ea97a 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el | |||
| @@ -1060,7 +1060,7 @@ keywords are understood: | |||
| 1060 | Menu entry for the export dispatcher. It should be a list | 1060 | Menu entry for the export dispatcher. It should be a list |
| 1061 | like: | 1061 | like: |
| 1062 | 1062 | ||
| 1063 | '(KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU) | 1063 | (KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU) |
| 1064 | 1064 | ||
| 1065 | where : | 1065 | where : |
| 1066 | 1066 | ||
| @@ -1084,17 +1084,17 @@ keywords are understood: | |||
| 1084 | If it is an alist, associations should follow the | 1084 | If it is an alist, associations should follow the |
| 1085 | pattern: | 1085 | pattern: |
| 1086 | 1086 | ||
| 1087 | '(KEY DESCRIPTION ACTION) | 1087 | (KEY DESCRIPTION ACTION) |
| 1088 | 1088 | ||
| 1089 | where KEY, DESCRIPTION and ACTION are described above. | 1089 | where KEY, DESCRIPTION and ACTION are described above. |
| 1090 | 1090 | ||
| 1091 | Valid values include: | 1091 | Valid values include: |
| 1092 | 1092 | ||
| 1093 | '(?m \"My Special Back-end\" my-special-export-function) | 1093 | (?m \"My Special Back-end\" my-special-export-function) |
| 1094 | 1094 | ||
| 1095 | or | 1095 | or |
| 1096 | 1096 | ||
| 1097 | '(?l \"Export to LaTeX\" | 1097 | (?l \"Export to LaTeX\" |
| 1098 | \(?p \"As PDF file\" org-latex-export-to-pdf) | 1098 | \(?p \"As PDF file\" org-latex-export-to-pdf) |
| 1099 | \(?o \"As PDF file and open\" | 1099 | \(?o \"As PDF file and open\" |
| 1100 | \(lambda (a s v b) | 1100 | \(lambda (a s v b) |
| @@ -1105,7 +1105,7 @@ keywords are understood: | |||
| 1105 | or the following, which will be added to the previous | 1105 | or the following, which will be added to the previous |
| 1106 | sub-menu, | 1106 | sub-menu, |
| 1107 | 1107 | ||
| 1108 | '(?l 1 | 1108 | (?l 1 |
| 1109 | \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) | 1109 | \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) |
| 1110 | \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) | 1110 | \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) |
| 1111 | 1111 | ||