diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2019-12-03 21:22:57 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2019-12-03 21:22:57 -0500 |
| commit | ce6c4adb2403edca1a483602b9d7bf2f18187b53 (patch) | |
| tree | 67040bd759cf45aa9a351abddc1794c15116fa49 | |
| parent | 7d3d14daa3bba9e067f20742a01a5c406ce8a852 (diff) | |
| parent | f4d8622bc63c16de3a65e46870c32e7778541644 (diff) | |
| download | org-mode-ce6c4adb2403edca1a483602b9d7bf2f18187b53.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ob-eshell.el | 2 | ||||
| -rw-r--r-- | lisp/ol.el | 10 | ||||
| -rw-r--r-- | lisp/org-keys.el | 10 | ||||
| -rw-r--r-- | lisp/org-num.el | 10 |
4 files changed, 19 insertions, 13 deletions
diff --git a/lisp/ob-eshell.el b/lisp/ob-eshell.el index 800abce..1090bef 100644 --- a/lisp/ob-eshell.el +++ b/lisp/ob-eshell.el @@ -1,6 +1,6 @@ ;;; ob-eshell.el --- Babel Functions for Eshell -*- lexical-binding: t; -*- -;; Copyright (C) 2018 Free Software Foundation, Inc. +;; Copyright (C) 2018-2019 Free Software Foundation, Inc. ;; Author: stardiviner <numbchild@gmail.com> ;; Keywords: literate programming, reproducible research @@ -1,22 +1,24 @@ ;;; ol.el --- Org links library -*- lexical-binding: t; -*- -;; Copyright (C) 2018 Free Software Foundation, Inc. +;; Copyright (C) 2018-2019 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/org-keys.el b/lisp/org-keys.el index ae4f60d..daad26d 100644 --- a/lisp/org-keys.el +++ b/lisp/org-keys.el @@ -1,21 +1,23 @@ ;;; org-keys.el --- Key bindings for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2018 Free Software Foundation, Inc. +;; Copyright (C) 2018-2019 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/org-num.el b/lisp/org-num.el index 5604819..7254b58 100644 --- a/lisp/org-num.el +++ b/lisp/org-num.el @@ -1,22 +1,24 @@ ;;; org-num.el --- Dynamic Headlines Numbering -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2019 Free Software Foundation, Inc. +;; Copyright (C) 2018-2019 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> ;; Keywords: outlines, hypermedia, calendar, wp -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: |