X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fb6d826c69939c2d016c1b824d4e9bcb53d9e643..2f67f8a145af8f185f644b1d094a03895a124ef1:/lisp/erc/erc-track.el

diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 5af1663378..a6d72d07d1 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1,6 +1,6 @@
 ;;; erc-track.el --- Track modified channel buffers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -480,99 +480,6 @@ START is the minimum length of the name used."
 	(setq result other)))
     result))
 
-;;; Test:
-
-(cl-assert
- (and
-  ;; verify examples from the doc strings
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("#emacs" "#vi" "#electronica" "#folk")
-	    '("#emacs" "#vi")))
-	 '("#em" "#vi"))	 ; emacs is different from electronica
-  (equal (let ((erc-track-shorten-aggressively t))
-	   (erc-unique-channel-names
-	    '("#emacs" "#vi" "#electronica" "#folk")
-	    '("#emacs" "#vi")))
-	 '("#em" "#v"))		       ; vi is shortened by one letter
-  (equal (let ((erc-track-shorten-aggressively 'max))
-	   (erc-unique-channel-names
-	    '("#emacs" "#vi" "#electronica" "#folk")
-	    '("#emacs" "#vi")))
-	 '("#e" "#v"))  ; emacs need not be different from electronica
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("#linux-de" "#linux-fr")
-	    '("#linux-de" "#linux-fr")))
-	 '("#linux-de" "#linux-fr")) ; shortening by one letter is too aggressive
-  (equal (let ((erc-track-shorten-aggressively t))
-	   (erc-unique-channel-names
-	    '("#linux-de" "#linux-fr")
-	    '("#linux-de" "#linux-fr")))
-	 '("#linux-d" "#linux-f")); now we want to be aggressive
-  ;; specific problems
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("#dunnet" "#lisp" "#sawfish" "#fsf" "#guile"
-	      "#testgnome" "#gnu" "#fsbot" "#hurd" "#hurd-bunny"
-	      "#emacs")
-	    '("#hurd-bunny" "#hurd" "#sawfish" "#lisp")))
-	 '("#hurd-" "#hurd" "#s" "#l"))
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-substrings
-	    '("#emacs" "#vi" "#electronica" "#folk")))
-	 '("#em" "#vi" "#el" "#f"))
-  (equal (let ((erc-track-shorten-aggressively t))
-	   (erc-unique-substrings
-	    '("#emacs" "#vi" "#electronica" "#folk")))
-	 '("#em" "#v" "#el" "#f"))
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("#emacs" "#burse" "+linux.de" "#starwars"
-	      "#bitlbee" "+burse" "#ratpoison")
-	    '("+linux.de" "#starwars" "#burse")))
-	 '("+l" "#s" "#bu"))
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("fsbot" "#emacs" "deego")
-	    '("fsbot")))
-	 '("fs"))
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("fsbot" "#emacs" "deego")
-	    '("fsbot")
-	    (lambda (s)
-	      (> (length s) 4))
-	    1))
-	 '("f"))
-  (equal (let ((erc-track-shorten-aggressively nil))
-	   (erc-unique-channel-names
-	    '("fsbot" "#emacs" "deego")
-	    '("fsbot")
-	    (lambda (s)
-	      (> (length s) 4))
-	    2))
-	 '("fs"))
-  (let ((erc-track-shorten-aggressively nil))
-    (equal (erc-unique-channel-names '("deego" "#hurd" "#hurd-bunny" "#emacs")
-				     '("#hurd" "#hurd-bunny"))
-	   '("#hurd" "#hurd-")))
-  ;; general examples
-  (let ((erc-track-shorten-aggressively t))
-    (and (equal (erc-unique-substring-1 "abc" '("ab" "abcd")) "abcd")
-	 (not (erc-unique-substring-1 "a" '("xyz" "xab")))
-	 (equal (erc-unique-substrings '("abc" "xyz" "xab"))
-		'("ab" "xy" "xa"))
-	 (equal (erc-unique-substrings '("abc" "abcdefg"))
-		'("abc" "abcd"))))
-  (let ((erc-track-shorten-aggressively nil))
-    (and (equal (erc-unique-substring-1 "abc" '("ab" "abcd")) "abcd")
-	 (not (erc-unique-substring-1 "a" '("xyz" "xab")))
-	 (equal (erc-unique-substrings '("abc" "xyz" "xab"))
-		'("abc" "xyz" "xab"))
-	 (equal (erc-unique-substrings '("abc" "abcdefg"))
-		'("abc" "abcd"))))))
-
 ;;; Minor mode
 
 ;; Play nice with other IRC clients (and Emacs development rules) by
@@ -971,7 +878,8 @@ is in `erc-mode'."
   "Return a list of all faces used in STR."
   (let ((i 0)
 	(m (length str))
-	(faces (erc-list (get-text-property 0 'face str)))
+	(faces (let ((face1 (get-text-property 0 'face str)))
+		 (when face1 (list face1))))
 	cur)
     (while (and (setq i (next-single-property-change i 'face str m))
 		(not (= i m)))
@@ -980,13 +888,6 @@ is in `erc-mode'."
 	   (push cur faces)))
     faces))
 
-(cl-assert
- (let ((str "is bold"))
-   (put-text-property 3 (length str)
-		      'face '(bold erc-current-nick-face)
-		      str)
-   (erc-faces-in str)))
-
 ;;; Buffer switching
 
 (defvar erc-track-last-non-erc-buffer nil