Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: f896c80906
...
compare: 6ef71f1f43
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 2 additions and 11 deletions.
  1. +0 −4 .gitmodules
  2. +0 −1  emacs-httpd
  3. +2 −6 init.el
View
4 .gitmodules
@@ -2,10 +2,6 @@
path = emacs-java
url = https://github.com/skeeto/emacs-java.git
ignore = untracked
-[submodule "emacs-httpd"]
- path = emacs-httpd
- url = https://github.com/skeeto/emacs-http-server.git
- ignore = untracked
[submodule "yasnippet-java"]
path = yasnippet-java
url = https://github.com/skeeto/yasnippet-java-topcoder.git
1  emacs-httpd
@@ -1 +0,0 @@
-Subproject commit 1d9d606e07544810f3631511780f44597b313997
View
8 init.el
@@ -6,7 +6,7 @@
;; Set up package system
(defvar my-packages
'(ido-ubiquitous smex magit yasnippet markdown-mode paredit
- glsl-mode parenface graphviz-dot-mode mark-multiple memoize)
+ glsl-mode parenface graphviz-dot-mode mark-multiple memoize simple-httpd)
"A list of packages to ensure are installed at launch.")
(require 'package)
@@ -81,9 +81,6 @@
(require 'uniquify)
(setq uniquify-buffer-name-style 'post-forward-angle-brackets)
-;; Web server
-(require 'httpd)
-
;; Winner mode
(require 'winner)
(winner-mode 1)
@@ -103,7 +100,6 @@
;; Git
(require 'magit)
(global-set-key "\C-xg" 'magit-status)
-(setq magit-status-buffer-switch-function 'switch-to-buffer)
(setq vc-display-status nil)
;; Markdown
@@ -114,7 +110,7 @@
;; Jekyll
(require 'jekyll)
-(global-set-key (kbd "C-c n") 'jekyll/new-post)
+(require 'simple-httpd)
(setq jekyll-home "~/src/skeeto.github.com/")
(when (file-exists-p jekyll-home)
(setq httpd-root (concat jekyll-home "_site"))

No commit comments for this range

Something went wrong with that request. Please try again.