From a631067fba54e873122d40106fec4dacd8eba8db Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 17 Aug 2022 12:48:02 +0200 Subject: [PATCH] Fix some recently introduced byte-compiler warnings * lisp/emulation/viper-util.el (viper-key-to-character): * lisp/vc/vc-svn.el (vc-svn-dir-extra-headers): Fix warnings. * lisp/net/eudc-export.el (eudc-batch-export-records-to-bbdb): Fix buglet. --- lisp/emulation/viper-util.el | 1 - lisp/net/eudc-export.el | 2 +- lisp/vc/vc-svn.el | 10 ++++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 25c55acf96c..46dbd7f24d5 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -1020,7 +1020,6 @@ Otherwise return the normal value." (string-to-char (symbol-name key))) ((and (listp key) (eq (car key) 'control) - (symbol-name (nth 1 key)) (= 1 (length (symbol-name (nth 1 key))))) (read (format "?\\C-%s" (symbol-name (nth 1 key))))) (t key))) diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 3f7d9c00608..2f841336e0b 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -210,7 +210,7 @@ LOCATION is used as the phone location for BBDB." (while (eudc-move-to-next-record) (and (overlays-at (point)) (setq record (overlay-get (car (overlays-at (point))) 'eudc-record)) - (1+ nbrec) + (setq nbrec (1+ nbrec)) (eudc-create-bbdb-record record t))) (message "%d records imported into BBDB" nbrec))) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 270877041aa..08b53a7169f 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -224,12 +224,10 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." (let (process-file-side-effects) (vc-svn-command "*vc*" 0 nil "info")) (let ((repo - (save-excursion - (and (progn - (set-buffer "*vc*") - (goto-char (point-min)) - (re-search-forward "Repository Root: *\\(.*\\)" nil t)) - (match-string 1))))) + (with-current-buffer "*vc*" + (goto-char (point-min)) + (when (re-search-forward "Repository Root: *\\(.*\\)" nil t) + (match-string 1))))) (concat (cond (repo (concat -- 2.39.5