branch: elpa/subed
commit ee5f92f56ece128188054ea04184b2c9263a9ed7
Author: Sacha Chua <sa...@sachachua.com>
Commit: Sacha Chua <sa...@sachachua.com>
Remove autoloads from the repository to make it get along with ELPA
* .gitignore: Don't include autoloads and package files.
* Makefile (clean): Remove autoload file.
(test): Generate autoloads.
* subed/subed-common.el (subed--post-command-handler): Include Stefan
Monnier's improvement to the test for buffer-chars-modified-tick.
* subed/subed.el: Bump the version.
(subed-autoloads): Don't require autoloads.
* tests/test-subed-ass.el: Turn on lexical binding.
* README.org (Manual installation): Add note about autoloads, since
it's not in the repository.
... Not sure if I'm doing this the right way, but maybe it will work!
---
.gitignore | 4 ++++
subed/subed-autoloads.el | 2 ++
subed/subed-common.el | 4 ++--
subed/subed.el | 3 +--
tests/test-subed-ass.el | 2 +-
tests/undercover-init.el | 2 +-
6 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..1f721d93bb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.elc
+/subed-autoloads.el
+/subed-pkg.el
+/subed/subed-autoloads.el
diff --git a/subed/subed-autoloads.el b/subed/subed-autoloads.el
index de47cade7e..d6fe3b7f23 100644
--- a/subed/subed-autoloads.el
+++ b/subed/subed-autoloads.el
@@ -2,6 +2,8 @@
;;
;;; Code:
+(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car
load-path))))
+
;;;### (autoloads nil "subed" "subed.el" (0 0 0 0))
;;; Generated autoloads from subed.el
diff --git a/subed/subed-common.el b/subed/subed-common.el
index 0e6c2c040e..fd6e5d03b8 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -480,8 +480,8 @@ Before BODY is run, point is placed on the subtitle's ID."
(new-buffer-chars-modified-tick (buffer-chars-modified-tick)))
(when (and
new-point subed--current-point
- (or (not (= new-point subed--current-point))
- (not (= new-buffer-chars-modified-tick
subed--buffer-chars-modified-tick))))
+ (not (and (= new-point subed--current-point)
+ (= new-buffer-chars-modified-tick
subed--buffer-chars-modified-tick))))
;; If point is synced to playback position, temporarily disable that so
;; that manual moves aren't cancelled immediately by automated moves.
diff --git a/subed/subed.el b/subed/subed.el
index c01d6b23cb..538c0f5cb7 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -1,6 +1,6 @@
;;; subed.el --- A major mode for editing subtitles -*- lexical-binding: t;
-*-
-;; Version: 1.0.3
+;; Version: 1.0.4
;; Keywords: convenience, files, hypermedia, multimedia
;; URL: https://github.com/rndusr/subed
;; Package-Requires: ((emacs "25.1"))
@@ -32,7 +32,6 @@
;;; Code:
-(require 'subed-autoloads)
(require 'subed-config)
(require 'subed-debug)
(require 'subed-common)
diff --git a/tests/test-subed-ass.el b/tests/test-subed-ass.el
index cd8cee4571..692956bddd 100644
--- a/tests/test-subed-ass.el
+++ b/tests/test-subed-ass.el
@@ -1,4 +1,4 @@
-;; -*- eval: (buttercup-minor-mode) -*-
+;; -*- eval: (buttercup-minor-mode); lexical-binding: t; -*-
(load-file "./tests/undercover-init.el")
(require 'subed)
diff --git a/tests/undercover-init.el b/tests/undercover-init.el
index 0ffc2aed1a..c7f5c57417 100644
--- a/tests/undercover-init.el
+++ b/tests/undercover-init.el
@@ -1,4 +1,4 @@
-(add-to-list 'load-path (expand-file-name "./subed"))
+(add-to-list 'load-path (expand-file-name "./subed")) ;FIXME: ??
(when (require 'undercover nil t)
(undercover "./subed/*.el" (:report-format 'simplecov) (:send-report nil)))
