1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

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.
This commit is contained in:
Noam Postavsky 2018-06-10 18:41:47 -04:00
commit 23e9beff8c
6 changed files with 18 additions and 15 deletions

View file

@ -1693,7 +1693,7 @@ or as help on variables `cperl-tips', `cperl-problems',
(set (make-local-variable 'comment-end) "")
(set (make-local-variable 'comment-column) cperl-comment-column)
(set (make-local-variable 'comment-start-skip) "#+ *")
;; "[ \t]*sub"
;; (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start
;; cperl-maybe-white-and-comment-rex ; 15=pre-block