2 files changed, 18 insertions, 4 deletions
diff --git a/metapost/context/base/mp-base.mpii b/metapost/context/base/mp-base.mpii
index 0f8104447..95cacb288 100644
--- a/metapost/context/base/mp-base.mpii
+++ b/metapost/context/base/mp-base.mpii
@@ -360,9 +360,17 @@ enddef;
 def filldraw expr c =
   addto currentpicture contour c withpen currentpen
   _op_ enddef;
-def drawdot expr z =
-  addto currentpicture contour makepath currentpen shifted z
-  _op_ enddef;
+% def drawdot expr z =
+%   addto currentpicture contour makepath currentpen shifted z
+%   _op_ enddef;
+
+def drawdot expr p =
+    if pair p :
+        addto currentpicture doublepath p withpen currentpen _op_
+    else :
+        errmessage("drawdot only accepts a pair expression")
+    fi
+enddef ;
 
 def unfill expr c = fill c withcolor background enddef;
 def undraw expr p = draw p withcolor background enddef;
diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv
index 4d2e522a1..d5c7b8c21 100644
--- a/metapost/context/base/mp-base.mpiv
+++ b/metapost/context/base/mp-base.mpiv
@@ -609,7 +609,13 @@ enddef ;
 %
 % so ...
 
-let drawdot = draw ;
+def drawdot expr p =
+    if pair p :
+        addto currentpicture doublepath p withpen currentpen _op_
+    else :
+        errmessage("drawdot only accepts a pair expression")
+    fi
+enddef ;
 
 def unfill     expr c = fill     c withcolor background enddef ;
 def undraw     expr p = draw     p withcolor background enddef ;