From eadf1faa3cb5eea8c25a5166a9a97ebd63525c56 Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Tue, 20 Nov 2012 15:06:17 -0500
Subject: Conflate Qnil and Qunbound for `symbol-function'. * src/alloc.c
(Fmake_symbol): Initialize `function' to Qnil. * src/lread.c (init_obarray):
Set `function' fields to Qnil. * src/eval.c (Fcommandp): Ignore Qunbound.
(Fautoload, eval_sub, Fapply, Ffuncall, Fmacroexpand): * src/data.c (Ffset,
Ffboundp, indirect_function, Findirect_function): Test NILP rather than
Qunbound. (Ffmakunbound): Set to Qnil. (Fsymbol_function): Never signal an
error. (Finteractive_form): Ignore Qunbound.
---
src/alloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/alloc.c')
diff --git a/src/alloc.c b/src/alloc.c
index a66a752f5dc..22e3db3cc77 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3212,7 +3212,7 @@ static struct Lisp_Symbol *symbol_free_list;
DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0,
doc: /* Return a newly allocated uninterned symbol whose name is NAME.
-Its value and function definition are void, and its property list is nil. */)
+Its value is void, and its function definition and property list are nil. */)
(Lisp_Object name)
{
register Lisp_Object val;
@@ -3249,7 +3249,7 @@ Its value and function definition are void, and its property list is nil. */)
set_symbol_plist (val, Qnil);
p->redirect = SYMBOL_PLAINVAL;
SET_SYMBOL_VAL (p, Qunbound);
- set_symbol_function (val, Qunbound);
+ set_symbol_function (val, Qnil);
set_symbol_next (val, NULL);
p->gcmarkbit = 0;
p->interned = SYMBOL_UNINTERNED;
--
cgit v1.2.1
From 9239d970523919dfcf7437f728f4976b3a9467f3 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Wed, 21 Nov 2012 13:06:52 -0800
Subject: Assume POSIX 1003.1-1988 or later for unistd.h.
* admin/CPP-DEFINES (BROKEN_GETWD, HAVE_GETCWD, HAVE_GETWD, HAVE_SIZE_T)
(HAVE_UNISTD_H): Remove.
* configure.ac: Do not check for getcwd or getwd.
* lib-src/emacsclient.c (getcwd): Remove decl.
(get_current_dir_name): Assume getcwd exists.
* lib-src/etags.c (HAVE_GETCWD): Remove.
(getcwd): Remove decl.
(NO_LONG_OPTIONS): Remove this. All uses removed.
Emacs always has GNU getopt.
(etags_getcwd): Assume getcwd exists.
* lib-src/movemail.c (F_OK, X_OK, W_OK, R_OK): Remove.
* nt/config.nt (HAVE_GETCWD): Remove.
* src/alloc.c: Assume unistd.h exists.
* src/fileio.c (Fexpand_file_name) [DOS_NT]: Use getcwd, not getwd.
* src/sysdep.c (get_current_dir_name): Assume getcwd exists.
(getwd) [USG]: Remove; no longer needed.
(sys_subshell) [DOS_NT]: Use getcwd, not getwd.
* src/w32.c (getcwd): Rename from getwd, and switch to getcwd's API.
* src/w32.h (getcwd): Remove decl.
Fixes: debbugs:12945
---
src/alloc.c | 4 ----
1 file changed, 4 deletions(-)
(limited to 'src/alloc.c')
diff --git a/src/alloc.c b/src/alloc.c
index 22e3db3cc77..46b2dde93a3 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -63,10 +63,6 @@ along with GNU Emacs. If not, see . */
#endif
#include
-#ifndef HAVE_UNISTD_H
-extern void *sbrk ();
-#endif
-
#include
#ifdef USE_GTK
--
cgit v1.2.1
From 5c74767510841c8afc35f66f5cb068fe99f29615 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov
Date: Thu, 22 Nov 2012 13:32:32 +0400
Subject: * alloc.c (Fgarbage_collect): Unblock input after clearing
gc_in_progress to avoid note_mouse_highlight glitch with GC. * frame.h
(FRAME_MOUSE_UPDATE): New macro. * msdos.c (IT_frame_up_to_date): Use it
here... * w32term.c (w32_frame_up_to_date): ...here... * xterm.c
(XTframe_up_to_date): ...and here... * nsterm.m (ns_frame_up_to_date): ...but
not here. * lisp.h (Mouse_HLInfo): Remove mouse_face_deferred_gc member.
Adjust users. * xdisp.c (message2_nolog, message3_nolog,
note_mouse_highlight): Do not check whether GC is in progress.
---
src/alloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/alloc.c')
diff --git a/src/alloc.c b/src/alloc.c
index 46b2dde93a3..28c9b51dab4 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5331,12 +5331,12 @@ See Info node `(elisp)Garbage Collection'. */)
dump_zombies ();
#endif
- unblock_input ();
-
check_cons_list ();
gc_in_progress = 0;
+ unblock_input ();
+
consing_since_gc = 0;
if (gc_cons_threshold < GC_DEFAULT_THRESHOLD / 10)
gc_cons_threshold = GC_DEFAULT_THRESHOLD / 10;
--
cgit v1.2.1