10 files changed, 90 insertions, 71 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ce4fe1cd7b4..37a4cdb1b10 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (Fx_create_frame): Set default to Qright.
+
+        * frame.c (Vdefault_frame_scroll_bars): Set default to Qright for
+        all window systems.
+
+2010-03-12  Eli Zaretskii  <eliz@gnu.org>
+
+        These changes remove termcap.c from the build on Posix platforms.
+        * Makefilie.in (termcapobj): Move termcap.o from here...
+        (MSDOS_OBJ): ...to here.
+        (termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is
+        now identical to when LIBS_TERMCAP is defined.
+
+        * term.c: Remove (ifdef'ed away) inclusion of termcap.h.
+
+        * cm.c: Remove (ifdef'ed away) inclusion of termcap.h.
+
+        * config.in: Regenerated.  (See top-level ChangeLog.)
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
+2010-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Cleanup setup of gl_state in various parts of the code.
+        * syntax.h (SETUP_BUFFER_SYNTAX_TABLE): New macro.
+        (SETUP_SYNTAX_TABLE, SETUP_SYNTAX_TABLE_FOR_OBJECT):
+        * syntax.c (find_defun_start, Fchar_syntax, Fmatching_paren)
+        (skip_chars):
+        * regex.c (regex_compile): Use it.
+        (re_compile_pattern): Don't set gl_state.current_syntax_table since
+        it's now set in regex_compile when/if we need it.
+
 2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         Make it possible to C-g in a tight bytecode loop again (bug#5680).
diff --git a/src/cm.c b/src/cm.c
index f6bf37cb7db..73d3791074e 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -33,13 +33,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* For now, don't try to include termcap.h.  On some systems,
    configure finds a non-standard termcap.h that the main build
    won't find.  */
-
-#if defined HAVE_TERMCAP_H && 0
-#include <termcap.h>
-#else
 extern void tputs P_ ((const char *, int, int (*)(int)));
 extern char *tgoto P_ ((const char *, int, int));
-#endif
 
 #define BIG     9999            /* 9999 good on VAXen.  For 16 bit machines
                                    use about 2000.... */
diff --git a/src/config.in b/src/config.in
index b321c586a4a..3a3ae09a084 100644
--- a/src/config.in
+++ b/src/config.in
@@ -319,10 +319,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <kerberos/krb.h> header file. */
 #undef HAVE_KERBEROS_KRB_H
 
-/* Define to 1 if `e_text' is member of `krb5_error'. */
+/* Define to 1 if `krb5_error' is a member of `e_text'. */
 #undef HAVE_KRB5_ERROR_E_TEXT
 
-/* Define to 1 if `text' is member of `krb5_error'. */
+/* Define to 1 if `krb5_error' is a member of `text'. */
 #undef HAVE_KRB5_ERROR_TEXT
 
 /* Define to 1 if you have the <krb5.h> header file. */
@@ -616,25 +616,25 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 
-/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
+/* Define to 1 if `struct ifreq' is a member of `ifr_addr'. */
 #undef HAVE_STRUCT_IFREQ_IFR_ADDR
 
-/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
+/* Define to 1 if `struct ifreq' is a member of `ifr_broadaddr'. */
 #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
 
-/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
+/* Define to 1 if `struct ifreq' is a member of `ifr_flags'. */
 #undef HAVE_STRUCT_IFREQ_IFR_FLAGS
 
-/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
+/* Define to 1 if `struct ifreq' is a member of `ifr_hwaddr'. */
 #undef HAVE_STRUCT_IFREQ_IFR_HWADDR
 
-/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
+/* Define to 1 if `struct ifreq' is a member of `ifr_netmask'. */
 #undef HAVE_STRUCT_IFREQ_IFR_NETMASK
 
-/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
+/* Define to 1 if `struct nlist' is a member of `n_un.n_name'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `struct tm' is a member of `tm_zone'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
@@ -697,9 +697,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <sys/_mbstate_t.h> header file. */
 #undef HAVE_SYS__MBSTATE_T_H
 
-/* Define to 1 if you have the <termcap.h> header file. */
-#undef HAVE_TERMCAP_H
-
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
@@ -858,6 +855,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -917,6 +917,28 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if using the Motif X toolkit. */
 #undef USE_MOTIF
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if we should use toolkit scroll bars. */
 #undef USE_TOOLKIT_SCROLL_BARS
 
@@ -952,28 +974,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
diff --git a/src/frame.c b/src/frame.c
index f05f9f751da..c779f1c5b65 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4584,13 +4584,8 @@ Setting this variable does not affect existing frames, only new ones.  */);
   DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
                doc: /* Default position of scroll bars on this window-system.  */);
 #ifdef HAVE_WINDOW_SYSTEM
-#if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA)
-  /* MS-Windows and Mac OS X have scroll bars on the right by default.  */
   Vdefault_frame_scroll_bars = Qright;
 #else
-  Vdefault_frame_scroll_bars = Qleft;
-#endif
-#else
   Vdefault_frame_scroll_bars = Qnil;
 #endif
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 1e331d078ce..48d39235e3f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11235,6 +11235,7 @@ handle_interrupt ()
           GCPRO4 (saved.object, saved.global_code,
                   saved.current_syntax_table, saved.old_prop);
           Fsignal (Qquit, Qnil);
+          /* FIXME: AFAIK, `quit' can never return, so this code is dead!  */
           gl_state = saved;
           UNGCPRO;
         }
diff --git a/src/regex.c b/src/regex.c
index f242446796d..e59c48aad74 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3070,7 +3070,7 @@ regex_compile (pattern, size, syntax, bufp)
                            syntax-table for ASCII chars, while the other chars
                            will obey syntax-table properties.  It's not ideal,
                            but it's the way it's been done until now.  */
-                        SETUP_SYNTAX_TABLE (BEGV, 0);
+                        SETUP_BUFFER_SYNTAX_TABLE ();
 
                         for (ch = 0; ch < 256; ++ch)
                           {
@@ -4496,7 +4496,7 @@ re_search_2 (bufp, str1, size1, str2, size2, startpos, range, regs, stop)
   anchored_start = (bufp->buffer[0] == begline);
 
 #ifdef emacs
-  gl_state.object = re_match_object;
+  gl_state.object = re_match_object; /* Used by SYNTAX_TABLE_BYTE_TO_CHAR. */
   {
     int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (startpos));
 
@@ -5099,7 +5099,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
 
 #ifdef emacs
   int charpos;
-  gl_state.object = re_match_object;
+  gl_state.object = re_match_object; /* Used by SYNTAX_TABLE_BYTE_TO_CHAR. */
   charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (pos));
   SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1);
 #endif
