aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-02-21 17:23:51 -0500
committerGlenn Morris2012-02-21 17:23:51 -0500
commit6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418 (patch)
tree1e6b2b5282a2bef4c1f46ac7da580dcd9936f9bb /lisp/ChangeLog
parent68af8d4fc3bcdf9c9123f66283d0005cf91e34b0 (diff)
downloademacs-6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418.tar.gz
emacs-6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418.zip
Tiny emerge-defvar-local fix
* lisp/vc/emerge.el (emerge-defvar-local): Set `permanent-local' property rather than unused `preserved'.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 083a953cc03..8bedc86ce88 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-02-21 Glenn Morris <rgm@gnu.org> 12012-02-21 Glenn Morris <rgm@gnu.org>
2 2
3 * vc/emerge.el (emerge-defvar-local):
4 Set `permanent-local' property rather than unused `preserved'.
5
3 * textmodes/picture.el (picture-delete-char): New alias. 6 * textmodes/picture.el (picture-delete-char): New alias.
4 (picture-mode-map): Use it. (Bug#10860) 7 (picture-mode-map): Use it. (Bug#10860)
5 (picture-mode): Doc fix. 8 (picture-mode): Doc fix.