aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bb0bad7282..df8aa7e8845 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-01 Stefan Monnier <monnier@iro.umontreal.ca> 12011-07-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * vc/vc-bzr.el (vc-bzr-revision-keywords): Update.
4 (vc-bzr-revision-completion-table): Add support for annotate and date.
5
3 * emacs-lisp/derived.el (define-derived-mode): Make abbrev-table 6 * emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
4 inherit from parent. 7 inherit from parent.
5 8
@@ -27,7 +30,7 @@
27 (cfengine3-class-selector-regex cfengine3-category-regex) 30 (cfengine3-class-selector-regex cfengine3-category-regex)
28 (cfengine3-vartypes cfengine3-font-lock-keywords) 31 (cfengine3-vartypes cfengine3-font-lock-keywords)
29 (cfengine3-beginning-of-defun, cfengine3-end-of-defun) 32 (cfengine3-beginning-of-defun, cfengine3-end-of-defun)
30 (cfengine3-indent-line): Added from cfengine3.el. 33 (cfengine3-indent-line): Add from cfengine3.el.
31 34
322011-07-01 Michael Albinus <michael.albinus@gmx.de> 352011-07-01 Michael Albinus <michael.albinus@gmx.de>
33 36