;; 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:
+
+;; NOTE: This is an add-on module for Riece.
;;; Code:
(require 'derived)
(defgroup riece-highlight nil
- "Highlight IRC buffers"
+ "Decorate IRC buffers with faces and fonts."
:tag "Highlight"
:prefix "riece-"
:group 'riece)
(defgroup riece-highlight-faces nil
- "Faces for highlight IRC buffers"
+ "Faces for highlight IRC buffers."
:tag "Faces"
:prefix "riece-highlight-"
:group 'riece-highlight)
".*\\)$")
(list 1 (intern (format "riece-dialogue-%s-face" line)) t t)))
'(change notice wallops error info))
- (list (list "(from [^)]+)$" 0 riece-dialogue-server-face t)))
+ '((riece-highlight-server-match 0 riece-dialogue-server-face t)))
"Default expressions to highlight in riece-dialogue-mode."
:type '(repeat (list string))
:group 'riece-highlight)
:type '(repeat (list string))
:group 'riece-highlight)
-(unless (find-face 'riece-modeline-current-face)
+(unless (riece-facep 'riece-modeline-current-face)
(make-face 'riece-modeline-current-face
"Face used for displaying the current channel in modeline.")
(if (featurep 'xemacs)
(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")
+ "Highlight IRC buffers.")
+
+(defun riece-highlight-server-match (limit)
+ (and (re-search-forward "(from [^)]+)$" limit t)
+ (get-text-property (match-beginning 0) 'riece-server-name)))
(defun riece-highlight-setup-dialogue ()
(make-local-variable 'font-lock-defaults)
(font-lock-set-defaults)
(make-local-hook 'after-change-functions)
(add-hook 'after-change-functions
- 'riece-highlight-hide-prefix nil 'local)
- (if riece-highlight-enabled
+ 'riece-highlight-hide-prefix nil t)
+ (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))
(defun riece-highlight-insinuate ()
(put 'riece-channel-mode 'font-lock-defaults
'(riece-dialogue-font-lock-keywords t))
- (add-hook 'riece-channel-mode-hook
- 'riece-highlight-setup-dialogue)
(put 'riece-others-mode 'font-lock-defaults
'(riece-dialogue-font-lock-keywords t))
- (add-hook 'riece-others-mode-hook
- 'riece-highlight-setup-dialogue)
(put 'riece-dialogue-mode 'font-lock-defaults
'(riece-dialogue-font-lock-keywords t))
(add-hook 'riece-dialogue-mode-hook
(add-hook 'riece-after-insert-functions
'riece-highlight-put-overlay-faces))
+(defun riece-highlight-uninstall ()
+ (let ((buffers riece-buffer-list))
+ (save-excursion
+ (while buffers
+ (set-buffer (car buffers))
+ (if (eq (derived-mode-class major-mode)
+ 'riece-dialogue-mode)
+ (remove-hook 'after-change-functions
+ 'riece-highlight-hide-prefix t))
+ (setq buffers (cdr buffers)))))
+ (riece-remprop 'riece-channel-mode 'font-lock-defaults)
+ (riece-remprop 'riece-others-mode 'font-lock-defaults)
+ (riece-remprop 'riece-dialogue-mode 'font-lock-defaults)
+ (remove-hook 'riece-dialogue-mode-hook
+ 'riece-highlight-setup-dialogue)
+ (riece-remprop 'riece-channel-list-mode 'font-lock-defaults)
+ (remove-hook 'riece-channel-list-mode-hook
+ 'riece-highlight-setup-channel-list)
+ (remove-hook 'riece-format-identity-for-channel-list-indicator-functions
+ 'riece-highlight-format-identity-for-channel-list-indicator)
+ (remove-hook 'riece-after-insert-functions
+ 'riece-highlight-put-overlay-faces))
+
(defun riece-highlight-enable ()
(let ((buffers riece-buffer-list))
(while buffers
'(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))
'(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)