Applied patch from Glen Morris. Some more setup and autoload fixes.

lisp/org-agenda.el

@@ -566,11 +566,11 @@ a calendar-style date list like (month day year)."
 This function makes sure that dates are aligned for easy reading."
   (require 'cal-iso)
   (let* ((dayname (calendar-day-name date))
-	 (day (extract-calendar-day date))
+	 (day (cadr date))
 	 (day-of-week (calendar-day-of-week date))
-	 (month (extract-calendar-month date))
+	 (month (car date))
 	 (monthname (calendar-month-name month))
-	 (year (extract-calendar-year date))
+	 (year (nth 2 date))
 	 (iso-week (org-days-to-iso-week
 		    (calendar-absolute-from-gregorian date)))
 	 (weekyear (cond ((and (= month 1) (>= iso-week 52))
@@ -2769,7 +2769,8 @@ MATCH is being ignored."
 (defun org-get-entries-from-diary (date)
   "Get the (Emacs Calendar) diary entries for DATE."
   (require 'diary-lib)
-  (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*")
+  (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
+         (fancy-diary-buffer diary-fancy-buffer)
 	 (diary-display-hook '(fancy-diary-display))
 	 (pop-up-frames nil)
 	 (list-diary-entries-hook
@@ -2783,9 +2784,9 @@ MATCH is being ignored."
 	(funcall (if (fboundp 'diary-list-entries)
 		     'diary-list-entries 'list-diary-entries)
 		 date 1)))
-    (if (not (get-buffer fancy-diary-buffer))
+    (if (not (get-buffer diary-fancy-buffer))
 	(setq entries nil)
-      (with-current-buffer fancy-diary-buffer
+      (with-current-buffer diary-fancy-buffer
 	(setq buffer-read-only nil)
 	(if (zerop (buffer-size))
 	    ;; No entries
@@ -2797,7 +2798,7 @@ MATCH is being ignored."
 	      (setq entries nil)
 	    (setq entries (buffer-substring (point-min) (- (point-max) 1)))))
 	(set-buffer-modified-p nil)
-	(kill-buffer fancy-diary-buffer)))
+	(kill-buffer diary-fancy-buffer)))
     (when entries
       (setq entries (org-split-string entries "\n"))
       (setq entries
@@ -4819,10 +4820,9 @@ the cursor position."
 	 (point (point))
 	 (date (calendar-gregorian-from-absolute
 		(get-text-property point 'day)))
-         ;; the following 3 vars are needed in the calendar
-	 (displayed-day (extract-calendar-day date))
-	 (displayed-month (extract-calendar-month date))
-	 (displayed-year (extract-calendar-year date)))
+         ;; the following 2 vars are needed in the calendar
+	 (displayed-month (car date))
+	 (displayed-year (nth 2 date)))
       (unwind-protect
 	  (progn
 	    (fset 'calendar-cursor-to-date
@@ -4867,7 +4867,11 @@ argument, latitude and longitude will be prompted for."
 		  (error "Don't know which date to open in calendar")))
 	 (date (calendar-gregorian-from-absolute day))
 	 (calendar-move-hook nil)
+	 (calendar-view-holidays-initially-flag nil)
+	 (calendar-view-diary-initially-flag nil)
 	 (view-calendar-holidays-initially nil)
+	 (calendar-view-diary-initially-flag nil)
+	 (calendar-view-holidays-initially-flag nil)
 	 (view-diary-entries-initially nil))
     (calendar)
     (calendar-goto-date date)))

lisp/org.el

@@ -2713,27 +2713,27 @@ outside the table.")
 (eval-and-compile
   (org-autoload "org-table"
 		'(org-table-align org-table-begin org-table-blank-field
-org-table-convert org-table-convert-region org-table-copy-down
-org-table-copy-region org-table-create
-org-table-create-or-convert-from-region
-org-table-create-with-table.el org-table-current-dline
-org-table-cut-region org-table-delete-column org-table-edit-field
-org-table-edit-formulas org-table-end org-table-eval-formula
-org-table-export org-table-field-info
-org-table-get-stored-formulas org-table-goto-column
-org-table-hline-and-move org-table-import org-table-insert-column
-org-table-insert-hline org-table-insert-row org-table-iterate
-org-table-justify-field-maybe org-table-kill-row
-org-table-maybe-eval-formula org-table-maybe-recalculate-line
-org-table-move-column org-table-move-column-left
-org-table-move-column-right org-table-move-row
-org-table-move-row-down org-table-move-row-up
-org-table-next-field org-table-next-row org-table-paste-rectangle
-org-table-previous-field org-table-recalculate
-org-table-rotate-recalc-marks org-table-sort-lines org-table-sum
-org-table-toggle-coordinate-overlays
-org-table-toggle-formula-debugger org-table-wrap-region
-orgtbl-mode turn-on-orgtbl)))
+   org-table-convert org-table-convert-region org-table-copy-down
+   org-table-copy-region org-table-create
+   org-table-create-or-convert-from-region
+   org-table-create-with-table.el org-table-current-dline
+   org-table-cut-region org-table-delete-column org-table-edit-field
+   org-table-edit-formulas org-table-end org-table-eval-formula
+   org-table-export org-table-field-info
+   org-table-get-stored-formulas org-table-goto-column
+   org-table-hline-and-move org-table-import org-table-insert-column
+   org-table-insert-hline org-table-insert-row org-table-iterate
+   org-table-justify-field-maybe org-table-kill-row
+   org-table-maybe-eval-formula org-table-maybe-recalculate-line
+   org-table-move-column org-table-move-column-left
+   org-table-move-column-right org-table-move-row
+   org-table-move-row-down org-table-move-row-up
+   org-table-next-field org-table-next-row org-table-paste-rectangle
+   org-table-previous-field org-table-recalculate
+   org-table-rotate-recalc-marks org-table-sort-lines org-table-sum
+   org-table-toggle-coordinate-overlays
+   org-table-toggle-formula-debugger org-table-wrap-region
+   orgtbl-mode turn-on-orgtbl)))
 
 (defun org-at-table-p (&optional table-type)
   "Return t if the cursor is inside an org-type table.
@@ -2810,19 +2810,27 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
 (eval-and-compile
   (org-autoload "org-exp"
 		'(org-export org-export-as-ascii org-export-visible
-org-insert-export-options-template org-export-as-html-and-open
-org-export-as-html-batch org-export-as-html-to-buffer
-org-replace-region-by-html org-export-region-as-html
-org-export-as-html org-export-icalendar-this-file
-org-export-icalendar-all-agenda-files
-org-export-icalendar-combine-agenda-files org-export-as-xoxo)))
+   org-insert-export-options-template org-export-as-html-and-open
+   org-export-as-html-batch org-export-as-html-to-buffer
+   org-replace-region-by-html org-export-region-as-html
+   org-export-as-html org-export-icalendar-this-file
+   org-export-icalendar-all-agenda-files
+   org-export-icalendar-combine-agenda-files org-export-as-xoxo)))
+
+;; Declare and autoload functions from org-exp.el
+
+(eval-and-compile
+  (org-autoload "org-exp"
+		'(org-agenda org-agenda-list org-search-view
+   org-todo-list org-tags-view org-agenda-list-stuck-projects
+   org-diary org-agenda-to-appt)))
 
 ;; Autoload org-remember
 
 (eval-and-compile
   (org-autoload "org-remember"
 		'(org-remember-insinuate org-remember-annotation
-org-remember-apply-template org-remember org-remember-handler)))
+   org-remember-apply-template org-remember org-remember-handler)))
 
 ;; Autoload org-clock.el
 
@@ -11596,7 +11604,9 @@ user."
 		    (setq def (apply 'encode-time defdecode)
 			  defdecode (decode-time def)))))
 	 (calendar-move-hook nil)
+	 (calendar-view-diary-initially-flag nil)
 	 (view-diary-entries-initially nil)
+	 (calendar-view-holidays-initially-flag nil)
 	 (view-calendar-holidays-initially nil)
 	 (timestr (format-time-string
 		   (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") def))
@@ -12562,7 +12572,9 @@ A prefix ARG can be used to force the current date."
   (interactive "P")
   (let ((tsr org-ts-regexp) diff
 	(calendar-move-hook nil)
+	(calendar-view-holidays-initially-flag nil)
 	(view-calendar-holidays-initially nil)
+	(calendar-view-diary-initially-flag nil)
 	(view-diary-entries-initially nil))
     (if (or (org-at-timestamp-p)
 	    (save-excursion