Fix typos in ChangeLogs.

* lisp/emacs-lisp/edebug.el: Use backtrace-eval to handle lexical variables.
(edebug-eval): Use backtrace-eval.
(edebug--display, edebug--recursive-edit): Don't let-bind the
edebug-outer-* vars that keep track of variables we locally let-bind.
(edebug-outside-excursion): Don't restore outside values of locally
let-bound vars.
(edebug--display): Use user-error.
(cl-lexical-debug, cl-debug-env): Remove.

lisp/desktop.el (desktop-restore-frames): Call `sit-for'.
We want to be sure that new frames are visible before deleting
any remaining ones.

Fix bug #14841 with invisible frames on MS-Windows.

 src/w32term.c (w32_read_socket) <WM_EMACS_PAINT>: Warn about frame
 being re-exposed only if it didn't ask to become visible.
 <WM_SIZE>: Under SIZE_RESTORED, only set the frame visible if it
 was previously iconified.
 (x_iconify_frame): Mark the frame iconified.

lisp/vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-print-root-log.

*** empty log message ***

Add aliases for encrypting mail.
* epa.el (epa-mail-aliases): New option.
* epa-mail.el (epa-mail-encrypt): Rewrite to be callable from programs.
Bind inhibit-read-only so read-only text doesn't ruin everything.
(epa-mail-default-recipients): New subroutine broken out.
Handle epa-mail-aliases.

Fix minor problems found by static checking.

* eval.c (get_backtrace_frame, backtrace_eval_unrewind): Now static.
(backtrace_eval_unrewind): ';' -> '{}' to pacify GCC.

Add support for lexical variables to the debugger's `e' command.
* lisp/emacs-lisp/debug.el (debug): Don't let-bind the debugger-outer-*
vars, except for debugger-outer-match-data.
(debugger-frame-number): Move check for "on a function call" from
callers into it.  Add `skip-base' argument.
(debugger-frame, debugger-frame-clear): Simplify accordingly.
(debugger-env-macro): Only reset the state stored in non-variables,
i.e. current-buffer and match-data.
(debugger-eval-expression): Rewrite using backtrace-eval.
* lisp/subr.el (internal--called-interactively-p--get-frame): Remove.
(called-interactively-p):
* lisp/emacs-lisp/edebug.el (edebug--called-interactively-skip): Use the new
`base' arg of backtrace-frame instead.
* src/eval.c (set_specpdl_old_value): New function.
(unbind_to): Minor simplification.
(get_backtrace_frame): New function.
(Fbacktrace_frame): Use it.  Add `base' argument.
(backtrace_eval_unrewind, Fbacktrace_eval): New functions.
(syms_of_eval): Export backtrace-eval.
* src/xterm.c (x_focus_changed): Simplify.

Fix bug #14946 with documentation of fringe-mode the variable.

 doc/emacs/display.texi (Fringes): Document the variable fringe-mode.

* lisp/align.el (align-regexp): Doc fix.
(align-region): Explicit error if subexpression missing/does not match.

Fixes: debbugs:14857

* lisp/simple.el (global-visual-line-mode): Do not duplicate the mode lighter.

Fixes: debbugs:14858

* etc/spook.lines: Additions  (tiny change)

Fixes: debbugs:14658

gnus-art.el (gnus-button-url-regexp): Make it match url in which punctuation characters follow parentheses (bug#14950)

Add Makefile rules for ido.texi

* doc/misc/Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add ido.
(ido, $(buildinfodir)/ido$(INFO_EXT), ido.dvi, ido.pdf): New rules.

* info/dir: Add ido.

Auto-commit of loaddefs files.

In display-buffer bind split-window-keep-point to t, bug#14829.

* window.el (display-buffer): In display-buffer bind
split-window-keep-point to t, bug#14829.

lisp/desktop.el: Use pcase-let, pcase-let* in a few places.
(desktop--select-frame, desktop--sort-states, desktop-restore-frames):
Deobfuscate access to desktop--mini values.

lisp/desktop.el: Rename internal "desktop-X" frame params to "desktop--X".
(desktop-filter-parameters-alist, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--process-minibuffer-frames)
(desktop--select-frame, desktop--sort-states, desktop-restore-frames):
Change accordingly.

* fileio.c (Finsert_file_contents): Use a more-conservative fix.

Fixes: debbugs:14936

* fileio.c (Finsert_file_contents): Avoid double-close.

Fixes: debbugs:14936

Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalics@gmx.at

* make-dist: Add a --tests option, to include test/   (backport from trunk)

* make-dist: Add a --tests option, to include test/.

Reduce use of @email in doc/misc

In many cases it serves no purpose.  It gets converted to mailto:
in html output, which is mainly just an invitation to get spam.

* doc/misc/erc.texi (Special Features): Update contact information.
(History): Avoid using @email.

* doc/misc/eshell.texi (Bugs and ideas): Minor updates.

* doc/misc/faq.texi (Reporting bugs, Origin of the term Emacs)
(Setting up a customization file)
(Using an already running Emacs process, Turning off beeping)
(Packages that do not come with Emacs)
(Replying to the sender of a message): Avoid using @email.

* doc/misc/pcl-cvs.texi (Contributors, Bugs): Avoid using @email.

* doc/misc/reftex.texi (Imprint): Avoid using @email.

* doc/misc/ses.texi (Top): Update bug reporting instructions.
(Acknowledgments): Avoid using @email.

* doc/misc/woman.texi (Introduction, Background): Remove outdated information.
(Bugs, Acknowledgments): Avoid using @email.

lisp/desktop.el: Add workaround for bug#14949.
(desktop--make-frame): Do not pass the `fullscreen' parameter to
modify-frame-parameters if the value has not changed.
(desktop--make-frame): On cl-delete-if call, check parameter name,
not full parameter.

