Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org

* lisp/frame.el (make-frame): Use t rather than nil for `w'.

Fixes: debbugs:18653

* NEWS: Mention optional arg to terpri and new cl-lib functions.

* doc/lispref/frames.texi: Tweak previous tweaks.

Doc tweaks

* doc/lispref/frames.texi (Multiple Terminals): Copyedits.

* lisp/frame.el (display-monitor-attributes-list): Doc tweaks.

* nt/README.W32, src/ChangeLog.10, src/w32term.c:
Standardize on "taskbar" rather than "task bar", since that is what
most references seem to use; e.g.
http://en.wikipedia.org/wiki/Taskbar
http://windows.microsoft.com/en-us/windows7/products/features/windows-taskbar

Enhance terpri to allow conditionally output a newline

* doc/lispref/streams.texi (Output Functions): Document new argument ENSURE to
terpri.

* doc/misc/cl.texi (Porting Common Lisp): Remove parse-integer.

* lisp/emacs-lisp/cl-extra.el (cl-fresh-line): New function.

* src/keymap.c (describe_vector_princ):
* src/keyboard.c (Fcommand_error_default_function): Adapt to change to
Fterpri.

* src/print.c (printchar_stdout_last): Declare.
(printchar): Record the last char written to stdout.
(Fterpri): Add optional argument ENSURE.

* test/automated/print-tests.el: New file.
(terpri): Tests for terpri.  (Bug#18652)

* lisp/frame.el: Fix doc typo in previous

* cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases.

* lisp/progmodes/cfengine.el (cfengine3-make-syntax-cache): Always
return a syntax.  Replace call-process-shell-command with
process-file.  Ensure cfengine-mode-syntax-functions-regex is
always set.  Ensure cache when cfengine-cf-promises fails.

Fixes: debbugs:18620

Fix bug #18649 with handling C-g on MS-Windows in -nw sessions.

 src/w32inevt.c (maybe_generate_resize_event): Pass non-zero as the
 DELAY argument to change_frame_size, so that the frame size
 changes, if any are needed, are delayed until the next redisplay.
 This is to avoid a too early QUIT inside change_frame_size, when
 it calls Lisp in frame_windows_min_size, in case one of the events
 we've read sets the quit-flag.

doc/lispref/frames.texi: (Multiple Terminals): Fix last commit.

Accept terminal devices on MS-Windows in APIs that accept frame or display.

 src/w32fns.c (check_x_display_info): Accept terminal objects as
 argument, to follow what xfns.c does.

Fix bug #18636 with documentation of multi-monitor displays.

 doc/lispref/frames.texi (Multiple Terminals): Improve the description of X
 display names.  Add index entries.
 (Basic Parameters): Add a cross-reference to where X display names
 are described.
 (Position Parameters): Mention that positional parameters of the
 form (+ POS) can be negative if they are on a non-primary monitor
 of a multi-monitor display.
 (Creating Frames): Mention that on multi-monitor displays the
 frame might be positioned differently than specified by the frame
 parameters alist.

 lisp/faces.el (display-grayscale-p): Mention in the doc string that
 the argument can be either a display name or a frame.
 lisp/frame.el (display-pixel-height, display-pixel-width)
 (display-mm-height, display-mm-width, display-backing-store)
 (display-save-under, display-planes, display-color-cells)
 (display-visual-class, display-monitor-attributes-list)
 (display-screens): Mention in the doc string that the argument can
 be either a display name or a frame.  Improve the docs of the
 monitor attributes.

Fix bug #18610 with crashes when visiting files with ESC and 8-bit bytes.

 src/coding.c (detect_coding_iso_2022): Set coding->rejected
 correctly when an invalid escape sequence is found.

 Backported from trunk.

* admin/unidata/Makefile.in: Check for deleted uni- files.
(all): Use unifiles rather than charprop.el.
(FORCE): New variable and phony rule.
(${unidir}/charprop.el): Respect FORCE.
(unifiles): New rule.

* src/Makefile.in ($(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el): Add explicit FORCE.

Fixes: debbugs:18489

Fix bug #18650 with warning about zlib when loading url-vars.el.

 src/decompress.c (init_zlib_functions): Move the message about zlib
 being unavailable from here...
 (Fzlib_decompress_region): ...to here.

 lisp/url/url-http.el (url-http-create-request): Recheck zlib availability
 on windows-nt each time it might be required.

* font.c (Ffont_get_glyphs): Use validate_subarray and fix
the case where an optional string is used.  Adjust docstring.

admin/unidata/Makefile.in small cleanup

* admin/unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
(charprop.el, install): Remove rules.
(clean): Simplify.

* lisp/font-lock.el (font-lock-fontify-buffer): Fix interactive-only markup.

Sync with upstream verilog-mode revision c075a492

* lisp/progmodes/verilog-mode.el (verilog-mode-version): Bump.
(verilog-menu): Add AUTOINSERTLAST.
(verilog-no-indent-begin-re): When `verilog-indent-begin-after-if'
is nil, fix indenting initial/final to match always statements, bug825.
Reported by Tim Clapp.
(verilog-extended-complete-re): Fix indentation of DPI-C imports,
bug557.  Reported by ZeDong Mao and Jason Forkey.
(verilog-read-decls): Fix parsing typed interfaces.
Fix AUTOINOUTMODPORT missing types.  Reported by Stephan Bourduas.
(verilog-auto-arg-ports): Fix verilog-auto-arg-format single.
(verilog-auto-output-every): Add regexp to AUTOOUTPUTEVERY, bug793.
Reported by Pierre-David Pfister.
(verilog-auto-insert-lisp): Doc fix.
(verilog-auto-insert-last, verilog-auto): Add AUTOINSERTLAST to
allow post-AUTO user fixups, bug826.  Reported by Dennis Muhlestein.
(verilog-sk-ovm-class, verilog-sk-uvm-object)
(verilog-sk-uvm-component): Fix missing string keyword in class
skeletons, bug824.  Reported by eldad faruhi.

