(require 'riece-emacs))
(require 'riece-filter)
-(require 'riece-highlight)
(require 'riece-display)
(require 'riece-server)
(require 'riece-compat)
(setq keymap (symbol-value (car keymap)))))
(let (key)
(while plist
- (when (symbolp (setq key (pop plist)))
- (setq key (symbol-value key)))
+ (if (symbolp (setq key (car plist)))
+ (setq key (symbol-value key)))
+ (setq plist (cdr plist))
(if (or (not safe)
(eq (lookup-key keymap key) 'undefined))
- (define-key keymap key (pop plist))
- (pop plist)))))
+ (define-key keymap key (car plist))
+ (car plist))
+ (setq plist (cdr plist)))))
(when t
(riece-define-keys riece-dialogue-mode-map
"\C-to" riece-command-toggle-own-freeze
"\C-tu" riece-command-toggle-user-list-buffer-mode
"\C-tc" riece-command-toggle-channel-buffer-mode
+ "\C-tC" riece-command-toggle-channel-list-buffer-mode
"i" riece-command-invite
"j" riece-command-join
"\C-k" riece-command-kick
"m" riece-dialogue-enter-message
"M" riece-command-change-mode
"n" riece-command-change-nickname
+ "\C-n" riece-command-names
"o" other-window
"O" riece-command-open-server
"C" riece-command-close-server
"q" riece-command-quit
"r" riece-command-configure-windows
"x" riece-command-copy-region
- "t" riece-command-topic)
+ "t" riece-command-topic
+ "w" riece-command-who)
(riece-define-keys riece-command-mode-map
"\r" riece-command-enter-message
- [tab] riece-command-complete
- [(meta control c) >] riece-command-push
- [(meta control c) <] riece-command-pop)
+ [(control return)] riece-command-enter-message-as-notice)
(riece-define-keys (riece-command-map "\C-c" riece-command-mode-map)
"\177" riece-command-scroll-down
"o" riece-command-set-operators
"\C-p" riece-command-part
"r" riece-command-configure-windows
- "v" riece-command-set-voices)
+ "v" riece-command-set-speakers)
(set-keymap-parent riece-command-map riece-dialogue-mode-map)
(riece-define-keys riece-user-list-mode-map
If optional argument CONFIRM is non-nil, ask which IRC server to connect.
If already connected, just pop up the windows."
(interactive "P")
- (riece-read-variables-files
- (car command-line-args-left))
- (pop command-line-args-left)
+ (riece-read-variables-files (if noninteractive
+ (car command-line-args-left)))
+ (riece-insinuate-addons riece-addons)
(run-hooks 'riece-after-load-startup-hook)
(if (riece-server-opened)
(riece-configure-windows)
(setq riece-server (completing-read "Server: " riece-server-alist)))
(if (stringp riece-server)
(setq riece-server (riece-server-name-to-server riece-server)))
- (setq riece-server-process (riece-start-server riece-server))
+ (riece-open-server riece-server)
(riece-create-buffers)
(riece-configure-windows)
(let ((channel-list riece-startup-channel-list))
(interactive)
(kill-all-local-variables)
- (setq major-mode 'riece-command-mode
- mode-name "Commands"
+ (setq riece-freeze riece-default-freeze
+ riece-freeze-indicator (if riece-freeze "F" "-")
+ riece-own-freeze riece-default-own-freeze
+ riece-own-freeze-indicator (if riece-own-freeze "M" "-")
riece-away-indicator "-"
- riece-freeze-indicator "-"
- riece-own-freeze-indicator "-"
+ major-mode 'riece-command-mode
+ mode-name "Commands"
mode-line-buffer-identification
(riece-mode-line-buffer-identification
'("Riece: "
riece-freeze-indicator (if riece-freeze "F" "-")
riece-own-freeze riece-default-own-freeze
riece-own-freeze-indicator (if riece-own-freeze "M" "-")
-
+ riece-away-indicator "-"
major-mode 'riece-dialogue-mode
mode-name "Dialogue"
mode-line-buffer-identification
(funcall (cdr (car alist))))
(setq alist (cdr alist))))))
+(defun riece-load-and-build-addon-dependencies (addons)
+ (let ((load-path (cons riece-addon-directory load-path))
+ dependencies
+ pointer)
+ (while addons
+ (require (car addons)) ;error will be reported here
+ (let* ((requires
+ (funcall (or (intern-soft
+ (concat (symbol-name (car addons)) "-requires"))
+ #'ignore)))
+ (pointer requires)
+ entry)
+ ;; Increment succs' pred count.
+ (if (setq entry (assq (car addons) dependencies))
+ (setcar (cdr entry) (+ (length requires) (nth 1 entry)))
+ (setq dependencies (cons (list (car addons) (length requires))
+ dependencies)))
+ ;; Merge pred's succs.
+ (while pointer
+ (if (setq entry (assq (car pointer) dependencies))
+ (setcdr (cdr entry)
+ (cons (car addons) (nthcdr 2 entry)))
+ (setq dependencies (cons (list (car pointer) 0 (car addons))
+ dependencies)))
+ (setq pointer (cdr pointer))))
+ (setq addons (cdr addons)))
+ dependencies))
+
+(defun riece-insinuate-addons (addons)
+ (let ((pointer addons)
+ dependencies queue)
+ ;; Uniquify, first.
+ (while pointer
+ (if (memq (car pointer) (cdr pointer))
+ (setcar pointer nil))
+ (setq pointer (cdr pointer)))
+ (setq dependencies (riece-load-and-build-addon-dependencies
+ (delq nil addons))
+ pointer dependencies)
+ ;; Sort them.
+ (while pointer
+ (if (zerop (nth 1 (car pointer)))
+ (setq dependencies (delq (car pointer) dependencies)
+ queue (cons (car pointer) queue)))
+ (setq pointer (cdr pointer)))
+ (setq addons nil)
+ (while queue
+ (setq addons (cons (car (car queue)) addons)
+ pointer (nthcdr 2 (car queue)))
+ (while pointer
+ (let* ((entry (assq (car pointer) dependencies))
+ (count (1- (nth 1 entry))))
+ (if (zerop count)
+ (progn
+ (setq dependencies (delq entry dependencies)
+ queue (nconc queue (list entry))))
+ (setcar (cdr entry) count)))
+ (setq pointer (cdr pointer)))
+ (setq queue (cdr queue)))
+ (if dependencies
+ (error "Circular add-on dependency found"))
+ (while addons
+ (require (car addons)) ;implicit dependency
+ (funcall (intern (concat (symbol-name (car addons)) "-insinuate")))
+ (setq addons (cdr addons)))))
+
(provide 'riece)
;;; riece.el ends here