From: Stefan Monnier Date: Wed, 31 Oct 2007 15:47:02 +0000 (+0000) Subject: (abbrev-symbol): Correct let->let*. X-Git-Tag: emacs-pretest-23.0.90~9927 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b86bfb1fd50af27d41aff1034df08be2cdf82b1;p=emacs.git (abbrev-symbol): Correct let->let*. (abbrev--before-point): Only use abbrev-start-location if before point. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7d1b834125..cb936a3265a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/abbrev.el b/lisp/abbrev.el index 04b8a8ce97c..87a31df8112 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -649,8 +649,8 @@ The default is to try buffer's mode-specific abbrev table, then global table." (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 @@ then ABBREV is looked up in that table only." (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))