March 2006 - xemacs-cvs＠xemacs.org - XEmacs Mailing List Archives

CVS update by viteno xemacs ... 18 years, 9 months

CVS Monitor

User: viteno Date: 06/03/27 23:51:13 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1481 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1480 retrieving revision 1.1481 diff -u -p -r1.1480 -r1.1481 --- version.sh 2006/03/26 21:51:14 1.1480 +++ version.sh 2006/03/27 21:51:12 1.1481 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060326)" +xemacs_extra_name="(+CVS-20060327)" xemacs_release_date="2006-02-26"

1 participants
0 comments

CVS update by james xemacs ... 18 years, 9 months

CVS Monitor

User: james Date: 06/03/27 23:00:22 Modified: xemacs ChangeLog configure configure.ac Log: Fix ALSA detection by detecting a header file with no dependencies. See xemacs-patches message with ID <m3vetzvc39.fsf(a)jerrypc.cs.usu.edu>. Revision Changes Path 1.494 +4 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.493 retrieving revision 1.494 diff -u -p -r1.493 -r1.494 --- ChangeLog 2006/03/27 17:40:45 1.493 +++ ChangeLog 2006/03/27 21:00:01 1.494 ＠＠ -1,3 +1,7 ＠＠ +2006-03-27 Jerry James <james(a)xemacs.org> + + * configure.ac: Repair ALSA detection. + 2006-03-24 Jerry James <james(a)xemacs.org> * configure.ac: Autodetect ALSA support and report it if detected. 1.275 +35 -35 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.274 retrieving revision 1.275 diff -u -p -r1.274 -r1.275 --- configure 2006/03/27 17:40:45 1.274 +++ configure 2006/03/27 21:00:01 1.275 ＠＠ -35584,18 +35584,18 ＠＠ _ACEOF fi if test "$enable_sound_alsa" != "no"; then - if test "${ac_cv_header_alsa_pcm_h+set}" = set; then - echo "$as_me:$LINENO: checking for alsa/pcm.h" >&5 -echo $ECHO_N "checking for alsa/pcm.h... $ECHO_C" >&6 -if test "${ac_cv_header_alsa_pcm_h+set}" = set; then + if test "${ac_cv_header_alsa_input_h+set}" = set; then + echo "$as_me:$LINENO: checking for alsa/input.h" >&5 +echo $ECHO_N "checking for alsa/input.h... $ECHO_C" >&6 +if test "${ac_cv_header_alsa_input_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_alsa_pcm_h" >&5 -echo "${ECHO_T}$ac_cv_header_alsa_pcm_h" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_alsa_input_h" >&5 +echo "${ECHO_T}$ac_cv_header_alsa_input_h" >&6 else # Is the header compilable? -echo "$as_me:$LINENO: checking alsa/pcm.h usability" >&5 -echo $ECHO_N "checking alsa/pcm.h usability... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking alsa/input.h usability" >&5 +echo $ECHO_N "checking alsa/input.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF ＠＠ -35603,7 +35603,7 ＠＠ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <alsa/pcm.h> +#include <alsa/input.h> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ＠＠ -35639,15 +35639,15 ＠＠ echo "$as_me:$LINENO: result: $ac_header echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:$LINENO: checking alsa/pcm.h presence" >&5 -echo $ECHO_N "checking alsa/pcm.h presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking alsa/input.h presence" >&5 +echo $ECHO_N "checking alsa/input.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <alsa/pcm.h> +#include <alsa/input.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ＠＠ -35681,25 +35681,25 ＠＠ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: alsa/pcm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: alsa/pcm.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: alsa/input.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: alsa/input.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: alsa/pcm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: alsa/pcm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: alsa/pcm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: alsa/pcm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: alsa/pcm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: alsa/pcm.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: alsa/input.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: alsa/input.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: alsa/input.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: alsa/input.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: alsa/input.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/input.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: alsa/input.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------------- ## ＠＠ -35710,18 +35710,18 ＠＠ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for alsa/pcm.h" >&5 -echo $ECHO_N "checking for alsa/pcm.h... $ECHO_C" >&6 -if test "${ac_cv_header_alsa_pcm_h+set}" = set; then +echo "$as_me:$LINENO: checking for alsa/input.h" >&5 +echo $ECHO_N "checking for alsa/input.h... $ECHO_C" >&6 +if test "${ac_cv_header_alsa_input_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_alsa_pcm_h=$ac_header_preproc + ac_cv_header_alsa_input_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_alsa_pcm_h" >&5 -echo "${ECHO_T}$ac_cv_header_alsa_pcm_h" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_alsa_input_h" >&5 +echo "${ECHO_T}$ac_cv_header_alsa_input_h" >&6 fi -if test $ac_cv_header_alsa_pcm_h = yes; then +if test $ac_cv_header_alsa_input_h = yes; then echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5 echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6 1.37 +1 -1 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- configure.ac 2006/03/27 17:40:49 1.36 +++ configure.ac 2006/03/27 21:00:13 1.37 ＠＠ -5131,7 +5131,7 ＠＠ fi dnl ALSA sound support if test "$enable_sound_alsa" != "no"; then - AC_CHECK_HEADER([alsa/pcm.h], [ + AC_CHECK_HEADER([alsa/input.h], [ AC_CHECK_LIB(asound, snd_pcm_open, have_alsa_sound=yes)]) if test "$have_alsa_sound" = "yes"; then enable_sound_alsa=yes

1 participants
0 comments

CVS update by james xemacs/src ... 18 years, 9 months

CVS Monitor

