diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:22:26 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:22:26 -0800 |
| commit | 8d99e233147d44c2176cef599db754d06b12f5e3 (patch) | |
| tree | 1c98a8e6b702bc3b10fab1d8a2ade1fda4f938a6 /lisp | |
| parent | d5ccb74848658d20a7b31ea3a2bf5a090468fd5d (diff) | |
| parent | 6c3031399b796feceaab2bdfe94abe7170db4e34 (diff) | |
| download | emacs-8d99e233147d44c2176cef599db754d06b12f5e3.tar.gz emacs-8d99e233147d44c2176cef599db754d06b12f5e3.tar.bz2 emacs-8d99e233147d44c2176cef599db754d06b12f5e3.zip | |
Merge from origin/emacs-26
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/org/org-clock.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index eb7080bb8be..fd99c175013 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -487,7 +487,7 @@ to add an effort property.") "10\\.6\\.[[:digit:]]" (shell-command-to-string "sw_vers -productVersion")) - (<= m -1034058203136)) + (<= m -1034058203135)) (ignore-errors (decode-time (list m 0))))))) (low (funcall dichotomy |