Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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 fork: langmartin/site-lisp
base: 41f21db15c
...
head fork: langmartin/site-lisp
compare: 8118fbd2ae
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 27 additions and 3 deletions.
  1. +14 −0 git-commands.el
  2. +12 −2 rc-eshell.el
  3. +1 −1  rc-package.el
View
14 git-commands.el
@@ -124,4 +124,18 @@
nil
git-commands-map)
+(defun git-get-current-branch ()
+ (with-temp-buffer
+ (shell-command "git symbolic-ref HEAD" (current-buffer))
+ (let ((str (chomp (buffer-string))))
+ (string-match "^refs/.*?/\\(.*\\)$" str)
+ (match-string 1 str))))
+
+(defun git-set-rebase ()
+ (interactive)
+ (shell-command
+ (concat "git config \"branch."
+ (git-get-current-branch)
+ ".rebase\" true")))
+
(provide 'git-commands)
View
14 rc-eshell.el
@@ -21,7 +21,7 @@
(defun shell-focus-or-create (prefix)
(interactive "P")
(cond (prefix
- (eshell prefix))
+ (call-interactively #'shell))
((bufferp (get-buffer "*shell*"))
(let ((dir default-directory))
(switch-to-buffer "*shell*")
@@ -29,7 +29,17 @@
(insert "cd " dir)
(comint-send-input))))
(t
- (eshell nil))))
+ (shell nil))))
+
+(defun send-c-c-interrupt-subjob (prefix)
+ (interactive "P")
+ (cond (prefix
+ (comint-interrupt-subjob))
+ (t
+ (insert "")
+ (comint-send-input))))
+
+(define-key shell-mode-map (kbd "C-c C-c") 'send-c-c-interrupt-subjob)
(global-set-key (kbd "H-s") 'shell-focus-or-create)
View
2  rc-package.el
@@ -11,7 +11,7 @@ Otherwise warn."
(progn ,@body)
(warn "feature %s is not installed" ',feature)))
-(with-feature maxframe)
+;; (with-feature maxframe)
(with-feature org-compat)
(with-feature project-mode

No commit comments for this range

Something went wrong with that request. Please try again.