diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el index e68a3e9129e..50f80288288 100644 --- a/lisp/auth-source-pass.el +++ b/lisp/auth-source-pass.el @@ -149,7 +149,6 @@ HOSTS can be a string or a list of strings." (defvar auth-source-pass-backend (auth-source-backend - (when (<= emacs-major-version 25) "password-store") :source "." ;; not used :type 'password-store :search-function #'auth-source-pass-search) diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el index 89e83386879..fb21baf2985 100644 --- a/lisp/cedet/ede/config.el +++ b/lisp/cedet/ede/config.el @@ -154,14 +154,9 @@ the directory isn't on the `safe' list, ask to add it to the safe list." (when (file-exists-p fname) (message "Ignoring EDE config file for now and creating a new one. Use C-c . g to load it.") ;; Set how it was ignored. - (if loadask - (setq ignore-type 'manual) - (setq ignore-type 'auto)) - ) + (setq ignore-type (if loadask 'manual 'auto))) ;; Create a new one. - (setq config (make-instance class - "Configuration" - :file fname)) + (setq config (make-instance class :file fname)) (oset config ignored-file ignore-type) ;; Set initial values based on project. diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index a43bd2f6f2a..4616d196716 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -327,7 +327,7 @@ If one doesn't exist, create a new one for this directory." (ans (object-assoc dir :path targets)) ) (when (not ans) - (setq ans (ede-cpp-root-target dir + (setq ans (ede-cpp-root-target :name (file-name-nondirectory (directory-file-name dir)) :path dir diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el index bad8952ec60..1651b4d3ad3 100644 --- a/lisp/cedet/ede/locate.el +++ b/lisp/cedet/ede/locate.el @@ -89,7 +89,7 @@ based on `ede-locate-setup-options'." (when (called-interactively-p 'interactive) (message "Setting locator to ede-locate-base")) (setq ans 'ede-locate-base)) - (oset proj locate-obj (make-instance ans "Loc" :root root)) + (oset proj locate-obj (make-instance ans :root root)) (when (called-interactively-p 'interactive) (message "Setting locator to %s" ans)) )) diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el index f45cf1b8616..e66751ba9b1 100644 --- a/lisp/cedet/ede/project-am.el +++ b/lisp/cedet/ede/project-am.el @@ -480,7 +480,7 @@ This is used when subprojects are made in named subdirectories." (bug (nth 2 pi)) (cof (nth 3 pi)) (ampf (project-am-makefile - pn :name pn + :name pn :version ver :mailinglist (or bug "") :file fn))) diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el index 45e74c2b27a..3d3dfdc7975 100644 --- a/lisp/cedet/semantic/analyze/refs.el +++ b/lisp/cedet/semantic/analyze/refs.el @@ -89,8 +89,7 @@ Use `semantic-analyze-current-tag' to debug this fcn." (setq allhits (semantic--analyze-refs-full-lookup tag scope t)) - (semantic-analyze-references (semantic-tag-name tag) - :tag tag + (semantic-analyze-references :tag tag :tagdb db :scope scope :rawsearchdata allhits) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 81639b98176..659e30a45d9 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1256,8 +1256,7 @@ Use `semantic-analyze-current-tag' to debug this fcn." (setq allhits (semantic--analyze-refs-full-lookup tag scope t))) ;; (setq refs - (semantic-analyze-references (semantic-tag-name tag) - :tag tag + (semantic-analyze-references :tag tag :tagdb db :scope scope :rawsearchdata allhits)))) ;;) diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 736025e1d54..e0d16d6fbce 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1899,7 +1899,7 @@ completion text in ghost text." (mapcar (lambda (class) (let* ((C (intern (car class))) - (doc (documentation-property C 'variable-documentation)) + (doc (cl--class-docstring (cl--find-class C))) (doc1 (car (split-string doc "\n"))) ) (list 'const @@ -1930,7 +1930,7 @@ DEFAULT-TAG is a semantic tag or string to use as the default value. If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. HISTORY is a symbol representing a variable to store the history in." (semantic-complete-read-tag-engine - (semantic-collector-buffer-deep prompt :buffer (current-buffer)) + (semantic-collector-buffer-deep :buffer (current-buffer)) (semantic-displayer-traditional-with-focus-highlight) ;;(semantic-displayer-tooltip) prompt @@ -1952,7 +1952,7 @@ DEFAULT-TAG is a semantic tag or string to use as the default value. If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. HISTORY is a symbol representing a variable to store the history in." (semantic-complete-read-tag-engine - (semantic-collector-local-members prompt :buffer (current-buffer)) + (semantic-collector-local-members :buffer (current-buffer)) (semantic-displayer-traditional-with-focus-highlight) ;;(semantic-displayer-tooltip) prompt @@ -1974,8 +1974,7 @@ DEFAULT-TAG is a semantic tag or string to use as the default value. If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. HISTORY is a symbol representing a variable to store the history in." (semantic-complete-read-tag-engine - (semantic-collector-project-brutish prompt - :buffer (current-buffer) + (semantic-collector-project-brutish :buffer (current-buffer) :path (current-buffer) ) (semantic-displayer-traditional-with-focus-highlight) @@ -2049,7 +2048,6 @@ prompts. these are calculated from the CONTEXT variable passed in." (setq syms (nreverse (cdr (nreverse syms)))) (semantic-complete-read-tag-engine (semantic-collector-analyze-completions - prompt :buffer (oref context buffer) :context context) (semantic-displayer-traditional-with-focus-highlight) diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el index 3e34f4a1ea1..51e52afa64a 100644 --- a/lisp/cedet/semantic/db-ebrowse.el +++ b/lisp/cedet/semantic/db-ebrowse.el @@ -309,11 +309,7 @@ If there is no database for DIRECTORY available, then ) (if found (setq db found) - (setq db (make-instance - dbeC - directory - :ebrowse-struct ebd - )) + (setq db (make-instance dbeC :ebrowse-struct ebd)) (oset db reference-directory directory)) ;; Once we recycle or make a new DB, refresh the diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index f15e6e69cb0..3edbc4a2fcd 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -138,10 +138,6 @@ If DIRECTORY doesn't exist, create a new one." (unless db (setq db (make-instance dbc ; Create the database requested. Perhaps - (concat (file-name-nondirectory - (directory-file-name - directory)) - "/") :file fn :tables nil :semantic-tag-version semantic-tag-version :semanticdb-version semanticdb-file-version))) diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 62eb72af08f..92ddb65ef68 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -136,7 +136,7 @@ If there is no table, create one, and fill it in." ;; Make sure we have a cache object in the DB index. (when (not cache) ;; The object won't change as we fill it with stuff. - (setq cache (semanticdb-typecache (semanticdb-full-filename table))) + (setq cache (semanticdb-typecache)) (oset idx type-cache cache)) cache)) diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index ffbb3431a81..375e43f2561 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -188,7 +188,6 @@ If one doesn't exist, create it." (oref obj index) (let ((idx nil)) (setq idx (funcall semanticdb-default-find-index-class - (concat (eieio-object-name obj) " index") ;; Fill in the defaults :table obj )) @@ -413,7 +412,6 @@ If the table for FILE does not exist, create one." ;; This implementation will satisfy autoloaded classes ;; for tables. (setq newtab (funcall (oref db new-table-class) - (file-name-nondirectory file) :file (file-name-nondirectory file) )) (setf (slot-value newtab 'parent-db) db) @@ -486,7 +484,7 @@ other than :table." (if obj obj ;; Just return it. ;; No object, let's create a new one and return that. - (setq obj (funcall desired-class "Cache" :table table)) + (setq obj (make-instance desired-class :table table)) (object-add-to-list table 'cache obj) obj))) diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index 9fe499be83a..05f70583c2a 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -199,8 +199,7 @@ STATE is the current compilation state." (tag nil) (class nil) (table nil) - (STATE (srecode-compile-state (file-name-nondirectory - (buffer-file-name)))) + (STATE (srecode-compile-state)) (mode nil) (application nil) (framework nil) @@ -263,7 +262,7 @@ STATE is the current compilation state." ;; Create a compound dictionary value from "value". (require 'srecode/dictionary) (let ((cv (srecode-dictionary-compound-variable - name :value value))) + :value value))) (setq vars (cons (cons name cv) vars))) )) ) diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el index d49ccde24fa..63613969191 100644 --- a/lisp/cedet/srecode/cpp.el +++ b/lisp/cedet/srecode/cpp.el @@ -146,8 +146,7 @@ specified in a C file." (value-dict (srecode-dictionary-add-section-dictionary dict "VALUE"))) (srecode-semantic-apply-tag-to-dict - (srecode-semantic-tag (semantic-tag-name value-tag) - :prime value-tag) + (srecode-semantic-tag :prime value-tag) value-dict)) ;; Discriminate using statements referring to namespaces and @@ -224,8 +223,7 @@ specified in a C file." (let ((template-dict (srecode-dictionary-add-section-dictionary templates-dict "ARGS"))) (srecode-semantic-apply-tag-to-dict - (srecode-semantic-tag (semantic-tag-name template) - :prime template) + (srecode-semantic-tag :prime template) template-dict))))) ) diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 2fbed835bdd..bac3b7c48d3 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -369,7 +369,7 @@ values but STATE is nil." (srecode-dictionary-set-value dict name (srecode-dictionary-compound-variable - name :value value :state state))))) + :value value :state state))))) (setq entries (nthcdr 2 entries))) dict) @@ -536,7 +536,7 @@ inserted with a new editable field.") (error "Unknown default value for value %S" name))) ;; Create a field from the inserter. - (srecode-field name :name name + (srecode-field :name name :start start :end (point) :prompt (oref sti prompt) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index a28a4f0e63c..7189ad27c92 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -648,8 +648,7 @@ Use DICTIONARY to resolve values." Use DICTIONARY to resolve values." (let* ((default (srecode-insert-ask-default sti dictionary)) (compound-value - (srecode-field-value (oref sti object-name) - :firstinserter sti + (srecode-field-value :firstinserter sti :defaultvalue default)) ) ;; Return this special compound value as the thing to insert. diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el index bfacda54557..1db041cdfd0 100644 --- a/lisp/cedet/srecode/semantic.el +++ b/lisp/cedet/srecode/semantic.el @@ -129,8 +129,7 @@ variable default values, and other things." larg nil nil))) ;; Apply the sub-argument to the subdictionary. (srecode-semantic-apply-tag-to-dict - (srecode-semantic-tag (semantic-tag-name larg) - :prime larg) + (srecode-semantic-tag :prime larg) subdict) ) ;; Next! @@ -203,8 +202,7 @@ variable default values, and other things." (when (not tag) (error "No tag for current template. Use the semantic kill-ring")) (srecode-semantic-apply-tag-to-dict - (srecode-semantic-tag (semantic-tag-name tag) - :prime tag) + (srecode-semantic-tag :prime tag) dict))) ;;; :tagtype ARGUMENT HANDLING @@ -394,7 +392,7 @@ as `function' will leave point where code might be inserted." ;; Resolve TAG into the dictionary. We may have a :tag arg ;; from the macro such that we don't need to do this. (when (not (srecode-dictionary-lookup-name dict "TAG")) - (let ((tagobj (srecode-semantic-tag (semantic-tag-name tag) :prime tag)) + (let ((tagobj (srecode-semantic-tag :prime tag)) ) (srecode-semantic-apply-tag-to-dict tagobj dict))) diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el index ba87c0a01d2..6f98038b614 100644 --- a/lisp/cedet/srecode/table.el +++ b/lisp/cedet/srecode/table.el @@ -180,7 +180,6 @@ INIT are the initialization parameters for the new template table." (old (srecode-mode-table-find mt file)) (attr (file-attributes file)) (new (apply #'srecode-template-table - (file-name-nondirectory file) :file file :filesize (file-attribute-size attr) :filedate (file-attribute-modification-time attr)