New experimental feature to save&restore window and frame setup.

* etc/NEWS: Document new Desktop option `desktop-save-windows'.

* lisp/desktop.el (desktop-save-windows): New defcustom.
  (desktop--saved-states): New var.
  (desktop--excluded-frame-parameters): New defconst.
  (desktop--filter-frame-parms, desktop--find-frame-in-display)
  (desktop--restore-windows, desktop--save-windows): New functions.
  (desktop-save): Call `desktop--save-windows'.
  (desktop-read): Call `desktop--restore-windows'.

* net/shr.el (add-face-text-property): Removed compat definition.

* NEWS: Mention new version of todo-mode.el and obsoleting and
renaming of old version.

* obsolete/otodo-mode.el: Add obsolescence info to file header.

* python-tests.el (python-tests-with-temp-file): Clean up after ourself

* net/eww.el (eww-read-bookmarks): Check file size.

Fix ChangeLog typo

* automated/undo-tests.el (undo-test3): Remove test that seems to
nothing that the previous one doesn't, except leave a tempfile.

Fix copyright header.

Do not create locallisppath directories.

* Makefile.in (install-arch-indep): Do not create directories passed
with --enable-locallisppath.

* etc/NEWS: Mention policy change with respect to locallisppath dirs.

* lisp/emacs-lisp/nadvice.el (advice--defalias-fset): Move advice back to
advice--pending if newdef is nil or an autoload.
(advice-mapc): New function.

Fixes: debbugs:13820

(eww-bookmark-browse): Don't bug out if it's the only window.

(eww-add-bookmark): Remove newlines from the title.

Add bookmark support to eww

* net/eww.el (eww-mode): Undo isn't necessary in eww buffers,
probably.
(eww-mode-map): Add a menu bar.
(eww-add-bookmark): New command.
(eww-bookmark-mode): New mode and commands.

* tips.texi (Coding Conventions): Improve wording.

(eww-mode-map): Add a menu bar.

Implement a command and mode for displaying and editing cookies

* lisp/htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.
(hfy-size): Handle ttys.

Fixes: debbugs:14668

info-xref.el: Update for Texinfo 5 change in *note format

* lisp/info-xref.el (info-xref-node-re, info-xref-note-re): New constants.
(info-xref-check-buffer): Use info-xref-note-re.

* test/automated/info-xref.el: New file.

* lisp/simple.el (set-variable): Use read-from-minibuffer.

Fixes: debbugs:14710

* lisp/emacs-lisp/package.el (package--add-to-archive-contents): Add missing
nil to terminate the loop.

Fixes: debbugs:14718

(eww-render): Move the history reset to the correct buffer.

* net/eww.el: Rework history traversal.

When going forward/back, put these actions into the history, too, so
that they can be replayed.

* lisp/files-x.el (read-file-local-variable-value): Add `default'.

Fixes: debbugs:14710

* lisp/files-x.el (modify-dir-local-variable): Change the header comment
in the file with directory local variables.

Fixes: debbugs:14692

* net/eww.el (eww-download): New command and keystroke.

* net/eww.el (eww-make-unique-file-name): Create a unique file
name before saving to entering `y' accidentally asynchronously.

Use `w' for copying URLs in shr and eww

* net/eww.el (eww-mode-map): Ditto.

* net/eww.el (eww-copy-page-url): Changed name of command.

* net/shr.el (shr-map): Change `shr-copy-url' from `u' to `w' to
be more consistent with Info and dired.

lisp/window.el: Fix previous change (2013-06-25T15:08:47Z!lekktu@gmail.com).

