(ses-destroy-cell-variable-range): Fix heading comment convention.

(ses-call-printer): Does not pass an empty string to formatter when the cell is empty to keep from barking printer Calc math-format-value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7fb8fcd0698f80d9f2ef45a6d1b70676123e4cd..e65f73347549cbb7adc3a8235466b1da815f6d56 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-27  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+       * ses.el (ses-destroy-cell-variable-range): Fix heading comment
+       convention.
+       (ses-call-printer): Does not pass an empty string to formatter when the
+       cell is empty to keep from barking printer Calc math-format-value.
+
 2011-06-27  Richard Stallman  <rms@gnu.org>
 
        * battery.el (battery-mode-line-limit): New variable.

diff --git a/lisp/ses.el b/lisp/ses.el
index 2e23e49810a4eefb50650bfa54fe46ef0ff38516..8b06f058fcd226dfca791e56365cd45232377af3 100644 (file)
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -670,9 +670,9 @@ for this spreadsheet."
        (put sym 'ses-cell (cons xrow xcol))
        (make-local-variable sym)))))
 
-;;We do not delete the ses-cell properties for the cell-variables, in case a
-;;formula that refers to this cell is in the kill-ring and is later pasted
-;;back in.
+;; We do not delete the ses-cell properties for the cell-variables, in
+;; case a formula that refers to this cell is in the kill-ring and is
+;; later pasted back in.
 (defun ses-destroy-cell-variable-range (minrow maxrow mincol maxcol)
   "Destroy buffer-local variables for cells.  This is undoable."
   (let (sym)
@@ -1170,17 +1170,19 @@ The variable `ses-call-printer-return' is set to t if the printer used
 parenthesis to request left-justification, or the error-signal if the
 printer signaled one (and \"%s\" is used as the default printer), else nil."
   (setq ses-call-printer-return nil)
-  (unless value
-    (setq value ""))
   (condition-case signal
       (cond
        ((stringp printer)
-       (format printer value))
+       (if value
+           (format printer value)
+         ""))
        ((stringp (car-safe printer))
        (setq ses-call-printer-return t)
-       (format (car printer) value))
+       (if value
+           (format (car printer) value)
+         ""))
        (t
-       (setq value (funcall printer value))
+       (setq value (funcall printer (or value "")))
        (if (stringp value)
            value
          (or (stringp (car-safe value))