upstream i think

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 @@
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+	* ob.el (org-babel-execute-src-block): Fix typo.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
 	* org.el (org-link-unescape, org-link-unescape-compound): Fix typos.
@@ -15461,7 +15465,7 @@
 
 	* org.el (org-enforce-todo-checkbox-dependencies): New option.
 	(org-block-todo-from-checkboxes): New function.
-	(org-todo): Make tripple prefix arg circumvent blocking.
+	(org-todo): Make triple prefix arg circumvent blocking.
 
 2009-01-30  Glenn Morris  <rgm@gnu.org>
 
@@ -17592,7 +17596,7 @@
 2008-06-17  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-schedule, org-deadline): Protect scheduled and
-	deadline tasks against changes that accidently remove the
+	deadline tasks against changes that accidentally remove the
 	repeater.  Also show a message with the new date when done.
 
 2008-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
 execution and the collection and formatting of results can be
 controlled through a variety of header arguments.
 
-With prefix argument ARG, force re-execution even if a an
+With prefix argument ARG, force re-execution even if an
 existing result cached in the buffer would otherwise have been
 returned.
 
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."
   :group 'org-agenda-todo-list
   :type '(choice
 	  (const :tag "Do not dim" nil)
-	  (const :tag "Dim to a grey face" t)
+	  (const :tag "Dim to a gray face" t)
 	  (const :tag "Make invisible" invisible)))
 
 (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 @@
   "List to hold parsed bibtex entries.")
 
 (defcustom org-bibtex-autogen-keys nil
-  "Set to a truthy value to use `bibtex-generate-autokey' to generate keys."
+  "Set to a truth value to use `bibtex-generate-autokey' to generate keys."
   :group 'org-bibtex
   :type  'boolean)
 
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."
                shiftedm (- 13 (* 3 (nth 1 tmp)))
                shiftedq (- 5 (nth 1 tmp))))
        (setq d 1 h 0 m 0 d1 1 month shiftedm month1 (+ 3 shiftedm) h1 0 m1 0 y shiftedy))
-       ((> (+ q shift) 0) ; shift is whitin this year
+       ((> (+ q shift) 0) ; shift is within this year
        (setq shiftedq (+ q shift))
        (setq shiftedy y)
        (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."
        ((equal major-mode 'org-agenda-mode)
 	(org-columns-eval eval)
 	;; The following let preserves the current format, and makes sure
-	;; that in only a single file things need to be upated.
+	;; that in only a single file things need to be updated.
 	(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
 	       (buffer (marker-buffer pom))
 	       (org-agenda-contributing-files
@@ -605,7 +605,7 @@ an integer, select that value."
      ((equal major-mode 'org-agenda-mode)
       (org-columns-eval '(org-entry-put pom key nval))
       ;; The following let preserves the current format, and makes sure
-      ;; that in only a single file things need to be upated.
+      ;; that in only a single file things need to be updated.
       (let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
 	     (buffer (marker-buffer pom))
 	     (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."
         (with-current-buffer mm-buffer
           (erase-buffer)
           (setq buffer-file-coding-system 'utf-8)
-          ;; Fix-me: Currentl Freemind (ver 0.9.0 RC9) does not support this:
+          ;; Fix-me: Currently Freemind (ver 0.9.0 RC9) does not support this:
           ;;(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
           (insert "<map version=\"0.9.0\">\n")
           (insert "<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->\n"))