modification to avoid compile warnings (end)

+ some menu modifications

2 files changed, 4 insertions, 4 deletions

diff --git a/generic/holes.el b/generic/holes.el
index b1594464..524b070a 100644
--- a/generic/holes.el
+++ b/generic/holes.el
@@ -417,8 +417,8 @@ is), which is annoying.
 
 
 
-(defun mapcar-holes (FUNCTION &optional BUFFER-OR-STRING FROM TO)
-  (mapcar-spans FUNCTION nil BUFFER-OR-STRING FROM TO nil 'hole)
+(defun mapcar-holes (FUNCTION &optional FROM TO PROP)
+  (mapcar-spans FUNCTION FROM TO 'hole)
   )
 
 (defun clear-all-buffer-holes (&optional start end)
@@ -427,7 +427,7 @@ is), which is annoying.
 
   (interactive)
   (disable-active-hole)
-  (mapcar-holes 'clear-hole nil start end)
+  (mapcar-holes 'clear-hole (or start (point-min)) (or end (point-max)) 'hole)
   )
 
 
diff --git a/generic/span-overlay.el b/generic/span-overlay.el
index 36a04458..e22c38a4 100644
--- a/generic/span-overlay.el
+++ b/generic/span-overlay.el
@@ -232,7 +232,7 @@ Re-attaches SPAN if it was removed from the buffer."
 
 (defsubst mapcar-spans (fn start end prop &optional val)
   "Apply function FN to all spans between START and END with property PROP set"
-  (mapcar fn (spans-at-region-prop start end prop val)))
+  (mapcar fn (spans-at-region-prop start end prop (or val nil))))
 
 (defun map-spans-aux (f l)
   (cond (l (cons (funcall f l) (map-spans-aux f (span-property l 'before))))