Fix X clipboard functions for modern Emacs

Author: ramen

personal/init-x.el

@@ -1,29 +1,31 @@
 ;;; init-x.el --- Tweaks for X sessions.
 
-(when (eq window-system 'x)
+(when (eq (window-system) 'x)
   ;; Prevent kills from writing to clipboard (slow over remote X sessions).
-  (setq interprogram-cut-function nil)
-  (setq interprogram-paste-function nil)
+  (setq select-enable-clipboard nil)
+  (setq select-enable-primary nil)
 
   ;; Define new cut/copy/paste functions for when clipboard interaction is
   ;; actually desired.
   (defun x-cut ()
     (interactive)
-    (let ((interprogram-cut-function
-           'x-select-text))
+    (let ((select-enable-clipboard t))
+      (gui-set-selection 'CLIPBOARD
+                         (buffer-substring (region-beginning) (region-end)))
       (kill-region (region-beginning)
                    (region-end))))
   (defun x-copy ()
     (interactive)
-    (let ((interprogram-cut-function
-           'x-select-text))
+    (let ((select-enable-clipboard t))
+      (gui-set-selection 'CLIPBOARD
+                         (buffer-substring (region-beginning) (region-end)))
       (kill-ring-save (region-beginning)
                       (region-end))))
   (defun x-paste ()
     (interactive)
-    (let ((interprogram-paste-function
-           'x-cut-buffer-or-selection-value))
-      (yank)))
+    (let ((clipboard-content (gui-get-selection 'CLIPBOARD)))
+      (when clipboard-content
+        (insert clipboard-content))))
 
   ;; Bind cut/copy/paste to some useful keyboard shortcuts.
   (global-set-key [S-delete] 'x-cut)