branch: externals/exwm
commit 41d1e6c1c3f06721de1df79578bf6089eb5ec2e6
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Deprecate xinitrc
The example configuration should not be used directly. Instead copy the
relevant settings to your X initialization script. See #57.
* xinitrc: Print warning when used.
---
exwm-config.el | 10 +++++-----
xinitrc | 6 ++++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/exwm-config.el b/exwm-config.el
index 36270a3065..a0dd994893 100644
--- a/exwm-config.el
+++ b/exwm-config.el
@@ -32,11 +32,11 @@
(defun exwm-config--warn ()
"Print obsoletion warning."
(fset #'exwm-config--warn #'ignore)
- (warn "The `exwm-config' file has been deprecated. We do not recommend
-requiring `exwm-config' directly in your Emacs configuration. Instead
-copy and modify the relevant settings to your configuration. The code
-from here will be moved out of the source repository to the manual after
-the next release. See https://github.com/emacs-exwm/exwm/issues/57.";))
+ (warn "The `exwm-config' file has been deprecated. We do not recommend
requiring
+`exwm-config' directly in your Emacs configuration. Instead copy the relevant
+settings to your configuration and modify them as needed. The code from here
+will be moved out of the source repository to the manual after the next
+release. See https://github.com/emacs-exwm/exwm/issues/57.";))
(defun exwm-config-example ()
"Default configuration of EXWM."
diff --git a/xinitrc b/xinitrc
index 591e419914..4726ac95f2 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,3 +1,9 @@
+echo "The xinitrc file has been deprecated. We do not recommend using
+xinitrc directly as is. Instead copy the relevant settings to your
+xsession or xinitrc file and modify them as needed. The code from here
+will be moved out of the source repository to the manual after the
+next release. See https://github.com/emacs-exwm/exwm/issues/57.";
+
# Disable access control for the current user.
xhost +SI:localuser:$USER
