[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104118: Merge from emacs-23; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104118: Merge from emacs-23; up to r100567. |
Date: |
Wed, 04 May 2011 21:00:38 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104118 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-04 21:00:38 -0700
message:
Merge from emacs-23; up to r100567.
modified:
etc/NEWS.23
leim/ChangeLog
leim/quail/latin-ltx.el
lisp/ChangeLog
src/ChangeLog
src/nsfns.m
src/w32heap.c
=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23 2011-04-08 18:53:26 +0000
+++ b/etc/NEWS.23 2011-05-05 04:00:38 +0000
@@ -15,11 +15,7 @@
with a prefix argument or by typing C-u C-h C-n.
-* 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 @@
details and pointers to URLs where the latest libpng can be
downloaded.
+
+* 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.
+
+
+* 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
=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog 2011-04-06 12:18:10 +0000
+++ b/leim/ChangeLog 2011-05-05 04:00:38 +0000
@@ -1,3 +1,11 @@
+2011-05-05 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.
=== modified file 'leim/quail/latin-ltx.el'
--- a/leim/quail/latin-ltx.el 2011-01-26 08:36:39 +0000
+++ b/leim/quail/latin-ltx.el 2011-05-05 04:00:38 +0000
@@ -498,7 +498,7 @@
("\\Vert" ?‖)
("\\Vvdash" ?⊪)
("\\Xi" ?Ξ)
- ("\\aleph" ?א)
+ ("\\aleph" ?ℵ)
("\\alpha" ?α)
("\\amalg" ?∐)
("\\angle" ?∠)
@@ -515,7 +515,7 @@
("\\barwedge" ?⊼)
("\\because" ?∵)
("\\beta" ?β)
- ("\\beth" ?ב)
+ ("\\beth" ?ℶ)
("\\between" ?≬)
("\\bigcap" ?⋂)
("\\bigcirc" ?◯)
@@ -569,7 +569,7 @@
("\\dag" ?†)
("\\dagger" ?†)
- ("\\daleth" ?ד)
+ ("\\daleth" ?ℸ)
("\\dashv" ?⊣)
("\\ddag" ?‡)
("\\ddagger" ?‡)
@@ -626,7 +626,7 @@
("\\gets" ?←)
("\\gg" ?≫)
("\\ggg" ?⋙)
- ("\\gimel" ?ג)
+ ("\\gimel" ?ℷ)
("\\gnapprox" ?⋧)
("\\gneq" ?≩)
("\\gneqq" ?≩)
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-05 03:42:09 +0000
+++ b/lisp/ChangeLog 2011-05-05 04:00:38 +0000
@@ -1,3 +1,8 @@
+2011-05-05 Daniel Colascione <address@hidden>
+
+ * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
+ correct match group (bug#8438).
+
2011-05-05 Stefan Monnier <address@hidden>
Fix earlier half-done eieio-defmethod change (bug#8338).
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-05-05 02:05:36 +0000
+++ b/src/ChangeLog 2011-05-05 04:00:38 +0000
@@ -1,3 +1,12 @@
+2011-05-05 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
+
+ * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
+
2011-05-05 Teodor Zlatanov <address@hidden>
* gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2011-04-07 03:34:05 +0000
+++ b/src/nsfns.m 2011-05-05 04:00:38 +0000
@@ -1416,9 +1416,10 @@
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 @@
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 @@
panelOK = 0;
BLOCK_INPUT;
- if (NILP (isLoad))
+ if (NILP (mustmatch))
{
ret = [panel runModalForDirectory: dirS file: initS];
}
=== modified file 'src/w32heap.c'
--- a/src/w32heap.c 2011-01-25 04:08:28 +0000
+++ b/src/w32heap.c 2011-05-05 04:00:38 +0000
@@ -114,6 +114,7 @@
return data_region_end;
}
+#if !defined (USE_LISP_UNION_TYPE) && !defined (USE_LSB_TAG)
static char *
allocate_heap (void)
{
@@ -140,9 +141,31 @@
return ptr;
}
-
-
-/* Emulate Unix sbrk. */
+#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. 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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104118: Merge from emacs-23; up to r100567.,
Glenn Morris <=