From 2987818804f7435a616f75b696a018966c0c310a Mon Sep 17 00:00:00 2001
From: Yuchen Pei <id@ypei.org>
Date: Thu, 29 Jun 2023 20:01:51 +1000
Subject: some minor changes

---
 emacs/.emacs.d/init/ycp-prog.el      |  2 ++
 emacs/.emacs.d/init/ycp-vc.el        |  3 +-
 emacs/.emacs.d/lisp/my/my-mariadb.el | 54 ++++++++++++++++--------------------
 misc/.gdbinit                        |  2 +-
 misc/bin/gdb-mi.sh                   |  0
 5 files changed, 28 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 misc/bin/gdb-mi.sh

diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index cb061b2..12522f4 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -190,6 +190,8 @@
   (setq-default c-electric-flag t)
   ;; prevent backspace from untabifying
   (setq c-backspace-function 'delete-backward-char)
+  (require 'my-mariadb)
+  (add-to-list 'c-style-alist my-c-style-maria-spider)
   )
 
 (my-package my-prog
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index 1f52df6..abd02d1 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -84,7 +84,7 @@
   (:install t)
   ;; diff-hl-mode can slow down things in buffers visiting large
   ;; files, so here we only enable it for prog-mode
-  (add-hook 'prog-mode-hook diff-hl-mode)
+  (add-hook 'prog-mode-hook #'diff-hl-mode)
   (diff-hl-flydiff-mode))
 
 (my-package diffview
@@ -95,7 +95,6 @@
 (my-package git-commit
   (:install t)
   (:delay 30)
-  (setq git-commit-summary-max-length 50)
   (setq git-commit-style-convention-checks '(non-empty-second-line))
   ;; Refresh all buffers in the project after a commit for diff-hl
   (require 'my-diff-hl)
diff --git a/emacs/.emacs.d/lisp/my/my-mariadb.el b/emacs/.emacs.d/lisp/my/my-mariadb.el
index 773ddbd..bd9fd76 100644
--- a/emacs/.emacs.d/lisp/my/my-mariadb.el
+++ b/emacs/.emacs.d/lisp/my/my-mariadb.el
@@ -43,12 +43,13 @@
     (my-gdb-quit))
   (sleep-for 1)
   (my-gdb
-   (format "rr replay %s -d ~/bin/gdb-mi.sh"
+   (format "rr replay %s -d %s"
            (expand-file-name
             (replace-regexp-in-string
              "/src"
              "/build/mysql-test/var/log/mysqld.1.rr/latest-trace"
-             (project-root (project-current t)))))))
+             (project-root (project-current t))))
+           (expand-file-name "~/bin/gdb-mi.sh"))))
 
 (defun my-gdb-maria-spider ()
   (interactive)
@@ -57,38 +58,31 @@
     (my-gdb-quit))
   (sleep-for 1)
   (my-gdb
-   (format "rr replay %s -d ~/bin/gdb-mi.sh"
+   (format "rr replay %s -d %s"
            (expand-file-name
             (replace-regexp-in-string
              "/src"
              "/build/mysql-test/var/log/mysqld.1.1.rr/latest-trace"
-             (project-root (project-current t)))))))
-
-(defun my-maria-style ()
-  (setq comment-start "/* "
-        comment-end " */"
-        comment-continue "  "
-        comment-style 'extra-line))
-
-(setq my-c-style-maria-spider
-      '("maria-spider"
-        (c-basic-offset . 2)
-        (c-offsets-alist
-         . (;; no indentation when opening an brace
-            (substatement-open . 0)
-            ;; no extra space when aligning continued lines of block comments
-            (c . 0)
-            (arglist-intro . +)
-            (arglist-close . 0)
-            (arglist-cont-nonempty c-lineup-gcc-asm-reg c-lineup-arglist)
-            (arglist-cont . 0)
-            (statement-block-intro . +)
-            ))
-        ;; empty comment start on block comment continuation refill
-        (c-block-comment-prefix . "")
-))
-
-(add-to-list 'c-style-alist my-c-style-maria-spider)
+             (project-root (project-current t))))
+           (expand-file-name "~/bin/gdb-mi.sh"))))
+
+(defvar my-c-style-maria-spider
+  '("maria-spider"
+    (c-basic-offset . 2)
+    (c-offsets-alist
+     . (;; no indentation when opening an brace
+        (substatement-open . 0)
+        ;; no extra space when aligning continued lines of block comments
+        (c . +)
+        (arglist-intro . +)
+        (arglist-close . 0)
+        (arglist-cont-nonempty c-lineup-gcc-asm-reg c-lineup-arglist)
+        (arglist-cont . 0)
+        (statement-block-intro . +)
+        ))
+    ;; empty comment start on block comment continuation refill
+    (c-block-comment-prefix . "")
+    ))
 
 (defun my-mdev-22979 (beg end)
   (interactive "r")
diff --git a/misc/.gdbinit b/misc/.gdbinit
index 8923c3b..9b9916d 100644
--- a/misc/.gdbinit
+++ b/misc/.gdbinit
@@ -1,4 +1,4 @@
-print static-members off
+set print static-members off
 set print frame-arguments all
 handle SIGUSR1 nostop noprint
 handle SIGUSR2 nostop noprint
diff --git a/misc/bin/gdb-mi.sh b/misc/bin/gdb-mi.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3