* etc/NEWS: Typo fix.

* doc/misc/ido.texi: New file.

Fix bug #14780 with unreachable lines near end of buffer.

 src/xdisp.c (redisplay_window): Instead of moving point out of
 scroll margin, reject the force_start method, and try scrolling.

lisp/desktop.el (desktop-restoring-frames-p): Return a true boolean.
(desktop-restore-frames): Warn when deleting an existing frame failed.

* lisp/ffap.el (ffap-machine-p): Handle "not known" response.

Fixes: debbugs:14929

* src/alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined (Bug#14944).

* automated/file-notify-tests.el
(file-notify--test-local-enabled): New defconst.  Replaces all
`file-notify-support' occurences.
(file-notify--test-remote-enabled): New defun.
(file-notify--deftest-remote): Use it.
(file-notify-test00-availability): Rewrite.
(file-notify-test00-availability-remote): New defun.
(file-notify-test01-add-watch): Rewrite first erroneous check.

* filenotify.el (file-notify-supported-p):
* net/tramp-sh.el (tramp-sh-handle-file-notify-supported-p):
Remove functions.

* autorevert.el (auto-revert-use-notify):
(auto-revert-notify-add-watch):
* net/tramp.el (tramp-file-name-for-operation):
* net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Remove `file-notify-supported-p' entry.

* errors.texi (Standard Errors): Fix typo.

* files.texi (Magic File Names):
* os.texi (File Notifications): Remove file-notify-supported-p.

Auto-commit of loaddefs files.

Auto-commit of generated files.

Merge from mainline.

* lisp/ido.el: Doc fix.

* lisp/ido.el (ido-fractionp):
(ido-cache-ftp-work-directory-time, ido-max-prospects, ido-mode)
(ido-max-file-prompt-width, ido-unc-hosts-cache)
(ido-max-directory-size, ido-max-dir-file-cache)
(ido-decorations): Doc fix.

* lisp/dired-x.el (dired-mark-extension): Convert comment to doc string.

* printing.el: Replace all uses of deleted ps-flatten-list with lpr- version.

* printing.el: Replace all uses of deleted ps-windows-system, ps-lp-system
with lpr- versions.

* src/eval.c (Fprogn): Do not check that BODY is a proper list.

This undoes the previous change.  The check slows down the
interpreter, and is not needed to prevent a crash.  See
<http://lists.gnu.org/archive/html/emacs-devel/2013-07/msg00693.html>.
* doc/lispref/eval.texi (Special Forms): Mention 'lambda'.  Also, say that
non-well-formed expressions result in unspecified behavior, though
Emacs will not crash.

* lisp/emacs-lisp/pcase.el (pcase--u1): Verify if self-quoting values can be
checked with memq.

Fixes: debbugs:14935

* lisp/files.el (revert-buffer-function): Use a non-nil default.
(revert-buffer-preserve-modes): Declare var to
provide access to the `preserve-modes' argument.
(revert-buffer): Let-bind it.
(revert-buffer--default): New function, extracted from revert-buffer.

* lisp/lpr.el: Signal print errors more prominently.
(print-region-function): Don't default to nil.
(lpr-print-region): New function, extracted from print-region-1.
Check lpr's return value and signal an error in case of problem.
(print-region-1): Use it.
* lisp/ps-print.el (ps-windows-system, ps-lp-system): Remove.  Use the lpr-*
versions instead.
(ps-printer-name): Default to nil.
(ps-printer-name-option): Default to lpr-printer-switch.
(ps-print-region-function): Don't default to nil.
(ps-postscript-code-directory): Simplify default.
(ps-do-despool): Use lpr-print-region to properly check the outcome.
(ps-string-list, ps-eval-switch, ps-flatten-list)
(ps-flatten-list-1): Remove.
(ps-multibyte-buffer): Avoid setq.
* lisp/dos-w32.el (direct-print-region-helper): Use proper regexp operators.
(print-region-function, ps-print-region-function): Don't set them here.

* lisp/ansi-color.el: Fix old URL.

* configure.ac: Use self-descriptive tags for AC_CONFIG_COMMANDS.

* progmodes/sql.el Version 3.3
(sql-product-alist): Improve oracle :prompt-cont-regexp.
(sql-starts-with-prompt-re, sql-ends-with-prompt-re): New functions.
(sql-interactive-remove-continuation-prompt): Rewrite, use
functions above.  Fix continuation prompt and complete output line
handling.
(sql-redirect-one, sql-execute): Use `read-only-mode' on
redirected output buffer.
(sql-mode): Restore deleted code (Bug#13591).

lisp/desktop.el (desktop-clear): Fix previous change.

No need for configure to create etc/ and lisp/ any more

* configure.ac (etc, lisp): No need to create specially.
Configure already creates lisp when generating lisp/Makefile;
src/Makefile now creates etc when needed.

* src/Makefile.in ($(etc)/DOC, temacs$(EXEEXT)): Ensure etc/ exists.

Use a @configure_input@ comment at the start of generated Makefiles

* inotify-test.el (inotify-file-watch-simple): Delete temp-file when done.

* test/automated/subword-tests.el: Require subword.

* net/tramp.el (tramp-handle-file-notify-add-watch): New defun.

* net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* net/tramp-smb.el (tramp-smb-file-name-handler-alist): Use it.

lisp/desktop.el (desktop-list*): Fix previous change.

Auto-commit of generated files.

Fix ChangeLog typo.

Port to GNU/Linux systems with tinfo but not ncurses.

* configure.ac (USE_NCURSES): New symbol.
* src/dispnew.c (init_display): Depend on USE_NCURSES, not GNU_LINUX,
to decide whether ncurses is being used.  Without this change,
GCC complains about tgetent not being declared, on a system
that has tinfo installed but ncurses not installed.

* eval.c (Fprogn): Check that BODY is a proper list.

[Gnus] Fix previous commit

* gnus.el (gnus-continuum-version):
* gnus-msg.el (gnus-extended-version): Simplify.

* gnus.el (gnus-continuum-version-1): Remove.
* gnus-msg.el (gnus-bug): Revert.

Tune UNEVALLED functions by using XCAR instead of Fcar, etc.

* data.c (Fsetq_default):
* eval.c (Fif, Fcond, Fprog1, Fsetq, Fquote, Ffunction, Fdefvar)
(Fdefconst, FletX, Flet, Fwhile, Fcatch, Funwind_protect)
(Fcondition_case):
Tune by taking advantage of the fact that ARGS is always a list
when a function is declared to have UNEVALLED args.

* emacsgtkfixed.c: Port to GCC 4.6.

GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.

Calculate gnus-version correctly on Cygwin

* gnus.el (gnus-continuum-version): Do main calculations in integers.
  (gnus-continuum-version-1): New function, return a string.
* gnus-msg.el (gnus-extended-version, gnus-bug):
  Use gnus-continuum-version-1 instead of gnus-continuum-version.

src/callproc.c (child_setup): Silence compiler warnings.

lisp/desktop.el: Simplify.
(desktop-clear): Simplify; remove useless checks against invalid buffer names.
(desktop-list*): Use cl-list*.
(desktop-buffer-info, desktop-create-buffer): Simplify.

* bookmark.el (bookmark-make-record): Restore NAME as a default
value.

Fixes: debbugs:14933

* lisp/emacs-lisp/autoload.el (autoload--setup-output): New function,
extracted from autoload--insert-text.
(autoload--insert-text): Remove.
(autoload--print-cookie-text): New function, extracted from
autoload--insert-cookie-text.
(autoload--insert-cookie-text): Remove.
(autoload-generate-file-autoloads): Adjust calls accordingly.

* lisp/winner.el (winner-hook-installed-p): Remove.
(winner-mode): Simplify accordingly.

* lisp/subr.el (add-to-list): Fix compiler-macro when `append' is
not constant.  Don't use `cl-member' for the base case.

* lisp/progmodes/subword.el: Fix boundary case.
(subword-forward-regexp): Make it a constant.  Wrap optional \\W in its
own group.
(subword-backward-regexp): Make it a constant.
(subword-forward-internal): Don't treat a trailing capital as the
beginning of a word.
* test/automated/subword-tests.el: New file.

Fixes: debbugs:13758

* sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame

when including <sys/user.h>, to prevent Sparc/ARM machine/frame.h
from messing up Emacs's 'struct frame'.

Fixes: debbugs:14923

lisp/emacs-lisp/package.el (package-menu-mode): Fix bug#14930.
Don't modify the global value of tabulated-list-revert-hook.

Auto-commit of loaddefs files.

* files.texi (Magic File Names): Add file-notify-add-watch,
file-notify-rm-watch and file-notify-supported-p.  Move
file-remote-p down.

* errors.texi (Standard Errors): Add file-notify-error.

* os.texi (Desktop Notifications): Rename from Notifications.
(File Notifications): New node.

* elisp.texi (Top): Update menu for these changes.

Fix typo.

* lisp/url/url-http.el (status): Remove, unused.
(success): Remove var.
(url-http-handle-authentication): Return the value that `success'
should take instead of setting `success' directly.  Don't set `status'
since it's not used.
(url-http-parse-headers): Avoid unneeded setq.
Move the `setq success'.
(url-http): Use pcase.
(url-http-file-exists-p): Simplify.

lisp/desktop.el: Require 'cl-lib.
(desktop-before-saving-frames-functions): New hook.
(desktop--process-minibuffer-frames): Set desktop-mini parameter only
for frames being saved.  Rename from desktop--save-minibuffer-frames.
(desktop-save-frames): Run hook desktop-before-saving-frames-functions.
Do not save frames with non-nil `desktop-dont-save' parameter.  Filter
out deleted frames.
(desktop--find-frame): Use cl-find-if.
(desktop--select-frame): Use cl-(first|second|third) to access values
of desktop-mini.
(desktop--make-frame): Use cl-delete-if.
(desktop--sort-states): Fix sorting of minibuffer-owning frames.
(desktop-restore-frames): Use cl-(first|second|third) to access values
of desktop-mini.  Look for visible frame at the end, not while
restoring frames.

lisp/dired-x.el: Fix bug#14927.
(dired-mark-unmarked-files, dired-virtual, dired-guess-default)
(dired-mark-sexp, dired-filename-at-point): Use string-match-p, looking-at-p.

lisp/desktop.el: Make some frame-restoring functions public.
(desktop-saved-frame-states): Rename from desktop--saved-states;
all users changed.
(desktop-save-frames): Rename from desktop--save-frames.
Do not save state to desktop file.
(desktop-save): Save desktop-saved-frame-states to desktop file
and reset to nil.
(desktop-restoring-frames-p): New function.
(desktop-restore-frames): Use it.  Rename from desktop--restore-frames.
(desktop-read): Use desktop-restoring-frames-p.  Do not try to fix
buffer-lists when restoring frames.  Suggested by Martin Rudalics.

* alloc.c (make_save_ptr_ptr): Define this function.

It was inadvertently omitted.  It's needed only if
HAVE_MENUS && ! (USE_X_TOOLKIT || USE_GTK).

* nsterm.m (sendEvent:): Skip mouse moved if no dialog and no Emacs
frame have focus.

Fixes: debbugs:14895

Auto-commit of generated files.

Avoid vfork-related deadlock more cleanly.

* callproc.c (child_setup): When the child's exec fails, output
the program name, as that's more useful.  Use O_NONBLOCK to avoid
deadlock.
* process.c (create_process_1): Remove; no longer needed.
(create_process): Remove timer hack; no longer needed, now that
the child avoids deadlock.

Spelling fixes.

lisp/ChangeLog, src/ChangeLog: Fix typos.

lisp/desktop.el: Correctly restore iconified frames.
(desktop--filter-iconified-position): New function.
(desktop-filter-parameters-alist): Add entries for `top' and `left'.

image-dired.el: use with-current-buffer

* lisp/image-dired.el (image-dired-track-original-file):
Use with-current-buffer.
(image-dired-track-thumbnail): Use with-current-buffer.
Avoid changing point of wrong window.

Tweak some message calls in gdb-mi.el

* lisp/progmodes/gdb-mi.el (gdb-delete-handler, gdb-stopped):
Let `message' do the formatting.
(def-gdb-preempt-display-buffer): Add explicit format.

Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at

* lisp/image-dired.el (image-dired-track-original-file):
Avoid changing point of wrong window.

Fixes: debbugs:14909

* international/mule.el (coding-system-iso-2022-flags): Fix last
change.

Fix array bounds violation when pty allocation fails.

* configure.ac (PTY_TTY_NAME_SPRINTF): Use PTY_NAME_SIZE,
not sizeof pty_name, since pty_name is now a pointer to the array.
* src/process.c (PTY_NAME_SIZE): New constant.
(pty_name): Remove static variable; it's now auto.
(allocate_pty): Define even if !HAVE_PTYS; that's simpler.
Take pty_name as an arg rather than using a static variable.
All callers changed.
(create_process): Recover pty_flag from process, not from volatile local.
(create_pty): Stay inside array even when pty allocation fails.
(Fmake_serial_process): Omit unnecessary initializaiton of pty_flag.

* lread.c (Fload): Avoid initialization only when lint checking.

Mention that it's needed only for older GCCs.

merge trunk

coding.c (decode_coding_iso_2022): Fix previous change.

mule.el (coding-system-iso-2022-flags): Change 8-bit-level-4'

* lread.c (Fload): Avoid uninitialized warning.

* coding.c (CODING_ISO_FLAG_LEVEL_4): New macro.
(decode_coding_iso_2022): Check the single-shift area.  (Bug#8522)

* mule.el (coding-system-iso-2022-flags): Add `level-4'.  (Bug#8522)