Merge remote-tracking branch 'origin/trunk' into xwidget

idlwave-concatenate-rinfo-lists fix

* progmodes/idlwave.el (idlwave-concatenate-rinfo-lists):
Handle idlwave-last-system-routine-info-cons-cell being nil.

This seems to prevent an error on typing `C-c TAB',
idlwave-update-routine-info, in an idlwave buffer.

* lisp/emacs-lisp/smie.el (smie-highlight-matching-block): Always turn
off the highlight first.

* lisp/progmodes/octave.el (octave-indent-comment): Tweak regexps.
(octave-help): Small simplification.

* test/indent/octave.m: Tweak.

* idlwave.el (idlwave-scan-user-lib-files, idlwave-write-paths): Simplify
via with-temp-buffer.

Silence cua-mode compilation

* emulation/cua-gmrk.el: Also load cua-base, cua-rect at run time.
* emulation/cua-rect.el: Also load cua-base at run time.

Silence cperl-mode compilation

* progmodes/cperl-mode.el (imenu-choose-buffer-index)
(file-of-tag, etags-snarf-tag, etags-goto-tag-location): Declare.
(cperl-imenu-on-info): Require imenu.

Silence some gnus compilation warnings

* gnus/gnus-ems.el (set-process-plist): Every supported Emacs has this.

* gnus/gnus-group.el (gnus-sequence-of-unread-articles)
(gnus-summary-add-mark, gnus-mark-article-as-read)
(gnus-group-make-articles-read): Declare.

* gnus/gnus-sum.el (gnus-parameter-list-identifier)
(gnus-article-stop-animations, gnus-stop-downloads)
(gnus-article-only-boring-p, article-goto-body)
(gnus-flush-original-article-buffer, article-narrow-to-head)
(gnus-article-hidden-text-p, gnus-delete-wash-type)
(gnus-summary-save-in-pipe, gnus-article-show-summary): Declare.

* gnus/gnus.el: No need to eval-and-compile autoloads.

* gnus/gravatar.el (help-function-arglist): Autoload.

* gnus/nnimap.el (gnus-refer-thread-use-nnir): Declare.

* gnus/nnmail.el (nnmail-fancy-expiry-target): Maybe use mail-dont-reply-to.

* gnus/spam.el: No need to load spam-report when compiling.
No need to eval-and-compile autoloads.
(spam-report-resend-to): Declare.
(spam-report-resend-register-routine): Require 'spam-report.

* src/fileio.c (Finsert_file_contents): Preserve undo info when reverting
a buffer.

Fixes: debbugs:8447

* doc/lispref/functions.texi (Lambda Expressions): Lambda expressions don't
evaluate to themselves in general.

Fixes: debbugs:11782

upstream

Handle "capitalised keywords" correctly.
        * progmodes/cc-mode.el (c-after-change): bind case-fold-search to
        nil.

Added -r option to eshell/cp

Silence the rest of vc compilation

* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.

* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.

* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.

* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.

Commit file missing from previous change

* obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert): Autoload.
(vc-resynch-buffer): Declare.

Silence some vc compilation warnings

* lisp/vc/vc-arch.el (vc-exec-after): Declare.
(vc-switches): Autoload.

* lisp/vc/vc-bzr.el: No need to require vc when compiling.
(vc-exec-after, vc-set-async-update, vc-default-dir-printer)
(vc-resynch-buffer, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches): Autoload.

* lisp/vc/vc-dir.el (desktop-missing-file-warning): Declare.

* lisp/vc/vc-mtn.el (vc-exec-after): Declare.
(vc-switches): Autoload.

* lisp/vc/vc-rcs.el (vc-expand-dirs, vc-switches)
(vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
(vc-file-tree-walk): Declare.

* lisp/vc/vc-svn.el (vc-exec-after): Declare.
(vc-switches, vc-setup-buffer): Autoload.

* lisp/obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):
Autoload.
(vc-resynch-buffer): Declare.

* obsolete/fast-lock.el (byte-compile-warnings):
Don't warn about obsolete features in this obsolete file.

* cc-vars.el (c-macro-names-with-semicolon): Move definition before use.

dunnet.el trivia

* play/dunnet.el (byte-compile-warnings): Don't disable them all.
(dun-unix-verbs): Remove dun-zippy.
(dun-zippy): Remove function.

* lisp/emacs-lisp/bytecomp.el (byte-compile-warnings): Doc fix.

Add comment for last change.

* erc.texi (Special Features): ERC is being maintained within Emacs
now.  (See
http://lists.gnu.org/archive/html/erc-discuss/2012-10/msg00000.html)

* lisp/replace.el (replace-search): New function with code moved out
from `perform-replace'.
(replace-highlight, replace-dehighlight): Move function definitions
up closer to `replace-search'.

Fixes: debbugs:11746

* lisp/vc/vc-git.el (vc-git-working-revision): When in detached mode,
return the commit hash.  Also set the `vc-git-detached' property.
(vc-git--rev-parse): Extract from `vc-git-previous-revision'.
(vc-git-mode-line-string): Use the same help-echo format whether in
detached mode or not, because we know the actual revision now.  When
in detached mode, shorten the revision to 7 chars.

Fixes: debbugs:14459

* lisp/replace.el (perform-replace): Ignore invisible matches.
In addition to checking `query-replace-skip-read-only', also
filter out matches by calling `run-hook-with-args-until-failure'
on `isearch-filter-predicates', and also check `search-invisible'
for t or call `isearch-range-invisible'.
(replace-dehighlight): Call `isearch-clean-overlays'.