User: james Date: 06/03/27 19:41:02 Modified: xemacs/src ChangeLog config.h.in sound.c Added: xemacs/src alsaplay.c Log: Add support for sound using the ALSA library. See xemacs-patches message with ID <m3slp77hui.fsf(a)jerrypc.cs.usu.edu>. Revision Changes Path 1.493 +4 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.492 retrieving revision 1.493 diff -u -p -r1.492 -r1.493 --- ChangeLog 2006/02/27 16:29:00 1.492 +++ ChangeLog 2006/03/27 17:40:45 1.493 ＠＠ -1,3 +1,7 ＠＠ +2006-03-24 Jerry James <james(a)xemacs.org> + + * configure.ac: Autodetect ALSA support and report it if detected. + 2006-02-22 Marcus Crestani <crestani(a)xemacs.org> * configure.ac: Remove mc-alloc, replace it with newgc, adjust 1.274 +241 -10 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.273 retrieving revision 1.274 diff -u -p -r1.273 -r1.274 --- configure 2006/02/27 16:29:00 1.273 +++ configure 2006/03/27 17:40:45 1.274 ＠＠ -1090,13 +1090,14 ＠＠ Sound options ------------- --with-sound=TYPE Compile with sound support. Valid types are - `native', `nas' and `esd'. Prefix a type with 'no' - to disable. The first type can be `none' or `all'. - `none' means `nonative,nonas,noesd'. `all' means - `native,nas,esd'. Later options override earlier - ones for the same TYPE. The default is to autodetect - all sound support except for ESD which defaults to - off. + `native', `alsa', `nas' and `esd'. Prefix a type + with 'no' to disable. The first type can be `none' + or `all'. `none' means + `nonative,noalsa,nonas,noesd'. `all' means + `native,alsa,nas,esd'. Later options override + earlier ones for the same TYPE. The default is to + autodetect all sound support except for ESD which + defaults to off. --with-native-sound-lib Path to sound library (for systems with name conflicts). ＠＠ -2926,10 +2927,11 ＠＠ fi; _sound_notfirst="" _sound_native_default="" +_sound_alsa_default="" _sound_nas_default="" _sound_esd_default=no -_sound_types="native nas esd" -_sound_default="native,nas,noesd" +_sound_types="native alsa nas esd" +_sound_default="native,alsa,nas,noesd" # If --with-sound or --without-sound were given then copy the value to the # equivalent enable_sound variable. ＠＠ -34968,9 +34970,9 ＠＠ fi - { echo "$as_me:$LINENO: checking for sound support..." >&5 echo "$as_me: checking for sound support..." >&6;} + test -n "$with_native_sound_lib" && enable_sound_native=yes if test "$enable_sound_native" != "no"; then ＠＠ -35581,6 +35583,234 ＠＠ _ACEOF test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$with_native_sound_lib\" to \$LIBS"; fi fi +if test "$enable_sound_alsa" != "no"; then + if test "${ac_cv_header_alsa_pcm_h+set}" = set; then + echo "$as_me:$LINENO: checking for alsa/pcm.h" >&5 +echo $ECHO_N "checking for alsa/pcm.h... $ECHO_C" >&6 +if test "${ac_cv_header_alsa_pcm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_alsa_pcm_h" >&5 +echo "${ECHO_T}$ac_cv_header_alsa_pcm_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking alsa/pcm.h usability" >&5 +echo $ECHO_N "checking alsa/pcm.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <alsa/pcm.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking alsa/pcm.h presence" >&5 +echo $ECHO_N "checking alsa/pcm.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <alsa/pcm.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: alsa/pcm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: alsa/pcm.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: alsa/pcm.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: alsa/pcm.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: alsa/pcm.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: alsa/pcm.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: alsa/pcm.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: alsa/pcm.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: alsa/pcm.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for alsa/pcm.h" >&5 +echo $ECHO_N "checking for alsa/pcm.h... $ECHO_C" >&6 +if test "${ac_cv_header_alsa_pcm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_alsa_pcm_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_alsa_pcm_h" >&5 +echo "${ECHO_T}$ac_cv_header_alsa_pcm_h" >&6 + +fi +if test $ac_cv_header_alsa_pcm_h = yes; then + + echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5 +echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6 +if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lasound $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char snd_pcm_open (); +int +main () +{ +snd_pcm_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_asound_snd_pcm_open=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_asound_snd_pcm_open=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5 +echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6 +if test $ac_cv_lib_asound_snd_pcm_open = yes; then + have_alsa_sound=yes +fi + +fi + + + if test "$have_alsa_sound" = "yes"; then + enable_sound_alsa=yes + cat >>confdefs.h <<\_ACEOF +#define HAVE_ALSA_SOUND 1 +_ACEOF + + extra_objs="$extra_objs alsaplay.o" && if test "$verbose" = "yes"; then + echo " xemacs will be linked with \"alsaplay.o\"" + fi + LIBS="-lasound $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lasound\" to \$LIBS"; fi + else + test "$enable_sound_alsa" = "yes" && \ + { echo "Error:" "Required ALSA sound support cannot be provided." >&2; exit 1; } + enable_sound_alsa=no + fi +fi + if test "$enable_sound_nas" != "no"; then if test "${ac_cv_header_audio_audiolib_h+set}" = set; then echo "$as_me:$LINENO: checking for audio/audiolib.h" >&5 ＠＠ -39401,6 +39631,7 ＠＠ test "$with_xface" = yes && echo " Comp echo " Sound:" test "$enable_sound_native" = yes && echo " Compiling in support for sound (native)." +test "$enable_sound_alsa" = yes && echo " Compiling in support for ALSA (Advanced Linux Sound Architecture)." test "$enable_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)." test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously." test "$enable_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)." 1.36 +25 -6 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- configure.ac 2006/02/27 16:29:06 1.35 +++ configure.ac 2006/03/27 17:40:49 1.36 ＠＠ -791,16 +791,18 ＠＠ dnl XE_HELP_SUBSECTION([Sound options]) XE_COMPLEX_ARG([sound], AC_HELP_STRING([--enable-sound=TYPE],[Compile with sound support. - Valid types are `native', `nas' and `esd'. + Valid types are `native', `alsa', `nas' and `esd'. Prefix a type with 'no' to disable. The first type can be `none' or `all'. `none' means - `nonative,nonas,noesd'. `all' means `native,nas,esd'. - Later options override earlier ones for the same TYPE. - The default is to autodetect all sound support except - for ESD which defaults to off.]), + `nonative,noalsa,nonas,noesd'. `all' means + `native,alsa,nas,esd'. Later options override earlier + ones for the same TYPE. The default is to autodetect + all sound support except for ESD which defaults to + off.]), [], [enable_sound_nas=""], [XE_COMPLEX_OPTION([native],[""]), + XE_COMPLEX_OPTION([alsa],[""]), XE_COMPLEX_OPTION([nas],[""]), XE_COMPLEX_OPTION([esd],[no])]) XE_MERGED_ARG([native-sound-lib], ＠＠ -5006,9 +5008,9 ＠＠ dnl Check for nlist.h AC_CHECK_HEADER(nlist.h, AC_DEFINE(NLIST_STRUCT), ) dnl Check for sound of various sorts. +AC_CHECKING([for sound support]) dnl Autodetect native sound -AC_CHECKING([for sound support]) test -n "$with_native_sound_lib" && enable_sound_native=yes if test "$enable_sound_native" != "no"; then ＠＠ -5127,6 +5129,22 ＠＠ if test "$enable_sound_native" = "yes"; test -n "$with_native_sound_lib" && XE_PREPEND($with_native_sound_lib, LIBS) fi +dnl ALSA sound support +if test "$enable_sound_alsa" != "no"; then + AC_CHECK_HEADER([alsa/pcm.h], [ + AC_CHECK_LIB(asound, snd_pcm_open, have_alsa_sound=yes)]) + if test "$have_alsa_sound" = "yes"; then + enable_sound_alsa=yes + AC_DEFINE(HAVE_ALSA_SOUND) + XE_ADD_OBJS(alsaplay.o) + XE_PREPEND(-lasound, LIBS) + else + test "$enable_sound_alsa" = "yes" && \ + XE_DIE("Required ALSA sound support cannot be provided.") + enable_sound_alsa=no + fi +fi + dnl NAS Sound support if test "$enable_sound_nas" != "no"; then AC_CHECK_HEADER(audio/audiolib.h, [ ＠＠ -6053,6 +6071,7 ＠＠ test "$with_xface" = yes && echo " Comp echo " Sound:" test "$enable_sound_native" = yes && echo " Compiling in support for sound (native)." +test "$enable_sound_alsa" = yes && echo " Compiling in support for ALSA (Advanced Linux Sound Architecture)." test "$enable_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)." test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously." test "$enable_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)." 1.936 +6 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.935 retrieving revision 1.936 diff -u -p -r1.935 -r1.936 --- ChangeLog 2006/03/27 15:20:28 1.935 +++ ChangeLog 2006/03/27 17:40:57 1.936 ＠＠ -1,3 +1,9 ＠＠ +2006-03-24 Jerry James <james(a)xemacs.org> + + * alsaplay.c: New file providing support for sound with ALSA. + * config.h.in: New symbol HAVE_ALSA_SOUND + * sound.c: Add ALSA support. + 2006-03-27 Mike Fabian <mfabian(a)suse.de> * vdb-posix.c (vdb_install_signal_handler): Correct memset. 1.107 +3 -0 XEmacs/xemacs/src/config.h.in Index: config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- config.h.in 2006/02/27 16:29:22 1.106 +++ config.h.in 2006/03/27 17:40:58 1.107 ＠＠ -796,6 +796,9 ＠＠ things are arranged in config.h.in. In /* Native sound may be provided via soundcard.h, in various directories */ #undef SOUNDCARD_H_FILE +/* Compile in support for ALSA (Advanced Linux Sound Architecture) */ +#undef HAVE_ALSA_SOUND + /* Compile in support for NAS (Network Audio System)? NAS_NO_ERROR_JUMP means that the NAS libraries don't include some error handling changes. */ 1.26 +51 -13 XEmacs/xemacs/src/sound.c Index: sound.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sound.c 2005/11/16 07:22:46 1.25 +++ sound.c 2006/03/27 17:40:59 1.26 ＠＠ -70,12 +70,25 ＠＠ Boston, MA 02111-1307, USA. */ #define USED_IF_HAVE_ANY(decl) UNUSED (decl) #endif +#ifdef HAVE_ALSA_SOUND +extern int alsa_play_sound_file (const Extbyte *file, int vol); +extern int alsa_play_sound_data (const Binbyte *data, int length, int vol); +# define DEVICE_CONNECTED_TO_ALSA_P(x) 1 /* #### better check */ +#endif + #ifdef HAVE_ESD_SOUND extern int esd_play_sound_file (Extbyte *file, int vol); extern int esd_play_sound_data (Binbyte *data, size_t length, int vol); # define DEVICE_CONNECTED_TO_ESD_P(x) 1 /* #### better check */ #endif +#ifdef HAVE_NAS_SOUND +extern int nas_play_sound_file (Extbyte *name, int volume); +extern int nas_play_sound_data (Binbyte *data, int length, int volume); +extern int nas_wait_for_sounds (void); +extern Extbyte *nas_init_play (Display *); +#endif + Fixnum bell_volume; Fixnum bell_inhibit_time; Lisp_Object Vsound_alist; ＠＠ -84,14 +97,6 ＠＠ Lisp_Object Vnative_sound_only_on_consol Lisp_Object Q_volume, Q_pitch, Q_duration, Q_sound; Lisp_Object Qsound_error; - -#ifdef HAVE_NAS_SOUND -extern int nas_play_sound_file (Extbyte *name, int volume); -extern int nas_play_sound_data (Binbyte *data, int length, int volume); -extern int nas_wait_for_sounds (void); -extern Extbyte *nas_init_play (Display *); -#endif - DOESNT_RETURN report_sound_error (const Ascbyte *string, Lisp_Object data) { ＠＠ -110,8 +115,8 ＠＠ Windows the sound file must be in WAV fo { /* This function can call lisp */ int vol; -#if defined (HAVE_NATIVE_SOUND) || defined (HAVE_NAS_SOUND) \ - || defined (HAVE_ESD_SOUND) +#if defined (HAVE_NATIVE_SOUND) || defined (HAVE_ALSA_SOUND) || \ + defined (HAVE_NAS_SOUND) || defined (HAVE_ESD_SOUND) struct device *d = decode_device (device); #endif struct gcpro gcpro1; ＠＠ -148,6 +153,18 ＠＠ Windows the sound file must be in WAV fo } UNGCPRO; +#ifdef HAVE_ALSA_SOUND + if (DEVICE_CONNECTED_TO_ALSA_P (d)) + { + Extbyte *fileext; + + LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name); + /* #### ALSA code should allow specification of a device. */ + if (alsa_play_sound_file (fileext, vol)) + return Qnil; + } +#endif + #ifdef HAVE_NAS_SOUND if (DEVICE_CONNECTED_TO_NAS_P (d)) { ＠＠ -355,10 +372,24 ＠＠ If the sound cannot be played in any oth pit = (INT_OR_FLOATP (pitch) ? (int) XFLOATINT (pitch) : -1); dur = (INT_OR_FLOATP (duration) ? (int) XFLOATINT (duration) : -1); - /* If the sound is a string, and we're connected to Nas, do that. - Else if the sound is a string, and we're on console, play it natively. - Else just beep. + /* If the sound is a string, and we're connected to ALSA, NAS, or ESD, do + that. Else if the sound is a string, and we're on console, play it + natively. Else just beep. */ +#ifdef HAVE_ALSA_SOUND + if (DEVICE_CONNECTED_TO_ALSA_P (d) && STRINGP (sound)) + { + Binbyte *soundext; + Bytecount soundextlen; + + TO_EXTERNAL_FORMAT (LISP_STRING, sound, + ALLOCA, (soundext, soundextlen), + Qbinary); + if (alsa_play_sound_data (soundext, soundextlen, vol)) + return Qnil; + } +#endif /* HAVE_ALSA_SOUND */ + #ifdef HAVE_NAS_SOUND if (DEVICE_CONNECTED_TO_NAS_P (d) && STRINGP (sound)) { ＠＠ -423,6 +454,10 ＠＠ Return t if DEVICE is able to play sound */ (USED_IF_HAVE_NATIVE_OR_NAS (device))) { +#ifdef HAVE_ALSA_SOUND + if (DEVICE_CONNECTED_TO_ALSA_P (decode_device (device))) + return Qt; +#endif #ifdef HAVE_NAS_SOUND if (DEVICE_CONNECTED_TO_NAS_P (decode_device (device))) return Qt; ＠＠ -654,6 +689,9 ＠＠ syms_of_sound (void) void vars_of_sound (void) { +#ifdef HAVE_ALSA_SOUND + Fprovide (intern ("alsa-sound")); +#endif #ifdef HAVE_NATIVE_SOUND Fprovide (intern ("native-sound")); #endif 1.1 XEmacs/xemacs/src/alsaplay.c Index: alsaplay.c =================================================================== /* Play sound with the ALSA library Copyright (C) 2006 Jerry James. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* TODO: Support asynchronous sound playing; see the NAS support in sound.c */ #include <config.h> #include "lisp.h" #include "sound.h" #include "sysfile.h" /* We can't just include <alsa/asoundlib.h> because it tries to redefine * several symbols defined by the previous header files. */ #include <alsa/input.h> #include <alsa/output.h> #include <alsa/conf.h> #include <alsa/global.h> #include <alsa/pcm.h> #include <alsa/error.h> #include <alsa/hwdep.h> #include <alsa/rawmidi.h> #include <alsa/control.h> #include <alsa/mixer.h> struct mixer_state { snd_mixer_t *mixer; snd_mixer_elem_t *vol_ctl; /* Which channels need the old volume restored */ int reset_front_left; int reset_front_center; int reset_front_right; int reset_rear_left; int reset_rear_center; int reset_rear_right; int reset_side_left; int reset_side_right; int reset_woofer; /* Old volumes for the channels */ long front_left_vol; long front_center_vol; long front_right_vol; long rear_left_vol; long rear_center_vol; long rear_right_vol; long side_left_vol; long side_right_vol; long woofer_vol; }; /* Assemble a machine half-word in little-endian order */ #define HALF_LE(arr,start) (arr[start] + (arr[start + 1] << 8)) /* Assemble a machine word in little-endian order */ #define WORD_LE(arr,start) (arr[start] + (arr[start + 1] << 8) + \ (arr[start + 2] << 16) + (arr[start + 3] << 24)) /* Assemble a machine word in big-endian order */ #define WORD_BE(arr,start) ((arr[start] << 24) + (arr[start + 1] << 16) + \ (arr[start + 2] << 8) + arr[start + 3]) /* This function was inspired by miscplay.c. * Examine sound data to determine its format. * * TODO: Detect other formats that ALSA can play, such as GSM and MPEG. */ static snd_pcm_format_t analyze_format (const Binbyte *format, int *speed, int *tracks) { if (!memcmp (format, "Creative Voice File\x1A\x1A\x00", 22) && HALF_LE (format, 22) == ((0x1233 - HALF_LE (format, 24)) & 0xFFFF)) { /* VOC */ *speed = 8000; *tracks = 2; return SND_PCM_FORMAT_U8; } else if (!memcmp (format, "RIFF", 4) && !memcmp (format + 8, "WAVEfmt ", 8)) { /* WAVE */ *speed = WORD_LE (format, 24); *tracks = format[22]; return format[32] / format[22] == 1 ? SND_PCM_FORMAT_U8 : SND_PCM_FORMAT_S16_LE; } else if (!memcmp (format, ".snd", 4)) { /* Sun/NeXT Audio (big endian) */ if (WORD_BE (format, 4) < 24) { *speed = 8000; *tracks = 1; return SND_PCM_FORMAT_MU_LAW; } *speed = WORD_BE (format, 16); *tracks = format[23]; if (!memcmp (format + 12, "\000\000\000", 3)) { switch (format[15]) { case 1: case 17: case 29: return SND_PCM_FORMAT_MU_LAW; case 2: return SND_PCM_FORMAT_S8; case 3: return SND_PCM_FORMAT_S16_BE; case 4: return SND_PCM_FORMAT_S24_BE; case 5: return SND_PCM_FORMAT_S32_BE; case 23: case 24: case 25: case 26: return SND_PCM_FORMAT_IMA_ADPCM; case 27: return SND_PCM_FORMAT_A_LAW; default: break; } } return SND_PCM_FORMAT_UNKNOWN; } else if (!memcmp (format, ".sd", 4)) { /* DEC Audio (little endian) */ if (WORD_LE (format, 4) < 24) { *speed = 8000; *tracks = 1; return SND_PCM_FORMAT_MU_LAW; } *speed = WORD_LE (format, 16); *tracks = format[20]; if (!memcmp (format + 13, "\000\000\000", 3)) { switch (format[12]) { case 1: case 17: case 29: return SND_PCM_FORMAT_MU_LAW; case 2: return SND_PCM_FORMAT_S8; case 3: return SND_PCM_FORMAT_S16_LE; case 4: return SND_PCM_FORMAT_S24_LE; case 5: return SND_PCM_FORMAT_S32_LE; case 23: case 24: case 25: case 26: return SND_PCM_FORMAT_IMA_ADPCM; case 27: return SND_PCM_FORMAT_A_LAW; default: break; } } return SND_PCM_FORMAT_UNKNOWN; } else { /* We don't know what it is. Guess that it is mono audio in unsigned * byte format. Maybe we should error if we reach this point. */ *speed = 8000; *tracks = 1; return SND_PCM_FORMAT_U8; } } /* Set the volume: if any errors occur, we accept the existing volume */ static void set_volume (struct mixer_state *mix, int volume) { snd_mixer_selem_id_t *volume_id; long min_vol, max_vol, dev_vol; if (snd_mixer_open (&mix->mixer, 0) < 0) return; if (snd_mixer_attach (mix->mixer, "default") < 0) return; if (snd_mixer_selem_register (mix->mixer, NULL, NULL) < 0) return; if (snd_mixer_load (mix->mixer) < 0) return; snd_mixer_selem_id_alloca (&volume_id); snd_mixer_selem_id_set_name (volume_id, "PCM"); if ((mix->vol_ctl = snd_mixer_find_selem (mix->mixer, volume_id)) == NULL) { snd_mixer_selem_id_set_name (volume_id, "Master"); if ((mix->vol_ctl = snd_mixer_find_selem (mix->mixer, volume_id)) == NULL) return; } /* Translate the Lisp volume range to the device volume range */ if (snd_mixer_selem_get_playback_volume_range (mix->vol_ctl, &min_vol, &max_vol) < 0) return; dev_vol = volume * (max_vol - min_vol) / 100 + min_vol; /* Record the old volumes */ if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_FRONT_LEFT, &mix->front_left_vol) >= 0) mix->reset_front_left = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_FRONT_CENTER, &mix->front_center_vol) >= 0) mix->reset_front_center = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_FRONT_RIGHT, &mix->front_right_vol) >= 0) mix->reset_front_right = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_REAR_LEFT, &mix->rear_left_vol) >= 0) mix->reset_rear_left = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_REAR_CENTER, &mix->rear_center_vol) >= 0) mix->reset_rear_center = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_REAR_RIGHT, &mix->rear_right_vol) >= 0) mix->reset_rear_right = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_SIDE_LEFT, &mix->side_left_vol) >= 0) mix->reset_side_left = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_SIDE_RIGHT, &mix->side_right_vol) >= 0) mix->reset_side_right = 1; if (snd_mixer_selem_get_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_WOOFER, &mix->woofer_vol) >= 0) mix->reset_woofer = 1; /* Set the volume */ snd_mixer_selem_set_playback_volume_all (mix->vol_ctl, dev_vol); } static void reset_volume (const struct mixer_state *mix) { if (mix->reset_front_left) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_FRONT_LEFT, mix->front_left_vol); if (mix->reset_front_center) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_FRONT_CENTER, mix->front_center_vol); if (mix->reset_front_right) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_FRONT_RIGHT, mix->front_right_vol); if (mix->reset_rear_left) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_REAR_LEFT, mix->rear_left_vol); if (mix->reset_rear_center) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_REAR_CENTER, mix->rear_center_vol); if (mix->reset_rear_right) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_REAR_RIGHT, mix->rear_right_vol); if (mix->reset_side_left) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_SIDE_LEFT, mix->side_left_vol); if (mix->reset_side_right) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_SIDE_RIGHT, mix->side_right_vol); if (mix->reset_woofer) snd_mixer_selem_set_playback_volume (mix->vol_ctl, SND_MIXER_SCHN_WOOFER, mix->woofer_vol); snd_mixer_close (mix->mixer); } int alsa_play_sound_data (const Binbyte *data, int length, int volume) { snd_pcm_t *pcm_handle; snd_pcm_hw_params_t *hwparams; snd_pcm_format_t format; struct mixer_state mix; int speed, tracks, err; /* Set the PCM parameters */ if ((err = snd_pcm_open (&pcm_handle, "default", SND_PCM_STREAM_PLAYBACK, 0)) < 0) goto error_pcm_open; snd_pcm_hw_params_alloca (&hwparams); if ((err = snd_pcm_hw_params_any (pcm_handle, hwparams)) < 0) goto error_pcm; format = analyze_format (data, &speed, &tracks); if ((err = snd_pcm_hw_params_set_access (pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) goto error_pcm; if ((err = snd_pcm_hw_params_set_format (pcm_handle, hwparams, format)) < 0) goto error_pcm; if ((err = snd_pcm_hw_params_set_rate (pcm_handle, hwparams, speed, 0)) < 0) goto error_pcm; if ((err = snd_pcm_hw_params_set_channels (pcm_handle, hwparams, tracks)) < 0) goto error_pcm; if ((err = snd_pcm_hw_params (pcm_handle, hwparams)) < 0) goto error_pcm; /* Set the volume */ memset (&mix, 0, sizeof (mix)); set_volume (&mix, volume); /* Play the sound */ if ((err = snd_pcm_writei (pcm_handle, data, length)) < 0) goto error_mixer; /* Put the volume back the way it used to be */ reset_volume (&mix); /* Release resources */ snd_pcm_close (pcm_handle); return 1; error_mixer: reset_volume (&mix); error_pcm: snd_pcm_close (pcm_handle); error_pcm_open: sound_perror (snd_strerror (err)); return 0; } /* Read the sound file into an internal buffer, then call * alsa_play_sound_data. */ int alsa_play_sound_file (const Extbyte *sound_file, int volume) { Binbyte *data; int fd, retval; struct stat st; fd = retry_open (sound_file, O_RDONLY, 0); if (fd < 0) { sound_perror (sound_file); return 0; } qxe_fstat (fd, &st); data = xnew_array (Binbyte, st.st_size); retry_read (fd, data, st.st_size); retry_close (fd); retval = alsa_play_sound_data (data, st.st_size, volume); xfree (data, Binbyte); return retval; }

