From: Alan Third <alan@idiocy.org>
To: 1948@debbugs.gnu.org, emacs-devel@gnu.org
Cc: Peter Tury <tury.peter@gmail.com>
Subject: Re: bug#1948: confusion and bug in dabbrev.el
Date: Sat, 30 Jan 2016 01:01:37 +0000 [thread overview]
Message-ID: <m2d1sj518u.fsf@galloway.idiocy.org> (raw)
In-Reply-To: <m2d1t97drh.fsf@galloway.idiocy.org> (Alan J. Third's message of "Sun, 10 Jan 2016 13:41:38 +0000")
[-- Attachment #1: Type: text/plain, Size: 907 bytes --]
Peter Tury said:
> However, the more serious problem is that it "forgets" such
> eliminations when it searches for `old' expansion in case of repeated
> calls of `dabbrev-expand' (i.e. when the check "(eq last-command
> this-command)" in this function results t) what results in weird text
> in some cases.
I think I've got a fix for this.
The problem is that dabbrev--substitute-expansion alters EXPANSION
before using it in the substitution, but dabbrev-expand has no idea that
it's done this, so it assumes the unaltered EXPANSION is still valid and
saves it.
The patch makes dabbrev--substitute-expansion return EXPANSION, and
dabbrev-expand saves that version instead.
I considered making a new function to remove the whitespace and using it
in both dabbrev-expand and dabbrev--substitute-expansion, but returning
the value actually used strikes me as safer, in case anything else is
done to it.
[-- Attachment #2: save actual expansion --]
[-- Type: text/plain, Size: 1470 bytes --]
From 9ef22a911d58f772265bc1fde2608ea135a4dea2 Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Sat, 30 Jan 2016 00:38:32 +0000
Subject: [PATCH] Always save the actual expansion
lisp/dabbrev.el (dabbrev--substitute-expansion): Return EXPANSION after
any processing.
lisp/dabbrev.el (dabbrev-expand): Set EXPANSION to the return value of
DABBREV--SUBSTITUTE-EXPANSION.
---
lisp/dabbrev.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 3557041..d9f36b1 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -546,8 +546,8 @@ dabbrev-expand
(copy-marker dabbrev--last-expansion-location)))
;; Success: stick it in and return.
(setq buffer-undo-list (cons orig-point buffer-undo-list))
- (dabbrev--substitute-expansion old abbrev expansion
- record-case-pattern)
+ (setq expansion (dabbrev--substitute-expansion old abbrev expansion
+ record-case-pattern))
;; Save state for re-expand.
(setq dabbrev--last-expansion expansion)
@@ -902,7 +902,9 @@ dabbrev--substitute-expansion
;; and (2) the replacement itself is all lower case.
(dabbrev--safe-replace-match expansion
(not use-case-replace)
- t)))
+ t))
+ ;; Return the expansion actually used.
+ expansion)
;;;----------------------------------------------------------------
--
2.5.4 (Apple Git-61)
[-- Attachment #3: Type: text/plain, Size: 16 bytes --]
--
Alan Third
next prev parent reply other threads:[~2016-01-30 1:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <b5accf970901181137g45f24159pa31b6b0b7a8c0fec@mail.gmail.com>
2012-09-12 19:22 ` bug#1948: confusion and bug in dabbrev.el Fred
[not found] ` <m2mvse72c2.fsf@galloway.idiocy.org>
[not found] ` <m2d1t97drh.fsf@galloway.idiocy.org>
2016-01-30 1:01 ` Alan Third [this message]
2016-01-30 2:00 ` Drew Adams
2016-01-30 11:59 ` Alan Third
2016-01-30 12:25 ` Eli Zaretskii
2016-01-30 17:37 ` Drew Adams
2016-02-29 4:18 ` Lars Ingebrigtsen
2016-03-01 3:16 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2d1sj518u.fsf@galloway.idiocy.org \
--to=alan@idiocy.org \
--cc=1948@debbugs.gnu.org \
--cc=emacs-devel@gnu.org \
--cc=tury.peter@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).