Merge from trunk, configury not fixed yet.

* progmodes/octave.el (octave-goto-function-definition): Improve
and fix callers.

* lisp/emacs-lisp/cl-extra.el (cl-getf): Return the proper value in
the setter.

Fixes: debbugs:14387

* lisp/progmodes/f90.el (f90-blocks-re): Include the terminating \> in the
surrounding group.
* src/regex.c (regex_compile) [\=, \>, \<]: Don't forget to set laststart.

Fixes: debbugs:14402

* lisp/subr.el (find-tag-default-as-regexp): Return nil if `tag' is nil.

Fixes: debbugs:14390

* f90.el (f90-imenu-generic-expression): Fix typo in 2013-05-08 change.
(Bug#14402)

* progmodes/gdb-mi.el (gdb-running, gdb-starting): Remove
signals for which replies are never received.

Recommend to use MinGW Texinfo.

* progmodes/gdb-mi.el: Fix non-responsive gud commands (bug#13845)
(gdb-handler-alist, gdb-handler-number): Remove variables.
(gdb-handler-list): New variable.
(gdb-add-handler, gdb-delete-handler, gdb-get-handler-function)
(gdb-pending-handler-p, gdb-handle-reply)
(gdb-remove-all-pending-triggers): New functions.
(gdb-discard-unordered-replies): New defcustom.
(gdb-handler): New defstruct.
(gdb-wait-for-pending): Fix invalid backquote.  Use gdb-handler-list.
instead of gdb-pending-triggers.  Update docstring.
(gdb-init-1): Remove dead variables.  Initialize gdb-handler-list.
(gdb-speedbar-update, gdb-speedbar-timer-fn, gdb-var-update)
(gdb-var-update-handler, def-gdb-auto-update-trigger)
(def-gdb-auto-update-handler, gdb-get-changed-registers)
(gdb-changed-registers-handler, gdb-get-main-selected-frame)
(gdb-frame-handler): Pending triggers are now automatically managed.
(def-gdb-trigger-and-handler, def-gdb-auto-update-handler):
Remove argument.
(gdb-input): Automatically handles pending triggers.  Update docstring.
(gdb-resync): Replace gdb-pending-triggers by gdb-handler-list.
(gdb-thread-exited, gdb-thread-selected, gdb-register-names-handler):
Update comments.
(gdb-done-or-error): Now use gdb-handle-reply.

* progmodes/gdb-mi.el (gdb-input): Include token numbers in
gdb-debug-log.

* subr.el (user-emacs-directory-warning): New option.
(locate-user-emacs-file): Handle non-accessible .emacs.d.

Not in NEWS, because you only need to know about this if you encounter
it in the wild.

Fixes: debbugs:13930

Another attempt to solve bug #14062 with assertion violations on MS-Windows.

 src/w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT
 unless we know that the window w is a leaf window.  Another
 attempt at solving bug#14062.

* progmodes/octave.el (octave-font-lock-texinfo-comment):
Fix invalid search bound error: wrong side of point.

* nsfont.m (ns_spec_to_descriptor): Retain and autorelease fdesc.

Fixes: debbugs:14375

* lisp/emacs-lisp/tabulated-list.el: Set a version number.
* lisp/emacs-lisp/package.el: Explicitly depend on a tabulated-list version.

Fixes: debbugs:14137

* progmodes/octave.el (octave-font-lock-keywords): Fix error
during redisplay.
(octave-goto-function-definition, octave-find-definition): Minor tweaks.

* lisp/progmodes/flymake.el (flymake-xml-program): New option.
(flymake-xml-init): Use it.

More cus-test.el tweaks

* admin/cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
(cus-test-libs): Fix let-binding of default-directory.
(cus-test-noloads): Load all libs for the comparison.

* ede/simple.el, semantic/java.el: Set generated-autoload-load-name.

* lisp/term/xterm.el: Provide a feature.

Make sup-mouse.el obsolete

* doc/emacs/ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el.

* term/sup-mouse.el: Move to obsolete/.

* etc/NEWS: Mention this.

Fix typo in previous

* cus-dep.el (defcustom-mh, defgroup-mh, defface-mh): Add compat aliases
as a hack workaround.

Fixes: debbugs:14384

Auto-commit of generated files.

* progmodes/octave.el (octave-indent-comment): Fix indentation for %!.
(octave-comment-start-skip): Include %!.
(octave-mode): Set comment-start-skip to octave-comment-start-skip.

* configure.ac (LD_SWITCH_SYSTEM_EMACS): Fix typo in previous change.

* configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -fno-pie.

Reported privately by Han Boetes <han@boetes.org>.

* progmodes/octave.el (octave-mode-map): Bind octave-indent-defun to
C-c C-q instead of C-M-q.

* progmodes/octave.el (octave-indent-comment): Fix the indentation
of ### or %%%.

* image.c (gif_load): Check that subimages fit.

Fixes: debbugs:14345

Auto-commit of loaddefs files.

* progmodes/octave.el (inferior-octave-startup): Store the value
of __octave_srcdir__ for octave-source-directories.
(inferior-octave-check-process): New function refactored out of
inferior-octave-send-list-and-digest.
(octave-source-directories)
(octave-find-definition-filename-function): New variables.
(octave-source-directories)
(octave-find-definition-default-filename): New functions.
(octave-find-definition): Improve to find functions implemented in C++.

* diary-lib.el (diary-outlook-format-1): Don't include dayname in the output.

Fixes: debbugs:14349

* lisp/emacs-lisp/autoload.el (generated-autoload-load-name): Doc fix.

Set generated-autoload-load-name in some more cedet files

There are no autoloads in these files, but there are defcustoms.
See bug#5277.

* ede/project-am.el, semantic/db-ebrowse.el, semantic/grammar.el:
* semantic/sb.el, semantic/bovine/grammar.el, semantic/wisent/comp.el:
* semantic/wisent/grammar.el, semantic/wisent/wisent.el:
* srecode/fields.el: Set generated-autoload-load-name.

* cus-dep.el (custom-make-dependencies): Only use safe local variables.
Treat cc-provide like provide.

Use generated-autoload-load-name for cus-load.el.

* lisp/cus-dep.el (custom-make-dependencies):
Use generated-autoload-load-name for the sake of files such
such cedet/semantic/bovine/c.el, where the base file name
is not in load-path.

Fixes: debbugs:5277

Make some files provide features

* dos-vars.el, emacs-lisp/cl-indent.el, emulation/tpu-extras.el:
Provide features.

* progmodes/octave.el (octave-indent-comment): Improve.
(octave-eldoc-message-style, octave-eldoc-cache): New variables.
(octave-eldoc-function-signatures, octave-eldoc-function): New
functions.
(octave-mode, inferior-octave-mode): Add eldoc support.

* epa.el (epa-decrypt-file): Take output file name as argument
and read it using `interactive'.