* lisp/emacs-lisp/package.el: Include obsolete packages from archives.
Use lexical-binding.
(package-archive-contents): Change format; include obsolete packages.
(package-desc): Use `dir' to mark builtin packages.
(package--from-builtin): Set the `dir' field to `builtin'.
(generated-autoload-file, version-control): Declare.
(package-compute-transaction): Change first arg and return value to be
lists of package-descs.  Adjust to new package-archive-contents format.
(package--add-to-archive-contents): Adjust to new
package-archive-contents format.
(package-download-transaction): Arg is now a list of package-descs.
(package-install): If `pkg' is a package name, pass it as
a requirement, so it is subject to the usual (e.g. disabled) checks.
(describe-package): Accept package-desc as well.
(describe-package-1): Describe a specific package-desc.  Add links to
other package-descs for the same package name.
(package-menu-describe-package): Pass the actual package-desc.
(package-menu-mode): Add to tabulated-list-revert-hook so revert-buffer
works correctly.
(package-desc-status): New function.
(package-menu--refresh): New function, extracted
from package-menu--generate.
(package-menu--generate): Use it.
(package-delete): Update package-alist.
(package-menu-execute): Don't call package-initialize.

* lisp/progmodes/idlw-toolbar.el, lisp/progmodes/idlw-shell.el,
lisp/progmodes/idlw-help.el, lisp/progmodes/idlw-complete-structtag.el,
lisp/progmodes/ebnf-yac.el, lisp/progmodes/ebnf-otz.el,
lisp/progmodes/ebnf-iso.el, lisp/progmodes/ebnf-ebx.el,
lisp/progmodes/ebnf-dtd.el, lisp/progmodes/ebnf-bnf.el,
lisp/progmodes/ebnf-abn.el, lisp/emacs-lisp/package-x.el,
lisp/emacs-lisp/cl-seq.el, lisp/emacs-lisp/cl-macs.el
lisp/cedet/data-debug.el, lisp/cedet/cedet-idutils.el:
Neuter the "Version:" header.

Mention eww

lisp/window.el (window--state-get-1): Workaround for bug#14527.
http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html

(eww-forward-url) Allow going forward in the history, too.

This may not be the most intuitive way to implement this.  Perhaps
following links should flush "forwards"...

nt/configure.bat: Warn about deprecation status.

(eww) Reimplement the history functionality

* net/eww.el (eww-back-url): Implement the history by stashing all
the data into a list.

* lisp/files-x.el (read-file-local-variable-value): Use read-from-minibuffer
for values and use read--expression for expressions.
(read-file-local-variable): Avoid setq.
(read-file-local-variable-mode): Use minor-mode-list.

Fixes: debbugs:14710

bibtex-generate-url-list): Add support for DOI URLs

bibtex-mode: Update imenu-support when dialect changes

Shameful typo

* test/automated/occur-tests.el (occur-test-create): New function.
Use it to create separate tests for each element, so we run them
all rather than stopping at the first error.

Add some notes related to the Emacs www pages

* ido.el (ido-read-internal): Allow forward slash on windows.

* test/automated/occur-tests.el (occur-tests):
Update for 2013-05-29 change to occur header line.

* net/eww.el (eww): Start of strings is \\`, not ^.

* net/shr.el (shr-browse-url): Fix interactive spec.

* net/eww.el (eww): Add a trailing slash to domain names.

lisp/faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com.

Fixes: debbugs:14705

* net/shr.el (shr-browse-url): Use an external browser if given a prefix.

* net/eww.el (eww-external-browser): Moved to shr.

eww improvements

* net/eww.el (eww): Work more correctly for file: URLs.
(eww-detect-charset): Allow quoted charsets.
(eww-yank-page-url): New command and keystroke.

Auto-commit of generated files.

epg.el: Add context option `home-directory' and `program'.

