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

Compare commits

base: ld/multiple-cursors.el:master
Branches Tags
ld/multiple-cursors.el:master ld/multiple-cursors.el:cl-tidy-up ld/multiple-cursors.el:feature/split-region ld/multiple-cursors.el:bugfix/mark-all-in-region-with-one-match
ld/multiple-cursors.el:1.5.0 ld/multiple-cursors.el:1.4.0 ld/multiple-cursors.el:1.3.0 ld/multiple-cursors.el:1.2.3 ld/multiple-cursors.el:1.2.2 ld/multiple-cursors.el:1.2.1 ld/multiple-cursors.el:1.2.0 ld/multiple-cursors.el:1.1.5 ld/multiple-cursors.el:1.1.4 ld/multiple-cursors.el:1.1.3 ld/multiple-cursors.el:1.1.2
...
compare: ld/multiple-cursors.el:cl-tidy-up
Branches Tags
ld/multiple-cursors.el:master ld/multiple-cursors.el:cl-tidy-up ld/multiple-cursors.el:feature/split-region ld/multiple-cursors.el:bugfix/mark-all-in-region-with-one-match
ld/multiple-cursors.el:1.5.0 ld/multiple-cursors.el:1.4.0 ld/multiple-cursors.el:1.3.0 ld/multiple-cursors.el:1.2.3 ld/multiple-cursors.el:1.2.2 ld/multiple-cursors.el:1.2.1 ld/multiple-cursors.el:1.2.0 ld/multiple-cursors.el:1.1.5 ld/multiple-cursors.el:1.1.4 ld/multiple-cursors.el:1.1.3 ld/multiple-cursors.el:1.1.2

2 Commits
master ... cl-tidy-up

Author SHA1 Message Date
Steve Purcell 48e1d3da5c Use lexical-binding instead of old lexical-let macro 2020-10-24 13:03:49 +13:00
Steve Purcell 1f3ccfbcd2 return-from should be cl-return-from 2020-10-24 13:01:21 +13:00
2 changed files with 10 additions and 14 deletions
Expand all files Collapse all files
features/step-definitions/multiple-cursors-steps.el
+9 -13
View File
@@ -1,4 +1,4 @@
(require 'cl) ;; For lexical-let ;; -*- lexical-binding: t -*-
(When "^I mark next like this$" (When "^I mark next like this$"
(lambda () (call-interactively 'mc/mark-next-like-this))) (lambda () (call-interactively 'mc/mark-next-like-this)))
@@ -108,27 +108,23 @@
(When "^I copy \"\\(.+\\)\" in another program$" (When "^I copy \"\\(.+\\)\" in another program$"
(lambda (text) (lambda (text)
(lexical-let ((text text)) (setq interprogram-paste-function
(setq interprogram-paste-function #'(lambda () (let ((r text)) (setq text nil) r)))))
#'(lambda () (let ((r text)) (setq text nil) r))))))
(Given "^I have bound C-! to a lambda that inserts \"\\(.+\\)\"$" (Given "^I have bound C-! to a lambda that inserts \"\\(.+\\)\"$"
(lambda (ins) (lambda (ins)
(lexical-let ((ins ins)) (global-set-key (kbd "C-!") #'(lambda () (interactive) (insert ins)))))
(global-set-key (kbd "C-!") #'(lambda () (interactive) (insert ins))))))
(Given "^I have bound C-! to a new command that inserts \"\\(.+\\)\"$" (Given "^I have bound C-! to a new command that inserts \"\\(.+\\)\"$"
(lambda (ins) (lambda (ins)
(lexical-let ((ins ins)) (defun mc-test-temp-command () (interactive) (insert ins))
(defun mc-test-temp-command () (interactive) (insert ins)) (global-set-key (kbd "C-!") 'mc-test-temp-command)))
(global-set-key (kbd "C-!") 'mc-test-temp-command))))
(Given "^I have bound C-! to another new command that inserts \"\\(.+\\)\"$" (Given "^I have bound C-! to another new command that inserts \"\\(.+\\)\"$"
(lambda (ins) (lambda (ins)
(lexical-let ((ins ins)) (defun mc-test-temp-command-2 () (interactive) (insert ins))
(defun mc-test-temp-command-2 () (interactive) (insert ins)) (global-set-key (kbd "C-!") 'mc-test-temp-command-2)))
(global-set-key (kbd "C-!") 'mc-test-temp-command-2))))
(Given "^I have bound C-! to a keyboard macro that insert \"_\"$" (Given "^I have bound C-! to a keyboard macro that insert \"_\"$"
(lambda () (lambda ()
mc-cycle-cursors.el
+1 -1
View File
@@ -88,7 +88,7 @@
(cl-defun mc/cycle (next-cursor fallback-cursor loop-message) (cl-defun mc/cycle (next-cursor fallback-cursor loop-message)
(when (null next-cursor) (when (null next-cursor)
(when (eql 'stop (mc/handle-loop-condition loop-message)) (when (eql 'stop (mc/handle-loop-condition loop-message))
(return-from mc/cycle nil)) (cl-return-from mc/cycle nil))
(setf next-cursor fallback-cursor)) (setf next-cursor fallback-cursor))
(mc/create-fake-cursor-at-point) (mc/create-fake-cursor-at-point)
(mc/pop-state-from-overlay next-cursor) (mc/pop-state-from-overlay next-cursor)