lisp/gnus/mml-smime.el: Add mml-smime-encrypt-to-self

* mml-smime.el (mml-smime-encrypt-to-self): New user option analogous
to mml2015-encrypt-to-self.
(mml-smime-epg-encrypt): Respect mml-smime-encrypt-to-self.

emacsclient -t should not suspend Emacs server

* lisp.h, sysdep.c (block_tty_out_signal, unblock_tty_out_signal):
New functions.
* term.c (init_tty): Use them instead of rolling our own code.
* sysdep.c (tcsetpgrp_without_stopping): Likewise.  Here, this
switches from 'signal' to 'pthread_sigmask', which is safer in
multithreaded applications.
* term.c (Fresume_tty): Don't bother dissociating if O_IGNORE_CTTY,
which has already arranged for that.
(dissociate_if_controlling_tty): If setsid fails, fall back on TIOCNOTTY.
This is the main part of the bug fix.

Fixes: debbugs:13387

* autorevert.el (auto-revert-notify-enabled): Move up.
(auto-revert-use-notify): New defcustom.
(auto-revert-mode, global-auto-revert-mode)
(auto-revert-notify-add-watch, auto-revert-handler)
(auto-revert-buffers): Use `auto-revert-use-notify' instead of
`auto-revert-notify-enabled'.

* gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around
x_last_font_name.

Fixes: debbugs:13403

* lisp/files.el (auto-mode-alist): Use doc-view for djvu files.
* lisp/doc-view.el (doc-view-document->bitmap):
Use doc-view-single-page-converter-function instead of
single-page-converter arg; adjust callers.

Fixes: debbugs:13164

* lisp/progmodes/which-func.el (which-function): Understand Semantic's use
of overlays in imenu--index-alist.

* lisp/man.el: Handle different "man -k" behaviors.  Use utf-8.
(Man-man-k-use-anchor): New var.
(Man-parse-man-k): New function.
(Man-completion-table): Use it.
(man): Flush the completion cache between uses.
* test/automated/man-tests.el: New file.

Fixes: debbugs:13160

* autorevert.el: Add file watch support.
(auto-revert-notify-enabled): New defconst.
(auto-revert-notify-watch-descriptor-hash-list)
(auto-revert-notify-watch-descriptor)
(auto-revert-notify-modified-p): New defvars.
(auto-revert-notify-rm-watch, auto-revert-notify-add-watch)
(auto-revert-notify-handler): New defuns.
(auto-revert-mode, global-auto-revert-mode): Remove file watches
when mode is disabled.
(auto-revert-handler): Check for `auto-revert-notify-modified-p'.
(auto-revert-buffers): Add file watches for active buffers.

Omit buffer_slot_type_mismatch and use generic predicates to enforce
the type of per-buffer values where appropriate.
* src/lisp.h (struct Lisp_Buffer_Objfwd): Rename slottype member to
predicate, which is how it's really used now.  Adjust comment.
* src/buffer.h (buffer_slot_type_mismatch): Remove prototype.
* src/buffer.c (buffer_slot_type_mismatch): Remove.
(DEFVAR_PER_BUFFER, defvar_per_buffer): Rename type argument to
predicate.  Adjust comment.
(syms_of_buffer): Use Qsymbolp for major-mode.  Use Qintegerp for
fill-column, left-margin, tab-width, buffer-saved-size,
left-margin-width, right-margin-width, left-fringe-width,
right-fringe-width, scroll-bar-width and buffer-display-count.
Use Qstringp for default-directory, buffer-file-name,
buffer-file-truename and buffer-auto-save-file-name.  Use Qfloatp for
scroll-up-aggressively and scroll-down-aggressively.  Use Qnumberp for
line-spacing.
* src/data.c (store_symval_forwarding): Adjust to call the predicate.
* lisp/cus-start.el (toplevel): Only allow float values for
scroll-up-aggressively and scroll-down-aggressively.
Allow any number for line-spacing.

* tramp.texi (Default Host): Introduce `tramp-default-host-alist'.

