diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/bug_report.md | 2 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Documentation/magit.org | 45 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | default.mk | 11 | ||||
| -rw-r--r-- | lisp/magit-core.el | 2 | ||||
| -rw-r--r-- | lisp/magit-pkg.el | 1 | ||||
| -rw-r--r-- | lisp/magit-utils.el | 3 |
8 files changed, 21 insertions, 49 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e343c33..ae9a644 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -25,7 +25,7 @@ Alternatively, run `M-x magit-emacs-Q-command RET` to save a shell command to th Finally, if that didn't work and you have installed Magit from Melpa, then run commands similar to the ones below, but use tab completion to replace the various Ns with the correct versions: $ cd ~/.emacs.d/elpa/magit-N - $ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../dash-N -L ../git-commit-N -L ../lv-N -L ../magit-popup-N -L ../transient-N -L ../with-editor-N -L . -l magit + $ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../dash-N -L ../git-commit-N -L ../lv-N -L ../transient-N -L ../with-editor-N -L ../ghub-N -L . -l magit More debugging tools are described in the manual [6]. diff --git a/.travis.yml b/.travis.yml index e74b7fe..8a64959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,9 @@ install: - export EMACS=/tmp/emacs/bin/emacs - $CURL -O ${GHRAW}/magnars/dash.el/master/dash.el - $CURL -O ${GHRAW}/abo-abo/hydra/master/lv.el - - $CURL -O ${GHRAW}/magit/magit-popup/master/magit-popup.el - $CURL -O ${GHRAW}/magit/transient/master/lisp/transient.el - $CURL -O ${GHRAW}/magit/with-editor/master/with-editor.el - - $EMACS -Q --batch -L . -f batch-byte-compile dash.el lv.el magit-popup.el transient.el with-editor.el + - $EMACS -Q --batch -L . -f batch-byte-compile dash.el lv.el transient.el with-editor.el - $EMACS --version script: - git config --global user.name "A U Thor" diff --git a/Documentation/magit.org b/Documentation/magit.org index 8618cdf..d05b84d 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -165,10 +165,10 @@ Now see [[*Post-Installation Tasks]]. ** Installing from the Git Repository -Magit depends on the ~dash~, ~lv~, ~magit-popup~, ~transient~ and ~with-editor~ -libraries which are available from Melpa and Melpa-Stable. Install -them using ~M-x package-install RET <package> RET~. Of course you may -also install them manually from their repository. +Magit depends on the ~dash~, ~lv~, ~transient~ and ~with-editor~ libraries +which are available from Melpa and Melpa-Stable. Install them using +~M-x package-install RET <package> RET~. Of course you may also install +them manually from their repository. Then clone the Magit repository: @@ -183,17 +183,15 @@ Then compile the libraries and generate the info manuals: $ make #+END_SRC -If you haven't installed ~dash~, ~lv~, ~magit-popup~, ~transient~ and -~with-editor~ from Melpa or at ~/path/to/magit/../<package>~, then you -have to tell ~make~ where to find them. To do so create the file -~/path/to/magit/config.mk~ with the following content before running -~make~: +If you haven't installed ~dash~, ~lv~, ~transient~ and ~with-editor~ from +Melpa or at ~/path/to/magit/../<package>~, then you have to tell ~make~ +where to find them. To do so create the file ~/path/to/magit/config.mk~ +with the following content before running ~make~: #+BEGIN_SRC makefile LOAD_PATH = -L /path/to/magit/lisp LOAD_PATH += -L /path/to/dash LOAD_PATH += -L /path/to/hydra - LOAD_PATH += -L /path/to/magit-popup LOAD_PATH += -L /path/to/transient LOAD_PATH += -L /path/to/with-editor #+END_SRC @@ -1203,21 +1201,17 @@ certain type of sections. As you can see there are not many of those. Whether to append the number of children to section headings. This only affects sections that could benefit from this information. -** Popup Buffers and Prefix Commands +** Transient Commands -Many Magit commands are implemented using *popup buffers*. First the -user invokes a *popup* or *prefix* command, which causes a popup buffer -with the available *infix* arguments and *suffix* commands to be -displayed. The user then optionally toggles/sets some arguments and -finally invokes one of the suffix commands. +Many Magit commands are implemented as *transient* commands. First the +user invokes a *prefix* command, which causes its *infix* arguments and +*suffix* commands to be displayed in the echo area. The user then +optionally sets some infix arguments and finally invokes one of the +suffix commands. -This is implemented in the library ~magit-popup~. Earlier releases used -the library ~magit-key-mode~. A future release will switch to a -yet-to-be-written successor, which will likely be named ~transient~. - -Because ~magit-popup~ can also be used by other packages without having -to depend on all of Magit, it is documented in its own manual. See -[[info:magit-popup]]. +This is implemented in the library ~~transient~. Earlier Magit releases +used the package ~magit-popup~ and even earlier versions library +~magit-key-mode~. - Key: C-c C-c, magit-dispatch-popup @@ -7031,9 +7025,8 @@ abstractions to extend Magit itself or implement a separate extension. A few of the low-level features used by Magit have been factored out into separate libraries/packages, so that they can be used by other -packages, without having to depend on Magit. These libraries are -described in separate manuals, see [[info:with-editor]] and -[[info:magit-popup]]. +packages, without having to depend on Magit. See [[info:with-editor]] for +information about ~with-editor~. ~transient~ doesn't have a manual yet. If you are trying to find an unused key that you can bind to a command provided by your own Magit extension, then checkout @@ -206,7 +206,6 @@ define set_package_requires (dash ,dash-version) (git-commit ,git-commit-version) (lv ,lv-version) - (magit-popup ,magit-popup-version) (transient ,transient-version) (with-editor ,with-editor-version))))) (goto-char (point-min)) @@ -224,7 +223,6 @@ bump-versions-1: (dash-version \"$(DASH_VERSION)\")\ (git-commit-version \"$(GIT_COMMIT_VERSION)\")\ (lv-version \"$(LV_VERSION)\")\ - (magit-popup-version \"$(MAGIT_POPUP_VERSION)\")\ (transient-version \"$(TRANSIENT_VERSION)\")\ (with-editor-version \"$(WITH_EDITOR_VERSION)\"))\ $$set_package_requires)" @@ -236,7 +234,6 @@ bump-snapshots: (dash-version \"$(DASH_MELPA_SNAPSHOT)\")\ (git-commit-version \"$(GIT_COMMIT_MELPA_SNAPSHOT)\")\ (lv-version \"$(LV_MELPA_SNAPSHOT)\")\ - (magit-popup-version \"$(MAGIT_POPUP_MELPA_SNAPSHOT)\")\ (transient-version \"$(TRANSIENT_MELPA_SNAPSHOT)\")\ (with-editor-version \"$(WITH_EDITOR_MELPA_SNAPSHOT)\"))\ $$set_package_requires)" @@ -102,7 +102,6 @@ ASYNC_VERSION = 1.9.3 DASH_VERSION = 2.14.1 GIT_COMMIT_VERSION = 2.91.0 LV_VERSION = 0 -MAGIT_POPUP_VERSION = 2.12.5 TRANSIENT_VERSION = 0 WITH_EDITOR_VERSION = 2.8.0 @@ -110,7 +109,6 @@ ASYNC_MELPA_SNAPSHOT = 20180527 DASH_MELPA_SNAPSHOT = 20180910 GIT_COMMIT_MELPA_SNAPSHOT = 20181104 LV_MELPA_SNAPSHOT = 0 -MAGIT_POPUP_MELPA_SNAPSHOT = 20181003 TRANSIENT_MELPA_SNAPSHOT = 0 WITH_EDITOR_MELPA_SNAPSHOT = 20181103 @@ -142,13 +140,6 @@ ifeq "$(LV_DIR)" "" LV_DIR = $(TOP)../hydra endif -MAGIT_POPUP_DIR ?= $(shell \ - find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/magit-popup-[.0-9]*' 2> /dev/null | \ - sort | tail -n 1) -ifeq "$(MAGIT_POPUP_DIR)" "" - MAGIT_POPUP_DIR = $(TOP)../magit-popup -endif - TRANSIENT_DIR ?= $(shell \ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/transient-[.0-9]*' 2> /dev/null | \ sort | tail -n 1) @@ -177,13 +168,11 @@ LOAD_PATH = -L $(TOP)/lisp ifdef CYGPATH LOAD_PATH += -L $(shell cygpath --mixed $(DASH_DIR)) LOAD_PATH += -L $(shell cygpath --mixed $(LV_DIR)) - LOAD_PATH += -L $(shell cygpath --mixed $(MAGIT_POPUP_DIR)) LOAD_PATH += -L $(shell cygpath --mixed $(TRANSIENT_DIR)) LOAD_PATH += -L $(shell cygpath --mixed $(WITH_EDITOR_DIR)) else LOAD_PATH += -L $(DASH_DIR) LOAD_PATH += -L $(LV_DIR) - LOAD_PATH += -L $(MAGIT_POPUP_DIR) LOAD_PATH += -L $(TRANSIENT_DIR) LOAD_PATH += -L $(WITH_EDITOR_DIR) endif diff --git a/lisp/magit-core.el b/lisp/magit-core.el index 9308517..f9bf336 100644 --- a/lisp/magit-core.el +++ b/lisp/magit-core.el @@ -102,8 +102,6 @@ are enabled by default by the popup `magit-NAME-popup'." "Extensions to Magit." :group 'magit) -(custom-add-to-group 'magit-modes 'magit-popup 'custom-group) -(custom-add-to-group 'magit-faces 'magit-popup-faces 'custom-group) (custom-add-to-group 'magit-modes 'git-commit 'custom-group) (custom-add-to-group 'magit-faces 'git-commit-faces 'custom-group) (custom-add-to-group 'magit-modes 'git-rebase 'custom-group) diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el index 2e05544..eff6901 100644 --- a/lisp/magit-pkg.el +++ b/lisp/magit-pkg.el @@ -6,5 +6,4 @@ (git-commit "20181104") (lv "0") (transient "0") - (magit-popup "20181003") (with-editor "20181103"))) diff --git a/lisp/magit-utils.el b/lisp/magit-utils.el index d612724..6c333e3 100644 --- a/lisp/magit-utils.el +++ b/lisp/magit-utils.el @@ -61,8 +61,6 @@ (defvar magit-wip-before-change-mode) -(require 'magit-popup) - ;;; Options (defcustom magit-completing-read-function 'magit-builtin-completing-read @@ -744,7 +742,6 @@ See info node `(magit)Debugging Tools' for more information." '(;; Like `LOAD_PATH' in `default.mk'. "dash" "lv" - "magit-popup" "transient" "with-editor" ;; Obviously `magit' itself is needed too. |