[Emacs-diffs] trunk r117266: * woman.el (woman-mapcan): Remove.

[Mario Lang]

------------------------------------------------------------
revno: 117266
revision-id: address@hidden
parent: address@hidden
committer: Mario Lang <address@hidden>
branch nick: trunk
timestamp: Thu 2014-06-05 15:40:54 +0200
message:
  * woman.el (woman-mapcan): Remove.
  (woman-parse-colon-path): Use cl-mapcan instead.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/woman.el                  woman.el-20091113204419-o5vbwnq5f7feedwu-1805

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-03 09:06:18 +0000
+++ b/lisp/ChangeLog    2014-06-05 13:40:54 +0000
@@ -1,3 +1,8 @@
+2014-06-05  Mario Lang  <address@hidden>
+
+       * woman.el (woman-mapcan): Remove.
+       (woman-parse-colon-path): Use cl-mapcan instead.
+
 2014-06-03  Rüdiger Sonderfeld  <address@hidden>
 
        * register.el: Add link to Emacs manual in Commentary.

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2014-02-10 01:34:22 +0000
+++ b/lisp/woman.el     2014-06-05 13:40:54 +0000
@@ -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 @@
             (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 @@
             (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 "")))))