From c23f2b5d9e75ca0a8861043ec3d4114c89047b95 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 26 Mar 2018 14:29:49 -0400 Subject: [PATCH] Trivial fixes for last changes to package.el and marker.c * lisp/emacs-lisp/package.el (package-quickstart): Add missing version. * src/marker.c (verify_bytepos): Fix typo. --- lisp/emacs-lisp/package.el | 10 ++++++---- src/marker.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index b9fdf732ef4..94d98178c4d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -3460,19 +3460,21 @@ The list is displayed in a buffer named `*Packages*'." ;; package.el). ;; Other than speeding things up, this also offers a bootstrap feature: -;; it lets us activate packages according to package-load-list and -;; package-user-dir even before those vars are set. +;; it lets us activate packages according to `package-load-list' and +;; `package-user-dir' even before those vars are set. (defcustom package-quickstart nil "Precompute activation actions to speed up startup. This requires the use of `package-quickstart-refresh' every time the activations need to be changed, such as when `package-load-list' is modified." - :type 'boolean) + :type 'boolean + :version "27.1") (defcustom package-quickstart-file (locate-user-emacs-file "package-quickstart.el") "Location of the file used to speed up activation of packages at startup." - :type 'file) + :type 'file + :version "27.1") (defun package--quickstart-maybe-refresh () (if package-quickstart diff --git a/src/marker.c b/src/marker.c index eaae8ff6a90..2a45ae636ed 100644 --- a/src/marker.c +++ b/src/marker.c @@ -775,7 +775,7 @@ ptrdiff_t verify_bytepos (ptrdiff_t charpos) { ptrdiff_t below = BEG; - ptrdiff_t below_byte = BYTE_BEG; + ptrdiff_t below_byte = BEG_BYTE; while (below != charpos) { -- 2.11.4.GIT