aboutsummaryrefslogtreecommitdiff
path: root/emacs/.emacs.d/init/ycp-prog.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/.emacs.d/init/ycp-prog.el')
-rw-r--r--emacs/.emacs.d/init/ycp-prog.el18
1 files changed, 13 insertions, 5 deletions
diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index 9eff2f8..6584491 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -106,7 +106,10 @@
"C-c C-n" 'comint-next-prompt
"C-c C-u" 'gud-up
"C-c C-d" 'gud-down
- "C-c C-n" 'comint-next-prompt)
+ "C-c C-k" 'my-gud-insert-source-line
+ "C-c C-q" 'my-gud-insert-function-name
+ "C-," 'my-gud-insert-source-line-and-function-name
+ )
(add-hook 'gud-mode-hook 'my-gud-comint-set-prompt-regexp)
(add-hook 'gud-mode-hook 'company-mode)
;; Don't make this a general comint-mode hook, as it will overwrite
@@ -188,6 +191,8 @@
(:delay 5)
(define-key c-mode-map (kbd "C-c C-c") 'compile)
(define-key c++-mode-map (kbd "C-c C-c") 'project-compile)
+ (define-key c-mode-map (kbd "C-x C-e") 'my-gud-print-expr-region)
+ (define-key c++-mode-map (kbd "C-x C-e") 'my-gud-print-expr-region)
(add-to-list 'auto-mode-alist '("\\.inl\\'" . c++-mode))
(setq c-default-style
'((java-mode . "java")
@@ -208,7 +213,7 @@
(add-hook 'c-mode-hook 'my-c-set-compile-command)
(define-key c-mode-map (kbd "C-c s") 'my-c-switch-between-header-and-source)
(define-key c++-mode-map (kbd "C-c s")
- 'my-c-switch-between-header-and-source)
+ 'my-c-switch-between-header-and-source)
(my-override bookmark-make-record)
)
@@ -501,14 +506,16 @@
(setq comment-start "#"))))
(add-to-list 'auto-mode-alist '("\\.cnf\\'" . conf-mode))
(require 'my-mariadb)
+ (add-hook 'sql-mode-hook 'my-mtr-set-compile-command)
+ (add-to-list 'compilation-error-regexp-alist 'mtr)
+ (add-to-list 'compilation-error-regexp-alist-alist
+ my-mtr-compilation-error-re)
(define-key sql-mode-map (kbd "C-c C-c") 'my-sql-maybe-mtrr)
(my-keybind global-map
"C-c d m" 'my-gdb-maria
"C-c d s" 'my-gdb-maria-spider
)
(define-key gud-mode-map (kbd "C-c C-z") 'my-gdb-mysql-parse-frame)
- (define-key gud-mode-map (kbd "C-c C-p") 'comint-previous-prompt)
- (define-key gud-mode-map (kbd "C-c C-n") 'comint-next-prompt)
(add-to-list 'grep-files-aliases
'("mtr" . "*.inc *.test *.cnf *.result *.rdiff"))
(add-to-list 'grep-files-aliases
@@ -543,7 +550,8 @@
;;; nxml
(my-package nxml-mode
(:delay 60)
- (setq nxml-slash-auto-complete-flag t))
+ (setq nxml-slash-auto-complete-flag t)
+ (add-to-list 'auto-mode-alist '("\\.opf\\'" . nxml-mode)))
(my-package etags
(:delay 60)