Merge from mainline.

7 files changed, 126 insertions, 167 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 96dc0066fd9..38368f33a70 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,33 @@
+2010-01-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * fileio.c (Frename_file): Fix last change (Bug#5487).
+
+        * m/mips.h: Remove DATA_START.  Suggested by Dan Nicolaescu.
+
+        * m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629).
+
+2010-01-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (Fx_create_frame): Remove window size matching code from
+        2010-01-15.
+        (x_get_current_desktop, x_get_desktop_workarea): Remove
+
+2010-01-27  Jason Rumney  <jasonr@gnu.org>
+
+        * w32inevt.c (w32_kbd_patch_key): Save the unicode character.
+        (key_event): Use unicode for characters 128 and higher (Bug#4567).
+
+2010-01-27  Kenichi Handa  <handa@m17n.org>
+
+        * regex.c (analyse_first): Fix setting of fastmap for unibyte
+        pattern string (Bug#4209).
+
+2010-01-27  David De La Harpe Golden  <david@harpegolden.net>
+
+        * fileio.c (Frename_file): Call copy-directory and
+        delete-directory for directories, in order to handle cross-device
+        renaming (Bug#3353).
+
 2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (Fx_create_frame): If frame height is too big, try
@@ -9323,7 +9353,7 @@
         (syms_of_xterm): Don't declare it any more.
         (x_draw_glyph_string): Adjust to the new name.
 
-2008-06-10  David De La Harpe Golden  <david@harpegolden.net>  (tiny change)
+2008-06-10  David De La Harpe Golden  <david@harpegolden.net>
 
         * xterm.c (x_underline_minimum_display_offset): New var.
         (x_draw_glyph_string): Use it.
diff --git a/src/fileio.c b/src/fileio.c
index d6cb814641b..72f695acb68 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -215,6 +215,12 @@ Lisp_Object Qdelete_by_moving_to_trash;
 /* Lisp function for moving files to trash.  */
 Lisp_Object Qmove_file_to_trash;
 
+/* Lisp function for recursively copying directories.  */
+Lisp_Object Qcopy_directory;
+
+/* Lisp function for recursively deleting directories.  */
+Lisp_Object Qdelete_directory;
+
 extern Lisp_Object Vuser_login_name;
 
 #ifdef WINDOWSNT
@@ -2241,7 +2247,11 @@ This is what happens in interactive use with M-x.  */)
       && (NILP (Fstring_equal (Fdowncase (file), Fdowncase (newname))))
 #endif
       )
-    newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
+    {
+      Lisp_Object fname = NILP (Ffile_directory_p (file))
+        ? file : Fdirectory_file_name (file);
+      newname = Fexpand_file_name (Ffile_name_nondirectory (fname), newname);
+    }
   else
     newname = Fexpand_file_name (newname, Qnil);
 
@@ -2279,15 +2289,21 @@ This is what happens in interactive use with M-x.  */)
                                  NILP (ok_if_already_exists) ? Qnil : Qt);
           else
 #endif
+          if (!NILP (Ffile_directory_p (file)))
+            call4 (Qcopy_directory, file, newname, Qt, Qnil);
+          else
+            /* We have already prompted if it was an integer, so don't
+               have copy-file prompt again.  */
             Fcopy_file (file, newname,
-                        /* We have already prompted if it was an integer,
-                           so don't have copy-file prompt again.  */
                         NILP (ok_if_already_exists) ? Qnil : Qt,
                         Qt, Qt);
 
           count = SPECPDL_INDEX ();
           specbind (Qdelete_by_moving_to_trash, Qnil);
-          Fdelete_file (file);
+          if (!NILP (Ffile_directory_p (file)))
+            call2 (Qdelete_directory, file, Qt);
+          else
+            Fdelete_file (file);
           unbind_to (count, Qnil);
         }
       else