1 participants
0 comments

CVS update by crestani xemacs/src ... 18 years, 9 months

CVS Monitor

User: crestani Date: 06/03/27 17:20:35 Modified: xemacs/src ChangeLog vdb-posix.c Log: 2006-03-27 Mike Fabian <mfabian(a)suse.de> * vdb-posix.c (vdb_install_signal_handler): Correct memset. Revision Changes Path 1.935 +4 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.934 retrieving revision 1.935 diff -u -p -r1.934 -r1.935 --- ChangeLog 2006/03/26 15:24:25 1.934 +++ ChangeLog 2006/03/27 15:20:28 1.935 ＠＠ -1,3 +1,7 ＠＠ +2006-03-27 Mike Fabian <mfabian(a)suse.de> + + * vdb-posix.c (vdb_install_signal_handler): Correct memset. + 2006-03-26 Marcus Crestani <crestani(a)xemacs.org> * alloc.c (malloc_warning): Move function into scope of 1.2 +1 -1 XEmacs/xemacs/src/vdb-posix.c Index: vdb-posix.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/vdb-posix.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vdb-posix.c 2005/11/25 01:42:07 1.1 +++ vdb-posix.c 2006/03/27 15:20:31 1.2 ＠＠ -118,7 +118,7 ＠＠ vdb_install_signal_handler (void) } #ifdef USE_SIGACTION - memset(&act, sizeof(struct sigaction), 0); + memset(&act, 0, sizeof(struct sigaction)); act.sa_sigaction = vdb_fault_handler; sigemptyset (&act.sa_mask); act.sa_flags = SA_SIGINFO;