* lisp/doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name.
(doc-view-pdf->png-converter-function): Use mupdf if available.
(doc-view-djvu->png-converter-function)
(doc-view-ps->png-converter-function): Remove.
(doc-view--image-file-pattern): Replace doc-view--image-file-extension.
(doc-view-goto-page, doc-view-convert-current-doc, doc-view-display)
(doc-view-already-converted-p): Adjust accordingly.
(doc-view-mode-p): Simplify.
(doc-view-enlarge): Use setq-local.
(doc-view-pdf->png-converter-ghostscript)
(doc-view-djvu->png-converter-ddjvu)
(doc-view-pdf->png-converter-mupdf): Rework to call
doc-view-start-process directly.
(doc-view-pdf/ps->png): Simplify accordingly.
(doc-view-pdf->png-1, doc-view-djvu->png-1): Remove.
(doc-view-document->bitmap): Rename from doc-view-document->png.
(doc-view-convert-current-doc): Merge pdf and djvu cases.
(doc-view-set-slice-from-bounding-box): Fix completion table.
(doc-view-mode): Use add-hook for after-revert-hook.

Misc make-tarball updates

Merge from emacs-24

Bump version to 24.2.92
Regenerate etc/AUTHORS and lisp/ldefs-boot.el

* lisp/emacs-lisp/crm.el: Allow any regexp for separators.
(crm-default-separator): All spaces around the default comma separator.
(crm--completion-command): New macro.
(crm-completion-help, crm-complete, crm-complete-word): Use it.
(crm-complete-and-exit): Handle non-single-char separators.

ChangeLog fixes from M-x authors

authors.el tiny updates

* lisp/emacs-lisp/authors.el (authors-ignored-files)
(authors-valid-file-names, authors-renamed-files-alist):
Add some more entries.

Merge from gnulib.

