auto upstream

Fix race conditions with MS-Windows lock files by using _sopen.

 src/filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with
 _SH_DENYRW flag, instead of emacs_open, to deny any other process
 access to the lock file until it is written and closed.

Fixes: debbugs:13807

* lisp/font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of
&optional.

Fixes: debbugs:13819

* net/tramp-adb.el (tramp-adb-parse-device-names)
(tramp-adb-maybe-open-connection): Add timeouts.  (Bug#13299)

Qcall_interactively and Qexecute_kbd_macro are now static.

auto upstream

* window.c (Frecenter): Tiny docstring enhancement.

* net/tramp-sh.el (tramp-sh-handle-insert-directory): Add
"2>/dev/null" to the ls command, in case "en_US.utf8" is not
defined.  POSIX environments fall back to the "C" locale then and
emit a warning, which shall be suppressed.

Minor textprop integer cleanup.

* intervals.h, textprop.c (add_text_properties_from_list):
Return void, not int, since nobody uses the return value.
* textprop.c (validate_plist, add_properties, remove_properties)
(Fadd_text_properties):
Don't assume list length fits in int.
(interval_has_all_properties, interval_has_some_properties)
(interval_has_some_properties_list, add_properties, remove_properties)
(Fadd_text_properties, Fremove_text_properties)
(Fremove_list_of_text_properties, text_property_stickiness):
Use bool for booleans.
(Fadd_text_properties, Fremove_text_properties):
(Fremove_list_of_text_properties):
Reindent do-while as per GNU style.

* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Tweak logic.
(easy-mmode-set-keymap-parents): Use make-composed-keymap.

* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Use let.

auto upstream

lisp/gnus/mml2015.el (mml2015-epg-key-image): Wrap epg-gpg-program in shell-quote-argument

* lisp/replace.el (read-regexp): Let-bind `default' to the first
element of `defaults' if it's a list, otherwise it should be
a string or nil.  Let-bind `suggestions' to `defaults' if it's
a list, otherwise make a list with the string value.  Doc fix.

Fixes: debbugs:13805

Implement CLASH_DETECTION for MS-Windows.

 src/filelock.c [WINDOWSNT]: Include w32.h.
 (MAKE_LOCK_NAME): Don't use 'lock', it clashes with MS runtime
 function of that name.  Up-case the macro arguments.
 (IS_LOCK_FILE): New macro.
 (fill_in_lock_file_name): Use IS_LOCK_FILE instead of S_ISLNK.
 (create_lock_file): New function, with body extracted from
 lock_file_1.
 [WINDOWSNT]: Implement lock files by writing a regular file with
 the lock information as its contents.
 (read_lock_data): New function, on Posix platforms just calls
 emacs_readlinkat.
 [WINDOWSNT]: Read the lock info from the file.
 (current_lock_owner): Call read_lock_data instead of calling
 emacs_readlinkat directly.
 (lock_file) [WINDOWSNT]: Run the file name through
 dostounix_filename.
 src/w32proc.c (sys_kill): Support the case of SIG = 0, in which case
 just check if the process by that PID exists.
 src/w32.c (sys_open): Don't reset the _O_CREAT flag if _O_EXCL is
 also present, as doing so will fail to error out if the file
 already exists.
 src/makefile.w32-in ($(BLD)/filelock.$(O)): Depend on src/w32.h.

 nt/inc/ms-w32.h (BOOT_TIME_FILE): Define.
 nt/config.nt (CLASH_DETECTION): Define to 1.

 lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Reject files
 that match "\`\.#", to avoid compiling lock files, even if they
 are readable (as they are on MS-Windows).

 doc/emacs/files.texi (Interlocking): Don't refer to symlinks as the
 exclusive means of locking files.

 etc/NEWS: Mention support for lock files on MS-Windows.

* NEWS: Document removal of --with-crt-dir.

Fix bug #13743 with crashes due to recursive add-text-properties.

 src/textprop.c (Fadd_text_properties, Fremove_text_properties)
 (Fremove_list_of_text_properties): Skip all of the intervals in
 the region between START and END that already have resp. don't
 have the requested properties, not just the first one.  Add
 assertions that the loop afterwards always modifies the
 properties.

* src/callint.c (Fcall_interactively): Use the right lexical environment
for `interactive' specs.
* src/eval.c (Feval): Accept a lexical environment.

Fixes: debbugs:13811

* lisp/files.el (basic-save-buffer): Remove redundant directory-creation.

Auto-commit of generated files.

Spelling fixes.

Simplify data_start configuration.

This is a followon simplification to the fix for Bug#13650.
* admin/CPP-DEFINES (DATA_START, ORDINARY_LINK): Remove.
* configure.ac (CRT_DIR, LIB_STANDARD, START_FILES, DATA_START)
(LD_FIRSTFLAG, ORDINARY_LINK, LIB_GCC): Remove.
(AC_CHECK_HEADERS_ONCE): Remove sys/resource.h, as it's
not always needed.
(HAVE_DATA_START): New macro.
* etc/PROBLEMS (LIBS_SYSTEM, LIBS_MACHINE, LIBS_STANDARD): Remove.
Remove legacy-systems section, as this stuff is no longer
applicable with current linking strategies.
* src/Makefile.in (LD_FIRSTFLAG, LIB_GCC, CRT_DIR, LIB_STANDARD)
(START_FILES): Remove.  All uses removed.
(otherobj): Remove $(VMLIMIT_OBJ), as it's now first.
(ALLOBJS): Move here from autodeps.mk, and with VMLIMITS_OBJ first.
(buildobj.h): Use it.
($(ALLOBJS)): Depend on globals.h.
(temacs$(EXEEXT)): Use $(ALLOBJS).
* src/autodeps.mk (ALLOBJS): Move to Makefile.in.
* src/deps.mk (vm-limit.o):
* src/makefile.w32-in ($(BLD)/vm-limit.$(O)):
Do not depend on mem-limits.h.
* src/emacs.c (__do_global_ctors, __do_global_ctors_aux)
(__do_global_dtors, __CTOR_LIST__, __DTOR_LIST__)
[__GNUC__ && !ORDINARY_LINK]: Remove.
* src/mem-limits.h, src/pre-crt0.c: Remove.
* src/unexaix.c, src/unexcoff.c: Don't include mem-limits.h.
* src/unexcoff.c (etext): New decl.
(make_hdr): Use it instead of start_of_data.
* src/vm-limit.c: Move most of mem-limits.h's contents here.
(data_start): New decl.  It's OK if this is approximate,
so simplify-away some unnecessary exactness.
(POINTER): Remove; all uses removed.
(data_space_start): Now char *, to avoid casts.
(exceeds_lisp_ptr): New function, replacing the old
EXCEEDS_LISP_PTR macro.  All uses changed.
(check_memory_limits): Simplify and remove casts.
(start_of_data) [!CANNOT_DUMP || !SYSTEM_MALLOC]: Remove.
(memory_warnings): Use data_start instead of start_of_data.

Fixes: debbugs:13783

auto upstream

gnus-registry.el: Silence XEmacs byte compiler

Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org

Port documentation to Texinfo 5.0.

* tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c.
(Filename Syntax): Do not use @trampfn{} in @item.
(Filename completion): Use @columnfractions in @multitable.

Fixes: debbugs:13797
* xdisp.c (set_message): Only check for debug-on-message if STRING
is a string.

* lisp/eshell/em-cmpl.el: Corrected "context-related help"
keybinding in commentary.

* calc/calc-ext.el (math-to-radians-2, math-from-radians-2):
  Add option to force `pi' to remain symbolic.
* calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan)
  (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin)
  (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the
  derivatives, when necessary.

Fix regression introduced by July 10 filelock.c patch.

* filelock.c (fill_in_lock_file_name): Fix crash caused by the
2012-07-10 patch to this file.  Reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
and diagnosed by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.

auto upstream

Update ps-mode.el from upstream

* lisp/progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i.
(ps-mode-octal-region): Use string-make-unibyte.

Add bug-gnu-emacs to some specialized bug report addresses

* emulation/viper-cmd.el (viper-submit-report):
* progmodes/ps-mode.el (ps-mode-maintainer-address):
* progmodes/vera-mode.el (vera-mode-help-address):
* textmodes/artist.el (artist-maintainer-address):
* textmodes/reftex.el (reftex-report-bug):
* vc/ediff-util.el (ediff-submit-report):
Add bug-gnu-emacs to bug report address.

Make simula.el special bug reporting obsolete

* progmodes/simula.el (simula-mode-menu, simula-mode-map):
Remove bug report entries.
(simula-mode-help-address, simula-submit-bug-report): Make obsolete.

TODO update

Avoid recursive byte-compile-files fighting over input/output buffers

* lisp/emacs-lisp/bytecomp.el (byte-compile-level): New.
(byte-compile-file, byte-compile-from-buffer):
Use separate input/output buffers for each level of recursive
byte-compile-file calls.

Fixes: debbugs:13787

* net/tramp.el (tramp-methods): Fix docstring.
(tramp-ssh-controlmaster-options): Rename it from
`tramp-ssh-controlmaster-template'.  Return a string.
(tramp-default-method): Adapt check for
`tramp-ssh-controlmaster-options'.

* net/tramp-sh.el (tramp-methods): Replace
`tramp-ssh-controlmaster-template' by "%c".
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it in format spec.  Ensure,
that it is applied for the first hop only.

Minor improvements in the ELisp manual.

 doc/lispref/files.texi (Magic File Names): Improve wording and indexing.

auto upstream

gnus-registry.el (gnus-registry-save): Provide class name when calling `eieio-persistent-read' to avoid "unsafe call" warning  Use `condition-case' to stay compatible with older EIEIO versions which only accept one argument

Assume C89 or better.

* ralloc.c (SIZE, POINTER, NIL):
* vm-limit.c (POINTER):
Remove, replacing all uses with C89 equivalents.  These old
symbols were present only for porting to pre-C89 platforms.

Merge from emacs-24; up to 2012-12-22T02:59:08Z!cyd@gnu.org

* ack.texi, emacs.texi (Acknowledgments): Small updates

Don't call 'select' from emacs_gnutls_pull.

 src/w32.c (emacs_gnutls_pull): Don't call 'select', and don't loop.
 This avoids warning messages reported as part of Bug#13546.

* net/tramp.el (tramp-tramp-file-p): Fix docstring.

* net/tramp-sh.el (tramp-sh-handle-insert-directory): Handle
multibyte file names.

Improve instructions in etc/DEBUG, per bug #13775.

Use derived-mode-p in previous change

* doc/misc/flymake.texi (Syntax check statuses): Fix multitable continued rows.

Tweak for sgml-transformation-function

* lisp/textmodes/sgml-mode.el (sgml-xml-mode): Move before use.
(sgml-transformation-function): Give it a :set function.
(sgml-tag): Doc fix.

Doc fixes re set-variable

* lisp/cmuscheme.el (scheme-buffer):
* lisp/progmodes/inf-lisp.el (inferior-lisp-buffer):
* lisp/progmodes/tcl.el (inferior-tcl-buffer):
* lisp/textmodes/tex-mode.el (tex-command): Doc fixes.

* lisp/image-mode.el (image-mode): Add mouse bindings for mode-line-process.

* lisp/htmlfontify.el (hfy-default-header): Encode title string.  (Bug#7457)

auto upstream

Parallelize documentation builds.

This speeds up building of documentation on multiprocessor
platforms, and is motivated by Texinfo 5.0, which is much slower.
Add a toplevel rule 'make docs' to make all the documentation.
* .bzrignore: Add .dvi, .html, .ps.
* Makefile.in (DVIS, HTMLS, INFOS, PSS, DOCS): New macros.
($(DOCS), docs, vi, html, pdf, ps): New rules.
(info-real): Depend on $(INFOS) rather than doing it sequentially.
(dvi): Depend on $(DVIS) rather than doing it sequentially.
* doc/misc/Makefile.in (html): New rule.

* cmuscheme.el (scheme-buffer): Fix docstring.

Thanks to Xue Fuqiao for reporting this.

Port to Texinfo 5.0 by backporting trunk 2012-12-22T19:57:35Z!rgm@gnu.org and 2013-02-21T02:42:30Z!eggert@cs.ucla.edu.

* lisp/isearch.el (isearch-lazy-highlight-new-loop):
Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end'
to `isearch-other-end' if it is not nil.

* lisp/replace.el (replace-highlight): Let-bind `isearch-other-end'
to `match-beg'.

* lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
Let-bind `isearch-other-end' to `start', `isearch-forward' to t
and `isearch-error' to nil.

Fixes: debbugs:13402

Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

ChangeLog fix

* net/tramp.el (tramp-ssh-controlmaster-template): Make it a
defconst.  Apply independent check for ControlPersist.

* net/tramp-sh.el (tramp-sh-handle-set-file-times): Set $UTC only
temporarily, via "env".

Make Info-edit obsolete

Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00374.html
(Warning: interminable bikeshedding in thread)

* lisp/info.el (Info-enable-edit): Remove.
(Info-edit): Disable it rather than using Info-enable.
(Info-edit-mode-hook, Info-edit-map, Info-edit-mode, Info-edit)
(Info-cease-edit): Make editing of Info files obsolete.

* etc/NEWS: Mention this.

* lisp/informat.el (Info-tagify): Handle buffers not visiting files.

Fixes: debbugs:13763

Remove package not updated in 10 years.

More doc updates for multi-frame images

* doc/emacs/files.texi (File Conveniences): Not just GIFs can be animated.

* doc/lispref/display.texi (Multi-Frame Images): Minor rephrasing.

* etc/NEWS: Related edits.

lisp/calc/calc-graph.el (calc-graph-show-dumb): Fix typo.

* lisp/files.el (basic-save-buffer): Move check for existing parent directory
after hooks.  (Bug#13773)

Port documentation to Texinfo 5.0.

* src/sheap.c (report_sheap_usage): Fix arguments of message1_no_log.

auto upstream

* src/sheap.c (report_sheap_usage): Prefer message1_nolog.

* progmodes/python.el (python-info-current-defun): Enhance
match-data cluttering prevention.

Added intial test suite for python.el.

* automated/python-tests.el
(python-tests-with-temp-buffer): New macro.
(python-tests-look-at): New function.
(python-tests-look-at-1)
(python-tests-look-at-2)
(python-indent-pep8-1)
(python-indent-pep8-2)
(python-indent-pep8-3)
(python-indent-inside-paren-1)
(python-indent-inside-paren-2)
(python-indent-after-block-1)
(python-indent-after-block-2)
(python-indent-dedenters-1)
(python-indent-after-backslash-1)
(python-indent-after-backslash-2)
(python-nav-beginning-of-defun-1)
(python-nav-beginning-of-defun-2)
(python-nav-end-of-defun-1)
(python-nav-end-of-defun-2)
(python-nav-beginning-of-statement-1)
(python-nav-end-of-statement-1)
(python-nav-forward-statement-
(python-nav-backward-statement-1)
(python-nav-backward-statement-2)
(python-nav-beginning-of-block-1)
(python-nav-end-of-block-1)
(python-nav-forward-block-1)
(python-nav-lisp-forward-sexp-safe-1)
(python-nav-forward-sexp-1)
(python-nav-forward-sexp-2)
(python-nav-forward-sexp-3)
(python-nav-up-list-1)
(python-nav-backward-up-list-1)
(python-imenu-prev-index-position-1)
(python-info-current-defun-1)
(python-info-current-defun-2)
(python-info-current-defun-3)
(python-info-current-symbol-1)
(python-info-current-symbol-2)
(python-info-current-symbol-3)
(python-info-statement-starts-block-p-1)
(python-info-statement-starts-block-p-2)
(python-info-statement-ends-block-p-1)
(python-info-statement-ends-block-p-2)
(python-info-beginning-of-statement-p-1)
(python-info-beginning-of-statement-p-2)
(python-info-end-of-statement-p-1)
(python-info-end-of-statement-p-2)
(python-info-beginning-of-block-p-1)
(python-info-beginning-of-block-p-2)
(python-info-end-of-block-p-1)
(python-info-end-of-block-p-2)
(python-info-closing-block-1)
(python-info-closing-block-2)
(python-info-line-ends-backslash-p-1)
(python-info-beginning-of-backslash-1)
(python-info-continuation-line-p-1)
(python-info-block-continuation-line-p-1)
(python-info-block-continuation-line-p-2)
(python-info-assignment-continuation-line-p-1)
(python-info-assignment-continuation-line-p-2)
(python-info-looking-at-beginning-of-defun-1)
(python-info-current-line-comment-p-1)
(python-info-current-line-empty-p)
(python-util-goto-line-1)
(python-util-clone-local-variables-1)
(python-util-forward-comment-1): New tests.

* lisp/simple.el (command-execute): Move from C.  Add obsolete check.
(extended-command-history): Move from C.
* src/keyboard.c (Qcommand_execute): New var.
(command_loop_1, read_char): Use it.
(Fcommand_execute): Remove, replace by an Elisp implementation.
(syms_of_keyboard): Adjust accordingly.

* tramp.texi (Android shell setup): Improve.  Reported by Thierry
Volpiatto <thierry.volpiatto@gmail.com>.

* lisp/jka-cmpr-hook.el (jka-compr-compression-info-list)
(jka-compr-mode-alist-additions): Handle .txz suffix for
XZ-compressed tar archives.

Fixes: debbugs:13770

* outline.el (outline-regexp, outline-heading-end-regexp): Use
variables, not options (bug#13731).

Setting this as a global option is likely to be useless, because it is
unlikely that all outline file will use the modified regexp.

Additionnally, if one of these variables if set through customize and
the outline keybindings don't work in a standard outline file, it is
hard to know why.

Thanks to T. V. Raman for reporting this.

Lispref updates for multi-frame images

* doc/lispref/display.texi (GIF Images, TIFF Images): Delete these nodes.
(ImageMagick Images): For :index, use an xref rather than duplicating.
(Other Image Types): Add GIF, adjust formatting.
(Multi-Frame Images): Rename from Animated Images.  Expand section.

* doc/lispref/elisp.texi (Top): Update menu for these changes.

Rework recent image-multi-frame stuff a little

* image.el (image-current-frame): Change from variable to function.
(image-show-frame): Rename from image-nth-frame.  Update callers.

* image-mode.el (image-multi-frame): New variable.
(image-mode-map, image-mode, image-goto-frame):
Use image-multi-frame rather than image-current-frame.
(image-mode, image-goto-frame):
Use image-current-frame as function rather than as variable.

* sheap.c (report_sheap_usage): Use message, not message1, so
  that we don't try to create a buffer while we're in the middle
  of dumping Emacs.  Explain why.

2013-02-19  Daniel Colascione <dancol@dancol.org>

        * sheap.c (report_sheap_usage): Use message, not message1, so
       that we don't try to create a buffer while we're in the middle
       of dumping Emacs.  Explain why.

* search.c (find_newline): Return byte position in bytepos.
Adjust comment.
(find_next_newline_no_quit, find_before_next_newline): Add
bytepos argument.
* lisp.h (find_newline, find_next_newline_no_quit)
(find_before_next_newline): Adjust prototypes.
* bidi.c (bidi_find_paragraph_start):
* editfns.c (Fconstrain_to_field, Fline_end_position):
* indent.c (compute_motion, vmotion):
* xdisp.c (back_to_previous_line_start, forward_to_next_line_start):
(get_visually_first_element, move_it_vertically_backward):
Adjust users and avoid calls to CHAR_TO_BYTE where appropriate.

Make cl-floatp-safe just an alias for floatp

* lisp/emacs-lisp/cl-lib.el (cl-floatp-safe): Make it an alias for floatp.

* lisp/emacs-lisp/cl-macs.el (cl--make-type-test)
(cl--compiler-macro-assoc): Use floatp rather than cl-floatp-safe.

* doc/misc/cl.texi: Remove commented out sections about cl-floatp-safe.

auto upstream

* lisp/net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not
loaded while outline-regexp is let bound.  (Bug#9584)

* progmodes/python.el (python-info-current-defun): Fix failed
defun name retrieval because of unwanted match-data cluttering.

* net/tramp-cache.el (tramp-get-hash-table): New defun.
(tramp-get-file-property, tramp-set-file-property)
(tramp-get-connection-property, tramp-set-connection-property): Use it.
(tramp-flush-file-property, tramp-flush-directory-property):
Rename argument to KEY.
(tramp-flush-connection-property): Simplify a little bit.
(tramp-connection-property-p): New defun.
(top): Reapply saved values only if there isn't a corresponding
entry in `tramp-connection-properties'.

Spelling fixes.

Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru

* progmodes/python.el (python-indent-context): Fix
python-info-line-ends-backslash-p call.
(python-info-line-ends-backslash-p)
(python-info-beginning-of-backslash): Respect line-number
argument.
(python-info-current-line-comment-p): Fix behavior when not at
beginning-of-line.
(python-util-position): Remove function.
(python-util-goto-line): New function.

Remove some defunct/no longer relevant MORE.STUFF links.
Move info-look stuff to info-look.el commentary.

Cleanup some of EIEIO's namespace.
* lisp/emacs-lisp/eieio.el (eieio--define-field-accessors): New macro.
Use it to define all the class-* and object-* field accessors (renamed
to eieio--class-* and eieio--object-*).  Update all uses.
(eieio--class-num-slots, eieio--object-num-slots): Rename from
class-num-slots and object-num-slots.
(eieio--check-type): New macro.
(eieio-defclass, eieio-oref, eieio-oref-default, same-class-p)
(object-of-class-p, child-of-class-p, object-slots, class-slot-initarg)
(eieio-oset, eieio-oset-default, object-assoc, object-assoc-list)
(object-assoc-list-safe): Use it.
(eieio-defclass): Tighten regexp.
(eieio--defmethod): Use `memq'.  Signal an error for unknown method kind.
Remove unreachable code.
(object-class-fast): Declare obsolete.
(eieio-class-name, eieio-object-name, eieio-object-set-name-string)
(eieio-object-class, eieio-object-class-name, eieio-class-parents)
(eieio-class-children, eieio-class-precedence-list, eieio-class-parent):
Rename from class-name, object-name, object-set-name-string,
object-class, object-class-name, class-parents, class-children,
class-precedence-list, class-parent; with obsolete alias.
(class-of, class-direct-superclasses, class-direct-subclasses):
Declare obsolete.
(eieio-defmethod): Use `memq'; remove unreachable code.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-opt.el (eieio-class-button, eieio-describe-generic)
(eieio-browse-tree, eieio-browse): Use eieio--check-type.

* doc/lispref/text.texi (Change Hooks): Fix typo.

auto upstream

* eshell/em-unix.el (eshell/su): Require tramp.
(eshell/sudo): Require tramp.  Remove now unnecessary check.

* net/tramp-sh.el (tramp-sh-handle-start-file-process): Let-bind
`tramp-current-connection' in order to avoid an error when several
commands are invoked in a short time in eshell and friends.

Documented Eshell's insert output-redirection operator

Avoid leaking handles on MS-Windows.

 src/w32proc.c (new_child): Avoid leaking handles if the subprocess
 resources were not orderly released.

Fix a typo in a comment.

* lisp/emacs-lisp/eldoc.el (eldoc-highlight-function-argument):
Use font-lock-keyword-face for macros and special forms.

Fixes: debbugs:8345

auto upstream