Merge branch 'maint'

7 files changed, 29 insertions, 15 deletions

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 7c69efa..d0719d5 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -157,8 +157,8 @@ You can now find them here :
 - https://github.com/org-mime/org-mime
 
 *** Change ~org-texinfo-classes~ value
-The value cannot support functions to create sectionning commands
-anymore.  Also, the sectionning commands should include commands for
+The value cannot support functions to create sectioning commands
+anymore.  Also, the sectioning commands should include commands for
 appendices.  See the docstring for more information.
 *** Removal of ~:sitemap-sans-extension~
 
@@ -265,7 +265,7 @@ developers to prepend code to the scheme block being processed.
 Multiple ~:prologue~ headers can be added each of them using a string
 with the content to be added.
 
-The scheme blocks are prepared by surronding the code in the block
+The scheme blocks are prepared by surrounding the code in the block
 with a let form. The content of the ~:prologue~ headers are prepended
 before this let form.
 
@@ -386,7 +386,7 @@ argument for the scope of the clock table.
 Global table of contents are generated using vanilla Markdown syntax
 instead of HTML.  Also #+TOC keyword, including local table of
 contents, are now supported.
-**** Add Slovanian translations
+**** Add Slovenian translations
 **** Implement ~org-export-insert-image-links~
 This new function is meant to be used in back-ends supporting images
 as descriptions of links, a.k.a. image links.  See its docstring for
@@ -573,7 +573,7 @@ far away in the future.
 *** Save point before opening a file with an unknown search option
 
 When following a file link with a search option (e.g., =::#custom-id=)
-that doesn't exist in the target file, save positon before raising an
+that doesn't exist in the target file, save position before raising an
 error.  As a consequence, it is possible to jump back to the original
 document with ~org-mark-ring-goto~ (default binding =C-c &=).
 
@@ -585,7 +585,7 @@ See docstring for details.
 
 This variable is a ~defcustom~ and replaces the variable
 ~org-babel-capitalize-example-region-markers~, which is a ~defvar~ and
-is now obselete.
+is now obsolete.
 *** =INCLUDE= keywords in commented trees are now ignored.
 *** Default value for ~org-texinfo-text-markup-alist~ changed.
 
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 9250825..1b1d2dc 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -127,7 +127,7 @@ SQL Server on Windows and Linux platform."
 	     " "))
 
 (defun org-babel-sql-dbstring-sqsh (host user password database)
-  "Make sqsh commmand line args for database connection.
+  "Make sqsh command line args for database connection.
 \"sqsh\" is one method to access Sybase or MS SQL via Linux platform"
   (mapconcat #'identity
              (delq nil
diff --git a/lisp/ob-vala.el b/lisp/ob-vala.el
index 3998e2d..580e272 100644
--- a/lisp/ob-vala.el
+++ b/lisp/ob-vala.el
@@ -8,6 +8,8 @@
 
 ;;; License:
 
+;; 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
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 001930a..9dc5015 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -478,7 +478,17 @@ to add an effort property.")
 	  (funcall dichotomy
 		   most-negative-fixnum
 		   0
-		   (lambda (m) (ignore-errors (decode-time (list m 0))))))
+		   (lambda (m)
+                     ;; libc in macOS 10.6 hangs when decoding times
+                     ;; around year -2**31.  Limit `high' not to go
+                     ;; any earlier than that.
+                     (unless (and (eq system-type 'darwin)
+                                  (string-match-p
+                                   "10\\.6\\.[[:digit:]]"
+                                   (shell-command-to-string
+                                    "sw_vers -productVersion"))
+                                  (<= m -1034058203136))
+                       (ignore-errors (decode-time (list m 0)))))))
 	 (low
 	  (funcall dichotomy
 		   most-negative-fixnum
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index 308f42f..6d1926b 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -54,7 +54,7 @@ Added time stamp is active unless value is `inactive'."
   "Find or create an entry for date D.
 If KEEP-RESTRICTION is non-nil, do not widen the buffer.
 When it is nil, the buffer will be widened to make sure an existing date
-tree can be found.  If it is the sympol `subtree-at-point', then the tree
+tree can be found.  If it is the symbol `subtree-at-point', then the tree
 will be built under the headline at point."
   (setq-local org-datetree-base-level 1)
   (save-restriction
@@ -94,7 +94,7 @@ will be built under the headline at point."
 Compared to `org-datetree-find-date-create' this function creates
 entries ordered by week instead of months.
 When it is nil, the buffer will be widened to make sure an existing date
-tree can be found.  If it is the sympol `subtree-at-point', then the tree
+tree can be found.  If it is the symbol `subtree-at-point', then the tree
 will be built under the headline at point."
   (setq-local org-datetree-base-level 1)
   (save-restriction
diff --git a/lisp/org-duration.el b/lisp/org-duration.el
index 3e5f0f5..096e973 100644
--- a/lisp/org-duration.el
+++ b/lisp/org-duration.el
@@ -1,22 +1,24 @@
 ;;; org-duration.el --- Library handling durations   -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017  Free Software Foundation, Inc.
+;; Copyright (C) 2017 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:
 
diff --git a/lisp/org-table.el b/lisp/org-table.el
index a920fc8..e787fa8 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -5430,7 +5430,7 @@ information."
 	     (column
 	      ;; Call costly `org-export-table-cell-address' only if
 	      ;; absolutely necessary, i.e., if one
-	      ;; of :fmt :efmt :hmft has a "plist type" value.
+	      ;; of :fmt :efmt :hfmt has a "plist type" value.
 	      ,(and (cl-some (lambda (v) (integerp (car-safe v)))
 			     (list efmt hfmt fmt))
 		    '(1+ (cdr (org-export-table-cell-address cell info))))))