Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102915. ------------------------------------------------------------ revno: 102915 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-01-19 23:17:22 -0800 message: * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-20 06:40:36 +0000 +++ lisp/ChangeLog 2011-01-20 07:17:22 +0000 @@ -1,5 +1,7 @@ 2011-01-20 Glenn Morris + * vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change. + * simple.el (read-expression-history): Remove, it's in minibuf.c. 2011-01-20 Chong Yidong === modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2011-01-19 03:49:00 +0000 +++ lisp/vc/vc-svn.el 2011-01-20 07:17:22 +0000 @@ -180,8 +180,9 @@ (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) (propstat (cdr (assq (aref (match-string 2) 0) state-map))) (filename (match-string 4))) - (if (memq propstat '(conflict edited)) - (setq state propstat)) + (and (memq propstat '(conflict edited)) + (not (eq state 'conflict)) ; conflict always wins + (setq state propstat)) (and remote (string-equal (match-string 3) "*") ;; FIXME are there other possible combinations? (cond ((eq state 'edited) (setq state 'needs-merge)) ------------------------------------------------------------ revno: 102914 committer: Jan D. branch nick: trunk timestamp: Thu 2011-01-20 07:43:04 +0100 message: * src/unexmacosx.c: Add comment about include order. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-20 06:40:36 +0000 +++ src/ChangeLog 2011-01-20 06:43:04 +0000 @@ -1,3 +1,7 @@ +2011-01-20 Jan Djärv + + * unexmacosx.c: Add comment about include order. + 2011-01-20 Glenn Morris * minibuf.c (syms_of_minibuf) : === modified file 'src/unexmacosx.c' --- src/unexmacosx.c 2011-01-19 22:13:54 +0000 +++ src/unexmacosx.c 2011-01-20 06:43:04 +0000 @@ -86,15 +86,20 @@ be changed accordingly. */ -#include +/* config.h #define:s malloc/realloc/free and then includes stdlib.h. + We want the undefined versions, but if config.h includes stdlib.h + with the #define:s in place, the prototypes will be wrong and we get + warnings. To prevent that, include stdlib.h before config.h. */ + #include -#include -#include -#include #include #undef malloc #undef realloc #undef free +#include +#include +#include +#include #include #include #include ------------------------------------------------------------ revno: 102913 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-01-19 22:40:36 -0800 message: Give read-expression-history a doc. * lisp/simple.el (read-expression-history): Remove, it's in minibuf.c. * src/minibuf.c (syms_of_minibuf) : Give it a doc string. * src/globals.h: Add Vread_expression_history. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-20 02:55:36 +0000 +++ lisp/ChangeLog 2011-01-20 06:40:36 +0000 @@ -1,3 +1,7 @@ +2011-01-20 Glenn Morris + + * simple.el (read-expression-history): Remove, it's in minibuf.c. + 2011-01-20 Chong Yidong * subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS. === modified file 'lisp/simple.el' --- lisp/simple.el 2011-01-16 02:21:30 +0000 +++ lisp/simple.el 2011-01-20 06:40:36 +0000 @@ -1142,8 +1142,6 @@ (set-keymap-parent m minibuffer-local-map) (setq read-expression-map m)) -(defvar read-expression-history nil) - (defvar minibuffer-completing-symbol nil "Non-nil means completing a Lisp symbol in the minibuffer.") === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-20 06:10:05 +0000 +++ src/ChangeLog 2011-01-20 06:40:36 +0000 @@ -1,5 +1,9 @@ 2011-01-20 Glenn Morris + * minibuf.c (syms_of_minibuf) : + Give it a doc string. + * globals.h: Add Vread_expression_history. + * macros.c (syms_of_macros) : Give it a doc string. * globals.h: Add Vkbd_macro_termination_hook. === modified file 'src/globals.h' --- src/globals.h 2011-01-20 06:10:05 +0000 +++ src/globals.h 2011-01-20 06:40:36 +0000 @@ -983,6 +983,8 @@ Lisp_Object f_Vminibuffer_exit_hook; + Lisp_Object f_Vread_expression_history; + /* Function to call to read a buffer name. */ Lisp_Object f_Vread_buffer_function; @@ -2268,6 +2270,8 @@ globals.f_Vquit_flag #define Vread_buffer_function \ globals.f_Vread_buffer_function +#define Vread_expression_history \ + globals.f_Vread_expression_history #define Vread_circle \ globals.f_Vread_circle #define Vread_expression_map \ === modified file 'src/minibuf.c' --- src/minibuf.c 2011-01-18 20:45:37 +0000 +++ src/minibuf.c 2011-01-20 06:40:36 +0000 @@ -1,7 +1,8 @@ /* Minibuffer input and completion. - Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2016,6 +2017,11 @@ Qcase_fold_search = intern_c_string ("case-fold-search"); staticpro (&Qcase_fold_search); + DEFVAR_LISP ("read-expression-history", Vread_expression_history, + doc: /* A history list for arguments that are Lisp expressions to evaluate. +For example, `eval-expression' uses this. */); + Vread_expression_history = Qnil; + Qread_expression_history = intern_c_string ("read-expression-history"); staticpro (&Qread_expression_history); ------------------------------------------------------------ revno: 102912 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-01-19 22:10:05 -0800 message: Give kbd-macro-termination-hook a doc. * src/macros.c (syms_of_macros) : Give it a doc string. * src/globals.h: Add Vkbd_macro_termination_hook. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-20 02:55:36 +0000 +++ src/ChangeLog 2011-01-20 06:10:05 +0000 @@ -1,3 +1,9 @@ +2011-01-20 Glenn Morris + + * macros.c (syms_of_macros) : + Give it a doc string. + * globals.h: Add Vkbd_macro_termination_hook. + 2011-01-20 Chong Yidong * fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS. === modified file 'src/globals.h' --- src/globals.h 2011-01-19 23:32:42 +0000 +++ src/globals.h 2011-01-20 06:10:05 +0000 @@ -937,6 +937,9 @@ Lisp_Object f_Vobarray; + /* Normal hook run whenever a keyboard macro terminates. */ + Lisp_Object f_Vkbd_macro_termination_hook; + /* Kbd macro currently being executed (a string or vector). */ Lisp_Object f_Vexecuting_kbd_macro; @@ -1951,6 +1954,8 @@ globals.f_Vexec_path #define Vexec_suffixes \ globals.f_Vexec_suffixes +#define Vkbd_macro_termination_hook \ + globals.f_Vkbd_macro_termination_hook #define Vexecuting_kbd_macro \ globals.f_Vexecuting_kbd_macro #define Vface_default_stipple \ === modified file 'src/macros.c' --- src/macros.c 2011-01-18 20:45:37 +0000 +++ src/macros.c 2011-01-20 06:10:05 +0000 @@ -1,6 +1,7 @@ /* Keyboard macros. - Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -361,6 +362,11 @@ { Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro"); staticpro (&Qexecute_kbd_macro); + + DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook, + doc: /* Normal hook run whenever a keyboard macro terminates. +This is run whether the macro ends normally or prematurely due to an error. */); + Vkbd_macro_termination_hook = Qnil; Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook"); staticpro (&Qkbd_macro_termination_hook); ------------------------------------------------------------ revno: 102911 [merge] committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-01-19 21:02:52 -0800 message: Merge: omit auto-generated aclocal.m4 from repository diff: === modified file 'ChangeLog' --- ChangeLog 2011-01-19 23:56:53 +0000 +++ ChangeLog 2011-01-20 05:00:40 +0000 @@ -1,3 +1,12 @@ +2011-01-20 Paul Eggert + + aclocal.m4: omit auto-generated file from repository + * Makefile.in (top_maintainer_clean): Remove aclocal.m4; this undoes + the most recent change here. + * aclocal.m4: Remove from bzr repository. This file is + auto-generated and isn't needed to run 'configure'. See + . + 2011-01-19 Paul Eggert Minor Makefile.in tweaks to build from gnulib better. === modified file 'Makefile.in' --- Makefile.in 2011-01-19 23:56:53 +0000 +++ Makefile.in 2011-01-20 05:00:40 +0000 @@ -833,7 +833,8 @@ ### begin to build the program. top_maintainer_clean=\ ${top_distclean}; \ - rm -fr autom4te.cache + rm -fr autom4te.cache; \ + rm -f aclocal.m4 maintainer-clean: bootstrap-clean FRC (cd src; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) === removed file 'aclocal.m4' --- aclocal.m4 2011-01-09 07:33:50 +0000 +++ aclocal.m4 1970-01-01 00:00:00 +0000 @@ -1,1001 +0,0 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 10 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 16 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([m4/00gnulib.m4]) -m4_include([m4/c-strtod.m4]) -m4_include([m4/extensions.m4]) -m4_include([m4/getopt.m4]) -m4_include([m4/gnulib-common.m4]) -m4_include([m4/gnulib-comp.m4]) -m4_include([m4/include_next.m4]) -m4_include([m4/mktime.m4]) -m4_include([m4/multiarch.m4]) -m4_include([m4/stddef_h.m4]) -m4_include([m4/time_h.m4]) -m4_include([m4/time_r.m4]) -m4_include([m4/unistd_h.m4]) -m4_include([m4/warn-on-use.m4]) -m4_include([m4/wchar_t.m4]) ------------------------------------------------------------ revno: 102910 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-01-19 21:55:36 -0500 message: Revert changes adding format args to yes-or-no-p and y-or-n-p. See discussion on emacs-devel at http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00388.html * src/fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS. * lisp/subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS. * lisp/files.el (find-alternate-file, basic-save-buffer) (basic-save-buffer-2, revert-buffer, recover-file) (kill-buffer-ask, abort-if-file-too-large) (set-visited-file-name, write-file, backup-buffer) (basic-save-buffer, save-some-buffers): * lisp/dired-aux.el (dired-compress-file): Callers changed. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-01-13 08:08:58 +0000 +++ etc/NEWS 2011-01-20 02:55:36 +0000 @@ -688,8 +688,6 @@ ** New function `read-char-choice' reads a restricted set of characters, discarding any inputs not inside the set. -** `y-or-n-p' and `yes-or-no-p' now accept format string arguments. - ** `image-library-alist' is renamed to `dynamic-library-alist'. The variable is now used to load all kind of supported dynamic libraries, not just image libraries. The previous name is still available as an === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-19 03:49:00 +0000 +++ lisp/ChangeLog 2011-01-20 02:55:36 +0000 @@ -1,3 +1,14 @@ +2011-01-20 Chong Yidong + + * subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS. + + * files.el (find-alternate-file, basic-save-buffer) + (basic-save-buffer-2, revert-buffer, recover-file) + (kill-buffer-ask, abort-if-file-too-large) + (set-visited-file-name, write-file, backup-buffer) + (basic-save-buffer, save-some-buffers): + * dired-aux.el (dired-compress-file): Callers changed. + 2011-01-19 Glenn Morris * vc/vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2011-01-16 02:21:30 +0000 +++ lisp/dired-aux.el 2011-01-20 02:55:36 +0000 @@ -821,8 +821,8 @@ (let ((out-name (concat file ".gz"))) (and (or (not (file-exists-p out-name)) (y-or-n-p - "File %s already exists. Really compress? " - out-name)) + (format "File %s already exists. Really compress? " + out-name))) (not (dired-check-process (concat "Compressing " file) "gzip" "-f" file)) (or (file-exists-p out-name) === modified file 'lisp/dired.el' --- lisp/dired.el 2011-01-18 19:08:00 +0000 +++ lisp/dired.el 2011-01-20 02:55:36 +0000 @@ -3562,7 +3562,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "adcb55a439048f158f47c5c96b3dad09") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "b30af1396920c8bf22f3c83746bb73f9") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ === modified file 'lisp/files.el' --- lisp/files.el 2011-01-15 20:38:27 +0000 +++ lisp/files.el 2011-01-20 02:55:36 +0000 @@ -1558,8 +1558,8 @@ (unless (run-hook-with-args-until-failure 'kill-buffer-query-functions) (error "Aborted")) (when (and (buffer-modified-p) buffer-file-name) - (if (yes-or-no-p "Buffer %s is modified; save it first? " - (buffer-name)) + (if (yes-or-no-p (format "Buffer %s is modified; save it first? " + (buffer-name))) (save-buffer) (unless (yes-or-no-p "Kill and replace the buffer without saving it? ") (error "Aborted")))) @@ -1762,9 +1762,9 @@ OP-TYPE specifies the file operation being performed (for message to user)." (when (and large-file-warning-threshold size (> size large-file-warning-threshold) - (not (y-or-n-p "File %s is large (%dMB), really %s? " - (file-name-nondirectory filename) - (/ size 1048576) op-type))) + (not (y-or-n-p (format "File %s is large (%dMB), really %s? " + (file-name-nondirectory filename) + (/ size 1048576) op-type)))) (error "Aborted"))) (defun find-file-noselect (filename &optional nowarn rawfile wildcards) @@ -3584,8 +3584,8 @@ (let ((buffer (and filename (find-buffer-visiting filename)))) (and buffer (not (eq buffer (current-buffer))) (not no-query) - (not (y-or-n-p "A buffer is visiting %s; proceed? " - filename)) + (not (y-or-n-p (format "A buffer is visiting %s; proceed? " + filename))) (error "Aborted"))) (or (equal filename buffer-file-name) (progn @@ -3696,7 +3696,7 @@ (or buffer-file-name (buffer-name)))))) (and confirm (file-exists-p filename) - (or (y-or-n-p "File `%s' exists; overwrite? " filename) + (or (y-or-n-p (format "File `%s' exists; overwrite? " filename)) (error "Canceled"))) (set-visited-file-name filename (not confirm)))) (set-buffer-modified-p t) @@ -3750,8 +3750,8 @@ (and targets (or (eq delete-old-versions t) (eq delete-old-versions nil)) (or delete-old-versions - (y-or-n-p "Delete excess backup versions of %s? " - real-file-name)))) + (y-or-n-p (format "Delete excess backup versions of %s? " + real-file-name))))) (modes (file-modes buffer-file-name)) (context (file-selinux-context buffer-file-name))) ;; Actually write the back up file. @@ -4324,8 +4324,8 @@ ;; Signal an error if the user specified the name of an ;; existing directory. (error "%s is a directory" filename) - (unless (y-or-n-p "File `%s' exists; overwrite? " - filename) + (unless (y-or-n-p (format "File `%s' exists; overwrite? " + filename)) (error "Canceled"))) ;; Signal an error if the specified name refers to a ;; non-existing directory. @@ -4338,8 +4338,9 @@ (or (verify-visited-file-modtime (current-buffer)) (not (file-exists-p buffer-file-name)) (yes-or-no-p - "%s has changed since visited or saved. Save anyway? " - (file-name-nondirectory buffer-file-name)) + (format + "%s has changed since visited or saved. Save anyway? " + (file-name-nondirectory buffer-file-name))) (error "Save not confirmed")) (save-restriction (widen) @@ -4353,8 +4354,8 @@ (eq require-final-newline 'visit-save) (and require-final-newline (y-or-n-p - "Buffer %s does not end in newline. Add one? " - (buffer-name)))) + (format "Buffer %s does not end in newline. Add one? " + (buffer-name))))) (save-excursion (goto-char (point-max)) (insert ?\n)))) @@ -4416,9 +4417,10 @@ (if (not (file-exists-p buffer-file-name)) (error "Directory %s write-protected" dir) (if (yes-or-no-p - "File %s is write-protected; try to save anyway? " - (file-name-nondirectory - buffer-file-name)) + (format + "File %s is write-protected; try to save anyway? " + (file-name-nondirectory + buffer-file-name))) (setq tempsetmodes t) (error "Attempt to save to a file which you aren't allowed to write")))))) (or buffer-backed-up @@ -4609,7 +4611,7 @@ (progn (if (or arg (eq save-abbrevs 'silently) - (y-or-n-p "Save abbrevs in %s? " abbrev-file-name)) + (y-or-n-p (format "Save abbrevs in %s? " abbrev-file-name))) (write-abbrev-file nil)) ;; Don't keep bothering user if he says no. (setq abbrevs-changed nil) @@ -4784,8 +4786,8 @@ (list dir (if (directory-files dir nil directory-files-no-dot-files-regexp) (y-or-n-p - "Directory `%s' is not empty, really %s? " - dir (if trashing "trash" "delete")) + (format "Directory `%s' is not empty, really %s? " + dir (if trashing "trash" "delete"))) nil) (null current-prefix-arg)))) ;; If default-directory is a remote directory, make sure we find its @@ -4984,8 +4986,8 @@ (dolist (regexp revert-without-query) (when (string-match regexp file-name) (throw 'found t))))) - (yes-or-no-p "Revert buffer from file %s? " - file-name)) + (yes-or-no-p (format "Revert buffer from file %s? " + file-name))) (run-hooks 'before-revert-hook) ;; If file was backed up but has changed since, ;; we should make another backup. @@ -5105,7 +5107,7 @@ ;; to emulate what `ls' did in that case. (insert-directory-safely file switches) (insert-directory-safely file-name switches)))) - (yes-or-no-p "Recover auto save file %s? " file-name)) + (yes-or-no-p (format "Recover auto save file %s? " file-name))) (switch-to-buffer (find-file-noselect file t)) (let ((inhibit-read-only t) ;; Keep the current buffer-file-coding-system. @@ -5225,10 +5227,10 @@ (defun kill-buffer-ask (buffer) "Kill BUFFER if confirmed." - (when (yes-or-no-p - "Buffer %s %s. Kill? " (buffer-name buffer) - (if (buffer-modified-p buffer) - "HAS BEEN EDITED" "is unmodified")) + (when (yes-or-no-p (format "Buffer %s %s. Kill? " + (buffer-name buffer) + (if (buffer-modified-p buffer) + "HAS BEEN EDITED" "is unmodified"))) (kill-buffer buffer))) (defun kill-some-buffers (&optional list) === modified file 'lisp/subr.el' --- lisp/subr.el 2011-01-15 20:38:27 +0000 +++ lisp/subr.el 2011-01-20 02:55:36 +0000 @@ -2067,12 +2067,10 @@ nil)))))) (set-advertised-calling-convention 'sit-for '(seconds &optional nodisp) "22.1") -(defun y-or-n-p (prompt &rest args) +(defun y-or-n-p (prompt) "Ask user a \"y or n\" question. Return t if answer is \"y\". -The string to display to ask the question is obtained by -formatting the string PROMPT with arguments ARGS (see `format'). -The result should end in a space; `y-or-n-p' adds \"(y or n) \" -to it. +PROMPT is the string to display to ask the question. It should +end in a space; `y-or-n-p' adds \"(y or n) \" to it. No confirmation of the answer is requested; a single character is enough. Also accepts Space to mean yes, or Delete to mean no. \(Actually, it uses @@ -2091,7 +2089,7 @@ use-dialog-box) (setq answer (x-popup-dialog t `(,prompt ("yes" . act) ("No" . skip)))) - (setq prompt (concat (apply 'format prompt args) + (setq prompt (concat prompt (if (eq ?\s (aref prompt (1- (length prompt)))) "" " ") "(y or n) ")) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-19 23:32:42 +0000 +++ src/ChangeLog 2011-01-20 02:55:36 +0000 @@ -1,3 +1,7 @@ +2011-01-20 Chong Yidong + + * fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS. + 2011-01-19 Paul Eggert Fix X11 compilation failure. === modified file 'src/fns.c' --- src/fns.c 2011-01-18 20:45:37 +0000 +++ src/fns.c 2011-01-20 02:55:36 +0000 @@ -2450,24 +2450,23 @@ /* Anything that calls this function must protect from GC! */ -DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, MANY, 0, +DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, 1, 0, doc: /* Ask user a yes-or-no question. Return t if answer is yes. -The string to display to ask the question is obtained by -formatting the string PROMPT with arguments ARGS (see `format'). -The result should end in a space; `yes-or-no-p' adds -\"(yes or no) \" to it. +PROMPT is the string to display to ask the question. It should end in +a space; `yes-or-no-p' adds \"(yes or no) \" to it. The user must confirm the answer with RET, and can edit it until it has been confirmed. Under a windowing system a dialog box will be used if `last-nonmenu-event' -is nil, and `use-dialog-box' is non-nil. -usage: (yes-or-no-p PROMPT &rest ARGS) */) - (int nargs, Lisp_Object *args) +is nil, and `use-dialog-box' is non-nil. */) + (Lisp_Object prompt) { register Lisp_Object ans; + Lisp_Object args[2]; struct gcpro gcpro1; - Lisp_Object prompt = Fformat (nargs, args); + + CHECK_STRING (prompt); #ifdef HAVE_MENUS if (FRAME_WINDOW_P (SELECTED_FRAME ()) @@ -2488,7 +2487,10 @@ } #endif /* HAVE_MENUS */ - prompt = concat2 (prompt, build_string ("(yes or no) ")); + args[0] = prompt; + args[1] = build_string ("(yes or no) "); + prompt = Fconcat (2, args); + GCPRO1 (prompt); while (1) ------------------------------------------------------------ revno: 102909 [merge] committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-01-19 15:59:52 -0800 message: Merge: build from gnulib a bit better; document autoreconf. diff: === modified file 'ChangeLog' --- ChangeLog 2011-01-18 05:23:52 +0000 +++ ChangeLog 2011-01-19 23:56:53 +0000 @@ -1,3 +1,10 @@ +2011-01-19 Paul Eggert + + Minor Makefile.in tweaks to build from gnulib better. + + * Makefile.in (sync-from-gnulib): Also run autoreconf -I m4. + (top_maintainer_clean): Don't remove aclocal.m4. + 2011-01-18 Paul Eggert Minor cleanups for 'bzr status' === modified file 'Makefile.in' --- Makefile.in 2011-01-18 05:23:52 +0000 +++ Makefile.in 2011-01-19 23:56:53 +0000 @@ -343,6 +343,7 @@ $(gnulib_srcdir)/build-aux/mkinstalldirs \ $(gnulib_srcdir)/build-aux/move-if-change \ $(srcdir) + cd $(srcdir) && autoreconf -I m4 .PHONY: sync-from-gnulib # These targets should be "${SUBDIR} without `src'". @@ -832,8 +833,7 @@ ### begin to build the program. top_maintainer_clean=\ ${top_distclean}; \ - rm -fr autom4te.cache; \ - rm -f aclocal.m4 + rm -fr autom4te.cache maintainer-clean: bootstrap-clean FRC (cd src; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-01-17 22:11:13 +0000 +++ admin/ChangeLog 2011-01-19 23:56:42 +0000 @@ -1,3 +1,9 @@ +2011-01-19 Paul Eggert + + * make-tarball.txt: Suggest 'autoreconf -I m4 --force' + rather than doing rm and autoconf by hand. See + . + 2011-01-17 Paul Eggert * notes/bzr (Installing changes from gnulib): New section. === modified file 'admin/make-tarball.txt' --- admin/make-tarball.txt 2010-10-22 03:28:21 +0000 +++ admin/make-tarball.txt 2011-01-19 23:56:42 +0000 @@ -28,7 +28,7 @@ refer to a newer release of Emacs. (This is probably needed only when preparing a major Emacs release, or branching for it.) -5. rm configure src/config.in; autoconf; autoheader +5. autoreconf -I m4 --force make bootstrap 6. Commit configure, src/config.in, etc/AUTHORS, all the files changed @@ -107,4 +107,3 @@ 13. For a pretest, announce it on emacs-devel and BCC the pretesters. For a release, announce it on info-gnu@gnu.org, info-gnu-emacs@gnu.org, and emacs-devel. - ------------------------------------------------------------ revno: 102908 committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-01-19 15:32:42 -0800 message: Fix X11 compilation failure. * globals.h (struct emacs_globals): Document f_Vselection_alist. * xselect.c (Vselection_alist): Remove declaration, moving its documentation to globals.h. This fixes a compilation failure induced by the earlier change to globals.h today. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-19 22:13:54 +0000 +++ src/ChangeLog 2011-01-19 23:32:42 +0000 @@ -1,3 +1,11 @@ +2011-01-19 Paul Eggert + + Fix X11 compilation failure. + * globals.h (struct emacs_globals): Document f_Vselection_alist. + * xselect.c (Vselection_alist): Remove declaration, moving its + documentation to globals.h. This fixes a compilation failure + induced by the earlier change to globals.h today. + 2011-01-19 Jan Djärv * unexmacosx.c: Include config.h before unistd.h (Bug#7859). === modified file 'src/globals.h' --- src/globals.h 2011-01-19 22:11:33 +0000 +++ src/globals.h 2011-01-19 23:32:42 +0000 @@ -1701,7 +1701,7 @@ f_ns_input_line; Lisp_Object f_ns_input_color, f_ns_input_text, f_ns_working_text; Lisp_Object f_ns_input_spi_name, f_ns_input_spi_arg; - + /* Specifies which emacs modifier should be generated when NS receives the Alternate modifier. May be Qnone or any of the modifier lisp symbols. */ @@ -1751,6 +1751,19 @@ Lisp_Object f_Vns_sent_selection_hooks; Lisp_Object f_Vns_lost_selection_hooks; + + /* This is an association list whose elements are of the form + ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) + SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. + SELECTION-VALUE is the value that emacs owns for that selection. + It may be any kind of Lisp object. + SELECTION-TIMESTAMP is the time at which emacs began owning this + selection, as a cons of two 16-bit numbers (making a 32 bit time.) + FRAME is the frame for which we made the selection. + If there is an entry in this alist, then it can be assumed that Emacs owns + that selection. + The only (eq) parts of this list that are visible from Lisp are the + selection-values. */ Lisp_Object f_Vselection_alist; Lisp_Object f_Vns_reg_to_script; @@ -2882,5 +2895,3 @@ globals.f_Vselection_alist #define Vns_reg_to_script \ globals.f_Vns_reg_to_script - - === modified file 'src/xselect.c' --- src/xselect.c 2011-01-18 20:45:37 +0000 +++ src/xselect.c 2011-01-19 23:32:42 +0000 @@ -127,20 +127,6 @@ /* Defined in keyboard.c. */ extern unsigned long last_event_timestamp; -/* This is an association list whose elements are of the form - ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) - SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. - SELECTION-VALUE is the value that emacs owns for that selection. - It may be any kind of Lisp object. - SELECTION-TIMESTAMP is the time at which emacs began owning this selection, - as a cons of two 16-bit numbers (making a 32 bit time.) - FRAME is the frame for which we made the selection. - If there is an entry in this alist, then it can be assumed that Emacs owns - that selection. - The only (eq) parts of this list that are visible from Lisp are the - selection-values. */ -static Lisp_Object Vselection_alist; - /* Define a queue to save up SELECTION_REQUEST_EVENT events for later @@ -2700,4 +2686,3 @@ Qforeign_selection = intern_c_string ("foreign-selection"); staticpro (&Qforeign_selection); } - ------------------------------------------------------------ revno: 102907 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-01-19 22:35:53 +0000 message: gnus-art.el (gnus-article-highlight): Remove argument passed to gnus-article-add-buttons. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-19 22:22:18 +0000 +++ lisp/gnus/ChangeLog 2011-01-19 22:35:53 +0000 @@ -1,3 +1,8 @@ +2011-01-19 Katsumi Yamaoka + + * gnus-art.el (gnus-article-highlight): Remove argument passed to + gnus-article-add-buttons. + 2011-01-19 Tom Rauchenwald (tiny change) * spam.el (spam-spamassassin-register-with-sa-learn): Insert a full === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-19 22:22:18 +0000 +++ lisp/gnus/gnus-art.el 2011-01-19 22:35:53 +0000 @@ -7651,7 +7651,7 @@ (gnus-article-highlight-headers) (gnus-article-highlight-citation force) (gnus-article-highlight-signature) - (gnus-article-add-buttons force) + (gnus-article-add-buttons) (gnus-article-add-buttons-to-head)) (defun gnus-article-highlight-some (&optional force) ------------------------------------------------------------ revno: 102906 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-01-19 22:22:18 +0000 message: gnus-art.el (gnus-article-add-buttons): Simplify condition. (gnus-button-push): Remove gnus-button-entry function, it fails heavily if you have the same regexp several times. (gnus-button-push): Fix matching when regexp is symbol. spam.el (spam-spamassassin-register-with-sa-learn): Insert a full From header with a date and "nobody" as the sender. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-16 02:21:30 +0000 +++ lisp/gnus/ChangeLog 2011-01-19 22:22:18 +0000 @@ -1,3 +1,15 @@ +2011-01-19 Tom Rauchenwald (tiny change) + + * spam.el (spam-spamassassin-register-with-sa-learn): Insert a full + From header with a date and "nobody" as the sender. + +2011-01-19 Julien Danjou + + * gnus-art.el (gnus-article-add-buttons): Simplify condition. + (gnus-button-push): Remove gnus-button-entry function, it fails heavily + if you have the same regexp several times. + (gnus-button-push): Fix matching when regexp is symbol. + 2011-01-15 Glenn Morris * message.el (message-mail): A compose-mail function should === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-14 17:18:41 +0000 +++ lisp/gnus/gnus-art.el 2011-01-19 22:22:18 +0000 @@ -4413,7 +4413,6 @@ (gnus-update-format-specifications nil 'article-mode) (set (make-local-variable 'page-delimiter) gnus-page-delimiter) (set (make-local-variable 'gnus-page-broken) nil) - (make-local-variable 'gnus-button-marker-list) (make-local-variable 'gnus-article-current-summary) (make-local-variable 'gnus-article-mime-handles) (make-local-variable 'gnus-article-decoded-p) @@ -4436,10 +4435,6 @@ (mm-enable-multibyte) (gnus-run-mode-hooks 'gnus-article-mode-hook)) -(defvar gnus-button-marker-list nil - "Regexp matching any of the regexps from `gnus-button-alist'. -Internal variable.") - (defun gnus-article-setup-buffer () "Initialize the article buffer." (let* ((name (if gnus-single-article-buffer "*Article*" @@ -4483,8 +4478,6 @@ (setq gnus-article-mime-handle-alist nil) (buffer-disable-undo) (setq buffer-read-only t) - ;; This list just keeps growing if we don't reset it. - (setq gnus-button-marker-list nil) (unless (eq major-mode 'gnus-article-mode) (gnus-article-mode)) (setq truncate-lines gnus-article-truncate-lines) @@ -7726,28 +7719,16 @@ "Say whether PROP exists in the region." (text-property-not-all b e prop nil)) -(defun gnus-article-add-buttons (&optional force) +(defun gnus-article-add-buttons () "Find external references in the article and make buttons of them. \"External references\" are things like Message-IDs and URLs, as specified by `gnus-button-alist'." - (interactive (list 'force)) + (interactive) (gnus-with-article-buffer (let ((inhibit-point-motion-hooks t) (case-fold-search t) (alist gnus-button-alist) beg entry regexp) - ;; Remove all old markers. - (let (marker entry new-list) - (while (setq marker (pop gnus-button-marker-list)) - (if (or (< marker (point-min)) (>= marker (point-max))) - (push marker new-list) - (goto-char marker) - (when (setq entry (gnus-button-entry)) - (put-text-property (match-beginning (nth 1 entry)) - (match-end (nth 1 entry)) - 'gnus-callback nil)) - (set-marker marker nil))) - (setq gnus-button-marker-list new-list)) ;; We skip the headers. (article-goto-body) (setq beg (point)) @@ -7758,18 +7739,16 @@ (let ((start (match-beginning (nth 1 entry))) (end (match-end (nth 1 entry))) (from (match-beginning 0))) - (when (and (or (eq t (nth 2 entry)) - (eval (nth 2 entry))) + (when (and (eval (nth 2 entry)) (not (gnus-button-in-region-p start end 'gnus-callback))) ;; That optional form returned non-nil, so we add the ;; button. (setq from (set-marker (make-marker) from)) - (push from gnus-button-marker-list) (unless (and (eq (car entry) 'gnus-button-url-regexp) (gnus-article-extend-url-button from start end)) (gnus-article-add-button start end - 'gnus-button-push from) + 'gnus-button-push (list from entry)) (gnus-put-text-property start end 'gnus-string (buffer-substring-no-properties @@ -7916,41 +7895,38 @@ (let ((gnus-article-mime-handle-alist-1 gnus-article-mime-handle-alist)) (gnus-set-mode-line 'article)))) -(defun gnus-button-entry () - ;; Return the first entry in `gnus-button-alist' matching this place. - (let ((alist gnus-button-alist) - (entry nil)) - (while alist - (setq entry (pop alist)) - (if (looking-at (eval (car entry))) - (setq alist nil) - (setq entry nil))) - entry)) - -(defun gnus-button-push (marker) +(defun gnus-button-push (marker-and-entry) ;; Push button starting at MARKER. (save-excursion - (goto-char marker) - (let* ((entry (gnus-button-entry)) - (inhibit-point-motion-hooks t) - (fun (nth 3 entry)) - (args (or (and (eq (car entry) 'gnus-button-url-regexp) - (get-char-property marker 'gnus-button-url)) - (mapcar (lambda (group) - (let ((string (match-string group))) - (set-text-properties - 0 (length string) nil string) - string)) - (nthcdr 4 entry))))) - (cond - ((fboundp fun) - (apply fun args)) - ((and (boundp fun) - (fboundp (symbol-value fun))) - (apply (symbol-value fun) args)) - (t - (gnus-message 1 "You must define `%S' to use this button" - (cons fun args))))))) + (let* ((marker (car marker-and-entry)) + (entry (cadr marker-and-entry)) + (regexp (car entry)) + (inhibit-point-motion-hooks t)) + (goto-char marker) + ;; This is obviously true, or something bad is happening :) + ;; But we need it to have the match-data + (when (looking-at (or (if (symbolp regexp) + (symbol-value regexp) + regexp))) + (let ((fun (nth 3 entry)) + (args (or (and (eq (car entry) 'gnus-button-url-regexp) + (get-char-property marker 'gnus-button-url)) + (mapcar (lambda (group) + (let ((string (match-string group))) + (set-text-properties + 0 (length string) nil string) + string)) + (nthcdr 4 entry))))) + + (cond + ((fboundp fun) + (apply fun args)) + ((and (boundp fun) + (fboundp (symbol-value fun))) + (apply (symbol-value fun) args)) + (t + (gnus-message 1 "You must define `%S' to use this button" + (cons fun args))))))))) (defun gnus-parse-news-url (url) (let (scheme server port group message-id articles) === modified file 'lisp/gnus/spam.el' --- lisp/gnus/spam.el 2011-01-14 17:18:41 +0000 +++ lisp/gnus/spam.el 2011-01-19 22:22:18 +0000 @@ -2726,9 +2726,8 @@ (with-current-buffer summary-buffer-name (setq article-string (spam-get-article-as-string article))) (when (stringp article-string) - (insert "From \n") ; mbox separator (sa-learn only checks the - ; first five chars, so we can get away with - ; a bogus line)) + ;; mbox separator + (insert (concat "From nobody " (current-time-string) "\n")) (insert article-string) (insert "\n")))) ;; call sa-learn on all messages at the same time ------------------------------------------------------------ revno: 102905 committer: Jan D. branch nick: trunk timestamp: Wed 2011-01-19 23:13:54 +0100 message: * unexmacosx.c: Include config.h before unistd.h. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-19 22:11:33 +0000 +++ src/ChangeLog 2011-01-19 22:13:54 +0000 @@ -1,5 +1,7 @@ 2011-01-19 Jan Djärv + * unexmacosx.c: Include config.h before unistd.h (Bug#7859). + * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize) (ns_input_line, ns_input_color, ns_input_text, ns_working_text) (ns_input_spi_name, ns_input_spi_arg) === modified file 'src/unexmacosx.c' --- src/unexmacosx.c 2011-01-15 23:16:57 +0000 +++ src/unexmacosx.c 2011-01-19 22:13:54 +0000 @@ -91,6 +91,10 @@ #include #include #include +#include +#undef malloc +#undef realloc +#undef free #include #include #include @@ -98,10 +102,6 @@ #if defined (__ppc__) #include #endif -#include -#undef malloc -#undef realloc -#undef free #ifdef HAVE_MALLOC_MALLOC_H #include #else ------------------------------------------------------------ revno: 102904 committer: Jan D. branch nick: trunk timestamp: Wed 2011-01-19 23:11:33 +0100 message: Fix NextStep build problems with globals.h introducion. * src/globals.h (struct emacs_globals): Add f_ns_input_file, f_ns_input_font, f_ns_input_fontsize, f_ns_input_line, f_ns_input_color, f_ns_input_text, f_ns_working_text, f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier, f_ns_right_alternate_modifier, f_ns_command_modifier, f_ns_right_command_modifier, f_ns_control_modifier, f_ns_right_control_modifier, f_ns_function_modifier, f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist, f_Vns_version_string, f_Vns_sent_selection_hooks, f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script and corresponding defines. * src/nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration. (Vns_icon_type_alist, Vns_version_string): Move to globals.h. (syms_of_nsfns): Remove & from DEFVAR_LISP calls. * src/nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to globals.h. (syms_of_nsfont): Remove & from DEFVAR_LISP. * src/nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks (Vselection_alist, Vselection_converter_alist): Move to globals.h. (syms_of_nsselect): Remove & from DEFVAR_LISP. * src/nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize) (ns_input_line, ns_input_color, ns_input_text, ns_working_text) (ns_input_spi_name, ns_input_spi_arg) (ns_alternate_modifier, ns_right_alternate_modifier) (ns_command_modifier, ns_right_command_modifier, ns_control_modifier) (ns_right_control_modifier, ns_function_modifier) (ns_antialias_text, ns_confirm_quit): Move to globals.h. (Vx_toolkit_scroll_bars, x_use_underline_position_properties) (x_underline_at_descent_line): Remove declaration. (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL. * src/nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag): Remove declaration. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-19 15:55:47 +0000 +++ src/ChangeLog 2011-01-19 22:11:33 +0000 @@ -1,3 +1,44 @@ +2011-01-19 Jan Djärv + + * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize) + (ns_input_line, ns_input_color, ns_input_text, ns_working_text) + (ns_input_spi_name, ns_input_spi_arg) + (ns_alternate_modifier, ns_right_alternate_modifier) + (ns_command_modifier, ns_right_command_modifier, ns_control_modifier) + (ns_right_control_modifier, ns_function_modifier) + (ns_antialias_text, ns_confirm_quit): Move to globals.h. + (Vx_toolkit_scroll_bars, x_use_underline_position_properties) + (x_underline_at_descent_line): Remove declaration. + (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL. + + * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks + (Vselection_alist, Vselection_converter_alist): Move to globals.h. + (syms_of_nsselect): Remove & from DEFVAR_LISP. + + * nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag): + Remove declaration. + + * nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to + globals.h. + (syms_of_nsfont): Remove & from DEFVAR_LISP. + + * nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration. + (Vns_icon_type_alist, Vns_version_string): Move to globals.h. + (syms_of_nsfns): Remove & from DEFVAR_LISP calls. + + * globals.h (struct emacs_globals): Add f_ns_input_file, + f_ns_input_font, f_ns_input_fontsize, f_ns_input_line, + f_ns_input_color, f_ns_input_text, f_ns_working_text, + f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier, + f_ns_right_alternate_modifier, f_ns_command_modifier, + f_ns_right_command_modifier, f_ns_control_modifier, + f_ns_right_control_modifier, f_ns_function_modifier, + f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist, + f_Vns_version_string, f_Vns_sent_selection_hooks, + f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script + and corresponding defines. + + 2011-01-19 Sam Steingold * w32.c (check_windows_init_file): Remove declarations of === modified file 'src/globals.h' --- src/globals.h 2011-01-18 20:45:37 +0000 +++ src/globals.h 2011-01-19 22:11:33 +0000 @@ -1695,6 +1695,67 @@ Lisp_Object f_Vx_super_keysym; Lisp_Object f_Vx_keysym_table; + + /* Lisp communications */ + Lisp_Object f_ns_input_file, f_ns_input_font, f_ns_input_fontsize, + f_ns_input_line; + Lisp_Object f_ns_input_color, f_ns_input_text, f_ns_working_text; + Lisp_Object f_ns_input_spi_name, f_ns_input_spi_arg; + + /* Specifies which emacs modifier should be generated when NS receives + the Alternate modifier. May be Qnone or any of the modifier lisp symbols. + */ + Lisp_Object f_ns_alternate_modifier; + + /* Specifies which emacs modifier should be generated when NS receives + the right Alternate modifier. Has same values as ns_alternate_modifier + plus the value Qleft which means whatever value ns_alternate_modifier has. + */ + Lisp_Object f_ns_right_alternate_modifier; + + /* Specifies which emacs modifier should be generated when NS receives + the Command modifier. May be any of the modifier lisp symbols. */ + Lisp_Object f_ns_command_modifier; + + /* Specifies which emacs modifier should be generated when NS receives + the right Command modifier. Has same values as ns_command_modifier plus + the value Qleft which means whatever value ns_command_modifier has. */ + Lisp_Object f_ns_right_command_modifier; + + /* Specifies which emacs modifier should be generated when NS receives + the Control modifier. May be any of the modifier lisp symbols. */ + Lisp_Object f_ns_control_modifier; + + /* Specifies which emacs modifier should be generated when NS receives + the right Control modifier. Has same values as ns_control_modifier plus + the value Qleft which means whatever value ns_control_modifier has. */ + Lisp_Object f_ns_right_control_modifier; + + /* Specifies which emacs modifier should be generated when NS receives + the Function modifier (laptops). May be any of the modifier lisp symbols. + */ + Lisp_Object f_ns_function_modifier; + + /* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */ + Lisp_Object f_ns_antialias_text; + + /* Confirm on exit. */ + Lisp_Object f_ns_confirm_quit; + + /* Alist of elements (REGEXP . IMAGE) for images of icons associated + to frames.*/ + Lisp_Object f_Vns_icon_type_alist; + + /* Toolkit version support. */ + Lisp_Object f_Vns_version_string; + + Lisp_Object f_Vns_sent_selection_hooks; + Lisp_Object f_Vns_lost_selection_hooks; + Lisp_Object f_Vselection_alist; + + Lisp_Object f_Vns_reg_to_script; + + }; extern struct emacs_globals globals; @@ -2773,3 +2834,53 @@ globals.f_x_underline_at_descent_line #define x_use_underline_position_properties \ globals.f_x_use_underline_position_properties +#define ns_input_file \ + globals.f_ns_input_file +#define ns_input_font \ + globals.f_ns_input_font +#define ns_input_fontsize \ + globals.f_ns_input_fontsize +#define ns_input_line \ + globals.f_ns_input_line +#define ns_input_color \ + globals.f_ns_input_color +#define ns_input_text \ + globals.f_ns_input_text +#define ns_working_text \ + globals.f_ns_working_text +#define ns_input_spi_name \ + globals.f_ns_input_spi_name +#define ns_input_spi_arg \ + globals.f_ns_input_spi_arg +#define ns_alternate_modifier \ + globals.f_ns_alternate_modifier +#define ns_right_alternate_modifier \ + globals.f_ns_right_alternate_modifier +#define ns_command_modifier \ + globals.f_ns_command_modifier +#define ns_right_command_modifier \ + globals.f_ns_right_command_modifier +#define ns_control_modifier \ + globals.f_ns_control_modifier +#define ns_right_control_modifier \ + globals.f_ns_right_control_modifier +#define ns_function_modifier \ + globals.f_ns_function_modifier +#define ns_antialias_text \ + globals.f_ns_antialias_text +#define ns_confirm_quit \ + globals.f_ns_confirm_quit +#define Vns_icon_type_alist \ + globals.f_Vns_icon_type_alist +#define Vns_version_string \ + globals.f_Vns_version_string +#define Vns_sent_selection_hooks \ + globals.f_Vns_sent_selection_hooks +#define Vns_lost_selection_hooks \ + globals.f_Vns_lost_selection_hooks +#define Vselection_alist \ + globals.f_Vselection_alist +#define Vns_reg_to_script \ + globals.f_Vns_reg_to_script + + === modified file 'src/nsfns.m' --- src/nsfns.m 2011-01-16 02:21:30 +0000 +++ src/nsfns.m 2011-01-19 22:11:33 +0000 @@ -82,11 +82,7 @@ extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth; extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle; extern Lisp_Object Qnone; -extern Lisp_Object Vframe_title_format, Vicon_title_format; - -/* The below are defined in frame.c. */ - -extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; + Lisp_Object Qbuffered; Lisp_Object Qfontsize; @@ -94,13 +90,6 @@ /* hack for OS X file panels */ char panelOK = 0; -/* Alist of elements (REGEXP . IMAGE) for images of icons associated - to frames.*/ -static Lisp_Object Vns_icon_type_alist; - -/* Toolkit version support. */ -static Lisp_Object Vns_version_string; - EmacsTooltip *ns_tooltip; /* Need forward declaration here to preserve organizational integrity of file */ @@ -2593,7 +2582,7 @@ Qfontsize = intern_c_string ("fontsize"); staticpro (&Qfontsize); - DEFVAR_LISP ("ns-icon-type-alist", &Vns_icon_type_alist, + DEFVAR_LISP ("ns-icon-type-alist", Vns_icon_type_alist, doc: /* Alist of elements (REGEXP . IMAGE) for images of icons associated to frames. If the title of a frame matches REGEXP, then IMAGE.tiff is selected as the image of the icon representing the frame when it's @@ -2614,7 +2603,7 @@ be used as the image of the icon representing the frame. */); Vns_icon_type_alist = Fcons (Qt, Qnil); - DEFVAR_LISP ("ns-version-string", &Vns_version_string, + DEFVAR_LISP ("ns-version-string", Vns_version_string, doc: /* Toolkit version for NS Windowing. */); Vns_version_string = ns_appkit_version_str (); === modified file 'src/nsfont.m' --- src/nsfont.m 2011-01-15 23:16:57 +0000 +++ src/nsfont.m 2011-01-19 22:11:33 +0000 @@ -48,10 +48,8 @@ extern Lisp_Object Qns; extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded; -static Lisp_Object Vns_reg_to_script; static Lisp_Object Qapple, Qroman, Qmedium; extern Lisp_Object Qappend; -extern Lisp_Object ns_antialias_text; extern float ns_antialias_threshold; extern int ns_tmp_flags; extern struct nsfont_info *ns_tmp_font; @@ -1517,7 +1515,7 @@ DEFSYM (Qapple, "apple"); DEFSYM (Qroman, "roman"); DEFSYM (Qmedium, "medium"); - DEFVAR_LISP ("ns-reg-to-script", &Vns_reg_to_script, + DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, doc: /* Internal use: maps font registry to unicode script. */); } === modified file 'src/nsmenu.m' --- src/nsmenu.m 2011-01-15 23:16:57 +0000 +++ src/nsmenu.m 2011-01-19 22:11:33 +0000 @@ -65,8 +65,7 @@ extern Lisp_Object QCtoggle, QCradio; Lisp_Object Qdebug_on_next_call; -extern Lisp_Object Voverriding_local_map, Voverriding_local_map_menu_flag, - Qoverriding_local_map, Qoverriding_terminal_local_map; +extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; extern long context_menu_value; EmacsMenu *mainMenu, *svcsMenu, *dockMenu; === modified file 'src/nsselect.m' --- src/nsselect.m 2011-01-15 23:16:57 +0000 +++ src/nsselect.m 2011-01-19 22:11:33 +0000 @@ -39,11 +39,6 @@ Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME; -static Lisp_Object Vns_sent_selection_hooks; -static Lisp_Object Vns_lost_selection_hooks; -static Lisp_Object Vselection_alist; -static Lisp_Object Vselection_converter_alist; - static Lisp_Object Qforeign_selection; /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ @@ -568,7 +563,7 @@ Vselection_alist = Qnil; staticpro (&Vselection_alist); - DEFVAR_LISP ("ns-sent-selection-hooks", &Vns_sent_selection_hooks, + DEFVAR_LISP ("ns-sent-selection-hooks", Vns_sent_selection_hooks, "A list of functions to be called when Emacs answers a selection request.\n\ The functions are called with four arguments:\n\ - the selection name (typically `PRIMARY', `SECONDARY', or `CLIPBOARD');\n\ @@ -582,7 +577,7 @@ it merely informs you that they have happened."); Vns_sent_selection_hooks = Qnil; - DEFVAR_LISP ("selection-converter-alist", &Vselection_converter_alist, + DEFVAR_LISP ("selection-converter-alist", Vselection_converter_alist, "An alist associating X Windows selection-types with functions.\n\ These functions are called to convert the selection, with three args:\n\ the name of the selection (typically `PRIMARY', `SECONDARY', or `CLIPBOARD');\n\ @@ -597,7 +592,7 @@ and there is no meaningful selection value."); Vselection_converter_alist = Qnil; - DEFVAR_LISP ("ns-lost-selection-hooks", &Vns_lost_selection_hooks, + DEFVAR_LISP ("ns-lost-selection-hooks", Vns_lost_selection_hooks, "A list of functions to be called when Emacs loses an X selection.\n\ \(This happens when some other X client makes its own selection\n\ or when a Lisp program explicitly clears the selection.)\n\ === modified file 'src/nsterm.m' --- src/nsterm.m 2011-01-15 23:16:57 +0000 +++ src/nsterm.m 2011-01-19 22:11:33 +0000 @@ -135,49 +135,10 @@ }; -/* Lisp communications */ -Lisp_Object ns_input_file, ns_input_font, ns_input_fontsize, ns_input_line; -Lisp_Object ns_input_color, ns_input_text, ns_working_text; -Lisp_Object ns_input_spi_name, ns_input_spi_arg; -Lisp_Object Vx_toolkit_scroll_bars; static Lisp_Object Qmodifier_value; Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone; extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; -/* Specifies which emacs modifier should be generated when NS receives - the Alternate modifier. May be Qnone or any of the modifier lisp symbols. */ -Lisp_Object ns_alternate_modifier; - -/* Specifies which emacs modifier should be generated when NS receives - the right Alternate modifier. Has same values as ns_alternate_modifier plus - the value Qleft which means whatever value ns_alternate_modifier has. */ -Lisp_Object ns_right_alternate_modifier; - -/* Specifies which emacs modifier should be generated when NS receives - the Command modifier. May be any of the modifier lisp symbols. */ -Lisp_Object ns_command_modifier; - -/* Specifies which emacs modifier should be generated when NS receives - the right Command modifier. Has same values as ns_command_modifier plus - the value Qleft which means whatever value ns_command_modifier has. */ -Lisp_Object ns_right_command_modifier; - -/* Specifies which emacs modifier should be generated when NS receives - the Control modifier. May be any of the modifier lisp symbols. */ -Lisp_Object ns_control_modifier; - -/* Specifies which emacs modifier should be generated when NS receives - the right Control modifier. Has same values as ns_control_modifier plus - the value Qleft which means whatever value ns_control_modifier has. */ -Lisp_Object ns_right_control_modifier; - -/* Specifies which emacs modifier should be generated when NS receives - the Function modifier (laptops). May be any of the modifier lisp symbols. */ -Lisp_Object ns_function_modifier; - -/* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */ -Lisp_Object ns_antialias_text; - /* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold, the maximum font size to NOT antialias. On GNUstep there is currently no way to control this behavior. */ @@ -186,9 +147,6 @@ /* Used to pick up AppleHighlightColor on OS X */ NSString *ns_selection_color; -/* Confirm on exit. */ -Lisp_Object ns_confirm_quit; - NSArray *ns_send_types =0, *ns_return_types =0, *ns_drag_types =0; NSString *ns_app_name = @"Emacs"; /* default changed later */ @@ -303,8 +261,6 @@ static void ns_judge_scroll_bars (struct frame *f); void x_set_frame_alpha (struct frame *f); -/* unused variables needed for compatibility reasons */ -int x_use_underline_position_properties, x_underline_at_descent_line; /* FIXME: figure out what to do with underline_minimum_offset. */ @@ -3980,7 +3936,6 @@ } -extern Lisp_Object Vauto_save_list_file_name; void ns_term_shutdown (int sig) { @@ -6295,50 +6250,50 @@ Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier)); - DEFVAR_LISP ("ns-input-file", &ns_input_file, + DEFVAR_LISP ("ns-input-file", ns_input_file, "The file specified in the last NS event."); ns_input_file =Qnil; - DEFVAR_LISP ("ns-input-text", &ns_input_text, + DEFVAR_LISP ("ns-input-text", ns_input_text, "The data received in the last NS text drag event."); ns_input_text =Qnil; - DEFVAR_LISP ("ns-working-text", &ns_working_text, + DEFVAR_LISP ("ns-working-text", ns_working_text, "String for visualizing working composition sequence."); ns_working_text =Qnil; - DEFVAR_LISP ("ns-input-font", &ns_input_font, + DEFVAR_LISP ("ns-input-font", ns_input_font, "The font specified in the last NS event."); ns_input_font =Qnil; - DEFVAR_LISP ("ns-input-fontsize", &ns_input_fontsize, + DEFVAR_LISP ("ns-input-fontsize", ns_input_fontsize, "The fontsize specified in the last NS event."); ns_input_fontsize =Qnil; - DEFVAR_LISP ("ns-input-line", &ns_input_line, + DEFVAR_LISP ("ns-input-line", ns_input_line, "The line specified in the last NS event."); ns_input_line =Qnil; - DEFVAR_LISP ("ns-input-color", &ns_input_color, + DEFVAR_LISP ("ns-input-color", ns_input_color, "The color specified in the last NS event."); ns_input_color =Qnil; - DEFVAR_LISP ("ns-input-spi-name", &ns_input_spi_name, + DEFVAR_LISP ("ns-input-spi-name", ns_input_spi_name, "The service name specified in the last NS event."); ns_input_spi_name =Qnil; - DEFVAR_LISP ("ns-input-spi-arg", &ns_input_spi_arg, + DEFVAR_LISP ("ns-input-spi-arg", ns_input_spi_arg, "The service argument specified in the last NS event."); ns_input_spi_arg =Qnil; - DEFVAR_LISP ("ns-alternate-modifier", &ns_alternate_modifier, + DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier, "This variable describes the behavior of the alternate or option key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ Set to none means that the alternate / option key is not interpreted by Emacs\n\ at all, allowing it to be used at a lower level for accented character entry."); ns_alternate_modifier = Qmeta; - DEFVAR_LISP ("ns-right-alternate-modifier", &ns_right_alternate_modifier, + DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier, "This variable describes the behavior of the right alternate or option key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ Set to left means be the same key as `ns-alternate-modifier'.\n\ @@ -6346,12 +6301,12 @@ at all, allowing it to be used at a lower level for accented character entry."); ns_right_alternate_modifier = Qleft; - DEFVAR_LISP ("ns-command-modifier", &ns_command_modifier, + DEFVAR_LISP ("ns-command-modifier", ns_command_modifier, "This variable describes the behavior of the command key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key."); ns_command_modifier = Qsuper; - DEFVAR_LISP ("ns-right-command-modifier", &ns_right_command_modifier, + DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier, "This variable describes the behavior of the right command key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ Set to left means be the same key as `ns-command-modifier'.\n\ @@ -6359,12 +6314,12 @@ at all, allowing it to be used at a lower level for accented character entry."); ns_right_command_modifier = Qleft; - DEFVAR_LISP ("ns-control-modifier", &ns_control_modifier, + DEFVAR_LISP ("ns-control-modifier", ns_control_modifier, "This variable describes the behavior of the control key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key."); ns_control_modifier = Qcontrol; - DEFVAR_LISP ("ns-right-control-modifier", &ns_right_control_modifier, + DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier, "This variable describes the behavior of the right control key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ Set to left means be the same key as `ns-control-modifier'.\n\ @@ -6372,18 +6327,18 @@ at all, allowing it to be used at a lower level for accented character entry."); ns_right_control_modifier = Qleft; - DEFVAR_LISP ("ns-function-modifier", &ns_function_modifier, + DEFVAR_LISP ("ns-function-modifier", ns_function_modifier, "This variable describes the behavior of the function key (on laptops).\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ Set to none means that the function key is not interpreted by Emacs at all,\n\ allowing it to be used at a lower level for accented character entry."); ns_function_modifier = Qnone; - DEFVAR_LISP ("ns-antialias-text", &ns_antialias_text, + DEFVAR_LISP ("ns-antialias-text", ns_antialias_text, "Non-nil (the default) means to render text antialiased. Only has an effect on OS X Panther and above."); ns_antialias_text = Qt; - DEFVAR_LISP ("ns-confirm-quit", &ns_confirm_quit, + DEFVAR_LISP ("ns-confirm-quit", ns_confirm_quit, "Whether to confirm application quit using dialog."); ns_confirm_quit = Qnil; @@ -6394,7 +6349,7 @@ last_mouse_motion_frame = Qnil; /* TODO: move to common code */ - DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, + DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, doc: /* If not nil, Emacs uses toolkit scroll bars. */); #ifdef USE_TOOLKIT_SCROLL_BARS Vx_toolkit_scroll_bars = Qt; @@ -6405,7 +6360,7 @@ /* these are unsupported but we need the declarations to avoid whining messages from cus-start.el */ DEFVAR_BOOL ("x-use-underline-position-properties", - &x_use_underline_position_properties, + x_use_underline_position_properties, doc: /* NOT SUPPORTED UNDER NS. *Non-nil means make use of UNDERLINE_POSITION font properties. A value of nil means ignore them. If you encounter fonts with bogus @@ -6416,7 +6371,7 @@ x_use_underline_position_properties = 0; DEFVAR_BOOL ("x-underline-at-descent-line", - &x_underline_at_descent_line, + x_underline_at_descent_line, doc: /* NOT SUPPORTED UNDER NS. *Non-nil means to draw the underline at the same place as the descent line. A value of nil means to draw the underline according to the value of the ------------------------------------------------------------ revno: 102903 committer: Sam Steingold branch nick: trunk timestamp: Wed 2011-01-19 10:55:47 -0500 message: Fix an error introduced by the previous patch. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-19 15:24:40 +0000 +++ src/ChangeLog 2011-01-19 15:55:47 +0000 @@ -2,6 +2,7 @@ * w32.c (check_windows_init_file): Remove declarations of Vwindow_system, Vload_path, Qfile_exists_p to fix compilation. + * w32fns.c: Fix an error introduced by the previous patch. 2011-01-19 Tom Tromey === modified file 'src/w32fns.c' --- src/w32fns.c 2011-01-18 20:45:37 +0000 +++ src/w32fns.c 2011-01-19 15:55:47 +0000 @@ -89,8 +89,6 @@ static unsigned hourglass_timer = 0; static HWND hourglass_hwnd = NULL; -#if 0 #endif - #ifndef IDC_HAND #define IDC_HAND MAKEINTRESOURCE(32649) #endif ------------------------------------------------------------ revno: 102902 committer: Sam Steingold branch nick: trunk timestamp: Wed 2011-01-19 10:24:40 -0500 message: * src/w32.c (check_windows_init_file): Remove declarations of Vwindow_system, Vload_path, Qfile_exists_p to fix compilation. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-19 15:06:24 +0000 +++ src/ChangeLog 2011-01-19 15:24:40 +0000 @@ -1,3 +1,8 @@ +2011-01-19 Sam Steingold + + * w32.c (check_windows_init_file): Remove declarations of + Vwindow_system, Vload_path, Qfile_exists_p to fix compilation. + 2011-01-19 Tom Tromey * window.c: Fix error introduced by previous patch. === modified file 'src/w32.c' --- src/w32.c 2011-01-18 20:45:37 +0000 +++ src/w32.c 2011-01-19 15:24:40 +0000 @@ -5656,7 +5656,6 @@ if (!noninteractive && !inhibit_window_system) { - extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; Lisp_Object objs[2]; Lisp_Object full_load_path; Lisp_Object init_file; ------------------------------------------------------------ revno: 102901 committer: Tom Tromey branch nick: trunk timestamp: Wed 2011-01-19 08:06:24 -0700 message: * window.c: Fix error introduced by previous patch. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-18 20:45:37 +0000 +++ src/ChangeLog 2011-01-19 15:06:24 +0000 @@ -1,3 +1,7 @@ +2011-01-19 Tom Tromey + + * window.c: Fix error introduced by previous patch. + 2011-01-18 Tom Tromey * globals.h: New file. === modified file 'src/window.c' --- src/window.c 2011-01-18 20:45:37 +0000 +++ src/window.c 2011-01-19 15:06:24 +0000 @@ -151,7 +151,7 @@ #if 0 /* This isn't used anywhere. */ /* Nonzero means we can split a frame even if it is "unsplittable". */ static int inhibit_frame_unsplittable; -#endif extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; +#endif DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, ------------------------------------------------------------ revno: 102900 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-01-18 19:49:00 -0800 message: vc-svn fix for bug#7861. * lisp/vc/vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): Also check the property status. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-18 15:33:24 +0000 +++ lisp/ChangeLog 2011-01-19 03:49:00 +0000 @@ -1,3 +1,8 @@ +2011-01-19 Glenn Morris + + * vc/vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): + Also check the property status. (Bug#7861) + 2011-01-18 Michael Albinus * net/tramp.el (tramp-debug-message): Extend function exclude === modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2011-01-15 23:16:57 +0000 +++ lisp/vc/vc-svn.el 2011-01-19 03:49:00 +0000 @@ -171,15 +171,18 @@ (?? . unregistered) ;; This is what vc-svn-parse-status does. (?~ . edited))) - (re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" - ;; Subexp 2 is a dummy in this case, so the numbers match. - "^\\(.\\)....\\(.\\) \\(.*\\)$")) + (re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" + ;; Subexp 3 is a dummy in this case, so the numbers match. + "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$")) result) (goto-char (point-min)) (while (re-search-forward re nil t) (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) - (filename (match-string 3))) - (and remote (string-equal (match-string 2) "*") + (propstat (cdr (assq (aref (match-string 2) 0) state-map))) + (filename (match-string 4))) + (if (memq propstat '(conflict edited)) + (setq state propstat)) + (and remote (string-equal (match-string 3) "*") ;; FIXME are there other possible combinations? (cond ((eq state 'edited) (setq state 'needs-merge)) ((not state) (setq state 'needs-update)))) @@ -643,7 +646,7 @@ "Parse output of \"svn status\" command in the current buffer. Set file properties accordingly. Unless FILENAME is non-nil, parse only information about FILENAME and return its status." - (let (file status) + (let (file status propstat) (goto-char (point-min)) (while (re-search-forward ;; Ignore the files with status X. @@ -653,7 +656,9 @@ (setq file (or filename (expand-file-name (buffer-substring (point) (line-end-position))))) - (setq status (char-after (line-beginning-position))) + (setq status (char-after (line-beginning-position)) + ;; Status of the item's properties ([ MC]). + propstat (char-after (1+ (line-beginning-position)))) (if (eq status ??) (vc-file-setprop file 'vc-state 'unregistered) ;; Use the last-modified revision, so that searching in vc-print-log @@ -664,7 +669,7 @@ (vc-file-setprop file 'vc-state (cond - ((eq status ?\ ) + ((and (eq status ?\ ) (eq propstat ?\ )) (if (eq (char-after (match-beginning 1)) ?*) 'needs-update (vc-file-setprop file 'vc-checkout-time @@ -675,9 +680,11 @@ (vc-file-setprop file 'vc-working-revision "0") (vc-file-setprop file 'vc-checkout-time 0) 'added) - ((eq status ?C) + ;; Conflict in contents or properties. + ((or (eq status ?C) (eq propstat ?C)) (vc-file-setprop file 'vc-state 'conflict)) - ((eq status '?M) + ;; Modified contents or properties. + ((or (eq status ?M) (eq propstat ?M)) (if (eq (char-after (match-beginning 1)) ?*) 'needs-merge 'edited)) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.