Merge branch 'jave-xwidget' into xwidget

3 files changed, 39 insertions, 7 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f80c1b6973c..1892d5fbb58 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * NEWS (utf-8 for el): Move to the incompatible section.
+
+2013-06-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * DEBUG: Document -Og and -fno-omit-frame-pointer.
+
 2013-06-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * NEWS: Document new prog-mode symbol prettify support.
diff --git a/etc/DEBUG b/etc/DEBUG
index 709e8987d03..61a8ee05e27 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -24,12 +24,14 @@ There are several ways to overcome that difficulty, they are all
 described in the node "Auto-loading safe path" in the GDB user manual.
 
 ** When you are trying to analyze failed assertions or backtraces, it
-will be essential to compile Emacs either completely without
-optimizations (set CFLAGS to "-O0 -g3") or at least (when using GCC)
-with the -fno-crossjumping option in CFLAGS.  Failure to do so may
-make the compiler recycle the same abort call for all assertions in a
-given function, rendering the stack backtrace useless for identifying
-the specific failed assertion.
+is essential to compile Emacs with flags suitable for debugging.
+With GCC 4.8 or later, you can invoke 'make' with CFLAGS="-Og -g3".
+With older GCC or non-GCC commpilers, you can use CFLAGS="-O0 -g3".
+With GCC and higher optimization levels such as -O2, the
+-fno-omit-frame-pointer and -fno-crossjumping options are often
+essential.  The latter prevents GCC from using the same abort call for
+all assertions in a given function, rendering the stack backtrace
+useless for identifying the specific failed assertion.
 
 ** It is a good idea to run Emacs under GDB (or some other suitable
 debugger) *all the time*.  Then, when Emacs crashes, you will be able
@@ -769,4 +771,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/etc/NEWS b/etc/NEWS
index 1e6088fe671..1361b2491e6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -296,6 +296,18 @@ and opens overlays with hidden text when `search-invisible' is `open'.
 *** By default, prefix arguments do not now terminate Isearch mode.
 Set `isearch-allow-prefix' to nil to restore old behavior.
 
+*** More Isearch commands accept prefix arguments, namely
+`isearch-printing-char', `isearch-quote-char', `isearch-yank-word',
+`isearch-yank-line'.
+
+*** Word search now matches whitespace at the beginning/end
+of the search string if it contains leading/trailing whitespace.
+In an incremental word search or when using a non-nil LAX argument
+of `word-search-regexp', the lax matching can also match part of
+the first word (in addition to the lax matching of the last word).
+The same rules are now applied to the symbol search with the difference
+that it matches symbols, and non-symbol characters between symbols.
+
 ** MH-E has been updated to MH-E version 8.5.
 See MH-E-NEWS for details.
 
@@ -365,6 +377,8 @@ External su and sudo commands are now the default; the internal,
 TRAMP-using variants can still be used by enabling the eshell-tramp
 module.
 
+** New term.el option `term-suppress-hard-newline'.
+
 ** Obsolete packages:
 
 *** longlines.el is obsolete; use visual-line-mode instead.
@@ -400,6 +414,12 @@ It is layered as:
 
 * Incompatible Lisp Changes in Emacs 24.4
 
+** The default file coding for Emacs Lisp files is now utf-8.
+(See file-coding-system-alist.)  In most cases, this change is transparent, but
+files that contain unusual characters without specifying an explicit coding
+system may fail to load with obscure errors.
+You should either convert them to utf-8 or add an explicit coding: cookie.
+
 ** overriding-terminal-local-map does not replace the local keymaps any more.
 It used to disable the minor mode, major mode, and text-property keymaps,
 whereas now it simply has higher precedence.
@@ -438,6 +458,9 @@ file using `set-file-extended-attributes'.
 
 * Lisp Changes in Emacs 24.4
 
++++
+** New macro with-eval-after-load.  Like eval-after-load, but better behaved.
+
 ** Obsoleted functions:
 *** `dont-compile'
 *** `lisp-complete-symbol'