X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece.el;h=400404d8f6aa76b3644cac25650bef5dc4e2c4cf;hb=HEAD;hp=b7c18eb13371267a4a2d90b1942ff3e696885d47;hpb=3e1dba2ee02cb061f5e9f7fd859d5a570f5727fa;p=elisp%2Friece.git diff --git a/lisp/riece.el b/lisp/riece.el index b7c18eb..400404d 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -19,8 +19,8 @@ ;; 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. ;;; Code: @@ -31,8 +31,6 @@ (require 'riece-addon) (require 'riece-signal) -(autoload 'derived-mode-class "derived") - (defvar riece-channel-list-mode-map (make-sparse-keymap)) (defvar riece-user-list-mode-map (make-sparse-keymap)) @@ -58,13 +56,9 @@ (riece-dialogue-buffer "*Dialogue*" riece-dialogue-mode) (riece-others-buffer "*Others*" riece-others-mode) (riece-channel-list-buffer "*Channels*" riece-channel-list-mode) - (riece-user-list-buffer " *Users*" riece-user-list-mode))) - -(defvar riece-shrink-buffer-idle-timer nil - "Timer object to periodically shrink channel buffers.") - -(defvar riece-addons-insinuated nil - "Non nil if add-ons are already insinuated.") + (riece-user-list-buffer " *Users*" riece-user-list-mode) + (riece-temp-buffer " *Temp*") + (riece-debug-buffer "*Debug*"))) (defvar riece-select-keys `("#" riece-command-switch-to-channel-by-number @@ -164,6 +158,7 @@ If optional argument SAFE is nil, overwrite previous definitions." "f" riece-command-finger "\C-tf" riece-command-toggle-freeze "\C-to" riece-command-toggle-own-freeze + "\C-tO" riece-command-toggle-others-buffer-mode "\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 @@ -182,9 +177,11 @@ If optional argument SAFE is nil, overwrite previous definitions." "p" riece-command-enter-message-to-user "q" riece-command-quit "r" riece-command-configure-windows + "s" riece-command-save-variables "x" riece-command-copy-region "t" riece-command-topic - "w" riece-command-who) + "w" riece-command-who + "z" riece-command-suspend-resume) (riece-define-keys riece-command-mode-map "\r" riece-command-enter-message @@ -239,30 +236,45 @@ If optional argument SAFE is nil, overwrite previous definitions." (let ((files (if file (setq riece-variables-file file riece-variables-files (list file)) - riece-variables-files))) + riece-variables-files)) + (variables riece-saved-forms)) (while files (condition-case nil (load (expand-file-name (car files))) (file-error nil)) - (setq files (cdr files))))) + (setq files (cdr files))) + (while variables + (if (fboundp 'custom-reevaluate-setting) + (custom-reevaluate-setting (car variables)) + (funcall (or (get (car variables) 'custom-set) 'set-default) + (car variables) + (eval (car (or (get (car variables) 'saved-value) + (get (car variables) 'standard-value)))))) + (setq variables (cdr variables))))) (defvar print-quoted) (defvar print-escape-multibyte) (defun riece-save-variables-files () - "Save current settings to `riece-variables-file'." + "Save current settings to `riece-saved-variables-file'." + (message (riece-mcat "Saving %s...") riece-saved-variables-file) (with-temp-file riece-saved-variables-file + (insert ";;; This file is generated automatically by " riece-version ".\n" + ";;; Do not edit this file!\n\n") (let ((print-quoted t) (print-readably t) print-escape-multibyte print-level print-length (variables riece-saved-forms)) + (insert "(custom-set-variables\n") (while variables - (prin1 `(setq ,(car variables) - ',(symbol-value (car variables))) + (insert " '") + (prin1 `(,(car variables) ',(symbol-value (car variables))) (current-buffer)) (insert "\n") - (setq variables (cdr variables))))) + (setq variables (cdr variables))) + (insert ")"))) + (message (riece-mcat "Saving %s...done") riece-saved-variables-file) (setq riece-save-variables-are-dirty nil)) ;;;###autoload @@ -275,33 +287,21 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (run-hooks 'riece-after-load-startup-hook) (if (riece-server-opened) (riece-command-configure-windows) - (unless riece-addons-insinuated - (setq riece-addons (riece-resolve-addons riece-addons)) - (let ((pointer riece-addons)) - (while pointer - (riece-insinuate-addon (car pointer) riece-debug) - (setq pointer (cdr pointer)))) - (setq riece-addons-insinuated t)) + (modify-frame-parameters (selected-frame) + (list (cons 'riece-window-configuration + (current-window-configuration)))) + (setq riece-addon-dependencies (riece-resolve-addons + (copy-sequence riece-addons))) + (let ((pointer riece-addon-dependencies)) + (while pointer + (riece-insinuate-addon (car (car pointer)) riece-debug) + (setq pointer (cdr pointer)))) (if (or confirm (null riece-server)) - (setq riece-server (completing-read "Server: " riece-server-alist))) + (setq riece-server (completing-read (riece-mcat "Server: ") + riece-server-alist))) (if (stringp riece-server) (setq riece-server (riece-server-name-to-server riece-server))) (riece-create-buffers) - (if riece-max-buffer-size - (setq riece-shrink-buffer-idle-timer - (riece-run-with-idle-timer - riece-shrink-buffer-idle-time-delay t - (lambda () - (let ((buffers riece-buffer-list)) - (while buffers - (if (buffer-live-p (car buffers)) - (if (eq (derived-mode-class - (with-current-buffer (car buffers) - major-mode)) - 'riece-dialogue-mode) - (riece-shrink-buffer (car buffers))) - (delq (car buffers) riece-buffer-list)) - (setq buffers (cdr buffers)))))))) (switch-to-buffer riece-command-buffer) (riece-display-connect-signals) (riece-redisplay-buffers) @@ -321,30 +321,14 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (unless (riece-server-opened server) (riece-command-open-server server)) (setq channel-list (cdr channel-list)))) - (let ((pointer riece-addons)) + (let ((pointer riece-addon-dependencies)) (while pointer - (unless (get (car pointer) 'riece-addon-default-disabled) - (riece-enable-addon (car pointer) riece-debug)) + (unless (get (car (car pointer)) 'riece-addon-default-disabled) + (riece-enable-addon (car (car pointer)) riece-debug)) (setq pointer (cdr pointer)))) (run-hooks 'riece-startup-hook) (message "%s" (substitute-command-keys - "Type \\[describe-mode] for help"))))) - -(defun riece-shrink-buffer (buffer) - (save-excursion - (set-buffer buffer) - (goto-char (point-min)) - (while (> (buffer-size) riece-max-buffer-size) - (let* ((inhibit-read-only t) - buffer-read-only - (end (progn - (goto-char riece-shrink-buffer-remove-chars) - (beginning-of-line 2))) - (overlays (riece-overlays-in (point-min) end))) - (while overlays - (riece-delete-overlay (car overlays)) - (setq overlays (cdr overlays))) - (delete-region (point-min) end))))) + (riece-mcat "Type \\[describe-mode] for help")))))) (defun riece-exit () (if riece-save-variables-are-dirty @@ -354,8 +338,6 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (buffer-live-p (car riece-buffer-list))) (funcall riece-buffer-dispose-function (car riece-buffer-list))) (setq riece-buffer-list (cdr riece-buffer-list))) - (if riece-shrink-buffer-idle-timer - (riece-cancel-timer riece-shrink-buffer-idle-timer)) (riece-clear-signal-slots) (setq riece-server nil riece-current-channels nil @@ -363,12 +345,14 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." riece-channel-buffer nil riece-channel-buffer-alist nil riece-user-indicator nil - riece-long-channel-indicator "None" - riece-channel-list-indicator "No channel" + riece-long-channel-indicator (riece-mcat "None") + riece-channel-list-indicator (riece-mcat "No channel") riece-away-indicator "-" riece-operator-indicator "-" riece-channel-status-indicator "-" riece-freeze-indicator "-") + (modify-frame-parameters (selected-frame) + (list (list 'riece-window-configuration))) (delete-other-windows) (run-hooks 'riece-exit-hook)) @@ -387,21 +371,24 @@ For a list of the generic commands type \\[riece-command-generic] ? RET. (make-local-variable 'truncate-partial-width-windows) (setq truncate-partial-width-windows nil) + (make-local-variable 'riece-mode-line-buffer-identification) (setq riece-away-indicator "-" riece-operator-indicator "-" riece-channel-status-indicator "-" major-mode 'riece-command-mode mode-name "Command" + riece-mode-line-buffer-identification + '("Riece: " + riece-away-indicator + riece-operator-indicator + riece-channel-status-indicator + " " + riece-user-indicator + " " + riece-channel-indicator) mode-line-buffer-identification (riece-mode-line-buffer-identification - '("Riece: " - riece-away-indicator - riece-operator-indicator - riece-channel-status-indicator - " " - riece-user-indicator - " " - riece-channel-indicator)) + riece-mode-line-buffer-identification) truncate-lines nil) (riece-simplify-mode-line-format) (use-local-map riece-command-mode-map) @@ -410,9 +397,12 @@ For a list of the generic commands type \\[riece-command-generic] ? RET. (setq riece-command-mode-syntax-table (copy-syntax-table (syntax-table))) (set-syntax-table riece-command-mode-syntax-table) - (mapcar - (lambda (c) (modify-syntax-entry c "w")) - "^[]{}'`")) + (let* ((chars "^[]{}'`") + (length (length chars)) + (index 0)) + (while (< index length) + (modify-syntax-entry (aref chars index) "w") + (setq index (1+ index))))) (run-hooks 'riece-command-mode-hook)) @@ -430,21 +420,24 @@ Instead, these commands are available: (make-local-variable 'truncate-partial-width-windows) (setq truncate-partial-width-windows nil) + (make-local-variable 'riece-mode-line-buffer-identification) (setq riece-freeze riece-default-freeze riece-away-indicator "-" riece-operator-indicator "-" riece-channel-status-indicator "-" major-mode 'riece-dialogue-mode mode-name "Dialogue" + riece-mode-line-buffer-identification + '("Riece: " + riece-away-indicator + riece-operator-indicator + riece-freeze-indicator + riece-channel-status-indicator + " " + riece-channel-list-indicator " ") mode-line-buffer-identification (riece-mode-line-buffer-identification - '("Riece: " - riece-away-indicator - riece-operator-indicator - riece-freeze-indicator - riece-channel-status-indicator - " " - riece-channel-list-indicator " ")) + riece-mode-line-buffer-identification) truncate-lines nil buffer-read-only t) (riece-simplify-mode-line-format) @@ -466,15 +459,18 @@ All normal editing commands are turned off. Instead, these commands are available: \\{riece-channel-mode-map}" (make-local-variable 'riece-channel-buffer-window-point) - (setq mode-line-buffer-identification + (make-local-variable 'riece-mode-line-buffer-identification) + (setq riece-mode-line-buffer-identification + '("Riece: " + riece-away-indicator + riece-operator-indicator + riece-freeze-indicator + riece-channel-status-indicator + " " + riece-long-channel-indicator) + mode-line-buffer-identification (riece-mode-line-buffer-identification - '("Riece: " - riece-away-indicator - riece-operator-indicator - riece-freeze-indicator - riece-channel-status-indicator - " " - riece-long-channel-indicator)))) + riece-mode-line-buffer-identification))) (defun riece-channel-list-mode () "Major mode for displaying channel list. @@ -487,13 +483,16 @@ All normal editing commands are turned off." (make-local-variable 'truncate-partial-width-windows) (setq truncate-partial-width-windows nil) + (make-local-variable 'riece-mode-line-buffer-identification) (setq major-mode 'riece-channel-list-mode mode-name "Channels" + riece-mode-line-buffer-identification '("Riece: ") mode-line-buffer-identification - (riece-mode-line-buffer-identification '("Riece: ")) + (riece-mode-line-buffer-identification + riece-mode-line-buffer-identification) truncate-lines t buffer-read-only t) - (make-local-hook 'riece-update-buffer-functions) + (riece-make-local-hook 'riece-update-buffer-functions) (add-hook 'riece-update-buffer-functions 'riece-update-channel-list-buffer nil t) (use-local-map riece-channel-list-mode-map) @@ -512,16 +511,19 @@ Instead, these commands are available: (make-local-variable 'truncate-partial-width-windows) (setq truncate-partial-width-windows nil) + (make-local-variable 'riece-mode-line-buffer-identification) (setq major-mode 'riece-user-list-mode mode-name "Users" + riece-mode-line-buffer-identification + '("Riece: " riece-long-channel-indicator " ") mode-line-buffer-identification (riece-mode-line-buffer-identification - '("Riece: " riece-long-channel-indicator " ")) + riece-mode-line-buffer-identification) truncate-lines t buffer-read-only t) (if (boundp 'transient-mark-mode) (set (make-local-variable 'transient-mark-mode) t)) - (make-local-hook 'riece-update-buffer-functions) + (riece-make-local-hook 'riece-update-buffer-functions) (add-hook 'riece-update-buffer-functions 'riece-update-user-list-buffer nil t) (use-local-map riece-user-list-mode-map) @@ -614,6 +616,10 @@ are familiar with the debugger, to get a lisp back-trace.") (buffer-substring (point) (point-max))) "(closed server)")) (setq pointer (cdr pointer)))) + (insert "\n\nRecent debug messages:\n" + "-----------------------------------\n" + (with-current-buffer riece-debug-buffer + (buffer-string))) ;; Insert recent keystrokes. (insert "\n\nRecent keystrokes:\n" "-----------------\n\n")