emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 09f3ac6: Put missing c-keep-region-active's into the source code


From: Alan Mackenzie
Subject: master 09f3ac6: Put missing c-keep-region-active's into the source code
Date: Thu, 28 Oct 2021 13:05:43 -0400 (EDT)

branch: master
commit 09f3ac60cc99dcb56632c55f0dfd0fbeadc60dc0
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>

    Put missing c-keep-region-active's into the source code
    
    * lisp/progmodes/cc-cmds.el (c-beginning-of-defun): Insert
    c-keep-region-active when (< arg 0).
    (c-forward-conditional): Insert c-keep-region-active.
---
 lisp/progmodes/cc-cmds.el | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index a9a5263..5024972 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1896,16 +1896,18 @@ defun."
            (if (< arg 0)
                (c-while-widening-to-decl-block
                 (< (setq arg (- (c-forward-to-nth-EOF-\;-or-} (- arg) where))) 
0)))
-           ;; Move forward to the next opening brace....
-           (when (and (= arg 0)
-                      (progn
-                        (c-while-widening-to-decl-block
-                         (not (c-syntactic-re-search-forward "{" nil 'eob)))
-                        (eq (char-before) ?{)))
-             (backward-char)
-             ;; ... and backward to the function header.
-             (c-beginning-of-decl-1)
-             t))
+           (prog1
+               ;; Move forward to the next opening brace....
+               (when (and (= arg 0)
+                          (progn
+                            (c-while-widening-to-decl-block
+                             (not (c-syntactic-re-search-forward "{" nil 
'eob)))
+                            (eq (char-before) ?{)))
+                 (backward-char)
+                 ;; ... and backward to the function header.
+                 (c-beginning-of-decl-1)
+                 t)
+             (c-keep-region-active)))
 
        ;; Move backward to the opening brace of a function, making successively
        ;; larger portions of the buffer visible as necessary.
@@ -3413,7 +3415,8 @@ to call `c-scan-conditionals' directly instead."
   (interactive "p")
   (let ((new-point (c-scan-conditionals count target-depth with-else)))
     (push-mark)
-    (goto-char new-point)))
+    (goto-char new-point))
+  (c-keep-region-active))
 
 (defun c-scan-conditionals (count &optional target-depth with-else)
   "Scan forward across COUNT preprocessor conditionals.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]