diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-12-11 10:59:27 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-12-11 10:59:27 -0500 |
| commit | 7ae3ae396308f0a46974532c608e46c0e61767ad (patch) | |
| tree | aeface1a99681ee840aeed4adca7a9811a466c01 /lisp | |
| parent | 5a80236fc8817e3b7fabcba233246ec862758a29 (diff) | |
| download | emacs-7ae3ae396308f0a46974532c608e46c0e61767ad.tar.gz | |
* lisp/emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching
comment-start-skip, since it fails when that uses submatch 1.
Fixes: debbugs:16041
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22cba2e5225..22ff12fe6b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-12-11 Stefan Monnier <monnier@iro.umontreal.ca> + * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching + comment-start-skip, since it fails when that uses submatch 1 (bug#16041). + * emulation/cua-base.el (cua-paste): Add `delete-selection' property instead of deleting the selection "by hand" (bug#16098). Rely on insert-for-yank to yank rectangles. 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)))))) |