From: Alex Branham <alex.branham@gmail.com>
Date: Sat, 27 Jan 2018 04:37:31 +0000 (-0600)
Subject: Prefer non-obsolete var names
X-Git-Tag: emacs-29.0.90~1306^2~15^2~86^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=46ee100327;p=emacs.git

Prefer non-obsolete var names
---

diff --git a/lisp/use-package/use-package-ensure-system-package.el b/lisp/use-package/use-package-ensure-system-package.el
index 0fae57aff76..d6f7956dcae 100644
--- a/lisp/use-package/use-package-ensure-system-package.el
+++ b/lisp/use-package/use-package-ensure-system-package.el
@@ -23,20 +23,20 @@
 (require 'system-packages nil t)
 
 (eval-when-compile
-  (defvar system-packages-packagemanager)
+  (defvar system-packages-package-manager)
   (defvar system-packages-supported-package-managers)
-  (defvar system-packages-usesudo))
+  (defvar system-packages-use-sudo))
 
 (defun use-package-ensure-system-package-install-command (pack)
-  "Return the default install command for `pack'."
+  "Return the default install command for PACK."
   (let ((command
-         (cdr (assoc 'install (cdr (assoc system-packages-packagemanager
+         (cdr (assoc 'install (cdr (assoc system-packages-package-manager
                                           system-packages-supported-package-managers))))))
     (unless command
-      (error (format "%S not supported in %S" 'install system-packages-packagemanager)))
+      (error (format "%S not supported in %S" 'install system-packages-package-manager)))
     (unless (listp command)
       (setq command (list command)))
-    (when system-packages-usesudo
+    (when system-packages-use-sudo
       (setq command (mapcar (lambda (part) (concat "sudo " part)) command)))
     (setq command (mapconcat 'identity command " && "))
     (mapconcat 'identity (list command pack) " ")))