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

Conflicts:

	org.el

Makefile

@@ -104,14 +104,11 @@ install-noutline: xemacs/noutline.elc
 	if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
 	$(CP) xemacs/noutline.el xemacs/noutline.elc $(lispdir)
 
-org-install.el: $(LISPFILES0)
+org-install.el: $(LISPFILES) Makefile
 	$(BATCH) --eval "(require 'autoload)" \
 		--eval '(find-file "org-install.el")'  \
 		--eval '(erase-buffer)' \
-		--eval '(generate-file-autoloads "org.el")' \
-		--eval '(generate-file-autoloads "org-mouse.el")' \
-		--eval '(generate-file-autoloads "org-publish.el")' \
-		--eval '(generate-file-autoloads "org-export-latex.el")' \
+		--eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPFILES))))' \
 		--eval '(insert "\n(provide (quote org-install))\n")' \
 		--eval '(save-buffer)'
 

org-irc.el

@@ -50,9 +50,7 @@
 ;;
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
+(require 'cl)
 (require 'org)
 (require 'erc)
 (require 'erc-log)

org.el

@@ -66,6 +66,7 @@
 
 ;;;; Require other packages
 
+(require 'cl)
 (eval-when-compile
   (require 'cl)
   (require 'cl-extra)
@@ -18535,7 +18536,7 @@ The date will be changed by N times WHAT.  WHAT can be `day', `month',
 in the timestamp determines what will be changed."
   (let ((pos (point))
 	with-hm inactive
-	(dm (max (nth 1 org-time-stamp-rounding-minutes-when-changing) 1))
+	(dm (max (nth 1 org-time-stamp-rounding-minutes) 1))
 	org-ts-what
 	extra rem
 	ts time time0)