diff options
| author | Chong Yidong | 2012-07-18 21:31:16 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-07-18 21:31:16 +0800 |
| commit | 9aeb25a6b4d684bd79a309326b047ac0ea4afca4 (patch) | |
| tree | b8931454a42af136e84ae25a673a7e086a8357e4 | |
| parent | 464d5a5e1f95378b8fef2b70dd6aee4486a352da (diff) | |
| download | emacs-9aeb25a6b4d684bd79a309326b047ac0ea4afca4.tar.gz emacs-9aeb25a6b4d684bd79a309326b047ac0ea4afca4.zip | |
* subr.el (keyboard-translate): Doc fix.
Fixes: debbugs:7261
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1db5fa3a6b..fcb0d9859be 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | 2012-07-18 Chong Yidong <cyd@gnu.org> | 6 | 2012-07-18 Chong Yidong <cyd@gnu.org> |
| 7 | 7 | ||
| 8 | * subr.el (keyboard-translate): Doc fix (Bug#7261). | ||
| 9 | |||
| 8 | * isearch.el (isearch-mode-map): Handle C-x 8 key translations, | 10 | * isearch.el (isearch-mode-map): Handle C-x 8 key translations, |
| 9 | and make C-x 8 RET exit isearch (Bug#11439). | 11 | and make C-x 8 RET exit isearch (Bug#11439). |
| 10 | 12 | ||
diff --git a/lisp/subr.el b/lisp/subr.el index 93273b1d41d..8952ea6a9e0 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -732,7 +732,7 @@ Subkeymaps may be modified but are not canonicalized." | |||
| 732 | (put 'keyboard-translate-table 'char-table-extra-slots 0) | 732 | (put 'keyboard-translate-table 'char-table-extra-slots 0) |
| 733 | 733 | ||
| 734 | (defun keyboard-translate (from to) | 734 | (defun keyboard-translate (from to) |
| 735 | "Translate character FROM to TO at a low level. | 735 | "Translate character FROM to TO on the current terminal. |
| 736 | This function creates a `keyboard-translate-table' if necessary | 736 | This function creates a `keyboard-translate-table' if necessary |
| 737 | and then modifies one entry in it." | 737 | and then modifies one entry in it." |
| 738 | (or (char-table-p keyboard-translate-table) | 738 | (or (char-table-p keyboard-translate-table) |