Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	lisp/ChangeLog

lisp/ChangeLog

@@ -6,6 +6,11 @@
 	* org-exp.el (org-export-format-source-code-or-example): Use
 	listing package if requested by the user.
 
+2009-08-08  Bastien Guerry  <bzg@altern.org>
+
+	* org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb'
+	command before actually switching to a buffer.
+
 2009-08-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-get-file-contents): Only quote org lines when

lisp/org.el

@@ -13396,8 +13396,8 @@ Due to some yet unresolved reason, the global function
 		      (mapcar 'buffer-name blist)))))
 	 (switch-to-buffer
 	  (iswitchb-read-buffer
-	   "Switch-to: " nil t))
-	 (or enabled (iswitchb-mode -1))))))
+	   "Switch-to: " nil t)))
+	 (or enabled (iswitchb-mode -1)))))
 
 ;;;###autoload
 (defun org-ido-switchb (&optional arg)