• Paul Eggert's avatar
    Merge from origin/emacs-25 · c61ee949
    Paul Eggert authored
    4af5981d Add a comment in generated refcards about the source
    ef880a5e ; * etc/refcards/calccard.tex: Remove obsolete comment.
    4887e7c6 js-mode: Fix indent problem after a regexp
    e992ac0a Fix sluggish display of symbols in UTF-8 language environment
    1fc101b0 Don't confuse how Texinfo outputs @var with the input
    91aa5d19 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame...
    f758fcdb * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da...
    5b0cddd9 More fixes in copyright notices in etc/refcards/
    f994c204 Update copyright text in refcards
    9ad2ae77 Fix Outline command names
    26c3554f Send text received by bracketed paste to process
    db0b58da Correct the statement about programming modes always running ...
    78aece49 Improve documentation of 'occur'
    eb364fdd Do call debugger on failed cl-assert
    3ef4ee84 Avoid infloop in python
    8da810f9 Don't refer to obsolete FEATURE-unload-hook
    4f478ca0 Improve documentation of dabbrevs
    7272e5db * lisp/chistory.el (list-command-history): Doc fix.  (Bug#24890)
    89b74829 * lisp/simple.el (set-mark-command): Doc fix.  (Bug#24890)
    3b199f7c Improve documentation of some Help commands
    93d3a0e3 Fix documentation of yes-or-no prompts
    af04919f Fix documentation of partial completion style
    ed80184d Fix documentation of the mode line on emacsclient frames
    e6be8557 Fix description of 'C-z' in User manual
    16f70070 Improve and clarify documentation of Outline Mode
    31d93aa1 Add Emacs version number to nt/README.W32
    0b6b8151 Fix python-mode hideshow regexp
    dc152c54 Modernize usage of 'macOS' in doc and comments
    84c53436 Prefer comments /* like this */ in C code
    bb61e505 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845).
    3ef86fd0 Clarify documentation of face attribute functions
    de51d598 ; * nt/README.W32: Minor copyedits.
    db436e93 Don't call debug on failed cl-assert
    
    # Conflicts:
    #	doc/emacs/cmdargs.texi
    #	etc/NEWS
    #	etc/PROBLEMS
    #	lisp/auth-source.el
    #	lisp/net/tramp-sh.el
    c61ee949
tramp-sh.el 221 KB