* epg.el (epg-status-GET_HIDDEN): Pass epg-context as the first

[elisp/riece.git] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 4d8a1f3..1d09c38 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.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:
 
@@ -29,7 +29,7 @@
 (require 'riece-coding)                        ;riece-default-coding-system
 (require 'riece-identity)
 (require 'riece-compat)
-(require 'riece-lru)
+(require 'riece-cache)
 
 (eval-and-compile
   (defvar riece-server-keyword-map
@@ -197,8 +197,7 @@ the `riece-server-keyword-map' variable."
   (let* ((server-name (if identity
                          (riece-identity-server identity)
                        (riece-current-server-name)))
-        (process (riece-server-process server-name))
-        coding-system)
+        (process (riece-server-process server-name)))
     (unless process
       (error "%s" (substitute-command-keys
                   "Type \\[riece-command-open-server] to open server.")))
@@ -272,8 +271,10 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-channel-obarray)
     (setq riece-channel-obarray (make-vector riece-channel-obarray-size 0))
     (make-local-variable 'riece-coding-system)
-    (make-local-variable 'riece-user-lru)
-    (setq riece-user-lru (riece-make-lru riece-user-lru-max-size))
+    (make-local-variable 'riece-channel-cache)
+    (setq riece-channel-cache (riece-make-cache riece-channel-cache-max-size))
+    (make-local-variable 'riece-user-cache)
+    (setq riece-user-cache (riece-make-cache riece-user-cache-max-size))
     (buffer-disable-undo)
     (erase-buffer)))