Re: rcirc update

[Ryan Yeske]

Stefan Monnier <address@hidden> writes:

>> This patch does not apply cleanly to the version of rcirc.el in Emacs
>> CVS; I get an error "**** context mangled in hunk at line 1619".

Hmm, not sure why that would have happened, I just inserted the
*vc-diff* buffer into a *mail* buffer and sent it.

> This error usually means that something messed up the format of the patch.
> Typically the MTA/MUA or some copy&paste has turned lines of whitespace
> into empty lines, or something like that.
>
> In any case, his patch worked just fine for me, so I installed it.

Thanks Stefan.

I have a couple small follow up fixes to those changes:

2007-06-15  Ryan Yeske  <address@hidden>

        * rcirc.el (rcirc-connections): Fix default setting.
        (rcirc-clear-activity): Make sure RCIRC-ACTIVITY isn't modified.
        (rcirc-print): Never ignore messages from ourself.


*** rcirc.el    07 Jun 2007 10:39:22 -0700      1.177
--- rcirc.el    14 Jun 2007 21:25:43 -0700      
***************
*** 56,62 ****
    :group 'applications)
  
  (defcustom rcirc-connections
!   '(("irc.freenode.net" :channels ("#rcirc")))
    "An alist of IRC connections to establish when running `rcirc'.
  Each element looks like (SERVER-NAME PARAMETERS).
  
--- 56,62 ----
    :group 'applications)
  
  (defcustom rcirc-connections
!   '(("irc.freenode.net" channels ("#rcirc")))
    "An alist of IRC connections to establish when running `rcirc'.
  Each element looks like (SERVER-NAME PARAMETERS).
  
***************
*** 64,72 ****
  to.
  
  PARAMETERS is a plist of optional connection parameters.  Valid
! properties are: nick (a string), port (number or string),
! user-name (string), full-name (string), and channels (list of
! strings)."
    :type '(alist :key-type string 
                :value-type (plist :options ((nick string)
                                             (port integer)
--- 64,76 ----
  to.
  
  PARAMETERS is a plist of optional connection parameters.  Valid
! properties are: 
! 
! NICK (a string), 
! PORT (number or string),
! USER-NAME (string), 
! FULL-NAME (string), and
! CHANNELS (list of strings)."
    :type '(alist :key-type string 
                :value-type (plist :options ((nick string)
                                             (port integer)
***************
*** 590,596 ****
                                               process))))))
  
  (defun rcirc-delete-process (process)
-   (message "delete process %S" process)
    (delete-process process))
  
  (defvar rcirc-trap-errors-flag t)
--- 594,599 ----
***************
*** 1262,1272 ****
  Format based on SENDER and RESPONSE.  If ACTIVITY is non-nil,
  record activity."
    (or text (setq text ""))
!   (unless (or (member sender rcirc-ignore-list)
!             (member (with-syntax-table rcirc-nick-syntax-table
!                       (when (string-match "^\\([^/]\\w*\\)[:,]" text)
!                         (match-string 1 text)))
!                     rcirc-ignore-list))
      (let* ((buffer (rcirc-target-buffer process sender response target text))
           (inhibit-read-only t))
        (with-current-buffer buffer
--- 1265,1276 ----
  Format based on SENDER and RESPONSE.  If ACTIVITY is non-nil,
  record activity."
    (or text (setq text ""))
!   (unless (and (or (member sender rcirc-ignore-list)
!                  (member (with-syntax-table rcirc-nick-syntax-table
!                            (when (string-match "^\\([^/]\\w*\\)[:,]" text)
!                              (match-string 1 text)))
!                          rcirc-ignore-list))
!              (not (string= sender (rcirc-nick process))))
      (let* ((buffer (rcirc-target-buffer process sender response target text))
           (inhibit-read-only t))
        (with-current-buffer buffer
***************
*** 1635,1641 ****
  
  (defun rcirc-clear-activity (buffer)
    "Clear the BUFFER activity."
!   (setq rcirc-activity (delete buffer rcirc-activity))
    (with-current-buffer buffer
      (setq rcirc-activity-types nil)))
  
--- 1639,1645 ----
  
  (defun rcirc-clear-activity (buffer)
    "Clear the BUFFER activity."
!   (setq rcirc-activity (remove buffer rcirc-activity))
    (with-current-buffer buffer
      (setq rcirc-activity-types nil)))
  


-- 
Ryan