2 files changed, 23 insertions, 9 deletions
diff --git a/emacs/.emacs.d/lisp/my/my-emms.el b/emacs/.emacs.d/lisp/my/my-emms.el
index fa0ae17..ffb6bc0 100644
--- a/emacs/.emacs.d/lisp/my/my-emms.el
+++ b/emacs/.emacs.d/lisp/my/my-emms.el
@@ -139,7 +139,7 @@
   (mapc 'my-emms-load-from-native my-emms-native-playlists)
   (emms-metaplaylist-mode-go))
 
-(defun my-emms-deduplicate ()
+(defun my-emms-playlist-deduplicate ()
   (interactive)
   (emms-mark-regexp ".* ([0-9])\\.[a-zA-Z0-9]+" nil)
   (emms-mark-delete-marked-tracks))
@@ -159,6 +159,16 @@ either 'audio or 'video
                              (alist-get type my-extension-types)))
     (with-current-buffer to (emms-sort))))
 
+(defun my-emms-players-preference (track players)
+  "If audio, use first player, otherwise second."
+  (let ((name (emms-track-name track)))
+    (if (and (length> players 1)
+             (string-prefix-p "file://" name)
+             (member (file-name-extension name)
+                     '("mkv" "mp4" "ogv" "avi" "webm")))
+        'emms-player-vlc
+      'emms-player-mpv)))
+
 (defvar my-emms-playlist-alist nil
   "alist controlling playlists, where the cdr of each item is an also an alist,
 with possible keys 'source and 'type.
diff --git a/emacs/.emacs.d/lisp/my/my-prog.el b/emacs/.emacs.d/lisp/my/my-prog.el
index 9d6a778..9c75a22 100644
--- a/emacs/.emacs.d/lisp/my/my-prog.el
+++ b/emacs/.emacs.d/lisp/my/my-prog.el
@@ -54,6 +54,13 @@
   (sleep-for .1)
   (my-comint-revive))
 
+(defun my-comint-add-write-history-hook ()
+  "Add `comint-write-input-ring' to `kill-buffer-hook'.
+
+To use as a hook to comint mode, so that history is updated on
+buffer kill."
+  (add-hook 'kill-buffer-hook 'comint-write-input-ring 0 t))
+
 (defvar my-comint-revive-commands
   '((shell-mode . my-shell-revive)
     (inferior-emacs-lisp-mode . ielm))
@@ -329,12 +336,9 @@ left and the source buffer on the right.
 
 (defun my-gdb-quit ()
   (interactive)
-  (let ((old-window (selected-window)))
-    (select-window (get-buffer-window gud-comint-buffer))
-    (goto-char (point-max))
-    (gdb-delchar-or-quit 0)
-    (my-toggle-lock-current-window-to-buffer)
-    (when (window-live-p old-window) (select-window old-window))))
+  (let ((kill-buffer-query-functions nil))
+    (kill-buffer gud-comint-buffer))
+  )
 
 (defun my-gdb-frames-add-breakpoint ()
   (interactive)
@@ -394,8 +398,8 @@ left and the source buffer on the right.
     record))
 
 ;;; bison-mode
-(require 'bison-mode)
 (defun my-bison-imenu-create-index ()
+  (require 'bison-mode)
   (let ((end))
     (beginning-of-buffer)
     (re-search-forward "^%%")
@@ -409,8 +413,8 @@ left and the source buffer on the right.
         'my-bison-imenu-create-index))
 
 ;;; json-mode
-(require 'json-mode)
 (defun my-json-mode-path ()
+  (require 'json-mode)
   (string-join
    (mapcar 'prin1-to-string (plist-get (json-path-to-position (point)) :path))
    "/"))