summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/smie.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-12-11 19:06:29 +0200
committerEli Zaretskii <eliz@gnu.org>2013-12-11 19:06:29 +0200
commita34a8cd1e46594c5776f187dd98583bcb82f9bc0 (patch)
tree92503ed7f7d3fb3c73c38d4689611b8202682970 /lisp/emacs-lisp/smie.el
parent8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6 (diff)
parent1421be8445803bdb9c3fece8c658836b5f0f9c34 (diff)
downloademacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.gz
emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.bz2
emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.zip
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
-rw-r--r--lisp/emacs-lisp/smie.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index f025a8b400b..1c468e013d6 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -1165,7 +1165,7 @@ the beginning of a line."
(forward-char 1))
(skip-chars-forward " \t")
(or (eolp)
- (and (looking-at comment-start-skip)
+ (and ;; (looking-at comment-start-skip) ;(bug#16041).
(forward-comment (point-max))))
(point))))))