commit eed2aff42fb3fecacdc7c5d0473f739cb9fa16e9
Author: Alex Pilon <[email protected]>
Date: Tue Mar 17 19:33:47 2015 -0400
Remove upstreamed patches.
diff --git a/st.suckless.org/patches/clipboardpaste.md
b/st.suckless.org/patches/clipboardpaste.md
deleted file mode 100644
index b178232..0000000
--- a/st.suckless.org/patches/clipboardpaste.md
+++ /dev/null
@@ -1,19 +0,0 @@
-clipboardpaste
-==============
-
-Description
------------
-
-This is a patch to allow pasting the contents of CLIPBOARD into st
-using Alt+Shift+Ins (Shift+Ins still pastes PRIMARY).
-
-Download
---------
-* [st-0.3-clipboardpaste.diff][0]
-
-[0]: st-0.3-clipboardpaste.diff
-
-Author
-------
-
- * Stephen Paul Weber - singpolyma
diff --git a/st.suckless.org/patches/no_clobber_clipboard.md
b/st.suckless.org/patches/no_clobber_clipboard.md
deleted file mode 100644
index b7da56d..0000000
--- a/st.suckless.org/patches/no_clobber_clipboard.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Do not clobber clipboard
-========================
-
-Description
------------
-
-By default, st sets both the primary selection and the clipboard
-selection to the (mouse) selected text. This patch changes st so that
-selecting text affects only the primary selection, not the clipboard
-selection. This patch makes st conform to the guidelines at
-[freedesktop.org](http://standards.freedesktop.org/clipboards-spec/clipboards-latest.txt).
-
-Download
---------
-
-* [st-no-clobber-clipboard.diff](st-no-clobber-clipboard.diff)
-
-Author
-------
-
- * Wander Nauta - [email protected]
diff --git a/st.suckless.org/patches/st-0.3-clipboardpaste.diff
b/st.suckless.org/patches/st-0.3-clipboardpaste.diff
deleted file mode 100644
index b37fff9..0000000
--- a/st.suckless.org/patches/st-0.3-clipboardpaste.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/st.c
-+++ b/st.c
-@@ -353,6 +353,7 @@ static void selinit(void);
- static inline bool selected(int, int);
- static void selcopy(void);
- static void selpaste(void);
-+static void clipboardpaste(void);
- static void selscroll(int, int);
-
- static int utf8decode(char *, long *);
-@@ -751,6 +752,12 @@ void selclear(XEvent *e) {
- }
-
- void
-+clipboardpaste() {
-+ Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-+ XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY, xw.win,
CurrentTime);
-+}
-+
-+void
- selrequest(XEvent *e) {
- XSelectionRequestEvent *xsre;
- XSelectionEvent xev;
-@@ -2690,8 +2697,12 @@ kpress(XEvent *ev) {
- ttywrite(buf, 3);
- break;
- case XK_Insert:
-- if(shift)
-- selpaste();
-+ if(shift) {
-+ if(meta)
-+ clipboardpaste();
-+ else
-+ selpaste();
-+ }
- break;
- case XK_Return:
- if(meta)
diff --git a/st.suckless.org/patches/st-no-clobber-clipboard.diff
b/st.suckless.org/patches/st-no-clobber-clipboard.diff
deleted file mode 100644
index b10ddab..0000000
--- a/st.suckless.org/patches/st-no-clobber-clipboard.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7552a9358aecd38006cdbcff61491ae8e713aa13 Mon Sep 17 00:00:00 2001
-From: Wander Nauta <[email protected]>
-Date: Fri, 20 Feb 2015 00:36:48 +0100
-Subject: [PATCH] Don't clobber CLIPBOARD
-
----
- st.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/st.c b/st.c
-index b9d30a7..5af4dc2 100644
---- a/st.c
-+++ b/st.c
-@@ -1080,16 +1080,9 @@ selrequest(XEvent *e) {
-
- void
- xsetsel(char *str) {
-- /* register the selection for both the clipboard and the primary */
-- Atom clipboard;
--
- free(sel.clip);
- sel.clip = str;
--
- XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
--
-- clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-- XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
- }
-
- void
---
-2.3.0
-
