Merge from trunk.

3 files changed, 72 insertions, 27 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f80c1b6973c..afaf1d71676 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,15 @@
+2013-06-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document new Prettify Symbols mode.
+
+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.
@@ -6,10 +18,10 @@
 
         * NEWS: Document eshell visual subcommands and options.
 
-2013-06-02  Eric Ludlam <zappo@gnu.org>
+2013-06-02  Eric Ludlam  <zappo@gnu.org>
 
         * srecode/c.srt (header_guard): Add :c parameter so it works
-        standalone
+        standalone.
 
 2013-06-01  Alex Ott  <alexott@gmail.com>
 
@@ -23,7 +35,7 @@
 
         * refcards/refcard.tex: Refine some entries.  (Bug#14087)
 
-        * refcards/dired-ref.tex: Refine some entries. (Bug#14072)
+        * refcards/dired-ref.tex: Refine some entries.  (Bug#14072)
 
 2013-05-24  Fabrice Niessen  <fni@missioncriticalit.com>
 
@@ -39,7 +51,7 @@
 
 2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        Use Gnulib ACL implementation, for benefit of Solaris etc.  (Bug#14295)
         * NEWS: Emacs is no longer limited to POSIX ACLs.  --disable-acl,
         not --without-acl, since we're now using Gnulib's implementation.
 
@@ -111,7 +123,7 @@
 
         * srecode/c.srt (header_guard): Upcase the filename symbol.
 
-2013-03-21  Vladimir Kazanov <vkazanov@inbox.ru>
+2013-03-21  Vladimir Kazanov  <vkazanov@inbox.ru>
 
         * srecode/java.srt (empty-main): New.
         (class-tag): Decapitalize class.
@@ -201,7 +213,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        Fix permissions bugs with setgid directories etc.  (Bug#13125)
         * NEWS: Document changes to file-attributes,
         file-ownership-preserved-p.
         Mention new functions group-gid, group-real-gid.
@@ -507,7 +519,7 @@
 2012-04-01  Jambunathan K  <kjambunathan@gmail.com>
 
         * org/OrgOdtContentTemplate.xml (OrgIndentedSection-Level-*):
-        New section styles. These sections are indented to the same
+        New section styles.  These sections are indented to the same
         level as the corresponding list entries.  These sections hold
         tables that occur within a list.  (OrgTable):
         Increased relative width from 90% to 96% for aesthetic reasons.
@@ -673,7 +685,7 @@
 
 2011-08-24  Steve Chapel  <schapel@laptop.stevechapel.com>  (tiny change)
 
-        * refcards/refcard.tex: Add a few more commands. (Bug#9343)
+        * refcards/refcard.tex: Add a few more commands.  (Bug#9343)
 
 2011-08-22  Juri Linkov  <juri@jurta.org>
 
@@ -3873,7 +3885,7 @@
 
 2005-10-10  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * NEWS: -nb => -nbi
+        * NEWS: -nb => -nbi.
 
 2005-10-10  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/etc/DEBUG b/etc/DEBUG
index 709e8987d03..b2a943f5d71 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 compilers, 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 81509469638..475b4b26fdb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -30,7 +30,7 @@ configure option `--disable-acl'.
 
 ** Emacs can be compiled with file notification support.
 The configure option `--with-file-notification=LIB' enables file
-notification support in Emacs. This option's value should be `yes',
+notification support in Emacs.  This option's value should be `yes',
 `no', `gfile', `inotify' or `w32'.  `yes' is a synonym for `w32' on
 MS-Windows, and for `gfile' otherwise.  The default value is `yes'.
 
@@ -103,6 +103,9 @@ Available only on X, this option allows to control over-scrolling
 using the scroll bar (i.e. dragging the thumb down even when the end
 of the buffer is visible).
 
+** New function `add-face-text-property' has been added, which can be
+used to conveniently prepend/append new face attributes to text.
+
 ** In compiled Lisp files, the header no longer includes a timestamp.
 
 ** Multi-monitor support has been added.
@@ -177,8 +180,8 @@ Affected files:
 
 ** Delphi mode is now called OPascal mode.
 *** All delphi-* variables and functions have been renamed to opascal-*.
-*** `delphi-newline-always-indents' is not supported any more
-use `electric-indent-mode' instead.
+*** `delphi-newline-always-indents' is not supported any more.
+Use `electric-indent-mode' instead.
 *** `delphi-tab' is gone, replaced by `indent-for-tab-command'.
 
 ** Eldoc Mode works properly in the minibuffer.
@@ -239,7 +242,7 @@ amounts of data into the ERC input.
 ---
 ** New F90 mode option `f90-smart-end-names'.
 
-** Icomplete is a bit more like IDO.
+** Icomplete is a bit more like Ido.
 *** key bindings to navigate through and select the completions.
 *** The icomplete-separator is customizable, and its default has changed.
 *** Removed icomplete-show-key-bindings.
@@ -296,6 +299,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.
 
@@ -323,8 +338,8 @@ New features include:
 When its arg ADJACENT is non-nil (when called interactively with C-u C-u)
 it works like the utility `uniq'.  Otherwise by default it deletes
 duplicate lines everywhere in the region without regard to adjacency.
-When it arg KEEP-BLANKS is non-nil (when called interactively with C-u C-u C-u),
-duplicate blank lines are preserved.
+When its arg KEEP-BLANKS is non-nil (when called interactively with
+C-u C-u C-u), duplicate blank lines are preserved.
 
 ** New `cycle-spacing' command allows cycling between having just one
 space, no spaces, or reverting to the original spacing.  Like
@@ -365,6 +380,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.
@@ -385,6 +402,7 @@ has not been relevant for some time.
 
 
 * New Modes and Packages in Emacs 24.4
+
 ** New `superword-mode' in subword.el
 `superword-mode' overrides the default word motion commands to treat
 symbol_words as a single word, similar to what `subword-mode' does and
@@ -400,6 +418,15 @@ It is layered as:
 
 * Incompatible Lisp Changes in Emacs 24.4
 
+** The syntax of ?» and ?« is now punctuation instead of matched parens.
+Some languages match those as »...« and others as «...» so better stay neutral.
+
+** 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,13 +465,18 @@ 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:
+*** `log10'
 *** `dont-compile'
 *** `lisp-complete-symbol'
 *** `field-complete'
 *** `minibuffer-completion-contents'
 *** `isearch-nonincremental-exit-minibuffer'
 *** `isearch-filter-visible'
+*** `generic-make-keywords-list'
 
 ** `with-wrapper-hook' is obsoleted by `add-function'.
 The few hooks that used with-wrapper-hook are replaced as follows:
@@ -478,7 +510,7 @@ of remote files when set to non-nil.
 
 ** Face changes
 
-*** The `face-spec-set' is now analogous to `setq' for face specs.
+*** The function `face-spec-set' is now analogous to `setq' for face specs.
 Its third arg now accepts values specifying exactly which face spec to
 set (defface, custom, or user spec), and it directly sets the relevant
 property using the supplied face spec.
@@ -2842,10 +2874,10 @@ should be derived.
 modes, e.g. (add-hook 'prog-mode-hook 'flyspell-prog-mode) to enable
 on-the-fly spell checking for comments and strings.
 
-**** New option, `prog-prettify-symbols' lets the user control symbol
-prettify (replacing a string like "lambda" with the Greek lambda
-character.  The mode derived from `prog-mode' must call
-`prog-prettify-install' with its own custom alist, which can be empty.
+**** New minor modes `prettify-symbols-mode' and
+`global-prettify-symbols-mode' let the user enable symbol
+prettification (replacing a string like "lambda" with the Greek lambda
+character).
 
 *** New hook `change-major-mode-after-body-hook', run by
 `run-mode-hooks' just before any other mode hooks.