aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-01-01 12:39:01 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-01-01 12:39:01 +1300
commitbee176e8f895d594e522ea6ff46ca3e2c7d2cb76 (patch)
tree29115713032e2526d8a9628cbf5716432bc50491
parente19bb8fb3c8350bee288327abd978a59eb3dc0f7 (diff)
parent6e61a72616611b7d171bcb4122d5251b5ea02e35 (diff)
downloaddotfiles-bee176e8f895d594e522ea6ff46ca3e2c7d2cb76.tar.gz
Merge branch 'release/v4.4.0'v4.4.0
* release/v4.4.0: Bump VERSION Add my new .emacs file
-rw-r--r--Makefile4
-rw-r--r--README.md1
-rw-r--r--VERSION4
-rw-r--r--emacs/emacs7
4 files changed, 14 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2629ec55..31018936 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@
install-curl \
install-dillo \
install-dunst \
+ install-emacs \
install-ex \
install-finger \
install-games \
@@ -392,6 +393,9 @@ install-dunst: install-x
mkdir -p -- $(HOME)/.config/dunst
cp -p -- dunst/dunstrc $(HOME)/.config/dunst
+install-emacs:
+ cp -p -- emacs/emacs $(HOME)/.emacs
+
install-ex:
cp -p -- ex/exrc $(HOME)/.exrc
diff --git a/README.md b/README.md
index d2db5107..ceedf66f 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ Configuration is included for:
that works with `libnotify`
* `finger(1)` -- User information lookup program
* [Git](https://git-scm.com/) -- Distributed version control system
+* [GNU Emacs](https://www.gnu.org/software/emacs/) -- Extensible text editor
* [GnuPG](https://www.gnupg.org/) -- GNU Privacy Guard, for private
communication and file encryption
* [GTK+](https://www.gtk.org/) -- GIMP Toolkit, for graphical user interface
diff --git a/VERSION b/VERSION
index 8550a5e5..02fd4e9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.3.0
-Mon Dec 31 12:11:08 UTC 2018
+tejr dotfiles v4.4.0
+Mon Dec 31 23:39:00 UTC 2018
diff --git a/emacs/emacs b/emacs/emacs
new file mode 100644
index 00000000..a80f36a1
--- /dev/null
+++ b/emacs/emacs
@@ -0,0 +1,7 @@
+(require 'package)
+(add-to-list 'package-archives
+ '("melpa" . "https://melpa.org/packages/"))
+(package-initialize)
+(custom-set-variables
+ '(package-selected-packages
+ (quote (markdown-mode fireplace))))