From 95258c55d6bb0eb29f65795847fa35575de945cf Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 7 Oct 2019 18:06:13 -0400 Subject: [PATCH] Remove xclip-mode & osx-clipboard-mode Due to the varied approaches to terminal environments, I leave it up to the user to handle restoration of the clipboard. --- core/core-editor.el | 9 --------- core/packages.el | 2 -- 2 files changed, 11 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index eee289a9b..4e34ae00e 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -112,15 +112,6 @@ possible." ;; Save clipboard contents into kill-ring before replacing them (setq save-interprogram-paste-before-kill t) -;; Fix the clipboard in terminal or daemon Emacs (non-GUI) -(add-hook! 'tty-setup-hook - (defun doom-init-clipboard-in-tty-emacs-h () - (unless (getenv "SSH_CONNECTION") - (cond (IS-MAC - (if (require 'osx-clipboard nil t) (osx-clipboard-mode))) - ((executable-find "xclip") - (if (require 'xclip nil t) (xclip-mode))))))) - ;; ;;; Extra file extensions to support diff --git a/core/packages.el b/core/packages.el index cef817150..fb3e9091b 100644 --- a/core/packages.el +++ b/core/packages.el @@ -31,13 +31,11 @@ ;; I've created my own mirror for it because git.savannah.gnu.org runs on a ;; potato. :recipe (:host github :repo "hlissner/emacs-so-long")) -(package! osx-clipboard :ignore (not IS-MAC)) (package! undo-tree ;; NOTE The version of undo-tree published to ELPA is over 5 years old and ;; missing some fixes. Just use the maintainer's repo directly. :recipe (:host nil :repo "http://www.dr-qubit.org/git/undo-tree.git")) (package! ws-butler) -(package! xclip :ignore (not IS-LINUX)) ;; core-projects.el (package! projectile)