From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
Date: Sat, 14 Oct 2023 09:07:59 +0000 (UTC) [thread overview]
Message-ID: <1697274403.ee4089c376f57979ac2a9ab900bd9294aa37bf6f.ulm@gentoo> (raw)
commit: ee4089c376f57979ac2a9ab900bd9294aa37bf6f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 08:58:41 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 09:06:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4089c3
app-emacs/gnuserv: Don't advise delete-frame
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../gnuserv/files/gnuserv-3.12.8-advice.patch | 15 +-----------
.../gnuserv/files/gnuserv-3.12.8-devices.patch | 27 ++++++++++++++++++----
.../gnuserv/files/gnuserv-3.12.8-warnings.patch | 2 +-
...v-3.12.8-r7.ebuild => gnuserv-3.12.8-r8.ebuild} | 0
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
index f4ac28efa662..90d4938751e2 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
@@ -2,7 +2,7 @@ defadvice is obsolete in Emacs 30.
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -112,38 +112,35 @@
+@@ -112,28 +112,27 @@
;; can do! If the device doesn't represent a live frame, we create
;; the frame as requested.
@@ -24,19 +24,6 @@ defadvice is obsolete in Emacs 30.
+
+ (advice-add 'make-frame :around #'gnuserv-compat-make-frame)
- ;; Advise `delete-frame' to run `delete-device-hook'. This might be a
- ;; little too hacky, but it seems to work! If someone actually tries
- ;; to do something device specific then it will probably blow up!
-- (defadvice delete-frame (before
-- gnuserv-compat-delete-frame
-- first
-- nil
-- activate)
-+ (defun gnuserv-compat-delete-frame (&optional frame _force)
- (run-hook-with-args 'delete-device-hook frame))
-
-+ (advice-add 'delete-frame :before #'gnuserv-compat-delete-frame)
-+
;; Advise `filtered-frame-list' to ignore the optional device
;; argument. Here we don't follow the mapping of devices to frames.
;; We just assume that any frame satisfying the predicate will do.
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
index 0c509a7cd842..faab53e6da1e 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
@@ -2,9 +2,29 @@ Function device-class from devices.el is not used, but collides with
a function of the same name in frame.el of Emacs 29. So, inline what
we need, and drop devices.el altogether.
+Define delete-device-hook as an alias of delete-frame-functions, so we
+need no advice for delete-frame.
+
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -153,9 +153,39 @@
+@@ -125,16 +125,6 @@
+ (setq ad-return-value device))
+ ad-do-it))
+
+- ;; Advise `delete-frame' to run `delete-device-hook'. This might be a
+- ;; little too hacky, but it seems to work! If someone actually tries
+- ;; to do something device specific then it will probably blow up!
+- (defadvice delete-frame (before
+- gnuserv-compat-delete-frame
+- first
+- nil
+- activate)
+- (run-hook-with-args 'delete-device-hook frame))
+-
+ ;; Advise `filtered-frame-list' to ignore the optional device
+ ;; argument. Here we don't follow the mapping of devices to frames.
+ ;; We just assume that any frame satisfying the predicate will do.
+@@ -153,9 +143,36 @@
(if (string-match "XEmacs" (emacs-version))
nil
@@ -14,6 +34,7 @@ we need, and drop devices.el altogether.
+ (defalias 'device-live-p 'frame-live-p)
+ (defalias 'frame-device 'identity)
+ (defalias 'make-tty-device 'ignore)
++ (defvaralias 'delete-device-hook 'delete-frame-functions)
+
+ (defun make-x-device (&optional display)
+ (if display
@@ -26,10 +47,6 @@ we need, and drop devices.el altogether.
+ the toolbar, glyphs, etc."
+ (and (cdr-safe (assq 'display (frame-parameters device))) t))
+
-+ (defvar delete-device-hook nil
-+ "Function or functions to call when a device is deleted.
-+ One argument, the to-be-deleted device.")
-+
+ (defun delete-device (device &optional force)
+ "Delete DEVICE, permanently eliminating it from use.
+ Normally, you cannot delete the last non-minibuffer-only frame (you must
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
index 113d7f0f5f37..5310f357621f 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
@@ -11,7 +11,7 @@ Fix some byte-compiler warnings
nil
;; XEmacs `make-frame' takes an optional device to create the frame
-@@ -150,7 +150,7 @@
+@@ -140,7 +140,7 @@
;; part we use devices.el from the Emacs-W3 distribution. In some
;; places the implementation seems wrong, so we "fix" it!
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
similarity index 100%
rename from app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
rename to app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
next reply other threads:[~2023-10-14 9:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-14 9:07 Ulrich Müller [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-10 21:34 [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/ Ulrich Müller
2023-10-13 19:23 Ulrich Müller
2023-10-13 11:37 Ulrich Müller
2022-04-06 8:08 Ulrich Müller
2018-08-09 18:22 Ulrich Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1697274403.ee4089c376f57979ac2a9ab900bd9294aa37bf6f.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox