Permalink
Browse files

Various changes and a bit of cleanup

  • Loading branch information...
1 parent d5e5d1e commit dfb714967fb418eafa4c197cdc7886df1c2d4d7f John Wiegley committed Jan 22, 2013
Showing with 35 additions and 24 deletions.
  1. +0 −12 .gitmodules
  2. +1 −2 init.el
  3. +1 −1 lisp/fetchmail-ctl.el
  4. +30 −2 lisp/paredit-ext.el
  5. +1 −1 site-lisp/ac/auto-complete
  6. +1 −1 site-lisp/ac/popup-el
  7. +0 −1 site-lisp/asynk
  8. +0 −1 site-lisp/dvc
  9. +0 −1 site-lisp/el-get
  10. +1 −1 site-lisp/emacs-edbi
  11. +0 −1 site-lisp/melpa
View
@@ -163,9 +163,6 @@
[submodule "lisp/use-package"]
path = lisp/use-package
url = git://github.com/jwiegley/use-package.git
-[submodule "site-lisp/el-get"]
- path = site-lisp/el-get
- url = https://github.com/dimitri/el-get.git
[submodule "site-lisp/zencoding-mode"]
path = site-lisp/zencoding-mode
url = git://github.com/rooney/zencoding.git
@@ -178,9 +175,6 @@
[submodule "lisp/erc-yank"]
path = lisp/erc-yank
url = git://github.com/jwiegley/erc-yank.git
-[submodule "lisp/emacs-async"]
- path = lisp/emacs-async
- url = git://github.com/jwiegley/emacs-async.git
[submodule "site-lisp/eval-expr"]
path = site-lisp/eval-expr
url = git://github.com/jwiegley/eval-expr.git
@@ -235,12 +229,6 @@
[submodule "site-lisp/elisp-slime-nav"]
path = site-lisp/elisp-slime-nav
url = https://github.com/purcell/elisp-slime-nav.git
-[submodule "site-lisp/dvc"]
- path = site-lisp/dvc
- url = https://github.com/emacsmirror/dvc.git
-[submodule "site-lisp/melpa"]
- path = site-lisp/melpa
- url = https://github.com/milkypostman/melpa.git
[submodule "site-lisp/ruby-mode"]
path = site-lisp/ruby-mode
url = https://github.com/jwiegley/ruby-mode.git
View
@@ -2168,8 +2168,7 @@ FORM => (eval FORM)."
(if (> (length (split-string message "\n")) 8)
(my-flycheck-show-error-in-window)
(if wind (delete-window wind))
- (message "%s" message))
- (message nil)))
+ (message "%s" message))))
;; Try again if the minibuffer is busy at the moment
(flycheck-show-error-at-point-soon))))
View
@@ -138,7 +138,7 @@
(get-buffer-create "*fetchnews*")
(executable-find "fetchnews")
"-F" (expand-file-name "~/Messages/leafnode/config")
- "-vvv")))))
+ "-vvv" "-n")))))
(cur-buf (current-buffer)))
(delete-other-windows)
(flet ((switch-in-other-buffer
View
@@ -71,6 +71,30 @@
(throw 'done t)))
(paredit-forward-slurp-sexp))))
+(defun paredit--is-at-start-of-sexp ()
+ (and (looking-at "(\\|\\[")
+ (not (nth 3 (syntax-ppss))) ;; inside string
+ (not (nth 4 (syntax-ppss))))) ;; inside comment
+
+(defun paredit-duplicate-closest-sexp ()
+ (interactive)
+ ;; skips to start of current sexp
+ (while (not (paredit--is-at-start-of-sexp))
+ (paredit-backward))
+ (set-mark-command nil)
+ ;; while we find sexps we move forward on the line
+ (while (and (bounds-of-thing-at-point 'sexp)
+ (<= (point) (car (bounds-of-thing-at-point 'sexp)))
+ (not (= (point) (line-end-position))))
+ (forward-sexp)
+ (while (looking-at " ")
+ (forward-char)))
+ (kill-ring-save (mark) (point))
+ ;; go to the next line and copy the sexprs we encountered
+ (paredit-newline)
+ (yank)
+ (exchange-point-and-mark))
+
(nconc paredit-commands
'("Extreme Barfage & Slurpage"
(("C-M-)")
@@ -86,13 +110,17 @@
(("C-M-(")
paredit-slurp-all-the-way-backward
("(foo bar (baz| quux) zot)"
- "((foo bar baz| quux) zot)")
+ "((foo bar baz| quux) zot)")
("(a b ((c| d)) e f)"
"(a b ((c| d)) e f)"))
(("C-M-{")
paredit-barf-all-the-way-backward
("(foo (bar baz |quux) zot)"
- "(foo bar baz (|quux) zot)"))))
+ "(foo bar baz (|quux) zot)"))
+ (("C-M->")
+ paredit-duplicate-closest-sexp
+ ("(foo | bar)"
+ "(foo bar)(foo bar)"))))
(paredit-define-keys)
(paredit-annotate-mode-with-examples)
Submodule popup-el updated 5 files
+1 −0 .gitignore
+18 −1 Makefile
+30 −29 README.md
+12 −6 popup.el
+240 −5 tests/popup-test.el
Submodule asynk deleted from 70fbf5
Submodule dvc deleted from 1f56c3
Submodule el-get deleted from 24ce17
Submodule emacs-edbi updated 5 files
+1 −1 e2wm-edbi.el
+2 −2 edbi-pkg.el
+61 −11 edbi.el
+1 −1 package.sh
+34 −0 readme.md
Submodule melpa deleted from f87a10

0 comments on commit dfb7149

Please sign in to comment.