From: Leo Liu <sdl.web@gmail.com>
Date: Wed, 29 Feb 2012 15:05:42 +0000 (+0800)
Subject: Reset sys to nil in define-abbrevs
X-Git-Tag: emacs-pretest-24.0.05~208
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d44d9cc7040ba6c9548443189ac7d112ee00003;p=emacs.git

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 10a0c3f9255..85af5f8ec78 100644
--- 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 ade36f2f9a0..7beee0a1752 100644
--- 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)))