diff options
| author | Eric Schulte <schulte.eric@gmail.com> | 2010-07-28 09:24:15 -0600 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2010-07-28 09:24:15 -0600 |
| commit | 69f15e0b73f10883c6737ac788f494a301c95ca9 (patch) | |
| tree | e8776a26e2bddbac0959338c8de1907d9de5224c | |
| parent | dc92eaa08d89e4bc9556f868ae65633196157a8d (diff) | |
| parent | 95212c22024e81fc32d2f4d76d5901b85e952826 (diff) | |
| download | org-mode-69f15e0b73f10883c6737ac788f494a301c95ca9.tar.gz | |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
| -rw-r--r-- | doc/org.texi | 8 | ||||
| -rw-r--r-- | lisp/org-agenda.el | 3 | ||||
| -rw-r--r-- | lisp/org-capture.el | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/doc/org.texi b/doc/org.texi index e4135d0..38fd4b9 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -9911,9 +9911,9 @@ different level - then the hierarchy above frames will produce the sectioning structure of the presentation. A template for useful in-buffer settings or properties can be inserted into -the buffer with @kbd{M-x org-beamer-settings-template}. Among other things, -this will install a column view format which is very handy for editing -special properties used by beamer. +the buffer with @kbd{M-x org-insert-beamer-options-template}. Among other +things, this will install a column view format which is very handy for +editing special properties used by beamer. You can influence the structure of the presentation using the following properties: @@ -9978,7 +9978,7 @@ environment or the @code{BEAMER_col} property. Column view provides a great way to set the environment of a node and other important parameters. Make sure you are using a COLUMN format that is geared toward this special purpose. The command @kbd{M-x -org-beamer-settings-template} defines such a format. +org-insert-beamer-options-template} defines such a format. Here is a simple example Org document that is intended for beamer export. diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index bfb155f..d62b193 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5315,8 +5315,9 @@ HH:MM." (alpha-up (and (org-em 'alpha-up 'alpha-down ss) (org-cmp-alpha a b))) (alpha-down (if alpha-up (- alpha-up) nil)) + (need-user-cmp (org-em 'user-defined-up 'user-defined-down ss)) user-defined-up user-defined-down) - (if (and org-agenda-cmp-user-defined + (if (and need-user-cmp org-agenda-cmp-user-defined (functionp org-agenda-cmp-user-defined)) (setq user-defined-up (funcall org-agenda-cmp-user-defined a b) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index cf09dce..2efed78 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -467,8 +467,9 @@ bypassed." (markerp (org-capture-get :interrupted-clock 'local)) (buffer-live-p (marker-buffer (org-capture-get :interrupted-clock 'local)))) - (org-with-point-at (org-capture-get :interrupted-clock 'local) - (org-clock-in)) + (let ((clock-in-task (org-capture-get :interrupted-clock 'local))) + (org-with-point-at clock-in-task + (org-clock-in))) (message "Interrupted clock has been resumed"))) (let ((beg (point-min)) |