Reset sys to nil in define-abbrevs

Otherwise all abbrevs after are regarded as system ones and not saved
to disk, causing data loss.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10a0c3f925555d950e3f96cfbd1a8ad017e7077d..85af5f8ec78fd2e7734993566b1ab70759208c72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-29  Leo Liu  <sdl.web@gmail.com>
+
+       * abbrev.el (define-abbrevs): Reset sys to nil.
+
 2012-02-28  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
        * files.el (file-equal-p): Rename from `files-equal-p'.

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index ade36f2f9a0c9f087581298cf1c9da01c1279f1e..7beee0a1752b77eae1b093295abd666a8cffd207 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -191,7 +191,8 @@ the ones defined from the buffer now."
                      (not (eolp)))
          (setq name (read buf) count (read buf))
          (if (equal count '(sys))
-             (setq sys t count (read buf)))
+             (setq sys t count (read buf))
+           (setq sys nil))
          (setq exp (read buf))
          (skip-chars-backward " \t\n\f")
          (setq hook (if (not (eolp)) (read buf)))