Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-61

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 353-357)

   - Update from CVS

2 files changed, 20 insertions, 7 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a27a5282b42..e0c8ded307a 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -935,6 +935,7 @@ Returns the compilation buffer created."
                     (substitute-env-vars (match-string 1 command))
                   "~")
               default-directory))
+        (erase-buffer)
         ;; Select the desired mode.
         (if (not (eq mode t))
             (funcall mode)
@@ -944,11 +945,11 @@ Returns the compilation buffer created."
         (if highlight-regexp
             (set (make-local-variable 'compilation-highlight-regexp)
                  highlight-regexp))
-        (erase-buffer)
         ;; Output a mode setter, for saving and later reloading this buffer.
         (insert "-*- mode: " name-of-mode
                 "; default-directory: " (prin1-to-string default-directory)
-                " -*-\n" command "\n")  (setq thisdir default-directory))
+                " -*-\n" command "\n")
+        (setq thisdir default-directory))
       (set-buffer-modified-p nil))
     ;; If we're already in the compilation buffer, go to the end
     ;; of the buffer, so point will track the compilation output.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 7356583fb90..d2d2dc6263a 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -115,9 +115,8 @@
   :version "22.1")
 
 (defface makefile-shell-face
-  '((((class color) (background light)) (:background  "seashell1"))
-    (((class color) (background dark)) (:background  "seashell4"))
-    (t (:reverse-video t)))
+  '((((class color) (min-colors 88) (background light)) (:background  "seashell1"))
+    (((class color) (min-colors 88) (background dark)) (:background  "seashell4")))
   "Face to use for additionally highlighting Shell commands in Font-Lock mode."
   :group 'faces
   :group 'makefile
@@ -262,7 +261,7 @@ not be enclosed in { } or ( )."
 ;; index in makefile-imenu-generic-expression.
 (defvar makefile-dependency-regex
   ;; Allow for two nested levels $(v1:$(v2:$(v3:a=b)=c)=d)
-  "^ *\\(\\(?: *\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\| *[^ \n$#:=]+\\)+?\\)[ \t]*\\(:\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)"
+  "^\\(\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#:=]\\)+?\\)\\(:\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)"
   "Regex used to find dependency lines in a makefile.")
 
 (defconst makefile-bsdmake-dependency-regex
@@ -291,7 +290,7 @@ not be enclosed in { } or ( )."
 ;; that if you change this regexp you might have to fix the imenu index in
 ;; makefile-imenu-generic-expression.
 (defconst makefile-macroassign-regex
-  "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)"
+  "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
   "Regex used to find macro assignment lines in a makefile.")
 
 (defconst makefile-var-use-regex
@@ -1704,6 +1703,19 @@ matched in a rule action."
             (when (save-excursion
                     (beginning-of-line)
                     (looking-at makefile-dependency-regex))
+              (save-excursion
+                (let ((deps-end (match-end 1))
+                      (match-data (match-data)))
+                  (goto-char deps-end)
+                  (skip-chars-backward " \t")
+                  (setq deps-end (point))
+                  (beginning-of-line)
+                  (skip-chars-forward " \t")
+                  ;; Alter the bounds recorded for subexp 1,
+                  ;; which is what is supposed to match the targets.
+                  (setcar (nthcdr 2 match-data) (point))
+                  (setcar (nthcdr 3 match-data) deps-end)
+                  (store-match-data match-data)))
               (end-of-line)
               (throw 'found (point)))))
       (goto-char pt))