1 participants
0 comments

CVS update by viteno xemacs ... 18 years, 9 months

CVS Monitor

User: viteno Date: 06/03/26 23:51:15 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1480 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1479 retrieving revision 1.1480 diff -u -p -r1.1479 -r1.1480 --- version.sh 2006/03/25 22:51:19 1.1479 +++ version.sh 2006/03/26 21:51:14 1.1480 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060325)" +xemacs_extra_name="(+CVS-20060326)" xemacs_release_date="2006-02-26"

1 participants
0 comments

CVS update by crestani xemacs/src ... 18 years, 9 months

CVS Monitor

User: crestani Date: 06/03/26 17:24:29 Modified: xemacs/src ChangeLog alloc.c mc-alloc.c mc-alloc.h Log: 2006-03-26 Marcus Crestani <crestani(a)xemacs.org> * alloc.c (malloc_warning): Move function into scope of MALLOC_END, add MALLOC_END. * alloc.c (memory_full): Add memory shortage indication, adjust error messages. * mc-alloc.c: Add memory_shortage. * mc-alloc.c (expand_heap): If memory is short, allocate only the needed pages, not more. * mc-alloc.h: Add memory_shortage. Revision Changes Path 1.934 +11 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.933 retrieving revision 1.934 diff -u -p -r1.933 -r1.934 --- ChangeLog 2006/03/26 14:33:37 1.933 +++ ChangeLog 2006/03/26 15:24:25 1.934 ＠＠ -1,5 +1,16 ＠＠ 2006-03-26 Marcus Crestani <crestani(a)xemacs.org> + * alloc.c (malloc_warning): Move function into scope of + MALLOC_END, add MALLOC_END. + * alloc.c (memory_full): Add memory shortage indication, adjust + error messages. + * mc-alloc.c: Add memory_shortage. + * mc-alloc.c (expand_heap): If memory is short, allocate only the + needed pages, not more. + * mc-alloc.h: Add memory_shortage. + +2006-03-26 Marcus Crestani <crestani(a)xemacs.org> + * alloc.c (make_uninit_string): Use set_lispstringp_direct. * lisp.h (set_lispstringp_direct): New. 1.125 +60 -40 XEmacs/xemacs/src/alloc.c Index: alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -p -r1.124 -r1.125 --- alloc.c 2006/03/26 14:33:38 1.124 +++ alloc.c 2006/03/26 15:24:26 1.125 ＠＠ -231,46 +231,6 ＠＠ release_breathing_space (void) } #endif /* not NEW_GC */ -/* malloc calls this if it finds we are near exhausting storage */ -void -malloc_warning (const char *str) -{ - if (ignore_malloc_warnings) - return; - - warn_when_safe - (Qmemory, Qemergency, - "%s\n" - "Killing some buffers may delay running out of memory.\n" - "However, certainly by the time you receive the 95%% warning,\n" - "you should clean up, kill this Emacs, and start a new one.", - str); -} - -/* Called if malloc returns zero */ -DOESNT_RETURN -memory_full (void) -{ - fprintf (stderr, "##### M E M O R Y F U L L #####\n"); - /* Force a GC next time eval is called. - It's better to loop garbage-collecting (we might reclaim enough - to win) than to loop beeping and barfing "Memory exhausted" - */ - consing_since_gc = gc_cons_threshold + 1; - recompute_need_to_garbage_collect (); -#ifndef NEW_GC - release_breathing_space (); -#endif /* not NEW_GC */ - - /* Flush some histories which might conceivably contain garbalogical - inhibitors. */ - if (!NILP (Fboundp (Qvalues))) - Fset (Qvalues, Qnil); - Vcommand_history = Qnil; - - out_of_memory ("Memory exhausted", Qunbound); -} - static void set_alloc_mins_and_maxes (void *val, Bytecount size) { ＠＠ -352,6 +312,66 ＠＠ malloc_after (void *val, Bytecount size) if (!val && size != 0) memory_full (); set_alloc_mins_and_maxes (val, size); +} + +/* malloc calls this if it finds we are near exhausting storage */ +void +malloc_warning (const char *str) +{ + if (ignore_malloc_warnings) + return; + + /* Remove the malloc lock here, because warn_when_safe may allocate + again. It is safe to remove the malloc lock here, because malloc + is already finished (malloc_warning is called via + after_morecore_hook -> check_memory_limits -> save_warn_fun -> + malloc_warning). */ + MALLOC_END (); + + warn_when_safe + (Qmemory, Qemergency, + "%s\n" + "Killing some buffers may delay running out of memory.\n" + "However, certainly by the time you receive the 95%% warning,\n" + "you should clean up, kill this Emacs, and start a new one.", + str); +} + +/* Called if malloc returns zero */ +DOESNT_RETURN +memory_full (void) +{ + /* Force a GC next time eval is called. + It's better to loop garbage-collecting (we might reclaim enough + to win) than to loop beeping and barfing "Memory exhausted" + */ + consing_since_gc = gc_cons_threshold + 1; + recompute_need_to_garbage_collect (); +#ifdef NEW_GC + /* Put mc-alloc into memory shortage mode. This may keep XEmacs + alive until the garbage collector can free enough memory to get + us out of the memory exhaustion. If already in memory shortage + mode, we are in a loop and hopelessly lost. */ + if (memory_shortage) + { + fprintf (stderr, "Memory full, cannot recover.\n"); + ABORT (); + } + fprintf (stderr, + "Memory full, try to recover.\n" + "You should clean up, kill this Emacs, and start a new one.\n"); + memory_shortage++; +#else /* not NEW_GC */ + release_breathing_space (); +#endif /* not NEW_GC */ + + /* Flush some histories which might conceivably contain garbalogical + inhibitors. */ + if (!NILP (Fboundp (Qvalues))) + Fset (Qvalues, Qnil); + Vcommand_history = Qnil; + + out_of_memory ("Memory exhausted", Qunbound); } /* like malloc, calloc, realloc, free but: 1.10 +8 -3 XEmacs/xemacs/src/mc-alloc.c Index: mc-alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mc-alloc.c 2006/03/26 14:05:30 1.9 +++ mc-alloc.c 2006/03/26 15:24:26 1.10 ＠＠ -411,6 +411,8 ＠＠ mc_allocator_globals_type mc_allocator_g /* MC Allocator */ /************************************************************************/ +/* Set to 1 if memory becomes short. */ +EMACS_INT memory_shortage; /*--- misc functions ---------------------------------------------------*/ ＠＠ -1136,9 +1138,12 ＠＠ expand_heap (EMACS_INT needed_pages) void *real_start; /* determine number of pages the heap should grow */ - n_pages = needed_pages + (HEAP_SIZE / (PAGE_SIZE * HEAP_GROWTH_DIVISOR)); - if (n_pages < MIN_HEAP_INCREASE) - n_pages = MIN_HEAP_INCREASE; + if (memory_shortage) + n_pages = needed_pages; + else + n_pages = max (MIN_HEAP_INCREASE, + needed_pages + + (HEAP_SIZE / (PAGE_SIZE * HEAP_GROWTH_DIVISOR))); /* get the real values */ real_size = (n_pages * PAGE_SIZE) + PAGE_SIZE; 1.6 +2 -0 XEmacs/xemacs/src/mc-alloc.h Index: mc-alloc.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- mc-alloc.h 2006/03/26 14:05:30 1.5 +++ mc-alloc.h 2006/03/26 15:24:27 1.6 ＠＠ -27,6 +27,8 ＠＠ Boston, MA 02111-1307, USA. */ BEGIN_C_DECLS +/* Set to 1 if memory becomes short. */ +extern EMACS_INT memory_shortage; /* Internal Allocator Functions: */

