be smarter about julia-mode.el

lisp/Makefile

@@ -64,7 +64,7 @@ ESSR_VER =`cat ../etc/ESSR-VERSION`
 
 ### Targets
 
-all: $(ELC) ess-custom.el
+all: $(ELC) ess-custom.el julia-mode.el
 
 .PHONY: dist
 dist: all
@@ -103,9 +103,9 @@ ess-custom.el: ../VERSION
 # ess-r-d.el: ../etc/ESSR-VERSION
 # 	sed -i -e '/let.*ESSR-version/s/"[-.0-9]*"/"$(ESSR_VER)"/' $@
 
-## This should typically happen before releasing ESS
+## This should typically happen before building ESS
 julia-mode.el:
-	wget https://raw.githubusercontent.com/JuliaLang/julia/master/contrib/julia-mode.el
+	$(DOWNLOAD) https://raw.githubusercontent.com/JuliaLang/julia/master/contrib/julia-mode.el > julia-mode.el
 
 ### File Dependencies
 

lisp/ess-julia.el

@@ -39,7 +39,12 @@
 
 (require 'compile); for compilation-* below
 (require 'ess-utils)
-(require 'julia-mode)
+
+(condition-case nil
+      (progn
+        (require 'julia-mode)
+        (when (featurep 'julia-mode)
+
 (eval-when-compile
   (require 'cl))
 
@@ -389,6 +394,6 @@ to julia, put them in the variable `inferior-julia-args'."
 
 (add-to-list 'auto-mode-alist '("\\.jl\\'" . ess-julia-mode))
 
+))  (error nil))
 (provide 'ess-julia)
-
 ;;; ess-julia.el ends here