emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ebdb 6479c87 173/350: Remove unused code


From: Eric Abrahamsen
Subject: [elpa] externals/ebdb 6479c87 173/350: Remove unused code
Date: Mon, 14 Aug 2017 11:46:29 -0400 (EDT)

branch: externals/ebdb
commit 6479c872376fb8f31c841567163bd0b17ad82e6e
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Remove unused code
    
    * ebdb.el: Remove `ebdb-merge-concat',
      `ebdb-merge-concat-remove-duplicates', `ebdb-merge-string-least',
      `ebdb-merge-string-most' and `ebdb-merge-lists'.  They aren't used
      anywhere.
---
 ebdb.el | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/ebdb.el b/ebdb.el
index d0e00d5..3a88956 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -4279,45 +4279,6 @@ also be one of the special symbols below.
                                 (field string))
   (ebdb-record-user-field record field))
 
-(defun ebdb-merge-concat (string1 string2 &optional separator)
-  "Return the concatenation of STRING1 and STRING2.
-SEPARATOR defaults to \"\\n\"."
-  (concat string1 (or separator "\n") string2))
-
-(defun ebdb-merge-concat-remove-duplicates (string1 string2)
-  "Concatenate STRING1 and STRING2, but remove duplicate lines."
-  (let ((lines (split-string string1 "\n")))
-    (dolist (line (split-string string2 "\n"))
-      (cl-pushnew line lines))
-    (ebdb-concat "\n" lines)))
-
-(defun ebdb-merge-string-least (string1 string2)
-  "Return the string out of STRING1 and STRING2 that is `string-lessp'."
-  (if (string-lessp string1 string2)
-      string1
-    string2))
-
-(defun ebdb-merge-string-most (string1 string2)
-  "Return the string out of STRING1 and STRING2 that is not `string-lessp'."
-  (if (string-lessp string1 string2)
-      string2
-    string1))
-
-(defun ebdb-merge-lists (l1 l2 cmp)
-  "Merge two lists L1 and L2 based on comparison CMP.
-An element from L2 is added to L1 if CMP returns nil for all elements of L1.
-If L1 or L2 are not lists, they are replaced by (list L1) and (list L2)."
-  (let (merge)
-    (unless (listp l1) (setq l1 (list l1)))
-    (dolist (e2 (if (listp l2) l2 (list l2)))
-      (let ((ll1 l1) e1 fail)
-        (while (setq e1 (pop ll1))
-          (if (funcall cmp e1 e2)
-              (setq ll1 nil
-                    fail t)))
-        (unless fail (push e2 merge))))
-    (append l1 (nreverse merge))))
-
 ;;; Parsing other things
 
 (defun ebdb-divide-name (string)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]