Merge from emacs-26
commit23e9beff8cb950112fb9f750d4b3040d3fe36e05
authorNoam Postavsky <npostavs@gmail.com>
Sun, 10 Jun 2018 22:41:47 +0000 (10 18:41 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Sun, 10 Jun 2018 22:41:47 +0000 (10 18:41 -0400)
tree8b63a8f04ad3a0acee281c92b7b147cdfd70a303
parentf4e9ceacdae2de88a165e94b5c2f34eeb4115139
parentf21fa142aca53e3de5783e1ce6fe1bf116174aeb
Merge from emacs-26

55c9bb9f3c Fix comint-get-old-input-default for output field case (Bu...
26819cd1c0 ; ChangeLog.3: Fix typo.
e35a08ea4b Prevent infloop in 'delete-trailing-whitespace'

* lisp/progmodes/cperl-mode.el:
* lisp/progmodes/cc-engine.el:
* lisp/progmodes/cc-mode.el: Fix tabs mixed with space preventing
commit hook from succeeding.
lisp/comint.el
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-mode.el
lisp/progmodes/cperl-mode.el
lisp/simple.el