Now on revision 109392. ------------------------------------------------------------ revno: 109392 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 23:47:17 -0700 message: Misc updates for CPP-DEFINES diff: === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2012-08-02 04:14:48 +0000 +++ admin/CPP-DEFINES 2012-08-02 06:47:17 +0000 @@ -1,10 +1,21 @@ Here are some of the cpp macros used, together with some short explanation of their use. Feel free to add more macros and more categories. +Most of these are from config.in, so it's probably better to put the +explanations in that file. Ideally, everything would be defined and +documented in config.in, and this file would not be necessary. + ** Distinguishing OSes ** +AIX +_AIX +BSD4_2 +BSD_SYSTEM CYGWIN Compiling the Cygwin port. __CYGWIN__ Ditto +GNU_LINUX +HPUX +IRIX6_5 MSDOS Compiling the MS-DOS port. __MSDOS__ Ditto. __DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c. @@ -13,6 +24,10 @@ __MINGW32__ Compiling the W32 port with the MinGW port of GCC. _MSC_VER Compiling the W32 port with the Microsoft C compiler. DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h). +SOLARIS2 +USG +USG5 +USG5_4 ** Distinguishing GUIs ** @@ -45,12 +60,12 @@ REL_ALLOC Compile in the relocatable memory allocator ralloc.c. SYSTEM_MALLOC Use the system library's malloc. -subprocesses System can use subprocesses (for M-x shell for example). Defined by default, only MSDOS undefines it. -DEBUG_LISP_OBJECT_TYPE Define it in lisp.h enable compile time checks on Lisp_Object use. +subprocesses System can use subprocesses (for M-x shell for example). + Defined by default, only MSDOS undefines it. +DEBUG_LISP_OBJECT_TYPE Define it in lisp.h enable compile time checks + on Lisp_Object use. -** System specific macros, described in detail in src/s/template.h -CLASH_DETECTION -COFF +** System specific macros FIRST_PTY_LETTER HAVE_PTYS INTERRUPT_INPUT @@ -59,12 +74,12 @@ SYSTEM_TYPE ** Misc macros -USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at the full user name. Only MSDOS overrides the default. - -** Defines from src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/s/*.h. - - -AIX +USER_FULL_NAME If defined, overrides the default pw->pw_gecos for +getting at the full user name. Only MSDOS overrides the default. + +** Miscellaneous defines. Some of these might not be used in the code +anymore, so they can be removed. + AMPERSAND_FULL_NAME BROKEN_DATAGRAM_SOCKETS BROKEN_FIONREAD @@ -76,8 +91,6 @@ BROKEN_SIGIO BROKEN_SIGPOLL BROKEN_SIGPTY -BSD4_2 -BSD_SYSTEM CLASH_DETECTION DATA_SEG_BITS DATA_START @@ -100,7 +113,6 @@ GC_SETJMP_WORKS GMALLOC_INHIBIT_VALLOC GNU_LIBRARY_PENDING_OUTPUT_COUNT -GNU_LINUX GNU_MALLOC HAVE_AIX_SMT_EXP HAVE_CBRT @@ -159,20 +171,16 @@ HAVE_WINDOW_SYSTEM HAVE_WORKING_VFORK HAVE_XRMSETDATABASE -HPUX INTERNAL_TERMINAL IS_ANY_SEP IS_DIRECTORY_SEP -LINKER LINUX_VERSION_CODE -LNOFLSH LOCALTIME_CACHE MAIL_USE_FLOCK MAIL_USE_LOCKF MAIL_USE_POP MAIL_USE_SYSTEM_LOCK MAXPATHLEN -MIN_PTY_KERNEL_VERSION -- only used on Mac MODE_LINE_BINARY_TEXT MUST_UNDEF__STDC__ NLIST_STRUCT @@ -208,7 +216,6 @@ SIGPIPE SIGQUIT SIGTRAP -SOLARIS2 STDC_HEADERS SYSTEM_PURESIZE_EXTRA SYSTEM_MALLOC @@ -223,13 +230,9 @@ UNIX98_PTYS USE_CRT_DLL USE_TOOLKIT_SCROLL_BARS -USG -USG5 USG_SUBTTY_WORKS VALBITS XOS_NEEDS_TIME_H -_AIX -_ARCH_PPC64 _FILE_OFFSET_BITS _LP64 _MALLOC_INTERNAL ------------------------------------------------------------ revno: 109391 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 23:43:13 -0700 message: Comment diff: === modified file 'src/emacs.c' --- src/emacs.c 2012-07-31 22:24:49 +0000 +++ src/emacs.c 2012-08-02 06:43:13 +0000 @@ -2375,7 +2375,7 @@ Anything else (in Emacs 24.1, the possibilities are: aix, berkeley-unix, hpux, irix, usg-unix-v) indicates some sort of Unix system. */); Vsystem_type = intern_c_string (SYSTEM_TYPE); - /* The above values are from SYSTEM_TYPE in include files under src/s. */ + /* See configure.ac (and config.nt) for the possible SYSTEM_TYPEs. */ DEFVAR_LISP ("system-configuration", Vsystem_configuration, doc: /* Value is string indicating configuration Emacs was built for. ------------------------------------------------------------ revno: 109390 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 23:21:48 -0700 message: * src/s/: Remove empty directory. * make-dist: Remove src/s. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-02 06:19:48 +0000 +++ ChangeLog 2012-08-02 06:21:48 +0000 @@ -1,5 +1,7 @@ 2012-08-02 Glenn Morris + * make-dist: Remove src/s. + * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location. 2012-08-02 Paul Eggert === modified file 'make-dist' --- make-dist 2012-07-09 04:52:49 +0000 +++ make-dist 2012-08-02 06:21:48 +0000 @@ -282,7 +282,7 @@ leim leim/CXTERM-DIC leim/MISC-DIC \ leim/SKK-DIC leim/ja-dic leim/quail \ build-aux build-aux/snippet \ - src src/s src/bitmaps lib lib-src oldXMenu lwlib \ + src src/bitmaps lib lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ `find etc lisp admin -type d` \ doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ @@ -359,10 +359,6 @@ (cd src/bitmaps ln README *.xbm ../../${tempdir}/src/bitmaps) -echo "Making links to \`src/s'" -(cd src/s - ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s) - echo "Making links to \`lib'" (snippet_h=`(cd build-aux/snippet && ls *.h)` cd lib === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-02 06:19:48 +0000 +++ src/ChangeLog 2012-08-02 06:21:48 +0000 @@ -1,5 +1,7 @@ 2012-08-02 Glenn Morris + * s/: Remove empty directory. + * s/ms-w32.h: Move to ../nt/inc. * makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H): Update for new ms-w32.h location. === removed directory 'src/s' ------------------------------------------------------------ revno: 109389 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 23:19:48 -0700 message: Move NT-specific include file to the NT include directory * nt/inc/ms-w32.h: Move here from ../src/s. * nt/config.nt (config_opsysfile): Change to . * s/ms-w32.h: Move to ../nt/inc. * src/makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H): Update for new ms-w32.h location. * lib-src/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location. * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location. * lisp/emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-02 04:46:10 +0000 +++ ChangeLog 2012-08-02 06:19:48 +0000 @@ -1,3 +1,7 @@ +2012-08-02 Glenn Morris + + * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location. + 2012-08-02 Paul Eggert Merge from gnulib (Bug#12116), incorporating: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-01 17:54:06 +0000 +++ lib-src/ChangeLog 2012-08-02 06:19:48 +0000 @@ -1,3 +1,7 @@ +2012-08-02 Glenn Morris + + * makefile.w32-in (MS_W32_H): Update for new ms-w32.h location. + 2012-08-01 Glenn Morris * Makefile.in (config_h): New variable. === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2012-08-01 00:29:59 +0000 +++ lib-src/makefile.w32-in 2012-08-02 06:19:48 +0000 @@ -360,7 +360,7 @@ NT_INC = $(EMACS_ROOT)/nt/inc GNU_LIB = $(EMACS_ROOT)/lib -MS_W32_H = $(SRC)/s/ms-w32.h \ +MS_W32_H = $(NT_INC)/ms-w32.h \ $(NT_INC)/sys/stat.h CONF_POST_H = $(SRC)/conf_post.h \ $(MS_W32_H) === modified file 'lib/makefile.w32-in' --- lib/makefile.w32-in 2012-08-01 00:29:59 +0000 +++ lib/makefile.w32-in 2012-08-02 06:19:48 +0000 @@ -1,5 +1,5 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft Windows API. -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -71,7 +71,7 @@ C_CTYPE_H = $(GNU_LIB)/c-ctype.h \ $(NT_INC)/stdbool.h -MS_W32_H = $(SRC)/s/ms-w32.h \ +MS_W32_H = $(NT_INC)/ms-w32.h \ $(NT_INC)/sys/stat.h CONF_POST_H = $(SRC)/conf_post.h \ $(MS_W32_H) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-02 01:36:14 +0000 +++ lisp/ChangeLog 2012-08-02 06:19:48 +0000 @@ -1,3 +1,7 @@ +2012-08-02 Glenn Morris + + * emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h. + 2012-08-02 Paul Eggert Obsolete alias inactivate-current-input-method-function (Bug#10150). === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2012-07-10 01:11:08 +0000 +++ lisp/emacs-lisp/authors.el 2012-08-02 06:19:48 +0000 @@ -578,6 +578,7 @@ ("w32console.c" . "w32term.c") ("unexnt.c" . "unexw32.c") ("s/windowsnt.h" . "s/ms-w32.h") + ("s/ms-w32.h" . "inc/ms-w32.h") ("winnt.el" . "w32-fns.el") ("config.emacs" . "configure") ("configure.in" . "configure.ac") === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-08-01 11:20:07 +0000 +++ nt/ChangeLog 2012-08-02 06:19:48 +0000 @@ -1,3 +1,8 @@ +2012-08-02 Glenn Morris + + * inc/ms-w32.h: Move here from ../src/s. + * config.nt (config_opsysfile): Change to . + 2012-08-01 Juanma Barranquero * config.nt: Sync with autogen/config.in. === modified file 'nt/config.nt' --- nt/config.nt 2012-08-01 11:20:07 +0000 +++ nt/config.nt 2012-08-02 06:19:48 +0000 @@ -22,7 +22,7 @@ This file is intentionally kept in sync with autogen/config.in to ease maintenance. Please do not remove non-Windows related stuff unless strictly necessary. Also, before adding anything here - consider whether src/s/ms-w32.h would be a better place; this is + consider whether inc/ms-w32.h would be a better place; this is particularly true for gcc vs. MSVC conditional defines, MinGW or MSVC specific code, and macros not already defined in config.in. */ @@ -1538,7 +1538,7 @@ /* Some platforms that do not use configure define this to include extra configuration information. */ -#define config_opsysfile "s/ms-w32.h" +#define config_opsysfile /* A replacement for va_copy, if needed. */ #define gl_va_copy(a,b) ((a) = (b)) === renamed file 'src/s/ms-w32.h' => 'nt/inc/ms-w32.h' === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-02 04:14:48 +0000 +++ src/ChangeLog 2012-08-02 06:19:48 +0000 @@ -1,3 +1,9 @@ +2012-08-02 Glenn Morris + + * s/ms-w32.h: Move to ../nt/inc. + * makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H): + Update for new ms-w32.h location. + 2012-08-02 Paul Eggert Port to Solaris 8. === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2012-08-01 00:29:59 +0000 +++ src/makefile.w32-in 2012-08-02 06:19:48 +0000 @@ -339,7 +339,7 @@ ## ## This works only with GNU Make. -TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h +TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/inc/ms-w32.h $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE) TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2) @@ -353,7 +353,7 @@ $(OBJ1_c) ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ $(OBJ2_c) \ - $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h + $(CURDIR)/*.h $(CURDIR)/../nt/inc/ms-w32.h TAGS-nmake: echo This target is not supported with NMake @@ -403,7 +403,7 @@ $(GNU_LIB)/verify.h CODING_H = $(SRC)/coding.h \ $(SRC)/composite.h -MS_W32_H = $(SRC)/s/ms-w32.h \ +MS_W32_H = $(NT_INC)/ms-w32.h \ $(NT_INC)/sys/stat.h CONF_POST_H = $(SRC)/conf_post.h \ $(MS_W32_H) ------------------------------------------------------------ revno: 109388 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 23:17:21 -0700 message: Remove files that no longer exist diff: === modified file 'admin/MAINTAINERS' --- admin/MAINTAINERS 2012-05-22 16:20:27 +0000 +++ admin/MAINTAINERS 2012-08-02 06:17:21 +0000 @@ -34,7 +34,6 @@ src/msdos.[ch] src/dosfns.[ch] src/w16select.c - src/s/msdos.h lisp/term/internal.el lisp/term/pc-win.el lisp/dos-fns.el @@ -183,7 +182,6 @@ src/process.c src/ralloc.c src/region-cache.c -src/s/ src/scroll.c src/search.c src/sound.c ------------------------------------------------------------ revno: 109387 fixes bug: http://debbugs.gnu.org/12116 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-08-01 21:46:10 -0700 message: Merge from gnulib, for extern-inline. 2012-08-01 extern-inline: new module 2012-08-01 stat-time, timespec, u64, utimens: use extern-inline * lib/stat-time.c, lib/utimespec.c, lib/u64.c, m4/extern-inline.m4: New files. The new .c files are for instantiating extern inline functions. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-02 04:14:48 +0000 +++ ChangeLog 2012-08-02 04:46:10 +0000 @@ -1,5 +1,12 @@ 2012-08-02 Paul Eggert + Merge from gnulib (Bug#12116), incorporating: + 2012-08-01 extern-inline: new module + 2012-08-01 stat-time, timespec, u64, utimens: use extern-inline + * lib/stat-time.c, lib/utimespec.c, lib/u64.c, m4/extern-inline.m4: + New files. The new .c files are for instantiating extern inline + functions. + Port to Solaris 8. Without this change, 'configure' fails because the recently-added wait3 prototype in config.h messes up later 'configure' tests. === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2012-07-28 23:05:32 +0000 +++ lib/gnulib.mk 2012-08-02 04:46:10 +0000 @@ -465,6 +465,7 @@ ## begin gnulib module stat-time +libgnu_a_SOURCES += stat-time.c EXTRA_DIST += stat-time.h @@ -1092,6 +1093,7 @@ ## begin gnulib module timespec +libgnu_a_SOURCES += timespec.c EXTRA_DIST += timespec.h @@ -1111,6 +1113,7 @@ ## begin gnulib module u64 +libgnu_a_SOURCES += u64.c EXTRA_DIST += u64.h === added file 'lib/stat-time.c' --- lib/stat-time.c 1970-01-01 00:00:00 +0000 +++ lib/stat-time.c 2012-08-02 04:46:10 +0000 @@ -0,0 +1,3 @@ +#include +#define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE +#include === modified file 'lib/stat-time.h' --- lib/stat-time.h 2012-06-24 17:21:20 +0000 +++ lib/stat-time.h 2012-08-02 04:46:10 +0000 @@ -23,6 +23,11 @@ #include #include +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_STAT_TIME_INLINE +# define _GL_STAT_TIME_INLINE _GL_INLINE +#endif + /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type struct timespec, if available. If not, then STAT_TIMESPEC_NS (ST, ST_XTIM) is the nanosecond component of the ST_XTIM member for *ST, @@ -46,7 +51,7 @@ #endif /* Return the nanosecond component of *ST's access time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_atime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -59,7 +64,7 @@ } /* Return the nanosecond component of *ST's status change time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_ctime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -72,7 +77,7 @@ } /* Return the nanosecond component of *ST's data modification time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_mtime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -85,7 +90,7 @@ } /* Return the nanosecond component of *ST's birth time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_birthtime_ns (struct stat const *st) { # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC @@ -100,7 +105,7 @@ } /* Return *ST's access time. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_atime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -114,7 +119,7 @@ } /* Return *ST's status change time. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_ctime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -128,7 +133,7 @@ } /* Return *ST's data modification time. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_mtime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -143,7 +148,7 @@ /* Return *ST's birth time, if available; otherwise return a value with tv_sec and tv_nsec both equal to -1. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_birthtime (struct stat const *st) { struct timespec t; @@ -186,4 +191,6 @@ return t; } +_GL_INLINE_HEADER_END + #endif === added file 'lib/timespec.c' --- lib/timespec.c 1970-01-01 00:00:00 +0000 +++ lib/timespec.c 2012-08-02 04:46:10 +0000 @@ -0,0 +1,3 @@ +#include +#define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE +#include === modified file 'lib/timespec.h' --- lib/timespec.h 2012-07-09 08:34:39 +0000 +++ lib/timespec.h 2012-08-02 04:46:10 +0000 @@ -21,6 +21,11 @@ # include +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_TIMESPEC_INLINE +# define _GL_TIMESPEC_INLINE _GL_INLINE +#endif + /* Return negative, zero, positive if A < B, A == B, A > B, respectively. For each time stamp T, this code assumes that either: @@ -49,7 +54,7 @@ The (int) cast avoids a gcc -Wconversion warning. */ -static inline int +_GL_TIMESPEC_INLINE int timespec_cmp (struct timespec a, struct timespec b) { return (a.tv_sec < b.tv_sec ? -1 @@ -59,7 +64,7 @@ /* Return -1, 0, 1, depending on the sign of A. A.tv_nsec must be nonnegative. */ -static inline int +_GL_TIMESPEC_INLINE int timespec_sign (struct timespec a) { return a.tv_sec < 0 ? -1 : a.tv_sec || a.tv_nsec; @@ -73,7 +78,7 @@ _GL_ATTRIBUTE_CONST; /* Return an approximation to A, of type 'double'. */ -static inline double +_GL_TIMESPEC_INLINE double timespectod (struct timespec a) { return a.tv_sec + a.tv_nsec / 1e9; @@ -82,4 +87,6 @@ void gettime (struct timespec *); int settime (struct timespec const *); +_GL_INLINE_HEADER_END + #endif === added file 'lib/u64.c' --- lib/u64.c 1970-01-01 00:00:00 +0000 +++ lib/u64.c 2012-08-02 04:46:10 +0000 @@ -0,0 +1,3 @@ +#include +#define _GL_U64_INLINE _GL_EXTERN_INLINE +#include === modified file 'lib/u64.h' --- lib/u64.h 2012-05-26 23:14:36 +0000 +++ lib/u64.h 2012-08-02 04:46:10 +0000 @@ -19,6 +19,11 @@ #include +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_U64_INLINE +# define _GL_U64_INLINE _GL_INLINE +#endif + /* Return X rotated left by N bits, where 0 < N < 64. */ #define u64rol(x, n) u64or (u64shl (x, n), u64shr (x, 64 - n)) @@ -54,7 +59,7 @@ /* Given the high and low-order 32-bit quantities HI and LO, return a u64 value representing (HI << 32) + LO. */ -static inline u64 +_GL_U64_INLINE u64 u64hilo (uint32_t hi, uint32_t lo) { u64 r; @@ -64,7 +69,7 @@ } /* Return a u64 value representing LO. */ -static inline u64 +_GL_U64_INLINE u64 u64lo (uint32_t lo) { u64 r; @@ -74,7 +79,7 @@ } /* Return a u64 value representing SIZE. */ -static inline u64 +_GL_U64_INLINE u64 u64size (size_t size) { u64 r; @@ -84,14 +89,14 @@ } /* Return X < Y. */ -static inline int +_GL_U64_INLINE int u64lt (u64 x, u64 y) { return x.hi < y.hi || (x.hi == y.hi && x.lo < y.lo); } /* Return X & Y. */ -static inline u64 +_GL_U64_INLINE u64 u64and (u64 x, u64 y) { u64 r; @@ -101,7 +106,7 @@ } /* Return X | Y. */ -static inline u64 +_GL_U64_INLINE u64 u64or (u64 x, u64 y) { u64 r; @@ -111,7 +116,7 @@ } /* Return X ^ Y. */ -static inline u64 +_GL_U64_INLINE u64 u64xor (u64 x, u64 y) { u64 r; @@ -121,7 +126,7 @@ } /* Return X + Y. */ -static inline u64 +_GL_U64_INLINE u64 u64plus (u64 x, u64 y) { u64 r; @@ -131,7 +136,7 @@ } /* Return X << N. */ -static inline u64 +_GL_U64_INLINE u64 u64shl (u64 x, int n) { u64 r; @@ -149,7 +154,7 @@ } /* Return X >> N. */ -static inline u64 +_GL_U64_INLINE u64 u64shr (u64 x, int n) { u64 r; @@ -167,3 +172,5 @@ } #endif + +_GL_INLINE_HEADER_END === modified file 'lib/utimens.c' --- lib/utimens.c 2012-06-22 21:26:37 +0000 +++ lib/utimens.c 2012-08-02 04:46:10 +0000 @@ -21,6 +21,7 @@ #include +#define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE #include "utimens.h" #include === modified file 'lib/utimens.h' --- lib/utimens.h 2012-06-24 17:21:20 +0000 +++ lib/utimens.h 2012-08-02 04:46:10 +0000 @@ -1,3 +1,22 @@ +/* Set file access and modification times. + + Copyright 2012 Free Software Foundation, Inc. + + This program 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 3 of the License, or any + later version. + + This program 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 this program. If not, see . */ + +/* Written by Paul Eggert. */ + #include int fdutimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); @@ -7,13 +26,21 @@ # include # include +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_UTIMENS_INLINE +# define _GL_UTIMENS_INLINE _GL_INLINE +#endif + int fdutimensat (int fd, int dir, char const *name, struct timespec const [2], int atflag); /* Using this function makes application code slightly more readable. */ -static inline int +_GL_UTIMENS_INLINE int lutimensat (int dir, char const *file, struct timespec const times[2]) { return utimensat (dir, file, times, AT_SYMLINK_NOFOLLOW); } + +_GL_INLINE_HEADER_END + #endif === added file 'm4/extern-inline.m4' --- m4/extern-inline.m4 1970-01-01 00:00:00 +0000 +++ m4/extern-inline.m4 2012-08-02 04:46:10 +0000 @@ -0,0 +1,40 @@ +dnl 'extern inline' a la ISO C99. + +dnl Copyright 2012 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_EXTERN_INLINE], +[ + AC_REQUIRE([AC_C_INLINE]) + AH_VERBATIM([extern_inline], +[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. + _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. + _GL_INLINE_HEADER_BEGIN contains useful stuff to put + in an include file, before uses of _GL_INLINE. + It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, + when FOO is an inline function in the header; see + . + _GL_INLINE_HEADER_END contains useful stuff to put + in the same include file, after uses of _GL_INLINE. */ +#if __GNUC__ ? __GNUC_STDC_INLINE__ : 199901L <= __STDC_VERSION__ +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +# endif +#else +# define _GL_INLINE static inline +# define _GL_EXTERN_INLINE static inline +#endif + +#ifndef _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif]) +]) === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2012-07-28 23:05:32 +0000 +++ m4/gnulib-comp.m4 2012-08-02 04:46:10 +0000 @@ -55,6 +55,7 @@ # Code from module environ: # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module extern-inline: # Code from module filemode: # Code from module getloadavg: # Code from module getopt-gnu: @@ -151,6 +152,7 @@ gl_UNISTD_MODULE_INDICATOR([dup2]) gl_ENVIRON gl_UNISTD_MODULE_INDICATOR([environ]) +AC_REQUIRE([gl_EXTERN_INLINE]) gl_FILEMODE gl_GETLOADAVG if test $HAVE_GETLOADAVG = 0; then @@ -261,7 +263,6 @@ fi gl_TIME_MODULE_INDICATOR([time_r]) gl_TIMESPEC -AC_REQUIRE([AC_C_INLINE]) gl_UNISTD_H gl_UTIMENS gl_gnulib_enabled_dosname=false @@ -565,6 +566,7 @@ lib/sha512.c lib/sha512.h lib/signal.in.h + lib/stat-time.c lib/stat-time.h lib/stat.c lib/stdalign.in.h @@ -590,7 +592,9 @@ lib/time_r.c lib/timespec-add.c lib/timespec-sub.c + lib/timespec.c lib/timespec.h + lib/u64.c lib/u64.h lib/unistd.in.h lib/utimens.c @@ -603,6 +607,7 @@ m4/dup2.m4 m4/environ.m4 m4/extensions.m4 + m4/extern-inline.m4 m4/filemode.m4 m4/getloadavg.m4 m4/getopt.m4 ------------------------------------------------------------ revno: 109386 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-08-01 21:14:48 -0700 message: Port to Solaris 8. Without this change, 'configure' fails because the recently-added wait3 prototype in config.h messes up later 'configure' tests. Fix this problem by droping wait3 and WRETCODE, as they're no longer needed on hosts that are current porting targets. * configure.ac (wait3, WRETCODE): Remove, fixing a FIXME. All uses changed to waitpid and WEXITSTATUS. * src/syswait.h (WRETCODE): Remove, consistently with ../configure.ac. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-02 01:59:19 +0000 +++ ChangeLog 2012-08-02 04:14:48 +0000 @@ -1,5 +1,13 @@ 2012-08-02 Paul Eggert + Port to Solaris 8. + Without this change, 'configure' fails because the recently-added + wait3 prototype in config.h messes up later 'configure' tests. + Fix this problem by droping wait3 and WRETCODE, as they're + no longer needed on hosts that are current porting targets. + * configure.ac (wait3, WRETCODE): Remove, fixing a FIXME. + All uses changed to waitpid and WEXITSTATUS. + Avoid needless autoheader after autogen.sh. * src/stamp-h.in: Remove from bzr repository; no longer needed there. * .bzrignore: Add it. === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2012-07-30 18:56:42 +0000 +++ admin/CPP-DEFINES 2012-08-02 04:14:48 +0000 @@ -227,7 +227,6 @@ USG5 USG_SUBTTY_WORKS VALBITS -WRETCODE XOS_NEEDS_TIME_H _AIX _ARCH_PPC64 === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-08-01 08:49:28 +0000 +++ admin/ChangeLog 2012-08-02 04:14:48 +0000 @@ -1,3 +1,8 @@ +2012-08-02 Paul Eggert + + Port to Solaris 8. + * CPP-DEFINES (WRETCODE): Remove. + 2012-08-01 Dmitry Antipov * coccinelle/overlay.cocci: Semantic patch to replace direct === modified file 'configure.ac' --- configure.ac 2012-08-01 15:00:49 +0000 +++ configure.ac 2012-08-02 04:14:48 +0000 @@ -3692,23 +3692,6 @@ ;; esac -dnl Used in process.c. -case $opsys in - irix6-5 | sol2* | unixware ) - dnl It is possible to receive SIGCHLD when there are no children - dnl waiting, because a previous waitsys(2) cleaned up the carcass - dnl of child without clearing the SIGCHLD pending info. So, use a - dnl non-blocking wait3 instead, which maps to waitpid(2) in SysVr4. - AC_DEFINE(wait3(status, options, rusage), - [waitpid ((pid_t) -1, (status), (options))], - [Some platforms redefine this.]) - dnl FIXME this makes no sense, because WRETCODE is only used in - dnl process.c, which includes syswait.h aftet config.h, and the - dnl former unconditionally redefines WRETCODE. - AC_DEFINE(WRETCODE(w), [(w >> 8)], [Some platforms redefine this.]) - ;; -esac - case $opsys in hpux* | sol2* ) === modified file 'lib-src/movemail.c' --- lib-src/movemail.c 2012-07-12 15:20:39 +0000 +++ lib-src/movemail.c 2012-08-02 04:14:48 +0000 @@ -560,8 +560,8 @@ wait (&wait_status); if (!WIFEXITED (wait_status)) exit (EXIT_FAILURE); - else if (WRETCODE (wait_status) != 0) - exit (WRETCODE (wait_status)); + else if (WEXITSTATUS (wait_status) != 0) + exit (WEXITSTATUS (wait_status)); #if !defined (MAIL_USE_MMDF) && !defined (MAIL_USE_SYSTEM_LOCK) #ifdef MAIL_USE_MAILLOCK === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-02 04:06:38 +0000 +++ src/ChangeLog 2012-08-02 04:14:48 +0000 @@ -1,3 +1,8 @@ +2012-08-02 Paul Eggert + + Port to Solaris 8. + * syswait.h (WRETCODE): Remove, consistently with ../configure.ac. + 2012-08-02 Glenn Morris * nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR rather than === modified file 'src/process.c' --- src/process.c 2012-08-01 06:23:24 +0000 +++ src/process.c 2012-08-02 04:14:48 +0000 @@ -441,7 +441,7 @@ if (WIFSTOPPED (w)) return Fcons (Qstop, Fcons (make_number (WSTOPSIG (w)), Qnil)); else if (WIFEXITED (w)) - return Fcons (Qexit, Fcons (make_number (WRETCODE (w)), + return Fcons (Qexit, Fcons (make_number (WEXITSTATUS (w)), WCOREDUMP (w) ? Qt : Qnil)); else if (WIFSIGNALED (w)) return Fcons (Qsignal, Fcons (make_number (WTERMSIG (w)), @@ -4287,7 +4287,7 @@ FD_ZERO (&Writeok); if (time_limit == 0 && nsecs == 0 && wait_proc && !NILP (Vinhibit_quit) - && !(CONSP (PVAR (wait_proc, status)) + && !(CONSP (PVAR (wait_proc, status)) && EQ (XCAR (PVAR (wait_proc, status)), Qexit))) message ("Blocking call to accept-process-output with quit inhibited!!"); @@ -4887,7 +4887,7 @@ if (p->pid == -2) { /* If the EIO occurs on a pty, sigchld_handler's - wait3() will not find the process object to + waitpid() will not find the process object to delete. Do it here. */ p->tick = ++process_tick; PVAR (p, status) = Qfailed; @@ -4959,7 +4959,7 @@ if (xerrno) { p->tick = ++process_tick; - PVAR (p, status) + PVAR (p, status) = Fcons (Qfailed, Fcons (make_number (xerrno), Qnil)); deactivate_process (proc); } @@ -6352,7 +6352,7 @@ do { errno = 0; - pid = wait3 (&w, WNOHANG | WUNTRACED, 0); + pid = waitpid (-1, &w, WNOHANG | WUNTRACED); } while (pid < 0 && errno == EINTR); @@ -6440,7 +6440,7 @@ /* Report the status of the synchronous process. */ if (WIFEXITED (w)) - synch_process_retcode = WRETCODE (w); + synch_process_retcode = WEXITSTATUS (w); else if (WIFSIGNALED (w)) synch_process_termsig = WTERMSIG (w); @@ -6746,7 +6746,7 @@ CHECK_PROCESS (process); p = XPROCESS (process); if (NILP (flag)) - PVAR (p, decode_coding_system) + PVAR (p, decode_coding_system) = raw_text_coding_system (PVAR (p, decode_coding_system)); setup_process_coding_systems (process); === modified file 'src/sysdep.c' --- src/sysdep.c 2012-08-01 06:23:24 +0000 +++ src/sysdep.c 2012-08-02 04:14:48 +0000 @@ -294,7 +294,7 @@ #if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined (__GNU__) /* Note that kill returns -1 even if the process is just a zombie now. But inevitably a SIGCHLD interrupt should be generated - and child_sig will do wait3 and make the process go away. */ + and child_sig will do waitpid and make the process go away. */ /* There is some indication that there is a bug involved with termination of subprocesses, perhaps involving a kernel bug too, but no idea what it is. Just as a hunch we signal SIGCHLD to see === modified file 'src/syswait.h' --- src/syswait.h 2012-01-19 07:21:25 +0000 +++ src/syswait.h 2012-08-02 04:14:48 +0000 @@ -51,9 +51,4 @@ #define WTERMSIG(status) ((status) & 0x7f) #endif -#undef WRETCODE -#define WRETCODE(status) WEXITSTATUS (status) - - #endif /* EMACS_SYSWAIT_H */ - === modified file 'src/w32proc.c' --- src/w32proc.c 2012-07-29 16:22:27 +0000 +++ src/w32proc.c 2012-08-02 04:14:48 +0000 @@ -549,7 +549,7 @@ /* Report the status of the synchronous process. */ if (WIFEXITED (retval)) - synch_process_retcode = WRETCODE (retval); + synch_process_retcode = WEXITSTATUS (retval); else if (WIFSIGNALED (retval)) { int code = WTERMSIG (retval); ------------------------------------------------------------ revno: 109385 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 21:06:38 -0700 message: * src/nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR (rather than hard-coding the path separator). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 20:51:44 +0000 +++ src/ChangeLog 2012-08-02 04:06:38 +0000 @@ -1,3 +1,8 @@ +2012-08-02 Glenn Morris + + * nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR rather than + hard-coding the path separator. + 2012-08-01 Paul Eggert Use "ASET (a, i, v)" rather than "AREF (a, i) = v". === modified file 'src/nsterm.m' --- src/nsterm.m 2012-08-01 20:15:30 +0000 +++ src/nsterm.m 2012-08-02 04:06:38 +0000 @@ -329,8 +329,7 @@ NSString *binDir = [bundle bundlePath]; NSString *resourcePath, *resourcePaths; NSRange range; - BOOL onWindows = NO; /* FIXME determine this somehow */ - NSString *pathSeparator = onWindows ? @";" : @":"; + NSString *pathSeparator = [NSString stringWithFormat: @"%c", SEPCHAR]; NSFileManager *fileManager = [NSFileManager defaultManager]; NSArray *paths; NSEnumerator *pathEnum; @@ -377,8 +376,7 @@ NSBundle *bundle = [NSBundle mainBundle]; NSString *resourceDir = [bundle resourcePath]; NSString *resourcePath, *resourcePaths; - BOOL onWindows = NO; /* FIXME determine this somehow */ - NSString *pathSeparator = onWindows ? @";" : @":"; + NSString *pathSeparator = [NSString stringWithFormat: @"%c", SEPCHAR]; NSFileManager *fileManager = [NSFileManager defaultManager]; BOOL isDir; NSArray *paths = [resourceDir stringsByAppendingPaths: ------------------------------------------------------------ revno: 109384 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-08-01 18:59:19 -0700 message: Avoid needless autoheader after autogen.sh. * src/stamp-h.in: Remove from bzr repository; no longer needed there. * .bzrignore: Add it. * autogen.sh: Create it. diff: === modified file '.bzrignore' --- .bzrignore 2012-07-28 23:05:32 +0000 +++ .bzrignore 2012-08-02 01:59:19 +0000 @@ -143,6 +143,7 @@ src/gdb.ini src/prefix-args* src/stamp-oldxmenu +src/stamp-h.in src/temacs test/indent/*.new +* === modified file 'ChangeLog' --- ChangeLog 2012-08-01 15:00:49 +0000 +++ ChangeLog 2012-08-02 01:59:19 +0000 @@ -1,3 +1,10 @@ +2012-08-02 Paul Eggert + + Avoid needless autoheader after autogen.sh. + * src/stamp-h.in: Remove from bzr repository; no longer needed there. + * .bzrignore: Add it. + * autogen.sh: Create it. + 2012-08-01 Glenn Morris * configure.ac (DOS_NT, MSDOS): New system type templates. === modified file 'autogen.sh' --- autogen.sh 2012-07-09 04:52:49 +0000 +++ autogen.sh 2012-08-02 01:59:19 +0000 @@ -209,6 +209,10 @@ ## Let autoreconf figure out what, if anything, needs doing. autoreconf -i -I m4 || exit $? +## Create a timestamp, so that './autogen.sh; make' doesn't +## cause 'make' to needlessly run 'autoheader'. +echo timestamp > src/stamp-h.in || exit + echo "You can now run \`./configure'." exit 0 === removed file 'src/stamp-h.in' --- src/stamp-h.in 2002-04-15 13:14:45 +0000 +++ src/stamp-h.in 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -timestamp ------------------------------------------------------------ revno: 109383 fixes bug: http://debbugs.gnu.org/10150 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-08-01 18:36:14 -0700 message: Obsolete alias inactivate-current-input-method-function. * lisp/international/mule-cmds.el: Create inactivate-current-input-method-function as an obsolete alias for deactivate-current-input-method-function. See Katsumi Yamaoka in . diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-01 15:36:37 +0000 +++ lisp/ChangeLog 2012-08-02 01:36:14 +0000 @@ -1,3 +1,11 @@ +2012-08-02 Paul Eggert + + Obsolete alias inactivate-current-input-method-function (Bug#10150). + * international/mule-cmds.el: Create + inactivate-current-input-method-function as an obsolete alias for + deactivate-current-input-method-function. See Katsumi Yamaoka in + . + 2012-08-01 Jay Belanger * calc/calc-mode.el (calc-set-simplify-mode): Use `cond' instead === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2012-07-29 18:33:47 +0000 +++ lisp/international/mule-cmds.el 2012-08-02 01:36:14 +0000 @@ -1331,6 +1331,9 @@ (make-variable-buffer-local 'input-method-history) (put 'input-method-history 'permanent-local t) +(define-obsolete-variable-alias + 'inactivate-current-input-method-function + 'deactivate-current-input-method-function "24.2") (defvar deactivate-current-input-method-function nil "Function to call for deactivating the current input method. Every input method should set this to an appropriate value when activated. ------------------------------------------------------------ revno: 109382 committer: Jay Belanger branch nick: trunk timestamp: Wed 2012-08-01 18:42:29 -0500 message: calc.texi (Simplification modes, Conversions) (Operating on Selections, Basic Simplifications) (Algebraic Simplifications): Mention "basic" simplifications. (Algebraic Entry): Remove mention of default simplifications. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-08-01 18:24:13 +0000 +++ doc/misc/ChangeLog 2012-08-01 23:42:29 +0000 @@ -1,6 +1,7 @@ 2012-08-01 Jay Belanger - * calc.texi (Simplification modes): Mention "basic" simplification. + * calc.texi (Simplification modes, Conversions) + (Operating on Selections): Mention "basic" simplification. (The Calc Mode Line): Mention the mode line display for Basic simplification mode. (Simplify Formulas): Refer to 'algebraic' rather than 'default' @@ -14,6 +15,7 @@ (Trigonometric/Hyperbolic Functions, Reducing and Mapping) (Kinds of Declarations, Functions for Declarations): Mention "algebraic simplifications" instead of `a s'. + (Algebraic Entry): Remove mention of default simplifications. 2012-07-30 Jay Belanger === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2012-08-01 18:24:13 +0000 +++ doc/misc/calc.texi 2012-08-01 23:42:29 +0000 @@ -10123,7 +10123,7 @@ the variable @samp{pi}, but @kbd{' pi M-@key{RET}} pushes 3.1415.) If you finish your algebraic entry by pressing @key{LFD} (or @kbd{C-j}) -instead of @key{RET}, Calc disables the default simplifications +instead of @key{RET}, Calc disables simplification (as if by @kbd{m O}; @pxref{Simplification Modes}) while the entry is being pushed on the stack. Thus @kbd{' 1+2 @key{RET}} pushes 3 on the stack, but @kbd{' 1+2 @key{LFD}} pushes the formula @expr{1+2}; @@ -12613,12 +12613,12 @@ @kindex m B @pindex calc-bin-simplify-mode -The @kbd{m B} (@code{calc-bin-simplify-mode}) mode applies the limited +The @kbd{m B} (@code{calc-bin-simplify-mode}) mode applies the basic simplifications to a result and then, if the result is an integer, uses the @kbd{b c} (@code{calc-clip}) command to clip the integer according to the current binary word size. @xref{Binary Functions}. Real numbers are rounded to the nearest integer and then clipped; other kinds of -results (after the default simplifications) are left alone. +results (after the basic simplifications) are left alone. @kindex m A @pindex calc-alg-simplify-mode @@ -16714,10 +16714,10 @@ operation. Vectors and formulas are cleaned by cleaning each component number (i.e., pervasively). -If the simplification mode is set below the limited level, it is raised -to the limited level for the purposes of this command. Thus, @kbd{c c} -applies the limited simplifications even if their automatic application -is disabled. @xref{Simplification Modes}. +If the simplification mode is set below basic simplification, it is raised +for the purposes of this command. Thus, @kbd{c c} applies the basic +simplifications even if their automatic application is disabled. +@xref{Simplification Modes}. @cindex Roundoff errors, correcting A numeric prefix argument to @kbd{c c} sets the floating-point precision @@ -22124,7 +22124,7 @@ @kindex j v @pindex calc-sel-evaluate The @kbd{j v} (@code{calc-sel-evaluate}) command performs the -limited simplifications on the selected sub-formula. +basic simplifications on the selected sub-formula. These simplifications would normally be done automatically on all results, but may have been partially inhibited by previous selection-related operations, or turned off altogether @@ -22412,14 +22412,14 @@ As well as the simplifications described here, if you have stored any rewrite rules in the variable @code{EvalRules} then these rules -will also be applied before any built-in default simplifications. +will also be applied before any of the basic simplifications. @xref{Automatic Rewrites}, for details. @tex \bigskip @end tex -And now, on with the limited set of simplifications: +And now, on with the basic simplifications: Arithmetic operators like @kbd{+} and @kbd{*} always take two arguments in Calc's internal form. Sums and products of three or @@ -22737,7 +22737,7 @@ Products are sorted into a canonical order using the commutative law. For example, @expr{b c a} is commuted to @expr{a b c}. -This allows easier comparison of products; for example, the limited +This allows easier comparison of products; for example, the basic simplifications will not change @expr{x y + y x} to @expr{2 x y}, but the algebraic simplifications; it first rewrites the sum to @expr{x y + x y} which can then be recognized as a sum of identical @@ -22796,10 +22796,10 @@ Integer powers of the variable @code{i} are simplified according to the identity @expr{i^2 = -1}. If you store a new value other than the complex number @expr{(0,1)} in @code{i}, this simplification -will no longer occur. This is not done by the limited +will no longer occur. This is not done by the basic simplifications; in case someone (unwisely) wants to use the name @code{i} for a variable unrelated to complex numbers, they can use -limited simplifications. +basic simplification mode. Square roots of integer or rational arguments are simplified in several ways. (Note that these will be left unevaluated only in ------------------------------------------------------------ revno: 109381 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-08-01 13:51:44 -0700 message: Use "ASET (a, i, v)" rather than "AREF (a, i) = v". This how ASET and AREF are supposed to work, and makes it easier to think about future improvements. See . * charset.h (set_charset_attr): New function. All lvalue-style uses of CHARSET_DECODER etc. changed to use it. * lisp.h (ASET): Rewrite so as not to use AREF in an lvalue style. (aref_addr): New function. All uses of &AREF(...) changed. (set_hash_key, set_hash_value, set_hash_next, set_hash_hash) (set_hash_index): New functions. All lvalue-style uses of HASH_KEY etc. changed. * keyboard.c (set_prop): New function. All lvalue-style uses of PROP changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 20:15:30 +0000 +++ src/ChangeLog 2012-08-01 20:51:44 +0000 @@ -1,3 +1,19 @@ +2012-08-01 Paul Eggert + + Use "ASET (a, i, v)" rather than "AREF (a, i) = v". + This how ASET and AREF are supposed to work, and makes + it easier to think about future improvements. See + . + * charset.h (set_charset_attr): New function. + All lvalue-style uses of CHARSET_DECODER etc. changed to use it. + * lisp.h (ASET): Rewrite so as not to use AREF in an lvalue style. + (aref_addr): New function. All uses of &AREF(...) changed. + (set_hash_key, set_hash_value, set_hash_next, set_hash_hash) + (set_hash_index): New functions. All lvalue-style uses of + HASH_KEY etc. changed. + * keyboard.c (set_prop): New function. All lvalue-style uses + of PROP changed. + 2012-08-01 Alp Aker * nsterm.m (ns_set_vertical_scroll_bar, ns_redeem_scroll_bar) === modified file 'src/charset.c' --- src/charset.c 2012-07-27 09:24:34 +0000 +++ src/charset.c 2012-08-01 20:51:44 +0000 @@ -272,8 +272,8 @@ { int n = CODE_POINT_TO_INDEX (charset, max_code) + 1; - vec = CHARSET_DECODER (charset) - = Fmake_vector (make_number (n), make_number (-1)); + vec = Fmake_vector (make_number (n), make_number (-1)); + set_charset_attr (charset, charset_decoder, vec); } else { @@ -285,10 +285,10 @@ else { table = Fmake_char_table (Qnil, Qnil); - if (charset->method == CHARSET_METHOD_MAP) - CHARSET_ENCODER (charset) = table; - else - CHARSET_DEUNIFIER (charset) = table; + set_charset_attr (charset, + (charset->method == CHARSET_METHOD_MAP + ? charset_encoder : charset_deunifier), + table); } } else @@ -1133,7 +1133,7 @@ { new_definition_p = 0; id = XFASTINT (CHARSET_SYMBOL_ID (args[charset_arg_name])); - HASH_VALUE (hash_table, charset.hash_index) = attrs; + set_hash_value (hash_table, charset.hash_index, attrs); } else { @@ -1336,7 +1336,7 @@ Lisp_Object attrs; CHECK_CHARSET_GET_ATTR (charset, attrs); - CHARSET_ATTR_PLIST (attrs) = plist; + ASET (attrs, charset_plist, plist); return plist; } @@ -1375,7 +1375,7 @@ { if (! STRINGP (unify_map) && ! VECTORP (unify_map)) signal_error ("Bad unify-map", unify_map); - CHARSET_UNIFY_MAP (cs) = unify_map; + set_charset_attr (cs, charset_unify_map, unify_map); } if (NILP (Vchar_unify_table)) Vchar_unify_table = Fmake_char_table (Qnil, Qnil); === modified file 'src/charset.h' --- src/charset.h 2012-02-10 18:58:48 +0000 +++ src/charset.h 2012-08-01 20:51:44 +0000 @@ -325,6 +325,13 @@ #define CHARSET_DEUNIFIER(charset) \ (CHARSET_ATTR_DEUNIFIER (CHARSET_ATTRIBUTES (charset))) +static inline void +set_charset_attr (struct charset *charset, enum charset_attr_index idx, + Lisp_Object val) +{ + ASET (CHARSET_ATTRIBUTES (charset), idx, val); +} + /* Nonzero if OBJ is a valid charset symbol. */ #define CHARSETP(obj) (CHARSET_SYMBOL_HASH_INDEX (obj) >= 0) === modified file 'src/coding.c' --- src/coding.c 2012-07-30 06:43:46 +0000 +++ src/coding.c 2012-08-01 20:51:44 +0000 @@ -2674,8 +2674,8 @@ CODING_GET_INFO (coding, attrs, charset_list); if (! EQ (charset_list, Vemacs_mule_charset_list)) { - CODING_ATTR_CHARSET_LIST (attrs) - = charset_list = Vemacs_mule_charset_list; + charset_list = Vemacs_mule_charset_list; + ASET (attrs, coding_attr_charset_list, charset_list); } while (charbuf < charbuf_end) @@ -2967,8 +2967,8 @@ if ((flags & CODING_ISO_FLAG_FULL_SUPPORT) && ! EQ (charset_list, Viso_2022_charset_list)) { - CODING_ATTR_CHARSET_LIST (attrs) - = charset_list = Viso_2022_charset_list; + charset_list = Viso_2022_charset_list; + ASET (attrs, coding_attr_charset_list, charset_list); ASET (attrs, coding_attr_safe_charsets, Qnil); } @@ -9603,16 +9603,16 @@ name = args[coding_arg_name]; CHECK_SYMBOL (name); - CODING_ATTR_BASE_NAME (attrs) = name; + ASET (attrs, coding_attr_base_name, name); val = args[coding_arg_mnemonic]; if (! STRINGP (val)) CHECK_CHARACTER (val); - CODING_ATTR_MNEMONIC (attrs) = val; + ASET (attrs, coding_attr_mnemonic, val); coding_type = args[coding_arg_coding_type]; CHECK_SYMBOL (coding_type); - CODING_ATTR_TYPE (attrs) = coding_type; + ASET (attrs, coding_attr_type, coding_type); charset_list = args[coding_arg_charset_list]; if (SYMBOLP (charset_list)) @@ -9659,49 +9659,49 @@ max_charset_id = charset->id; } } - CODING_ATTR_CHARSET_LIST (attrs) = charset_list; + ASET (attrs, coding_attr_charset_list, charset_list); safe_charsets = make_uninit_string (max_charset_id + 1); memset (SDATA (safe_charsets), 255, max_charset_id + 1); for (tail = charset_list; CONSP (tail); tail = XCDR (tail)) SSET (safe_charsets, XFASTINT (XCAR (tail)), 0); - CODING_ATTR_SAFE_CHARSETS (attrs) = safe_charsets; + ASET (attrs, coding_attr_safe_charsets, safe_charsets); - CODING_ATTR_ASCII_COMPAT (attrs) = args[coding_arg_ascii_compatible_p]; + ASET (attrs, coding_attr_ascii_compat, args[coding_arg_ascii_compatible_p]); val = args[coding_arg_decode_translation_table]; if (! CHAR_TABLE_P (val) && ! CONSP (val)) CHECK_SYMBOL (val); - CODING_ATTR_DECODE_TBL (attrs) = val; + ASET (attrs, coding_attr_decode_tbl, val); val = args[coding_arg_encode_translation_table]; if (! CHAR_TABLE_P (val) && ! CONSP (val)) CHECK_SYMBOL (val); - CODING_ATTR_ENCODE_TBL (attrs) = val; + ASET (attrs, coding_attr_encode_tbl, val); val = args[coding_arg_post_read_conversion]; CHECK_SYMBOL (val); - CODING_ATTR_POST_READ (attrs) = val; + ASET (attrs, coding_attr_post_read, val); val = args[coding_arg_pre_write_conversion]; CHECK_SYMBOL (val); - CODING_ATTR_PRE_WRITE (attrs) = val; + ASET (attrs, coding_attr_pre_write, val); val = args[coding_arg_default_char]; if (NILP (val)) - CODING_ATTR_DEFAULT_CHAR (attrs) = make_number (' '); + ASET (attrs, coding_attr_default_char, make_number (' ')); else { CHECK_CHARACTER (val); - CODING_ATTR_DEFAULT_CHAR (attrs) = val; + ASET (attrs, coding_attr_default_char, val); } val = args[coding_arg_for_unibyte]; - CODING_ATTR_FOR_UNIBYTE (attrs) = NILP (val) ? Qnil : Qt; + ASET (attrs, coding_attr_for_unibyte, NILP (val) ? Qnil : Qt); val = args[coding_arg_plist]; CHECK_LIST (val); - CODING_ATTR_PLIST (attrs) = val; + ASET (attrs, coding_attr_plist, val); if (EQ (coding_type, Qcharset)) { @@ -9726,7 +9726,7 @@ int idx = (dim - 1) * 4; if (CHARSET_ASCII_COMPATIBLE_P (charset)) - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); for (i = charset->code_space[idx]; i <= charset->code_space[idx + 1]; i++) @@ -9824,7 +9824,7 @@ { Lisp_Object bom, endian; - CODING_ATTR_ASCII_COMPAT (attrs) = Qnil; + ASET (attrs, coding_attr_ascii_compat, Qnil); if (nargs < coding_arg_utf16_max) goto short_args; @@ -9877,7 +9877,7 @@ CHECK_CHARSET_GET_CHARSET (val, charset); ASET (initial, i, make_number (CHARSET_ID (charset))); if (i == 0 && CHARSET_ASCII_COMPATIBLE_P (charset)) - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); } else ASET (initial, i, make_number (-1)); @@ -9938,13 +9938,13 @@ } if (category != coding_category_iso_8_1 && category != coding_category_iso_8_2) - CODING_ATTR_ASCII_COMPAT (attrs) = Qnil; + ASET (attrs, coding_attr_ascii_compat, Qnil); } else if (EQ (coding_type, Qemacs_mule)) { if (EQ (args[coding_arg_charset_list], Qemacs_mule)) ASET (attrs, coding_attr_emacs_mule_full, Qt); - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); category = coding_category_emacs_mule; } else if (EQ (coding_type, Qshift_jis)) @@ -9961,7 +9961,7 @@ error ("Dimension of charset %s is not one", SDATA (SYMBOL_NAME (CHARSET_NAME (charset)))); if (CHARSET_ASCII_COMPATIBLE_P (charset)) - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); charset_list = XCDR (charset_list); charset = CHARSET_FROM_ID (XINT (XCAR (charset_list))); @@ -9999,7 +9999,7 @@ error ("Dimension of charset %s is not one", SDATA (SYMBOL_NAME (CHARSET_NAME (charset)))); if (CHARSET_ASCII_COMPATIBLE_P (charset)) - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); charset_list = XCDR (charset_list); charset = CHARSET_FROM_ID (XINT (XCAR (charset_list))); @@ -10013,7 +10013,7 @@ else if (EQ (coding_type, Qraw_text)) { category = coding_category_raw_text; - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); } else if (EQ (coding_type, Qutf_8)) { @@ -10033,7 +10033,7 @@ } ASET (attrs, coding_attr_utf_bom, bom); if (NILP (bom)) - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; + ASET (attrs, coding_attr_ascii_compat, Qt); category = (CONSP (bom) ? coding_category_utf_8_auto : NILP (bom) ? coding_category_utf_8_nosig @@ -10045,14 +10045,15 @@ error ("Invalid coding system type: %s", SDATA (SYMBOL_NAME (coding_type))); - CODING_ATTR_CATEGORY (attrs) = make_number (category); - CODING_ATTR_PLIST (attrs) - = Fcons (QCcategory, Fcons (AREF (Vcoding_category_table, category), - CODING_ATTR_PLIST (attrs))); - CODING_ATTR_PLIST (attrs) - = Fcons (QCascii_compatible_p, - Fcons (CODING_ATTR_ASCII_COMPAT (attrs), - CODING_ATTR_PLIST (attrs))); + ASET (attrs, coding_attr_category, make_number (category)); + ASET (attrs, coding_attr_plist, + Fcons (QCcategory, + Fcons (AREF (Vcoding_category_table, category), + CODING_ATTR_PLIST (attrs)))); + ASET (attrs, coding_attr_plist, + Fcons (QCascii_compatible_p, + Fcons (CODING_ATTR_ASCII_COMPAT (attrs), + CODING_ATTR_PLIST (attrs)))); eol_type = args[coding_arg_eol_type]; if (! NILP (eol_type) @@ -10126,7 +10127,7 @@ { if (! STRINGP (val)) CHECK_CHARACTER (val); - CODING_ATTR_MNEMONIC (attrs) = val; + ASET (attrs, coding_attr_mnemonic, val); } else if (EQ (prop, QCdefault_char)) { @@ -10134,37 +10135,37 @@ val = make_number (' '); else CHECK_CHARACTER (val); - CODING_ATTR_DEFAULT_CHAR (attrs) = val; + ASET (attrs, coding_attr_default_char, val); } else if (EQ (prop, QCdecode_translation_table)) { if (! CHAR_TABLE_P (val) && ! CONSP (val)) CHECK_SYMBOL (val); - CODING_ATTR_DECODE_TBL (attrs) = val; + ASET (attrs, coding_attr_decode_tbl, val); } else if (EQ (prop, QCencode_translation_table)) { if (! CHAR_TABLE_P (val) && ! CONSP (val)) CHECK_SYMBOL (val); - CODING_ATTR_ENCODE_TBL (attrs) = val; + ASET (attrs, coding_attr_encode_tbl, val); } else if (EQ (prop, QCpost_read_conversion)) { CHECK_SYMBOL (val); - CODING_ATTR_POST_READ (attrs) = val; + ASET (attrs, coding_attr_post_read, val); } else if (EQ (prop, QCpre_write_conversion)) { CHECK_SYMBOL (val); - CODING_ATTR_PRE_WRITE (attrs) = val; + ASET (attrs, coding_attr_pre_write, val); } else if (EQ (prop, QCascii_compatible_p)) { - CODING_ATTR_ASCII_COMPAT (attrs) = val; + ASET (attrs, coding_attr_ascii_compat, val); } - CODING_ATTR_PLIST (attrs) - = Fplist_put (CODING_ATTR_PLIST (attrs), prop, val); + ASET (attrs, coding_attr_plist, + Fplist_put (CODING_ATTR_PLIST (attrs), prop, val)); return val; } === modified file 'src/composite.c' --- src/composite.c 2012-08-01 05:11:36 +0000 +++ src/composite.c 2012-08-01 20:51:44 +0000 @@ -762,7 +762,7 @@ } metrics->width = metrics->lbearing = metrics->rbearing = 0; } - for (glyph = &LGSTRING_GLYPH (gstring, from); from < to; from++, glyph++) + for (glyph = lgstring_glyph_addr (gstring, from); from < to; from++, glyph++) { int x; === modified file 'src/composite.h' --- src/composite.h 2012-02-10 18:58:48 +0000 +++ src/composite.h 2012-08-01 20:51:44 +0000 @@ -247,6 +247,11 @@ #define LGSTRING_GLYPH_LEN(lgs) (ASIZE ((lgs)) - 2) #define LGSTRING_GLYPH(lgs, idx) AREF ((lgs), (idx) + 2) #define LGSTRING_SET_GLYPH(lgs, idx, val) ASET ((lgs), (idx) + 2, (val)) +static inline Lisp_Object * +lgstring_glyph_addr (Lisp_Object lgs, ptrdiff_t idx) +{ + return aref_addr (lgs, idx + 2); +} /* Vector size of Lispy glyph. */ enum lglyph_indices === modified file 'src/fns.c' --- src/fns.c 2012-08-01 08:49:28 +0000 +++ src/fns.c 2012-08-01 20:51:44 +0000 @@ -1192,7 +1192,7 @@ string, make_number (0), res, Qnil); } else - res = Fvector (to_char - from_char, &AREF (string, from_char)); + res = Fvector (to_char - from_char, aref_addr (string, from_char)); return res; } @@ -1274,7 +1274,7 @@ string, make_number (0), res, Qnil); } else - res = Fvector (to - from, &AREF (string, from)); + res = Fvector (to - from, aref_addr (string, from)); return res; } @@ -3663,7 +3663,7 @@ /* Set up the free list. */ for (i = 0; i < sz - 1; ++i) - HASH_NEXT (h, i) = make_number (i + 1); + set_hash_next (h, i, make_number (i + 1)); h->next_free = make_number (0); XSET_HASH_TABLE (table, h); @@ -3770,7 +3770,7 @@ the end of the free list. This makes some operations like maphash faster. */ for (i = old_size; i < new_size - 1; ++i) - HASH_NEXT (h, i) = make_number (i + 1); + set_hash_next (h, i, make_number (i + 1)); if (!NILP (h->next_free)) { @@ -3781,7 +3781,7 @@ !NILP (next)) last = next; - HASH_NEXT (h, XFASTINT (last)) = make_number (old_size); + set_hash_next (h, XFASTINT (last), make_number (old_size)); } else XSETFASTINT (h->next_free, old_size); @@ -3792,8 +3792,8 @@ { EMACS_UINT hash_code = XUINT (HASH_HASH (h, i)); ptrdiff_t start_of_bucket = hash_code % ASIZE (h->index); - HASH_NEXT (h, i) = HASH_INDEX (h, start_of_bucket); - HASH_INDEX (h, start_of_bucket) = make_number (i); + set_hash_next (h, i, HASH_INDEX (h, start_of_bucket)); + set_hash_index (h, start_of_bucket, make_number (i)); } } } @@ -3852,16 +3852,16 @@ /* Store key/value in the key_and_value vector. */ i = XFASTINT (h->next_free); h->next_free = HASH_NEXT (h, i); - HASH_KEY (h, i) = key; - HASH_VALUE (h, i) = value; + set_hash_key (h, i, key); + set_hash_value (h, i, value); /* Remember its hash code. */ - HASH_HASH (h, i) = make_number (hash); + set_hash_hash (h, i, make_number (hash)); /* Add new entry to its collision chain. */ start_of_bucket = hash % ASIZE (h->index); - HASH_NEXT (h, i) = HASH_INDEX (h, start_of_bucket); - HASH_INDEX (h, start_of_bucket) = make_number (i); + set_hash_next (h, i, HASH_INDEX (h, start_of_bucket)); + set_hash_index (h, start_of_bucket, make_number (i)); return i; } @@ -3892,14 +3892,16 @@ { /* Take entry out of collision chain. */ if (NILP (prev)) - HASH_INDEX (h, start_of_bucket) = HASH_NEXT (h, i); + set_hash_index (h, start_of_bucket, HASH_NEXT (h, i)); else - HASH_NEXT (h, XFASTINT (prev)) = HASH_NEXT (h, i); + set_hash_next (h, XFASTINT (prev), HASH_NEXT (h, i)); /* Clear slots in key_and_value and add the slots to the free list. */ - HASH_KEY (h, i) = HASH_VALUE (h, i) = HASH_HASH (h, i) = Qnil; - HASH_NEXT (h, i) = h->next_free; + set_hash_key (h, i, Qnil); + set_hash_value (h, i, Qnil); + set_hash_hash (h, i, Qnil); + set_hash_next (h, i, h->next_free); h->next_free = make_number (i); h->count--; eassert (h->count >= 0); @@ -3925,10 +3927,10 @@ for (i = 0; i < size; ++i) { - HASH_NEXT (h, i) = i < size - 1 ? make_number (i + 1) : Qnil; - HASH_KEY (h, i) = Qnil; - HASH_VALUE (h, i) = Qnil; - HASH_HASH (h, i) = Qnil; + set_hash_next (h, i, i < size - 1 ? make_number (i + 1) : Qnil); + set_hash_key (h, i, Qnil); + set_hash_value (h, i, Qnil); + set_hash_hash (h, i, Qnil); } for (i = 0; i < ASIZE (h->index); ++i) @@ -3992,17 +3994,18 @@ { /* Take out of collision chain. */ if (NILP (prev)) - HASH_INDEX (h, bucket) = next; + set_hash_index (h, bucket, next); else - HASH_NEXT (h, XFASTINT (prev)) = next; + set_hash_next (h, XFASTINT (prev), next); /* Add to free list. */ - HASH_NEXT (h, i) = h->next_free; + set_hash_next (h, i, h->next_free); h->next_free = idx; /* Clear key, value, and hash. */ - HASH_KEY (h, i) = HASH_VALUE (h, i) = Qnil; - HASH_HASH (h, i) = Qnil; + set_hash_key (h, i, Qnil); + set_hash_value (h, i, Qnil); + set_hash_hash (h, i, Qnil); h->count--; } @@ -4509,7 +4512,7 @@ i = hash_lookup (h, key, &hash); if (i >= 0) - HASH_VALUE (h, i) = value; + set_hash_value (h, i, value); else hash_put (h, key, value, hash); === modified file 'src/font.c' --- src/font.c 2012-08-01 05:11:36 +0000 +++ src/font.c 2012-08-01 20:51:44 +0000 @@ -4722,7 +4722,7 @@ Lisp_Object elt = AREF (object, XFASTINT (from) + i); CHECK_CHARACTER (elt); } - chars = &(AREF (object, XFASTINT (from))); + chars = aref_addr (object, XFASTINT (from)); } vec = Fmake_vector (make_number (len), Qnil); === modified file 'src/keyboard.c' --- src/keyboard.c 2012-08-01 07:57:09 +0000 +++ src/keyboard.c 2012-08-01 20:51:44 +0000 @@ -5551,7 +5551,7 @@ mouse_syms = larger_vector (mouse_syms, incr, -1); } - start_pos_ptr = &AREF (button_down_location, button); + start_pos_ptr = aref_addr (button_down_location, button); start_pos = *start_pos_ptr; *start_pos_ptr = Qnil; @@ -5959,7 +5959,7 @@ mouse_syms = larger_vector (mouse_syms, incr, -1); } - start_pos_ptr = &AREF (button_down_location, button); + start_pos_ptr = aref_addr (button_down_location, button); start_pos = *start_pos_ptr; position = make_lispy_position (f, event->x, event->y, @@ -7525,8 +7525,8 @@ tem2 = AREF (menu_bar_items_vector, i + 2); tem3 = AREF (menu_bar_items_vector, i + 3); if (end > i + 4) - memmove (&AREF (menu_bar_items_vector, i), - &AREF (menu_bar_items_vector, i + 4), + memmove (aref_addr (menu_bar_items_vector, i), + aref_addr (menu_bar_items_vector, i + 4), (end - i - 4) * sizeof (Lisp_Object)); ASET (menu_bar_items_vector, end - 4, tem0); ASET (menu_bar_items_vector, end - 3, tem1); @@ -7575,8 +7575,8 @@ if (EQ (key, AREF (menu_bar_items_vector, i))) { if (menu_bar_items_index > i + 4) - memmove (&AREF (menu_bar_items_vector, i), - &AREF (menu_bar_items_vector, i + 4), + memmove (aref_addr (menu_bar_items_vector, i), + aref_addr (menu_bar_items_vector, i + 4), (menu_bar_items_index - i - 4) * sizeof (Lisp_Object)); menu_bar_items_index -= 4; } @@ -8096,6 +8096,14 @@ UNGCPRO; } +/* Access slot with index IDX of vector tool_bar_item_properties. */ +#define PROP(IDX) AREF (tool_bar_item_properties, (IDX)) +static inline void +set_prop (ptrdiff_t idx, Lisp_Object val) +{ + ASET (tool_bar_item_properties, idx, val); +} + /* Parse a tool bar item specification ITEM for key KEY and return the result in tool_bar_item_properties. Value is zero if ITEM is @@ -8146,9 +8154,6 @@ static int parse_tool_bar_item (Lisp_Object key, Lisp_Object item) { - /* Access slot with index IDX of vector tool_bar_item_properties. */ -#define PROP(IDX) AREF (tool_bar_item_properties, (IDX)) - Lisp_Object filter = Qnil; Lisp_Object caption; int i, have_label = 0; @@ -8172,15 +8177,15 @@ if (VECTORP (tool_bar_item_properties)) { for (i = 0; i < TOOL_BAR_ITEM_NSLOTS; ++i) - PROP (i) = Qnil; + set_prop (i, Qnil); } else tool_bar_item_properties = Fmake_vector (make_number (TOOL_BAR_ITEM_NSLOTS), Qnil); /* Set defaults. */ - PROP (TOOL_BAR_ITEM_KEY) = key; - PROP (TOOL_BAR_ITEM_ENABLED_P) = Qt; + set_prop (TOOL_BAR_ITEM_KEY, key); + set_prop (TOOL_BAR_ITEM_ENABLED_P, Qt); /* Get the caption of the item. If the caption is not a string, evaluate it to get a string. If we don't get a string, skip this @@ -8192,7 +8197,7 @@ if (!STRINGP (caption)) return 0; } - PROP (TOOL_BAR_ITEM_CAPTION) = caption; + set_prop (TOOL_BAR_ITEM_CAPTION, caption); /* If the rest following the caption is not a list, the menu item is either a separator, or invalid. */ @@ -8201,7 +8206,7 @@ { if (menu_separator_name_p (SSDATA (caption))) { - PROP (TOOL_BAR_ITEM_TYPE) = Qt; + set_prop (TOOL_BAR_ITEM_TYPE, Qt); #if !defined (USE_GTK) && !defined (HAVE_NS) /* If we use build_desired_tool_bar_string to render the tool bar, the separator is rendered as an image. */ @@ -8217,7 +8222,7 @@ } /* Store the binding. */ - PROP (TOOL_BAR_ITEM_BINDING) = XCAR (item); + set_prop (TOOL_BAR_ITEM_BINDING, XCAR (item)); item = XCDR (item); /* Ignore cached key binding, if any. */ @@ -8236,9 +8241,9 @@ { /* `:enable FORM'. */ if (!NILP (Venable_disabled_menus_and_buttons)) - PROP (TOOL_BAR_ITEM_ENABLED_P) = Qt; + set_prop (TOOL_BAR_ITEM_ENABLED_P, Qt); else - PROP (TOOL_BAR_ITEM_ENABLED_P) = value; + set_prop (TOOL_BAR_ITEM_ENABLED_P, value); } else if (EQ (ikey, QCvisible)) { @@ -8249,17 +8254,16 @@ } else if (EQ (ikey, QChelp)) /* `:help HELP-STRING'. */ - PROP (TOOL_BAR_ITEM_HELP) = value; + set_prop (TOOL_BAR_ITEM_HELP, value); else if (EQ (ikey, QCvert_only)) /* `:vert-only t/nil'. */ - PROP (TOOL_BAR_ITEM_VERT_ONLY) = value; + set_prop (TOOL_BAR_ITEM_VERT_ONLY, value); else if (EQ (ikey, QClabel)) { const char *bad_label = "!!?GARBLED ITEM?!!"; /* `:label LABEL-STRING'. */ - PROP (TOOL_BAR_ITEM_LABEL) = STRINGP (value) - ? value - : build_string (bad_label); + set_prop (TOOL_BAR_ITEM_LABEL, + STRINGP (value) ? value : build_string (bad_label)); have_label = 1; } else if (EQ (ikey, QCfilter)) @@ -8274,8 +8278,8 @@ selected = XCDR (value); if (EQ (type, QCtoggle) || EQ (type, QCradio)) { - PROP (TOOL_BAR_ITEM_SELECTED_P) = selected; - PROP (TOOL_BAR_ITEM_TYPE) = type; + set_prop (TOOL_BAR_ITEM_SELECTED_P, selected); + set_prop (TOOL_BAR_ITEM_TYPE, type); } } else if (EQ (ikey, QCimage) @@ -8283,10 +8287,10 @@ || (VECTORP (value) && ASIZE (value) == 4))) /* Value is either a single image specification or a vector of 4 such specifications for the different button states. */ - PROP (TOOL_BAR_ITEM_IMAGES) = value; + set_prop (TOOL_BAR_ITEM_IMAGES, value); else if (EQ (ikey, QCrtl)) /* ':rtl STRING' */ - PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value; + set_prop (TOOL_BAR_ITEM_RTL_IMAGE, value); } @@ -8328,18 +8332,19 @@ new_lbl = Fupcase_initials (build_string (label)); if (SCHARS (new_lbl) <= tool_bar_max_label_size) - PROP (TOOL_BAR_ITEM_LABEL) = new_lbl; + set_prop (TOOL_BAR_ITEM_LABEL, new_lbl); else - PROP (TOOL_BAR_ITEM_LABEL) = empty_unibyte_string; + set_prop (TOOL_BAR_ITEM_LABEL, empty_unibyte_string); xfree (buf); } /* If got a filter apply it on binding. */ if (!NILP (filter)) - PROP (TOOL_BAR_ITEM_BINDING) - = menu_item_eval_property (list2 (filter, - list2 (Qquote, - PROP (TOOL_BAR_ITEM_BINDING)))); + set_prop (TOOL_BAR_ITEM_BINDING, + (menu_item_eval_property + (list2 (filter, + list2 (Qquote, + PROP (TOOL_BAR_ITEM_BINDING)))))); /* See if the binding is a keymap. Give up if it is. */ if (CONSP (get_keymap (PROP (TOOL_BAR_ITEM_BINDING), 0, 1))) @@ -8347,13 +8352,13 @@ /* Enable or disable selection of item. */ if (!EQ (PROP (TOOL_BAR_ITEM_ENABLED_P), Qt)) - PROP (TOOL_BAR_ITEM_ENABLED_P) - = menu_item_eval_property (PROP (TOOL_BAR_ITEM_ENABLED_P)); + set_prop (TOOL_BAR_ITEM_ENABLED_P, + menu_item_eval_property (PROP (TOOL_BAR_ITEM_ENABLED_P))); /* Handle radio buttons or toggle boxes. */ if (!NILP (PROP (TOOL_BAR_ITEM_SELECTED_P))) - PROP (TOOL_BAR_ITEM_SELECTED_P) - = menu_item_eval_property (PROP (TOOL_BAR_ITEM_SELECTED_P)); + set_prop (TOOL_BAR_ITEM_SELECTED_P, + menu_item_eval_property (PROP (TOOL_BAR_ITEM_SELECTED_P))); return 1; === modified file 'src/lisp.h' --- src/lisp.h 2012-08-01 08:49:28 +0000 +++ src/lisp.h 2012-08-01 20:51:44 +0000 @@ -598,7 +598,7 @@ #define ASET(ARRAY, IDX, VAL) \ (eassert ((IDX) == (IDX)), \ eassert ((IDX) >= 0 && (IDX) < ASIZE (ARRAY)), \ - AREF ((ARRAY), (IDX)) = (VAL)) + XVECTOR (ARRAY)->contents[IDX] = (VAL)) /* Convenience macros for dealing with Lisp strings. */ @@ -2336,6 +2336,44 @@ struct window; struct frame; +/* Simple access functions. */ + +static inline Lisp_Object * +aref_addr (Lisp_Object array, ptrdiff_t idx) +{ + return & XVECTOR (array)->contents[idx]; +} + +static inline void +set_hash_key (struct Lisp_Hash_Table *h, ptrdiff_t idx, Lisp_Object val) +{ + ASET (h->key_and_value, 2 * idx, val); +} + +static inline void +set_hash_value (struct Lisp_Hash_Table *h, ptrdiff_t idx, Lisp_Object val) +{ + ASET (h->key_and_value, 2 * idx + 1, val); +} + +static inline void +set_hash_next (struct Lisp_Hash_Table *h, ptrdiff_t idx, Lisp_Object val) +{ + ASET (h->next, idx, val); +} + +static inline void +set_hash_hash (struct Lisp_Hash_Table *h, ptrdiff_t idx, Lisp_Object val) +{ + ASET (h->hash, idx, val); +} + +static inline void +set_hash_index (struct Lisp_Hash_Table *h, ptrdiff_t idx, Lisp_Object val) +{ + ASET (h->index, idx, val); +} + /* Defined in data.c. */ extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound; extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; === modified file 'src/lread.c' --- src/lread.c 2012-08-01 07:57:09 +0000 +++ src/lread.c 2012-08-01 20:51:44 +0000 @@ -3715,7 +3715,7 @@ SET_SYMBOL_VAL (XSYMBOL (sym), sym); } - ptr = &AREF (obarray, XINT(tem)); + ptr = aref_addr (obarray, XINT(tem)); if (SYMBOLP (*ptr)) XSYMBOL (sym)->next = XSYMBOL (*ptr); else @@ -3797,9 +3797,13 @@ if (EQ (AREF (obarray, hash), tem)) { if (XSYMBOL (tem)->next) - XSETSYMBOL (AREF (obarray, hash), XSYMBOL (tem)->next); + { + Lisp_Object sym; + XSETSYMBOL (sym, XSYMBOL (tem)->next); + ASET (obarray, hash, sym); + } else - XSETINT (AREF (obarray, hash), 0); + ASET (obarray, hash, make_number (0)); } else { === modified file 'src/menu.c' --- src/menu.c 2012-07-05 18:35:48 +0000 +++ src/menu.c 2012-08-01 20:51:44 +0000 @@ -1006,7 +1006,7 @@ { entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE); - if (&AREF (menu_items, i) == client_data) + if (aref_addr (menu_items, i) == client_data) { if (keymaps != 0) { === modified file 'src/nsmenu.m' --- src/nsmenu.m 2012-08-01 20:15:30 +0000 +++ src/nsmenu.m 2012-08-01 20:51:44 +0000 @@ -222,7 +222,7 @@ /* Save the frame's previous menu bar contents data */ if (previous_menu_items_used) - memcpy (previous_items, &AREF (FVAR (f, menu_bar_vector), 0), + memcpy (previous_items, aref_addr (FVAR (f, menu_bar_vector), 0), previous_menu_items_used * sizeof (Lisp_Object)); /* parse stage 1: extract from lisp */ @@ -939,8 +939,7 @@ /* If this item has a null value, make the call_data null so that it won't display a box when the mouse is on it. */ - wv->call_data - = !NILP (def) ? (void *) &AREF (menu_items, i) : 0; + wv->call_data = !NILP (def) ? aref_addr (menu_items, i) : 0; wv->enabled = !NILP (enable); if (NILP (type)) @@ -1453,7 +1452,7 @@ unwind_data->pool = pool; unwind_data->dialog = dialog; - + record_unwind_protect (pop_down_menu, make_save_value (unwind_data, 0)); popup_activated_flag = 1; tem = [dialog runDialogAt: p]; === modified file 'src/w32menu.c' --- src/w32menu.c 2012-08-01 05:11:36 +0000 +++ src/w32menu.c 2012-08-01 20:51:44 +0000 @@ -1062,7 +1062,7 @@ if (!NILP (descrip)) wv->key = SSDATA (descrip); wv->value = SSDATA (item_name); - wv->call_data = (void *) &AREF (menu_items, i); + wv->call_data = aref_addr (menu_items, i); wv->enabled = !NILP (enable); wv->help = Qnil; prev_wv = wv; === modified file 'src/xfaces.c' --- src/xfaces.c 2012-08-01 05:11:36 +0000 +++ src/xfaces.c 2012-08-01 20:51:44 +0000 @@ -2182,14 +2182,14 @@ { Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX); - LFACE_FAMILY (lface) = SYMBOL_NAME (family); + ASET (lface, LFACE_FAMILY_INDEX, SYMBOL_NAME (family)); } if (force_p || UNSPECIFIEDP (LFACE_FOUNDRY (lface))) { Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX); - LFACE_FOUNDRY (lface) = SYMBOL_NAME (foundry); + ASET (lface, LFACE_FOUNDRY_INDEX, SYMBOL_NAME (foundry)); } if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface))) @@ -2197,26 +2197,26 @@ int pt = PIXEL_TO_POINT (font->pixel_size * 10, f->resy); eassert (pt > 0); - LFACE_HEIGHT (lface) = make_number (pt); + ASET (lface, LFACE_HEIGHT_INDEX, make_number (pt)); } if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface))) { val = FONT_WEIGHT_FOR_FACE (font_object); - LFACE_WEIGHT (lface) = ! NILP (val) ? val :Qnormal; + ASET (lface, LFACE_WEIGHT_INDEX, ! NILP (val) ? val :Qnormal); } if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface))) { val = FONT_SLANT_FOR_FACE (font_object); - LFACE_SLANT (lface) = ! NILP (val) ? val : Qnormal; + ASET (lface, LFACE_SLANT_INDEX, ! NILP (val) ? val : Qnormal); } if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface))) { val = FONT_WIDTH_FOR_FACE (font_object); - LFACE_SWIDTH (lface) = ! NILP (val) ? val : Qnormal; + ASET (lface, LFACE_SWIDTH_INDEX, ! NILP (val) ? val : Qnormal); } - LFACE_FONT (lface) = font_object; + ASET (lface, LFACE_FONT_INDEX, font_object); return 1; } @@ -2851,7 +2851,7 @@ signal_error ("Invalid face family", value); } old_value = LFACE_FAMILY (lface); - LFACE_FAMILY (lface) = value; + ASET (lface, LFACE_FAMILY_INDEX, value); prop_index = FONT_FAMILY_INDEX; } else if (EQ (attr, QCfoundry)) @@ -2863,7 +2863,7 @@ signal_error ("Invalid face foundry", value); } old_value = LFACE_FOUNDRY (lface); - LFACE_FOUNDRY (lface) = value; + ASET (lface, LFACE_FOUNDRY_INDEX, value); prop_index = FONT_FOUNDRY_INDEX; } else if (EQ (attr, QCheight)) @@ -2891,7 +2891,7 @@ } old_value = LFACE_HEIGHT (lface); - LFACE_HEIGHT (lface) = value; + ASET (lface, LFACE_HEIGHT_INDEX, value); prop_index = FONT_SIZE_INDEX; } else if (EQ (attr, QCweight)) @@ -2903,7 +2903,7 @@ signal_error ("Invalid face weight", value); } old_value = LFACE_WEIGHT (lface); - LFACE_WEIGHT (lface) = value; + ASET (lface, LFACE_WEIGHT_INDEX, value); prop_index = FONT_WEIGHT_INDEX; } else if (EQ (attr, QCslant)) @@ -2915,7 +2915,7 @@ signal_error ("Invalid face slant", value); } old_value = LFACE_SLANT (lface); - LFACE_SLANT (lface) = value; + ASET (lface, LFACE_SLANT_INDEX, value); prop_index = FONT_SLANT_INDEX; } else if (EQ (attr, QCunderline)) @@ -2969,7 +2969,7 @@ signal_error ("Invalid face underline", value); old_value = LFACE_UNDERLINE (lface); - LFACE_UNDERLINE (lface) = value; + ASET (lface, LFACE_UNDERLINE_INDEX, value); } else if (EQ (attr, QCoverline)) { @@ -2983,7 +2983,7 @@ signal_error ("Invalid face overline", value); old_value = LFACE_OVERLINE (lface); - LFACE_OVERLINE (lface) = value; + ASET (lface, LFACE_OVERLINE_INDEX, value); } else if (EQ (attr, QCstrike_through)) { @@ -2997,7 +2997,7 @@ signal_error ("Invalid face strike-through", value); old_value = LFACE_STRIKE_THROUGH (lface); - LFACE_STRIKE_THROUGH (lface) = value; + ASET (lface, LFACE_STRIKE_THROUGH_INDEX, value); } else if (EQ (attr, QCbox)) { @@ -3060,7 +3060,7 @@ signal_error ("Invalid face box", value); old_value = LFACE_BOX (lface); - LFACE_BOX (lface) = value; + ASET (lface, LFACE_BOX_INDEX, value); } else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) @@ -3072,7 +3072,7 @@ signal_error ("Invalid inverse-video face attribute value", value); } old_value = LFACE_INVERSE (lface); - LFACE_INVERSE (lface) = value; + ASET (lface, LFACE_INVERSE_INDEX, value); } else if (EQ (attr, QCforeground)) { @@ -3089,7 +3089,7 @@ signal_error ("Empty foreground color value", value); } old_value = LFACE_FOREGROUND (lface); - LFACE_FOREGROUND (lface) = value; + ASET (lface, LFACE_FOREGROUND_INDEX, value); } else if (EQ (attr, QCbackground)) { @@ -3106,7 +3106,7 @@ signal_error ("Empty background color value", value); } old_value = LFACE_BACKGROUND (lface); - LFACE_BACKGROUND (lface) = value; + ASET (lface, LFACE_BACKGROUND_INDEX, value); } else if (EQ (attr, QCstipple)) { @@ -3116,7 +3116,7 @@ && NILP (Fbitmap_spec_p (value))) signal_error ("Invalid stipple attribute", value); old_value = LFACE_STIPPLE (lface); - LFACE_STIPPLE (lface) = value; + ASET (lface, LFACE_STIPPLE_INDEX, value); #endif /* HAVE_X_WINDOWS || HAVE_NS */ } else if (EQ (attr, QCwidth)) @@ -3128,7 +3128,7 @@ signal_error ("Invalid face width", value); } old_value = LFACE_SWIDTH (lface); - LFACE_SWIDTH (lface) = value; + ASET (lface, LFACE_SWIDTH_INDEX, value); prop_index = FONT_WIDTH_INDEX; } else if (EQ (attr, QCfont)) @@ -3174,7 +3174,7 @@ set_lface_from_font (f, lface, value, 1); } else - LFACE_FONT (lface) = value; + ASET (lface, LFACE_FONT_INDEX, value); } #endif /* HAVE_WINDOW_SYSTEM */ } @@ -3189,7 +3189,7 @@ tmp = Fquery_fontset (value, Qnil); if (NILP (tmp)) signal_error ("Invalid fontset name", value); - LFACE_FONTSET (lface) = value = tmp; + ASET (lface, LFACE_FONTSET_INDEX, value = tmp); } #endif /* HAVE_WINDOW_SYSTEM */ } @@ -3203,21 +3203,21 @@ if (!SYMBOLP (XCAR (tail))) break; if (NILP (tail)) - LFACE_INHERIT (lface) = value; + ASET (lface, LFACE_INHERIT_INDEX, value); else signal_error ("Invalid face inheritance", value); } else if (EQ (attr, QCbold)) { old_value = LFACE_WEIGHT (lface); - LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold; + ASET (lface, LFACE_WEIGHT_INDEX, NILP (value) ? Qnormal : Qbold); prop_index = FONT_WEIGHT_INDEX; } else if (EQ (attr, QCitalic)) { attr = QCslant; old_value = LFACE_SLANT (lface); - LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic; + ASET (lface, LFACE_SLANT_INDEX, NILP (value) ? Qnormal : Qitalic); prop_index = FONT_SLANT_INDEX; } else @@ -3365,8 +3365,8 @@ { face = Qdefault; lface = lface_from_face_name (f, face, 1); - LFACE_FOREGROUND (lface) = (STRINGP (new_value) - ? new_value : Qunspecified); + ASET (lface, LFACE_FOREGROUND_INDEX, + (STRINGP (new_value) ? new_value : Qunspecified)); realize_basic_faces (f); } else if (EQ (param, Qbackground_color)) @@ -3381,8 +3381,8 @@ face = Qdefault; lface = lface_from_face_name (f, face, 1); - LFACE_BACKGROUND (lface) = (STRINGP (new_value) - ? new_value : Qunspecified); + ASET (lface, LFACE_BACKGROUND_INDEX, + (STRINGP (new_value) ? new_value : Qunspecified)); realize_basic_faces (f); } #ifdef HAVE_WINDOW_SYSTEM @@ -3390,22 +3390,22 @@ { face = Qborder; lface = lface_from_face_name (f, face, 1); - LFACE_BACKGROUND (lface) = (STRINGP (new_value) - ? new_value : Qunspecified); + ASET (lface, LFACE_BACKGROUND_INDEX, + (STRINGP (new_value) ? new_value : Qunspecified)); } else if (EQ (param, Qcursor_color)) { face = Qcursor; lface = lface_from_face_name (f, face, 1); - LFACE_BACKGROUND (lface) = (STRINGP (new_value) - ? new_value : Qunspecified); + ASET (lface, LFACE_BACKGROUND_INDEX, + (STRINGP (new_value) ? new_value : Qunspecified)); } else if (EQ (param, Qmouse_color)) { face = Qmouse; lface = lface_from_face_name (f, face, 1); - LFACE_BACKGROUND (lface) = (STRINGP (new_value) - ? new_value : Qunspecified); + ASET (lface, LFACE_BACKGROUND_INDEX, + (STRINGP (new_value) ? new_value : Qunspecified)); } #endif @@ -3445,7 +3445,7 @@ font = font_load_for_lface (f, XVECTOR (lface)->contents, font); if (NILP (font)) return; - LFACE_FONT (lface) = font; + ASET (lface, LFACE_FONT_INDEX, font); } f->default_face_done_p = 0; Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil)); @@ -5366,39 +5366,39 @@ XSETFONT (font_object, FRAME_FONT (f)); set_lface_from_font (f, lface, font_object, f->default_face_done_p); - LFACE_FONTSET (lface) = fontset_name (FRAME_FONTSET (f)); + ASET (lface, LFACE_FONTSET_INDEX, fontset_name (FRAME_FONTSET (f))); f->default_face_done_p = 1; } #endif /* HAVE_WINDOW_SYSTEM */ if (!FRAME_WINDOW_P (f)) { - LFACE_FAMILY (lface) = build_string ("default"); - LFACE_FOUNDRY (lface) = LFACE_FAMILY (lface); - LFACE_SWIDTH (lface) = Qnormal; - LFACE_HEIGHT (lface) = make_number (1); + ASET (lface, LFACE_FAMILY_INDEX, build_string ("default")); + ASET (lface, LFACE_FOUNDRY_INDEX, LFACE_FAMILY (lface)); + ASET (lface, LFACE_SWIDTH_INDEX, Qnormal); + ASET (lface, LFACE_HEIGHT_INDEX, make_number (1)); if (UNSPECIFIEDP (LFACE_WEIGHT (lface))) - LFACE_WEIGHT (lface) = Qnormal; + ASET (lface, LFACE_WEIGHT_INDEX, Qnormal); if (UNSPECIFIEDP (LFACE_SLANT (lface))) - LFACE_SLANT (lface) = Qnormal; + ASET (lface, LFACE_SLANT_INDEX, Qnormal); if (UNSPECIFIEDP (LFACE_FONTSET (lface))) - LFACE_FONTSET (lface) = Qnil; + ASET (lface, LFACE_FONTSET_INDEX, Qnil); } if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) - LFACE_UNDERLINE (lface) = Qnil; + ASET (lface, LFACE_UNDERLINE_INDEX, Qnil); if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) - LFACE_OVERLINE (lface) = Qnil; + ASET (lface, LFACE_OVERLINE_INDEX, Qnil); if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) - LFACE_STRIKE_THROUGH (lface) = Qnil; + ASET (lface, LFACE_STRIKE_THROUGH_INDEX, Qnil); if (UNSPECIFIEDP (LFACE_BOX (lface))) - LFACE_BOX (lface) = Qnil; + ASET (lface, LFACE_BOX_INDEX, Qnil); if (UNSPECIFIEDP (LFACE_INVERSE (lface))) - LFACE_INVERSE (lface) = Qnil; + ASET (lface, LFACE_INVERSE_INDEX, Qnil); if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) { @@ -5407,11 +5407,11 @@ Lisp_Object color = Fassq (Qforeground_color, FVAR (f, param_alist)); if (CONSP (color) && STRINGP (XCDR (color))) - LFACE_FOREGROUND (lface) = XCDR (color); + ASET (lface, LFACE_FOREGROUND_INDEX, XCDR (color)); else if (FRAME_WINDOW_P (f)) return 0; else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) - LFACE_FOREGROUND (lface) = build_string (unspecified_fg); + ASET (lface, LFACE_FOREGROUND_INDEX, build_string (unspecified_fg)); else abort (); } @@ -5422,17 +5422,17 @@ set in the frame parameter list. */ Lisp_Object color = Fassq (Qbackground_color, FVAR (f, param_alist)); if (CONSP (color) && STRINGP (XCDR (color))) - LFACE_BACKGROUND (lface) = XCDR (color); + ASET (lface, LFACE_BACKGROUND_INDEX, XCDR (color)); else if (FRAME_WINDOW_P (f)) return 0; else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) - LFACE_BACKGROUND (lface) = build_string (unspecified_bg); + ASET (lface, LFACE_BACKGROUND_INDEX, build_string (unspecified_bg)); else abort (); } if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) - LFACE_STIPPLE (lface) = Qnil; + ASET (lface, LFACE_STIPPLE_INDEX, Qnil); /* Realize the face; it must be fully-specified now. */ eassert (lface_fully_specified_p (XVECTOR (lface)->contents)); === modified file 'src/xfont.c' --- src/xfont.c 2012-07-11 06:14:19 +0000 +++ src/xfont.c 2012-08-01 20:51:44 +0000 @@ -463,11 +463,11 @@ list = Fcons (entity, list); continue; } - if (memcmp (props, &(AREF (entity, FONT_FOUNDRY_INDEX)), + if (memcmp (props, aref_addr (entity, FONT_FOUNDRY_INDEX), sizeof (Lisp_Object) * 7) || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7])) { - memcpy (props, &(AREF (entity, FONT_FOUNDRY_INDEX)), + memcpy (props, aref_addr (entity, FONT_FOUNDRY_INDEX), sizeof (Lisp_Object) * 7); props[7] = AREF (entity, FONT_SPACING_INDEX); scripts = xfont_supported_scripts (display, indices[i], === modified file 'src/xmenu.c' --- src/xmenu.c 2012-08-01 05:11:36 +0000 +++ src/xmenu.c 2012-08-01 20:51:44 +0000 @@ -1782,8 +1782,7 @@ /* If this item has a null value, make the call_data null so that it won't display a box when the mouse is on it. */ - wv->call_data - = (!NILP (def) ? (void *) &AREF (menu_items, i) : 0); + wv->call_data = !NILP (def) ? aref_addr (menu_items, i) : 0; wv->enabled = !NILP (enable); if (NILP (type)) @@ -1884,7 +1883,7 @@ { entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE); - if (menu_item_selection == &AREF (menu_items, i)) + if (menu_item_selection == aref_addr (menu_items, i)) { if (keymaps != 0) { @@ -2104,7 +2103,7 @@ if (!NILP (descrip)) wv->key = SSDATA (descrip); wv->value = SSDATA (item_name); - wv->call_data = (void *) &AREF (menu_items, i); + wv->call_data = aref_addr (menu_items, i); wv->enabled = !NILP (enable); wv->help = Qnil; prev_wv = wv; @@ -2187,7 +2186,7 @@ { entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE); - if (menu_item_selection == &AREF (menu_items, i)) + if (menu_item_selection == aref_addr (menu_items, i)) { if (keymaps != 0) { ------------------------------------------------------------ revno: 109380 committer: Alp Aker branch nick: trunk timestamp: Wed 2012-08-01 16:15:30 -0400 message: * nsterm.m (ns_set_vertical_scroll_bar, ns_redeem_scroll_bar) (EmacsWindow-accessibilityAttributeValue, EmacsScroller-initFrame:) (EmacsScroller-dealloc): Adjust to use WVAR. (Bug#12114) * nsfns.m (ns_set_name_as_filename): Likewise. * nsmenu.m (ns_update_menubar): Likewise. * nsselect.m (symbol_to_nsstring): Adjust to use SVAR. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 16:30:13 +0000 +++ src/ChangeLog 2012-08-01 20:15:30 +0000 @@ -1,3 +1,12 @@ +2012-08-01 Alp Aker + + * nsterm.m (ns_set_vertical_scroll_bar, ns_redeem_scroll_bar) + (EmacsWindow-accessibilityAttributeValue, EmacsScroller-initFrame:) + (EmacsScroller-dealloc): Adjust to use WVAR. (Bug#12114) + * nsfns.m (ns_set_name_as_filename): Likewise. + * nsmenu.m (ns_update_menubar): Likewise. + * nsselect.m (symbol_to_nsstring): Adjust to use SVAR. + 2012-08-01 Eli Zaretskii * .gdbinit (xcar, xcdr, xlist, xwindow, nextcons, xprintsym): === modified file 'src/nsfns.m' --- src/nsfns.m 2012-07-31 15:15:29 +0000 +++ src/nsfns.m 2012-08-01 20:15:30 +0000 @@ -607,7 +607,7 @@ { NSView *view; Lisp_Object name, filename; - Lisp_Object buf = XWINDOW (FVAR (f, selected_window))->buffer; + Lisp_Object buf = WVAR (XWINDOW (FVAR (f, selected_window)), buffer); const char *title; NSAutoreleasePool *pool; struct gcpro gcpro1; === modified file 'src/nsmenu.m' --- src/nsmenu.m 2012-07-31 16:19:03 +0000 +++ src/nsmenu.m 2012-08-01 20:15:30 +0000 @@ -193,7 +193,7 @@ = alloca (previous_menu_items_used * sizeof *previous_items); /* lisp preliminaries */ - buffer = XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer; + buffer = WVAR (XWINDOW (FRAME_SELECTED_WINDOW (f)), buffer); specbind (Qinhibit_quit, Qt); specbind (Qdebug_on_next_call, Qnil); record_unwind_save_match_data (); === modified file 'src/nsselect.m' --- src/nsselect.m 2012-07-07 19:23:41 +0000 +++ src/nsselect.m 2012-08-01 20:15:30 +0000 @@ -62,7 +62,7 @@ if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; if (EQ (sym, QTEXT)) return NSStringPboardType; - return [NSString stringWithUTF8String: SSDATA (XSYMBOL (sym)->xname)]; + return [NSString stringWithUTF8String: SSDATA (SVAR (XSYMBOL (sym), xname))]; } static NSPasteboard * === modified file 'src/nsterm.m' --- src/nsterm.m 2012-08-01 05:11:36 +0000 +++ src/nsterm.m 2012-08-01 20:15:30 +0000 @@ -3624,9 +3624,9 @@ EmacsScroller *bar; /* optimization; display engine sends WAY too many of these.. */ - if (!NILP (window->vertical_scroll_bar)) + if (!NILP (WVAR (window, vertical_scroll_bar))) { - bar = XNS_SCROLL_BAR (window->vertical_scroll_bar); + bar = XNS_SCROLL_BAR (WVAR (window, vertical_scroll_bar)); if ([bar checkSamePosition: position portion: portion whole: whole]) { if (view->scrollbarsNeedingUpdate == 0) @@ -3674,27 +3674,27 @@ /* we want at least 5 lines to display a scrollbar */ if (WINDOW_TOTAL_LINES (window) < 5) { - if (!NILP (window->vertical_scroll_bar)) + if (!NILP (WVAR (window, vertical_scroll_bar))) { - bar = XNS_SCROLL_BAR (window->vertical_scroll_bar); + bar = XNS_SCROLL_BAR (WVAR (window, vertical_scroll_bar)); [bar removeFromSuperview]; - window->vertical_scroll_bar = Qnil; + WVAR (window, vertical_scroll_bar) = Qnil; } ns_clear_frame_area (f, sb_left, top, width, height); UNBLOCK_INPUT; return; } - if (NILP (window->vertical_scroll_bar)) + if (NILP (WVAR (window, vertical_scroll_bar))) { ns_clear_frame_area (f, sb_left, top, width, height); bar = [[EmacsScroller alloc] initFrame: r window: win]; - window->vertical_scroll_bar = make_save_value (bar, 0); + WVAR (window, vertical_scroll_bar) = make_save_value (bar, 0); } else { NSRect oldRect; - bar = XNS_SCROLL_BAR (window->vertical_scroll_bar); + bar = XNS_SCROLL_BAR (WVAR (window, vertical_scroll_bar)); oldRect = [bar frame]; r.size.width = oldRect.size.width; if (FRAME_LIVE_P (f) && !NSEqualRects (oldRect, r)) @@ -3741,9 +3741,9 @@ { id bar; NSTRACE (ns_redeem_scroll_bar); - if (!NILP (window->vertical_scroll_bar)) + if (!NILP (WVAR (window, vertical_scroll_bar))) { - bar =XNS_SCROLL_BAR (window->vertical_scroll_bar); + bar = XNS_SCROLL_BAR (WVAR (window, vertical_scroll_bar)); [bar reprieve]; } } @@ -6064,7 +6064,7 @@ Lisp_Object str = Qnil; struct frame *f = SELECTED_FRAME (); struct buffer *curbuf - = XBUFFER (XWINDOW (FVAR (f, selected_window))->buffer); + = XBUFFER (WVAR (XWINDOW (FVAR (f, selected_window)), buffer)); if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) return NSAccessibilityTextFieldRole; @@ -6239,7 +6239,7 @@ if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; - frame = XFRAME (XWINDOW (win)->frame); + frame = XFRAME (WVAR (XWINDOW (win), frame)); if (FRAME_LIVE_P (frame)) { int i; @@ -6278,7 +6278,7 @@ { NSTRACE (EmacsScroller_dealloc); if (!NILP (win)) - XWINDOW (win)->vertical_scroll_bar = Qnil; + WVAR (XWINDOW (win), vertical_scroll_bar) = Qnil; [super dealloc]; } ------------------------------------------------------------ revno: 109379 committer: Jay Belanger branch nick: trunk timestamp: Wed 2012-08-01 13:24:13 -0500 message: calc.texi (Simplification modes): Mention "basic" simplification. (The Calc Mode Line): Mention the mode line display for Basic simplification mode. (Simplify Formulas): Refer to 'algebraic' rather than 'default' simplifications. (Basic Simplifications): Rename from "Limited Simplifications" Replace "limited" by "basic" throughout. (Algebraic Simplifications): Indicate that the algebraic simplifications are done by default. (Unsafe Simplifications): Mention `m E'. (Simplification of Units): Mention `m U'. (Trigonometric/Hyperbolic Functions, Reducing and Mapping, Kinds of Declarations, Functions for Declarations): Mention "algebraic simplifications" instead of `a s'. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-07-30 03:38:24 +0000 +++ doc/misc/ChangeLog 2012-08-01 18:24:13 +0000 @@ -1,3 +1,20 @@ +2012-08-01 Jay Belanger + + * calc.texi (Simplification modes): Mention "basic" simplification. + (The Calc Mode Line): Mention the mode line display for Basic + simplification mode. + (Simplify Formulas): Refer to 'algebraic' rather than 'default' + simplifications. + (Basic Simplifications): Rename from "Limited Simplifications" + Replace "limited" by "basic" throughout. + (Algebraic Simplifications): Indicate that the algebraic + simplifications are done by default. + (Unsafe Simplifications): Mention `m E'. + (Simplification of Units): Mention `m U'. + (Trigonometric/Hyperbolic Functions, Reducing and Mapping) + (Kinds of Declarations, Functions for Declarations): Mention + "algebraic simplifications" instead of `a s'. + 2012-07-30 Jay Belanger * calc.texi (Getting Started, Tutorial): Change simulated === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2012-07-30 03:38:24 +0000 +++ doc/misc/calc.texi 2012-08-01 18:24:13 +0000 @@ -12569,7 +12569,7 @@ Some normalizations are unavoidable, such as rounding floating-point results to the current precision, and reducing fractions to simplest form. Others, such as simplifying a formula like @expr{a+a} (or @expr{2+3}), -are done by default but can be turned off when necessary. +are done automatically but can be turned off when necessary. When you press a key like @kbd{+} when @expr{2} and @expr{3} are on the stack, Calc pops these numbers, normalizes them, creates the formula @@ -12603,9 +12603,9 @@ error form or modulo form), or a vector all of whose elements are constant. -@kindex m L -@pindex calc-limited-simplify-mode -The @kbd{m L} (@code{calc-limited-simplify-mode}) command does limited +@kindex m I +@pindex calc-basic-simplify-mode +The @kbd{m I} (@code{calc-basic-simplify-mode}) command does some basic simplifications for all formulas. This includes many easy and fast algebraic simplifications such as @expr{a+0} to @expr{a}, and @expr{a + 2 a} to @expr{3 a}, as well as evaluating functions like @@ -12620,23 +12620,21 @@ are rounded to the nearest integer and then clipped; other kinds of results (after the default simplifications) are left alone. -@kindex m D -@pindex calc-default-simplify-mode -The @kbd{m D} (@code{calc-default-simplify-mode}) mode does standard +@kindex m A +@pindex calc-alg-simplify-mode +The @kbd{m A} (@code{calc-alg-simplify-mode}) mode does standard algebraic simplifications. @xref{Algebraic Simplifications}. @kindex m E @pindex calc-ext-simplify-mode -The @kbd{m E} (@code{calc-ext-simplify-mode}) mode does ``extended'' -algebraic simplification, as by the @kbd{a e} (@code{calc-simplify-extended}) -command. @xref{Unsafe Simplifications}. +The @kbd{m E} (@code{calc-ext-simplify-mode}) mode does ``extended'', or +``unsafe'', algebraic simplification. @xref{Unsafe Simplifications}. @kindex m U @pindex calc-units-simplify-mode The @kbd{m U} (@code{calc-units-simplify-mode}) mode does units -simplification; it applies the command @kbd{u s} -(@code{calc-simplify-units}), which in turn -is a superset of @kbd{a s}. In this mode, variable names which +simplification. @xref{Simplification of Units}. These include the +algebraic simplifications, plus variable names which are identifiable as unit names (like @samp{mm} for ``millimeters'') are simplified with their unit definitions in mind. @@ -12853,8 +12851,8 @@ only when certain values are integers (such as @samp{(x^y)^z} shown above). -Another command that makes use of declarations is @kbd{a s}, when -simplifying equations and inequalities. It will cancel @code{x} +Calc's algebraic simplifications also make use of declarations when +simplifying equations and inequalities. They will cancel @code{x} from both sides of @samp{a x = b x} only if it is sure @code{x} is non-zero, say, because it has a @code{pos} declaration. To declare specifically that @code{x} is real and non-zero, @@ -12992,10 +12990,10 @@ The @code{dpos} function checks for positive (but nonzero) reals. The @code{dneg} function checks for negative reals. The @code{dnonneg} function checks for nonnegative reals, i.e., reals greater than or -equal to zero. Note that the @kbd{a s} command can simplify an -expression like @expr{x > 0} to 1 or 0 using @code{dpos}, and that -@kbd{a s} is effectively applied to all conditions in rewrite rules, -so the actual functions @code{dpos}, @code{dneg}, and @code{dnonneg} +equal to zero. Note that Calc's algebraic simplifications, which are +effectively applied to all conditions in rewrite rules, can simplify +an expression like @expr{x > 0} to 1 or 0 using @code{dpos}. +So the actual functions @code{dpos}, @code{dneg}, and @code{dnonneg} are rarely necessary. @ignore @@ -13021,7 +13019,7 @@ The @code{deven} function returns 1 if its argument is known to be an even integer (or integer-valued float); it returns 0 if its argument is known not to be even (because it is known to be odd or a non-integer). -The @kbd{a s} command uses this to simplify a test of the form +Calc's algebraic simplifications use this to simplify a test of the form @samp{x % 2 = 0}. There is also an analogous @code{dodd} function. @ignore @@ -15648,7 +15646,7 @@ rule, it first matches the pattern as usual. It then substitutes @samp{#1}, @samp{#2}, etc., in the conditions, if any. Next, the conditions are simplified and evaluated in order from left to right, -as if by the @w{@kbd{a s}} algebra command (@pxref{Simplifying Formulas}). +using the algebraic simplifications (@pxref{Simplifying Formulas}). Each result is true if it is a nonzero number, or an expression that can be proven to be nonzero (@pxref{Declarations}). If the results of all conditions are true, the expression (such as @@ -15876,8 +15874,8 @@ @item BinSimp@var{w} Binary-integer simplification mode; word size @var{w} (@kbd{m B}, @kbd{b w}). -@item LimSimp -Limited simplification mode (@kbd{m L}). +@item BasicSimp +Basic simplification mode (@kbd{m I}). @item ExtSimp Extended algebraic simplification mode (@kbd{m E}). @@ -18328,7 +18326,7 @@ the form @expr{x} plus a multiple of @cpiover{2} are also simplified. Calc includes similar formulas for @code{cos} and @code{tan}. -The @kbd{a s} command knows all angles which are integer multiples of +Calc's algebraic simplifications know all angles which are integer multiples of @cpiover{12}, @cpiover{10}, or @cpiover{8} radians. In Degrees mode, analogous simplifications occur for integer multiples of 15 or 18 degrees, and for arguments plus multiples of 90 degrees. @@ -22178,9 +22176,9 @@ Use @kbd{a v} if you want the variables to ignore their stored values. If you give a numeric prefix argument of 2 to @kbd{a v}, it simplifies -as if in Algebraic Simplification mode. This is equivalent to typing -@kbd{a s}; @pxref{Simplifying Formulas}. If you give a numeric prefix -of 3 or more, it uses Extended Simplification mode (@kbd{a e}). +using Calc's algebraic simplifications; @pxref{Simplifying Formulas}. +If you give a numeric prefix of 3 or more, it uses Extended +Simplification mode (@kbd{a e}). If you give a negative prefix argument @mathit{-1}, @mathit{-2}, or @mathit{-3}, it simplifies in the corresponding mode but only works on the top-level @@ -22253,8 +22251,8 @@ are mapped, the direction of the second inequality is reversed to match the first: Using @kbd{a M +} on @samp{a < b} and @samp{a > 2} reverses the latter to get @samp{2 < a}, which then allows the -combination @samp{a + 2 < b + a}, which the @kbd{a s} command can -then simplify to get @samp{2 < b}. +combination @samp{a + 2 < b + a}, which the algebraic simplifications +can reduce to @samp{2 < b}. Using @kbd{a M *}, @kbd{a M /}, @kbd{a M n}, or @kbd{a M &} to negate or invert an inequality will reverse the direction of the inequality. @@ -22334,19 +22332,20 @@ @xref{Rewrite Rules}. @xref{Simplification Modes}, for commands to control what level of -simplification occurs automatically. Normally only the default -algebraic simplifications occur. If you have turned on a -simplification mode which does not do these default simplifications, -you can still perform them on a formula with the @kbd{a s} command. +simplification occurs automatically. Normally the algebraic +simplifications described below occur. If you have turned on a +simplification mode which does not do these algebraic simplifications, +you can still apply them to a formula with the @kbd{a s} +(@code{calc-simplify}) [@code{simplify}] command. There are some simplifications that, while sometimes useful, are never done automatically. For example, the @kbd{I} prefix can be given to @kbd{a s}; the @kbd{I a s} command will change any trigonometric function to the appropriate combination of @samp{sin}s and @samp{cos}s before simplifying. This can be useful in simplifying even mildly -complicated trigonometric expressions. For example, while @kbd{a s} -can reduce @samp{sin(x) csc(x)} to @samp{1}, it will not simplify -@samp{sin(x)^2 csc(x)}. The command @kbd{I a s} can be used to +complicated trigonometric expressions. For example, while the algebraic +simplifications can reduce @samp{sin(x) csc(x)} to @samp{1}, they will not +simplify @samp{sin(x)^2 csc(x)}. The command @kbd{I a s} can be used to simplify this latter expression; it will transform @samp{sin(x)^2 csc(x)} into @samp{sin(x)}. However, @kbd{I a s} will also perform some ``simplifications'' which may not be desired; for example, it @@ -22357,21 +22356,22 @@ @menu -* Limited Simplifications:: +* Basic Simplifications:: * Algebraic Simplifications:: * Unsafe Simplifications:: * Simplification of Units:: @end menu -@node Limited Simplifications, Algebraic Simplifications, Simplifying Formulas, Simplifying Formulas -@subsection Limited Simplifications +@node Basic Simplifications, Algebraic Simplifications, Simplifying Formulas, Simplifying Formulas +@subsection Basic Simplifications @noindent -@cindex Limited simplifications -This section describes a limited set of simplifications. These, as -well as those described in the next section, are normally applied to -all results. You can type @kbd{m L} to restrict the simplifications -done on the stack to this limited set. +@cindex Basic simplifications +This section describes basic simplifications which Calc performs in many +situations. For example, both binary simplifications and algebraic +simplifications begin by performing these basic simplifications. You +can type @kbd{m I} to restrict the simplifications done on the stack to +these simplifications. The most basic simplification is the evaluation of functions. For example, @expr{2 + 3} is evaluated to @expr{5}, and @expr{@tfn{sqrt}(9)} @@ -22391,7 +22391,7 @@ operator) does not evaluate all of its arguments, and @code{evalto} does not evaluate its lefthand argument. -Most commands apply at least these limited simplifications to all +Most commands apply at least these basic simplifications to all arguments they take from the stack, perform a particular operation, then simplify the result before pushing it back on the stack. In the common special case of regular arithmetic commands like @kbd{+} and @@ -22400,7 +22400,7 @@ (the arguments being simplified first as part of the process, as described above). -Even the limited set of simplifications are too numerous to describe +Even the basic set of simplifications are too numerous to describe completely here, but this section will describe the ones that apply to the major arithmetic operators. This list will be rather technical in nature, and will probably be interesting to you only if you are @@ -22438,11 +22438,11 @@ special cases described below. Some algebra programs always rearrange terms into a canonical order, which enables them to see that @expr{a b + b a} can be simplified to @expr{2 a b}. -Calc assumes you have put the terms into the order you want -and generally leaves that order alone, with the consequence -that formulas like the above will only be simplified if you -explicitly give the @kbd{a s} command. @xref{Algebraic -Simplifications}. +If you are using Basic Simplification mode, Calc assumes you have put +the terms into the order you want and generally leaves that order alone, +with the consequence that formulas like the above will only be +simplified if you explicitly give the @kbd{a s} command. +@xref{Algebraic Simplifications}. Differences @expr{a - b} are treated like sums @expr{a + (-b)} for purposes of simplification; one of the default simplifications @@ -22473,9 +22473,8 @@ is simplified to @expr{a + 2 b + c}, but @expr{a + b + c + b} is not simplified. The reason is that comparing all terms of a sum with one another would require time proportional to the -square of the number of terms; Calc relegates potentially slow -operations like this to commands that have to be invoked -explicitly, like @kbd{a s}. +square of the number of terms; Calc omits potentially slow +operations like this in basic simplification mode. Finally, @expr{a + 0} and @expr{0 + a} are simplified to @expr{a}. A consequence of the above rules is that @expr{0 - a} is simplified @@ -22672,9 +22671,9 @@ Functions like @code{sin} and @code{arctan} generally don't have any default simplifications beyond simply evaluating the functions -for suitable numeric arguments and infinity. The @kbd{a s} command -described in the next section does provide some simplifications for -these functions, though. +for suitable numeric arguments and infinity. The algebraic +simplifications described in the next section do provide some +simplifications for these functions, though. One important simplification that does occur is that @expr{@tfn{ln}(@tfn{e})} is simplified to 1, and @expr{@tfn{ln}(@tfn{e}^x)} is @@ -22689,25 +22688,23 @@ @expr{!!x} to @expr{x}, this would not be valid in general because @expr{!!2} is 1, not 2. -Most other Calc functions have few if any default simplifications +Most other Calc functions have few if any basic simplifications defined, aside of course from evaluation when the arguments are suitable numbers. -@node Algebraic Simplifications, Unsafe Simplifications, Limited Simplifications, Simplifying Formulas +@node Algebraic Simplifications, Unsafe Simplifications, Basic Simplifications, Simplifying Formulas @subsection Algebraic Simplifications @noindent @cindex Algebraic simplifications @kindex a s -@kindex I a s -@kindex H a s -@pindex calc-simplify -@tindex simplify +@kindex m A This section describes all simplifications that are performed by -the default algebraic simplification mode. If you have switched to a different -simplification mode, you can switch back with the @kbd{m D} command. -Even in other simplification modes, the @kbd{a s} command will use -these algebraic simplifications to simplifies the formula. +the algebraic simplification mode, which is the default simplification +mode. If you have switched to a different simplification mode, you can +switch back with the @kbd{m A} command. Even in other simplification +modes, the @kbd{a s} command will use these algebraic simplifications to +simplify the formula. There is a variable, @code{AlgSimpRules}, in which you can put rewrites to be applied. Its use is analogous to @code{EvalRules}, @@ -22715,7 +22712,7 @@ @samp{@w{a r} AlgSimpRules} with an infinite repeat count on the whole expression being simplified, then it traverses the expression applying the built-in rules described below. If the result is different from -the original expression, the process repeats with the limited +the original expression, the process repeats with the basic simplifications (including @code{EvalRules}), then @code{AlgSimpRules}, then the built-in simplifications, and so on. @@ -22731,8 +22728,8 @@ Also, terms of sums are combined by the distributive law, as in @expr{x + y + 2 x} to @expr{y + 3 x}. This always occurs for -adjacent terms, but @kbd{a s} compares all pairs of terms including -non-adjacent ones. +adjacent terms, but Calc's algebraic simplifications compare all pairs +of terms including non-adjacent ones. @tex \bigskip @@ -22935,21 +22932,26 @@ @cindex Unsafe simplifications @cindex Extended simplification @kindex a e +@kindex m E @pindex calc-simplify-extended @ignore @mindex esimpl@idots @end ignore @tindex esimplify -The @kbd{a e} (@code{calc-simplify-extended}) [@code{esimplify}] command -is like @kbd{a s} -except that it applies some additional simplifications which are not -``safe'' in all cases. Use this only if you know the values in your -formula lie in the restricted ranges for which these simplifications -are valid. The symbolic integrator uses @kbd{a e}; -one effect of this is that the integrator's results must be used with -caution. Where an integral table will often attach conditions like -``for positive @expr{a} only,'' Calc (like most other symbolic -integration programs) will simply produce an unqualified result. +Calc is capable of performing some simplifications which may sometimes +be desired but which are not ``safe'' in all cases. The @kbd{a e} +(@code{calc-simplify-extended}) [@code{esimplify}] command +applies the algebraic simplifications as well as these extended, or +``unsafe'', simplifications. Use this only if you know the values in +your formula lie in the restricted ranges for which these +simplifications are valid. You can use Extended Simplification mode +(@kbd{m E}) to have these simplifications done automatically. + +The symbolic integrator uses these extended simplifications; one effect +of this is that the integrator's results must be used with caution. +Where an integral table will often attach conditions like ``for positive +@expr{a} only,'' Calc (like most other symbolic integration programs) +will simply produce an unqualified result. Because @kbd{a e}'s simplifications are unsafe, it is sometimes better to type @kbd{C-u -3 a v}, which does extended simplification only @@ -22957,21 +22959,20 @@ In fact, @kbd{C-u -3 j v} allows you to target extended simplification to any specific part of a formula. -The variable @code{ExtSimpRules} contains rewrites to be applied by -the @kbd{a e} command. These are applied in addition to +The variable @code{ExtSimpRules} contains rewrites to be applied when +the extended simplifications are used. These are applied in addition to @code{EvalRules} and @code{AlgSimpRules}. (The @kbd{a r AlgSimpRules} step described above is simply followed by an @kbd{a r ExtSimpRules} step.) -Following is a complete list of ``unsafe'' simplifications performed -by @kbd{a e}. +Following is a complete list of the ``unsafe'' simplifications. @tex \bigskip @end tex Inverse trigonometric or hyperbolic functions, called with their -corresponding non-inverse functions as arguments, are simplified -by @kbd{a e}. For example, @expr{@tfn{arcsin}(@tfn{sin}(x))} changes +corresponding non-inverse functions as arguments, are simplified. +For example, @expr{@tfn{arcsin}(@tfn{sin}(x))} changes to @expr{x}. Also, @expr{@tfn{arcsin}(@tfn{cos}(x))} and @expr{@tfn{arccos}(@tfn{sin}(x))} both change to @expr{@tfn{pi}/2 - x}. These simplifications are unsafe because they are valid only for @@ -23011,8 +23012,8 @@ Common factors are canceled from products on both sides of an equation, even if those factors may be zero: @expr{a x / b x} to @expr{a / b}. Such factors are never canceled from -inequalities: Even @kbd{a e} is not bold enough to reduce -@expr{a x < b x} to @expr{a < b} (or @expr{a > b}, depending +inequalities: Even the extended simplifications are not bold enough to +reduce @expr{a x < b x} to @expr{a < b} (or @expr{a > b}, depending on whether you believe @expr{x} is positive or negative). The @kbd{a M /} command can be used to divide a factor out of both sides of an inequality. @@ -23021,13 +23022,14 @@ @subsection Simplification of Units @noindent -The simplifications described in this section are applied by the -@kbd{u s} (@code{calc-simplify-units}) command. These are in addition -to the regular @kbd{a s} (but not @kbd{a e}) simplifications described -earlier. @xref{Basic Operations on Units}. +The simplifications described in this section (as well as the algebraic +simplifications) are applied when units need to be simplified. They can +be applied using the @kbd{u s} (@code{calc-simplify-units}) command, or +will be done automatically in Units Simplification mode (@kbd{m U}). +@xref{Basic Operations on Units}. The variable @code{UnitSimpRules} contains rewrites to be applied by -the @kbd{u s} command. These are applied in addition to @code{EvalRules} +units simplifications. These are applied in addition to @code{EvalRules} and @code{AlgSimpRules}. Scalar mode is automatically put into effect when simplifying units. @@ -23581,10 +23583,11 @@ @vindex IntegSimpRules Another set of rules, stored in @code{IntegSimpRules}, are applied -every time the integrator uses @kbd{a s} to simplify an intermediate -result. For example, putting the rule @samp{twice(x) := 2 x} into -@code{IntegSimpRules} would tell Calc to convert the @code{twice} -function into a form it knows whenever integration is attempted. +every time the integrator uses algebraic simplifications to simplify an +intermediate result. For example, putting the rule +@samp{twice(x) := 2 x} into @code{IntegSimpRules} would tell Calc to +convert the @code{twice} function into a form it knows whenever +integration is attempted. One more way to influence the integrator is to define a function with the @kbd{Z F} command (@pxref{Algebraic Definitions}). Calc's @@ -23602,8 +23605,8 @@ you can use @code{IntegAfterRules}. This is an extra rule set that runs after the main integrator returns its result; basically, Calc does an @kbd{a r IntegAfterRules} on the result before showing it to you. -(It also does an @kbd{a s}, without @code{IntegSimpRules}, after that -to further simplify the result.) For example, Calc's integrator +(It also does algebraic simplifications, without @code{IntegSimpRules}, +after that to further simplify the result.) For example, Calc's integrator sometimes produces expressions of the form @samp{ln(1+x) - ln(1-x)}; the default @code{IntegAfterRules} rewrite this into the more readable form @samp{2 arctanh(x)}. Note that, unlike @code{IntegRules}, @@ -25414,7 +25417,7 @@ @samp{sum(a_k, k, 0, 2 n, n)} produces @samp{a_0 + a_n + a_(2 n)}. Calc computes the number of iterations using the formula @samp{1 + (@var{high} - @var{low}) / @var{step}}, which must, -after simplification as if by @kbd{a s}, evaluate to an integer. +after algebraic simplification, evaluate to an integer. If the number of iterations according to the above formula does not come out to an integer, the sum is invalid and will be left @@ -26038,7 +26041,7 @@ the rule is accepted. Once @var{old} has been successfully matched to the target expression, @var{cond} is evaluated (with all the meta-variables substituted for the values they matched) and simplified -with @kbd{a s} (@code{calc-simplify}). If the result is a nonzero +with Calc's algebraic simplifications. If the result is a nonzero number or any other object known to be nonzero (@pxref{Declarations}), the rule is accepted. If the result is zero or if it is a symbolic formula that is not known to be nonzero, the rule is rejected. @@ -26718,7 +26721,7 @@ @end ignore @tindex evalsimp The formula @expr{x} has meta-variables substituted in the usual -way, then algebraically simplified as if by the @kbd{a s} command. +way, then algebraically simplified. @item evalextsimp(x) @ignore @@ -26741,15 +26744,15 @@ @end ignore @tindex let The expression @expr{x} is evaluated with meta-variables substituted. -The @kbd{a s} command's simplifications are @emph{not} applied by +The algebraic simplifications are @emph{not} applied by default, but @expr{x} can include calls to @code{evalsimp} or @code{evalextsimp} as described above to invoke higher levels -of simplification. The -result of @expr{x} is then bound to the meta-variable @expr{v}. As -usual, if this meta-variable has already been matched to something -else the two values must be equal; if the meta-variable is new then -it is bound to the result of the expression. This variable can then -appear in later conditions, and on the righthand side of the rule. +of simplification. The result of @expr{x} is then bound to the +meta-variable @expr{v}. As usual, if this meta-variable has already +been matched to something else the two values must be equal; if the +meta-variable is new then it is bound to the result of the expression. +This variable can then appear in later conditions, and on the righthand +side of the rule. In fact, @expr{v} may be any pattern in which case the result of evaluating @expr{x} is matched to that pattern, binding any meta-variables that appear in that pattern. Note that @code{let} @@ -27499,17 +27502,19 @@ @cindex @code{AlgSimpRules} variable @vindex AlgSimpRules Suppose you want @samp{sin(a + b)} to be expanded out not all the time, -but only when @kbd{a s} is used to simplify the formula. The variable -@code{AlgSimpRules} holds rules for this purpose. The @kbd{a s} command -will apply @code{EvalRules} and @code{AlgSimpRules} to the formula, as -well as all of its built-in simplifications. +but only when algebraic simplifications are used to simplify the +formula. The variable @code{AlgSimpRules} holds rules for this purpose. +The @kbd{a s} command will apply @code{EvalRules} and +@code{AlgSimpRules} to the formula, as well as all of its built-in +simplifications. Most of the special limitations for @code{EvalRules} don't apply to @code{AlgSimpRules}. Calc simply does an @kbd{a r AlgSimpRules} -command with an infinite repeat count as the first step of @kbd{a s}. -It then applies its own built-in simplifications throughout the -formula, and then repeats these two steps (along with applying the -default simplifications) until no further changes are possible. +command with an infinite repeat count as the first step of algebraic +simplifications. It then applies its own built-in simplifications +throughout the formula, and then repeats these two steps (along with +applying the default simplifications) until no further changes are +possible. @cindex @code{ExtSimpRules} variable @cindex @code{UnitSimpRules} variable @@ -27689,7 +27694,7 @@ @tindex usimplify The @kbd{u s} (@code{calc-simplify-units}) [@code{usimplify}] command simplifies a units -expression. It uses @kbd{a s} (@code{calc-simplify}) to simplify the +expression. It uses Calc's algebraic simplifications to simplify the expression first as a regular algebraic formula; it then looks for features that can be further simplified by converting one object's units to be compatible with another's. For example, @samp{5 m + 23 mm} will @@ -28773,7 +28778,7 @@ @item s D Edit @code{Decls}. @xref{Declarations}. @item s E -Edit @code{EvalRules}. @xref{Limited Simplifications}. +Edit @code{EvalRules}. @xref{Basic Simplifications}. @item s F Edit @code{FitRules}. @xref{Curve Fitting}. @item s G @@ -28943,19 +28948,16 @@ All current modes apply when an @samp{=>} operator is computed, including the current simplification mode. Recall that the -formula @samp{x + y + x} is not handled by Calc's default -simplifications, but the @kbd{a s} command will reduce it to -the simpler form @samp{y + 2 x}. You can also type @kbd{m A} -to enable an Algebraic Simplification mode in which the -equivalent of @kbd{a s} is used on all of Calc's results. -If you enter @samp{x + y + x =>} normally, the result will -be @samp{x + y + x => x + y + x}. If you change to -Algebraic Simplification mode, the result will be -@samp{x + y + x => y + 2 x}. However, just pressing @kbd{a s} -once will have no effect on @samp{x + y + x => x + y + x}, +formula @samp{arcsin(sin(x))} will not be handled by Calc's algebraic +simplifications, but Calc's unsafe simplifications will reduce it to +@samp{x}. If you enter @samp{arcsin(sin(x)) =>} normally, the result +will be @samp{arcsin(sin(x)) => arcsin(sin(x))}. If you change to +Extended Simplification mode, the result will be +@samp{arcsin(sin(x)) => x}. However, just pressing @kbd{a e} +once will have no effect on @samp{arcsin(sin(x)) => arcsin(sin(x))}, because the righthand side depends only on the lefthand side and the current mode settings, and the lefthand side is not -affected by commands like @kbd{a s}. +affected by commands like @kbd{a e}. The ``let'' command (@kbd{s l}) has an interesting interaction with the @samp{=>} operator. The @kbd{s l} command evaluates the @@ -33756,8 +33758,9 @@ other types of objects to be unordered, @code{beforep} puts any two objects into a definite, consistent order. The @code{beforep} function is used by the @kbd{V S} vector-sorting command, and also -by @kbd{a s} to put the terms of a product into canonical order: -This allows @samp{x y + y x} to be simplified easily to @samp{2 x y}. +by Calc's algebraic simplifications to put the terms of a product into +canonical order: This allows @samp{x y + y x} to be simplified easily to +@samp{2 x y}. @end defun @defun equal x y @@ -34426,10 +34429,9 @@ @end defun @defun simplify expr -Simplify the expression @var{expr} by applying various algebraic rules. -This is what the @w{@kbd{a s}} (@code{calc-simplify}) command uses. This -always returns a copy of the expression; the structure @var{expr} points -to remains unchanged in memory. +Simplify the expression @var{expr} by applying Calc's algebraic +simplifications. This always returns a copy of the expression; the +structure @var{expr} points to remains unchanged in memory. More precisely, here is what @code{simplify} does: The expression is first normalized and evaluated by calling @code{normalize}. If any @@ -36562,7 +36564,7 @@ @c 7 @item A prefix argument specifies simplification level and depth. -1=Default, 2=like @kbd{a s}, 3=like @kbd{a e}. +1=Basic simplifications, 2=Algebraic simplifications, 3=Extended simplifications @c 8 @item ------------------------------------------------------------ revno: 109378 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 13:55:15 -0400 message: * lwlib/Makefile.in (config_h): Add conf_post.h. diff: === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2012-07-31 11:37:38 +0000 +++ lwlib/ChangeLog 2012-08-01 17:55:15 +0000 @@ -1,3 +1,7 @@ +2012-08-01 Glenn Morris + + * Makefile.in (config_h): Add conf_post.h. + 2012-07-31 Dmitry Antipov Avoid unused variable warning if --with-x-toolkit=motif. === modified file 'lwlib/Makefile.in' --- lwlib/Makefile.in 2012-06-26 01:05:39 +0000 +++ lwlib/Makefile.in 2012-08-01 17:55:15 +0000 @@ -69,7 +69,7 @@ $(RANLIB) $@ ## Generated files in ../src, non-generated in $(srcdir)/../src. -config_h = ../src/config.h +config_h = ../src/config.h $(srcdir)/../src/conf_post.h lisp_h = $(srcdir)/../src/lisp.h ## lisp.h includes this. globals_h = ../src/globals.h ------------------------------------------------------------ revno: 109377 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 13:54:06 -0400 message: Update lib-src config.h dependencies * lib-src/Makefile.in (config_h): New variable. Use throughout in place of ../src/config.h. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-01 00:29:59 +0000 +++ lib-src/ChangeLog 2012-08-01 17:54:06 +0000 @@ -1,3 +1,8 @@ +2012-08-01 Glenn Morris + + * Makefile.in (config_h): New variable. + Use throughout in place of ../src/config.h. + 2012-08-01 Juanma Barranquero * makefile.w32-in (CONFIG_H): Update dependencies. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2012-07-30 16:20:35 +0000 +++ lib-src/Makefile.in 2012-08-01 17:54:06 +0000 @@ -178,6 +178,9 @@ LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} +# Configuration files for .o files to depend on. +config_h = ../src/config.h $(srcdir)/../src/conf_post.h + all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} .PHONY: all need-blessmail maybe-blessmail @@ -289,19 +292,19 @@ $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c ./test-distrib ${srcdir}/testfile -../lib/libgnu.a: ../src/config.h +../lib/libgnu.a: $(config_h) cd ../lib && $(MAKE) libgnu.a -regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h +regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ ${srcdir}/../src/regex.c -etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h +etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h) $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ regex.o $(LOADLIBES) -o etags -ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h +ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h) $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse @@ -312,30 +315,30 @@ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ regex.o $(LOADLIBES) -o ctags -profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h +profile${EXEEXT}: ${srcdir}/profile.c $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \ $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o profile -make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h +make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \ -o make-docfile -movemail${EXEEXT}: ${srcdir}/movemail.c pop.o ../src/config.h +movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(config_h) $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \ $(LOADLIBES) $(LIBS_MOVE) -o movemail -pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h +pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h $(config_h) $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c -emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h +emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ -DVERSION="\"${version}\"" \ $(LOADLIBES) -o emacsclient -hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h +hexl${EXEEXT}: ${srcdir}/hexl.c $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl -update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h +update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(config_h) $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ ${srcdir}/update-game-score.c $(LOADLIBES) -o update-game-score ------------------------------------------------------------ revno: 109376 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2012-08-01 19:31:59 +0300 message: More fixes in .gdbinit. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2012-08-01 16:28:58 +0000 +++ src/.gdbinit 2012-08-01 16:31:59 +0000 @@ -1218,7 +1218,7 @@ # $ptr is NULL in temacs if ($ptr != 0) set $tem = (struct Lisp_Symbol *) $ptr - xgetptr $tem->xname + xgetptr $tem->xname_ set $tem = (struct Lisp_String *) $ptr set $tem = (char *) $tem->data @@ -1241,7 +1241,7 @@ silent xgetptr globals.f_Vinitial_window_system set $tem = (struct Lisp_Symbol *) $ptr - xgetptr $tem->xname + xgetptr $tem->xname_ set $tem = (struct Lisp_String *) $ptr set $tem = (char *) $tem->data # If we are running in synchronous mode, we want a chance to look ------------------------------------------------------------ revno: 109375 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2012-08-01 19:30:13 +0300 message: Fix typo in src/ChangeLog. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 16:28:58 +0000 +++ src/ChangeLog 2012-08-01 16:30:13 +0000 @@ -2,7 +2,7 @@ * .gdbinit (xcar, xcdr, xlist, xwindow, nextcons, xprintsym): Adapt to latest changes in field names of the corresponding Lisp - objects + objects. * xdisp.c (try_window_id): Use WVAR in IF_DEBUG code. ------------------------------------------------------------ revno: 109374 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2012-08-01 19:28:58 +0300 message: Fix .gdbinit for latest INTERNAL_FIELD uses. src/.gdbinit (xcar, xcdr, xlist, xwindow, nextcons, xprintsym): Adapt to latest changes in field names of the corresponding Lisp objects. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2012-07-31 17:34:51 +0000 +++ src/.gdbinit 2012-08-01 16:28:58 +0000 @@ -789,13 +789,13 @@ xgetptr $ print (struct window *) $ptr set $window = (struct window *) $ptr - xgetint $window->total_cols + xgetint $window->total_cols_ set $width=$int - xgetint $window->total_lines + xgetint $window->total_lines_ set $height=$int - xgetint $window->left_col + xgetint $window->left_col_ set $left=$int - xgetint $window->top_line + xgetint $window->top_line_ set $top=$int printf "%dx%d+%d+%d\n", $width, $height, $left, $top end @@ -892,7 +892,7 @@ end define nextcons - p $.u.cdr + p $.u.cdr_ xcons end document nextcons @@ -903,7 +903,7 @@ define xcar xgetptr $ xgettype $ - print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->car : 0) + print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->car_ : 0) end document xcar Assume that $ is an Emacs Lisp pair and print its car. @@ -912,7 +912,7 @@ define xcdr xgetptr $ xgettype $ - print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.cdr : 0) + print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.cdr_ : 0) end document xcdr Assume that $ is an Emacs Lisp pair and print its cdr. @@ -925,9 +925,9 @@ set $nil = $ptr set $i = 0 while $cons != $nil && $i < 10 - p/x $cons->car + p/x $cons->car_ xpr - xgetptr $cons->u.cdr + xgetptr $cons->u.cdr_ set $cons = (struct Lisp_Cons *) $ptr set $i = $i + 1 printf "---\n" @@ -1047,7 +1047,7 @@ define xprintsym xgetptr $arg0 set $sym = (struct Lisp_Symbol *) $ptr - xgetptr $sym->xname + xgetptr $sym->xname_ set $sym_name = (struct Lisp_String *) $ptr xprintstr $sym_name end === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 15:39:21 +0000 +++ src/ChangeLog 2012-08-01 16:28:58 +0000 @@ -1,5 +1,9 @@ 2012-08-01 Eli Zaretskii + * .gdbinit (xcar, xcdr, xlist, xwindow, nextcons, xprintsym): + Adapt to latest changes in field names of the corresponding Lisp + objects + * xdisp.c (try_window_id): Use WVAR in IF_DEBUG code. 2012-08-01 Glenn Morris ------------------------------------------------------------ revno: 109373 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:43:36 -0700 message: ChangeLog fix diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-08-01 15:20:59 +0000 +++ msdos/ChangeLog 2012-08-01 15:43:36 +0000 @@ -8,7 +8,7 @@ (_setjmp, _longjmp): Move here from src/s/msdos.h. (config_opsysfile, config_machfile): Remove. * sed1v2.inp (M_FILE, S_FILE): Remove. - * mainmake.v2 (TAGS tags): Remove src/s/msdos.h. + * mainmake.v2 (TAGS, tags): Remove src/s/msdos.h. 2012-07-31 Glenn Morris ------------------------------------------------------------ revno: 109372 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2012-08-01 18:39:21 +0300 message: Fix fallout from revision 109354 that introduced WVAR. src/xdisp.c (try_window_id): Use WVAR in IF_DEBUG code. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 15:19:51 +0000 +++ src/ChangeLog 2012-08-01 15:39:21 +0000 @@ -1,3 +1,7 @@ +2012-08-01 Eli Zaretskii + + * xdisp.c (try_window_id): Use WVAR in IF_DEBUG code. + 2012-08-01 Glenn Morris * s/msdos.h: Remove file. === modified file 'src/xdisp.c' --- src/xdisp.c 2012-08-01 06:23:24 +0000 +++ src/xdisp.c 2012-08-01 15:39:21 +0000 @@ -17834,8 +17834,8 @@ else abort (); - IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); - debug_end_vpos = XFASTINT (w->window_end_vpos)); + IF_DEBUG (debug_end_pos = XFASTINT (WVAR (w, window_end_pos)); + debug_end_vpos = XFASTINT (WVAR (w, window_end_vpos))); /* Record that display has not been completed. */ WVAR (w, window_end_valid) = Qnil; ------------------------------------------------------------ revno: 109371 committer: Jay Belanger branch nick: trunk timestamp: Wed 2012-08-01 10:36:37 -0500 message: calc-mode.el (calc-set-simplify-mode): Use `cond' instead of nested `if's. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-01 07:34:28 +0000 +++ lisp/ChangeLog 2012-08-01 15:36:37 +0000 @@ -1,3 +1,8 @@ +2012-08-01 Jay Belanger + + * calc/calc-mode.el (calc-set-simplify-mode): Use `cond' instead + of nested `if's. + 2012-08-01 Glenn Morris * progmodes/autoconf.el (autoconf-definition-regexp): === modified file 'lisp/calc/calc-mode.el' --- lisp/calc/calc-mode.el 2012-07-31 21:38:18 +0000 +++ lisp/calc/calc-mode.el 2012-08-01 15:36:37 +0000 @@ -497,11 +497,11 @@ (defun calc-set-simplify-mode (mode arg msg) (calc-change-mode 'calc-simplify-mode - (if arg - (and (> (prefix-numeric-value arg) 0) - mode) - (and (not (eq calc-simplify-mode mode)) - mode))) + (cond + (arg mode) + ((eq calc-simplify-mode mode) + 'alg) + (t mode))) (message "%s" (if (eq calc-simplify-mode mode) msg "Algebraic simplification occurs by default"))) ------------------------------------------------------------ revno: 109370 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:33:09 -0700 message: Alphabetic order is proving tricky today diff: === modified file 'src/conf_post.h' --- src/conf_post.h 2012-08-01 15:25:43 +0000 +++ src/conf_post.h 2012-08-01 15:33:09 +0000 @@ -90,6 +90,14 @@ #undef HAVE_RINT #endif /* HPUX */ +#ifdef IRIX6_5 +#ifdef emacs +char *_getpty(); +#endif + +#undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ +#endif /* IRIX6_5 */ + #ifdef MSDOS #ifndef __DJGPP__ You lose; /* Emacs for DOS must be compiled with DJGPP */ @@ -130,14 +138,6 @@ #endif #endif /* MSDOS */ -#ifdef IRIX6_5 -#ifdef emacs -char *_getpty(); -#endif - -#undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ -#endif /* IRIX6_5 */ - #ifdef USG5_4 /* Get FIONREAD from . Get to get struct tchars. But get first to make sure ttold.h doesn't interfere. */ ------------------------------------------------------------ revno: 109369 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:25:43 -0700 message: Alphabetical order diff: === modified file 'src/conf_post.h' --- src/conf_post.h 2012-08-01 15:24:23 +0000 +++ src/conf_post.h 2012-08-01 15:25:43 +0000 @@ -74,6 +74,22 @@ #define vfork fork #endif /* DARWIN_OS */ +/* We have to go this route, rather than the old hpux9 approach of + renaming the functions via macros. The system's stdlib.h has fully + prototyped declarations, which yields a conflicting definition of + srand48; it tries to redeclare what was once srandom to be srand48. + So we go with HAVE_LRAND48 being defined. */ +#ifdef HPUX +#undef srandom +#undef random +/* We try to avoid checking for random and rint on hpux in + configure.ac, but some other configure test might check for them as + a dependency, so to be safe we also undefine them here. + */ +#undef HAVE_RANDOM +#undef HAVE_RINT +#endif /* HPUX */ + #ifdef MSDOS #ifndef __DJGPP__ You lose; /* Emacs for DOS must be compiled with DJGPP */ @@ -114,22 +130,6 @@ #endif #endif /* MSDOS */ -/* We have to go this route, rather than the old hpux9 approach of - renaming the functions via macros. The system's stdlib.h has fully - prototyped declarations, which yields a conflicting definition of - srand48; it tries to redeclare what was once srandom to be srand48. - So we go with HAVE_LRAND48 being defined. */ -#ifdef HPUX -#undef srandom -#undef random -/* We try to avoid checking for random and rint on hpux in - configure.ac, but some other configure test might check for them as - a dependency, so to be safe we also undefine them here. - */ -#undef HAVE_RANDOM -#undef HAVE_RINT -#endif - #ifdef IRIX6_5 #ifdef emacs char *_getpty(); ------------------------------------------------------------ revno: 109368 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:24:23 -0700 message: Fix typo in previous diff: === modified file 'src/conf_post.h' --- src/conf_post.h 2012-08-01 15:19:51 +0000 +++ src/conf_post.h 2012-08-01 15:24:23 +0000 @@ -112,7 +112,7 @@ enlarging Emacs footprint by another 100+ KBytes. */ #define SYSTEM_PURESIZE_EXTRA (-170000+65000) #endif -#endif MSDOS /* MSDOS */ +#endif /* MSDOS */ /* We have to go this route, rather than the old hpux9 approach of renaming the functions via macros. The system's stdlib.h has fully ------------------------------------------------------------ revno: 109367 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:20:59 -0700 message: * msdos/sed2v2.inp (HAVE_WCHAR_H): Fix typo. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-08-01 15:19:51 +0000 +++ msdos/ChangeLog 2012-08-01 15:20:59 +0000 @@ -1,5 +1,7 @@ 2012-08-01 Glenn Morris + * sed2v2.inp (HAVE_WCHAR_H): Fix typo. + * sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN) (HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP) (INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME) === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2012-08-01 15:19:51 +0000 +++ msdos/sed2v2.inp 2012-08-01 15:20:59 +0000 @@ -83,7 +83,7 @@ /^#undef HAVE_SIGNED_SIG_ATOMIC_T *$/s/^.*$/#define HAVE_SIGNED_SIG_ATOMIC_T 1/ /^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/ /^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/ -/^#under HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/ +/^#undef HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/ /^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/ /^#undef IS_DIRECTORY_SEP *$/s/^.*$/#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')/ /^#undef IS_ANY_SEP *$/s/^.*$/#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))/ ------------------------------------------------------------ revno: 109366 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:19:51 -0700 message: Remove src/s/msdos.h * msdos/sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN) (HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP) (INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME) (_setjmp, _longjmp): Move here from src/s/msdos.h. (config_opsysfile, config_machfile): Remove. * msdos/sed1v2.inp (M_FILE, S_FILE): Remove. * msdos/mainmake.v2 (TAGS tags): Remove src/s/msdos.h. * src/s/msdos.h: Remove file. * src/conf_post.h [MSDOS]: New section, moved from s/msdos.h. * src/Makefile.in (S_FILE): Remove. (config_h): Remove S_FILE. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-07-31 23:20:25 +0000 +++ msdos/ChangeLog 2012-08-01 15:19:51 +0000 @@ -1,3 +1,13 @@ +2012-08-01 Glenn Morris + + * sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN) + (HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP) + (INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME) + (_setjmp, _longjmp): Move here from src/s/msdos.h. + (config_opsysfile, config_machfile): Remove. + * sed1v2.inp (M_FILE, S_FILE): Remove. + * mainmake.v2 (TAGS tags): Remove src/s/msdos.h. + 2012-07-31 Glenn Morris * sed1v2.inp (S_FILE): Update for format change. === modified file 'msdos/mainmake.v2' --- msdos/mainmake.v2 2012-06-30 15:32:51 +0000 +++ msdos/mainmake.v2 2012-08-01 15:19:51 +0000 @@ -161,8 +161,7 @@ cd src ../bin/etags --include=../lisp/TAGS \ --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ - $(CURDIR)/src/*.c $(CURDIR)/src/*.h \ - $(CURDIR)/src/s/msdos.h + $(CURDIR)/src/*.c $(CURDIR)/src/*.h cd .. ./bin/etags --include=src/TAGS === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2012-07-31 23:20:25 +0000 +++ msdos/sed1v2.inp 2012-08-01 15:19:51 +0000 @@ -128,8 +128,6 @@ /^DEPFLAGS *=/s/@DEPFLAGS@// /^MKDEPDIR *=/s/@MKDEPDIR@// /^version *=/s/@[^@\n]*@// -/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! -/^S_FILE *=/s!=!= $(srcdir)/s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// /^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! /^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2012-07-28 23:05:32 +0000 +++ msdos/sed2v2.inp 2012-08-01 15:19:51 +0000 @@ -26,7 +26,11 @@ #define NSIG 320\ #endif +/^#undef MSDOS *$/s/^.*$/#define MSDOS/ +/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ +/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ /^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/ +/^#undef HAVE_INVERSE_HYPERBOLIC *$/s/^.*$/#define HAVE_INVERSE_HYPERBOLIC/ /^#undef HAVE_SETITIMER *$/s/^.*$/#define HAVE_SETITIMER 1/ /^#undef HAVE_STRUCT_UTIMBUF *$/s/^.*$/#define HAVE_STRUCT_UTIMBUF 1/ /^#undef LOCALTIME_CACHE *$/s/^.*$/#define LOCALTIME_CACHE 1/ @@ -80,6 +84,15 @@ /^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/ /^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/ /^#under HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/ +/^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/ +/^#undef IS_DIRECTORY_SEP *$/s/^.*$/#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')/ +/^#undef IS_ANY_SEP *$/s/^.*$/#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))/ +/^#undef INTERNAL_TERMINAL *$/s/^.*$/#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display::co#80:li#25:Co#16:pa#256:km:ms:cm=:cl=:ce=::se=:so=:us=
    :ue=
:md=:mh=:mb=:mr=:me=::AB=:AF=:op=:"/ +/^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/ +/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR ';'/ +/^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/ +/^#undef _setjmp/s/^.*$/#define _setjmp setjmp/ +/^#undef _longjmp/s/^.*$/#define _longjmp longjmp/ /^#undef inline/s/^.*$/#define inline __inline__/ /^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/ /^#undef restrict/s/^.*$/#define restrict __restrict/ @@ -90,8 +103,6 @@ s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/ s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/ s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "msdos"/ -s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"! -s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"! s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ /^#undef HAVE_INTTYPES_H/c\ === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 11:20:07 +0000 +++ src/ChangeLog 2012-08-01 15:19:51 +0000 @@ -1,3 +1,10 @@ +2012-08-01 Glenn Morris + + * s/msdos.h: Remove file. + * conf_post.h [MSDOS]: New section, moved from s/msdos.h. + * Makefile.in (S_FILE): Remove. + (config_h): Remove S_FILE. + 2012-08-01 Juanma Barranquero * s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): === modified file 'src/Makefile.in' --- src/Makefile.in 2012-07-31 23:20:25 +0000 +++ src/Makefile.in 2012-08-01 15:19:51 +0000 @@ -56,9 +56,7 @@ lispdir = ../lisp # Configuration files for .o files to depend on. -# MS-DOS sets S_FILE non-nil. -S_FILE = -config_h = config.h conf_post.h $(S_FILE) +config_h = config.h conf_post.h bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) === modified file 'src/conf_post.h' --- src/conf_post.h 2012-07-31 23:02:12 +0000 +++ src/conf_post.h 2012-08-01 15:19:51 +0000 @@ -74,6 +74,46 @@ #define vfork fork #endif /* DARWIN_OS */ +#ifdef MSDOS +#ifndef __DJGPP__ +You lose; /* Emacs for DOS must be compiled with DJGPP */ +#endif +#define _NAIVE_DOS_REGS + +/* Start of gnulib-related stuff */ + +/* lib/ftoastr.c wants strtold, but DJGPP only has _strtold. DJGPP > + 2.03 has it, but it also has _strtold as a stub that jumps to + strtold, so use _strtold in all versions. */ +#define strtold _strtold + +#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3 +# define HAVE_LSTAT 1 +#else +# define lstat stat +#endif +/* End of gnulib-related stuff. */ + +/* Define one of these for easier conditionals. */ +#ifdef HAVE_X_WINDOWS +/* We need a little extra space, see ../../lisp/loadup.el and the + commentary below, in the non-X branch. The 140KB number was + measured on GNU/Linux and on MS-Windows. */ +#define SYSTEM_PURESIZE_EXTRA (-170000+140000) +#else +/* We need a little extra space, see ../../lisp/loadup.el. + As of 20091024, DOS-specific files use up 62KB of pure space. But + overall, we end up wasting 130KB of pure space, because + BASE_PURESIZE starts at 1.47MB, while we need only 1.3MB (including + non-DOS specific files and load history; the latter is about 55K, + but depends on the depth of the top-level Emacs directory in the + directory tree). Given the unknown policy of different DPMI + hosts regarding loading of untouched pages, I'm not going to risk + enlarging Emacs footprint by another 100+ KBytes. */ +#define SYSTEM_PURESIZE_EXTRA (-170000+65000) +#endif +#endif MSDOS /* MSDOS */ + /* We have to go this route, rather than the old hpux9 approach of renaming the functions via macros. The system's stdlib.h has fully prototyped declarations, which yields a conflicting definition of === removed file 'src/s/msdos.h' --- src/s/msdos.h 2012-07-17 11:52:00 +0000 +++ src/s/msdos.h 1970-01-01 00:00:00 +0000 @@ -1,114 +0,0 @@ -/* System description file for MS-DOS - -Copyright (C) 1993, 1996-1997, 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs 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 3 of the License, or -(at your option) any later version. - -GNU Emacs 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 GNU Emacs. If not, see . */ - -/* Note: lots of stuff here was taken from s-msdos.h in demacs. */ - - -/* Define symbols to identify the version of Unix this is. - Define all the symbols that apply correctly. */ -#ifndef MSDOS -#define MSDOS -#endif - -#ifndef __DJGPP__ -You lose; /* Emacs for DOS must be compiled with DJGPP */ -#endif - -#define DOS_NT /* MSDOS or WINDOWSNT */ - -/* subprocesses should be defined if you want to have code for - asynchronous subprocesses (as used in M-x compile and M-x shell). - This is the only system that needs this. */ -#undef subprocesses - -/* Here, on a separate page, add any special hacks needed to make - Emacs work on this system. For example, you might define certain - system call names that don't exist on your system, or that do - different things on your system and must be used only through an - encapsulation (which you should place, by convention, in sysdep.c). */ - -/* This overrides the default value on editfns.c, since DJGPP - does not have pw->pw_gecos. */ -#define USER_FULL_NAME (getenv ("NAME")) - -/* setjmp and longjmp can safely replace _setjmp and _longjmp, - but they will run slower. */ -#define _setjmp setjmp -#define _longjmp longjmp - -#define _NAIVE_DOS_REGS - -/* Used by emacs.c:decode_env_path. */ -#define SEPCHAR ';' - -/* Used by callproc.c (and process.c, but in the part not compiled on - MSDOS). The default is defined on process.h. */ -#define NULL_DEVICE "nul" - -/* Used by floatfns.c. */ -#define HAVE_INVERSE_HYPERBOLIC -#define FLOAT_CHECK_DOMAIN - -/* Start of gnulib-related stuff */ - -/* lib/ftoastr.c wants strtold, but DJGPP only has _strtold. DJGPP > - 2.03 has it, but it also has _strtold as a stub that jumps to - strtold, so use _strtold in all versions. */ -#define strtold _strtold - -#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3 -# define HAVE_LSTAT 1 -#else -# define lstat stat -#endif - -/* End of gnulib-related stuff. */ - -/* When $TERM is "internal" then this is substituted: */ -#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\ -:co#80:li#25:Co#16:pa#256:km:ms:cm=:cl=:ce=:\ -:se=:so=:us=
    :ue=
:md=:mh=:mb=:mr=:me=:\ -:AB=:AF=:op=:" - -/* Define this to be the separator between devices and paths. Used by - lisp.h to define IS_DEVICE_SEP. */ -#define DEVICE_SEP ':' - -/* We'll support either convention of slashes on MSDOS. */ -#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') -#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) - -/* Define one of these for easier conditionals. */ -#ifdef HAVE_X_WINDOWS -/* We need a little extra space, see ../../lisp/loadup.el and the - commentary below, in the non-X branch. The 140KB number was - measured on GNU/Linux and on MS-Windows. */ -#define SYSTEM_PURESIZE_EXTRA (-170000+140000) -#else -/* We need a little extra space, see ../../lisp/loadup.el. - As of 20091024, DOS-specific files use up 62KB of pure space. But - overall, we end up wasting 130KB of pure space, because - BASE_PURESIZE starts at 1.47MB, while we need only 1.3MB (including - non-DOS specific files and load history; the latter is about 55K, - but depends on the depth of the top-level Emacs directory in the - directory tree). Given the unknown policy of different DPMI - hosts regarding loading of untouched pages, I'm not going to risk - enlarging Emacs footprint by another 100+ KBytes. */ -#define SYSTEM_PURESIZE_EXTRA (-170000+65000) -#endif ------------------------------------------------------------ revno: 109365 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 08:00:49 -0700 message: * configure.ac (DOS_NT, MSDOS): New system type templates. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-01 07:20:52 +0000 +++ ChangeLog 2012-08-01 15:00:49 +0000 @@ -1,3 +1,7 @@ +2012-08-01 Glenn Morris + + * configure.ac (DOS_NT, MSDOS): New system type templates. + 2012-08-01 Ulrich Müller * configure.ac (LIB_STANDARD, START_FILES) [FreeBSD]: === modified file 'configure.ac' --- configure.ac 2012-08-01 07:20:52 +0000 +++ configure.ac 2012-08-01 15:00:49 +0000 @@ -3730,6 +3730,8 @@ dnl Define all the symbols that apply correctly. AH_TEMPLATE(BSD4_2, [Define if the system is compatible with BSD 4.2.]) AH_TEMPLATE(BSD_SYSTEM, [Define if the system is compatible with BSD 4.2.]) +AH_TEMPLATE(DOS_NT, [Define if the system is MS DOS or MS Windows.]) +AH_TEMPLATE(MSDOS, [Define if the system is MS DOS.]) AH_TEMPLATE(USG, [Define if the system is compatible with System III.]) AH_TEMPLATE(USG5, [Define if the system is compatible with System V.]) AH_TEMPLATE(USG5_4, [Define if the system is compatible with System V Release 4.]) ------------------------------------------------------------ revno: 109364 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2012-08-01 13:20:07 +0200 message: Sync Windows port with autogen/config.in changes. * nt/config.nt: Sync with autogen/config.in. (DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC) (INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP): New macros. * src/s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): Remove; moved to nt/config.nt. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-08-01 00:29:59 +0000 +++ nt/ChangeLog 2012-08-01 11:20:07 +0000 @@ -1,6 +1,13 @@ 2012-08-01 Juanma Barranquero * config.nt: Sync with autogen/config.in. + (DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC) + (INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP): + New macros. + +2012-08-01 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. Remove code moved to conf_post.h and include (NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME) (USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros. === modified file 'nt/config.nt' --- nt/config.nt 2012-08-01 00:29:59 +0000 +++ nt/config.nt 2012-08-01 11:20:07 +0000 @@ -122,6 +122,9 @@ /* Name of the default sound device. */ #undef DEFAULT_SOUND_DEVICE +/* Character that separates a device in a file name. */ +#define DEVICE_SEP ':' + /* Define to 1 for DGUX with . */ #undef DGUX @@ -147,6 +150,10 @@ */ #define FIRST_PTY_LETTER 'a' +/* Define if the float library doesn't handle errors by either setting errno, + or signaling SIGFPE/SIGILL. */ +#undef FLOAT_CHECK_DOMAIN + /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG @@ -524,6 +531,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if you have the functions acosh, asinh, and atanh. */ +#undef HAVE_INVERSE_HYPERBOLIC + /* Define to 1 if you have the jpeg library (-ljpeg). */ #undef HAVE_JPEG @@ -1102,12 +1112,24 @@ /* Define if the system is HPUX. */ #undef HPUX +/* This is substituted when $TERM is "internal". */ +#undef INTERNAL_TERMINAL + /* Define to read input using SIGIO. */ #undef INTERRUPT_INPUT /* Define if the system is IRIX. */ #undef IRIX6_5 +/* Returns true if character is any form of separator. */ +#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) + +/* Returns true if character is a device separator. */ +#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP) + +/* Returns true if character is a directory separator. */ +#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') + /* Define to support Kerberos-authenticated POP mail retrieval. */ #undef KERBEROS @@ -1514,7 +1536,8 @@ /* Some platforms redefine this. */ #undef _setjmp -/* Define to the used os dependent file. */ +/* Some platforms that do not use configure define this to include extra + configuration information. */ #define config_opsysfile "s/ms-w32.h" /* A replacement for va_copy, if needed. */ === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 08:49:28 +0000 +++ src/ChangeLog 2012-08-01 11:20:07 +0000 @@ -1,3 +1,8 @@ +2012-08-01 Juanma Barranquero + + * s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): + Remove; moved to nt/config.nt. + 2012-08-01 Dmitry Antipov Use INTERNAL_FIELD for conses and overlays. === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2012-08-01 00:29:59 +0000 +++ src/s/ms-w32.h 2012-08-01 11:20:07 +0000 @@ -74,13 +74,6 @@ your system and must be used only through an encapsulation (which you should place, by convention, in sysdep.c). */ -/* Define this to be the separator between devices and paths. */ -#define DEVICE_SEP ':' - -/* We'll support either convention on NT. */ -#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') -#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) - #ifdef __GNUC__ #ifndef __cplusplus #undef inline ------------------------------------------------------------ revno: 109363 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 06:20:52 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2012-07-01 10:23:35 +0000 +++ lisp/ldefs-boot.el 2012-08-01 10:20:52 +0000 @@ -5,7 +5,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (20459 40320 865360 0)) +;;;;;; "play/5x5.el" (20478 3673 653810 0)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -114,7 +114,7 @@ ;;;;;; add-change-log-entry-other-window add-change-log-entry find-change-log ;;;;;; prompt-for-change-log-name add-log-mailing-address add-log-full-name ;;;;;; add-log-current-defun-function) "add-log" "vc/add-log.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -253,7 +253,7 @@ ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (20355 10021 546955 0)) +;;;;;; "advice" "emacs-lisp/advice.el" (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -910,7 +910,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (20461 32935 300400 0)) +;;;;;; "net/ange-ftp.el" (20501 3499 284800 0)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -1051,8 +1051,8 @@ ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20374 32165 -;;;;;; 855366 0)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20497 6436 +;;;;;; 957082 0)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1488,7 +1488,7 @@ ;;;*** ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el" -;;;;;; (20425 59428 310626 0)) +;;;;;; (20502 24369 261101 0)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1562,11 +1562,11 @@ ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20505 550 96420 0)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ -Major mode for editing Autoconf configure.in files. +Major mode for editing Autoconf configure.ac files. \(fn)" t nil) @@ -1613,7 +1613,7 @@ ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (20440 54677 388705 0)) +;;;;;; (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1664,7 +1664,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (20373 11301 906925 0)) +;;;;;; "autorevert" "autorevert.el" (20476 31768 298871 0)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1753,7 +1753,7 @@ ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (20369 14251 85829 0)) +;;;;;; "avoid.el" (20476 31768 298871 0)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1794,7 +1794,7 @@ ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (20369 14251 85829 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -2113,7 +2113,7 @@ ;;;;;; bookmark-save bookmark-write bookmark-delete bookmark-insert ;;;;;; bookmark-rename bookmark-insert-location bookmark-relocate ;;;;;; bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark" -;;;;;; "bookmark.el" (20459 40320 865360 0)) +;;;;;; "bookmark.el" (20476 31768 298871 0)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2314,7 +2314,7 @@ ;;;;;; browse-url-xdg-open browse-url-at-mouse browse-url-at-point ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file ;;;;;; browse-url-of-buffer browse-url-of-file browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (20395 3526 841101 0)) +;;;;;; "browse-url" "net/browse-url.el" (20478 3673 653810 0)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2630,7 +2630,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (20369 14251 85829 0)) +;;;;;; "bs" "bs.el" (20479 62884 77836 0)) ;;; Generated autoloads from bs.el (autoload 'bs-cycle-next "bs" "\ @@ -2670,8 +2670,8 @@ ;;;*** -;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2693,7 +2693,7 @@ ;;;*** ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference" -;;;;;; "progmodes/bug-reference.el" (20355 10021 546955 0)) +;;;;;; "progmodes/bug-reference.el" (20490 33188 850375 0)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2717,7 +2717,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20460 12069 586020 0)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2876,8 +2876,8 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc -;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20407 -;;;;;; 29477 794904 0)) +;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20504 +;;;;;; 23200 130482 0)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2972,8 +2972,8 @@ ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (20427 -;;;;;; 14766 970343 0)) +;;;### (autoloads (calculator) "calculator" "calculator.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -3094,7 +3094,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (20373 11301 906925 0)) +;;;;;; (20486 36135 22104 0)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -4129,8 +4129,8 @@ ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20464 9124 -;;;;;; 585807 0)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.2") @@ -4158,7 +4158,7 @@ ;;;*** ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4222,7 +4222,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (20464 9124 585807 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4359,8 +4359,8 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20428 -;;;;;; 35620 209002 0)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4542,7 +4542,7 @@ ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (20388 65061 302484 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4795,7 +4795,7 @@ ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20461 32935 300400 +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20490 33188 850375 ;;;;;; 0)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) @@ -5014,7 +5014,7 @@ ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (20427 14766 970343 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5075,8 +5075,8 @@ ;;;*** -;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5494,7 +5494,7 @@ ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "vc/cvs-status.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5505,7 +5505,7 @@ ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (20439 5925 915283 0)) +;;;;;; "cwarn" "progmodes/cwarn.el" (20478 3673 653810 0)) ;;; Generated autoloads from progmodes/cwarn.el (autoload 'cwarn-mode "cwarn" "\ @@ -5642,8 +5642,8 @@ ;;;*** -;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20440 -;;;;;; 54677 388705 0)) +;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5784,7 +5784,7 @@ ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (20355 10021 546955 0)) +;;;;;; "emacs-lisp/debug.el" (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5828,7 +5828,7 @@ ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -6032,7 +6032,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (20433 53542 563193 0)) +;;;;;; "descr-text.el" (20486 36135 22104 0)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6069,7 +6069,7 @@ ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (20450 62630 628906 0)) +;;;;;; "desktop.el" (20497 6436 957082 0)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6332,7 +6332,7 @@ ;;;*** ;;;### (autoloads (diff-buffer-with-file diff-backup diff diff-command -;;;;;; diff-switches) "diff" "vc/diff.el" (20379 50083 187499 0)) +;;;;;; diff-switches) "diff" "vc/diff.el" (20476 31768 298871 0)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6376,7 +6376,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (20415 23587 118149 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6420,8 +6420,8 @@ ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (20452 17962 -;;;;;; 966427 0)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (20486 36135 +;;;;;; 22104 0)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6573,8 +6573,8 @@ ;;;*** -;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (20433 -;;;;;; 53542 563193 0)) +;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (20497 +;;;;;; 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6777,8 +6777,8 @@ ;;;*** ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe -;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20458 -;;;;;; 56750 651721 0)) +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -7150,7 +7150,7 @@ ;;;;;; ebnf-eps-file ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ;;;;;; ebnf-spool-file ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (20373 11301 906925 0)) +;;;;;; "progmodes/ebnf2ps.el" (20495 51111 757560 0)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload 'ebnf-customize "ebnf2ps" "\ @@ -7424,8 +7424,8 @@ ;;;;;; ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition ;;;;;; ebrowse-tags-view-definition ebrowse-tags-find-declaration ;;;;;; ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree -;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (20459 -;;;;;; 40320 865360 0)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7657,7 +7657,7 @@ ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (20440 54677 388705 0)) +;;;;;; "emacs-lisp/edebug.el" (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7730,8 +7730,8 @@ ;;;;;; ediff-merge-directories-with-ancestor ediff-merge-directories ;;;;;; ediff-directories3 ediff-directory-revisions ediff-directories ;;;;;; ediff-buffers3 ediff-buffers ediff-backup ediff-current-file -;;;;;; ediff-files3 ediff-files) "ediff" "vc/ediff.el" (20373 11301 -;;;;;; 906925 0)) +;;;;;; ediff-files3 ediff-files) "ediff" "vc/ediff.el" (20495 51111 +;;;;;; 757560 0)) ;;; Generated autoloads from vc/ediff.el (autoload 'ediff-files "ediff" "\ @@ -8008,7 +8008,7 @@ ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (20438 24016 194668 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from edmacro.el (autoload 'edit-kbd-macro "edmacro" "\ @@ -8159,7 +8159,7 @@ ;;;*** ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode) -;;;;;; "electric" "electric.el" (20369 14251 85829 0)) +;;;;;; "electric" "electric.el" (20481 18215 64245 0)) ;;; Generated autoloads from electric.el (defvar electric-indent-chars '(10) "\ @@ -8247,7 +8247,7 @@ ;;;### (autoloads (elint-initialize elint-defun elint-current-buffer ;;;;;; elint-directory elint-file) "elint" "emacs-lisp/elint.el" -;;;;;; (20421 62373 255269 0)) +;;;;;; (20486 36135 22104 0)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8283,8 +8283,8 @@ ;;;*** ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list -;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (20355 -;;;;;; 10021 546955 0)) +;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (20497 +;;;;;; 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8347,7 +8347,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug-query-existing-bugs report-emacs-bug) -;;;;;; "emacsbug" "mail/emacsbug.el" (20431 40251 885267 983000)) +;;;;;; "emacsbug" "mail/emacsbug.el" (20495 51111 757560 0)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -9148,6 +9148,13 @@ ;;;*** +;;;### (autoloads nil "erc-notifications" "erc/erc-notifications.el" +;;;;;; (20491 54052 900109 0)) +;;; Generated autoloads from erc/erc-notifications.el +(autoload 'erc-notifications-mode "erc-notifications" "" t) + +;;;*** + ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" ;;;;;; "erc/erc-notify.el" (20355 10021 546955 0)) ;;; Generated autoloads from erc/erc-notify.el @@ -9400,7 +9407,7 @@ ;;;*** ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell" -;;;;;; "eshell/eshell.el" (20458 56750 651721 0)) +;;;;;; "eshell/eshell.el" (20478 3673 653810 0)) ;;; Generated autoloads from eshell/eshell.el (autoload 'eshell "eshell" "\ @@ -9441,7 +9448,7 @@ ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (20388 65061 302484 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9929,7 +9936,7 @@ ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (20427 14766 970343 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -10241,8 +10248,8 @@ ;;;### (autoloads (variable-pitch-mode buffer-face-toggle buffer-face-set ;;;;;; buffer-face-mode text-scale-adjust text-scale-decrease text-scale-increase ;;;;;; text-scale-set face-remap-set-base face-remap-reset-base -;;;;;; face-remap-add-relative) "face-remap" "face-remap.el" (20445 -;;;;;; 44711 217937 0)) +;;;;;; face-remap-add-relative) "face-remap" "face-remap.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10401,8 +10408,8 @@ ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20387 44199 -;;;;;; 24128 0)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20501 3499 +;;;;;; 284800 0)) ;;; Generated autoloads from mail/feedmail.el (autoload 'feedmail-send-it "feedmail" "\ @@ -10457,7 +10464,7 @@ ;;;### (autoloads (ffap-bindings ffap-guess-file-name-at-point dired-at-point ;;;;;; ffap-at-mouse ffap-menu find-file-at-point ffap-next) "ffap" -;;;;;; "ffap.el" (20395 38306 463596 0)) +;;;;;; "ffap.el" (20479 62884 77836 0)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10649,8 +10656,8 @@ ;;;*** -;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10818,7 +10825,7 @@ ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (20355 10021 546955 0)) +;;;;;; "emacs-lisp/find-func.el" (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -11059,8 +11066,8 @@ ;;;*** ;;;### (autoloads (flymake-find-file-hook flymake-mode-off flymake-mode-on -;;;;;; flymake-mode) "flymake" "progmodes/flymake.el" (20458 56750 -;;;;;; 651721 0)) +;;;;;; flymake-mode) "flymake" "progmodes/flymake.el" (20482 39076 +;;;;;; 289170 0)) ;;; Generated autoloads from progmodes/flymake.el (autoload 'flymake-mode "flymake" "\ @@ -11162,7 +11169,7 @@ ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (20387 44199 24128 0)) +;;;;;; (20501 3499 284800 0)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11230,8 +11237,8 @@ ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20387 -;;;;;; 44199 24128 0)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from mail/footnote.el (autoload 'footnote-mode "footnote" "\ @@ -11415,7 +11422,7 @@ ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (20415 53309 822770 0)) +;;;;;; (20501 3499 284800 0)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11573,7 +11580,7 @@ ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11644,8 +11651,8 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (20458 56750 -;;;;;; 651721 0)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (20503 45225 +;;;;;; 529939 0)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11789,7 +11796,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (20458 56750 651721 0)) +;;;;;; (20497 6436 957082 0)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11944,8 +11951,8 @@ ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png ;;;;;; gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header -;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (20355 -;;;;;; 10021 546955 0)) +;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (20495 +;;;;;; 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -12009,7 +12016,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (20458 56750 651721 0)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (20495 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12043,7 +12050,7 @@ ;;;*** ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12184,7 +12191,7 @@ ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (20458 56750 651721 0)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (20495 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12239,7 +12246,7 @@ ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (20355 10021 546955 0)) +;;;;;; "gnus/gnus-range.el" (20495 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12364,7 +12371,7 @@ ;;;*** ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" -;;;;;; (20458 56750 651721 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12375,7 +12382,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (20458 56750 651721 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12387,7 +12394,7 @@ ;;;*** ;;;### (autoloads (gnus-sync-install-hooks gnus-sync-initialize) -;;;;;; "gnus-sync" "gnus/gnus-sync.el" (20458 56750 651721 0)) +;;;;;; "gnus-sync" "gnus/gnus-sync.el" (20465 29989 57840 0)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12414,7 +12421,7 @@ ;;;*** ;;;### (autoloads (gnutls-min-prime-bits) "gnutls" "net/gnutls.el" -;;;;;; (20417 65331 139825 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12698,8 +12705,8 @@ ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20458 56750 -;;;;;; 651721 0)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12789,7 +12796,7 @@ ;;;### (autoloads (setf gv-define-simple-setter gv-define-setter ;;;;;; gv--defun-declaration gv-define-expander gv-letplace gv-get) -;;;;;; "gv" "emacs-lisp/gv.el" (20453 5437 764254 0)) +;;;;;; "gv" "emacs-lisp/gv.el" (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12896,7 +12903,7 @@ ;;;*** ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -13101,7 +13108,7 @@ ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories ;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 ;;;;;; find-lisp-object-file-name help-C-file-name describe-function) -;;;;;; "help-fns" "help-fns.el" (20458 56750 651721 0)) +;;;;;; "help-fns" "help-fns.el" (20497 6436 957082 0)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13198,7 +13205,7 @@ ;;;### (autoloads (help-bookmark-jump help-xref-on-pp help-insert-xref-button ;;;;;; help-xref-button help-make-xrefs help-buffer help-setup-xref ;;;;;; help-mode-finish help-mode-setup help-mode) "help-mode" "help-mode.el" -;;;;;; (20459 40320 865360 0)) +;;;;;; (20479 62884 77836 0)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13314,7 +13321,7 @@ ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (20420 41510 996439 0)) +;;;;;; "hexl.el" (20478 3673 653810 0)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13796,7 +13803,7 @@ ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (20355 10021 546955 0)) +;;;;;; "hippie-exp.el" (20495 51111 757560 0)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\ @@ -14115,8 +14122,8 @@ ;;;*** ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter -;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (20406 -;;;;;; 8611 875037 0)) +;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14142,7 +14149,7 @@ change its definition, you should explicitly call `ibuffer-recompile-formats'. -\(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)" nil (quote macro)) +\(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)" nil nil) (autoload 'define-ibuffer-sorter "ibuf-macs" "\ Define a method of sorting named NAME. @@ -14154,7 +14161,7 @@ buffer object, and `b' bound to another. BODY should return a non-nil value if and only if `a' is \"less than\" `b'. -\(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)" nil (quote macro)) +\(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)" nil nil) (autoload 'define-ibuffer-op "ibuf-macs" "\ Generate a function which operates on a buffer. @@ -14187,7 +14194,7 @@ COMPLEX means this function is special; see the source code of this macro for exactly what it does. -\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)" nil (quote macro)) +\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)" nil nil) (autoload 'define-ibuffer-filter "ibuf-macs" "\ Define a filter named NAME. @@ -14200,12 +14207,12 @@ will be evaluated with BUF bound to the buffer object, and QUALIFIER bound to the current value of the filter. -\(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" nil (quote macro)) +\(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" nil nil) ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (20383 47352 714562 935000)) +;;;;;; "ibuffer" "ibuffer.el" (20479 62884 77836 0)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14523,8 +14530,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20450 -;;;;;; 62630 628906 0)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20495 +;;;;;; 51111 757560 0)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -15016,7 +15023,7 @@ ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (20458 56750 651721 0)) +;;;;;; "image-dired" "image-dired.el" (20478 3673 653810 0)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -15217,7 +15224,7 @@ ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (20420 41510 996439 +;;;;;; image-mode) "image-mode" "image-mode.el" (20476 31768 298871 ;;;;;; 0)) ;;; Generated autoloads from image-mode.el @@ -15263,7 +15270,7 @@ ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (20393 22044 766544 +;;;;;; imenu-sort-function) "imenu" "imenu.el" (20476 31768 298871 ;;;;;; 0)) ;;; Generated autoloads from imenu.el @@ -15480,7 +15487,7 @@ ;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node ;;;;;; Info-mode info-finder info-apropos Info-index Info-directory ;;;;;; Info-on-current-buffer info-standalone info-emacs-bug info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (20458 56750 651721 +;;;;;; info info-other-window) "info" "info.el" (20476 31768 298871 ;;;;;; 0)) ;;; Generated autoloads from info.el @@ -15691,7 +15698,7 @@ ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20474 44971 970015 0)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15740,7 +15747,7 @@ ;;;### (autoloads (info-xref-docstrings info-xref-check-all-custom ;;;;;; info-xref-check-all info-xref-check) "info-xref" "info-xref.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20476 31768 298871 0)) ;;; Generated autoloads from info-xref.el (autoload 'info-xref-check "info-xref" "\ @@ -15999,9 +16006,8 @@ ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20486 36135 22104 0)) ;;; Generated autoloads from international/iso-transl.el - (or key-translation-map (setq key-translation-map (make-sparse-keymap))) (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) @@ -16238,8 +16244,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20387 -;;;;;; 44199 24128 0)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20495 +;;;;;; 51111 757560 0)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -16369,7 +16375,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20459 40320 865360 +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from progmodes/js.el @@ -16487,7 +16493,7 @@ ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item) -;;;;;; "kmacro" "kmacro.el" (20388 65061 302484 0)) +;;;;;; "kmacro" "kmacro.el" (20471 22929 875294 592000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16598,7 +16604,7 @@ ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (20355 10021 546955 0)) +;;;;;; "language/korea-util.el" (20501 3499 284800 0)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16613,7 +16619,7 @@ ;;;*** ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16830,8 +16836,8 @@ ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20399 -;;;;;; 35365 4050 0)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16915,36 +16921,40 @@ ;;;*** -;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (20399 35365 -;;;;;; 4050 0)) +;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (20477 21160 +;;;;;; 227853 0)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ Setup a buffer to enter a log message. -\\The buffer will be put in mode MODE or `log-edit-mode' -if MODE is nil. -If SETUP is non-nil, the buffer is then erased and `log-edit-hook' is run. -Mark and point will be set around the entire contents of the buffer so -that it is easy to kill the contents of the buffer with \\[kill-region]. -Once you're done editing the message, pressing \\[log-edit-done] will call -`log-edit-done' which will end up calling CALLBACK to do the actual commit. +The buffer is put in mode MODE or `log-edit-mode' if MODE is nil. +\\ +If SETUP is non-nil, erase the buffer and run `log-edit-hook'. +Set mark and point around the entire contents of the buffer, so +that it is easy to kill the contents of the buffer with +\\[kill-region]. Once the user is done editing the message, +invoking the command \\[log-edit-done] (`log-edit-done') will +call CALLBACK to do the actual commit. -PARAMS if non-nil is an alist. Possible keys and associated values: +PARAMS if non-nil is an alist of variables and buffer-local +values to give them in the Log Edit buffer. Possible keys and +associated values: `log-edit-listfun' -- function taking no arguments that returns the list of files that are concerned by the current operation (using relative names); `log-edit-diff-function' -- function taking no arguments that displays a diff of the files concerned by the current operation. + `vc-log-fileset' -- the VC fileset to be committed (if any). -If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the -log message and go back to the current buffer when done. Otherwise, it -uses the current buffer. +If BUFFER is non-nil `log-edit' will jump to that buffer, use it +to edit the log message and go back to the current buffer when +done. Otherwise, it uses the current buffer. \(fn CALLBACK &optional SETUP PARAMS BUFFER MODE &rest IGNORE)" nil nil) ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20477 +;;;;;; 21160 227853 0)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16981,8 +16991,8 @@ ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (20355 -;;;;;; 10021 546955 0)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17116,7 +17126,7 @@ ;;;*** ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el" -;;;;;; (20454 59685 195070 0)) +;;;;;; (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/macroexp.el (autoload 'macroexpand-all "macroexp" "\ @@ -17608,7 +17618,7 @@ ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (20390 20388 254308 0)) +;;;;;; (20504 6781 423358 0)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17719,7 +17729,7 @@ ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (20458 56750 651721 0)) +;;;;;; "gnus/message.el" (20501 3499 284800 0)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -18137,7 +18147,7 @@ ;;;*** ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight" -;;;;;; "midnight.el" (20355 10021 546955 0)) +;;;;;; "midnight.el" (20478 3673 653810 0)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18224,7 +18234,7 @@ ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files ;;;;;; multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup) -;;;;;; "misearch" "misearch.el" (20420 41510 996439 0)) +;;;;;; "misearch" "misearch.el" (20490 33188 850375 0)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18361,7 +18371,7 @@ ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (20355 10021 546955 0)) +;;;;;; "mm-url" "gnus/mm-url.el" (20495 51111 757560 0)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18596,7 +18606,7 @@ ;;;*** -;;;### (autoloads (mpc) "mpc" "mpc.el" (20378 29222 722320 0)) +;;;### (autoloads (mpc) "mpc" "mpc.el" (20476 31768 298871 0)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18617,7 +18627,7 @@ ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (20355 10021 546955 0)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (20476 31768 298871 0)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -19020,8 +19030,8 @@ ;;;*** -;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (20495 +;;;;;; 51111 757560 0)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -19251,7 +19261,7 @@ ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (20399 35365 4050 0)) +;;;;;; "novice" "novice.el" (20478 3673 653810 0)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19311,8 +19321,8 @@ ;;;*** -;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20439 -;;;;;; 5925 915283 0)) +;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -21638,7 +21648,7 @@ ;;;*** ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -21651,8 +21661,8 @@ ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20439 -;;;;;; 5925 915283 0)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -21728,7 +21738,7 @@ ;;;*** ;;;### (autoloads (pcase-let pcase-let* pcase) "pcase" "emacs-lisp/pcase.el" -;;;;;; (20453 5437 764254 0)) +;;;;;; (20497 6436 957082 0)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -21737,6 +21747,7 @@ UPatterns can take the following forms: _ matches anything. + SELFQUOTING matches itself. This includes keywords, numbers, and strings. SYMBOL matches anything and binds it to SYMBOL. (or UPAT...) matches if any of the patterns matches. (and UPAT...) matches if all the patterns match. @@ -21756,7 +21767,8 @@ PRED can take the form FUNCTION in which case it gets called with one argument. - (FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments. + (FUN ARG1 .. ARGN) in which case it gets called with an N+1'th argument + which is the value being matched. A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION). PRED patterns can refer to variables bound earlier in the pattern. E.g. you can match pairs where the cdr is larger than the car with a pattern @@ -21918,8 +21930,8 @@ ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20376 -;;;;;; 40834 914217 0)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20476 +;;;;;; 31768 298871 0)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -21978,7 +21990,7 @@ ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "vc/pcvs.el" (20454 59685 195070 0)) +;;;;;; "vc/pcvs.el" (20476 31768 298871 0)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -22053,8 +22065,8 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20476 31768 +;;;;;; 298871 0)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -22063,7 +22075,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (20365 17199 85293 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -22233,7 +22245,7 @@ ;;;*** -;;;### (autoloads (pong) "pong" "play/pong.el" (20355 10021 546955 +;;;### (autoloads (pong) "pong" "play/pong.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from play/pong.el @@ -22264,7 +22276,7 @@ ;;;### (autoloads (pp-macroexpand-last-sexp pp-eval-last-sexp pp-macroexpand-expression ;;;;;; pp-eval-expression pp pp-buffer pp-to-string) "pp" "emacs-lisp/pp.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -22332,7 +22344,7 @@ ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20501 3499 284800 0)) ;;; Generated autoloads from printing.el (autoload 'pr-interface "printing" "\ @@ -23232,14 +23244,31 @@ ;;;*** -;;;### (autoloads (python-mode) "python" "progmodes/python.el" (20453 -;;;;;; 38823 158957 0)) +;;;### (autoloads (python-mode run-python) "python" "progmodes/python.el" +;;;;;; (20504 35072 130543 0)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) (add-to-list 'interpreter-mode-alist (cons (purecopy "python") 'python-mode)) +(autoload 'run-python "python" "\ +Run an inferior Python process. +Input and output via buffer named after +`python-shell-buffer-name'. If there is a process already +running in that buffer, just switch to it. + +With argument, allows you to define CMD so you can edit the +command used to call the interpreter and define DEDICATED, so a +dedicated process for the current buffer is open. When numeric +prefix arg is other than 0 or 4 do not SHOW. + +Runs the hook `inferior-python-mode-hook' (after the +`comint-mode-hook' is run). (Type \\[describe-mode] in the +process buffer for a list of commands.) + +\(fn CMD &optional DEDICATED SHOW)" t nil) + (autoload 'python-mode "python" "\ Major mode for editing Python files. @@ -23275,7 +23304,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (20356 55829 180242 0)) +;;;;;; "international/quail.el" (20501 3499 284800 0)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -23506,8 +23535,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20355 -;;;;;; 10021 546955 0)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -23677,17 +23706,10 @@ ;;;### (autoloads (rectangle-number-lines clear-rectangle string-insert-rectangle ;;;;;; string-rectangle delete-whitespace-rectangle open-rectangle -;;;;;; insert-rectangle yank-rectangle kill-rectangle extract-rectangle -;;;;;; delete-extract-rectangle delete-rectangle) "rect" "rect.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; insert-rectangle yank-rectangle copy-rectangle-as-kill kill-rectangle +;;;;;; extract-rectangle delete-extract-rectangle delete-rectangle) +;;;;;; "rect" "rect.el" (20501 3499 284800 0)) ;;; Generated autoloads from rect.el - (define-key ctl-x-r-map "c" 'clear-rectangle) - (define-key ctl-x-r-map "k" 'kill-rectangle) - (define-key ctl-x-r-map "d" 'delete-rectangle) - (define-key ctl-x-r-map "y" 'yank-rectangle) - (define-key ctl-x-r-map "o" 'open-rectangle) - (define-key ctl-x-r-map "t" 'string-rectangle) - (define-key ctl-x-r-map "N" 'rectangle-number-lines) (autoload 'delete-rectangle "rect" "\ Delete (don't save) text in the region-rectangle. @@ -23734,6 +23756,11 @@ \(fn START END &optional FILL)" t nil) +(autoload 'copy-rectangle-as-kill "rect" "\ +Copy the region-rectangle and save it as the last killed one. + +\(fn START END)" t nil) + (autoload 'yank-rectangle "rect" "\ Yank the last killed rectangle with upper left corner at point. @@ -23815,8 +23842,8 @@ ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -23837,8 +23864,8 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20355 10021 -;;;;;; 546955 0)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20499 48164 +;;;;;; 310488 0)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -23986,8 +24013,8 @@ ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20498 +;;;;;; 27300 867875 0)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -24592,7 +24619,7 @@ ;;;*** ;;;### (autoloads (robin-use-package robin-modify-package robin-define-package) -;;;;;; "robin" "international/robin.el" (20427 14766 970343 0)) +;;;;;; "robin" "international/robin.el" (20501 3499 284800 0)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -24664,7 +24691,7 @@ ;;;*** ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el" -;;;;;; (20459 40320 865360 0)) +;;;;;; (20502 63903 34842 0)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -24695,7 +24722,7 @@ ;;;*** ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el" -;;;;;; (20375 53029 572236 0)) +;;;;;; (20490 33188 850375 0)) ;;; Generated autoloads from progmodes/ruby-mode.el (autoload 'ruby-mode "ruby-mode" "\ @@ -25177,7 +25204,7 @@ ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (20464 9124 585807 +;;;### (autoloads nil "secrets" "net/secrets.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) @@ -25240,7 +25267,7 @@ ;;;;;; mail-personal-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-interactive ;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) -;;;;;; "sendmail" "mail/sendmail.el" (20417 65331 139825 0)) +;;;;;; "sendmail" "mail/sendmail.el" (20501 3499 284800 0)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -25522,8 +25549,8 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (20457 -;;;;;; 35879 688143 0)) +;;;;;; server-force-delete server-start) "server" "server.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -25590,7 +25617,7 @@ ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (20459 40320 865360 0)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (20493 9382 687578 0)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -25609,7 +25636,7 @@ ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (20427 14766 970343 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -25675,7 +25702,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (20397 18394 841411 0)) +;;;;;; (20487 57003 603251 0)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -25829,7 +25856,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (20402 36105 904047 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -25877,8 +25904,8 @@ ;;;*** -;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20459 -;;;;;; 40320 865360 0)) +;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20486 +;;;;;; 36135 22104 0)) ;;; Generated autoloads from gnus/shr.el (autoload 'shr-insert-document "shr" "\ @@ -25890,8 +25917,9 @@ ;;;*** -;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (20355 10021 546955 0)) +;;;### (autoloads (sieve-upload-and-kill sieve-upload-and-bury sieve-upload +;;;;;; sieve-manage) "sieve" "gnus/sieve.el" (20487 57003 603251 +;;;;;; 0)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -25909,10 +25937,15 @@ \(fn &optional NAME)" t nil) +(autoload 'sieve-upload-and-kill "sieve" "\ + + +\(fn &optional NAME)" t nil) + ;;;*** ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20487 57003 603251 0)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -26090,7 +26123,7 @@ ;;;*** ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff) -;;;;;; "smerge-mode" "vc/smerge-mode.el" (20415 23587 118149 0)) +;;;;;; "smerge-mode" "vc/smerge-mode.el" (20476 31768 298871 0)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -26151,7 +26184,7 @@ ;;;*** -;;;### (autoloads (snake) "snake" "play/snake.el" (20355 10021 546955 +;;;### (autoloads (snake) "snake" "play/snake.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from play/snake.el @@ -26176,7 +26209,7 @@ ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -26504,7 +26537,7 @@ ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (20434 17809 692608 0)) +;;;;;; "speedbar.el" (20497 6436 957082 0)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -26548,7 +26581,7 @@ ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-connect ;;;;;; sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20480 38535 248706 0)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -27084,8 +27117,8 @@ ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (20427 -;;;;;; 14766 970343 0)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -27977,8 +28010,8 @@ ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20387 44199 -;;;;;; 24128 0)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -28077,7 +28110,7 @@ ;;;*** ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el" -;;;;;; (20461 32935 300400 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -28167,8 +28200,8 @@ ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from play/tetris.el (autoload 'tetris "tetris" "\ @@ -28199,7 +28232,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (20458 56750 651721 0)) +;;;;;; (20485 15269 390836 0)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -28541,7 +28574,7 @@ ;;;*** ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote) -;;;;;; "texinfo" "textmodes/texinfo.el" (20355 10021 546955 0)) +;;;;;; "texinfo" "textmodes/texinfo.el" (20478 3673 653810 0)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -29454,7 +29487,7 @@ ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (20355 10021 546955 0)) +;;;;;; "trace" "emacs-lisp/trace.el" (20485 15269 390836 0)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer (purecopy "*trace-output*") "\ @@ -29491,7 +29524,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (20447 37 83194 0)) +;;;;;; "net/tramp.el" (20471 14012 248888 0)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29923,7 +29956,7 @@ ;;;;;; ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string ;;;;;; ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region ;;;;;; ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize" -;;;;;; "international/ucs-normalize.el" (20355 10021 546955 0)) +;;;;;; "international/ucs-normalize.el" (20476 31768 298871 0)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -30043,7 +30076,7 @@ ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (20450 62630 628906 0)) +;;;;;; "url/url.el" (20478 3673 653810 0)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -30165,15 +30198,34 @@ ;;;*** -;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (20355 10021 546955 0)) +;;;### (autoloads (url-dav-vc-registered url-dav-request url-dav-supported-p) +;;;;;; "url-dav" "url/url-dav.el" (20501 3499 284800 0)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ - +Return WebDAV protocol version supported by URL. +Returns nil if WebDAV is not supported. \(fn URL)" nil nil) +(autoload 'url-dav-request "url-dav" "\ +Perform WebDAV operation METHOD on URL. Return the parsed responses. +Automatically creates an XML request body if TAG is non-nil. +BODY is the XML document fragment to be enclosed by . + +DEPTH is how deep the request should propagate. Default is 0, meaning +it should apply only to URL. A negative number means to use +`Infinity' for the depth. Not all WebDAV servers support this depth +though. + +HEADERS is an assoc list of extra headers to send in the request. + +NAMESPACES is an assoc list of (NAMESPACE . EXPANSION), and these are +added to the element. The DAV=DAV: namespace is automatically +added to this list, so most requests can just pass in nil. + +\(fn URL METHOD TAG BODY &optional DEPTH HEADERS NAMESPACES)" nil nil) + (autoload 'url-dav-vc-registered "url-dav" "\ @@ -30181,8 +30233,8 @@ ;;;*** -;;;### (autoloads (url-file) "url-file" "url/url-file.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (url-file) "url-file" "url/url-file.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -30193,7 +30245,7 @@ ;;;*** ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw" -;;;;;; "url/url-gw.el" (20355 10021 546955 0)) +;;;;;; "url/url-gw.el" (20478 3673 653810 0)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -30268,7 +30320,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (20415 53309 822770 +;;;;;; url-http) "url-http" "url/url-http.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from url/url-http.el @@ -30380,7 +30432,7 @@ ;;;*** ;;;### (autoloads (url-data url-generic-emulator-loader url-info -;;;;;; url-man) "url-misc" "url/url-misc.el" (20355 10021 546955 +;;;;;; url-man) "url-misc" "url/url-misc.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from url/url-misc.el @@ -30471,7 +30523,7 @@ ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (20395 38306 463596 0)) +;;;;;; "url/url-parse.el" (20478 3673 653810 0)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -30523,7 +30575,7 @@ ;;;*** ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -30534,7 +30586,7 @@ ;;;*** ;;;### (autoloads (url-queue-retrieve) "url-queue" "url/url-queue.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -30554,8 +30606,8 @@ ;;;;;; url-percentage url-display-percentage url-pretty-length url-strip-leading-spaces ;;;;;; url-eat-trailing-space url-get-normalized-date url-lazy-message ;;;;;; url-normalize-url url-insert-entities-in-string url-parse-args -;;;;;; url-debug url-debug) "url-util" "url/url-util.el" (20402 -;;;;;; 11562 85788 0)) +;;;;;; url-debug url-debug) "url-util" "url/url-util.el" (20478 +;;;;;; 3673 653810 0)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -30717,7 +30769,7 @@ ;;;*** ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock) -;;;;;; "userlock" "userlock.el" (20355 10021 546955 0)) +;;;;;; "userlock" "userlock.el" (20490 33188 850375 0)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -30815,8 +30867,8 @@ ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers ;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff ;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20421 -;;;;;; 62373 255269 0)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20501 +;;;;;; 3499 284800 0)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -30893,7 +30945,7 @@ The optional argument NOT-URGENT non-nil means it is ok to say no to saving the buffer. -\(fn HISTORIC &optional NOT-URGENT)" t nil) +\(fn &optional HISTORIC NOT-URGENT)" t nil) (autoload 'vc-version-ediff "vc" "\ Show differences between revisions of the fileset in the @@ -31094,7 +31146,7 @@ ;;;*** ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el" -;;;;;; (20356 55829 180242 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -31131,7 +31183,7 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20427 14766 970343 +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) @@ -31142,7 +31194,7 @@ ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20406 55122 186927 +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20489 12324 656827 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-bzr.el @@ -31159,7 +31211,7 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20427 14766 970343 +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) @@ -31171,7 +31223,7 @@ ;;;*** -;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20377 8374 887348 +;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-dir.el @@ -31197,7 +31249,7 @@ ;;;*** ;;;### (autoloads (vc-do-command) "vc-dispatcher" "vc/vc-dispatcher.el" -;;;;;; (20364 45187 886974 270000)) +;;;;;; (20489 12324 656827 0)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -31220,7 +31272,7 @@ ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20464 9124 585807 +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20495 51111 757560 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) @@ -31232,7 +31284,7 @@ ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20377 8374 887348 0)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20489 12324 656827 0)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -31243,7 +31295,7 @@ ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20427 14766 970343 +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20478 3673 653810 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-mtn.el @@ -31261,7 +31313,7 @@ ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc/vc-rcs.el" -;;;;;; (20459 40320 865360 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -31504,7 +31556,7 @@ ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (20427 14766 970343 0)) +;;;;;; (20495 51111 757560 0)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -31794,7 +31846,7 @@ (mra) architecture is selected. If another architecture is desired, it can be marked as most-recently-analyzed (speedbar menu) before generating the configuration. - + Note: Configurations of subcomponents (i.e. hierarchical configuration declarations) are currently not considered when displaying configurations in speedbar. @@ -32433,7 +32485,7 @@ ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20501 3499 284800 0)) ;;; Generated autoloads from emulation/viper.el (autoload 'toggle-viper-mode "viper" "\ @@ -32540,7 +32592,7 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (20452 17962 966427 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from wdired.el (autoload 'wdired-change-to-wdired-mode "wdired" "\ @@ -32610,8 +32662,8 @@ ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region ;;;;;; whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options ;;;;;; global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode -;;;;;; whitespace-mode) "whitespace" "whitespace.el" (20434 17809 -;;;;;; 692608 0)) +;;;;;; whitespace-mode) "whitespace" "whitespace.el" (20495 51111 +;;;;;; 757560 0)) ;;; Generated autoloads from whitespace.el (autoload 'whitespace-mode "whitespace" "\ @@ -33010,8 +33062,8 @@ ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (20355 10021 -;;;;;; 546955 0)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -33084,8 +33136,8 @@ ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (20355 -;;;;;; 10021 546955 0)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (20495 +;;;;;; 51111 757560 0)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -33138,7 +33190,7 @@ ;;;*** ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el" -;;;;;; (20453 5437 764254 0)) +;;;;;; (20478 3673 653810 0)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -33157,7 +33209,7 @@ ;;;*** ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file -;;;;;; woman woman-locale) "woman" "woman.el" (20458 56750 651721 +;;;;;; woman woman-locale) "woman" "woman.el" (20504 6781 423358 ;;;;;; 0)) ;;; Generated autoloads from woman.el @@ -33319,8 +33371,8 @@ ;;;*** -;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20464 9124 -;;;;;; 585807 0)) +;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20478 3673 +;;;;;; 653810 0)) ;;; Generated autoloads from net/xesam.el (autoload 'xesam-search "xesam" "\ @@ -33340,27 +33392,59 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (20464 9124 585807 0)) +;;;;;; (20499 48164 310488 0)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ Parse the well-formed XML file FILE. Return the top node with all its children. If PARSE-DTD is non-nil, the DTD is parsed rather than skipped. -If PARSE-NS is non-nil, then QNAMES are expanded. + +If PARSE-NS is non-nil, then QNAMES are expanded. By default, +the variable `xml-default-ns' is the mapping from namespaces to +URIs, and expanded names will be returned as a cons + + (\"namespace:\" . \"foo\"). + +If PARSE-NS is an alist, it will be used as the mapping from +namespace to URIs instead. + +If it is the symbol 'symbol-qnames, expanded names will be +returned as a plain symbol 'namespace:foo instead of a cons. + +Both features can be combined by providing a cons cell + + (symbol-qnames . ALIST). \(fn FILE &optional PARSE-DTD PARSE-NS)" nil nil) (autoload 'xml-parse-region "xml" "\ Parse the region from BEG to END in BUFFER. +Return the XML parse tree, or raise an error if the region does +not contain well-formed XML. + +If BEG is nil, it defaults to `point-min'. +If END is nil, it defaults to `point-max'. If BUFFER is nil, it defaults to the current buffer. -Returns the XML list for the region, or raises an error if the region -is not well-formed XML. -If PARSE-DTD is non-nil, the DTD is parsed rather than skipped, -and returned as the first element of the list. -If PARSE-NS is non-nil, then QNAMES are expanded. - -\(fn BEG END &optional BUFFER PARSE-DTD PARSE-NS)" nil nil) +If PARSE-DTD is non-nil, parse the DTD and return it as the first +element of the list. +If PARSE-NS is non-nil, then QNAMES are expanded. By default, +the variable `xml-default-ns' is the mapping from namespaces to +URIs, and expanded names will be returned as a cons + + (\"namespace:\" . \"foo\"). + +If PARSE-NS is an alist, it will be used as the mapping from +namespace to URIs instead. + +If it is the symbol 'symbol-qnames, expanded names will be +returned as a plain symbol 'namespace:foo instead of a cons. + +Both features can be combined by providing a cons cell + + (symbol-qnames . ALIST). + +\(fn &optional BEG END BUFFER PARSE-DTD PARSE-NS)" nil nil) ;;;*** @@ -33383,8 +33467,8 @@ ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (20485 +;;;;;; 15269 390836 0)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -33473,34 +33557,35 @@ ;;;;;; "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el" ;;;;;; "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el" ;;;;;; "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el" -;;;;;; "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el" -;;;;;; "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el" -;;;;;; "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el" -;;;;;; "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el" -;;;;;; "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el" -;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el" -;;;;;; "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el" -;;;;;; "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el" -;;;;;; "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el" -;;;;;; "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el" -;;;;;; "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" -;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" -;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el" -;;;;;; "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el" -;;;;;; "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el" -;;;;;; "cedet/cedet.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" -;;;;;; "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el" -;;;;;; "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el" -;;;;;; "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/locate.el" -;;;;;; "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" -;;;;;; "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" -;;;;;; "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" -;;;;;; "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" -;;;;;; "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el" -;;;;;; "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el" -;;;;;; "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el" -;;;;;; "cedet/ede/system.el" "cedet/ede/util.el" "cedet/inversion.el" -;;;;;; "cedet/pulse.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" +;;;;;; "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el" +;;;;;; "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el" +;;;;;; "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el" +;;;;;; "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el" +;;;;;; "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el" +;;;;;; "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el" +;;;;;; "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el" +;;;;;; "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el" +;;;;;; "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el" +;;;;;; "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el" +;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el" +;;;;;; "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el" +;;;;;; "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el" +;;;;;; "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el" +;;;;;; "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el" +;;;;;; "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/auto.el" +;;;;;; "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" "cedet/ede/cpp-root.el" +;;;;;; "cedet/ede/custom.el" "cedet/ede/dired.el" "cedet/ede/emacs.el" +;;;;;; "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el" +;;;;;; "cedet/ede/loaddefs.el" "cedet/ede/locate.el" "cedet/ede/make.el" +;;;;;; "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" "cedet/ede/pmake.el" +;;;;;; "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" +;;;;;; "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" +;;;;;; "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" +;;;;;; "cedet/ede/proj-shared.el" "cedet/ede/proj.el" "cedet/ede/project-am.el" +;;;;;; "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el" +;;;;;; "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el" +;;;;;; "cedet/ede/util.el" "cedet/inversion.el" "cedet/pulse.el" +;;;;;; "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" ;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" ;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" ;;;;;; "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el" @@ -33520,13 +33605,13 @@ ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" -;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" -;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" -;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" -;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" -;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" -;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" -;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" +;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" +;;;;;; "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el" +;;;;;; "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el" +;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" +;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" +;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" @@ -33538,11 +33623,11 @@ ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" -;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" -;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" -;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" -;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el" +;;;;;; "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el" +;;;;;; "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" +;;;;;; "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el" +;;;;;; "cus-dep.el" "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" +;;;;;; "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el" ;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" ;;;;;; "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el" ;;;;;; "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" @@ -33563,31 +33648,31 @@ ;;;;;; "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el" ;;;;;; "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el" ;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" -;;;;;; "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el" -;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" -;;;;;; "eshell/esh-var.el" "ezimage.el" "foldout.el" "format-spec.el" -;;;;;; "fringe.el" "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" -;;;;;; "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el" -;;;;;; "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el" -;;;;;; "gnus/gnus-ems.el" "gnus/gnus-int.el" "gnus/gnus-logic.el" -;;;;;; "gnus/gnus-mh.el" "gnus/gnus-salt.el" "gnus/gnus-score.el" -;;;;;; "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-topic.el" -;;;;;; "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el" -;;;;;; "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el" -;;;;;; "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el" -;;;;;; "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-archive.el" -;;;;;; "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-util.el" -;;;;;; "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/nnagent.el" -;;;;;; "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el" -;;;;;; "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el" -;;;;;; "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmairix.el" "gnus/nnmbox.el" -;;;;;; "gnus/nnmh.el" "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" -;;;;;; "gnus/nnrss.el" "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el" -;;;;;; "gnus/nnweb.el" "gnus/registry.el" "gnus/rfc1843.el" "gnus/rfc2045.el" -;;;;;; "gnus/rfc2047.el" "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/rtree.el" -;;;;;; "gnus/shr-color.el" "gnus/sieve-manage.el" "gnus/smime.el" -;;;;;; "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" -;;;;;; "ibuf-ext.el" "international/cp51932.el" "international/eucjp-ms.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el" +;;;;;; "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el" +;;;;;; "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "foldout.el" +;;;;;; "format-spec.el" "fringe.el" "generic-x.el" "gnus/compface.el" +;;;;;; "gnus/gnus-async.el" "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" +;;;;;; "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el" +;;;;;; "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-int.el" +;;;;;; "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el" +;;;;;; "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el" +;;;;;; "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el" +;;;;;; "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" +;;;;;; "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el" +;;;;;; "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el" +;;;;;; "gnus/mm-archive.el" "gnus/mm-bodies.el" "gnus/mm-decode.el" +;;;;;; "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" +;;;;;; "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" +;;;;;; "gnus/nneething.el" "gnus/nngateway.el" "gnus/nnheader.el" +;;;;;; "gnus/nnimap.el" "gnus/nnir.el" "gnus/nnmail.el" "gnus/nnmaildir.el" +;;;;;; "gnus/nnmairix.el" "gnus/nnmbox.el" "gnus/nnmh.el" "gnus/nnnil.el" +;;;;;; "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el" "gnus/nnspool.el" +;;;;;; "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el" "gnus/registry.el" +;;;;;; "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2104.el" +;;;;;; "gnus/rfc2231.el" "gnus/rtree.el" "gnus/shr-color.el" "gnus/sieve-manage.el" +;;;;;; "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el" +;;;;;; "hfy-cmap.el" "ibuf-ext.el" "international/cp51932.el" "international/eucjp-ms.el" ;;;;;; "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el" ;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "international/uni-bidi.el" ;;;;;; "international/uni-category.el" "international/uni-combining.el" @@ -33667,7 +33752,7 @@ ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el" -;;;;;; "w32-vars.el" "x-dnd.el") (20464 9462 647923 919000)) +;;;;;; "w32-vars.el" "x-dnd.el") (20505 765 716386 793000)) ;;;*** ------------------------------------------------------------ revno: 109362 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 06:17:30 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-07-29 10:19:06 +0000 +++ autogen/Makefile.in 2012-08-01 10:17:30 +0000 @@ -733,7 +733,6 @@ STRIP = @STRIP@ SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -S_FILE = @S_FILE@ TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ TERMCAP_OBJ = @TERMCAP_OBJ@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ === modified file 'autogen/config.in' --- autogen/config.in 2012-07-31 23:03:04 +0000 +++ autogen/config.in 2012-08-01 10:17:30 +0000 @@ -117,6 +117,9 @@ /* Name of the default sound device. */ #undef DEFAULT_SOUND_DEVICE +/* Character that separates a device in a file name. */ +#undef DEVICE_SEP + /* Define to 1 for DGUX with . */ #undef DGUX @@ -142,6 +145,10 @@ */ #undef FIRST_PTY_LETTER +/* Define if the float library doesn't handle errors by either setting errno, + or signaling SIGFPE/SIGILL. */ +#undef FLOAT_CHECK_DOMAIN + /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG @@ -514,6 +521,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if you have the functions acosh, asinh, and atanh. */ +#undef HAVE_INVERSE_HYPERBOLIC + /* Define to 1 if you have the jpeg library (-ljpeg). */ #undef HAVE_JPEG @@ -1091,12 +1101,24 @@ /* Define if the system is HPUX. */ #undef HPUX +/* This is substituted when $TERM is "internal". */ +#undef INTERNAL_TERMINAL + /* Define to read input using SIGIO. */ #undef INTERRUPT_INPUT /* Define if the system is IRIX. */ #undef IRIX6_5 +/* Returns true if character is any form of separator. */ +#undef IS_ANY_SEP + +/* Returns true if character is a device separator. */ +#undef IS_DEVICE_SEP + +/* Returns true if character is a directory separator. */ +#undef IS_DIRECTORY_SEP + /* Define to support Kerberos-authenticated POP mail retrieval. */ #undef KERBEROS @@ -1504,7 +1526,8 @@ /* Some platforms redefine this. */ #undef _setjmp -/* Define to the used os dependent file. */ +/* Some platforms that do not use configure define this to include extra + configuration information. */ #undef config_opsysfile /* A replacement for va_copy, if needed. */ === modified file 'autogen/configure' --- autogen/configure 2012-07-31 23:03:04 +0000 +++ autogen/configure 2012-08-01 10:17:30 +0000 @@ -1119,7 +1119,6 @@ ns_appresdir ns_appbindir ns_appdir -S_FILE X_TOOLKIT_TYPE GNUSTEP_CFLAGS C_SWITCH_X_SITE @@ -8169,8 +8168,8 @@ START_FILES='pre-crt0.o' ;; freebsd ) - LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' - START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' + LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o' + START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' SYSTEM_TYPE=berkeley-unix ;; gnu-linux | gnu-kfreebsd ) @@ -14649,6 +14648,10 @@ $as_echo "#define CLASH_DETECTION 1" >>confdefs.h + + + + ## Note: PTYs are broken on darwin <6. Use at your own risk. $as_echo "#define HAVE_PTYS 1" >>confdefs.h @@ -14659,6 +14662,8 @@ + + $as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h @@ -14677,6 +14682,21 @@ + +$as_echo "#define IS_DEVICE_SEP(_c_) 0" >>confdefs.h + + + +$as_echo "#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)" >>confdefs.h + + + +$as_echo "#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))" >>confdefs.h + + + + + case $opsys in aix4-2) if test x$ac_cv_lib_Xmu_XmuConvertStandardSelection != xyes; then @@ -15459,8 +15479,6 @@ ## Used in lwlib/Makefile.in. -S_FILE= - @@ -15478,11 +15496,7 @@ #define EMACS_CONFIG_OPTIONS "${ac_configure_args}" _ACEOF -if test -z "No longer used"; then - -$as_echo "#define config_opsysfile /**/" >>confdefs.h - -fi + XMENU_OBJ= XOBJ= ------------------------------------------------------------ revno: 109361 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2012-08-01 12:49:28 +0400 message: Use INTERNAL_FIELD for conses and overlays. * src/lisp.h (struct Lisp_Cons): Use INTERNAL_FIELD. Remove obsolete comment. (MVAR): New macro. (struct Lisp_Overlay): Use INTERNAL_FIELD. * src/alloc.c, src/buffer.c, src/buffer.h, src/fns.c: Adjust users. * admin/coccinelle/overlay.cocci: Semantic patch to replace direct access to Lisp_Object members of struct Lisp_Overlay to MVAR. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-08-01 07:57:09 +0000 +++ admin/ChangeLog 2012-08-01 08:49:28 +0000 @@ -1,5 +1,10 @@ 2012-08-01 Dmitry Antipov + * coccinelle/overlay.cocci: Semantic patch to replace direct + access to Lisp_Object members of struct Lisp_Overlay to MVAR. + +2012-08-01 Dmitry Antipov + * coccinelle/symbol.cocci: Semantic patch to replace direct access to Lisp_Object members of struct Lisp_Symbol to SVAR. === added file 'admin/coccinelle/overlay.cocci' --- admin/coccinelle/overlay.cocci 1970-01-01 00:00:00 +0000 +++ admin/coccinelle/overlay.cocci 2012-08-01 08:49:28 +0000 @@ -0,0 +1,28 @@ +// Change direct access to Lisp_Object fields of struct +// Lisp_Overlay to MVAR. Beginning M denotes "misc", and +// MVAR is likely to be used for other second-class objects. +@@ +struct Lisp_Overlay *V; +Lisp_Object O; +@@ +( +- V->start ++ MVAR (V, start) +| +- V->end ++ MVAR (V, end) +| +- V->plist ++ MVAR (V, plist) + +| + +- XOVERLAY (O)->start ++ MVAR (XOVERLAY (O), start) +| +- XOVERLAY (O)->end ++ MVAR (XOVERLAY (O), end) +| +- XOVERLAY (O)->plist ++ MVAR (XOVERLAY (O), plist) +) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 07:57:09 +0000 +++ src/ChangeLog 2012-08-01 08:49:28 +0000 @@ -1,5 +1,14 @@ 2012-08-01 Dmitry Antipov + Use INTERNAL_FIELD for conses and overlays. + * lisp.h (struct Lisp_Cons): Use INTERNAL_FIELD. + Remove obsolete comment. + (MVAR): New macro. + (struct Lisp_Overlay): Use INTERNAL_FIELD. + * alloc.c, buffer.c, buffer.h, fns.c: Adjust users. + +2012-08-01 Dmitry Antipov + Use INTERNAL_FIELD for symbols. * lisp.h (SVAR): New macro. Adjust users. * alloc.c, bytecode.c, cmds.c, data.c, doc.c, eval.c: === modified file 'src/alloc.c' --- src/alloc.c 2012-08-01 07:57:09 +0000 +++ src/alloc.c 2012-08-01 08:49:28 +0000 @@ -2686,7 +2686,7 @@ { ptr->u.chain = cons_free_list; #if GC_MARK_STACK - ptr->car = Vdead; + CVAR (ptr, car) = Vdead; #endif cons_free_list = ptr; consing_since_gc -= sizeof *ptr; @@ -4295,7 +4295,7 @@ && offset < (CONS_BLOCK_SIZE * sizeof b->conses[0]) && (b != cons_block || offset / sizeof b->conses[0] < cons_block_index) - && !EQ (((struct Lisp_Cons *) p)->car, Vdead)); + && !EQ (CVAR ((struct Lisp_Cons *) p, car), Vdead)); } else return 0; @@ -5837,9 +5837,9 @@ for (; ptr && !ptr->gcmarkbit; ptr = ptr->next) { ptr->gcmarkbit = 1; - mark_object (ptr->start); - mark_object (ptr->end); - mark_object (ptr->plist); + mark_object (MVAR (ptr, start)); + mark_object (MVAR (ptr, end)); + mark_object (MVAR (ptr, plist)); } } @@ -6169,14 +6169,14 @@ CHECK_ALLOCATED_AND_LIVE (live_cons_p); CONS_MARK (ptr); /* If the cdr is nil, avoid recursion for the car. */ - if (EQ (ptr->u.cdr, Qnil)) + if (EQ (CVAR (ptr, u.cdr), Qnil)) { - obj = ptr->car; + obj = CVAR (ptr, car); cdr_count = 0; goto loop; } - mark_object (ptr->car); - obj = ptr->u.cdr; + mark_object (CVAR (ptr, car)); + obj = CVAR (ptr, u.cdr); cdr_count++; if (cdr_count == mark_object_loop_halt) abort (); @@ -6325,7 +6325,7 @@ cblk->conses[pos].u.chain = cons_free_list; cons_free_list = &cblk->conses[pos]; #if GC_MARK_STACK - cons_free_list->car = Vdead; + CVAR (cons_free_list, car) = Vdead; #endif } else === modified file 'src/buffer.c' --- src/buffer.c 2012-08-01 05:11:36 +0000 +++ src/buffer.c 2012-08-01 08:49:28 +0000 @@ -417,17 +417,17 @@ Lisp_Object overlay, start, end; struct Lisp_Marker *m; - eassert (MARKERP (list->start)); - m = XMARKER (list->start); + eassert (MARKERP (MVAR (list, start))); + m = XMARKER (MVAR (list, start)); start = build_marker (b, m->charpos, m->bytepos); XMARKER (start)->insertion_type = m->insertion_type; - eassert (MARKERP (list->end)); - m = XMARKER (list->end); + eassert (MARKERP (MVAR (list, end))); + m = XMARKER (MVAR (list, end)); end = build_marker (b, m->charpos, m->bytepos); XMARKER (end)->insertion_type = m->insertion_type; - overlay = build_overlay (start, end, Fcopy_sequence (list->plist)); + overlay = build_overlay (start, end, Fcopy_sequence (MVAR (list, plist))); if (tail) tail = tail->next = XOVERLAY (overlay); else @@ -657,10 +657,11 @@ static void drop_overlay (struct buffer *b, struct Lisp_Overlay *ov) { - eassert (b == XBUFFER (Fmarker_buffer (ov->start))); - modify_overlay (b, marker_position (ov->start), marker_position (ov->end)); - Fset_marker (ov->start, Qnil, Qnil); - Fset_marker (ov->end, Qnil, Qnil); + eassert (b == XBUFFER (Fmarker_buffer (MVAR (ov, start)))); + modify_overlay (b, marker_position (MVAR (ov, start)), + marker_position (MVAR (ov, end))); + Fset_marker (MVAR (ov, start), Qnil, Qnil); + Fset_marker (MVAR (ov, end), Qnil, Qnil); } @@ -3886,7 +3887,7 @@ { CHECK_OVERLAY (overlay); - return Fcopy_sequence (XOVERLAY (overlay)->plist); + return Fcopy_sequence (MVAR (XOVERLAY (overlay), plist)); } @@ -4062,7 +4063,7 @@ (Lisp_Object overlay, Lisp_Object prop) { CHECK_OVERLAY (overlay); - return lookup_char_property (XOVERLAY (overlay)->plist, prop, 0); + return lookup_char_property (MVAR (XOVERLAY (overlay), plist), prop, 0); } DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, @@ -4077,7 +4078,7 @@ buffer = Fmarker_buffer (OVERLAY_START (overlay)); - for (tail = XOVERLAY (overlay)->plist; + for (tail = MVAR (XOVERLAY (overlay), plist); CONSP (tail) && CONSP (XCDR (tail)); tail = XCDR (XCDR (tail))) if (EQ (XCAR (tail), prop)) @@ -4088,8 +4089,8 @@ } /* It wasn't in the list, so add it to the front. */ changed = !NILP (value); - XOVERLAY (overlay)->plist - = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); + MVAR (XOVERLAY (overlay), plist) + = Fcons (prop, Fcons (value, MVAR (XOVERLAY (overlay), plist))); found: if (! NILP (buffer)) { === modified file 'src/buffer.h' --- src/buffer.h 2012-07-31 12:36:19 +0000 +++ src/buffer.h 2012-08-01 08:49:28 +0000 @@ -986,15 +986,15 @@ /* Return the marker that stands for where OV starts in the buffer. */ -#define OVERLAY_START(OV) (XOVERLAY (OV)->start) +#define OVERLAY_START(OV) MVAR (XOVERLAY (OV), start) /* Return the marker that stands for where OV ends in the buffer. */ -#define OVERLAY_END(OV) (XOVERLAY (OV)->end) +#define OVERLAY_END(OV) MVAR (XOVERLAY (OV), end) /* Return the plist of overlay OV. */ -#define OVERLAY_PLIST(OV) XOVERLAY ((OV))->plist +#define OVERLAY_PLIST(OV) MVAR (XOVERLAY (OV), plist) /* Return the actual buffer position for the marker P. We assume you know which buffer it's pointing into. */ === modified file 'src/fns.c' --- src/fns.c 2012-08-01 07:57:09 +0000 +++ src/fns.c 2012-08-01 08:49:28 +0000 @@ -2053,8 +2053,8 @@ || !internal_equal (OVERLAY_END (o1), OVERLAY_END (o2), depth + 1, props)) return 0; - o1 = XOVERLAY (o1)->plist; - o2 = XOVERLAY (o2)->plist; + o1 = MVAR (XOVERLAY (o1), plist); + o2 = MVAR (XOVERLAY (o2), plist); goto tail_recurse; } if (MARKERP (o1)) === modified file 'src/lisp.h' --- src/lisp.h 2012-08-01 07:57:09 +0000 +++ src/lisp.h 2012-08-01 08:49:28 +0000 @@ -637,17 +637,22 @@ #define CHECK_STRING_OR_BUFFER(x) \ CHECK_TYPE (STRINGP (x) || BUFFERP (x), Qbuffer_or_string_p, x) - -/* In a cons, the markbit of the car is the gc mark bit */ +/* Most code should use this macro to + access Lisp fields in struct Lisp_Cons. */ + +#define CVAR(cons, field) ((cons)->INTERNAL_FIELD (field)) struct Lisp_Cons { - /* Please do not use the names of these elements in code other - than the core lisp implementation. Use XCAR and XCDR below. */ - Lisp_Object car; + /* Car of this cons cell. */ + Lisp_Object INTERNAL_FIELD (car); + union { - Lisp_Object cdr; + /* Cdr of this cons cell. */ + Lisp_Object INTERNAL_FIELD (cdr); + + /* Used to chain conses on a free list. */ struct Lisp_Cons *chain; } u; }; @@ -659,8 +664,8 @@ fields are not accessible as lvalues. (What if we want to switch to a copying collector someday? Cached cons cell field addresses may be invalidated at arbitrary points.) */ -#define XCAR_AS_LVALUE(c) (XCONS ((c))->car) -#define XCDR_AS_LVALUE(c) (XCONS ((c))->u.cdr) +#define XCAR_AS_LVALUE(c) (CVAR (XCONS (c), car)) +#define XCDR_AS_LVALUE(c) (CVAR (XCONS (c), u.cdr)) /* Use these from normal code. */ #define XCAR(c) LISP_MAKE_RVALUE (XCAR_AS_LVALUE (c)) @@ -1261,7 +1266,11 @@ #define DEFAULT_REHASH_SIZE 1.5 - +/* Most code should use this macro to access + Lisp fields in a different misc objects. */ + +#define MVAR(misc, field) ((misc)->INTERNAL_FIELD (field)) + /* These structures are used for various misc types. */ struct Lisp_Misc_Any /* Supertype of all Misc types. */ @@ -1331,7 +1340,9 @@ unsigned gcmarkbit : 1; int spacer : 15; struct Lisp_Overlay *next; - Lisp_Object start, end, plist; + Lisp_Object INTERNAL_FIELD (start); + Lisp_Object INTERNAL_FIELD (end); + Lisp_Object INTERNAL_FIELD (plist); }; /* Hold a C pointer for later use. ------------------------------------------------------------ revno: 109360 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2012-08-01 12:18:22 +0400 message: Commit forgotten admin/coccinelle/symbol.cocci. diff: === added file 'admin/coccinelle/symbol.cocci' --- admin/coccinelle/symbol.cocci 1970-01-01 00:00:00 +0000 +++ admin/coccinelle/symbol.cocci 2012-08-01 08:18:22 +0000 @@ -0,0 +1,32 @@ +// Change direct access to Lisp_Object fields of struct Lisp_Symbol to SVAR. +@@ +struct Lisp_Symbol *S; +Lisp_Object O; +@@ +( +- S->xname ++ SVAR (S, xname) +| +- S->val.value ++ SVAR (S, val.value) +| +- S->function ++ SVAR (S, function) +| +- S->plist ++ SVAR (S, plist) + +| + +- XSYMBOL (O)->xname ++ SVAR (XSYMBOL (O), xname) +| +- XSYMBOL (O)->val.value ++ SVAR (XSYMBOL (O), val.value) +| +- XSYMBOL (O)->function ++ SVAR (XSYMBOL (O), function) +| +- XSYMBOL (O)->plist ++ SVAR (XSYMBOL (O), plist) +) ------------------------------------------------------------ revno: 109359 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2012-08-01 11:57:09 +0400 message: Use INTERNAL_FIELD for symbols. * src/lisp.h (SVAR): New macro. Adjust users. * src/alloc.c, src/bytecode.c, src/cmds.c, src/data.c, src/doc.c, src/eval.c: * src/fns.c, src/keyboard.c, src/lread.c, src/xterm.c: Users changed. * admin/coccinelle/symbol.cocci: Semantic patch to replace direct access to Lisp_Object members of struct Lisp_Symbol to SVAR. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-08-01 06:23:24 +0000 +++ admin/ChangeLog 2012-08-01 07:57:09 +0000 @@ -1,5 +1,10 @@ 2012-08-01 Dmitry Antipov + * coccinelle/symbol.cocci: Semantic patch to replace direct + access to Lisp_Object members of struct Lisp_Symbol to SVAR. + +2012-08-01 Dmitry Antipov + * coccinelle/process.cocci: Semantic patch to replace direct access to Lisp_Object members of struct Lisp_Process to PVAR. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 06:23:24 +0000 +++ src/ChangeLog 2012-08-01 07:57:09 +0000 @@ -1,5 +1,12 @@ 2012-08-01 Dmitry Antipov + Use INTERNAL_FIELD for symbols. + * lisp.h (SVAR): New macro. Adjust users. + * alloc.c, bytecode.c, cmds.c, data.c, doc.c, eval.c: + * fns.c, keyboard.c, lread.c, xterm.c: Users changed. + +2012-08-01 Dmitry Antipov + Use INTERNAL_FIELD for processes. * process.h (PVAR): New macro. Adjust style. (struct Lisp_Process): Change Lisp_Object members to INTERNAL_FIELD. === modified file 'src/alloc.c' --- src/alloc.c 2012-08-01 05:11:36 +0000 +++ src/alloc.c 2012-08-01 07:57:09 +0000 @@ -3518,11 +3518,11 @@ MALLOC_UNBLOCK_INPUT; p = XSYMBOL (val); - p->xname = name; - p->plist = Qnil; + SVAR (p, xname) = name; + SVAR (p, plist) = Qnil; p->redirect = SYMBOL_PLAINVAL; SET_SYMBOL_VAL (p, Qunbound); - p->function = Qunbound; + SVAR (p, function) = Qunbound; p->next = NULL; p->gcmarkbit = 0; p->interned = SYMBOL_UNINTERNED; @@ -4321,7 +4321,7 @@ && offset < (SYMBOL_BLOCK_SIZE * sizeof b->symbols[0]) && (b != symbol_block || offset / sizeof b->symbols[0] < symbol_block_index) - && !EQ (((struct Lisp_Symbol *) p)->function, Vdead)); + && !EQ (SVAR (((struct Lisp_Symbol *)p), function), Vdead)); } else return 0; @@ -6073,8 +6073,8 @@ break; CHECK_ALLOCATED_AND_LIVE (live_symbol_p); ptr->gcmarkbit = 1; - mark_object (ptr->function); - mark_object (ptr->plist); + mark_object (SVAR (ptr, function)); + mark_object (SVAR (ptr, plist)); switch (ptr->redirect) { case SYMBOL_PLAINVAL: mark_object (SYMBOL_VAL (ptr)); break; @@ -6105,9 +6105,9 @@ break; default: abort (); } - if (!PURE_POINTER_P (XSTRING (ptr->xname))) - MARK_STRING (XSTRING (ptr->xname)); - MARK_INTERVAL_TREE (STRING_INTERVALS (ptr->xname)); + if (!PURE_POINTER_P (XSTRING (SVAR (ptr, xname)))) + MARK_STRING (XSTRING (SVAR (ptr, xname))); + MARK_INTERVAL_TREE (STRING_INTERVALS (SVAR (ptr, xname))); ptr = ptr->next; if (ptr) @@ -6473,7 +6473,7 @@ /* Check if the symbol was created during loadup. In such a case it might be pointed to by pure bytecode which we don't trace, so we conservatively assume that it is live. */ - int pure_p = PURE_POINTER_P (XSTRING (sym->s.xname)); + int pure_p = PURE_POINTER_P (XSTRING (sym->s.INTERNAL_FIELD (xname))); if (!sym->s.gcmarkbit && !pure_p) { @@ -6482,7 +6482,7 @@ sym->s.next = symbol_free_list; symbol_free_list = &sym->s; #if GC_MARK_STACK - symbol_free_list->function = Vdead; + SVAR (symbol_free_list, function) = Vdead; #endif ++this_free; } @@ -6490,7 +6490,7 @@ { ++num_used; if (!pure_p) - UNMARK_STRING (XSTRING (sym->s.xname)); + UNMARK_STRING (XSTRING (sym->s.INTERNAL_FIELD (xname))); sym->s.gcmarkbit = 0; } } @@ -6675,10 +6675,10 @@ XSETSYMBOL (tem, sym); val = find_symbol_value (tem); if (EQ (val, obj) - || EQ (sym->function, obj) - || (!NILP (sym->function) - && COMPILEDP (sym->function) - && EQ (AREF (sym->function, COMPILED_BYTECODE), obj)) + || EQ (SVAR (sym, function), obj) + || (!NILP (SVAR (sym, function)) + && COMPILEDP (SVAR (sym, function)) + && EQ (AREF (SVAR (sym, function), COMPILED_BYTECODE), obj)) || (!NILP (val) && COMPILEDP (val) && EQ (AREF (val, COMPILED_BYTECODE), obj))) === modified file 'src/bytecode.c' --- src/bytecode.c 2012-07-20 05:28:00 +0000 +++ src/bytecode.c 2012-08-01 07:57:09 +0000 @@ -818,7 +818,7 @@ && !EQ (val, Qunbound) && !XSYMBOL (sym)->redirect && !SYMBOL_CONSTANT_P (sym)) - XSYMBOL (sym)->val.value = val; + SVAR (XSYMBOL (sym), val.value) = val; else { BEFORE_POTENTIAL_GC (); === modified file 'src/cmds.c' --- src/cmds.c 2012-07-18 13:20:59 +0000 +++ src/cmds.c 2012-08-01 07:57:09 +0000 @@ -446,11 +446,13 @@ /* If we expanded an abbrev which has a hook, and the hook has a non-nil `no-self-insert' property, return right away--don't really self-insert. */ - if (SYMBOLP (sym) && ! NILP (sym) && ! NILP (XSYMBOL (sym)->function) - && SYMBOLP (XSYMBOL (sym)->function)) + if (SYMBOLP (sym) && ! NILP (sym) + && ! NILP (SVAR (XSYMBOL (sym), function)) + && SYMBOLP (SVAR (XSYMBOL (sym), function))) { Lisp_Object prop; - prop = Fget (XSYMBOL (sym)->function, intern ("no-self-insert")); + prop = Fget (SVAR (XSYMBOL (sym), function), + intern ("no-self-insert")); if (! NILP (prop)) return 1; } === modified file 'src/data.c' --- src/data.c 2012-07-31 12:36:19 +0000 +++ src/data.c 2012-08-01 07:57:09 +0000 @@ -562,7 +562,7 @@ (register Lisp_Object symbol) { CHECK_SYMBOL (symbol); - return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt); + return (EQ (SVAR (XSYMBOL (symbol), function), Qunbound) ? Qnil : Qt); } DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, @@ -585,7 +585,7 @@ CHECK_SYMBOL (symbol); if (NILP (symbol) || EQ (symbol, Qt)) xsignal1 (Qsetting_constant, symbol); - XSYMBOL (symbol)->function = Qunbound; + SVAR (XSYMBOL (symbol), function) = Qunbound; return symbol; } @@ -594,8 +594,8 @@ (register Lisp_Object symbol) { CHECK_SYMBOL (symbol); - if (!EQ (XSYMBOL (symbol)->function, Qunbound)) - return XSYMBOL (symbol)->function; + if (!EQ (SVAR (XSYMBOL (symbol), function), Qunbound)) + return SVAR (XSYMBOL (symbol), function); xsignal1 (Qvoid_function, symbol); } @@ -604,7 +604,7 @@ (register Lisp_Object symbol) { CHECK_SYMBOL (symbol); - return XSYMBOL (symbol)->plist; + return SVAR (XSYMBOL (symbol), plist); } DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, @@ -628,7 +628,7 @@ if (NILP (symbol) || EQ (symbol, Qt)) xsignal1 (Qsetting_constant, symbol); - function = XSYMBOL (symbol)->function; + function = SVAR (XSYMBOL (symbol), function); if (!NILP (Vautoload_queue) && !EQ (function, Qunbound)) Vautoload_queue = Fcons (Fcons (symbol, function), Vautoload_queue); @@ -636,13 +636,13 @@ if (CONSP (function) && EQ (XCAR (function), Qautoload)) Fput (symbol, Qautoload, XCDR (function)); - XSYMBOL (symbol)->function = definition; + SVAR (XSYMBOL (symbol), function) = definition; /* Handle automatic advice activation. */ - if (CONSP (XSYMBOL (symbol)->plist) + if (CONSP (SVAR (XSYMBOL (symbol), plist)) && !NILP (Fget (symbol, Qad_advice_info))) { call2 (Qad_activate_internal, symbol, Qnil); - definition = XSYMBOL (symbol)->function; + definition = SVAR (XSYMBOL (symbol), function); } return definition; } @@ -657,8 +657,8 @@ (register Lisp_Object symbol, Lisp_Object definition, Lisp_Object docstring) { CHECK_SYMBOL (symbol); - if (CONSP (XSYMBOL (symbol)->function) - && EQ (XCAR (XSYMBOL (symbol)->function), Qautoload)) + if (CONSP (SVAR (XSYMBOL (symbol), function)) + && EQ (XCAR (SVAR (XSYMBOL (symbol), function)), Qautoload)) LOADHIST_ATTACH (Fcons (Qt, symbol)); if (!NILP (Vpurify_flag) /* If `definition' is a keymap, immutable (and copying) is wrong. */ @@ -679,7 +679,7 @@ (register Lisp_Object symbol, Lisp_Object newplist) { CHECK_SYMBOL (symbol); - XSYMBOL (symbol)->plist = newplist; + SVAR (XSYMBOL (symbol), plist) = newplist; return newplist; } @@ -2019,12 +2019,12 @@ { if (!SYMBOLP (hare) || EQ (hare, Qunbound)) break; - hare = XSYMBOL (hare)->function; + hare = SVAR (XSYMBOL (hare), function); if (!SYMBOLP (hare) || EQ (hare, Qunbound)) break; - hare = XSYMBOL (hare)->function; + hare = SVAR (XSYMBOL (hare), function); - tortoise = XSYMBOL (tortoise)->function; + tortoise = SVAR (XSYMBOL (tortoise), function); if (EQ (hare, tortoise)) xsignal1 (Qcyclic_function_indirection, object); @@ -2048,7 +2048,7 @@ /* Optimize for no indirection. */ result = object; if (SYMBOLP (result) && !EQ (result, Qunbound) - && (result = XSYMBOL (result)->function, SYMBOLP (result))) + && (result = SVAR (XSYMBOL (result), function), SYMBOLP (result))) result = indirect_function (result); if (!EQ (result, Qunbound)) return result; @@ -3197,7 +3197,7 @@ defsubr (&Ssubr_arity); defsubr (&Ssubr_name); - XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function; + SVAR (XSYMBOL (Qwholenump), function) = SVAR (XSYMBOL (Qnatnump), function); DEFVAR_LISP ("most-positive-fixnum", Vmost_positive_fixnum, doc: /* The largest value that is representable in a Lisp integer. */); === modified file 'src/doc.c' --- src/doc.c 2012-07-10 21:48:34 +0000 +++ src/doc.c 2012-08-01 07:57:09 +0000 @@ -508,7 +508,7 @@ { /* Don't use indirect_function here, or defaliases will apply their docstrings to the base functions (Bug#2603). */ - Lisp_Object fun = SYMBOLP (obj) ? XSYMBOL (obj)->function : obj; + Lisp_Object fun = SYMBOLP (obj) ? SVAR (XSYMBOL (obj), function) : obj; /* The type determines where the docstring is stored. */ === modified file 'src/eval.c' --- src/eval.c 2012-07-31 12:36:19 +0000 +++ src/eval.c 2012-08-01 07:57:09 +0000 @@ -976,7 +976,7 @@ tem = Fassq (sym, environment); if (NILP (tem)) { - def = XSYMBOL (sym)->function; + def = SVAR (XSYMBOL (sym), function); if (!EQ (def, Qunbound)) continue; } @@ -1893,9 +1893,9 @@ CHECK_STRING (file); /* If function is defined and not as an autoload, don't override. */ - if (!EQ (XSYMBOL (function)->function, Qunbound) - && !(CONSP (XSYMBOL (function)->function) - && EQ (XCAR (XSYMBOL (function)->function), Qautoload))) + if (!EQ (SVAR (XSYMBOL (function), function), Qunbound) + && !(CONSP (SVAR (XSYMBOL (function), function)) + && EQ (XCAR (SVAR (XSYMBOL (function), function)), Qautoload))) return Qnil; if (NILP (Vpurify_flag)) @@ -2081,7 +2081,7 @@ /* Optimize for no indirection. */ fun = original_fun; if (SYMBOLP (fun) && !EQ (fun, Qunbound) - && (fun = XSYMBOL (fun)->function, SYMBOLP (fun))) + && (fun = SVAR (XSYMBOL (fun), function), SYMBOLP (fun))) fun = indirect_function (fun); if (SUBRP (fun)) @@ -2266,7 +2266,7 @@ /* Optimize for no indirection. */ if (SYMBOLP (fun) && !EQ (fun, Qunbound) - && (fun = XSYMBOL (fun)->function, SYMBOLP (fun))) + && (fun = SVAR (XSYMBOL (fun), function), SYMBOLP (fun))) fun = indirect_function (fun); if (EQ (fun, Qunbound)) { @@ -2771,7 +2771,7 @@ /* Optimize for no indirection. */ fun = original_fun; if (SYMBOLP (fun) && !EQ (fun, Qunbound) - && (fun = XSYMBOL (fun)->function, SYMBOLP (fun))) + && (fun = SVAR (XSYMBOL (fun), function), SYMBOLP (fun))) fun = indirect_function (fun); if (SUBRP (fun)) === modified file 'src/fns.c' --- src/fns.c 2012-07-20 07:29:04 +0000 +++ src/fns.c 2012-08-01 07:57:09 +0000 @@ -1868,7 +1868,7 @@ (Lisp_Object symbol, Lisp_Object propname) { CHECK_SYMBOL (symbol); - return Fplist_get (XSYMBOL (symbol)->plist, propname); + return Fplist_get (SVAR (XSYMBOL (symbol), plist), propname); } DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0, @@ -1910,8 +1910,8 @@ (Lisp_Object symbol, Lisp_Object propname, Lisp_Object value) { CHECK_SYMBOL (symbol); - XSYMBOL (symbol)->plist - = Fplist_put (XSYMBOL (symbol)->plist, propname, value); + SVAR (XSYMBOL (symbol), plist) + = Fplist_put (SVAR (XSYMBOL (symbol), plist), propname, value); return value; } === modified file 'src/keyboard.c' --- src/keyboard.c 2012-08-01 05:11:36 +0000 +++ src/keyboard.c 2012-08-01 07:57:09 +0000 @@ -7894,7 +7894,8 @@ /* If the command is an alias for another (such as lmenu.el set it up), check if the original command matches the cached command. */ - && !(SYMBOLP (def) && EQ (tem, XSYMBOL (def)->function)))) + && !(SYMBOLP (def) + && EQ (tem, SVAR (XSYMBOL (def), function))))) keys = Qnil; } @@ -8823,9 +8824,9 @@ /* Handle a symbol whose function definition is a keymap or an array. */ if (SYMBOLP (next) && !NILP (Ffboundp (next)) - && (ARRAYP (XSYMBOL (next)->function) - || KEYMAPP (XSYMBOL (next)->function))) - next = Fautoload_do_load (XSYMBOL (next)->function, next, Qnil); + && (ARRAYP (SVAR (XSYMBOL (next), function)) + || KEYMAPP (SVAR (XSYMBOL (next), function)))) + next = Fautoload_do_load (SVAR (XSYMBOL (next), function), next, Qnil); /* If the keymap gives a function, not an array, then call the function with one arg and use === modified file 'src/lisp.h' --- src/lisp.h 2012-08-01 05:11:36 +0000 +++ src/lisp.h 2012-08-01 07:57:09 +0000 @@ -1039,6 +1039,11 @@ SYMBOL_FORWARDED = 3 }; +/* Most code should use this macro to access + Lisp fields in struct Lisp_Symbol. */ + +#define SVAR(sym, field) ((sym)->INTERNAL_FIELD (field)) + struct Lisp_Symbol { unsigned gcmarkbit : 1; @@ -1066,22 +1071,22 @@ /* The symbol's name, as a Lisp string. The name "xname" is used to intentionally break code referring to the old field "name" of type pointer to struct Lisp_String. */ - Lisp_Object xname; + Lisp_Object INTERNAL_FIELD (xname); /* Value of the symbol or Qunbound if unbound. Which alternative of the union is used depends on the `redirect' field above. */ union { - Lisp_Object value; + Lisp_Object INTERNAL_FIELD (value); struct Lisp_Symbol *alias; struct Lisp_Buffer_Local_Value *blv; union Lisp_Fwd *fwd; } val; /* Function value of the symbol or Qunbound if not fboundp. */ - Lisp_Object function; + Lisp_Object INTERNAL_FIELD (function); /* The symbol's property list. */ - Lisp_Object plist; + Lisp_Object INTERNAL_FIELD (plist); /* Next symbol in obarray bucket, if the symbol is interned. */ struct Lisp_Symbol *next; @@ -1090,7 +1095,7 @@ /* Value is name of symbol. */ #define SYMBOL_VAL(sym) \ - (eassert ((sym)->redirect == SYMBOL_PLAINVAL), (sym)->val.value) + (eassert ((sym)->redirect == SYMBOL_PLAINVAL), SVAR (sym, val.value)) #define SYMBOL_ALIAS(sym) \ (eassert ((sym)->redirect == SYMBOL_VARALIAS), (sym)->val.alias) #define SYMBOL_BLV(sym) \ @@ -1098,7 +1103,7 @@ #define SYMBOL_FWD(sym) \ (eassert ((sym)->redirect == SYMBOL_FORWARDED), (sym)->val.fwd) #define SET_SYMBOL_VAL(sym, v) \ - (eassert ((sym)->redirect == SYMBOL_PLAINVAL), (sym)->val.value = (v)) + (eassert ((sym)->redirect == SYMBOL_PLAINVAL), SVAR (sym, val.value) = (v)) #define SET_SYMBOL_ALIAS(sym, v) \ (eassert ((sym)->redirect == SYMBOL_VARALIAS), (sym)->val.alias = (v)) #define SET_SYMBOL_BLV(sym, v) \ @@ -1107,7 +1112,7 @@ (eassert ((sym)->redirect == SYMBOL_FORWARDED), (sym)->val.fwd = (v)) #define SYMBOL_NAME(sym) \ - LISP_MAKE_RVALUE (XSYMBOL (sym)->xname) + LISP_MAKE_RVALUE (SVAR (XSYMBOL (sym), xname)) /* Value is non-zero if SYM is an interned symbol. */ === modified file 'src/lread.c' --- src/lread.c 2012-07-29 16:55:02 +0000 +++ src/lread.c 2012-08-01 07:57:09 +0000 @@ -3922,13 +3922,13 @@ /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil, so those two need to be fixed manually. */ SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound); - XSYMBOL (Qunbound)->function = Qunbound; - XSYMBOL (Qunbound)->plist = Qnil; + SVAR (XSYMBOL (Qunbound), function) = Qunbound; + SVAR (XSYMBOL (Qunbound), plist) = Qnil; /* XSYMBOL (Qnil)->function = Qunbound; */ SET_SYMBOL_VAL (XSYMBOL (Qnil), Qnil); XSYMBOL (Qnil)->constant = 1; XSYMBOL (Qnil)->declared_special = 1; - XSYMBOL (Qnil)->plist = Qnil; + SVAR (XSYMBOL (Qnil), plist) = Qnil; Qt = intern_c_string ("t"); SET_SYMBOL_VAL (XSYMBOL (Qt), Qt); @@ -3950,7 +3950,7 @@ Lisp_Object sym; sym = intern_c_string (sname->symbol_name); XSETTYPED_PVECTYPE (sname, size, PVEC_SUBR); - XSETSUBR (XSYMBOL (sym)->function, sname); + XSETSUBR (SVAR (XSYMBOL (sym), function), sname); } #ifdef NOTDEF /* Use fset in subr.el now! */ === modified file 'src/xterm.c' --- src/xterm.c 2012-08-01 05:11:36 +0000 +++ src/xterm.c 2012-08-01 07:57:09 +0000 @@ -10117,7 +10117,7 @@ terminal->kboard->next_kboard = all_kboards; all_kboards = terminal->kboard; - if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) + if (!EQ (SVAR (XSYMBOL (Qvendor_specific_keysyms), function), Qunbound)) { char *vendor = ServerVendor (dpy); ------------------------------------------------------------ revno: 109358 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 00:34:28 -0700 message: Small tweaks for autoconf mode * lisp/progmodes/autoconf.el (autoconf-definition-regexp): Add AH_TEMPLATE, adjust submatch numbering. (autoconf-font-lock-keywords, autoconf-imenu-generic-expression) (autoconf-current-defun-function): Update for above change. (autoconf-current-defun-function): First skip to end of current word. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-01 07:15:44 +0000 +++ lisp/ChangeLog 2012-08-01 07:34:28 +0000 @@ -1,3 +1,11 @@ +2012-08-01 Glenn Morris + + * progmodes/autoconf.el (autoconf-definition-regexp): + Add AH_TEMPLATE, adjust submatch numbering. + (autoconf-font-lock-keywords, autoconf-imenu-generic-expression) + (autoconf-current-defun-function): Update for above change. + (autoconf-current-defun-function): First skip to end of current word. + 2012-08-01 Rupert Swarbrick (tiny change) * calendar/cal-html.el (cal-html-insert-agenda-days): === modified file 'lisp/progmodes/autoconf.el' --- lisp/progmodes/autoconf.el 2012-07-09 04:52:49 +0000 +++ lisp/progmodes/autoconf.el 2012-08-01 07:34:28 +0000 @@ -43,12 +43,12 @@ "Hook run by `autoconf-mode'.") (defconst autoconf-definition-regexp - "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\[*\\(\\sw+\\)\\]*") + "A\\(?:H_TEMPLATE\\|C_\\(?:SUBST\\|DEFINE\\(?:_UNQUOTED\\)?\\)\\)(\\[*\\(\\sw+\\)\\]*") (defvar autoconf-font-lock-keywords `(("\\_ committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 00:20:52 -0700 message: Tweak FreeBSD LIB_STANDARD, START_FILES * configure.ac (LIB_STANDARD, START_FILES) [FreeBSD]: Don't include crtbegin.o and crtend.o. diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-01 02:02:47 +0000 +++ ChangeLog 2012-08-01 07:20:52 +0000 @@ -1,3 +1,8 @@ +2012-08-01 Ulrich Müller + + * configure.ac (LIB_STANDARD, START_FILES) [FreeBSD]: + Don't include crtbegin.o and crtend.o. (Bug#12047) + 2012-08-01 Glenn Morris * configure.ac (FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC) === modified file 'configure.ac' --- configure.ac 2012-08-01 02:02:47 +0000 +++ configure.ac 2012-08-01 07:20:52 +0000 @@ -982,8 +982,8 @@ START_FILES='pre-crt0.o' ;; freebsd ) - LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' - START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' + LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o' + START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' SYSTEM_TYPE=berkeley-unix ;; gnu-linux | gnu-kfreebsd ) ------------------------------------------------------------ revno: 109356 fixes bug: http://debbugs.gnu.org/12018 author: Rupert Swarbrick committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-08-01 00:15:44 -0700 message: * calendar/cal-html.el (cal-html-insert-agenda-days): Fix typo. (tiny change) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-01 02:14:20 +0000 +++ lisp/ChangeLog 2012-08-01 07:15:44 +0000 @@ -1,3 +1,8 @@ +2012-08-01 Rupert Swarbrick (tiny change) + + * calendar/cal-html.el (cal-html-insert-agenda-days): + Fix typo. (Bug#12018) + 2012-07-31 Fabián Ezequiel Gallina Shell processes: enhancements to startup and CEDET compatibility. === modified file 'lisp/calendar/cal-html.el' --- lisp/calendar/cal-html.el 2012-05-05 21:31:41 +0000 +++ lisp/calendar/cal-html.el 2012-08-01 07:15:44 +0000 @@ -396,7 +396,7 @@ ;; Diary entries. cal-html-b-tabledata-string (cal-html-htmlify-list holiday-list date t) - (and holiday-list diary-list "
\n") + (if (and holiday-list diary-list) "
\n" "") (cal-html-htmlify-list diary-list date) cal-html-e-tabledata-string cal-html-e-tablerow-string) ------------------------------------------------------------ revno: 109355 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2012-08-01 10:23:24 +0400 message: Use INTERNAL_FIELD for processes. * src/process.h (PVAR): New macro. Adjust style. (struct Lisp_Process): Change Lisp_Object members to INTERNAL_FIELD. * src/print.c, src/process.c, src/sysdep.c, src/w32.c: * src/xdisp.c: Users changed. * admin/coccinelle/process.cocci: Semantic patch to replace direct access to Lisp_Object members of struct Lisp_Process to PVAR. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-08-01 05:11:36 +0000 +++ admin/ChangeLog 2012-08-01 06:23:24 +0000 @@ -1,5 +1,10 @@ 2012-08-01 Dmitry Antipov + * coccinelle/process.cocci: Semantic patch to replace direct + access to Lisp_Object members of struct Lisp_Process to PVAR. + +2012-08-01 Dmitry Antipov + * coccinelle/window.cocci: Semantic patch to replace direct access to Lisp_Object members of struct window to WVAR. === added file 'admin/coccinelle/process.cocci' --- admin/coccinelle/process.cocci 1970-01-01 00:00:00 +0000 +++ admin/coccinelle/process.cocci 2012-08-01 06:23:24 +0000 @@ -0,0 +1,110 @@ +// Change direct access to Lisp_Object fields of struct Lisp_Process to PVAR. +@@ +struct Lisp_Process *P; +Lisp_Object O; +@@ +( +- P->tty_name ++ PVAR (P, tty_name) +| +- P->name ++ PVAR (P, name) +| +- P->command ++ PVAR (P, command) +| +- P->filter ++ PVAR (P, filter) +| +- P->sentinel ++ PVAR (P, sentinel) +| +- P->log ++ PVAR (P, log) +| +- P->buffer ++ PVAR (P, buffer) +| +- P->childp ++ PVAR (P, childp) +| +- P->plist ++ PVAR (P, plist) +| +- P->type ++ PVAR (P, type) +| +- P->mark ++ PVAR (P, mark) +| +- P->status ++ PVAR (P, status) +| +- P->decode_coding_system ++ PVAR (P, decode_coding_system) +| +- P->decoding_buf ++ PVAR (P, decoding_buf) +| +- P->encode_coding_system ++ PVAR (P, encode_coding_system) +| +- P->encoding_buf ++ PVAR (P, encoding_buf) +| +- P->write_queue ++ PVAR (P, write_queue) + +| + +- XPROCESS (O)->tty_name ++ PVAR (XPROCESS (O), tty_name) +| +- XPROCESS (O)->name ++ PVAR (XPROCESS (O), name) +| +- XPROCESS (O)->command ++ PVAR (XPROCESS (O), command) +| +- XPROCESS (O)->filter ++ PVAR (XPROCESS (O), filter) +| +- XPROCESS (O)->sentinel ++ PVAR (XPROCESS (O), sentinel) +| +- XPROCESS (O)->log ++ PVAR (XPROCESS (O), log) +| +- XPROCESS (O)->buffer ++ PVAR (XPROCESS (O), buffer) +| +- XPROCESS (O)->childp ++ PVAR (XPROCESS (O), childp) +| +- XPROCESS (O)->plist ++ PVAR (XPROCESS (O), plist) +| +- XPROCESS (O)->type ++ PVAR (XPROCESS (O), type) +| +- XPROCESS (O)->mark ++ PVAR (XPROCESS (O), mark) +| +- XPROCESS (O)->status ++ PVAR (XPROCESS (O), status) +| +- XPROCESS (O)->decode_coding_system ++ PVAR (XPROCESS (O), decode_coding_system) +| +- XPROCESS (O)->decoding_buf ++ PVAR (XPROCESS (O), decoding_buf) +| +- XPROCESS (O)->encode_coding_system ++ PVAR (XPROCESS (O), encode_coding_system) +| +- XPROCESS (O)->encoding_buf ++ PVAR (XPROCESS (O), encoding_buf) +| +- XPROCESS (O)->write_queue ++ PVAR (XPROCESS (O), write_queue) +) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-01 05:11:36 +0000 +++ src/ChangeLog 2012-08-01 06:23:24 +0000 @@ -1,5 +1,12 @@ 2012-08-01 Dmitry Antipov + Use INTERNAL_FIELD for processes. + * process.h (PVAR): New macro. Adjust style. + (struct Lisp_Process): Change Lisp_Object members to INTERNAL_FIELD. + * print.c, process.c, sysdep.c, w32.c, xdisp.c: Users changed. + +2012-08-01 Dmitry Antipov + Use INTERNAL_FIELD for windows. * window.h (WVAR): New macro. (struct window): Change Lisp_Object members to INTERNAL_FIELD. === modified file 'src/print.c' --- src/print.c 2012-08-01 05:11:36 +0000 +++ src/print.c 2012-08-01 06:23:24 +0000 @@ -1699,11 +1699,11 @@ if (escapeflag) { strout ("#name, printcharfun); + print_string (PVAR (XPROCESS (obj), name), printcharfun); PRINTCHAR ('>'); } else - print_string (XPROCESS (obj)->name, printcharfun); + print_string (PVAR (XPROCESS (obj), name), printcharfun); } else if (BOOL_VECTOR_P (obj)) { === modified file 'src/process.c' --- src/process.c 2012-07-20 07:29:04 +0000 +++ src/process.c 2012-08-01 06:23:24 +0000 @@ -172,10 +172,10 @@ /* QCfilter is defined in keyboard.c. */ extern Lisp_Object QCfilter; -#define NETCONN_P(p) (EQ (XPROCESS (p)->type, Qnetwork)) -#define NETCONN1_P(p) (EQ ((p)->type, Qnetwork)) -#define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial)) -#define SERIALCONN1_P(p) (EQ ((p)->type, Qserial)) +#define NETCONN_P(p) (EQ (PVAR (XPROCESS (p), type), Qnetwork)) +#define NETCONN1_P(p) (EQ (PVAR (p, type), Qnetwork)) +#define SERIALCONN_P(p) (EQ (PVAR (XPROCESS (p), type), Qserial)) +#define SERIALCONN1_P(p) (EQ (PVAR (p, type), Qserial)) #ifndef HAVE_H_ERRNO extern int h_errno; @@ -428,7 +428,7 @@ update_status (struct Lisp_Process *p) { eassert (p->raw_status_new); - p->status = status_convert (p->raw_status); + PVAR (p, status) = status_convert (p->raw_status); p->raw_status_new = 0; } @@ -479,7 +479,7 @@ static Lisp_Object status_message (struct Lisp_Process *p) { - Lisp_Object status = p->status; + Lisp_Object status = PVAR (p, status); Lisp_Object symbol; int code, coredump; Lisp_Object string, string2; @@ -626,8 +626,8 @@ p = allocate_process (); /* Initialize Lisp data. Note that allocate_process initializes all Lisp data to nil, so do it only for slots which should not be nil. */ - p->status = Qrun; - p->mark = Fmake_marker (); + PVAR (p, status) = Qrun; + PVAR (p, mark) = Fmake_marker (); /* Initialize non-Lisp data. Note that allocate_process zeroes out all non-Lisp data, so do it only for slots which should not be zero. */ @@ -648,7 +648,7 @@ name1 = concat2 (name, make_formatted_string (suffix, "<%"pMd">", i)); } name = name1; - p->name = name; + PVAR (p, name) = name; XSETPROCESS (val, p); Vprocess_alist = Fcons (Fcons (name, val), Vprocess_alist); return val; @@ -745,7 +745,7 @@ p->raw_status_new = 0; if (NETCONN1_P (p) || SERIALCONN1_P (p)) { - p->status = Fcons (Qexit, Fcons (make_number (0), Qnil)); + PVAR (p, status) = Fcons (Qexit, Fcons (make_number (0), Qnil)); p->tick = ++process_tick; status_notify (p); redisplay_preserve_echo_area (13); @@ -763,9 +763,9 @@ /* If the process has already signaled, remove it from the list. */ if (p->raw_status_new) update_status (p); - symbol = p->status; - if (CONSP (p->status)) - symbol = XCAR (p->status); + symbol = PVAR (p, status); + if (CONSP (PVAR (p, status))) + symbol = XCAR (PVAR (p, status)); if (EQ (symbol, Qsignal) || EQ (symbol, Qexit)) deleted_pid_list = Fdelete (make_fixnum_or_float (pid), deleted_pid_list); @@ -774,7 +774,7 @@ { Fkill_process (process, Qnil); /* Do this now, since remove_process will make sigchld_handler do nothing. */ - p->status + PVAR (p, status) = Fcons (Qsignal, Fcons (make_number (SIGKILL), Qnil)); p->tick = ++process_tick; status_notify (p); @@ -816,14 +816,14 @@ p = XPROCESS (process); if (p->raw_status_new) update_status (p); - status = p->status; + status = PVAR (p, status); if (CONSP (status)) status = XCAR (status); if (NETCONN1_P (p) || SERIALCONN1_P (p)) { if (EQ (status, Qexit)) status = Qclosed; - else if (EQ (p->command, Qt)) + else if (EQ (PVAR (p, command), Qt)) status = Qstop; else if (EQ (status, Qrun)) status = Qopen; @@ -840,8 +840,8 @@ CHECK_PROCESS (process); if (XPROCESS (process)->raw_status_new) update_status (XPROCESS (process)); - if (CONSP (XPROCESS (process)->status)) - return XCAR (XCDR (XPROCESS (process)->status)); + if (CONSP (PVAR (XPROCESS (process), status))) + return XCAR (XCDR (PVAR (XPROCESS (process), status))); return make_number (0); } @@ -865,7 +865,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->name; + return PVAR (XPROCESS (process), name); } DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0, @@ -877,7 +877,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->command; + return PVAR (XPROCESS (process), command); } DEFUN ("process-tty-name", Fprocess_tty_name, Sprocess_tty_name, 1, 1, 0, @@ -887,7 +887,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->tty_name; + return PVAR (XPROCESS (process), tty_name); } DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer, @@ -902,9 +902,9 @@ if (!NILP (buffer)) CHECK_BUFFER (buffer); p = XPROCESS (process); - p->buffer = buffer; + PVAR (p, buffer) = buffer; if (NETCONN1_P (p) || SERIALCONN1_P (p)) - p->childp = Fplist_put (p->childp, QCbuffer, buffer); + PVAR (p, childp) = Fplist_put (PVAR (p, childp), QCbuffer, buffer); setup_process_coding_systems (process); return buffer; } @@ -916,7 +916,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->buffer; + return PVAR (XPROCESS (process), buffer); } DEFUN ("process-mark", Fprocess_mark, Sprocess_mark, @@ -925,7 +925,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->mark; + return PVAR (XPROCESS (process), mark); } DEFUN ("set-process-filter", Fset_process_filter, Sset_process_filter, @@ -961,23 +961,23 @@ if (p->infd >= 0) { - if (EQ (filter, Qt) && !EQ (p->status, Qlisten)) + if (EQ (filter, Qt) && !EQ (PVAR (p, status), Qlisten)) { FD_CLR (p->infd, &input_wait_mask); FD_CLR (p->infd, &non_keyboard_wait_mask); } - else if (EQ (p->filter, Qt) + else if (EQ (PVAR (p, filter), Qt) /* Network or serial process not stopped: */ - && !EQ (p->command, Qt)) + && !EQ (PVAR (p, command), Qt)) { FD_SET (p->infd, &input_wait_mask); FD_SET (p->infd, &non_keyboard_wait_mask); } } - p->filter = filter; + PVAR (p, filter) = filter; if (NETCONN1_P (p) || SERIALCONN1_P (p)) - p->childp = Fplist_put (p->childp, QCfilter, filter); + PVAR (p, childp) = Fplist_put (PVAR (p, childp), QCfilter, filter); setup_process_coding_systems (process); return filter; } @@ -989,7 +989,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->filter; + return PVAR (XPROCESS (process), filter); } DEFUN ("set-process-sentinel", Fset_process_sentinel, Sset_process_sentinel, @@ -1004,9 +1004,9 @@ CHECK_PROCESS (process); p = XPROCESS (process); - p->sentinel = sentinel; + PVAR (p, sentinel) = sentinel; if (NETCONN1_P (p) || SERIALCONN1_P (p)) - p->childp = Fplist_put (p->childp, QCsentinel, sentinel); + PVAR (p, childp) = Fplist_put (PVAR (p, childp), QCsentinel, sentinel); return sentinel; } @@ -1017,7 +1017,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->sentinel; + return PVAR (XPROCESS (process), sentinel); } DEFUN ("set-process-window-size", Fset_process_window_size, @@ -1102,7 +1102,7 @@ Lisp_Object contact; CHECK_PROCESS (process); - contact = XPROCESS (process)->childp; + contact = PVAR (XPROCESS (process), childp); #ifdef DATAGRAM_SOCKETS if (DATAGRAM_CONN_P (process) @@ -1128,7 +1128,7 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return XPROCESS (process)->plist; + return PVAR (XPROCESS (process), plist); } DEFUN ("set-process-plist", Fset_process_plist, Sset_process_plist, @@ -1139,7 +1139,7 @@ CHECK_PROCESS (process); CHECK_LIST (plist); - XPROCESS (process)->plist = plist; + PVAR (XPROCESS (process), plist) = plist; return plist; } @@ -1151,7 +1151,7 @@ a socket connection. */) (Lisp_Object process) { - return XPROCESS (process)->type; + return PVAR (XPROCESS (process), type); } #endif @@ -1164,7 +1164,7 @@ { Lisp_Object proc; proc = get_process (process); - return XPROCESS (proc)->type; + return PVAR (XPROCESS (proc), type); } DEFUN ("format-network-address", Fformat_network_address, Sformat_network_address, @@ -1325,13 +1325,13 @@ itself; it's all taken care of here. */ record_unwind_protect (start_process_unwind, proc); - XPROCESS (proc)->childp = Qt; - XPROCESS (proc)->plist = Qnil; - XPROCESS (proc)->type = Qreal; - XPROCESS (proc)->buffer = buffer; - XPROCESS (proc)->sentinel = Qnil; - XPROCESS (proc)->filter = Qnil; - XPROCESS (proc)->command = Flist (nargs - 2, args + 2); + PVAR (XPROCESS (proc), childp) = Qt; + PVAR (XPROCESS (proc), plist) = Qnil; + PVAR (XPROCESS (proc), type) = Qreal; + PVAR (XPROCESS (proc), buffer) = buffer; + PVAR (XPROCESS (proc), sentinel) = Qnil; + PVAR (XPROCESS (proc), filter) = Qnil; + PVAR (XPROCESS (proc), command) = Flist (nargs - 2, args + 2); #ifdef HAVE_GNUTLS /* AKA GNUTLS_INITSTAGE(proc). */ @@ -1347,7 +1347,7 @@ /* Make the process marker point into the process buffer (if any). */ if (BUFFERP (buffer)) - set_marker_both (XPROCESS (proc)->mark, buffer, + set_marker_both (PVAR (XPROCESS (proc), mark), buffer, BUF_ZV (XBUFFER (buffer)), BUF_ZV_BYTE (XBUFFER (buffer))); @@ -1376,7 +1376,7 @@ else if (CONSP (Vdefault_process_coding_system)) val = XCAR (Vdefault_process_coding_system); } - XPROCESS (proc)->decode_coding_system = val; + PVAR (XPROCESS (proc), decode_coding_system) = val; val = Vcoding_system_for_write; if (NILP (val)) @@ -1396,7 +1396,7 @@ else if (CONSP (Vdefault_process_coding_system)) val = XCDR (Vdefault_process_coding_system); } - XPROCESS (proc)->encode_coding_system = val; + PVAR (XPROCESS (proc), encode_coding_system) = val; /* Note: At this moment, the above coding system may leave text-conversion or eol-conversion unspecified. They will be decided after we read output from the process and decode it by @@ -1405,9 +1405,9 @@ } - XPROCESS (proc)->decoding_buf = empty_unibyte_string; + PVAR (XPROCESS (proc), decoding_buf) = empty_unibyte_string; XPROCESS (proc)->decoding_carryover = 0; - XPROCESS (proc)->encoding_buf = empty_unibyte_string; + PVAR (XPROCESS (proc), encoding_buf) = empty_unibyte_string; XPROCESS (proc)->inherit_coding_system_flag = !(NILP (buffer) || !inherit_process_coding_system); @@ -1465,7 +1465,7 @@ { if (NILP (arg_encoding)) arg_encoding = (complement_process_encoding_system - (XPROCESS (proc)->encode_coding_system)); + (PVAR (XPROCESS (proc), encode_coding_system))); XSETCAR (tem, code_convert_string_norecord (XCAR (tem), arg_encoding, 1)); @@ -1629,7 +1629,7 @@ more portable (see USG_SUBTTY_WORKS above). */ XPROCESS (process)->pty_flag = pty_flag; - XPROCESS (process)->status = Qrun; + PVAR (XPROCESS (process), status) = Qrun; /* Delay interrupts until we have a chance to store the new fork's pid in its process structure */ @@ -1868,10 +1868,10 @@ #ifdef HAVE_PTYS if (pty_flag) - XPROCESS (process)->tty_name = build_string (pty_name); + PVAR (XPROCESS (process), tty_name) = build_string (pty_name); else #endif - XPROCESS (process)->tty_name = Qnil; + PVAR (XPROCESS (process), tty_name) = Qnil; #if !defined (WINDOWSNT) && defined (FD_CLOEXEC) /* Wait for child_setup to complete in case that vfork is @@ -1966,7 +1966,7 @@ more portable (see USG_SUBTTY_WORKS above). */ XPROCESS (process)->pty_flag = pty_flag; - XPROCESS (process)->status = Qrun; + PVAR (XPROCESS (process), status) = Qrun; setup_process_coding_systems (process); FD_SET (inchannel, &input_wait_mask); @@ -1977,10 +1977,10 @@ XPROCESS (process)->pid = -2; #ifdef HAVE_PTYS if (pty_flag) - XPROCESS (process)->tty_name = build_string (pty_name); + PVAR (XPROCESS (process), tty_name) = build_string (pty_name); else #endif - XPROCESS (process)->tty_name = Qnil; + PVAR (XPROCESS (process), tty_name) = Qnil; } @@ -2369,7 +2369,7 @@ if (set_socket_option (s, option, value)) { - p->childp = Fplist_put (p->childp, option, value); + PVAR (p, childp) = Fplist_put (PVAR (p, childp), option, value); return Qt; } @@ -2458,10 +2458,10 @@ proc = Fplist_get (contact, QCport); proc = get_process (proc); p = XPROCESS (proc); - if (!EQ (p->type, Qserial)) + if (!EQ (PVAR (p, type), Qserial)) error ("Not a serial process"); - if (NILP (Fplist_get (p->childp, QCspeed))) + if (NILP (Fplist_get (PVAR (p, childp), QCspeed))) { UNGCPRO; return Qnil; @@ -2602,21 +2602,21 @@ if (NILP (buffer)) buffer = name; buffer = Fget_buffer_create (buffer); - p->buffer = buffer; + PVAR (p, buffer) = buffer; - p->childp = contact; - p->plist = Fcopy_sequence (Fplist_get (contact, QCplist)); - p->type = Qserial; - p->sentinel = Fplist_get (contact, QCsentinel); - p->filter = Fplist_get (contact, QCfilter); - p->log = Qnil; + PVAR (p, childp) = contact; + PVAR (p, plist) = Fcopy_sequence (Fplist_get (contact, QCplist)); + PVAR (p, type) = Qserial; + PVAR (p, sentinel) = Fplist_get (contact, QCsentinel); + PVAR (p, filter) = Fplist_get (contact, QCfilter); + PVAR (p, log) = Qnil; if (tem = Fplist_get (contact, QCnoquery), !NILP (tem)) p->kill_without_query = 1; if (tem = Fplist_get (contact, QCstop), !NILP (tem)) - p->command = Qt; + PVAR (p, command) = Qt; p->pty_flag = 0; - if (!EQ (p->command, Qt)) + if (!EQ (PVAR (p, command), Qt)) { FD_SET (fd, &input_wait_mask); FD_SET (fd, &non_keyboard_wait_mask); @@ -2624,7 +2624,7 @@ if (BUFFERP (buffer)) { - set_marker_both (p->mark, buffer, + set_marker_both (PVAR (p, mark), buffer, BUF_ZV (XBUFFER (buffer)), BUF_ZV_BYTE (XBUFFER (buffer))); } @@ -2645,7 +2645,7 @@ else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) val = Qnil; - p->decode_coding_system = val; + PVAR (p, decode_coding_system) = val; val = Qnil; if (!NILP (tem)) @@ -2659,12 +2659,12 @@ else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) val = Qnil; - p->encode_coding_system = val; + PVAR (p, encode_coding_system) = val; setup_process_coding_systems (proc); - p->decoding_buf = empty_unibyte_string; + PVAR (p, decoding_buf) = empty_unibyte_string; p->decoding_carryover = 0; - p->encoding_buf = empty_unibyte_string; + PVAR (p, encoding_buf) = empty_unibyte_string; p->inherit_coding_system_flag = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); @@ -3401,27 +3401,27 @@ p = XPROCESS (proc); - p->childp = contact; - p->plist = Fcopy_sequence (Fplist_get (contact, QCplist)); - p->type = Qnetwork; + PVAR (p, childp) = contact; + PVAR (p, plist) = Fcopy_sequence (Fplist_get (contact, QCplist)); + PVAR (p, type) = Qnetwork; - p->buffer = buffer; - p->sentinel = sentinel; - p->filter = filter; - p->log = Fplist_get (contact, QClog); + PVAR (p, buffer) = buffer; + PVAR (p, sentinel) = sentinel; + PVAR (p, filter) = filter; + PVAR (p, log) = Fplist_get (contact, QClog); if (tem = Fplist_get (contact, QCnoquery), !NILP (tem)) p->kill_without_query = 1; if ((tem = Fplist_get (contact, QCstop), !NILP (tem))) - p->command = Qt; + PVAR (p, command) = Qt; p->pid = 0; p->infd = inch; p->outfd = outch; if (is_server && socktype != SOCK_DGRAM) - p->status = Qlisten; + PVAR (p, status) = Qlisten; /* Make the process marker point into the process buffer (if any). */ if (BUFFERP (buffer)) - set_marker_both (p->mark, buffer, + set_marker_both (PVAR (p, mark), buffer, BUF_ZV (XBUFFER (buffer)), BUF_ZV_BYTE (XBUFFER (buffer))); @@ -3431,7 +3431,7 @@ /* We may get here if connect did succeed immediately. However, in that case, we still need to signal this like a non-blocking connection. */ - p->status = Qconnect; + PVAR (p, status) = Qconnect; if (!FD_ISSET (inch, &connect_wait_mask)) { FD_SET (inch, &connect_wait_mask); @@ -3443,8 +3443,8 @@ #endif /* A server may have a client filter setting of Qt, but it must still listen for incoming connects unless it is stopped. */ - if ((!EQ (p->filter, Qt) && !EQ (p->command, Qt)) - || (EQ (p->status, Qlisten) && NILP (p->command))) + if ((!EQ (PVAR (p, filter), Qt) && !EQ (PVAR (p, command), Qt)) + || (EQ (PVAR (p, status), Qlisten) && NILP (PVAR (p, command)))) { FD_SET (inch, &input_wait_mask); FD_SET (inch, &non_keyboard_wait_mask); @@ -3498,7 +3498,7 @@ else val = Qnil; } - p->decode_coding_system = val; + PVAR (p, decode_coding_system) = val; if (!NILP (tem)) { @@ -3532,13 +3532,13 @@ else val = Qnil; } - p->encode_coding_system = val; + PVAR (p, encode_coding_system) = val; } setup_process_coding_systems (proc); - p->decoding_buf = empty_unibyte_string; + PVAR (p, decoding_buf) = empty_unibyte_string; p->decoding_carryover = 0; - p->encoding_buf = empty_unibyte_string; + PVAR (p, encoding_buf) = empty_unibyte_string; p->inherit_coding_system_flag = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); @@ -4031,8 +4031,8 @@ return; #endif - if (!NILP (ps->log)) - call3 (ps->log, server, Qnil, + if (!NILP (PVAR (ps, log))) + call3 (PVAR (ps, log), server, Qnil, concat3 (build_string ("accept failed with code"), Fnumber_to_string (make_number (code)), build_string ("\n"))); @@ -4102,15 +4102,15 @@ process name of the server process concatenated with the caller identification. */ - if (!NILP (ps->filter) && !EQ (ps->filter, Qt)) + if (!NILP (PVAR (ps, filter)) && !EQ (PVAR (ps, filter), Qt)) buffer = Qnil; else { - buffer = ps->buffer; + buffer = PVAR (ps, buffer); if (!NILP (buffer)) buffer = Fbuffer_name (buffer); else - buffer = ps->name; + buffer = PVAR (ps, name); if (!NILP (buffer)) { buffer = concat2 (buffer, caller); @@ -4121,7 +4121,7 @@ /* Generate a unique name for the new server process. Combine the server process name with the caller identification. */ - name = concat2 (ps->name, caller); + name = concat2 (PVAR (ps, name), caller); proc = make_process (name); chan_process[s] = proc; @@ -4137,7 +4137,7 @@ p = XPROCESS (proc); /* Build new contact information for this setup. */ - contact = Fcopy_sequence (ps->childp); + contact = Fcopy_sequence (PVAR (ps, childp)); contact = Fplist_put (contact, QCserver, Qnil); contact = Fplist_put (contact, QChost, host); if (!NILP (service)) @@ -4151,21 +4151,21 @@ conv_sockaddr_to_lisp (&saddr.sa, len)); #endif - p->childp = contact; - p->plist = Fcopy_sequence (ps->plist); - p->type = Qnetwork; + PVAR (p, childp) = contact; + PVAR (p, plist) = Fcopy_sequence (PVAR (ps, plist)); + PVAR (p, type) = Qnetwork; - p->buffer = buffer; - p->sentinel = ps->sentinel; - p->filter = ps->filter; - p->command = Qnil; + PVAR (p, buffer) = buffer; + PVAR (p, sentinel) = PVAR (ps, sentinel); + PVAR (p, filter) = PVAR (ps, filter); + PVAR (p, command) = Qnil; p->pid = 0; p->infd = s; p->outfd = s; - p->status = Qrun; + PVAR (p, status) = Qrun; /* Client processes for accepted connections are not stopped initially. */ - if (!EQ (p->filter, Qt)) + if (!EQ (PVAR (p, filter), Qt)) { FD_SET (s, &input_wait_mask); FD_SET (s, &non_keyboard_wait_mask); @@ -4179,24 +4179,24 @@ of the new process should reflect the settings at the time the server socket was opened; not the current settings. */ - p->decode_coding_system = ps->decode_coding_system; - p->encode_coding_system = ps->encode_coding_system; + PVAR (p, decode_coding_system) = PVAR (ps, decode_coding_system); + PVAR (p, encode_coding_system) = PVAR (ps, encode_coding_system); setup_process_coding_systems (proc); - p->decoding_buf = empty_unibyte_string; + PVAR (p, decoding_buf) = empty_unibyte_string; p->decoding_carryover = 0; - p->encoding_buf = empty_unibyte_string; + PVAR (p, encoding_buf) = empty_unibyte_string; p->inherit_coding_system_flag = (NILP (buffer) ? 0 : ps->inherit_coding_system_flag); - if (!NILP (ps->log)) - call3 (ps->log, server, proc, + if (!NILP (PVAR (ps, log))) + call3 (PVAR (ps, log), server, proc, concat3 (build_string ("accept from "), (STRINGP (host) ? host : build_string ("-")), build_string ("\n"))); - if (!NILP (p->sentinel)) + if (!NILP (PVAR (p, sentinel))) exec_sentinel (proc, concat3 (build_string ("open from "), (STRINGP (host) ? host : build_string ("-")), @@ -4287,7 +4287,8 @@ FD_ZERO (&Writeok); if (time_limit == 0 && nsecs == 0 && wait_proc && !NILP (Vinhibit_quit) - && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit))) + && !(CONSP (PVAR (wait_proc, status)) + && EQ (XCAR (PVAR (wait_proc, status)), Qexit))) message ("Blocking call to accept-process-output with quit inhibited!!"); /* If wait_proc is a process to watch, set wait_channel accordingly. */ @@ -4460,8 +4461,8 @@ if (wait_proc && wait_proc->raw_status_new) update_status (wait_proc); if (wait_proc - && ! EQ (wait_proc->status, Qrun) - && ! EQ (wait_proc->status, Qconnect)) + && ! EQ (PVAR (wait_proc, status), Qrun) + && ! EQ (PVAR (wait_proc, status), Qconnect)) { int nread, total_nread = 0; @@ -4820,7 +4821,7 @@ continue; /* If this is a server stream socket, accept connection. */ - if (EQ (XPROCESS (proc)->status, Qlisten)) + if (EQ (PVAR (XPROCESS (proc), status), Qlisten)) { server_accept_connection (proc, channel); continue; @@ -4889,7 +4890,7 @@ wait3() will not find the process object to delete. Do it here. */ p->tick = ++process_tick; - p->status = Qfailed; + PVAR (p, status) = Qfailed; } else kill (getpid (), SIGCHLD); @@ -4908,8 +4909,8 @@ deactivate_process (proc); if (XPROCESS (proc)->raw_status_new) update_status (XPROCESS (proc)); - if (EQ (XPROCESS (proc)->status, Qrun)) - XPROCESS (proc)->status + if (EQ (PVAR (XPROCESS (proc), status), Qrun)) + PVAR (XPROCESS (proc), status) = Fcons (Qexit, Fcons (make_number (256), Qnil)); } } @@ -4958,17 +4959,18 @@ if (xerrno) { p->tick = ++process_tick; - p->status = Fcons (Qfailed, Fcons (make_number (xerrno), Qnil)); + PVAR (p, status) + = Fcons (Qfailed, Fcons (make_number (xerrno), Qnil)); deactivate_process (proc); } else { - p->status = Qrun; + PVAR (p, status) = Qrun; /* Execute the sentinel here. If we had relied on status_notify to do it later, it will read input from the process before calling the sentinel. */ exec_sentinel (proc, build_string ("open\n")); - if (!EQ (p->filter, Qt) && !EQ (p->command, Qt)) + if (!EQ (PVAR (p, filter), Qt) && !EQ (PVAR (p, command), Qt)) { FD_SET (p->infd, &input_wait_mask); FD_SET (p->infd, &non_keyboard_wait_mask); @@ -5040,7 +5042,7 @@ chars = alloca (carryover + readmax); if (carryover) /* See the comment above. */ - memcpy (chars, SDATA (p->decoding_buf), carryover); + memcpy (chars, SDATA (PVAR (p, decoding_buf)), carryover); #ifdef DATAGRAM_SOCKETS /* We have a working select, so proc_buffered_char is always -1. */ @@ -5119,7 +5121,7 @@ record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); /* Read and dispose of the process output. */ - outstream = p->filter; + outstream = PVAR (p, filter); if (!NILP (outstream)) { Lisp_Object text; @@ -5161,9 +5163,9 @@ text = coding->dst_object; Vlast_coding_system_used = CODING_ID_NAME (coding->id); /* A new coding system might be found. */ - if (!EQ (p->decode_coding_system, Vlast_coding_system_used)) + if (!EQ (PVAR (p, decode_coding_system), Vlast_coding_system_used)) { - p->decode_coding_system = Vlast_coding_system_used; + PVAR (p, decode_coding_system) = Vlast_coding_system_used; /* Don't call setup_coding_system for proc_decode_coding_system[channel] here. It is done in @@ -5176,21 +5178,21 @@ proc_encode_coding_system[p->outfd] surely points to a valid memory because p->outfd will be changed once EOF is sent to the process. */ - if (NILP (p->encode_coding_system) + if (NILP (PVAR (p, encode_coding_system)) && proc_encode_coding_system[p->outfd]) { - p->encode_coding_system + PVAR (p, encode_coding_system) = coding_inherit_eol_type (Vlast_coding_system_used, Qnil); - setup_coding_system (p->encode_coding_system, + setup_coding_system (PVAR (p, encode_coding_system), proc_encode_coding_system[p->outfd]); } } if (coding->carryover_bytes > 0) { - if (SCHARS (p->decoding_buf) < coding->carryover_bytes) - p->decoding_buf = make_uninit_string (coding->carryover_bytes); - memcpy (SDATA (p->decoding_buf), coding->carryover, + if (SCHARS (PVAR (p, decoding_buf)) < coding->carryover_bytes) + PVAR (p, decoding_buf) = make_uninit_string (coding->carryover_bytes); + memcpy (SDATA (PVAR (p, decoding_buf)), coding->carryover, coding->carryover_bytes); p->decoding_carryover = coding->carryover_bytes; } @@ -5226,7 +5228,7 @@ } /* If no filter, write into buffer if it isn't dead. */ - else if (!NILP (p->buffer) && !NILP (BVAR (XBUFFER (p->buffer), name))) + else if (!NILP (PVAR (p, buffer)) && !NILP (BVAR (XBUFFER (PVAR (p, buffer)), name))) { Lisp_Object old_read_only; ptrdiff_t old_begv, old_zv; @@ -5236,7 +5238,7 @@ Lisp_Object text; struct buffer *b; - Fset_buffer (p->buffer); + Fset_buffer (PVAR (p, buffer)); opoint = PT; opoint_byte = PT_BYTE; old_read_only = BVAR (current_buffer, read_only); @@ -5250,9 +5252,11 @@ /* Insert new output into buffer at the current end-of-output marker, thus preserving logical ordering of input and output. */ - if (XMARKER (p->mark)->buffer) - SET_PT_BOTH (clip_to_bounds (BEGV, marker_position (p->mark), ZV), - clip_to_bounds (BEGV_BYTE, marker_byte_position (p->mark), + if (XMARKER (PVAR (p, mark))->buffer) + SET_PT_BOTH (clip_to_bounds (BEGV, + marker_position (PVAR (p, mark)), ZV), + clip_to_bounds (BEGV_BYTE, + marker_byte_position (PVAR (p, mark)), ZV_BYTE)); else SET_PT_BOTH (ZV, ZV_BYTE); @@ -5269,23 +5273,23 @@ Vlast_coding_system_used = CODING_ID_NAME (coding->id); /* A new coding system might be found. See the comment in the similar code in the previous `if' block. */ - if (!EQ (p->decode_coding_system, Vlast_coding_system_used)) + if (!EQ (PVAR (p, decode_coding_system), Vlast_coding_system_used)) { - p->decode_coding_system = Vlast_coding_system_used; - if (NILP (p->encode_coding_system) + PVAR (p, decode_coding_system) = Vlast_coding_system_used; + if (NILP (PVAR (p, encode_coding_system)) && proc_encode_coding_system[p->outfd]) { - p->encode_coding_system + PVAR (p, encode_coding_system) = coding_inherit_eol_type (Vlast_coding_system_used, Qnil); - setup_coding_system (p->encode_coding_system, + setup_coding_system (PVAR (p, encode_coding_system), proc_encode_coding_system[p->outfd]); } } if (coding->carryover_bytes > 0) { - if (SCHARS (p->decoding_buf) < coding->carryover_bytes) - p->decoding_buf = make_uninit_string (coding->carryover_bytes); - memcpy (SDATA (p->decoding_buf), coding->carryover, + if (SCHARS (PVAR (p, decoding_buf)) < coding->carryover_bytes) + PVAR (p, decoding_buf) = make_uninit_string (coding->carryover_bytes); + memcpy (SDATA (PVAR (p, decoding_buf)), coding->carryover, coding->carryover_bytes); p->decoding_carryover = coding->carryover_bytes; } @@ -5303,11 +5307,11 @@ /* Make sure the process marker's position is valid when the process buffer is changed in the signal_after_change above. W3 is known to do that. */ - if (BUFFERP (p->buffer) - && (b = XBUFFER (p->buffer), b != current_buffer)) - set_marker_both (p->mark, p->buffer, BUF_PT (b), BUF_PT_BYTE (b)); + if (BUFFERP (PVAR (p, buffer)) + && (b = XBUFFER (PVAR (p, buffer)), b != current_buffer)) + set_marker_both (PVAR (p, mark), PVAR (p, buffer), BUF_PT (b), BUF_PT_BYTE (b)); else - set_marker_both (p->mark, p->buffer, PT, PT_BYTE); + set_marker_both (PVAR (p, mark), PVAR (p, buffer), PT, PT_BYTE); update_mode_lines++; @@ -5401,9 +5405,9 @@ entry = Fcons (obj, Fcons (make_number (offset), make_number (len))); if (front) - p->write_queue = Fcons (entry, p->write_queue); + PVAR (p, write_queue) = Fcons (entry, PVAR (p, write_queue)); else - p->write_queue = nconc2 (p->write_queue, Fcons (entry, Qnil)); + PVAR (p, write_queue) = nconc2 (PVAR (p, write_queue), Fcons (entry, Qnil)); } /* Remove the first element in the write_queue of process P, put its @@ -5417,11 +5421,11 @@ Lisp_Object entry, offset_length; ptrdiff_t offset; - if (NILP (p->write_queue)) + if (NILP (PVAR (p, write_queue))) return 0; - entry = XCAR (p->write_queue); - p->write_queue = XCDR (p->write_queue); + entry = XCAR (PVAR (p, write_queue)); + PVAR (p, write_queue) = XCDR (PVAR (p, write_queue)); *obj = XCAR (entry); offset_length = XCDR (entry); @@ -5455,10 +5459,10 @@ if (p->raw_status_new) update_status (p); - if (! EQ (p->status, Qrun)) - error ("Process %s not running", SDATA (p->name)); + if (! EQ (PVAR (p, status), Qrun)) + error ("Process %s not running", SDATA (PVAR (p, name))); if (p->outfd < 0) - error ("Output file descriptor of %s is closed", SDATA (p->name)); + error ("Output file descriptor of %s is closed", SDATA (PVAR (p, name))); coding = proc_encode_coding_system[p->outfd]; Vlast_coding_system_used = CODING_ID_NAME (coding->id); @@ -5468,9 +5472,9 @@ && !NILP (BVAR (XBUFFER (object), enable_multibyte_characters))) || EQ (object, Qt)) { - p->encode_coding_system - = complement_process_encoding_system (p->encode_coding_system); - if (!EQ (Vlast_coding_system_used, p->encode_coding_system)) + PVAR (p, encode_coding_system) + = complement_process_encoding_system (PVAR (p, encode_coding_system)); + if (!EQ (Vlast_coding_system_used, PVAR (p, encode_coding_system))) { /* The coding system for encoding was changed to raw-text because we sent a unibyte text previously. Now we are @@ -5480,8 +5484,8 @@ Another reason we come here is that the coding system was just complemented and a new one was returned by complement_process_encoding_system. */ - setup_coding_system (p->encode_coding_system, coding); - Vlast_coding_system_used = p->encode_coding_system; + setup_coding_system (PVAR (p, encode_coding_system), coding); + Vlast_coding_system_used = PVAR (p, encode_coding_system); } coding->src_multibyte = 1; } @@ -5568,7 +5572,7 @@ /* If there is already data in the write_queue, put the new data in the back of queue. Otherwise, ignore it. */ - if (!NILP (p->write_queue)) + if (!NILP (PVAR (p, write_queue))) write_queue_push (p, object, buf, len, 0); do /* while !NILP (p->write_queue) */ @@ -5682,7 +5686,7 @@ cur_len -= written; } } - while (!NILP (p->write_queue)); + while (!NILP (PVAR (p, write_queue))); } else { @@ -5690,10 +5694,10 @@ proc = process_sent_to; p = XPROCESS (proc); p->raw_status_new = 0; - p->status = Fcons (Qexit, Fcons (make_number (256), Qnil)); + PVAR (p, status) = Fcons (Qexit, Fcons (make_number (256), Qnil)); p->tick = ++process_tick; deactivate_process (proc); - error ("SIGPIPE raised on process %s; closed it", SDATA (p->name)); + error ("SIGPIPE raised on process %s; closed it", SDATA (PVAR (p, name))); } } @@ -5751,12 +5755,12 @@ pid_t gid = -1; #ifdef TIOCGPGRP - if (ioctl (p->infd, TIOCGPGRP, &gid) == -1 && ! NILP (p->tty_name)) + if (ioctl (p->infd, TIOCGPGRP, &gid) == -1 && ! NILP (PVAR (p, tty_name))) { int fd; /* Some OS:es (Solaris 8/9) does not allow TIOCGPGRP from the master side. Try the slave side. */ - fd = emacs_open (SSDATA (p->tty_name), O_RDONLY, 0); + fd = emacs_open (SSDATA (PVAR (p, tty_name)), O_RDONLY, 0); if (fd != -1) { @@ -5785,12 +5789,12 @@ proc = get_process (process); p = XPROCESS (proc); - if (!EQ (p->type, Qreal)) + if (!EQ (PVAR (p, type), Qreal)) error ("Process %s is not a subprocess", - SDATA (p->name)); + SDATA (PVAR (p, name))); if (p->infd < 0) error ("Process %s is not active", - SDATA (p->name)); + SDATA (PVAR (p, name))); gid = emacs_get_tty_pgrp (p); @@ -5825,12 +5829,12 @@ proc = get_process (process); p = XPROCESS (proc); - if (!EQ (p->type, Qreal)) + if (!EQ (PVAR (p, type), Qreal)) error ("Process %s is not a subprocess", - SDATA (p->name)); + SDATA (PVAR (p, name))); if (p->infd < 0) error ("Process %s is not active", - SDATA (p->name)); + SDATA (PVAR (p, name))); if (!p->pty_flag) current_group = Qnil; @@ -5919,7 +5923,7 @@ #ifdef SIGCONT case SIGCONT: p->raw_status_new = 0; - p->status = Qrun; + PVAR (p, status) = Qrun; p->tick = ++process_tick; if (!nomsg) { @@ -6009,13 +6013,13 @@ struct Lisp_Process *p; p = XPROCESS (process); - if (NILP (p->command) + if (NILP (PVAR (p, command)) && p->infd >= 0) { FD_CLR (p->infd, &input_wait_mask); FD_CLR (p->infd, &non_keyboard_wait_mask); } - p->command = Qt; + PVAR (p, command) = Qt; return process; } #ifndef SIGTSTP @@ -6038,9 +6042,9 @@ struct Lisp_Process *p; p = XPROCESS (process); - if (EQ (p->command, Qt) + if (EQ (PVAR (p, command), Qt) && p->infd >= 0 - && (!EQ (p->filter, Qt) || EQ (p->status, Qlisten))) + && (!EQ (PVAR (p, filter), Qt) || EQ (PVAR (p, status), Qlisten))) { FD_SET (p->infd, &input_wait_mask); FD_SET (p->infd, &non_keyboard_wait_mask); @@ -6051,7 +6055,7 @@ tcflush (p->infd, TCIFLUSH); #endif /* not WINDOWSNT */ } - p->command = Qnil; + PVAR (p, command) = Qnil; return process; } #ifdef SIGCONT @@ -6098,7 +6102,8 @@ CHECK_PROCESS (process); pid = XPROCESS (process)->pid; if (pid <= 0) - error ("Cannot signal process %s", SDATA (XPROCESS (process)->name)); + error ("Cannot signal process %s", + SDATA (PVAR (XPROCESS (process), name))); } #define parse_signal(NAME, VALUE) \ @@ -6242,8 +6247,8 @@ /* Make sure the process is really alive. */ if (XPROCESS (proc)->raw_status_new) update_status (XPROCESS (proc)); - if (! EQ (XPROCESS (proc)->status, Qrun)) - error ("Process %s not running", SDATA (XPROCESS (proc)->name)); + if (! EQ (PVAR (XPROCESS (proc), status), Qrun)) + error ("Process %s not running", SDATA (PVAR (XPROCESS (proc), name))); if (CODING_REQUIRE_FLUSHING (coding)) { @@ -6253,7 +6258,7 @@ if (XPROCESS (proc)->pty_flag) send_process (proc, "\004", 1, Qnil); - else if (EQ (XPROCESS (proc)->type, Qserial)) + else if (EQ (PVAR (XPROCESS (proc), type), Qserial)) { #ifndef WINDOWSNT if (tcdrain (XPROCESS (proc)->outfd) != 0) @@ -6270,7 +6275,7 @@ for communication with the subprocess, call shutdown to cause EOF. (In some old system, shutdown to socketpair doesn't work. Then we just can't win.) */ - if (EQ (XPROCESS (proc)->type, Qnetwork) + if (EQ (PVAR (XPROCESS (proc), type), Qnetwork) || XPROCESS (proc)->outfd == XPROCESS (proc)->infd) shutdown (XPROCESS (proc)->outfd, 1); /* In case of socketpair, outfd == infd, so don't close it. */ @@ -6383,7 +6388,7 @@ { proc = XCDR (XCAR (tail)); p = XPROCESS (proc); - if (EQ (p->type, Qreal) && p->pid == pid) + if (EQ (PVAR (p, type), Qreal) && p->pid == pid) break; p = 0; } @@ -6467,7 +6472,7 @@ static Lisp_Object exec_sentinel_unwind (Lisp_Object data) { - XPROCESS (XCAR (data))->sentinel = XCDR (data); + PVAR (XPROCESS (XCAR (data)), sentinel) = XCDR (data); return Qnil; } @@ -6507,13 +6512,13 @@ friends don't expect current-buffer to be changed from under them. */ record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); - sentinel = p->sentinel; + sentinel = PVAR (p, sentinel); if (NILP (sentinel)) return; /* Zilch the sentinel while it's running, to avoid recursive invocations; assure that it gets restored no matter how the sentinel exits. */ - p->sentinel = Qnil; + PVAR (p, sentinel) = Qnil; record_unwind_protect (exec_sentinel_unwind, Fcons (proc, sentinel)); /* Inhibit quit so that random quits don't screw up a running filter. */ specbind (Qinhibit_quit, Qt); @@ -6601,16 +6606,16 @@ p->update_tick = p->tick; /* If process is still active, read any output that remains. */ - while (! EQ (p->filter, Qt) - && ! EQ (p->status, Qconnect) - && ! EQ (p->status, Qlisten) + while (! EQ (PVAR (p, filter), Qt) + && ! EQ (PVAR (p, status), Qconnect) + && ! EQ (PVAR (p, status), Qlisten) /* Network or serial process not stopped: */ - && ! EQ (p->command, Qt) + && ! EQ (PVAR (p, command), Qt) && p->infd >= 0 && p != deleting_process && read_process_output (proc, p->infd) > 0); - buffer = p->buffer; + buffer = PVAR (p, buffer); /* Get the text to use for the message. */ if (p->raw_status_new) @@ -6618,9 +6623,9 @@ msg = status_message (p); /* If process is terminated, deactivate it or delete it. */ - symbol = p->status; - if (CONSP (p->status)) - symbol = XCAR (p->status); + symbol = PVAR (p, status); + if (CONSP (PVAR (p, status))) + symbol = XCAR (PVAR (p, status)); if (EQ (symbol, Qsignal) || EQ (symbol, Qexit) || EQ (symbol, Qclosed)) @@ -6637,7 +6642,7 @@ this code to be run again. */ p->update_tick = p->tick; /* Now output the message suitably. */ - if (!NILP (p->sentinel)) + if (!NILP (PVAR (p, sentinel))) exec_sentinel (proc, msg); /* Don't bother with a message in the buffer when a process becomes runnable. */ @@ -6659,8 +6664,8 @@ /* Insert new output into buffer at the current end-of-output marker, thus preserving logical ordering of input and output. */ - if (XMARKER (p->mark)->buffer) - Fgoto_char (p->mark); + if (XMARKER (PVAR (p, mark))->buffer) + Fgoto_char (PVAR (p, mark)); else SET_PT_BOTH (ZV, ZV_BYTE); @@ -6670,11 +6675,11 @@ tem = BVAR (current_buffer, read_only); BVAR (current_buffer, read_only) = Qnil; insert_string ("\nProcess "); - Finsert (1, &p->name); + Finsert (1, &PVAR (p, name)); insert_string (" "); Finsert (1, &msg); BVAR (current_buffer, read_only) = tem; - set_marker_both (p->mark, p->buffer, PT, PT_BYTE); + set_marker_both (PVAR (p, mark), PVAR (p, buffer), PT, PT_BYTE); if (opoint >= before) SET_PT_BOTH (opoint + (PT - before), @@ -6704,14 +6709,14 @@ CHECK_PROCESS (process); p = XPROCESS (process); if (p->infd < 0) - error ("Input file descriptor of %s closed", SDATA (p->name)); + error ("Input file descriptor of %s closed", SDATA (PVAR (p, name))); if (p->outfd < 0) - error ("Output file descriptor of %s closed", SDATA (p->name)); + error ("Output file descriptor of %s closed", SDATA (PVAR (p, name))); Fcheck_coding_system (decoding); Fcheck_coding_system (encoding); encoding = coding_inherit_eol_type (encoding, Qnil); - p->decode_coding_system = decoding; - p->encode_coding_system = encoding; + PVAR (p, decode_coding_system) = decoding; + PVAR (p, encode_coding_system) = encoding; setup_process_coding_systems (process); return Qnil; @@ -6723,8 +6728,8 @@ (register Lisp_Object process) { CHECK_PROCESS (process); - return Fcons (XPROCESS (process)->decode_coding_system, - XPROCESS (process)->encode_coding_system); + return Fcons (PVAR (XPROCESS (process), decode_coding_system), + PVAR (XPROCESS (process), encode_coding_system)); } DEFUN ("set-process-filter-multibyte", Fset_process_filter_multibyte, @@ -6741,7 +6746,8 @@ CHECK_PROCESS (process); p = XPROCESS (process); if (NILP (flag)) - p->decode_coding_system = raw_text_coding_system (p->decode_coding_system); + PVAR (p, decode_coding_system) + = raw_text_coding_system (PVAR (p, decode_coding_system)); setup_process_coding_systems (process); return Qnil; @@ -7079,19 +7085,19 @@ if (!proc_decode_coding_system[inch]) proc_decode_coding_system[inch] = xmalloc (sizeof (struct coding_system)); - coding_system = p->decode_coding_system; - if (! NILP (p->filter)) + coding_system = PVAR (p, decode_coding_system); + if (! NILP (PVAR (p, filter))) ; - else if (BUFFERP (p->buffer)) + else if (BUFFERP (PVAR (p, buffer))) { - if (NILP (BVAR (XBUFFER (p->buffer), enable_multibyte_characters))) + if (NILP (BVAR (XBUFFER (PVAR (p, buffer)), enable_multibyte_characters))) coding_system = raw_text_coding_system (coding_system); } setup_coding_system (coding_system, proc_decode_coding_system[inch]); if (!proc_encode_coding_system[outch]) proc_encode_coding_system[outch] = xmalloc (sizeof (struct coding_system)); - setup_coding_system (p->encode_coding_system, + setup_coding_system (PVAR (p, encode_coding_system), proc_encode_coding_system[outch]); #endif } @@ -7137,7 +7143,7 @@ for (tail = Vprocess_alist; CONSP (tail); tail = XCDR (tail)) { proc = Fcdr (XCAR (tail)); - if (PROCESSP (proc) && EQ (XPROCESS (proc)->buffer, buf)) + if (PROCESSP (proc) && EQ (PVAR (XPROCESS (proc), buffer), buf)) return proc; } #endif /* subprocesses */ @@ -7176,7 +7182,7 @@ { proc = XCDR (XCAR (tail)); if (PROCESSP (proc) - && (NILP (buffer) || EQ (XPROCESS (proc)->buffer, buffer))) + && (NILP (buffer) || EQ (PVAR (XPROCESS (proc), buffer), buffer))) { if (NETCONN_P (proc) || SERIALCONN_P (proc)) Fdelete_process (proc); === modified file 'src/process.h' --- src/process.h 2012-07-31 22:24:49 +0000 +++ src/process.h 2012-08-01 06:23:24 +0000 @@ -26,59 +26,78 @@ #include "gnutls.h" #endif +/* Most code should use this macro to access + Lisp fields in struct Lisp_Process. */ + +#define PVAR(w, field) ((w)->INTERNAL_FIELD (field)) + /* This structure records information about a subprocess - or network connection. - - Every field in this structure except for the header - must be a Lisp_Object, for GC's sake. */ + or network connection. */ struct Lisp_Process { struct vectorlike_header header; /* Name of subprocess terminal. */ - Lisp_Object tty_name; + Lisp_Object INTERNAL_FIELD (tty_name); + /* Name of this process */ - Lisp_Object name; + Lisp_Object INTERNAL_FIELD (name); + /* List of command arguments that this process was run with. Is set to t for a stopped network process; nil otherwise. */ - Lisp_Object command; + Lisp_Object INTERNAL_FIELD (command); + /* (funcall FILTER PROC STRING) (if FILTER is non-nil) to dispose of a bunch of chars from the process all at once */ - Lisp_Object filter; + Lisp_Object INTERNAL_FIELD (filter); + /* (funcall SENTINEL PROCESS) when process state changes */ - Lisp_Object sentinel; + Lisp_Object INTERNAL_FIELD (sentinel); + /* (funcall LOG SERVER CLIENT MESSAGE) when a server process accepts a connection from a client. */ - Lisp_Object log; + Lisp_Object INTERNAL_FIELD (log); + /* Buffer that output is going to */ - Lisp_Object buffer; + Lisp_Object INTERNAL_FIELD (buffer); + /* t if this is a real child process. For a network or serial connection, it is a plist based on the arguments to make-network-process or make-serial-process. */ - Lisp_Object childp; + + Lisp_Object INTERNAL_FIELD (childp); + /* Plist for programs to keep per-process state information, parameters, etc. */ - Lisp_Object plist; + Lisp_Object INTERNAL_FIELD (plist); + /* Symbol indicating the type of process: real, network, serial */ - Lisp_Object type; + Lisp_Object INTERNAL_FIELD (type); + /* Marker set to end of last buffer-inserted output from this process */ - Lisp_Object mark; + Lisp_Object INTERNAL_FIELD (mark); + /* Symbol indicating status of process. This may be a symbol: run, open, or closed. Or it may be a list, whose car is stop, exit or signal and whose cdr is a pair (EXIT_CODE . COREDUMP_FLAG) or (SIGNAL_NUMBER . COREDUMP_FLAG). */ - Lisp_Object status; + Lisp_Object INTERNAL_FIELD (status); + /* Coding-system for decoding the input from this process. */ - Lisp_Object decode_coding_system; + Lisp_Object INTERNAL_FIELD (decode_coding_system); + /* Working buffer for decoding. */ - Lisp_Object decoding_buf; + Lisp_Object INTERNAL_FIELD (decoding_buf); + /* Coding-system for encoding the output to this process. */ - Lisp_Object encode_coding_system; + Lisp_Object INTERNAL_FIELD (encode_coding_system); + /* Working buffer for encoding. */ - Lisp_Object encoding_buf; + Lisp_Object INTERNAL_FIELD (encoding_buf); + /* Queue for storing waiting writes */ - Lisp_Object write_queue; + Lisp_Object INTERNAL_FIELD (write_queue); #ifdef HAVE_GNUTLS Lisp_Object gnutls_cred_type; === modified file 'src/sysdep.c' --- src/sysdep.c 2012-07-20 07:29:04 +0000 +++ src/sysdep.c 2012-08-01 06:23:24 +0000 @@ -2156,7 +2156,7 @@ int err = -1; char summary[4] = "???"; /* This usually becomes "8N1". */ - childp2 = Fcopy_sequence (p->childp); + childp2 = Fcopy_sequence (PVAR (p, childp)); /* Read port attributes and prepare default configuration. */ err = tcgetattr (p->outfd, &attr); @@ -2174,7 +2174,7 @@ if (!NILP (Fplist_member (contact, QCspeed))) tem = Fplist_get (contact, QCspeed); else - tem = Fplist_get (p->childp, QCspeed); + tem = Fplist_get (PVAR (p, childp), QCspeed); CHECK_NUMBER (tem); err = cfsetspeed (&attr, XINT (tem)); if (err != 0) @@ -2186,7 +2186,7 @@ if (!NILP (Fplist_member (contact, QCbytesize))) tem = Fplist_get (contact, QCbytesize); else - tem = Fplist_get (p->childp, QCbytesize); + tem = Fplist_get (PVAR (p, childp), QCbytesize); if (NILP (tem)) tem = make_number (8); CHECK_NUMBER (tem); @@ -2207,7 +2207,7 @@ if (!NILP (Fplist_member (contact, QCparity))) tem = Fplist_get (contact, QCparity); else - tem = Fplist_get (p->childp, QCparity); + tem = Fplist_get (PVAR (p, childp), QCparity); if (!NILP (tem) && !EQ (tem, Qeven) && !EQ (tem, Qodd)) error (":parity must be nil (no parity), `even', or `odd'"); #if defined (PARENB) && defined (PARODD) && defined (IGNPAR) && defined (INPCK) @@ -2240,7 +2240,7 @@ if (!NILP (Fplist_member (contact, QCstopbits))) tem = Fplist_get (contact, QCstopbits); else - tem = Fplist_get (p->childp, QCstopbits); + tem = Fplist_get (PVAR (p, childp), QCstopbits); if (NILP (tem)) tem = make_number (1); CHECK_NUMBER (tem); @@ -2262,7 +2262,7 @@ if (!NILP (Fplist_member (contact, QCflowcontrol))) tem = Fplist_get (contact, QCflowcontrol); else - tem = Fplist_get (p->childp, QCflowcontrol); + tem = Fplist_get (PVAR (p, childp), QCflowcontrol); if (!NILP (tem) && !EQ (tem, Qhw) && !EQ (tem, Qsw)) error (":flowcontrol must be nil (no flowcontrol), `hw', or `sw'"); #if defined (CRTSCTS) @@ -2304,7 +2304,7 @@ error ("tcsetattr() failed: %s", emacs_strerror (errno)); childp2 = Fplist_put (childp2, QCsummary, build_string (summary)); - p->childp = childp2; + PVAR (p, childp) = childp2; } #endif /* not DOS_NT */ === modified file 'src/w32.c' --- src/w32.c 2012-07-29 16:22:27 +0000 +++ src/w32.c 2012-08-01 06:23:24 +0000 @@ -6144,7 +6144,7 @@ error ("Not a serial process"); hnd = fd_info[ p->outfd ].hnd; - childp2 = Fcopy_sequence (p->childp); + childp2 = Fcopy_sequence (PVAR (p, childp)); /* Initialize timeouts for blocking read and blocking write. */ if (!GetCommTimeouts (hnd, &ct)) @@ -6173,7 +6173,7 @@ if (!NILP (Fplist_member (contact, QCspeed))) tem = Fplist_get (contact, QCspeed); else - tem = Fplist_get (p->childp, QCspeed); + tem = Fplist_get (PVAR (p, childp), QCspeed); CHECK_NUMBER (tem); dcb.BaudRate = XINT (tem); childp2 = Fplist_put (childp2, QCspeed, tem); @@ -6182,7 +6182,7 @@ if (!NILP (Fplist_member (contact, QCbytesize))) tem = Fplist_get (contact, QCbytesize); else - tem = Fplist_get (p->childp, QCbytesize); + tem = Fplist_get (PVAR (p, childp), QCbytesize); if (NILP (tem)) tem = make_number (8); CHECK_NUMBER (tem); @@ -6196,7 +6196,7 @@ if (!NILP (Fplist_member (contact, QCparity))) tem = Fplist_get (contact, QCparity); else - tem = Fplist_get (p->childp, QCparity); + tem = Fplist_get (PVAR (p, childp), QCparity); if (!NILP (tem) && !EQ (tem, Qeven) && !EQ (tem, Qodd)) error (":parity must be nil (no parity), `even', or `odd'"); dcb.fParity = FALSE; @@ -6226,7 +6226,7 @@ if (!NILP (Fplist_member (contact, QCstopbits))) tem = Fplist_get (contact, QCstopbits); else - tem = Fplist_get (p->childp, QCstopbits); + tem = Fplist_get (PVAR (p, childp), QCstopbits); if (NILP (tem)) tem = make_number (1); CHECK_NUMBER (tem); @@ -6243,7 +6243,7 @@ if (!NILP (Fplist_member (contact, QCflowcontrol))) tem = Fplist_get (contact, QCflowcontrol); else - tem = Fplist_get (p->childp, QCflowcontrol); + tem = Fplist_get (PVAR (p, childp), QCflowcontrol); if (!NILP (tem) && !EQ (tem, Qhw) && !EQ (tem, Qsw)) error (":flowcontrol must be nil (no flowcontrol), `hw', or `sw'"); dcb.fOutxCtsFlow = FALSE; @@ -6277,7 +6277,7 @@ error ("SetCommState() failed"); childp2 = Fplist_put (childp2, QCsummary, build_string (summary)); - p->childp = childp2; + PVAR (p, childp) = childp2; } #ifdef HAVE_GNUTLS === modified file 'src/xdisp.c' --- src/xdisp.c 2012-08-01 05:11:36 +0000 +++ src/xdisp.c 2012-08-01 06:23:24 +0000 @@ -21678,10 +21678,10 @@ obj = Fget_buffer_process (Fcurrent_buffer ()); if (PROCESSP (obj)) { - p = decode_mode_spec_coding (XPROCESS (obj)->decode_coding_system, - p, eol_flag); - p = decode_mode_spec_coding (XPROCESS (obj)->encode_coding_system, - p, eol_flag); + p = decode_mode_spec_coding + (PVAR (XPROCESS (obj), decode_coding_system), p, eol_flag); + p = decode_mode_spec_coding + (PVAR (XPROCESS (obj), encode_coding_system), p, eol_flag); } #endif /* subprocesses */ #endif /* 0 */