[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107736: Fix regressions in Org.
|
From: |
Bastien Guerry |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107736: Fix regressions in Org. |
|
Date: |
Mon, 02 Apr 2012 17:42:03 +0200 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107736
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-02 17:42:03 +0200
message:
Fix regressions in Org.
modified:
lisp/org/ChangeLog
lisp/org/org-agenda.el
lisp/org/org-clock.el
lisp/org/org.el
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2012-04-02 00:43:32 +0000
+++ b/lisp/org/ChangeLog 2012-04-02 15:42:03 +0000
@@ -1,6 +1,15 @@
+2012-04-02 Bastien Guerry <address@hidden>
+
+ * org-clock.el (org-clock-out-if-current): Fix regression: rename
+ `org-clock-state' to `org-state' to match the name of the
+ dynamically-scoped variable in `org-todo'.
+
+ * org-agenda.el (entry, org-diary, org-class): Fix regression:
+ rename `org-entry' to `entry'.
+
2012-04-01 Bastien Guerry <address@hidden>
- * org.el (org-todo): Fix bug in `org-todo'.
+ * org.el (org-todo): Fix regression in `org-todo'.
2012-04-01 Eric Schulte <address@hidden>
@@ -9739,7 +9748,7 @@
Remove hard-wired configuration of minted export
(org-export-latex-minted-with-line-numbers): Remove variable.
-2010-12-11 Bastien Guerry <address@hidden>
+2010-12-11 Bastien Guerry <address@hidden>
* org-clock.el (org-dblock-write:clocktable): Fix double
reference to `link' in let construct.
@@ -11133,7 +11142,7 @@
* org.el (org-make-link-string): Don't escape characters in link
type.
-2010-11-11 Bastien Guerry <address@hidden>
+2010-11-11 Bastien Guerry <address@hidden>
* org-capture.el (org-capture-templates): Update docstring to
advertise %:org-date.
@@ -11218,7 +11227,7 @@
* ob-keys.el (org-babel-key-bindings): Key bindings for block
demarcation.
-2010-11-11 Bastien Guerry <address@hidden>
+2010-11-11 Bastien Guerry <address@hidden>
* org.el (org-link-types): Add the "message" link type.
@@ -11227,7 +11236,7 @@
* org.el (org-link-types): Add 'message:' link type to default
link types.
-2010-11-11 Bastien Guerry <address@hidden>
+2010-11-11 Bastien Guerry <address@hidden>
* org-gnus.el (org-gnus-store-link): Add the :date property to
gnus links, allowing the use of %:date in capture templates.
@@ -11460,7 +11469,7 @@
* org.el (org-src-fontify-natively): Set to nil by default.
Supply cutomize interface.
-2010-11-11 Bastien Guerry <address@hidden>
+2010-11-11 Bastien Guerry <address@hidden>
* org-ascii.el (org-export-as-ascii): Fix bug in ASCII export: use
`org-bracket-link-analytic-regexp++' to match the link type.
@@ -12718,7 +12727,7 @@
(org-org-menu): Remove the entry to configure LaTeX snippet
processing.
-2010-11-11 Bastien Guerry <address@hidden>
+2010-11-11 Bastien Guerry <address@hidden>
* org-agenda.el (org-agenda-clock-goto): Use `\C-c\C-x\C-j' for
`org-clock-goto' and `J' for `org-agenda-clock-goto'. If the
@@ -13554,7 +13563,7 @@
* org-html.el (org-export-html-close-lists-maybe): Check if raw
HTML stuff was actually made from an example.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-latex.el: Items are no longer skipped when their first line
ends on a protected element.
@@ -13567,18 +13576,18 @@
* org-exp-blocks.el (org-export-blocks-preprocess):
Cleanup trailing newline after block.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-exp.el: Comment regexp now matches documentation. No more
protection check when deleting comments before export.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-exp.el (org-export-preprocess-string):
Now using `org-export-handle-include-files-recurse' to resolve
included files.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-agenda.el (org-agenda-get-deadlines)
(org-agenda-get-scheduled):
@@ -13589,7 +13598,7 @@
now instead of resetting on the cyclic repeating date. This makes it
much more obvious when you missed a repeating task after the repeater.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-exp.el (org-export-mark-blockquote-verse-center):
Consider environments that end at eob.
@@ -13629,16 +13638,16 @@
from latex backend specific instructions (#+LaTeX) are already
protected and won't be treated as normal environments.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-timer.el (org-timer-set-timer): Fix typo in the docstring.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-timer.el (org-timer-set-timer): Use a prefix argument.
See the docstring of the function.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-timer.el (org-timer-set-timer): Fix bug about canceling
timers.
@@ -13659,7 +13668,7 @@
t before calling `org-clock-out', so that that function can
know its call context.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-timer.el (org-timer-default-timer): New variable.
(org-timer-set-timer): Use the new variable. Also offer the
@@ -14109,7 +14118,7 @@
* org-compat.el (org-overlays-at): Function removed.
(org-overlays-in): Function removed.
-2010-07-19 Bastien Guerry <address@hidden>
+2010-07-19 Bastien Guerry <address@hidden>
* org-clock.el (org-clock-set-current): Just return the headline
itself, strip the TODO keyword, the priority cookie and the tags.
@@ -14355,7 +14364,7 @@
* org-publish.el (org-publish-aux-preprocess): Control case
sensitivity.
-2010-04-10 Bastien Guerry <address@hidden>
+2010-04-10 Bastien Guerry <address@hidden>
* org.el (org-splice-latex-header): Fix typo.
@@ -14843,7 +14852,7 @@
restricted, as an agenda mode.
(org-agenda-fontify-priorities): Allow simple colors as values.
-2010-04-10 Bastien Guerry <address@hidden>
+2010-04-10 Bastien Guerry <address@hidden>
* org-timer.el (org-timer-current-timer): Rename from
`org-timer-last-timer'.
@@ -14861,7 +14870,7 @@
* org-exp.el (org-export-format-source-code-or-example):
Fix textarea tag.
-2010-04-10 Bastien Guerry <address@hidden>
+2010-04-10 Bastien Guerry <address@hidden>
* org-clock.el (org-clock-current-task): New variable to store
last clocked in task.
@@ -16176,7 +16185,7 @@
(org-columns-compile-format): Support the additional parameter in
org-columns-compile-map.
-2009-11-13 Bastien Guerry <address@hidden>
+2009-11-13 Bastien Guerry <address@hidden>
* org.el (org-mode-hook): Turn `org-mode-hook' into a customizable
variable.
@@ -16845,7 +16854,7 @@
* org.el (org-shifttab): Interpret arg differently when using only
odd levels.
-2009-10-01 Bastien Guerry <address@hidden>
+2009-10-01 Bastien Guerry <address@hidden>
* org.el (org-check-agenda-file): Use a more explicit message.
@@ -16854,7 +16863,7 @@
* org-exp.el (org-export-remove-special-table-lines): Don't remove
normal lines.
-2009-10-01 Bastien Guerry <address@hidden>
+2009-10-01 Bastien Guerry <address@hidden>
* org.el (org-offer-links-in-entry): Don't use "Select link" as a
prompt in the temporary window.
@@ -17065,7 +17074,7 @@
* org-gnus.el (org-gnus-store-link): Restore the linking to a
website.
-2009-09-02 Bastien Guerry <address@hidden>
+2009-09-02 Bastien Guerry <address@hidden>
* org-latex.el (org-export-latex-first-lines): Bugfix.
@@ -17209,7 +17218,7 @@
(org-remember-apply-template): Use `org-remember-escaped-%' to
detect escaped % signs.
-2009-09-02 Bastien Guerry <address@hidden>
+2009-09-02 Bastien Guerry <address@hidden>
* org-timer.el (org-timer-set-timer): Use `org-notify' and play a
sound when showing the notification.
@@ -17343,7 +17352,7 @@
* org-exp.el (org-export-format-source-code-or-example):
Use listing package if requested by the user.
-2009-09-02 Bastien Guerry <address@hidden>
+2009-09-02 Bastien Guerry <address@hidden>
* org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb'
command before actually switching to a buffer.
@@ -17577,14 +17586,14 @@
* org-macs.el (org-unmodified): Turn of modification hooks while
running this macro.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (org-adapt-indentation): Slightly improve the docstring.
(org-occur): Sends an error when the user inputs an empty string.
(org-priority): Bugfix: the tag alignement should happen within
save-excursion.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (org-make-link-regexps): Don't exclude parentheses from
`org-plain-link-re'.
@@ -17598,7 +17607,7 @@
* org-clock.el (org-clock-in): Bugfix: recognize timestamps with
an abbreviated format for days.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org-protocol.el (org-protocol-default-template-key):
New option.
@@ -17615,7 +17624,7 @@
(org-update-parent-todo-statistics): Possibly use the new allowed
value of `org-provide-todo-statistics'.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org-timer.el: Add autoload cookie.
@@ -17640,7 +17649,7 @@
(org-update-parent-todo-statistics): Possibly use the new
'all-headline value from `org-provide-todo-statistics'.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org-clock.el (org-dblock-write:clocktable): Add a new option
:timestamp which allows display of timestamps in clock reports.
@@ -17656,7 +17665,7 @@
* org.el (org-eval-in-calendar): Select the right frame.
(org-save-frame-excursion): Remove this macro.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org-list.el (org-list-beginning-re): Bugfix: don't use * when
trying to find the beginning of a list.
@@ -17670,7 +17679,7 @@
(org-id-method): Use `org-id-uuid-program'.
(org-id-new): Use `org-id-uuid-program'.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org-exp.el (org-export-number-lines): Allow whitespace in code
references. Allow the -r switch to remove the references in the
@@ -17683,18 +17692,18 @@
* org-clock.el (org-show-notification-handler): New option.
(org-show-notification): Use the new option.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (org-eval-in-calendar): Fix a bug about calendar
navigation when `calendar-setup' value is 'calendar-only.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (orgstruct++-mode): Fix typo in docstring.
(org-insert-link): Clean up: (or (...)) => (...)
(org-insert-link): Use TAB for stored links completion.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (org-get-refile-targets): Fix bug: don't ignore case when
building the list of targets.
@@ -17711,12 +17720,12 @@
* org-plot.el (org-plot/gnuplot): Run with an idle timer to avoid
premature deletion of the data when using org-plot in a script.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org-clock.el (org-clock-in-prepare-hook): New hook.
(org-clock-in): Use this new hook.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (org-special-ctrl-a/e): Explicitly bind the value
'reversed for this option to the "true line boundary first"
@@ -18750,7 +18759,7 @@
* org-exp.el (org-export-splice-attributes): New function.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
Daniel M German <address@hidden>
Sebastian Rose <address@hidden>
Ross Patterson <address@hidden>
@@ -18961,7 +18970,7 @@
* org-exp.el (org-export-as-ascii): Improve export of plain lists.
-2009-08-06 Bastien Guerry <address@hidden>
+2009-08-06 Bastien Guerry <address@hidden>
* org.el (org-toggle-fixed-width-section): Bug fix: insert a
column and a space, not only a column.
@@ -20776,7 +20785,7 @@
* org-archive.el (org-archive-to-archive-sibling): Handle top
level headlines better.
-2008-10-26 Bastien Guerry <address@hidden>
+2008-10-26 Bastien Guerry <address@hidden>
* org-export-latex.el (org-export-latex-classes):
Add \usepackage{graphicx} to the default list of packages.
@@ -21000,7 +21009,7 @@
New functions, similar to the outline versions, but invisible headings
are OK.
-2008-10-12 Bastien Guerry <address@hidden>
+2008-10-12 Bastien Guerry <address@hidden>
* org.el (org-auto-repeat-maybe): Insert a space between
the timestamp's type and the timestamp itself.
@@ -21012,13 +21021,13 @@
* org.el (org-map-entries): Protect the keyword-selecting variables.
-2008-10-12 Bastien Guerry <address@hidden>
+2008-10-12 Bastien Guerry <address@hidden>
* org-agenda.el (org-agenda-to-appt): Make sure the function check
against all agenda files.
2008-10-12 Carsten Dominik <address@hidden>
- Bastien Guerry <address@hidden>
+ Bastien Guerry <address@hidden>
* org-list.el: New file, aggregating list functions from org.el
and org-export-latex.el.
@@ -21030,7 +21039,7 @@
* org-agenda.el (org-agenda-to-appt): Fix bug with appointment
time before 1am.
-2008-10-12 Bastien Guerry <address@hidden>
+2008-10-12 Bastien Guerry <address@hidden>
* org-export-latex.el (org-export-latex-keywords-maybe): Bug fix.
@@ -21075,7 +21084,7 @@
* org-compat.el (org-propertize): New function.
-2008-10-12 Bastien Guerry <address@hidden>
+2008-10-12 Bastien Guerry <address@hidden>
* org-export-latex.el (org-export-latex-tables): Protect exported
tables from further special chars conversion.
@@ -21181,7 +21190,7 @@
* org.el (org-log-note-extra): New variable.
-2008-10-12 Bastien Guerry <address@hidden>
+2008-10-12 Bastien Guerry <address@hidden>
* org.el (org-additional-option-like-keywords): Add keywords for
the _QUOTE, _VERSE and _SRC environments.
@@ -21834,7 +21843,7 @@
(org-structure-template-alist): New, experimental option.
(org-complete): Call `org-complete-expand-structure-template'.
-2008-06-17 Bastien Guerry <address@hidden>
+2008-06-17 Bastien Guerry <address@hidden>
* org-export-latex.el (org-export-latex-preprocess):
Add support for blockquotes.
=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el 2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-agenda.el 2012-04-02 15:42:03 +0000
@@ -91,7 +91,7 @@
(defvar org-agenda-buffer-name)
(defvar org-agenda-overriding-header)
(defvar org-agenda-title-append nil)
-(defvar org-entry)
+(defvar entry)
(defvar date)
(defvar org-agenda-undo-list)
(defvar org-agenda-pending-undo-list)
@@ -4530,8 +4530,8 @@
(org-compile-prefix-format 'agenda)
(org-set-sorting-strategy 'agenda)
(setq args (or args '(:deadline :scheduled :timestamp :sexp)))
- (let* ((files (if (and org-entry (stringp org-entry) (string-match "\\S-"
org-entry))
- (list org-entry)
+ (let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry))
+ (list entry)
(org-agenda-files t)))
(time (org-float-time))
file rtn results)
@@ -4936,7 +4936,7 @@
(not (member (car (calendar-iso-from-absolute d)) skip-weeks))))
(not (and (memq 'holidays skip-weeks)
(calendar-check-holidays date)))
- org-entry)))
+ entry)))
(defun org-diary-class (m1 d1 y1 m2 d2 y2 dayname &rest skip-weeks)
"Like `org-class', but honor `calendar-date-style'.
=== modified file 'lisp/org/org-clock.el'
--- a/lisp/org/org-clock.el 2012-04-01 20:27:06 +0000
+++ b/lisp/org/org-clock.el 2012-04-02 15:42:03 +0000
@@ -1691,7 +1691,7 @@
(remove-hook 'before-change-functions
'org-clock-remove-overlays 'local))))
-(defvar org-clock-state) ;; dynamically scoped into this function
+(defvar org-state) ;; dynamically scoped into this function
(defun org-clock-out-if-current ()
"Clock out if the current entry contains the running clock.
This is used to stop the clock after a TODO entry is marked DONE,
@@ -1700,9 +1700,9 @@
org-clock-out-when-done
(marker-buffer org-clock-marker)
(or (and (eq t org-clock-out-when-done)
- (member org-clock-state org-done-keywords))
+ (member org-state org-done-keywords))
(and (listp org-clock-out-when-done)
- (member org-clock-state org-clock-out-when-done)))
+ (member org-state org-clock-out-when-done)))
(equal (or (buffer-base-buffer (org-clocking-buffer))
(org-clocking-buffer))
(or (buffer-base-buffer (current-buffer))
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2012-04-02 00:43:32 +0000
+++ b/lisp/org/org.el 2012-04-02 15:42:03 +0000
@@ -4841,7 +4841,7 @@
;; FIXME: Occasionally check by commenting these, to make sure
;; no other functions uses these, forgetting to let-bind them.
-(defvar org-entry)
+(defvar entry)
(defvar org-last-state)
(defvar date)
@@ -10382,8 +10382,8 @@
targets tgs txt re files f desc descre fast-path-p level pos0)
(message "Getting targets...")
(with-current-buffer (or default-buffer (current-buffer))
- (while (setq org-entry (pop entries))
- (setq files (car org-entry) desc (cdr org-entry))
+ (while (setq entry (pop entries))
+ (setq files (car entry) desc (cdr entry))
(setq fast-path-p nil)
(cond
((null files) (setq files (list (current-buffer))))
@@ -11260,18 +11260,18 @@
(completion-ignore-case t)
(member (member this org-todo-keywords-1))
(tail (cdr member))
- (state (cond
- ((and org-todo-key-trigger
- (or (and (equal arg '(4))
- (eq org-use-fast-todo-selection
'prefix))
- (and (not arg) org-use-fast-todo-selection
- (not (eq org-use-fast-todo-selection
- 'prefix)))))
- ;; Use fast selection
- (org-fast-todo-selection))
- ((and (equal arg '(4))
- (or (not org-use-fast-todo-selection)
- (not org-todo-key-trigger)))
+ (org-state (cond
+ ((and org-todo-key-trigger
+ (or (and (equal arg '(4))
+ (eq org-use-fast-todo-selection
'prefix))
+ (and (not arg)
org-use-fast-todo-selection
+ (not (eq org-use-fast-todo-selection
+ 'prefix)))))
+ ;; Use fast selection
+ (org-fast-todo-selection))
+ ((and (equal arg '(4))
+ (or (not org-use-fast-todo-selection)
+ (not org-todo-key-trigger)))
;; Read a state with completion
(org-icompleting-read
"State: " (mapcar (lambda(x) (list x))
@@ -11320,12 +11320,12 @@
nil)))
(t
(car tail))))
- (state (or
- (run-hook-with-args-until-success
- 'org-todo-get-default-hook state org-last-state)
- state))
- (next (if state (concat " " state " ") " "))
- (change-plist (list :type 'todo-state-change :from this :to
state
+ (org-state (or
+ (run-hook-with-args-until-success
+ 'org-todo-get-default-hook org-state
org-last-state)
+ org-state))
+ (next (if org-state (concat " " org-state " ") " "))
+ (change-plist (list :type 'todo-state-change :from this :to
org-state
:position startpos))
dolog now-done-p)
(when org-blocker-hook
@@ -11337,16 +11337,16 @@
(run-hook-with-args-until-failure
'org-blocker-hook change-plist))))
(if (org-called-interactively-p 'interactive)
- (error "TODO state change from %s to %s blocked" this state)
+ (error "TODO state change from %s to %s blocked" this
org-state)
;; fail silently
- (message "TODO state change from %s to %s blocked" this state)
+ (message "TODO state change from %s to %s blocked" this
org-state)
(throw 'exit nil))))
(store-match-data match-data)
(replace-match next t t)
(unless (pos-visible-in-window-p hl-pos)
(message "TODO state changed to %s" (org-trim next)))
(unless head
- (setq head (org-get-todo-sequence-head state)
+ (setq head (org-get-todo-sequence-head org-state)
ass (assoc head org-todo-kwd-alist)
interpret (nth 1 ass)
done-word (nth 3 ass)
@@ -11354,24 +11354,24 @@
(when (memq arg '(nextset previousset))
(message "Keyword-Set %d/%d: %s"
(- (length org-todo-sets) -1
- (length (memq (assoc state org-todo-sets)
org-todo-sets)))
+ (length (memq (assoc org-state org-todo-sets)
org-todo-sets)))
(length org-todo-sets)
- (mapconcat 'identity (assoc state org-todo-sets) " ")))
+ (mapconcat 'identity (assoc org-state org-todo-sets) "
")))
(setq org-last-todo-state-is-todo
- (not (member state org-done-keywords)))
- (setq now-done-p (and (member state org-done-keywords)
+ (not (member org-state org-done-keywords)))
+ (setq now-done-p (and (member org-state org-done-keywords)
(not (member this org-done-keywords))))
(and logging (org-local-logging logging))
(when (and (or org-todo-log-states org-log-done)
(not (eq org-inhibit-logging t))
(not (memq arg '(nextset previousset))))
;; we need to look at recording a time and note
- (setq dolog (or (nth 1 (assoc state org-todo-log-states))
+ (setq dolog (or (nth 1 (assoc org-state org-todo-log-states))
(nth 2 (assoc this org-todo-log-states))))
(if (and (eq dolog 'note) (eq org-inhibit-logging 'note))
(setq dolog 'time))
- (when (and state
- (member state org-not-done-keywords)
+ (when (and org-state
+ (member org-state org-not-done-keywords)
(not (member this org-not-done-keywords)))
;; This is now a todo state and was not one before
;; If there was a CLOSED time stamp, get rid of it.
@@ -11381,17 +11381,17 @@
(org-add-planning-info 'closed (org-current-effective-time))
(if (and (not dolog) (eq 'note org-log-done))
(org-add-log-setup 'done state this 'findpos 'note)))
- (when (and state dolog)
+ (when (and org-state dolog)
;; This is a non-nil state, and we need to log it
- (org-add-log-setup 'state state this 'findpos dolog)))
+ (org-add-log-setup 'state org-state this 'findpos dolog)))
;; Fixup tag positioning
- (org-todo-trigger-tag-changes state)
+ (org-todo-trigger-tag-changes org-state)
(and org-auto-align-tags (not org-setting-tags) (org-set-tags nil
t))
(when org-provide-todo-statistics
(org-update-parent-todo-statistics))
(run-hooks 'org-after-todo-state-change-hook)
- (if (and arg (not (member state org-done-keywords)))
- (setq head (org-get-todo-sequence-head state)))
+ (if (and arg (not (member org-state org-done-keywords)))
+ (setq head (org-get-todo-sequence-head org-state)))
(put-text-property (point-at-bol) (point-at-eol) 'org-todo-head
head)
;; Do we need to trigger a repeat?
(when now-done-p
@@ -11400,7 +11400,7 @@
(save-match-data
(setq org-agenda-headline-snapshot-before-repeat
(org-get-heading))))
- (org-auto-repeat-maybe state))
+ (org-auto-repeat-maybe org-state))
;; Fixup cursor location if close to the keyword
(if (and (outline-on-heading-p)
(not (bolp))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107736: Fix regressions in Org.,
Bastien Guerry <=