Silence ses.el compilation.

* lisp/ses.el (top-level): Require cl when compiling.
(ses-set-localvars): Fix error statement.
Call it at compile time to silence a storm of warnings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59a8074871f0c888ef80b7c4ae80a6e7a8c15063..a7a9ebc6cc1f944da2f26e15d09a54f23354492b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-29  Glenn Morris  <rgm@gnu.org>
+
+       * ses.el (top-level): Require cl when compiling.
+       (ses-set-localvars): Fix error statement.
+       Call it at compile time to silence a storm of warnings.
+
 2011-06-29  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (normalize-live-buffer): Rename to

diff --git a/lisp/ses.el b/lisp/ses.el
index 8b06f058fcd226dfca791e56365cd45232377af3..a0df6a5e2cc050c07bcdc266b1cd4f6d351826dc 100644 (file)
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -56,6 +56,7 @@
 ;;; Code:
 
 (require 'unsafep)
+(eval-when-compile (require 'cl))
 
 
 ;;----------------------------------------------------------------------------
@@ -272,18 +273,18 @@ default printer and then modify its output.")
 (eval-and-compile
   (defconst ses-localvars
     '(ses--blank-line ses--cells ses--col-printers
-      ses--col-widths (ses--curcell . nil) ses--curcell-overlay
+      ses--col-widths ses--curcell ses--curcell-overlay
       ses--default-printer
-      ses--deferred-narrow (ses--deferred-recalc
-      . nil) (ses--deferred-write . nil) ses--file-format
+      ses--deferred-narrow ses--deferred-recalc
+      ses--deferred-write ses--file-format
       (ses--header-hscroll . -1) ; Flag for "initial recalc needed"
       ses--header-row ses--header-string ses--linewidth
       ses--numcols ses--numrows ses--symbolic-formulas
-      ses--data-marker ses--params-marker (ses--Dijkstra-attempt-nb
-      . 0) ses--Dijkstra-weight-bound
+      ses--data-marker ses--params-marker (ses--Dijkstra-attempt-nb . 0)
+      ses--Dijkstra-weight-bound
       ;; Global variables that we override
       mode-line-process next-line-add-newlines transient-mark-mode)
-    "Buffer-local variables used by SES."))
+    "Buffer-local variables used by SES.")
 
 (defun ses-set-localvars ()
   "Set buffer-local and initialize some SES variables."
@@ -292,8 +293,11 @@ default printer and then modify its output.")
      ((symbolp x)
       (set (make-local-variable x) nil))
      ((consp x)
-       (set (make-local-variable (car x)) (cdr x)))
-     (error "Unexpected elements `%S' in list `ses-localvars'"))))
+      (set (make-local-variable (car x)) (cdr x)))
+     (t (error "Unexpected elements `%S' in list `ses-localvars'" x))))))
+
+(eval-when-compile                     ; silence compiler
+  (ses-set-localvars))
 
 ;;; This variable is documented as being permitted in file-locals:
 (put 'ses--symbolic-formulas 'safe-local-variable 'consp)