@@ -6504,10 +6504,6 @@ re_compile_pattern (pattern, length, bufp)
 {
   reg_errcode_t ret;
 
-#ifdef emacs
-  gl_state.current_syntax_table = current_buffer->syntax_table;
-#endif
-
   /* GNU code is written to assume at least RE_NREGS registers will be set
      (and at least one extra will be -1).  */
   bufp->regs_allocated = REGS_UNALLOCATED;
diff --git a/src/syntax.c b/src/syntax.c
index 47b4caf5ade..a80f047e43c 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -385,8 +385,7 @@ find_defun_start (pos, pos_byte)
   /* We optimize syntax-table lookup for rare updates.  Thus we accept
      only those `^\s(' which are good in global _and_ text-property
      syntax-tables.  */
-  gl_state.current_syntax_table = current_buffer->syntax_table;
-  gl_state.use_global = 0;
+  SETUP_BUFFER_SYNTAX_TABLE ();
   while (PT > BEGV)
     {
       int c;
@@ -401,8 +400,7 @@ find_defun_start (pos, pos_byte)
           if (SYNTAX (c) == Sopen)
             break;
           /* Now fallback to the default value.  */
-          gl_state.current_syntax_table = current_buffer->syntax_table;
-          gl_state.use_global = 0;
+          SETUP_BUFFER_SYNTAX_TABLE ();
         }
       /* Move to beg of previous line.  */
       scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -2, 1);
