From cd45f8bfa00bb002298bfd223a0c1283c4416f70 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 12 Apr 2015 02:04:11 +0200 Subject: correct invalid :package-version keywords in option definitions The value of some instances was 2.1.0 instead of 1.4.0. --- magit.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/magit.el b/magit.el index 9b788c0..a30e685 100644 --- a/magit.el +++ b/magit.el @@ -479,7 +479,7 @@ in the same directory as numbered backup files and have to be applied manually. Only individual hunks are backed up; when a complete file is reverted (which requires confirmation) no backup is created." - :package-version '(magit . "2.1.0") + :package-version '(magit . "1.4.0") :group 'magit :type 'boolean) @@ -621,14 +621,14 @@ To select the face used for highlighting customize the option other face that does not use the background then you can set this option to nil. Doing so could potentially improve performance when generating large diffs." - :package-version '(magit . "2.1.0") + :package-version '(magit . "1.4.0") :group 'magit :group 'magit-faces :set-after '(magit-item-highlight-face) :type 'boolean) (define-obsolete-variable-alias 'magit-diff-use-overlays - 'magit-use-overlays "2.1.0") + 'magit-use-overlays "1.4.0") ;;;;; Completion @@ -989,7 +989,7 @@ The function is called with one argument, the propertized graph of a single line in as a string. It has to return the formatted string. This option can also be nil, in which case the graph is inserted as is." - :package-version '(magit . "2.1.0") + :package-version '(magit . "1.4.0") :group 'magit-log :type '(choice (const :tag "insert as is" nil) (function-item magit-log-format-unicode-graph) @@ -998,7 +998,7 @@ inserted as is." (defcustom magit-log-format-unicode-graph-alist '((?/ . ?╱) (?| . ?│) (?\\ . ?╲) (?* . ?◆) (?o . ?◇)) "Alist used by `magit-log-format-unicode-graph' to translate chars." - :package-version '(magit . "2.1.0") + :package-version '(magit . "1.4.0") :group 'magit-log :type '(repeat (cons :format "%v\n" (character :format "replace %v ") -- cgit v1.0 From 93ce697d14503921d14c0b707512be1c50b29f86 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 12 Apr 2015 02:07:01 +0200 Subject: no longer support the obsolete magit-log-edit library and make sure that those who still have it installed remove it. This will cause their committing experience to get much nicer. --- magit.el | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/magit.el b/magit.el index a30e685..7e429d9 100644 --- a/magit.el +++ b/magit.el @@ -65,12 +65,7 @@ Use the function by the same name instead of this variable.") (when (version< emacs-version "23.2") (error "Magit requires at least GNU Emacs 23.2")) -;; Users may choose to use `magit-log-edit' instead of the preferred -;; `git-commit-mode', by simply putting it on the `load-path'. If -;; it can be found there then it is loaded at the end of this file. -(unless (locate-library "magit-log-edit") - (require 'git-commit-mode)) - +(require 'git-commit-mode) (require 'git-rebase-mode) (require 'ansi-color) @@ -7813,7 +7808,17 @@ Emacs: (setq magit-last-seen-setup-instructions \"1.4.0\") You might also want to read the release notes: -https://raw.githubusercontent.com/magit/magit/next/Documentation/RelNotes/1.4.0.txt"))) +https://raw.githubusercontent.com/magit/magit/next/Documentation/RelNotes/1.4.0.txt")) + (when (featurep 'magit-log-edit) + (display-warning :error "magit-log-edit has to be removed + +Magit is no longer compatible with the library `magit-log-edit', +which was used in earlier releases. Please remove it, so that +Magit can use the successor `git-commit-mode' without the +obsolete library getting in the way. Then restart Emacs. + +You might also want to read: +https://github.com/magit/magit/wiki/Emacsclient"))) (add-hook 'after-init-hook #'magit-maybe-show-setup-instructions) @@ -7831,15 +7836,8 @@ https://raw.githubusercontent.com/magit/magit/next/Documentation/RelNotes/1.4.0. (provide 'magit) -;; rest of magit core (require 'magit-key-mode) -;; If `magit-log-edit' is available and `git-commit-mode' is not -;; loaded, then we have no choice but to assume the user actually -;; wants to use the former. -(unless (featurep 'git-commit-mode) - (require 'magit-log-edit nil t)) - ;; Local Variables: ;; coding: utf-8 ;; indent-tabs-mode: nil -- cgit v1.0 From daae787621b48c77e750c61730b9866d1dfefd49 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 12 Apr 2015 02:26:06 +0200 Subject: remove some obsolete variable definitions Many variables were renamed in the 1.4.0 release. That these particular old names have been defined as obsolete names is essentially random. In fact these are variables whose value most likely have not been changed by anyone. --- magit.el | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/magit.el b/magit.el index 7e429d9..b89f556 100644 --- a/magit.el +++ b/magit.el @@ -7824,16 +7824,6 @@ https://github.com/magit/magit/wiki/Emacsclient"))) (cl-eval-when (load eval) (magit-version t)) -(define-obsolete-variable-alias 'magit-cherry-insert-sections-hook - 'magit-cherry-sections-hook "1.4.0") -(define-obsolete-variable-alias 'magit-status-insert-sections-hook - 'magit-status-sections-hook "1.4.0") -(define-obsolete-variable-alias 'magit-wazzup-insert-sections-hook - 'magit-wazzup-sections-hook "1.4.0") - -(define-obsolete-variable-alias 'magit-quote-curly-braces - 'magit-process-quote-curly-braces "1.4.0") - (provide 'magit) (require 'magit-key-mode) -- cgit v1.0 From 9724ed6b84922bf8aaffa876f63f4994bb30554d Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 12 Apr 2015 02:31:14 +0200 Subject: ensure magit-maybe-show-setup-instructions is run for everybody Previously it was only run if `magit' was loaded before `after-init-hook' ran. --- Makefile | 7 +++++-- magit.el | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5c93609..d228444 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ EFLAGS ?= -L ../git-modes -L ../cl-lib EMACSBIN ?= emacs BATCH = $(EMACSBIN) $(EFLAGS) -batch -Q -L . BATCHE = $(BATCH) -eval -BATCHC = $(BATCH) -f batch-byte-compile VERSION=$(shell \ test -e .git && git describe --tags --dirty 2> /dev/null || \ @@ -79,7 +78,8 @@ help: @printf "\n" %.elc: %.el - @$(BATCHC) $< + @$(BATCH) -eval "(setq magit-last-seen-setup-instructions \"9999\")" \ + -f batch-byte-compile $< # Not a phony target, but needs to run *every* time. .PHONY: magit-version.el @@ -112,6 +112,7 @@ loaddefs: $(LOADDEFS_FILE) $(LOADDEFS_FILE): $(ELS) @$(BATCHE) "(progn\ (setq vc-handled-backends nil)\ + (setq magit-last-seen-setup-instructions \"9999\")\ (defvar generated-autoload-file nil)\ (let ((generated-autoload-file \"$(CURDIR)/$(LOADDEFS_FILE)\")\ (make-backup-files nil))\ @@ -197,6 +198,7 @@ install-docs: docs test: $(ELCS) @$(BATCHE) "(progn\ (require 'cl) \ + (setq magit-last-seen-setup-instructions \"9999\")\ (put 'flet 'byte-obsolete-info nil))" \ -l tests/magit-tests.el -f ert-run-tests-batch-and-exit @@ -205,6 +207,7 @@ test-interactive: $(ELCS) @$(EMACSBIN) $(EFLAGS) -Q -L "." --eval "(progn\ (require 'cl)\ (put 'flet 'byte-obsolete-info nil)\ + (setq magit-last-seen-setup-instructions \"9999\")\ (load-file \"tests/magit-tests.el\")\ (ert t))" diff --git a/magit.el b/magit.el index b89f556..769d402 100644 --- a/magit.el +++ b/magit.el @@ -7822,10 +7822,13 @@ https://github.com/magit/magit/wiki/Emacsclient"))) (add-hook 'after-init-hook #'magit-maybe-show-setup-instructions) -(cl-eval-when (load eval) (magit-version t)) - (provide 'magit) +(cl-eval-when (load eval) + (magit-version t) + (when after-init-time + (magit-maybe-show-setup-instructions))) + (require 'magit-key-mode) ;; Local Variables: -- cgit v1.0 From efa6bd9ba4240784c7a3df6b9af1dbb83f55d6b6 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 12 Apr 2015 02:42:48 +0200 Subject: Makefile: remove BATCHE variable Instead just use `$(BATCH) --eval', which is much more descriptive. --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d228444..eb3e786 100644 --- a/Makefile +++ b/Makefile @@ -23,11 +23,10 @@ INSTALL_INFO ?= install-info EFLAGS ?= -L ../git-modes -L ../cl-lib EMACSBIN ?= emacs BATCH = $(EMACSBIN) $(EFLAGS) -batch -Q -L . -BATCHE = $(BATCH) -eval VERSION=$(shell \ test -e .git && git describe --tags --dirty 2> /dev/null || \ - $(BATCHE) "(progn\ + $(BATCH) --eval "(progn\ (require 'cl)\ (flet ((message (&rest _) _))\ (load-file \"magit-version.el\"))\ @@ -110,7 +109,7 @@ magit-pkg.el: loaddefs: $(LOADDEFS_FILE) $(LOADDEFS_FILE): $(ELS) - @$(BATCHE) "(progn\ + @$(BATCH) --eval "(progn\ (setq vc-handled-backends nil)\ (setq magit-last-seen-setup-instructions \"9999\")\ (defvar generated-autoload-file nil)\ @@ -196,7 +195,7 @@ install-docs: docs .PHONY: test test: $(ELCS) - @$(BATCHE) "(progn\ + @$(BATCH) --eval "(progn\ (require 'cl) \ (setq magit-last-seen-setup-instructions \"9999\")\ (put 'flet 'byte-obsolete-info nil))" \ -- cgit v1.0 From 2f8c330e566476a5bbf92d3294d4bc209ad52268 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 12 Apr 2015 03:05:40 +0200 Subject: release version 1.4.1 --- Documentation/RelNotes/1.4.1.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Documentation/RelNotes/1.4.1.txt diff --git a/Documentation/RelNotes/1.4.1.txt b/Documentation/RelNotes/1.4.1.txt new file mode 100644 index 0000000..4f3f6bd --- /dev/null +++ b/Documentation/RelNotes/1.4.1.txt @@ -0,0 +1,37 @@ +It's Magit! A Git Porcelain inside Emacs +========================================= + +Magit is an interface to the version control system Git, implemented +as an Emacs package. For more information see http://magit.vc. + +Magit v1.4.1 Release Notes +========================== + +Released 12 April 2015 by Jonas Bernoulli. + +This is a bugfix release. + +Changes since v1.4.0 +-------------------- + + * The external library `magit-log-edit.el' is no longer supported. + If it is still installed, then instruct the user to remove it. + + * The function `magit-maybe-show-setup-instructions' is now run even + when `magit' has not been loaded by the time `after-init-hook' ran. + + * Invalid `:package-version' keywords in option definitions were + fixed. In some cases the value was "2.1.0" instead of "1.4.0". + + * Some unnecessary obsolete-variable definitions were removed. + + * Running tests on Travis CI was fixed. + + * The Makefile, README.md, and release notes received minor fixes + and cleanup. + +Authors +------- + + 9 Jonas Bernoulli + 1 Noam Postavsky -- cgit v1.0