[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/bindings.el,v
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/bindings.el,v |
Date: |
Wed, 25 Jun 2008 20:17:29 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juri Linkov <jurta> 08/06/25 20:17:10
Index: bindings.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/bindings.el,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- bindings.el 5 Jun 2008 19:59:15 -0000 1.207
+++ bindings.el 25 Jun 2008 20:17:07 -0000 1.208
@@ -804,16 +804,31 @@
(define-key ctl-x-map "\C-n" 'set-goal-column)
(define-key global-map "\C-a" 'move-beginning-of-line)
(define-key global-map "\C-e" 'move-end-of-line)
-(define-key esc-map "g" (make-sparse-keymap))
-(define-key esc-map "g\M-g" 'goto-line)
-(define-key esc-map "gg" 'goto-line)
-(define-key esc-map "gn" 'next-error)
-(define-key esc-map "g\M-n" 'next-error)
(define-key ctl-x-map "`" 'next-error)
-(define-key esc-map "gp" 'previous-error)
-(define-key esc-map "g\M-p" 'previous-error)
+(defvar goto-map (make-sparse-keymap)
+ "Keymap for navigation commands.")
+(define-key esc-map "g" goto-map)
+
+(define-key goto-map "g" 'goto-line)
+(define-key goto-map "\M-g" 'goto-line)
+(define-key goto-map "n" 'next-error)
+(define-key goto-map "\M-n" 'next-error)
+(define-key goto-map "p" 'previous-error)
+(define-key goto-map "\M-p" 'previous-error)
+
+(defvar search-map (make-sparse-keymap)
+ "Keymap for search related commands.")
+(define-key esc-map "s" search-map)
+
+(define-key search-map "o" 'occur)
+(define-key search-map "hr" 'highlight-regexp)
+(define-key search-map "hp" 'highlight-phrase)
+(define-key search-map "hl" 'highlight-lines-matching-regexp)
+(define-key search-map "hu" 'unhighlight-regexp)
+(define-key search-map "hf" 'hi-lock-find-patterns)
+(define-key search-map "hw" 'hi-lock-write-interactive-patterns)
;;(defun function-key-error ()
;; (interactive)