aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-05-16 02:21:01 +0300
committerJuri Linkov2013-05-16 02:21:01 +0300
commitda547b32a6c45494ccbd2073f0491383e8864ea9 (patch)
treee6edf4601c9add50a171bb3e78e7463bbef05198
parent6d65486d647049cbf33524e261bbd891dd28daba (diff)
downloademacs-da547b32a6c45494ccbd2073f0491383e8864ea9.tar.gz
emacs-da547b32a6c45494ccbd2073f0491383e8864ea9.zip
* lisp/isearch.el (isearch-char-by-name): Rename from
`isearch-insert-char-by-name'. Doc fix. (isearch-forward): Mention `isearch-char-by-name' in the docstring. Fixes: debbugs:13348
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/isearch.el15
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 070d2f1bd37..8b8cb820428 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12013-05-15 Juri Linkov <juri@jurta.org> 12013-05-15 Juri Linkov <juri@jurta.org>
2 2
3 * isearch.el (isearch-char-by-name): Rename from
4 `isearch-insert-char-by-name'. Doc fix.
5 (isearch-forward): Mention `isearch-char-by-name' in
6 the docstring. (Bug#13348)
7
3 * isearch.el (minibuffer-local-isearch-map): Bind "\r" to 8 * isearch.el (minibuffer-local-isearch-map): Bind "\r" to
4 `exit-minibuffer' instead of 9 `exit-minibuffer' instead of
5 `isearch-nonincremental-exit-minibuffer'. 10 `isearch-nonincremental-exit-minibuffer'.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 04fd594e7f1..fe73bf7d6a4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -515,12 +515,12 @@ This is like `describe-bindings', but displays only Isearch keys."
515 (define-key map "\M-so" 'isearch-occur) 515 (define-key map "\M-so" 'isearch-occur)
516 (define-key map "\M-shr" 'isearch-highlight-regexp) 516 (define-key map "\M-shr" 'isearch-highlight-regexp)
517 517
518 ;; The key translations defined in the C-x 8 prefix should insert 518 ;; The key translations defined in the C-x 8 prefix should add
519 ;; characters into the search string. See iso-transl.el. 519 ;; characters to the search string. See iso-transl.el.
520 (define-key map "\C-x" nil) 520 (define-key map "\C-x" nil)
521 (define-key map [?\C-x t] 'isearch-other-control-char) 521 (define-key map [?\C-x t] 'isearch-other-control-char)
522 (define-key map "\C-x8" nil) 522 (define-key map "\C-x8" nil)
523 (define-key map "\C-x8\r" 'isearch-insert-char-by-name) 523 (define-key map "\C-x8\r" 'isearch-char-by-name)
524 524
525 map) 525 map)
526 "Keymap for `isearch-mode'.") 526 "Keymap for `isearch-mode'.")
@@ -679,6 +679,8 @@ Type \\[isearch-yank-kill] to yank the last string of killed text.
679Type \\[isearch-yank-pop] to replace string just yanked into search prompt 679Type \\[isearch-yank-pop] to replace string just yanked into search prompt
680 with string killed before it. 680 with string killed before it.
681Type \\[isearch-quote-char] to quote control character to search for it. 681Type \\[isearch-quote-char] to quote control character to search for it.
682Type \\[isearch-char-by-name] to add a character to search by Unicode name,\
683 with completion.
682\\[isearch-abort] while searching or when search has failed cancels input\ 684\\[isearch-abort] while searching or when search has failed cancels input\
683 back to what has 685 back to what has
684 been found successfully. 686 been found successfully.
@@ -1870,11 +1872,12 @@ Subword is used when `subword-mode' is activated. "
1870 (lambda () (let ((inhibit-field-text-motion t)) 1872 (lambda () (let ((inhibit-field-text-motion t))
1871 (line-end-position (if (eolp) 2 1)))))) 1873 (line-end-position (if (eolp) 2 1))))))
1872 1874
1873(defun isearch-insert-char-by-name () 1875(defun isearch-char-by-name ()
1874 "Read a character by its Unicode name and insert it into search string." 1876 "Read a character by its Unicode name and add it to the search string.
1877Completion is available like in `read-char-by-name' used by `insert-char'."
1875 (interactive) 1878 (interactive)
1876 (with-isearch-suspended 1879 (with-isearch-suspended
1877 (let ((char (read-char-by-name "Insert character (Unicode name or hex): "))) 1880 (let ((char (read-char-by-name "Add character to search (Unicode name or hex): ")))
1878 (when char 1881 (when char
1879 (setq isearch-new-string (concat isearch-string (string char)) 1882 (setq isearch-new-string (concat isearch-string (string char))
1880 isearch-new-message (concat isearch-message 1883 isearch-new-message (concat isearch-message