aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog8
-rw-r--r--lisp/org/ob.el2
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/org/org-bibtex.el2
-rw-r--r--lisp/org/org-clock.el2
-rw-r--r--lisp/org/org-colview.el4
-rw-r--r--lisp/org/org-freemind.el2
7 files changed, 13 insertions, 9 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 1cdb0a6f574..1c8a3e72956 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
12011-11-24 Juanma Barranquero <lekktu@gmail.com>
2
3 * ob.el (org-babel-execute-src-block): Fix typo.
4
12011-11-20 Juanma Barranquero <lekktu@gmail.com> 52011-11-20 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * org.el (org-link-unescape, org-link-unescape-compound): Fix typos. 7 * org.el (org-link-unescape, org-link-unescape-compound): Fix typos.
@@ -15461,7 +15465,7 @@
15461 15465
15462 * org.el (org-enforce-todo-checkbox-dependencies): New option. 15466 * org.el (org-enforce-todo-checkbox-dependencies): New option.
15463 (org-block-todo-from-checkboxes): New function. 15467 (org-block-todo-from-checkboxes): New function.
15464 (org-todo): Make tripple prefix arg circumvent blocking. 15468 (org-todo): Make triple prefix arg circumvent blocking.
15465 15469
154662009-01-30 Glenn Morris <rgm@gnu.org> 154702009-01-30 Glenn Morris <rgm@gnu.org>
15467 15471
@@ -17592,7 +17596,7 @@
175922008-06-17 Carsten Dominik <dominik@science.uva.nl> 175962008-06-17 Carsten Dominik <dominik@science.uva.nl>
17593 17597
17594 * org.el (org-schedule, org-deadline): Protect scheduled and 17598 * org.el (org-schedule, org-deadline): Protect scheduled and
17595 deadline tasks against changes that accidently remove the 17599 deadline tasks against changes that accidentally remove the
17596 repeater. Also show a message with the new date when done. 17600 repeater. Also show a message with the new date when done.
17597 17601
175982008-06-17 Carsten Dominik <dominik@science.uva.nl> 176022008-06-17 Carsten Dominik <dominik@science.uva.nl>
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 728c6c5cb5e..f34d1fbda9e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -380,7 +380,7 @@ Insert the results of execution into the buffer. Source code
380execution and the collection and formatting of results can be 380execution and the collection and formatting of results can be
381controlled through a variety of header arguments. 381controlled through a variety of header arguments.
382 382
383With prefix argument ARG, force re-execution even if a an 383With prefix argument ARG, force re-execution even if an
384existing result cached in the buffer would otherwise have been 384existing result cached in the buffer would otherwise have been
385returned. 385returned.
386 386
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 50761ede7cb..2f4617f5146 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -800,7 +800,7 @@ will only be dimmed."
800 :group 'org-agenda-todo-list 800 :group 'org-agenda-todo-list
801 :type '(choice 801 :type '(choice
802 (const :tag "Do not dim" nil) 802 (const :tag "Do not dim" nil)
803 (const :tag "Dim to a grey face" t) 803 (const :tag "Dim to a gray face" t)
804 (const :tag "Make invisible" invisible))) 804 (const :tag "Make invisible" invisible)))
805 805
806(defcustom org-timeline-show-empty-dates 3 806(defcustom org-timeline-show-empty-dates 3
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 138d99a36d9..3607458a410 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -215,7 +215,7 @@
215 "List to hold parsed bibtex entries.") 215 "List to hold parsed bibtex entries.")
216 216
217(defcustom org-bibtex-autogen-keys nil 217(defcustom org-bibtex-autogen-keys nil
218 "Set to a truthy value to use `bibtex-generate-autokey' to generate keys." 218 "Set to a truth value to use `bibtex-generate-autokey' to generate keys."
219 :group 'org-bibtex 219 :group 'org-bibtex
220 :type 'boolean) 220 :type 'boolean)
221 221
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 6279ed3df0d..6d82d4529b6 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1919,7 +1919,7 @@ the returned times will be formatted strings."
1919 shiftedm (- 13 (* 3 (nth 1 tmp))) 1919 shiftedm (- 13 (* 3 (nth 1 tmp)))
1920 shiftedq (- 5 (nth 1 tmp)))) 1920 shiftedq (- 5 (nth 1 tmp))))
1921 (setq d 1 h 0 m 0 d1 1 month shiftedm month1 (+ 3 shiftedm) h1 0 m1 0 y shiftedy)) 1921 (setq d 1 h 0 m 0 d1 1 month shiftedm month1 (+ 3 shiftedm) h1 0 m1 0 y shiftedy))
1922 ((> (+ q shift) 0) ; shift is whitin this year 1922 ((> (+ q shift) 0) ; shift is within this year
1923 (setq shiftedq (+ q shift)) 1923 (setq shiftedq (+ q shift))
1924 (setq shiftedy y) 1924 (setq shiftedy y)
1925 (setq d 1 h 0 m 0 d1 1 month (+ 1 (* 3 (- (+ q shift) 1))) month1 (+ 4 (* 3 (- (+ q shift) 1))) h1 0 m1 0)))) 1925 (setq d 1 h 0 m 0 d1 1 month (+ 1 (* 3 (- (+ q shift) 1))) month1 (+ 4 (* 3 (- (+ q shift) 1))) h1 0 m1 0))))
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 05df6bb7524..0f6fc0bed6a 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -474,7 +474,7 @@ Where possible, use the standard interface for changing this line."
474 ((equal major-mode 'org-agenda-mode) 474 ((equal major-mode 'org-agenda-mode)
475 (org-columns-eval eval) 475 (org-columns-eval eval)
476 ;; The following let preserves the current format, and makes sure 476 ;; The following let preserves the current format, and makes sure
477 ;; that in only a single file things need to be upated. 477 ;; that in only a single file things need to be updated.
478 (let* ((org-agenda-overriding-columns-format org-columns-current-fmt) 478 (let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
479 (buffer (marker-buffer pom)) 479 (buffer (marker-buffer pom))
480 (org-agenda-contributing-files 480 (org-agenda-contributing-files
@@ -605,7 +605,7 @@ an integer, select that value."
605 ((equal major-mode 'org-agenda-mode) 605 ((equal major-mode 'org-agenda-mode)
606 (org-columns-eval '(org-entry-put pom key nval)) 606 (org-columns-eval '(org-entry-put pom key nval))
607 ;; The following let preserves the current format, and makes sure 607 ;; The following let preserves the current format, and makes sure
608 ;; that in only a single file things need to be upated. 608 ;; that in only a single file things need to be updated.
609 (let* ((org-agenda-overriding-columns-format org-columns-current-fmt) 609 (let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
610 (buffer (marker-buffer pom)) 610 (buffer (marker-buffer pom))
611 (org-agenda-contributing-files 611 (org-agenda-contributing-files
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 91a1e5e59cb..b01f6d9fa6e 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -660,7 +660,7 @@ Otherwise give an error say the file exists."
660 (with-current-buffer mm-buffer 660 (with-current-buffer mm-buffer
661 (erase-buffer) 661 (erase-buffer)
662 (setq buffer-file-coding-system 'utf-8) 662 (setq buffer-file-coding-system 'utf-8)
663 ;; Fix-me: Currentl Freemind (ver 0.9.0 RC9) does not support this: 663 ;; Fix-me: Currently Freemind (ver 0.9.0 RC9) does not support this:
664 ;;(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n") 664 ;;(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
665 (insert "<map version=\"0.9.0\">\n") 665 (insert "<map version=\"0.9.0\">\n")
666 (insert "<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->\n")) 666 (insert "<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->\n"))