Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 104305. ------------------------------------------------------------ revno: 104305 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:27:00 -0700 message: * lib-src/etags.c: Fix typo in previous comment change. diff: === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-05-21 02:08:21 +0000 +++ lib-src/etags.c 2011-05-21 02:27:00 +0000 @@ -93,7 +93,7 @@ #ifdef HAVE_CONFIG_H # include - /* This is probably not necessary any more. On some systms, config.h + /* This is probably not necessary any more. On some systems, config.h used to define static as nothing for the sake of unexec. We don't want that here since we don't use unexec. None of these systems are supported any more, but the idea is still mentioned in ------------------------------------------------------------ revno: 104304 [merge] committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:15:34 -0700 message: Merge from emacs-23; up to r100582. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-21 02:04:48 +0000 +++ src/ChangeLog 2011-05-21 02:15:34 +0000 @@ -1,3 +1,8 @@ +2011-05-21 YAMAMOTO Mitsuharu + + * dispnew.c (scrolling_window): Don't exclude the case that the + last enabled row in the desired matrix touches the bottom boundary. + 2011-05-21 Glenn Morris * Makefile.in ($(etc)/DOC): Make second command line even shorter. === modified file 'src/dispnew.c' --- src/dispnew.c 2011-05-12 07:07:06 +0000 +++ src/dispnew.c 2011-05-21 02:15:34 +0000 @@ -4330,23 +4330,29 @@ first_old = first_new = i; - /* Set last_new to the index + 1 of the last enabled row in the - desired matrix. */ + /* Set last_new to the index + 1 of the row that reaches the + bottom boundary in the desired matrix. Give up if we find a + disabled row before we reach the bottom boundary. */ i = first_new + 1; - while (i < desired_matrix->nrows - 1 - && MATRIX_ROW (desired_matrix, i)->enabled_p - && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) - ++i; + while (i < desired_matrix->nrows - 1) + { + int bottom; - if (!MATRIX_ROW (desired_matrix, i)->enabled_p) - return 0; + if (!MATRIX_ROW (desired_matrix, i)->enabled_p) + return 0; + bottom = MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)); + if (bottom <= yb) + ++i; + if (bottom >= yb) + break; + } last_new = i; - /* Set last_old to the index + 1 of the last enabled row in the - current matrix. We don't look at the enabled flag here because - we plan to reuse part of the display even if other parts are - disabled. */ + /* Set last_old to the index + 1 of the row that reaches the bottom + boundary in the current matrix. We don't look at the enabled + flag here because we plan to reuse part of the display even if + other parts are disabled. */ i = first_old + 1; while (i < current_matrix->nrows - 1) { ------------------------------------------------------------ revno: 104303 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:09:49 -0700 message: image-mode fix for bug#8567. * image-mode.el (image-after-revert-hook): Redraw all frames on which the image is visible. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-21 02:07:25 +0000 +++ lisp/ChangeLog 2011-05-21 02:09:49 +0000 @@ -1,5 +1,8 @@ 2011-05-21 Glenn Morris + * image-mode.el (image-after-revert-hook): + Redraw all frames on which the image is visible. (Bug#8567) + * dired-aux.el (dired-touch-initial): Just use current-time. (Bug#6887) * wid-edit.el (widget-checklist-match-inline): === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2011-04-23 03:07:16 +0000 +++ lisp/image-mode.el 2011-05-21 02:09:49 +0000 @@ -532,7 +532,8 @@ (when (image-get-display-property) (image-toggle-display-text) ;; Update image display. - (redraw-frame (selected-frame)) + (mapc (lambda (window) (redraw-frame (window-frame window))) + (get-buffer-window-list (current-buffer) 'nomini 'visible)) (image-toggle-display-image))) ------------------------------------------------------------ revno: 104302 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:08:21 -0700 message: * lib-src/etags.c: Comment. diff: === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-03-29 06:54:38 +0000 +++ lib-src/etags.c 2011-05-21 02:08:21 +0000 @@ -93,8 +93,11 @@ #ifdef HAVE_CONFIG_H # include - /* On some systems, Emacs defines static as nothing for the sake - of unexec. We don't want that here since we don't use unexec. */ + /* This is probably not necessary any more. On some systms, config.h + used to define static as nothing for the sake of unexec. We don't + want that here since we don't use unexec. None of these systems + are supported any more, but the idea is still mentioned in + etc/PROBLEMS. */ # undef static # ifndef PTR /* for XEmacs */ # define PTR void * ------------------------------------------------------------ revno: 104301 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:07:25 -0700 message: * dired-aux.el (dired-touch-initial): Just use current-time. (Bug#6887) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-21 02:06:11 +0000 +++ lisp/ChangeLog 2011-05-21 02:07:25 +0000 @@ -1,5 +1,7 @@ 2011-05-21 Glenn Morris + * dired-aux.el (dired-touch-initial): Just use current-time. (Bug#6887) + * wid-edit.el (widget-checklist-match-inline): Fix 2011-04-19 change. (Bug#8649) === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2011-04-19 13:44:55 +0000 +++ lisp/dired-aux.el 2011-05-21 02:07:25 +0000 @@ -229,14 +229,17 @@ (defun dired-touch-initial (files) "Create initial input value for `touch' command." - (let (initial) - (while files - (let ((current (nth 5 (file-attributes (car files))))) - (if (and initial (not (equal initial current))) - (setq initial (current-time) files nil) - (setq initial current)) - (setq files (cdr files)))) - (format-time-string "%Y%m%d%H%M.%S" initial))) + ;; Nobody can explain what this version is supposed to do. (Bug#6887) + ;; Also, the manual says it uses "the present time". + ;;; (let (initial) + ;;; (while files + ;;; (let ((current (nth 5 (file-attributes (car files))))) + ;;; (if (and initial (not (equal initial current))) + ;;; (setq initial (current-time) files nil) + ;;; (setq initial current)) + ;;; (setq files (cdr files)))) + ;;; (format-time-string "%Y%m%d%H%M.%S" initial))) + (format-time-string "%Y%m%d%H%M.%S" (current-time))) (defun dired-do-chxxx (attribute-name program op-symbol arg) ;; Change file attributes (mode, group, owner, timestamp) of marked files and ------------------------------------------------------------ revno: 104300 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:06:11 -0700 message: * wid-edit.el (widget-checklist-match-inline): Fix 2011-04-19 change. (Bug#8649) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-20 18:20:12 +0000 +++ lisp/ChangeLog 2011-05-21 02:06:11 +0000 @@ -1,3 +1,8 @@ +2011-05-21 Glenn Morris + + * wid-edit.el (widget-checklist-match-inline): + Fix 2011-04-19 change. (Bug#8649) + 2011-05-20 Stefan Monnier * emacs-lisp/checkdoc.el (checkdoc-sentencespace-region-engine): === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2011-04-19 13:44:55 +0000 +++ lisp/wid-edit.el 2011-05-21 02:06:11 +0000 @@ -2283,9 +2283,9 @@ (while vals (let ((answer (widget-checklist-match-up args vals))) (cond (answer - (let ((vals (widget-match-inline answer vals))) - (setq found (append found (car vals)) - vals (cdr vals) + (let ((vals2 (widget-match-inline answer vals))) + (setq found (append found (car vals2)) + vals (cdr vals2) args (delq answer args)))) (greedy (setq rest (append rest (list (car vals))) ------------------------------------------------------------ revno: 104299 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:04:48 -0700 message: * src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-21 02:02:42 +0000 +++ src/ChangeLog 2011-05-21 02:04:48 +0000 @@ -1,6 +1,8 @@ 2011-05-21 Glenn Morris * Makefile.in ($(etc)/DOC): Make second command line even shorter. + (SOME_MACHINE_OBJECTS): Replace FONT_OBJ by its maximal expansion, + and add some more files. 2011-05-20 Eli Zaretskii === modified file 'src/Makefile.in' --- src/Makefile.in 2011-05-21 02:02:42 +0000 +++ src/Makefile.in 2011-05-21 02:04:48 +0000 @@ -149,11 +149,13 @@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ +## dbusbind.o if HAVE_DBUS, else empty. DBUS_OBJ = @DBUS_OBJ@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ +## gtkutil.o if USE_GTK, else empty. GTK_OBJ=@GTK_OBJ@ ## -ltermcap, or -lncurses, or -lcurses, or "". @@ -198,7 +200,10 @@ ## Else $(OLDXMENU). LIBXMENU=@LIBXMENU@ +## xmenu.o if HAVE_X_WINDOWS, else empty. XMENU_OBJ=@XMENU_OBJ@ +## xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o +## xsettings.o xgselect.o if HAVE_X_WINDOWS, else empty. XOBJ=@XOBJ@ TOOLKIT_LIBW=@TOOLKIT_LIBW@ @@ -241,7 +246,9 @@ ns_appdir=@ns_appdir@ ns_appbindir=@ns_appbindir@ ns_appsrc=@ns_appsrc@ +## fontset.o fringe.o image.o if HAVE_NS, else empty. NS_OBJ=@NS_OBJ@ +## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o if HAVE_NS. NS_OBJC_OBJ=@NS_OBJC_OBJ@ ## Only set if NS_IMPL_GNUSTEP. GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ @@ -333,12 +340,16 @@ ## Object files used on some machine or other. ## These go in the DOC file on all machines in case they are needed. +## Some of them have no DOC entries, but it does no harm to have them +## in the list, in case they ever add any such entries. SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ fontset.o dbusbind.o \ nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ - w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_OBJ) + w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ + w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \ + xsettings.o xgselect.o termcap.o ## gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty. GMALLOC_OBJ=@GMALLOC_OBJ@ ------------------------------------------------------------ revno: 104298 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-05-20 19:02:42 -0700 message: * src/Makefile.in ($(etc)/DOC): Make second command line even shorter. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-20 09:47:59 +0000 +++ src/ChangeLog 2011-05-21 02:02:42 +0000 @@ -1,3 +1,7 @@ +2011-05-21 Glenn Morris + + * Makefile.in ($(etc)/DOC): Make second command line even shorter. + 2011-05-20 Eli Zaretskii * callproc.c (Fcall_process) [MSDOS]: Fix arguments to === modified file 'src/Makefile.in' --- src/Makefile.in 2011-05-20 00:41:03 +0000 +++ src/Makefile.in 2011-05-21 02:02:42 +0000 @@ -411,7 +411,7 @@ $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) -rm -f $(etc)/DOC $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC - $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)|../lisp|p' $(srcdir)/lisp.mk` + $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk` $(libsrc)/make-docfile$(EXEEXT): cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT) ------------------------------------------------------------ revno: 104297 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2011-05-20 15:20:12 -0300 message: * lisp/emacs-lisp/checkdoc.el (checkdoc-sentencespace-region-engine): Also allow singlespace after single-letter capitals followed by a dot. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-20 13:15:00 +0000 +++ lisp/ChangeLog 2011-05-20 18:20:12 +0000 @@ -1,5 +1,8 @@ 2011-05-20 Stefan Monnier + * emacs-lisp/checkdoc.el (checkdoc-sentencespace-region-engine): + Also allow singlespace after single-letter capitals followed by a dot. + * nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is enabled. Suggested by James Ahlborn (bug#8704). === modified file 'lisp/emacs-lisp/checkdoc.el' --- lisp/emacs-lisp/checkdoc.el 2011-02-12 23:40:43 +0000 +++ lisp/emacs-lisp/checkdoc.el 2011-05-20 18:20:12 +0000 @@ -2046,7 +2046,7 @@ ;; piece of an abbreviation ;; FIXME etc (looking-at - "\\([a-z]\\|[iI]\\.?e\\|[eE]\\.?g\\)\\.")) + "\\([a-zA-Z]\\|[iI]\\.?e\\|[eE]\\.?g\\)\\.")) (error t)))) (if (checkdoc-autofix-ask-replace b e ------------------------------------------------------------ revno: 104296 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8704 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2011-05-20 10:15:00 -0300 message: * lisp/nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is enabled. Suggested by James Ahlborn . diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-20 00:51:46 +0000 +++ lisp/ChangeLog 2011-05-20 13:15:00 +0000 @@ -1,3 +1,8 @@ +2011-05-20 Stefan Monnier + + * nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is + enabled. Suggested by James Ahlborn (bug#8704). + 2011-05-20 Nix * files.el (basic-save-buffer-2): === modified file 'lisp/nxml/nxml-mode.el' --- lisp/nxml/nxml-mode.el 2011-01-26 08:36:39 +0000 +++ lisp/nxml/nxml-mode.el 2011-05-20 13:15:00 +0000 @@ -1263,9 +1263,9 @@ (nxml-scan-error nil)) (when (and (eq (nxml-token-before) (point)) (eq xmltok-type 'partial-empty-element)) - (insert ">"))) - (when (and end-tag-p at-indentation) - (nxml-indent-line)))))) + (insert ">")))) + (when (and end-tag-p at-indentation) + (nxml-indent-line))))) (defun nxml-balanced-close-start-tag-block () "Close the start-tag before point with `>' and insert a balancing end-tag. ------------------------------------------------------------ revno: 104295 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-05-20 12:55:14 +0300 message: Fix the MSDOS build following revisions 104265, 104280, 104289. config.bat: Concatenate lisp.mk onto the end of src/Makefile. msdos/sed1v2.inp (make-docfile commands): Recognize only if the line begins with a TAB. Use $(etc) rather than a literal "../etc". (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp). (@lisp_frag@): Edit out. msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to zero. src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to report_file_error introduced by the change from 2011-05-07. .bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h. diff: === modified file '.bzrignore' --- .bzrignore 2011-05-19 06:04:16 +0000 +++ .bzrignore 2011-05-20 09:54:04 +0000 @@ -51,7 +51,9 @@ lib/c++defs.h lib/getopt.h lib/inttypes.h +lib/stdbool.h lib/stdio.h +lib/stdint.h lib/stdlib.h lib/sys/ lib/time.h @@ -61,6 +63,7 @@ lib/stdbool.in-h lib/stddef.in-h lib/stdint.in-h +lib/stdio.in-h lib/stdlib.in-h lib/sys_stat.in-h lib/time.in-h === modified file 'ChangeLog' --- ChangeLog 2011-05-20 00:41:03 +0000 +++ ChangeLog 2011-05-20 09:54:04 +0000 @@ -1,3 +1,9 @@ +2011-05-20 Eli Zaretskii + + * .bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h. + + * config.bat: Concatenate lisp.mk onto the end of src/Makefile. + 2011-05-20 Glenn Morris * configure.in (lisp_frag): New output file. === modified file 'config.bat' --- config.bat 2011-03-31 04:24:03 +0000 +++ config.bat 2011-05-20 09:47:59 +0000 @@ -211,7 +211,7 @@ rem Create "makefile" from "makefile.in". rm -f Makefile makefile.tmp -copy Makefile.in+deps.mk makefile.tmp +copy Makefile.in+lisp.mk+deps.mk makefile.tmp sed -f ../msdos/sed1v2.inp Makefile rm -f makefile.tmp === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2011-05-19 06:04:16 +0000 +++ msdos/ChangeLog 2011-05-20 09:47:59 +0000 @@ -1,3 +1,13 @@ +2011-05-20 Eli Zaretskii + + * sed1v2.inp (make-docfile commands): Recognize only if the line + begins with a TAB. Use $(etc) rather than a literal "../etc". + (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp). + (@lisp_frag@): Edit out. + + * sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to + zero. + 2011-05-19 Glenn Morris * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT): === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2011-05-19 06:04:16 +0000 +++ msdos/sed1v2.inp 2011-05-20 09:47:59 +0000 @@ -127,9 +127,10 @@ /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! /^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// -/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o ../etc/DOC! -/^.\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! +/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! +/^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! /^.\$(libsrc)\/make-doc/s!>.*$!! +/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp)! /^[ ]*$/d /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit @@ -161,6 +162,7 @@ /^ -\{0,1\} *ln -/s/ln -f/cp -pf/ /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ +s/@lisp_frag@// s/@deps_frag@// s/@ns_frag@// s/@PRE_EDIT_LDFLAGS@// === modified file 'msdos/sedlibmk.inp' --- msdos/sedlibmk.inp 2011-05-07 10:24:55 +0000 +++ msdos/sedlibmk.inp 2011-05-20 09:47:59 +0000 @@ -197,6 +197,7 @@ /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/ /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/ /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/ +/^GNULIB_GROUP_MEMBER *=/s/@GNULIB_GROUP_MEMBER@/0/ /^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/ /^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/ /^GNULIB_LINK *=/s/@GNULIB_LINK@/0/ @@ -328,6 +329,7 @@ /^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/ /^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/ /^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/ +/^HAVE_GROUP_MEMBER *=/s/@HAVE_GROUP_MEMBER@/0/ /^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/ /^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/ /^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/ === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-20 06:37:13 +0000 +++ src/ChangeLog 2011-05-20 09:47:59 +0000 @@ -1,3 +1,8 @@ +2011-05-20 Eli Zaretskii + + * callproc.c (Fcall_process) [MSDOS]: Fix arguments to + report_file_error introduced by the change from 2011-05-07. + 2011-05-20 Paul Eggert * systime.h (Time): Define only if emacs is defined. @@ -176,11 +181,11 @@ (Fget_screen_color): New function. (syms_of_ntterm): Defsubr it. - * callproc.c (call_process_cleanup): Don't close and unlink the - temporary file if Fcall_process didn't create it in the first - place. - (Fcall_process): Don't create tempfile if stdout of the child - process will be redirected to a file specified with `:file'. + * callproc.c (call_process_cleanup) [MSDOS]: Don't close and + unlink the temporary file if Fcall_process didn't create it in the + first place. + (Fcall_process) [MSDOS]: Don't create tempfile if stdout of the + child process will be redirected to a file specified with `:file'. Don't try to re-open tempfile in that case, and set fd[0] to -1 as cue to call_process_cleanup not to close that handle. === modified file 'src/callproc.c' --- src/callproc.c 2011-05-07 11:25:05 +0000 +++ src/callproc.c 2011-05-20 09:47:59 +0000 @@ -577,7 +577,7 @@ unlink (tempfile); emacs_close (filefd); report_file_error ("Cannot re-open temporary file", - Fcons (tempfile, Qnil)); + Fcons (build_string (tempfile), Qnil)); } } else ------------------------------------------------------------ revno: 104294 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-05-19 23:37:13 -0700 message: * systime.h (Time): Define only if emacs is defined. This is to allow ../lib-src/profile.c to be compiled on FreeBSD, where the include path doesn't have X11/X.h by default. See . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-20 00:54:09 +0000 +++ src/ChangeLog 2011-05-20 06:37:13 +0000 @@ -1,3 +1,10 @@ +2011-05-20 Paul Eggert + + * systime.h (Time): Define only if emacs is defined. + This is to allow ../lib-src/profile.c to be compiled on FreeBSD, + where the include path doesn't have X11/X.h by default. See + . + 2011-05-20 Kenichi Handa * composite.c (find_automatic_composition): Fix previous change. === modified file 'src/systime.h' --- src/systime.h 2011-05-12 20:23:33 +0000 +++ src/systime.h 2011-05-20 06:37:13 +0000 @@ -30,10 +30,12 @@ #endif #endif -#ifdef HAVE_X_WINDOWS -# include -#else +#ifdef emacs +# ifdef HAVE_X_WINDOWS +# include +# else typedef unsigned long Time; +# endif #endif #ifdef HAVE_TZNAME ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.