(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
(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
(switch-to-buffer (riece-get-buffer-create riece-command-buffer))
(unless (eq major-mode 'riece-command-mode)
(riece-command-mode))
- (if (or confirm (null riece-server))
- (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))
+ (let ((server-name
+ (if (or confirm (null riece-server))
+ (completing-read "Server: " riece-server-alist)
+ riece-server)))
+ (setq riece-server-process (riece-start-server
+ (riece-server-name-to-server server-name))))
(riece-create-buffers)
(riece-configure-windows)
(let ((channel-list riece-startup-channel-list))
(defun riece-load-and-build-addon-dependencies (addons)
(let ((load-path (cons riece-addon-directory load-path))
- dependencies)
+ dependencies
+ pointer)
(while addons
(require (car addons)) ;error will be reported here
(let* ((requires
- (funcall (or (intern-soft (concat (symbol-name (car addons))
- "-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))
- (setcar (cdr entry) (1+ (nth 1 entry)))
- (push (list (car pointer) 1 nil) dependencies))
- (setq pointer (cdr pointer)))
- (if (setq entry (assq (car addons) dependencies))
- (setcar (nthcdr 2 entry) requires)
- (push (list (car addons) 0 requires) 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* ((dependencies (riece-load-and-build-addon-dependencies addons))
- (pointer dependencies)
- queue)
+ (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
- (when (zerop (nth 1 (car pointer)))
- (setq dependencies (delq (car pointer) dependencies))
- (push (car pointer) queue))
+ (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
- (push (car (car queue)) addons)
- (setq pointer (nth 2 (car 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))))
(setq pointer (cdr pointer)))
(setq queue (cdr queue)))
(if dependencies
- (error "Circular dependency found"))
+ (error "Circular add-on dependency found"))
(while addons
(require (car addons)) ;implicit dependency
(funcall (intern (concat (symbol-name (car addons)) "-insinuate")))