From 4b83f9525ce6324eab2244a16f0d654a55a55fc3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 4 Dec 2017 21:21:54 +0000 Subject: [PATCH] Rename up-* files to use-package-* for consistency --- .../use-package/use-package-bind-key.el | 6 +++--- up-core.el => lisp/use-package/use-package-core.el | 4 ++-- .../use-package/use-package-delight.el | 6 +++--- .../use-package/use-package-diminish.el | 6 +++--- .../use-package/use-package-ensure.el | 6 +++--- up-jump.el => lisp/use-package/use-package-jump.el | 6 +++--- lisp/use-package/use-package.el | 14 +++++++------- .../lisp/use-package/use-package-tests.el | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) rename up-bind-key.el => lisp/use-package/use-package-bind-key.el (97%) rename up-core.el => lisp/use-package/use-package-core.el (99%) rename up-delight.el => lisp/use-package/use-package-delight.el (96%) rename up-diminish.el => lisp/use-package/use-package-diminish.el (95%) rename up-ensure.el => lisp/use-package/use-package-ensure.el (98%) rename up-jump.el => lisp/use-package/use-package-jump.el (95%) rename up-tests.el => test/lisp/use-package/use-package-tests.el (99%) diff --git a/up-bind-key.el b/lisp/use-package/use-package-bind-key.el similarity index 97% rename from up-bind-key.el rename to lisp/use-package/use-package-bind-key.el index 1ed760a96bb..4021bb432d6 100644 --- a/up-bind-key.el +++ b/lisp/use-package/use-package-bind-key.el @@ -1,4 +1,4 @@ -;;; up-bind-key.el --- Support for the :bind/:bind-keymap keywords +;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords ;; Copyright (C) 2012-2017 John Wiegley @@ -35,7 +35,7 @@ ;;; Code: -(require 'up-core) +(require 'use-package-core) (require 'bind-key) ;;;###autoload @@ -127,4 +127,4 @@ deferred until the prefix key sequence is pressed." (defun use-package-handler/:bind-keymap* (name keyword arg rest state) (use-package-handler/:bind-keymap name keyword arg rest state t)) -(provide 'up-bind-key) +(provide 'use-package-bind-key) diff --git a/up-core.el b/lisp/use-package/use-package-core.el similarity index 99% rename from up-core.el rename to lisp/use-package/use-package-core.el index 527c8b19463..2e2fa945056 100644 --- a/up-core.el +++ b/lisp/use-package/use-package-core.el @@ -1,4 +1,4 @@ -;;; up-core.el --- A configuration macro for simplifying your .emacs +;;; use-package-core.el --- A configuration macro for simplifying your .emacs ;; Copyright (C) 2012-2017 John Wiegley @@ -1344,7 +1344,7 @@ this file. Usage: (put 'use-package 'lisp-indent-function 'defun) -(provide 'up-core) +(provide 'use-package-core) ;; Local Variables: ;; indent-tabs-mode: nil diff --git a/up-delight.el b/lisp/use-package/use-package-delight.el similarity index 96% rename from up-delight.el rename to lisp/use-package/use-package-delight.el index 2a2138a56db..9f0a93fb00f 100644 --- a/up-delight.el +++ b/lisp/use-package/use-package-delight.el @@ -1,4 +1,4 @@ -;;; up-delight.el --- Support for the :delight keyword +;;; use-package-delight.el --- Support for the :delight keyword ;; Copyright (C) 2012-2017 John Wiegley @@ -33,7 +33,7 @@ ;;; Code: -(require 'up-core) +(require 'use-package-core) (defun use-package-normalize-delight (name args) "Normalize ARGS for a single call to `delight'." @@ -84,4 +84,4 @@ (add-to-list 'use-package-keywords :delight t) -(provide 'up-delight) +(provide 'use-package-delight) diff --git a/up-diminish.el b/lisp/use-package/use-package-diminish.el similarity index 95% rename from up-diminish.el rename to lisp/use-package/use-package-diminish.el index f848531875a..d177a908839 100644 --- a/up-diminish.el +++ b/lisp/use-package/use-package-diminish.el @@ -1,4 +1,4 @@ -;;; up-diminish.el --- Support for the :diminish keyword +;;; use-package-diminish.el --- Support for the :diminish keyword ;; Copyright (C) 2012-2017 John Wiegley @@ -33,7 +33,7 @@ ;;; Code: -(require 'up-core) +(require 'use-package-core) (defun use-package-normalize-diminish (name label arg &optional recursed) "Normalize the arguments to diminish down to a list of one of two forms: @@ -73,4 +73,4 @@ (add-to-list 'use-package-keywords :diminish t) -(provide 'up-diminish) +(provide 'use-package-diminish) diff --git a/up-ensure.el b/lisp/use-package/use-package-ensure.el similarity index 98% rename from up-ensure.el rename to lisp/use-package/use-package-ensure.el index 30f2190e922..5f728e36246 100644 --- a/up-ensure.el +++ b/lisp/use-package/use-package-ensure.el @@ -1,4 +1,4 @@ -;;; up-ensure.el --- Support for the :ensure and :pin keywords +;;; use-package-ensure.el --- Support for the :ensure and :pin keywords ;; Copyright (C) 2012-2017 John Wiegley @@ -34,7 +34,7 @@ ;;; Code: (require 'cl-lib) -(require 'up-core) +(require 'use-package-core) (defgroup use-package-ensure nil "Support for :ensure and :pin keywords in use-package declarations." @@ -201,4 +201,4 @@ manually updated package." (add-to-list 'use-package-keywords :ensure) (add-to-list 'use-package-keywords :pin) -(provide 'up-ensure) +(provide 'use-package-ensure) diff --git a/up-jump.el b/lisp/use-package/use-package-jump.el similarity index 95% rename from up-jump.el rename to lisp/use-package/use-package-jump.el index 721c17c7100..000c6bc38b7 100644 --- a/up-jump.el +++ b/lisp/use-package/use-package-jump.el @@ -1,4 +1,4 @@ -;;; up-jump.el --- Attempt to jump to a use-package declaration +;;; use-package-jump.el --- Attempt to jump to a use-package declaration ;; Copyright (C) 2012-2017 John Wiegley @@ -35,7 +35,7 @@ ;;; Code: -(require 'up-core) +(require 'use-package-core) (defun use-package-find-require (package) "Find file that required PACKAGE by searching `load-history'. @@ -74,4 +74,4 @@ instead." (goto-char location) (beginning-of-line)))))) -(provide 'up-jump) +(provide 'use-package-jump) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 72a9e1a2250..a00957afe5a 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -39,15 +39,15 @@ ;;; Code: -(require 'up-core) +(require 'use-package-core) -(require 'up-bind-key) -(require 'up-diminish) -(require 'up-delight) -(require 'up-ensure) +(require 'use-package-bind-key) +(require 'use-package-diminish) +(require 'use-package-delight) +(require 'use-package-ensure) -(declare-function use-package-jump-to-package-form "up-jump") -(autoload #'use-package-jump-to-package-form "up-jump" nil t) +(declare-function use-package-jump-to-package-form "use-package-jump") +(autoload #'use-package-jump-to-package-form "use-package-jump" nil t) (provide 'use-package) diff --git a/up-tests.el b/test/lisp/use-package/use-package-tests.el similarity index 99% rename from up-tests.el rename to test/lisp/use-package/use-package-tests.el index bb22b344479..5c6f0fe92d9 100644 --- a/up-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -17,7 +17,7 @@ ;;; Commentary: -;; +;; ;;; Code: -- 2.39.2