ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2016-11-19 16:50:37 -05:00
parent 2c466ebff2 d31c8ef17c
commit bc0bebbc43
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/orgcard.tex
View File

@ -20,14 +20,18 @@
% Copyright (C) 1987, 1993, 1996-1997, 2001-2016 Free Software % Copyright (C) 1987, 1993, 1996-1997, 2001-2016 Free Software
% Foundation, Inc. % Foundation, Inc.
% This file is part of GNU Emacs. % This document is free software: you can redistribute it and/or modify
% GNU Emacs is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by % it under the terms of the GNU General Public License as published by
% the Free Software Foundation, either version 3 of the License, or % the Free Software Foundation, either version 3 of the License, or
% (at your option) any later version. % (at your option) any later version.
% GNU Emacs is distributed in the hope that it will be useful, % As a special additional permission, you may distribute reference cards
% printed, or formatted for printing, with the notice "Released under
% the terms of the GNU General Public License version 3 or later"
% instead of the usual distributed-under-the-GNU-GPL notice, and without
% a copy of the GPL itself.
% This document is distributed in the hope that it will be useful,
% but WITHOUT ANY WARRANTY; without even the implied warranty of % but WITHOUT ANY WARRANTY; without even the implied warranty of
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% GNU General Public License for more details. % GNU General Public License for more details.
@ -73,9 +77,8 @@
\centerline{Author: Philip Rooke} \centerline{Author: Philip Rooke}
\centerline{based on refcard design and format by Stephen Gildea} \centerline{based on refcard design and format by Stephen Gildea}
Permission is granted to make and distribute copies of \centerline{Released under the terms of the GNU General Public License}
this card provided the copyright notice and this permission notice \centerline{version 3 or later.}
are preserved on all copies.
\endgroup} \endgroup}

4
lisp/org.el
View File

@ -2251,7 +2251,7 @@ See `org-file-apps'.")
("dvi" . "xdvi %s") ("dvi" . "xdvi %s")
("fig" . "xfig %s") ("fig" . "xfig %s")
(t . "open %s")) (t . "open %s"))
"Default file applications on a MacOS X system. "Default file applications on a macOS system.
The system \"open\" is known as a default, but we use X11 applications The system \"open\" is known as a default, but we use X11 applications
for some files for which the OS does not have a good default. for some files for which the OS does not have a good default.
See `org-file-apps'.") See `org-file-apps'.")
@ -2323,7 +2323,7 @@ Possible values for the file identifier are:
will also open html files inside Emacs, unless you add will also open html files inside Emacs, unless you add
(\"html\" . default) to the list as well. (\"html\" . default) to the list as well.
`system' The system command to open files, like `open' on Windows `system' The system command to open files, like `open' on Windows
and Mac OS X, and mailcap under GNU/Linux. This is the command and macOS, and mailcap under GNU/Linux. This is the command
that will be selected if you call `org-open-at-point' with a that will be selected if you call `org-open-at-point' with a
double prefix argument (`\\[universal-argument] \ double prefix argument (`\\[universal-argument] \
\\[universal-argument] \\[org-open-at-point]'). \\[universal-argument] \\[org-open-at-point]').