Migrate blank line travel to block-travel

jcs090218 · jcs090218 · commit 9f624c1bbb72 · 2022-10-15T23:04:26.000+08:00
diff --git a/lisp/func/jcs-nav.el b/lisp/func/jcs-nav.el
@@ -101,24 +101,6 @@
                 (< (point) max-pt))
       (forward-char 1))))
 
-;;
-;; (@* "Navigating Blank Line" )
-;;
-
-(defun jcs-previous-blank-line ()
-  "Move to the previous line containing nothing but whitespaces or tabs."
-  (interactive)
-  (let ((sr-pt (save-excursion (re-search-backward "^[ \t]*\n" nil t))))
-    (goto-char (or sr-pt (point-min)))))
-
-(defun jcs-next-blank-line ()
-  "Move to the next line containing nothing but whitespaces or tabs."
-  (interactive)
-  (when (jcs-current-line-empty-p) (forward-line 1))
-  (let ((sr-pt (save-excursion (re-search-forward "^[ \t]*\n" nil t))))
-    (goto-char (or sr-pt (point-max)))
-    (when sr-pt (forward-line -1))))
-
 ;;
 ;; (@* "Character Navigation" )
 ;;
diff --git a/lisp/jcs-key.el b/lisp/jcs-key.el
@@ -313,8 +313,8 @@
 (jcs-leaf-key*
   `(("\eq"               . (lambda () (interactive) (other-window -1)))
     ("\ew"               . other-window)
-    ([C-up]              . jcs-previous-blank-line)
-    ([C-down]            . jcs-next-blank-line)
+    ([C-up]              . block-travel-up)
+    ([C-down]            . block-travel-down)
     ((kbd "C-d")         . jcs-kill-whole-line)
     ((kbd "C-x")         . kill-region)
     ((kbd "C-c")         . kill-ring-save)
diff --git a/lisp/jcs-plugin.el b/lisp/jcs-plugin.el
@@ -583,7 +583,7 @@
 (leaf multiple-cursors
   :init
   (defconst jcs-mc/cancel-commands
-    '( jcs-previous-blank-line jcs-next-blank-line
+    '( block-travel-down block-travel-up
        jcs-isearch-backward-symbol-at-point
        isearch-forward-symbol-at-point
        jcs-isearch-repeat-backward
@@ -623,12 +623,11 @@
 
 (leaf page-break-lines
   :init
-  (setq page-break-lines-modes '(browse-kill-ring-mode
-                                 emacs-lisp-mode
-                                 lisp-mode
-                                 scheme-mode
-                                 outline-mode
-                                 help-mode)))
+  (setq page-break-lines-modes '( browse-kill-ring-mode
+                                  emacs-lisp-mode lisp-mode
+                                  scheme-mode
+                                  outline-mode
+                                  help-mode)))
 
 (leaf popup
   :defer-config
diff --git a/lisp/mode/jcs-python-mode.el b/lisp/mode/jcs-python-mode.el
@@ -85,8 +85,8 @@
 
   (jcs-key-local
     `(([C-backspace] . jcs-backward-delete-word)
-      ([M-up]        . jcs-previous-blank-line)
-      ([M-down]      . jcs-next-blank-line)
+      ([M-up]        . block-travel-up)
+      ([M-down]      . block-travel-down)
       ((kbd "RET")   . jcs-py-return))))
 
 (provide 'jcs-python-mode)
diff --git a/lisp/mode/jcs-shell-mode.el b/lisp/mode/jcs-shell-mode.el
@@ -24,8 +24,8 @@
       ((kbd "<up>")   . comint-previous-input)
       ((kbd "<down>") . comint-next-input)
       ((kbd "<tab>")  . comint-next-matching-input-from-input)
-      ([C-up]         . jcs-previous-blank-line)
-      ([C-down]       . jcs-next-blank-line)
+      ([C-up]         . block-travel-up)
+      ([C-down]       . block-travel-down)
       ((kbd "C-~")    . (lambda () (interactive)
                           (shell-pop (multi-shell--next-valid-index))))
       ((kbd "C-_")    . multi-shell-prev)
