Omit unused arg EXPECTED from socket hooks.

* keyboard.c (gobble_input, read_avail_input, tty_read_avail_input):
* nsterm.m (ns_term_init):
* termhooks.h (struct terminal.read_socket_hook):
* w32inevt.c (w32_console_read_socket):
* w32term.c (w32_read_socket):
* xterm.c (XTread_socket):
Omit unused arg EXPECTED.  All callers changed.
(store_user_signal_events): Return void, not int, since callers no
longer care about the return value.  All uses changed.

src/w32gui.h (XParseGeometry): Do not declare.

* w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0.

Ignore 'expected'. See Eli Zaretskii in
<http://bugs.gnu.org/12471#8> (last line).

* lisp/dired-aux.el (dired-diff): Add (require 'diff) because
`diff-latest-backup-file' is not autoloaded.
(dired-do-chxxx, dired-do-chmod): Set `no-error-if-not-filep' arg
of `dired-get-filename' to t to not report error when there is
no default file on the current line.

* lisp/emacs-lisp/macroexp.el (macroexp--funcall-if-compiled): Rename from
macroexp--eval-if-compile.
(macroexp--funcall-and-return, macroexp--warn-and-return): New funs.
(macroexp--expand-all): Use them.

Fixes: debbugs:12371

* lisp/doc-view.el (doc-view-guess-paper-size)
(doc-view-scale-bounding-box): Fix unbound `caddr'.

New feature: set optimal slice from BoundingBox information.
* doc-view.el (doc-view-mode-map): Add keybinding.
(doc-view-menu): Add menu entry.
(doc-view-set-slice): Adapt docstring.
(doc-view-get-bounding-box, doc-view-guess-paper-size)
(doc-view-scale-bounding-box)
(doc-view-set-slice-from-bounding-box): New functions.
(doc-view-paper-sizes): New defvar.

* doc/emacs/misc.texi (DocView Slicing): Document new slice from
BoundingBox feature.

* frame.c (read_integer): Remove.  All uses replaced by strtol/strtoul.

(XParseGeometry): Now static.  Substitute extremal values for
values that are out of range.

Partial fix for bug#12371

* emacs-lisp/macroexp.el (byte-compile-warn-obsolete)
(byte-compile-log-warning): Autoload.

Auto-commit of generated files.

Allow customization of calendar month header text

* lisp/calendar/calendar.el (calendar-american-month-header)
(calendar-european-month-header, calendar-iso-month-header)
(calendar-month-header): New options.
(calendar-set-date-style): Set calendar-month-header.  Redraw calendar.
(calendar-generate-month): Use calendar-month-header.

Fixes: debbugs:9510

* killing.texi (Yanking): Minor clarification.

Fixes: debbugs:12469

* lisp/startup.el (command-line-ns-option-alist): Add -g and --geometry.

* src/frame.c (read_integer, XParseGeometry): Moved from w32xfns.c.
(Fx_parse_geometry): If there is a space in string, call
Qns_parse_geometry, otherwise do as on other terms.

* src/w32xfns.c (read_integer, XParseGeometry): Move to frame.c.

* src/nsfns.m (XParseGeometry): Remove.
(Fx_create_frame): Call x_set_offset to correctly interpret
top_pos in geometry.

Fixes: debbugs:12368

* lisp/dired-aux.el (dired-diff): Restore original functionality of
getting the default value, but keep new feature of using the
latest existing backup file (`diff-latest-backup-file').

* lisp/dired.el (dired-mark): If the region is active in Transient Mark
mode, mark all files in the active region.  Doc fix.
(dired-unmark, dired-flag-file-deletion, dired-unmark-backward):
Doc fix.

Fixes: debbugs:10624

* lisp/dired-aux.el (dired-do-chxxx, dired-do-chmod): Default file
attributes for M-n are pulled from the file at point.
(dired-do-chgrp, dired-do-chown, dired-do-touch): Doc fix.
Suggested by Drew Adams.

Fixes: debbugs:10624

* lisp/progmodes/ruby-mode.el (ruby-brace-to-do-end): Don't add extra
whitespace after "end".
(ruby-do-end-to-brace): Collapse block to one line if it fits
within fill-column.

* configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.

Fix bug #12464 with test for giflib 5.0.0 on MS-Windows.

 nt/configure.bat: Include stddef.h before gif_lib.h, to have size_t
 defined, as needed by giflib-5.0.0.

Auto-commit of loaddefs files.

rmailedit comment

Fix some recent changes in debug.el.

* emacs-lisp/debug.el (debugger-bury-or-kill): Fix customization
value.
(debug): Don't remove debugger window when debugger is expected
to be back.

Doc fixes for defface and friends.

* lisp/cus-edit.el (custom-unlispify-remove-prefixes): Add warning.

* lisp/custom.el (defface): Doc fix.

* doc/lispref/customize.texi (Customization): Define customization more
carefully.
(Common Keywords): Add xref to Constant Variables.

* doc/lispref/display.texi (Faces): Discuss anonymous faces.
(Face Attributes): Tweak intro.
(Defining Faces): Move after the Face Attributes node.  Copyedits.
(Displaying Faces): Describe role of inheritance.

* doc/lispref/variables.texi (Defining Variables): Link to defcustom's node
instead of the higher-level Customization chapter.

Fixes: debbugs:11440

* lisp/progmodes/compile.el (compilation-start): Use compilation-always-kill
to initialize query-on-exit; then test that instead.

Fixes: debbugs:12288

* Makefile.in (bootstrap): Revert last change.  Run config.status
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).

* Makefile.in: Run autogen/copy_autogen if autogen.sh fails,

to create 'configure'; problem reported by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
* autogen.sh: Exit with status 1 when failing due to missing tools,
reverting the 2012-09-10 change to this file.
* autogen/copy_autogen: Fail if one of the subsidiary actions fail.
Use 'cp -f' for the build-aux files, since the destinations are
typically read-only.

* Makefile.in: Fix build error on FreeBSD.

($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env.
Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00430.html>.
(MAKE_CONFIG_STATUS): Remove.  Remaining use expanded.
This undoes part of the 2012-09-10 patch.
(bootstrap): Run ./configure, rather than trying to run config.status
if it exists.  That builds src/epaths.h more reliably.

Fix bug #12196 with infloop when cache-long-line-scans is non-nil.

 src/search.c (scan_buffer): Use character positions in calls to
 region_cache_forward and region_cache_backward, not byte
 positions.

Fix typo in previous

2012-09-17  Stefan Merten  <smerten@oekonux.de>

* rst.el: Add support for `testcover'.
(rst-defcustom-testcover, rst-testcover-add-compose)
(rst-testcover-add-1value): New functions.
(rst-portable-mark-active-p): Replace by `use-region-p'.
(rst-update-section, rst-classify-adornment)
(rst-find-title-line): Mark `1value' forms.
(rst-classify-adornment): Remove superfluous form.
(rst-update-section, rst-get-adornments-around)
(rst-adornment-complete-p, rst-get-next-adornment)
(rst-adjust, rst-promote-region)
(rst-display-adornments-hierarchy, rst-straighten-adornments)
(rst-find-pfx-in-region, rst-section-tree-rec)
(rst-section-tree-point, rst-toc-insert, rst-toc-insert-node)
(rst-toc-node, rst-toc, rst-forward-section)
(rst-iterate-leftmost-paragraphs)
(rst-iterate-leftmost-paragraphs-2, rst-enumerate-region)
(rst-bullet-list-region)
(rst-convert-bullets-to-enumeration, rst-font-lock-keywords)
(rst-compile-find-conf, rst-compile)
(rst-repeat-last-character): Fix style.

Add ChangeLog bug refs

Make pcomplete less eager to add an extra space.

* comint.el (comint--complete-file-name-data): Don't add a space
if the status is `sole'; that adds a gratuitous space in the
completion-cycling case.

* pcomplete.el (pcomplete-completions-at-point): Likewise.

Fixes: debbugs:12092

nt/config.nt: Sync with autogen/config.in.
(BROKEN_SA_RESTART, SYNC_INPUT): Remove.

When toggling mime processing off, just don't do mime processing.

rmail-retry-failure must avoid mime processing.

message-in-body-p should not alter anything.

Handle Mail mode correctly.  Some code cleanup.

Auto-commit of generated files.

Fix bug when a name has no key.

Fix a typo in a comment.

Set pending_signals to 1 in w32term.c's read-socket hook.

 src/w32term.c (w32_read_socket): Set pending_signals to 1, like
 xterm.c does.  Reported by Daniel Colascione <dancol@dancol.org>.

Fix the value of __malloc_extra_blocks.

 src/ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize
 __malloc_extra_blocks to 32 instead of 64, like alloc.c did in
 emacs_blocked_malloc, now deleted.

* admin/admin.el (add-log-time-format): Declare.

Reduce version number duplication in etc/refcards

* etc/refcards/emacsver.tex: New file.
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
* refcards/emacsver.tex, etc/refcards/fr-dired-ref.tex:
* etc/refcards/fr-refcard.tex, etc/refcards/fr-survival.tex:
* etc/refcards/orgcard.tex, etc/refcards/pl-refcard.tex:
* etc/refcards/pt-br-refcard.tex, etc/refcards/refcard.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
* etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: Include emacsver.tex.
* refcards/calccard.tex (\emacsversionnumber):
Rename to \versionemacs, same as all the other refcards.
* etc/refcards/Makefile (ENVADD): New variable.
(sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf)
(%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi):
Depend on emacsver.tex.  Add "." to TEXINPUTS for TeX commands.

* admin/admin.el (set-version): Set major version in
etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex.
(set-copyright): In etc/refcards, only change ru-refcard.tex
and emacsver.tex.

* admin.el (cusver-scan, cusver-check): Bind local variables.

* .bzrignore: Add etc/refcards TeX intermediate files.

Update docstrings and comments to use "init file" terminology.

* bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes.
* comint.el (comint-prompt-read-only):
* custom.el (defcustom):
* hi-lock.el (hi-lock-mode):
* ibuffer.el (ibuffer-formats):
* ielm.el (ielm-prompt-read-only):
* novice.el (disable-command):
* saveplace.el (toggle-save-place):
* speedbar.el (speedbar-supported-extension-expressions):
* startup.el (auto-save-list-file-prefix, init-file-user)
(after-init-hook, inhibit-startup-echo-area-message):
* strokes.el (strokes-help):
* time-stamp.el (time-stamp):
* calendar/calendar.el (calendar, diary-file):
* calendar/diary-lib.el (diary-mail-entries, diary)
(diary-list-entries-hook):
* calendar/holidays.el (holidays, calendar-holidays):
* calendar/lunar.el (lunar-phases):
* calendar/solar.el (sunrise-sunset):
* emulation/edt.el (edt-load-keys):
* emulation/viper.el (viper-mode):
* eshell/em-alias.el (eshell-command-aliases-list):
* eshell/esh-util.el (eshell-convert-numeric-arguments):
* international/ogonek.el (ogonek-information):
* net/tramp-cmds.el (tramp-bug):
* net/quickurl.el (quickurl-reread-hook-postfix):
* play/decipher.el (decipher-font-lock-keywords):
* progmodes/cc-styles.el (c-set-style):
* progmodes/idlw-shell.el (idlwave-shell-prompt-pattern):
* progmodes/inf-lisp.el (inferior-lisp-prompt):
* progmodes/octave-mod.el (octave-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password):
* progmodes/verilog-mode.el (verilog-read-defines):
* textmodes/two-column.el (2C-mode): Likewise.

Convert several shell.el defvars to defcustoms.

* shell.el (shell-file-name-chars, shell-file-name-quote-list)
(shell-dynamic-complete-functions): Convert to defcustom.
(shell-prompt-pattern, shell-completion-fignore): Doc fix.

Doc fix for removed var gdb-use-separate-io-buffer.

* building.texi (GDB User Interface Layout): Remove reference to
removed variable gdb-use-separate-io-buffer.

Fixes: debbugs:12454

Remove no-longer-needed Solaris 2.4 vfork bug workaround.

The workaround was for improving performance on Solaris 2.4, but
is getting in the way now.  Emacs will still work if someone is
still running Solaris 2.4 in a museum somewhere; Sun dropped
support for Solaris 2.4 in 2003.
* configure.ac (ac_cv_func_vfork_works): Default to 'no' on
Solaris 2.4, so that AC_FUNC_VFORK doesn't think vfork works.
* src/callproc.c (Fcall_process) [HAVE_WORKING_VFORK]:
* src/process.c (create_process) [HAVE_WORKING_VFORK]:
Omit now-unnecessary workaround for the Solaris 2.4 vfork bug,
since Emacs no longer uses vfork on that platform.

Reduce the number of versioned files storing the short copyright string

* configure.ac (copyright): New output variable.
(COPYRIGHT): New AC_DEFINE.

* admin/admin.el (set-copyright): No more need to set copyrights for
nextstep, or .c files.  Add configure.ac and config.nt.

* lib-src/ebrowse.c (version):
* lib-src/etags.c (print_version): Use COPYRIGHT.

* nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/InfoPlist.strings.in:
* nextstep/templates/Info.plist.in: Let configure set copyright.

* nt/config.nt (COPYRIGHT): New.

* src/emacs.c: Use COPYRIGHT.

mail/mailabbrev.el (mail-abbrev-expand-hook): Work for a mail aliasee that holds many addresses.

Remove configure's --without-sync-input option.

When auditing signal-handling in preparation for cleaning it up,
I found that SYNC_INPUT has race conditions and would be a real
pain to fix.  Since it's an undocumented and deprecated
configure-time option, now seems like a good time to remove it.
Also see <http://bugs.gnu.org/11080#16>.
* configure.ac (SYNC_INPUT, BROKEN_SA_RESTART): Remove.
* admin/CPP-DEFINES (BROKEN_SA_RESTART, SA_RESTART): Remove.
* etc/TODO (Make SYNC_INPUT the default): Remove, as the code now
behaves as if SYNC_INPUT is always true.
* src/alloc.c (_bytes_used, __malloc_extra_blocks, _malloc_internal)
(_free_internal) [!DOUG_LEA_MALLOC]: Remove decls.
(alloc_mutex) [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
(malloc_hysteresis):
(check_depth) [XMALLOC_OVERRUN_CHECK]:
(MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT):
(__malloc_hook, __realloc_hook, __free_hook, BYTES_USED)
(dont_register_blocks, bytes_used_when_reconsidered)
(bytes_used_when_full, emacs_blocked_free, emacs_blocked_malloc)
(emacs_blocked_realloc, reset_malloc_hooks, uninterrupt_malloc):
[!SYSTEM_MALLOC && !SYNC_INPUT]:
Remove. All uses removed.
(MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): Use a different
implementation, one that depends on whether the new macro
XMALLOC_BLOCK_INPUT_CHECK is defined, not on whether SYNC_INPUT
is defined.
* src/atimer.c (run_timers, handle_alarm_signal):
* src/keyboard.c (pending_signal, poll_for_input_1, poll_for_input)
(handle_async_input, process_pending_signals)
(handle_input_available_signal, init_keyboard):
* src/nsterm.m (ns_read_socket):
* src/process.c (wait_reading_process_output):
* src/regex.c (immediate_quit, IMMEDIATE_QUIT_CHECK):
* src/sysdep.c (emacs_sigaction_init) [SA_RESTART]:
(emacs_write):
* src/xterm.c (XTread_socket):
Assume SYNC_INPUT.
* src/conf_post.h (SA_RESTART) [IRIX6_5]: Do not #undef.
* src/eval.c (handling_signal): Remove.  All uses removed.
* src/lisp.h (ELSE_PENDING_SIGNALS): Remove.
All uses replaced with the SYNC_INPUT version.
(reset_malloc_hooks, uninterrupt_malloc, handling_signal):
Remove decls.
* src/sysdep.c, src/syssignal.h (main_thread) [FORWARD_SIGNAL_TO_MAIN_THREAD]:
Now static.

Fixes: debbugs:12450

* font.c (Ffont_shape_gstring): Remove unused local.

* src/Makefile.in (clean): No longer run nextstep's clean.

(distclean): Remove unnecessary directory deletion.

Add missing nextstep file from previous change.

Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.

* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.

* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.

* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.

* .bzrignore: Add some nextstep files.

* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.

* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.

* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.

Fix marker usage in align-areas.

* align.el (align-areas): Call the indication function with
positions instead of markers for arguments.

Fixes: debbugs:12343

merge trunk

font.c (Ffont_shape_gstring): Fix previous change; GLYPHs may not covert the last few charactes.

* files.el (parse-colon-path): Use split-string.

Fixes: debbugs:12351

merge trunk

Window parameter functions again accept any window as argument (Bug#12452).

* window.c (Fwindow_parameter, Fset_window_parameter): Accept
any window as argument (Bug#12452).

Try to fix crashes introduced by 2012-09-10T21:01:45Z!jan.h.d@swipnet.se.

* nsfns.m (Fx_open_connection): Move initialization of ns_*_types
to ns_term_init to avoid memory leak.

* nsterm.m (ns_update_begin): Initialize bp after lcokFocus, use
explicit retain/release.
(ns_term_init): Only allow one display.  Initialize outerpool and
ns_*_types.

Mark display-buffer-function as obsolete.

* lisp/window.el (display-buffer-function): Mark as obsolete.

Fixes: debbugs:12166

* window.el (special-display-popup-frame): Doc fix.

Fixes: debbugs:8853

Alter last change to be compatible with Emacs 23.

* lisp/progmodes/compile.el (compilation-parse-errors): Accept list
values similar to font-lock-keywords.  Suggested by
Oleksandr Manzyuk.
(compilation-error-regexp-alist): Doc fix.

Fixes: debbugs:12136

In compilation-error-regexp-alist, allow more HIGHLIGHT types.

* progmodes/compile.el (compilation-parse-errors): Apply any value
that is a valid font-lock-face property.
(compilation-error-regexp-alist): Doc fix.

Fixes: debbugs:12136

Add option to ask bzr itself for the emacs bzr revision

* lisp/version.el (emacs-bzr-version-bzr): New function.
(emacs-bzr-get-version): Add optional EXTERNAL argument.

Auto-commit of loaddefs files.

Auto-commit of generated files.

Port _setjmp fix to POSIXish hosts as well as Microsoft.

* nt/config.nt: Attempt to sync with autogen/config.in.
(HAVE_SIGSETJMP, HAVE__SETJMP): New macros.
(_longjmp, _setjmp): Remove.
* src/image.c (_setjmp) [!HAVE__SETJMP]: Restore definition, as
it's needed on POSIXish hosts that lack _setjmp.  Attempt to solve
the Microsoft problem in a different way, by altering nt/config.nt.

Fix MS-Windows build broken by 2012-09-15T07:06:56Z!eggert@cs.ucla.edu, completing fix for bug #12446.

 src/w32xfns.c:
 src/w32uniscribe.c:
 src/w32term.c:
 src/w32select.c:
 src/w32reg.c:
 src/w32proc.c:
 src/w32menu.c:
 src/w32inevt.c:
 src/w32heap.c:
 src/w32font.c:
 src/w32fns.c:
 src/w32console.c:
 src/w32.c:
 src/w16select.c: Remove inclusion of setjmp.h, as it is now included
 by lisp.h.  This completes removal of setjmp.h inclusion
 erroneously announced in the previous commit.
 src/lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary
 more accurate.
 src/image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is
 not defined as a macro.  The latter happens on MS-Windows.

Port better to POSIX hosts lacking _setjmp.

* configure.ac (HAVE__SETJMP, HAVE_SIGSETJMP): New symbols.
(_setjmp, _longjmp): Remove.
* src/lisp.h: Include <setjmp.h> here, since we use its symbols here.
All instances of '#include <setjmp.h>' removed, if the
only reason for the instance was because "lisp.h" was included.
(sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
and _longjmp with the new symbols.  Emacs already uses _setjmp if
available, so this change affects only POSIXish hosts that have
sigsetjmp but not _setjmp, such as some versions of Solaris and
Unixware.  (Also, POSIX-2008 marks _setjmp as obsolescent.)
* src/image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
(png_load_body) [HAVE_PNG]:
(PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
(PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
since PNG requires jmp_buf.  This is the only exception to the
general rule that we now use sys_setjmp and sys_longjmp.
This exception is OK since this code does not change the signal
mask or longjmp out of a signal handler.

Fixes: debbugs:12446

merge trunk

font.c (Ffont_shape_gstring): Don't adjust grapheme cluster here, but just check the validity of glyphs in the glyph-string.

Improve vc-bzr-working-revision for lightweight checkouts

* lisp/vc/vc-bzr.el (vc-bzr-working-revision): For lightweight local
checkouts, check the parent dirstate matches the branch.
Add "--tree" to "bzr revno" arguments.  Don't try to shorten the
empty string.

Tweak previous emacs-bzr-get-version change

Improve emacs-bzr-version for lightweight checkouts (bug#12441)

* lisp/version.el (emacs-bzr-version): Doc fix.
(emacs-bzr-version-dirstate): New function.
(emacs-bzr-get-version): For lightweight checkouts, if the parent
is local try and check that it matches the branch.  If not, just
use dirstate information.

* lisp/dired-aux.el (dired-do-chmod): Use `eq' to detect empty input.

Fixes: debbugs:12399

Fix glitches with 'configure --without-sync-input'.

* configure.ac (--without-sync-input): Fix typo in usage message.
* alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
Include "syssignal.h", for 'main_thread'.

* configure.ac: Port to hosts lacking gtk.

(PKG_CHECK_MODULES): Capture pkg-config diagnostics
better, in particular, problems in invoking pkg-config itself.
This is useful on hosts that don't have pkg-config.
(GTK_MODULES): Do not exit 'configure' simply because gtk3
and gtk2 are both missing.  Problem found on Solaris 8.

Avoid out-of-range marker position (Bug#12426).
* insdel.c (replace_range, replace_range_2): Adjust
markers before overlays, as suggested by comments.
(insert_1_both, insert_from_buffer_1, adjust_after_replace):
Remove redundant check before calling offset_intervals.

* lisp/emacs-lisp/advice.el (ad-prognify): Remove, use macroexp-progn.

Auto-commit of generated files.

In Fformat_mode_line always save/restore current buffer.  (Bug#12387)

* xdisp.c (Fformat_mode_line): Unconditionally save/restore current
buffer.  (Bug#12387)

* lisp/emacs-lisp/edebug.el: Miscellaneous cleanup.
Remove obsolete byte-compiler hack that tried to silence some warnings.
(edebug-submit-bug-report): Remove.
(edebug-get-buffer-window, edebug-sit-for, edebug-input-pending-p):
Remove aliases, use the un-prefixed name instead.
(edebug-pop-to-buffer): Consider other frames.
(edebug-original-read):: Make it more obvious that it's always defined.
(edebug--make-form-data-entry, edebug--form-data-name)
(edebug--form-data-begin, edebug--form-data-end): Rename from the
single-dashed name, and implement with cl-defstruct.
(edebug-set-form-data-entry): Use the standard accessors.
(edebug-make-top-form-data-entry): Use push.
(edebug-no-match): Drop useless `funcall'.
(mapcar, mapconcat, mapatoms, apply, funcall): Don't add debug specs
to functions.
(defsubst, dont-compile, eval-when-compile, eval-and-compile)
(delay-mode-hooks, with-temp-file, with-temp-message, ad-dolist)
(with-syntax-table, push, pop, 1value, noreturn, defadvice)
(easy-menu-define, with-custom-print): Remove redundant specs.
(edebug-outside-overriding-local-map)
(edebug-outside-overriding-terminal-local-map): Remove, unused.
(edebug--display): Bind unread-command-events directly to nil rather
than binding it to unread-command-events and later setting it to nil.
(edebug--display): Kill edebug-eval-buffer here...
(edebug--recursive-edit): ...rather than here.
Bind standard-output and standard-input.
(edebug-eval): Check cl-macroexpand-all is fboundp.
(edebug-temp-display-freq-count): Fix last change.

* lisp/emacs-lisp/easymenu.el (easy-menu-define): Add `debug' spec.
* lisp/subr.el (noreturn, 1value): Add `debug' spec.
* lisp/emacs-lisp/advice.el: Require cl-lib.
(ad-copy-tree): Remove, use copy-tree instead.
(ad-dolist): Remove use dolist or cl-dolist instead.
(ad-do-return): Remove, use cl-return instead.
(defadvice): Add `debug' spec.

src/makefile.w32-in ($(BLD)/alloc.$(O)): Update dependencies.

nt/config.nt: Sync with autogen/config.in.
(BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, HAVE_CBRT, HAVE_LOGB, NO_TERMIO): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New macros.

* lisp/dired-aux.el (dired-do-chxxx): Use `eq' to detect empty input.

Fixes: debbugs:12399

Update some function declarations

* lisp/calc/calc-ext.el (math-compose-expr):
* lisp/calc/calc.el (math-compose-expr):
* lisp/progmodes/cc-defs.el (cl-macroexpand-all):
* lisp/progmodes/cc-langs.el (delete-duplicates, mapcan)
(cl-macroexpand-all): Update declarations.

* lisp/vc/vc.el: No need to require ediff.
(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.

Use a more backwards-compatible timer format.

* etc/NEWS: Document it.
* lisp/emacs-lisp/timer.el (timer): PSECS is now at the end, rather than
being right after USECS, as that better supports old code that
inadvisedly looked directly at the timer vector.
* src/keyboard.c (decode_timer): Get PSECS from the 8th (origin-0)
vector element, not from the 4th, since PSECS is now at the end.
(Fcurrent_idle_time): Doc fix.

Fixes: debbugs:12430

language/chinese.el ("Chinese-GB", "Chinese-BIG5", "Chinese-CNS", "Chinese-EUC-TW"): Add chinese-gbk to coding-priority property of these language environment.

* configure.ac: Report Gtk+ 3 as GTK.

Fix typos in ChangeLogs.

gnus-art.el (gnus-article-stop-animations): Use gnus-timer--function that is an alias to timer--function

Auto-commit of generated files.

* texinfo.tex: Merge from gnulib.

* configure.ac: Reorder Xaw3d messages.

* etc/NEWS (--with-x-toolkit): Mention Gtk+ 3 is now default.