@@ -5727,6 +5743,10 @@ When non-nil, the function `move-file-to-trash' will be used by
   Qdelete_by_moving_to_trash = intern_c_string ("delete-by-moving-to-trash");
   Qmove_file_to_trash = intern_c_string ("move-file-to-trash");
   staticpro (&Qmove_file_to_trash);
+  Qcopy_directory = intern_c_string ("copy-directory");
+  staticpro (&Qcopy_directory);
+  Qdelete_directory = intern_c_string ("delete-directory");
+  staticpro (&Qdelete_directory);
 
   defsubr (&Sfind_file_name_handler);
   defsubr (&Sfile_name_directory);
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 26cdb807452..5abf8bba726 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -95,7 +95,7 @@ NOTE-END
 
 #undef UNEXEC
 #define UNEXEC unexelf.o
-#ifndef GNU_LINUX
+#if !defined(GNU_LINUX) && !defined(__NetBSD__)
 #define DATA_START    0x140000000
 #endif
 
diff --git a/src/m/mips.h b/src/m/mips.h
index 2b47dba25fa..7a84b6596c8 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -50,10 +50,6 @@ NOTE-END  */
 
 #define TEXT_START      0x00400000
 
-#ifndef GNU_LINUX
-#define DATA_START      0x10000000
-#endif
-
 
 #if 0 /* These definitions were advantageous when not using
          USE_LSB_TAG.  With that, they get ignored but cause errors.  */
diff --git a/src/regex.c b/src/regex.c
index 0dbfa5971b3..bb921a5b519 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -4083,8 +4083,7 @@ analyse_first (p, pend, fastmap, multibyte)
                      the corresponding multibyte character.  */
                   int c = RE_CHAR_TO_MULTIBYTE (p[1]);
 
-                  if (! CHAR_BYTE8_P (c))
-                    fastmap[CHAR_LEADING_CODE (c)] = 1;
+                  fastmap[CHAR_LEADING_CODE (c)] = 1;
                 }
             }
           break;
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 5ba8430eb84..159751c8b46 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -81,6 +81,9 @@ extern unsigned int w32_key_to_modifier (int key);
 static INPUT_RECORD event_queue[EVENT_QUEUE_SIZE];
 static INPUT_RECORD *queue_ptr = event_queue, *queue_end = event_queue;
 
+/* Temporarily store lead byte of DBCS input sequences.  */
+static char dbcs_lead = 0;
+
 static int
 fill_queue (BOOL block)
 {
@@ -253,13 +256,15 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event)
                           keystate, buf, 128, 0);
       if (isdead > 0)
         {
-          char cp[20];
-          int cpId;
+          char cp[20];
+          int cpId;
 
-          GetLocaleInfo (GetThreadLocale (),
+          event->uChar.UnicodeChar = buf[isdead - 1];
+
+          GetLocaleInfo (GetThreadLocale (),
                          LOCALE_IDEFAULTANSICODEPAGE, cp, 20);
-          cpId = atoi (cp);
-          isdead = WideCharToMultiByte (cpId, 0, buf, isdead,
+          cpId = atoi (cp);
+          isdead = WideCharToMultiByte (cpId, 0, buf, isdead,
                                         ansi_code, 4, NULL, NULL);
         }
       else
@@ -425,8 +430,6 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
 
   if (lispy_function_keys[event->wVirtualKeyCode] == 0)
     {
-      emacs_ev->kind = ASCII_KEYSTROKE_EVENT;
-
       if (!NILP (Vw32_recognize_altgr)
           && (event->dwControlKeyState & LEFT_CTRL_PRESSED)
           && (event->dwControlKeyState & RIGHT_ALT_PRESSED))
@@ -461,9 +464,65 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
           else if (event->uChar.AsciiChar == 0)
             w32_kbd_patch_key (event);
         }
+
       if (event->uChar.AsciiChar == 0)
-        return 0;
-      emacs_ev->code = event->uChar.AsciiChar;
+        {
+          emacs_ev->kind = NO_EVENT;
+          return 0;
+        }
+      else if (event->uChar.AsciiChar > 0 && event->uChar.AsciiChar < 128)
+        {
+          emacs_ev->kind = ASCII_KEYSTROKE_EVENT;
+          emacs_ev->code = event->uChar.AsciiChar;
+        }
+      else if (event->uChar.UnicodeChar > 0)
+        {
+          emacs_ev->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
+          emacs_ev->code = event->uChar.UnicodeChar;
+        }
+      else
+        {
+          /* Fallback for non-Unicode versions of Windows.  */
+          wchar_t code;
+          char dbcs[2];
+          char cp[20];
+          int cpId;
+
+          /* Get the codepage to interpret this key with.  */
+          GetLocaleInfo (GetThreadLocale (),
+                         LOCALE_IDEFAULTANSICODEPAGE, cp, 20);
+          cpId = atoi (cp);
+
+          dbcs[0] = dbcs_lead;
+          dbcs[1] = event->uChar.AsciiChar;
+          if (dbcs_lead)
+            {
+              dbcs_lead = 0;
+              if (!MultiByteToWideChar (cpId, 0, dbcs, 2, &code, 1))
+                {
+                  /* Garbage  */
+                  DebPrint (("Invalid DBCS sequence: %d %d\n",
+                             dbcs[0], dbcs[1]));
+                  emacs_ev->kind = NO_EVENT;
+                }
+            }
+          else if (IsDBCSLeadByteEx (cpId, dbcs[1]))
+            {
+              dbcs_lead = dbcs[1];
+              emacs_ev->kind = NO_EVENT;
+            }
+          else
+            {
+              if (!MultiByteToWideChar (cpId, 0, &dbcs[1], 1, &code, 1))
+                {
+                  /* Garbage  */
+                  DebPrint (("Invalid character: %d\n", dbcs[1]));
+                  emacs_ev->kind = NO_EVENT;
+                }
+            }
+          emacs_ev->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
+          emacs_ev->code = code;
+        }
     }
   else
     {
diff --git a/src/xfns.c b/src/xfns.c
index 905ed9c576a..0ebce8d1e24 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3145,91 +3145,6 @@ If FRAME is nil, use the selected frame.  */)
   return Qnil;
 }
 
-/* Return current desktop index for the display where frame F is.
-   If we can't find out the current desktop, return 0.  */
-
-static int
-x_get_current_desktop (f)
-     struct frame *f;
-{
-  Atom actual_type;
-  unsigned long actual_size, bytes_remaining;
-  int rc, actual_format;
-  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
-  long max_len = 10;
-  Display *dpy = FRAME_X_DISPLAY (f);
-  long *data = NULL;
-  int current_desktop;
-
-  BLOCK_INPUT;
-  x_catch_errors (dpy);
-  rc = XGetWindowProperty (dpy, dpyinfo->root_window,
-                           XInternAtom (dpy, "_NET_CURRENT_DESKTOP", False),
-                           0, max_len, False, XA_CARDINAL,
-                           &actual_type, &actual_format, &actual_size,
-                           &bytes_remaining, (unsigned char **)&data);
-
-  if (rc != Success || actual_type != XA_CARDINAL || x_had_errors_p (dpy)
-      || actual_size == 0 || actual_format != 32)
-    current_desktop = 0;
-  else
-    current_desktop = (int)*data;
-
-  if (data) XFree (data);
-  x_uncatch_errors ();
-  UNBLOCK_INPUT;
-  return current_desktop;
-}
-
-/* Return current size for DESKTOP_INDEX on the display where frame F is.
-   If we can't find out the size, return 0, otherwise 1.  */
-
-static int
-x_get_desktop_workarea (f, desktop_index, deskw, deskh)
-     struct frame *f;
-     int desktop_index;
-     int *deskw, *deskh;
-{
-  Atom actual_type;
-  unsigned long actual_size, bytes_remaining;
-  int rc, actual_format;
-  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
-  long max_len = 1000; /* This handles 250 desktops, who has that many?  */
-  Display *dpy = FRAME_X_DISPLAY (f);
-  long *data = NULL;
-  int retval;
-
-  BLOCK_INPUT;
-  x_catch_errors (dpy);
-  rc = XGetWindowProperty (dpy, dpyinfo->root_window,
-                           XInternAtom (dpy, "_NET_WORKAREA", False),
-                           0, max_len, False, XA_CARDINAL,
-                           &actual_type, &actual_format, &actual_size,
-                           &bytes_remaining, (unsigned char **)&data);
-
-  if (rc != Success || actual_type != XA_CARDINAL || x_had_errors_p (dpy)
-      || actual_size < 3 || actual_format != 32)
-    retval = 0;
-  else
-    {
-      int idx;
-      
-      if (actual_size == 4 /* Only one info for all desktops.  */
-          || desktop_index*4 > actual_size) /* destop_index out of range.  */
-        desktop_index = 0;
-
-      idx = desktop_index*4;
-      *deskw = data[idx+2] - data[idx];
-      *deskh = data[idx+3] - data[idx+1];
-      retval = 1;
-    }
-  
-  if (data) XFree (data);
-  x_uncatch_errors ();
-  UNBLOCK_INPUT;
-  return retval;
-}
-
 DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
        1, 1, 0,
        doc: /* Make a new X window, which is called a "frame" in Emacs terms.
@@ -3249,7 +3164,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   Lisp_Object name;
   int minibuffer_only = 0;
   long window_prompting = 0;
-  int width, height, deskw = -1, deskh = -1, current_desktop = -1;
+  int width, height;
   int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   Lisp_Object display;
@@ -3517,66 +3432,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
   /* Compute the size of the X window.  */
   window_prompting = x_figure_window_size (f, parms, 1);
 
-  /* Don't make height higher than display height unless the user asked
-     for it.  Try sizes 24 and 10 if current is too large.  */
-  height = FRAME_LINES (f);
-  tem = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER);
-  if (EQ (tem, Qunbound))
-    {
-      int h = FRAME_LINES (f) + FRAME_TOOL_BAR_LINES (f)
-        + FRAME_MENU_BAR_LINES (f) + 2;
-      int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h);
-      int dph = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
-      static int tryheight[] = { 24, 10, 0 } ;
-      int i;
-
-      ph += (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0) /* Gtk toolbar size */
-        + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0); /* Arbitrary */
-
-      /* Some desktops have fixed menus above and/or panels below.  Try to
-         figure out the usable size we have for emacs.  */
-      current_desktop = x_get_current_desktop (f);
-      x_get_desktop_workarea (f, current_desktop, &deskw, &deskh);
-      if (deskh > 0 && deskh < dph) dph = deskh;
-      
-      /* Allow 40 pixels for manager decorations.  */
-      for (i = 0; ph+40 > dph && tryheight[i] != 0; ++i)
-        {
-          height = tryheight[i];
-          h = height + FRAME_TOOL_BAR_LINES (f) + FRAME_MENU_BAR_LINES (f) + 2;
-          ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h)
-            + (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0)
-            + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0);
-        }
-    }
-
-  /* Don't make width wider than display width unless the user asked
-     for it.  */
-  width = FRAME_COLS (f);
-  tem = x_get_arg (dpyinfo, parms, Qwidth, 0, 0, RES_TYPE_NUMBER);
-  if (EQ (tem, Qunbound))
-    {
-      int pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, FRAME_COLS (f));
-      int dpw = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
-      if (deskw == -1)
-        {
-          current_desktop = x_get_current_desktop (f);
-          x_get_desktop_workarea (f, current_desktop, &deskw, &deskh);
-        }
-      if (deskw > 0 && deskw < dpw) dpw = deskw;
-      
-      if (pw > dpw)
-        width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, dpw);
-    }
-
-  if (height != FRAME_LINES (f) || width != FRAME_COLS (f))
-    {
-      check_frame_size (f, &height, &width);
-      FRAME_LINES (f) = height;
-      SET_FRAME_COLS (f, width);
-    }
-  
-
   tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
   f->no_split = minibuffer_only || EQ (tem, Qt);