some minor changes

1 files changed, 24 insertions, 30 deletions

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")