diff options
Diffstat (limited to 'lisp/obsolete/vc-arch.el')
| -rw-r--r-- | lisp/obsolete/vc-arch.el | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el index 80a2094d804..00e7d26cd75 100644 --- a/lisp/obsolete/vc-arch.el +++ b/lisp/obsolete/vc-arch.el @@ -81,8 +81,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "23.1" - :group 'vc-arch) + :version "23.1") (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1") @@ -92,8 +91,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (setq candidates (cdr candidates))) (or (car candidates) "tla")) "Name of the Arch executable." - :type 'string - :group 'vc-arch) + :type 'string) ;; Clear up the cache to force vc-call to check again and discover ;; new functions when we reload this file. @@ -341,7 +339,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see ("--" . permissions-changed) ("-/" . permissions-changed) ;directory )) - (state-map-regexp (regexp-opt (mapcar 'car state-map) t)) + (state-map-regexp (regexp-opt (mapcar #'car state-map) t)) (entry-regexp (concat "^" state-map-regexp " \\(.*\\)$")) result) (goto-char (point-min)) @@ -387,8 +385,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (defcustom vc-arch-mode-line-rewrite '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]")) "Rewrite rules to shorten Arch's revision names on the mode-line." - :type '(repeat (cons regexp string)) - :group 'vc-arch) + :type '(repeat (cons regexp string))) (defun vc-arch-mode-line-string (file) "Return a string for `vc-mode-line' to put in the mode line for FILE." @@ -420,7 +417,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see ;; The .rej file is obsolete. (condition-case nil (delete-file rej) (error nil)) ;; Remove the hook so that it is not called multiple times. - (remove-hook 'after-save-hook 'vc-arch-delete-rej-if-obsolete t)))))) + (remove-hook 'after-save-hook #'vc-arch-delete-rej-if-obsolete t)))))) (defun vc-arch-find-file-hook () (let ((rej (concat buffer-file-name ".rej"))) @@ -433,7 +430,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (condition-case nil (delete-file rej) (error nil)) (smerge-mode 1) (add-hook 'after-save-hook - 'vc-arch-delete-rej-if-obsolete nil t) + #'vc-arch-delete-rej-if-obsolete nil t) (message "There are unresolved conflicts in this file"))) (message "There are unresolved conflicts in %s" (file-name-nondirectory rej)))))) @@ -488,11 +485,11 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (defun vc-arch-rename-file (old new) (vc-arch-command nil 0 new "mv" (file-relative-name old))) -(defalias 'vc-arch-responsible-p 'vc-arch-root) +(defalias 'vc-arch-responsible-p #'vc-arch-root) (defun vc-arch-command (buffer okstatus file &rest flags) "A wrapper around `vc-do-command' for use in vc-arch.el." - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-arch-program file flags)) + (apply #'vc-do-command (or buffer "*vc*") okstatus vc-arch-program file flags)) ;;; Completion of versions and revisions. @@ -571,7 +568,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (when (string-match "-\\([0-9]+\\)\\'" f) (cons (string-to-number (match-string 1 f)) f))) (directory-files dir nil nil 'nosort))) - 'car-less-than-car)) + #'car-less-than-car)) (subdirs nil)) (when (cddr revs) (dotimes (_i (/ (length revs) 2)) @@ -600,26 +597,26 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (let* ((archives (directory-files rl-dir 'full directory-files-no-dot-files-regexp)) (categories - (apply 'append + (apply #'append (mapcar (lambda (dir) (when (file-directory-p dir) (directory-files dir 'full directory-files-no-dot-files-regexp))) archives))) (branches - (apply 'append + (apply #'append (mapcar (lambda (dir) (when (file-directory-p dir) (directory-files dir 'full directory-files-no-dot-files-regexp))) categories))) (versions - (apply 'append + (apply #'append (mapcar (lambda (dir) (when (file-directory-p dir) (directory-files dir 'full "--.*--"))) branches)))) - (mapc 'vc-arch-trim-one-revlib versions)) + (mapc #'vc-arch-trim-one-revlib versions)) )) (defvar vc-arch-extra-menu-map |