ld/multiple-cursors.el
1
0
Fork 0
mirror of https://github.com/magnars/multiple-cursors.el.git synced 2025-10-13 05:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #383 from LaurenceWarne/fix-byte-comp-warnings

Browse Source 
Fix byte compilation warnings
This commit is contained in:
Leo Gaskin 2024-02-23 12:34:45 +01:00 committed by GitHub
commit c870c18462
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mc-mark-more.el
View File

@ -29,6 +29,7 @@
(require 'multiple-cursors-core) (require 'multiple-cursors-core)
(require 'thingatpt) (require 'thingatpt)
(require 'sgml-mode)
(defun mc/cursor-end (cursor) (defun mc/cursor-end (cursor)
(if (overlay-get cursor 'mark-active) (if (overlay-get cursor 'mark-active)
@ -96,8 +97,8 @@ to (point)), or nil."
"How should mc/mark-more-* search for more matches? "How should mc/mark-more-* search for more matches?
Match everything: nil Match everything: nil
Match only whole words: 'words Match only whole words: \\='words
Match only whole symbols: 'symbols Match only whole symbols: \\='symbols
Use like case-fold-search, don't recommend setting it globally.") Use like case-fold-search, don't recommend setting it globally.")
@ -497,20 +498,27 @@ remove the keymap depends on user input and KEEP-PRED:
(push alist emulation-mode-map-alists)))) (push alist emulation-mode-map-alists))))
(defvar mc/mark-more-like-this-extended-keymap (make-sparse-keymap))
(define-key mc/mark-more-like-this-extended-keymap (kbd "<up>") 'mc/mmlte--up)
(define-key mc/mark-more-like-this-extended-keymap (kbd "<down>") 'mc/mmlte--down)
(define-key mc/mark-more-like-this-extended-keymap (kbd "<left>") 'mc/mmlte--left)
(define-key mc/mark-more-like-this-extended-keymap (kbd "<right>") 'mc/mmlte--right)
;;;###autoload ;;;###autoload
(defun mc/mark-more-like-this-extended () (defun mc/mark-more-like-this-extended ()
"Like mark-more-like-this, but then lets you adjust with arrow keys. "Like mark-more-like-this, but then lets you adjust with arrow keys.
The adjustments work like this: The adjustments work like this:
<up> Mark previous like this and set direction to 'up <up> Mark previous like this and set direction to \\='up
<down> Mark next like this and set direction to 'down <down> Mark next like this and set direction to \\='down
If direction is 'up: If direction is \\='up:
<left> Skip past the cursor furthest up <left> Skip past the cursor furthest up
<right> Remove the cursor furthest up <right> Remove the cursor furthest up
If direction is 'down: If direction is \\='down:
<left> Remove the cursor furthest down <left> Remove the cursor furthest down
<right> Skip past the cursor furthest down <right> Skip past the cursor furthest down
@ -558,13 +566,6 @@ are we working on the next or previous cursors?")
(mc/skip-to-next-like-this)) (mc/skip-to-next-like-this))
(mc/mmlte--message)) (mc/mmlte--message))
(defvar mc/mark-more-like-this-extended-keymap (make-sparse-keymap))
(define-key mc/mark-more-like-this-extended-keymap (kbd "<up>") 'mc/mmlte--up)
(define-key mc/mark-more-like-this-extended-keymap (kbd "<down>") 'mc/mmlte--down)
(define-key mc/mark-more-like-this-extended-keymap (kbd "<left>") 'mc/mmlte--left)
(define-key mc/mark-more-like-this-extended-keymap (kbd "<right>") 'mc/mmlte--right)
(defvar mc--restrict-mark-all-to-symbols nil) (defvar mc--restrict-mark-all-to-symbols nil)
;;;###autoload ;;;###autoload

2
multiple-cursors-core.el
View File

@ -334,7 +334,7 @@ values."
(let ((mc-name (intern (concat "mc--" (symbol-name fn-name))))) (let ((mc-name (intern (concat "mc--" (symbol-name fn-name)))))
`(progn `(progn
(defun ,mc-name (orig-fun &rest args) (defun ,mc-name (orig-fun &rest args)
(if (not multiple-cursors-mode) (if (not (bound-and-true-p multiple-cursors-mode))
(apply orig-fun args) (apply orig-fun args)
(let* ((cache-key (cons ,(symbol-name fn-name) (,args-cache-key-fn args))) (let* ((cache-key (cons ,(symbol-name fn-name) (,args-cache-key-fn args)))
(cached-value (assoc cache-key mc--input-function-cache)) (cached-value (assoc cache-key mc--input-function-cache))