lisp/desktop.el: More fixes to frame restoration.
(desktop-restore-frames): Rename from desktop-save-windows.
(desktop-restore-in-current-display): New customization option.
(desktop--excluded-frame-parameters): Add `font'.
(desktop--save-frames): Rename from desktop--save-windows.
(desktop--restore-in-this-display-p): New function.
(desktop--make-full-frame): Remove unwanted width/height from
full(width|height) frames.
(desktop--restore-frames): Rename from desktop--restore-windows.
Obey desktop-restore-current-display.  Do not delete old frames or
select a new frame unless we were able to restore at least one frame.

lisp/ChangeLog: Fix typo.

ChangeLog fix

Add `remember-notes' function to store random notes across Emacs
restarts.
* remember.el (remember-data-file): Add :set callback to affect
notes buffer (if any).
(remember-notes): New command.
(remember-notes-buffer-name, bury-remember-notes-on-kill):
New defcustoms for the `remember-notes' function.
(remember-notes-save-and-bury-buffer): New command.
(remember-notes-mode-map): New variable.
(remember-mode): New minor mode.
(remember-notes--kill-buffer-query): New function.
* lisp/startup.el (initial-buffer-choice): Add notes to custom type.
* src/buffer.c (FKill_buffer): Run `kill-buffer-query-functions'
before checking whether buffer is modified.  This lets
`kill-buffer-query-functions' cancel killing of the buffer or save
its content before `kill-buffer' asks user the "Buffer %s
modified; kill anyway?" question.

* remember.el (remember-append-to-file):
Don't mix `find-buffer-visiting' and `get-file-buffer'.

* lisp/files.el (find-file-noselect): Simplify conditional expression.

Auto-commit of generated files.

* nsfns.m (handlePanelKeys): Don't process Command+Function keys.
Let the super performKeyEquivalent deal with them.

Fixes: debbugs:14747

Fix minor problems found by static checking.

* lwlib/lwlib-Xaw.h (xaw_update_one_value, xaw_popup_menu):
* lwlib/lwlib-Xlw.h (xlw_update_one_value, xlw_pop_instance):
* lwlib/lwlib.h (lw_allow_resizing, lw_set_main_areas) [!USE_MOTIF]:
Now const.
* src/widget.c (resize_cb): Remove unused local.

Remove duplicate ChangeLog entry.

Do not use GTK 3 if it exists but cannot be compiled.

* configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
exists but cannot be compiled.
* src/xmenu.c (x_menu_wait_for_event) [!USE_GTK]:
* src/xterm.c (x_error_handler) [!USE_GTK]:
Do not use GTK 3.

* intervals.c (get_local_map): Actually clip POSITION

Fixes: debbugs:14753

Spelling fixes.

A possible fix for bug #14753 with aborts in get_local_map.

 src/intervals.c (get_local_map): Instead of aborting, clip POSITION
 to the valid range of values.

Don't call sit-for in right-char and left-char for visual cursor motion.

 src/xdisp.c (Fmove_point_visually): Invalidate the cursor position
 when moving point by using the current glyph matrix.  This avoids
 the need to force redisplay when this function is called in a
 loop.

 lisp/bindings.el (right-char, left-char): Don't call sit-for, this is
 no longer needed.  Use arithmetic comparison only for numerical
 arguments.

Fix bug #14755 which prevented autoloads from being computed.

 lisp/international/mule-cmds.el (select-safe-coding-system): Handle
 the case of FROM being a string correctly.

Fix shr table rendering infloop

* net/shr.el (shr-make-table-1): Add a sanity check that allows
progression on degenerate tables.
(shr-rescale-image): ImageMagick animated images currently doesn't
work.

Some fixes and improvements for desktop frame restoration.
It is still experimental and disabled by default.

* lisp/desktop.el (desktop--save-windows): Put the selected frame at
  the head of the list.
  (desktop--make-full-frame): New function.
  (desktop--restore-windows): Try to re-select the frame that was
  selected upon saving.  Do not abort if some frames fail to restore,
  just show an error message and contnue.  Set up maximized frames so
  they have default non-maximized dimensions.

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Don't
start heredoc inside a string or comment.

Fix typos in ChangeLogs.

Fix typo in src/ChangeLog.

Fix minor problems found by static checking.

* coding.c (encode_inhibit_flag, inhibit_flag): New functions.
Redo the latter's body to sidestep GCC parenthesization warnings.
(setup_coding_system, detect_coding, detect_coding_system): Use them.
* coding.c (detect_coding, detect_coding_system):
* coding.h (struct undecided_spec):
Use bool for boolean.
* image.c (QCmax_width, QCmax_height): Now static.
* xdisp.c (Fmove_point_visually): Remove unused local.

Minor fix in right-char and left-char, per Stefan's comments.

Implement visual-order cursor motion.

 src/xdisp.c (Fmove_point_visually): New function.

 lisp/bindings.el (visual-order-cursor-movement): New defcustom.
 (right-char, left-char): Provide visual-order cursor motion by
 calling move-point-visually.  Update the doc strings.

 doc/emacs/basic.texi (Moving Point): Document visual-order-cursor-movement
 and its effect on right-char and left-char.

 doc/lispref/display.texi (Bidirectional Display): Document move-point-visually.

 etc/NEWS: Document the new feature.

merge trunk

merge trunk

* buffers.texi (Buffer File Name): Fix typo.

* admin.el (manual-pdf, manual-ps): Work in the directory with the texi file,
so that TeX intermediate files go there rather than to PWD.

* admin/admin.el (make-manuals): Don't bother with txt or dvi any more.
(manual-txt): Remove.
(manual-pdf): Doc fix.
(manual-ps): Rename from manual-dvi.

* image.c (image_unget_x_image): Fix formatting.

* doc/emacs/ack.texi (Acknowledgments): Small update.

coding.c (setup_coding_system): Handle CODING->spec.undecided.
(detect_coding): Likewise.
(detect_coding_system): Likewise.
(Fdefine_coding_system_internal): New coding system properties
:inhibit-null-byte-detection, :inhibit-iso-escape-detection, and
:prefer-utf-8.
(syms_of_coding): Adjusted for coding_arg_undecided_max.

coding.h (define_coding_undecided_arg_index): New enum.
(coding_attr_index): New members
coding_attr_undecided_inhibit_null_byte_detection,
coding_attr_undecided_inhibit_iso_escape_detection,
coding_attr_undecided_prefer_utf_8.
(undecided_spec): New struct.
(struct coding_system): New member `undecied' of the member
`spec'.

mule.el (define-coding-system): New coding system
properties :inhibit-null-byte-detection,
:inhibit-iso-escape-detection, and :prefer-utf-8.
(set-buffer-file-coding-system): If :charset-list property of
CODING-SYSTEM is `emacs', do not check if CODING-SYSTEM is
appropriate for setting.

