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, 18 May 2024 11:28:00 +0300 Message-ID: <867cfrfrsf.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> <868r1q50oa.fsf@gnu.org> <86edb3f3nj.fsf@gnu.org> <86le4smwxw.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18275"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 68487@debbugs.gnu.org, monnier@iro.umontreal.ca To: law@martinmarshall.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 18 10:29:09 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 1s8FRC-0004X0-Th for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 18 May 2024 10:29:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8FR6-0005Pl-MP; Sat, 18 May 2024 04:29:00 -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 1s8FR4-0005P9-TI for bug-gnu-emacs@gnu.org; Sat, 18 May 2024 04:28:58 -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 1s8FR4-0002KN-K1 for bug-gnu-emacs@gnu.org; Sat, 18 May 2024 04:28:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8FR7-0007TX-K5 for bug-gnu-emacs@gnu.org; Sat, 18 May 2024 04:29:01 -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, 18 May 2024 08:29:01 +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.171602089828721 (code B ref 68487); Sat, 18 May 2024 08:29:01 +0000 Original-Received: (at 68487) by debbugs.gnu.org; 18 May 2024 08:28:18 +0000 Original-Received: from localhost ([127.0.0.1]:60261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8FQQ-0007TB-04 for submit@debbugs.gnu.org; Sat, 18 May 2024 04:28:18 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:49974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8FQM-0007T5-AY for 68487@debbugs.gnu.org; Sat, 18 May 2024 04:28:15 -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 1s8FQB-0002Dx-BQ; Sat, 18 May 2024 04:28:03 -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=wzGMFFgXvjkJm9i9F/F0ouGf4dfwZda1zx6Kplgq2U8=; b=R0B57FBjnGTq Whmjyx84YOVnYWG5H3iG1yLMTsA8Zm5F76+nOyzRxFcfJGQoCo9vMacEqFul1iJux8PF8ZfjV0qOm dfYv9SVqXXO8HAcTe+QN8g6Pk1irQwsCAJnf3WjGHQjr8FbMfhDt5QcT0QCoqjVoNriR0P6faq1pH YtuMnkTdEZpljoSPLkFCWD8nlqLazwnH1CeHyebWHYIUZAp8AiQjNwmt6Ifl9994U/Tj+Qhii1yJZ iePgMG2eekDdY5mnu2gIxXfs+fhvrBlduoi3S3RKjT5Ob/qyGPlgq8PaLIKV9WcV2rRcTWj5gigQK LSt8ROatRx6YK5BCfawwyA==; In-Reply-To: <86le4smwxw.fsf@gnu.org> (message from Eli Zaretskii on Thu, 02 May 2024 11:37:15 +0300) 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:285288 Archived-At: Ping! Ping! Ping! Martin, are you still there? > Cc: 68487@debbugs.gnu.org, monnier@iro.umontreal.ca > Date: Thu, 02 May 2024 11:37:15 +0300 > From: Eli Zaretskii > > Ping! Ping! Martin, could you please respond? > > > Cc: 68487@debbugs.gnu.org, monnier@iro.umontreal.ca > > Date: Thu, 18 Apr 2024 11:58:40 +0300 > > From: Eli Zaretskii > > > > Ping! Martin, did you have time to make any progress in this matter? > > > > > Cc: 68487@debbugs.gnu.org, monnier@iro.umontreal.ca > > > Date: Sat, 06 Apr 2024 11:56:53 +0300 > > > From: Eli Zaretskii > > > > > > 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 > > > > > > > > > > > > > > > > > > > > > > > > > > > >