aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-06-18 12:46:39 +0000
committerGerd Moellmann2001-06-18 12:46:39 +0000
commitdb8f730342efb2d3c8891dfab2ecebd50b292c16 (patch)
treebfaa7a4b44bdf136fef30d617932f07373044abd
parent753b4645a70fb09c9cb3b0f3f4cb426da00ca8d6 (diff)
downloademacs-db8f730342efb2d3c8891dfab2ecebd50b292c16.tar.gz
emacs-db8f730342efb2d3c8891dfab2ecebd50b292c16.zip
(quail-start-conversion): Reset
quail-translating to nil.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/international/quail.el2
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a72eee93097..609855b7a9c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-06-18 Gerd Moellmann <gerd@gnu.org> 12001-06-18 Gerd Moellmann <gerd@gnu.org>
2 2
3 * international/quail.el (quail-start-conversion): Reset
4 quail-translating to nil.
5
3 * antlr-mode.el (antlr-mode): Check that `c-Java-access-key' is 6 * antlr-mode.el (antlr-mode): Check that `c-Java-access-key' is
4 bound. Suggested by David B. Malkovsky <David.Malkovsky@sas.com>. 7 bound. Suggested by David B. Malkovsky <David.Malkovsky@sas.com>.
5 8
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index c9c298fce98..088fb84e8e7 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2,6 +2,7 @@
2 2
3;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN. 3;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
4;; Licensed to the Free Software Foundation. 4;; Licensed to the Free Software Foundation.
5;; Copyright (C) 2001 Free Software Foundation, Inc.
5 6
6;; Author: Kenichi HANDA <handa@etl.go.jp> 7;; Author: Kenichi HANDA <handa@etl.go.jp>
7;; Naoto TAKAHASHI <ntakahas@etl.go.jp> 8;; Naoto TAKAHASHI <ntakahas@etl.go.jp>
@@ -1434,6 +1435,7 @@ Return the input string."
1434 (setq unread-command-events 1435 (setq unread-command-events
1435 (string-to-list (this-single-command-raw-keys))) 1436 (string-to-list (this-single-command-raw-keys)))
1436 (setq quail-converting nil)))) 1437 (setq quail-converting nil))))
1438 (setq quail-translating nil)
1437 (if (overlay-start quail-conv-overlay) 1439 (if (overlay-start quail-conv-overlay)
1438 (delete-region (overlay-start quail-conv-overlay) 1440 (delete-region (overlay-start quail-conv-overlay)
1439 (overlay-end quail-conv-overlay))) 1441 (overlay-end quail-conv-overlay)))