aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-11-15 19:41:36 +0000
committerRichard M. Stallman1994-11-15 19:41:36 +0000
commit0cabad136a1f87b29958608f6bebfaf85bb3ebe7 (patch)
treeda2c6bf5d2e01968b4632413689be1c09e89ecfb
parentfb5eba9c6f46199350bd110e02d7dfdadc5dd8e4 (diff)
downloademacs-0cabad136a1f87b29958608f6bebfaf85bb3ebe7.tar.gz
emacs-0cabad136a1f87b29958608f6bebfaf85bb3ebe7.zip
(isearch-other-meta-char): Delete debugging code.
(isearch-char-to-string): Simplify--assume character is an integer.
-rw-r--r--lisp/isearch.el14
1 files changed, 4 insertions, 10 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 51921e5e712..e31abb94655 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -4,7 +4,7 @@
4 4
5;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> 5;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
6 6
7;; |$Date: 1994/11/15 16:53:29 $|$Revision: 1.76 $ 7;; |$Date: 1994/11/15 16:56:44 $|$Revision: 1.77 $
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
@@ -480,8 +480,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
480 isearch-yank-flag nil 480 isearch-yank-flag nil
481 isearch-invalid-regexp nil 481 isearch-invalid-regexp nil
482 isearch-within-brackets nil 482 isearch-within-brackets nil
483 ;; Use (baud-rate) for now, for sake of other versions. 483 isearch-slow-terminal-mode (and (<= baud-rate search-slow-speed)
484 isearch-slow-terminal-mode (and (<= (baud-rate) search-slow-speed)
485 (> (window-height) 484 (> (window-height)
486 (* 4 search-slow-window-lines))) 485 (* 4 search-slow-window-lines)))
487 isearch-other-end nil 486 isearch-other-end nil
@@ -1026,8 +1025,7 @@ and the meta character is unread so that it applies to editing the string."
1026 ;; Convert the event back into its raw form, 1025 ;; Convert the event back into its raw form,
1027 ;; with the dummy prefix implicit in the mouse event, 1026 ;; with the dummy prefix implicit in the mouse event,
1028 ;; so it will get split up once again. 1027 ;; so it will get split up once again.
1029 (progn (setq foo key) 1028 (progn (setq unread-command-events
1030 (setq unread-command-events
1031 (cdr unread-command-events)) 1029 (cdr unread-command-events))
1032 (setq main-event (car unread-command-events)) 1030 (setq main-event (car unread-command-events))
1033 (setcar (cdr (event-start main-event)) 1031 (setcar (cdr (event-start main-event))
@@ -1392,11 +1390,7 @@ since they have special meaning in a regexp."
1392(defvar last-command-event) 1390(defvar last-command-event)
1393 1391
1394(defun isearch-char-to-string (c) 1392(defun isearch-char-to-string (c)
1395 (if (integerp c) 1393 (make-string 1 c))
1396 (make-string 1 c)
1397 (if (and (symbolp c) (get c 'ascii-character))
1398 (make-string 1 (get c 'ascii-character))
1399 (make-string 1 (event-to-character c)))))
1400 1394
1401(defun isearch-text-char-description (c) 1395(defun isearch-text-char-description (c)
1402 (if (and (integerp c) (or (< c ?\ ) (= c ?\^?))) 1396 (if (and (integerp c) (or (< c ?\ ) (= c ?\^?)))