* lisp/image-mode.el (image-mode-winprops): Don't throw away the fallback
`t' pseudo-window entry.

Fix bugs in the c-parse-state mechanism.  Reuse some markers instead of
continually generating new ones.

cc-engine.el (c-state-old-cpp-beg-marker, c-state-old-cpp-end-marker):
New variables.
(c-append-lower-brace-pair-to-state-cache): Start a backward search for
"}" definitively outside CPP constructs.
(c-remove-stale-state-cache): Inform the caller of a need to search back
for a brace pair in certain circumstances.
(c-state-maybe-marker): New macro.
(c-parse-state): Reuse markers when appropriate.

* test/automated/undo-tests.el (undo-test0): Adjust error to code change.

commands.texi small fix for bug#13393

* doc/lispref/commands.texi (Interactive Codes):
Whitespace does not terminate interactive "S".

* lisp/doc-view.el: Add support for DjVu.
(doc-view-djvu->png-converter-function): New config var.
(doc-view-single-page-converter-function, doc-view--image-type)
(doc-view--image-file-extension): New vars.
(doc-view-mode): Initialize them.
(doc-view-goto-page): Use them.
(doc-view-mode-p): Add support for ddjvu.
(doc-view-djvu->png-converter-ddjvu, doc-view-djvu->png-1)
(doc-view-set-up-single-converter): New funs.
(doc-view-pdf/ps->png): Extend for djvu.
(doc-view-document->png): Rename from doc-view-pdf->png.
(doc-view-convert-current-doc): Handle djvu.
(doc-view-insert-image, doc-view-display)
(doc-view-already-converted-p): Don't hardcode png.
(doc-view-set-doc-type): Recognize djvu docs.

Fixes: debbugs:13164

execute-extended-command prompt fix (bug#13395)

* lisp/simple.el (execute-extended-command): Doc fix.
Bind prefix-arg around read-extended-command, for prompt.

* lisp/doc-view.el: Add support for mupdf converter.
(doc-view-pdfdraw-program, doc-view-pdf->png-converter-function)
(doc-view-ps->png-converter-function): New config vars.
(doc-view-pdf->png-converter-ghostscript)
(doc-view-ps->png-converter-ghostscript)
(doc-view-pdf->png-converter-mupdf): New functions.
(doc-view-pdf/ps->png, doc-view-pdf->png-1): Use them.

Fixes: debbugs:13164

nt/config.nt: Sync with autogen/config.in.
(HAVE_GTK_HANDLE_BOX_NEW, HAVE_GTK_TEAROFF_MENU_ITEM_NEW): New macros.

src/w32.c, src/w32term.c: Remove unused local variables.

* insdel.c (make_gap_larger): Fix comment because gap_left doesn't
adjust markers.
(make_gap_smaller): Likewise for gap_right.

* lisp.h (make_gap_1): New prototype.
* buffer.h (GAP_BYTES_DFL, GAP_BYTES_MIN): New macros for the special
gap size values.
* editfns.c (Fbuffer_size): Rename from Fbufsize to fit the common
naming convention.
(syms_of_editfns): Adjust defsubr.  Drop commented-out obsolete code.
* insdel.c (make_gap_larger): Use GAP_BYTES_DFL.
(make_gap_smaller): Use GAP_BYTES_MIN.  Adjust comment.
(make_gap_1): New function to adjust the gap of any buffer.
* coding.c (coding_alloc_by_making_gap): Use it.
* buffer.c (compact_buffer): Likewise.  Use BUF_Z_BYTE, BUF_GAP_SIZE,
GAP_BYTES_DFL and GAP_BYTES_MIN.  Adjust comment.

* net/tramp.el (tramp-eshell-directory-change): Check remote-path
first in session cache: When `tramp-own-remote-path' is in
`tramp-remote-path', the remote path is only set in the session
cache.

Minor doc fix.

* faces.el (read-face-name): Doc fix.

Merge from emacs-24; up to 2012-12-08T12:11:29Z!eliz@gnu.org

Backport spelling fixes from trunk

Spelling fix merged from gnulib.

Remove duplicated ChangeLog entry

Spelling fixes.

* lisp/net/tramp-adb.el (tramp-adb-get-toolbox):
Fix misspelling of 'unknown'.

* mml-smime.el (epg-sub-key-fingerprint): Autoload.

Remove some obsolete trace.el commentary

Remove some of the more obsolete MAINTAINERS info

* emacs-lisp/trace.el (trace-function, trace-function-background): Doc fix.

* lisp/international/mule-cmds.el (read-char-by-name): Move let-binding
of completion-ignore-case around completing-read to fix regression
exhibited by the test case `C-x 8 RET *acc TAB' and caused by
`string-match-p' using the nil value of `case-fold-search' and
`completion-ignore-case' in `completion-pcm--all-completions'..

Fixes: debbugs:12615

* lisp/textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
* lisp/progmodes/flymake.el (flymake-errline, flymake-warnline):
Use underline style wave on terminals that support it.

* src/xfaces.c (tty_supports_face_attributes_p): Return 0 for the case
of (supports :underline (:style wave)).

Fixes: debbugs:13000

* lisp/emacs-lisp/pcase.el (pcase--split-equal): Also take advantage if
the predicate returns nil.

Fixes related to the last Org merge.

* lisp/simple.el: Use lexical-binding.
(primitive-undo): Use pcase.
(minibuffer-history-isearch-push-state): Use a closure.

* lisp/simple.el (primitive-undo): Move from undo.c.
* src/undo.c (Fprimitive_undo): Move to simple.el.
(syms_of_undo): Remove declaration for Sprimitive_undo.
* test/automated/undo-tests.el: New file.

Merge Org up to commit 4cac75153.  Some ChangeLog formatting fixes.

* lisp/vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'.
(cvs-mode-remove-handled): Use it.

Fixes: debbugs:13380

doc/misc/org.texi: Fix version number

* src/keyboard.c (echo_add_key): Rename from echo_add_char.

Merge Org (commit c8c217).  Fix mistake about updating the wrong ChangeLog.

* lisp/emacs-lisp/nadvice.el (advice--tweak): New function.
(advice--remove-function, advice--subst-main): Use it.
* lisp/emacs-lisp/advice.el: Update commentary.

Merge Org 7.9.3 (commit 31c1aea)

