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.

3 files changed, 9 insertions, 9 deletions

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 36f5196c5e2..3961ea647cf 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -12619,12 +12619,12 @@ comment at the start of cc-engine.el for more info."
           (c-beginning-of-statement-1 containing-sexp nil nil t)
           (when (/= (point) indent-point)
             (if (> (c-point 'boi) containing-sexp)
-                (goto-char (c-point 'boi))
-              (if (consp special-brace-list)
-                  (progn
-                    (goto-char (caar special-brace-list))
-                    (c-forward-token-2 1 nil indent-point))
-                (goto-char containing-sexp))
+                (goto-char (c-point 'boi))
+              (if (consp special-brace-list)
+                  (progn
+                    (goto-char (caar special-brace-list))
+                    (c-forward-token-2 1 nil indent-point))
+                (goto-char containing-sexp))
               (forward-char)
               (c-skip-ws-forward indent-point)))
           (cond
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index e619fac43f2..f09ca04cfff 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1180,13 +1180,13 @@ Note that the style variables are always made local to the buffer."
                        end))
           (c-literal-limits)))
        (end-literal-type (and end-limits
-                              (c-literal-type end-limits)))
+                                      (c-literal-type end-limits)))
        (beg-limits
         (progn
           (goto-char beg)
           (c-literal-limits)))
        (beg-literal-type (and beg-limits
-                              (c-literal-type beg-limits))))
+                                      (c-literal-type beg-limits))))
 
     (when (eq end-literal-type 'string)
       (setq c-new-END (max c-new-END (cdr end-limits))))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 09a26ddbe08..18a72324c65 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -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