[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109450: * emacs.c (decode_env_path):
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109450: * emacs.c (decode_env_path): Only use defaulted if WINDOWSNT. |
Date: |
Sun, 05 Aug 2012 23:44:21 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109450
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2012-08-05 23:44:21 +0200
message:
* emacs.c (decode_env_path): Only use defaulted if WINDOWSNT.
modified:
src/ChangeLog
src/emacs.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-05 15:47:28 +0000
+++ b/src/ChangeLog 2012-08-05 21:44:21 +0000
@@ -1,3 +1,7 @@
+2012-08-05 Andreas Schwab <address@hidden>
+
+ * emacs.c (decode_env_path): Only use defaulted if WINDOWSNT.
+
2012-08-05 Dmitry Antipov <address@hidden>
Generalize common compile-time constants.
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2012-08-05 07:45:12 +0000
+++ b/src/emacs.c 2012-08-05 21:44:21 +0000
@@ -2242,8 +2242,8 @@
{
const char *path, *p;
Lisp_Object lpath, element, tem;
+#ifdef WINDOWSNT
int defaulted = 0;
-#ifdef WINDOWSNT
const char *emacs_dir = egetenv ("emacs_dir");
static const char *emacs_dir_env = "%emacs_dir%/";
const size_t emacs_dir_len = strlen (emacs_dir_env);
@@ -2259,7 +2259,9 @@
if (!path)
{
path = defalt;
+#ifdef WINDOWSNT
defaulted = 1;
+#endif
}
#ifdef DOS_NT
/* Ensure values from the environment use the proper directory separator. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109450: * emacs.c (decode_env_path): Only use defaulted if WINDOWSNT.,
Andreas Schwab <=