[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115537: Minor fix in Windows-specific code in decod
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115537: Minor fix in Windows-specific code in decode_env_path. |
Date: |
Sun, 15 Dec 2013 17:52:42 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115537
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-15 19:52:14 +0200
message:
Minor fix in Windows-specific code in decode_env_path.
src/emacs.c (decode_env_path): Fix bogus comparison against
emacs_dir. Reported by Juanma Barranquero <address@hidden>.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/emacs.c emacs.c-20091113204419-o5vbwnq5f7feedwu-241
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-15 17:40:44 +0000
+++ b/src/ChangeLog 2013-12-15 17:52:14 +0000
@@ -1,3 +1,8 @@
+2013-12-15 Eli Zaretskii <address@hidden>
+
+ * emacs.c (decode_env_path): Fix bogus comparison against
+ emacs_dir. Reported by Juanma Barranquero <address@hidden>.
+
2013-12-15 Juanma Barranquero <address@hidden>
* w32fns.c (Fw32_shell_execute): Remove unused local variable.
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2013-12-09 17:20:34 +0000
+++ b/src/emacs.c 2013-12-15 17:52:14 +0000
@@ -2224,7 +2224,8 @@
/* egetenv looks in process-environment, which holds the variables
in their original system-locale encoding. We need emacs_dir to
be in UTF-8. */
- filename_from_ansi (edir, emacs_dir);
+ if (edir)
+ filename_from_ansi (edir, emacs_dir);
#endif
/* It's okay to use getenv here, because this function is only used
@@ -2299,7 +2300,7 @@
#ifdef WINDOWSNT
/* Relative file names in the default path are interpreted as
being relative to $emacs_dir. */
- if (emacs_dir && defaulted
+ if (edir && defaulted
&& strncmp (path, emacs_dir_env, emacs_dir_len) == 0)
element = Fexpand_file_name (Fsubstring
(element,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115537: Minor fix in Windows-specific code in decode_env_path.,
Eli Zaretskii <=