Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

3 files changed, 103 insertions, 25 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1892d5fbb58..93ba05bc377 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,20 @@
+2013-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document new Desktop option `desktop-save-windows'.
+
+2013-06-27  Stephen Berman  <stephen.berman@gmx.net>
+
+        * NEWS: Mention new version of todo-mode.el and obsoleting and
+        renaming of old version.
+
+2013-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Mention policy change with respect to locallisppath dirs.
+
+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.
@@ -14,10 +31,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>
 
@@ -31,7 +48,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>
 
@@ -47,7 +64,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.
 
@@ -119,7 +136,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.
@@ -209,7 +226,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.
@@ -515,7 +532,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.
@@ -681,7 +698,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>
 
@@ -3881,7 +3898,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 61a8ee05e27..b2a943f5d71 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -26,7 +26,7 @@ described in the node "Auto-loading safe path" in the GDB user manual.
 ** When you are trying to analyze failed assertions or backtraces, it
 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 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
diff --git a/etc/NEWS b/etc/NEWS
index 1361b2491e6..f83d82417dd 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'.
 
@@ -57,6 +57,9 @@ files are in share/emacs/VERSION/etc.  (Emacs knows about all these
 directories and will find the files in there automatically; there's no
 need to set any variables due to this change.)
 
+** Directories passed to configure option `--enable-locallisppath' are
+no longer created during installation.
+
 
 * Startup Changes in Emacs 24.4
 
@@ -87,6 +90,14 @@ simply disabling Transient Mark mode does the same thing.
 ** `initial-buffer-choice' can now specify a function to set up the
 initial buffer.
 
+** `remember-notes' creates a buffer whose content is saved on kill-emacs.
+You may think of it as a *scratch* buffer whose content is preserved.
+In fact, it was designed as a replacement for *scratch* buffer and can
+be used that way by setting `initial-buffer-choice' to `remember-notes'
+and `remember-notes-buffer-name' to "*scratch*".  Without the second
+change, *scratch* buffer will still be there for notes that do not
+need to be preserved.
+
 ** `write-region-inhibit-fsync' now defaults to t in batch mode.
 
 ** ACL support has been added.
@@ -103,6 +114,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.
@@ -125,6 +139,13 @@ bound to <f11> and M-<f10>, respectively.
 ** In keymaps where SPC scrolls, S-SPC now scrolls in the reverse direction.
 Eg View mode, etc.
 
++++
+** New option `visual-order-cursor-movement'.
+If this is non-nil, cursor motion with arrow keys will follow the
+visual order of characters on the screen: <left> always moves to the
+left, <right> always moves to the right, disregarding the surrounding
+bidirectional context.
+
 ** New command `kmacro-to-register' to store keyboard macros in registers.
 
 ** Shell Script mode
@@ -147,6 +168,9 @@ usually line-oriented command a visual command.  Typical examples are
 pager by default.  See `eshell-visual-subcommands' and
 `eshell-visual-options'.
 
+** If your Emacs is compiled with libxml2 support, you can use the new
+built-in web browser `eww'.
+
 ** `remember' can now store notes in separates files
 You can use the new function `remember-store-in-files' within the
 `remember-handler-functions' option.
@@ -158,9 +182,6 @@ for new options related to this function.
 ** More packages look for ~/.emacs.d/<foo> additionally to ~/.<foo>.
 Affected files:
 ~/.emacs.d/timelog      replaces  ~/.timelog
-~/.emacs.d/todo-do      replaces  ~/.todo-do
-~/.emacs.d/todo-done    replaces  ~/.todo-done
-~/.emacs.d/todo-top     replaces  ~/.todo-top
 ~/.emacs.d/vip          replaces  ~/.vip
 ~/.emacs.d/viper        replaces  ~/.viper
 ~/.emacs.d/ido.last     replaces  ~/.ido.last
@@ -174,11 +195,16 @@ Affected files:
 ~/.emacs.d/strokes      replaces  ~/.strokes
 ~/.emacs.d/notes        replaces  ~/.notes
 ~/.emacs.d/type-break   replaces  ~/.type-break
+Also the following files used by the now obsolete otodo-mode.el:
+~/.emacs.d/todo-do      replaces  ~/.todo-do
+~/.emacs.d/todo-done    replaces  ~/.todo-done
+~/.emacs.d/todo-top     replaces  ~/.todo-top
+
 
 ** 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.
@@ -226,6 +252,9 @@ on the given date.
 *** `desktop-auto-save-timeout' defines the number of seconds between
 auto-saves of the desktop.
 
+*** `desktop-restore-frames enables saving and restoring the window/frame
+configuration.
+
 ** Dired
 
 *** New minor mode `dired-hide-details-mode' hides details.
@@ -239,7 +268,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.
@@ -335,14 +364,33 @@ 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
 `just-one-space' command it can handle or ignore newlines and
 leave different number of spaces.
 
+** Todo mode has been rewritten and enhanced.
+New features include:
+- support for multiple todo files and archive files of done items;
+- renaming, reordering, moving, merging, and deleting categories;
+- sortable tabular summaries of categories and the types of items they contain;
+- cross-category lists of items filtered by specific criteria;
+- more fine-grained interaction with the Emacs diary, by being able to decide
+  for each todo item whether it appears in the Fancy Diary display;
+- highly flexible new item insertion and item editing;
+- moving items between categories, storing done items in their category or in
+  archive files, undoing or unarchiving done items;
+- reprioritizing items by inputting a numerical priority;
+- extensive customizability of operation and display, including numerous faces.
+To support some of these features, a new file format is used, which is
+incompatible with the old format; however, you can convert old todo and done
+item files to the new format on initializing the first new todo file, or at any
+later time with the provided conversion command.  The old version of
+todo-mode.el has been made obsolete and renamed otodo-mode.el.
+
 ** Tramp
 
 +++
@@ -388,6 +436,8 @@ module.
 
 *** terminal.el is obsolete; use term.el instead.
 
+*** The previous version of todo-mode.el is obsolete and renamed otodo-mode.el.
+
 *** xesam.el.
 
 +++
@@ -399,6 +449,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
@@ -414,11 +465,14 @@ 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.
+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,
@@ -462,6 +516,7 @@ file using `set-file-extended-attributes'.
 ** New macro with-eval-after-load.  Like eval-after-load, but better behaved.
 
 ** Obsoleted functions:
+*** `log10'
 *** `dont-compile'
 *** `lisp-complete-symbol'
 *** `field-complete'
@@ -502,7 +557,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.
@@ -687,6 +742,9 @@ ImageMagick types are treated as images.  The function
 `imagemagick-filter-types' returns the list of types that will be
 treated as images.
 
+*** ImageMagick images now support the :max-width and :max-height
+keywords.
+
 ** Minibuffer
 
 *** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
@@ -1180,6 +1238,9 @@ and the `attributes' slot is always nil.
 The `url-retrieve' function now uses this to encode its URL argument,
 in case that is not properly encoded.
 
+*** New command `url-cookie-list' displays all the current cookies, and
+allows deleting selected cookies.
+
 ** notifications.el supports now version 1.2 of the Notifications API.
 The function `notifications-get-capabilities' returns the supported
 server properties.
@@ -2866,10 +2927,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.