* 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

diff --git a/etc/NEWS b/etc/NEWS
index b446d2709b30bf7a6d07e8823c5fa86f5a5ed9c3..3957c40dcd0c8e9c6be0e74768f965d48e48c1c3 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -247,6 +247,13 @@ You can pick the name of the function and the variables with `C-x 4 a'.
 \f
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
+** CUA-mode
+CUA-mode was changed to make use of delete-selection-mode and
+shift-select-mode.  So you can now enable it independently from
+transient-mark-mode, delete-selection-mode, and shift-select-mode.
+As a result, cua-highlight-region-shift-only is obsolete
+(you can disable transient-mark-mode to get the same result).
+
 ** `delete-selection-mode' can be used without transient-mark-mode.
 
 ** prolog-use-smie has been removed, along with the non-SMIE indentation code.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22cba2e52253cc9bd5a30a22815ce6ac8e1c1b07..22ff12fe6b4fd4ddd475bf20185d6fbd9b1d4b31 100644 (file)
--- 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 f025a8b400be25ec25362b22c4e50de8b026eca3..1c468e013d64a99693ab10ce925ce37de216cf99 100644 (file)
--- 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))))))