mule-cmds.el (select-safe-coding-system): If
DEFAULT-CODING-SYSTEM is prefer-utf-8 and the buffer contains
multibyte characters, return utf-8 (or one of it's siblings).

mule-conf.el (prefer-utf-8): New coding system.
(file-coding-system-alist): Use prefer-utf-8 as default for Elisp
files.

decoder-tests.el (decoder-tests-gen-file): New arg FILE.
(decoder-tests-ao-gen-file): Renamed from decoder-tests-filename.
Callers changed.
(decoder-tests-filename): New function.
(decoder-tests-prefer-utf-8-read)
(decoder-tests-prefer-utf-8-write): New function.
(ert-test-decoder-prefer-utf-8): New test.

gnus-art.el (gnus-article-extend-url-button): Make it work again with gnus-button-push revised at 2011-01-19

* net/shr.el (shr-render-region): New function.

* net/eww.el: Autoload `eww-browse-url'.

* image.c (x_from_xcolors): Remove unused local.

Fix W32-specific part of last change.

Fix typo in ChangeLog for last commit.

Defer image data transfer between X client and server until actual display happens.

Add Copyright header, standardize license notice

Do not tickle glib SIGCHLD handling if Cygwin.

This mostly consists of undoing recent changes.
* callproc.c (Fcall_process):
* process.c (create_process):
Do not worry about catching SIGCHLD here, undoing previous change.
* nsterm.m (ns_term_init): Re-catch SIGCHLD, undoing previous change.
* process.c, process.h (catch_child_signal):
No longer extern if !NS_IMPL_GNUSTEP, undoing 06-22 change.
* process.c (catch_child_handler): Don't worry about being called
lazily and do not assume caller has blocked SIGCHLD, undoing
previous change.  Move first-time stuff back to
init_process_emacs, undoing 06-22 change.  If CYGWIN, do not
tickle glib, as that causes Cygwin bootstrap to fail.  Do not
set lib_child_handler if it's already initialized, which may
help avoid problems on GNUStep.

* test/automated/package-x-test.el: Change the commentary.
(package-x-test--single-archive-entry-1-3)
(package-x-test--single-archive-entry-1-4): Fix the tests, by
using the appropriate data structure.

* test/automated/package-x-test.el: Change the commentary.

* automated/Makefile.in (setwins): Include the 'data' subdirectory.

* automated/package-x-test.el: New file.

* automated/package-test.el: New file.

* automated/data/package: New directory, with test examples.

* lisp/emacs-lisp/package-x.el (package-upload-buffer-internal): Adapt
to `package-desc-version' being a list.  Use
`package--ac-desc-version' to retrieve version from a package
archive element.

* info.el (Info-try-follow-nearest-node): Move search for footnote
above search for node name to prevent missing a footnote.

Fixes: debbugs:14717

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