From 7ae3ae396308f0a46974532c608e46c0e61767ad Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 11 Dec 2013 10:59:27 -0500 Subject: [PATCH] * 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 --- etc/NEWS | 7 +++++++ lisp/ChangeLog | 3 +++ lisp/emacs-lisp/smie.el | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index b446d2709b3..3957c40dcd0 100644 --- 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'. * 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 22cba2e5225..22ff12fe6b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-12-11 Stefan Monnier + * 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)))))) -- 2.39.2