* progmodes/octave.el (octave-begin-keywords, octave-end-keywords)
(octave-reserved-words, octave-smie-bnf-table)
(octave-smie-rules): Add new keywords from Octave 3.6.4.

* progmodes/octave.el (octave-indent-comment): New function.
(octave-mode): Use it in smie-indent-functions.

Fixes: debbugs:14350

* progmodes/octave.el (octave-beginning-of-line)
(octave-end-of-line): Check before using up-list because it jumps
out of more syntactic contructs since moving to smie.

More cus-test.el tweaks

* admin/cus-test.el (cus-test-libs-noloads): Add a few more files.
(cus-test-load-libs, cus-test-opts):
Add option to load more/all Lisp files.
(cus-test-get-lisp-files): Ignore .*.el files.

Fix some declarations

* lisp/faces.el (internal-face-x-get-resource):
* lisp/frame.el (ns-display-monitor-attributes-list):
* lisp/calc/calc-aent.el (math-to-radians-2):
* lisp/cedet/ede/locate.el (cedet-cscope-version-check)
(cedet-cscope-support-for-directory):
* lisp/cedet/semantic/grammar.el (semantic-grammar-wy--install-parser):
* lisp/emacs-lisp/package.el (tar-header-name, tar-header-link-type):
Fix declarations.

