XEmacs 21.4.5 "Civil Service".

[chise/xemacs-chise.git.1] / src / editfns.c

diff --git a/src/editfns.c b/src/editfns.c
index 7a8df46..bc3d29b 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include "frame.h"
 #include "insdel.h"
 #include "window.h"
+#include "casetab.h"
 #include "chartab.h"
 #include "line-number.h"
 
@@ -636,7 +637,8 @@ On Unix it is obtained from TMPDIR, with /tmp as the default.
        {
          mkdir(path, 0700);    /* ignore retval -- checked next anyway. */
        }
-      if (lstat(path, &st) == 0 && st.st_uid == myuid && S_ISDIR(st.st_mode))
+      if (lstat(path, &st) == 0 && st.st_uid == (uid_t) myuid &&
+         S_ISDIR(st.st_mode))
        {
          tmpdir = path;
        }
@@ -823,7 +825,7 @@ value of `user-full-name' is returned.
 #endif
   tem = ((!NILP (user) && !pw)
         ? Qnil
-        : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
+        : make_ext_string ((Extbyte *) p, (q ? q - p : (int) strlen (p)),
                            Qnative));
 
 #ifdef AMPERSAND_FULL_NAME
@@ -1489,7 +1491,6 @@ buffer_insert1 (struct buffer *buf, Lisp_Object arg)
       arg = wrong_type_argument (Qchar_or_string_p, arg);
       goto retry;
     }
-  zmacs_region_stays = 0;
   UNGCPRO;
 }
 
@@ -1550,7 +1551,6 @@ Any other markers at the point of insertion also end up after the text.
          goto retry;
        }
     }
-  zmacs_region_stays = 0;
   return Qnil;
 }
 
@@ -1566,7 +1566,6 @@ BUFFER defaults to the current buffer.
   struct buffer *b = decode_buffer (buffer, 1);
   CHECK_STRING (string);
   buffer_insert_lisp_string (b, string);
-  zmacs_region_stays = 0;
   return Qnil;
 }
 
@@ -1637,7 +1636,6 @@ text into.  If BUFFER is nil, the current buffer is assumed.
     buffer_insert_raw_string (b, string, n);
 #endif
 
-  zmacs_region_stays = 0;
   return Qnil;
 }
 
@@ -1717,7 +1715,7 @@ determines whether case is significant or ignored.
   REGISTER Charcount len1, len2, length, i;
   struct buffer *bp1, *bp2;
   Lisp_Object trt = ((!NILP (current_buffer->case_fold_search)) ?
-                    current_buffer->case_canon_table : Qnil);
+                    XCASE_TABLE_CANON (current_buffer->case_table) : Qnil);
 
   /* Find the first buffer and its substring.  */
 
@@ -2003,7 +2001,6 @@ If optional third arg BUFFER is nil, the current buffer is assumed.
 
   get_buffer_range_char (buf, start, end, &bp_start, &bp_end, 0);
   buffer_delete_range (buf, bp_start, bp_end, 0);
-  zmacs_region_stays = 0;
   return Qnil;
 }
 \f
@@ -2040,7 +2037,6 @@ If BUFFER is nil, the current buffer is assumed.
 {
   struct buffer *b = decode_buffer (buffer, 1);
   widen_buffer (b, 0);
-  zmacs_region_stays = 0;
   return Qnil;
 }
 
@@ -2076,7 +2072,6 @@ or markers) bounding the text that should remain visible.
   /* Changing the buffer bounds invalidates any recorded current column.  */
   invalidate_current_column ();
   narrow_line_number_cache (buf);
-  zmacs_region_stays = 0;
   return Qnil;
 }