From d301d2a06b12fa2156ddfe01caa7b58014cc9232 Mon Sep 17 00:00:00 2001
From: Daniel Schwabeneder <daniel.schwabeneder@openmailbox.org>
Date: Thu, 24 Aug 2017 16:58:43 +0200
Subject: [PATCH] fix ticks = nothing on pyplot, ...

---
 src/args.jl            | 2 +-
 src/backends/gr.jl     | 4 ++--
 src/backends/pyplot.jl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/args.jl b/src/args.jl
index 0b5750ab..f312675f 100644
--- a/src/args.jl
+++ b/src/args.jl
@@ -432,7 +432,7 @@ add_aliases(:foreground_color_title, :fg_title, :fgtitle, :fgcolor_title, :fg_co
 add_aliases(:foreground_color_axis, :fg_axis, :fgaxis, :fgcolor_axis, :fg_color_axis, :foreground_axis,
                             :foreground_colour_axis, :fgcolour_axis, :fg_colour_axis, :axiscolor)
 add_aliases(:foreground_color_border, :fg_border, :fgborder, :fgcolor_border, :fg_color_border, :foreground_border,
-                            :foreground_colour_border, :fgcolour_border, :fg_colour_border, :bordercolor, :border)
+                            :foreground_colour_border, :fgcolour_border, :fg_colour_border, :bordercolor)
 add_aliases(:foreground_color_text, :fg_text, :fgtext, :fgcolor_text, :fg_color_text, :foreground_text,
                             :foreground_colour_text, :fgcolour_text, :fg_colour_text, :textcolor)
 add_aliases(:foreground_color_guide, :fg_guide, :fgguide, :fgcolor_guide, :fg_color_guide, :foreground_guide,
diff --git a/src/backends/gr.jl b/src/backends/gr.jl
index 60e7df00..563873b0 100644
--- a/src/backends/gr.jl
+++ b/src/backends/gr.jl
@@ -739,7 +739,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         GR.setclip(1)
 
         # tick marks
-        if !(xticks in (nothing, false))
+        if !(xticks in (:none, nothing, false))
             # x labels
             flip = sp[:yaxis][:flip]
             mirror = sp[:xaxis][:mirror]
@@ -756,7 +756,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             end
         end
 
-        if !(yticks in (nothing, false))
+        if !(yticks in (:none, nothing, false))
             # y labels
             flip = sp[:xaxis][:flip]
             mirror = sp[:yaxis][:mirror]
diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl
index 03c047bf..80a7f77c 100644
--- a/src/backends/pyplot.jl
+++ b/src/backends/pyplot.jl
@@ -1067,7 +1067,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                 lab[:set_family](axis[:tickfont].family)
                 lab[:set_rotation](axis[:rotation])
             end
-            if axis[:grid] && sp[:framestyle] != :none
+            if axis[:grid] && !(ticks in (:none, nothing, false))
                 fgcolor = py_color(axis[:foreground_color_grid])
                 pyaxis[:grid](true,
                     color = fgcolor,