lisp/vc: Try and avoid quoting lambdas

* lisp/vc/pcvs.el (cvs-menu, cvs-minor-mode-map):
* lisp/vc/vc-hg.el (vc-hg--extract-headers):
* lisp/vc/vc-git.el (vc-git-show-stash): Don't quote lambdas.

3 files changed, 16 insertions, 15 deletions

diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index b5dd3bf1ce6..27fc74d98ce 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -222,7 +222,7 @@
   "C-o"            #'cvs-mode-display-file)
 
 (easy-menu-define cvs-menu cvs-mode-map "Menu used in `cvs-mode'."
-  '("CVS"
+  `("CVS"
     ["Open file"                cvs-mode-find-file      t]
     ["Open in other window"     cvs-mode-find-file-other-window t]
     ["Display in other window"  cvs-mode-display-file   t]
@@ -257,8 +257,9 @@
     ["Unmark all"               cvs-mode-unmark-all-files t]
     ["Hide handled"             cvs-mode-remove-handled t]
     "----"
-    ["PCL-CVS Manual"           (lambda () (interactive)
-                                  (info "(pcl-cvs)Top")) t]
+    ["PCL-CVS Manual"           ,(lambda () (interactive)
+                                   (info "(pcl-cvs)Top"))
+     t]
     "----"
     ["Quit"                     cvs-mode-quit           t]))
 
@@ -273,9 +274,9 @@
 
 (defvar-keymap cvs-minor-mode-map
   (key-description cvs-minor-mode-prefix) 'cvs-mode-map
-  "e" '(menu-item nil cvs-mode-edit-log
-                  :filter (lambda (x)
-                            (and (derived-mode-p 'log-view-mode) x))))
+  "e" `(menu-item nil cvs-mode-edit-log
+                  :filter ,(lambda (x)
+                             (and (derived-mode-p 'log-view-mode) x))))
 
 (require 'pcvs-defs)
 
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f462fb1959f..44af30b2eb0 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -241,14 +241,14 @@ The following place holders should be present in the string:
 Default t means all, otherwise an integer specifying the maximum
 number to show.  A text button is always shown allowing you to
 toggle display of the entire list."
-  :type '(choice (const :tag "All" t)
+  :type `(choice (const :tag "All" t)
                  (integer :tag "Limit"
                           :validate
-                          (lambda (widget)
-                            (unless (>= (widget-value widget) 0)
-                              (widget-put widget :error
-                                          "Invalid value: must be a non-negative integer")
-                              widget))))
+                          ,(lambda (widget)
+                             (unless (>= (widget-value widget) 0)
+                               (widget-put widget :error
+                                           "Invalid value: must be a non-negative integer")
+                               widget))))
   :version "27.1")
 
 (defcustom vc-git-revision-complete-only-branches nil
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 761e802eb22..4e9057db4f9 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1260,9 +1260,9 @@ REV is ignored."
 (defun vc-hg--extract-headers (comment)
   (log-edit-extract-headers `(("Author" . "--user")
                               ("Date" . "--date")
-                              ("Amend" . (lambda (value)
-                                           (when (equal value "yes")
-                                             (list "--amend")))))
+                              ("Amend" . ,(lambda (value)
+                                            (when (equal value "yes")
+                                              (list "--amend")))))
                             comment))
 
 (defun vc-hg-find-revision (file rev buffer)