1 participants
0 comments

CVS update by crestani xemacs/src ... 18 years, 9 months

CVS Monitor

User: crestani Date: 06/03/26 16:33:41 Modified: xemacs/src ChangeLog alloc.c lisp.h Log: 2006-03-26 Marcus Crestani <crestani(a)xemacs.org> * alloc.c (make_uninit_string): Use set_lispstringp_direct. * lisp.h (set_lispstringp_direct): New. Revision Changes Path 1.933 +5 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.932 retrieving revision 1.933 diff -u -p -r1.932 -r1.933 --- ChangeLog 2006/03/26 14:05:29 1.932 +++ ChangeLog 2006/03/26 14:33:37 1.933 ＠＠ -1,3 +1,8 ＠＠ +2006-03-26 Marcus Crestani <crestani(a)xemacs.org> + + * alloc.c (make_uninit_string): Use set_lispstringp_direct. + * lisp.h (set_lispstringp_direct): New. + 2006-03-21 Marcus Crestani <crestani(a)xemacs.org> * mc-alloc.c (visit_all_used_page_headers): 1.124 +1 -0 XEmacs/xemacs/src/alloc.c Index: alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.123 retrieving revision 1.124 diff -u -p -r1.123 -r1.124 --- alloc.c 2006/02/27 16:29:21 1.123 +++ alloc.c 2006/03/26 14:33:38 1.124 ＠＠ -2500,6 +2500,7 ＠＠ make_uninit_string (Bytecount length) XSET_STRING_ASCII_BEGIN (wrap_string (s), 0); #ifdef NEW_GC + set_lispstringp_direct (s); STRING_DATA_OBJECT (s) = wrap_string_direct_data (alloc_lrecord (fullsize, &lrecord_string_direct_data)); 1.140 +1 -0 XEmacs/xemacs/src/lisp.h Index: lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.139 retrieving revision 1.140 diff -u -p -r1.139 -r1.140 --- lisp.h 2006/03/20 21:20:29 1.139 +++ lisp.h 2006/03/26 14:33:39 1.140 ＠＠ -2475,6 +2475,7 ＠＠ DECLARE_MODULE_API_LRECORD (string, Lisp /* Operations on Lisp_String *'s; only ones left */ #ifdef NEW_GC +#define set_lispstringp_direct(s) ((s)->indirect = 0) #define set_lispstringp_indirect(s) ((s)->indirect = 1) #define set_lispstringp_length(s, len) XSET_STRING_DATA_SIZE (s, len) #define set_lispstringp_data(s, ptr) XSET_STRING_DATA_DATA (s, ptr)

