commit 3fb966dc6392e1908304a1b6fe481da9f670cfbb (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Sun Sep 22 12:57:08 2024 +0300 ; Fix dnd-tests on MS-Windows * test/lisp/dnd-tests.el (dnd-tests-get-local-file-uri): Fix test on MS-Windows. diff --git a/test/lisp/dnd-tests.el b/test/lisp/dnd-tests.el index 3d4f28b9ae1..3b1cf51069a 100644 --- a/test/lisp/dnd-tests.el +++ b/test/lisp/dnd-tests.el @@ -389,11 +389,13 @@ This function only tries to handle strings." (delete-file remote-temp-file)))) (ert-deftest dnd-tests-get-local-file-uri () - (should (equal (dnd-get-local-file-uri "file://localhost/path/to/foo") - "file:///path/to/foo")) - (should (equal (dnd-get-local-file-uri - (format "file://%s/path/to/" (system-name))) - "file:///path/to/")) + ;; 'dnd-get-local-file-uri' always returns nil on MS-Windows + (unless (eq system-type 'windows-nt) + (should (equal (dnd-get-local-file-uri "file://localhost/path/to/foo") + "file:///path/to/foo")) + (should (equal (dnd-get-local-file-uri + (format "file://%s/path/to/" (system-name))) + "file:///path/to/"))) (should-not (dnd-get-local-file-uri "file://some-remote-host/path/to/foo")) (should-not (dnd-get-local-file-uri "file:///path/to/foo"))) commit e8f0baf354b117837fd686e2bf6ca8df15bd1cd4 Author: Cecilio Pardo Date: Sat Sep 21 15:30:27 2024 +0200 Fix multi-file drag-and-drop on MS-Windows Pass all dropped files to 'dnd-handle-multiple-urls' in one call instead on doing multiple calls (Bug#73258). * lisp/term/w32-win.el (w32-dropped-file-to-url): New function to convert file name to a url for dnd. (w32-handle-dropped-file): Changed to use 'w32-dropped-file-to-url'. (w32-drag-n-drop): Changed to pass all files to 'dnd-handle-multiple-urls'/ diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 3c0acf368f4..b57b3dd3bef 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -101,6 +101,13 @@ ;; (princ event)) (defun w32-handle-dropped-file (window file-name) + (dnd-handle-multiple-urls + window + (list + (w32-dropped-file-to-url file-name)) + 'private)) + +(defun w32-dropped-file-to-url (file-name) (let ((f (if (eq system-type 'cygwin) (cygwin-convert-file-name-from-windows file-name t) (subst-char-in-string ?\\ ?/ file-name))) @@ -117,14 +124,11 @@ (split-string (encode-coding-string f coding) "/") "/"))) - ;; FIXME: is the W32 build capable only of receiving a single file - ;; from each drop? - (dnd-handle-multiple-urls window (list (concat - (if (eq system-type 'cygwin) - "file://" - "file:") - file-name)) - 'private)) + (concat + (if (eq system-type 'cygwin) + "file://" + "file:") + file-name)) (defun w32-drag-n-drop (event &optional new-frame) "Edit the files listed in the drag-n-drop EVENT. @@ -146,8 +150,11 @@ Switch to a buffer editing the last file dropped." (raise-frame) (setq window (selected-window)) - (mapc (apply-partially #'w32-handle-dropped-file window) - (car (cdr (cdr event))))))) + (dnd-handle-multiple-urls + window + (mapcar #'w32-dropped-file-to-url + (car (cdr (cdr event)))) + 'private)))) (defun w32-drag-n-drop-other-frame (event) "Edit the files listed in the drag-n-drop EVENT, in other frames. commit 0f4c09d26782835a7e31bf29c92d72a6a27a3ff1 Author: Joseph Turner Date: Sat Sep 21 10:23:07 2024 -0700 ; Add test for deleting multiple pairs at once * test/lisp/electric-tests.el (electric-pair-backspace-2): New test. (Bug#72437) diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el index 76c18594b26..a3774ba3263 100644 --- a/test/lisp/electric-tests.el +++ b/test/lisp/electric-tests.el @@ -562,6 +562,14 @@ baz\"\"" (electric-pair-delete-pair 1) (should (equal "" (buffer-string)))))) +(ert-deftest electric-pair-backspace-2 () + (save-electric-modes + (with-temp-buffer + (insert "((()))") + (goto-char 4) + (electric-pair-delete-pair 2) + (should (equal "()" (buffer-string)))))) + ;;; Undoing (ert-deftest electric-pair-undo-unrelated-state () commit a7192fd7b7355f13ff3002dba14c6acdabad5b5e Author: Eshel Yaron Date: Sat Sep 21 12:15:16 2024 +0200 Teach Electric Pair mode about prefix arguments * lisp/elec-pair.el (electric-pair--insert): New arg TIMES. (electric-pair-inhibit-if-helps-balance) (electric-pair-post-self-insert-function) (electric-pair-open-newline-between-pairs-psif) (electric-pair-skip-if-helps-balance): Respect prefix arg. (electric-pair-delete-pair): Delete ARG chars, not just 1. * test/lisp/electric-tests.el (autowrapping-multi-1) (autowrapping-multi-2): New tests. * doc/emacs/programs.texi (Matching): Mention prefix arg support in Electric Pair mode documentation. * etc/NEWS: Announce it. (Bug#72437) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 42b57143bf1..948f4128acf 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1061,7 +1061,9 @@ one, no insertion takes places, and that position is simply skipped over. If the region is active (@pxref{Mark}), insertion of a delimiter operates on the region: the characters in the region are enclosed in a pair of matching delimiters, leaving point after the -delimiter you typed. +delimiter you typed. If you provide a prefix argument when inserting +a delimiter, the numeric value of that prefix argument specifies the +number of pairs to insert. These variables control additional features of Electric Pair mode: diff --git a/etc/NEWS b/etc/NEWS index 46abc908c6e..c1a0524c8ba 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -160,6 +160,12 @@ This option, if non-nil, makes 'delete-pair' push a mark at the end of the region enclosed by the deleted delimiters. This makes it easy to act on that region. For example, we can highlight it using 'C-x C-x'. ++++ +** Electric Pair mode can now pair multiple delimiters at once. +You can now insert or wrap text with multiple sets of parentheses and +other matching delimiters at once with Electric Pair mode, by providing +a prefix argument when inserting one of the delimiters. + * Changes in Specialized Modes and Packages in Emacs 31.1 diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 40618e9ef38..c9627763d8d 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -260,7 +260,7 @@ inside a comment or string." (list ?\( (cdr direct) t string-or-comment))) (reverse (list ?\) (car reverse) t string-or-comment))))) -(defun electric-pair--insert (char) +(defun electric-pair--insert (char times) (let ((last-command-event char) (blink-matching-paren nil) (electric-pair-mode nil) @@ -271,7 +271,7 @@ inside a comment or string." ;; us to add these newlines, and is probably about to kick in ;; again after we add the closer. (electric-layout-allow-duplicate-newlines t)) - (self-insert-command 1))) + (self-insert-command times))) (defun electric-pair--syntax-ppss (&optional pos where) "Like `syntax-ppss', but sometimes fallback to `parse-partial-sexp'. @@ -455,7 +455,8 @@ happened." (atomic-change-group ;; Don't use `delete-char'; that may modify the head of the ;; undo list. - (delete-region (point) (1- (point))) + (delete-region (- (point) (prefix-numeric-value current-prefix-arg)) + (point)) (throw 'done (cond ((eq ?\( syntax) @@ -474,25 +475,26 @@ happened." Works by first removing the character from the buffer, then doing some list calculations, finally restoring the situation as if nothing happened." - (pcase (electric-pair-syntax-info char) - (`(,syntax ,pair ,_ ,s-or-c) - (unwind-protect - (progn - (delete-char -1) - (cond ((eq syntax ?\)) - (let* ((pair-data - (electric-pair--balance-info - -1 s-or-c)) - (innermost (car pair-data)) - (outermost (cdr pair-data))) - (and - (cond ((car outermost) - (car innermost)) - ((car innermost) - (not (eq (cdr outermost) pair))))))) - ((eq syntax ?\") - (electric-pair--inside-string-p char)))) - (insert char))))) + (let ((num (prefix-numeric-value current-prefix-arg))) + (pcase (electric-pair-syntax-info char) + (`(,syntax ,pair ,_ ,s-or-c) + (unwind-protect + (progn + (delete-char (- num)) + (cond ((eq syntax ?\)) + (let* ((pair-data + (electric-pair--balance-info + (- num) s-or-c)) + (innermost (car pair-data)) + (outermost (cdr pair-data))) + (and + (cond ((car outermost) + (car innermost)) + ((car innermost) + (not (eq (cdr outermost) pair))))))) + ((eq syntax ?\") + (electric-pair--inside-string-p char)))) + (insert (make-string num char))))))) (defun electric-pair-default-skip-self (char) (if electric-pair-preserve-balance @@ -527,11 +529,14 @@ The decision is taken by order of preference: `electric-pair-inhibit-predicate', `electric-pair-skip-self' and `electric-pair-skip-whitespace' (which see)." (let* ((pos (and electric-pair-mode (electric--after-char-pos))) + (num (when pos (prefix-numeric-value current-prefix-arg))) + (beg (when num (- pos num))) (skip-whitespace-info)) (pcase (electric-pair-syntax-info last-command-event) (`(,syntax ,pair ,unconditional ,_) (cond ((null pos) nil) + ((zerop num) nil) ;; Wrap a pair around the active region. ;; ((and (memq syntax '(?\( ?\) ?\" ?\$)) (use-region-p)) @@ -545,16 +550,17 @@ The decision is taken by order of preference: (>= (mark) (point)))) (save-excursion (goto-char (mark)) - (electric-pair--insert pair)) - (delete-region pos (1- pos)) - (electric-pair--insert pair) + (electric-pair--insert pair num)) + (delete-region beg pos) + (electric-pair--insert pair num) (goto-char (mark)) - (electric-pair--insert last-command-event))) + (electric-pair--insert last-command-event num))) ;; Backslash-escaped: no pairing, no skipping. ((save-excursion - (goto-char (1- pos)) + (goto-char beg) (not (zerop (% (skip-syntax-backward "\\") 2)))) - nil) + (let ((current-prefix-arg (1- num))) + (electric-pair-post-self-insert-function))) ;; Skip self. ((and (memq syntax '(?\) ?\" ?\$)) (and (or unconditional @@ -580,10 +586,10 @@ The decision is taken by order of preference: ;; live with it for now. (when skip-whitespace-info (funcall electric-pair-skip-whitespace-function)) - (delete-region (1- pos) (if (eq skip-whitespace-info 'chomp) - (point) - pos)) - (forward-char)) + (delete-region beg (if (eq skip-whitespace-info 'chomp) + (point) + pos)) + (forward-char num)) ;; Insert matching pair. ((and (memq syntax '(?\( ?\" ?\$)) (not overwrite-mode) @@ -592,7 +598,7 @@ The decision is taken by order of preference: (goto-char pos) (funcall electric-pair-inhibit-predicate last-command-event))))) - (save-excursion (electric-pair--insert pair)))))))) + (save-excursion (electric-pair--insert pair num)))))))) (defun electric-pair-open-newline-between-pairs-psif () "Honor `electric-pair-open-newline-between-pairs'. @@ -604,7 +610,8 @@ Member of `post-self-insert-hook' if `electric-pair-mode' is on." (< (1+ (point-min)) (point) (point-max)) (eq (save-excursion (skip-chars-backward "\t\s") - (char-before (1- (point)))) + (char-before (- (point) + (prefix-numeric-value current-prefix-arg)))) (matching-paren (char-after)))) (save-excursion (newline 1 t)))) @@ -618,7 +625,7 @@ Member of `post-self-insert-hook' if `electric-pair-mode' is on." ARG and KILLP are passed directly to `backward-delete-char-untabify', which see." (interactive "*p\nP") - (delete-char 1) + (delete-char arg) (backward-delete-char-untabify arg killp)) (defvar electric-pair-mode-map diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el index 720313511a6..76c18594b26 100644 --- a/test/lisp/electric-tests.el +++ b/test/lisp/electric-tests.el @@ -653,6 +653,22 @@ baz\"\"" (skip-chars-backward "\"") (mark-sexp -1))) +(define-electric-pair-test autowrapping-multi-1 + "foo" "(" :expected-string "(((((foo)))))" :expected-point 6 + :bindings '((current-prefix-arg . 5)) + :fixture-fn (lambda () + (electric-pair-mode 1) + (mark-sexp 1))) + +(define-electric-pair-test autowrapping-multi-2 + "foo" ")" :expected-string "(((((foo)))))" :expected-point 14 + :bindings '((current-prefix-arg . 5)) + :fixture-fn (lambda () + (electric-pair-mode 1) + (goto-char (point-max)) + (skip-chars-backward "\"") + (mark-sexp -1))) + ;;; Electric quotes (define-electric-pair-test electric-quote-string