From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.bugs Subject: bug#37621: [PATCH] Remove XEmacs compat code from edt.el Date: Sat, 05 Oct 2019 22:12:55 +0100 Message-ID: <87a7aeq4ko.fsf@tcd.ie> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="106808"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 37621@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Oct 05 23:14:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iGrNV-000Reb-4R for geb-bug-gnu-emacs@m.gmane.org; Sat, 05 Oct 2019 23:14:13 +0200 Original-Received: from localhost ([::1]:58836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGrNT-00033G-DK for geb-bug-gnu-emacs@m.gmane.org; Sat, 05 Oct 2019 17:14:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44471) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGrNM-00032w-Hr for bug-gnu-emacs@gnu.org; Sat, 05 Oct 2019 17:14:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGrNK-0006Kl-Va for bug-gnu-emacs@gnu.org; Sat, 05 Oct 2019 17:14:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGrNK-0006Kd-MJ for bug-gnu-emacs@gnu.org; Sat, 05 Oct 2019 17:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iGrNK-0000qM-DW for bug-gnu-emacs@gnu.org; Sat, 05 Oct 2019 17:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Oct 2019 21:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37621 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 37621-submit@debbugs.gnu.org id=B37621.15703099863168 (code B ref 37621); Sat, 05 Oct 2019 21:14:02 +0000 Original-Received: (at 37621) by debbugs.gnu.org; 5 Oct 2019 21:13:06 +0000 Original-Received: from localhost ([127.0.0.1]:45310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGrMQ-0000p2-3S for submit@debbugs.gnu.org; Sat, 05 Oct 2019 17:13:06 -0400 Original-Received: from mail-wm1-f43.google.com ([209.85.128.43]:37976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGrMN-0000oV-B3 for 37621@debbugs.gnu.org; Sat, 05 Oct 2019 17:13:04 -0400 Original-Received: by mail-wm1-f43.google.com with SMTP id 3so8879136wmi.3 for <37621@debbugs.gnu.org>; Sat, 05 Oct 2019 14:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=O3IHHqaJj6A2triVWPeKl8PgMgLN6vy5+yomR63A/v0=; b=iq8iMlgbeRO/DoXIBzZU6QMGpRa/F2O332vl8uBq9QnNkhgxuQTVs8iTuKWDMAPMhB 1V9fiI8Kbfo30LTm711lxAZQnp1RmupBnVMtv0QVmS0jRs8/QtCApS38Pt1Us8LStu1b FrxsWg7xoarsYr3dWqYGZmSBbtdQf6IR6sidFKhf8aQNlSY8DHb7Ovnh2ZpUaN9ZIEbs FpwCNGQTyW6oKU+7yluVgtPl6E4RTFiFyH/TwluoilkJPOzg9BpcwZUk7zk9/Z9KPlf8 pZD6P9JFTq7CtCXp91wQGPT00+z3CO8dJ11OD/ZzfGHjc5oy2b1CPQrk08ncmZexl/2s HViQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=O3IHHqaJj6A2triVWPeKl8PgMgLN6vy5+yomR63A/v0=; b=fZTK2Ack6SIvpBog60xcKePg93TFNcqwujuaue//f6Qf/VBntTNthqr3IxdR1J86vA EzlUnpiWIg3Z4Vv3dSy/uDFSB8Pa3Po0V2B+D19B8BzrLjmVC7F+/tsOEFYTRuK7UpK0 ib7K+lmmNfH7hDsmtjQBMrtyv3C0Q0taAnf23bEasFNgu9uIbarfAzZS1avaApjeDFWE AdEy1jFM+BUdmZgERIDFwhPZ+Ap7SmPH3OV7JwL0mPgCdwZyb3Y7H6IrQawx6I+tYOU5 gPhWntA1frAadToVvb8Wp/It/rmbhWwAAxo+a9JzNynNYzc+XaQvp9RAqvcncAqpOiuJ kSYg== X-Gm-Message-State: APjAAAWEzjBsSv32eDa1LSpM33YcnoizOiDq8OZnZ6lTqeIAhmHvx6jW 0Zeb8FPAv76sBmclLy2/aIqx6Jz28O0= X-Google-Smtp-Source: APXvYqwhi8MtIqaSLsoU2e6Jym9YDdQBoRaZUCyPDrH4VqBodPaB55LAt0ogJ9DTPJ1fhrBTp2KBTw== X-Received: by 2002:a1c:545d:: with SMTP id p29mr6150746wmi.9.1570309977363; Sat, 05 Oct 2019 14:12:57 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:92bd:1bfd:38fc:fae2]) by smtp.gmail.com with ESMTPSA id y5sm12270743wma.14.2019.10.05.14.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 14:12:56 -0700 (PDT) In-Reply-To: (Stefan Kangas's message of "Fri, 4 Oct 2019 16:08:36 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:168399 Archived-At: Stefan Kangas writes: > @@ -310,23 +305,13 @@ edt-term > ;;; > ;;; o edt-emulation-on o edt-load-keys > ;;; > -(defconst edt-emacs-variant (if (featurep 'emacs) "gnu" "xemacs") > - "Indicates Emacs variant: GNU Emacs or XEmacs (aka Lucid Emacs).") > - > -(defconst edt-window-system (if (featurep 'emacs) window-system (console-type)) > - "Indicates window system (in GNU Emacs) or console type (in XEmacs).") Hopefully no-one will complain about these constants disappearing without first being made obsolete (I won't). ;) > @@ -2037,27 +1974,16 @@ edt-emulation-on > (setq edt-term term)))) > (edt-load-keys nil)) > ;; Make highlighting of selected text work properly for EDT commands. > - (if (featurep 'emacs) > - (progn > - (setq edt-orig-transient-mark-mode > - (default-value 'transient-mark-mode)) > - (add-hook 'activate-mark-hook > - (function > - (lambda () > - (edt-select-mode t)))) > - (add-hook 'deactivate-mark-hook > - (function > - (lambda () > - (edt-select-mode nil))))) > - (progn > - (add-hook 'zmacs-activate-region-hook > - (function > - (lambda () > - (edt-select-mode t)))) > - (add-hook 'zmacs-deactivate-region-hook > - (function > - (lambda () > - (edt-select-mode nil)))))) > + (setq edt-orig-transient-mark-mode > + (default-value 'transient-mark-mode)) > + (add-hook 'activate-mark-hook > + (function > + (lambda () > + (edt-select-mode t)))) > + (add-hook 'deactivate-mark-hook > + (function > + (lambda () > + (edt-select-mode nil)))) The calls to (function ...) can be removed, as they are redundant around evaluated lambdas. Otherwise looks fine to me, FWIW. Thanks, -- Basil