Merge branch 'master' of https://github.com/nemocas/Nemo.jl

appveyor.yml

@@ -1,13 +1,14 @@
 environment:
   matrix:
   # Releases
-   - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
   # Nightlies
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

src/antic/nf_elem.jl

@@ -46,6 +46,8 @@ function check_parent(a::nf_elem, b::nf_elem)
    a.parent != b.parent && error("Incompatible number field elements")
 end
 
+show_minus_one(::Type{nf_elem}) = false
+
 ###############################################################################
 #
 #   Basic manipulation

src/flint/padic.jl

@@ -89,6 +89,8 @@ function check_parent(a::padic, b::padic)
       error("Incompatible padic rings in padic operation")
 end
 
+parent_type(::Type{padic}) = FlintPadicField
+
 ###############################################################################
 #
 #   Basic manipulation
@@ -223,7 +225,7 @@ needs_parentheses(x::padic) = true
 
 isnegative(x::padic) = false
 
-show_minus_one(::FlintPadicField) = true
+show_minus_one(::Type{padic}) = true
 
 ###############################################################################
 #