summaryrefslogtreecommitdiff
path: root/emacs/patches/010-fix-init-env.patch
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2011-01-02 23:27:23 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2011-01-02 23:27:23 +0100
commit9352995934adec8059077af241c35ccd1573bd80 (patch)
tree60286e266b3b31b90b952ac37e12a1ebbcdd2eb6 /emacs/patches/010-fix-init-env.patch
parentef3b84d78197acbd45d73a9b1ae44b47b5904290 (diff)
parent880bca260c4ce91554a49b2475232cf5c0ffd447 (diff)
downloadqipackages-fork-master.tar.gz
Merge branch 'master' of git://projects.qi-hardware.com/openwrt-packagesHEADmaster
Conflicts: links/Makefile
Diffstat (limited to 'emacs/patches/010-fix-init-env.patch')
-rw-r--r--emacs/patches/010-fix-init-env.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/emacs/patches/010-fix-init-env.patch b/emacs/patches/010-fix-init-env.patch
new file mode 100644
index 0000000..a03a9c4
--- /dev/null
+++ b/emacs/patches/010-fix-init-env.patch
@@ -0,0 +1,15 @@
+Index: emacs23.2-openwrt-q/src/emacs.c
+===================================================================
+--- emacs23.2-openwrt-q.orig/src/emacs.c 2010-12-18 20:24:35.000000000 +0100
++++ emacs23.2-openwrt-q/src/emacs.c 2010-12-18 20:28:41.000000000 +0100
+@@ -1735,6 +1735,10 @@
+ #endif /* HAVE_NTGUI */
+ }
+
++ /* syms_of_callproc() resets process-environment to nil; generating it again
++ * here, as workaround (probably only hits us since we're not dumping */
++ set_initial_environment();
++
+ init_charset ();
+
+ init_editfns (); /* init_process uses Voperating_system_release. */