Re: rcirc bug

[Ryan Yeske]

"Alfred M. Szmidt" <address@hidden> writes:

> Hey,
>
> rcirc tries to use member* without (require 'cl), which causes
> breakage.

The following patch fixes this:

*** rcirc.el    05 Sep 2006 12:14:49 -0700      1.26
--- rcirc.el    05 Sep 2006 14:22:05 -0700      
***************
*** 1544,1552 ****
                 (with-current-buffer b
                   (dolist (type rcirc-activity-types)
                     (rcirc-add-face 0 (length s)
!                                    (case type
!                                      ('nick 'rcirc-track-nick)
!                                      ('keyword 'rcirc-track-keyword))
                                     s)))
                 s))
             buffers ","))
--- 1544,1552 ----
                 (with-current-buffer b
                   (dolist (type rcirc-activity-types)
                     (rcirc-add-face 0 (length s)
!                                    (cond
!                                     ((eq type 'nick) 'rcirc-track-nick)
!                                     ((eq type 'keyword) 'rcirc-track-keyword))
                                     s)))
                 s))
             buffers ","))
***************
*** 1936,1945 ****
  (defun rcirc-markup-attributes (process sender response channel-buffer)
    (while (re-search-forward "\\([\C-b\C-_\C-v]\\).*?\\(\\1\\|\C-o\\)" nil t)
      (rcirc-add-face (match-beginning 0) (match-end 0)
!                   (case (char-after (match-beginning 1))
!                     (?\C-b 'bold)
!                     (?\C-v 'italic)
!                     (?\C-_ 'underline)))
      ;; keep the ^O since it could terminate other attributes
      (when (not (eq ?\C-o (char-before (match-end 2))))
        (delete-region (match-beginning 2) (match-end 2)))
--- 1936,1945 ----
  (defun rcirc-markup-attributes (process sender response channel-buffer)
    (while (re-search-forward "\\([\C-b\C-_\C-v]\\).*?\\(\\1\\|\C-o\\)" nil t)
      (rcirc-add-face (match-beginning 0) (match-end 0)
!                   (let ((ch (char-after (match-beginning 1))))
!                     (cond ((eq ch ?\C-b) 'bold)
!                           ((eq ch ?\C-v) 'italic)
!                           ((eq ch ?\C-_) 'underline))))
      ;; keep the ^O since it could terminate other attributes
      (when (not (eq ?\C-o (char-before (match-end 2))))
        (delete-region (match-beginning 2) (match-end 2)))