Make a few libraries loadable in isolation

* lisp/calc/calc-menu.el: Make it loadable in isolation.

* lisp/gnus/gnus-vm.el: Make it loadable without VM.
(gnus-vm-make-folder, gnus-summary-save-in-vm): Require 'vm.
(vm-forward-message, vm-reply, vm-mail): Remove unused autoloads.

* lisp/net/eudcb-bbdb.el: Make it loadable without bbdb.
(eudc-bbdb-filter-non-matching-record, eudc-bbdb-extract-phones)
(eudc-bbdb-extract-addresses, eudc-bbdb-format-record-as-result)
(eudc-bbdb-query-internal): Require 'bbdb.

More custom :type fixes

* lisp/lpr.el (lpr-headers-switches):
* lisp/emacs-lisp/testcover.el (testcover-compose-functions):
* lisp/cedet/ede/project-am.el (project-am-compile-project-command): Fix :type.

* lisp/progmodes/sql.el (sql-login-params): Fix and improve :type.

* lisp/emulation/edt-mapper.el: In batch mode, error rather than hang.

* lisp/term.el (term-set-escape-char): Make it idempotent.

Auto-commit of loaddefs files.

Auto-commit of generated files.

Add option for cus-test.el to load all Lisp files

* admin/cus-test.el (cus-test-libs-noloads): Add some files.
(cus-test-get-lisp-files): New function.
(cus-test-libs): Add option to load more/all Lisp files.

* progmodes/octave.el (inferior-octave-completion-table): No
longer a function and all uses changed.  Use cache to speed up
completion due to bug#11906.
(octave-beginning-of-defun): Re-write to be more general.

* lisp/emacs-lisp/cl-macs.el (cl-loop): Doc fix.

* src/doc.c (get_doc_string): Slightly relax the sanity checking.
* src/lread.c (skip_dyn_eof): New function.
(read1): Use it to skip the end of a file in response to #@00.

