summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2014-08-09 22:50:14 +0100
committerReuben Thomas <rrt@sc3d.org>2014-08-09 22:50:14 +0100
commitea2eccbb490f968d87fac056dcadc8536ea5067b (patch)
tree2df3c5cd879d0512bccffca2dc34e46917f05c1b
parentaac6be13316f360bb2df46d6708ad9eea6059dc5 (diff)
downloademacs-ea2eccbb490f968d87fac056dcadc8536ea5067b.tar.gz
emacs-ea2eccbb490f968d87fac056dcadc8536ea5067b.tar.bz2
emacs-ea2eccbb490f968d87fac056dcadc8536ea5067b.zip
src/alloc.c: remove a stray brace
-rw-r--r--src/ChangeLog1
-rw-r--r--src/alloc.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index af0589257d8..52862bfb446 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,6 @@
2014-08-09 Reuben Thomas <rrt@sc3d.org>
+ * alloc.c (Fmemory_info): Remove a stray brace.
* process.c: Fix a comment typo.
* msdos.c:
* dosfns.c (init_dosfns): Remove support for DJGPP < 2.02.
diff --git a/src/alloc.c b/src/alloc.c
index a8ad44491fa..ac154b587e6 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6915,7 +6915,6 @@ or memory information can't be obtained, return nil. */)
(uintmax_t) freeswap / 1024);
else
return Qnil;
-}
#else /* not HAVE_LINUX_SYSINFO, not WINDOWSNT, not MSDOS */
/* FIXME: add more systems. */
return Qnil;