Merge from origin/emacs-25

[gnu-emacs] / lisp / ses.el

diff --git a/lisp/ses.el b/lisp/ses.el
index 50101945f34ca258dae3bfa404f298552dedef6d..a87386e17307b5543c7fb7445c9acf3436303ad4 100644 (file)
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1319,7 +1319,7 @@ printer signaled one (and \"%s\" is used as the default printer), else nil."
                           (and locprn
                                (ses--locprn-compiled locprn))))
                    printer)
-               (or value "")))
+               value))
        (if (stringp value)
            value
          (or (stringp (car-safe value))
@@ -1539,7 +1539,8 @@ Sets `ses-relocate-return' to `delete' if cell-references were removed."
        (if (setq rowcol (ses-sym-rowcol formula))
            (ses-relocate-symbol formula rowcol
                                 startrow startcol rowincr colincr)
-         formula) ; Pass through as-is.
+         ;; Constants pass through as-is.
+         formula)
       (dolist (cur formula)
        (setq rowcol (ses-sym-rowcol cur))
        (cond