*** empty log message ***

[gnus] / lisp / nnoo.el

diff --git a/lisp/nnoo.el b/lisp/nnoo.el
index 1bfda6d..251fdc9 100644 (file)
--- a/lisp/nnoo.el
+++ b/lisp/nnoo.el
@@ -26,7 +26,7 @@
 ;;; Code:
 
 (require 'nnheader)
-(require 'cl)
+(eval-when-compile (require 'cl))
 
 (defvar nnoo-definition-alist nil)
 (defvar nnoo-state-alist nil)
@@ -58,7 +58,7 @@
 
 (defmacro nnoo-declare (backend &rest parents)
   `(eval-and-compile
-     (push (list ',backend 
+     (push (list ',backend
                 (mapcar (lambda (p) (list p)) ',parents)
                 nil nil)
           nnoo-definition-alist)
@@ -96,14 +96,14 @@
        (pop functions)))))
 
 (defun nnoo-parent-function (backend function args)
-  (let* ((pbackend (nnoo-backend function)))
+  (let ((pbackend (nnoo-backend function)))
     (nnoo-change-server pbackend (nnoo-current-server backend)
                        (cdr (assq pbackend (nnoo-parents backend))))
     (apply function args)))
 
 (defun nnoo-execute (backend function &rest args)
   "Execute FUNCTION on behalf of BACKEND."
-  (let* ((pbackend (nnoo-backend function)))
+  (let ((pbackend (nnoo-backend function)))
     (nnoo-change-server pbackend (nnoo-current-server backend)
                        (cdr (assq pbackend (nnoo-parents backend))))
     (apply function args)))
@@ -126,7 +126,7 @@
                 (&rest args)
               (nnoo-parent-function ',backend ',(car m)
                                     ,(cons 'list (nreverse margs))))))))
-  
+
 (defun nnoo-backend (symbol)
   (string-match "^[^-]+-" (symbol-name symbol))
   (intern (substring (symbol-name symbol) 0 (1- (match-end 0)))))
@@ -143,7 +143,7 @@
         (def (assq backend nnoo-definition-alist))
         (parents (nth 1 def)))
     (unless def
-      (error "%s belongs to a backend that hasn't been declared." var))
+      (error "%s belongs to a backend that hasn't been declared" var))
     (setcar (nthcdr 2 def)
            (delq (assq var (nth 2 def)) (nth 2 def)))
     (setcar (nthcdr 2 def)
@@ -180,8 +180,8 @@
                                              (symbol-value (car def)))))))
          (set (car def) (cadr def))))
       (while parents
-       (nnoo-change-server 
-        (caar parents) server 
+       (nnoo-change-server
+        (caar parents) server
         (mapcar (lambda (def) (list (car def) (symbol-value (cadr def))))
                 (cdar parents)))
        (pop parents))))
@@ -192,7 +192,7 @@
        (defs (nnoo-variables backend)))
     ;; Remove the old definition.
     (setcdr (cdr bstate) (delq (assoc current (cddr bstate)) (cddr bstate)))
-    ;; If this is the first time we push the server (i. e., this is 
+    ;; If this is the first time we push the server (i. e., this is
     ;; the nil server), then we update the default values of
     ;; all the variables to reflect the current values.
     (when (equal current "*internal-non-initialized-backend*")
@@ -207,7 +207,7 @@
        (pop defs))
       (nconc bstate (list (cons current state))))))
 
-(defun nnoo-current-server-p (backend server)
+(defsubst nnoo-current-server-p (backend server)
   (equal (nnoo-current-server backend) server))
 
 (defun nnoo-current-server (backend)