@@ -860,11 +858,9 @@ are listed in the documentation of `modify-syntax-entry'.  */)
      Lisp_Object character;
 {
   int char_int;
-  gl_state.current_syntax_table = current_buffer->syntax_table;
-
-  gl_state.use_global = 0;
   CHECK_NUMBER (character);
   char_int = XINT (character);
+  SETUP_BUFFER_SYNTAX_TABLE ();
   return make_number (syntax_code_spec[(int) SYNTAX (char_int)]);
 }
 
@@ -874,10 +870,9 @@ DEFUN ("matching-paren", Fmatching_paren, Smatching_paren, 1, 1, 0,
      Lisp_Object character;
 {
   int char_int, code;
-  gl_state.current_syntax_table = current_buffer->syntax_table;
-  gl_state.use_global = 0;
   CHECK_NUMBER (character);
   char_int = XINT (character);
+  SETUP_BUFFER_SYNTAX_TABLE ();
   code = SYNTAX (char_int);
   if (code == Sopen || code == Sclose)
     return SYNTAX_MATCH (char_int);
@@ -1752,7 +1747,7 @@ skip_chars (forwardp, string, lim, handle_iso_classes)
        let's initialize it manually.
        We ignore syntax-table text-properties for now, since that's
        what we've done in the past.  */
-    SETUP_SYNTAX_TABLE (BEGV, 0);
+    SETUP_BUFFER_SYNTAX_TABLE ();
     if (forwardp)
       {
         if (multibyte)
diff --git a/src/syntax.h b/src/syntax.h
index c36b1eb28f6..ec8fab0166c 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -245,6 +245,14 @@ extern char syntax_code_spec[16];
          1)                                                     \
       : 0))
 
+/* This macro sets up the buffer-global syntax table.  */
+#define SETUP_BUFFER_SYNTAX_TABLE()                                     \
+do                                                                      \
+  {                                                                     \
+    gl_state.use_global = 0;                                            \
+    gl_state.current_syntax_table = current_buffer->syntax_table;       \
+  } while (0)
+
 /* This macro should be called with FROM at the start of forward
    search, or after the last position of the backward search.  It
    makes sure that the first char is picked up with correct table, so
@@ -256,12 +264,11 @@ extern char syntax_code_spec[16];
 #define SETUP_SYNTAX_TABLE(FROM, COUNT)                                 \
 do                                                                      \
   {                                                                     \
+    SETUP_BUFFER_SYNTAX_TABLE ();                                       \
     gl_state.b_property = BEGV;                                         \
     gl_state.e_property = ZV + 1;                                       \
     gl_state.object = Qnil;                                             \
-    gl_state.use_global = 0;                                            \
     gl_state.offset = 0;                                                \
-    gl_state.current_syntax_table = current_buffer->syntax_table;       \
     if (parse_sexp_lookup_properties)                                   \
       if ((COUNT) > 0 || (FROM) > BEGV)                                 \
         update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),\
@@ -279,6 +286,7 @@ while (0)
 #define SETUP_SYNTAX_TABLE_FOR_OBJECT(OBJECT, FROM, COUNT)              \
 do                                                                      \
   {                                                                     \
+    SETUP_BUFFER_SYNTAX_TABLE ();                                       \
     gl_state.object = (OBJECT);                                         \
     if (BUFFERP (gl_state.object))                                      \
       {                                                                 \
@@ -305,8 +313,6 @@ do									\
         gl_state.e_property = 1 + SCHARS (gl_state.object);             \
         gl_state.offset = 0;                                            \
       }                                                                 \
-    gl_state.use_global = 0;                                            \
-    gl_state.current_syntax_table = current_buffer->syntax_table;       \
     if (parse_sexp_lookup_properties)                                   \
       update_syntax_table (((FROM) + gl_state.offset                    \
                             + (COUNT > 0 ? 0 :  -1)),                   \
diff --git a/src/term.c b/src/term.c
index dbfdf80d905..718a20d4164 100644
--- a/src/term.c
+++ b/src/term.c
@@ -66,15 +66,10 @@ static int been_here = -1;
 /* For now, don't try to include termcap.h.  On some systems,
    configure finds a non-standard termcap.h that the main build
    won't find.  */
-
-#if defined HAVE_TERMCAP_H && 0
-#include <termcap.h>
-#else
 extern void tputs P_ ((const char *, int, int (*)(int)));
 extern int tgetent P_ ((char *, const char *));
 extern int tgetflag P_ ((char *id));
 extern int tgetnum P_ ((char *id));
-#endif
 
 #include "cm.h"
 #ifdef HAVE_X_WINDOWS
diff --git a/src/xfns.c b/src/xfns.c
index 96fb090e327..84d0d622200 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3376,7 +3376,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
 #endif
                        "internalBorderWidth", "internalBorderWidth",
                        RES_TYPE_NUMBER);
-  x_default_parameter (f, parms, Qvertical_scroll_bars, Qleft,
+  x_default_parameter (f, parms, Qvertical_scroll_bars, Qright,
                        "verticalScrollBars", "ScrollBars",
                        RES_TYPE_SYMBOL);