diff options
Diffstat (limited to 'lisp/cedet/ede')
| -rw-r--r-- | lisp/cedet/ede/base.el | 4 | ||||
| -rw-r--r-- | lisp/cedet/ede/emacs.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/files.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/proj-elisp.el | 3 | ||||
| -rw-r--r-- | lisp/cedet/ede/project-am.el | 3 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index 9d23909d62e..27016f0f5cc 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -204,7 +204,7 @@ This is a URL to be sent to a web site for documentation.") :group name :documentation "A directory where web pages can be found by Emacs. -For remote locations use a path compatible with ange-ftp or EFS. +For remote locations use a path compatible with ange-ftp. You can also use TRAMP for use with rcp & scp.") (web-site-file :initarg :web-site-file :initform "" @@ -214,7 +214,7 @@ You can also use TRAMP for use with rcp & scp.") :documentation "A file which contains the website for this project. This file can be relative to slot `web-site-directory'. -This can be a local file, use ange-ftp, EFS, or TRAMP.") +This can be a local file, use ange-ftp or TRAMP.") (ftp-site :initarg :ftp-site :initform "" :type string diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el index 5a23f504f78..cbe766cedb6 100644 --- a/lisp/cedet/ede/emacs.el +++ b/lisp/cedet/ede/emacs.el @@ -59,7 +59,7 @@ Return a tuple of ( EMACSNAME . VERSION )." (file-exists-p (setq configure_ac "configure.in"))) (insert-file-contents configure_ac) (goto-char (point-min)) - (re-search-forward "AC_INIT(\\(?:GNU \\)?[eE]macs,\\s-*\\([0-9.]+\\)\\s-*[,)]") + (re-search-forward "AC_INIT(\\[?\\(?:GNU \\)?[eE]macs]?,\\s-*\\[?\\([0-9.]+\\)]?\\s-*[,)]") (setq ver (match-string 1)) ) ) diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 3b9002a6e31..b8acb192c17 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -257,7 +257,7 @@ If optional EXACT is non-nil, only return exact matches for DIR." (defun ede-flush-directory-hash () "Flush the project directory hash. Do this only when developing new projects that are incorrectly putting -'nomatch tokens into the hash." +`nomatch' tokens into the hash." (interactive) (setq ede-project-directory-hash (make-hash-table :test 'equal)) ;; Also slush the current project's locator hash. diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el index 0c65af15c4a..7c56ca19936 100644 --- a/lisp/cedet/ede/proj-elisp.el +++ b/lisp/cedet/ede/proj-elisp.el @@ -319,8 +319,7 @@ Lays claim to all .elc files that match .el files in this target." ("require" . "$(foreach r,$(1),(require (quote $(r))))")) :commands '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \ ---eval '(setq generated-autoload-file \"$(abspath $(LOADDEFS))\")' \ --f batch-update-autoloads $(abspath $(LOADDIRS))") +-f loaddefs-generate-batch $(abspath $(LOADDEFS)) $(abspath $(LOADDIRS))") :rules (list (ede-makefile-rule :target "clean-autoloads" :phony t :rules '("rm -f $(LOADDEFS)"))) :sourcetype '(ede-source-emacs) ) diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el index 2803e1c3071..544e39b8729 100644 --- a/lisp/cedet/ede/project-am.el +++ b/lisp/cedet/ede/project-am.el @@ -191,8 +191,9 @@ other meta-variable based on this name.") "Encode one makefile.") ;;; Code: -(cl-defmethod project-add-file ((ot project-am-target)) +(cl-defmethod project-add-file ((ot project-am-target) &optional _file) "Add the current buffer into a project. +_FILE is ignored. OT is the object target. DIR is the directory to start in." (let* ((target (if ede-object (error "Already associated w/ a target") (let ((amf (project-am-load default-directory))) |