From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Change references to "~/.emacs.d" into `user-emacs-directory' ?
Date: Sat, 12 Jan 2013 17:45:44 +0100 [thread overview]
Message-ID: <87mwwefiyv.fsf@Rainer.invalid> (raw)
In-Reply-To: 87d2xejnl9.fsf@bzg.ath.cx
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
Bastien writes:
>> Not sure if this is of any importance, but since the variable
>> user-emacs-directory (a defconst) exists, maybe org-mode could use it
>> instead of "~/.emacs.d". It seems only relevant for MS-DOS systems,
>> though.
>
> Applied, thanks.
This introduces a regression, since XEmacs doesn't have that variable.
This patch fixes it (apply on master):
[-- Attachment #2: 0001-Compatibility-XEmacs-does-not-have-user-emacs-direct.patch --]
[-- Type: text/x-patch, Size: 1072 bytes --]
From 59d70e47484db7cdebd9c8ac0fe2124cbe7db4b0 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat, 12 Jan 2013 12:06:20 +0100
Subject: [PATCH] Compatibility: XEmacs does not have user-emacs-directory, use
user-init-directory instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* lisp/org-compat.el (user-emacs-directory): If not bound, define as an alias to
`user-init-directory´ so that XEmacs continues to be happy with Org.
---
lisp/org-compat.el | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 687b81f..2d200b7 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -113,6 +113,11 @@ (defun org-version-check (version feature level)
\f
;;;; Emacs/XEmacs compatibility
+(eval-and-compile
+ (when (and (not (boundp 'user-emacs-directory))
+ (boundp 'user-init-directory))
+ (defvaralias 'user-emacs-directory 'user-init-directory)))
+
;; Keys
(defconst org-xemacs-key-equivalents
'(([mouse-1] . [button1])
--
1.8.1
[-- Attachment #3: Type: text/plain, Size: 192 bytes --]
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptation for Waldorf rackAttack V1.04R1:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
next prev parent reply other threads:[~2013-01-12 16:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 16:09 [PATCH] Change references to "~/.emacs.d" into `user-emacs-directory' ? Nicolas Richard
2013-01-09 16:59 ` Bastien
2013-01-12 16:45 ` Achim Gratz [this message]
2013-01-12 17:24 ` Bastien
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mwwefiyv.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--cc=emacs-orgmode@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).