From ed87ba72282a8e5c2cd3f5631748726c930809bd Mon Sep 17 00:00:00 2001
From: Miquel Sabaté Solà <msabate@suse.com>
Date: Fri, 21 Oct 2016 11:55:32 +0200
Subject: emacs: trying to test it with travis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Files and idea taken from https://github.com/purcell/emacs.d. I've also
added the bin/test directory into it.

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
---
 emacs/init.el         |  9 ++++++---
 emacs/test-startup.sh | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100755 emacs/test-startup.sh

(limited to 'emacs')

diff --git a/emacs/init.el b/emacs/init.el
index 7a3f8de..295c7ac 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -128,8 +128,10 @@
 
 ;; Graphical interface tweaks
 (menu-bar-mode -1)
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
+(when (fboundp 'set-scroll-bar-mode)
+  (set-scroll-bar-mode nil))
+(when (fboundp 'tool-bar-mode)
+  (tool-bar-mode -1))
 
 ;; Lines and columns
 (line-number-mode 1)
@@ -204,7 +206,7 @@ The user will end up in the *scratch* buffer."
 
 ;;; My lisp directory
 
-(add-to-list 'load-path "~/.emacs.d/lisp")
+(add-to-list 'load-path (expand-file-name "lisp" user-emacs-directory))
 (require 'g)
 
 ;;; Packages
@@ -214,6 +216,7 @@ The user will end up in the *scratch* buffer."
 ;; for Emacs out there. After trying some custom functions to handle
 ;; package-install, I decided on use-package because I feel more well-organized.
 (unless (package-installed-p 'use-package)
+  (package-refresh-contents)
   (package-install 'use-package))
 
 (require 'use-package)
diff --git a/emacs/test-startup.sh b/emacs/test-startup.sh
new file mode 100755
index 0000000..d8f3547
--- /dev/null
+++ b/emacs/test-startup.sh
@@ -0,0 +1,22 @@
+#!/bin/sh -ex
+# Kindly taken from: https://github.com/purcell/emacs.d
+
+if [ -n "$TRAVIS" ]; then
+    # We still need to have an .emacs.d directory, so emacs-async (dependency of
+    # some other package) is happy.
+    export HOME=$PWD/..
+    ln -s emacs ../.emacs.d
+fi
+
+echo "Attempting startup..."
+
+${EMACS:=emacs} -nw --batch \
+                --eval '(let ((debug-on-error t)
+                              (url-show-status nil)
+                              (user-emacs-directory default-directory)
+                              (package-user-dir (expand-file-name (concat "elpa-" emacs-version)))
+                              (custom-theme-directory default-directory)
+                              (user-init-file (expand-file-name "init.el")))
+                           (load-file user-init-file)
+                           (run-hooks (quote after-init-hook)))'
+echo "Startup successful"
-- 
cgit v1.2.3