X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/fc789f326d713fa02d02c612b948c26b543653e2..23a624ca1d40fa9cefd7229ac6152b79278a6517:/packages/xpm/flower.el

diff --git a/packages/xpm/flower.el b/packages/xpm/flower.el
index 5621d81e5..a91a52c48 100644
--- a/packages/xpm/flower.el
+++ b/packages/xpm/flower.el
@@ -2,6 +2,9 @@
 
 ;; Copyright (C) 2014  Free Software Foundation, Inc.
 
+;; Author: Thien-Thi Nguyen <ttn@gnu.org>
+;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -54,20 +57,16 @@
                           (lambda (θ) (cos (* τ θ)))))
          (n-mag-fns (length mag-fns)))
     (cl-flet
-        ((random-mag-fn () (aref mag-fns (random n-mag-fns))))
+        ((random-mag-fn () (aref mag-fns (random n-mag-fns)))
+         (form (fn &rest args) (apply fn half half (random 42) args)))
       (let* ((x-mag-fn (random-mag-fn))
              (y-mag-fn (random-mag-fn))
              (form (if again
                        (get 'flower 'form)
                      (delete-dups
                       (if (zerop (random 5))
-                          (let ((one (xpm-m2z-circle
-                                      half half
-                                      (random 42)))
-                                (two (xpm-m2z-ellipse
-                                      half half
-                                      (random 42)
-                                      (random 42))))
+                          (let ((one (form 'xpm-m2z-circle))
+                                (two (form 'xpm-m2z-ellipse (random 42))))
                             (append one two))
                         (cl-loop
                          for θ below τ by 0.003