Mercurial > emacs
annotate lisp/international/isearch-x.el @ 70323:810cd69c168f
(tool-bar-setup): Put Help and Preferences items in the default tool-bar-map.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 01 May 2006 20:15:56 +0000 |
parents | 9a14f5181afd |
children | 43cc94d955c2 187d6a1f84f7 |
rev | line source |
---|---|
17052 | 1 ;;; isearch-x.el --- extended isearch handling commands |
2 | |
62274 | 3 ;; Copyright (C) 1997, 2001, 2004 Free Software Foundation, Inc. |
4 ;; Copyright (C) 1995, 1997, 1998, 2000 | |
5 ;; National Institute of Advanced Industrial Science and Technology (AIST) | |
6 ;; Registration Number H14PRO021 | |
17052 | 7 |
8 ;; Keywords: multilingual, isearch | |
9 | |
10 ;; Author: Kenichi HANDA <handa@etl.go.jp> | |
11 ;; Maintainer: Kenichi HANDA <handa@etl.go.jp> | |
12 | |
13 ;; This file is part of GNU Emacs. | |
14 | |
15 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
16 ;; it under the terms of the GNU General Public License as published by | |
17 ;; the Free Software Foundation; either version 2, or (at your option) | |
18 ;; any later version. | |
19 | |
20 ;; GNU Emacs is distributed in the hope that it will be useful, | |
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
23 ;; GNU General Public License for more details. | |
24 | |
25 ;; You should have received a copy of the GNU General Public License | |
17071 | 26 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 27 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
28 ;; Boston, MA 02110-1301, USA. | |
17052 | 29 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
32798
diff
changeset
|
30 ;;; Commentary: |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
32798
diff
changeset
|
31 |
17052 | 32 ;;; Code: |
33 | |
34 ;;;###autoload | |
35 (defun isearch-toggle-specified-input-method () | |
18713
bca5a6b78f91
(isearch-input-method): New variable.
Kenichi Handa <handa@m17n.org>
parents:
18377
diff
changeset
|
36 "Select an input method and turn it on in interactive search." |
17052 | 37 (interactive) |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
38 (let ((overriding-terminal-local-map nil)) |
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
39 (toggle-input-method t)) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
40 (setq isearch-input-method-function input-method-function |
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
41 isearch-input-method-local-p t) |
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
42 (setq input-method-function nil) |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
43 (isearch-update)) |
17052 | 44 |
45 ;;;###autoload | |
46 (defun isearch-toggle-input-method () | |
47 "Toggle input method in interactive search." | |
48 (interactive) | |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
49 (let ((overriding-terminal-local-map nil)) |
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
50 (toggle-input-method)) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
51 (setq isearch-input-method-function input-method-function |
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
52 isearch-input-method-local-p t) |
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
53 (setq input-method-function nil) |
17052 | 54 (isearch-update)) |
55 | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
56 (defvar isearch-minibuffer-local-map |
29327 | 57 (let ((map (copy-keymap minibuffer-local-map))) |
58 (define-key map [with-keyboard-coding] 'isearch-with-keyboard-coding) | |
59 (define-key map [with-input-method] 'isearch-with-input-method) | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
60 map) |
29327 | 61 "Keymap to use in minibuffer for multibyte character inputting in isearch.") |
62 | |
63 ;; Exit from recursive edit safely. Set in `after-change-functions' | |
64 ;; by isearch-with-keyboard-coding. | |
39090
2fd8ebeef411
(isearch-exit-recursive-edit): Take
Gerd Moellmann <gerd@gnu.org>
parents:
38436
diff
changeset
|
65 (defun isearch-exit-recursive-edit (start end length) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
66 (interactive) |
29327 | 67 (throw 'exit nil)) |
68 | |
69 ;; Simulate character decoding by the keyboard coding system in the | |
70 ;; current buffer (minibuffer). As soon as a character is inserted, | |
71 ;; it exits from minibuffer. | |
72 | |
73 (defun isearch-with-keyboard-coding () | |
74 (interactive) | |
75 (let ((after-change-functions '(isearch-exit-recursive-edit))) | |
76 (recursive-edit)) | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
77 (exit-minibuffer)) |
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
78 |
29327 | 79 ;; Simulate the work of the current input method in the current buffer |
80 ;; (minibuffer). | |
81 | |
82 (defun isearch-with-input-method () | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
83 (interactive) |
32798
6d04a7aba075
(isearch-with-input-method): Call input-method-function with the first
Kenichi Handa <handa@m17n.org>
parents:
29719
diff
changeset
|
84 (let ((key (car unread-command-events)) |
6d04a7aba075
(isearch-with-input-method): Call input-method-function with the first
Kenichi Handa <handa@m17n.org>
parents:
29719
diff
changeset
|
85 events) |
6d04a7aba075
(isearch-with-input-method): Call input-method-function with the first
Kenichi Handa <handa@m17n.org>
parents:
29719
diff
changeset
|
86 (setq unread-command-events (cdr unread-command-events) |
6d04a7aba075
(isearch-with-input-method): Call input-method-function with the first
Kenichi Handa <handa@m17n.org>
parents:
29719
diff
changeset
|
87 events (funcall input-method-function key)) |
29327 | 88 ;; EVENTS is a list of events the input method has generated. It |
89 ;; contains a character event and/or the special event | |
90 ;; `compose-last-chars'. We extract only character events and | |
91 ;; insert the corresponding characters. | |
92 (while events | |
93 (if (integerp (car events)) (insert (car events))) | |
94 (setq events (cdr events))) | |
22920
f80a1ca0112f
(isearch-minibuffer-local-map): Bind
Kenichi Handa <handa@m17n.org>
parents:
22803
diff
changeset
|
95 (exit-minibuffer))) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
96 |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
97 ;;;###autoload |
17052 | 98 (defun isearch-process-search-multibyte-characters (last-char) |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
99 (if (eq this-command 'isearch-printing-char) |
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
100 (let ((overriding-terminal-local-map nil) |
64437
9a14f5181afd
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Juri Linkov <juri@jurta.org>
parents:
64085
diff
changeset
|
101 (prompt (isearch-message-prefix)) |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
102 (minibuffer-local-map isearch-minibuffer-local-map) |
64437
9a14f5181afd
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Juri Linkov <juri@jurta.org>
parents:
64085
diff
changeset
|
103 str junk-hist) |
29327 | 104 (if isearch-input-method-function |
105 (let (;; Let input method work rather tersely. | |
29719
bec7534ceb14
(isearch-minibuffer-input-method)
Kenichi Handa <handa@m17n.org>
parents:
29327
diff
changeset
|
106 (input-method-verbose-flag nil)) |
29327 | 107 (setq unread-command-events |
108 (cons 'with-input-method | |
109 (cons last-char unread-command-events)) | |
29719
bec7534ceb14
(isearch-minibuffer-input-method)
Kenichi Handa <handa@m17n.org>
parents:
29327
diff
changeset
|
110 ;; Inherit current-input-method in a minibuffer. |
64437
9a14f5181afd
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Juri Linkov <juri@jurta.org>
parents:
64085
diff
changeset
|
111 str (read-string prompt isearch-message 'junk-hist nil t)) |
9a14f5181afd
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Juri Linkov <juri@jurta.org>
parents:
64085
diff
changeset
|
112 (if (or (not str) (< (length str) (length isearch-message))) |
29327 | 113 ;; All inputs were deleted while the input method |
114 ;; was working. | |
115 (setq str "") | |
58912
f0538bd79bc1
(isearch-process-search-multibyte-characters):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
116 (setq str (substring str (length isearch-message))) |
29327 | 117 (if (and (= (length str) 1) |
29719
bec7534ceb14
(isearch-minibuffer-input-method)
Kenichi Handa <handa@m17n.org>
parents:
29327
diff
changeset
|
118 (= (aref str 0) last-char) |
bec7534ceb14
(isearch-minibuffer-input-method)
Kenichi Handa <handa@m17n.org>
parents:
29327
diff
changeset
|
119 (>= last-char 128)) |
29327 | 120 ;; The input method couldn't handle LAST-CHAR. |
121 (setq str nil))))) | |
122 | |
123 (if (and (not str) (keyboard-coding-system)) | |
124 (setq unread-command-events | |
125 (cons 'with-keyboard-coding | |
126 (cons last-char unread-command-events)) | |
64437
9a14f5181afd
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Juri Linkov <juri@jurta.org>
parents:
64085
diff
changeset
|
127 str (read-string prompt nil 'junk-hist))) |
29327 | 128 |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
129 (if (and str (> (length str) 0)) |
22931
fad48aef2340
(isearch-process-search-multibyte-characters): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22920
diff
changeset
|
130 (let ((unread-command-events nil)) |
fad48aef2340
(isearch-process-search-multibyte-characters): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22920
diff
changeset
|
131 (isearch-process-search-string str str)) |
fad48aef2340
(isearch-process-search-multibyte-characters): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22920
diff
changeset
|
132 (isearch-update))) |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
133 (isearch-process-search-char last-char))) |
17052 | 134 |
52401 | 135 ;;; arch-tag: 1a90a6cf-2cb2-477a-814a-9ff895852822 |
17052 | 136 ;;; isearch-x.el ends here |