From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: [PATCH] Change references to "~/.emacs.d" into `user-emacs-directory' ? Date: Sat, 12 Jan 2013 17:45:44 +0100 Message-ID: <87mwwefiyv.fsf@Rainer.invalid> References: <87a9sixrqo.fsf@yahoo.fr> <87d2xejnl9.fsf@bzg.ath.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:43070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu4Dg-000452-Px for emacs-orgmode@gnu.org; Sat, 12 Jan 2013 11:46:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tu4Db-0004cf-BL for emacs-orgmode@gnu.org; Sat, 12 Jan 2013 11:46:08 -0500 Received: from plane.gmane.org ([80.91.229.3]:44703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu4Db-0004cV-3t for emacs-orgmode@gnu.org; Sat, 12 Jan 2013 11:46:03 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Tu4Dk-00024i-UQ for emacs-orgmode@gnu.org; Sat, 12 Jan 2013 17:46:12 +0100 Received: from pd9eb5715.dip.t-dialin.net ([217.235.87.21]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 12 Jan 2013 17:46:12 +0100 Received: from Stromeko by pd9eb5715.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 12 Jan 2013 17:46:12 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain 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): --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-Compatibility-XEmacs-does-not-have-user-emacs-direct.patch Content-Transfer-Encoding: 8bit >From 59d70e47484db7cdebd9c8ac0fe2124cbe7db4b0 Mon Sep 17 00:00:00 2001 From: Achim Gratz 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) ;;;; 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 --=-=-= Content-Type: text/plain 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 --=-=-=--