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

Conflicts:
	lisp/ChangeLog
	lisp/org-exp.el
	lisp/org.el

lisp/ChangeLog

@@ -105,6 +105,13 @@
 	* org-macs.el (org-unmodified): Turn of modification hooks while
 	running this macro.
 
+2009-08-02  Bastien Guerry  <bzg@altern.org>
+
+	* 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-07-31  Bastien Guerry  <bzg@altern.org>
 
 	* org.el (org-make-link-regexps): Don't exclude parentheses from

lisp/org-exp.el

@@ -2504,8 +2504,7 @@ directory."
 			    (or pub-dir
 				(org-export-directory :org opt-plist)))
 			   (file-name-sans-extension
-			    (file-name-nondirectory bfname))
-			     ".org"))
+			    (file-name-nondirectory bfname))))
 	 (filename (and filename
 			(if (equal (file-truename filename)
 				   (file-truename bfname))

lisp/org.el

@@ -693,7 +693,7 @@ The following issues are influenced by this variable:
 - When this is set and the *entire* text in an entry is indented, the
   indentation is increased by one space in a demotion command, and
   decreased by one in a promotion command.  If any line in the entry
-  body starts at column 0, indentation is not changed at all.
+  body starts with text at column 0, indentation is not changed at all.
 
 - Property drawers and planning information is inserted indented when
   this variable s set.  When nil, they will not be indented.
@@ -10207,6 +10207,8 @@ command.
 If CALLBACK is non-nil, it is a function which is called to confirm
 that the match should indeed be shown."
   (interactive "sRegexp: \nP")
+  (when (equal regexp "")
+    (error "Regexp cannot be empty"))
   (unless keep-previous
     (org-remove-occur-highlights nil nil t))
   (push (cons regexp callback) org-occur-parameters)
@@ -10374,13 +10376,12 @@ ACTION can be `set', `up', `down', or a character."
 		(goto-char (match-end 2))
 		(insert " [#" news "]"))
 	    (goto-char (match-beginning 3))
-	    (insert "[#" news "] ")))))
-    (org-preserve-lc (org-set-tags nil 'align))
+	    (insert "[#" news "] "))))
+      (org-preserve-lc (org-set-tags nil 'align)))
     (if remove
 	(message "Priority removed")
       (message "Priority of current item set to %s" news))))
 
-
 (defun org-get-priority (s)
   "Find priority cookie and return priority."
   (save-match-data