Mercurial > emacs
changeset 85837:07865f189760
(abbrev-symbol): Correct let->let*.
(abbrev--before-point): Only use abbrev-start-location if before point.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 31 Oct 2007 15:47:02 +0000 |
| parents | e22b1d805f02 |
| children | 6852207d73f3 |
| files | lisp/ChangeLog lisp/abbrev.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 31 12:49:40 2007 +0000 +++ b/lisp/ChangeLog Wed Oct 31 15:47:02 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-31 Stefan Monnier <monnier@iro.umontreal.ca> + + * abbrev.el (abbrev-symbol): Correct let->let*. + (abbrev--before-point): Only use abbrev-start-location if before point. + 2007-10-31 Juanma Barranquero <lekktu@gmail.com> * strokes.el (strokes-alphabetic-lessp): Simplify. Doc fix.
--- a/lisp/abbrev.el Wed Oct 31 12:49:40 2007 +0000 +++ b/lisp/abbrev.el Wed Oct 31 15:47:02 2007 +0000 @@ -649,8 +649,8 @@ (let ((tables (abbrev--active-tables table)) sym) (while (and tables (not (symbol-value sym))) - (let ((table (pop tables)) - (case-fold (not (abbrev-table-get table :case-fixed)))) + (let* ((table (pop tables)) + (case-fold (not (abbrev-table-get table :case-fixed)))) (setq tables (append (abbrev-table-get table :parents) tables)) ;; In case the table doesn't set :case-fixed but some of the ;; abbrevs do, we have to be careful. @@ -693,9 +693,10 @@ (delete-region start (1+ start))) (skip-syntax-backward " ") (setq end (point)) - (setq name (buffer-substring start end)) - (goto-char pos) ; Restore point. - (list (abbrev-symbol name tables) name start end)) + (when (> end start) + (setq name (buffer-substring start end)) + (goto-char pos) ; Restore point. + (list (abbrev-symbol name tables) name start end))) (while (and tables (not (car res))) (let* ((table (pop tables))