From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#68487: [PATCH] Make jump commands usable for all skeletons Date: Sat, 06 Apr 2024 11:56:53 +0300 Message-ID: <868r1q50oa.fsf@gnu.org> References: <877ckawckc.fsf@martinmarshall.com> <875xz2y46o.fsf@martinmarshall.com> <87il316y4w.fsf@martinmarshall.com> <875xycyq0x.fsf@martinmarshall.com> <86o7bhb6ak.fsf@gnu.org> <87h6gzxhan.fsf@martinmarshall.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15189"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 68487@debbugs.gnu.org, monnier@iro.umontreal.ca To: martin Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Apr 06 10:58:07 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rt1sE-0003gL-1h for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 06 Apr 2024 10:58:06 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rt1s5-0007Gz-Ve; Sat, 06 Apr 2024 04:57:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rt1s4-0007Gh-E6 for bug-gnu-emacs@gnu.org; Sat, 06 Apr 2024 04:57:56 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rt1s4-0007ZT-5q for bug-gnu-emacs@gnu.org; Sat, 06 Apr 2024 04:57:56 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rt1sA-0006sd-6w for bug-gnu-emacs@gnu.org; Sat, 06 Apr 2024 04:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 06 Apr 2024 08:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68487 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68487-submit@debbugs.gnu.org id=B68487.171239383126206 (code B ref 68487); Sat, 06 Apr 2024 08:58:02 +0000 Original-Received: (at 68487) by debbugs.gnu.org; 6 Apr 2024 08:57:11 +0000 Original-Received: from localhost ([127.0.0.1]:38232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt1rL-0006oa-5W for submit@debbugs.gnu.org; Sat, 06 Apr 2024 04:57:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt1rI-0006oG-Bl for 68487@debbugs.gnu.org; Sat, 06 Apr 2024 04:57:09 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rt1r5-0007SH-8t; Sat, 06 Apr 2024 04:56:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=FOeZ/sTA2SfxX8hEjx8aTMO9KhdEI9+N09bUrCsr/s0=; b=IxIw0T/9AbNv 0a8/scOKkjLVTpzhHtgvS7XOoSmsbHySZ6WEnXxrEAPgO2wTboqSAHtT6+dQNpYWUeOOor3OPmXyQ 4vP31jO1WZSgPh3LB5LFBFD8nf4A2G6bToGaioE5yVuWnQa1hsLnWRVxDj/+SaXZ0HtS4QqPkUI1o QyVECYWpeJRSsEnXe/jSuNcQNz1ugggc6qMijsp4IfVjpK58Wf7dm4thhEUDoxPS/t8lhG0F/boNM cdyFGN+deugWqMeZhN3iRwidGHn5/5zpeoqCV6bgMgIRuktefizQ//tokNFNjtuQxztBbrRziH23t k7pX+AY1sOcK6gcjqECYxw==; In-Reply-To: <87h6gzxhan.fsf@martinmarshall.com> (message from martin on Thu, 21 Mar 2024 20:05:04 -0400) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:282761 Archived-At: Any progress there? > From: martin > Cc: Stefan Monnier , 68487@debbugs.gnu.org > Date: Thu, 21 Mar 2024 20:05:04 -0400 > > Eli Zaretskii writes: > > > Ping! Martin, can you please respond to Stefan's comments, so we > > could move forward with this issue? > > Sorry for the long delay in responding. I'll try to get to this by the > end of the weekend. > > > >> Cc: 68487@debbugs.gnu.org > >> Date: Sat, 02 Mar 2024 23:07:18 -0500 > >> From: Stefan Monnier via "Bug reports for GNU Emacs, > >> the Swiss army knife of text editors" > >> > >> >> Ideally this should go along with the removal of the use of a vector in > >> >> `expand-list`, which not only is odd given its name but is odd because > >> >> it seems completely useless. > >> > > >> > Nothing (at least nothing in Emacs core) stores a vector to > >> > `expand-list`. So I'm curious why `expand-abbrev-hook` was written to > >> > account for that possibility. > >> > >> It's because it internally did that, tho I don't know why it did that > >> internally since my patch seems to show that it's simpler not to. > >> > >> > Changing `expand-abbrev-hook` to expect `expand-list` to actually be a > >> > list (as you did with your patch) makes sense to me. > >> > >> Should I install it, so it's kept separate from the changes you add > >> on top (mostly for readability of the patches)? > >> > >> > What do you think? > >> > >> I find the patch a bit hard to read, maybe for lack of a separate > >> description of the intended changes, or maybe because it does too much > >> in a single step. > >> > >> I have one question, tho: > >> > >> > (defun expand-do-expansion () > >> > - (delete-char (- (length last-abbrev-text))) > >> > - (let* ((vect (symbol-value last-abbrev)) > >> > - (text (aref vect 0)) > >> > - (position (aref vect 1)) > >> > - (jump-args (aref vect 2)) > >> > - (hook (aref vect 3))) > >> > - (cond (text > >> > - (insert text) > >> > - (setq expand-point (point)))) > >> > - (if jump-args > >> > - (funcall #'expand-build-list (car jump-args) (cdr jump-args))) > >> > - (if position > >> > - (backward-char position)) > >> > - (if hook > >> > - (funcall hook)) > >> > - t)) > >> > - > >> > -(defun expand-abbrev-from-expand (word) > >> > - "Test if an abbrev has a hook." > >> > - (or > >> > - (and (intern-soft word local-abbrev-table) > >> > - (symbol-function (intern-soft word local-abbrev-table))) > >> > - (and (intern-soft word global-abbrev-table) > >> > - (symbol-function (intern-soft word global-abbrev-table))))) > >> > - > >> > -(defun expand-previous-word () > >> > - "Return the previous word." > >> > - (save-excursion > >> > - (let ((p (point))) > >> > - (backward-word 1) > >> > - (buffer-substring p (point))))) > >> > + ;; expand-point tells us if we have inserted the text > >> > + ;; ourself or if it is the hook which has done the job. > >> > + (if (listp expand-list) > >> > + (setq expand-index 0 > >> > + expand-pos (expand-list-to-markers expand-list) > >> > + expand-list nil)) > >> > + (run-hooks 'expand-expand-hook)) > >> > >> Hmm... but this `expand-do-expansion` doesn't actually "do" any > >> expansion any more, right? > >> > >> > (defun expand-skeleton-end-hook () > >> > - (if skeleton-positions > >> > - (setq expand-list skeleton-positions))) > >> > + (when skeleton-positions > >> > + (setq expand-list skeleton-positions) > >> > + (expand-do-expansion))) > >> > >> Here if you read the code out loud it doesn't make sense to call > >> `expand-do-expansion` since skeleton has already "done the expansion". > >> > >> > >> Stefan > >> > >> > >> > >> > >> > > -- > Best regards, > Martin Marshall >