aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2012-02-29 23:05:42 +0800
committerLeo Liu2012-02-29 23:05:42 +0800
commit2d44d9cc7040ba6c9548443189ac7d112ee00003 (patch)
tree1bade5020b8ec4fdcffca25a558ade6013c5a787
parentf8425af235eeb55d474b4c452af1aa53e95f00a6 (diff)
downloademacs-2d44d9cc7040ba6c9548443189ac7d112ee00003.tar.gz
emacs-2d44d9cc7040ba6c9548443189ac7d112ee00003.zip
Reset sys to nil in define-abbrevs
Otherwise all abbrevs after are regarded as system ones and not saved to disk, causing data loss.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/abbrev.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10a0c3f9255..85af5f8ec78 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-02-29 Leo Liu <sdl.web@gmail.com>
2
3 * abbrev.el (define-abbrevs): Reset sys to nil.
4
12012-02-28 Thierry Volpiatto <thierry.volpiatto@gmail.com> 52012-02-28 Thierry Volpiatto <thierry.volpiatto@gmail.com>
2 6
3 * files.el (file-equal-p): Rename from `files-equal-p'. 7 * 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."
191 (not (eolp))) 191 (not (eolp)))
192 (setq name (read buf) count (read buf)) 192 (setq name (read buf) count (read buf))
193 (if (equal count '(sys)) 193 (if (equal count '(sys))
194 (setq sys t count (read buf))) 194 (setq sys t count (read buf))
195 (setq sys nil))
195 (setq exp (read buf)) 196 (setq exp (read buf))
196 (skip-chars-backward " \t\n\f") 197 (skip-chars-backward " \t\n\f")
197 (setq hook (if (not (eolp)) (read buf))) 198 (setq hook (if (not (eolp)) (read buf)))