]>
Commit | Line | Data |
---|---|---|
30758730 | 1 | --- ./lisp/expand.el.fred Fri Jan 29 15:12:00 1999 |
2 | +++ ./lisp/expand.el Mon Dec 20 07:32:00 1999 | |
3 | @@ -364,8 +364,9 @@ | |
4 | expand-pos (expand-list-to-markers expand-list) | |
5 | expand-list nil))) | |
6 | (run-hooks 'expand-expand-hook) | |
7 | - t)))) | |
8 | - ) | |
9 | + t) | |
10 | + nil)) | |
11 | + nil)) | |
12 | ||
13 | (defun expand-do-expansion () | |
14 | (delete-backward-char (length last-abbrev-text)) | |
15 | --- ./src/abbrev.c.fred Tue May 18 06:38:03 1999 | |
16 | +++ ./src/abbrev.c Mon Dec 20 07:30:44 1999 | |
17 | @@ -365,8 +365,15 @@ | |
18 | ||
19 | hook = XSYMBOL (sym)->function; | |
20 | if (!NILP (hook)) | |
21 | - call0 (hook); | |
22 | - | |
23 | + { | |
24 | + /* If the expansion is a special one, use the return value from the hook | |
25 | + to know if the expansion happened. */ | |
26 | + if (!NILP(call0 (hook)) || STRINGP(expansion)) | |
27 | + return value; | |
28 | + else | |
29 | + return Qnil; | |
30 | + } | |
31 | + | |
32 | return value; | |
33 | } | |
34 |