aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Belaïche2014-01-03 15:15:53 +0100
committerVincent Belaïche2014-01-03 15:15:53 +0100
commitfdaecc05fee5a61cfb83654e39eaf888757b471c (patch)
tree6e74ec33d1ea8bc9edf0c8566f39b3293b63865c
parentc401907409785f13087ad741a243a94496686bb7 (diff)
downloademacs-fdaecc05fee5a61cfb83654e39eaf888757b471c.tar.gz
emacs-fdaecc05fee5a61cfb83654e39eaf888757b471c.zip
Reverted 2014-01-02T22:54:37Z!vincentb1@users.sourceforge.net.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ses.el2
2 files changed, 1 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d5cadb7d78..f74ede68cd1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -47,11 +47,6 @@
47 47
482014-01-02 Vincent Belaïche <vincentb1@users.sourceforge.net> 482014-01-02 Vincent Belaïche <vincentb1@users.sourceforge.net>
49 49
50 * ses.el (ses-load): Correct handling for ses--file-format
51 checking.
52
532014-01-02 Vincent Belaïche <vincentb1@users.sourceforge.net>
54
55 * ses.el (ses-initial-global-parameters-re): New defconst, a 50 * ses.el (ses-initial-global-parameters-re): New defconst, a
56 specific regexp is needed now that ses.el can handle both 51 specific regexp is needed now that ses.el can handle both
57 file-format 2 (no local printers) and 3 (may have local printers). 52 file-format 2 (no local printers) and 3 (may have local printers).
diff --git a/lisp/ses.el b/lisp/ses.el
index 2b8daa48ddc..cdf479398ed 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1860,7 +1860,7 @@ Does not execute cell formulas or print functions."
1860 (insert "(ses-header-row 0)\n") 1860 (insert "(ses-header-row 0)\n")
1861 (ses-set-parameter 'ses--file-format 3) 1861 (ses-set-parameter 'ses--file-format 3)
1862 (message "Upgrading from SES-1 file format"))) 1862 (message "Upgrading from SES-1 file format")))
1863 (or (<= ses--file-format 3) 1863 (or (> ses--file-format 3)
1864 (error "This file needs a newer version of the SES library code")) 1864 (error "This file needs a newer version of the SES library code"))
1865 ;; Initialize cell array. 1865 ;; Initialize cell array.
1866 (setq ses--cells (make-vector ses--numrows nil)) 1866 (setq ses--cells (make-vector ses--numrows nil))