diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
| commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
| tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /lisp/ChangeLog.7 | |
| parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
| parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/ChangeLog.7')
| -rw-r--r-- | lisp/ChangeLog.7 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 2e96063eb8..c68d02bc3d 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -1043,10 +1043,10 @@ (quail-prev-translation-block): Likewise. (quail-conversion-backward-char): Call quail-error instead of error. Set quail-translating to nil. - (quail-conversion-forward-char): Likewize. + (quail-conversion-forward-char): Likewise. (quail-conversion-delete-char): Call quail-error instead of error. If conversion region gets vacant, set quail-converting to nil. - (quail-conversion-backward-delete-char): Likewize. + (quail-conversion-backward-delete-char): Likewise. (quail-no-conversion): Just set quail-converting to nil. (quail-mouse-choose-completion): Call quai-error instead of error. (quail-choose-completion-string): Likewise. |