X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece.el;h=75356bd4be1ad266f42b9ae70eb2800b1f37cd61;hb=68110589e12c39f8c679f9bf405b7ec30d8b0fe5;hp=2fe80de51c1861dd58ebfeec656d7a5f40f191ba;hpb=9cd80a6c8b7fd590580df68b6e000968437ec0f1;p=elisp%2Friece.git

diff --git a/lisp/riece.el b/lisp/riece.el
index 2fe80de..75356bd 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:
 
@@ -60,10 +60,7 @@
     (riece-channel-list-buffer "*Channels*" riece-channel-list-mode)
     (riece-user-list-buffer " *Users*" riece-user-list-mode)
     (riece-temp-buffer " *Temp*")
-    (riece-debug-buffer " *Debug*")))
-
-(defvar riece-shrink-buffer-idle-timer nil
-  "Timer object to periodically shrink channel buffers.")
+    (riece-debug-buffer "*Debug*")))
 
 (defvar riece-select-keys
   `("#" riece-command-switch-to-channel-by-number
@@ -182,6 +179,7 @@ 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
@@ -250,8 +248,10 @@ If optional argument SAFE is nil, overwrite previous definitions."
 (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'."
   (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
@@ -286,25 +286,11 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	(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)
@@ -331,24 +317,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	  (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)
-		    (point)))
-	     (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
@@ -358,8 +327,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
@@ -367,8 +334,8 @@ 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 "-"