• Glenn Morris's avatar
    Merge from origin/emacs-26 · 98f4e336
    Glenn Morris authored
    333d6f4d (origin/emacs-26) More changes in the Emacs manual
    52ca0d1a * lisp/vc/vc.el (vc-deduce-backend): Use ignore-errors.
    69e80466 Don't signal error in vc-deduce-backend
    f568c916 * doc/misc/tramp.texi: Index more user options.
    92ca881d Minor change in the Emacs manual
    e055a128 NEWS update about 'string-trim'
    96b6e243 Clarify TRAMP process-environment interaction (Bug#30419)
    4fa467ee * lisp/progmodes/grep.el (grep-num-matches-found): New variable.
    a22820a3 Avoid aborts in cm.c due to too small TTY frame
    26f64410 Another set of improvements in the Emacs manual
    cef3b424 Fix help in mode-line-mode-menu
    f8a493c8 Improve documentation of desktop restoring
    10637af9 Improve the Emacs manual's chapter "Frames"
    d924953e Fix unbound mm-uu-entry in mm-uu
    cb2487b1 Improve Emacs user manual in fixit.texi
    66e9527b Another minor change in the manual
    6a1c03d6 More minor changes in the Emacs manual
    32fb8c4c Avoid printing garbled error message from image.el
    
    Conflicts:
    	etc/NEWS
    	lisp/image.el
    98f4e336
image.el 38.6 KB