------------------------------------------------------------ revno: 117065 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-05-05 13:22:32 -0400 message: * autogen.sh: Check any pre-existing ACLOCAL_PATH. diff: === modified file 'ChangeLog' --- ChangeLog 2014-05-04 21:28:08 +0000 +++ ChangeLog 2014-05-05 17:22:32 +0000 @@ -1,3 +1,7 @@ +2014-05-05 Glenn Morris + + * autogen.sh: Check any pre-existing ACLOCAL_PATH. + 2014-05-04 Paul Eggert Consult libpng-config more consistently (Bug#17339). === modified file 'autogen.sh' --- autogen.sh 2014-05-04 21:18:30 +0000 +++ autogen.sh 2014-05-05 17:22:32 +0000 @@ -212,27 +212,44 @@ AUTORECONF_ENV= env_space= ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || { - oIFS=$IFS - IFS=: - before_first_aclocal=true - for dir in $PATH; do - if test -x "$dir/aclocal"; then - if $before_first_aclocal; then - before_first_aclocal=false - elif ac_dir=`"$dir/aclocal" --print-ac-dir` && test -r "$ac_dir/pkg.m4" - then - case $ACLOCAL_PATH in - '') ACLOCAL_PATH=$ac_dir;; - ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; - esac - export ACLOCAL_PATH - AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" - env_space=' ' - break - fi - fi - done - IFS=$oIFS + + # Maybe ACLOCAL_PATH is already set-up. + if test -n "$ACLOCAL_PATH"; then + oIFS=$IFS + IFS=: + for dir in $ACLOCAL_PATH; do + if test -r "$dir/pkg.m4"; then + AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" + env_space=' ' + break + fi + done + IFS=$oIFS + fi + + if test -z "$AUTORECONF_ENV"; then + oIFS=$IFS + IFS=: + before_first_aclocal=true + for dir in $PATH; do + if test -x "$dir/aclocal"; then + if $before_first_aclocal; then + before_first_aclocal=false + elif ac_dir=`"$dir/aclocal" --print-ac-dir` && test -r "$ac_dir/pkg.m4" + then + case $ACLOCAL_PATH in + '') ACLOCAL_PATH=$ac_dir;; + ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; + esac + export ACLOCAL_PATH + AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" + env_space=' ' + break + fi + fi + done + IFS=$oIFS + fi ## OK, maybe pkg-config is in a weird place (eg on hydra). if test -z "$AUTORECONF_ENV"; then ------------------------------------------------------------ revno: 117064 [merge] committer: Daniel Colascione branch nick: trunk timestamp: Mon 2014-05-05 03:59:24 -0700 message: Use rx for `gnu' compile.el pattern * progmodes/compile.el (compilation-error-regexp-alist-alist): Port `gnu' pattern to rx. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-05-05 07:35:50 +0000 +++ lisp/ChangeLog 2014-05-05 10:59:24 +0000 @@ -1,3 +1,8 @@ +2014-05-05 Daniel Colascione + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Port `gnu' pattern to rx. + 2014-05-05 Jarek Czekalski Remove unneeded prompt when closing a buffer with active === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2014-02-10 01:34:22 +0000 +++ lisp/progmodes/compile.el 2014-05-05 10:58:06 +0000 @@ -134,7 +134,7 @@ ;; emacs -batch -l compile-tests.el -f ert-run-tests-batch-and-exit (defvar compilation-error-regexp-alist-alist - '((absoft + `((absoft "^\\(?:[Ee]rror on \\|[Ww]arning on\\( \\)\\)?[Ll]ine[ \t]+\\([0-9]+\\)[ \t]+\ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) @@ -255,16 +255,46 @@ ;; can be composed of any non-newline char, but it also rules out some ;; valid but unlikely cases, such as a trailing space or a space ;; followed by a -, or a colon followed by a space. - + ;; ;; The "in \\|from " exception was added to handle messages from Ruby. - "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\|[ \t]+\\(?:in \\|from \\)\\)?\ -\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\ -\\([0-9]+\\)\\(?:-\\(?4:[0-9]+\\)\\(?:\\.\\(?5:[0-9]+\\)\\)?\ -\\|[.:]\\(?3:[0-9]+\\)\\(?:-\\(?:\\(?4:[0-9]+\\)\\.\\)?\\(?5:[0-9]+\\)\\)?\\)?:\ -\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ - *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|\\[ skipping .+ \\]\\|\ -\\(?:instantiated\\|required\\) from\\|[Nn]ote\\)\\|\ - *[Ee]rror\\|[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" + ,(rx + bol + (? (| (regexp "[[:alpha:]][-[:alnum:].]+: ?") + (regexp "[ \t]+\\(?:in \\|from\\)"))) + (group-n 1 (: (regexp "[0-9]*[^0-9\n]") + (*? (| (regexp "[^\n :]") + (regexp " [^-/\n]") + (regexp ":[^ \n]"))))) + (regexp ": ?") + (group-n 2 (regexp "[0-9]+")) + (? (| (: "-" + (group-n 4 (regexp "[0-9]+")) + (? "." (group-n 5 (regexp "[0-9]+")))) + (: (in ".:") + (group-n 3 (regexp "[0-9]+")) + (? "-" + (? (group-n 4 (regexp "[0-9]+")) ".") + (group-n 5 (regexp "[0-9]+")))))) + ":" + (| (: (* " ") + (group-n 6 (| "FutureWarning" + "RuntimeWarning" + "Warning" + "warning" + "W:"))) + (: (* " ") + (group-n 7 (| (regexp "[Ii]nfo\\(?:\\>\\|rmationa?l?\\)") + "I:" + (: "[ skipping " (+ ".") " ]") + "instantiated from" + "required from" + (regexp "[Nn]ote")))) + (: (* " ") + (regexp "[Ee]rror")) + (: (regexp "[0-9]?") + (| (regexp "[^0-9\n]") + eol)) + (regexp "[0-9][0-9][0-9]"))) 1 (2 . 4) (3 . 5) (6 . 7)) (lcc ------------------------------------------------------------ revno: 117063 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-05-05 13:06:04 +0300 message: Update nt/INSTALL for the latest changes in configury. nt/INSTALL: Update to the effect that pkg-config is now required for building from the repository. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2014-04-30 19:54:52 +0000 +++ nt/ChangeLog 2014-05-05 10:06:04 +0000 @@ -1,3 +1,8 @@ +2014-05-05 Eli Zaretskii + + * INSTALL: Update to the effect that pkg-config is now required + for building from the repository. + 2014-04-30 Eli Zaretskii * cmdproxy.c (make_absolute): Don't copy more characters from PATH === modified file 'nt/INSTALL' --- nt/INSTALL 2014-03-30 18:55:19 +0000 +++ nt/INSTALL 2014-05-05 10:06:04 +0000 @@ -115,6 +115,11 @@ MSYS Texinfo, after installing it as part of msys-base, invoke the command "mingw-get remove msys-texinfo".) + In addition, building Emacs from the development repository requires + pkg-config to be installed. As the MinGW project does not offer it, + you will have to install it from elsewhere; see below (search for + "pkg-config"). + At this point, you should be ready to configure and build Emacs in its basic configuration. Skip to the "Generating the configure script" section for the build instructions. If you want to build it @@ -173,15 +178,17 @@ Available from http://sourceforge.net/projects/ezwinports/files/. + . pkg-config (invoked by the configure script to look for optional + packages; _required_ for building from the development + repository, as some components of pkg-config are needed to run + the autoconf and aclocal scripts) + + Available from http://www.gtk.org/download/win32.php + . gzip (needed to compress files during "make install") Available from http://gnuwin32.sourceforge.net/packages/gzip.htm. - . pkg-config (needed for building with some optional libraries, - such as GnuTLS and libxml2) - - Available from http://www.gtk.org/download/win32.php - Each package might list other packages as prerequisites on its download page (under "Runtime requirements"); download those as well. (Using the mingw-get installer will fetch those prerequisites ------------------------------------------------------------ revno: 117062 fixes bug: http://debbugs.gnu.org/16548 committer: Jarek Czekalski branch nick: emacs-bzr timestamp: Mon 2014-05-05 09:35:50 +0200 message: Remove unneeded prompt "Buffer ... still has clients" * server.el (server-start): Remove the only call to: (server-kill-buffer-query-function): Remove. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-05-04 23:49:33 +0000 +++ lisp/ChangeLog 2014-05-05 07:35:50 +0000 @@ -1,3 +1,10 @@ +2014-05-05 Jarek Czekalski + + Remove unneeded prompt when closing a buffer with active + emacsclient ("Buffer ... still has clients"), #16548. + * server.el (server-start): Remove the only call to: + (server-kill-buffer-query-function): Remove. + 2014-05-04 Leo Liu * calendar/diary-lib.el (calendar-chinese-month-name-array): === modified file 'lisp/server.el' --- lisp/server.el 2014-03-21 01:12:57 +0000 +++ lisp/server.el 2014-05-05 07:35:50 +0000 @@ -642,8 +642,6 @@ (cl-letf (((default-file-modes) ?\700)) (add-hook 'suspend-tty-functions 'server-handle-suspend-tty) (add-hook 'delete-frame-functions 'server-handle-delete-frame) - (add-hook 'kill-buffer-query-functions - 'server-kill-buffer-query-function) (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) (add-hook 'kill-emacs-hook 'server-force-stop) ;Cleanup upon exit. @@ -1472,22 +1470,6 @@ (save-buffer))) (server-buffer-done (current-buffer)))) -;; Ask before killing a server buffer. -;; It was suggested to release its client instead, -;; but I think that is dangerous--the client would proceed -;; using whatever is on disk in that file. -- rms. -(defun server-kill-buffer-query-function () - "Ask before killing a server buffer." - (or (not server-buffer-clients) - (let ((res t)) - (dolist (proc server-buffer-clients) - (when (and (memq proc server-clients) - (eq (process-status proc) 'open)) - (setq res nil))) - res) - (yes-or-no-p (format "Buffer `%s' still has clients; kill it? " - (buffer-name (current-buffer)))))) - (defun server-kill-emacs-query-function () "Ask before exiting Emacs if it has live clients." (or (not server-clients) ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.