* lisp/comint.el (comint-redirect-send-command-to-process): Use :around
rather than :override for comint-redirect-filter.
(comint-redirect-filter): Add the corresponding `orig-filter' argument.
Call it instead of comint-redirect-original-filter-function (which
is gone).  Reported by Juanma Barranquero <lekktu@gmail.com>.

X-Debbugs-CC clarifications

Implement display-monitor-attributes-list for NS.

* lisp/frame.el (display-monitor-attributes-list): Add NS case.
(ns-display-monitor-attributes-list): Declare.

* src/nsfns.m: Include IOGraphicsLib.h if Cocoa.
(Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Declare.
(MonitorInfo): New struct.
(free_monitors, ns_screen_name, ns_make_monitor_attribute_list)
(Fns_display_monitor_attributes_list): New functions.
(display-usable-bounds): Remove.
(syms_of_nsfns): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes and
Qsource.

* xterm.h (GTK_PREREQ): Remove, replacing with GTK_CHECK_VERSION.

(GTK_CHECK_VERSION): New macro, if not already defined.
All uses of GTK_PREREQ, GTK_MAJOR_VERSION, etc.
replaced by GTK_CHECK_VERSION.

* lisp/gnus/mml1991.el: Make it loadable.

* lisp/gnus/mml2015.el: Comment.

Fixes: debbugs:13456

admin/cus-test,el misc updates

Mainly for some files listed in loaddefs.el now being in subdirs that
are not in load-path.

* admin/cus-test.el (cus-test-libs-noloads): Add dunnet in the defvar.
(dunnet): Don't always load it.
(viper-mode): Only set if interactive.
(cus-test-load-custom-loads): Load dunnet if necessary.
(cus-test-load-1): New macro, with common code from cus-test-load-libs
and cus-test-libs.
(cus-test-load-libs, cus-test-libs): Use cus-test-load-1 macro.
Update for cus-test-get-autoload-deps changed result.
(cus-test-get-autoload-deps): Simplify.  Return file names as they
appear in loaddefs.el (directory parts are needed now that not all
lisp subdirs are in load-path).
(cus-test-deps): Explicitly skip dunnet.

* admin/cus-test.el: No need to provide bbdb, bbdb-com any more.
Remove some outdated comments.

Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org

* fontset.el (vertical-centering-font-regexp): Set standard-value.

* lisp/tar-mode.el (tar-superior-buffer, tar-superior-descriptor): Add doc.

Fix a bunch of custom types (thank you cus-test.el)

* lisp/bookmark.el (bookmark-search-delay):
* lisp/cus-start.el (vertical-centering-font-regexp):
* lisp/ps-mule.el (ps-mule-font-info-database-default):
* lisp/ps-print.el (ps-default-fg, ps-default-bg):
* lisp/type-break.el (type-break-good-break-interval):
* lisp/whitespace.el (whitespace-indentation-regexp)
(whitespace-space-after-tab-regexp):
* lisp/emacs-lisp/testcover.el (testcover-1value-functions)
(testcover-noreturn-functions, testcover-progn-functions)
(testcover-prog1-functions):
* lisp/emulation/viper-init.el (viper-emacs-state-cursor-color):
* lisp/erc/erc-desktop-notifications.el (erc-notifications-icon):
* lisp/eshell/em-glob.el (eshell-glob-translate-alist):
* lisp/gnus/gnus-art.el (gnus-article-date-headers, gnus-blocked-images):
* lisp/gnus/gnus-async.el (gnus-async-post-fetch-function):
* lisp/gnus/gnus-gravatar.el (gnus-gravatar-size, gnus-gravatar-properties):
* lisp/gnus/gnus-html.el (gnus-html-image-cache-ttl):
* lisp/gnus/gnus-notifications.el (gnus-notifications-timeout):
* lisp/gnus/gnus-picon.el (gnus-picon-properties):
* lisp/gnus/gnus-util.el (gnus-completion-styles):
* lisp/gnus/gnus.el (gnus-other-frame-resume-function):
* lisp/gnus/message.el (message-user-organization-file)
(message-cite-reply-position):
* lisp/gnus/nnir.el (nnir-summary-line-format)
(nnir-retrieve-headers-override-function):
* lisp/gnus/shr-color.el (shr-color-visible-luminance-min):
* lisp/gnus/shr.el (shr-blocked-images):
* lisp/gnus/spam-report.el (spam-report-resend-to):
* lisp/gnus/spam.el (spam-summary-exit-behavior):
* lisp/mh-e/mh-e.el (mh-sortm-args, mh-default-folder-for-message-function):
* lisp/play/tetris.el (tetris-tty-colors):
* lisp/progmodes/cpp.el (cpp-face-default-list):
* lisp/progmodes/flymake.el (flymake-allowed-file-name-masks):
* lisp/progmodes/idlw-help.el (idlwave-help-browser-generic-program)
(idlwave-help-browser-generic-args):
* lisp/progmodes/make-mode.el (makefile-special-targets-list):
* lisp/progmodes/python.el (python-shell-virtualenv-path):
* lisp/progmodes/verilog-mode.el (verilog-active-low-regexp)
(verilog-auto-input-ignore-regexp, verilog-auto-inout-ignore-regexp)
(verilog-auto-output-ignore-regexp, verilog-auto-tieoff-ignore-regexp)
(verilog-auto-unused-ignore-regexp, verilog-typedef-regexp):
* lisp/textmodes/reftex-vars.el (reftex-format-label-function):
* lisp/textmodes/remember.el (remember-diary-file):
Fix custom types.

* lisp/cedet/semantic/db-find.el (semanticdb-find-throttle-custom-list):
Fix value.

* lisp/gnus/gnus-salt.el (gnus-selected-tree-face): Fix default.

* lisp/jka-cmpr-hook.el (jka-compr-mode-alist-additions): Fix typo.
Add :version.

* progmodes/octave.el (inferior-octave-completion-at-point):
Restore the broken file completion.
(inferior-octave-startup): Fix incorrect highlighting for the
first prompt.

Fixes: debbugs:14300

* xterm.h (GTK_PREREQ): New macro.

All simple uses of GTK_MAJOR_VERSION and GTK_MINOR_VERSION changed
to use this macro instead, for consistency and clarity.

* lisp/progmodes/ruby-mode.el: First cut at SMIE support.
(ruby-use-smie): New var.
(ruby-smie-grammar): New constant.
(ruby-smie--bosp, ruby-smie--implicit-semi-p)
(ruby-smie--forward-token, ruby-smie--backward-token)
(ruby-smie-rules): New functions.
(ruby-mode-variables): Setup SMIE if applicable.
* test/indent/ruby.rb: Fix indentation after =; add more cases.

Avoid beginning/end of buffer errors when moving across display strings.

 lisp/simple.el (line-move-visual): Signal beginning/end of buffer
 only if vertical-motion moved less than it was requested.  Avoids
 silly incorrect error messages when there are display strings with
 multiple newlines at EOL.

Fix vertical cursor motion when there's a display string with newline at EOL.

 src/xdisp.c (row_for_charpos_p): New function, with code of
 cursor_row_p, but accepts an additional argument CHARPOS instead
 of using a hardcoded PT.
 (cursor_row_p): Call row_for_charpos_p with 2nd argument PT.
 (row_containing_pos): Call row_for_charpos_p instead of partially
 doing the same.  Fixes cursor positioning under longlines-mode
 when longlines-show-effect includes more than one newline, when
 moving the cursor vertically up.

* lisp/progmodes/f90.el (f90-mode-syntax-table): Use symbol syntax for "_".
Change all regexps to use things like \_< and \_>.

* lisp/progmodes/ada-mode.el (ada-mode-abbrev-table): Consolidate declaration.
(ada-mode-syntax-table, ada-mode-symbol-syntax-table): Initialize in
the declaration.
(ada-create-syntax-table): Remove.
(ada-capitalize-word): Don't mess with the syntax of "_" since it
already has the right syntax nowadays.
(ada-goto-next-word): Don't change the syntax of "_".

* lisp/progmodes/autoconf.el (autoconf-definition-regexp)
(autoconf-font-lock-keywords, autoconf-current-defun-function):
Handle a _ with symbol syntax.
(autoconf-mode): Don't change the syntax-table for imenu and font-lock.

* lisp/progmodes/vera-mode.el (vera-underscore-is-part-of-word):
* lisp/progmodes/prolog.el (prolog-underscore-wordchar-flag)
(prolog-char-quote-workaround):
* lisp/progmodes/cperl-mode.el (cperl-under-as-char):
* lisp/progmodes/vhdl-mode.el (vhdl-underscore-is-part-of-word):
 Mark as obsolete.
 (vhdl-mode-syntax-table, vhdl-mode-ext-syntax-table): Initialize in
their declaration.
(vhdl-mode-syntax-table-init): Remove.

* lisp/progmodes/ld-script.el (ld-script-mode-syntax-table): Use symbol
syntax for "_".
(ld-script-font-lock-keywords):
Change regexps to use things like \_< and \_>.

* lisp/progmodes/m4-mode.el (m4-mode-syntax-table): Add comment on last change.

* lisp/font-lock.el (lisp-font-lock-keywords-2): Don't highlight obsolete
with-wrapper-hook.

* lisp/mh-e/mh-comp.el (mh-regexp-in-field-p): Minor simplification.

lib/makefile.w32-in (ACL_H): New macro.
($(BLD)/acl-errno-valid.$(O)): Update dependencies.

src/makefile.w32-in (ACL_H): New macro.
($(BLD)/fileio.$(O)): Update dependencies.

* lisp/thingatpt.el (thing-at-point): Accept optional second argument
NO-PROPERTIES to strip the text properties from the return value.
* lisp/net/browse-url.el (browse-url-url-at-point): Pass NO-PROPERTIES
to `thing-at-point' instead of stripping the properties ourselves.
Also, when `thing-at-point' fails to find a url, prepend "http://"
to the filename at point on the assumption that the user is
pointing at something like gnu.org/gnu.

Silence byte-compiler warnings.

* lisp/emacs-lisp/bytecomp.el (byte-compile-insert-header):
* lisp/faces.el (crm-separator): Silence byte-compiler.
* lisp/progmodes/gud.el (gdb-speedbar-auto-raise, gud-tooltip-mode)
  (tool-bar-map): Remove unneeded defvars.

nt/config.nt: Sync with autogen/config.in.

Re-work a fix for bug#10994 based on Le Wang's patch.
* ido.el (ido-remove-consecutive-dups): New helper.
(ido-completing-read): Use it.
(ido-chop): Revert fix for bug#10994.

Auto-commit of generated files.

* lisp/cus-edit.el (custom-save-variables): Pretty-print long values.

Fixes: debbugs:14187

m4-mode misc small cleanup

* lisp/progmodes/m4-mode.el (m4-program): Assume it is in PATH.
(m4-mode-syntax-table): Init in the defvar.
(m4-mode-abbrev-table): Let define-derived-mode define it.

* lisp/progmodes/m4-mode.el (m4-mode-syntax-table):
Do not treat "_" as word constituent.

Fixes: debbugs:14167

* lisp/descr-text.el (describe-char): Fix %d/%x typo.

Fixes: debbugs:14360

Fix some doc/emacs typos

* doc/emacs/sending.texi (Mail Sending): Fix typo.

* doc/emacs/windows.texi (Change Window): Fix typo.

Use Gnulib ACL implementation, for benefit of Solaris etc.

* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs.  --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove.  All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.

Fixes: debbugs:14295

Comment fix, to match Gnulib upstream copy.

* unexelf.c: Don't assume ElfW (Half) fits in int.

(entry_address, find_section, unexec): Use ptrdiff_t, not int,
when dealing with ElfW (Half) values, since they can exceed 2**31
on 64-bit OpenBSD hosts.  Problem reported privately by Han Boetes.
(entry_address): Omit unused NUM arg.  All uses changed.

* src/callint.c (Fcall_interactively): Set `visargs[i]' for code 'n'
to the string converted from number with `Fnumber_to_string'.

Fixes: debbugs:14254

* xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4.

This fixes a problem introduced by my previous change.

* src/lread.c (readchar): Don't read from a dead buffer.  (Bug#14280)

* lisp/progmodes/perl-mode.el (perl-prettify-symbols): Add :version.

* xfns.c: Move misplaced ifndef USE_GTK from previous checkin.

* buffer.c (tab-width): Mention that it doesn't control indentation.

* callint.c (Fcall_interactively): Explain what is `visargs'.

gnus-art.el (gnus-article-describe-bindings): Add a comment

lisp/gnus/ChangeLog: Revert last bogus change

lisp/gnus/ChangeLog: Remove `(Bug#14356)' in the 2013-05-07 entry

Auto-commit of generated files.

* lisp/eshell/em-hist.el (eshell-isearch-map): Initialize in the defvar.
Remove explicit eshell-isearch-cancel-map.