summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-03-09 07:49:33 +0000
committerAndrea Corallo <akrl@sdf.org>2020-03-09 07:49:33 +0000
commit87ee6ff4eb6df369965f37fba073e3ef1bb5d0bd (patch)
tree2af79516bca28e875879e01cb45b16fa4525a905 /src/emacs.c
parent9838ee7ed870844470703b2648f8b59c0575bd46 (diff)
parenta461baae79af3cea8780e9d9a845a1e859e96e5e (diff)
downloademacs-87ee6ff4eb6df369965f37fba073e3ef1bb5d0bd.tar.gz
emacs-87ee6ff4eb6df369965f37fba073e3ef1bb5d0bd.tar.bz2
emacs-87ee6ff4eb6df369965f37fba073e3ef1bb5d0bd.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index ce1c9edc2dc..fcc02a3a874 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1974,7 +1974,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
/* This calls putenv and so must precede init_process_emacs. */
init_timefns ();
- /* This sets Voperating_system_release, which init_process_emacs uses. */
init_editfns ();
/* These two call putenv. */