* epg.el (epg-make-context): Check if PROTOCOL is valid; embed the
file name of gpg executable.
(epg-context-program): New function.
(epg-context-home-directory): New function.
(epg-context-set-program): New function.
(epg-context-set-home-directory): New function.
(epg--start): Use `epg-context-program' instead of
'epg-gpg-program'.
(epg--list-keys-1): Likewise.

Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org

* doc/emacs/rmail.texi: Comment

Simplify last change to ido.el

Revert previous change

* doc/misc/eudc.texi (Overview, Creating BBDB Records): Restrict bbdb cross-ref
to info output.  It's not very important, and gives broken links in
the html version.

* doc/emacs/files.texi: Comment.

* ido.el (ido-read-internal): Fix bug#14620.

* doc/misc/eshell.texi: Fix cross-references to other manuals.

A more-conservative workaround for Cygwin SIGCHLD issues.

* callproc.c (Fcall_process):
* process.c (create_process):
Make sure SIGCHLD is caught before we fork,
since Emacs startup no arranges to catch SIGCHLD.
* process.c (lib_child_handler): Initialize to null, not to
dummy_handler.
(catch_child_signal): Allow self to be called lazily.
Do nothing if it's already been called.
Assume caller has blocked SIGCHLD (all callers do now).
* emacs.c (main): Do not catch SIGCHLD here; defer it until
just before it's really needed.
* nsterm.m (ns_term_init): No need to re-catch SIGCHLD here,
since it hasn't been caught yet.

Fixes: debbugs:14569

lisp/faces.el: Minor changes.
(face-documentation): Simplify.
(read-face-attribute, tty-find-type, x-resolve-font-name):
Use `string-match-p'.
(list-faces-display): Use `string-match-p'.  Simplify.
(face-spec-recalc): Check face to avoid face alias loops.
(read-color): Use `string-match-p' and non-capturing parenthesis.

Implement :max-width/:max-height for (ImageMagic) images

* doc/lispref/display.texi (ImageMagick Images): Mention :max-width and
:max-height.

* lisp/net/shr.el (shr-rescale-image): Use the new
:max-width/:max-height functionality.

* src/image.c (compute_image_size): New function to implement
:max-width and :max-height.
(imagemagick_load_image): Use it.

* net/eww.el: Bind `C-c C-c' to "submit" in all form keymaps.

eww.el: Add a command to browse using and external browser

(eww-external-browser): New variable.
(eww-mode-map): New keystroke.
(eww-browse-with-external-browser): New command.

eww.el: If given a non-domain text, search for the term

* net/eww.el (eww-search-prefix): New variable.
(eww): Use it.

Try to avoid malloc SEGVs on Cygwin.

* callproc.c, process.h (block_child_signal, unblock_child_signal):
Now extern.
* emacs.c (main): Catch SIGCHLD just before initializing gfilenotify.
* process.c (catch_child_signal): Block SIGCHLD while futzing with
the SIGCHLD handler, since the code is not atomic and (due to glib)
signals may be arriving now.
* sysdep.c (init_signals): Do not catch child signals here;
'main' now does that later, at a safer time.

Fixes: debbugs:14569

lisp/emacs-lisp/tabulated-list.el: Fix alignment problem with :pad-right = 0.
(tabulated-list-init-header): Don't skip aligning the next header field when
padding is 0; otherwise, field width is not respected unless the title is as
wide as the field.

Remove some doc/misc/Makefile.in stuff that is not needed any more

* doc/misc/Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq):
Remove; not needed now we use a standard html layout for the faq.
(clean): Remove HTML_TARGETS, emacs-faq.text.

* lisp/emacs-lisp/package.el (package-el-version): Remove.
(package-process-define-package): Fix inf-loop.
(package-install): Allow symbols as arguments again.

Clean up SIGCHLD handling a bit.

* process.c, process.h (catch_child_signal):
Now always extern, even if !NS_IMPL_GNUSTEP.
* process.c (catch_child_signal): Move glib tickler here from
init_process_emacs, so that it's done earlier in Emacs
initialization.  Also move the noninteractive && !initialized
check here from init_process_emacs.  This is all a bit cleaner for
GNUish platforms, and I hope it works around the Cygwin bug.
* sysdep.c (init_signals): Invoke catch_child_signal here, so
that glib signal handling is tickled before glib creates threads.

Fixes: debbugs:14569

* process.c (wait_reading_process_output): Avoid int overflow

when reading more than 2 GiB total from a process.

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `catch',
add some more keyword-like methods.
http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00911.html

Auto-commit of generated files.