* net/tramp-adb.el (tramp-adb-file-name-handler-alist): Remove
spurious entry.

etc/NEWS: Document the change wrt `apropos-user-option' and `apropos-variable'

Merge from gnulib (comment change only).

Add some :version tags

* gnus/mml-smime.el (mml-smime-sign-with-sender): Add :version.

* net/tramp.el (tramp-default-host-alist): Add :version.

* lisp/info.el (Info-read-node-name-2): Don't duplicate suffixes for single completion.
(info--manual-names): Expand node completions into an explicit list
before appending it to another list.  Filter out internal buffers
with the leading space in the buffer name.  (Bug#10771)

Fixes: debbugs:12456

* lisp/info.el (Info-read-node-name-1): Allow empty node name in (FILENAME)
that defaults to the Top node.
(Info-goto-node, Info-read-node-name): Doc fix to mention that
the short format (FILENAME) goes to the Top node.
(Info-build-node-completions): Rename arg `file' to `filename'.

* doc/misc/info.texi (Go to node): Mention the abbreviated format
`(FILENAME)' equal to `(FILENAME)Top'.

Fixes: debbugs:13365

Introduce `apropos-user-option' and update `apropos-variable'.  (Bug#13276)

* net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
Handle filename correctly, when parsing "source -> target" symlink
output.
(tramp-adb-handle-set-file-times): New defun.

* lisp/emacs-lisp/advice.el (ad-activate-advised-definition): Refresh the
advice list when the interactive-spec of ad-Advice-* changes.

wid-edit.el (widget-default-get): Work for inlined elements (Bug#12670)

* net/tramp.el (tramp-default-host-alist): New defcustom.
(tramp-find-host): Use it.
(tramp-eshell-directory-change): Moved from tramp-sh.el.  Add to
`eshell-directory-change-hook'.

* net/tramp-adb.el (top): Add adb specific entry in
`tramp-default-host-alist'.
(tramp-adb-file-name-host): Remove function.
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
Use `tramp-file-name-host' instead of `tramp-adb-file-name-host'.

* net/tramp-sh.el : Move eshell integration code to tramp.el.

lisp/gnus/mml-smime.el: Support signing by sender.

* lisp/progmodes/compile.el (compilation-parse-errors): Fix typo.

Fixes: debbugs:13369

comint-send-input tiny change

* lisp/comint.el (comint-send-input): Check size of buffer before
waiting for process output, in case already accepted.

Fixes: debbugs:13290

* net/tramp-adb.el (tramp-methods): Add `tramp-tmpdir' entry.

Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org

* net/tramp-adb.el (tramp-adb-ls-toolbox-regexp): The file size can
consist of mor than one digit.
(tramp-adb-file-name-handler-alist): Use
`tramp-handle-file-exists-p' consistently.
(tramp-adb-file-name-handler): Don't tweak `tramp-default-host'.
(tramp-adb-handle-file-exists-p): Remove function.
(tramp-adb-file-name-host): New defun.
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
Use it.
(tramp-adb-maybe-open-connection): Set "remote-path" property.

* autotype.texi: Remove undefined command @subtitlefont.
* cc-mode.texi: Likewise.

* org.texi (Advanced features): Use `@w{ }' instead of `@ ' in
@item argument.
(Property searches): Use \\ instead of @backslashchar{}.
* pgg.texi (VERSION): Move @set below @setfilename.

* windows.texi (Vertical Scrolling): Fix typos.

Fixes: debbugs:13267

Try to handle buffer/file modifications which conflict with VCS locking.

* vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.

* vc/vc.el (vc-next-action): Detect buffer modifications
conflicting with locking VCS operation.

Fixes: debbugs:11490

Fix echoing of replayed keys.

* keyboard.c (echo_add_char): New function, factored out from
echo_char.  Don't add a space if the previous echo string was
empty.
(echo_char): Use it.
(read_key_sequence): When echoing mock input, ensure that the
trailing dash is properly added.

Fixes: debbugs:13255

Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru

Fix ChangeLog date oddness

* doc/lsipref/display.texi (Overlay Properties): Mention field.

Fixes: debbugs:13364

* doc/emacs/text.texi (HTML Mode): Remove deleted nxml C-RET binding.

ChangeLog fix

* tramp.texi (Remote shell setup): Replace literal NUL character by \0.

Fix manual formatting errors

* lispref/hooks.texi (Standard Hooks): Fix use of @itemx.

* misc/ada-mode.texi: Remove braces from @title argument.
* misc/eudc.texi: Likewise.
* misc/smtpmail.texi: Likewise.
* misc/auth.texi (VERSION): Set before first use.
* misc/emacs-gnutls.texi (VERSION): Likewise.
* misc/pgg.texi (VERSION): Likewise.
* misc/ede.texi (Top): Rename from top, all uses changed.
* misc/eshell.texi: Add missing argument to @sp.
* misc/forms.texi (Top): Reorder menu to match structure.
* misc/htmlfontify.texi (Customisation): Add missing @item in
@enumerate.
* misc/org.texi (Advanced features): Add missing argument for @item.
(Property searches): Use @backslashchar{} in macro argument.
* misc/pcl-cvs.texi: Add missing argument to @sp.
(Movement commands): Fix use of @itemx.
* misc/vip.texi (Misc Commands, Viewing the Buffer): Likewise.
* misc/reftex.texi (Options (Creating Citations)): Add missing newline
before @end.
* misc/tramp.texi (Obtaining Tramp): Remove extra dots.
(Configuration): Reorder menu to match structure.
* misc/viper.texi (Marking): Add missing argument for @item.

* net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
(tramp-adb-handle-directory-files-and-attributes): Fix typos.

* net/tramp-adb.el (tramp-adb-handle-file-attributes): More robust
parsing of ls output using regular expression (handle filenames
with spaces).  Use virtual device number.
(tramp-do-parse-file-attributes-with-ls): New defun (Code
cleanup).

Improve display of glyph matrix by dump-glyph-matrix.

 src/xdisp.c (dump_glyph): Align glyph data better.  Use "pD" instead
 of a non-portable "t" to print ptrdiff_t values.  Allow up to 9
 digits for buffer positions, before misalignment starts.  Display
 "0" for integer "object" field.
 (dump_glyph_row): Adapt the header line to changes in dump_glyph.
 Display the newline glyph more unambiguously.

Fix usage of @itemx in ELisp manual.

 doc/lispref/hooks.texi (Standard Hooks): Use @item, not @itemx, as the first
 directive in a group of items.

* keymaps.texi (Key Sequences): Remove obsolete sentence.

Fixes: debbugs:13356

* epg.el: Silence byte-compiler warnings.

* epg.el (epg--start): Don't call "tty" program on W32 platforms.

Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca

Auto-commit of generated files.

Add htmlfontify manual to build process

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

* doc/misc/makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean):
Add htmlfontify.
($(infodir)/htmlfontify$(INFO_EXT), htmlfontify.dvi): New targets.

* info/dir: Add htmlfontify.

* net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be
non-negative integers.  Otherwise, the default values are used.
(tramp-convert-file-attributes): Convert uid and gid to integers.

* doc/misc/htmlfontify.texi: Miscellaneous fixes and updates.
Set copyright to FSF, update license to GFDL 1.3+.

Import the htmlfontify manual

icomplete-prospects-height fix (tiny change)

* icomplete.el (icomplete-completions):
Honor icomplete-prospects-height once more following 2012-11-29 changes.

Fixes: debbugs:13224

* lisp/subr.el (internal--called-interactively-p--get-frame): Find aliases
of called-interactively-p as well.

Fixes: debbugs:13237

* lisp/view.el (view--enable, view--disable): Rename from view-mode-enable
and view-mode-disable and assume it's called from view-mode.
(view-mode-enable, view-mode-disable): Redefine as obsolete
compatibility layer above view-mode.
(view-mode-enter): Call `view-mode'.
* lisp/files.el (after-find-file): Call `view-mode'.

* lisp/doc-view.el (doc-view-scale-internally): New var.
(doc-view-enlarge, doc-view-insert-image): Obey it.