Fixes: debbugs:11746

* lisp/isearch.el (isearch-filter-predicates): Rename from `isearch-filter-predicate'.
Doc fix.
(isearch-message-prefix): Display text from the property
`isearch-message-prefix' of the currently active filters.
(isearch-search): Don't compare `isearch-filter-predicate' with
`isearch-filter-visible'.  Call `run-hook-with-args-until-failure'
on `isearch-filter-predicates'.  Also check `search-invisible' for t
or call `isearch-range-invisible'.
(isearch-filter-visible): Make obsolete.
(isearch-lazy-highlight-search):
Call `run-hook-with-args-until-failure' on
`isearch-filter-predicates' and use `isearch-range-invisible'.

* lisp/info.el (Info-search): Call `run-hook-with-args-until-failure' on
`isearch-filter-predicates' instead of `funcall'ing
`isearch-filter-predicate'.
(Info-mode): Set `Info-isearch-filter' to
`isearch-filter-predicates' instead of `isearch-filter-predicate'.

* lisp/dired-aux.el (dired-isearch-filter-predicate-orig): Remove variable.
(dired-isearch-filenames-toggle, dired-isearch-filenames-setup)
(dired-isearch-filenames-end): Add and remove
`dired-isearch-filter-filenames' in `isearch-filter-predicates'
instead of changing the value of `isearch-filter-predicate'.
Rebind `dired-isearch-filenames-toggle' from "\M-sf" to "\M-sff".
(dired-isearch-filter-filenames): Don't use `isearch-filter-visible'.
Put property `isearch-message-prefix' to "filename " on
`dired-isearch-filter-filenames'.

* lisp/wdired.el (wdired-change-to-wdired-mode):
Add `isearch-filter-predicates' to `wdired-isearch-filter-read-only'
locally instead of changing `isearch-filter-predicate'.
(wdired-isearch-filter-read-only): Don't use `isearch-filter-visible'.

Fixes: debbugs:11378

Merge remote-tracking branch 'origin/trunk' into xwidget

Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in

Fix bug #14476 with posn-at-point and glyphs from display vector.

 src/xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
 display vector, and we backtrack, handle the case that the
 previous character position is also displayed from a display
 vector or covered by a display string or image.

Restore an omitted bug reference.

Always defvar a mode's hook and provide a docstring.
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
* lisp/emacs-lisp/derived.el (define-derived-mode): Always defvar the
mode hook and provide a docstring.

Remove spurious syntax-table text properties inserted by C-y.
        * progmodes/cc-mode.el (c-after-change): Also clear hard
        syntax-table property with value nil.

