Move “Fix some broken conditional forms” to master

Revert 2020-01-04T19:17:12Z!eggert@cs.ucla.edu
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.

2 files changed, 17 insertions, 3 deletions

diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index f0dbccb7fc1..ee8aa5db1b7 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -478,6 +478,21 @@ Argument COMMAND is the command to use for compiling the target."
   "Don't rescan this project from the sources."
   (message "cpp-root has nothing to rescan."))
 
+;;; Quick Hack
+(defun ede-create-lots-of-projects-under-dir (dir projfile &rest attributes)
+  "Create a bunch of projects under directory DIR.
+PROJFILE is a file name sans directory that indicates a subdirectory
+is a project directory.
+Generic ATTRIBUTES, such as :include-path can be added.
+Note: This needs some work."
+  (let ((files (directory-files dir t)))
+    (dolist (F files)
+      (if (file-exists-p (expand-file-name projfile F))
+          `(ede-cpp-root-project (file-name-nondirectory F)
+                                 :name (file-name-nondirectory F)
+                                 :file (expand-file-name projfile F)
+                                 attributes)))))
+
 (provide 'ede/cpp-root)
 
 ;; Local variables:
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index b85b397af2d..63fb62b5a57 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -56,9 +56,8 @@ don't do it.  A value of nil means to just do it.")
             (and (eq ede-pconf-create-file-query 'ask)
                  (not (eq ede-pconf-create-file-query 'never))
                  (not (y-or-n-p
-                       (format "I had to create the %s file for you.  Ok? "
-                               file))))
-          (error "Quit"))))))
+                       (format "I had to create the %s file for you.  Ok? " file)))
+                 (error "Quit")))))))
 
 
 (cl-defmethod ede-proj-configure-synchronize ((this ede-proj-project))