(let (file)
(make-glyph
(nconc
- (if (setq file (liece-locate-icon-file
- "liece-pointer.xpm"))
+ (if (and (featurep 'xpm)
+ (setq file (liece-locate-icon-file "liece-pointer.xpm")))
(list (vector 'xpm :file file)))
- (if (setq file (liece-locate-icon-file
- "liece-pointer.xbm"))
+ (if (and (featurep 'xbm)
+ (setq file (liece-locate-icon-file "liece-pointer.xbm")))
(list (vector 'xbm :file file)))
'([string :data "Liece:"]))))))
(set-glyph-face glyph 'modeline-buffer-id)
(let ((glyph
(make-glyph
(nconc
- (if (setq file (liece-locate-icon-file file))
+ (if (and (featurep 'xpm)
+ (setq file (liece-locate-icon-file file)))
(list (vector 'xpm :file file)))
(if string
(list (vector 'string :data string)))))))
(let ((filename (match-string 1 (cdr object))))
(liece-command-dcc-send filename nick))))
-(defadvice easy-menu-add-item
- (around liece-fix-menu-path-switch-buffer activate)
- "Advice for XEmacs 20.4 or earlier."
- (save-excursion
- (set-buffer liece-command-buffer)
- (add-menu-button
- (cons (car (ad-get-arg 0)) (ad-get-arg 1))
- (ad-get-arg 2) (ad-get-arg 3))))
-
(eval-and-compile
(setq liece-x-face-insert-function
(function liece-x-face-insert-with-xemacs))
(set-window-configuration config)
(redisplay-frame frame)))))))
-(or (eq 'stream (device-type))
- (liece-xemacs-splash))
+(unless (or liece-inhibit-startup-message
+ (eq 'stream (device-type)))
+ (liece-xemacs-splash))
;;; @ unread mark
;;;
(if liece-display-unread-mark
(with-current-buffer liece-channel-list-buffer
(let* ((buffer-read-only nil)
- (file (liece-xemacs-icon-path
- liece-xemacs-unread-icon))
- (glyph (make-glyph
- (list (vector 'xpm :file file)
- (vector 'string
- :data liece-channel-unread-character))))
+ (file (liece-locate-icon-file liece-xemacs-unread-icon))
+ (glyph
+ (make-glyph
+ (nconc (if (and (featurep 'xpm) file)
+ (list (vector 'xpm :file file)))
+ (list (vector 'string
+ :data liece-channel-unread-character)))))
ext)
(goto-char (point-min))
(when (re-search-forward (concat "^ ?[0-9]+: " chnl "$") nil t)
(add-hook 'liece-nick-replace-hook 'liece-xemacs-set-drop-functions)
(fset 'liece-redisplay-unread-mark 'liece-xemacs-redisplay-unread-mark)
-(add-hook 'liece-channel-unread-hook 'liece-xemacs-unread-mark)
-(add-hook 'liece-channel-read-hook 'liece-xemacs-read-mark)
+(add-hook 'liece-channel-unread-functions 'liece-xemacs-unread-mark)
+(add-hook 'liece-channel-read-functions 'liece-xemacs-read-mark)
(provide 'liece-xemacs)