X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/caf1fc6497bf52e22e4a43d0b172d73e8c5a205d..b6f44b18d89f8dae5dd00791d42504d37a2e9907:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 001fa29..1c484e6 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -511,6 +511,12 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
       org-export-docbook-xslt-stylesheet
       "/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl")
 
+;; Glasses.
+
+(setq glasses-separator "-"
+      glasses-separate-parentheses-p nil
+      glasses-uncapitalize-p t)
+
 ;; Some hacks to do with window placement.
 
 (defun mdw-clobber-other-windows-showing-buffer (buffer-or-name)
@@ -990,6 +996,12 @@ options."
 	   (concat (shell-quote-argument (dired-get-filename nil))
 		   " " args)))
 
+(defadvice dired-do-flagged-delete
+    (around mdw-delete-if-prefix-argument activate compile)
+  (let ((delete-by-moving-to-trash (and (null current-prefix-arg)
+					delete-by-moving-to-trash)))
+    ad-do-it))
+
 (eval-after-load "dired"
   '(define-key dired-mode-map "X" 'mdw-dired-run))
 
@@ -1927,7 +1939,7 @@ name, as a symbol."
 
 (defvar mdw-c-comment-fill-prefix
   `((,(concat "\\([ \t]*/?\\)"
-	      "\\(\*\\|//]\\)"
+	      "\\(\\*\\|//\\)"
 	      "\\([ \t]*\\)"
 	      "\\([A-Za-z]+:[ \t]*\\)?"
 	      mdw-hanging-indents)
@@ -2334,10 +2346,6 @@ name, as a symbol."
 			 "[lLfFdD]?")
 		 '(0 mdw-number-face))
 
-	   ;; Identifiers with trailing operators.
-	   (list (concat "_\\(" punctuation "\\)+")
-		 '(0 mdw-trivial-face))
-
 	   ;; And everything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 		 '(0 mdw-punct-face)))
@@ -2632,15 +2640,15 @@ name, as a symbol."
 		      "const" "continue" "create"
 		      "do"
 		      "else" "enum" "extern"
-		      "false" "final" "fn" "for"
+		      "final" "fn" "for"
 		      "if" "impl" "in"
 		      "let" "loop"
 		      "macro" "match" "mod" "move" "mut"
 		      "offsetof" "override"
-		      "priv" "pub" "pure"
+		      "priv" "proc" "pub" "pure"
 		      "ref" "return"
-		      "self" "sizeof" "static" "struct" "super"
-		      "true" "trait" "type" "typeof"
+		      "sizeof" "static" "struct" "super"
+		      "trait" "type" "typeof"
 		      "unsafe" "unsized" "use"
 		      "virtual"
 		      "where" "while"
@@ -2651,7 +2659,8 @@ name, as a symbol."
 		      "f32" "f64"
 		      "i8" "i16" "i32" "i64" "isize"
 		      "u8" "u16" "u32" "u64" "usize"
-		      "char" "str")))
+		      "char" "str"
+		      "self" "Self")))
     (setq font-lock-keywords
 	  (list
 
@@ -4037,6 +4046,7 @@ This allows you to pass a list of arguments through `ansi-term'."
 	  (magit-wip-after-apply-mode 1)
 	  (magit-wip-before-change-mode 1)
 	  (add-to-list 'magit-no-confirm 'safe-with-wip)
+	  (add-to-list 'magit-no-confirm 'trash)
 	  (push '(:eval (if (or magit-wip-after-save-local-mode
 				magit-wip-after-apply-mode
 				magit-wip-before-change-mode)
@@ -4055,6 +4065,13 @@ This allows you to pass a list of arguments through `ansi-term'."
     (around mdw-just-this-buffer activate compile)
   (let ((magit-save-repository-buffers nil)) ad-do-it))
 
+(defadvice magit-discard
+    (around mdw-delete-if-prefix-argument activate compile)
+  (let ((magit-delete-by-moving-to-trash
+	 (and (null current-prefix-arg)
+	      magit-delete-by-moving-to-trash)))
+    ad-do-it))
+
 (setq magit-repolist-columns
       '(("Name" 16 magit-repolist-column-ident nil)
 	("Version" 18 magit-repolist-column-version nil)
@@ -4096,6 +4113,19 @@ there is sadness."
 (add-hook 'find-file-hook 'mdw-try-smerge t)
 
 ;;;--------------------------------------------------------------------------
+;;; GUD, and especially GDB.
+
+;; Inhibit window dedication.  I mean, seriously, wtf?
+(defadvice gdb-display-buffer (after mdw-undedicated (buf) compile activate)
+  "Don't make windows dedicated.  Seriously."
+  (set-window-dedicated-p ad-return-value nil))
+(defadvice gdb-set-window-buffer
+    (after mdw-undedicated (name &optional ignore-dedicated window)
+     compile activate)
+  "Don't make windows dedicated.  Seriously."
+  (set-window-dedicated-p (or window (selected-window)) nil))
+
+;;;--------------------------------------------------------------------------
 ;;; MPC configuration.
 
 (eval-when-compile (trap (require 'mpc)))