Removed aliases for encode-coding-string & decode-coding-string since

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 930b904..75356bd 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -60,7 +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*")))
+    (riece-debug-buffer "*Debug*")))
 
 (defvar riece-select-keys
   `("#" riece-command-switch-to-channel-by-number
@@ -179,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
@@ -247,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
@@ -283,7 +286,8 @@ 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)
@@ -313,7 +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")))))
+                    (riece-mcat "Type \\[describe-mode] for help"))))))
 
 (defun riece-exit ()
   (if riece-save-variables-are-dirty
@@ -330,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 "-"