Merge from trunk.

[bpt/emacs.git] / lisp / cedet / ede / pmake.el

diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index 4566056..bd5400b 100644 (file)
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -1,7 +1,6 @@
 ;;; ede-pmake.el --- EDE Generic Project Makefile code generator.
 
-;;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2005, 2007-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
@@ -336,7 +335,7 @@ NOTE: Not yet in use!  This is part of an SRecode conversion of
 ;
 ;         (oref this variables))
 ;
-;     ;; Add in all variables from the configuration not allready covered.
+;     ;; Add in all variables from the configuration not already covered.
 ;     (mapc (lambda (c)
 ;
 ;           (if (member (car c) conf-done)
@@ -373,7 +372,7 @@ NOTE: Not yet in use!  This is part of an SRecode conversion of
                  (setq conf-done (cons (car c) conf-done))))
            (insert (cdr c) "\n"))
          (oref this variables))
-    ;; Add in all variables from the configuration not allready covered.
+    ;; Add in all variables from the configuration not already covered.
     (mapc (lambda (c)
            (if (member (car c) conf-done)
                nil
@@ -431,7 +430,7 @@ sources variable."
                      this (oref proj configuration-default)))
         (conf-done nil)
         )
-    ;; Add in all variables from the configuration not allready covered.
+    ;; Add in all variables from the configuration not already covered.
     (mapc (lambda (c)
            (if (member (car c) conf-done)
                nil
@@ -479,7 +478,7 @@ These are removed with make clean."
 (defmethod ede-proj-makefile-garbage-patterns ((this ede-proj-target))
   "Return a list of patterns that are considered garbage to THIS.
 These are removed with make clean."
-  ;; Get the  the source object from THIS, and use the specified garbage.
+  ;; Get the source object from THIS, and use the specified garbage.
   (let ((src (ede-target-sourcecode this))
        (garb nil))
     (while src
@@ -565,10 +564,7 @@ Argument THIS is the target that should insert stuff."
            (cond ((eq (cdr sv) 'share)
                   ;; This variable may be shared between multiple targets.
                   (if (re-search-backward (concat "\\$(" (car sv) ")")
-                                          (save-excursion
-                                            (beginning-of-line)
-                                            (point))
-                                          t)
+                                          (point-at-bol) t)
                       ;; If its already in the dist target, then skip it.
                       nil
                     (setq sv (car sv))))
@@ -693,5 +689,4 @@ Argument TARGETS are the targets we should depend on for TAGS."
 
 (provide 'ede/pmake)
 
-;; arch-tag: 7ad8e19f-cdee-484c-8caf-f15cb0fc4df2
 ;;; ede/pmake.el ends here