Mercurial > emacs
annotate lisp/international/isearch-x.el @ 29352:fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Add an optional WHEN argument and change the format of the
symbol-property information.
* emacs-lisp/bytecomp.el (byte-compile-log): Don't quote lambda.
(byte-compile-obsolete, byte-compile-variable-ref): Understand the
new obsolete-symbol-property format and print WHEN if it is provided.
(make-obsolete): Update the calls to use the third argument.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 01 Jun 2000 04:58:08 +0000 |
parents | 18bfc4113440 |
children | bec7534ceb14 |
rev | line source |
---|---|
17052 | 1 ;;; isearch-x.el --- extended isearch handling commands |
2 | |
3 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. | |
18377
8b4a66c66dd6
Change copyright notice.
Richard M. Stallman <rms@gnu.org>
parents:
17071
diff
changeset
|
4 ;; Licensed to the Free Software Foundation. |
17052 | 5 |
6 ;; Keywords: multilingual, isearch | |
7 | |
8 ;; Author: Kenichi HANDA <handa@etl.go.jp> | |
9 ;; Maintainer: Kenichi HANDA <handa@etl.go.jp> | |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
17071 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
17052 | 27 |
28 ;;; Code: | |
29 | |
30 ;;;###autoload | |
31 (defun isearch-toggle-specified-input-method () | |
18713
bca5a6b78f91
(isearch-input-method): New variable.
Kenichi Handa <handa@m17n.org>
parents:
18377
diff
changeset
|
32 "Select an input method and turn it on in interactive search." |
17052 | 33 (interactive) |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
34 (let ((overriding-terminal-local-map nil)) |
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
35 (toggle-input-method t)) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
36 (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
|
37 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
|
38 (setq input-method-function nil) |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
39 (isearch-update)) |
17052 | 40 |
41 ;;;###autoload | |
42 (defun isearch-toggle-input-method () | |
43 "Toggle input method in interactive search." | |
44 (interactive) | |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
45 (let ((overriding-terminal-local-map nil)) |
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
46 (toggle-input-method)) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
47 (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
|
48 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
|
49 (setq input-method-function nil) |
17052 | 50 (isearch-update)) |
51 | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
52 (defvar isearch-minibuffer-local-map |
29327 | 53 (let ((map (copy-keymap minibuffer-local-map))) |
54 (define-key map [with-keyboard-coding] 'isearch-with-keyboard-coding) | |
55 (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
|
56 map) |
29327 | 57 "Keymap to use in minibuffer for multibyte character inputting in isearch.") |
58 | |
59 | |
60 ;; These two variables are used to refer to the values of | |
61 ;; `current-input-method' and `input-method-function' of the original | |
62 ;; buffer in the function isearch-with-input-method which runs in a | |
63 ;; minibuffer. | |
64 | |
65 (defvar isearch-minibuffer-input-method nil) | |
66 (defvar isearch-minibuffer-input-method-function nil) | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
67 |
29327 | 68 ;; Exit from recursive edit safely. Set in `after-change-functions' |
69 ;; by isearch-with-keyboard-coding. | |
70 (defun isearch-exit-recursive-edit () | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
71 (interactive) |
29327 | 72 (throw 'exit nil)) |
73 | |
74 ;; Simulate character decoding by the keyboard coding system in the | |
75 ;; current buffer (minibuffer). As soon as a character is inserted, | |
76 ;; it exits from minibuffer. | |
77 | |
78 (defun isearch-with-keyboard-coding () | |
79 (interactive) | |
80 (let ((after-change-functions '(isearch-exit-recursive-edit))) | |
81 (recursive-edit)) | |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
82 (exit-minibuffer)) |
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
83 |
29327 | 84 ;; Simulate the work of the current input method in the current buffer |
85 ;; (minibuffer). | |
86 | |
87 (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
|
88 (interactive) |
29327 | 89 (let* ((current-input-method isearch-minibuffer-input-method) |
90 (events (funcall isearch-minibuffer-input-method-function nil))) | |
91 ;; EVENTS is a list of events the input method has generated. It | |
92 ;; contains a character event and/or the special event | |
93 ;; `compose-last-chars'. We extract only character events and | |
94 ;; insert the corresponding characters. | |
95 (while events | |
96 (if (integerp (car events)) (insert (car events))) | |
97 (setq events (cdr events))) | |
22920
f80a1ca0112f
(isearch-minibuffer-local-map): Bind
Kenichi Handa <handa@m17n.org>
parents:
22803
diff
changeset
|
98 (exit-minibuffer))) |
22780
54069d469c31
(isearch-toggle-specified-input-method): Adjusted for the change
Kenichi Handa <handa@m17n.org>
parents:
19433
diff
changeset
|
99 |
19407
50444ccff3f2
(isearch-input-method): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19390
diff
changeset
|
100 ;;;###autoload |
17052 | 101 (defun isearch-process-search-multibyte-characters (last-char) |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
102 (if (eq this-command 'isearch-printing-char) |
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
103 (let ((overriding-terminal-local-map nil) |
29327 | 104 (prompt (concat (isearch-message-prefix) isearch-message)) |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
105 (minibuffer-local-map isearch-minibuffer-local-map) |
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
106 str) |
29327 | 107 (if isearch-input-method-function |
108 (let (;; Let input method work rather tersely. | |
109 (input-method-verbose-flag nil) | |
110 (isearch-minibuffer-input-method current-input-method) | |
111 (isearch-minibuffer-input-method-function | |
112 isearch-input-method-function)) | |
113 (setq unread-command-events | |
114 (cons 'with-input-method | |
115 (cons last-char unread-command-events)) | |
116 str (read-string prompt)) | |
117 (if (not str) | |
118 ;; All inputs were deleted while the input method | |
119 ;; was working. | |
120 (setq str "") | |
121 (if (and (= (length str) 1) | |
122 (= (aref str 0) last-char)) | |
123 ;; The input method couldn't handle LAST-CHAR. | |
124 (setq str nil))))) | |
125 | |
126 (if (and (not str) (keyboard-coding-system)) | |
127 (setq unread-command-events | |
128 (cons 'with-keyboard-coding | |
129 (cons last-char unread-command-events)) | |
130 str (read-string prompt))) | |
131 | |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
132 (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
|
133 (let ((unread-command-events nil)) |
fad48aef2340
(isearch-process-search-multibyte-characters): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22920
diff
changeset
|
134 (isearch-process-search-string str str)) |
fad48aef2340
(isearch-process-search-multibyte-characters): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22920
diff
changeset
|
135 (isearch-update))) |
22803
c52637c83ebf
(isearch-minibuffer-self-insert):
Kenichi Handa <handa@m17n.org>
parents:
22780
diff
changeset
|
136 (isearch-process-search-char last-char))) |
17052 | 137 |
138 ;;; isearch-x.el ends here |