[emacs] misc fixes

1 files changed, 23 insertions, 9 deletions

diff --git a/emacs/.emacs.d/lisp/my/my-prog.el b/emacs/.emacs.d/lisp/my/my-prog.el
index 92fcf21..eead408 100644
--- a/emacs/.emacs.d/lisp/my/my-prog.el
+++ b/emacs/.emacs.d/lisp/my/my-prog.el
@@ -444,7 +444,12 @@ overlay arrow in source buffer."
 
 (defun my-gud-watch-expr (expr)
   (with-current-buffer gud-comint-buffer
-    (insert "watch -l " expr)
+    (insert "wl " expr)
+    (comint-send-input)))
+
+(defun my-gud-break-expr (expr)
+  (with-current-buffer gud-comint-buffer
+    (insert "b " expr)
     (comint-send-input)))
 
 (defun my-gud-print-expr (expr)
@@ -454,11 +459,12 @@ overlay arrow in source buffer."
 
 (defun my-gud-print-expr-region (b e)
   (interactive "r")
-  (unless (eq (gdb-get-source-buffer) (current-buffer))
-    (error "Not in the source buffer"))
-  (if current-prefix-arg
-      (my-gud-watch-expr (buffer-substring b e))
-    (my-gud-print-expr (buffer-substring b e))))
+  (let ((selection (buffer-substring b e)))
+    (pcase (prefix-numeric-value current-prefix-arg)
+      (16 (my-gud-break-expr selection))
+      (4 (my-gud-watch-expr selection))
+      (_ (my-gud-print-expr selection))))
+  (deactivate-mark))
 
 ;;; which-func
 (defun my-copy-which-func ()
@@ -466,11 +472,19 @@ overlay arrow in source buffer."
   (kill-new (which-function))
   )
 
+(defun my-copy-with-func (b e)
+  (interactive "r")
+  (kill-new
+   (concat comment-start "in " (which-function) ":" comment-end "\n"
+           (buffer-substring b e)))
+  (deactivate-mark)
+  (message "Copied current region with function name"))
+
 (defun my-set-header-line-to-which-func ()
   (setq header-line-format
-                '((which-func-mode
-                   ("" which-func-format " ")
-                   ))))
+        '((which-func-mode
+           ("" which-func-format " ")
+           ))))
 
 ;; override bookmark-make-record for easier default bookmark name.
 (defun my-bookmark-make-record ()