* woman.el (woman-mapcan): Remove.

(woman-parse-colon-path): Use cl-mapcan instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90cfedceb850f8f5a369fd0bbb2eed63d242b274..f5273a6665900c0b1722faf0126ec5bdc4a6ca2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05  Mario Lang  <mlang@delysid.org>
+
+       * woman.el (woman-mapcan): Remove.
+       (woman-parse-colon-path): Use cl-mapcan instead.
+
 2014-06-03  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * register.el: Add link to Emacs manual in Commentary.

diff --git a/lisp/woman.el b/lisp/woman.el
index 88510517b25fb511d6d4d8db1a4d63af49182bf4..2dda211200d14e62440bd4eba4edc67a690738c8 100644 (file)
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -414,18 +414,12 @@
               (substring arg 0 (match-end 1))
             arg))))
 
+(require 'cl-lib)
+
 (eval-when-compile                     ; to avoid compiler warnings
   (require 'dired)
-  (require 'cl-lib)
   (require 'apropos))
 
-(defun woman-mapcan (fn x)
-  "Return concatenated list of FN applied to successive `car' elements of X.
-FN must return a list, cons or nil.  Useful for splicing into a list."
-  ;; Based on the Standard Lisp function MAPCAN but with args swapped!
-  ;; More concise implementation than the recursive one.  -- dak
-  (apply #'nconc (mapcar fn x)))
-
 (defun woman-parse-colon-path (paths)
   "Explode search path string PATHS into a list of directory names.
 Allow Cygwin colon-separated search paths on Microsoft platforms.
@@ -440,7 +434,7 @@ As a special case, if PATHS is nil then replace it by calling
             (mapcar 'woman-Cyg-to-Win (woman-parse-man.conf)))
            ((string-match-p ";" paths)
             ;; Assume DOS-style path-list...
-            (woman-mapcan              ; splice list into list
+            (cl-mapcan                 ; splice list into list
              (lambda (x)
                (if x
                    (list x)
@@ -451,14 +445,14 @@ As a special case, if PATHS is nil then replace it by calling
             (list paths))
            (t
             ;; Assume UNIX/Cygwin-style path-list...
-            (woman-mapcan              ; splice list into list
+            (cl-mapcan                 ; splice list into list
              (lambda (x)
                (mapcar 'woman-Cyg-to-Win
                        (if x (list x) (woman-parse-man.conf))))
              (let ((path-separator ":"))
                (parse-colon-path paths)))))
     ;; Assume host-default-style path-list...
-    (woman-mapcan                      ; splice list into list
+    (cl-mapcan                         ; splice list into list
      (lambda (x) (if x (list x) (woman-parse-man.conf)))
      (parse-colon-path (or paths "")))))