lisp/gnus/gnus-icalendar.el (gnus-icalendar-identities): Include message-alternative-emails

Fix "make docs" failure

* doc/misc/newsticker.texi (Supported Formats): Fix order of subheading and
itemize.

* lisp/term/w32-win.el: Move all code from 32-common-fns.el here.
(gui-select-text, gui-selection-value): Use w32 handlers in the w32
console as well.
* lisp/w32-common-fns.el: Remove.
* lisp/loadup.el: Don't load w32-common-fns.el.
* w32-fns.elc: Don't require w32-common-fns.
* src/lisp.mk (lisp): Remove w32-common-fns.elc.

Fixes: debbugs:18629

* lisp/icomplete.el: Move Iswitchb autoload here.  Much simpler.
* lisp/Makefile.in (obsolete-autoloads): Remove.
(AUTOGENEL): Remove obsolete/loaddefs.el.
* lisp/loadup.el: Don't load obsolete/loaddefs.el.
* lisp/obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.
Remove redundant obsolescence thingy.

* lisp/Makefile.in (obsolete-autoloads): Write to a separate file,
to workaround autoloads bug.
(AUTOGENEL): Add obsolete/loaddefs.el.

* lisp/loadup.el: Load obsolete/loaddefs.el if present.

* lisp/subr.el (do-after-load-evaluation):
Don't warn about obsolete/loaddefs.el.

Fixes: debbugs:17407

