emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj-comp.el


From: Chong Yidong
Subject: [Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj-comp.el
Date: Sun, 04 Oct 2009 14:25:47 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/04 14:25:46

Modified files:
        lisp           : ChangeLog 
        lisp/cedet/ede : proj-comp.el 

Log message:
        * cedet/ede/proj-comp.el:  Don't require ede/pmake at toplevel.
        (ede-proj-makefile-insert-variables): Require ede/pmake.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16347&r2=1.16348
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/proj-comp.el?cvsroot=emacs&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16347
retrieving revision 1.16348
diff -u -b -r1.16347 -r1.16348
--- ChangeLog   4 Oct 2009 12:16:36 -0000       1.16347
+++ ChangeLog   4 Oct 2009 14:25:42 -0000       1.16348
@@ -1,3 +1,8 @@
+2009-10-04  Chong Yidong  <address@hidden>
+
+       * cedet/ede/proj-comp.el:  Don't require ede/pmake at toplevel.
+       (ede-proj-makefile-insert-variables): Require ede/pmake.
+
 2009-10-04  Michael Albinus  <address@hidden>
 
        * files.el (copy-directory): New defun.

Index: cedet/ede/proj-comp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/proj-comp.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/ede/proj-comp.el      3 Oct 2009 19:28:09 -0000       1.5
+++ cedet/ede/proj-comp.el      4 Oct 2009 14:25:46 -0000       1.6
@@ -46,7 +46,7 @@
 
 (require 'ede)                         ;source object
 (require 'ede/autoconf-edit)
-(eval-when-compile (require 'ede/pmake))
+(declare-function ede-pmake-insert-variable-once "ede/pmake")
 
 ;;; Types:
 (defclass ede-compilation-program (eieio-instance-inheritor)
@@ -253,6 +253,7 @@
 
 (defmethod ede-proj-makefile-insert-variables ((this ede-compilation-program))
   "Insert variables needed by the compiler THIS."
+  (require 'ede/pmake)
   (if (eieio-instance-inheritor-slot-boundp this 'variables)
       (with-slots (variables) this
        (mapcar




reply via email to

[Prev in Thread] Current Thread [Next in Thread]