branch: externals/load-relative
commit e79d8f1581991381a9e3f1657af59dd0c35058fa
Merge: ff2a827144 ea385a918d
Author: rocky <r...@dustyfeet.com>
Commit: rocky <r...@dustyfeet.com>
Merge branch 'externals/load-relative' of
https://git.sv.gnu.org/git/emacs/elpa
---
ChangeLog | 7 +-
autogen.sh | 6 ++
el-get-install.el | 104 ---------------------------
load-relative.el | 2 +-
test/subdir/test-require-list-from-subdir.el | 4 +-
5 files changed, 16 insertions(+), 107 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5f20404531..ff5aa1ac4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-26 Stefan Monnier <monn...@iro.umontreal.ca>
+
+ * load-relative.el (__FILE__): Mention the bytecomp-filename problem.
+ Fix other details mentioned by `checkdoc-current-buffer'.
+
2010-09-30 rocky <ro...@gnu.org>
* .gitignore: git Administrivia.
@@ -9,7 +14,7 @@
2010-09-30 rocky <ro...@gnu.org>
- * .gitignore, COPYING, Makefile.am, README, configure.ac:
+ * .gitignore, COPYING, Makefile.am, README, configure.ac:
Administrivia. Add COPYING, update README and .gitignore, bump
version number.
diff --git a/autogen.sh b/autogen.sh
index 8a728371d3..fce38da6bc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,10 @@
#!/bin/sh
+# An autoconf setup script.
+# From inside emacs, make sure test-simple is installed and then
+# Press C-x C-e at the end of the next line run this script
+# (test-simple-run "EMACSLOADPATH=%s ./autogen.sh" (mapconcat 'identity
load-path ":"))
+ln -fs README.md README
+touch common.mk
autoreconf -vi && \
autoconf && {
echo "Running configure with --enable-maintainer-mode $@"
diff --git a/el-get-install.el b/el-get-install.el
deleted file mode 100644
index 86c55ec75b..0000000000
--- a/el-get-install.el
+++ /dev/null
@@ -1,104 +0,0 @@
-(eval-when-compile
- (defvar el-get-sources)
-)
-
-(declare-function el-get-post-install 'el-get)
-
-(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
-
-;;; el-get-install.el --- installer for the lazy
-;;
-;; Copyright (C) 2010 Dimitri Fontaine
-;;
-;; Author: Dimitri Fontaine <d...@tapoueh.org>
-;; URL: http://www.emacswiki.org/emacs/el-get.el
-;; Created: 2010-06-17
-;; Keywords: emacs package elisp install elpa git git-svn bzr cvs apt-get fink
http http-tar
-;; Licence: WTFPL, grab your copy here: http://sam.zoy.org/wtfpl/
-;;
-;; This file is NOT part of GNU Emacs.
-;;
-;; bootstrap your el-get installation, the goal is then to use el-get to
-;; update el-get.
-;;
-;; So the idea is that you copy/paste this code into your *scratch* buffer,
-;; hit C-j, and you have a working el-get.
-
-(let ((el-get-root
- (file-name-as-directory
- (or (bound-and-true-p el-get-dir)
- (concat (file-name-as-directory user-emacs-directory) "el-get")))))
-
- (when (file-directory-p el-get-root)
- (add-to-list 'load-path el-get-root))
-
- ;; try to require el-get, failure means we have to install it
- (unless (require 'el-get nil t)
- (unless (file-directory-p el-get-root)
- (make-directory el-get-root t))
-
- (let* ((package "el-get")
- (buf (switch-to-buffer "*el-get bootstrap*"))
- (pdir (file-name-as-directory (concat el-get-root package)))
- (git (or (executable-find "git")
- (error "Unable to find `git'")))
- (url (or (bound-and-true-p el-get-git-install-url)
- "http://github.com/dimitri/el-get.git";))
- (default-directory el-get-root)
- (process-connection-type nil) ; pipe, no pty (--no-progress)
-
- ;; First clone el-get
- (status
- (call-process
- git nil `(,buf t) t "--no-pager" "clone" "-v" url package)))
-
- (unless (zerop status)
- (error "Couldn't clone el-get from the Git repository: %s" url))
-
- ;; switch branch if we have to
- (let* ((branch (cond
- ;; Check if a specific branch is requested
- ((bound-and-true-p el-get-install-branch))
- ;; Check if master branch is requested
- ((boundp 'el-get-master-branch) "master")
- ;; Read the default branch from the el-get recipe
- ((plist-get (with-temp-buffer
- (insert-file-contents-literally
- (expand-file-name "recipes/el-get.rcp"
pdir))
- (read (current-buffer)))
- :branch))
- ;; As a last resort, use the master branch
- ("master")))
- (remote-branch (format "origin/%s" branch))
- (default-directory pdir)
- (bstatus
- (if (string-equal branch "master")
- 0
- (call-process git nil (list buf t) t "checkout" "-t"
remote-branch))))
- (unless (zerop bstatus)
- (error "Couldn't `git checkout -t %s`" branch)))
-
- (add-to-list 'load-path pdir)
- (load package)
- (let ((el-get-default-process-sync t) ; force sync operations for
installer
- (el-get-verbose t)) ; let's see it all
- (el-get-post-install "el-get"))
- (with-current-buffer buf
- (goto-char (point-max))
- (insert "\nCongrats, el-get is installed and ready to serve!")))))
-
-
-(declare-function el-get 'el-get)
-
-;; now either el-get is `require'd already, or have been `load'ed by the
-;; el-get installer.
-(setq
- el-get-sources
- '(el-get ; el-get is self-hosting
- loc-changes ; loc marks in buffers
- load-relative ; load emacs lisp relative to emacs source
- test-simple ; simple test framework
- ))
-
-;; install new packages and init already installed packages
-(el-get 'sync '(loc-changes list-utils load-relative test-simple))
diff --git a/load-relative.el b/load-relative.el
index 290166b0f3..e229b82a98 100644
--- a/load-relative.el
+++ b/load-relative.el
@@ -1,7 +1,7 @@
;;; load-relative.el --- Relative file load (within a multi-file Emacs
package) -*- lexical-binding: t -*-
;; Author: Rocky Bernstein <ro...@gnu.org>
-;; Version: 1.3.1
+;; Version: 1.3.2
;; Keywords: internal
;; URL: https://github.com/rocky/emacs-load-relative
;; Compatibility: GNU Emacs 23.x
diff --git a/test/subdir/test-require-list-from-subdir.el
b/test/subdir/test-require-list-from-subdir.el
index 880b4f37b0..cf4a91f691 100644
--- a/test/subdir/test-require-list-from-subdir.el
+++ b/test/subdir/test-require-list-from-subdir.el
@@ -1,4 +1,6 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Can't find the "test-unit" package, so: -*- no-byte-compile:t -*-
+
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <ro...@gnu.org>