In term-window-width subtract 1 from width when any fringe has zero width. (Bug#18601)

* term.el (term-window-width): Subtract 1 from the width when
any fringe has zero width, not just the right fringe.  (Bug#18601)

* package.texi (Package Menu): Package list was changed to not say "unsigned"

* lisp/menu-bar.el (menu-bar-games-menu): Remove landmark.
It's not a game you can play, and is of no interest to the casual browser.
It was broken for years and no-one even noticed.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00288.html

* configure.ac: Add -Wno-string-plus-int for clang.

* imenu.el (imenu): Re-write for clarity.

Remove calendar code obsolete since at least version 23.1

* lisp/calendar/cal-bahai.el (calendar-absolute-from-bahai)
(calendar-print-bahai-date, calendar-bahai-prompt-for-date)
(calendar-goto-bahai-date, list-bahai-diary-entries)
(mark-bahai-calendar-date-pattern, mark-bahai-diary-entries)
(insert-bahai-diary-entry, insert-monthly-bahai-diary-entry)
(insert-yearly-bahai-diary-entry):
* lisp/calendar/cal-china.el (chinese-calendar-time-zone)
(chinese-calendar-location-name)
(chinese-calendar-daylight-time-offset)
(chinese-calendar-standard-time-zone-name)
(chinese-calendar-daylight-time-zone-name)
(chinese-calendar-daylight-savings-starts)
(chinese-calendar-daylight-savings-ends)
(chinese-calendar-daylight-savings-starts-time)
(chinese-calendar-daylight-savings-ends-time)
(chinese-calendar-celestial-stem)
(chinese-calendar-terrestrial-branch)
(calendar-absolute-from-chinese, calendar-print-chinese-date)
(calendar-goto-chinese-date):
* lisp/calendar/cal-coptic.el (calendar-absolute-from-coptic)
(calendar-print-coptic-date, coptic-prompt-for-date)
(calendar-goto-coptic-date, calendar-absolute-from-ethiopic)
(calendar-print-ethiopic-date, calendar-goto-ethiopic-date):
* lisp/calendar/cal-french.el (calendar-absolute-from-french)
(calendar-print-french-date, calendar-goto-french-date):
* lisp/calendar/cal-hebrew.el (diary-sabbath-candles-minutes)
(calendar-absolute-from-hebrew, calendar-print-hebrew-date)
(hebrew-calendar-yahrzeit, calendar-goto-hebrew-date)
(holiday-rosh-hashanah-etc, holiday-hanukkah)
(holiday-passover-etc, holiday-tisha-b-av-etc)
(list-hebrew-diary-entries, mark-hebrew-calendar-date-pattern)
(mark-hebrew-diary-entries, insert-hebrew-diary-entry)
(insert-monthly-hebrew-diary-entry)
(insert-yearly-hebrew-diary-entry, list-yahrzeit-dates)
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha)
(diary-sabbath-candles):
* lisp/calendar/cal-islam.el (calendar-absolute-from-islamic)
(calendar-print-islamic-date, calendar-goto-islamic-date)
(list-islamic-diary-entries, mark-islamic-calendar-date-pattern)
(mark-islamic-diary-entries, insert-islamic-diary-entry)
(insert-monthly-islamic-diary-entry)
(insert-yearly-islamic-diary-entry):
* lisp/calendar/cal-iso.el (calendar-absolute-from-iso)
(calendar-print-iso-date, calendar-iso-read-args)
(calendar-goto-iso-date, calendar-goto-iso-week):
* lisp/calendar/cal-julian.el (calendar-absolute-from-julian)
(calendar-print-julian-date, calendar-goto-julian-date)
(calendar-absolute-from-astro, calendar-print-astro-day-number)
(calendar-goto-astro-day-number):
* lisp/calendar/cal-mayan.el (calendar-print-mayan-date)
(calendar-next-haab-date, calendar-previous-haab-date)
(calendar-next-tzolkin-date, calendar-previous-tzolkin-date)
(calendar-next-calendar-round-date)
(calendar-previous-calendar-round-date)
(calendar-absolute-from-mayan-long-count)
(calendar-goto-mayan-long-count-date):
* lisp/calendar/cal-move.el (scroll-calendar-left)
(scroll-calendar-right, scroll-calendar-left-three-months)
(scroll-calendar-right-three-months):
* lisp/calendar/cal-persia.el (calendar-absolute-from-persian)
(calendar-print-persian-date, persian-prompt-for-date)
(calendar-goto-persian-date):
* lisp/calendar/cal-x.el (calendar-after-frame-setup-hooks):
* lisp/calendar/calendar.el (view-diary-entries-initially)
(mark-diary-entries-in-calendar, calendar-today-face)
(diary-face, holiday-face, view-calendar-holidays-initially)
(mark-holidays-in-calendar, initial-calendar-window-hook)
(today-visible-calendar-hook, today-invisible-calendar-hook)
(hebrew-diary-entry-symbol, islamic-diary-entry-symbol)
(bahai-diary-entry-symbol, american-date-diary-pattern)
(european-date-diary-pattern, european-calendar-display-form)
(american-calendar-display-form, holidays-in-diary-buffer)
(all-hebrew-calendar-holidays, all-christian-calendar-holidays)
(all-islamic-calendar-holidays, all-bahai-calendar-holidays)
(fancy-diary-buffer, increment-calendar-month)
(extract-calendar-month, extract-calendar-day)
(extract-calendar-year, exit-calendar, calendar-date-is-legal-p)
(mark-visible-calendar-date, calendar-version):
* lisp/calendar/diary-lib.el (diary-button-face, sexp-diary-entry-symbol)
(diary-display-hook, list-diary-entries-hook)
(mark-diary-entries-hook, nongregorian-diary-listing-hook)
(nongregorian-diary-marking-hook, print-diary-entries-hook)
(abbreviated-calendar-year, number-of-diary-entries)
(view-other-diary-entries, add-to-diary-list)
(include-other-diary-files, simple-diary-display)
(fancy-diary-display, print-diary-entries, mark-diary-entries)
(mark-sexp-diary-entries, mark-included-diary-files)
(mark-calendar-days-named, mark-calendar-month)
(mark-calendar-date-pattern, sort-diary-entries)
(list-sexp-diary-entries, make-diary-entry, insert-diary-entry)
(insert-weekly-diary-entry, insert-monthly-diary-entry)
(insert-yearly-diary-entry, insert-anniversary-diary-entry)
(insert-block-diary-entry, insert-cyclic-diary-entry)
(fancy-diary-font-lock-keywords, fancy-diary-display-mode):
* lisp/calendar/holidays.el (general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays)
(christian-holidays, islamic-holidays, bahai-holidays)
(solar-holidays, list-calendar-holidays)
(check-calendar-holidays, mark-calendar-holidays)
(filter-visible-calendar-holidays):
* lisp/calendar/lunar.el (calendar-phases-of-moon, phases-of-moon)
(diary-phases-of-moon): Remove obsolete aliases.

* lisp/calendar/cal-menu.el (cal-menu-load-hook): Remove obsolete hook.
* calendar/cal-x.el (calendar-one-frame-setup)
(calendar-only-one-frame-setup, calendar-two-frame-setup):
Remove obsolete functions.
(cal-x-load-hook): Remove obsolete hook.

* calendar/calendar.el (european-calendar-style): Remove obsolete variable.
(calendar-date-style): No longer consult european-calendar-style.

* calendar/calendar.el (european-calendar, american-calendar):
Remove obsolete commands.

* calendar/calendar.el (calendar-for-loop): Remove obsolete macro.

* calendar/diary-lib.el (diary-face): Remove obsolete variable.
(diary-font-lock-date-forms, diary-fancy-font-lock-keywords):
Use the face `diary' instead of the variable `diary-face'.

* calendar/holidays.el (hebrew-holidays-1, hebrew-holidays-2)
(hebrew-holidays-3, hebrew-holidays-4): Remove obsolete variables.

* lisp/calendar/icalendar.el (icalendar--date-style): Remove function.
Replace all uses with calendar-date-style.

* lisp/textmodes/remember.el (calendar-date-style): Declare.
(remember-diary-convert-entry):
No longer consult european-calendar-style.

* test/automated/icalendar-tests.el (icalendar--calendar-style):
Remove test, no longer relevant.

* keyboard.c (Qleft, Qright): Remove duplicate definitions.

These were already defined in buffer.c, and the duplicate
definitions cause problems on platforms like 'gcc -fno-common'.
Reported by Peter Dyballa in: http://bugs.gnu.org/9927#137

Fix disable toolbar for GNUStep.

* nsterm.m (updateFrameSize:): Only call update_frame_tool_bar
if toolbar is visible.

Fixes: debbugs:18345

* nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than 0.23.

Fixes: debbugs:18030

Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca

* nsterm.m (ns_draw_window_cursor): Adjust y for hbar cursor only if smaller than
line height (Bug#17977).

Fixes: debbugs:18345

* nsterm.m (ns_select, ns_read_socket): Use unwind_protect to decrease
apploopnr.

Fixes: debbugs:18345

* NEWS: Mention ns-use-fullscreen-animation.

Add ns-use-fullscreen-animation for non-native fullscreen on NS.

* nsterm.m (syms_of_nsterm): ns-use-fullscreen-animation is new.
(toggleFullScreen:): Use ns-use-fullscreen-animation for animate.

Import from macoport 24.3.94.

* macfont.m: Fix indentation and import changes from macport
24.3.94.
(macfont_closest_traits_index): New function.
(macfont_closest_traits_index_p): Renamed from
macfont_closest_traits_index.
(macfont_list): Use macfont_closest_traits_index_p.

coding.c (detect_coding_iso_2022): Fix previous change.

coding.c (detect_coding_iso_2022): Set coding->rejected correctly when an invalid escape sequence is found (Bug#18610).

* imenu.el (imenu-default-goto-function): Fix typo.

lisp/gnus/nnimap.el (nnimap-process-expiry-targets): Reverse the list of expired messages only when it was built in reverse order

lisp/gnus/gnus-delay.el (gnus-delay-send-queue): Remove `gnus-delay-header' last so it can be used in `message-send-hook'

Add NEWS entry form ntlm.el change

* lisp/net/ntlm.el (ntlm-build-auth-request): Add NTLM2 Session support.

Fixes: debbugs:15603

* apropos.el (apropos-symbols-internal): Avoid error with non-symbol properties.

Fixes: debbugs:18337

* admin/authors.el (authors-renamed-files-alist): Add package-x-test.el

Merge package-x-test.el into package-test.el, to avoid running tests twice

* test/automated/package-x-test.el: Remove file...
* test/automated/package-test.el: ... merge package-x-test.el.

Fixes: debbugs:18574

* lisp/startup.el (command-line): Handle altered user-emacs-directory
in load-path warning.

Fixes: debbugs:18512

doc/emacs small markup fixes

* doc/emacs/misc.texi (Sorting):
* doc/emacs/search.texi (Query Replace): Markup fixes.

Fix Gtk+ tearoff not present on Customize Emacs and not at menu top.

* gtkutil.c (create_menus): Only add tearoffs to empty menus.
(xg_update_submenu): Remove has_tearoff_p, pass 1 to create_menus
for add_tearoff_p.

Add documentation for horizontal scroll bars and fix some minor issues.

* buffer.c (scroll_bar_width, scroll_bar_height): Fix
doc-strings.
* window.c (Fset_window_scroll_bars): Fix doc-string.
(Fwindow_scroll_bars): Have it return what the doc-string says.

* window.el (window-full-height-p): Make it behave correctly for
minibuffer window.
(window-current-scroll-bars): Fix code.
(fit-frame-to-buffer): Use window-scroll-bar-height instead of
window-scroll-bars.
* frame.el (frame-current-scroll-bars): Fix doc-string.
* scroll-bar.el (toggle-horizontal-scroll-bar): New command.

* frames.texi (Scroll Bars): Describe use of horizontal scroll
bars.

* display.texi (Scroll Bars): Add description of horizontal scroll
bars and associated functions.
* frames.texi (Layout Parameters): Add horizontal scroll bar
entries.  Remove paragraph on "combined fringe widths".
* windows.texi (Window Sizes): Describe affects of horizontal
scroll bars on window layout and sizes.  Fix description of
window-full-height-p.
(Resizing Windows): Mention horizontal scroll bar.

* lisp/files.el (auto-mode-alist): Use sh-mode for .zsh files.

Fixes: debbugs:18488

* configure.ac: Silence warning with some old Xrandr.h.

Fixes: debbugs:18465

Merge from emacs-24; up to 2014-07-20T16:14:58Z!dmantipov@yandex.ru

* doc/lispref/commands.texi (Generic Commands): Copyedits.

* doc/misc/vip.texi (Other Vi Commands): Markup fix.

Small copyedits for doc/lispref

* doc/lispref/display.texi (Scroll Bars):
* doc/lispref/modes.texi (Header Lines): Copyedits.

Small doc/ fixes re @var usage.

* doc/emacs/cmdargs.texi (Misc X):
* doc/emacs/display.texi (Optional Mode Line):
* doc/emacs/misc.texi (emacsclient Options):
* doc/emacs/vc1-xtra.texi (VC Delete/Rename):
* doc/lispref/buffers.texi (Buffer List):
* doc/lispref/display.texi (Image Descriptors, Defining Images):
* doc/lispref/functions.texi (Core Advising Primitives):
Small fixes re @var usage.

* doc/lispref/windows.texi (Window Sizes, Resizing Windows): Copyedits.

Merge trivially safe differences from standalone CC-mode.
* lisp/progmodes/cc-mode.el (c-initialize-cc-mode): Don't quote a symbol
just to then pass it to `symbol-value'.
(prog-mode): Provide fallback definition, if needed.
* lisp/progmodes/cc-langs.el: Always load `cl'.  Don't load `cl-lib'.
Remove "cl-" prefix accordingly.
* lisp/progmodes/cc-fonts.el (c-font-lock-invalid-string): Use integerp or
characterp depending on the type of characters.
(c-font-lock-enum-tail): Remove unused var `start'.
* lisp/progmodes/cc-engine.el: Load CL at compile-time.
(c-declare-lang-variables): Use mapcan.
(c-append-to-state-cache): Remove unused var `ce+1'.
(c-parse-state-state): Make buffer-local.
(c-ssb-lit-begin): Remove unused var `pps-end-pos'.
(c-just-after-func-arglist-p): Remove unused var `end'.
* lisp/progmodes/cc-defs.el: Load cc-fix if delete-dups is undefined.
(c-<-as-paren-syntax, c->-as-paren-syntax): Move definition earlier.
(c-make-keywords-re): Use delete-dups.
(c-get-current-file): Avoid file-name-base.
* lisp/progmodes/cc-cmds.el (c-electric-lt-gt): Remove unused var
`close-paren-inserted'.
* lisp/progmodes/cc-awk.el (c-forward-sws): Remove unused declaration.

* lisp/erc/erc.el (erc-channel-receive-names): Silence compiler warning.
(erc-format-@nick, erc-update-modes): Idem.

Doc tweaks re multi-monitor

* doc/lispref/frames.texi (Multiple Terminals): Copyedits re multiple monitors.

* lisp/frame.el (frame-monitor-attributes, display-monitor-attributes-list):
Doc fixes.

doc/emacs copyedits re rectangle-mark-mode

* doc/emacs/killing.texi (Rectangles): Copyedits re rectangle-mark-mode.
(CUA Bindings): Mention rectangle-mark-mode.

* lisp/progmodes/python.el: Avoid building unneeded markers.
(python-font-lock-keywords, python-indent-dedent-line)
(python-fill-paren, python-shell-completion-complete-or-indent):
Prefer point over point-marker.
(inferior-python-mode): Remove redundant completion settings.

Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru

ChangeLog fixes

ChangeLog merge fix
Yet another unlabelled backport.

ChangeLog fix

Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org

ChangeLog fixes

A few tiny doc/ copyedits.

Fix vc-svn-ignore

* lisp/vc/vc-svn.el (vc-svn-ignore-completion-table): Implement.
(vc-svn-ignore): Use it.

Fixes: debbugs:18619

doc/misc/erc.texi (Connecting): Remove stray "OA" that failed the manual build.

Updating ERC documentation

erc.el (erc-rename-buffers): Use defcustom instead of defvar.

Mention `frame-resize-pixelwise' to make frames truly fullscreen or maximized.

* frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
In doc-string mention need of setting `frame-resize-pixelwise'.

* frames.texi (Frame Commands):
* cmdargs.texi (Window Size X): Mention the use of
`frame-resize-pixelwise' to make frames truly fullscreen or
maximized.

* frames.texi (Size Parameters, Size and Position): Mention that
with some window managers you have to set
`frame-resize-pixelwise' in order make a frame truly fullscreen
or maximized.

Sync with Org 8.2.8.

* fileio.c (emacs_readlinkat, Finsert_file_contents):
* w32fns.c, xfns.c (x_create_tip_frame): Use AUTO_STRING.

Consistently use min and max macros from lisp.h.
* coding.c (min, max):
* font.c (MAX):
* unexhp9k800.c (min):
* unexw32.c (min, max): Use definitions from lisp.h.
* regex.c (MAX, MIN) [!emacs]: Define own max and min as such.
Adjust users.
* gmalloc.c (min): Tiny style change.

* font.c (font_list_entities): Do not add empty vector to font cache.
(font_matching_entity): Likewise.  If matching entity is found, insert
1-item vector with this entity instead of an entity itself (Bug#17125).

Fix x-focus-frame bug with "Not an in-range integer".

* xselect.c (X_SHRT_MAX, X_SHRT_MIN, X_LONG_MAX, X_LONG_MIN)
(X_ULONG_MAX): Move these macros to xterm.h.
(x_fill_property_data): Be more generous about allowing either
signed or unsigned data of the appropriate width.
* xterm.h (x_display_set_last_user_time): New function.
All setters of last_user_time changd to use this function.
If ENABLE_CHECKING, check that the times are in range.

Fixes: debbugs:18586

* lisp/select.el: Add commentary discussion.

New gui-selection-value consolidating x-selection-value.
* lisp/select.el (gui-selection-value-alist): New method.
(gui-selection-value): New function.
(x-selection-value): Make it an obsolete alias.
* lisp/simple.el (interprogram-paste-function): Default to gui-selection-value.
* lisp/w32-common-fns.el (w32-get-selection-value): Simplify.
(x-selection-value): Remove alias.
(interprogram-paste-function): Don't set.
(gui-selection-value): Define for w32.
* lisp/term/x-win.el (gui-selection-value): Define for x.
(x--selection-value): Rename from x--selection-value.
(interprogram-paste-function): Don't set.
* lisp/term/pc-win.el (w16-get-selection-value): Simplify.
(msdos-initialize-window-system): Don't set interprogram-paste-function.
(gui-selection-value): Define for pc.
* lisp/term/ns-win.el (x-selection-value): Remove.
(gui-selection-value): Define for ns, instead.
* lisp/term/common-win.el (x-setup-function-keys): Don't set
interprogram-paste-function.
* lisp/obsolete/mouse-sel.el (mouse-sel-get-selection-function):
Use gui-selection-value.

* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp,
similarly to Roger's 2010-06-12 change for the remote change.

Fixes: debbugs:18605

* lisp/term/ns-win.el: Add functions to ns frame, not x frame.

Fixes: debbugs:18614

* configure.ac: Port to strict POSIX shells on non-MinGW.

Fixes: debbugs:18612

* erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).

* lisp/obsolete/lucid.el (read-number): Remove, redundant.
* lisp/obsolete/cl-compat.el (cl-floor, cl-ceiling, cl-round, cl-truncate):
Remove, broken.

src/dispnew.c (adjust_decode_mode_spec_buffer): Use 'int' instead of 'ssize_t'.

Suggested by Paul Eggert <eggert@cs.ucla.edu>.

Merge from emacs-24

Fix bug #18584 with assertion violations while scrolling.

 src/xdisp.c (move_it_by_lines): Call reseat_1 after moving the
 iterator backwards, to resync the bidi iterator.

* alloc.c (mark_overlay): Assume that overlay boundaries are
always markers.  Add comment.
* lread.c (read_internal_start): Use convenient validate_subarray.
Adjust docstring.
(Fread_from_string): Adjust docstring.

* lisp/frame.el: Use lexical-binding.
(make-frame): Use t rather than nil for tty's window-system.
* lisp/startup.el (command-line): Use gui-method.

Fixes: debbugs:18598

* simple.el (deactivate-mark): Fix typo.

* src/lisp.h: Fix up compilation for USE_STACK_LISP_OBJECTS=false.

Use local variable to determine if buffers should be renamed

Fixes: debbugs:18300

Do not reset input ring if one exists

Fixes: debbugs:18599