summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Cassou <damien@cassou.me>2023-10-30 08:13:42 +0100
committerGitHub <noreply@github.com>2023-10-30 08:13:42 +0100
commitd35505abb1e38ddda61440b033ebd4decac7a25c (patch)
tree890ef062d3243db3bd4f84a751fa17ebeb107d08
parentd5fc55bc825203f998537c5834718e665bb87c29 (diff)
parent3dcc9b99eccaea9a060a0b506d49296583e4618f (diff)
Merge pull request #7 from DamienCassou/miscexternals/gpastel
Misc changes
-rw-r--r--.github/FUNDING.yml12
-rw-r--r--.github/workflows/test.yml9
-rw-r--r--.gitlab-ci.yml15
-rw-r--r--Makefile2
-rw-r--r--README.org2
-rw-r--r--gpastel.el7
6 files changed, 28 insertions, 19 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..c28872e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: damien-cassou
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: DamienCassou # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..d8d5d9a
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,9 @@
+name: CI
+
+on:
+ pull_request:
+
+jobs:
+ compile:
+ name: Compile
+ uses: DamienCassou/emacs-workflows/.github/workflows/makel.yml@main
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index fbcf2b4..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-image: alpine:latest
-
-.test_job_template: &test_job_definition
- script:
- - emacs --version
- - make ci-dependencies
- - make check
-
-test:emacs:25.3:
- image: silex/emacs:25.3-dev
- <<: *test_job_definition
-
-test:emacs:26:
- image: silex/emacs:26-dev
- <<: *test_job_definition
diff --git a/Makefile b/Makefile
index 7790096..a44699d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ makel.mk:
curl \
--fail --silent --show-error --insecure --location \
--retry 9 --retry-delay 9 \
- -O https://gitlab.petton.fr/DamienCassou/makel/raw/v0.5.1/makel.mk; \
+ -O https://github.com/DamienCassou/makel/raw/v0.8.0/makel.mk; \
fi
# Include makel.mk if present
diff --git a/README.org b/README.org
index 02d6f39..cd0654c 100644
--- a/README.org
+++ b/README.org
@@ -105,7 +105,7 @@ Add the following to your initialization file:
** License
-See [[file:COPYING][COPYING]]. Copyright (c) 2018 Damien Cassou.
+See [[file:COPYING][COPYING]]. Copyright (c) 2018-2023 Damien Cassou.
#+BEGIN_HTML
<a href="https://liberapay.com/DamienCassou/donate">
diff --git a/gpastel.el b/gpastel.el
index 8e1fa7d..737d6f0 100644
--- a/gpastel.el
+++ b/gpastel.el
@@ -1,9 +1,9 @@
;;; gpastel.el --- Integrates GPaste with the kill-ring -*- lexical-binding: t; -*-
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2023 Free Software Foundation, Inc.
;; Author: Damien Cassou <damien@cassou.me>
-;; Url: https://gitlab.petton.fr/DamienCassou/desktop-environment
+;; Url: https://github.com/DamienCassou/gpastel
;; Package-requires: ((emacs "25.1"))
;; Version: 0.5.0
;; Keywords: tools
@@ -161,6 +161,8 @@ all text in the GPaste clipboard."
(cl-defmethod gui-backend-set-selection (selection-symbol value
&context (window-system nil))
+ "Don't know what this code is about anymore.
+SELECTION-SYMBOL VALUE WINDOW-SYSTEM."
(if (not (and gpastel-mode (eq selection-symbol 'CLIPBOARD)))
(cl-call-next-method)
(gpastel-dbus-call #'dbus-call-method "Add" value)))
@@ -175,6 +177,7 @@ all text in the GPaste clipboard."
(selection-symbol value
&context (window-system nil)
((terminal-parameter nil 'xterm--set-selection) (eql t)))
+ "Don't know what this code is about anymore."
;; Disable this method which doesn't work anyway in 99% of the cases!
(setf (terminal-parameter nil 'xterm--set-selection) nil)
;; Try again!