diff options
| author | Stefan Monnier | 2018-03-26 14:29:49 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2018-03-26 14:29:49 -0400 |
| commit | c23f2b5d9e75ca0a8861043ec3d4114c89047b95 (patch) | |
| tree | 2d2302dc52b97d3b1b5b65e4ca505876796ffc5d | |
| parent | 6247a904e6c5a68e21a4af79b52ab22a90d6c389 (diff) | |
| download | emacs-c23f2b5d9e75ca0a8861043ec3d4114c89047b95.tar.gz emacs-c23f2b5d9e75ca0a8861043ec3d4114c89047b95.zip | |
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.
| -rw-r--r-- | lisp/emacs-lisp/package.el | 10 | ||||
| -rw-r--r-- | 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*'." | |||
| 3460 | ;; package.el). | 3460 | ;; package.el). |
| 3461 | 3461 | ||
| 3462 | ;; Other than speeding things up, this also offers a bootstrap feature: | 3462 | ;; Other than speeding things up, this also offers a bootstrap feature: |
| 3463 | ;; it lets us activate packages according to package-load-list and | 3463 | ;; it lets us activate packages according to `package-load-list' and |
| 3464 | ;; package-user-dir even before those vars are set. | 3464 | ;; `package-user-dir' even before those vars are set. |
| 3465 | 3465 | ||
| 3466 | (defcustom package-quickstart nil | 3466 | (defcustom package-quickstart nil |
| 3467 | "Precompute activation actions to speed up startup. | 3467 | "Precompute activation actions to speed up startup. |
| 3468 | This requires the use of `package-quickstart-refresh' every time the | 3468 | This requires the use of `package-quickstart-refresh' every time the |
| 3469 | activations need to be changed, such as when `package-load-list' is modified." | 3469 | activations need to be changed, such as when `package-load-list' is modified." |
| 3470 | :type 'boolean) | 3470 | :type 'boolean |
| 3471 | :version "27.1") | ||
| 3471 | 3472 | ||
| 3472 | (defcustom package-quickstart-file | 3473 | (defcustom package-quickstart-file |
| 3473 | (locate-user-emacs-file "package-quickstart.el") | 3474 | (locate-user-emacs-file "package-quickstart.el") |
| 3474 | "Location of the file used to speed up activation of packages at startup." | 3475 | "Location of the file used to speed up activation of packages at startup." |
| 3475 | :type 'file) | 3476 | :type 'file |
| 3477 | :version "27.1") | ||
| 3476 | 3478 | ||
| 3477 | (defun package--quickstart-maybe-refresh () | 3479 | (defun package--quickstart-maybe-refresh () |
| 3478 | (if package-quickstart | 3480 | (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 | |||
| 775 | verify_bytepos (ptrdiff_t charpos) | 775 | verify_bytepos (ptrdiff_t charpos) |
| 776 | { | 776 | { |
| 777 | ptrdiff_t below = BEG; | 777 | ptrdiff_t below = BEG; |
| 778 | ptrdiff_t below_byte = BYTE_BEG; | 778 | ptrdiff_t below_byte = BEG_BYTE; |
| 779 | 779 | ||
| 780 | while (below != charpos) | 780 | while (below != charpos) |
| 781 | { | 781 | { |