mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity
org-mode/lisp
History
Matt Lundin 13751c3249 Fix org-clock-load 
Since commit fda64f1ae2 on November 6,
org-clock-load no longer restores clocks in org-clock-persist-file. The
contents of the file look like this:

(setq org-clock-stored-history '(("/home/matt/org/inbox.org" . 39479) ("/home/matt/org/reading.org" . 63478)))

The files both exist; the position information is correct; and
org-clock-persist is t. And yet after calling org-clock-load,
org-clock-history, org-clock-loaded, and org-clock-stored-history remain
nil.

The problem, it seems, is that the logic/order of the if statement was
reversed in the commit above. The attached patch should fix the issue.

Best,
Matt

[4. text/x-diff; 0001-org-clock-Fix-org-clock-load.patch]
From 6d649016fbbfaa28c902ee1e71c20ecf332f8a14 Mon Sep 17 00:00:00 2001
From: Matt Lundin <mdl@imapmail.org>
Date: Mon, 19 Dec 2016 17:24:10 -0600
Subject: [PATCH] org-clock: Fix org-clock-load

* lisp/org-clock.el: (org-clock-load): Fix incorrect order in if
statement that was preventing org-load from loading stored data and
populating org-clock-history.
 		2016-12-20 18:01:02 +01:00
..
Makefile
…
ob-C.el Use ‘eq’ instead of ‘equal’ for symbols 2016-09-25 16:29:06 +01:00
ob-J.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-R.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-abc.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-asymptote.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-awk.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-calc.el Use ‘eq’ instead of ‘equal’ for symbols 2016-09-25 16:29:06 +01:00
ob-clojure.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-comint.el ob-comint: Fix org-babel-comint-in-buffer 2016-09-03 02:48:23 +01:00
ob-coq.el ox-coq.el: Clean up 2016-02-11 08:54:03 +01:00
ob-core.el ob-core: Fix typos in messages 2016-11-04 08:34:57 +01:00
ob-css.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
ob-ditaa.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-dot.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-ebnf.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-emacs-lisp.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-eval.el babel: change single-armed ‘if’ statements to ‘when’ 2016-09-03 02:45:27 +01:00
ob-exp.el Change :version in defcustoms from "25.1" to "25.2" 2016-10-05 11:18:39 +02:00
ob-forth.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-fortran.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-gnuplot.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-groovy.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-haskell.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-io.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-java.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-js.el ob-js: Fix error when code block ends with a comment 2016-11-21 23:21:23 +01:00
ob-keys.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
ob-latex.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-ledger.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-lilypond.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-lisp.el Change :version in defcustoms from "25.1" to "25.2" 2016-10-05 11:18:39 +02:00
ob-lob.el Fix coderef handling in source blocks 2016-08-28 11:56:14 +02:00
ob-lua.el lisp/ob-lua.el: Small indentation fix 2016-11-01 21:39:11 +01:00
ob-makefile.el Merge branch 'maint' 2016-01-09 17:43:27 -05:00
ob-matlab.el Merge branch 'maint' 2016-01-09 17:43:27 -05:00
ob-maxima.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-mscgen.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-ocaml.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-octave.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-org.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-perl.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-picolisp.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-plantuml.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-processing.el Remove unnecessary (require 'cl) 2016-07-25 15:41:02 +02:00
ob-python.el Use ‘eq’ instead of ‘equal’ for symbols 2016-09-25 16:29:06 +01:00
ob-ref.el Clean up string handling. 2016-08-24 16:05:54 +01:00
ob-ruby.el Use ‘eq’ instead of ‘equal’ for symbols 2016-09-25 16:29:06 +01:00
ob-sass.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-scala.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-scheme.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-screen.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-sed.el Merge branch 'maint' 2016-01-09 17:43:27 -05:00
ob-shell.el Use ‘eq’ instead of ‘equal’ for symbols 2016-09-25 16:29:06 +01:00
ob-shen.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-sql.el Use assq instead of assoc for :keywords 2016-09-23 11:20:09 +01:00
ob-sqlite.el Use ‘eq’ instead of ‘equal’ for symbols 2016-09-25 16:29:06 +01:00
ob-stan.el Use `string-match-p' instead of `org-string-match-p' 2016-07-25 15:21:12 +02:00
ob-table.el babel: change single-armed ‘if’ statements to ‘when’ 2016-09-03 02:45:27 +01:00
ob-tangle.el ob-tangle: Fix last commit 2016-12-10 00:59:08 +01:00
ob.el Merge branch 'maint' 2016-01-09 17:43:27 -05:00
org-agenda.el org-agenda: Fix "Wrong type argument: number-or-marker-p" 2016-12-15 22:16:19 +01:00
org-archive.el Fix TODO keywords case sensitivity 2016-11-13 11:26:17 +01:00
org-attach.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-bbdb.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-bibtex.el Change :version in defcustoms from "25.1" to "25.2" 2016-10-05 11:18:39 +02:00
org-capture.el Fix documentation 2016-11-07 01:14:04 +01:00
org-clock.el Fix org-clock-load 2016-12-20 18:01:02 +01:00
org-colview.el org-colview: Fix `org-agenda-overriding-columns-format' 2016-12-11 01:34:55 +01:00
org-compat.el org-compat: Assume `string-prefix-p' is defined 2016-10-29 10:02:27 +02:00
org-crypt.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
org-ctags.el Remove unnecessary calls to `org-update-radio-target-regexp' 2016-10-19 15:31:10 +02:00
org-datetree.el String handling improvements. 2016-09-03 02:05:10 +01:00
org-docview.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
org-element.el org-element: Prevent parsing meta-data after blank lines 2016-11-10 00:25:34 +01:00
org-entities.el org-entities.el (org-entities): Add Amacr and amacr entities 2016-10-19 17:05:08 +02:00
org-eshell.el Update eshell link definition 2016-07-18 22:47:50 +02:00
org-eww.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
org-faces.el Silence byte-compiler 2016-09-24 10:52:49 +02:00
org-feed.el Mark a few functions as obsolete 2016-06-23 10:00:00 +02:00
org-footnote.el Fix docstrings 2016-10-31 10:01:33 +01:00
org-gnus.el Improve docstrings 2016-10-15 17:43:54 +02:00
org-habit.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-id.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-indent.el org-indent: Remove (require 'cl) 2016-07-25 15:42:25 +02:00
org-info.el org-info: Fix docstrings 2016-12-14 21:37:03 +01:00
org-inlinetask.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-install.el
…
org-irc.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-lint.el Improve docstrings 2016-10-15 17:43:54 +02:00
org-list.el org-list: Clarify code 2016-12-19 12:06:30 +01:00
org-macro.el Deprecate org-remove-(angle-brackets,double-quotes) 2016-09-03 02:22:11 +01:00
org-macs.el org-macs: Tiny refactoring 2016-12-15 00:02:58 +01:00
org-mhe.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-mobile.el Match `org-complex-heading-regexp' with a nil `case-fold-search' 2016-10-29 00:38:15 +02:00
org-mouse.el Change "Org-mode" into "Org mode" 2016-10-11 18:00:08 +02:00
org-pcomplete.el Fix TODO keywords case sensitivity 2016-11-13 11:26:17 +01:00
org-plot.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
org-protocol.el Improve docstrings 2016-10-15 17:43:54 +02:00
org-rmail.el Deprecate org-remove-(angle-brackets,double-quotes) 2016-09-03 02:22:11 +01:00
org-src.el Allow coderef on otherwise empty lines 2016-12-07 23:11:10 +01:00
org-table.el Fix documentation 2016-11-07 01:14:04 +01:00
org-timer.el Improve docstrings 2016-10-15 17:43:54 +02:00
org-w3m.el Turn org-mode into Org or Org mode 2016-08-23 22:13:56 +02:00
org.el Fix C-c C-c on inline tasks 2016-12-15 14:24:01 +01:00
ox-ascii.el ox-ascii: Fix internal and ID links 2016-12-15 16:12:58 +01:00
ox-beamer.el ox-beamer: Fix target export 2016-12-14 13:15:48 +01:00
ox-html.el ox-html: Fix %d placeholder in pre/postamble string 2016-11-19 23:17:32 +01:00
ox-icalendar.el ox-icalendar: Use \r\n instead of \n as line breaks 2016-11-18 23:03:01 +01:00
ox-latex.el ox-latex: Fix typo 2016-12-13 14:15:07 +01:00
ox-man.el Fix LaTeX preview 2016-11-27 12:07:11 +01:00
ox-md.el Change :version in defcustoms from "25.1" to "25.2" 2016-10-05 11:18:39 +02:00
ox-odt.el Backport commit eeecac7 from Emacs 2016-12-07 22:33:31 -05:00
ox-org.el Move obsolete declarations into "org-compat.el" 2016-06-30 15:20:51 +02:00
ox-publish.el ox-publish: Fix too many opened buffer upon publishing 2016-11-11 00:45:21 +01:00
ox-texinfo.el Fix LaTeX preview 2016-11-27 12:07:11 +01:00
ox.el ox-ascii: Fix internal and ID links 2016-12-15 16:12:58 +01:00