.bzrignore: Add GNU idutils ID database file.

lisp/bs.el, emacs-lock.el: Use defvar-local, setq-local.

* lisp/bs.el (bs-buffer-show-mark): Make defvar-local.
  (bs-mode): Use setq-local.

* lisp/emacs-lock.el (emacs-lock-mode, emacs-lock--old-mode)
  (emacs-lock--try-unlocking): Make defvar-local.

* lisp/play/cookie1.el (cookie-apropos): Minor simplification.

* lisp/progmodes/gdb-mi.el (gdb-mapcar*): Remove, replace with cl-mapcar.

* configure.ac: Include X11/X.h when testing for Xft.h.

Fixes: debbugs:14684

* lisp/progmodes/ruby-mode.el (auto-mode-alist): Do not use
`regexp-opt', it breaks the build during dumping.

* progmodes/ruby-mode.el (auto-mode-alist): Forgot "Guardfile".

* lisp/progmodes/ruby-mode.el (auto-mode-alist): Consolidate different
entries into one regexp and add more *file-s.

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
keyword-like methods on Kernel and Module with
font-lock-builtin-face.

* process.c (create_process): Handle a couple more cases,

i.e., work even if new_argv and wait_child_setup[i] are cached.
Use Fcall_process's style for volatile vars.

* lisp/ChangeLog: Add changes for new version of todo-mode.el.

Merge from trunk.

* process.c (create_process): Mark PROCESS volatile.

* calendar/ChangeLog: Remove prior to merging new version of
  todo-mode.el to trunk.

* lib-src/ebrowse.c: Include <stddef.h>, needed on some platforms.

Use C99-style flexible array members if available.

This avoids some subtle aliasing issues, which typically
aren't a problem with GCC but may be a problem elsewhere.
* lib-src/ebrowse.c (struct member, struct alias, struct sym):
Use FLEXIBLE_ARRAY_MEMBER.
(add_sym, add_member, make_namespace, register_namespace_alias):
Use offsetof (struct, flex_array_member), not sizeof (struct), as
that ports better to pre-C99 non-GCC.
* src/alloc.c (sdata): New typedef, replacing the old struct sdata.
It is a struct if GC_CHECK_STRING_BYTES, a union otherwise.
In either case, it uses a flexible array member rather than
the old struct hack.  All uses changed.
(SDATA_NBYTES, sweep_strings) [!GC_CHECK_STRING_BYTES]:
Adjust to sdata reorganization.
* src/alloc.c (VBLOCK_BYTES_MIN, allocate_vectorlike, Fgarbage_collect):
Use offsetof (struct, flex_array_member), not sizeof (struct), as
that ports better to pre-C99 non-GCC.
* src/chartab.c (Fmake_char_table, make_sub_char_table, copy_char_table):
Use CHAR_TABLE_STANDARD_SLOTS rather than its definition,
as the latter has changed.
* src/conf_post.h (FLEXIBLE_ARRAY_MEMBER): Move here from w32.c,
and port better to pre-C99 GCC.
* src/image.c (struct xpm_cached_color):
* src/lisp.h (struct Lisp_Vector, struct Lisp_Bool_Vector)
(struct Lisp_Char_Table, struct Lisp_Sub_Char_Table):
Use FLEXIBLE_ARRAY_MEMBER.
* src/lisp.h (string_bytes) [GC_CHECK_STRING_BYTES]:
Move decl to top level so it gets checked against implementation.
(CHAR_TABLE_STANDARD_SLOTS): Adjust to struct Lisp_Char_Table change.
* src/w32.c (FLEXIBLE_ARRAY_MEMBER): Move to conf_post.h.

Merge from trunk.

Use cookie functions in yow

* play/cookie1.el (cookie-apropos): Add optional display argument.
* obsolete/yow.el (apropos-zippy): Use cookie-apropos.
(psychoanalyze-pinhead): Use cookie-doctor.

lisp/emacs-lisp/package.el (tar-get-file-descriptor, tar--extract): Declare.

Extend flymake's warning predicate to be a function.  Test suite for flymake.
* lisp/progmodes/flymake.el (flymake-warning-predicate): New.
(flymake-parse-line): Use it.
(flymake-warning-re): Make obsolete alias to
`flymake-warning-predicate'.
* doc/misc/flymake.texi (Parsing the output, Customizable variables):
Add reference to `flymake-warning-predicate'.
* test/automated/flymake-tests.el:
* test/automated/flymake/warnpred/Makefile
* test/automated/flymake/warnpred/test.c
* test/automated/flymake/warnpred/test.pl: New files.

Fixes: debbugs:14217

* lisp/emacs-lisp/package.el (package-alist): Include obsolete packages.
(package-obsolete-list): Remove.
(package-activate): Remove min-version argument.  Add `force' argument.
Adjust to new package-alist format.
(package-mark-obsolete): Remove.
(package-unpack): Force reload of the package's autoloads.
(package-installed-p): Check builtins if the installed package is not
recent enough.
(package-initialize): Don't reset package-obsolete-list.
Don't specify which package version to activate.
(package-process-define-package, describe-package-1)
(package-menu--generate): Adjust to new package-alist format.

