From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20208 invoked by alias); 7 Dec 2016 04:20:12 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 40115 Received: (qmail 19265 invoked from network); 7 Dec 2016 04:20:12 -0000 X-Qmail-Scanner-Diagnostics: from mail-qt0-f195.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.216.195):SA:0(-0.7/5.0):. Processed in 2.841575 secs); 07 Dec 2016 04:20:12 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: zmwangx@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.216.195 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=jFkpCoyqKG+OR58D6bpEAUtOQYbjI0CD+4X5gLa+eLY=; b=a1QSB1uuSMyg8RCjvffFtbLP6GenwB92J+nWKpDi8hS57im+DS+8q6x1wrqEA21JFS 5sGvcsPh8LsUL4TQbZw7SPN916lY5bZ3g5J9rsbO7Ms1N1P1/TLeMB5qr5M3B1rQXwvS n6HCd98WnKFdpxWBxbq+yXNdjTjWhHd0cYJGIr/lpP7yZr7jQl6Oa6da2EflRM/Zys43 iDi6XKyrjp4Nb8CM8batsmySAlnsfGhavDnU7J88k18gNGgmmQPqhIZtYi3ed8m90und b3LgjrAouUmYVEUy6AWRlmxLz0zDF5b2VstnJBBCB2YOoap78bwbvvWAFysuXNSM9JhL 4UjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=jFkpCoyqKG+OR58D6bpEAUtOQYbjI0CD+4X5gLa+eLY=; b=IlPqiawZ/4Cuk69ABtJBFv+QGiqadn8A7gMkD+T7QOQXof26VzUD5RHgXDklhvwt8Y OTCAj+TrueXjxQHVkC88wKd8CPsLMa5TQPTHxlw2i0ZoVh8Utyvdreb9BiM438BZzU4d XRgV9ZMQSd3qsgxde6I3XT9TOlqxO65+lOJtC7yfYTE8OtE7JG/3AFyTwmGjs3UMB/hR xb7PWMY1AIcfoqSt10ijdjP3exXbaCgAIH4/apRBs0ItFolGvM+wr34NI7hrZ3O7I3bN WHi5/JpJs820yQS7lY+GW8l7eWtIRoEbapKzgZ6mpjOTmwc2MHDclaPkFA8b1fJpzk+P +s2g== X-Gm-Message-State: AKaTC01c5Pj6kGuEeeMTZIHYWG+9d/gC1XHoXdItxRjgd0LZJ/p+h3tZ91tgdM+IikAs7g== X-Received: by 10.237.36.170 with SMTP id t39mr58612114qtc.115.1481083343369; Tue, 06 Dec 2016 20:02:23 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 10.1 \(3251\)) Subject: Re: Regression in bracketed-paste-magic (not in 5.2, but affects 5.3's test releases) From: Zhiming Wang In-Reply-To: Date: Tue, 6 Dec 2016 23:02:22 -0500 Cc: zsh-workers@zsh.org Content-Transfer-Encoding: quoted-printable Message-Id: <1F5893A8-F2D1-4AF5-941F-88ED32DD3FC8@gmail.com> References: To: Bart Schaefer X-Mailer: Apple Mail (2.3251) On Dec 6, 2016, at 10:25 PM, Bart Schaefer = wrote: > For the 5.3 release the easiest approach is likely to be to back out = that > change and re-apply it after the release when it can be more = thoroughly > debugged. Sounds good. I have verified that a revert restores sanity, for now. =46rom c1e93b892d9e444d751a073baa329c25cd996471 Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Tue, 6 Dec 2016 23:01:33 -0500 Subject: [PATCH] Revert "38579: simplify saving and restoring of state" This reverts commit 20948d088994dc7b26a26b94926432985fa6863e. --- Functions/Zle/bracketed-paste-magic | 44 = +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/Functions/Zle/bracketed-paste-magic = b/Functions/Zle/bracketed-paste-magic index fb584d595..c46f741d5 100644 --- a/Functions/Zle/bracketed-paste-magic +++ b/Functions/Zle/bracketed-paste-magic @@ -145,26 +145,27 @@ bracketed-paste-magic() { done fi =20 + # Save context, create a clean slate for the paste + integer bpm_mark=3D$MARK bpm_cursor=3D$CURSOR = bpm_region=3D$REGION_ACTIVE + integer bpm_numeric=3D${NUMERIC:-1} + local bpm_buffer=3D$BUFFER + fc -p -a /dev/null 0 0 + BUFFER=3D + zstyle -a :bracketed-paste-magic inactive-keys bpm_inactive if zstyle -s :bracketed-paste-magic active-widgets bpm_active '|'; = then - # Save context, create a clean slate for the paste - integer bpm_mark=3D$MARK bpm_region=3D$REGION_ACTIVE - integer bpm_numeric=3D${NUMERIC:-1} - integer bpm_limit=3D$UNDO_LIMIT_NO bpm_undo=3D$UNDO_CHANGE_NO - BUFFER=3D - CURSOR=3D1 - zle .split-undo - UNDO_LIMIT_NO=3D$UNDO_CHANGE_NO - fc -p -a /dev/null 0 0 + # There are active widgets. Reprocess $PASTED as keystrokes. + NUMERIC=3D1 + zle -U - $PASTED + if [[ $bmp_keymap =3D vicmd ]]; then zle -K viins fi =20 - # There are active widgets. Reprocess $PASTED as keystrokes. - NUMERIC=3D1 - zle -U - "$PASTED" - # Just in case there are active undo widgets + zle .split-undo + integer bpm_limit=3D$UNDO_LIMIT_NO bpm_undo=3D$UNDO_CHANGE_NO + UNDO_LIMIT_NO=3D$UNDO_CHANGE_NO =20 while [[ -n $PASTED ]] && zle .read-command; do PASTED=3D${PASTED#$KEYS} @@ -182,16 +183,21 @@ bracketed-paste-magic() { done PASTED=3D$BUFFER =20 - # Restore state - zle -K $bpm_keymap - fc -P - MARK=3D$bpm_mark - REGION_ACTIVE=3D$bpm_region - NUMERIC=3D$bpm_numeric + # Reset the undo state zle .undo $bpm_undo UNDO_LIMIT_NO=3D$bpm_limit + + zle -K $bpm_keymap fi =20 + # Restore state + BUFFER=3D$bpm_buffer + MARK=3D$bpm_mark + CURSOR=3D$bpm_cursor + REGION_ACTIVE=3D$bpm_region + NUMERIC=3D$bpm_numeric + fc -P + # PASTED has been updated, run the paste-finish functions if zstyle -a :bracketed-paste-magic paste-finish bpm_hooks; then for bpm_func in $bpm_hooks; do --=20 2.11.0