Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 458e2bb..5b17023 100644 (file)
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -15,11 +15,7 @@ You can narrow news to a specific version by calling `view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
 \f
-* Installation Changes in Emacs 23.3
-
-** New configure option --with-crt-dir specifies the location of your
-crt*.o files, if they are in a non-standard location.  This is only
-used on x86-64 and s390x GNU/Linux architectures.
+* Installation Changes in Emacs 23.4
 
 ** The MS-Windows build prefers libpng version 1.14 or later.
 Versions of libpng before 1.14 had security issues, so we now
@@ -28,6 +24,21 @@ require version 1.14 or later.  See README.W32 and nt/INSTALL for
 details and pointers to URLs where the latest libpng can be
 downloaded.
 
+\f
+* Changes in Emacs 23.4 on non-free operating systems
+
+** The MS-Windows port can now use more than 500MB of heap.
+Depending on the available virtual memory, Emacs on Windows can now
+have up to 2GB of heap space.  This allows, e.g., to visit several
+large (> 256MB) files in the same session.
+
+\f
+* Installation Changes in Emacs 23.3
+
+** New configure option --with-crt-dir specifies the location of your
+crt*.o files, if they are in a non-standard location.  This is only
+used on x86-64 and s390x GNU/Linux architectures.
+
 * Changes in Emacs 23.3
 
 ** The last-resort backup file `%backup%~' is now written to

diff --git a/leim/ChangeLog b/leim/ChangeLog
index b344659..fdc54fd 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-05  Eli Zaretskii  <eliz@gnu.org>
+
+       * quail/latin-ltx.el <\beth, \gimel, \daleth>: Produce
+       corresponding symbols rather than Hebrew letters.  (Bug#8563)
+
+       * quail/latin-ltx.el <\aleph>: Produce ALEF SYMBOL instead of
+       HEBREW LETTER ALEF.  (Bug#8563)
+
 2011-03-23  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.

diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index b3cc647..cc3be3a 100644 (file)
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -498,7 +498,7 @@ system, including many technical ones.  Examples:
  ("\\Vert" ?‖)
  ("\\Vvdash" ?⊪)
  ("\\Xi" ?Ξ)
- ("\\aleph" ?א)
+ ("\\aleph" ?ℵ)
  ("\\alpha" ?α)
  ("\\amalg" ?∐)
  ("\\angle" ?∠)
@@ -515,7 +515,7 @@ system, including many technical ones.  Examples:
  ("\\barwedge" ?⊼)
  ("\\because" ?∵)
  ("\\beta" ?β)
- ("\\beth" ?ב)
+ ("\\beth" ?ℶ)
  ("\\between" ?≬)
  ("\\bigcap" ?⋂)
  ("\\bigcirc" ?◯)
@@ -569,7 +569,7 @@ system, including many technical ones.  Examples:
 
  ("\\dag" ?†)
  ("\\dagger" ?†)
- ("\\daleth" ?ד)
+ ("\\daleth" ?ℸ)
  ("\\dashv" ?⊣)
  ("\\ddag" ?‡)
  ("\\ddagger" ?‡)
@@ -626,7 +626,7 @@ system, including many technical ones.  Examples:
  ("\\gets" ?←)
  ("\\gg" ?≫)
  ("\\ggg" ?⋙)
- ("\\gimel" ?ג)
+ ("\\gimel" ?ℷ)
  ("\\gnapprox" ?⋧)
  ("\\gneq" ?≩)
  ("\\gneqq" ?≩)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a491bd..f137688 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Daniel Colascione <dan.colascione@gmail.com>
+
+       * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
+       correct match group (bug#8438).
+
 2011-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Fix earlier half-done eieio-defmethod change (bug#8338).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6819a76..b6e30ab 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-05 Eli Zaretskii  <eliz@gnu.org>
+
+       * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
+       New version that can reserve upto 2GB of heap space.
+
+2011-05-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
+
 2011-05-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to

diff --git a/src/nsfns.m b/src/nsfns.m
index d4445d1..cdf3500 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1416,9 +1416,10 @@ DEFUN ("ns-popup-color-panel", Fns_popup_color_panel, Sns_popup_color_panel,
 DEFUN ("ns-read-file-name", Fns_read_file_name, Sns_read_file_name, 1, 4, 0,
        doc: /* Use a graphical panel to read a file name, using prompt PROMPT.
 Optional arg DIR, if non-nil, supplies a default directory.
-Optional arg ISLOAD, if non-nil, means read a file name for saving.
+Optional arg MUSTMATCH, if non-nil, means the returned file or
+directory must exist.
 Optional arg INIT, if non-nil, provides a default file name to use.  */)
-     (Lisp_Object prompt, Lisp_Object dir, Lisp_Object isLoad, Lisp_Object init)
+     (Lisp_Object prompt, Lisp_Object dir, Lisp_Object mustmatch, Lisp_Object init)
 {
   static id fileDelegate = nil;
   int ret;
@@ -1443,7 +1444,7 @@ Optional arg INIT, if non-nil, provides a default file name to use.  */)
   if ([dirS characterAtIndex: 0] == '~')
     dirS = [dirS stringByExpandingTildeInPath];
 
-  panel = NILP (isLoad) ?
+  panel = NILP (mustmatch) ?
     (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
 
   [panel setTitle: promptS];
@@ -1457,7 +1458,7 @@ Optional arg INIT, if non-nil, provides a default file name to use.  */)
 
   panelOK = 0;
   BLOCK_INPUT;
-  if (NILP (isLoad))
+  if (NILP (mustmatch))
     {
       ret = [panel runModalForDirectory: dirS file: initS];
     }

diff --git a/src/w32heap.c b/src/w32heap.c
index bbdabd2..477c11a 100644 (file)
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -114,6 +114,7 @@ get_data_end (void)
   return data_region_end;
 }
 
+#if !defined (USE_LISP_UNION_TYPE) && !defined (USE_LSB_TAG)
 static char *
 allocate_heap (void)
 {
@@ -140,9 +141,31 @@ allocate_heap (void)
 
   return ptr;
 }
+#else  /* USE_LISP_UNION_TYPE || USE_LSB_TAG */
+static char *
+allocate_heap (void)
+{
+  unsigned long size = 0x80000000; /* start by asking for 2GB */
+  void *ptr = NULL;
+
+  while (!ptr && size > 0x00100000)
+    {
+      reserved_heap_size = size;
+      ptr = VirtualAlloc (NULL,
+                         get_reserved_heap_size (),
+                         MEM_RESERVE,
+                         PAGE_NOACCESS);
+      size -= 0x00800000; /* if failed, decrease request by 8MB */
+    }
+
+  return ptr;
+}
+#endif /* USE_LISP_UNION_TYPE || USE_LSB_TAG */
 
 
-/* Emulate Unix sbrk.  */
+/* Emulate Unix sbrk.  Note that ralloc.c expects the return value to
+   be the address of the _start_ (not end) of the new block in case of
+   success, and zero (not -1) in case of failure.  */
 void *
 sbrk (unsigned long increment)
 {