mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Kyle Meyer 2019-06-09 21:39:18 -04:00
commit 81920b3f86
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/org-manual.org
View File

@ -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

3
doc/orgcard.tex
View File

@ -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.

3
lisp/org-id.el
View File

@ -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.

6
lisp/org.el
View File

@ -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

2
lisp/ox-publish.el
View File

@ -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.