auto upstream

5 files changed, 19 insertions, 14 deletions

diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 0711bc983e8..4b3fc91b0ff 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -142,7 +142,7 @@
 
 (defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]")
 ;;   Matches any character but a _, #, /, ", \, or newline.  N.B. _" starts a
-;; localisation string in gawk 3.1
+;; localization string in gawk 3.1
 (defconst c-awk-harmless-line-string*-re
   (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*"))
 ;;   Matches a (possibly empty) sequence of chars without unescaped /, ", \,
@@ -795,7 +795,8 @@
       (setq anchor (point))
       (search-forward-regexp c-awk-harmless-string*-here-re nil t)
       ;; We are now looking at either a " or a / or a brace/paren/semicolon.
-      ;; Do our thing on the string, regexp or divsion sign or update our state.
+      ;; Do our thing on the string, regexp or division sign or update
+      ;; our state.
       (setq anchor-state-/div
             (cond
              ((looking-at "_?\"")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index eb73b77bf52..d2a9617e28e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -42,24 +42,21 @@
 
 ;;;###autoload
 (defcustom compilation-mode-hook nil
-  "List of hook functions run by `compilation-mode' (see `run-mode-hooks')."
+  "List of hook functions run by `compilation-mode'."
   :type 'hook
   :group 'compilation)
 
 ;;;###autoload
 (defcustom compilation-start-hook nil
-  "List of hook functions run by `compilation-start' on the compilation process.
-\(See `run-hook-with-args').
-If you use \"omake -P\" and do not want \\[save-buffers-kill-terminal] to ask whether you want
-the compilation to be killed, you can use this hook:
-  (add-hook 'compilation-start-hook
-    (lambda (process) (set-process-query-on-exit-flag process nil)) nil t)"
+  "Hook run after starting a new compilation process.
+The hook is run with one argument, the new process."
   :type 'hook
   :group 'compilation)
 
 ;;;###autoload
 (defcustom compilation-window-height nil
-  "Number of lines in a compilation window.  If nil, use Emacs default."
+  "Number of lines in a compilation window.
+If nil, use Emacs default."
   :type '(choice (const :tag "Default" nil)
                  integer)
   :group 'compilation)
@@ -265,7 +262,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\([0-9]+\\)\\(?:-\\(?4:[0-9]+\\)\\(?:\\.\\(?5:[0-9]+\\)\\)?\
 \\|[.:]\\(?3:[0-9]+\\)\\(?:-\\(?:\\(?4:[0-9]+\\)\\.\\)?\\(?5:[0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
- *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
+ *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|\\[ skipping .+ \\]\\|\
+\\(?:instantiated\\|required\\) from\\|[Nn]ote\\)\\|\
  *[Ee]rror\\|[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 4) (3 . 5) (6 . 7))
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ef321addf24..d8c39f2ddef 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -359,7 +359,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
         (when grep-highlight-matches
           (let* ((beg (match-end 0))
                  (end (save-excursion (goto-char beg) (line-end-position)))
-                 (mbeg (text-property-any beg end 'font-lock-face 'match)))
+                 (mbeg (text-property-any beg end 'font-lock-face grep-match-face)))
             (when mbeg
               (- mbeg beg)))))
       .
@@ -367,7 +367,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
         (when grep-highlight-matches
           (let* ((beg (match-end 0))
                  (end (save-excursion (goto-char beg) (line-end-position)))
-                 (mbeg (text-property-any beg end 'font-lock-face 'match))
+                 (mbeg (text-property-any beg end 'font-lock-face grep-match-face))
                  (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
             (when mend
               (- mend beg)))))))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index be718135f99..20673866bc4 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1304,6 +1304,12 @@ Fill comments, backslashed lines, and variable definitions specially."
         (save-restriction
           (narrow-to-region beginning end)
           (makefile-backslash-region (point-min) (point-max) t)
+          ;; Backslashed newlines are marked as punctuation, so when
+          ;; fill-delete-newlines turns the LF into SPC, we end up with spaces
+          ;; which back-to-indentation (called via fill-newline ->
+          ;; fill-indent-to-left-margin -> indent-line-to) thinks are real code
+          ;; (bug#13179).
+          (remove-text-properties (point-min) (point-max) '(syntax-table))
           (let ((fill-paragraph-function nil)
                 ;; Adjust fill-column to allow space for the backslash.
                 (fill-column (- fill-column 1)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2cb108cc316..35c5ba19e33 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2334,7 +2334,7 @@ Argument OUTPUT is a string with the output from the comint process."
               ;; encounters an exception, it prints the _entire_ stack
               ;; trace.  To handle all of these cases, we want to find
               ;; the _last_ stack frame printed in the most recent
-              ;; batch of output, then jump to the corrsponding
+              ;; batch of output, then jump to the corresponding
               ;; file/line number.
               (goto-char (point-max))
               (when (re-search-backward python-pdbtrack-stacktrace-info-regexp nil t)