X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/20b6cd68765b7502483e411dea6c75f455c6f808..e48c2e5bf23439a671ced9423003faa49c1510ca:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index dcbaa78..a75d95c 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -990,6 +990,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))
 
@@ -1012,6 +1018,9 @@ If NEW-SESSION-P, start a new session."
 	    (w3m-browse-url url new-session-p))
 	(select-window window)))))
 
+(eval-after-load 'w3m
+  '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
+
 (defvar mdw-good-url-browsers
   '(browse-url-chromium
     browse-url-mozilla
@@ -1924,7 +1933,7 @@ name, as a symbol."
 
 (defvar mdw-c-comment-fill-prefix
   `((,(concat "\\([ \t]*/?\\)"
-	      "\\(\*\\|//]\\)"
+	      "\\(\\*\\|//\\)"
 	      "\\([ \t]*\\)"
 	      "\\([A-Za-z]+:[ \t]*\\)?"
 	      mdw-hanging-indents)
@@ -2331,10 +2340,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)))
@@ -4034,6 +4039,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)
@@ -4052,6 +4058,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)
@@ -4093,6 +4106,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)))