[Emacs-diffs] Changes to emacs/lisp/abbrev.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/10/31 15:47:05

Index: abbrev.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/abbrev.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- abbrev.el   30 Oct 2007 01:39:16 -0000      1.57
+++ abbrev.el   31 Oct 2007 15:47:02 -0000      1.58
@@ -649,7 +649,7 @@
   (let ((tables (abbrev--active-tables table))
         sym)
     (while (and tables (not (symbol-value sym)))
-      (let ((table (pop tables))
+      (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
@@ -693,9 +693,10 @@
               (delete-region start (1+ start)))
           (skip-syntax-backward " ")
           (setq end (point))
+          (when (> end start)
           (setq name (buffer-substring start end))
           (goto-char pos)               ; Restore point.
-          (list (abbrev-symbol name tables) name start end))
+            (list (abbrev-symbol name tables) name start end)))
         
       (while (and tables (not (car res)))
         (let* ((table (pop tables))