------------------------------------------------------------ revno: 115803 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-12-28 23:52:53 -0800 message: Revert quoting of xcrun-related library. diff: === modified file 'configure.ac' --- configure.ac 2013-12-29 07:15:01 +0000 +++ configure.ac 2013-12-29 07:52:53 +0000 @@ -3296,7 +3296,7 @@ # Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc. if test "${HAVE_LIBXML2}" != "yes" -a "$opsys" = "darwin"; then SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS=$CPPFLAGS' -I"$xcsdkdir"/usr/include/libxml2' + CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2" AC_CHECK_HEADER(libxml/HTMLparser.h, [AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, , [#include ])]) ------------------------------------------------------------ revno: 115802 fixes bug: http://debbugs.gnu.org/16262 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-12-28 23:42:46 -0800 message: * src/emacs.c (main): [DAEMON_MUST_EXEC]: Restore close-on-exec after exec. diff: === modified file 'src/emacs.c' --- src/emacs.c 2013-12-28 22:56:58 +0000 +++ src/emacs.c 2013-12-29 07:42:46 +0000 @@ -1117,6 +1117,7 @@ sscanf (dname_arg, "\n%d,%d\n%s", &(daemon_pipe[0]), &(daemon_pipe[1]), dname_arg2); dname_arg = *dname_arg2 ? dname_arg2 : NULL; + fcntl (daemon_pipe[1], F_SETFD, FD_CLOEXEC); } #endif /* DAEMON_MUST_EXEC */ ------------------------------------------------------------ revno: 115801 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-12-28 23:15:01 -0800 message: * configure.ac (LIBXML2_CFLAGS): Fix xcrun-related quoting problem. Reported by YAMAMOTO Mitsuharu in: http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00995.html diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-28 10:12:43 +0000 +++ ChangeLog 2013-12-29 07:15:01 +0000 @@ -1,3 +1,9 @@ +2013-12-29 Paul Eggert + + * configure.ac (LIBXML2_CFLAGS): Fix xcrun-related quoting problem. + Reported by YAMAMOTO Mitsuharu in: + http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00995.html + 2013-12-28 Jan Djärv * configure.ac: Fix CC detection for xcrun case. === modified file 'configure.ac' --- configure.ac 2013-12-28 10:37:53 +0000 +++ configure.ac 2013-12-29 07:15:01 +0000 @@ -3296,7 +3296,7 @@ # Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc. if test "${HAVE_LIBXML2}" != "yes" -a "$opsys" = "darwin"; then SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I'$xcsdkdir/usr/include/libxml2'" + CPPFLAGS=$CPPFLAGS' -I"$xcsdkdir"/usr/include/libxml2' AC_CHECK_HEADER(libxml/HTMLparser.h, [AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, , [#include ])]) ------------------------------------------------------------ revno: 115800 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-12-29 13:18:15 +0800 message: Add the "use strict;" and "use warnings;" pragmas. * admin/make-emacs: * admin/build-configs: Add the "use strict;" and "use warnings;" pragmas. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-12-28 08:33:44 +0000 +++ admin/ChangeLog 2013-12-29 05:18:15 +0000 @@ -1,3 +1,8 @@ +2013-12-29 Xue Fuqiao + + * make-emacs: + * build-configs: Add the "use strict;" and "use warnings;" pragmas. + 2013-12-28 Glenn Morris * admin.el (cusver-scan): Warn about missing :types. === modified file 'admin/admin.el' --- admin/admin.el 2013-12-28 08:33:44 +0000 +++ admin/admin.el 2013-12-29 05:18:15 +0000 @@ -69,6 +69,7 @@ (user-error "Version not found in %s" file)) (replace-match (format "%s" version) nil nil nil 1)) +;; TODO report the progress (defun set-version (root version) "Set Emacs version to VERSION in relevant files under ROOT. Root must be the root of an Emacs source tree." @@ -161,6 +162,7 @@ ;; Note this makes some assumptions about form of short copyright. +;; TODO report the progress (defun set-copyright (root copyright) "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT. Root must be the root of an Emacs source tree." === modified file 'admin/build-configs' --- admin/build-configs 2013-01-01 09:11:05 +0000 +++ admin/build-configs 2013-12-29 05:18:15 +0000 @@ -20,6 +20,8 @@ require 5; +use strict; +use warnings; use Getopt::Long; use File::Basename; use Cwd; === modified file 'admin/make-emacs' --- admin/make-emacs 2013-01-01 09:11:05 +0000 +++ admin/make-emacs 2013-12-29 05:18:15 +0000 @@ -21,6 +21,8 @@ require 5; +use strict; +use warnings; use Getopt::Long; use File::Basename; use Cwd; ------------------------------------------------------------ revno: 115799 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-12-28 14:56:58 -0800 message: Fix pipe bug with OS X emacs --daemon (Bug#16262). * emacs.c (main) [DAEMON_MUST_EXEC]: Clear the close-on-exec flags on the daemon pipe ends before execing. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-28 11:47:26 +0000 +++ src/ChangeLog 2013-12-28 22:56:58 +0000 @@ -1,3 +1,9 @@ +2013-12-28 Paul Eggert + + Fix pipe bug with OS X emacs --daemon (Bug#16262). + * emacs.c (main) [DAEMON_MUST_EXEC]: Clear the close-on-exec + flags on the daemon pipe ends before execing. + 2013-12-28 Eli Zaretskii * w32fns.c (Fx_create_frame): Error out if called from a TTY === modified file 'src/emacs.c' --- src/emacs.c 2013-12-18 20:36:50 +0000 +++ src/emacs.c 2013-12-28 22:56:58 +0000 @@ -1099,6 +1099,8 @@ argv[skip_args] = fdStr; + fcntl (daemon_pipe[0], F_SETFD, 0); + fcntl (daemon_pipe[1], F_SETFD, 0); execvp (argv[0], argv); emacs_perror (argv[0]); exit (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); ------------------------------------------------------------ revno: 115798 fixes bug: http://debbugs.gnu.org/16272 committer: João Távora branch nick: trunk timestamp: Sat 2013-12-28 19:26:54 +0000 message: Fix bug #16272 when inserting newline at point-min in electric-pair-mode. * elec-pair.el (electric-pair-post-self-insert-function): Don't open extra newlines at beginning of buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-28 11:47:26 +0000 +++ lisp/ChangeLog 2013-12-28 19:26:54 +0000 @@ -1,3 +1,8 @@ +2013-12-28 João Távora + + * elec-pair.el (electric-pair-post-self-insert-function): Don't + open extra newlines at beginning of buffer. (Bug#16272) + 2013-12-28 Eli Zaretskii * frame.el (window-system-for-display): Don't allow to create a === modified file 'lisp/elec-pair.el' --- lisp/elec-pair.el 2013-12-28 06:37:35 +0000 +++ lisp/elec-pair.el 2013-12-28 19:26:54 +0000 @@ -513,7 +513,7 @@ (funcall electric-pair-open-newline-between-pairs) electric-pair-open-newline-between-pairs) (eq last-command-event ?\n) - (not (eobp)) + (< (1+ (point-min)) (point) (point-max)) (eq (save-excursion (skip-chars-backward "\t\s") (char-before (1- (point)))) ------------------------------------------------------------ revno: 115797 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-12-28 19:12:57 +0200 message: Fix a thinko in last commit. diff: === modified file 'src/w32fns.c' --- src/w32fns.c 2013-12-28 11:47:26 +0000 +++ src/w32fns.c 2013-12-28 17:12:57 +0000 @@ -4346,7 +4346,8 @@ Lisp_Object parent; struct kboard *kb; - if (!FRAME_W32_P (SELECTED_FRAME ())) + if (!FRAME_W32_P (SELECTED_FRAME ()) + && !FRAME_INITIAL_P (SELECTED_FRAME ())) error ("Cannot create a GUI frame in a -nw session"); /* Make copy of frame parameters because the original is in pure ------------------------------------------------------------ revno: 115796 fixes bug: http://debbugs.gnu.org/14739 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-12-28 13:47:26 +0200 message: Fix bug #14739 with creation of GUI frames from TTY session on Windows. src/w32fns.c (Fx_create_frame): Error out if called from a TTY session. lisp/frame.el (window-system-for-display): Don't allow to create a GUI frame from a -nw session on MS-Windows. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-28 08:21:33 +0000 +++ lisp/ChangeLog 2013-12-28 11:47:26 +0000 @@ -1,3 +1,8 @@ +2013-12-28 Eli Zaretskii + + * frame.el (window-system-for-display): Don't allow to create a + GUI frame from a -nw session on MS-Windows. (Bug#14739) + 2013-12-28 Glenn Morris * mail/hashcash.el (hashcash-program): Rename from hashcash-path. === modified file 'lisp/frame.el' --- lisp/frame.el 2013-11-30 09:25:31 +0000 +++ lisp/frame.el 2013-12-28 11:47:26 +0000 @@ -540,10 +540,14 @@ (defun window-system-for-display (display) "Return the window system for DISPLAY. Return nil if we don't know how to interpret DISPLAY." - (cl-loop for descriptor in display-format-alist - for pattern = (car descriptor) - for system = (cdr descriptor) - when (string-match-p pattern display) return system)) + ;; MS-Windows doesn't know how to create a GUI frame in a -nw session. + (if (and (eq system-type 'windows-nt) + (null (window-system))) + nil + (cl-loop for descriptor in display-format-alist + for pattern = (car descriptor) + for system = (cdr descriptor) + when (string-match-p pattern display) return system))) (defun make-frame-on-display (display &optional parameters) "Make a frame on display DISPLAY. === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-28 02:17:54 +0000 +++ src/ChangeLog 2013-12-28 11:47:26 +0000 @@ -1,3 +1,8 @@ +2013-12-28 Eli Zaretskii + + * w32fns.c (Fx_create_frame): Error out if called from a TTY + session. (Bug#14739) + 2013-12-27 Jarek Czekalski * callproc.c (Vexec_path): Document that exec-directory is in it. === modified file 'src/w32fns.c' --- src/w32fns.c 2013-12-26 11:31:42 +0000 +++ src/w32fns.c 2013-12-28 11:47:26 +0000 @@ -4346,6 +4346,9 @@ Lisp_Object parent; struct kboard *kb; + if (!FRAME_W32_P (SELECTED_FRAME ())) + error ("Cannot create a GUI frame in a -nw session"); + /* Make copy of frame parameters because the original is in pure storage now. */ parameters = Fcopy_alist (parameters); ------------------------------------------------------------ revno: 115795 committer: Jan D. branch nick: trunk timestamp: Sat 2013-12-28 11:37:53 +0100 message: * configure.ac: Fix CC detection for xcrun case. diff: === modified file 'configure.ac' --- configure.ac 2013-12-28 10:12:43 +0000 +++ configure.ac 2013-12-28 10:37:53 +0000 @@ -654,15 +654,12 @@ #### Choose a compiler. dnl Sets GCC=yes if using gcc. +AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"]) if test -n "$XCRUN"; then - if test -z "$CC"; then - AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"]) - fi AC_CHECK_PROGS(AR, [ar "$XCRUN ar"]) test -n "$AR" && export AR -else - AC_PROG_CC fi + AM_PROG_CC_C_O if test x$GCC = xyes; then ------------------------------------------------------------ revno: 115794 committer: Jan D. branch nick: trunk timestamp: Sat 2013-12-28 11:12:43 +0100 message: * configure.ac: Fix CC detection for xcrun case. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-28 00:40:58 +0000 +++ ChangeLog 2013-12-28 10:12:43 +0000 @@ -1,3 +1,7 @@ +2013-12-28 Jan Djärv + + * configure.ac: Fix CC detection for xcrun case. + 2013-12-28 Paul Eggert Fix problem with MAKE and xcrun configuration. === modified file 'configure.ac' --- configure.ac 2013-12-28 00:40:58 +0000 +++ configure.ac 2013-12-28 10:12:43 +0000 @@ -654,17 +654,14 @@ #### Choose a compiler. dnl Sets GCC=yes if using gcc. -AC_PROG_CC if test -n "$XCRUN"; then if test -z "$CC"; then - if $XCRUN gcc --version >/dev/null 2>&1; then - CC="$XCRUN gcc" - elif $XCRUN clang --version >/dev/null 2>&1; then - CC="$XCRUN clang" - fi + AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"]) fi AC_CHECK_PROGS(AR, [ar "$XCRUN ar"]) test -n "$AR" && export AR +else + AC_PROG_CC fi AM_PROG_CC_C_O ------------------------------------------------------------ revno: 115793 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-12-28 00:33:44 -0800 message: * admin/admin.el (cusver-scan): Warn about missing :types. (cusver-check): Interactively, require existing directories. * admin/cus-test.el: Comment. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-12-27 10:21:47 +0000 +++ admin/ChangeLog 2013-12-28 08:33:44 +0000 @@ -1,3 +1,8 @@ +2013-12-28 Glenn Morris + + * admin.el (cusver-scan): Warn about missing :types. + (cusver-check): Interactively, require existing directories. + 2013-12-27 Xue Fuqiao * admin.el (manual-misc-manuals, make-manuals): === modified file 'admin/admin.el' --- admin/admin.el 2013-12-27 10:21:47 +0000 +++ admin/admin.el 2013-12-28 08:33:44 +0000 @@ -540,6 +540,12 @@ ;; Exclude macros, eg (defcustom ,varname ...). (symbolp var)) (progn + ;; FIXME It should be cus-test-apropos that does this. + (and (not old) + (equal "custom" (match-string 2)) + (not (memq :type form)) + (display-warning 'custom + (format "Missing type in: `%s'" form))) (setq ver (car (cdr-safe (memq :version form)))) (if (equal "group" (match-string 2)) ;; Group :version could be old. @@ -601,8 +607,8 @@ Note that a :version tag should also be added if the value of a defcustom changes (in a non-trivial way). This function does not check for that." - (interactive (list (read-directory-name "New Lisp directory: ") - (read-directory-name "Old Lisp directory: ") + (interactive (list (read-directory-name "New Lisp directory: " nil nil t) + (read-directory-name "Old Lisp directory: " nil nil t) (number-to-string (read-number "New version number: " (string-to-number cusver-new-version))))) === modified file 'admin/cus-test.el' --- admin/cus-test.el 2013-08-13 07:42:51 +0000 +++ admin/cus-test.el 2013-12-28 08:33:44 +0000 @@ -187,6 +187,9 @@ (message "Cus Test running...%s %s" (length cus-test-tested-variables) symbol) (condition-case alpha + ;; FIXME This defaults to 'sexp if no type was specified. + ;; Always report such instances as a type mismatch. + ;; Currently abusing cusver-scan to do that. (let* ((type (custom-variable-type symbol)) (conv (widget-convert type)) (get (or (get symbol 'custom-get) 'default-value))