* ses.el (macroexp): add require for this package, so that

function `ses--cell' gets macroexp-quote --- this change was
supposed to be in my previous commit, but left out by mistake.
(ses--cell): Do not make formula a macroexp-quote of value when
value, not formula, is *skip*.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da3ce647cf7..cd535eafafa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-25  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+        * ses.el (macroexp): add require for this package, so that
+        function `ses--cell' gets macroexp-quote --- this change was
+        supposed to be in my previous commit, but left out by mistake.
+        (ses--cell): Do not make formula a macroexp-quote of value when
+        value, not formula, is *skip*.
+
 2014-10-24  Vincent Belaïche  <vincentb1@users.sourceforge.net>
 
         * ses.el (macroexp): add require for this package, so that function
diff --git a/lisp/ses.el b/lisp/ses.el
index 09001fdb358..a653f8c174b 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -56,6 +56,7 @@
 ;;; Code:
 
 (require 'unsafep)
+(require 'macroexp)
 (eval-when-compile (require 'cl-lib))
 
 
@@ -491,7 +492,7 @@ Safety-checking for FORMULA and PRINTER are deferred until first use."
   (let ((rowcol (ses-sym-rowcol sym)))
     (ses-formula-record formula)
     (ses-printer-record printer)
-    (unless (or formula (eq formula '*skip*))
+    (unless (or formula (eq value '*skip*))
       (setq formula (macroexp-quote value)))
     (or (atom formula)
         (eq safe-functions t)