# HG changeset patch # User Stefan Monnier # Date 1193845622 0 # Node ID 07865f18976084ffc3f8094e40b594319bcb743a # Parent e22b1d805f02fd151b904af39f60844671274391 (abbrev-symbol): Correct let->let*. (abbrev--before-point): Only use abbrev-start-location if before point. diff -r e22b1d805f02 -r 07865f189760 lisp/ChangeLog --- 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 + + * abbrev.el (abbrev-symbol): Correct let->let*. + (abbrev--before-point): Only use abbrev-start-location if before point. + 2007-10-31 Juanma Barranquero * strokes.el (strokes-alphabetic-lessp): Simplify. Doc fix. diff -r e22b1d805f02 -r 07865f189760 lisp/abbrev.el --- 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))