* net/dbus.el (dbus-call-method): Let-bind `inhibit-redisplay'
when reading the events; the buffer layout shall not be changed.

Auto-commit of generated files.

* progmodes/octave.el (inferior-octave-directory-tracker-resync):
New variable.
(inferior-octave-directory-tracker): Automatically re-sync
default-directory.
(octave-help): Improve handling of 'See also'.

* configure.ac (HAVE_XRANDR): Check availability of XRRGetScreenResources rather than that of XRRQueryExtension.

* lisp/doc-view.el: Minor naming convention tweaks.
(desktop-buffer-mode-handlers): Don't add to it repeatedly.

* lisp/image-mode.el (image-mode-reapply-winprops): Call image-mode-winprops
even if there's no `display' property yet.

Fixes: debbugs:14435

Rewrite Eshell tests using ERT

Rename unmsys--filename to unmsys--file-name.

Factor out common code for multimonitors, for Gtk+, non-Gtk+ X11 and NS.

* frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): New
Lisp_Object:s.
(free_monitors, make_monitor_attribute_list): New functions.
(syms_of_frame): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes,
Qsource.

* frame.h (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Declare.
(struct MonitorInfo): New struct.
(free_monitors, make_monitor_attribute_list): Declare.

* nsfns.m (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Remove.
(struct MonitorInfo, free_monitors): Remove.
(ns_screen_name): Make static.
(ns_make_monitor_attribute_list): Call make_monitor_attribute_list.
(syms_of_nsfns): Remove DEFSYM for Qgeometry, Qworkarea, Qmm_size,
Qframes, Qsource.

* xfns.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Remove.
(struct MonitorInfo, free_monitors): Remove.
(x_make_monitor_attribute_list): Call make_monitor_attribute_list.
(Fx_display_monitor_attributes_list): Call make_monitor_attribute_list.
(syms_of_xfns): Remove DEFSYM for Qgeometry, Qworkarea, Qmm_size,
Qframes, Qsource.

Fix a typo in the last commit.

Explain in nt/INSTALL.MSYS why --prefix should be used with Windows builds.

Rename reveal-filename into unmsys--filename.

 lisp/subr.el (unmsys--filename): Renamed from reveal-filename.
 lisp/Makefile.in (custom-deps, finder-data, autoloads)
 ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el)
 ($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el)
 ($(CAL_DIR)/hol-loaddefs.el): All users changed.

 leim/Makefile.in (leim-list.el, check-declare): Replace
 reveal-filename with unmsys--filename.

* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't burp at EOB.

Fixes: debbugs:14446

* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
error-completion on the first 2 args of condition-case.

Fixes: debbugs:14446

* comint.el (comint-previous-matching-input): Do not flood the
*Messages* buffer with trivial messages.

* lisp/simple.el (read--expression): New function, extracted from
eval-expression.  Set completion-at-point-functions.
(eval-expression, eval-minibuffer): Use it.

* lisp/progmodes/flymake.el (flymake-nop): Don't return a string.
(flymake-set-at): Fix typo.

Fixes: debbugs:14465

* refcards/refcard.tex: Refine some entries.  (Bug#14087)

* indent/octave.m: Add tests for %!, # and ### comments

* callproc.c (call_process): Refine the doc string.  (Bug#14045)

ChangeLog fix

* refcards/dired-ref.tex: Refine some entries.

Refine the documentation of Flymake

* progmodes/flymake.el (flymake-save-buffer-in-file)
(flymake-makehash, flymake-posn-at-point-as-event, flymake-nop)
(flymake-selected-frame, flymake-log, flymake-ins-after)
(flymake-set-at, flymake-get-buildfile-from-cache)
(flymake-add-buildfile-to-cache, flymake-clear-buildfile-cache)
(flymake-find-possible-master-files, flymake-save-buffer-in-file):
Refine the doc string.
(flymake-get-file-name-mode-and-masks): Reformat.
(flymake-get-real-file-name-function): Fix a minor bug.

* flymake.texi: Changing from one space between sentences to two.

* lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Support =linenumber=
format used by git-grep for lines with function names.

Fixes: debbugs:13549

* lisp/emacs-lisp/smie.el (smie-auto-fill): Rework to be more robust.
(smie-setup): Use add-function to set it.

* lisp/progmodes/octave.el (octave-smie-rules): Return nil rather than
0 after a semi-colon; it works better for smie-auto-fill.
(octave--indent-new-comment-line): New function.
(octave-indent-new-comment-line): Use it (indirectly).
(octave-mode): Don't disable smie-auto-fill.  Use add-function to
modify comment-line-break-function.

* lisp/sort.el (delete-duplicate-lines): Accept an optional `keep-blanks'
argument (before the `interactive' argument).

* lisp/image-mode.el (image-mode-winprops): Add winprops to
image-mode-winprops-alist before running image-mode-new-window-functions.
* lisp/doc-view.el (doc-view-new-window-function): Don't delay
doc-view-goto-page via timers.

Fixes: debbugs:14435

lisp/gnus/sieve.el (sieve-setup-buffer): Fix default port value in sieve buffer setup

ChangeLog for the previous commit

* themes/leuven-theme.el: Update theme.

* doc-view.el: Integrate with desktop.el.  (Bug#14435)
(doc-view-desktop-save-buffer): New function.
(doc-view-restore-desktop-buffer): New function.
(desktop-buffer-mode-handlers): Add
`doc-view-restore-desktop-buffer' as desktop.el buffer mode
handler.
(doc-view-mode): Set `doc-view-desktop-save-buffer' as custom
`desktop-save-buffer' function.

xesam.el is obsolete.

* net/xesam.el: Move to obsolete/.

* net/tramp-gvfs.el (tramp-gvfs-enabled): New defconst.
(tramp-gvfs-file-name-handler): Raise a user error when
`tramp-gvfs-enabled' is nil.
(top): Register signals only when `tramp-gvfs-enabled' is non-nil.
Do not raise a user error when loading package.  (Bug#14447)

Silence some cedet compilation warnings

* cedet/semantic/bovine/c-by.el (semantic-parse-region):
* cedet/semantic/wisent/javat-wy.el (semantic-parse-region):
* cedet/semantic/wisent/js-wy.el (semantic-parse-region):
* cedet/semantic/wisent/python-wy.el (semantic-parse-region): Declare.

* cedet/semantic/bovine/grammar.el (bovine-make-parsers):
Avoid free variable `copyright-end'.

* font-lock.el (lisp-font-lock-keywords-2): Add with-coding-priority.

* emacs-lisp/chart.el (chart-sort): Replace obsolete `object-name'.

Silence some cperl-mode compiler warnings

* progmodes/cperl-mode.el (cperl-mode): Use fboundp.
(Info-find-node, Man-getpage-in-background): Declare.

* mail/unrmail.el (unrmail): Replace obsolete detect-coding-with-priority.

socks.el small cleanup

* lisp/net/socks.el (socks-split-string): Use this rather than split-string.
(socks-nslookup-host): Update for above change.
(dynamic-choice, s5-dynamic-choice-match)
(s5-dynamic-choice-match-inline, s5-widget-value-create):
Comment out unused code.

Comment out other unused code in a more standard manner, with ";"
rather than "'".

Gud tooltip tweak

* tooltip.el (tooltip-use-echo-area): Warn only on 'set.
* progmodes/gud.el (gud-gdb-completion-function): Move before use.
(gud-tooltip-echo-area): Make obsolete.
(gud-tooltip-process-output, gud-tooltip-tips): Also check tooltip-mode.

* lisp/progmodes/js.el (js--optimize-arglist): Declare.

* progmodes/ruby-mode.el (ruby-syntax-propertize-expansion): Declare.

* which-func.el (ediff-window-A, ediff-window-B, (ediff-window-C): Declare.

* pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el: Tweak requires to silence compiler.

Silence sym-comp compilation

* obsolete/sym-comp.el: No need to load hipper-exp when compiling.
(he-search-string, he-tried-table, he-expand-list)
(he-init-string, he-string-member, he-substitute-string)
(he-reset-string): Declare.

* options.el (list-options): Use custom-variable-p, rather than obsolete alias.

* simple.el (shell-command-on-region): Pass the `replace' argument
down to `call-process-region' to comply with he doc as reported on
<http://stackoverflow.com/questions/16720458/emacs-noninteractive-call-to-shell-command-on-region-always-deletes-region>

src/keyboard.c (read_decoded_event_from_main_queue): Improve commentary
 about the w32 console reading non-ASCII characters.

* lisp/emacs-lisp/smie.el (smie-indent-forward-token)
(smie-indent-backward-token): Handle string tokens.

Fixes: debbugs:14381

Don't apply keyboard decoding to unread-command-events.
* src/keyboard.c: Apply keyboard decoding only to events that come directly
from the tty, not from unread-command-events (bug#14368).
(read_event_from_main_queue): New function, extracted from read_char).
(read_decoded_char): Remove.
(read_decoded_event_from_main_queue): New function to replace it.
(read_char): Use it.
(read_key_sequence): Use read_char rather than read_decoded_char.

Fixes: debbugs:14403

* lisp/ielm.el (ielm-menu): New menu.
(inferior-emacs-lisp-mode): Set comment-start.

* lisp/textmodes/reftex.el (reftex-ref-style-toggle): Fix deactivate
  action.

* lisp/textmodes/reftex-vars.el (reftex-ref-style-alist): Add cleveref
  macros.

* lisp/textmodes/reftex-parse.el (reftex-locate-bibliography-files):
  Accept options for bibliography commands.
* lisp/textmodes/reftex-vars.el (reftex-bibliography-commands): Add
  addbibresource.  Basic Biblatex support.

* src/keyboard.c (read_decoded_char): Don't decode under w32.

Fixes: debbugs:14403

merge trunk

test/automated/decoder-tests.el: New file

* net/tramp-gvfs.el (top):
* net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
when loading package.  (Bug#14447)

Silence em-ls compilation

* lisp/eshell/em-ls.el: Adjust requires.
(eshell-glob-regexp): Declare.

Silence gnus-util compilation

* lisp/gnus/gnus-util.el (rmail-swap-buffers-maybe)
(rmail-maybe-set-message-counters, rmail-count-new-messages)
(rmail-summary-exists, rmail-show-message, rmail-summary-displayed)
(rmail-pop-to-buffer, rmail-maybe-display-summary): Declare.

Fix declaration typo

Silence some js compilation warnings

* lisp/progmodes/js.el: No need to load comint when compiling.
(ring-insert, comint-send-string, comint-send-input)
(comint-last-input-end, ido-chop): Declare.

Silence ediff compilation

* lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time.

* lisp/vc/ediff-mult.el: Adjust requires.
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-patch-file-internal): Declare.

* lisp/vc/ediff-ptch.el: Adjust requires.
(ediff-use-last-dir, ediff-buffers-internal): Declare.
(ediff-find-file): Autoload.

* lisp/vc/ediff-util.el: No need to load ediff when compiling.
(ediff-regions-internal): Declare.

* lisp/vc/ediff-wind.el: Adjust requires.
(ediff-compute-toolbar-width): Define when compiling.
(ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare.

* lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling.
(dired-get-filename, dired-get-marked-files)
(ediff-last-dir-patch, ediff-patch-default-directory)
(ediff-get-patch-buffer, ediff-dispatch-file-patching-job)
(ediff-patch-buffer-internal): Declare.

Silence some gnus compilation warnings

* gnus/mm-decode.el: No need to load term when compiling.
(term-mode, term-char-mode): Declare.

* gnus/mm-util.el: No need to load jka-compr when compiling.
(jka-compr-acceptable-retval-list, jka-compr-make-temp-name): Declare.

* gnus/nnmaildir.el: Require is automatically eval-and-compile.
(nnmail): Require at run-time too.

* gnus/registry.el (registry-size): Move definition before use.

Silence checkdoc.el compilation

* lisp/emacs-lisp/checkdoc.el: No need to load ispell when compiling.
(ispell-process, ispell-buffer-local-words, lm-summary)
(lm-section-start, lm-section-end): Declare.
(checkdoc-ispell-init): Simplify.

Silence vera-mode compilation

* lisp/progmodes/vera-mode.el (he-init-string, he-dabbrev-beg)
(he-string-member, he-reset-string, he-substitute-string): Declare.

* lisp/url/url.el (mm-dissect-buffer, mm-display-part): Declare.

Silence many eshell compilation warnings

* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.

* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.

* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.

* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.

* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.

* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.

* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.

* lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling.

lisp/gnus/gnus-spec.el (gnus-parse-complex-format): Try to maximize compatibility