changeset 69564:30b0fe844c71

(isearch-other-meta-char): Handle user bindings for shifted control characters.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 18 Mar 2006 15:11:48 +0000
parents e5352a2d20bc
children 0ab713e3e812
files lisp/isearch.el
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/isearch.el	Sat Mar 18 15:05:35 2006 +0000
+++ b/lisp/isearch.el	Sat Mar 18 15:11:48 2006 +0000
@@ -1696,12 +1696,15 @@
 	     (and (integerp main-event)
 		  (memq 'shift mods)
 		  (memq 'control mods)
-		  (lookup-key isearch-mode-map
-			      (let ((copy (copy-sequence key)))
-				(aset copy 0
-				      (- main-event (- ?\C-\S-a ?\C-a)))
-				copy)
-			      nil)))
+		  (not (memq (lookup-key isearch-mode-map
+					 (let ((copy (copy-sequence key)))
+					   (aset copy 0
+						 (- main-event
+						    (- ?\C-\S-a ?\C-a)))
+					   copy)
+					 nil)
+			     '(nil
+			       isearch-other-control-char)))))
 	   (setcar keylist (- main-event (- ?\C-\S-a ?\C-a)))
 	   (cancel-kbd-macro-events)
 	   (apply 'isearch-unread keylist))