* todo-mode.el: Change two occurrences of "document string" to
"documentation string".

* todo-mode.el: Clean up doc strings, comments and prompt strings,
mainly by changing "Todo" to "todo" when it is not part of a mode
name or does not begin a sentence.

leim/quail/*.el: Fix typos.

* leim/quail/croatian.el ("croatian-prefix"):
* leim/quail/czech.el ("czech", "czech-qwerty"):
* leim/quail/ipa-praat.el ("ipa-praat"):
* leim/quail/ipa.el ("ipa-x-sampa"):
* leim/quail/tibetan.el ("tibetan-wylie", "tibetan-tibkey"):
* leim/quail/uni-input.el (ucs-input-activate): Fix typos in docstrings.

* todo-mode.el: Offer to convert legacy file.  Update commentary.
(todo-show): If a legacy file is found and no new todo file
exists, offer to convert it and show it.  Restore autoload cookie.
(todo-convert-legacy-files): Delete unused local variable.
If todo-directory doesn't exist, create it before writing to file.
Check format of converted files.  Prompt to show converted todo file.

lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.

* lisp/allout-widgets.el (allout-widgets-mode-off)
  (allout-widgets-mode-on, allout-widgets-pre-command-business)
  (allout-widgets-post-command-business)
  (allout-widgets-after-copy-or-kill-function)
  (allout-widgets-after-undo-function, allout-test-range-overlaps)
  (allout-decorate-item-and-context)
  (allout-graphics-modification-handler): Fix typos in docstrings.
  (allout-get-or-create-parent-widget): Use `looking-at-p'.

* lisp/cmuscheme.el (scheme-start-file): Doc fix.
  (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
  (scheme-input-filter): Use `string-match-p'.

* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.

* lisp/dired-x.el: Use Dired consistently in docstrings.

* lisp/dired.el: Use Dired consistently in docstrings.
  (dired-readin, dired-mode): Use `setq-local'.
  (dired-switches-alist): Make defvar-local.
  (dired-buffers-for-dir): Use `zerop'.
  (dired-safe-switches-p, dired-switches-escape-p)
  (dired-insert-old-subdirs, dired-move-to-end-of-filename)
  (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
  (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
  (dired-goto-next-nontrivial-file): Use `string-match-p'.
  (dired-align-file, dired-insert-directory, dired-mark-files-in-region)
  (dired-toggle-marks, dired-mark-files-containing-regexp)
  (dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
  (dired-flag-auto-save-files, dired-flag-backup-files):
  Use `looking-at-p'.
  (dired-mark-files-regexp, dired-build-subdir-alist):
  Use `string-match-p', `looking-at-p'.

* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
  (direct-print-region-helper): Use `string-match-p'.

Auto-commit of generated files.

* comint.el (comint-redirect-results-list-from-process): Fix
infinite loop.