summaryrefslogtreecommitdiff
path: root/src/ChangeLog.7
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-01-09 09:36:10 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-01-09 09:36:10 -0800
commit35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch)
tree90358cbb033a126c4d48793a80fd804b7baaca24 /src/ChangeLog.7
parent59815c02506eb39b61e672528ed03885749ba529 (diff)
parent7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff)
downloademacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz
Merge from trunk.
Diffstat (limited to 'src/ChangeLog.7')
-rw-r--r--src/ChangeLog.74
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index fc97acdeb1e..891c1ca081a 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -3968,7 +3968,7 @@
1998-01-12 Kenichi Handa <handa@etl.go.jp>
- * minibuf.c (Fminibuffer_complete_word): Fix a bug of refering
+ * minibuf.c (Fminibuffer_complete_word): Fix a bug of referring
`i'. We must refer `i_byte' instead.
* insdel.c (insert_from_string_1): Decrement GAP_SIZE by
@@ -11092,7 +11092,7 @@ See ChangeLog.6 for earlier changes.
;; coding: utf-8
;; End:
- Copyright (C) 1997-1998, 2001-2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-1998, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.