diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-06-10 11:17:31 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-06-10 11:17:31 +0200 |
commit | c30fe929cdeb62093c676bfe0cb18af41348acda (patch) | |
tree | a928a42a3d9c0a365b0a95af179199c6b19f119c | |
parent | 3ecf1fb7b93aafd6349452076724b9dff5627f9e (diff) | |
parent | 81920b3f86edf21b4775464b3fe56453672bed3d (diff) | |
download | org-mode-c30fe929cdeb62093c676bfe0cb18af41348acda.tar.gz |
Merge branch 'master' of code.orgmode.org:bzg/org-mode
-rw-r--r-- | doc/org-manual.org | 4 | ||||
-rw-r--r-- | doc/orgcard.tex | 3 | ||||
-rw-r--r-- | lisp/org-id.el | 3 | ||||
-rw-r--r-- | lisp/org.el | 6 | ||||
-rw-r--r-- | lisp/ox-publish.el | 2 |
5 files changed, 7 insertions, 11 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index 73cfb5a..4fcd15d 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -21298,8 +21298,8 @@ information attached to them, like a time-stamp, a scheduled or a deadline string. See ~org-agenda-entry-types~ on how to set what planning information is taken into account. -[fn:102] For HTML you need to install Hrvoje Niksic's =htmlize.el= -from [[https://github.com/hniksic/emacs-htmlize][Hrvoje Niksic's repository]]. +[fn:102] For HTML you need to install Hrvoje Nikšić's =htmlize.el= +from [[https://github.com/hniksic/emacs-htmlize][Hrvoje Nikšić's repository]]. [fn:103] To create PDF output, the Ghostscript ps2pdf utility must be installed on the system. Selecting a PDF file also creates the diff --git a/doc/orgcard.tex b/doc/orgcard.tex index 699c3d3..7e0268c 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -58,8 +58,7 @@ % dvips -t landscape refcard.dvi % % Author: -% Stephen Gildea -% Internet: gildea@stop.mail-abuse.org +% Stephen Gildea <stepheng+emacs@gildea.com> % % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik % for their many good ideas. diff --git a/lisp/org-id.el b/lisp/org-id.el index ec4d25d..2968610 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -86,8 +86,7 @@ (defcustom org-id-link-to-org-use-id nil "Non-nil means storing a link to an Org file will use entry IDs. -\\<org-mode-map>\ - +\\<org-mode-map> The variable can have the following values: t Create an ID if needed to make a link to the current entry. diff --git a/lisp/org.el b/lisp/org.el index 7bf2b68..4b3b133 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4,7 +4,6 @@ ;; Copyright (C) 2004-2019 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> -;; Maintainer: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org ;; Version: 9.3 @@ -841,8 +840,7 @@ depends on, if any." (defcustom org-support-shift-select nil "Non-nil means make shift-cursor commands select text when possible. -\\<org-mode-map>\ - +\\<org-mode-map> In Emacs 23, when `shift-select-mode' is on, shifted cursor keys start selecting a region, or enlarge regions started in this way. In Org mode, in special contexts, these same keys are used for @@ -1228,8 +1226,8 @@ See `org-file-apps'.") ("\\.x?html?\\'" . default) ("\\.pdf\\'" . default)) "External applications for opening `file:path' items in a document. -\\<org-mode-map>\ +\\<org-mode-map> Org mode uses system defaults for different file types, but you can use this variable to set the application for a given file extension. The entries in this list are cons cells where the car identifies diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 4bfb021..8928301 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2006-2019 Free Software Foundation, Inc. ;; Author: David O'Toole <dto@gnu.org> -;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com> +;; Maintainer: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: hypermedia, outlines, wp ;; This file is part of GNU Emacs. |