Merge from trunk and from gnulib stdio.

4 files changed, 84 insertions, 28 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fdf57152294..26e343ddde4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,8 +2,6 @@
 
         * fileio.c (Fcopy_file): Report error if fchown or fchmod fail.
 
-2011-03-20  Paul Eggert  <eggert@cs.ucla.edu>
-
         * emacs.c (Fdaemon_initialized): Do not ignore I/O errors (Bug#8303).
 
         * process.c (Fmake_network_process): Use socklen_t, not int,
@@ -24,8 +22,6 @@
         (FIRST_PROC_DESC, IF_NON_BLOCKING_CONNECT): Remove unused macros.
         (create_process): Use 'volatile' to avoid vfork clobbering (Bug#8298).
 
-2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
-
         Make tparam.h and terminfo.c consistent.
         * cm.c (tputs, tgoto, BC, UP): Remove extern decls.  Include
         tparam.h instead, since it declares them.
@@ -61,8 +57,6 @@
         (find_automatic_composition): Mark vars as initialized,
         with a FIXME (Bug#8290).
 
-2011-03-18  Paul Eggert  <eggert@cs.ucla.edu>
-
         character.h: Rename locals to avoid shadowing.
         * character.h (PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE):
         (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE, FETCH_CHAR_ADVANCE):
@@ -101,6 +95,31 @@
         * callproc.c (call_process_cleanup): Now static.
         (relocate_fd): Rename locals to avoid shadowing.
 
+2011-03-20  Glenn Morris  <rgm@gnu.org>
+
+        * config.in: Remove file.
+
+2011-03-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (Vcompleting_read_function): Don't declare, global variables
+        are now in src/globals.h.
+        (syms_of_minibuf): Remove spurious & from previous change.
+
+2011-03-20  Leo  <sdl.web@gmail.com>
+
+        * minibuf.c (completing-read-function): New variable.
+        (completing-read-default): Rename from completing-read.
+        (completing-read): Call completing-read-function.
+
+2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xfaces.c (Fx_load_color_file):
+        Read color file from absolute filename (bug#8250).
+
+2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Update dependencies.
+
 2011-03-17  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in ($(BLD)/unexw32.$(O)): Depend on $(SRC)/unexec.h.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 3d882b23d6b..62c40ca1f94 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -221,7 +221,7 @@ GLOBAL_SOURCES =   dosfns.c msdos.c \
         region-cache.c sound.c atimer.c \
         doprnt.c intervals.c textprop.c composite.c
 SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
-  xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
+        xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
 obj = $(GLOBAL_SOURCES:.c=.o)
 
 globals.h: gl-stamp
@@ -386,6 +386,7 @@ $(BLD)/alloc.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -396,7 +397,6 @@ $(BLD)/alloc.$(O) : \
         $(SRC)/frame.h \
         $(SRC)/intervals.h \
         $(SRC)/keyboard.h \
-        $(PROCESS_H) \
         $(SRC)/puresize.h \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
@@ -484,8 +484,10 @@ $(BLD)/callproc.$(O) : \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -497,7 +499,6 @@ $(BLD)/callproc.$(O) : \
         $(SRC)/dispextern.h \
         $(SRC)/epaths.h \
         $(SRC)/frame.h \
-        $(PROCESS_H) \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
         $(SRC)/systty.h \
@@ -653,6 +654,7 @@ $(BLD)/dired.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/dir.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(EMACS_ROOT)/lib/filemode.h \
         $(LISP_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
@@ -662,7 +664,6 @@ $(BLD)/dired.$(O) : \
         $(SRC)/coding.h \
         $(SRC)/commands.h \
         $(SRC)/composite.h \
-        $(EMACS_ROOT)/lib/filemode.h \
         $(SRC)/ndir.h \
         $(SRC)/regex.h \
         $(SRC)/systime.h
@@ -673,6 +674,7 @@ $(BLD)/dispnew.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -687,7 +689,6 @@ $(BLD)/dispnew.$(O) : \
         $(SRC)/indent.h \
         $(SRC)/intervals.h \
         $(SRC)/keyboard.h \
-        $(PROCESS_H) \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
         $(SRC)/termchar.h \
@@ -726,8 +727,8 @@ $(BLD)/editfns.$(O) : \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/strftime.h \
         $(EMACS_ROOT)/lib/intprops.h \
+        $(EMACS_ROOT)/lib/strftime.h \
         $(LISP_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
@@ -747,8 +748,10 @@ $(BLD)/emacs.$(O) : \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -757,15 +760,14 @@ $(BLD)/emacs.$(O) : \
         $(SRC)/composite.h \
         $(SRC)/dispextern.h \
         $(SRC)/frame.h \
-        $(SRC)/gnutls.h \
         $(SRC)/intervals.h \
         $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(PROCESS_H) \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
         $(SRC)/systty.h \
         $(SRC)/termhooks.h \
+        $(SRC)/unexec.h \
         $(SRC)/w32.h \
         $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
@@ -837,6 +839,7 @@ $(BLD)/fns.$(O) : \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/langinfo.h \
         $(EMACS_ROOT)/nt/inc/nl_types.h \
+        $(EMACS_ROOT)/nt/inc/stdint.h \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(EMACS_ROOT)/lib/md5.h \
@@ -1030,6 +1033,7 @@ $(BLD)/keyboard.$(O) : \
         $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1044,7 +1048,6 @@ $(BLD)/keyboard.$(O) : \
         $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/macros.h \
-        $(PROCESS_H) \
         $(SRC)/puresize.h \
         $(SRC)/syntax.h \
         $(SRC)/syssignal.h \
@@ -1182,11 +1185,11 @@ $(BLD)/w32.$(O) : \
         $(EMACS_ROOT)/nt/inc/sys/socket.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/coding.h \
         $(SRC)/composite.h \
         $(SRC)/dispextern.h \
         $(SRC)/ndir.h \
-        $(PROCESS_H) \
         $(SRC)/systime.h \
         $(SRC)/w32.h \
         $(SRC)/w32gui.h \
@@ -1225,11 +1228,11 @@ $(BLD)/w32proc.$(O) : \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/character.h \
         $(SRC)/coding.h \
         $(SRC)/composite.h \
         $(SRC)/dispextern.h \
-        $(PROCESS_H) \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
         $(SRC)/syswait.h \
@@ -1261,6 +1264,7 @@ $(BLD)/print.$(O) : \
         $(EMACS_ROOT)/lib/ftoastr.h \
         $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1274,7 +1278,6 @@ $(BLD)/print.$(O) : \
         $(SRC)/frame.h \
         $(SRC)/intervals.h \
         $(SRC)/keyboard.h \
-        $(PROCESS_H) \
         $(SRC)/systime.h \
         $(SRC)/termchar.h \
         $(SRC)/termhooks.h \
@@ -1289,9 +1292,11 @@ $(BLD)/process.$(O) : \
         $(EMACS_ROOT)/nt/inc/arpa/inet.h \
         $(EMACS_ROOT)/nt/inc/netinet/in.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/socket.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1302,7 +1307,6 @@ $(BLD)/process.$(O) : \
         $(SRC)/dispextern.h \
         $(SRC)/frame.h \
         $(SRC)/keyboard.h \
-        $(PROCESS_H) \
         $(SRC)/sysselect.h \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
@@ -1415,10 +1419,12 @@ $(BLD)/sysdep.$(O) : \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/socket.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(EMACS_ROOT)/lib/ignore-value.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/cm.h \
@@ -1427,7 +1433,6 @@ $(BLD)/sysdep.$(O) : \
         $(SRC)/dispextern.h \
         $(SRC)/frame.h \
         $(SRC)/keyboard.h \
-        $(PROCESS_H) \
         $(SRC)/sysselect.h \
         $(SRC)/syssignal.h \
         $(SRC)/systime.h \
@@ -1445,6 +1450,7 @@ $(BLD)/term.$(O) : \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
         $(SRC)/atimer.h \
@@ -1500,9 +1506,9 @@ $(BLD)/textprop.$(O) : \
 
 $(BLD)/tparam.$(O) : \
         $(SRC)/tparam.c \
-        $(SRC)/tparam.h \
         $(CONFIG_H) \
-        $(LISP_H)
+        $(LISP_H) \
+        $(SRC)/tparam.h
 
 $(BLD)/undo.$(O) : \
         $(SRC)/undo.c \
@@ -1516,8 +1522,8 @@ $(BLD)/undo.$(O) : \
 
 $(BLD)/unexw32.$(O) : \
         $(SRC)/unexw32.c \
-        $(SRC)/unexec.h \
         $(CONFIG_H) \
+        $(SRC)/unexec.h \
         $(SRC)/w32heap.h
 
 $(BLD)/vm-limit.$(O) : \
@@ -1557,6 +1563,7 @@ $(BLD)/xdisp.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1576,7 +1583,6 @@ $(BLD)/xdisp.$(O) : \
         $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/macros.h \
-        $(PROCESS_H) \
         $(SRC)/region-cache.h \
         $(SRC)/systime.h \
         $(SRC)/termchar.h \
@@ -1668,8 +1674,10 @@ $(BLD)/w32term.$(O) : \
         $(SRC)/w32term.c \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/unistd.h \
+        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
+        $(PROCESS_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1686,7 +1694,6 @@ $(BLD)/w32term.$(O) : \
         $(SRC)/intervals.h \
         $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(PROCESS_H) \
         $(SRC)/systime.h \
         $(SRC)/systty.h \
         $(SRC)/termchar.h \
@@ -1709,7 +1716,6 @@ $(BLD)/w32select.$(O) : \
         $(SRC)/charset.h \
         $(SRC)/coding.h \
         $(SRC)/composite.h \
-        $(SRC)/keyboard.h \
         $(SRC)/systime.h \
         $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
diff --git a/src/minibuf.c b/src/minibuf.c
index 8ff861b2403..b6b79be9d3f 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -72,6 +72,7 @@ Lisp_Object Qcompletion_ignore_case;
 Lisp_Object Qminibuffer_completion_table;
 Lisp_Object Qminibuffer_completion_predicate;
 Lisp_Object Qminibuffer_completion_confirm;
+Lisp_Object Qcompleting_read_default;
 Lisp_Object Quser_variable_p;
 
 Lisp_Object Qminibuffer_default;
@@ -1674,7 +1675,27 @@ If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits
   the current input method and the setting of `enable-multibyte-characters'.
 
 Completion ignores case if the ambient value of
-  `completion-ignore-case' is non-nil.  */)
+  `completion-ignore-case' is non-nil.
+
+See also `completing-read-function'.  */)
+  (Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method)
+{
+  Lisp_Object args[9];
+  args[0] = Vcompleting_read_function;
+  args[1] = prompt;
+  args[2] = collection;
+  args[3] = predicate;
+  args[4] = require_match;
+  args[5] = initial_input;
+  args[6] = hist;
+  args[7] = def;
+  args[8] = inherit_input_method;
+  return Ffuncall (9, args);
+}
+
+DEFUN ("completing-read-default", Fcompleting_read_default, Scompleting_read_default, 2, 8, 0,
+       doc: /* Default method for reading from the minibuffer with completion.
+See `completing-read' for the meaning of the arguments.  */)
   (Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method)
 {
   Lisp_Object val, histvar, histpos, position;
@@ -1972,6 +1993,9 @@ syms_of_minibuf (void)
   minibuf_save_list = Qnil;
   staticpro (&minibuf_save_list);
 
+  Qcompleting_read_default = intern_c_string ("completing-read-default");
+  staticpro (&Qcompleting_read_default);
+
   Qcompletion_ignore_case = intern_c_string ("completion-ignore-case");
   staticpro (&Qcompletion_ignore_case);
 
@@ -2116,6 +2140,12 @@ If the value is `confirm-after-completion', the user may exit with an
                doc: /* Non-nil means completing file names.  */);
   Vminibuffer_completing_file_name = Qnil;
 
+  DEFVAR_LISP ("completing-read-function",
+               Vcompleting_read_function,
+               doc: /* The function called by `completing-read' to do the work.
+It should accept the same arguments as `completing-read'.  */);
+  Vcompleting_read_function = Qcompleting_read_default;
+
   DEFVAR_LISP ("minibuffer-help-form", Vminibuffer_help_form,
                doc: /* Value that `help-form' takes on inside the minibuffer.  */);
   Vminibuffer_help_form = Qnil;
@@ -2191,4 +2221,5 @@ properties.  */);
   defsubr (&Stest_completion);
   defsubr (&Sassoc_string);
   defsubr (&Scompleting_read);
+  defsubr (&Scompleting_read_default);
 }
diff --git a/src/xfaces.c b/src/xfaces.c
index 50bcab3c6a9..0fc5dd6f8a3 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6297,7 +6297,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string.  */)
   CHECK_STRING (filename);
   abspath = Fexpand_file_name (filename, Qnil);
 
-  fp = fopen (SDATA (filename), "rt");
+  fp = fopen (SDATA (abspath), "rt");
   if (fp)
     {
       char buf[512];