# HG changeset patch # User Richard M. Stallman # Date 1090075151 0 # Node ID 30845fb9e44d86ae4e5733ec2eb90354f491309f # Parent 84df5471b01ecf460bf81c408c89ed383f202c94 (Abbrev Expansion): Clarify pre-abbrev-expand-hook, fix example. diff -r 84df5471b01e -r 30845fb9e44d lispref/abbrevs.texi --- a/lispref/abbrevs.texi Sat Jul 17 14:34:42 2004 +0000 +++ b/lispref/abbrevs.texi Sat Jul 17 14:39:11 2004 +0000 @@ -335,10 +335,9 @@ @end defvar The following sample code shows a simple use of -@code{pre-abbrev-expand-hook}. If the user terminates an abbrev with a -punctuation character, the hook function asks for confirmation. Thus, -this hook allows the user to decide whether to expand the abbrev, and -aborts expansion if it is not confirmed. +@code{pre-abbrev-expand-hook}. If the user terminates an abbrev with +a punctuation character, the hook function asks for confirmation. It +aborts expansion if the user does not confirm. @smallexample (add-hook 'pre-abbrev-expand-hook 'query-if-not-space) @@ -350,12 +349,10 @@ ;; @r{user entered some other character, this function asks whether} ;; @r{expansion should continue.} -;; @r{If the user answers the prompt with @kbd{y}, the function returns} -;; @r{@code{nil} (because of the @code{not} function), but that is} -;; @r{acceptable; the return value has no effect on expansion.} +;; @r{The function's return value makes no difference.} (defun query-if-not-space () - (if (/= ?\s (preceding-char)) + (if (/= ?\s last-command-char) (if (not (y-or-n-p "Do you want to expand this abbrev? ")) (error "Not expanding this abbrev")))) @end smallexample