;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
(defcustom riece-channel-list-mark-face-alist
'((?* . riece-channel-list-current-face))
"An alist mapping marks on riece-channel-list-buffer to faces."
- :type 'list
+ :type '(repeat (cons character symbol))
:group 'riece-highlight)
(defcustom riece-channel-list-font-lock-keywords
(set-face-foreground 'riece-modeline-current-face
(face-foreground 'riece-channel-list-current-face)))
-(defvar riece-highlight-enabled nil)
-
(defconst riece-highlight-description
"Highlight IRC buffers.")
;; In XEmacs, auto-initialization of font-lock is not affective
;; when buffer-file-name is not set.
(font-lock-set-defaults)
- (make-local-hook 'after-change-functions)
+ (riece-make-local-hook 'after-change-functions)
(add-hook 'after-change-functions
'riece-highlight-hide-prefix nil t)
- (if riece-highlight-enabled
+ (if (get 'riece-highlight 'riece-addon-enabled)
(font-lock-mode 1)))
(defun riece-highlight-setup-channel-list ()
;; In XEmacs, auto-initialization of font-lock is not affective
;; when buffer-file-name is not set.
(font-lock-set-defaults)
- (if riece-highlight-enabled
+ (if (get 'riece-highlight 'riece-addon-enabled)
(font-lock-mode 1)))
(defun riece-highlight-hide-prefix (start end length)
(put-text-property (match-beginning 1) (match-end 1) 'invisible t))))
(defun riece-highlight-put-overlay-faces (start end)
- (if riece-highlight-enabled
+ (if (get 'riece-highlight 'riece-addon-enabled)
(riece-scan-property-region
'riece-overlay-face
start end
(defun riece-highlight-format-identity-for-channel-list-indicator (index
identity)
- (if (and riece-highlight-enabled
+ (if (and (get 'riece-highlight 'riece-addon-enabled)
(riece-identity-equal identity riece-current-channel))
(let ((string (riece-format-identity identity))
(start 0))
(save-excursion
(while buffers
(set-buffer (car buffers))
- (if (eq (derived-mode-class major-mode)
- 'riece-dialogue-mode)
+ (if (riece-derived-mode-p 'riece-dialogue-mode)
(remove-hook 'after-change-functions
'riece-highlight-hide-prefix t))
(setq buffers (cdr buffers)))))
(defun riece-highlight-enable ()
(let ((buffers riece-buffer-list))
(while buffers
- (if (memq (derived-mode-class
- (with-current-buffer (car buffers)
- major-mode))
- '(riece-dialogue-mode riece-channel-list-mode))
+ (if (with-current-buffer (car buffers)
+ (riece-derived-mode-p 'riece-dialogue-mode
+ 'riece-channel-list-mode))
(with-current-buffer (car buffers)
(font-lock-mode 1)))
- (setq buffers (cdr buffers))))
- (setq riece-highlight-enabled t))
+ (setq buffers (cdr buffers)))))
(defun riece-highlight-disable ()
(let ((buffers riece-buffer-list))
(while buffers
- (if (memq (derived-mode-class
- (with-current-buffer (car buffers)
- major-mode))
- '(riece-dialogue-mode riece-channel-list-mode))
+ (if (with-current-buffer (car buffers)
+ (riece-derived-mode-p 'riece-dialogue-mode
+ 'riece-channel-list-mode))
(with-current-buffer (car buffers)
(font-lock-mode 0)))
- (setq buffers (cdr buffers))))
- (setq riece-highlight-enabled nil))
+ (setq buffers (cdr buffers)))))
(provide 'riece-highlight)