Mercurial > emacs
comparison lisp/international/mule-cmds.el @ 83224:7a0245dd1848
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 06 Nov 2004 17:52:02 +0000 |
parents | 38500c0c86ab 93792c00945b |
children | 3ec251523b3e |
comparison
equal
deleted
inserted
replaced
83223:4056279af756 | 83224:7a0245dd1848 |
---|---|
1366 (setq current-input-method nil | 1366 (setq current-input-method nil |
1367 input-method-function nil | 1367 input-method-function nil |
1368 current-input-method-title nil) | 1368 current-input-method-title nil) |
1369 (force-mode-line-update))))) | 1369 (force-mode-line-update))))) |
1370 | 1370 |
1371 (defun set-input-method (input-method) | 1371 (defun set-input-method (input-method &optional interactive) |
1372 "Select and activate input method INPUT-METHOD for the current buffer. | 1372 "Select and activate input method INPUT-METHOD for the current buffer. |
1373 This also sets the default input method to the one you specify. | 1373 This also sets the default input method to the one you specify. |
1374 If INPUT-METHOD is nil, this function turns off the input method, and | 1374 If INPUT-METHOD is nil, this function turns off the input method, and |
1375 also causes you to be prompted for a name of an input method the next | 1375 also causes you to be prompted for a name of an input method the next |
1376 time you invoke \\[toggle-input-method]. | 1376 time you invoke \\[toggle-input-method]. |
1377 When called interactively, the optional arg INTERACTIVE is non-nil, | |
1378 which marks the variable `default-input-method' as set for Custom buffers. | |
1377 | 1379 |
1378 To deactivate the input method interactively, use \\[toggle-input-method]. | 1380 To deactivate the input method interactively, use \\[toggle-input-method]. |
1379 To deactivate it programmatically, use \\[inactivate-input-method]." | 1381 To deactivate it programmatically, use \\[inactivate-input-method]." |
1380 (interactive | 1382 (interactive |
1381 (let* ((default (or (car input-method-history) default-input-method))) | 1383 (let* ((default (or (car input-method-history) default-input-method))) |
1382 (list (read-input-method-name | 1384 (list (read-input-method-name |
1383 (if default "Select input method (default %s): " "Select input method: ") | 1385 (if default "Select input method (default %s): " "Select input method: ") |
1384 default t)))) | 1386 default t) |
1387 t))) | |
1385 (activate-input-method input-method) | 1388 (activate-input-method input-method) |
1386 (setq default-input-method input-method) | 1389 (setq default-input-method input-method) |
1387 (when (interactive-p) | 1390 (when interactive |
1388 (customize-mark-as-set 'default-input-method)) | 1391 (customize-mark-as-set 'default-input-method)) |
1389 default-input-method) | 1392 default-input-method) |
1390 | 1393 |
1391 (defun toggle-input-method (&optional arg) | 1394 (defun toggle-input-method (&optional arg interactive) |
1392 "Enable or disable multilingual text input method for the current buffer. | 1395 "Enable or disable multilingual text input method for the current buffer. |
1393 Only one input method can be enabled at any time in a given buffer. | 1396 Only one input method can be enabled at any time in a given buffer. |
1394 | 1397 |
1395 The normal action is to enable an input method if none was | 1398 The normal action is to enable an input method if none was |
1396 enabled, and disable the current one otherwise. Which input method | 1399 enabled, and disable the current one otherwise. Which input method |
1399 as a last resort by reading the name of an input method in the | 1402 as a last resort by reading the name of an input method in the |
1400 minibuffer. | 1403 minibuffer. |
1401 | 1404 |
1402 With a prefix argument, read an input method name with the minibuffer | 1405 With a prefix argument, read an input method name with the minibuffer |
1403 and enable that one. The default is the most recent input method specified | 1406 and enable that one. The default is the most recent input method specified |
1404 \(not including the currently active input method, if any)." | 1407 \(not including the currently active input method, if any). |
1405 | 1408 |
1406 (interactive "P") | 1409 When called interactively, the optional arg INTERACTIVE is non-nil, |
1410 which marks the variable `default-input-method' as set for Custom buffers." | |
1411 | |
1412 (interactive "P\np") | |
1407 (if (and current-input-method (not arg)) | 1413 (if (and current-input-method (not arg)) |
1408 (inactivate-input-method) | 1414 (inactivate-input-method) |
1409 (let ((default (or (car input-method-history) default-input-method))) | 1415 (let ((default (or (car input-method-history) default-input-method))) |
1410 (if (and arg default (equal current-input-method default) | 1416 (if (and arg default (equal current-input-method default) |
1411 (> (length input-method-history) 1)) | 1417 (> (length input-method-history) 1)) |
1418 default t)) | 1424 default t)) |
1419 default)) | 1425 default)) |
1420 (unless default-input-method | 1426 (unless default-input-method |
1421 (prog1 | 1427 (prog1 |
1422 (setq default-input-method current-input-method) | 1428 (setq default-input-method current-input-method) |
1423 (when (interactive-p) | 1429 (when interactive |
1424 (customize-mark-as-set 'default-input-method))))))) | 1430 (customize-mark-as-set 'default-input-method))))))) |
1425 | 1431 |
1426 (defun describe-input-method (input-method) | 1432 (defun describe-input-method (input-method) |
1427 "Describe input method INPUT-METHOD." | 1433 "Describe input method INPUT-METHOD." |
1428 (interactive | 1434 (interactive |