Merge branch 'bugfix' into emacs-sync

lisp/ob-julia.el

@@ -26,6 +26,9 @@
 ;; Org-Babel support for evaluating julia code
 ;;
 ;; Based on ob-R.el by Eric Schulte and Dan Davison.
+;;
+;; Session support requires the installation of the DataFrames and CSV
+;; Julia packages.
 
 ;;; Code:
 (require 'cl-lib)
@@ -62,6 +65,7 @@
 (defvar ess-current-process-name) ; dynamically scoped
 (defvar ess-local-process-name)   ; dynamically scoped
 (defvar ess-eval-visibly-p)       ; dynamically scoped
+(defvar ess-local-customize-alist); dynamically scoped
 (defun org-babel-edit-prep:julia (info)
   (let ((session (cdr (assq :session (nth 2 info)))))
     (when (and session
@@ -281,7 +285,8 @@ last statement in BODY, as elisp."
     (value
      (with-temp-buffer
        (insert (org-babel-chomp body))
-       (let ((ess-local-process-name
+       (let ((ess-local-customize-alist t)
+             (ess-local-process-name
 	      (process-name (get-buffer-process session)))
 	     (ess-eval-visibly-p nil))
 	 (ess-eval-buffer nil)))

lisp/ox-icalendar.el

@@ -276,14 +276,14 @@ re-read the iCalendar file.")
 ;;; Define Back-End
 
 (org-export-define-derived-backend 'icalendar 'ascii
-  :translate-alist '((clock . ignore)
-		     (footnote-definition . ignore)
-		     (footnote-reference . ignore)
+  :translate-alist '((clock . nil)
+		     (footnote-definition . nil)
+		     (footnote-reference . nil)
 		     (headline . org-icalendar-entry)
                      (inner-template . org-icalendar-inner-template)
-		     (inlinetask . ignore)
-		     (planning . ignore)
-		     (section . ignore)
+		     (inlinetask . nil)
+		     (planning . nil)
+		     (section . nil)
 		     (template . org-icalendar-template))
   :options-alist
   '((:exclude-tags