diff options
Diffstat (limited to 'lisp/vc')
38 files changed, 935 insertions, 1009 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 19765e0da34..2e20284951f 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -1,4 +1,4 @@ -;;; add-log.el --- change log maintenance commands for Emacs +;;; add-log.el --- change log maintenance commands for Emacs -*- lexical-binding: t; -*- ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2021 Free ;; Software Foundation, Inc. @@ -49,15 +49,13 @@ (defcustom change-log-default-name nil "Name of a change log file for \\[add-change-log-entry]." :type '(choice (const :tag "default" nil) - string) - :group 'change-log) + string)) ;;;###autoload -(put 'change-log-default-name 'safe-local-variable 'string-or-null-p) +(put 'change-log-default-name 'safe-local-variable #'string-or-null-p) (defcustom change-log-mode-hook nil "Normal hook run by `change-log-mode'." - :type 'hook - :group 'change-log) + :type 'hook) ;; Many modes set this variable, so avoid warnings. ;;;###autoload @@ -66,16 +64,14 @@ It is called by `add-log-current-defun' with no argument, and should return the function's name as a string, or nil if point is outside a function." - :type '(choice (const nil) function) - :group 'change-log) + :type '(choice (const nil) function)) ;;;###autoload (defcustom add-log-full-name nil "Full name of user, for inclusion in ChangeLog daily headers. This defaults to the value returned by the function `user-full-name'." :type '(choice (const :tag "Default" nil) - string) - :group 'change-log) + string)) ;;;###autoload (defcustom add-log-mailing-address nil @@ -86,8 +82,7 @@ will be recognized as referring to the same user; when creating a new ChangeLog entry, one element will be chosen at random." :type '(choice (const :tag "Default" nil) (string :tag "String") - (repeat :tag "List of Strings" string)) - :group 'change-log) + (repeat :tag "List of Strings" string))) (defcustom add-log-time-format 'add-log-iso8601-time-string "Function that defines the time format. @@ -98,8 +93,7 @@ and `current-time-string' are two valid values." add-log-iso8601-time-string) (const :tag "Old format, as returned by `current-time-string'" current-time-string) - (function :tag "Other")) - :group 'change-log) + (function :tag "Other"))) (defcustom add-log-keep-changes-together nil "If non-nil, normally keep day's log entries for one file together. @@ -130,14 +124,12 @@ and in the former: The NEW-ENTRY arg to `add-change-log-entry' can override the effect of this variable." :version "20.3" - :type 'boolean - :group 'change-log) + :type 'boolean) (defcustom add-log-always-start-new-record nil "If non-nil, `add-change-log-entry' will always start a new record." :version "22.1" - :type 'boolean - :group 'change-log) + :type 'boolean) (defvar add-log-buffer-file-name-function 'buffer-file-name "If non-nil, function to call to identify the full filename of a buffer. @@ -149,15 +141,13 @@ use `buffer-file-name'.") This function is called with one argument, the value of variable `buffer-file-name' in that buffer. If this is nil, the default is to use the file's name relative to the directory of the change log file." - :type '(choice (const nil) function) - :group 'change-log) + :type '(choice (const nil) function)) (defcustom change-log-version-info-enabled nil "If non-nil, enable recording version numbers with the changes." :version "21.1" - :type 'boolean - :group 'change-log) + :type 'boolean) (defcustom change-log-version-number-regexp-list (let ((re "\\([0-9]+\\.[0-9.]+\\)")) @@ -170,64 +160,54 @@ use the file's name relative to the directory of the change log file." The version number must be in group 1. Note: The search is conducted only within 10%, at the beginning of the file." :version "21.1" - :type '(repeat regexp) - :group 'change-log) + :type '(repeat regexp)) (defcustom change-log-directory-files '(".bzr" ".git" ".hg" ".svn") "List of files that cause `find-change-log' to stop in containing directory. This applies if no pre-existing ChangeLog is found. If nil, then in such a case simply use the directory containing the changed file." :version "26.1" - :type '(repeat file) - :group 'change-log) + :type '(repeat file)) (defface change-log-date '((t (:inherit font-lock-string-face))) "Face used to highlight dates in date lines." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-name '((t (:inherit font-lock-constant-face))) "Face for highlighting author names." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-email '((t (:inherit font-lock-variable-name-face))) "Face for highlighting author email addresses." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-file '((t (:inherit font-lock-function-name-face))) "Face for highlighting file names." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-list '((t (:inherit font-lock-keyword-face))) "Face for highlighting parenthesized lists of functions or variables." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-conditionals '((t (:inherit font-lock-variable-name-face))) "Face for highlighting conditionals of the form `[...]'." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-function '((t (:inherit font-lock-variable-name-face))) "Face for highlighting items of the form `<....>'." - :version "21.1" - :group 'change-log) + :version "21.1") (defface change-log-acknowledgment '((t (:inherit font-lock-comment-face))) "Face for highlighting acknowledgments." - :version "21.1" - :group 'change-log) + :version "21.1") (define-obsolete-face-alias 'change-log-acknowledgement 'change-log-acknowledgment "24.3") @@ -519,7 +499,7 @@ try to visit the file for the change under `point' instead." change-log-find-tail) (setq change-log-find-tail (condition-case nil - (apply 'change-log-goto-source-1 + (apply #'change-log-goto-source-1 (append change-log-find-head change-log-find-tail)) (error (format-message @@ -556,7 +536,7 @@ try to visit the file for the change under `point' instead." file (find-file-noselect file))) (condition-case nil (setq change-log-find-tail - (apply 'change-log-goto-source-1 change-log-find-head)) + (apply #'change-log-goto-source-1 change-log-find-head)) (error (format-message "Cannot find matches for tag `%s' in file `%s'" tag file))))))))) @@ -569,7 +549,7 @@ Compatibility function for \\[next-error] invocations." (count (abs argp)) ; how many cycles (down (< argp 0)) ; are we going down? (is argp negative?) (up (not down)) - (search-function (if up 're-search-forward 're-search-backward))) + (search-function (if up #'re-search-forward #'re-search-backward))) ;; set the starting position (goto-char (cond (reset (point-min)) @@ -589,29 +569,27 @@ Compatibility function for \\[next-error] invocations." (select-window change-log-find-window))))) (defvar change-log-mode-map - (let ((map (make-sparse-keymap)) - (menu-map (make-sparse-keymap))) - (define-key map [?\C-c ?\C-p] 'add-log-edit-prev-comment) - (define-key map [?\C-c ?\C-n] 'add-log-edit-next-comment) - (define-key map [?\C-c ?\C-f] 'change-log-find-file) - (define-key map [?\C-c ?\C-c] 'change-log-goto-source) - (define-key map [menu-bar changelog] (cons "ChangeLog" menu-map)) - (define-key menu-map [gs] - '(menu-item "Go To Source" change-log-goto-source - :help "Go to source location of ChangeLog tag near point")) - (define-key menu-map [ff] - '(menu-item "Find File" change-log-find-file - :help "Visit the file for the change under point")) - (define-key menu-map [sep] '("--")) - (define-key menu-map [nx] - '(menu-item "Next Log-Edit Comment" add-log-edit-next-comment - :help "Cycle forward through Log-Edit mode comment history")) - (define-key menu-map [pr] - '(menu-item "Previous Log-Edit Comment" add-log-edit-prev-comment - :help "Cycle backward through Log-Edit mode comment history")) + (let ((map (make-sparse-keymap))) + (define-key map [?\C-c ?\C-p] #'add-log-edit-prev-comment) + (define-key map [?\C-c ?\C-n] #'add-log-edit-next-comment) + (define-key map [?\C-c ?\C-f] #'change-log-find-file) + (define-key map [?\C-c ?\C-c] #'change-log-goto-source) map) "Keymap for Change Log major mode.") +(easy-menu-define change-log-mode-menu change-log-mode-map + "Menu for Change Log major mode." + '("ChangeLog" + ["Previous Log-Edit Comment" add-log-edit-prev-comment + :help "Cycle backward through Log-Edit mode comment history"] + ["Next Log-Edit Comment" add-log-edit-next-comment + :help "Cycle forward through Log-Edit mode comment history"] + "---" + ["Find File" change-log-find-file + :help "Visit the file for the change under point"] + ["Go To Source" change-log-goto-source + :help "Go to source location of ChangeLog tag near point"])) + ;; It used to be called change-log-time-zone-rule but really should be ;; called add-log-time-zone-rule since it's only used from add-log-* code. (defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule) @@ -814,7 +792,7 @@ means to put log entries in a suitably named buffer." :type 'boolean :version "27.1") -(put 'add-log-dont-create-changelog-file 'safe-local-variable 'booleanp) +(put 'add-log-dont-create-changelog-file 'safe-local-variable #'booleanp) (defun add-log--pseudo-changelog-buffer-name (changelog-file-name) "Compute a suitable name for a non-file visiting ChangeLog buffer. @@ -1216,12 +1194,11 @@ file were isearch was started." (forward-paragraph n))) (defcustom add-log-current-defun-header-regexp - "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]" + "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alnum:]]*[[:alpha:]][-_[:alnum:]]*\\)[ \t]*[:=]" "Heuristic regexp used by `add-log-current-defun' for unknown major modes. The regexp's first submatch is placed in the ChangeLog entry, in parentheses." - :type 'regexp - :group 'change-log) + :type 'regexp) (declare-function c-cpp-define-name "cc-cmds" ()) (declare-function c-defun-name "cc-cmds" ()) diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el index 932dcd78920..4c1d9eaad55 100644 --- a/lisp/vc/compare-w.el +++ b/lisp/vc/compare-w.el @@ -1,4 +1,4 @@ -;;; compare-w.el --- compare text between windows for Emacs +;;; compare-w.el --- compare text between windows for Emacs -*- lexical-binding: t; -*- ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2021 Free Software ;; Foundation, Inc. @@ -52,19 +52,16 @@ any text before that point. If the function returns the same value for both windows, then the whitespace is considered to match, and is skipped." :version "24.4" ; added \240 - :type '(choice regexp function) - :group 'compare-windows) + :type '(choice regexp function)) (defcustom compare-ignore-whitespace nil "Non-nil means command `compare-windows' ignores whitespace." :type 'boolean - :group 'compare-windows :version "22.1") (defcustom compare-ignore-case nil "Non-nil means command `compare-windows' ignores case differences." - :type 'boolean - :group 'compare-windows) + :type 'boolean) (defcustom compare-windows-sync 'compare-windows-sync-default-function "Function or regexp that is used to synchronize points in two @@ -92,7 +89,6 @@ If the value of this variable is nil (option \"No sync\"), then no synchronization is performed, and the function `ding' is called to beep or flash the screen when points are mismatched." :type '(choice function regexp (const :tag "No sync" nil)) - :group 'compare-windows :version "22.1") (defcustom compare-windows-sync-string-size 32 @@ -104,7 +100,6 @@ difference regions more coarse-grained. The default value 32 is good for the most cases." :type 'integer - :group 'compare-windows :version "22.1") (defcustom compare-windows-recenter nil @@ -115,7 +110,6 @@ matching points side-by-side. The value `(-1 0)' is useful if windows are split vertically, and the value `((4) (4))' for horizontally split windows." :type '(list sexp sexp) - :group 'compare-windows :version "22.1") (defcustom compare-windows-highlight t @@ -127,19 +121,16 @@ out all highlighting later with the command `compare-windows-dehighlight'." :type '(choice (const :tag "No highlighting" nil) (const :tag "Persistent highlighting" persistent) (other :tag "Highlight until next command" t)) - :group 'compare-windows :version "22.1") (defface compare-windows-removed '((t :inherit diff-removed)) "Face for highlighting `compare-windows' differing regions in the other window." - :group 'compare-windows :version "25.1") (defface compare-windows-added '((t :inherit diff-added)) "Face for highlighting `compare-windows' differing regions in current window." - :group 'compare-windows :version "25.1") (define-obsolete-face-alias 'compare-windows 'compare-windows-added "25.1") @@ -159,7 +150,6 @@ out all highlighting later with the command `compare-windows-dehighlight'." (function-item :tag "Next window" compare-windows-get-next-window) (function :tag "Your function")) - :group 'compare-windows :version "25.1") (defun compare-windows-get-recent-window () @@ -389,7 +379,7 @@ on third call it again advances points to the next difference and so on." (setq p1 (1+ p1))))) (when p12s ;; use closest matching points (i.e. points with minimal sum) - (setq p12 (cdr (assq (apply 'min (mapcar 'car p12s)) p12s))) + (setq p12 (cdr (assq (apply #'min (mapcar #'car p12s)) p12s))) (goto-char (car p12)) (compare-windows-highlight op1 (car p12) (current-buffer) w1 op2 (cadr p12) b2 w2)) @@ -416,7 +406,7 @@ on third call it again advances points to the next difference and so on." (overlay-put compare-windows-overlay2 'window w2) (if (not (eq compare-windows-highlight 'persistent)) ;; Remove highlighting before next command is executed - (add-hook 'pre-command-hook 'compare-windows-dehighlight) + (add-hook 'pre-command-hook #'compare-windows-dehighlight) (when compare-windows-overlay1 (push (copy-overlay compare-windows-overlay1) compare-windows-overlays1) (delete-overlay compare-windows-overlay1)) @@ -427,9 +417,9 @@ on third call it again advances points to the next difference and so on." (defun compare-windows-dehighlight () "Remove highlighting created by function `compare-windows-highlight'." (interactive) - (remove-hook 'pre-command-hook 'compare-windows-dehighlight) - (mapc 'delete-overlay compare-windows-overlays1) - (mapc 'delete-overlay compare-windows-overlays2) + (remove-hook 'pre-command-hook #'compare-windows-dehighlight) + (mapc #'delete-overlay compare-windows-overlays1) + (mapc #'delete-overlay compare-windows-overlays2) (and compare-windows-overlay1 (delete-overlay compare-windows-overlay1)) (and compare-windows-overlay2 (delete-overlay compare-windows-overlay2))) diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index 26fb6206c80..63b886362ba 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el @@ -28,7 +28,7 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) +(require 'cl-lib) (require 'pcvs-util) ;;; @@ -169,7 +169,7 @@ name type) -(defsubst cvs-status-vl-to-str (vl) (mapconcat 'number-to-string vl ".")) +(defsubst cvs-status-vl-to-str (vl) (mapconcat #'number-to-string vl ".")) (defun cvs-tag->string (tag) (if (stringp tag) tag @@ -283,7 +283,7 @@ BEWARE: because of stability issues, this is not a symmetric operation." tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2))))))))) (defun cvs-tag-make-tag (tag) - (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\.")))) + (let ((vl (mapcar #'string-to-number (split-string (nth 2 tag) "\\.")))) (cvs-tag-make vl (nth 0 tag) (intern (nth 1 tag))))) (defun cvs-tags->tree (tags) @@ -450,10 +450,10 @@ Optional prefix ARG chooses between two representations." (tags nil) (cvs-tree-nomerge (if arg (not cvs-tree-nomerge) cvs-tree-nomerge))) (while (listp (setq tags (cvs-status-get-tags))) - (let ((tags (mapcar 'cvs-tag-make-tag tags)) + (let ((tags (mapcar #'cvs-tag-make-tag tags)) ;;(pt (save-excursion (forward-line -1) (point))) ) - (setq tags (sort tags 'cvs-tag-lessp)) + (setq tags (sort tags #'cvs-tag-lessp)) (let* ((first (car tags)) (prev (if (cvs-tag-p first) (list (car (cvs-tag->vlist first))) nil))) @@ -472,7 +472,7 @@ Optional prefix ARG chooses between two representations." (nprev (if (and cvs-tree-nomerge next (equal vlist (cvs-tag->vlist next))) prev vlist))) - (cvs-map (lambda (v _p) v) nprev prev))) + (cl-mapcar (lambda (v _p) v) nprev prev))) (after (save-excursion (newline) (cvs-tree-tags-insert (cdr tags) nprev))) @@ -484,7 +484,7 @@ Optional prefix ARG chooses between two representations." (as after (cdr as))) ((and (null as) (null vs) (null ps)) (let ((revname (cvs-status-vl-to-str vlist))) - (if (cvs-every 'identity (cvs-map 'equal prev vlist)) + (if (cl-every #'identity (cl-mapcar #'equal prev vlist)) (insert (make-string (+ 4 (length revname)) ? ) (or (cvs-tag->name tag) "")) (insert " " revname ": " (or (cvs-tag->name tag) ""))))) @@ -500,7 +500,7 @@ Optional prefix ARG chooses between two representations." (if next-eq (cons nil cvs-tree-char-space) (cons t cvs-tree-char-eob)) (cons nil (if (and (eq (cvs-tag->type tag) 'branch) - (cvs-every 'null as)) + (cl-every #'null as)) cvs-tree-char-space cvs-tree-char-hbar)))))) (insert (cdr na+char)) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 7a474201811..eeb32f8fe50 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -357,6 +357,18 @@ well." :foreground "green" :extend t)) "`diff-mode' face used to highlight added lines.") +(defface diff-changed-unspecified + '((default + :inherit diff-changed) + (((class color) (min-colors 88) (background light)) + :background "grey90" :extend t) + (((class color) (min-colors 88) (background dark)) + :background "grey20" :extend t) + (((class color)) + :foreground "grey" :extend t)) + "`diff-mode' face used to highlight changed lines." + :version "28.1") + (defface diff-changed '((t nil)) "`diff-mode' face used to highlight changed lines." @@ -436,9 +448,10 @@ well." (defvar diff-use-changed-face (and (face-differs-from-default-p 'diff-changed) (not (face-equal 'diff-changed 'diff-added)) (not (face-equal 'diff-changed 'diff-removed))) - "If non-nil, use the face `diff-changed' for changed lines in context diffs. -Otherwise, use the face `diff-removed' for removed lines, -and the face `diff-added' for added lines.") + "Controls how changed lines are fontified in context diffs. +If non-nil, use the face `diff-changed-unspecified'. Otherwise, +use the face `diff-removed' for removed lines, and the face +`diff-added' for added lines.") (defvar diff-font-lock-keywords `((,(concat "\\(" diff-hunk-header-re-unified "\\)\\(.*\\)$") @@ -470,7 +483,7 @@ and the face `diff-added' for added lines.") diff-indicator-added-face diff-indicator-removed-face))))) (2 (if diff-use-changed-face - 'diff-changed + 'diff-changed-unspecified ;; Otherwise, use the same method as above. (save-match-data (let ((limit (save-excursion (diff-beginning-of-hunk)))) @@ -739,7 +752,7 @@ start and end positions." "Restrict the view to the current hunk. If the prefix ARG is given, restrict the view to the current file instead." (interactive "P") - (apply 'narrow-to-region + (apply #'narrow-to-region (if arg (diff-bounds-of-file) (diff-bounds-of-hunk))) (setq-local diff-narrowed-to (if arg 'file 'hunk))) @@ -770,7 +783,7 @@ If the prefix ARG is given, restrict the view to the current file instead." file-bounds hunk-bounds)) (inhibit-read-only t)) - (apply 'kill-region bounds) + (apply #'kill-region bounds) (goto-char (car bounds)) (ignore-errors (diff-beginning-of-hunk t))))) @@ -828,7 +841,7 @@ data such as \"Index: ...\" and such." (error "No hunks") (diff-beginning-of-hunk t) (let ((inhibit-read-only t)) - (apply 'kill-region (diff-bounds-of-file))) + (apply #'kill-region (diff-bounds-of-file))) (ignore-errors (diff-beginning-of-hunk t)))) (defun diff-kill-junk () @@ -956,11 +969,11 @@ If the OLD prefix arg is passed, tell the file NAME of the old file." (list (match-string 1))) header-files ;; this assumes that there are no spaces in filenames - (when (re-search-backward - "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?" - nil t) - (list (if old (match-string 2) (match-string 4)) - (if old (match-string 4) (match-string 2))))))))) + (and (re-search-backward "^diff " nil t) + (looking-at + "^diff \\(-[^ \t\nL]+ +\\)*\\(-L +\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?") + (list (if old (match-string 3) (match-string 5)) + (if old (match-string 4) (match-string 3))))))))) (defun diff-find-file-name (&optional old noprompt prefix) "Return the file corresponding to the current patch. @@ -1767,13 +1780,26 @@ char-offset in TEXT." (delete-region (point-min) keep)) ;; Remove line-prefix characters, and unneeded lines (unified diffs). ;; Also skip lines like "\ No newline at end of file" - (let ((kill-chars (list (if destp ?- ?+) ?\\))) + (let ((kill-chars (list (if destp ?- ?+) ?\\)) + curr-char last-char) (goto-char (point-min)) (while (not (eobp)) - (if (memq (char-after) kill-chars) - (delete-region (point) (progn (forward-line 1) (point))) + (setq curr-char (char-after)) + (if (memq curr-char kill-chars) + (delete-region + ;; Check for "\ No newline at end of file" + (if (and (eq curr-char ?\\) + (not (eq last-char (if destp ?- ?+))) + (save-excursion + (forward-line 1) + (or (eobp) (and (eq last-char ?-) + (eq (char-after) ?+))))) + (max (1- (point)) (point-min)) + (point)) + (progn (forward-line 1) (point))) (delete-char num-pfx-chars) - (forward-line 1))))) + (forward-line 1)) + (setq last-char curr-char)))) (let ((text (buffer-substring-no-properties (point-min) (point-max)))) (if char-offset (cons text (- (point) (point-min))) text)))))) @@ -1810,7 +1836,7 @@ Whitespace differences are ignored." (if (> (- (car forw) orig) (- orig (car back))) back forw) (or back forw)))) -(define-obsolete-function-alias 'diff-xor 'xor "27.1") +(define-obsolete-function-alias 'diff-xor #'xor "27.1") (defun diff-find-source-location (&optional other-file reverse noprompt) "Find current diff location within the source file. @@ -1984,7 +2010,7 @@ With a prefix argument, try to REVERSE the hunk." (diff-hunk-kill) (diff-hunk-next))))) -(defalias 'diff-mouse-goto-source 'diff-goto-source) +(defalias 'diff-mouse-goto-source #'diff-goto-source) (defun diff-goto-source (&optional other-file event) "Jump to the corresponding source line. @@ -2003,7 +2029,7 @@ revision of the file otherwise." (if event (posn-set-point (event-end event))) (let ((buffer (when event (current-buffer))) (reverse (not (save-excursion (beginning-of-line) (looking-at "[-<]"))))) - (pcase-let ((`(,buf ,line-offset ,pos ,src ,_dst ,switched) + (pcase-let ((`(,buf ,_line-offset ,pos ,src ,_dst ,_switched) (diff-find-source-location other-file reverse))) (pop-to-buffer buf) (goto-char (+ (car pos) (cdr src))) @@ -2080,7 +2106,7 @@ For use in `add-log-current-defun-function'." (write-region (concat lead (car new)) nil file2 nil 'nomessage) (with-temp-buffer (let ((status - (apply 'call-process + (apply #'call-process `(,diff-command nil t nil ,@opts ,file1 ,file2)))) (pcase status @@ -2252,17 +2278,20 @@ Call FUN with two args (BEG and END) for each hunk." ;; same hunk. (goto-char (next-single-char-property-change (point) 'diff--font-lock-refined nil max))) - (diff--iterate-hunks - max - (lambda (beg end) - (unless (get-char-property beg 'diff--font-lock-refined) - (diff--refine-hunk beg end) - (let ((ol (make-overlay beg end))) - (overlay-put ol 'diff--font-lock-refined t) - (overlay-put ol 'diff-mode 'fine) - (overlay-put ol 'evaporate t) - (overlay-put ol 'modification-hooks - '(diff--overlay-auto-delete)))))))) + ;; Ignore errors that diff cannot be found so that custom font-lock + ;; keywords after `diff--font-lock-refined' can still be evaluated. + (ignore-error file-missing + (diff--iterate-hunks + max + (lambda (beg end) + (unless (get-char-property beg 'diff--font-lock-refined) + (diff--refine-hunk beg end) + (let ((ol (make-overlay beg end))) + (overlay-put ol 'diff--font-lock-refined t) + (overlay-put ol 'diff-mode 'fine) + (overlay-put ol 'evaporate t) + (overlay-put ol 'modification-hooks + '(diff--overlay-auto-delete))))))))) (defun diff--overlay-auto-delete (ol _after _beg _end &optional _len) (delete-overlay ol)) @@ -2826,7 +2855,7 @@ hunk text is not found in the source file." ;;; Support for converting a diff to diff3 markers via `wiggle'. -;; Wiggle can be found at http://neil.brown.name/wiggle/ or in your nearest +;; Wiggle can be found at https://neil.brown.name/wiggle/ or in your nearest ;; Debian repository. (defun diff-wiggle () diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 7c4931b4b89..7bb1151602c 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -45,14 +45,12 @@ This variable is also used in the `vc-diff' command (and related commands) if the backend-specific diff switch variable isn't set (`vc-git-diff-switches' for git, for instance), and `vc-diff-switches' isn't set." - :type '(choice string (repeat string)) - :group 'diff) + :type '(choice string (repeat string))) ;;;###autoload (defcustom diff-command (purecopy "diff") "The command to use to run diff." - :type 'string - :group 'diff) + :type 'string) ;; prompt if prefix arg present (defun diff-switches () @@ -60,7 +58,7 @@ set (`vc-git-diff-switches' for git, for instance), and (read-string "Diff switches: " (if (stringp diff-switches) diff-switches - (mapconcat 'identity diff-switches " "))))) + (mapconcat #'identity diff-switches " "))))) (defun diff-sentinel (code &optional old-temp-file new-temp-file) "Code run when the diff process exits. @@ -165,7 +163,7 @@ returns the buffer used." (let* ((old-alt (diff-file-local-copy old)) (new-alt (diff-file-local-copy new)) (command - (mapconcat 'identity + (mapconcat #'identity `(,diff-command ;; Use explicitly specified switches ,@switches @@ -200,7 +198,7 @@ returns the buffer used." (if (and (not no-async) (fboundp 'make-process)) (let ((proc (start-process "Diff" buf shell-file-name shell-command-switch command))) - (set-process-filter proc 'diff-process-filter) + (set-process-filter proc #'diff-process-filter) (set-process-sentinel proc (lambda (proc _msg) (with-current-buffer (process-buffer proc) diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index fde9d4338f3..0965e888f06 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -87,7 +87,7 @@ options after the default ones. This variable is not for customizing the look of the differences produced by the command \\[ediff-show-diff-output]. Use the variable `ediff-custom-diff-options' for that." - :set 'ediff-set-diff-options + :set #'ediff-set-diff-options :type 'string) (ediff-defvar-local ediff-ignore-case nil @@ -231,10 +231,7 @@ one optional arguments, diff-number to refine.") (sit-for 2) ;; 1 is an error exit code 1) - (t (message "Computing differences between %s and %s ..." - (file-name-nondirectory file1) - (file-name-nondirectory file2)) - ;; this erases the diff buffer automatically + (t ;; this erases the diff buffer automatically (ediff-exec-process ediff-diff-program diff-buffer 'synchronize @@ -1146,7 +1143,10 @@ are ignored." (if (string-match "buffer" (symbol-name ediff-job-name)) ediff-coding-system-for-write ediff-coding-system-for-read)) - args) + (process-environment + ;; Avoid localization of messages so we can parse the output. + (cons "LC_MESSAGES=C" process-environment)) + args) (setq args (append (split-string options) (mapcar (lambda (file) (when (stringp file) diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index 84bf063aedf..a5bb953b6d4 100644 --- a/lisp/vc/ediff-help.el +++ b/lisp/vc/ediff-help.el @@ -156,7 +156,7 @@ the value of this variable and the variables `ediff-help-message-*' in ;; the keymap that defines clicks over the quick help regions (defvar ediff-help-region-map (make-sparse-keymap)) -(define-key ediff-help-region-map [mouse-2] 'ediff-help-for-quick-help) +(define-key ediff-help-region-map [mouse-2] #'ediff-help-for-quick-help) ;; runs in the control buffer (defun ediff-set-help-overlays () diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 6e658163b91..17c4202d647 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -25,6 +25,7 @@ ;;; Code: (require 'cl-lib) +(require 'ediff-util) ;; Start compiler pacifier (defvar ediff-metajob-name) @@ -980,8 +981,10 @@ this variable represents.") (defface ediff-even-diff-A `((((type pc)) (:foreground "green3" :background "light grey" :extend t)) - (((class color) (min-colors 88)) - (:background "light grey" :extend t)) + (((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "light grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dark grey" :extend t)) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey" :extend t)) (((class color)) @@ -999,8 +1002,10 @@ widget to customize the actual face object `ediff-even-diff-A' this variable represents.") (defface ediff-even-diff-B - `((((class color) (min-colors 88)) - (:background "Grey" :extend t)) + `((((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "Grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dim grey" :extend t)) (((class color) (min-colors 16)) (:foreground "White" :background "Grey" :extend t)) (((class color)) @@ -1019,8 +1024,10 @@ this variable represents.") (defface ediff-even-diff-C `((((type pc)) (:foreground "yellow3" :background "light grey" :extend t)) - (((class color) (min-colors 88)) - (:background "light grey" :extend t)) + (((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "light grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dark grey" :extend t)) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey" :extend t)) (((class color)) @@ -1040,8 +1047,10 @@ this variable represents.") (defface ediff-even-diff-Ancestor `((((type pc)) (:foreground "cyan3" :background "light grey" :extend t)) - (((class color) (min-colors 88)) - (:background "Grey" :extend t)) + (((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "Grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dim grey" :extend t)) (((class color) (min-colors 16)) (:foreground "White" :background "Grey" :extend t)) (((class color)) @@ -1068,8 +1077,10 @@ this variable represents.") (defface ediff-odd-diff-A '((((type pc)) (:foreground "green3" :background "gray40" :extend t)) - (((class color) (min-colors 88)) - (:background "Grey" :extend t)) + (((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "Grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dim grey" :extend t)) (((class color) (min-colors 16)) (:foreground "White" :background "Grey" :extend t)) (((class color)) @@ -1088,8 +1099,10 @@ this variable represents.") (defface ediff-odd-diff-B '((((type pc)) (:foreground "White" :background "gray40" :extend t)) - (((class color) (min-colors 88)) - (:background "light grey" :extend t)) + (((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "light grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dark grey" :extend t)) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey" :extend t)) (((class color)) @@ -1108,8 +1121,10 @@ this variable represents.") (defface ediff-odd-diff-C '((((type pc)) (:foreground "yellow3" :background "gray40" :extend t)) - (((class color) (min-colors 88)) - (:background "Grey" :extend t)) + (((class color) (min-colors 88) (background light)) + (:distant-foreground "Black" :background "Grey" :extend t)) + (((class color) (min-colors 88) (background dark)) + (:distant-foreground "White" :background "dim grey" :extend t)) (((class color) (min-colors 16)) (:foreground "White" :background "Grey" :extend t)) (((class color)) @@ -1167,8 +1182,8 @@ this variable represents.") (put ediff-fine-diff-face-Ancestor 'ediff-help-echo "A `refinement' of the current difference region") -(add-hook 'ediff-quit-hook 'ediff-cleanup-mess) -(add-hook 'ediff-suspend-hook 'ediff-default-suspend-function) +(add-hook 'ediff-quit-hook #'ediff-cleanup-mess) +(add-hook 'ediff-suspend-hook #'ediff-default-suspend-function) ;;; Overlays @@ -1298,7 +1313,8 @@ This default should work without changes." (defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight) (let ((diff-vector (eval (ediff-get-symbol-from-alist - buf-type ediff-difference-vector-alist))) + buf-type ediff-difference-vector-alist) + t)) overl diff-num) (mapcar (lambda (rec) (setq overl (ediff-get-diff-overlay-from-diff-record rec) diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index 826cad9cc1b..ad4ef473f84 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el @@ -194,7 +194,7 @@ Buffer B." (defun ediff-set-merge-mode () (normal-mode t) - (remove-hook 'write-file-functions 'ediff-set-merge-mode t)) + (remove-hook 'write-file-functions #'ediff-set-merge-mode t)) ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index d32c18be8fd..8e88b60a0bd 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -147,15 +147,15 @@ Useful commands (type ? to hide them and free up screen): (defvar ediff-dir-diffs-buffer-map (let ((map (make-sparse-keymap))) (suppress-keymap map) - (define-key map "q" 'ediff-bury-dir-diffs-buffer) - (define-key map " " 'next-line) - (define-key map "n" 'next-line) - (define-key map "\C-?" 'previous-line) - (define-key map "p" 'previous-line) - (define-key map "C" 'ediff-dir-diff-copy-file) - (define-key map [mouse-2] 'ediff-dir-diff-copy-file) - (define-key map [delete] 'previous-line) - (define-key map [backspace] 'previous-line) + (define-key map "q" #'ediff-bury-dir-diffs-buffer) + (define-key map " " #'next-line) + (define-key map "n" #'next-line) + (define-key map "\C-?" #'previous-line) + (define-key map "p" #'previous-line) + (define-key map "C" #'ediff-dir-diff-copy-file) + (define-key map [mouse-2] #'ediff-dir-diff-copy-file) + (define-key map [delete] #'previous-line) + (define-key map [backspace] #'previous-line) map) "The keymap to be installed in the buffer showing differences between directories.") @@ -413,12 +413,11 @@ Toggled by ediff-toggle-verbose-help-meta-buffer" ) '(menu-item "Show Manual" ediff-documentation :help "Display Ediff's manual")) - (or (ediff-one-filegroup-metajob) - (progn - (define-key ediff-meta-buffer-map "=" nil) - (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files) - (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files) - (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files))) + (unless (ediff-one-filegroup-metajob) + (define-key ediff-meta-buffer-map "=" nil) + (define-key ediff-meta-buffer-map "==" #'ediff-meta-mark-equal-files) + (define-key ediff-meta-buffer-map "=m" #'ediff-meta-mark-equal-files) + (define-key ediff-meta-buffer-map "=h" #'ediff-meta-mark-equal-files)) (define-key menu-map [ediff-next-meta-item] @@ -430,7 +429,7 @@ Toggled by ediff-toggle-verbose-help-meta-buffer" ) (if ediff-no-emacs-help-in-control-buffer - (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item)) + (define-key ediff-meta-buffer-map "\C-h" #'ediff-previous-meta-item)) (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function) (use-local-map ediff-meta-buffer-map) @@ -621,7 +620,7 @@ behavior." (setq common (ediff-intersection common lis3 #'string=))) ;; copying is needed because sort sorts via side effects - (setq common (sort (ediff-copy-list common) 'string-lessp)) + (setq common (sort (copy-sequence common) #'string-lessp)) ;; compute difference list (setq difflist (ediff-set-difference @@ -632,8 +631,8 @@ behavior." #'string=) difflist (delete "." difflist) ;; copying is needed because sort sorts via side effects - difflist (sort (ediff-copy-list (delete ".." difflist)) - 'string-lessp)) + difflist (sort (copy-sequence (delete ".." difflist)) + #'string-lessp)) (setq difflist (mapcar (lambda (elt) (cons elt 1)) difflist)) @@ -730,7 +729,7 @@ behavior." ) ;; copying is needed because sort sorts via side effects - (setq common (sort (ediff-copy-list common) 'string-lessp)) + (setq common (sort (copy-sequence common) #'string-lessp)) ;; return result (cons @@ -837,14 +836,14 @@ behavior." (ediff-draw-dir-diffs ediff-dir-difference-list)) (define-key ediff-meta-buffer-map "h" 'ediff-mark-for-hiding-at-pos) - (define-key ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions) + (define-key ediff-meta-buffer-map "x" #'ediff-hide-marked-sessions) (define-key - ediff-meta-buffer-map "m" 'ediff-mark-for-operation-at-pos) + ediff-meta-buffer-map "m" #'ediff-mark-for-operation-at-pos) (define-key ediff-meta-buffer-map "u" nil) (define-key - ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation) + ediff-meta-buffer-map "um" #'ediff-unmark-all-for-operation) (define-key - ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding) + ediff-meta-buffer-map "uh" #'ediff-unmark-all-for-hiding) (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode ediff-hide-marked-sessions] @@ -877,7 +876,7 @@ behavior." '(menu-item "Collect diffs" ediff-collect-custom-diffs :help "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'")) (define-key - ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs)) + ediff-meta-buffer-map "P" #'ediff-collect-custom-diffs)) ((ediff-patch-metajob jobname) (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode ediff-meta-show-patch] @@ -885,8 +884,8 @@ behavior." :help "Show the multi-file patch associated with this group session")) (define-key ediff-meta-buffer-map "P" 'ediff-meta-show-patch))) - (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy) - (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs) + (define-key ediff-meta-buffer-map "^" #'ediff-up-meta-hierarchy) + (define-key ediff-meta-buffer-map "D" #'ediff-show-dir-diffs) (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode ediff-up-meta-hierarchy] @@ -2128,7 +2127,7 @@ all marked sessions must be active." )) ;;;###autoload -(defalias 'eregistry 'ediff-show-registry) +(defalias 'eregistry #'ediff-show-registry) ;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a ;; parent meta-buf diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 9909dcd5424..0cbea2c28d7 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -123,106 +123,106 @@ to invocation.") (setq ediff-mode-map (make-sparse-keymap)) (suppress-keymap ediff-mode-map) - (define-key ediff-mode-map [mouse-2] 'ediff-help-for-quick-help) - (define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help) + (define-key ediff-mode-map [mouse-2] #'ediff-help-for-quick-help) + (define-key ediff-mode-map "\C-m" #'ediff-help-for-quick-help) - (define-key ediff-mode-map "p" 'ediff-previous-difference) - (define-key ediff-mode-map "\C-?" 'ediff-previous-difference) - (define-key ediff-mode-map [delete] 'ediff-previous-difference) + (define-key ediff-mode-map "p" #'ediff-previous-difference) + (define-key ediff-mode-map "\C-?" #'ediff-previous-difference) + (define-key ediff-mode-map [delete] #'ediff-previous-difference) (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer - 'ediff-previous-difference nil)) - (define-key ediff-mode-map [backspace] 'ediff-previous-difference) - (define-key ediff-mode-map [?\S-\ ] 'ediff-previous-difference) - (define-key ediff-mode-map "n" 'ediff-next-difference) - (define-key ediff-mode-map " " 'ediff-next-difference) - (define-key ediff-mode-map "j" 'ediff-jump-to-difference) + #'ediff-previous-difference nil)) + (define-key ediff-mode-map [backspace] #'ediff-previous-difference) + (define-key ediff-mode-map [?\S-\ ] #'ediff-previous-difference) + (define-key ediff-mode-map "n" #'ediff-next-difference) + (define-key ediff-mode-map " " #'ediff-next-difference) + (define-key ediff-mode-map "j" #'ediff-jump-to-difference) (define-key ediff-mode-map "g" nil) - (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point) - (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point) - (define-key ediff-mode-map "q" 'ediff-quit) - (define-key ediff-mode-map "D" 'ediff-show-diff-output) - (define-key ediff-mode-map "z" 'ediff-suspend) - (define-key ediff-mode-map "\C-l" 'ediff-recenter) - (define-key ediff-mode-map "|" 'ediff-toggle-split) - (define-key ediff-mode-map "h" 'ediff-toggle-hilit) + (define-key ediff-mode-map "ga" #'ediff-jump-to-difference-at-point) + (define-key ediff-mode-map "gb" #'ediff-jump-to-difference-at-point) + (define-key ediff-mode-map "q" #'ediff-quit) + (define-key ediff-mode-map "D" #'ediff-show-diff-output) + (define-key ediff-mode-map "z" #'ediff-suspend) + (define-key ediff-mode-map "\C-l" #'ediff-recenter) + (define-key ediff-mode-map "|" #'ediff-toggle-split) + (define-key ediff-mode-map "h" #'ediff-toggle-hilit) (or ediff-word-mode - (define-key ediff-mode-map "@" 'ediff-toggle-autorefine)) + (define-key ediff-mode-map "@" #'ediff-toggle-autorefine)) (if ediff-narrow-job - (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region)) - (define-key ediff-mode-map "~" 'ediff-swap-buffers) - (define-key ediff-mode-map "v" 'ediff-scroll-vertically) - (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically) - (define-key ediff-mode-map "^" 'ediff-scroll-vertically) - (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically) - (define-key ediff-mode-map "V" 'ediff-scroll-vertically) - (define-key ediff-mode-map "<" 'ediff-scroll-horizontally) - (define-key ediff-mode-map ">" 'ediff-scroll-horizontally) - (define-key ediff-mode-map "i" 'ediff-status-info) - (define-key ediff-mode-map "E" 'ediff-documentation) - (define-key ediff-mode-map "?" 'ediff-toggle-help) - (define-key ediff-mode-map "!" 'ediff-update-diffs) - (define-key ediff-mode-map "M" 'ediff-show-current-session-meta-buffer) - (define-key ediff-mode-map "R" 'ediff-show-registry) + (define-key ediff-mode-map "%" #'ediff-toggle-narrow-region)) + (define-key ediff-mode-map "~" #'ediff-swap-buffers) + (define-key ediff-mode-map "v" #'ediff-scroll-vertically) + (define-key ediff-mode-map "\C-v" #'ediff-scroll-vertically) + (define-key ediff-mode-map "^" #'ediff-scroll-vertically) + (define-key ediff-mode-map "\M-v" #'ediff-scroll-vertically) + (define-key ediff-mode-map "V" #'ediff-scroll-vertically) + (define-key ediff-mode-map "<" #'ediff-scroll-horizontally) + (define-key ediff-mode-map ">" #'ediff-scroll-horizontally) + (define-key ediff-mode-map "i" #'ediff-status-info) + (define-key ediff-mode-map "E" #'ediff-documentation) + (define-key ediff-mode-map "?" #'ediff-toggle-help) + (define-key ediff-mode-map "!" #'ediff-update-diffs) + (define-key ediff-mode-map "M" #'ediff-show-current-session-meta-buffer) + (define-key ediff-mode-map "R" #'ediff-show-registry) (or ediff-word-mode - (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs)) + (define-key ediff-mode-map "*" #'ediff-make-or-kill-fine-diffs)) (define-key ediff-mode-map "a" nil) (define-key ediff-mode-map "b" nil) (define-key ediff-mode-map "r" nil) (cond (ediff-merge-job ;; Will barf if no ancestor - (define-key ediff-mode-map "/" 'ediff-toggle-show-ancestor) + (define-key ediff-mode-map "/" #'ediff-toggle-show-ancestor) ;; In merging, we allow only A->C and B->C copying. - (define-key ediff-mode-map "a" 'ediff-copy-A-to-C) - (define-key ediff-mode-map "b" 'ediff-copy-B-to-C) - (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer) - (define-key ediff-mode-map "s" 'ediff-shrink-window-C) - (define-key ediff-mode-map "+" 'ediff-combine-diffs) + (define-key ediff-mode-map "a" #'ediff-copy-A-to-C) + (define-key ediff-mode-map "b" #'ediff-copy-B-to-C) + (define-key ediff-mode-map "r" #'ediff-restore-diff-in-merge-buffer) + (define-key ediff-mode-map "s" #'ediff-shrink-window-C) + (define-key ediff-mode-map "+" #'ediff-combine-diffs) (define-key ediff-mode-map "$" nil) - (define-key ediff-mode-map "$$" 'ediff-toggle-show-clashes-only) - (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions) - (define-key ediff-mode-map "&" 'ediff-re-merge)) + (define-key ediff-mode-map "$$" #'ediff-toggle-show-clashes-only) + (define-key ediff-mode-map "$*" #'ediff-toggle-skip-changed-regions) + (define-key ediff-mode-map "&" #'ediff-re-merge)) (ediff-3way-comparison-job - (define-key ediff-mode-map "ab" 'ediff-copy-A-to-B) - (define-key ediff-mode-map "ba" 'ediff-copy-B-to-A) - (define-key ediff-mode-map "ac" 'ediff-copy-A-to-C) - (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C) + (define-key ediff-mode-map "ab" #'ediff-copy-A-to-B) + (define-key ediff-mode-map "ba" #'ediff-copy-B-to-A) + (define-key ediff-mode-map "ac" #'ediff-copy-A-to-C) + (define-key ediff-mode-map "bc" #'ediff-copy-B-to-C) (define-key ediff-mode-map "c" nil) - (define-key ediff-mode-map "ca" 'ediff-copy-C-to-A) - (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B) - (define-key ediff-mode-map "ra" 'ediff-restore-diff) - (define-key ediff-mode-map "rb" 'ediff-restore-diff) - (define-key ediff-mode-map "rc" 'ediff-restore-diff) - (define-key ediff-mode-map "C" 'ediff-toggle-read-only)) + (define-key ediff-mode-map "ca" #'ediff-copy-C-to-A) + (define-key ediff-mode-map "cb" #'ediff-copy-C-to-B) + (define-key ediff-mode-map "ra" #'ediff-restore-diff) + (define-key ediff-mode-map "rb" #'ediff-restore-diff) + (define-key ediff-mode-map "rc" #'ediff-restore-diff) + (define-key ediff-mode-map "C" #'ediff-toggle-read-only)) (t ; 2-way comparison - (define-key ediff-mode-map "a" 'ediff-copy-A-to-B) - (define-key ediff-mode-map "b" 'ediff-copy-B-to-A) - (define-key ediff-mode-map "ra" 'ediff-restore-diff) - (define-key ediff-mode-map "rb" 'ediff-restore-diff)) + (define-key ediff-mode-map "a" #'ediff-copy-A-to-B) + (define-key ediff-mode-map "b" #'ediff-copy-B-to-A) + (define-key ediff-mode-map "ra" #'ediff-restore-diff) + (define-key ediff-mode-map "rb" #'ediff-restore-diff)) ) ; cond - (define-key ediff-mode-map "G" 'ediff-submit-report) + (define-key ediff-mode-map "G" #'ediff-submit-report) (define-key ediff-mode-map "#" nil) - (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match) - (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match) - (define-key ediff-mode-map "#c" 'ediff-toggle-ignore-case) + (define-key ediff-mode-map "#h" #'ediff-toggle-regexp-match) + (define-key ediff-mode-map "#f" #'ediff-toggle-regexp-match) + (define-key ediff-mode-map "#c" #'ediff-toggle-ignore-case) (or ediff-word-mode - (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar)) + (define-key ediff-mode-map "##" #'ediff-toggle-skip-similar)) (define-key ediff-mode-map "o" nil) - (define-key ediff-mode-map "A" 'ediff-toggle-read-only) - (define-key ediff-mode-map "B" 'ediff-toggle-read-only) + (define-key ediff-mode-map "A" #'ediff-toggle-read-only) + (define-key ediff-mode-map "B" #'ediff-toggle-read-only) (define-key ediff-mode-map "w" nil) - (define-key ediff-mode-map "wa" 'ediff-save-buffer) - (define-key ediff-mode-map "wb" 'ediff-save-buffer) - (define-key ediff-mode-map "wd" 'ediff-save-buffer) - (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions) + (define-key ediff-mode-map "wa" #'ediff-save-buffer) + (define-key ediff-mode-map "wb" #'ediff-save-buffer) + (define-key ediff-mode-map "wd" #'ediff-save-buffer) + (define-key ediff-mode-map "=" #'ediff-inferior-compare-regions) (if (and (fboundp 'ediff-show-patch-diagnostics) (ediff-patch-job)) - (define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics)) + (define-key ediff-mode-map "P" #'ediff-show-patch-diagnostics)) (if ediff-3way-job (progn - (define-key ediff-mode-map "wc" 'ediff-save-buffer) - (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point) + (define-key ediff-mode-map "wc" #'ediff-save-buffer) + (define-key ediff-mode-map "gc" #'ediff-jump-to-difference-at-point) )) - (define-key ediff-mode-map "m" 'ediff-toggle-wide-display) + (define-key ediff-mode-map "m" #'ediff-toggle-wide-display) ;; Allow ediff-mode-map to be referenced indirectly (fset 'ediff-mode-map ediff-mode-map) @@ -563,8 +563,9 @@ to invocation.") (set-visited-file-name merge-buffer-file)))) (ediff-with-current-buffer ediff-buffer-C (setq buffer-offer-save t) ; ask before killing buffer - ;; make sure the contents is auto-saved - (auto-save-mode 1)) + (when make-backup-files + ;; make sure the contents is auto-saved + (auto-save-mode 1))) )) @@ -2002,9 +2003,8 @@ ARG is a prefix argument. If nil, copy the current difference region." (goto-char reg-to-delete-end) (insert reg-to-copy) - (if (> reg-to-delete-end reg-to-delete-beg) - (kill-region reg-to-delete-beg reg-to-delete-end)) - )) + (when (> reg-to-delete-end reg-to-delete-beg) + (delete-region reg-to-delete-beg reg-to-delete-end)))) (or batch-invocation (setq messg @@ -2105,8 +2105,8 @@ ARG is a prefix argument. If nil, copy the current difference region." (goto-char reg-end) (insert saved-diff) - (if (> reg-end reg-beg) - (kill-region reg-beg reg-end)) + (when (> reg-end reg-beg) + (delete-region reg-beg reg-end)) (setq recovered t) )) @@ -4188,12 +4188,7 @@ Mail anyway? (y or n) ") (cdr result))) (define-obsolete-function-alias 'ediff-add-to-history #'add-to-history "27.1") - -(defalias 'ediff-copy-list 'copy-sequence) - - -;; don't report error if version control package wasn't found -;;(ediff-load-version-control 'silent) +(define-obsolete-function-alias 'ediff-copy-list #'copy-sequence "28.1") (run-hooks 'ediff-load-hook) diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el index 13a653b270b..9e82392725d 100644 --- a/lisp/vc/ediff-vers.el +++ b/lisp/vc/ediff-vers.el @@ -24,23 +24,9 @@ ;;; Code: -;; Compiler pacifier -(defvar rcs-default-co-switches) +(eval-when-compile (require 'ediff-init)) -(and noninteractive - (eval-when-compile - (condition-case nil - ;; for compatibility with current stable version of xemacs - (progn - ;;(require 'pcvs nil 'noerror) - ;;(require 'rcs nil 'noerror) - (require 'pcvs) - (require 'rcs)) - (error nil)) - (require 'vc) - (require 'ediff-init) - )) -;; end pacifier +(defvar rcs-default-co-switches) (defcustom ediff-keep-tmp-versions nil "If t, do not delete temporary previous versions for the files on which diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 47ef37a19ee..7c90348b5d4 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -400,7 +400,8 @@ keyboard input to go into icons." ;; skip dedicated and unsplittable frames (ediff-destroy-control-frame control-buffer) (let ((window-min-height 1) - split-window-function wind-width-or-height + (window-combination-resize t) + split-window-function three-way-comparison wind-A-start wind-B-start wind-A wind-B wind-C) (with-current-buffer control-buffer @@ -419,22 +420,12 @@ keyboard input to go into icons." (select-window (next-window nil 'ignore-minibuf))) (delete-other-windows) (set-window-dedicated-p (selected-window) nil) - (split-window-vertically) - (ediff-select-lowest-window) - (ediff-setup-control-buffer control-buffer) ;; go to the upper window and split it betw A, B, and possibly C (other-window 1) (switch-to-buffer buf-A) (setq wind-A (selected-window)) - (if three-way-comparison - (setq wind-width-or-height - (/ (if (eq split-window-function #'split-window-vertically) - (window-height wind-A) - (window-width wind-A)) - 3))) - - (funcall split-window-function wind-width-or-height) + (funcall split-window-function) (if (eq (selected-window) wind-A) (other-window 1)) @@ -443,7 +434,7 @@ keyboard input to go into icons." (if three-way-comparison (progn - (funcall split-window-function) ; equally + (funcall split-window-function) (if (eq (selected-window) wind-B) (other-window 1)) (switch-to-buffer buf-C) @@ -461,7 +452,9 @@ keyboard input to go into icons." (set-window-start wind-A wind-A-start) (set-window-start wind-B wind-B-start))) - (ediff-select-lowest-window) + (select-window (display-buffer-in-direction + control-buffer + '((direction . bottom)))) (ediff-setup-control-buffer control-buffer) )) @@ -746,6 +739,7 @@ keyboard input to go into icons." (and (not (frame-live-p frame-A)) (or ctl-frame-exists-p (eq frame-B (selected-frame)))))) + (window-combination-resize t) wind-A-start wind-B-start designated-minibuffer-frame) @@ -758,7 +752,7 @@ keyboard input to go into icons." 'B ediff-narrow-bounds)))) (if use-same-frame - (let (wind-width-or-height) ; this affects 3way setups only + (progn (if (and (eq frame-A frame-B) (frame-live-p frame-A)) (select-frame frame-A) ;; avoid dedicated and non-splittable windows @@ -767,15 +761,7 @@ keyboard input to go into icons." (switch-to-buffer buf-A) (setq wind-A (selected-window)) - (if three-way-comparison - (setq wind-width-or-height - (/ - (if (eq split-window-function #'split-window-vertically) - (window-height wind-A) - (window-width wind-A)) - 3))) - - (funcall split-window-function wind-width-or-height) + (funcall split-window-function) (if (eq (selected-window) wind-A) (other-window 1)) (switch-to-buffer buf-B) @@ -1043,8 +1029,8 @@ create a new splittable frame if none is found." (with-current-buffer ctl-buffer (let* ((frame-A (window-frame ediff-window-A)) (frame-A-parameters (frame-parameters frame-A)) - (frame-A-top (eval (cdr (assoc 'top frame-A-parameters)))) - (frame-A-left (eval (cdr (assoc 'left frame-A-parameters)))) + (frame-A-top (eval (cdr (assoc 'top frame-A-parameters)) t)) + (frame-A-left (eval (cdr (assoc 'left frame-A-parameters)) t)) (frame-A-width (frame-width frame-A)) (ctl-frame ediff-control-frame) horizontal-adjustment upward-adjustment @@ -1105,7 +1091,7 @@ It assumes that it is called from within the control buffer." (cw (frame-char-width frame-A)) (wd (- (/ (display-pixel-width) cw) 5))) (setq ediff-wide-display-orig-parameters - (list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params))))) + (list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params)) t))) (cons 'width (cdr (assoc 'width frame-A-params)))) ediff-wide-display-frame frame-A) (modify-frame-parameters diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index ed375738b47..3536cbf7381 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -264,7 +264,7 @@ arguments after setting up the Ediff buffers." 'ediff-files3)) ;;;###autoload -(defalias 'ediff3 'ediff-files3) +(defalias 'ediff3 #'ediff-files3) (defvar-local ediff--magic-file-name nil "Name of file where buffer's content was saved. @@ -359,7 +359,7 @@ has been saved (if not in `buffer-file-name')." (declare-function diff-latest-backup-file "diff" (fn)) ;;;###autoload -(defalias 'ediff 'ediff-files) +(defalias 'ediff #'ediff-files) ;;;###autoload (defun ediff-current-file () @@ -442,7 +442,7 @@ symbol describing the Ediff job type; it defaults to (ediff-buffers-internal buffer-A buffer-B nil startup-hooks job-name)) ;;;###autoload -(defalias 'ebuffers 'ediff-buffers) +(defalias 'ebuffers #'ediff-buffers) ;;;###autoload @@ -479,7 +479,7 @@ symbol describing the Ediff job type; it defaults to (ediff-buffers-internal buffer-A buffer-B buffer-C startup-hooks job-name)) ;;;###autoload -(defalias 'ebuffers3 'ediff-buffers3) +(defalias 'ebuffers3 #'ediff-buffers3) @@ -556,7 +556,7 @@ the same name in both. The third argument, REGEXP, is nil or a regular expression; only file names that match the regexp are considered." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) f) (list (setq f (read-directory-name "Directory A to compare: " dir-A nil 'must-match)) @@ -570,14 +570,14 @@ expression; only file names that match the regexp are considered." default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directories-internal dir1 dir2 nil regexp #'ediff-files 'ediff-directories )) ;;;###autoload -(defalias 'edirs 'ediff-directories) +(defalias 'edirs #'ediff-directories) ;;;###autoload @@ -587,7 +587,7 @@ The second argument, REGEXP, is a regular expression that filters the file names. Only the files that are under revision control are taken into account." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) ) (list (read-directory-name "Directory to compare with revision:" dir-A nil 'must-match) @@ -596,14 +596,14 @@ names. Only the files that are under revision control are taken into account." "Filter filenames through regular expression" default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directory-revisions-internal - dir1 regexp 'ediff-revision 'ediff-directory-revisions + dir1 regexp #'ediff-revision 'ediff-directory-revisions )) ;;;###autoload -(defalias 'edir-revisions 'ediff-directory-revisions) +(defalias 'edir-revisions #'ediff-directory-revisions) ;;;###autoload @@ -614,7 +614,7 @@ regular expression; only file names that match the regexp are considered." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) f) (list (setq f (read-directory-name "Directory A to compare:" dir-A nil)) (setq f (read-directory-name "Directory B to compare:" @@ -632,14 +632,14 @@ regular expression; only file names that match the regexp are considered." default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directories-internal dir1 dir2 dir3 regexp #'ediff-files3 'ediff-directories3 )) ;;;###autoload -(defalias 'edirs3 'ediff-directories3) +(defalias 'edirs3 #'ediff-directories3) ;;;###autoload (defun ediff-merge-directories (dir1 dir2 regexp &optional merge-autostore-dir) @@ -649,7 +649,7 @@ expression; only file names that match the regexp are considered. MERGE-AUTOSTORE-DIR is the directory in which to store merged files." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) f) (list (setq f (read-directory-name "Directory A to merge:" dir-A nil 'must-match)) @@ -663,7 +663,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directories-internal dir1 dir2 nil regexp #'ediff-merge-files 'ediff-merge-directories @@ -671,7 +671,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." )) ;;;###autoload -(defalias 'edirs-merge 'ediff-merge-directories) +(defalias 'edirs-merge #'ediff-merge-directories) ;;;###autoload (defun ediff-merge-directories-with-ancestor (dir1 dir2 ancestor-dir regexp @@ -685,7 +685,7 @@ only file names that match the regexp are considered. MERGE-AUTOSTORE-DIR is the directory in which to store merged files." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) f) (list (setq f (read-directory-name "Directory A to merge:" dir-A nil)) (setq f (read-directory-name "Directory B to merge:" @@ -703,7 +703,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directories-internal dir1 dir2 ancestor-dir regexp @@ -720,7 +720,7 @@ names. Only the files that are under revision control are taken into account. MERGE-AUTOSTORE-DIR is the directory in which to store merged files." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) ) (list (read-directory-name "Directory to merge with revisions:" dir-A nil 'must-match) @@ -729,15 +729,15 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directory-revisions-internal - dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions + dir1 regexp #'ediff-merge-revisions 'ediff-merge-directory-revisions nil merge-autostore-dir )) ;;;###autoload -(defalias 'edir-merge-revisions 'ediff-merge-directory-revisions) +(defalias 'edir-merge-revisions #'ediff-merge-directory-revisions) ;;;###autoload (defun ediff-merge-directory-revisions-with-ancestor (dir1 regexp @@ -749,7 +749,7 @@ names. Only the files that are under revision control are taken into account. MERGE-AUTOSTORE-DIR is the directory in which to store merged files." (interactive (let ((dir-A (ediff-get-default-directory-name)) - (default-regexp (eval ediff-default-filtering-regexp)) + (default-regexp (eval ediff-default-filtering-regexp t)) ) (list (read-directory-name "Directory to merge with revisions and ancestors:" @@ -759,10 +759,10 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." default-regexp) nil 'ediff-filtering-regexp-history - (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp t)) ))) (ediff-directory-revisions-internal - dir1 regexp 'ediff-merge-revisions-with-ancestor + dir1 regexp #'ediff-merge-revisions-with-ancestor 'ediff-merge-directory-revisions-with-ancestor nil merge-autostore-dir )) diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index d2d419ac786..8f7affeea4e 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -79,90 +79,75 @@ but can be invoked directly in `fast' mode." ;; way they number lines of a file. (defcustom emerge-diff-program "diff" "Name of the program which compares two files." - :type 'string - :group 'emerge) + :type 'string) (defcustom emerge-diff3-program "diff3" "Name of the program which compares three files. Its arguments are the ancestor file and the two variant files." - :type 'string - :group 'emerge) + :type 'string) (defcustom emerge-diff-options "" "Options to pass to `emerge-diff-program' and `emerge-diff3-program'." - :type 'string - :group 'emerge) + :type 'string) (defcustom emerge-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) (concat "^" x "\\([acd]\\)" x "$")) "Pattern to match lines produced by diff that describe differences. This is as opposed to lines from the source files." - :type 'regexp - :group 'emerge) + :type 'regexp) (defcustom emerge-diff-ok-lines-regexp "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)" "Regexp that matches normal output lines from `emerge-diff-program'. Lines that do not match are assumed to be error messages." - :type 'regexp - :group 'emerge) + :type 'regexp) (defcustom emerge-diff3-ok-lines-regexp "^\\([1-3]:\\|====\\| \\)" "Regexp that matches normal output lines from `emerge-diff3-program'. Lines that do not match are assumed to be error messages." - :type 'regexp - :group 'emerge) + :type 'regexp) (defcustom emerge-rcs-ci-program "ci" "Name of the program that checks in RCS revisions." - :type 'string - :group 'emerge) + :type 'string) (defcustom emerge-rcs-co-program "co" "Name of the program that checks out RCS revisions." - :type 'string - :group 'emerge) + :type 'string) (defcustom emerge-process-local-variables nil "Non-nil if Emerge should process local-variables lists in merge buffers. \(You can explicitly request processing the local-variables by executing `(hack-local-variables)'.)" - :type 'boolean - :group 'emerge) + :type 'boolean) (defcustom emerge-execute-line-deletions nil "If non-nil: `emerge-execute-line' makes no output if an input was deleted. It concludes that an input version has been deleted when an ancestor entry is present, only one A or B entry is present, and an output entry is present. If nil: In such circumstances, the A or B file that is present will be copied to the designated output file." - :type 'boolean - :group 'emerge) + :type 'boolean) (defcustom emerge-before-flag "vvvvvvvvvvvvvvvvvvvv\n" "Flag placed above the highlighted block of code. Must end with newline. Must be set before Emerge is loaded, or emerge-new-flags must be run after setting." - :type 'string - :group 'emerge) + :type 'string) (defcustom emerge-after-flag "^^^^^^^^^^^^^^^^^^^^\n" "Flag placed below the highlighted block of code. Must end with newline. Must be set before Emerge is loaded, or emerge-new-flags must be run after setting." - :type 'string - :group 'emerge) + :type 'string) ;; Hook variables (defcustom emerge-startup-hook nil "Hook to run in the merge buffer after the merge has been set up." - :type 'hook - :group 'emerge) + :type 'hook) (defcustom emerge-select-hook nil "Hook to run after a difference has been selected. The variable `n' holds the (internal) number of the difference." - :type 'hook - :group 'emerge) + :type 'hook) (defcustom emerge-unselect-hook nil "Hook to run after a difference has been unselected. The variable `n' holds the (internal) number of the difference." - :type 'hook - :group 'emerge) + :type 'hook) ;; Variables to control the default directories of the arguments to ;; Emerge commands. @@ -171,8 +156,7 @@ The variable `n' holds the (internal) number of the difference." "If nil, default dir for filenames in emerge is `default-directory'. If non-nil, filenames complete in the directory of the last argument of the same type to an `emerge-files...' command." - :type 'boolean - :group 'emerge) + :type 'boolean) (defvar emerge-last-dir-A nil "Last directory for the first file of an `emerge-files...' command.") @@ -235,15 +219,13 @@ depend on the flags." (defcustom emerge-min-visible-lines 3 "Number of lines that we want to show above and below the flags when we are displaying a difference." - :type 'integer - :group 'emerge) + :type 'integer) (defcustom emerge-temp-file-prefix (expand-file-name "emerge" temporary-file-directory) "Prefix to put on Emerge temporary file names. Do not start with `~/' or `~USERNAME/'." - :type 'string - :group 'emerge) + :type 'string) (make-obsolete-variable 'emerge-temp-file-prefix "customize `temporary-file-directory' instead." @@ -251,8 +233,7 @@ Do not start with `~/' or `~USERNAME/'." (defcustom emerge-temp-file-mode 384 ; u=rw only "Mode for Emerge temporary files." - :type 'integer - :group 'emerge) + :type 'integer) (make-obsolete-variable 'emerge-temp-file-mode "it has no effect, temporary files are always private." @@ -268,8 +249,7 @@ The template is inserted as a string, with the following interpolations: Don't forget to end the template with a newline. Note that this variable can be made local to a particular merge buffer by giving a prefix argument to `emerge-set-combine-versions-template'." - :type 'string - :group 'emerge) + :type 'string) ;; Build keymaps @@ -294,8 +274,7 @@ Makes Emerge commands directly available.") (defcustom emerge-command-prefix "\C-c\C-c" "Command prefix for Emerge commands in `edit' mode. Must be set before Emerge is loaded." - :type 'string - :group 'emerge) + :type 'string) ;; This function sets up the fixed keymaps. It is executed when the first ;; Emerge is done to allow the user maximum time to set up the global keymap. @@ -1245,8 +1224,7 @@ Otherwise, the A or B file present is copied to the output file." (defcustom emerge-merge-directories-filename-regexp "[^.]" "Regexp describing files to be processed by `emerge-merge-directories'." - :type 'regexp - :group 'emerge) + :type 'regexp) ;;;###autoload (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir) @@ -3070,8 +3048,7 @@ See also `auto-save-file-name-p'." (defcustom emerge-metachars nil "No longer used. Emerge now uses `shell-quote-argument'." - :type '(choice (const nil) regexp) - :group 'emerge) + :type '(choice (const nil) regexp)) (make-obsolete-variable 'emerge-metachars nil "26.1") (provide 'emerge) diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 56b31662210..46e9c97eb0a 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -191,7 +191,8 @@ when this variable is set to nil.") (defconst log-edit-files-buf "*log-edit-files*") (defvar log-edit-initial-files nil) (defvar log-edit-callback nil) -(defvar log-edit-diff-function nil) +(defvar log-edit-diff-function + (lambda () (error "Diff functionality has not been setup"))) (defvar log-edit-listfun nil) (defvar log-edit-parent-buffer nil) @@ -202,13 +203,15 @@ when this variable is set to nil.") ;;; Originally taken from VC-Log mode (defconst log-edit-maximum-comment-ring-size 32 - "Maximum number of saved comments in the comment ring.") + "Maximum number of saved commit comments in `log-edit-comment-ring'.") (defvar log-edit-comment-ring (make-ring log-edit-maximum-comment-ring-size)) (defvar log-edit-comment-ring-index nil) (defvar log-edit-last-comment-match "") (defun log-edit-new-comment-index (stride len) - "Return the comment index STRIDE elements from the current one. + "Return the comment whose index is STRIDE elements away from the current one. +This accesses `log-edit-comment-ring', which stores commit log comments, +i.e. descriptions of changes done by commits. LEN is the length of `log-edit-comment-ring'." (mod (cond (log-edit-comment-ring-index (+ log-edit-comment-ring-index stride)) @@ -220,7 +223,7 @@ LEN is the length of `log-edit-comment-ring'." len)) (defun log-edit-previous-comment (arg) - "Cycle backwards through comment history. + "Cycle backwards through VC commit comment history. With a numeric prefix ARG, go back ARG comments." (interactive "*p") (let ((len (ring-length log-edit-comment-ring))) @@ -233,15 +236,15 @@ With a numeric prefix ARG, go back ARG comments." (insert (ring-ref log-edit-comment-ring log-edit-comment-ring-index))))) (defun log-edit-next-comment (arg) - "Cycle forwards through comment history. + "Cycle forwards through VC commit comment history. With a numeric prefix ARG, go forward ARG comments." (interactive "*p") (log-edit-previous-comment (- arg))) (defun log-edit-comment-search-backward (str &optional stride) - "Search backwards through comment history for substring match of STR. + "Search backwards through VC commit comment history for a match of STR. If the optional argument STRIDE is present, that is a step-width to use -when going through the comment ring." +when going through the comment ring, `log-edit-comment-ring'." ;; Why substring rather than regexp ? -sm (interactive (list (read-string (format-prompt "Comment substring" @@ -261,7 +264,7 @@ when going through the comment ring." (log-edit-previous-comment 0))) (defun log-edit-comment-search-forward (str) - "Search forwards through comment history for a substring match of STR." + "Search forwards through VC commit comment history for a match of STR." (interactive (list (read-string (format-prompt "Comment substring" log-edit-last-comment-match) @@ -269,10 +272,15 @@ when going through the comment ring." (log-edit-comment-search-backward str -1)) (defun log-edit-comment-to-change-log (&optional whoami file-name) - "Enter last VC comment into the change log for the current file. -WHOAMI (interactive prefix) non-nil means prompt for user name -and site. FILE-NAME is the name of the change log; if nil, use -`change-log-default-name'. + "Insert the last VC commit comment into the change log for the current file. +This reuses the text of the last VC commit comment in `log-edit-comment-ring' +for the change-log entry of the current file, which is handy when several +related changes have the same commit comment. +WHOAMI (interactively, prefix argument) non-nil means prompt for user name +and email address of the person to whom to attribute the change. +FILE-NAME is the name of the change log; if nil, use `change-log-default-name' +Interactively, with prefix argument, prompt for both the name and address of +the person who did the change and for FILE-NAME. This may be useful as a `vc-checkin-hook' to update change logs automatically." @@ -331,7 +339,7 @@ automatically." (defconst log-edit-header-contents-regexp "[ \t]*\\(.*\\(\n[ \t].*\\)*\\)\n?" - "Regular expression matching a header field. + "Regular expression matching the header field in `log-edit-mode'. The first subexpression is the actual text of the field.") (defun log-edit-match-to-eoh (_limit) @@ -392,7 +400,9 @@ The first subexpression is the actual text of the field.") (log-edit--match-first-line (0 'log-edit-summary)))) (defvar log-edit-font-lock-gnu-style nil - "If non-nil, highlight common failures to follow the GNU coding standards.") + "If non-nil, highlight common failures to follow VC commit log conventions. +The conventions checked are those described in the GNU coding standards +document.") (put 'log-edit-font-lock-gnu-style 'safe-local-variable 'booleanp) (defconst log-edit-font-lock-gnu-keywords @@ -435,28 +445,28 @@ The first subexpression is the actual text of the field.") ;;;###autoload (defun log-edit (callback &optional setup params buffer mode &rest _ignore) - "Setup a buffer to enter a log message. -The buffer is put in mode MODE or `log-edit-mode' if MODE is nil. + "Setup a buffer to enter a VC commit log message. +The buffer is put in mode MODE, or `log-edit-mode' if MODE is nil. \\<log-edit-mode-map> If SETUP is non-nil, erase the buffer and run `log-edit-hook'. Set mark and point around the entire contents of the buffer, so that it is easy to kill the contents of the buffer with -\\[kill-region]. Once the user is done editing the message, -invoking the command \\[log-edit-done] (`log-edit-done') will -call CALLBACK to do the actual commit. +\\[kill-region]. Once the user is done editing the message, he +or she is expected to invoke the command \\[log-edit-done] (`log-edit-done'), +which will call CALLBACK, a function to do the actual commit. -PARAMS if non-nil is an alist of variables and buffer-local -values to give them in the Log Edit buffer. Possible keys and -associated values: +PARAMS, if non-nil, is an alist of variables and buffer-local +values to give to those variables in the Log Edit buffer. Possible +keys and associated values are: `log-edit-listfun' -- function taking no arguments that returns the list of - files that are concerned by the current operation (using relative names); + files that are concerned by the current operation (using relative names); `log-edit-diff-function' -- function taking no arguments that - displays a diff of the files concerned by the current operation. + displays a diff of the files concerned by the current operation. `vc-log-fileset' -- the VC fileset to be committed (if any). -If BUFFER is non-nil `log-edit' will jump to that buffer, use it +If BUFFER is non-nil, `log-edit' will switch to that buffer, use it to edit the log message and go back to the current buffer when -done. Otherwise, it uses the current buffer." +done. Otherwise, this function will use the current buffer." (let ((parent (current-buffer))) (if buffer (pop-to-buffer buffer)) (when (and log-edit-setup-invert (not (eq setup 'force))) @@ -482,12 +492,12 @@ done. Otherwise, it uses the current buffer." "Press \\[log-edit-done] when you are done editing.")))) (define-derived-mode log-edit-mode text-mode "Log-Edit" - "Major mode for editing version-control log messages. -When done editing the log entry, just type \\[log-edit-done] which -will trigger the actual commit of the file(s). -Several other handy support commands are provided of course and -the package from which this is used might also provide additional -commands (under C-x v for VC, for example). + "Major mode for editing version-control (VC) commit log messages. +When done editing the log entry, type \\[log-edit-done], which will +trigger the actual commit of the file(s). +Several other handy support commands are provided, and the package +from which this is used might also provide additional commands (under +the \"C-x v\" prefix for VC commands, for example). \\{log-edit-mode-map}" (setq-local font-lock-defaults '(log-edit-font-lock-keywords t)) @@ -519,7 +529,7 @@ commands (under C-x v for VC, for example). (insert "):"))) (defun log-edit-fill-entry (&optional justify) - "Like \\[fill-paragraph], but handle ChangeLog entries. + "Like \\[fill-paragraph], but for filling ChangeLog-formatted entries. Consecutive function entries without prose (i.e., lines of the form \"(FUNCTION):\") will be combined into \"(FUNC1, FUNC2):\" according to `fill-column'." @@ -569,7 +579,7 @@ according to `fill-column'." (ring-insert log-edit-comment-ring comment))) (defun log-edit-done () - "Finish editing the log message and commit the files. + "Finish editing the VC commit log message, and commit the files. If you want to abort the commit, simply delete the buffer." (interactive) ;; Clean up empty headers. @@ -616,9 +626,9 @@ If you want to abort the commit, simply delete the buffer." (call-interactively log-edit-callback)))) (defun log-edit-kill-buffer () - "Kill the current buffer. -Also saves its contents in the comment history and hides -`log-edit-files-buf'." + "Kill the current VC commit log buffer. +This command saves the contents of the log buffer in the VC commit +comment history, see `log-edit-comment-ring', and hides `log-edit-files-buf'." (interactive) (log-edit-hide-buf) (let ((buf (current-buffer))) @@ -659,9 +669,7 @@ Also saves its contents in the comment history and hides (defun log-edit-show-diff () "Show the diff for the files to be committed." (interactive) - (if (functionp log-edit-diff-function) - (funcall log-edit-diff-function) - (error "Diff functionality has not been setup"))) + (funcall log-edit-diff-function)) (defun log-edit-show-files () "Show the list of files to be committed." @@ -700,7 +708,7 @@ different header separator appropriate for `log-edit-mode'." (eobp)))) (defun log-edit-insert-message-template () - "Insert the default template with Summary and Author." + "Insert the default VC commit log template with Summary and Author." (interactive) (when (or (called-interactively-p 'interactive) (log-edit-empty-buffer-p)) @@ -711,7 +719,7 @@ different header separator appropriate for `log-edit-mode'." (message-position-point))) (defun log-edit-insert-cvs-template () - "Insert the template specified by the CVS administrator, if any. + "Insert the commit log template specified by the CVS administrator, if any. This simply uses the local CVS/Template file." (interactive) (when (or (called-interactively-p 'interactive) @@ -723,7 +731,7 @@ This simply uses the local CVS/Template file." (insert-file-contents "CVS/Template")))) (defun log-edit-insert-cvs-rcstemplate () - "Insert the rcstemplate from the CVS repository. + "Insert the RCS commit log template from the CVS repository. This contacts the repository to get the rcstemplate file and can thus take some time." (interactive) @@ -757,7 +765,7 @@ can thus take some time." (insert (mapconcat 'identity files ", ") ": ")))) (defun log-edit-add-to-changelog () - "Insert this log message into the appropriate ChangeLog file." + "Insert this VC commit log message into the appropriate ChangeLog file." (interactive) (log-edit-remember-comment) (dolist (f (log-edit-files)) @@ -771,7 +779,7 @@ can thus take some time." "Non-nil means rewrite (tiny change).") (defvar log-edit-rewrite-fixes nil - "Rule to rewrite bug numbers into Fixes: headers. + "Rule to rewrite bug numbers into Fixes: headers in commit log messages. The value should be of the form (REGEXP . REPLACEMENT) where REGEXP should match the expression referring to a bug number in the text, and REPLACEMENT is an expression to pass to `replace-match' @@ -789,10 +797,15 @@ to build the Fixes: header.") (declare-function diff-add-log-current-defuns "diff-mode" ()) (defun log-edit-generate-changelog-from-diff () - "Insert a log message by looking at the current diff. -This command will generate a ChangeLog entries listing the -functions. You can then add a description where needed, and use -\\[fill-paragraph] to join consecutive function names." + "Insert a VC commit log message by looking at the current diffs. +This command is intended to be used in the \"*vc-log*\" buffer. +This command will generate ChangeLog entries listing the modified +files and functions changed in those files, based on the diffs +you are about to commit. You can then add a description for each +change where needed, and use \\[fill-paragraph] to join consecutive function +names into a single entry where they all share the same description. +Should you need to look at the diffs themselves, they can be found +in the \"*vc-diff*\" buffer produced by this command." (interactive) (change-log-insert-entries (with-current-buffer @@ -810,21 +823,21 @@ functions. You can then add a description where needed, and use (diff-add-log-current-defuns)))) (defun log-edit-insert-changelog (&optional use-first) - "Insert a log message by looking at the ChangeLog. + "Insert a VC commit log message by looking at the ChangeLog. The idea is to write your ChangeLog entries first, and then use this -command to commit your changes. +command to commit your changes with that log. -To select default log text, we: -- find the ChangeLog entries for the files to be checked in, -- verify that the top entry in the ChangeLog is on the current date - and by the current user; if not, we don't provide any default text, -- search the ChangeLog entry for paragraphs containing the names of - the files we're checking in, and finally -- use those paragraphs as the log text. +To select default log text, this command: +- finds the ChangeLog entries for the files to be checked in; +- verifies that the top entry in the ChangeLog is on the current date + and by the current user; if not, it doesn't provide any default text; +- searches the ChangeLog entry for paragraphs containing the names of + the files to be checked in; and finally +- uses those paragraphs as the log text. If the optional prefix arg USE-FIRST is given (via \\[universal-argument]), -or if the command is repeated a second time in a row, use the first log entry -regardless of user name or time." +or if the command is repeated, use the first log entry regardless of user +name or time." (interactive "P") (save-excursion (let ((eoh (save-excursion (rfc822-goto-eoh) (point)))) @@ -874,7 +887,7 @@ regardless of user name or time." ;;;; (defun log-edit-narrow-changelog () - "Narrow to the top page of the current buffer, a ChangeLog file. + "Narrow to the top page of the current buffer, which visits a ChangeLog file. Actually, the narrowed region doesn't include the date line. A \"page\" in a ChangeLog file is the area between two dates." (or (eq major-mode 'change-log-mode) @@ -922,7 +935,7 @@ If we are between sub-paragraphs, return the previous subparagraph." (defun log-edit-changelog-entry () "Return the bounds of the ChangeLog entry containing point. -The variable `log-edit-changelog-full-paragraphs' decides whether an +The variable `log-edit-changelog-full-paragraphs' determines whether an \"entry\" is a paragraph or a subparagraph; see its documentation string for more details." (save-excursion @@ -961,8 +974,8 @@ Return non-nil if it is." (not (looking-at (format ".+ .+ <%s>" (regexp-quote mail)))) (looking-at ".+ \\(.+ <.+>\\) *\\((tiny change)\\)?")) - (let ((author (replace-regexp-in-string " " " " - (match-string 1)))) + (let ((author (string-replace " " " " + (match-string 1)))) (unless (and log-edit-author (string-match (regexp-quote author) (car log-edit-author))) @@ -1048,8 +1061,12 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each "\\($\\|[^[:alnum:]]\\)"))))) (defun log-edit-changelog-insert-entries (buffer beg end &rest files) - "Insert the text from BUFFER between BEG and END. -Rename relative filenames in the ChangeLog entry as FILES." + "Insert the text from ChangeLog BUFFER between BEG and END. +Rename relative filenames in the ChangeLog entry with FILES. +FILES are supposed to name the same files whose relative filenames +are to be replaced, and their names relative to the directory of +BUFFER are expected to match the relative file names in the ChangeLog +entry." (let ((opoint (point)) (log-name (buffer-file-name buffer)) (case-fold-search nil) @@ -1131,7 +1148,7 @@ Return t if toggled on (or TOGGLE is nil), otherwise nil." val)) (defun log-edit-extract-headers (headers comment) - "Extract headers from COMMENT to form command line arguments. + "Extract headers from VC commit COMMENT to form command line arguments. HEADERS should be an alist with elements (HEADER . CMDARG) or (HEADER . FUNCTION) associating headers to command line options and the result is then a list of the form (MSG ARGUMENTS...) diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 2ee3da70274..54ef06960f9 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -1,4 +1,4 @@ -;;; pcvs-defs.el --- variable definitions for PCL-CVS +;;; pcvs-defs.el --- variable definitions for PCL-CVS -*- lexical-binding: t; -*- ;; Copyright (C) 1991-2021 Free Software Foundation, Inc. @@ -71,7 +71,6 @@ versions, such as the one in SunOS-4.") (defcustom cvs-cvsrc-file (convert-standard-filename "~/.cvsrc") "Path to your cvsrc file." - :group 'pcl-cvs :type '(file)) (defvar cvs-shared-start 4 @@ -96,24 +95,20 @@ If t, they will be removed from the *cvs* buffer after every command. If `delayed', they will be removed from the *cvs* buffer before every command. If `status', they will only be removed after a `cvs-mode-status' command. Else, they will never be automatically removed from the *cvs* buffer." - :group 'pcl-cvs :type '(choice (const nil) (const status) (const delayed) (const t))) (defcustom cvs-auto-remove-directories 'handled "If `all', directory entries will never be shown. If `handled', only non-handled directories will be shown. If `empty', only non-empty directories will be shown." - :group 'pcl-cvs :type '(choice (const :tag "No" nil) (const all) (const handled) (const empty))) (defcustom cvs-auto-revert t "Non-nil if changed files should automatically be reverted." - :group 'pcl-cvs :type '(boolean)) (defcustom cvs-sort-ignore-file t "Non-nil if `cvs-mode-ignore' should sort the .cvsignore automatically." - :group 'pcl-cvs :type '(boolean)) (defcustom cvs-force-dir-tag t @@ -121,7 +116,6 @@ If `empty', only non-empty directories will be shown." Tagging should generally be applied a directory at a time, but sometimes it is useful to be able to tag a single file. The normal way to do that is to use `cvs-mode-force-command' so as to temporarily override the restrictions." - :group 'pcl-cvs :type '(boolean)) (defcustom cvs-default-ignore-marks nil @@ -130,7 +124,6 @@ Normally they run on the files that are marked (with `cvs-mode-mark'), or the file under the cursor if no files are marked. If this variable is set to a non-nil value they will by default run on the file on the current line. See also `cvs-invert-ignore-marks'." - :group 'pcl-cvs :type '(boolean)) (defcustom cvs-invert-ignore-marks @@ -143,7 +136,6 @@ current line. See also `cvs-invert-ignore-marks'." "List of cvs commands that invert the default ignore-mark behavior. Commands in this set will use the opposite default from the one set in `cvs-default-ignore-marks'." - :group 'pcl-cvs :type '(set (const "diff") (const "tag") (const "ignore"))) @@ -154,7 +146,6 @@ Non-nil means that PCL-CVS will ask confirmation before removing files except for files whose content can readily be recovered from the repository. A value of `list' means that the list of files to be deleted will be displayed when asking for confirmation." - :group 'pcl-cvs :type '(choice (const list) (const t) (const nil))) @@ -162,7 +153,6 @@ displayed when asking for confirmation." (defcustom cvs-add-default-message nil "Default message to use when adding files. If set to nil, `cvs-mode-add' will always prompt for a message." - :group 'pcl-cvs :type '(choice (const :tag "Prompt" nil) (string))) @@ -171,7 +161,6 @@ If set to nil, `cvs-mode-add' will always prompt for a message." If non-nil, `cvs-mode-find-file' will place the cursor at the beginning of the modified area. If the file is not locally modified, this will obviously have no effect." - :group 'pcl-cvs :type '(boolean)) (defcustom cvs-buffer-name-alist @@ -193,7 +182,6 @@ POSTPROC is a function that should be executed when the command terminates The CMD used for `cvs-mode-commit' is \"message\". For that special case, POSTPROC is called just after MODE with special arguments." - :group 'pcl-cvs :type '(repeat (list (choice (const "diff") (const "status") @@ -236,7 +224,6 @@ Output from cvs is placed here for asynchronous commands.") '(cvs-ediff-diff . cvs-ediff-merge) '(cvs-emerge-diff . cvs-emerge-merge)) "Pair of functions to be used for resp. diff'ing and merg'ing interactively." - :group 'pcl-cvs :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge)) (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge)))) @@ -255,7 +242,6 @@ Alternatives are: `samedir': reuse any cvs buffer displaying the same directory `subdir': or reuse any cvs buffer displaying any sub- or super- directory `always': reuse any cvs buffer." - :group 'pcl-cvs :type '(choice (const always) (const subdir) (const samedir) (const current))) (defvar cvs-temp-buffer nil @@ -424,8 +410,7 @@ This variable is buffer local and only used in the *cvs* buffer.") (defcustom cvs-minor-mode-prefix "\C-xc" "Prefix key for the `cvs-mode' bindings in `cvs-minor-mode'." - :type 'string - :group 'pcl-cvs) + :type 'string) (easy-mmode-defmap cvs-minor-mode-map `((,cvs-minor-mode-prefix . cvs-mode-map) diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el index e1197176af2..21fe98dacab 100644 --- a/lisp/vc/pcvs-info.el +++ b/lisp/vc/pcvs-info.el @@ -1,4 +1,4 @@ -;;; pcvs-info.el --- internal representation of a fileinfo entry +;;; pcvs-info.el --- internal representation of a fileinfo entry -*- lexical-binding: t; -*- ;; Copyright (C) 1991-2021 Free Software Foundation, Inc. @@ -384,8 +384,8 @@ For use by the ewoc package." The ordering defined by this function is such that directories are sorted alphabetically, and inside every directory the DIRCHANGE fileinfo will appear first, followed by all files (alphabetically)." - (let ((subtypea (cvs-fileinfo->subtype a)) - (subtypeb (cvs-fileinfo->subtype b))) + (let ( ;; (subtypea (cvs-fileinfo->subtype a)) + ) ;; (subtypeb (cvs-fileinfo->subtype b)) (cond ;; Sort according to directories. ((string< (cvs-fileinfo->dir a) (cvs-fileinfo->dir b)) t) diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index 43816501bda..3a96c930544 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -1,4 +1,4 @@ -;;; pcvs-parse.el --- the CVS output parser +;;; pcvs-parse.el --- the CVS output parser -*- lexical-binding: t; -*- ;; Copyright (C) 1991-2021 Free Software Foundation, Inc. @@ -73,12 +73,12 @@ by `$'." '("status" "add" "commit" "update" "remove" "checkout" "ci") "List of CVS commands whose output is understood by the parser.") -(defun cvs-parse-buffer (parse-spec dont-change-disc &optional subdir) +(defun cvs-parse-buffer (parse-spec dcd &optional subdir) "Parse current buffer according to PARSE-SPEC. PARSE-SPEC is a function of no argument advancing the point and returning either a fileinfo or t (if the matched text should be ignored) or nil if it didn't match anything. -DONT-CHANGE-DISC just indicates whether the command was changing the disc +DCD just indicates whether the command was changing the disc or not (useful to tell the difference between `cvs-examine' and `cvs-update' output. The path names should be interpreted as relative to SUBDIR (defaults @@ -86,6 +86,7 @@ The path names should be interpreted as relative to SUBDIR (defaults Return a list of collected entries, or t if an error occurred." (goto-char (point-min)) (let ((fileinfos ()) + (dont-change-disc dcd) (cvs-current-dir "") (case-fold-search nil) (cvs-current-subdir (or subdir ""))) @@ -134,12 +135,12 @@ Match RE and if successful, execute MATCHES." (defmacro cvs-or (&rest alts) "Try each one of the ALTS alternatives until one matches." + (declare (debug t)) `(let ((-cvs-parse-point (point))) ,(cons 'or (mapcar (lambda (es) `(or ,es (ignore (goto-char -cvs-parse-point)))) alts)))) -(def-edebug-spec cvs-or t) ;; This is how parser tables should be executed (defun cvs-parse-run-table (parse-spec) @@ -185,17 +186,20 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (let ((type (if (consp type) (car type) type)) (subtype (if (consp type) (cdr type)))) (when dir (setq cvs-current-dir dir)) - (apply 'cvs-create-fileinfo type + (apply #'cvs-create-fileinfo type (concat cvs-current-subdir (or dir cvs-current-dir)) file (cvs-parse-msg) :subtype subtype keys)))) ;;;; CVS Process Parser Tables: -;;;; -;;;; The table for status and update could actually be merged since they -;;;; don't conflict. But they don't overlap much either. +;; +;; The table for status and update could actually be merged since they +;; don't conflict. But they don't overlap much either. (defun cvs-parse-table () "Table of message objects for `cvs-parse-process'." + (with-suppressed-warnings ((lexical c file dir path base-rev subtype)) + (defvar c) (defvar file) (defvar dir) (defvar path) (defvar base-rev) + (defvar subtype)) (let (c file dir path base-rev subtype) (cvs-or @@ -401,6 +405,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (defun cvs-parse-merge () + (with-suppressed-warnings ((lexical path base-rev head-rev type)) + (defvar path) (defvar base-rev) (defvar head-rev) (defvar type)) (let (path base-rev head-rev type) ;; A merge (maybe with a conflict). (and @@ -445,6 +451,9 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." :merge (cons base-rev head-rev)))))) (defun cvs-parse-status () + (with-suppressed-warnings ((lexical nofile path base-rev head-rev type)) + (defvar nofile) (defvar path) (defvar base-rev) (defvar head-rev) + (defvar type)) (let (nofile path base-rev head-rev type) (and (cvs-match @@ -493,6 +502,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." :head-rev head-rev)))) (defun cvs-parse-commit () + (with-suppressed-warnings ((lexical path file base-rev subtype)) + (defvar path) (defvar file) (defvar base-rev) (defvar subtype)) (let (path file base-rev subtype) (cvs-or diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 57da7bf730e..75d9fe9bee1 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el @@ -1,4 +1,4 @@ -;;; pcvs-util.el --- utility functions for PCL-CVS +;;; pcvs-util.el --- utility functions for PCL-CVS -*- lexical-binding: t; -*- ;; Copyright (C) 1991-2021 Free Software Foundation, Inc. @@ -33,27 +33,9 @@ ;;;; (defsubst cvs-car (x) (if (consp x) (car x) x)) -(defalias 'cvs-cdr 'cdr-safe) +(defalias 'cvs-cdr #'cdr-safe) (defsubst cvs-append (&rest xs) - (apply 'append (mapcar (lambda (x) (if (listp x) x (list x))) xs))) - -(defsubst cvs-every (-cvs-every-f -cvs-every-l) - (while (consp -cvs-every-l) - (unless (funcall -cvs-every-f (pop -cvs-every-l)) - (setq -cvs-every-l t))) - (not -cvs-every-l)) - -(defun cvs-union (xs ys) - (let ((zs ys)) - (dolist (x xs zs) - (unless (member x ys) (push x zs))))) - -(defun cvs-map (-cvs-map-f &rest -cvs-map-ls) - (let ((accum ())) - (while (not (cvs-every 'null -cvs-map-ls)) - (push (apply -cvs-map-f (mapcar 'car -cvs-map-ls)) accum) - (setq -cvs-map-ls (mapcar 'cdr -cvs-map-ls))) - (nreverse accum))) + (apply #'append (mapcar (lambda (x) (if (listp x) x (list x))) xs))) (defun cvs-first (l &optional n) (if (null n) (car l) @@ -146,7 +128,7 @@ If NOREUSE is non-nil, always return a new buffer." "Insert a list of STRINGS into the current buffer. Uses columns to keep the listing readable but compact." (when (consp strings) - (let* ((length (apply 'max (mapcar 'length strings))) + (let* ((length (apply #'max (mapcar #'length strings))) (wwidth (1- (window-width))) (columns (min ;; At least 2 columns; at least 2 spaces between columns. @@ -174,7 +156,7 @@ arguments. If ARGS is not a list, no argument will be passed." (condition-case nil (with-temp-buffer (if args - (apply 'call-process + (apply #'call-process file nil t nil (when (listp args) args)) (insert-file-contents file)) (goto-char (point-min)) @@ -182,7 +164,7 @@ arguments. If ARGS is not a list, no argument will be passed." (if oneline (line-end-position) (point-max)))) (file-error nil))) -(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.3") +(define-obsolete-function-alias 'cvs-string-prefix-p #'string-prefix-p "24.3") ;;;; ;;;; file names diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 1a42c67cb1c..42f531e4f75 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -115,7 +115,7 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) +(require 'cl-lib) (require 'ewoc) ;Ewoc was once cookie (require 'pcvs-defs) (require 'pcvs-util) @@ -331,7 +331,7 @@ the primary since reading the primary can deactivate it." "This mode is used for buffers related to a main *cvs* buffer. All the `cvs-mode' buffer operations are simply rebound under the \\[cvs-mode-map] prefix." - nil " CVS" + :lighter " CVS" :group 'pcl-cvs) (put 'cvs-minor-mode 'permanent-local t) @@ -513,7 +513,7 @@ If non-nil, NEW means to create a new buffer no matter what." (let* ((dir+files+rest (if (or (null fis) (not single-dir)) ;; not single-dir mode: just process the whole thing - (list "" (mapcar 'cvs-fileinfo->full-name fis) nil) + (list "" (mapcar #'cvs-fileinfo->full-name fis) nil) ;; single-dir mode: extract the same-dir-elements (let ((dir (cvs-fileinfo->dir (car fis)))) ;; output the concerned dir so the parser can translate paths @@ -2135,11 +2135,11 @@ Returns a list of FIS that should be `cvs remove'd." (eq (cvs-fileinfo->type fi) 'UNKNOWN)) (cvs-mode-marked filter cmd)))) (silent (or (not cvs-confirm-removals) - (cvs-every (lambda (fi) - (or (not (file-exists-p - (cvs-fileinfo->full-name fi))) - (cvs-applicable-p fi 'safe-rm))) - files))) + (cl-every (lambda (fi) + (or (not (file-exists-p + (cvs-fileinfo->full-name fi))) + (cvs-applicable-p fi 'safe-rm))) + files))) (tmpbuf (cvs-temp-buffer))) (when (and (not silent) (equal cvs-confirm-removals 'list)) (with-current-buffer tmpbuf diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index c66a4fb2d6a..956d9b38017 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -214,6 +214,9 @@ Used in `smerge-diff-base-upper' and related functions." ["Invoke Ediff" smerge-ediff :help "Use Ediff to resolve the conflicts" :active (smerge-check 1)] + ["Refine" smerge-refine + :help "Highlight different words of the conflict" + :active (smerge-check 1)] ["Auto Resolve" smerge-resolve :help "Try auto-resolution heuristics" :active (smerge-check 1)] @@ -1450,30 +1453,31 @@ If no conflict maker is found, turn off `smerge-mode'." First tries to go to the next conflict in the current buffer, and if not found, uses VC to try and find the next file with conflict." (interactive) - (let ((buffer (current-buffer))) - (condition-case nil - ;; FIXME: Try again from BOB before moving to the next file. - (smerge-next) - (error - (if (and (or smerge-change-buffer-confirm - (and (buffer-modified-p) buffer-file-name)) - (not (or (eq last-command this-command) - (eq ?\r last-command-event)))) ;Called via M-x!? - ;; FIXME: Don't emit this message if `vc-find-conflicted-file' won't - ;; go to another file anyway (because there are no more conflicted - ;; files). - (message (if (buffer-modified-p) - "No more conflicts here. Repeat to save and go to next buffer" - "No more conflicts here. Repeat to go to next buffer")) - (if (and (buffer-modified-p) buffer-file-name) - (save-buffer)) - (vc-find-conflicted-file) - (if (eq buffer (current-buffer)) - ;; Do nothing: presumably `vc-find-conflicted-file' already - ;; emitted a message explaining there aren't any more conflicts. - nil + (condition-case nil + ;; FIXME: Try again from BOB before moving to the next file. + (smerge-next) + (error + (if (and (or smerge-change-buffer-confirm + (and (buffer-modified-p) buffer-file-name)) + (not (or (eq last-command this-command) + (eq ?\r last-command-event)))) ;Called via M-x!? + ;; FIXME: Don't emit this message if `vc-find-conflicted-file' won't + ;; go to another file anyway (because there are no more conflicted + ;; files). + (message (if (buffer-modified-p) + "No more conflicts here. Repeat to save and go to next buffer" + "No more conflicts here. Repeat to go to next buffer")) + (if (and (buffer-modified-p) buffer-file-name) + (save-buffer)) + (vc-find-conflicted-file) + ;; At this point, the caret will only be at a conflict marker + ;; if the file did not correspond to an opened + ;; buffer. Otherwise we need to jump to a marker explicitly. + (unless (looking-at "^<<<<<<<") + (let ((prev-pos (point))) (goto-char (point-min)) - (smerge-next))))))) + (unless (ignore-errors (not (smerge-next))) + (goto-char prev-pos)))))))) (provide 'smerge-mode) diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index b0435ab53ee..07b2800c2dc 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -164,18 +164,18 @@ List of factors, used to expand/compress the time scale. See `vc-annotate'." (defvar vc-annotate-mode-map (let ((m (make-sparse-keymap))) - (define-key m "a" 'vc-annotate-revision-previous-to-line) - (define-key m "d" 'vc-annotate-show-diff-revision-at-line) - (define-key m "=" 'vc-annotate-show-diff-revision-at-line) - (define-key m "D" 'vc-annotate-show-changeset-diff-revision-at-line) - (define-key m "f" 'vc-annotate-find-revision-at-line) - (define-key m "j" 'vc-annotate-revision-at-line) - (define-key m "l" 'vc-annotate-show-log-revision-at-line) - (define-key m "n" 'vc-annotate-next-revision) - (define-key m "p" 'vc-annotate-prev-revision) - (define-key m "w" 'vc-annotate-working-revision) - (define-key m "v" 'vc-annotate-toggle-annotation-visibility) - (define-key m "\C-m" 'vc-annotate-goto-line) + (define-key m "a" #'vc-annotate-revision-previous-to-line) + (define-key m "d" #'vc-annotate-show-diff-revision-at-line) + (define-key m "=" #'vc-annotate-show-diff-revision-at-line) + (define-key m "D" #'vc-annotate-show-changeset-diff-revision-at-line) + (define-key m "f" #'vc-annotate-find-revision-at-line) + (define-key m "j" #'vc-annotate-revision-at-line) + (define-key m "l" #'vc-annotate-show-log-revision-at-line) + (define-key m "n" #'vc-annotate-next-revision) + (define-key m "p" #'vc-annotate-prev-revision) + (define-key m "w" #'vc-annotate-working-revision) + (define-key m "v" #'vc-annotate-toggle-annotation-visibility) + (define-key m "\C-m" #'vc-annotate-goto-line) m) "Local keymap used for VC-Annotate mode.") diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index c495afb6ec5..5144b5d0bbb 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -45,9 +45,9 @@ ;;; Code: +(require 'vc-dispatcher) (eval-when-compile (require 'cl-lib) - (require 'vc-dispatcher) (require 'vc-dir)) ; vc-dir-at-event (declare-function vc-deduce-fileset "vc" @@ -66,7 +66,6 @@ (defcustom vc-bzr-program "bzr" "Name of the bzr command (excluding any arguments)." - :group 'vc-bzr :type 'string) (defcustom vc-bzr-diff-switches nil @@ -75,8 +74,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :type '(choice (const :tag "Unspecified" nil) (const :tag "None" t) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-bzr) + (repeat :tag "Argument List" :value ("") string))) (defcustom vc-bzr-annotate-switches nil "String or list of strings specifying switches for bzr annotate under VC. @@ -85,15 +83,13 @@ If nil, use the value of `vc-annotate-switches'. If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "25.1" - :group 'vc-bzr) + :version "25.1") (defcustom vc-bzr-log-switches nil "String or list of strings specifying switches for bzr log under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-bzr) + (repeat :tag "Argument List" :value ("") string))) (defcustom vc-bzr-status-switches (ignore-errors @@ -108,7 +104,6 @@ The option \"--no-classify\" should be present if your bzr supports it." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :group 'vc-bzr :version "24.1") ;; since v0.9, bzr supports removing the progress indicators @@ -122,7 +117,7 @@ prepends `vc-bzr-status-switches' to ARGS." `("BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9) "LC_MESSAGES=C" ; Force English output ,@process-environment))) - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-bzr-program + (apply #'vc-do-command (or buffer "*vc*") okstatus vc-bzr-program file-or-list bzr-command (if (and (string-equal "status" bzr-command) vc-bzr-status-switches) @@ -144,7 +139,7 @@ Use the current Bzr root directory as the ROOT argument to ,@process-environment)) (root (vc-bzr-root default-directory)) (buffer (format "*vc-bzr : %s*" (expand-file-name root)))) - (apply 'vc-do-async-command buffer root + (apply #'vc-do-async-command buffer root vc-bzr-program bzr-command args) buffer)) @@ -267,7 +262,8 @@ in the repository root directory of FILE." ;; If there is no parent, this must be a new repo. ;; If file is in dirstate, can only be added (b#8025). ((or (not (match-beginning 4)) - (eq (char-after (match-beginning 4)) ?a)) 'added) + (eq (char-after (match-beginning 4)) ?a)) + 'added) ((or (and (eql (string-to-number (match-string 3)) (file-attribute-size (file-attributes file))) (equal (match-string 5) @@ -280,7 +276,7 @@ in the repository root directory of FILE." (memq ?x (mapcar - 'identity + #'identity (file-attribute-modes (file-attributes file)))))) (if (eq (char-after (match-beginning 7)) @@ -374,13 +370,13 @@ If PROMPT is non-nil, prompt for the Bzr command to run." command (cadr args) args (cddr args))) (require 'vc-dispatcher) - (let ((buf (apply 'vc-bzr-async-command command args))) + (let ((buf (apply #'vc-bzr-async-command command args))) (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr) (setq-local compile-command (concat vc-bzr-program " " command " " - (if args (mapconcat 'identity args " ") ""))))) + (if args (mapconcat #'identity args " ") ""))))) (vc-set-async-update buf)))) (defun vc-bzr-pull (prompt) @@ -424,7 +420,7 @@ default if it is available." (vc-bzr-program (car cmd)) (command (cadr cmd)) (args (cddr cmd))) - (let ((buf (apply 'vc-bzr-async-command command args))) + (let ((buf (apply #'vc-bzr-async-command command args))) (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr))) (vc-set-async-update buf)))) @@ -471,7 +467,7 @@ in the branch repository (or whose status not be determined)." ;; Erase the status text that matched. (delete-region (match-beginning 0) (match-end 0)) (setq status - (intern (replace-regexp-in-string " " "" statusword))))) + (intern (string-replace " " "" statusword))))) (when status (goto-char (point-min)) (skip-chars-forward " \n\t") ;Throw away spaces. @@ -512,7 +508,7 @@ in the branch repository (or whose status not be determined)." (unless (re-search-forward "^<<<<<<< " nil t) (vc-bzr-command "resolve" nil 0 buffer-file-name) ;; Remove the hook so that it is not called multiple times. - (remove-hook 'after-save-hook 'vc-bzr-resolve-when-done t)))) + (remove-hook 'after-save-hook #'vc-bzr-resolve-when-done t)))) (defun vc-bzr-find-file-hook () (when (and buffer-file-name @@ -529,7 +525,7 @@ in the branch repository (or whose status not be determined)." ;; but the one in `bzr pull' isn't, so it would be good to provide an ;; elisp function to remerge from the .BASE/OTHER/THIS files. (smerge-start-session) - (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t) + (add-hook 'after-save-hook #'vc-bzr-resolve-when-done nil t) (vc-message-unresolved-conflicts buffer-file-name))) (defun vc-bzr-version-dirstate (dir) @@ -643,7 +639,7 @@ Returns nil if unable to find this information." ;; Could run `bzr status' in the directory and see if it succeeds, but ;; that's relatively expensive. -(defalias 'vc-bzr-responsible-p 'vc-bzr-root +(defalias 'vc-bzr-responsible-p #'vc-bzr-root "Return non-nil if FILE is (potentially) controlled by bzr. The criterion is that there is a `.bzr' directory in the same or a superior directory.") @@ -664,7 +660,7 @@ or a superior directory.") (defun vc-bzr-checkin (files comment &optional _rev) "Check FILES in to bzr with log message COMMENT." - (apply 'vc-bzr-command "commit" nil 0 files + (apply #'vc-bzr-command "commit" nil 0 files (cons "-m" (log-edit-extract-headers `(("Author" . ,(vc-bzr--sanitize-header "--author")) ("Date" . ,(vc-bzr--sanitize-header "--commit-time")) @@ -699,7 +695,7 @@ or a superior directory.") (defvar log-view-expanded-log-entry-function) (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View" - (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack. + (remove-hook 'log-view-mode-hook #'vc-bzr-log-view-mode) ;Deactivate the hack. (require 'add-log) (setq-local log-view-per-file-logs nil) (setq-local log-view-file-re regexp-unmatchable) @@ -745,7 +741,7 @@ If LIMIT is non-nil, show no more than this many entries." ;; the log display may not what the user wants - but I see no other ;; way of getting the above regexps working. (with-current-buffer buffer - (apply 'vc-bzr-command "log" buffer 'async files + (apply #'vc-bzr-command "log" buffer 'async files (append (if shortlog '("--line") '("--long")) ;; The extra complications here when start-revision and limit @@ -761,7 +757,8 @@ If LIMIT is non-nil, show no more than this many entries." ;; This means we don't have to use --no-aliases. ;; Is -c any different to -r in this case? "-r%s" - "-r..%s") start-revision))) + "-r..%s") + start-revision))) (if (eq vc-log-view-type 'with-diff) (list "-p")) (when limit (list "-l" (format "%s" limit))) ;; There is no sensible way to combine --limit and --forward, @@ -782,7 +779,7 @@ If LIMIT is non-nil, show no more than this many entries." (defun vc-bzr-expanded-log-entry (revision) (with-temp-buffer - (apply 'vc-bzr-command "log" t nil nil + (apply #'vc-bzr-command "log" t nil nil (append (list "--long" (format "-r%s" revision)) (if (stringp vc-bzr-log-switches) @@ -795,11 +792,11 @@ If LIMIT is non-nil, show no more than this many entries." (buffer-substring (match-end 0) (point-max))))) (defun vc-bzr-log-incoming (buffer remote-location) - (apply 'vc-bzr-command "missing" buffer 'async nil + (apply #'vc-bzr-command "missing" buffer 'async nil (list "--theirs-only" (unless (string= remote-location "") remote-location)))) (defun vc-bzr-log-outgoing (buffer remote-location) - (apply 'vc-bzr-command "missing" buffer 'async nil + (apply #'vc-bzr-command "missing" buffer 'async nil (list "--mine-only" (unless (string= remote-location "") remote-location)))) (defun vc-bzr-show-log-entry (revision) @@ -830,7 +827,7 @@ If LIMIT is non-nil, show no more than this many entries." (append ;; Only add --diff-options if there are any diff switches. (unless (zerop (length switches)) - (list "--diff-options" (mapconcat 'identity switches " "))) + (list "--diff-options" (mapconcat #'identity switches " "))) ;; This `when' is just an optimization because bzr-1.2 is *much* ;; faster when the revision argument is not given. (when (or rev1 rev2) @@ -995,7 +992,7 @@ stream. Standard error output is discarded." (defun vc-bzr-dir-status-files (dir files update-function) "Return a list of conses (file . state) for DIR." - (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files) + (apply #'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files) (vc-run-delayed (vc-bzr-after-dir-status update-function ;; "bzr status" results are relative to @@ -1010,15 +1007,15 @@ stream. Standard error output is discarded." (defvar vc-bzr-shelve-map (let ((map (make-sparse-keymap))) ;; Turn off vc-dir marking - (define-key map [mouse-2] 'ignore) - - (define-key map [down-mouse-3] 'vc-bzr-shelve-menu) - (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point) - (define-key map "=" 'vc-bzr-shelve-show-at-point) - (define-key map "\C-m" 'vc-bzr-shelve-show-at-point) - (define-key map "A" 'vc-bzr-shelve-apply-and-keep-at-point) - (define-key map "P" 'vc-bzr-shelve-apply-at-point) - (define-key map "S" 'vc-bzr-shelve-snapshot) + (define-key map [mouse-2] #'ignore) + + (define-key map [down-mouse-3] #'vc-bzr-shelve-menu) + (define-key map "\C-k" #'vc-bzr-shelve-delete-at-point) + (define-key map "=" #'vc-bzr-shelve-show-at-point) + (define-key map "\C-m" #'vc-bzr-shelve-show-at-point) + (define-key map "A" #'vc-bzr-shelve-apply-and-keep-at-point) + (define-key map "P" #'vc-bzr-shelve-apply-at-point) + (define-key map "S" #'vc-bzr-shelve-snapshot) map)) (defvar vc-bzr-shelve-menu-map @@ -1076,49 +1073,49 @@ stream. Standard error output is discarded." (when (string-match ".+checkout of branch: \\(.+\\)$" str) (match-string 1 str))))) (concat - (propertize "Parent branch : " 'face 'font-lock-type-face) + (propertize "Parent branch : " 'face 'vc-dir-header) (propertize (if (string-match "parent branch: \\(.+\\)$" str) (match-string 1 str) "None") - 'face 'font-lock-variable-name-face) + 'face 'vc-dir-header-value) "\n" (when light-checkout (concat - (propertize "Light checkout root: " 'face 'font-lock-type-face) - (propertize light-checkout 'face 'font-lock-variable-name-face) + (propertize "Light checkout root: " 'face 'vc-dir-header) + (propertize light-checkout 'face 'vc-dir-header-value) "\n")) (when light-checkout-branch (concat - (propertize "Checkout of branch : " 'face 'font-lock-type-face) - (propertize light-checkout-branch 'face 'font-lock-variable-name-face) + (propertize "Checkout of branch : " 'face 'vc-dir-header) + (propertize light-checkout-branch 'face 'vc-dir-header-value) "\n")) (when pending-merge (concat - (propertize "Warning : " 'face 'font-lock-warning-face + (propertize "Warning : " 'face 'vc-dir-status-warning 'help-echo pending-merge-help-echo) (propertize "Pending merges, commit recommended before any other action" 'help-echo pending-merge-help-echo - 'face 'font-lock-warning-face) + 'face 'vc-dir-status-warning) "\n")) (if shelve (concat - (propertize "Shelves :\n" 'face 'font-lock-type-face + (propertize "Shelves :\n" 'face 'vc-dir-header 'help-echo shelve-help-echo) (mapconcat (lambda (x) (propertize x - 'face 'font-lock-variable-name-face + 'face 'vc-dir-header-value 'mouse-face 'highlight 'help-echo "mouse-3: Show shelve menu\nA: Apply and keep shelf\nP: Apply and remove shelf (pop)\nS: Snapshot to a shelf\nC-k: Delete shelf" 'keymap vc-bzr-shelve-map)) shelve "\n")) (concat - (propertize "Shelves : " 'face 'font-lock-type-face + (propertize "Shelves : " 'face 'vc-dir-header 'help-echo shelve-help-echo) (propertize "No shelved changes" 'help-echo shelve-help-echo - 'face 'font-lock-variable-name-face)))))) + 'face 'vc-dir-header-value)))))) ;; Follows vc-bzr-command, which uses vc-do-command from vc-dispatcher. (declare-function vc-resynch-buffer "vc-dispatcher" @@ -1211,7 +1208,7 @@ stream. Standard error output is discarded." (let ((vc-bzr-revisions '()) (default-directory (file-name-directory (car files)))) (with-temp-buffer - (apply 'vc-bzr-command "log" t 0 files + (apply #'vc-bzr-command "log" t 0 files (append '("--line") (if (stringp vc-bzr-log-switches) (list vc-bzr-log-switches) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index a595cc9778b..c8f36fb76ec 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -76,8 +76,7 @@ (repeat :tag "Argument List" :value ("") string)) - :version "22.1" - :group 'vc-cvs) + :version "22.1") (defcustom vc-cvs-register-switches nil "Switches for registering a file into CVS. @@ -88,8 +87,7 @@ If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-cvs) + :version "21.1") (defcustom vc-cvs-diff-switches nil "String or list of strings specifying switches for CVS diff under VC. @@ -98,8 +96,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 "21.1" - :group 'vc-cvs) + :version "21.1") (defcustom vc-cvs-annotate-switches nil "String or list of strings specifying switches for cvs annotate under VC. @@ -109,22 +106,19 @@ switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "25.1" - :group 'vc-cvs) + :version "25.1") (defcustom vc-cvs-header '("$Id\ $") "Header keywords to be inserted by `vc-insert-headers'." :version "24.1" ; no longer consult the obsolete vc-header-alist - :type '(repeat string) - :group 'vc-cvs) + :type '(repeat string)) (defcustom vc-cvs-use-edit t "Non-nil means to use `cvs edit' to \"check out\" a file. This is only meaningful if you don't use the implicit checkout model \(i.e. if you have $CVSREAD set)." :type 'boolean - :version "21.1" - :group 'vc-cvs) + :version "21.1") (defcustom vc-cvs-stay-local 'only-file "Non-nil means use local operations when possible for remote repositories. @@ -151,16 +145,14 @@ except for hosts matched by these regular expressions." (regexp :format " stay local,\n%t: %v" :tag "if it matches") (repeat :format "%v%i\n" :inline t (regexp :tag "or")))) - :version "23.1" - :group 'vc-cvs) + :version "23.1") (defcustom vc-cvs-sticky-date-format-string "%c" "Format string for mode-line display of sticky date. Format is according to `format-time-string'. Only used if `vc-cvs-sticky-tag-display' is t." :type '(string) - :version "22.1" - :group 'vc-cvs) + :version "22.1") (defcustom vc-cvs-sticky-tag-display t "Specify the mode-line display of sticky tags. @@ -198,8 +190,7 @@ displayed. Date and time is displayed for sticky dates. See also variable `vc-cvs-sticky-date-format-string'." :type '(choice boolean function) - :version "22.1" - :group 'vc-cvs) + :version "22.1") ;;; ;;; Internal variables @@ -310,7 +301,7 @@ to the CVS command." (vc-cvs-could-register file) (push (directory-file-name (file-name-directory file)) dirs))) (if dirs (vc-cvs-register dirs))) - (apply 'vc-cvs-command nil 0 files + (apply #'vc-cvs-command nil 0 files "add" (and comment (string-match "[^\t\n ]" comment) (concat "-m" comment)) @@ -346,12 +337,12 @@ its parents." (error "%s is not a valid symbolic tag name" rev) ;; If the input revision is a valid symbolic tag name, we create it ;; as a branch, commit and switch to it. - (apply 'vc-cvs-command nil 0 files "tag" "-b" (list rev)) - (apply 'vc-cvs-command nil 0 files "update" "-r" (list rev)) + (apply #'vc-cvs-command nil 0 files "tag" "-b" (list rev)) + (apply #'vc-cvs-command nil 0 files "update" "-r" (list rev)) (mapc (lambda (file) (vc-file-setprop file 'vc-cvs-sticky-tag rev)) files))) (let ((status (apply - 'vc-cvs-command nil 1 files + #'vc-cvs-command nil 1 files "ci" (if rev (concat "-r" rev)) (concat "-m" (car (log-edit-extract-headers nil comment))) (vc-switches 'CVS 'checkin)))) @@ -378,7 +369,7 @@ its parents." (vc-file-setprop (car files) 'vc-working-revision (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2)) - (mapc 'vc-file-clearprops files)) + (mapc #'vc-file-clearprops files)) ;; Anyway, forget the checkout model of the file, because we might have ;; guessed wrong when we found the file. After commit, we can ;; tell it from the permissions of the file (see @@ -391,7 +382,7 @@ its parents." (vc-cvs-command nil 0 files "update" "-A")))) (defun vc-cvs-find-revision (file rev buffer) - (apply 'vc-cvs-command + (apply #'vc-cvs-command buffer 0 file "-Q" ; suppress diagnostic output "update" @@ -416,7 +407,7 @@ REV is the revision to check out." (if (equal file buffer-file-name) (read-only-mode -1)))) ;; Check out a particular revision (or recreate the file). (vc-file-setprop file 'vc-working-revision nil) - (apply 'vc-cvs-command nil 0 file + (apply #'vc-cvs-command nil 0 file "-w" "update" (when rev @@ -600,7 +591,7 @@ Remaining arguments are ignored." ;; This used to append diff-switches and vc-diff-switches, ;; which was consistent with the vc-diff-switches doc at that ;; time, but not with the actual behavior of any other VC diff. - (apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil + (apply #'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil ;; Not a CVS diff, does not use vc-cvs-diff-switches. (append (vc-switches nil 'diff) (list (file-relative-name file-oldvers) @@ -608,7 +599,7 @@ Remaining arguments are ignored." (setq status 0)) (push file invoke-cvs-diff-list))))) (when invoke-cvs-diff-list - (setq status (apply 'vc-cvs-command (or buffer "*vc-diff*") + (setq status (apply #'vc-cvs-command (or buffer "*vc-diff*") (if async 'async 1) invoke-cvs-diff-list "diff" (and oldvers (concat "-r" oldvers)) @@ -787,7 +778,7 @@ If UPDATE is non-nil, then update (resynch) any affected buffers." "A wrapper around `vc-do-command' for use in vc-cvs.el. The difference to vc-do-command is that this function always invokes `cvs', and that it passes `vc-cvs-global-switches' to it before FLAGS." - (apply 'vc-do-command (or buffer "*vc*") okstatus "cvs" files + (apply #'vc-do-command (or buffer "*vc*") okstatus "cvs" files (if (stringp vc-cvs-global-switches) (cons vc-cvs-global-switches flags) (append vc-cvs-global-switches @@ -816,7 +807,7 @@ individually should stay local." (setq default nil stay-local (cdr stay-local))) (when (consp stay-local) (setq stay-local - (mapconcat 'identity stay-local "\\|"))) + (mapconcat #'identity stay-local "\\|"))) (if (if (string-match stay-local hostname) default (not default)) 'yes 'no)))))))))))) @@ -1047,29 +1038,29 @@ Query all files in DIR if files is nil." (file-error nil)))) (concat (cond (repo - (concat (propertize "Repository : " 'face 'font-lock-type-face) - (propertize repo 'face 'font-lock-variable-name-face))) + (concat (propertize "Repository : " 'face 'vc-dir-header) + (propertize repo 'face 'vc-dir-header-value))) (t "")) (cond (module - (concat (propertize "Module : " 'face 'font-lock-type-face) - (propertize module 'face 'font-lock-variable-name-face))) + (concat (propertize "Module : " 'face 'vc-dir-header) + (propertize module 'face 'vc-dir-header-value))) (t "")) (if (file-readable-p "CVS/Tag") (let ((tag (vc-cvs-file-to-string "CVS/Tag"))) (cond ((string-match "\\`T" tag) - (concat (propertize "Tag : " 'face 'font-lock-type-face) + (concat (propertize "Tag : " 'face 'vc-dir-header) (propertize (substring tag 1) - 'face 'font-lock-variable-name-face))) + 'face 'vc-dir-header-value))) ((string-match "\\`D" tag) - (concat (propertize "Date : " 'face 'font-lock-type-face) + (concat (propertize "Date : " 'face 'vc-dir-header) (propertize (substring tag 1) - 'face 'font-lock-variable-name-face))) + 'face 'vc-dir-header-value))) (t "")))) ;; In CVS, branch is a per-file property, not a per-directory property. ;; We can't really do this here without making dangerous assumptions. - ;;(propertize "Branch: " 'face 'font-lock-type-face) + ;;(propertize "Branch: " 'face 'vc-dir-header) ;;(propertize "ADD CODE TO PRINT THE BRANCH NAME\n" ;; 'face 'font-lock-warning-face) ))) @@ -1182,7 +1173,7 @@ is non-nil." (mtime (file-attribute-modification-time (file-attributes file))) (parsed-time (progn (require 'parse-time) (parse-time-string (concat time " +0000"))))) - (cond ((and (not (string-match "\\+" time)) + (cond ((and (not (string-search "+" time)) (decoded-time-second parsed-time) ;; Compare just the seconds part of the file time, ;; since CVS file time stamp resolution is just 1 second. diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index 88f46eff059..5fd8d8e5036 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -1,4 +1,4 @@ -;;; vc-dav.el --- vc.el support for WebDAV +;;; vc-dav.el --- vc.el support for WebDAV -*- lexical-binding: t; -*- ;; Copyright (C) 2001, 2004-2021 Free Software Foundation, Inc. @@ -64,7 +64,7 @@ For a list of possible values, see `vc-state'." 'edited (cdr (car locks))))))) -(defun vc-dav-checkout-model (url) +(defun vc-dav-checkout-model (_url) "Indicate whether URL needs to be \"checked out\" before it can be edited. See `vc-checkout-model' for a list of possible values." ;; The only thing we can support with webdav is 'locking @@ -72,21 +72,21 @@ See `vc-checkout-model' for a list of possible values." ;; This should figure out the version # of the file somehow. What is ;; the most appropriate property in WebDAV to look at for this? -(defun vc-dav-workfile-version (url) +(defun vc-dav-workfile-version (_url) "Return the current workfile version of URL." "Unknown") -(defun vc-dav-register (url &optional _comment) +(defun vc-dav-register (_url &optional _comment) "Register URL in the DAV backend." ;; Do we need to do anything here? FIXME? ) -(defun vc-dav-checkin (url comment &optional _rev) +(defun vc-dav-checkin (_url _comment &optional _rev) "Commit changes in URL to WebDAV. COMMENT is used as a check-in comment." ;; This should PUT the resource and release any locks that we hold. ) -(defun vc-dav-checkout (url &optional rev destfile) +(defun vc-dav-checkout (_url &optional _rev _destfile) "Check out revision REV of URL into the working area. If EDITABLE is non-nil URL should be writable by the user and if @@ -101,7 +101,7 @@ write the contents to. ;; This should LOCK the resource. ) -(defun vc-dav-revert (url &optional contents-done) +(defun vc-dav-revert (_url &optional _contents-done) "Revert URL back to the current workfile version. If optional arg CONTENTS-DONE is non-nil, then the contents of FILE @@ -112,11 +112,11 @@ only needs to update the status of URL within the backend. ;; Should UNLOCK the file. ) -(defun vc-dav-print-log (url) +(defun vc-dav-print-log (_url) "Insert the revision log of URL into the *vc* buffer." ) -(defun vc-dav-diff (url &optional rev1 rev2 buffer async) +(defun vc-dav-diff (_url &optional _rev1 _rev2 _buffer _async) "Insert the diff for URL into the *vc-diff* buffer. If REV1 and REV2 are non-nil report differences from REV1 to REV2. If REV1 is nil, use the current workfile version as the older version. @@ -135,11 +135,11 @@ It should return a status of either 0 (no differences found), or ;; This should use url-dav-get-properties with a depth of `1' to get ;; all the properties. -(defun vc-dav-dir-state (url) +(defun vc-dav-dir-state (_url) "find the version control state of all files in DIR in a fast way." ) -(defun vc-dav-responsible-p (url) +(defun vc-dav-responsible-p (_url) "Return non-nil if DAV considers itself `responsible' for URL." ;; Check for DAV support on the web server. t) diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 14c81578b79..eb8cf8192c1 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -56,39 +56,48 @@ See `run-hooks'." (defface vc-dir-header '((t :inherit font-lock-type-face)) "Face for headers in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-header-value '((t :inherit font-lock-variable-name-face)) "Face for header values in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-directory '((t :inherit font-lock-comment-delimiter-face)) "Face for directories in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-file '((t :inherit font-lock-function-name-face)) "Face for files in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-mark-indicator '((t :inherit font-lock-type-face)) "Face for mark indicators in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-status-warning '((t :inherit font-lock-warning-face)) "Face for warning status in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-status-edited '((t :inherit font-lock-variable-name-face)) "Face for edited status in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") (defface vc-dir-status-up-to-date '((t :inherit font-lock-builtin-face)) "Face for up-to-date status in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") -(defface vc-dir-ignored '((t :inherit shadow)) +(defface vc-dir-status-ignored '((t :inherit shadow)) "Face for ignored or empty values in VC-dir buffers." - :group 'vc) + :group 'vc + :version "28.1") ;; Used to store information for the files displayed in the directory buffer. ;; Each item displayed corresponds to one of these defstructs. @@ -293,67 +302,67 @@ See `run-hooks'." (defvar vc-dir-mode-map (let ((map (make-sparse-keymap))) ;; VC commands - (define-key map "v" 'vc-next-action) ;; C-x v v - (define-key map "=" 'vc-diff) ;; C-x v = - (define-key map "D" 'vc-root-diff) ;; C-x v D - (define-key map "i" 'vc-register) ;; C-x v i - (define-key map "+" 'vc-update) ;; C-x v + + (define-key map "v" #'vc-next-action) ;; C-x v v + (define-key map "=" #'vc-diff) ;; C-x v = + (define-key map "D" #'vc-root-diff) ;; C-x v D + (define-key map "i" #'vc-register) ;; C-x v i + (define-key map "+" #'vc-update) ;; C-x v + ;; I'd prefer some kind of symmetry with vc-update: - (define-key map "P" 'vc-push) ;; C-x v P - (define-key map "l" 'vc-print-log) ;; C-x v l - (define-key map "L" 'vc-print-root-log) ;; C-x v L - (define-key map "I" 'vc-log-incoming) ;; C-x v I - (define-key map "O" 'vc-log-outgoing) ;; C-x v O + (define-key map "P" #'vc-push) ;; C-x v P + (define-key map "l" #'vc-print-log) ;; C-x v l + (define-key map "L" #'vc-print-root-log) ;; C-x v L + (define-key map "I" #'vc-log-incoming) ;; C-x v I + (define-key map "O" #'vc-log-outgoing) ;; C-x v O ;; More confusing than helpful, probably - ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. - ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer + ;;(define-key map "R" #'vc-revert) ;; u is taken by vc-dir-unmark. + ;;(define-key map "A" #'vc-annotate) ;; g is taken by revert-buffer ;; bound by `special-mode'. ;; Marking. - (define-key map "m" 'vc-dir-mark) - (define-key map "d" 'vc-dir-clean-files) - (define-key map "M" 'vc-dir-mark-all-files) - (define-key map "u" 'vc-dir-unmark) - (define-key map "U" 'vc-dir-unmark-all-files) - (define-key map "\C-?" 'vc-dir-unmark-file-up) - (define-key map "\M-\C-?" 'vc-dir-unmark-all-files) + (define-key map "m" #'vc-dir-mark) + (define-key map "d" #'vc-dir-clean-files) + (define-key map "M" #'vc-dir-mark-all-files) + (define-key map "u" #'vc-dir-unmark) + (define-key map "U" #'vc-dir-unmark-all-files) + (define-key map "\C-?" #'vc-dir-unmark-file-up) + (define-key map "\M-\C-?" #'vc-dir-unmark-all-files) ;; Movement. - (define-key map "n" 'vc-dir-next-line) - (define-key map " " 'vc-dir-next-line) - (define-key map "\t" 'vc-dir-next-directory) - (define-key map "p" 'vc-dir-previous-line) - (define-key map [?\S-\ ] 'vc-dir-previous-line) - (define-key map [backtab] 'vc-dir-previous-directory) + (define-key map "n" #'vc-dir-next-line) + (define-key map " " #'vc-dir-next-line) + (define-key map "\t" #'vc-dir-next-directory) + (define-key map "p" #'vc-dir-previous-line) + (define-key map [?\S-\ ] #'vc-dir-previous-line) + (define-key map [backtab] #'vc-dir-previous-directory) ;;; Rebind paragraph-movement commands. - (define-key map "\M-}" 'vc-dir-next-directory) - (define-key map "\M-{" 'vc-dir-previous-directory) - (define-key map [C-down] 'vc-dir-next-directory) - (define-key map [C-up] 'vc-dir-previous-directory) + (define-key map "\M-}" #'vc-dir-next-directory) + (define-key map "\M-{" #'vc-dir-previous-directory) + (define-key map [C-down] #'vc-dir-next-directory) + (define-key map [C-up] #'vc-dir-previous-directory) ;; The remainder. - (define-key map "f" 'vc-dir-find-file) - (define-key map "e" 'vc-dir-find-file) ; dired-mode compatibility - (define-key map "\C-m" 'vc-dir-find-file) - (define-key map "o" 'vc-dir-find-file-other-window) - (define-key map "\C-o" 'vc-dir-display-file) - (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process) - (define-key map [down-mouse-3] 'vc-dir-menu) + (define-key map "f" #'vc-dir-find-file) + (define-key map "e" #'vc-dir-find-file) ; dired-mode compatibility + (define-key map "\C-m" #'vc-dir-find-file) + (define-key map "o" #'vc-dir-find-file-other-window) + (define-key map "\C-o" #'vc-dir-display-file) + (define-key map "\C-c\C-c" #'vc-dir-kill-dir-status-process) + (define-key map [down-mouse-3] #'vc-dir-menu) (define-key map [follow-link] 'mouse-face) - (define-key map "x" 'vc-dir-hide-up-to-date) - (define-key map [?\C-k] 'vc-dir-kill-line) - (define-key map "S" 'vc-dir-search) ;; FIXME: Maybe use A like dired? - (define-key map "Q" 'vc-dir-query-replace-regexp) - (define-key map (kbd "M-s a C-s") 'vc-dir-isearch) - (define-key map (kbd "M-s a M-C-s") 'vc-dir-isearch-regexp) - (define-key map "G" 'vc-dir-ignore) + (define-key map "x" #'vc-dir-hide-up-to-date) + (define-key map [?\C-k] #'vc-dir-kill-line) + (define-key map "S" #'vc-dir-search) ;; FIXME: Maybe use A like dired? + (define-key map "Q" #'vc-dir-query-replace-regexp) + (define-key map (kbd "M-s a C-s") #'vc-dir-isearch) + (define-key map (kbd "M-s a M-C-s") #'vc-dir-isearch-regexp) + (define-key map "G" #'vc-dir-ignore) (let ((branch-map (make-sparse-keymap))) (define-key map "B" branch-map) - (define-key branch-map "c" 'vc-create-tag) - (define-key branch-map "l" 'vc-print-branch-log) - (define-key branch-map "s" 'vc-retrieve-tag)) + (define-key branch-map "c" #'vc-create-tag) + (define-key branch-map "l" #'vc-print-branch-log) + (define-key branch-map "s" #'vc-retrieve-tag)) (let ((mark-map (make-sparse-keymap))) (define-key map "*" mark-map) - (define-key mark-map "r" 'vc-dir-mark-registered-files)) + (define-key mark-map "r" #'vc-dir-mark-registered-files)) ;; Hook up the menu. (define-key map [menu-bar vc-dir-mode] @@ -497,7 +506,7 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc." (t (unless noinsert (ewoc-enter-before vc-ewoc node - (apply 'vc-dir-create-fileinfo entry))) + (apply #'vc-dir-create-fileinfo entry))) (setq entries (cdr entries)) (setq entry (car entries)))))) (t @@ -513,7 +522,7 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc." vc-ewoc node (vc-dir-create-fileinfo rd nil nil nil entrydir)))) ;; Now insert the node itself. (ewoc-enter-before vc-ewoc node - (apply 'vc-dir-create-fileinfo entry))) + (apply #'vc-dir-create-fileinfo entry))) (setq entries (cdr entries) entry (car entries)))))) ;; We're past the last node, all remaining entries go to the end. (unless (or node noinsert) @@ -529,10 +538,10 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc." vc-ewoc (vc-dir-create-fileinfo rd nil nil nil entrydir)))) ;; Now insert the node itself. (ewoc-enter-last vc-ewoc - (apply 'vc-dir-create-fileinfo entry)))))) + (apply #'vc-dir-create-fileinfo entry)))))) (when to-remove (let ((inhibit-read-only t)) - (apply 'ewoc-delete vc-ewoc (nreverse to-remove))))))) + (apply #'ewoc-delete vc-ewoc (nreverse to-remove))))))) (defun vc-dir-busy () (and (buffer-live-p vc-dir-process-buffer) @@ -873,7 +882,7 @@ system; see `vc-dir-delete-file'." The files will also be marked as deleted in the version control system." (interactive) - (mapc 'vc-delete-file (or (vc-dir-marked-files) + (mapc #'vc-delete-file (or (vc-dir-marked-files) (list (vc-dir-current-file))))) (defun vc-dir-find-file () @@ -903,13 +912,13 @@ system." "Search for a string through all marked buffers using Isearch." (interactive) (multi-isearch-files - (mapcar 'car (vc-dir-marked-only-files-and-states)))) + (mapcar #'car (vc-dir-marked-only-files-and-states)))) (defun vc-dir-isearch-regexp () "Search for a regexp through all marked buffers using Isearch." (interactive) (multi-isearch-files-regexp - (mapcar 'car (vc-dir-marked-only-files-and-states)))) + (mapcar #'car (vc-dir-marked-only-files-and-states)))) (defun vc-dir-search (regexp) "Search through all marked files for a match for REGEXP. @@ -934,13 +943,13 @@ with the command \\[tags-loop-continue]." (query-replace-read-args "Query replace regexp in marked files" t t))) (list (nth 0 common) (nth 1 common) (nth 2 common)))) - (dolist (file (mapcar 'car (vc-dir-marked-only-files-and-states))) + (dolist (file (mapcar #'car (vc-dir-marked-only-files-and-states))) (let ((buffer (get-file-buffer file))) (if (and buffer (with-current-buffer buffer buffer-read-only)) (error "File `%s' is visited read-only" file)))) (fileloop-initialize-replace - from to (mapcar 'car (vc-dir-marked-only-files-and-states)) + from to (mapcar #'car (vc-dir-marked-only-files-and-states)) (if (equal from (downcase from)) nil 'default) delimited) (fileloop-continue)) @@ -1152,7 +1161,7 @@ the *vc-dir* buffer. (add-to-list 'vc-dir-buffers (current-buffer)) ;; Make sure that if the directory buffer is killed, the update ;; process running in the background is also killed. - (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t) + (add-hook 'kill-buffer-query-functions #'vc-dir-kill-query nil t) (hack-dir-local-variables-non-file-buffer) (vc-dir-refresh))) @@ -1267,7 +1276,7 @@ Throw an error if another update process is in progress." vc-ewoc 'vc-dir-fileinfo->needs-update))) (if remaining (vc-dir-refresh-files - (mapcar 'vc-dir-fileinfo->name remaining)) + (mapcar #'vc-dir-fileinfo->name remaining)) (setq mode-line-process nil) (run-hooks 'vc-dir-refresh-hook)))))))))))) @@ -1321,7 +1330,7 @@ state of item at point, if any." (ewoc-delete vc-ewoc crt)) (setq crt prev))))) -(defalias 'vc-dir-hide-up-to-date 'vc-dir-hide-state) +(defalias 'vc-dir-hide-up-to-date #'vc-dir-hide-state) (defun vc-dir-kill-line () "Remove the current line from display." @@ -1357,7 +1366,7 @@ state of item at point, if any." (unless (vc-compatible-state (cdr crt) state) (error "When applying VC operations to multiple files, the files are required\nto be in similar VC states.\n%s in state %s clashes with %s in state %s" (car crt) (cdr crt) (caar only-files-list) state))) - (setq only-files-list (mapcar 'car only-files-list)) + (setq only-files-list (mapcar #'car only-files-list)) (when (and state (not (eq state 'unregistered))) (setq model (vc-checkout-model vc-dir-backend only-files-list)))) (list vc-dir-backend files only-files-list state model))) @@ -1428,13 +1437,13 @@ These are the commands available for use in the file status buffer: (defvar vc-dir-status-mouse-map (let ((map (make-sparse-keymap))) - (define-key map [mouse-2] 'vc-dir-toggle-mark) + (define-key map [mouse-2] #'vc-dir-toggle-mark) map) "Local keymap for toggling mark.") (defvar vc-dir-filename-mouse-map (let ((map (make-sparse-keymap))) - (define-key map [mouse-2] 'vc-dir-find-file-other-window) + (define-key map [mouse-2] #'vc-dir-find-file-other-window) map) "Local keymap for visiting a file.") @@ -1454,10 +1463,12 @@ These are the commands available for use in the file status buffer: " " (propertize (format "%-20s" state) - 'face (cond ((eq state 'up-to-date) 'vc-dir-status-up-to-date) - ((memq state '(missing conflict)) 'vc-dir-status-warning) - ((eq state 'edited) 'font-lock-constant-face) - (t 'vc-dir-header-value)) + 'face (cond + ((eq state 'up-to-date) 'vc-dir-status-up-to-date) + ((memq state '(missing conflict needs-update unlocked-changes)) + 'vc-dir-status-warning) + ((eq state 'ignored) 'vc-dir-status-ignored) + (t 'vc-dir-status-edited)) 'mouse-face 'highlight 'keymap vc-dir-status-mouse-map) " " diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 2573964c42c..c29458620e9 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -1,4 +1,4 @@ -;;; vc-dispatcher.el -- generic command-dispatcher facility. -*- lexical-binding: t -*- +;;; vc-dispatcher.el --- generic command-dispatcher facility. -*- lexical-binding: t -*- ;; Copyright (C) 2008-2021 Free Software Foundation, Inc. @@ -242,7 +242,7 @@ CODE should be a function of no arguments." ((or (null proc) (eq (process-status proc) 'exit)) ;; Make sure we've read the process's output before going further. (when proc (accept-process-output proc)) - (if (functionp code) (funcall code) (eval code))) + (if (functionp code) (funcall code) (eval code t))) ;; If a process is running, add CODE to the sentinel ((eq (process-status proc) 'run) (vc-set-mode-line-busy-indicator) @@ -254,7 +254,7 @@ CODE should be a function of no arguments." nil) (defmacro vc-run-delayed (&rest body) - (declare (indent 0) (debug t)) + (declare (indent 0) (debug (def-body))) `(vc-exec-after (lambda () ,@body))) (defvar vc-post-command-functions nil @@ -267,7 +267,7 @@ and is passed 3 arguments: the COMMAND, the FILES and the FLAGS.") (defun vc-delistify (filelist) "Smash a FILELIST into a file list string suitable for info messages." ;; FIXME what about file names with spaces? - (if (not filelist) "." (mapconcat 'identity filelist " "))) + (if (not filelist) "." (mapconcat #'identity filelist " "))) (defcustom vc-tor nil "If non-nil, communicate with the repository site via Tor. @@ -331,7 +331,7 @@ case, and the process object in the asynchronous case." ;; Run asynchronously. (let ((proc (let ((process-connection-type nil)) - (apply 'start-file-process command (current-buffer) + (apply #'start-file-process command (current-buffer) command squeezed)))) (when vc-command-messages (let ((inhibit-message (eq (selected-window) (active-minibuffer-window)))) @@ -339,7 +339,7 @@ case, and the process object in the asynchronous case." ;; Get rid of the default message insertion, in case we don't ;; set a sentinel explicitly. (set-process-sentinel proc #'ignore) - (set-process-filter proc 'vc-process-filter) + (set-process-filter proc #'vc-process-filter) (setq status proc) (when vc-command-messages (vc-run-delayed @@ -351,7 +351,7 @@ case, and the process object in the asynchronous case." (let ((inhibit-message (eq (selected-window) (active-minibuffer-window)))) (message "Running in foreground: %s" full-command))) (let ((buffer-undo-list t)) - (setq status (apply 'process-file command nil t nil squeezed))) + (setq status (apply #'process-file command nil t nil squeezed))) (when (and (not (eq t okstatus)) (or (not (integerp status)) (and okstatus (< okstatus status)))) @@ -394,7 +394,7 @@ Display the buffer in some window, but don't select it." (insert "\"...\n") ;; Run in the original working directory. (let ((default-directory dir)) - (apply 'vc-do-command t 'async command nil args))) + (apply #'vc-do-command t 'async command nil args))) (setq window (display-buffer buffer)) (if window (set-window-start window new-window-start)) diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index ee73aa6f938..254e47933d6 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el @@ -1,4 +1,4 @@ -;;; vc-filewise.el --- common functions for file-oriented back ends. +;;; vc-filewise.el --- common functions for file-oriented back ends. -*- lexical-binding: t; -*- ;; Copyright (C) 1992-1996, 1998-2021 Free Software Foundation, Inc. @@ -82,3 +82,5 @@ If the file is not registered, or the master name is not known, return nil." nil)))) ; Not registered (provide 'vc-filewise) + +;;; vc-filewise.el ends here diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index e7306386fea..935dc8b9aee 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -27,14 +27,6 @@ ;; system. ;; -;;; Installation: - -;; To install: put this file on the load-path and add Git to the list -;; of supported backends in `vc-handled-backends'; the following line, -;; placed in your init file, will accomplish this: -;; -;; (add-to-list 'vc-handled-backends 'Git) - ;;; Todo: ;; - check if more functions could use vc-git-command instead ;; of start-process. @@ -106,6 +98,7 @@ ;;; Code: (require 'cl-lib) +(require 'vc-dispatcher) (eval-when-compile (require 'subr-x) ; for string-trim-right (require 'vc) @@ -134,6 +127,13 @@ If nil, use the value of `vc-annotate-switches'. If t, use no switches." (repeat :tag "Argument List" :value ("") string)) :version "25.1") +(defcustom vc-git-log-switches nil + "String or list of strings specifying switches for Git log under VC." + :type '(choice (const :tag "None" nil) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "28.1") + (defcustom vc-git-resolve-conflicts t "When non-nil, mark conflicted file as resolved upon saving. That is performed after all conflict markers in it have been @@ -242,6 +242,15 @@ included in the completions." ;;;###autoload (load "vc-git" nil t) ;;;###autoload (vc-git-registered file)))) +(defun vc-git--literal-pathspec (pathspec) + "Prepend :(literal) path magic to PATHSPEC." + ;; Good example of PATHSPEC that needs this: "test[56].xx". + (and pathspec (concat ":(literal)" pathspec))) + +(defun vc-git--literal-pathspecs (pathspecs) + "Prepend :(literal) path magic to PATHSPECS." + (mapcar #'vc-git--literal-pathspec pathspecs)) + (defun vc-git-registered (file) "Check whether FILE is registered with git." (let ((dir (vc-git-root file))) @@ -251,16 +260,16 @@ included in the completions." ;; Do not use the `file-name-directory' here: git-ls-files ;; sometimes fails to return the correct status for relative ;; path specs. - ;; See also: http://marc.info/?l=git&m=125787684318129&w=2 + ;; See also: https://marc.info/?l=git&m=125787684318129&w=2 (name (file-relative-name file dir)) (str (with-demoted-errors "Error: %S" (cd dir) - (vc-git--out-ok "ls-files" "-c" "-z" "--" name) + (vc-git--out-ok "ls-files" "-c" "-z" "--" (vc-git--literal-pathspec name)) ;; If result is empty, use ls-tree to check for deleted ;; file. (when (eq (point-min) (point-max)) (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" - "--" name)) + "--" (vc-git--literal-pathspec name))) (buffer-string)))) (and str (> (length str) (length name)) @@ -342,7 +351,7 @@ in the order given by `git status'." ,@(when (version<= "1.7.6.3" (vc-git--program-version)) '("--ignored")) "--")) - (status (apply #'vc-git--run-command-string file args))) + (status (apply #'vc-git--run-command-string (vc-git--literal-pathspec file) args))) (if (null status) ;; If status is nil, there was an error calling git, likely because ;; the file is not in a git repo. @@ -375,7 +384,7 @@ in the order given by `git status'." "Return a string for `vc-mode-line' to put in the mode line for FILE." (let* ((rev (vc-working-revision file 'Git)) (disp-rev (or (vc-git--symbolic-ref file) - (substring rev 0 7))) + (and rev (substring rev 0 7)))) (def-ml (vc-default-mode-line-string 'Git file)) (help-echo (get-text-property 0 'help-echo def-ml)) (face (get-text-property 0 'face def-ml))) @@ -479,7 +488,8 @@ or an empty string if none." (propertize (format "%-12s" state) 'face (cond ((eq state 'up-to-date) 'vc-dir-status-up-to-date) - ((eq state '(missing conflict)) 'vc-dir-status-warning) + ((memq state '(missing conflict)) 'vc-dir-status-warning) + ((eq state 'ignored) 'vc-dir-status-ignored) (t 'vc-dir-status-edited)) 'mouse-face 'highlight 'keymap vc-dir-status-mouse-map) @@ -619,28 +629,28 @@ or an empty string if none." (pcase (vc-git-dir-status-state->stage git-state) ('update-index (if files - (vc-git-command (current-buffer) 'async files "add" "--refresh" "--") + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "add" "--refresh" "--") (vc-git-command (current-buffer) 'async nil "update-index" "--refresh"))) ('ls-files-added - (vc-git-command (current-buffer) 'async files + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "ls-files" "-z" "-c" "-s" "--")) ('ls-files-up-to-date - (vc-git-command (current-buffer) 'async files + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "ls-files" "-z" "-c" "-s" "--")) ('ls-files-conflict - (vc-git-command (current-buffer) 'async files + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "ls-files" "-z" "-u" "--")) ('ls-files-unknown - (vc-git-command (current-buffer) 'async files + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "ls-files" "-z" "-o" "--exclude-standard" "--")) ('ls-files-ignored - (vc-git-command (current-buffer) 'async files + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "ls-files" "-z" "-o" "-i" "--directory" "--no-empty-directory" "--exclude-standard" "--")) ;; --relative added in Git 1.5.5. ('diff-index - (vc-git-command (current-buffer) 'async files + (vc-git-command (current-buffer) 'async (vc-git--literal-pathspecs files) "diff-index" "--relative" "-z" "-M" "HEAD" "--"))) (vc-run-delayed (vc-git-after-dir-status-stage git-state)))) @@ -657,29 +667,29 @@ or an empty string if none." (defvar vc-git-stash-shared-map (let ((map (make-sparse-keymap))) - (define-key map "S" 'vc-git-stash-snapshot) - (define-key map "C" 'vc-git-stash) + (define-key map "S" #'vc-git-stash-snapshot) + (define-key map "C" #'vc-git-stash) map)) (defvar vc-git-stash-map (let ((map (make-sparse-keymap))) (set-keymap-parent map vc-git-stash-shared-map) ;; Turn off vc-dir marking - (define-key map [mouse-2] 'ignore) - - (define-key map [down-mouse-3] 'vc-git-stash-menu) - (define-key map "\C-k" 'vc-git-stash-delete-at-point) - (define-key map "=" 'vc-git-stash-show-at-point) - (define-key map "\C-m" 'vc-git-stash-show-at-point) - (define-key map "A" 'vc-git-stash-apply-at-point) - (define-key map "P" 'vc-git-stash-pop-at-point) + (define-key map [mouse-2] #'ignore) + + (define-key map [down-mouse-3] #'vc-git-stash-menu) + (define-key map "\C-k" #'vc-git-stash-delete-at-point) + (define-key map "=" #'vc-git-stash-show-at-point) + (define-key map "\C-m" #'vc-git-stash-show-at-point) + (define-key map "A" #'vc-git-stash-apply-at-point) + (define-key map "P" #'vc-git-stash-pop-at-point) map)) (defvar vc-git-stash-button-map (let ((map (make-sparse-keymap))) (set-keymap-parent map vc-git-stash-shared-map) - (define-key map [mouse-2] 'push-button) - (define-key map "\C-m" 'push-button) + (define-key map [mouse-2] #'push-button) + (define-key map "\C-m" #'push-button) map)) (defconst vc-git-stash-shared-help @@ -835,7 +845,7 @@ or an empty string if none." (propertize "Nothing stashed" 'help-echo vc-git-stash-shared-help 'keymap vc-git-stash-shared-map - 'face 'vc-dir-ignored)))))) + 'face 'vc-dir-header-value)))))) (defun vc-git-branches () "Return the existing branches, as a list of strings. @@ -868,12 +878,12 @@ The car of the list is the current branch." (when flist (vc-git-command nil 0 flist "update-index" "--add" "--")) (when dlist - (vc-git-command nil 0 dlist "add")))) + (vc-git-command nil 0 (vc-git--literal-pathspecs dlist) "add")))) -(defalias 'vc-git-responsible-p 'vc-git-root) +(defalias 'vc-git-responsible-p #'vc-git-root) (defun vc-git-unregister (file) - (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) + (vc-git-command nil 0 (vc-git--literal-pathspec file) "rm" "-f" "--cached" "--")) (declare-function log-edit-mode "log-edit" ()) (declare-function log-edit-toggle-header "log-edit" (header value)) @@ -904,9 +914,9 @@ If toggling on, also insert its message into the buffer." (defvar vc-git-log-edit-mode-map (let ((map (make-sparse-keymap "Git-Log-Edit"))) - (define-key map "\C-c\C-s" 'vc-git-log-edit-toggle-signoff) - (define-key map "\C-c\C-n" 'vc-git-log-edit-toggle-no-verify) - (define-key map "\C-c\C-e" 'vc-git-log-edit-toggle-amend) + (define-key map "\C-c\C-s" #'vc-git-log-edit-toggle-signoff) + (define-key map "\C-c\C-n" #'vc-git-log-edit-toggle-no-verify) + (define-key map "\C-c\C-e" #'vc-git-log-edit-toggle-amend) map)) (define-derived-mode vc-git-log-edit-mode log-edit-mode "Log-Edit/git" @@ -940,7 +950,7 @@ It is based on `log-edit-mode', and has Git-specific extensions.") (lambda (value) (when (equal value "yes") (list argument))))) ;; When operating on the whole tree, better pass "-a" than ".", since "." ;; fails when we're committing a merge. - (apply 'vc-git-command nil 0 (if only files) + (apply #'vc-git-command nil 0 (if only (vc-git--literal-pathspecs files)) (nconc (if msg-file (list "commit" "-F" (file-local-name msg-file)) (list "commit" "-m")) @@ -967,7 +977,7 @@ It is based on `log-edit-mode', and has Git-specific extensions.") (coding-system-for-write 'binary) (fullname (let ((fn (vc-git--run-command-string - file "ls-files" "-z" "--full-name" "--"))) + (vc-git--literal-pathspec file) "ls-files" "-z" "--full-name" "--"))) ;; ls-files does not return anything when looking for a ;; revision of a file that has been renamed or removed. (if (string= fn "") @@ -984,14 +994,14 @@ It is based on `log-edit-mode', and has Git-specific extensions.") (vc-git-root file))) (defun vc-git-checkout (file &optional rev) - (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) + (vc-git-command nil 0 (vc-git--literal-pathspec file) "checkout" (or rev "HEAD"))) (defun vc-git-revert (file &optional contents-done) "Revert FILE to the version stored in the git repository." (if contents-done (vc-git-command nil 0 file "update-index" "--") - (vc-git-command nil 0 file "reset" "-q" "--") - (vc-git-command nil nil file "checkout" "-q" "--"))) + (vc-git-command nil 0 (vc-git--literal-pathspec file) "reset" "-q" "--") + (vc-git-command nil nil (vc-git--literal-pathspec file) "checkout" "-q" "--"))) (defvar vc-git-error-regexp-alist '(("^ \\(.+\\)\\> *|" 1 nil nil 0)) @@ -1023,13 +1033,13 @@ If PROMPT is non-nil, prompt for the Git command to run." args (cddr args))) (setq args (nconc args extra-args)) (require 'vc-dispatcher) - (apply 'vc-do-async-command buffer root git-program command args) + (apply #'vc-do-async-command buffer root git-program command args) (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git) (setq-local compile-command (concat git-program " " command " " - (mapconcat 'identity args " "))) + (mapconcat #'identity args " "))) (setq-local compilation-directory root) ;; Either set `compilation-buffer-name-function' locally to nil ;; or use `compilation-arguments' to set `name-function'. @@ -1067,7 +1077,7 @@ This prompts for a branch to merge from." branches (cons "FETCH_HEAD" branches)) nil t))) - (apply 'vc-do-async-command buffer root vc-git-program "merge" + (apply #'vc-do-async-command buffer root vc-git-program "merge" (list merge-source)) (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git))) (vc-set-async-update buffer))) @@ -1075,7 +1085,7 @@ This prompts for a branch to merge from." (defun vc-git-conflicted-files (directory) "Return the list of files with conflicts in DIRECTORY." (let* ((status - (vc-git--run-command-string directory "status" "--porcelain" "--")) + (vc-git--run-command-string (vc-git--literal-pathspec directory) "status" "--porcelain" "--")) (lines (when status (split-string status "\n" 'omit-nulls))) files) (dolist (line lines files) @@ -1114,7 +1124,7 @@ This prompts for a branch to merge from." (vc-git-command nil 0 nil "reset")) (vc-resynch-buffer buffer-file-name t t) ;; Remove the hook so that it is not called multiple times. - (remove-hook 'after-save-hook 'vc-git-resolve-when-done t)))) + (remove-hook 'after-save-hook #'vc-git-resolve-when-done t)))) (defun vc-git-find-file-hook () "Activate `smerge-mode' if there is a conflict." @@ -1125,7 +1135,7 @@ This prompts for a branch to merge from." (re-search-forward "^<<<<<<< " nil 'noerror))) (smerge-start-session) (when vc-git-resolve-conflicts - (add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local)) + (add-hook 'after-save-hook #'vc-git-resolve-when-done nil 'local)) (vc-message-unresolved-conflicts buffer-file-name))) ;;; HISTORY FUNCTIONS @@ -1137,6 +1147,8 @@ This prompts for a branch to merge from." :type 'boolean :version "26.1") +(autoload 'vc-switches "vc") + (defun vc-git-print-log (files buffer &optional shortlog start-revision limit) "Print commit log associated with FILES into specified BUFFER. If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'. @@ -1153,8 +1165,8 @@ If LIMIT is a revision string, use it as an end-revision." ;; read-only. (let ((inhibit-read-only t)) (with-current-buffer buffer - (apply 'vc-git-command buffer - 'async files + (apply #'vc-git-command buffer + 'async (vc-git--literal-pathspecs files) (append '("log" "--no-color") (when (and vc-git-print-log-follow @@ -1168,9 +1180,10 @@ If LIMIT is a revision string, use it as an end-revision." (when shortlog `("--graph" "--decorate" "--date=short" ,(format "--pretty=tformat:%s" - (car vc-git-root-log-format)) - "--abbrev-commit")) - (when (numberp limit) + (car vc-git-root-log-format)) + "--abbrev-commit")) + vc-git-log-switches + (when (numberp limit) (list "-n" (format "%s" limit))) (when start-revision (if (and limit (not (numberp limit))) @@ -1223,11 +1236,11 @@ log entries." (read-shell-command "Search log with command: " (format "%s %s" vc-git-program - (mapconcat 'identity args " ")) + (mapconcat #'identity args " ")) 'vc-git-history) " " t)))) (vc-setup-buffer buffer) - (apply 'vc-git-command buffer 'async nil args))) + (apply #'vc-git-command buffer 'async nil args))) (defun vc-git-mergebase (rev1 &optional rev2) (unless rev2 (setq rev2 "HEAD")) @@ -1298,7 +1311,7 @@ or BRANCH^ (where \"^\" can be repeated)." (defun vc-git-expanded-log-entry (revision) (with-temp-buffer - (apply 'vc-git-command t nil nil (list "log" revision "-1" "--")) + (apply #'vc-git-command t nil nil (list "log" revision "-1" "--")) (goto-char (point-min)) (unless (eobp) ;; Indent the expanded log entry. @@ -1318,7 +1331,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." ;; but since Git is one of the two backends that support this operation ;; so far, it's hard to tell; hg doesn't need this. (with-temp-buffer - (vc-call-backend 'git 'diff file "HEAD" nil (current-buffer)) + (vc-call-backend 'git 'diff (list file) "HEAD" nil (current-buffer)) (goto-char (point-min)) (let ((last-offset 0) (from-offset nil) @@ -1391,8 +1404,6 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." samp coding-system-for-read t))) (setq coding-system-for-read 'undecided))) -(autoload 'vc-switches "vc") - (defun vc-git-diff (files &optional rev1 rev2 buffer _async) "Get a difference report using Git between two revisions of FILES." (let (process-file-side-effects @@ -1406,7 +1417,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (if vc-git-diff-switches (apply #'vc-git-command (or buffer "*vc-diff*") 1 ; bug#21969 - files + (vc-git--literal-pathspecs files) command "--exit-code" (append (vc-switches 'git 'diff) @@ -1414,7 +1425,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (vc-git-command (or buffer "*vc-diff*") 1 files "difftool" "--exit-code" "--no-prompt" "-x" (concat "diff " - (mapconcat 'identity + (mapconcat #'identity (vc-switches nil 'diff) " ")) rev1 rev2 "--")))) @@ -1491,7 +1502,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (let* ((fname (file-relative-name file)) (prev-rev (with-temp-buffer (and - (vc-git--out-ok "rev-list" "-2" rev "--" fname) + (vc-git--out-ok "rev-list" "-2" rev "--" (vc-git--literal-pathspec fname)) (goto-char (point-max)) (bolp) (zerop (forward-line -1)) @@ -1519,7 +1530,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (current-rev (with-temp-buffer (and - (vc-git--out-ok "rev-list" "-1" rev "--" file) + (vc-git--out-ok "rev-list" "-1" rev "--" (vc-git--literal-pathspec file)) (goto-char (point-max)) (bolp) (zerop (forward-line -1)) @@ -1531,7 +1542,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (and current-rev (with-temp-buffer (and - (vc-git--out-ok "rev-list" "HEAD" "--" file) + (vc-git--out-ok "rev-list" "HEAD" "--" (vc-git--literal-pathspec file)) (goto-char (point-min)) (search-forward current-rev nil t) (zerop (forward-line -1)) @@ -1541,13 +1552,13 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (or (vc-git-symbolic-commit next-rev) next-rev))) (defun vc-git-delete-file (file) - (vc-git-command nil 0 file "rm" "-f" "--")) + (vc-git-command nil 0 (vc-git--literal-pathspecs file) "rm" "-f" "--")) (defun vc-git-rename-file (old new) - (vc-git-command nil 0 (list old new) "mv" "-f" "--")) + (vc-git-command nil 0 (vc-git--literal-pathspecs (list old new)) "mv" "-f" "--")) (defun vc-git-mark-resolved (files) - (vc-git-command nil 0 files "add")) + (vc-git-command nil 0 (vc-git--literal-pathspecs files) "add")) (defvar vc-git-extra-menu-map (let ((map (make-sparse-keymap))) @@ -1775,7 +1786,7 @@ The difference to vc-do-command is that this function always invokes ,@(when revert-buffer-in-progress-p '("GIT_OPTIONAL_LOCKS=0"))) process-environment))) - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program + (apply #'vc-do-command (or buffer "*vc*") okstatus vc-git-program ;; https://debbugs.gnu.org/16897 (unless (and (not (cdr-safe file-or-list)) (let ((file (or (car-safe file-or-list) @@ -1809,10 +1820,10 @@ The difference to vc-do-command is that this function always invokes ,@(when revert-buffer-in-progress-p '("GIT_OPTIONAL_LOCKS=0"))) process-environment))) - (apply 'process-file vc-git-program nil buffer nil "--no-pager" command args))) + (apply #'process-file vc-git-program nil buffer nil "--no-pager" command args))) (defun vc-git--out-ok (command &rest args) - (zerop (apply 'vc-git--call '(t nil) command args))) + (zerop (apply #'vc-git--call '(t nil) command args))) (defun vc-git--run-command-string (file &rest args) "Run a git command on FILE and return its output as string. @@ -1820,7 +1831,7 @@ FILE can be nil." (let* ((ok t) (str (with-output-to-string (with-current-buffer standard-output - (unless (apply 'vc-git--out-ok + (unless (apply #'vc-git--out-ok (if file (append args (list (file-relative-name file))) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 1d163a64ab2..4a64caa36b8 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -26,12 +26,6 @@ ;; This is a mercurial version control backend -;;; Thanks: - -;;; Bugs: - -;;; Installation: - ;;; Todo: ;; 1) Implement the rest of the vc interface. See the comment at the @@ -97,9 +91,6 @@ ;; without even using `hg' (this way even if you don't have `hg' installed, ;; Emacs is able to tell you this file is under mercurial's control). -;;; History: -;; - ;;; Code: (require 'cl-lib) @@ -124,8 +115,7 @@ :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "22.2" - :group 'vc-hg) + :version "22.2") (defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u "String or list of strings specifying switches for Hg diff under VC. @@ -134,8 +124,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-hg) + :version "23.1") (defcustom vc-hg-annotate-switches '("-u" "--follow") "String or list of strings specifying switches for hg annotate under VC. @@ -145,8 +134,7 @@ switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "25.1" - :group 'vc-hg) + :version "25.1") (defcustom vc-hg-revert-switches nil "String or list of strings specifying switches for hg revert @@ -154,13 +142,11 @@ under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "27.1" - :group 'vc-hg) + :version "27.1") (defcustom vc-hg-program "hg" "Name of the Mercurial executable (excluding any arguments)." - :type 'string - :group 'vc-hg) + :type 'string) (defcustom vc-hg-root-log-format `(,(concat "{rev}:{ifeq(branch, 'default','', '{branch}')}" @@ -183,7 +169,6 @@ REGEXP is a regular expression matching the resulting Mercurial output, and KEYWORDS is a list of `font-lock-keywords' for highlighting the Log View buffer." :type '(list string regexp (repeat sexp)) - :group 'vc-hg :version "24.5") (defcustom vc-hg-create-bookmark t @@ -311,8 +296,7 @@ If no list entry produces a useful revision, return `nil'." (const :tag "Active bookmark" builtin-active-bookmark) (string :tag "Hg template") (function :tag "Custom"))) - :version "26.1" - :group 'vc-hg) + :version "26.1") (defcustom vc-hg-use-file-version-for-mode-line-version nil "When enabled, the modeline contains revision information for the visited file. @@ -320,8 +304,7 @@ When not, the revision in the modeline is for the repository working copy. `nil' is the much faster setting for large repositories." :type 'boolean - :version "26.1" - :group 'vc-hg) + :version "26.1") (defun vc-hg--active-bookmark-internal (rev) (when (equal rev ".") @@ -413,8 +396,7 @@ specific file to query." "String or list of strings specifying switches for hg log under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-hg) + (repeat :tag "Argument List" :value ("") string))) (autoload 'vc-setup-buffer "vc-dispatcher") @@ -442,7 +424,7 @@ If LIMIT is non-nil, show no more than this many entries." (let ((inhibit-read-only t)) (with-current-buffer buffer - (apply 'vc-hg-command buffer 'async files "log" + (apply #'vc-hg-command buffer 'async files "log" (nconc (when start-revision (list (format "-r%s:0" start-revision))) (when limit (list "-l" (format "%s" limit))) @@ -666,8 +648,7 @@ directly instead of always running Mercurial. We try to be safe against Mercurial data structure format changes and always fall back to running Mercurial directly." :type 'boolean - :version "26.1" - :group 'vc-hg) + :version "26.1") (defsubst vc-hg--read-u8 () "Read and advance over an unsigned byte. @@ -870,8 +851,8 @@ if we don't understand a construct, we signal (push "\\[" parts)) (t (let ((x (substring glob i j))) - (setf x (replace-regexp-in-string - "\\\\" "\\\\" x t t)) + (setf x (string-replace + "\\" "\\\\" x)) (setf i (1+ j)) (cond ((eq (aref x 0) ?!) (setf (aref x 0) ?^)) @@ -1177,7 +1158,7 @@ hg binary." "Create a new Mercurial repository." (vc-hg-command nil 0 nil "init")) -(defalias 'vc-hg-responsible-p 'vc-hg-root) +(defalias 'vc-hg-responsible-p #'vc-hg-root) (defun vc-hg-unregister (file) "Unregister FILE from hg." @@ -1200,7 +1181,7 @@ If toggling on, also insert its message into the buffer." (defvar vc-hg-log-edit-mode-map (let ((map (make-sparse-keymap "Hg-Log-Edit"))) - (define-key map "\C-c\C-e" 'vc-hg-log-edit-toggle-amend) + (define-key map "\C-c\C-e" #'vc-hg-log-edit-toggle-amend) map)) (define-derived-mode vc-hg-log-edit-mode log-edit-mode "Log-Edit/hg" @@ -1214,7 +1195,7 @@ REV is ignored." (lambda (value) (when (equal value "yes") (list "--amend"))))) - (apply 'vc-hg-command nil 0 files + (apply #'vc-hg-command nil 0 files (nconc (list "commit" "-m") (log-edit-extract-headers `(("Author" . "--user") ("Date" . "--date") @@ -1252,7 +1233,7 @@ REV is the revision to check out into WORKFILE." (unless (re-search-forward "^<<<<<<< " nil t) (vc-hg-command nil 0 buffer-file-name "resolve" "-m") ;; Remove the hook so that it is not called multiple times. - (remove-hook 'after-save-hook 'vc-hg-resolve-when-done t)))) + (remove-hook 'after-save-hook #'vc-hg-resolve-when-done t)))) (defun vc-hg-find-file-hook () (when (and buffer-file-name @@ -1268,7 +1249,7 @@ REV is the revision to check out into WORKFILE." ;; Hg may not recognize "conflict" as a state, but we can do better. (vc-file-setprop buffer-file-name 'vc-state 'conflict) (smerge-start-session) - (add-hook 'after-save-hook 'vc-hg-resolve-when-done nil t) + (add-hook 'after-save-hook #'vc-hg-resolve-when-done nil t) (vc-message-unresolved-conflicts buffer-file-name))) @@ -1403,8 +1384,8 @@ This runs the command \"hg summary\"." (cons (capitalize (match-string 1)) (match-string 2)) (cons "" (buffer-substring (point) (line-end-position)))))) (concat - (propertize (format "%-11s: " (car entry)) 'face 'font-lock-type-face) - (propertize (cdr entry) 'face 'font-lock-variable-name-face))) + (propertize (format "%-11s: " (car entry)) 'face 'vc-dir-header) + (propertize (cdr entry) 'face 'vc-dir-header-value))) result) (forward-line)) (nreverse result)) @@ -1443,7 +1424,7 @@ commands, which only operated on marked files." (apply #'vc-hg-command nil 0 nil command - (apply 'nconc + (apply #'nconc (mapcar (lambda (arg) (list "-r" arg)) marked-list))) (let* ((root (vc-hg-root default-directory)) (buffer (format "*vc-hg : %s*" (expand-file-name root))) @@ -1463,18 +1444,18 @@ commands, which only operated on marked files." (setq hg-program (car args) command (cadr args) args (cddr args))) - (apply 'vc-do-async-command buffer root hg-program command args) + (apply #'vc-do-async-command buffer root hg-program command args) (with-current-buffer buffer (vc-run-delayed (dolist (cmd post-processing) - (apply 'vc-do-command buffer nil hg-program nil cmd)) + (apply #'vc-do-command buffer nil hg-program nil cmd)) (vc-compilation-mode 'hg) (setq-local compile-command (concat hg-program " " command " " - (mapconcat 'identity args " ") + (mapconcat #'identity args " ") (mapconcat (lambda (args) (concat " && " hg-program " " - (mapconcat 'identity + (mapconcat #'identity args " "))) post-processing ""))) (setq-local compilation-directory root) @@ -1525,7 +1506,7 @@ This runs the command \"hg merge\"." ;; Disable pager. (process-environment (cons "HGPLAIN=1" process-environment)) (branch (vc-read-revision "Revision to merge: "))) - (apply 'vc-do-async-command buffer root vc-hg-program + (apply #'vc-do-async-command buffer root vc-hg-program (append '("--config" "ui.report_untrusted=0" "merge") (unless (string= branch "") (list branch)))) (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg))) @@ -1540,7 +1521,8 @@ This function differs from vc-do-command in that it invokes ;; Disable pager. (let ((process-environment (cons "HGPLAIN=1" process-environment)) (flags (append '("--config" "ui.report_untrusted=0") flags))) - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list + (apply #'vc-do-command (or buffer "*vc*") + okstatus vc-hg-program file-or-list (if (stringp vc-hg-global-switches) (cons vc-hg-global-switches flags) (append vc-hg-global-switches diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index f910f9d5496..4b3c829a2c6 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -50,50 +50,42 @@ (defface vc-up-to-date-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file is up to date." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-needs-update-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file needs update." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-locked-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file locked." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-locally-added-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file is locally added." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-conflict-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file contains merge conflicts." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-removed-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file was removed from the VC system." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-missing-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file is missing from the file system." - :version "25.1" - :group 'vc-faces) + :version "25.1") (defface vc-edited-state '((default :inherit vc-state-base)) "Face for VC modeline state when the file is edited." - :version "25.1" - :group 'vc-faces) + :version "25.1") ;; Customization Variables (the rest is in vc.el) @@ -871,31 +863,31 @@ In the latter case, VC mode is deactivated for this buffer." ;; (autoload 'vc-prefix-map "vc" nil nil 'keymap) (defvar vc-prefix-map (let ((map (make-sparse-keymap))) - (define-key map "a" 'vc-update-change-log) - (define-key map "b" 'vc-switch-backend) - (define-key map "d" 'vc-dir) - (define-key map "g" 'vc-annotate) - (define-key map "G" 'vc-ignore) - (define-key map "h" 'vc-region-history) - (define-key map "i" 'vc-register) - (define-key map "l" 'vc-print-log) - (define-key map "L" 'vc-print-root-log) - (define-key map "I" 'vc-log-incoming) - (define-key map "O" 'vc-log-outgoing) - (define-key map "ML" 'vc-log-mergebase) - (define-key map "MD" 'vc-diff-mergebase) - (define-key map "m" 'vc-merge) - (define-key map "r" 'vc-retrieve-tag) - (define-key map "s" 'vc-create-tag) - (define-key map "u" 'vc-revert) - (define-key map "v" 'vc-next-action) - (define-key map "+" 'vc-update) + (define-key map "a" #'vc-update-change-log) + (define-key map "b" #'vc-switch-backend) + (define-key map "d" #'vc-dir) + (define-key map "g" #'vc-annotate) + (define-key map "G" #'vc-ignore) + (define-key map "h" #'vc-region-history) + (define-key map "i" #'vc-register) + (define-key map "l" #'vc-print-log) + (define-key map "L" #'vc-print-root-log) + (define-key map "I" #'vc-log-incoming) + (define-key map "O" #'vc-log-outgoing) + (define-key map "ML" #'vc-log-mergebase) + (define-key map "MD" #'vc-diff-mergebase) + (define-key map "m" #'vc-merge) + (define-key map "r" #'vc-retrieve-tag) + (define-key map "s" #'vc-create-tag) + (define-key map "u" #'vc-revert) + (define-key map "v" #'vc-next-action) + (define-key map "+" #'vc-update) ;; I'd prefer some kind of symmetry with vc-update: - (define-key map "P" 'vc-push) - (define-key map "=" 'vc-diff) - (define-key map "D" 'vc-root-diff) - (define-key map "~" 'vc-revision-other-window) - (define-key map "x" 'vc-delete-file) + (define-key map "P" #'vc-push) + (define-key map "=" #'vc-diff) + (define-key map "D" #'vc-root-diff) + (define-key map "~" #'vc-revision-other-window) + (define-key map "x" #'vc-delete-file) map)) (fset 'vc-prefix-map vc-prefix-map) (define-key ctl-x-map "v" 'vc-prefix-map) diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 3b610a1e4fe..ea69893071a 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -46,8 +46,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-mtn) + :version "23.1") (defcustom vc-mtn-annotate-switches nil "String or list of strings specifying switches for mtn annotate under VC. @@ -57,13 +56,11 @@ switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "25.1" - :group 'vc-mtn) + :version "25.1") (defcustom vc-mtn-program "mtn" "Name of the monotone executable." - :type 'string - :group 'vc-mtn) + :type 'string) ;; Clear up the cache to force vc-call to check again and discover ;; new functions when we reload this file. @@ -115,7 +112,7 @@ switches." (let ((process-environment ;; Avoid localization of messages so we can parse the output. (cons "LC_MESSAGES=C" process-environment))) - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-mtn-program + (apply #'vc-do-command (or buffer "*vc*") okstatus vc-mtn-program files flags))) (defun vc-mtn-state (file) @@ -176,8 +173,7 @@ switches." '(("\\`[^:/#]*[:/#]" . "")) ;Drop the host part. "Rewrite rules to shorten Mtn's revision names on the mode-line." :type '(repeat (cons regexp string)) - :version "22.2" - :group 'vc-mtn) + :version "22.2") (defun vc-mtn-mode-line-string (file) "Return a string for `vc-mode-line' to put in the mode line for FILE." @@ -203,7 +199,7 @@ switches." (declare-function log-edit-extract-headers "log-edit" (headers string)) (defun vc-mtn-checkin (files comment &optional _rev) - (apply 'vc-mtn-command nil 0 files + (apply #'vc-mtn-command nil 0 files (nconc (list "commit" "-m") (log-edit-extract-headers '(("Author" . "--author") ("Date" . "--date")) @@ -227,7 +223,7 @@ switches." _SHORTLOG is ignored. If START-REVISION is non-nil, it is the newest revision to show. If LIMIT is non-nil, show no more than this many entries." - (apply 'vc-mtn-command buffer 0 files "log" + (apply #'vc-mtn-command buffer 0 files "log" (append (when start-revision (list "--from" (format "%s" start-revision))) (when limit (list "--last" (format "%s" limit)))))) @@ -258,7 +254,7 @@ If LIMIT is non-nil, show no more than this many entries." (defun vc-mtn-diff (files &optional rev1 rev2 buffer _async) "Get a difference report using monotone between two revisions of FILES." - (apply 'vc-mtn-command (or buffer "*vc-diff*") + (apply #'vc-mtn-command (or buffer "*vc-diff*") 1 ; bug#21969 files "diff" (append diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 8d64ee5cc57..6ffc1a8a2ff 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -58,8 +58,7 @@ If nil, VC itself computes this value when it is first needed." :type '(choice (const :tag "Auto" nil) (string :tag "Specified") - (const :tag "Unknown" unknown)) - :group 'vc-rcs) + (const :tag "Unknown" unknown))) (defcustom vc-rcs-register-switches nil "Switches for registering a file in RCS. @@ -70,8 +69,7 @@ If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-rcs) + :version "21.1") (defcustom vc-rcs-diff-switches nil "String or list of strings specifying switches for RCS diff under VC. @@ -80,21 +78,18 @@ 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 "21.1" - :group 'vc-rcs) + :version "21.1") (defcustom vc-rcs-header '("$Id\ $") "Header keywords to be inserted by `vc-insert-headers'." :type '(repeat string) - :version "24.1" ; no longer consult the obsolete vc-header-alist - :group 'vc-rcs) + :version "24.1") ; no longer consult the obsolete vc-header-alist (defcustom vc-rcsdiff-knows-brief nil "Indicates whether rcsdiff understands the --brief option. The value is either `yes', `no', or nil. If it is nil, VC tries to use --brief and sets this variable to remember whether it worked." - :type '(choice (const :tag "Work out" nil) (const yes) (const no)) - :group 'vc-rcs) + :type '(choice (const :tag "Work out" nil) (const yes) (const no))) ;; This needs to be autoloaded because vc-rcs-registered uses it (via ;; vc-default-registered), and vc-hooks needs to be able to check @@ -109,8 +104,7 @@ For a description of possible values, see `vc-check-master-templates'." (repeat :tag "User-specified" (choice string function))) - :version "21.1" - :group 'vc-rcs) + :version "21.1") ;;; Properties of the backend @@ -379,7 +373,7 @@ whether to remove it." "Retrieve a copy of a saved version of FILE. If FILE is a directory, attempt the checkout for all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-rcs-checkout (vc-expand-dirs (list file) 'RCS)) + (mapc #'vc-rcs-checkout (vc-expand-dirs (list file) 'RCS)) (let ((file-buffer (get-file-buffer file)) switches) (message "Checking out %s..." file) @@ -445,7 +439,7 @@ attempt the checkout for all registered files beneath it." "Revert FILE to the version it was based on. If FILE is a directory, revert all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-rcs-revert (vc-expand-dirs (list file) 'RCS)) + (mapc #'vc-rcs-revert (vc-expand-dirs (list file) 'RCS)) (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f" (concat (if (eq (vc-state file) 'edited) "-u" "-r") (vc-working-revision file))))) @@ -488,7 +482,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." If FILE is a directory, steal the lock on all registered files beneath it. Needs RCS 5.6.2 or later for -M." (if (file-directory-p file) - (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file) 'RCS)) + (mapc #'vc-rcs-steal-lock (vc-expand-dirs (list file) 'RCS)) (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) "-M" (concat "-u" rev)) ;; Do a real checkout after stealing the lock, so that we see ;; expanded headers. @@ -539,7 +533,7 @@ Remaining arguments are ignored. If FILE is a directory the operation is applied to all registered files beneath it." (vc-do-command (or buffer "*vc*") 0 "rlog" - (mapcar 'vc-master-name (vc-expand-dirs files 'RCS))) + (mapcar #'vc-master-name (vc-expand-dirs files 'RCS))) (with-current-buffer (or buffer "*vc*") (vc-rcs-print-log-cleanup)) (when limit 'limit-unsupported)) @@ -1344,7 +1338,7 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension." (push `(,(to-eol) ,(k-semi 'date (lambda () - (let ((ls (mapcar 'string-to-number + (let ((ls (mapcar #'string-to-number (split-string (buffer-substring-no-properties b e) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 3d3f4048052..92cce5f13a8 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -55,8 +55,7 @@ If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-sccs) + :version "21.1") (defcustom vc-sccs-diff-switches nil "String or list of strings specifying switches for SCCS diff under VC. @@ -65,14 +64,12 @@ 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 "21.1" - :group 'vc-sccs) + :version "21.1") (defcustom vc-sccs-header '("%W%") "Header keywords to be inserted by `vc-insert-headers'." :type '(repeat string) - :version "24.1" ; no longer consult the obsolete vc-header-alist - :group 'vc-sccs) + :version "24.1") ; no longer consult the obsolete vc-header-alist ;; This needs to be autoloaded because vc-sccs-registered uses it (via ;; vc-default-registered), and vc-hooks needs to be able to check @@ -87,8 +84,7 @@ For a description of possible values, see `vc-check-master-templates'." (repeat :tag "User-specified" (choice string function))) - :version "21.1" - :group 'vc-sccs) + :version "21.1") ;;; @@ -163,7 +159,7 @@ For a description of possible values, see `vc-check-master-templates'." "Write the SCCS version of input file FILE to output file OUTFILE. Optional string REV is a revision." (with-temp-buffer - (apply 'vc-sccs-do-command t 0 "get" (vc-master-name file) + (apply #'vc-sccs-do-command t 0 "get" (vc-master-name file) (append '("-s" "-p" "-k") ; -k: no keyword expansion (if rev (list (concat "-r" rev))))) (write-region nil nil outfile nil 'silent))) @@ -185,7 +181,7 @@ Optional string REV is a revision." (defun vc-sccs-do-command (buffer okstatus command file-or-list &rest flags) ;; (let ((load-path (append vc-sccs-path load-path))) ;; (apply 'vc-do-command buffer okstatus command file-or-list flags)) - (apply 'vc-do-command (or buffer "*vc*") okstatus "sccs" file-or-list command flags)) + (apply #'vc-do-command (or buffer "*vc*") okstatus "sccs" file-or-list command flags)) (defun vc-sccs-create-repo () "Create a new SCCS repository." @@ -207,7 +203,7 @@ to the SCCS command." (let ((vc-master-name (or project-file (format (car vc-sccs-master-templates) dirname basename)))) - (apply 'vc-sccs-do-command nil 0 "admin" vc-master-name + (apply #'vc-sccs-do-command nil 0 "admin" vc-master-name "-fb" (concat "-i" (file-relative-name file)) (and comment (concat "-y" comment)) @@ -225,14 +221,14 @@ to the SCCS command." (defun vc-sccs-checkin (files comment &optional rev) "SCCS-specific version of `vc-backend-checkin'." (dolist (file (vc-expand-dirs files 'SCCS)) - (apply 'vc-sccs-do-command nil 0 "delta" (vc-master-name file) + (apply #'vc-sccs-do-command nil 0 "delta" (vc-master-name file) (if rev (concat "-r" rev)) (concat "-y" comment) (vc-switches 'SCCS 'checkin)) (vc-sccs-do-command nil 0 "get" (vc-master-name file)))) (defun vc-sccs-find-revision (file rev buffer) - (apply 'vc-sccs-do-command + (apply #'vc-sccs-do-command buffer 0 "get" (vc-master-name file) "-s" ;; suppress diagnostic output "-p" @@ -247,7 +243,7 @@ If FILE is a directory, all version-controlled files beneath are checked out. EDITABLE non-nil means that the file should be writable and locked. REV is the revision to check out." (if (file-directory-p file) - (mapc 'vc-sccs-checkout (vc-expand-dirs (list file) 'SCCS)) + (mapc #'vc-sccs-checkout (vc-expand-dirs (list file) 'SCCS)) (let ((file-buffer (get-file-buffer file)) switches) (message "Checking out %s..." file) @@ -267,7 +263,7 @@ locked. REV is the revision to check out." (and rev (or (string= rev "") (not (stringp rev))) (setq rev nil)) - (apply 'vc-sccs-do-command nil 0 "get" (vc-master-name file) + (apply #'vc-sccs-do-command nil 0 "get" (vc-master-name file) "-e" (and rev (concat "-r" (vc-sccs-lookup-triple file rev))) switches)))) @@ -277,7 +273,7 @@ locked. REV is the revision to check out." "Revert FILE to the version it was based on. If FILE is a directory, revert all subfiles." (if (file-directory-p file) - (mapc 'vc-sccs-revert (vc-expand-dirs (list file) 'SCCS)) + (mapc #'vc-sccs-revert (vc-expand-dirs (list file) 'SCCS)) (vc-sccs-do-command nil 0 "unget" (vc-master-name file)) (vc-sccs-do-command nil 0 "get" (vc-master-name file)) ;; Checking out explicit revisions is not supported under SCCS, yet. @@ -288,7 +284,7 @@ revert all subfiles." (defun vc-sccs-steal-lock (file &optional rev) "Steal the lock on the current workfile for FILE and revision REV." (if (file-directory-p file) - (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file) 'SCCS)) + (mapc #'vc-sccs-steal-lock (vc-expand-dirs (list file) 'SCCS)) (vc-sccs-do-command nil 0 "unget" (vc-master-name file) "-n" (if rev (concat "-r" rev))) (vc-sccs-do-command nil 0 "get" @@ -309,7 +305,7 @@ revert all subfiles." "Print commit log associated with FILES into specified BUFFER. Remaining arguments are ignored." (setq files (vc-expand-dirs files 'SCCS)) - (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-master-name files)) + (vc-sccs-do-command buffer 0 "prs" (mapcar #'vc-master-name files)) (when limit 'limit-unsupported)) (autoload 'vc-setup-buffer "vc-dispatcher") @@ -338,7 +334,7 @@ Remaining arguments are ignored." (fake-command (format "diff%s %s" (if fake-flags - (concat " " (mapconcat 'identity fake-flags " ")) + (concat " " (mapconcat #'identity fake-flags " ")) "") (vc-delistify files))) (status 0) @@ -362,7 +358,7 @@ Remaining arguments are ignored." (cons "LC_MESSAGES=C" process-environment)) (w32-quote-process-args t) (this-status - (apply 'process-file "diff" nil t nil + (apply #'process-file "diff" nil t nil (append (vc-switches 'SCCS 'diff) (list (file-local-name oldfile) (or newfile diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 201d69d79a1..faba5bce2b7 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -97,13 +97,11 @@ If nil, VC itself computes this value when it is first needed." :type '(choice (const :tag "Auto" nil) (string :tag "Specified") - (const :tag "Unknown" unknown)) - :group 'vc-src) + (const :tag "Unknown" unknown))) (defcustom vc-src-program "src" "Name of the SRC executable (excluding any arguments)." - :type 'string - :group 'vc-src) + :type 'string) (defcustom vc-src-diff-switches nil "String or list of strings specifying switches for SRC diff under VC. @@ -111,8 +109,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :type '(choice (const :tag "Unspecified" nil) (const :tag "None" t) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-src) + (repeat :tag "Argument List" :value ("") string))) ;; This needs to be autoloaded because vc-src-registered uses it (via ;; vc-default-registered), and vc-hooks needs to be able to check @@ -126,8 +123,7 @@ For a description of possible values, see `vc-check-master-templates'." '("%s.src/%s,v")) (repeat :tag "User-specified" (choice string - function))) - :group 'vc-src) + function)))) ;;; Properties of the backend @@ -221,7 +217,7 @@ This function differs from vc-do-command in that it invokes `vc-src-program'." (setq file-list (list "--" file-or-list))) (file-or-list (setq file-list (cons "--" file-or-list)))) - (apply 'vc-do-command (or buffer "*vc*") 0 vc-src-program file-list flags))) + (apply #'vc-do-command (or buffer "*vc*") 0 vc-src-program file-list flags))) (defun vc-src-working-revision (file) "SRC-specific version of `vc-working-revision'." @@ -275,7 +271,7 @@ REV is the revision to check out into WORKFILE." "Revert FILE to the version it was based on. If FILE is a directory, revert all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-src-revert (vc-expand-dirs (list file) 'SRC)) + (mapc #'vc-src-revert (vc-expand-dirs (list file) 'SRC)) (vc-src-command nil file "co"))) (defun vc-src-modify-change-comment (files rev comment) @@ -290,8 +286,7 @@ directory the operation is applied to all registered files beneath it." "String or list of strings specifying switches for src log under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-src) + (repeat :tag "Argument List" :value ("") string))) (defun vc-src-print-log (files buffer &optional shortlog _start-revision limit) "Print commit log associated with FILES into specified BUFFER. @@ -307,7 +302,7 @@ If LIMIT is non-nil, show no more than this many entries." (let ((inhibit-read-only t)) (with-current-buffer buffer - (apply 'vc-src-command buffer files (if shortlog "list" "log") + (apply #'vc-src-command buffer files (if shortlog "list" "log") (nconc ;;(when start-revision (list (format "%s-1" start-revision))) (when limit (list "-l" (format "%s" limit))) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index da5471107d2..544a6c769fc 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -47,8 +47,7 @@ ;; FIXME there is also svnadmin. (defcustom vc-svn-program "svn" "Name of the SVN executable." - :type 'string - :group 'vc-svn) + :type 'string) ;; Might be nice if svn defaulted to non-interactive if stdin not tty. ;; https://svn.haxx.se/dev/archive-2008-05/0762.shtml @@ -64,8 +63,7 @@ hanging while prompting for authorization." (repeat :tag "Argument List" :value ("") string)) - :version "24.4" - :group 'vc-svn) + :version "24.4") (defcustom vc-svn-register-switches nil "Switches for registering a file into SVN. @@ -76,8 +74,7 @@ If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "22.1" - :group 'vc-svn) + :version "22.1") (defcustom vc-svn-diff-switches t ;`svn' doesn't support common args like -c or -b. @@ -92,8 +89,7 @@ If you want to force an empty list of arguments, use t." (repeat :tag "Argument List" :value ("") string)) - :version "22.1" - :group 'vc-svn) + :version "22.1") (defcustom vc-svn-annotate-switches nil "String or list of strings specifying switches for svn annotate under VC. @@ -103,14 +99,12 @@ switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "25.1" - :group 'vc-svn) + :version "25.1") (defcustom vc-svn-header '("$Id\ $") "Header keywords to be inserted by `vc-insert-headers'." :version "24.1" ; no longer consult the obsolete vc-header-alist - :type '(repeat string) - :group 'vc-svn) + :type '(repeat string)) ;; We want to autoload it for use by the autoloaded version of ;; vc-svn-registered, but we want the value to be compiled at startup, not @@ -198,7 +192,7 @@ switches." (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) (propstat (cdr (assq (aref (match-string 2) 0) state-map))) (filename (if (memq system-type '(windows-nt ms-dos)) - (replace-regexp-in-string "\\\\" "/" (match-string 4)) + (string-replace "\\" "/" (match-string 4)) (match-string 4)))) (and (memq propstat '(conflict edited)) (not (eq state 'conflict)) ; conflict always wins @@ -239,8 +233,8 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." (concat (cond (repo (concat - (propertize "Repository : " 'face 'font-lock-type-face) - (propertize repo 'face 'font-lock-variable-name-face))) + (propertize "Repository : " 'face 'vc-dir-header) + (propertize repo 'face 'vc-dir-header-value))) (t ""))))) (defun vc-svn-working-revision (file) @@ -305,19 +299,19 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." The COMMENT argument is ignored This does an add but not a commit. Passes either `vc-svn-register-switches' or `vc-register-switches' to the SVN command." - (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) + (apply #'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) (defun vc-svn-root (file) (vc-find-root file vc-svn-admin-directory)) -(defalias 'vc-svn-responsible-p 'vc-svn-root) +(defalias 'vc-svn-responsible-p #'vc-svn-root) (declare-function log-edit-extract-headers "log-edit" (headers string)) (defun vc-svn-checkin (files comment &optional _extra-args-ignored) "SVN-specific version of `vc-backend-checkin'." (let ((status (apply - 'vc-svn-command nil 1 files "ci" + #'vc-svn-command nil 1 files "ci" (nconc (cons "-m" (log-edit-extract-headers nil comment)) (vc-switches 'SVN 'checkin))))) (set-buffer "*vc*") @@ -345,7 +339,7 @@ to the SVN command." (defun vc-svn-find-revision (file rev buffer) "SVN-specific retrieval of a specified version into a buffer." (let (process-file-side-effects) - (apply 'vc-svn-command + (apply #'vc-svn-command buffer 0 file "cat" (and rev (not (string= rev "")) @@ -391,7 +385,7 @@ DIRECTORY or absolute." nil ;; Check out a particular version (or recreate the file). (vc-file-setprop file 'vc-working-revision nil) - (apply 'vc-svn-command nil 0 file + (apply #'vc-svn-command nil 0 file "update" (cond ((null rev) "-rBASE") @@ -563,27 +557,27 @@ If LIMIT is non-nil, show no more than this many entries." (goto-char (point-min)) (if files (dolist (file files) - (insert "Working file: " file "\n") - (apply - 'vc-svn-command - buffer - 'async - (list file) - "log" - (append - (list - (if start-revision - (format "-r%s:1" start-revision) - ;; By default Subversion only shows the log up to the - ;; working revision, whereas we also want the log of the - ;; subsequent commits. At least that's what the - ;; vc-cvs.el code does. - "-rHEAD:0")) - (if (eq vc-log-view-type 'with-diff) - (list "--diff")) - (when limit (list "--limit" (format "%s" limit)))))) + (insert "Working file: " file "\n") + (apply + #'vc-svn-command + buffer + 'async + (list file) + "log" + (append + (list + (if start-revision + (format "-r%s:1" start-revision) + ;; By default Subversion only shows the log up to the + ;; working revision, whereas we also want the log of the + ;; subsequent commits. At least that's what the + ;; vc-cvs.el code does. + "-rHEAD:0")) + (if (eq vc-log-view-type 'with-diff) + (list "--diff")) + (when limit (list "--limit" (format "%s" limit)))))) ;; Dump log for the entire directory. - (apply 'vc-svn-command buffer 0 nil "log" + (apply #'vc-svn-command buffer 0 nil "log" (append (list (if start-revision (format "-r%s" start-revision) "-rHEAD:0")) @@ -611,8 +605,8 @@ If LIMIT is non-nil, show no more than this many entries." (if vc-svn-diff-switches (vc-switches 'SVN 'diff) (list (concat "--diff-cmd=" diff-command) "-x" - (mapconcat 'identity (vc-switches nil 'diff) " "))))) - (apply 'vc-svn-command buffer + (mapconcat #'identity (vc-switches nil 'diff) " "))))) + (apply #'vc-svn-command buffer (if async 'async 0) files "diff" (append @@ -671,7 +665,7 @@ NAME is assumed to be a URL." "A wrapper around `vc-do-command' for use in vc-svn.el. The difference to vc-do-command is that this function always invokes `svn', and that it passes `vc-svn-global-switches' to it before FLAGS." - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list + (apply #'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list (if (stringp vc-svn-global-switches) (cons vc-svn-global-switches flags) (append vc-svn-global-switches flags)))) @@ -683,7 +677,7 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." (unless (re-search-forward "^<<<<<<< " nil t) (vc-svn-command nil 0 buffer-file-name "resolved") ;; Remove the hook so that it is not called multiple times. - (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t)))) + (remove-hook 'after-save-hook #'vc-svn-resolve-when-done t)))) ;; Inspired by vc-arch-find-file-hook. (defun vc-svn-find-file-hook () @@ -696,7 +690,7 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." ;; There are conflict markers. (progn (smerge-start-session) - (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t)) + (add-hook 'after-save-hook #'vc-svn-resolve-when-done nil t)) ;; There are no conflict markers. This is problematic: maybe it means ;; the conflict has been resolved and we should immediately call "svn ;; resolved", or it means that the file's type does not allow Svn to diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 00976a07d42..b75862e8a52 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -486,11 +486,19 @@ ;; from ignored files. ;; When called from Lisp code, if DIRECTORY is non-nil, the ;; repository to use will be deduced by DIRECTORY. +;; The default behavior is to add or remove a line from the file +;; returned by the `find-ignore-file' function. ;; ;; - ignore-completion-table (directory) ;; ;; Return the completion table for files ignored by the current ;; version control system, e.g., the entries in `.gitignore' and +;; `.bzrignore'. The default behavior is to read the contents of +;; the file returned by the `find-ignore-file' function. +;; +;; - find-ignore-file +;; +;; Return the ignore file that controls FILE, e.g. `.gitignore' or ;; `.bzrignore'. ;; ;; - previous-revision (file rev) @@ -979,6 +987,9 @@ be reported. If NO-ERROR is nil, signal an error that no VC backend is responsible for the given file." (or (and (not (file-directory-p file)) (vc-backend file)) + ;; FIXME it would be more efficient to walk up the directory tree, + ;; stopping the first time a backend is responsible. + ;; ;; First try: find a responsible backend. If this is for registration, ;; it must be a backend under which FILE is not yet registered. (let ((dirs (delq nil @@ -1425,6 +1436,7 @@ first backend that could register the file is used." (let ((vc-handled-backends (list backend))) (call-interactively 'vc-register))) +;;;###autoload (defun vc-ignore (file &optional directory remove) "Ignore FILE under the VCS of DIRECTORY. @@ -1831,7 +1843,7 @@ Return t if the buffer had changes, nil otherwise." (backend (car vc-fileset)) (first (car files)) (rev1-default nil) - (rev2-default nil)) + ) ;; (rev2-default nil) (cond ;; someday we may be able to do revision completion on non-singleton ;; filesets, but not yet. @@ -1855,9 +1867,10 @@ Return t if the buffer had changes, nil otherwise." rev1-default "): ") "Older revision: ")) (rev2-prompt (concat "Newer revision (default " - (or rev2-default "current source") "): ")) + ;; (or rev2-default + "current source): ")) (rev1 (vc-read-revision rev1-prompt files backend rev1-default)) - (rev2 (vc-read-revision rev2-prompt files backend rev2-default))) + (rev2 (vc-read-revision rev2-prompt files backend nil))) ;; rev2-default (when (string= rev1 "") (setq rev1 nil)) (when (string= rev2 "") (setq rev2 nil)) (list files rev1 rev2)))) @@ -2043,7 +2056,7 @@ saving the buffer." ;; relative file names work. (let ((default-directory rootdir)) (vc-diff-internal - t (list backend (list rootdir) working-revision) nil nil + t (list backend (list (expand-file-name rootdir)) working-revision) nil nil (called-interactively-p 'interactive)))))) ;;;###autoload @@ -2590,8 +2603,8 @@ with its diffs (if the underlying VCS supports that)." (setq backend (vc-responsible-backend rootdir)) (unless backend (error "Directory is not version controlled"))) - (setq default-directory rootdir) - (vc-print-log-internal backend (list rootdir) revision revision limit + (setq default-directory (expand-file-name rootdir)) + (vc-print-log-internal backend (list default-directory) revision revision limit (when with-diff 'with-diff)))) ;;;###autoload |