From: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date: Sat, 2 Jan 2016 15:59:03 +0000 (+0100)
Subject: Align textually on fix done for emacs-25 branch for bug#21054
X-Git-Tag: emacs-26.0.90~2827^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cfad94a5937931c4f28845a24d507fba4d6436cf;p=emacs.git

Align textually on fix done for emacs-25 branch for bug#21054

* lisp/ses.el (ses-check-curcell): Suppress ``temporary fix'' comment,
and useless `(if t ...)' in order to align textually on fix done for
emacs-25 branch for bug#21054.
---

diff --git a/lisp/ses.el b/lisp/ses.el
index 3e35fc10ac6..ee2bcd54b00 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1117,13 +1117,7 @@ region, or nil if cursor is not at a cell."
 The end marker is appropriate if some argument is 'end.
 A range is appropriate if some argument is 'range.
 A single cell is appropriate unless some argument is 'needrange."
-  (if t;; Vincent B.:
-      ;; previously (eq ses--curcell t)
-      ;; this is a quick hack to temporary fix the bug implied by changes made by Stefan in
-      ;; http://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/ses.el?id=84e0b7dad6f1a8e53261f9b96f5a9080fea681a4
-      ;;-------------------------------------------------------------------------
-      ;; curcell recalculation was postponed, but user typed ahead.
-      (ses-set-curcell))
+  (ses-set-curcell); fix  bug#21054
   (cond
    ((not ses--curcell)
     (or (memq 'end args)