diff options
| author | Vincent Belaïche | 2014-01-02 23:54:37 +0100 |
|---|---|---|
| committer | Vincent Belaïche | 2014-01-02 23:54:37 +0100 |
| commit | 33bebaa2f06d119a629301cb47daa908a37bf11d (patch) | |
| tree | 2f700d0fbc32e313080662597daccdf626c90184 | |
| parent | e831604df6fa74c1cbe978d63837313c2b8de9ed (diff) | |
| download | emacs-33bebaa2f06d119a629301cb47daa908a37bf11d.tar.gz emacs-33bebaa2f06d119a629301cb47daa908a37bf11d.zip | |
Correct ses--file-format checking.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ses.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ec7fc12c3f..570d900022f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -14,6 +14,11 @@ | |||
| 14 | 14 | ||
| 15 | 2014-01-02 Vincent Belaïche <vincentb1@users.sourceforge.net> | 15 | 2014-01-02 Vincent Belaïche <vincentb1@users.sourceforge.net> |
| 16 | 16 | ||
| 17 | * ses.el (ses-load): Correct handling for ses--file-format | ||
| 18 | checking. | ||
| 19 | |||
| 20 | 2014-01-02 Vincent Belaïche <vincentb1@users.sourceforge.net> | ||
| 21 | |||
| 17 | * ses.el (ses-initial-global-parameters-re): New defconst, a | 22 | * ses.el (ses-initial-global-parameters-re): New defconst, a |
| 18 | specific regexp is needed now that ses.el can handle both | 23 | specific regexp is needed now that ses.el can handle both |
| 19 | file-format 2 (no local printers) and 3 (may have local printers). | 24 | file-format 2 (no local printers) and 3 (may have local printers). |
diff --git a/lisp/ses.el b/lisp/ses.el index cdf479398ed..2b8daa48ddc 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)) |