;;; rcirc.el --- default, simple IRC client.
-;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
;; Author: Ryan Yeske <rcyeske@gmail.com>
;; Maintainers: Ryan Yeske <rcyeske@gmail.com>,
"Return a buffer for PROCESS, either the one selected or the process buffer."
(if rcirc-always-use-server-buffer-flag
(process-buffer process)
- (let ((buffer (window-buffer (selected-window))))
+ (let ((buffer (window-buffer)))
(if (and buffer
(with-current-buffer buffer
(and (eq major-mode 'rcirc-mode)
(old-types rcirc-activity-types))
(when (not (get-buffer-window (current-buffer) t))
(setq rcirc-activity
- (sort (add-to-list 'rcirc-activity (current-buffer))
+ (sort (if (memq (current-buffer) rcirc-activity) rcirc-activity
+ (cons (current-buffer) rcirc-activity))
(lambda (b1 b2)
(let ((t1 (with-current-buffer b1 rcirc-last-post-time))
(t2 (with-current-buffer b2 rcirc-last-post-time)))
(let ((pos start)
next prop)
(while (< pos end)
- (setq prop (get-text-property pos 'face object)
- next (next-single-property-change pos 'face object end))
- (unless (member name (get-text-property pos 'face object))
- (add-text-properties pos next (list 'face (cons name prop)) object))
+ (setq prop (get-text-property pos 'font-lock-face object)
+ next (next-single-property-change pos 'font-lock-face object end))
+ (unless (member name (get-text-property pos 'font-lock-face object))
+ (add-text-properties pos next
+ (list 'font-lock-face (cons name prop)) object))
(setq pos next)))))
(defun rcirc-facify (string face)