1 participants
0 comments

CVS update by crestani xemacs/src ... 18 years, 9 months

CVS Monitor

User: crestani Date: 06/03/26 16:05:33 Modified: xemacs/src ChangeLog mc-alloc.c mc-alloc.h vdb.c Log: 2006-03-21 Marcus Crestani <crestani(a)xemacs.org> * mc-alloc.c (visit_all_used_page_headers): * mc-alloc.c (finalize_page_for_disksave): * mc-alloc.c (mc_finalize_for_disksave): * mc-alloc.c (sweep_page): * mc-alloc.c (mc_sweep): * mc-alloc.c (protect_heap_page): * mc-alloc.c (protect_heap_pages): * mc-alloc.c (unprotect_heap_page): * mc-alloc.c (unprotect_heap_pages): * mc-alloc.h: Return number of pages processed. * vdb.c (vdb_start_dirty_bits_recording): Adjust size of page_fault_table to its upper bound (= number of pages that contain BLACK objects) in advance, to avoid malloc in the signal handler. Revision Changes Path 1.932 +17 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.931 retrieving revision 1.932 diff -u -p -r1.931 -r1.932 --- ChangeLog 2006/03/26 13:05:14 1.931 +++ ChangeLog 2006/03/26 14:05:29 1.932 ＠＠ -1,3 +1,20 ＠＠ +2006-03-21 Marcus Crestani <crestani(a)xemacs.org> + + * mc-alloc.c (visit_all_used_page_headers): + * mc-alloc.c (finalize_page_for_disksave): + * mc-alloc.c (mc_finalize_for_disksave): + * mc-alloc.c (sweep_page): + * mc-alloc.c (mc_sweep): + * mc-alloc.c (protect_heap_page): + * mc-alloc.c (protect_heap_pages): + * mc-alloc.c (unprotect_heap_page): + * mc-alloc.c (unprotect_heap_pages): + * mc-alloc.h: Return number of pages processed. + * vdb.c (vdb_start_dirty_bits_recording): Adjust size of + page_fault_table to its upper bound (= number of pages that + contain BLACK objects) in advance, to avoid malloc in the signal + handler. + 2006-03-24 Stephen J. Turnbull <stephen(a)xemacs.org> * file-coding.c (decode-coding-region, encode-coding-region): 1.9 +42 -28 XEmacs/xemacs/src/mc-alloc.c Index: mc-alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- mc-alloc.c 2006/02/27 16:29:27 1.8 +++ mc-alloc.c 2006/03/26 14:05:30 1.9 ＠＠ -430,10 +430,11 ＠＠ deadbeef_memory (void *ptr, Bytecount si /* Visits all pages (page_headers) hooked into the used heap pages list and executes f with the current page header as - argument. Needed for sweep. */ -static void -visit_all_used_page_headers (void (*f) (page_header *ph)) + argument. Needed for sweep. Returns number of processed pages. */ +static EMACS_INT +visit_all_used_page_headers (EMACS_INT (*f) (page_header *ph)) { + EMACS_INT number_of_pages_processed = 0; EMACS_INT i; for (i = 0; i < N_USED_PAGE_LISTS; i++) if (PLH_FIRST (USED_HEAP_PAGES (i))) ＠＠ -442,11 +443,12 ＠＠ visit_all_used_page_headers (void (*f) ( while (PH_NEXT (ph)) { page_header *next = PH_NEXT (ph); /* in case f removes the page */ - f (ph); + number_of_pages_processed += f (ph); ph = next; } - f (ph); + number_of_pages_processed += f (ph); } + return number_of_pages_processed; } ＠＠ -1485,8 +1487,9 ＠＠ mark_free_list (page_header *ph) object's finalizer for disksave. Therefore, you have to define the macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE(ptr). This macro should do nothing else then test if there is a finalizer and call it on - the given argument, which is the heap address of the object. */ -static void + the given argument, which is the heap address of the object. + Returns number of processed pages. */ +static EMACS_INT finalize_page_for_disksave (page_header *ph) { EMACS_INT heap_space = (EMACS_INT) PH_HEAP_SPACE (ph); ＠＠ -1499,21 +1502,24 ＠＠ finalize_page_for_disksave (page_header EMACS_INT ptr = (heap_space + (heap_space_step * mark_bit)); MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE ((void *) ptr); } + return 1; } -/* Finalizes the heap for disksave. */ -void +/* Finalizes the heap for disksave. Returns number of processed + pages. */ +EMACS_INT mc_finalize_for_disksave (void) { - visit_all_used_page_headers (finalize_page_for_disksave); + return visit_all_used_page_headers (finalize_page_for_disksave); } -/* Sweeps a page: all the non-marked cells are freed. If the page is empty - in the end, it is removed. If some cells are free, it is moved to the - front of its page header list. Full pages stay where they are. */ -static void +/* Sweeps a page: all the non-marked cells are freed. If the page is + empty in the end, it is removed. If some cells are free, it is + moved to the front of its page header list. Full pages stay where + they are. Returns number of processed pages.*/ +static EMACS_INT sweep_page (page_header *ph) { Rawbyte *heap_space = (Rawbyte *) PH_HEAP_SPACE (ph); ＠＠ -1533,7 +1539,7 ＠＠ sweep_page (page_header *ph) { zero_mark_bits (ph); PH_BLACK_BIT (ph) = 0; - return; + return 1; } } ＠＠ -1552,14 +1558,16 ＠＠ sweep_page (page_header *ph) remove_page_from_used_list (ph); else if (PH_CELLS_USED (ph) < PH_CELLS_ON_PAGE (ph)) move_page_header_to_front (ph); + + return 1; } -/* Sweeps the heap. */ -void +/* Sweeps the heap. Returns number of processed pages. */ +EMACS_INT mc_sweep (void) { - visit_all_used_page_headers (sweep_page); + return visit_all_used_page_headers (sweep_page); } ＠＠ -1860,8 +1868,8 ＠＠ fault_on_protected_page (void *ptr) /* Protect the heap page of given page header ph if black objects are - on the page. */ -static void + on the page. Returns number of processed pages. */ +static EMACS_INT protect_heap_page (page_header *ph) { if (PH_BLACK_BIT (ph)) ＠＠ -1870,20 +1878,23 ＠＠ protect_heap_page (page_header *ph) EMACS_INT heap_space_size = PH_N_PAGES (ph) * PAGE_SIZE; vdb_protect ((void *) heap_space, heap_space_size); PH_PROTECTION_BIT (ph) = 1; + return 1; } + return 0; } -/* Protect all heap pages with black objects. */ -void +/* Protect all heap pages with black objects. Returns number of + processed pages.*/ +EMACS_INT protect_heap_pages (void) { - visit_all_used_page_headers (protect_heap_page); + return visit_all_used_page_headers (protect_heap_page); } /* Remove protection (if there) of heap page of given page header - ph. */ -static void + ph. Returns number of processed pages. */ +static EMACS_INT unprotect_heap_page (page_header *ph) { if (PH_PROTECTION_BIT (ph)) ＠＠ -1892,14 +1903,17 ＠＠ unprotect_heap_page (page_header *ph) EMACS_INT heap_space_size = PH_N_PAGES (ph) * PAGE_SIZE; vdb_unprotect (heap_space, heap_space_size); PH_PROTECTION_BIT (ph) = 0; + return 1; } + return 0; } -/* Remove protection for all heap pages which are protected. */ -void +/* Remove protection for all heap pages which are protected. Returns + number of processed pages. */ +EMACS_INT unprotect_heap_pages (void) { - visit_all_used_page_headers (unprotect_heap_page); + return visit_all_used_page_headers (unprotect_heap_page); } /* Remove protection and mark page dirty. */ 1.5 +15 -12 XEmacs/xemacs/src/mc-alloc.h Index: mc-alloc.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- mc-alloc.h 2006/02/27 16:29:27 1.4 +++ mc-alloc.h 2006/03/26 14:05:30 1.5 ＠＠ -105,11 +105,12 ＠＠ EMACS_INT get_mark_bit (void *ptr); /* The finalizer of every not marked object is called. The macro MC_ALLOC_CALL_FINALIZER has to be defined and call the finalizer of - the object. */ -void mc_finalize (void); + the object. Returns number of processed pages. */ +EMACS_INT mc_finalize (void); -/* All not marked objects of the used heap are freed. */ -void mc_sweep (void); +/* All not marked objects of the used heap are freed. Returns number + of processed pages. */ +EMACS_INT mc_sweep (void); ＠＠ -117,8 +118,9 ＠＠ void mc_sweep (void); /* The finalizer for disksave of every object is called to shrink the dump image. The macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE has to - be defined and call the finalizer for disksave of the object. */ -void mc_finalize_for_disksave (void); + be defined and call the finalizer for disksave of the object. + Returns number of processed pages. */ +EMACS_INT mc_finalize_for_disksave (void); ＠＠ -141,12 +143,13 ＠＠ EMACS_INT mc_get_page_size (void); /* Is the fault at ptr on a protected page? */ EMACS_INT fault_on_protected_page (void *ptr); -/* Remove protection (if there) of heap page of given page header - ph. */ -void protect_heap_pages (void); - -/* Remove protection for all heap pages which are protected. */ -void unprotect_heap_pages (void); +/* Remove protection (if there) of heap page of given page header ph. + Returns number of processed pages. */ +EMACS_INT protect_heap_pages (void); + +/* Remove protection for all heap pages which are protected. Returns + number of processed pages. */ +EMACS_INT unprotect_heap_pages (void); /* Remove protection and mark page dirty. */ void unprotect_page_and_mark_dirty (void *ptr); 1.2 +2 -1 XEmacs/xemacs/src/vdb.c Index: vdb.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/vdb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vdb.c 2005/11/25 01:42:08 1.1 +++ vdb.c 2006/03/26 14:05:30 1.2 ＠＠ -38,8 +38,9 ＠＠ void_ptr_dynarr *page_fault_table; void vdb_start_dirty_bits_recording (void) { + Elemcount protected_pages = (Elemcount) protect_heap_pages (); page_fault_table = Dynarr_new2 (void_ptr_dynarr, void *); - protect_heap_pages (); + Dynarr_resize (page_fault_table, protected_pages); } /* Remove heap protection. */

1 participants
0 comments

CVS update by stephent xemacs/src ... 18 years, 9 months

CVS Monitor

User: stephent Date: 06/03/26 15:05:19 Modified: xemacs/src ChangeLog file-coding.c Log: Make {en,de}code-coding-region interactive commands. <877j6hnyuj.fsf(a)tleepslib.sk.tsukuba.ac.jp> Revision Changes Path 1.931 +5 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.930 retrieving revision 1.931 diff -u -p -r1.930 -r1.931 --- ChangeLog 2006/03/25 11:27:43 1.930 +++ ChangeLog 2006/03/26 13:05:14 1.931 ＠＠ -1,3 +1,8 ＠＠ +2006-03-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * file-coding.c (decode-coding-region, encode-coding-region): + Convert to interactive commands, and adjust docstrings. + 2006-03-21 Malcolm Purvis <malcolmp(a)xemacs.org> * regex.c: Bump INIT_FAILURE_ALLOC and re_max_failures to the 1.52 +7 -5 XEmacs/xemacs/src/file-coding.c Index: file-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- file-coding.c 2006/02/27 16:29:25 1.51 +++ file-coding.c 2006/03/26 13:05:17 1.52 ＠＠ -2288,13 +2288,14 ＠＠ encode_decode_coding_region (Lisp_Object } } -DEFUN ("decode-coding-region", Fdecode_coding_region, 3, 4, 0, /* +DEFUN ("decode-coding-region", Fdecode_coding_region, 3, 4, + "*r\nzDecode from coding system: \ni", /* Decode the text between START and END which is encoded in CODING-SYSTEM. This is useful if you've read in encoded text from a file without decoding it (e.g. you read in a JIS-formatted file but used the `binary' or `no-conversion' coding system, so that it shows up as "^[$B!<!+^[(B"). Return length of decoded text. -BUFFER defaults to the current buffer if unspecified. +BUFFER defaults to the current buffer if unspecified, and when interactive. */ (start, end, coding_system, buffer)) { ＠＠ -2302,11 +2303,12 ＠＠ BUFFER defaults to the current buffer if CODING_DECODE); } -DEFUN ("encode-coding-region", Fencode_coding_region, 3, 4, 0, /* +DEFUN ("encode-coding-region", Fencode_coding_region, 3, 4, + "*r\nzEncode to coding system: \ni", /* Encode the text between START and END using CODING-SYSTEM. This will, for example, convert Japanese characters into stuff such as -"^[$B!<!+^[(B" if you use the JIS encoding. Return length of encoded -text. BUFFER defaults to the current buffer if unspecified. +"^[$B!<!+^[(B" if you use the JIS encoding. Return length of encoded text. +BUFFER defaults to the current buffer if unspecified, and when interactive. */ (start, end, coding_system, buffer)) {

1 participants
0 comments

CVS update by viteno xemacs ... 18 years, 9 months

CVS Monitor

User: viteno Date: 06/03/25 23:51:20 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1479 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1478 retrieving revision 1.1479 diff -u -p -r1.1478 -r1.1479 --- version.sh 2006/03/24 22:51:55 1.1478 +++ version.sh 2006/03/25 22:51:19 1.1479 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060324)" +xemacs_extra_name="(+CVS-20060325)" xemacs_release_date="2006-02-26"

1 participants
0 comments

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

xemacs-cvs March 2006