aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Belaïche2016-01-02 16:59:03 +0100
committerVincent Belaïche2016-01-02 16:59:03 +0100
commitcfad94a5937931c4f28845a24d507fba4d6436cf (patch)
treea19ffe145e1d0d747979acd286586fb612e1c48f
parent222796697a6d1cae1d965df80fc42613f5fb1f89 (diff)
downloademacs-cfad94a5937931c4f28845a24d507fba4d6436cf.tar.gz
emacs-cfad94a5937931c4f28845a24d507fba4d6436cf.zip
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.
-rw-r--r--lisp/ses.el8
1 files changed, 1 insertions, 7 deletions
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."
1117The end marker is appropriate if some argument is 'end. 1117The end marker is appropriate if some argument is 'end.
1118A range is appropriate if some argument is 'range. 1118A range is appropriate if some argument is 'range.
1119A single cell is appropriate unless some argument is 'needrange." 1119A single cell is appropriate unless some argument is 'needrange."
1120 (if t;; Vincent B.: 1120 (ses-set-curcell); fix bug#21054
1121 ;; previously (eq ses--curcell t)
1122 ;; this is a quick hack to temporary fix the bug implied by changes made by Stefan in
1123 ;; http://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/ses.el?id=84e0b7dad6f1a8e53261f9b96f5a9080fea681a4
1124 ;;-------------------------------------------------------------------------
1125 ;; curcell recalculation was postponed, but user typed ahead.
1126 (ses-set-curcell))
1127 (cond 1121 (cond
1128 ((not ses--curcell) 1122 ((not ses--curcell)
1129 (or (memq 'end args) 1123 (or (memq 'end args)