[Erc-commit] [commit][master] erc-put-text-properties fixes.

[mwolson]

commit 0dabf5ebd44f20dcea9c0a01000ee0e014c8ec53
Author: Johan Bockgård <address@hidden>
Date:   Sun Apr 27 00:26:28 2008 +0200

    erc-put-text-properties fixes.
    
    * erc.el (erc-put-text-properties): Don't use mapcar*.
    (erc-display-line-1): Fix argument order in call to
    erc-put-text-properties.

diff --git a/ChangeLog b/ChangeLog
index 35e9f57..84f382d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-26  Johan Bockgård  <address@hidden>
+
+       * erc.el (erc-put-text-properties): Don't use mapcar*.
+       (erc-display-line-1): Fix argument order in call to
+       erc-put-text-properties.
+
 2008-04-14  Michael Olson  <address@hidden>
 
        * erc.el (erc-remove-text-properties-region): Disable this command
diff --git a/erc.el b/erc.el
index 2d84cc0..ca25be9 100644
--- a/erc.el
+++ b/erc.el
@@ -2363,8 +2363,8 @@ If STRING is nil, the function does nothing."
          (unless (string-match "\n$" string)
            (setq string (concat string "\n"))
            (when (erc-string-invisible-p string)
-             (erc-put-text-properties 0 (length string) string
-                                      '(invisible intangible))))
+             (erc-put-text-properties 0 (length string)
+                                      '(invisible intangible) string)))
          (erc-log (concat "erc-display-line: " string
                           (format "(%S)" string) " in buffer "
                           (format "%s" buffer)))
@@ -5036,9 +5036,9 @@ each property to the corresponding value in VALUE-LIST."
     (setq value-list (mapcar (lambda (x)
                               t)
                             properties)))
-  (mapcar* (lambda (prop value)
-            (erc-put-text-property start end prop value object))
-          properties value-list))
+  (while (and properties value-list)
+    (erc-put-text-property
+     start end (pop properties) (pop value-list) object)))
 
 ;;; Input area handling: