Commit bacf9d63abdb
Changed files (1431)
.emacs.d
elpa
apropospriate-theme-20170212.1229
apropospriate-theme-20170321.907
avy-20170402.112
company-20170328.1748
company-quickhelp-20170226.522
company-quickhelp-20170402.35
counsel-20170328.737
dired+-20170330.1047
flycheck-20170324.340
git-commit-20170308.146
git-commit-20170314.1414
hydra-20170325.815
ivy-20170328.1957
magit-20170401.1145
markdown-mode-20170317.1202
swiper-20170328.737
which-key-20170209.729
which-key-20170315.1055
yasnippet-20170310.1724
snippets
prog-mode
python-mode
yasnippet-20170326.1030
snippets
applescript-mode
c++-mode
cc-mode
chef-mode
cider-repl-mode
clojure-mode
cmake-mode
conf-unix-mode
cperl-mode
cpp-omnet-mode
csharp-mode
css-mode
dix-mode
elixir-mode
emacs-lisp-mode
enh-ruby-mode
ensime-mode
erlang-mode
f90-mode
faust-mode
git-commit-mode
go-mode
haskell-mode
html-mode
java-mode
js-mode
js2-mode
js3-mode
latex-mode
lisp-interaction-mode
m4-mode
makefile-automake-mode
makefile-gmake-mode
malabar-mode
markdown-mode
ned-mode
nix-mode
nsis-mode
nxml-mode
python-mode
rst-mode
ruby-mode
rust-mode
sql-mode
text-mode
tuareg-mode
typerex-mode
web-mode
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-theme-pkg.el
@@ -1,6 +0,0 @@
-(define-package "apropospriate-theme" "20170212.1229" "A colorful, low-contrast, light & dark theme set for Emacs with a fun name." 'nil :keywords
- '("color" "theme")
- :url "https://github.com/waymondo/apropospriate-theme")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-dark-theme.el → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-dark-theme.el
File renamed without changes
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-dark-theme.elc → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-dark-theme.elc
File renamed without changes
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-light-theme.el → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-light-theme.el
File renamed without changes
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-light-theme.elc → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-light-theme.elc
File renamed without changes
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-theme-autoloads.el → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-theme-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "apropospriate" "apropospriate.el" (22712 4608
-;;;;;; 896621 165000))
+;;;### (autoloads nil "apropospriate" "apropospriate.el" (22753 9106
+;;;;;; 776275 254000))
;;; Generated autoloads from apropospriate.el
(and load-file-name (boundp 'custom-theme-load-path) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
@@ -12,8 +12,8 @@
;;;***
;;;### (autoloads nil nil ("apropospriate-dark-theme.el" "apropospriate-light-theme.el"
-;;;;;; "apropospriate-theme-pkg.el" "apropospriate-theme.el") (22712
-;;;;;; 4608 898621 152000))
+;;;;;; "apropospriate-theme-pkg.el" "apropospriate-theme.el") (22753
+;;;;;; 9106 778275 224000))
;;;***
.emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-theme-pkg.el
@@ -0,0 +1,6 @@
+(define-package "apropospriate-theme" "20170321.907" "A colorful, low-contrast, light & dark theme set for Emacs with a fun name." 'nil :keywords
+ '("color" "theme")
+ :url "https://github.com/waymondo/apropospriate-theme")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-theme.el → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-theme.el
File renamed without changes
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate-theme.elc → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate-theme.elc
File renamed without changes
.emacs.d/elpa/apropospriate-theme-20170212.1229/apropospriate.el → .emacs.d/elpa/apropospriate-theme-20170321.907/apropospriate.el
@@ -201,14 +201,15 @@ Set to `1.0' or nil to prevent font size manipulation."
`(ivy-match-required-face ((,class (:foreground ,red))))
`(ivy-remote ((,class (:foreground ,cyan))))
`(ivy-virtual ((,class (:inherit ido-virtual))))
- `(ivy-minibuffer-match-face-1 ((,class (:background ,light-emphasis-2))))
- `(ivy-minibuffer-match-face-2 ((,class (:inherit match))))
- `(ivy-minibuffer-match-face-3 ((,class (:foreground ,yellow))))
- `(ivy-minibuffer-match-face-4 ((,class (:foreground ,yellow))))
+ `(ivy-minibuffer-match-face-1 ((,class (:foreground ,yellow :background nil))))
+ `(ivy-minibuffer-match-face-2 ((,class (:foreground ,yellow :background nil))))
+ `(ivy-minibuffer-match-face-3 ((,class (:foreground ,yellow :background nil))))
+ `(ivy-minibuffer-match-face-4 ((,class (:foreground ,yellow :background nil))))
`(swiper-match-face-1 ((,class (:inherit ivy-minibuffer-match-face-1))))
`(swiper-match-face-2 ((,class (:inherit ivy-minibuffer-match-face-2))))
`(swiper-match-face-3 ((,class (:inherit ivy-minibuffer-match-face-3))))
`(swiper-match-face-4 ((,class (:inherit ivy-minibuffer-match-face-4))))
+ `(swiper-line-face ((,class (:background ,highlight-line-color))))
`(wgrep-face ((,class (:background ,base00+2))))
`(wgrep-file-face ((,class (:background ,base00+1))))
`(wgrep-delete-face ((,class (:foreground ,red))))
.emacs.d/elpa/avy-20170208.148/avy-autoloads.el → .emacs.d/elpa/avy-20170402.112/avy-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "avy" "avy.el" (22712 4607 30633 556000))
+;;;### (autoloads nil "avy" "avy.el" (22753 9106 361281 499000))
;;; Generated autoloads from avy.el
(autoload 'avy-goto-char "avy" "\
@@ -46,7 +46,7 @@ Jump to one of the current isearch candidates.
Jump to a word start.
The window scope is determined by `avy-all-windows' (ARG negates it).
-\(fn ARG)" t nil)
+\(fn ARG &optional BEG END)" t nil)
(autoload 'avy-goto-word-1 "avy" "\
Jump to the currently visible CHAR at a word start.
.emacs.d/elpa/avy-20170208.148/avy-pkg.el → .emacs.d/elpa/avy-20170402.112/avy-pkg.el
@@ -1,2 +1,2 @@
;;; -*- no-byte-compile: t -*-
-(define-package "avy" "20170208.148" "tree-based completion" '((emacs "24.1") (cl-lib "0.5")) :url "https://github.com/abo-abo/avy" :keywords '("point" "location"))
+(define-package "avy" "20170402.112" "tree-based completion" '((emacs "24.1") (cl-lib "0.5")) :url "https://github.com/abo-abo/avy" :keywords '("point" "location"))
.emacs.d/elpa/avy-20170208.148/avy.el → .emacs.d/elpa/avy-20170402.112/avy.el
@@ -4,7 +4,7 @@
;; Author: Oleh Krehel <ohwoeowho@gmail.com>
;; URL: https://github.com/abo-abo/avy
-;; Package-Version: 20170208.148
+;; Package-Version: 20170402.112
;; Version: 0.4.0
;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
;; Keywords: point, location
@@ -135,6 +135,7 @@ If the commands isn't on the list, `avy-style' is used."
(?X . avy-action-kill-stay)
(?m . avy-action-mark)
(?n . avy-action-copy)
+ (?y . avy-action-yank)
(?i . avy-action-ispell))
"List of actions for `avy-handler-default'.
@@ -533,6 +534,11 @@ Set `avy-style' according to COMMMAND as well."
(select-window (cdr dat))
(goto-char (car dat))))
+(defun avy-action-yank (pt)
+ "Yank sexp starting at PT at the current point."
+ (avy-action-copy pt)
+ (yank))
+
(defun avy-action-kill-move (pt)
"Kill sexp at PT and move there."
(goto-char pt)
@@ -1051,12 +1057,24 @@ the visible part of the current buffer following point."
(isearch-done))))
;;;###autoload
-(defun avy-goto-word-0 (arg)
+(defun avy-goto-word-0 (arg &optional beg end)
"Jump to a word start.
The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P")
(avy-with avy-goto-word-0
- (avy--generic-jump avy-goto-word-0-regexp arg avy-style)))
+ (avy--generic-jump avy-goto-word-0-regexp arg avy-style beg end)))
+
+(defun avy-goto-word-0-above (arg)
+ "Jump to a word start between window start and point."
+ (interactive "P")
+ (avy-with avy-goto-word-0
+ (avy-goto-word-0 arg (window-start) (point))))
+
+(defun avy-goto-word-0-below (arg)
+ "Jump to a word start between point and window end."
+ (interactive "P")
+ (avy-with avy-goto-word-0
+ (avy-goto-word-0 arg (point) (window-end (selected-window) t))))
;;;###autoload
(defun avy-goto-word-1 (char &optional arg beg end symbol)
@@ -1467,7 +1485,8 @@ The window scope is determined by `avy-all-windows' or
"Select two lines and move the text between them here."
(interactive)
(avy-with avy-move-region
- (let* ((beg (avy--line))
+ (let* ((initial-window (selected-window))
+ (beg (avy--line))
(end (save-excursion
(goto-char (avy--line))
(forward-line)
@@ -1476,6 +1495,7 @@ The window scope is determined by `avy-all-windows' or
(pad (if (bolp) "" "\n")))
(move-beginning-of-line nil)
(delete-region beg end)
+ (select-window initial-window)
(insert text pad))))
;;;###autoload
.emacs.d/elpa/avy-20170208.148/avy.elc → .emacs.d/elpa/avy-20170402.112/avy.elc
Binary file
.emacs.d/elpa/company-20170218.1913/company-abbrev.el → .emacs.d/elpa/company-20170328.1748/company-abbrev.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-abbrev.elc → .emacs.d/elpa/company-20170328.1748/company-abbrev.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-autoloads.el → .emacs.d/elpa/company-20170328.1748/company-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "company" "company.el" (22712 4651 823336 93000))
+;;;### (autoloads nil "company" "company.el" (22753 9105 286297 677000))
;;; Generated autoloads from company.el
(autoload 'company-mode "company" "\
@@ -73,8 +73,8 @@ inserted.
;;;***
-;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22712
-;;;;;; 4651 837336 0))
+;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22753
+;;;;;; 9105 300297 467000))
;;; Generated autoloads from company-abbrev.el
(autoload 'company-abbrev "company-abbrev" "\
@@ -84,8 +84,8 @@ inserted.
;;;***
-;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22712 4651
-;;;;;; 833336 27000))
+;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22753 9105
+;;;;;; 296297 527000))
;;; Generated autoloads from company-bbdb.el
(autoload 'company-bbdb "company-bbdb" "\
@@ -95,8 +95,8 @@ inserted.
;;;***
-;;;### (autoloads nil "company-css" "company-css.el" (22712 4651
-;;;;;; 822336 100000))
+;;;### (autoloads nil "company-css" "company-css.el" (22753 9105
+;;;;;; 285297 693000))
;;; Generated autoloads from company-css.el
(autoload 'company-css "company-css" "\
@@ -106,8 +106,8 @@ inserted.
;;;***
-;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22712
-;;;;;; 4651 828336 60000))
+;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22753
+;;;;;; 9105 291297 602000))
;;; Generated autoloads from company-dabbrev.el
(autoload 'company-dabbrev "company-dabbrev" "\
@@ -118,7 +118,7 @@ dabbrev-like `company-mode' completion backend.
;;;***
;;;### (autoloads nil "company-dabbrev-code" "company-dabbrev-code.el"
-;;;;;; (22712 4651 826336 73000))
+;;;;;; (22753 9105 289297 632000))
;;; Generated autoloads from company-dabbrev-code.el
(autoload 'company-dabbrev-code "company-dabbrev-code" "\
@@ -130,8 +130,8 @@ comments or strings.
;;;***
-;;;### (autoloads nil "company-elisp" "company-elisp.el" (22712 4651
-;;;;;; 839335 987000))
+;;;### (autoloads nil "company-elisp" "company-elisp.el" (22753 9105
+;;;;;; 302297 437000))
;;; Generated autoloads from company-elisp.el
(autoload 'company-elisp "company-elisp" "\
@@ -141,8 +141,8 @@ comments or strings.
;;;***
-;;;### (autoloads nil "company-etags" "company-etags.el" (22712 4651
-;;;;;; 824336 87000))
+;;;### (autoloads nil "company-etags" "company-etags.el" (22753 9105
+;;;;;; 288297 648000))
;;; Generated autoloads from company-etags.el
(autoload 'company-etags "company-etags" "\
@@ -152,8 +152,8 @@ comments or strings.
;;;***
-;;;### (autoloads nil "company-files" "company-files.el" (22712 4651
-;;;;;; 829336 53000))
+;;;### (autoloads nil "company-files" "company-files.el" (22753 9105
+;;;;;; 292297 587000))
;;; Generated autoloads from company-files.el
(autoload 'company-files "company-files" "\
@@ -165,8 +165,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-gtags" "company-gtags.el" (22712 4651
-;;;;;; 817336 133000))
+;;;### (autoloads nil "company-gtags" "company-gtags.el" (22753 9105
+;;;;;; 281297 753000))
;;; Generated autoloads from company-gtags.el
(autoload 'company-gtags "company-gtags" "\
@@ -176,8 +176,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-ispell" "company-ispell.el" (22712
-;;;;;; 4651 838335 994000))
+;;;### (autoloads nil "company-ispell" "company-ispell.el" (22753
+;;;;;; 9105 301297 452000))
;;; Generated autoloads from company-ispell.el
(autoload 'company-ispell "company-ispell" "\
@@ -187,8 +187,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-keywords" "company-keywords.el" (22712
-;;;;;; 4651 831336 40000))
+;;;### (autoloads nil "company-keywords" "company-keywords.el" (22753
+;;;;;; 9105 294297 557000))
;;; Generated autoloads from company-keywords.el
(autoload 'company-keywords "company-keywords" "\
@@ -198,8 +198,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-nxml" "company-nxml.el" (22712 4651
-;;;;;; 834336 20000))
+;;;### (autoloads nil "company-nxml" "company-nxml.el" (22753 9105
+;;;;;; 297297 512000))
;;; Generated autoloads from company-nxml.el
(autoload 'company-nxml "company-nxml" "\
@@ -209,8 +209,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22712
-;;;;;; 4651 820336 113000))
+;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22753
+;;;;;; 9105 284297 708000))
;;; Generated autoloads from company-oddmuse.el
(autoload 'company-oddmuse "company-oddmuse" "\
@@ -220,8 +220,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-semantic" "company-semantic.el" (22712
-;;;;;; 4651 818336 126000))
+;;;### (autoloads nil "company-semantic" "company-semantic.el" (22753
+;;;;;; 9105 282297 738000))
;;; Generated autoloads from company-semantic.el
(autoload 'company-semantic "company-semantic" "\
@@ -231,8 +231,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-tempo" "company-tempo.el" (22712 4651
-;;;;;; 827336 67000))
+;;;### (autoloads nil "company-tempo" "company-tempo.el" (22753 9105
+;;;;;; 290297 617000))
;;; Generated autoloads from company-tempo.el
(autoload 'company-tempo "company-tempo" "\
@@ -242,8 +242,8 @@ File paths with spaces are only supported inside strings.
;;;***
-;;;### (autoloads nil "company-xcode" "company-xcode.el" (22712 4651
-;;;;;; 836336 7000))
+;;;### (autoloads nil "company-xcode" "company-xcode.el" (22753 9105
+;;;;;; 299297 482000))
;;; Generated autoloads from company-xcode.el
(autoload 'company-xcode "company-xcode" "\
@@ -254,7 +254,7 @@ File paths with spaces are only supported inside strings.
;;;***
;;;### (autoloads nil "company-yasnippet" "company-yasnippet.el"
-;;;;;; (22712 4651 835336 14000))
+;;;;;; (22753 9105 298297 497000))
;;; Generated autoloads from company-yasnippet.el
(autoload 'company-yasnippet "company-yasnippet" "\
@@ -286,7 +286,7 @@ shadow backends that come after it. Recommended usages:
;;;### (autoloads nil nil ("company-capf.el" "company-clang.el" "company-cmake.el"
;;;;;; "company-eclim.el" "company-pkg.el" "company-template.el")
-;;;;;; (22712 4651 832336 33000))
+;;;;;; (22753 9105 295297 542000))
;;;***
.emacs.d/elpa/company-20170218.1913/company-bbdb.el → .emacs.d/elpa/company-20170328.1748/company-bbdb.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-bbdb.elc → .emacs.d/elpa/company-20170328.1748/company-bbdb.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-capf.el → .emacs.d/elpa/company-20170328.1748/company-capf.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-capf.elc → .emacs.d/elpa/company-20170328.1748/company-capf.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-clang.el → .emacs.d/elpa/company-20170328.1748/company-clang.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-clang.elc → .emacs.d/elpa/company-20170328.1748/company-clang.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-cmake.el → .emacs.d/elpa/company-20170328.1748/company-cmake.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-cmake.elc → .emacs.d/elpa/company-20170328.1748/company-cmake.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-css.el → .emacs.d/elpa/company-20170328.1748/company-css.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-css.elc → .emacs.d/elpa/company-20170328.1748/company-css.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-dabbrev-code.el → .emacs.d/elpa/company-20170328.1748/company-dabbrev-code.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-dabbrev-code.elc → .emacs.d/elpa/company-20170328.1748/company-dabbrev-code.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-dabbrev.el → .emacs.d/elpa/company-20170328.1748/company-dabbrev.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-dabbrev.elc → .emacs.d/elpa/company-20170328.1748/company-dabbrev.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-eclim.el → .emacs.d/elpa/company-20170328.1748/company-eclim.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-eclim.elc → .emacs.d/elpa/company-20170328.1748/company-eclim.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-elisp.el → .emacs.d/elpa/company-20170328.1748/company-elisp.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-elisp.elc → .emacs.d/elpa/company-20170328.1748/company-elisp.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-files.el → .emacs.d/elpa/company-20170328.1748/company-files.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-files.elc → .emacs.d/elpa/company-20170328.1748/company-files.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-ispell.el → .emacs.d/elpa/company-20170328.1748/company-ispell.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-ispell.elc → .emacs.d/elpa/company-20170328.1748/company-ispell.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-keywords.el → .emacs.d/elpa/company-20170328.1748/company-keywords.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-keywords.elc → .emacs.d/elpa/company-20170328.1748/company-keywords.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-nxml.el → .emacs.d/elpa/company-20170328.1748/company-nxml.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-nxml.elc → .emacs.d/elpa/company-20170328.1748/company-nxml.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-oddmuse.el → .emacs.d/elpa/company-20170328.1748/company-oddmuse.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-oddmuse.elc → .emacs.d/elpa/company-20170328.1748/company-oddmuse.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-pkg.el → .emacs.d/elpa/company-20170328.1748/company-pkg.el
@@ -1,4 +1,4 @@
-(define-package "company" "20170218.1913" "Modular text completion framework"
+(define-package "company" "20170328.1748" "Modular text completion framework"
'((emacs "24.3"))
:url "http://company-mode.github.io/" :keywords
'("abbrev" "convenience" "matching"))
.emacs.d/elpa/company-20170218.1913/company-semantic.el → .emacs.d/elpa/company-20170328.1748/company-semantic.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-semantic.elc → .emacs.d/elpa/company-20170328.1748/company-semantic.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-template.el → .emacs.d/elpa/company-20170328.1748/company-template.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-template.elc → .emacs.d/elpa/company-20170328.1748/company-template.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-tempo.el → .emacs.d/elpa/company-20170328.1748/company-tempo.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-tempo.elc → .emacs.d/elpa/company-20170328.1748/company-tempo.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-xcode.el → .emacs.d/elpa/company-20170328.1748/company-xcode.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-xcode.elc → .emacs.d/elpa/company-20170328.1748/company-xcode.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-yasnippet.el → .emacs.d/elpa/company-20170328.1748/company-yasnippet.el
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company-yasnippet.elc → .emacs.d/elpa/company-20170328.1748/company-yasnippet.elc
File renamed without changes
.emacs.d/elpa/company-20170218.1913/company.el → .emacs.d/elpa/company-20170328.1748/company.el
@@ -1,11 +1,11 @@
;;; company.el --- Modular text completion framework -*- lexical-binding: t -*-
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
;; Author: Nikolaj Schumacher
;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
;; URL: http://company-mode.github.io/
-;; Version: 0.9.2
+;; Version: 0.9.3
;; Keywords: abbrev, convenience, matching
;; Package-Requires: ((emacs "24.3"))
@@ -1093,7 +1093,7 @@ can retrieve meta-data for them."
(defun company--should-complete ()
(and (eq company-idle-delay 'now)
- (not (or buffer-read-only overriding-terminal-local-map
+ (not (or buffer-read-only
overriding-local-map))
;; Check if in the middle of entering a key combination.
(or (equal (this-command-keys-vector) [])
@@ -1457,32 +1457,24 @@ prefix match (same case) will be prioritized."
company-prefix)))
(defun company--continue-failed (new-prefix)
- (let ((input (buffer-substring-no-properties (point) company-point)))
- (cond
- ((company-auto-complete-p input)
- ;; auto-complete
- (save-excursion
- (goto-char company-point)
- (let ((company--auto-completion t))
- (company-complete-selection))
- nil))
- ((and (or (not (company-require-match-p))
- ;; Don't require match if the new prefix
- ;; doesn't continue the old one, and the latter was a match.
- (not (stringp new-prefix))
- (<= (length new-prefix) (length company-prefix)))
- (member company-prefix company-candidates))
- ;; Last input was a success,
- ;; but we're treating it as an abort + input anyway,
- ;; like the `unique' case below.
- (company-cancel 'non-unique))
- ((company-require-match-p)
- ;; Wrong incremental input, but required match.
- (delete-char (- (length input)))
- (ding)
- (message "Matching input is required")
- company-candidates)
- (t (company-cancel)))))
+ (cond
+ ((and (or (not (company-require-match-p))
+ ;; Don't require match if the new prefix
+ ;; doesn't continue the old one, and the latter was a match.
+ (not (stringp new-prefix))
+ (<= (length new-prefix) (length company-prefix)))
+ (member company-prefix company-candidates))
+ ;; Last input was a success,
+ ;; but we're treating it as an abort + input anyway,
+ ;; like the `unique' case below.
+ (company-cancel 'non-unique))
+ ((company-require-match-p)
+ ;; Wrong incremental input, but required match.
+ (delete-char (- company-point (point)))
+ (ding)
+ (message "Matching input is required")
+ company-candidates)
+ (t (company-cancel))))
(defun company--good-prefix-p (prefix)
(and (stringp (company--prefix-str prefix)) ;excludes 'stop
@@ -1517,6 +1509,14 @@ prefix match (same case) will be prioritized."
(setq company-prefix new-prefix)
(company-update-candidates c)
c)
+ ((company-auto-complete-p (buffer-substring-no-properties
+ (point) company-point))
+ ;; auto-complete
+ (save-excursion
+ (goto-char company-point)
+ (let ((company--auto-completion t))
+ (company-complete-selection))
+ nil))
((not (company--incremental-p))
(company-cancel))
(t (company--continue-failed new-prefix)))))
@@ -2848,8 +2848,9 @@ Returns a negative number if the tooltip should be displayed above point."
(overlay-put ov 'window (selected-window)))))
(defun company-pseudo-tooltip-guard ()
- (cons
+ (list
(save-excursion (beginning-of-visual-line))
+ (window-width)
(let ((ov company-pseudo-tooltip-overlay)
(overhang (save-excursion (end-of-visual-line)
(- (line-end-position) (point)))))
@@ -3014,10 +3015,16 @@ Delay is determined by `company-tooltip-idle-delay'."
(defvar company-echo-delay .01)
+(defcustom company-echo-truncate-lines t
+ "Whether frontend messages written to the echo area should be truncated."
+ :type 'boolean
+ :package-version '(company . "0.9.3"))
+
(defun company-echo-show (&optional getter)
(when getter
(setq company-echo-last-msg (funcall getter)))
- (let ((message-log-max nil))
+ (let ((message-log-max nil)
+ (message-truncate-lines company-echo-truncate-lines))
(if company-echo-last-msg
(message "%s" company-echo-last-msg)
(message ""))))
.emacs.d/elpa/company-20170218.1913/company.elc → .emacs.d/elpa/company-20170328.1748/company.elc
Binary file
.emacs.d/elpa/company-quickhelp-20170226.522/company-quickhelp-pkg.el
@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "company-quickhelp" "20170226.522" "Popup documentation for completion candidates" '((emacs "24.4") (company "0.8.9") (pos-tip "0.4.6")) :url "https://www.github.com/expez/company-quickhelp" :keywords '("company" "popup" "documentation" "quickhelp"))
.emacs.d/elpa/company-quickhelp-20170226.522/company-quickhelp.elc
Binary file
.emacs.d/elpa/company-quickhelp-20170226.522/company-quickhelp-autoloads.el → .emacs.d/elpa/company-quickhelp-20170402.35/company-quickhelp-autoloads.el
@@ -4,9 +4,14 @@
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "company-quickhelp" "company-quickhelp.el"
-;;;;;; (22712 4652 831329 399000))
+;;;;;; (22753 9104 377311 358000))
;;; Generated autoloads from company-quickhelp.el
+(autoload 'company-quickhelp-local-mode "company-quickhelp" "\
+Provides documentation popups for `company-mode' using `pos-tip'.
+
+\(fn &optional ARG)" t nil)
+
(defvar company-quickhelp-mode nil "\
Non-nil if Company-Quickhelp mode is enabled.
See the `company-quickhelp-mode' command
@@ -18,7 +23,14 @@ or call the function `company-quickhelp-mode'.")
(custom-autoload 'company-quickhelp-mode "company-quickhelp" nil)
(autoload 'company-quickhelp-mode "company-quickhelp" "\
-Provides documentation popups for `company-mode' using `pos-tip'.
+Toggle Company-Quickhelp-Local mode in all buffers.
+With prefix ARG, enable Company-Quickhelp mode if ARG is positive;
+otherwise, disable it. If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Company-Quickhelp-Local mode is enabled in all buffers where
+`company-quickhelp-local-mode' would do it.
+See `company-quickhelp-local-mode' for more information on Company-Quickhelp-Local mode.
\(fn &optional ARG)" t nil)
.emacs.d/elpa/company-quickhelp-20170402.35/company-quickhelp-pkg.el
@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "company-quickhelp" "20170402.35" "Popup documentation for completion candidates" '((emacs "24.4") (company "0.8.9") (pos-tip "0.4.6")) :url "https://www.github.com/expez/company-quickhelp" :keywords '("company" "popup" "documentation" "quickhelp"))
.emacs.d/elpa/company-quickhelp-20170226.522/company-quickhelp.el → .emacs.d/elpa/company-quickhelp-20170402.35/company-quickhelp.el
@@ -4,9 +4,9 @@
;; Author: Lars Andersen <expez@expez.com>
;; URL: https://www.github.com/expez/company-quickhelp
-;; Package-Version: 20170226.522
+;; Package-Version: 20170402.35
;; Keywords: company popup documentation quickhelp
-;; Version: 1.4.0
+;; Version: 2.2.0
;; Package-Requires: ((emacs "24.4") (company "0.8.9") (pos-tip "0.4.6"))
;; This file is not part of GNU Emacs.
@@ -77,10 +77,10 @@ be triggered manually using `company-quickhelp-show'."
(const :tag "Default" nil))
:group 'company-quickhelp)
-(defvar company-quickhelp--timer nil
+(defvar-local company-quickhelp--timer nil
"Quickhelp idle timer.")
-(defvar company-quickhelp--original-tooltip-width company-tooltip-minimum-width
+(defvar-local company-quickhelp--original-tooltip-width company-tooltip-minimum-width
"The documentation popup breaks inexplicably when we transition
from a large pseudo-tooltip to a small one. We solve this by
overriding `company-tooltip-minimum-width' and save the
@@ -161,39 +161,41 @@ currently active `company' completion candidate."
(unless (company-quickhelp-pos-tip-available-p)
(error "company-quickhelp is not available in this emacs version or frame"))
(company-quickhelp--cancel-timer)
- (let* ((selected (nth company-selection company-candidates))
- (doc (company-quickhelp--doc selected))
- (width 80)
- (timeout 300)
- (ovl company-pseudo-tooltip-overlay)
- (overlay-width (* (frame-char-width)
- (if ovl (overlay-get ovl 'company-width) 0)))
- (overlay-position (* (frame-char-width)
- (- (if ovl (overlay-get ovl 'company-column) 1) 1)))
- (x-gtk-use-system-tooltips nil)
- (fg-bg `(,company-quickhelp-color-foreground
- . ,company-quickhelp-color-background)))
- (when (and ovl doc)
- (with-no-warnings
- (if company-quickhelp-use-propertized-text
- (let* ((frame (window-frame (selected-window)))
- (max-width (pos-tip-x-display-width frame))
- (max-height (pos-tip-x-display-height frame))
- (w-h (pos-tip-string-width-height doc)))
- (cond
- ((> (car w-h) width)
- (setq doc (pos-tip-fill-string doc width nil 'none nil max-height)
- w-h (pos-tip-string-width-height doc)))
- ((or (> (car w-h) max-width)
- (> (cdr w-h) max-height))
- (setq doc (pos-tip-truncate-string doc max-width max-height)
- w-h (pos-tip-string-width-height doc))))
- (pos-tip-show-no-propertize doc fg-bg (overlay-start ovl) nil timeout
- (pos-tip-tooltip-width (car w-h) (frame-char-width frame))
- (pos-tip-tooltip-height (cdr w-h) (frame-char-height frame) frame)
- nil (+ overlay-width overlay-position) 1))
- (pos-tip-show doc fg-bg (overlay-start ovl) nil timeout width nil
- (+ overlay-width overlay-position) 1))))))
+ (while-no-input
+ (let* ((selected (nth company-selection company-candidates))
+ (doc (let ((inhibit-message t))
+ (company-quickhelp--doc selected)))
+ (width 80)
+ (timeout 300)
+ (ovl company-pseudo-tooltip-overlay)
+ (overlay-width (* (frame-char-width)
+ (if ovl (overlay-get ovl 'company-width) 0)))
+ (overlay-position (* (frame-char-width)
+ (- (if ovl (overlay-get ovl 'company-column) 1) 1)))
+ (x-gtk-use-system-tooltips nil)
+ (fg-bg `(,company-quickhelp-color-foreground
+ . ,company-quickhelp-color-background)))
+ (when (and ovl doc)
+ (with-no-warnings
+ (if company-quickhelp-use-propertized-text
+ (let* ((frame (window-frame (selected-window)))
+ (max-width (pos-tip-x-display-width frame))
+ (max-height (pos-tip-x-display-height frame))
+ (w-h (pos-tip-string-width-height doc)))
+ (cond
+ ((> (car w-h) width)
+ (setq doc (pos-tip-fill-string doc width nil 'none nil max-height)
+ w-h (pos-tip-string-width-height doc)))
+ ((or (> (car w-h) max-width)
+ (> (cdr w-h) max-height))
+ (setq doc (pos-tip-truncate-string doc max-width max-height)
+ w-h (pos-tip-string-width-height doc))))
+ (pos-tip-show-no-propertize doc fg-bg (overlay-start ovl) nil timeout
+ (pos-tip-tooltip-width (car w-h) (frame-char-width frame))
+ (pos-tip-tooltip-height (cdr w-h) (frame-char-height frame) frame)
+ nil (+ overlay-width overlay-position) 1))
+ (pos-tip-show doc fg-bg (overlay-start ovl) nil timeout width nil
+ (+ overlay-width overlay-position) 1)))))))
(defun company-quickhelp--set-timer ()
(when (null company-quickhelp--timer)
@@ -218,26 +220,30 @@ currently active `company' completion candidate."
(not (memq window-system (list nil 'pc)))))
(defun company-quickhelp--enable ()
- (add-hook 'focus-out-hook #'company-quickhelp-hide)
- (setq company-quickhelp--original-tooltip-width company-tooltip-minimum-width
- company-tooltip-minimum-width (max company-tooltip-minimum-width 40))
+ (add-hook 'focus-out-hook #'company-quickhelp-hide nil t)
+ (setq-local company-quickhelp--original-tooltip-width company-tooltip-minimum-width)
+ (setq-local company-tooltip-minimum-width (max company-tooltip-minimum-width 40))
+ (make-local-variable 'company-frontends)
(add-to-list 'company-frontends 'company-quickhelp-frontend :append))
(defun company-quickhelp--disable ()
- (remove-hook 'focus-out-hook #'company-quickhelp-hide)
+ (remove-hook 'focus-out-hook #'company-quickhelp-hide t)
(company-quickhelp--cancel-timer)
- (setq company-tooltip-minimum-width company-quickhelp--original-tooltip-width
- company-frontends
- (delq 'company-quickhelp-frontend company-frontends)))
+ (setq-local company-tooltip-minimum-width company-quickhelp--original-tooltip-width)
+ (setq-local company-frontends (delq 'company-quickhelp-frontend company-frontends)))
;;;###autoload
-(define-minor-mode company-quickhelp-mode
+(define-minor-mode company-quickhelp-local-mode
"Provides documentation popups for `company-mode' using `pos-tip'."
- :global t
- (if company-quickhelp-mode
+ :global nil
+ (if company-quickhelp-local-mode
(company-quickhelp--enable)
(company-quickhelp--disable)))
+;;;###autoload
+(define-globalized-minor-mode company-quickhelp-mode
+ company-quickhelp-local-mode company-quickhelp-local-mode)
+
(provide 'company-quickhelp)
;;; company-quickhelp.el ends here
.emacs.d/elpa/company-quickhelp-20170402.35/company-quickhelp.elc
Binary file
.emacs.d/elpa/counsel-20170225.356/counsel-autoloads.el → .emacs.d/elpa/counsel-20170328.737/counsel-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "counsel" "counsel.el" (22712 4604 919647 574000))
+;;;### (autoloads nil "counsel" "counsel.el" (22753 9103 984317 272000))
;;; Generated autoloads from counsel.el
(autoload 'counsel-el "counsel" "\
@@ -279,6 +279,11 @@ Choose from headers of `org-mode' files in the agenda.
\(fn)" t nil)
+(autoload 'counsel-irony "counsel" "\
+Inline C/C++ completion using Irony.
+
+\(fn)" t nil)
+
(defvar counsel-mode nil "\
Non-nil if Counsel mode is enabled.
See the `counsel-mode' command
.emacs.d/elpa/counsel-20170225.356/counsel-pkg.el → .emacs.d/elpa/counsel-20170328.737/counsel-pkg.el
@@ -1,2 +1,2 @@
;;; -*- no-byte-compile: t -*-
-(define-package "counsel" "20170225.356" "Various completion functions using Ivy" '((emacs "24.3") (swiper "0.8.0")) :url "https://github.com/abo-abo/swiper" :keywords '("completion" "matching"))
+(define-package "counsel" "20170328.737" "Various completion functions using Ivy" '((emacs "24.3") (swiper "0.8.0")) :url "https://github.com/abo-abo/swiper" :keywords '("completion" "matching"))
.emacs.d/elpa/counsel-20170225.356/counsel.el → .emacs.d/elpa/counsel-20170328.737/counsel.el
@@ -4,7 +4,7 @@
;; Author: Oleh Krehel <ohwoeowho@gmail.com>
;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170225.356
+;; Package-Version: 20170328.737
;; Version: 0.8.0
;; Package-Requires: ((emacs "24.3") (swiper "0.8.0"))
;; Keywords: completion, matching
@@ -161,9 +161,10 @@ Or the time of the last minibuffer update.")
(unless (stringp re)
(setq re (caar re)))
(if (null ivy--old-cands)
- (unless (setq ivy--index (ivy--preselect-index
- (ivy-state-preselect ivy-last)
- ivy--all-candidates))
+ (unless (ivy-set-index
+ (ivy--preselect-index
+ (ivy-state-preselect ivy-last)
+ ivy--all-candidates))
(ivy--recompute-index
ivy-text re ivy--all-candidates))
(ivy--recompute-index
@@ -1251,7 +1252,7 @@ When REVERT is non-nil, regenerate the current *ivy-occur* buffer."
(defun counsel-git-grep-recenter ()
(interactive)
(with-ivy-window
- (counsel-git-grep-action ivy--current)
+ (counsel-git-grep-action (ivy-state-current ivy-last))
(recenter-top-bottom)))
;;** `counsel-git-stash'
@@ -1849,7 +1850,7 @@ RG-PROMPT, if non-nil, is passed as `ivy-read' prompt argument. "
cands))))
;;** `counsel-grep'
-(defcustom counsel-grep-base-command "grep -nE \"%s\" %s"
+(defcustom counsel-grep-base-command "grep -nE '%s' %s"
"Format string to use in `cousel-grep-function' to construct
the command."
:type 'string
@@ -1942,7 +1943,7 @@ the command."
(line-end-position))))
:history 'counsel-git-grep-history
:update-fn (lambda ()
- (counsel-grep-action ivy--current))
+ (counsel-grep-action (ivy-state-current ivy-last)))
:re-builder #'ivy--regex
:action #'counsel-grep-action
:unwind (lambda ()
@@ -2809,13 +2810,15 @@ midpoint, then the chosen color is black, otherwise is white. This
helps to improve the contrast and readability of a text regardless of
the background color."
(let ((rgb (color-name-to-rgb color)))
- (if (>
- (+ (* (nth 0 rgb) 0.299)
- (* (nth 1 rgb) 0.587)
- (* (nth 2 rgb) 0.114))
- 0.5)
- "#000000"
- "#FFFFFF")))
+ (if rgb
+ (if (>
+ (+ (* (nth 0 rgb) 0.299)
+ (* (nth 1 rgb) 0.587)
+ (* (nth 2 rgb) 0.114))
+ 0.5)
+ "#000000"
+ "#FFFFFF")
+ color)))
(defun counsel-colors--update-highlight (cand)
"Update the highlight face for the current candidate CAND.
@@ -2899,7 +2902,7 @@ selected candidate."
(list-colors-duplicates))
:require-match t
:update-fn (lambda ()
- (counsel-colors--update-highlight ivy--current))
+ (counsel-colors--update-highlight (ivy-state-current ivy-last)))
:action #'counsel-colors-action-insert-name
:history 'counsel-colors-emacs-history
:caller 'counsel-colors-emacs
@@ -3087,7 +3090,7 @@ selected candidate."
:require-match t
:action #'counsel-colors-action-insert-name
:update-fn (lambda ()
- (counsel-colors--update-highlight ivy--current))
+ (counsel-colors--update-highlight (ivy-state-current ivy-last)))
:history 'counsel-colors-web-history
:caller 'counsel-colors-web
:sort t)))
@@ -3238,7 +3241,40 @@ candidate."
:history 'counsel-org-agenda-headlines-history
:caller 'counsel-org-agenda-headlines)))
-;** `counsel-mode'
+;;** `counsel-irony'
+;;;###autoload
+(defun counsel-irony ()
+ "Inline C/C++ completion using Irony."
+ (interactive)
+ (irony-completion-candidates-async 'counsel-irony-callback))
+
+(defun counsel-irony-callback ()
+ (interactive)
+ (let ((coll (irony-completion-at-point)))
+ (when coll
+ (setq ivy-completion-beg (nth 0 coll))
+ (setq ivy-completion-end (nth 1 coll))
+ (ivy-read "code: " (mapcar #'counsel-irony-annotate
+ (nth 2 coll))
+ :caller 'counsel-irony
+ :action 'ivy-completion-in-region-action))))
+
+(defun counsel-irony-annotate (x)
+ (cons
+ (condition-case nil
+ (concat
+ x " "
+ (irony-completion--at-point-annotate x))
+ (error x))
+ x))
+
+(add-to-list 'ivy-display-functions-alist '(counsel-irony . ivy-display-function-overlay))
+
+(declare-function irony-completion-candidates-async "ext:irony-completion")
+(declare-function irony-completion-at-point "ext:irony-completion")
+(declare-function irony-completion--at-point-annotate "ext:irony-completion")
+
+;;** `counsel-mode'
(defvar counsel-mode-map
(let ((map (make-sparse-keymap)))
(dolist (binding
.emacs.d/elpa/counsel-20170225.356/counsel.elc → .emacs.d/elpa/counsel-20170328.737/counsel.elc
Binary file
.emacs.d/elpa/dired+-20170221.1620/dired+-autoloads.el → .emacs.d/elpa/dired+-20170330.1047/dired+-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "dired+" "dired+.el" (22712 4596 210705 402000))
+;;;### (autoloads nil "dired+" "dired+.el" (22753 9102 854334 279000))
;;; Generated autoloads from dired+.el
(defvar diff-switches "-c" "\
@@ -182,7 +182,8 @@ Note:
(autoload 'diredp-dired-for-files "dired+" "\
Dired file names that you enter, in a Dired buffer that you name.
You are prompted for the name of the Dired buffer to use.
-You are then prompted for names of files and directories to list.
+You are then prompted for names of files and directories to list,
+ which can be located anywhere.
Use `C-g' when you are done.
With a prefix arg you are first prompted for the `ls' switches to use.
@@ -192,7 +193,7 @@ See also `dired' (including the advice).
\(fn ARG &optional SWITCHES)" t nil)
(autoload 'diredp-dired-for-files-other-window "dired+" "\
-Same as `diredp-dired-for-files' except uses another window.
+Same as `diredp-dired-for-files', except uses another window.
\(fn ARG &optional SWITCHES)" t nil)
@@ -282,6 +283,11 @@ From Lisp:
\(fn DIRED-NAME DIRBUFS &optional SWITCHES EXTRA)" t nil)
+(autoload 'diredp-dired-union-other-window "dired+" "\
+Same as `diredp-dired-union', except use other window.
+
+\(fn DIRED-NAME DIRBUFS &optional SWITCHES EXTRA)" t nil)
+
(autoload 'diredp-add-to-dired-buffer "dired+" "\
Add individual file and directory names to a Dired buffer.
You are prompted for the buffer name.
@@ -306,6 +312,11 @@ From Lisp:
\(fn DIRED-NAME TO-ADD &optional SWITCHES)" t nil)
+(autoload 'diredp-add-to-dired-buffer-other-window "dired+" "\
+Same as `diredp-add-to-dired-buffer', except use other window.
+
+\(fn DIRED-NAME TO-ADD &optional SWITCHES)" t nil)
+
(autoload 'diredp-add-to-this-dired-buffer "dired+" "\
Same as `diredp-add-to-dired-buffer' for this Dired buffer.
@@ -336,6 +347,7 @@ With a prefix arg:
(autoload 'diredp-dired-inserted-subdirs "dired+" "\
Open Dired for each of the subdirs inserted in this Dired buffer.
+A separate Dired buffer is used for each of them.
With a prefix arg, create the Dired buffers but do not display them.
Markings and current Dired switches are preserved.
.emacs.d/elpa/dired+-20170221.1620/dired+-pkg.el → .emacs.d/elpa/dired+-20170330.1047/dired+-pkg.el
@@ -1,2 +1,2 @@
;;; -*- no-byte-compile: t -*-
-(define-package "dired+" "20170221.1620" "Extensions to Dired." 'nil :url "https://www.emacswiki.org/emacs/download/dired%2b.el" :keywords '("unix" "mouse" "directories" "diredp" "dired"))
+(define-package "dired+" "20170330.1047" "Extensions to Dired." 'nil :url "https://www.emacswiki.org/emacs/download/dired%2b.el" :keywords '("unix" "mouse" "directories" "diredp" "dired"))
.emacs.d/elpa/dired+-20170221.1620/dired+.el → .emacs.d/elpa/dired+-20170330.1047/dired+.el
@@ -7,11 +7,11 @@
;; Copyright (C) 1999-2017, Drew Adams, all rights reserved.
;; Created: Fri Mar 19 15:58:58 1999
;; Version: 2013.07.23
-;; Package-Version: 20170221.1620
+;; Package-Version: 20170330.1047
;; Package-Requires: ()
-;; Last-Updated: Tue Feb 21 16:21:00 2017 (-0800)
+;; Last-Updated: Thu Mar 30 10:47:25 2017 (-0700)
;; By: dradams
-;; Update #: 9774
+;; Update #: 9907
;; URL: https://www.emacswiki.org/emacs/download/dired%2b.el
;; Doc URL: http://www.emacswiki.org/DiredPlus
;; Keywords: unix, mouse, directories, diredp, dired
@@ -258,15 +258,15 @@
;; `Dired+' adds commands for combining and augmenting Dired
;; listings:
;;
-;; * `diredp-add-to-dired-buffer', bound globally to `C-x E' ("E"
-;; for extra files), lets you add arbitrary file and directory
-;; names to an existing Dired buffer.
+;; * `diredp-add-to-dired-buffer', bound globally to `C-x D A', lets
+;; you add arbitrary file and directory names to an existing Dired
+;; buffer.
;;
-;; * `diredp-dired-union', bound globally to `C-x D', lets you take
-;; the union of multiple Dired listings, or convert an ordinary
-;; Dired listing to an explicit list of absolute file names. With
-;; a non-positive prefix arg, you can add extra file and directory
-;; names, just as for `diredp-add-to-dired-buffer'.
+;; * `diredp-dired-union', bound globally to `C-x D U', lets you
+;; take the union of multiple Dired listings, or convert an
+;; ordinary Dired listing to an explicit list of absolute file
+;; names. With a non-positive prefix arg, you can add extra file
+;; and directory names, just as for `diredp-add-to-dired-buffer'.
;;
;; You can optionally add a header line to a Dired buffer using
;; toggle command `diredp-breadcrumbs-in-header-line-mode'. (A
@@ -656,6 +656,21 @@
;;
;;; Change Log:
;;
+;; 2017/03/30 dadams
+;; Moved key bindings to end of file. Moved defgroup before defcustoms.
+;; Bind dired-multiple-w32-browser to C-M-RET, diredp-multiple-w32-browser-recursive to M-+ C-M-RET.
+;; 2017/03/29 dadams
+;; Added: diredp-dired-union-other-window, diredp-add-to-dired-buffer-other-window.
+;; diredp-dired-union-1: Added optional arg OTHERWIN.
+;; diredp-dired-plus-description: Updated doc string.
+;; diredp-menu-bar-subdir-menu: Added diredp-dired-for-files.
+;; Bind diredp-w32-drives to :/, diredp-dired-inserted-subdirs to C-M-i.
+;; Bind diredp-add-to-dired-buffer to C-x D A (not C-x E), diredp-dired-union to C-x D U (not C-x D),
+;; diredp-fileset to C-x D S (not C-M-f), diredp-dired-recent-dirs to C-x D R (not C-x R),
+;; diredp-dired-for-files to C-x D F, plus other-window versions.
+;; 2017/03/24 dadams
+;; Added defalias for dired-read-regexp.
+;; diredp-mouse-3-menu: Removed second arg to mouse-save-then-kill.
;; 2017/02/20 dadams
;; diredp-(next|previous)-line, diredp-(next|prev)-dirline, diredp-(next|prev)-subdir:
;; Update interactive spec to use (in effect) ^p for prefix arg (for shift-select-mode).
@@ -1608,6 +1623,7 @@ rather than FUN itself, to `minibuffer-setup-hook'."
(defvar dired-details-state) ; In `dired-details+.el'
(defvar dired-keep-marker-hardlink) ; In `dired-x.el'
(defvar dired-recursive-deletes) ; In `dired.el', Emacs 22+
+(defvar dired-shrink-to-fit) ; In `dired.el'
(defvar dired-switches-alist) ; In `dired.el'
(defvar dired-subdir-switches) ; In `dired.el'
(defvar dired-touch-program) ; Emacs 22+
@@ -1616,11 +1632,14 @@ rather than FUN itself, to `minibuffer-setup-hook'."
(defvar diredp-hide-details-last-state) ; Here, Emacs 24.4+
(defvar diredp-hide-details-propagate-flag) ; Here, Emacs 24.4+
(defvar diredp-hide-details-toggled) ; Here, Emacs 24.4+
+(defvar diredp-highlight-autofiles-mode) ; Here, Emacs 22+
(defvar diredp-menu-bar-immediate-bookmarks-menu) ; Here, if Bookmark+ is available
(defvar filesets-data) ; In `filesets.el'
(defvar grep-use-null-device) ; In `grep.el'
(defvar header-line-format) ; Emacs 22+
(defvar icicle-file-sort) ; In `icicles-opt.el'
+(defvar icicle-file-sort-first-time-p) ; In `icicles-var.el'
+(defvar icicle-files-ido-like-flag) ; In `icicles-opt.el'
(defvar icicle-ignored-directories) ; In `icicles-opt.el'
(defvar icicle-sort-comparer) ; In `icicles-opt.el'
(defvar image-dired-display-image-buffer) ; In `image-dired.el'
@@ -1630,6 +1649,7 @@ rather than FUN itself, to `minibuffer-setup-hook'."
(defvar image-dired-thumb-height) ; In `image-dired.el'
(defvar image-dired-thumb-width) ; In `image-dired.el'
(defvar image-dired-widget-list) ; In `image-dired.el'
+(defvar ls-lisp-use-insert-directory-program) ; In `ls-lisp.el'
(defvar minibuffer-default-add-function) ; In `simple.el', Emacs 23+
(defvar mouse3-dired-function) ; In `mouse3.el'
(defvar read-file-name-completion-ignore-case) ; In `minibuffer.el', Emacs 23+. In C code, Emacs 22.
@@ -1638,8 +1658,23 @@ rather than FUN itself, to `minibuffer-setup-hook'."
(defvar vc-directory-exclusion-list) ; In `vc'
(defvar w32-browser-wait-time) ; In `w32-browser.el'
-
;;;;;;;;;;;;;;;;;;;;;;;
+
+(defgroup Dired-Plus nil
+ "Various enhancements to Dired."
+ :prefix "diredp-" :group 'dired
+ :link `(url-link :tag "Send Bug Report"
+ ,(concat "mailto:" "drew.adams" "@" "oracle" ".com?subject=\
+dired+.el bug: \
+&body=Describe bug here, starting with `emacs -q'. \
+Don't forget to mention your Emacs and library versions."))
+ :link '(url-link :tag "Other Libraries by Drew"
+ "http://www.emacswiki.org/DrewsElispLibraries")
+ :link '(url-link :tag "Download"
+ "http://www.emacswiki.org/dired+.el")
+ :link '(url-link :tag "Description"
+ "http://www.emacswiki.org/DiredPlus")
+ :link '(emacs-commentary-link :tag "Commentary" "dired+"))
;;; Variables
@@ -2062,6 +2097,9 @@ Uses the `derived-mode-parent' property of the symbol to trace backwards."
"Return non-nil if FILE is not a directory."
(not (file-directory-p file))))
+(when (and (fboundp 'read-regexp) (not (fboundp 'dired-read-regexp))) ; Only deprecated, for now.
+ (defalias 'dired-read-regexp 'read-regexp))
+
;;; Some of the redefinitions that follow are essentially unaltered vanilla Emacs code to be
;;; reloaded, to use the new definition of `dired-map-over-marks' here.
@@ -2882,1354 +2920,6 @@ Note:
(display-buffer image-dired-display-image-buffer)
(image-dired-display-image img-file (not arg))))
(message "No image file here")))) ; An error is handled by `diredp-get-image-filename'.
-
-
-;;; Key Bindings.
-
-
-;; Menu Bar.
-;; New order is (left -> right):
-;;
-;; Dir Regexp Mark Multiple Single
-
-;; Get rid of menu bar predefined in `dired.el'.
-(define-key dired-mode-map [menu-bar] nil)
-;; Get rid of Edit menu bar menu to save space.
-(define-key dired-mode-map [menu-bar edit] 'undefined)
-
-
-;; `Single' menu.
-;;
-;; REPLACE ORIGINAL `Immediate' menu in `dired.el'.
-;;
-(defvar diredp-menu-bar-immediate-menu (make-sparse-keymap "Single"))
-(define-key dired-mode-map [menu-bar immediate] (cons "Single" diredp-menu-bar-immediate-menu))
-
-(if (fboundp 'diredp-describe-file)
- (define-key diredp-menu-bar-immediate-menu [diredp-describe-file]
- '(menu-item "Describe" diredp-describe-file
- :help "Describe the file or directory at cursor"))
- (define-key diredp-menu-bar-immediate-menu [diredp-describe-autofile]
- '(menu-item "Describe" diredp-describe-autofile
- :help "Describe the autofile at cursor"
- :enable (featurep 'bookmark+))))
-(define-key diredp-menu-bar-immediate-menu [separator-describe] '("--")) ; ---------------------
-
-(when (fboundp 'diredp-chown-this-file)
- (define-key diredp-menu-bar-immediate-menu [chown]
- '(menu-item "Change Owner..." diredp-chown-this-file
- :help "Change the owner of file at cursor")))
-(when (fboundp 'diredp-chgrp-this-file)
- (define-key diredp-menu-bar-immediate-menu [chgrp]
- '(menu-item "Change Group..." diredp-chgrp-this-file
- :help "Change the group of file at cursor")))
-(define-key diredp-menu-bar-immediate-menu [chmod]
- '(menu-item "Change Mode..." diredp-chmod-this-file
- :help "Change mode (attributes) of file at cursor"))
-(when (fboundp 'dired-do-touch) ; Emacs 22+
- (define-key diredp-menu-bar-immediate-menu [touch]
- '(menu-item "Change Timestamp (`touch')..." diredp-touch-this-file
- :help "Change the timestamp of file at cursor, using `touch'")))
-(define-key diredp-menu-bar-immediate-menu [separator-change] '("--")) ; -----------------------
-
-(define-key diredp-menu-bar-immediate-menu [load]
- '(menu-item "Load" diredp-load-this-file
- :help "Load this Emacs Lisp file"))
-(define-key diredp-menu-bar-immediate-menu [compile]
- '(menu-item "Byte Compile" diredp-byte-compile-this-file
- :help "Byte-compile this Emacs Lisp file"))
-(define-key diredp-menu-bar-immediate-menu [diredp-async-shell-command-this-file]
- '(menu-item "Asynchronous Shell Command..." diredp-async-shell-command-this-file
- :help "Run a shell command asynchronously on file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [command]
- '(menu-item "Shell Command..." diredp-shell-command-this-file
- :help "Run a shell command on file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [compress]
- '(menu-item "Compress/Uncompress" diredp-compress-this-file
- :help "Compress/uncompress file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [grep]
- '(menu-item "Grep..." diredp-grep-this-file :help "Grep file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [print]
- '(menu-item "Print..." diredp-print-this-file
- :help "Print file at cursor, supplying print command"))
-
-(when (fboundp 'mkhtml-dired-files) ; In `mkhtml.el'.
- (define-key diredp-menu-bar-immediate-menu [mkhtml-dired-files]
- '(menu-item "Create HTML" mkhtml-dired-files
- :help "Create an HTML file corresponding to file at cursor")))
-(define-key diredp-menu-bar-immediate-menu [separator-misc] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-immediate-menu [delete]
- '(menu-item "Delete" diredp-delete-this-file :help "Delete file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [separator-delete] '("--")) ; -----------------------
-
-(define-key diredp-menu-bar-immediate-menu [hardlink]
- '(menu-item "Hardlink to..." diredp-hardlink-this-file
- :help "Make hard links for current or marked files"))
-(if (not (fboundp 'dired-do-relsymlink))
- (define-key diredp-menu-bar-immediate-menu [symlink]
- '(menu-item "Symlink to..." diredp-symlink-this-file
- :visible (fboundp 'make-symbolic-link) :help "Make symbolic link for file at cursor"))
- (define-key diredp-menu-bar-immediate-menu [symlink]
- '(menu-item "Symlink to (Absolute)..." diredp-symlink-this-file
- :help "Make absolute symbolic link for file at cursor"))
- (define-key diredp-menu-bar-immediate-menu [relsymlink]
- '(menu-item "Symlink to (Relative)..." diredp-relsymlink-this-file ; In `dired-x.el'.
- :help "Make relative symbolic link for file at cursor")))
-(define-key diredp-menu-bar-immediate-menu [copy]
- '(menu-item "Copy to..." diredp-copy-this-file :help "Copy file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [rename]
- '(menu-item "Move to..." diredp-rename-this-file
- :help "Rename file at cursor, or move it to a different directory"))
-(define-key diredp-menu-bar-immediate-menu [separator-link] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-immediate-menu [downcase]
- '(menu-item "Downcase" diredp-downcase-this-file
- ;; When running on plain MS-DOS, there is only one letter-case for file names.
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Rename file at cursor to a lower-case name"))
-(define-key diredp-menu-bar-immediate-menu [upcase]
- '(menu-item "Upcase" diredp-upcase-this-file
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Rename file at cursor to an upper-case name"))
-(define-key diredp-menu-bar-immediate-menu [capitalize]
- '(menu-item "Capitalize" diredp-capitalize-this-file
- :help "Capitalize (initial caps) name of file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [separator-rename] '("--")) ; -----------------------
-
-(define-key diredp-menu-bar-immediate-menu [backup-diff]
- '(menu-item "Diff with Backup" dired-backup-diff
- :help "Diff file at cursor with its latest backup"))
-(define-key diredp-menu-bar-immediate-menu [diff]
- '(menu-item "Diff..." dired-diff
- :help "Compare file at cursor with another file using `diff'"))
-(define-key diredp-menu-bar-immediate-menu [ediff]
- '(menu-item "Compare..." diredp-ediff :help "Compare file at cursor with another file"))
-(define-key diredp-menu-bar-immediate-menu [separator-diff] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-immediate-menu [diredp-kill-this-tree]
- '(menu-item "Remove This Inserted Subdir and Lower" diredp-kill-this-tree
- :visible (and (fboundp 'diredp-kill-this-tree)
- (not (equal
- (expand-file-name (dired-current-directory))
- (expand-file-name default-directory)))))) ; In subdir, not top.
-(define-key diredp-menu-bar-immediate-menu [dired-kill-subdir]
- '(menu-item "Remove This Inserted Subdir" dired-kill-subdir
- :visible (not (equal (expand-file-name (dired-current-directory))
- (expand-file-name default-directory))))) ; In subdir, not top.
-(define-key diredp-menu-bar-immediate-menu [diredp-dired-this-subdir]
- '(menu-item "Dired This Inserted Subdir (Tear Off)"
- (lambda () (interactive) (diredp-dired-this-subdir t))
- :visible (and (cdr dired-subdir-alist) ; First is current dir. Must have at least one more.
- (not (equal (expand-file-name (dired-current-directory))
- (expand-file-name default-directory)))) ; Must be sub, not top.
- :help "Open Dired for subdir at or above point, tearing it off if inserted"))
-(define-key diredp-menu-bar-immediate-menu [insert-subdir]
- '(menu-item "Insert This Subdir" dired-maybe-insert-subdir
- :visible (and (atom (diredp-this-subdir))
- (not (assoc (file-name-as-directory (diredp-this-subdir)) dired-subdir-alist)))
- :enable (atom (diredp-this-subdir))
- :help "Insert a listing of this subdirectory"))
-(define-key diredp-menu-bar-immediate-menu [goto-subdir]
- '(menu-item "Go To Inserted Subdir" dired-maybe-insert-subdir
- :visible (and (atom (diredp-this-subdir))
- (assoc (file-name-as-directory (diredp-this-subdir)) dired-subdir-alist))
- :enable (atom (diredp-this-subdir))
- :help "Go to the inserted listing of this subdirectory"))
-(define-key diredp-menu-bar-immediate-menu [separator-subdir] '("--" ; ------------------------
- :visible (or (atom (diredp-this-subdir)) ; Subdir line.
- (not (equal (expand-file-name (dired-current-directory))
- (expand-file-name default-directory)))))) ; Not top.
-
-(define-key diredp-menu-bar-immediate-menu [view]
- '(menu-item "View (Read Only)" dired-view-file
- :help "Examine file at cursor in read-only mode"))
-(define-key diredp-menu-bar-immediate-menu [display]
- '(menu-item "Display in Other Window" dired-display-file
- :help "Display file at cursor in a different window"))
-;; On Windows, bind more.
-(eval-after-load "w32-browser"
- '(progn
- (define-key diredp-menu-bar-immediate-menu [dired-w32-browser]
- '(menu-item "Open Associated Windows App" dired-w32-browser
- :help "Open file using the Windows app associated with its file type"))
- (define-key diredp-menu-bar-immediate-menu [dired-w32explore]
- '(menu-item "Open in Windows Explorer" dired-w32explore
- :help "Open file in Windows Explorer"))))
-(define-key diredp-menu-bar-immediate-menu [find-file-other-frame]
- '(menu-item "Open in Other Frame" diredp-find-file-other-frame
- :help "Edit file at cursor in a different frame"))
-(define-key diredp-menu-bar-immediate-menu [find-file-other-window]
- '(menu-item "Open in Other Window" dired-find-file-other-window
- :help "Edit file at cursor in a different window"))
-(define-key diredp-menu-bar-immediate-menu [find-file]
- '(menu-item "Open" dired-find-file :help "Edit file at cursor"))
-
-
-;; `Single' > `Image' menu.
-;;
-(defvar diredp-menu-bar-immediate-image-menu (make-sparse-keymap "Image"))
-(defalias 'diredp-menu-bar-immediate-image-menu diredp-menu-bar-immediate-image-menu)
-(define-key diredp-menu-bar-immediate-menu [image]
- '(menu-item "Image" diredp-menu-bar-immediate-image-menu
- :enable (let ((img-file (diredp-get-image-filename 'LOCALP 'NO-ERROR)))
- (and (fboundp 'image-dired-dired-display-image) img-file))))
-
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-display-thumb]
- '(menu-item "Go To Thumbnail" diredp-image-dired-display-thumb
- :help "Pop to buffer showing the thumbnail of this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-create-thumb]
- '(menu-item "Create Thumbnail" diredp-image-dired-create-thumb
- :help "Create a thumbnail image for this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-edit-comment-and-tags]
- '(menu-item "Edit Comment and Tags..." diredp-image-dired-edit-comment-and-tags
- :help "Edit comment and tags for this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-delete-tag]
- '(menu-item "Delete Image Tag..." diredp-image-dired-delete-tag
- :help "Remove an `image-dired' tag from this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-tag-file]
- '(menu-item "Add Tags..." diredp-image-dired-tag-file
- :help "Add tags to this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-comment-file]
- '(menu-item "Add Comment..." diredp-image-dired-comment-file
- :help "Add a comment to this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-copy-with-exif-name]
- '(menu-item "Copy with EXIF Name" diredp-image-dired-copy-with-exif-name
- :help "Copy this image file to main image dir using EXIF name"))
-(define-key diredp-menu-bar-immediate-image-menu [image-dired-dired-display-external]
- '(menu-item "Display Externally" image-dired-dired-display-external
- :help "Display image using external viewer"))
-(define-key diredp-menu-bar-immediate-image-menu [image-dired-dired-display-image]
- '(menu-item "Display to Fit Other Window" image-dired-dired-display-image
- :help "Display scaled image to fit a separate window"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-show-this-file]
- '(menu-item "Display Full Size Or Smaller" diredp-image-show-this-file
- :help "Display image full size or at least prefix-arg lines high"))
-(define-key diredp-menu-bar-immediate-image-menu [dired-find-file]
- '(menu-item "Display Full Size" dired-find-file
- :help "Display image full size"))
-
-
-;; `Single' > `Encryption' menu.
-;;
-(when (fboundp 'epa-dired-do-encrypt) ; Emacs 23+
- (defvar diredp-menu-bar-immediate-encryption-menu (make-sparse-keymap "Encryption"))
- (define-key diredp-menu-bar-immediate-menu [encryption]
- (cons "Encryption" diredp-menu-bar-immediate-encryption-menu))
-
- (define-key diredp-menu-bar-immediate-encryption-menu [diredp-decrypt-this-file]
- '(menu-item "Decrypt..." (lambda ()
- (interactive)
- (epa-decrypt-file (expand-file-name (dired-get-filename
- nil 'NO-ERROR-P))))
- :help "Decrypt this file"))
- (define-key diredp-menu-bar-immediate-encryption-menu [diredp-verify-this-file]
- '(menu-item "Verify..." (lambda ()
- (interactive)
- (epa-verify-file (expand-file-name (dired-get-filename
- nil 'NO-ERROR-P))))
- :help "Verify this file"))
- (define-key diredp-menu-bar-immediate-encryption-menu [diredp-sign-this-file]
- '(menu-item "Sign..." (lambda ()
- (interactive)
- (epa-sign-file (expand-file-name (dired-get-filename
- nil 'NO-ERROR-P))
- (epa-select-keys (epg-make-context)
- "Select keys for signing.
-If no one is selected, default secret key is used. "
- nil t)))
- :help "Encrypt this file"))
- (define-key diredp-menu-bar-immediate-encryption-menu [diredp-encrypt-this-file]
- '(menu-item "Encrypt..." (lambda ()
- (interactive)
- (epa-encrypt-file (expand-file-name (dired-get-filename
- nil 'NO-ERROR-P))
- (epa-select-keys
- (epg-make-context)
- "Select recipients for encryption.
-If no one is selected, symmetric encryption will be performed. "
- nil t)))
- :help "Sign this file")))
-
-
-;; `Single' > `Bookmark' menu.
-;;
-(when (require 'bookmark+ nil t)
- (defvar diredp-menu-bar-immediate-bookmarks-menu (make-sparse-keymap "Bookmark"))
- (define-key diredp-menu-bar-immediate-menu [bookmark]
- (cons "Bookmark" diredp-menu-bar-immediate-bookmarks-menu))
-
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-set-tag-value-this-file]
- '(menu-item "Set Tag Value..." diredp-set-tag-value-this-file
- :help "Set the value (not the name) of a given tag for this file"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-paste-replace-tags-this-file]
- '(menu-item "Paste Tags (Replace)" diredp-paste-replace-tags-this-file
- :help "Replace tags for this file with previously copied tags"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-paste-add-tags-this-file]
- '(menu-item "Paste Tags (Add)" diredp-paste-add-tags-this-file
- :help "Add previously copied tags to this file"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-copy-tags-this-file]
- '(menu-item "Copy Tags" diredp-copy-tags-this-file
- :help "Copy the tags from this file, so you can paste them to another"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-remove-all-tags-this-file]
- '(menu-item "Remove All Tags" diredp-remove-all-tags-this-file
- :help "Remove all tags from the file at cursor"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-untag-this-file]
- '(menu-item "Remove Tags..." diredp-untag-this-file
- :help "Remove some tags from the file at cursor (`C-u': remove all tags)"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-tag-this-file]
- '(menu-item "Add Tags..." diredp-tag-this-file :help "Add some tags to the file at cursor"))
- (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-bookmark-this-file]
- '(menu-item "Bookmark..." diredp-bookmark-this-file
- :help "Bookmark the file at cursor (create/set autofile)")))
-
-
-;; `Multiple' menu.
-;;
-;; REPLACE ORIGINAL "Operate" menu in `dired.el'.
-;;
-(defvar diredp-menu-bar-operate-menu (make-sparse-keymap "Multiple"))
-(define-key dired-mode-map [menu-bar operate] (cons "Multiple" diredp-menu-bar-operate-menu))
-
-(define-key diredp-menu-bar-operate-menu [diredp-describe-marked-autofiles]
- '(menu-item "Describe Marked Autofiles" diredp-describe-marked-autofiles
- :help "Show the metadata for the marked files that are autofiles"
- :enable (featurep 'bookmark+)))
-(define-key diredp-menu-bar-operate-menu [separator-describe] '("--")) ; -----------------------
-
-(unless (memq system-type '(windows-nt ms-dos))
- (define-key diredp-menu-bar-operate-menu [chown]
- '(menu-item "Change Owner..." dired-do-chown
- :help "Change the owner of marked files")))
-(unless (memq system-type '(windows-nt ms-dos))
- (define-key diredp-menu-bar-operate-menu [chgrp]
- '(menu-item "Change Group..." dired-do-chgrp
- :help "Change the owner of marked files")))
-(define-key diredp-menu-bar-operate-menu [chmod]
- '(menu-item "Change Mode..." dired-do-chmod
- :help "Change mode (attributes) of marked files"))
-(when (fboundp 'dired-do-touch) ; Emacs 22+
- (define-key diredp-menu-bar-operate-menu [touch]
- '(menu-item "Change Timestamp (`touch')..." dired-do-touch
- :help "Change the timestamp of the marked files, using `touch'")))
-(define-key diredp-menu-bar-operate-menu [separator-change] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-operate-menu [load]
- '(menu-item "Load" dired-do-load :help "Load marked Emacs Lisp files"))
-(define-key diredp-menu-bar-operate-menu [compile]
- '(menu-item "Byte Compile" dired-do-byte-compile :help "Byte-compile marked Emacs Lisp files"))
-(when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
- (define-key diredp-menu-bar-operate-menu [async-command]
- '(menu-item "Asynchronous Shell Command..." dired-do-async-shell-command
- :help "Run a shell command asynchronously on each marked file")))
-(define-key diredp-menu-bar-operate-menu [command]
- '(menu-item "Shell Command..." dired-do-shell-command
- :help "Run a shell command on each marked file"))
-(when (fboundp 'dired-do-compress-to)
- (define-key diredp-menu-bar-operate-menu [compress-to]
- '(menu-item "Compress to..." dired-do-compress-to
- :help "Compress marked files and dirs together, in the same archive")))
-(define-key diredp-menu-bar-operate-menu [compress]
- '(menu-item "Compress/Uncompress" dired-do-compress :help "Compress/uncompress marked files"))
-(define-key diredp-menu-bar-operate-menu [diredp-do-apply-function]
- '(menu-item "Apply Lisp Function..." diredp-do-apply-function
- :help "Apply a Lisp function to each marked file name (`C-u': file contents, not name)"))
-(define-key diredp-menu-bar-operate-menu [print]
- '(menu-item "Print..." dired-do-print :help "Print marked files, supplying print command"))
-
-(unless (require 'bookmark+ nil t)
- (define-key diredp-menu-bar-immediate-menu [diredp-bookmark-this-file]
- '(menu-item "Bookmark..." diredp-bookmark-this-file :help "Bookmark the file at cursor")))
-(when (fboundp 'mkhtml-dired-files) ; In `mkhtml.el'.
- (define-key diredp-menu-bar-operate-menu [mkhtml-dired-files]
- '(menu-item "Create HTML" mkhtml-dired-files
- :help "Create HTML files corresponding to marked files")))
-(define-key diredp-menu-bar-operate-menu [separator-misc] '("--")) ; ---------------------------
-
-(define-key diredp-menu-bar-operate-menu [delete-flagged]
- '(menu-item "Delete Flagged" dired-do-flagged-delete
- :help "Delete all files flagged for deletion (D)"))
-(define-key diredp-menu-bar-operate-menu [delete]
- '(menu-item "Delete Marked (not Flagged)" dired-do-delete
- :help "Delete current file or all marked files (not flagged files)"))
-(define-key diredp-menu-bar-operate-menu [separator-delete] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-operate-menu [hardlink]
- '(menu-item "Hardlink to..." dired-do-hardlink
- :help "Make hard links for current or marked files"))
-(if (not (fboundp 'dired-do-relsymlink))
- (define-key diredp-menu-bar-operate-menu [symlink]
- '(menu-item "Symlink to..." dired-do-symlink
- :visible (fboundp 'make-symbolic-link)
- :help "Make symbolic links for current or marked files"))
- (define-key diredp-menu-bar-operate-menu [symlink]
- '(menu-item "Symlink to (Absolute)..." dired-do-symlink
- :help "Make absolute symbolic links for current or marked files"))
- (define-key diredp-menu-bar-operate-menu [relsymlink] ; In `dired-x.el'.
- '(menu-item "Symlink to (Relative)..." dired-do-relsymlink
- :help "Make relative symbolic links for current or marked files")))
-(define-key diredp-menu-bar-operate-menu [copy]
- '(menu-item "Copy to..." dired-do-copy :help "Copy current file or all marked files"))
-(define-key diredp-menu-bar-operate-menu [rename]
- '(menu-item "Move to..." dired-do-rename :help "Rename current file or move marked files"))
-(define-key diredp-menu-bar-operate-menu [separator-rename] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-operate-menu [capitalize]
- '(menu-item "Capitalize" diredp-capitalize
- :help "Capitalize (initial caps) the names of all marked files"))
-(define-key diredp-menu-bar-operate-menu [downcase]
- '(menu-item "Downcase" dired-downcase
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Rename marked files to lowercase names"))
-(define-key diredp-menu-bar-operate-menu [upcase]
- '(menu-item "Upcase" dired-upcase
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Rename marked files to uppercase names"))
-(define-key diredp-menu-bar-operate-menu [separator-lettercase] '("--")) ; ---------------------
-
-(when (fboundp 'dired-copy-filename-as-kill)
- (define-key diredp-menu-bar-operate-menu [kill-ring]
- '(menu-item "Copy File Names (to Paste)" dired-copy-filename-as-kill
- :help "Copy names of marked files onto kill ring, for pasting")))
-(define-key diredp-menu-bar-operate-menu [diredp-list-marked]
- '(menu-item "List Marked Files" diredp-list-marked
- :help "List the files marked here (C-u C-u: all, C-u C-u C-u: all + dirs)"))
-(define-key diredp-menu-bar-operate-menu [diredp-insert-subdirs]
- '(menu-item "Insert Subdirs" diredp-insert-subdirs
- :help "Insert the marked subdirectories - like using `i' at each marked dir"))
-(define-key diredp-menu-bar-operate-menu [diredp-marked-other-window]
- '(menu-item "Dired (Marked) in Other Window" diredp-marked-other-window
- :enable (save-excursion (goto-char (point-min))
- (and (re-search-forward (dired-marker-regexp) nil t)
- (re-search-forward (dired-marker-regexp) nil t)))
- :help "Open Dired on marked files only, in other window"))
-(define-key diredp-menu-bar-operate-menu [diredp-marked]
- '(menu-item "Dired (Marked)" diredp-marked
- :enable (save-excursion (goto-char (point-min))
- (and (re-search-forward (dired-marker-regexp) nil t)
- (re-search-forward (dired-marker-regexp) nil t)))
- :help "Open Dired on marked files only"))
-;; On Windows, bind more.
-(eval-after-load "w32-browser"
- '(define-key diredp-menu-bar-operate-menu [dired-multiple-w32-browser]
- '(menu-item "Open Associated Windows Apps" dired-multiple-w32-browser
- :help "Open files using the Windows apps associated with their file types")))
-(when (fboundp 'dired-do-find-marked-files)
- (define-key diredp-menu-bar-operate-menu [find-files]
- '(menu-item "Open" dired-do-find-marked-files ; In `dired-x.el'.
- :help "Open each marked file for editing")))
-
-
-;; `Multiple' > `Images' menu.
-;;
-(defvar diredp-menu-bar-images-menu (make-sparse-keymap "Images"))
-(defalias 'diredp-menu-bar-images-menu diredp-menu-bar-images-menu)
-(define-key diredp-menu-bar-operate-menu [images]
- '(menu-item "Images" diredp-menu-bar-images-menu
- :enable (fboundp 'image-dired-display-thumbs)))
-
-;; Remove the items from `Multiple' menu.
-(define-key diredp-menu-bar-operate-menu [image-dired-delete-tag] nil)
-(define-key diredp-menu-bar-operate-menu [image-dired-tag-files] nil)
-(define-key diredp-menu-bar-operate-menu [image-dired-dired-comment-files] nil)
-(define-key diredp-menu-bar-operate-menu [image-dired-display-thumbs] nil)
-
-;; Add them to `Multiple' > `Images' menu.
-(define-key diredp-menu-bar-images-menu [image-dired-delete-tag]
- '(menu-item "Delete Tag..." image-dired-delete-tag
- :help "Delete tag from marked image files"))
-(define-key diredp-menu-bar-images-menu [image-dired-tag-files]
- '(menu-item "Add Tags..." image-dired-tag-files
- :help "Add tags to marked image files"))
-(define-key diredp-menu-bar-images-menu [image-dired-dired-comment-files]
- '(menu-item "Add Comment..." image-dired-dired-comment-files
- :help "Add comment to marked image files"))
-(define-key diredp-menu-bar-images-menu [image-dired-display-thumbs]
- '(menu-item "Display Thumbnails" image-dired-display-thumbs
- :help "Display thumbnails for marked image files"))
-(define-key diredp-menu-bar-images-menu [diredp-do-display-images]
- '(menu-item "Display" diredp-do-display-images
- :help "Display the marked image files"))
-
-
-;; `Multiple' > `Encryption' menu.
-;;
-(when (fboundp 'epa-dired-do-encrypt) ; Emacs 23+
- (defvar diredp-menu-bar-encryption-menu (make-sparse-keymap "Encryption"))
- (define-key diredp-menu-bar-operate-menu [encryption]
- (cons "Encryption" diredp-menu-bar-encryption-menu))
-
- ;; Remove the items from `Multiple' menu.
- (define-key diredp-menu-bar-operate-menu [epa-dired-do-decrypt] nil)
- (define-key diredp-menu-bar-operate-menu [epa-dired-do-verify] nil)
- (define-key diredp-menu-bar-operate-menu [epa-dired-do-sign] nil)
- (define-key diredp-menu-bar-operate-menu [epa-dired-do-encrypt] nil)
-
- ;; Add them to `Multiple' > `Encryption' menu.
- (define-key diredp-menu-bar-encryption-menu [epa-dired-do-decrypt]
- '(menu-item "Decrypt..." epa-dired-do-decrypt :help "Decrypt the marked files"))
- (define-key diredp-menu-bar-encryption-menu [epa-dired-do-verify]
- '(menu-item "Verify..." epa-dired-do-verify :help "Verify the marked files"))
- (define-key diredp-menu-bar-encryption-menu [epa-dired-do-sign]
- '(menu-item "Sign..." epa-dired-do-sign :help "Sign the marked files"))
- (define-key diredp-menu-bar-encryption-menu [epa-dired-do-encrypt]
- '(menu-item "Encrypt..." epa-dired-do-encrypt :help "Encrypt the marked files")))
-
-
-;; `Multiple' > `Search' menu.
-;;
-(defvar diredp-menu-bar-operate-search-menu (make-sparse-keymap "Search"))
-(define-key diredp-menu-bar-operate-menu [search]
- (cons "Search" diredp-menu-bar-operate-search-menu))
-(when (fboundp 'dired-do-isearch-regexp) ; Emacs 23+
- (define-key diredp-menu-bar-operate-search-menu [isearch-regexp]
- '(menu-item "Isearch Regexp Files..." dired-do-isearch-regexp
- :help "Incrementally search marked files for regexp"))
- (define-key diredp-menu-bar-operate-search-menu [isearch]
- '(menu-item "Isearch Files..." dired-do-isearch
- :help "Incrementally search marked files for string")))
-(when (fboundp 'dired-do-find-regexp-and-replace)
- (define-key diredp-menu-bar-operate-search-menu [find-query-replace]
- '(menu-item "Query Replace using `find'..." dired-do-find-regexp-and-replace
- :help "Replace regexp in marked files using `find'")))
-(define-key diredp-menu-bar-operate-search-menu [query-replace]
- (if (< emacs-major-version 21)
- '(menu-item "Query Replace..." dired-do-query-replace)
- '(menu-item "Query Replace..." dired-do-query-replace-regexp
- :help "Replace regexp in marked files")))
-(when (fboundp 'dired-do-find-regexp)
- (define-key diredp-menu-bar-operate-search-menu [find-regexp]
- '(menu-item "Search Files using `find'..." dired-do-find-regexp
- :help "Search marked files for regexp using `find'")))
-(define-key diredp-menu-bar-operate-search-menu [search]
- '(menu-item "Search Files..." dired-do-search :help "Search marked files for regexp"))
-(define-key diredp-menu-bar-operate-search-menu [grep]
- '(menu-item "Grep..." diredp-do-grep :help "Grep marked, next N, or all files shown"))
-
-
-;; `Multiple' > `Bookmark' menu.
-;;
-(defvar diredp-menu-bar-operate-bookmarks-menu (make-sparse-keymap "Bookmark"))
-(define-key diredp-menu-bar-operate-menu [bookmark]
- (cons "Bookmark" diredp-menu-bar-operate-bookmarks-menu))
-
-(when (require 'bookmark+ nil t)
- (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-set-tag-value]
- '(menu-item "Set Tag Value..." diredp-do-set-tag-value
- :help "Set the value of a given tag for the marked or next N files"))
- (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-paste-replace-tags]
- '(menu-item "Paste Tags (Replace)" diredp-do-paste-replace-tags
- :help "Replace tags for the marked or next N files with copied tags"))
- (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-paste-add-tags]
- '(menu-item "Paste Tags (Add)" diredp-do-paste-add-tags
- :help "Add previously copied tags to the marked or next N files"))
- (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-remove-all-tags]
- '(menu-item "Remove All Tags" diredp-do-remove-all-tags
- :help "Remove all tags from the marked or next N files"))
- (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-untag]
- '(menu-item "Remove Tags..." diredp-do-untag
- :help "Remove some tags from the marked or next N files"))
- (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-tag]
- '(menu-item "Add Tags..." diredp-do-tag
- :help "Add some tags to the marked or next N files"))
- (define-key diredp-menu-bar-operate-bookmarks-menu [separator-book-2] '("--"))) ; ------------
-
-(define-key diredp-menu-bar-operate-bookmarks-menu
- [diredp-do-bookmark-in-bookmark-file-recursive]
- '(menu-item "Bookmark in Bookmark File (Here and Below)..."
- diredp-do-bookmark-in-bookmark-file-recursive
- :help "Bookmark marked files (including in marked subdirs) in bookmark file and save it"))
-(define-key diredp-menu-bar-operate-bookmarks-menu
- [diredp-set-bookmark-file-bookmark-for-marked-recursive]
- '(menu-item "Create Bookmark-File Bookmark (Here and Below)..."
- diredp-set-bookmark-file-bookmark-for-marked-recursive
- :help "Create a bookmark-file bookmark for marked files, including in marked subdirs"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-dirs-recursive]
- '(menu-item "Bookmark Dirs (Here and Below)..." diredp-do-bookmark-dirs-recursive
- :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-recursive]
- '(menu-item "Bookmark (Here and Below)..." diredp-do-bookmark-recursive
- :help "Bookmark the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [separator-book-1] '("--")) ; ---------------
-
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-in-bookmark-file]
- '(menu-item "Bookmark in Bookmark File..." diredp-do-bookmark-in-bookmark-file
- :help "Bookmark the marked files in BOOKMARK-FILE and save BOOKMARK-FILE"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-set-bookmark-file-bookmark-for-marked]
- '(menu-item "Create Bookmark-File Bookmark..." diredp-set-bookmark-file-bookmark-for-marked
- :help "Create a bookmark-file bookmark, and bookmark the marked files in it"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark]
- '(menu-item "Bookmark..." diredp-do-bookmark :help "Bookmark the marked or next N files"))
-
-
-;; `Multiple' > `Marked Here and Below' menu.
-;;
-(defvar diredp-menu-bar-operate-recursive-menu (make-sparse-keymap "Marked Here and Below"))
-(define-key diredp-menu-bar-operate-menu [operate-recursive]
- (cons "Marked Here and Below" diredp-menu-bar-operate-recursive-menu))
-
-
-(when (fboundp 'diredp-do-chown-recursive)
- (define-key diredp-menu-bar-operate-recursive-menu [chown]
- '(menu-item "Change Owner..." diredp-do-chown-recursive
- :help "Change the owner of marked files, including those in marked subdirs")))
-(when (fboundp 'diredp-do-chgrp-recursive)
- (define-key diredp-menu-bar-operate-recursive-menu [chgrp]
- '(menu-item "Change Group..." diredp-do-chgrp-recursive
- :help "Change the owner of marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [chmod]
- '(menu-item "Change Mode..." diredp-do-chmod-recursive
- :help "Change mode (attributes) of marked files, including those in marked subdirs"))
-(when (fboundp 'dired-do-touch) ; Emacs 22+
- (define-key diredp-menu-bar-operate-recursive-menu [touch]
- '(menu-item "Change Timestamp (`touch')..." diredp-do-touch-recursive
- :help "Change timestamp of marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-change] '("--")) ; ----------------
-
-(when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
- (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-async-shell-command-recursive]
- '(menu-item "Asynchronous Shell Command..." diredp-do-async-shell-command-recursive
- :help "Run shell command asynchronously on marked files, including in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-shell-command-recursive]
- '(menu-item "Shell Command..." diredp-do-shell-command-recursive
- :help "Run shell command on the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-apply-function-recursive]
- '(menu-item "Apply Lisp Function..." diredp-do-apply-function-recursive
- :help "Apply a Lisp function to the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-print-recursive]
- '(menu-item "Print..." diredp-do-print-recursive
- :help "Print the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-misc] '("--")) ; ------------------
-
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-delete-recursive]
- '(menu-item "Delete Marked (not Flagged)" diredp-do-delete-recursive
- :help "Delete marked (not flagged) files, including in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-delete] '("--")) ; ----------------
-
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-hardlink-recursive]
- '(menu-item "Hardlink to..." diredp-do-hardlink-recursive
- :help "Make hard links for marked files, including those in marked subdirs"))
-(if (not (fboundp 'dired-do-relsymlink))
- (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-symlink-recursive]
- '(menu-item "Symlink to..." diredp-do-symlink-recursive
- :visible (fboundp 'make-symbolic-link)
- :help "Make symbolic links for marked files, including those in marked subdirs"))
- (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-symlink-recursive]
- '(menu-item "Symlink to (Absolute)..." diredp-do-symlink-recursive
- :help "Make absolute symbolic links for marked files, including those in marked subdirs"))
- (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-relsymlink-recursive]
- '(menu-item "Symlink to (Relative)..." diredp-do-relsymlink-recursive
- :help "Make relative symbolic links for marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-copy-recursive]
- '(menu-item "Copy to..." diredp-do-copy-recursive
- :help "Copy marked files, including in marked subdirs, to a given directory"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-move-recursive]
- '(menu-item "Move to..." diredp-do-move-recursive
- :help "Move marked files, including in marked subdirs, to a given directory"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-copy-move] '("--")) ; -------------
-
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-capitalize-recursive]
- '(menu-item "Capitalize" diredp-capitalize-recursive
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Capitalize the names of all marked files, including in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-downcase-recursive]
- '(menu-item "Downcase" diredp-downcase-recursive
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Rename marked files, including in marked subdirs, to lowercase names"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-upcase-recursive]
- '(menu-item "Upcase" diredp-upcase-recursive
- :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
- :help "Rename marked files, including in marked subdirs, to uppercase names"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-lettercase] '("--")) ; ------------
-
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-list-marked-recursive]
- '(menu-item "List Marked Files" diredp-list-marked-recursive
- :help "List the files marked here and in marked subdirs, recursively"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-copy-filename-as-kill-recursive]
- '(menu-item "Copy File Names (to Paste)" diredp-copy-filename-as-kill-recursive
- :help "Copy names of files marked here and in marked subdirs, to `kill-ring'"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-insert-subdirs-recursive]
- '(menu-item "Insert Subdirs" diredp-insert-subdirs-recursive
- :help "Insert the marked subdirectories, gathered recursively"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-dirs] '("--")) ; ------------------
-
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-marked-recursive-other-window]
- '(menu-item "Dired (Marked) in Other Window" diredp-marked-recursive-other-window
- :help "Open Dired (in other window) on marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-marked-recursive]
- '(menu-item "Dired (Marked)" diredp-marked-recursive
- :help "Open Dired on marked files, including those in marked subdirs"))
-;; On Windows, bind more.
-(eval-after-load "w32-browser"
- '(define-key diredp-menu-bar-operate-recursive-menu [diredp-multiple-w32-browser-recursive]
- '(menu-item "Open Associated Windows Apps" diredp-multiple-w32-browser-recursive
- :help "Run Windows apps for with marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-find-marked-files-recursive]
- '(menu-item "Open" diredp-do-find-marked-files-recursive
- :help "Find marked files simultaneously, including those in marked subdirs"))
-
-
-;; `Multiple' > `Marked Here and Below' > `Images' menu.
-;;
-(defvar diredp-menu-bar-images-recursive-menu (make-sparse-keymap "Images"))
-(defalias 'diredp-menu-bar-images-recursive-menu diredp-menu-bar-images-recursive-menu)
-(define-key diredp-menu-bar-operate-recursive-menu [images]
- '(menu-item "Images" diredp-menu-bar-images-recursive-menu
- :enable (fboundp 'image-dired-delete-tag)))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-delete-tag-recursive]
- '(menu-item "Delete Image Tag..." diredp-image-dired-delete-tag-recursive
- :help "Remove an `image-dired' tag from marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-tag-files-recursive]
- '(menu-item "Add Image Tags..." diredp-image-dired-tag-files-recursive
- :help "Add `image-dired' tags to marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-comment-files-recursive]
- '(menu-item "Add Image Comment..." diredp-image-dired-comment-files-recursive
- :help "Add image comment to marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-display-thumbs-recursive]
- '(menu-item "Display Image Thumbnails" diredp-image-dired-display-thumbs-recursive
- :help "Show thumbnails for marked image files, including those in marked subdirs"))
-
-
-;; `Multiple' > `Marked Here and Below' > `Encryption' menu.
-;;
-(when (fboundp 'epa-dired-do-encrypt) ; Emacs 23+
- (defvar diredp-menu-bar-encryption-recursive-menu (make-sparse-keymap "Encryption"))
- (define-key diredp-menu-bar-operate-recursive-menu [encryption]
- (cons "Encryption" diredp-menu-bar-encryption-recursive-menu))
- (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-decrypt-recursive]
- '(menu-item "Decrypt..." diredp-do-decrypt-recursive
- :help "Decrypt marked files, including those in marked subdirs"))
- (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-verify-recursive]
- '(menu-item "Verify..." diredp-do-verify-recursive
- :help "Verify marked files, including those in marked subdirs"))
- (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-sign-recursive]
- '(menu-item "Sign..." diredp-do-sign-recursive
- :help "Sign marked files, including those in marked subdirs"))
- (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-encrypt-recursive]
- '(menu-item "Encrypt..." diredp-do-encrypt-recursive
- :help "Encrypt marked files, including those in marked subdirs")))
-
-
-;; `Multiple' > `Marked Here and Below' > `Search' menu.
-;;
-(defvar diredp-menu-bar-search-recursive-menu (make-sparse-keymap "Search"))
-(define-key diredp-menu-bar-operate-recursive-menu [search]
- (cons "Search" diredp-menu-bar-search-recursive-menu))
-(when (fboundp 'dired-do-isearch-regexp) ; Emacs 23+
- (define-key diredp-menu-bar-search-recursive-menu [diredp-do-isearch-regexp-recursive]
- '(menu-item "Isearch Regexp Files..." diredp-do-isearch-regexp-recursive
- :help "Incrementally regexp search marked files, including those in marked subdirs"))
- (define-key diredp-menu-bar-search-recursive-menu [diredp-do-isearch-recursive]
- '(menu-item "Isearch Files..." diredp-do-isearch-recursive
- :help "Incrementally search marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-search-recursive-menu [diredp-do-query-replace-regexp-recursive]
- '(menu-item "Query Replace..." diredp-do-query-replace-regexp-recursive
- :help "Replace regexp in marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-search-recursive-menu [diredp-do-search-recursive]
- '(menu-item "Search Files..." diredp-do-search-recursive
- :help "Regexp search marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-search-recursive-menu [diredp-do-grep-recursive]
- '(menu-item "Grep..." diredp-do-grep-recursive
- :help "Run `grep' on the marked files, including those in marked subdirs"))
-
-
-;; `Multiple' > `Marked Here and Below' > `Bookmark' menu.
-;;
-(defvar diredp-menu-bar-bookmarks-recursive-menu (make-sparse-keymap "Bookmark"))
-(define-key diredp-menu-bar-operate-recursive-menu [bookmarks]
- (cons "Bookmark" diredp-menu-bar-bookmarks-recursive-menu))
-(define-key diredp-menu-bar-bookmarks-recursive-menu
- [diredp-do-bookmark-in-bookmark-file-recursive]
- '(menu-item "Bookmark in Bookmark File..." diredp-do-bookmark-in-bookmark-file-recursive
- :help "Bookmark marked files, including those in marked subdirs, in a bookmark file"))
-(define-key diredp-menu-bar-bookmarks-recursive-menu
- [diredp-set-bookmark-file-bookmark-for-marked-recursive]
- '(menu-item "Create Bookmark-File Bookmark..."
- diredp-set-bookmark-file-bookmark-for-marked-recursive
- :help "Create a bookmark-file bookmark for marked files, including in marked subdirs"))
-(define-key diredp-menu-bar-bookmarks-recursive-menu [diredp-do-bookmark-dirs-recursive]
- '(menu-item "Bookmark Dirs..." diredp-do-bookmark-dirs-recursive
- :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
-(define-key diredp-menu-bar-bookmarks-recursive-menu [diredp-do-bookmark-recursive]
- '(menu-item "Bookmark..." diredp-do-bookmark-recursive
- :help "Bookmark the marked files, including those in marked subdirs"))
-
-
-
-;; `Regexp' menu.
-;;
-;; REPLACE ORIGINAL `Regexp' menu in `dired.el'.
-;;
-(defvar diredp-menu-bar-regexp-menu (make-sparse-keymap "Regexp"))
-(define-key dired-mode-map [menu-bar regexp] (cons "Regexp" diredp-menu-bar-regexp-menu))
-
-(define-key diredp-menu-bar-regexp-menu [hardlink]
- '(menu-item "Hardlink to..." dired-do-hardlink-regexp
- :help "Make hard links for files matching regexp"))
-(if (not (fboundp 'dired-do-relsymlink-regexp))
- (define-key diredp-menu-bar-regexp-menu [symlink]
- '(menu-item "Symlink to..." dired-do-symlink-regexp
- :visible (fboundp 'make-symbolic-link)
- :help "Make symbolic links for files matching regexp"))
- (define-key diredp-menu-bar-regexp-menu [symlink]
- '(menu-item "Symlink to (Absolute)..." dired-do-symlink-regexp
- :visible (fboundp 'make-symbolic-link)
- :help "Make absolute symbolic links for files matching regexp"))
- (define-key diredp-menu-bar-regexp-menu [relsymlink] ; In `dired-x.el'.
- '(menu-item "Symlink to (Relative)..." dired-do-relsymlink-regexp
- :visible (fboundp 'make-symbolic-link)
- :help "Make relative symbolic links for files matching regexp")))
-(define-key diredp-menu-bar-regexp-menu [copy]
- '(menu-item "Copy to..." dired-do-copy-regexp :help "Copy marked files matching regexp"))
-(define-key diredp-menu-bar-regexp-menu [rename]
- '(menu-item "Move to..." dired-do-rename-regexp :help "Move marked files matching regexp"))
-(define-key diredp-menu-bar-regexp-menu [flag]
- '(menu-item "Flag..." dired-flag-files-regexp :help "Flag files matching regexp for deletion"))
-(define-key diredp-menu-bar-regexp-menu [image-dired-mark-tagged-files]
- '(menu-item "Mark Image Files Tagged..." image-dired-mark-tagged-files
- :enable (fboundp 'image-dired-mark-tagged-files)
- :help "Mark image files whose image tags match regexp"))
-(define-key diredp-menu-bar-regexp-menu [mark-cont]
- '(menu-item "Mark Containing..." dired-mark-files-containing-regexp
- :help "Mark files whose contents matches regexp"))
-(define-key diredp-menu-bar-regexp-menu [mark]
- '(menu-item "Mark..." dired-mark-files-regexp
- :help "Mark files matching regexp"))
-
-
-;; `Regexp' > `Here and Below' menu.
-;;
-(defvar diredp-menu-bar-regexp-recursive-menu (make-sparse-keymap "Here and Below"))
-(define-key diredp-menu-bar-regexp-menu [mark-recursive]
- (cons "Here and Below" diredp-menu-bar-regexp-recursive-menu))
-(define-key diredp-menu-bar-regexp-recursive-menu [diredp-mark-files-regexp-recursive]
- '(menu-item "Mark..." diredp-mark-files-regexp-recursive
- :help "Mark all files matching a regexp, including those in marked subdirs"))
-
-
-;; "Mark" menu.
-;;
-;; REPLACE ORIGINAL `Mark' menu in `dired.el'.
-;;
-(defvar diredp-menu-bar-mark-menu (make-sparse-keymap "Mark"))
-(define-key dired-mode-map [menu-bar mark] (cons "Mark" diredp-menu-bar-mark-menu))
-
-(when (fboundp 'dired-flag-extension)
- (define-key diredp-menu-bar-mark-menu [flag-extension] ; In `dired-x.el'
- '(menu-item "Flag Extension..." dired-flag-extension
- :help "Flag all files that have a certain extension, for deletion")))
-(define-key diredp-menu-bar-mark-menu [garbage-files]
- '(menu-item "Flag Garbage Files" dired-flag-garbage-files
- :help "Flag unneeded files for deletion"))
-(define-key diredp-menu-bar-mark-menu [backup-files]
- '(menu-item "Flag Backup Files" dired-flag-backup-files
- :help "Flag all backup files for deletion"))
-(define-key diredp-menu-bar-mark-menu [auto-save-files]
- '(menu-item "Flag Auto-save Files" dired-flag-auto-save-files
- :help "Flag auto-save files for deletion"))
-(define-key diredp-menu-bar-mark-menu [flag-region]
- '(menu-item "Flag Region" diredp-flag-region-files-for-deletion
- :enable (diredp-nonempty-region-p)
- :help "Flag all files in the region (selection) for deletion"))
-(when (< emacs-major-version 21)
- (put 'diredp-flag-region-files-for-deletion 'menu-enable '(diredp-nonempty-region-p)))
-(define-key diredp-menu-bar-mark-menu [deletion]
- '(menu-item "Flag" dired-flag-file-deletion :help "Flag current line's file for deletion"))
-(define-key diredp-menu-bar-mark-menu [separator-flag] '("--")) ; ------------------------------
-
-(define-key diredp-menu-bar-mark-menu [prev]
- '(menu-item "Previous Marked" dired-prev-marked-file :help "Move to previous marked file"))
-(define-key diredp-menu-bar-mark-menu [next]
- '(menu-item "Next Marked" dired-next-marked-file :help "Move to next marked file"))
-(define-key diredp-menu-bar-mark-menu [marks]
- '(menu-item "Change Marks..." dired-change-marks
- :help "Replace marker with another character"))
-(define-key diredp-menu-bar-mark-menu [omit-unmarked]
- '(menu-item "Omit Unmarked" diredp-omit-unmarked :help "Hide lines of unmarked files"))
-(define-key diredp-menu-bar-mark-menu [omit-marked]
- '(menu-item "Omit Marked" diredp-omit-marked :help "Hide lines of marked files"))
-(define-key diredp-menu-bar-mark-menu [toggle-marks]
- (if (> emacs-major-version 21)
- '(menu-item "Toggle Marked/Unmarked" dired-toggle-marks
- :help "Mark unmarked files, unmark marked ones")
- '(menu-item "Toggle Marked/Unmarked" dired-toggle-marks
- :help "Mark unmarked files, unmark marked ones")))
-(define-key diredp-menu-bar-mark-menu [separator-mark] '("--")) ; ------------------------------
-
-(when (fboundp 'dired-mark-sexp)
- (define-key diredp-menu-bar-mark-menu [mark-sexp] ; In `dired-x.el'.
- '(menu-item "Mark If..." dired-mark-sexp
- :help "Mark files for which specified condition is true")))
-(define-key diredp-menu-bar-mark-menu [image-dired-mark-tagged-files]
- '(menu-item "Mark Image Files Tagged..." image-dired-mark-tagged-files
- :enable (fboundp 'image-dired-mark-tagged-files)
- :help "Mark image files whose image tags match regexp"))
-(define-key diredp-menu-bar-mark-menu [mark-cont]
- '(menu-item "Mark Containing..." dired-mark-files-containing-regexp
- :help "Mark files whose contents matches regexp"))
-(define-key diredp-menu-bar-mark-menu [mark]
- '(menu-item "Mark..." dired-mark-files-regexp
- :help "Mark files matching regexp"))
-(when (fboundp 'dired-mark-omitted) ; In `dired-x.el'.
- (define-key diredp-menu-bar-mark-menu [mark-omitted]
- '(menu-item "Mark Omitted..." dired-mark-omitted
- :help "Mark all omitted files and subdirectories")))
-(define-key diredp-menu-bar-mark-menu [mark-autofiles]
- '(menu-item "Mark Autofiles..." diredp-mark-autofiles
- :help "Mark all autofiles (bookmarks with same name as file)"
- :enable (featurep 'bookmark+)))
-(define-key diredp-menu-bar-mark-menu [mark-extension]
- '(menu-item "Mark Extension..." diredp-mark/unmark-extension
- :help "Mark all files with specified extension"))
-(define-key diredp-menu-bar-mark-menu [symlinks]
- '(menu-item "Mark Symlinks" dired-mark-symlinks
- :visible (fboundp 'make-symbolic-link) :help "Mark all symbolic links"))
-(define-key diredp-menu-bar-mark-menu [directories]
- '(menu-item "Mark Directories" dired-mark-directories
- :help "Mark all directories except `.' and `..'"))
-(define-key diredp-menu-bar-mark-menu [directory]
- '(menu-item "Mark Old Backups" dired-clean-directory
- :help "Flag old numbered backups for deletion"))
-(define-key diredp-menu-bar-mark-menu [executables]
- '(menu-item "Mark Executables" dired-mark-executables :help "Mark all executable files"))
-(define-key diredp-menu-bar-mark-menu [mark-region]
- '(menu-item "Mark Region" diredp-mark-region-files
- :enable (diredp-nonempty-region-p)
- :help "Mark all of the files in the region (selection)"))
-(when (< emacs-major-version 21)
- (put 'diredp-mark-region-files 'menu-enable '(diredp-nonempty-region-p)))
-(define-key diredp-menu-bar-mark-menu [mark]
- '(menu-item "Mark" dired-mark :help "Mark current line's file for future operations"))
-(define-key diredp-menu-bar-mark-menu [separator-unmark] '("--")) ; ----------------------------
-
-(define-key diredp-menu-bar-mark-menu [unmark-autofiles]
- '(menu-item "Unmark Autofiles..." diredp-unmark-autofiles
- :help "Unmark all autofiles (bookmarks with same name as file)"
- :enable (featurep 'bookmark+)))
-(define-key diredp-menu-bar-mark-menu [unmark-all]
- '(menu-item "Unmark All" dired-unmark-all-marks :help "Remove all marks from all files"))
-(define-key diredp-menu-bar-mark-menu [unmark-with]
- '(menu-item "Unmark Marked-With..." dired-unmark-all-files
- :help "Remove a specific mark (or all marks) from every file"))
-(define-key diredp-menu-bar-mark-menu [unmark-region]
- '(menu-item "Unmark Region" diredp-unmark-region-files
- :enable (diredp-nonempty-region-p)
- :help "Unmark all files in the region (selection)"))
-(when (< emacs-major-version 21)
- (put 'diredp-unmark-region-files 'menu-enable '(diredp-nonempty-region-p)))
-(define-key diredp-menu-bar-mark-menu [unmark]
- '(menu-item "Unmark" dired-unmark :help "Unmark or unflag current line's file"))
-
-
-;; `Mark' > `Tagged' menu.
-;;
-(when (require 'bookmark+ nil t)
- (defvar diredp-mark-tags-menu (make-sparse-keymap "Tagged (Autofiles)")
- "`Tags' submenu for Dired menu-bar `Mark' menu.")
- (define-key diredp-menu-bar-mark-menu [mark-tags] (cons "Tagged" diredp-mark-tags-menu))
-
- (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-none]
- '(menu-item "Unmark Not Tagged with Any..." diredp-unmark-files-tagged-none
- :help "Unmark files that are not tagged with *any* of the tags you enter"))
- (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-not-all]
- '(menu-item "Unmark Not Tagged with All..." diredp-unmark-files-tagged-not-all
- :help "Unmark files that are not tagged with *all* tags"))
- (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-some]
- '(menu-item "Unmark Tagged with Some..." diredp-unmark-files-tagged-some
- :help "Unmark files that are tagged with at least one of the tags you enter"))
- (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-all]
- '(menu-item "Unmark Tagged with All..." diredp-unmark-files-tagged-all
- :help "Unmark files that are tagged with *each* tag you enter"))
- (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-regexp]
- '(menu-item "Unmark Tagged Matching Regexp..." diredp-unmark-files-tagged-regexp
- :help "Unmark files that have at least one tag that matches a regexp"))
-
- (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-none]
- '(menu-item "Mark Not Tagged with Any..." diredp-mark-files-tagged-none
- :help "Mark files that are not tagged with *any* of the tags you enter"))
- (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-not-all]
- '(menu-item "Mark Not Tagged with All..." diredp-mark-files-tagged-not-all
- :help "Mark files that are not tagged with *all* tags"))
- (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-some]
- '(menu-item "Mark Tagged with Some..." diredp-mark-files-tagged-some
- :help "Mark files that are tagged with at least one of the tags you enter"))
- (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-all]
- '(menu-item "Mark Tagged with All..." diredp-mark-files-tagged-all
- :help "Mark files that are tagged with *each* tag you enter"))
- (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-regexp]
- '(menu-item "Mark Tagged Matching Regexp..." diredp-mark-files-tagged-regexp
- :help "Mark files that have at least one tag that matches a regexp")))
-
-
-;; "Dir" menu.
-;;
-;; REPLACE ORIGINAL `Subdir' menu in `dired.el'.
-;;
-(defvar diredp-menu-bar-subdir-menu (make-sparse-keymap "Dir"))
-(define-key dired-mode-map [menu-bar subdir] (cons "Dir" diredp-menu-bar-subdir-menu))
-
-
-;; `Dir' > `Hide/Show' menu.
-;;
-(defvar diredp-hide/show-menu (make-sparse-keymap "Hide/Show")
- "`Hide/Show' submenu for Dired menu-bar `Dir' menu.")
-(define-key diredp-menu-bar-subdir-menu [hide-show] (cons "Hide/Show" diredp-hide/show-menu))
-
-(when (fboundp 'dired-omit-mode)
- (define-key diredp-hide/show-menu [dired-omit-mode]
- '(menu-item "Hide/Show Uninteresting (Omit Mode)" dired-omit-mode
- :help "Toggle omission of uninteresting files (Omit mode)")))
-(when (fboundp 'dired-hide-details-mode) ; Emacs 24.4+
- (define-key diredp-hide/show-menu [hide-details]
- '(menu-item "Hide/Show Details" dired-hide-details-mode
- :help "Hide or show less important fields of directory listing")))
-(define-key diredp-hide/show-menu [hide-all]
- '(menu-item "Hide/Show All Subdirs" dired-hide-all
- :help "Hide all subdirectories, leave only header lines"))
-(define-key diredp-hide/show-menu [hide-subdir]
- '(menu-item "Hide/Show Subdir" diredp-hide-subdir-nomove
- :help "Hide or unhide current directory listing"))
-
-
-;; `Dir' > `Bookmark' menu.
-;;
-(defvar diredp-bookmark-menu (make-sparse-keymap "Bookmark")
- "`Bookmark' submenu for Dired menu-bar `Dir' menu.")
-(define-key diredp-menu-bar-subdir-menu [bookmark] (cons "Bookmark" diredp-bookmark-menu))
-
-(define-key diredp-bookmark-menu [diredp-highlight-autofiles-mode]
- '(menu-item "Toggle Autofile Highlighting" diredp-highlight-autofiles-mode
- :help "Toggle whether to highlight autofile bookmarks"
- :visible (and (featurep 'bookmark+) (featurep 'highlight))))
-(define-key diredp-bookmark-menu [diredp-do-bookmark-dirs-recursive]
- '(menu-item "Bookmark Dirs Here and Below..." diredp-do-bookmark-dirs-recursive
- :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
-(define-key diredp-bookmark-menu [bookmark-dired]
- '(menu-item "Bookmark Dired Buffer..." bookmark-set :help "Bookmark this Dired buffer"))
-
-
-;; `Dir' > `Navigate' menu.
-;;
-(defvar diredp-navigate-menu (make-sparse-keymap "Navigate")
- "`Navigate' submenu for Dired menu-bar `Dir' menu.")
-(define-key diredp-menu-bar-subdir-menu [navigate] (cons "Navigate" diredp-navigate-menu))
-
-(define-key diredp-navigate-menu [insert]
- '(menu-item "Move To This Subdir" dired-maybe-insert-subdir
- :help "Move to subdirectory line or listing"))
-(define-key diredp-navigate-menu [tree-down]
- '(menu-item "Tree Down" dired-tree-down :help "Go to first subdirectory header down the tree"))
-(define-key diredp-navigate-menu [tree-up]
- '(menu-item "Tree Up" dired-tree-up :help "Go to first subdirectory header up the tree"))
-(define-key diredp-navigate-menu [up]
- '(menu-item "Up Directory" diredp-up-directory :help "Dired the parent directory"))
-(define-key diredp-navigate-menu [prev-subdir]
- '(menu-item "Prev Subdir" diredp-prev-subdir :help "Go to previous subdirectory header line"))
-(define-key diredp-navigate-menu [next-subdir]
- '(menu-item "Next Subdir" diredp-next-subdir :help "Go to next subdirectory header line"))
-(define-key diredp-navigate-menu [prev-dirline]
- '(menu-item "Prev Dirline" diredp-prev-dirline :help "Move to previous directory-file line"))
-(define-key diredp-navigate-menu [next-dirline]
- '(menu-item "Next Dirline" diredp-next-dirline :help "Move to next directory-file line"))
-
-(define-key diredp-menu-bar-subdir-menu [separator-subdir] '("--")) ; --------------------------
-
-(define-key diredp-menu-bar-subdir-menu [image-dired-dired-toggle-marked-thumbs]
- '(menu-item "Toggle Image Thumbnails" image-dired-dired-toggle-marked-thumbs
- :enable (fboundp 'image-dired-dired-toggle-marked-thumbs)
- :help "Add or remove image thumbnails in front of marked file names"))
-(when (fboundp 'dired-isearch-filenames) ; Emacs 23+
- (define-key diredp-menu-bar-subdir-menu [isearch-filenames-regexp]
- '(menu-item "Isearch Regexp in File Names..." dired-isearch-filenames-regexp
- :help "Incrementally search for regexp in file names only"))
- (define-key diredp-menu-bar-subdir-menu [isearch-filenames]
- '(menu-item "Isearch in File Names..." dired-isearch-filenames
- :help "Incrementally search for literal text in file names only.")))
-(when (or (> emacs-major-version 21) (fboundp 'wdired-change-to-wdired-mode))
- (define-key diredp-menu-bar-subdir-menu [wdired-mode]
- '(menu-item "Edit File Names (WDired)" wdired-change-to-wdired-mode
- :help "Put a Dired buffer in a mode in which filenames are editable"
- :keys "C-x C-q" :filter (lambda (x) (and (derived-mode-p 'dired-mode) x)))))
-(when (fboundp 'dired-compare-directories) ; Emacs 22+
- (define-key diredp-menu-bar-subdir-menu [compare-directories]
- '(menu-item "Compare Directories..." dired-compare-directories
- :help "Mark files with different attributes in two Dired buffers")))
-
-(define-key diredp-menu-bar-subdir-menu [separator-dired-on-set] '("--")) ; --------------------
-
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-recent-dirs]
- '(menu-item "Dired Recent Directories..." diredp-dired-recent-dirs
- :visible (boundp 'recentf-list) :enable (and (boundp 'recentf-list) (consp recentf-list))
- :help "Open a Dired buffer for recently used directories"))
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-inserted-subdirs]
- '(menu-item "Dired Each Inserted Subdir..." diredp-dired-inserted-subdirs
- :enable (cdr dired-subdir-alist) ; First elt is current dir. Must have at least one more.
- :help "Open Dired for each of the inserted subdirectories"))
-(define-key diredp-menu-bar-subdir-menu [diredp-add-to-this-dired-buffer]
- '(menu-item "Add Entries Here..." diredp-add-to-this-dired-buffer
- :help "Add individual file and directory names to the listing"
- :keys "C-x E"))
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-union]
- '(menu-item "Dired Union..." diredp-dired-union
- :help "Open Dired for the union of some existing Dired buffers"))
-(define-key diredp-menu-bar-subdir-menu [diredp-fileset-other-window]
- '(menu-item "Dired Fileset..." diredp-fileset-other-window
- :enable (> emacs-major-version 21) :help "Open Dired on an Emacs fileset"))
-(define-key diredp-menu-bar-subdir-menu [diredp-marked-other-window]
- '(menu-item "Dired Marked Files in Other Window" diredp-marked-other-window
- :enable (save-excursion (goto-char (point-min))
- (and (re-search-forward (dired-marker-regexp) nil t)
- (re-search-forward (dired-marker-regexp) nil t)))
- :help "Open Dired on marked files only, in other window"))
-(define-key diredp-menu-bar-subdir-menu [diredp-marked]
- '(menu-item "Dired Marked Files" diredp-marked
- :enable (save-excursion (goto-char (point-min))
- (and (re-search-forward (dired-marker-regexp) nil t)
- (re-search-forward (dired-marker-regexp) nil t)))
- :help "Open Dired on marked files only"))
-(define-key diredp-menu-bar-subdir-menu [dired]
- '(menu-item "Dired (Filter via Wildcards)..." dired
- :help "Explore a directory (you can provide wildcards)"))
-
-(define-key diredp-menu-bar-subdir-menu [separator-dired] '("--")) ; ---------------------
-
-(define-key diredp-menu-bar-subdir-menu [insert]
- '(menu-item "Insert/Move-To This Subdir" dired-maybe-insert-subdir
- :help "Move to subdirectory line or listing"))
-(define-key diredp-menu-bar-subdir-menu [revert]
- '(menu-item "Refresh (Sync \& Show All)" revert-buffer :help "Update directory contents"))
-(define-key diredp-menu-bar-subdir-menu [create-directory] ; Moved from "Immediate".
- '(menu-item "New Directory..." dired-create-directory :help "Create a directory"))
-
-
-;;; Mouse-3 menu binding.
-(define-key dired-mode-map [down-mouse-3] 'diredp-mouse-3-menu)
-(define-key dired-mode-map [mouse-3] 'ignore)
-
-
-;;; Non-menu Dired bindings.
-
-;; Move `dired-omit-mode' to `C-x M-o', so prefix key `M-o' is free for face/font-lock stuff.
-(define-key dired-mode-map "\C-x\M-o" (if (fboundp 'dired-omit-mode) 'dired-omit-mode 'dired-omit-toggle))
-(when (memq (lookup-key dired-mode-map "\M-o") '(dired-omit-mode dired-omit-toggle))
- (define-key dired-mode-map "\M-o" nil))
-
-(define-key ctl-x-map "D" 'diredp-dired-union) ; `C-x D'
-(define-key ctl-x-map "E" 'diredp-add-to-dired-buffer) ; `C-x E'
-(define-key ctl-x-map "\C-\M-f" 'diredp-fileset) ; `C-x C-M-f'
-(define-key ctl-x-4-map "\C-\M-f" 'diredp-fileset-other-window) ; `C-x 4 C-M-f'
-(define-key ctl-x-map "R" 'diredp-dired-recent-dirs) ; `C-x R'
-(define-key ctl-x-4-map "R" 'diredp-dired-recent-dirs-other-window) ; `C-x 4 R'
-
-;; Navigation
-(substitute-key-definition 'dired-up-directory 'diredp-up-directory dired-mode-map)
-(substitute-key-definition 'dired-next-line 'diredp-next-line dired-mode-map)
-(substitute-key-definition 'dired-previous-line 'diredp-previous-line dired-mode-map)
-(substitute-key-definition 'dired-next-dirline 'diredp-next-dirline dired-mode-map)
-(substitute-key-definition 'dired-prev-dirline 'diredp-prev-dirline dired-mode-map)
-(substitute-key-definition 'dired-next-subdir 'diredp-next-subdir dired-mode-map)
-(substitute-key-definition 'dired-prev-subdir 'diredp-prev-subdir dired-mode-map)
-
-
-(define-key dired-mode-map [S-down-mouse-1] 'ignore) ; (normally `mouse-set-font')
-;; `diredp-mouse-mark-region-files' provides Windows-Explorer behavior
-;; for selecting (marking) files.
-(define-key dired-mode-map [S-mouse-1] 'diredp-mouse-mark-region-files) ; `S-mouse-1'
-(define-key dired-mode-map [mouse-2] 'dired-mouse-find-file-other-window) ; `mouse-2'
-(define-key dired-mode-map [S-down-mouse-2] 'diredp-mouse-find-file) ; `S-mouse-2'
-(define-key dired-mode-map [S-mouse-2] 'ignore)
-(define-key dired-mode-map [M-mouse-2] 'diredp-mouse-find-file-other-frame) ; `M-mouse-2'
-
-;; On Windows, bind more.
-(eval-after-load "w32-browser"
- '(progn
- (define-key dired-mode-map [(control return)] 'dired-w32explore) ; `C-RET'
- (define-key dired-mode-map [(meta return)] 'dired-w32-browser) ; `M-RET'
- (define-key dired-mode-map [mouse-2] 'dired-mouse-w32-browser))) ; `mouse-2'
-
-(define-key dired-mode-map "@" 'diredp-do-apply-function) ; `@'
-(define-key dired-mode-map "\$" 'diredp-hide-subdir-nomove) ; `$'
-(define-key dired-mode-map "\M-$" 'dired-hide-subdir) ; `M-$'
-(define-key dired-mode-map "=" 'diredp-ediff) ; `='
-;; This replaces the `dired-x.el' binding of `dired-mark-extension'.
-(define-key dired-mode-map "*." 'diredp-mark/unmark-extension) ; `* .'
-(define-key dired-mode-map [(control meta ?*)] 'diredp-marked-other-window) ; `C-M-*'
-(define-key dired-mode-map "\M-a" 'dired-do-search) ; `M-a'
-(define-key dired-mode-map "\M-b" 'diredp-do-bookmark) ; `M-b'
-(define-key dired-mode-map "\C-\M-b" 'diredp-set-bookmark-file-bookmark-for-marked) ; `C-M-b'
-(define-key dired-mode-map [(control meta shift ?b)] ; `C-M-B' (aka `C-M-S-b')
- 'diredp-do-bookmark-in-bookmark-file)
-(define-key dired-mode-map "\M-g" 'diredp-do-grep) ; `M-g'
-(when (fboundp 'mkhtml-dired-files) ; In `mkhtml.el'.
- (define-key dired-mode-map "\M-h" 'mkhtml-dired-files)) ; `M-h'
-(define-key dired-mode-map "\M-q" (if (< emacs-major-version 21)
- 'dired-do-query-replace
- 'dired-do-query-replace-regexp)) ; `M-q'
-(define-key dired-mode-map [(control meta shift ?r)] ; `C-M-R' (aka `C-M-S-r')
- 'diredp-toggle-find-file-reuse-dir)
-(define-key dired-mode-map "U" 'dired-unmark-all-marks) ; `U'
-(substitute-key-definition 'describe-mode 'diredp-describe-mode ; `h', `C-h m'
- dired-mode-map (current-global-map))
-
-;; Tags - same keys as in `*Bookmark List*'.
-;;
-;; NOTE: If this changes then need to update `dired-sort-menu+.el' to reflect the changes.
-;;
-(define-key dired-mode-map "T" nil) ; For Emacs20
-(define-key dired-mode-map "T+" 'diredp-tag-this-file) ; `T +'
-(define-key dired-mode-map "T-" 'diredp-untag-this-file) ; `T -'
-(define-key dired-mode-map "T0" 'diredp-remove-all-tags-this-file) ; `T 0'
-(define-key dired-mode-map "Tc" 'diredp-copy-tags-this-file) ; `T c'
-(define-key dired-mode-map "Tp" 'diredp-paste-add-tags-this-file) ; `T p'
-(define-key dired-mode-map "Tq" 'diredp-paste-replace-tags-this-file) ; `T q'
-(define-key dired-mode-map "Tv" 'diredp-set-tag-value-this-file) ; `T v'
-(define-key dired-mode-map "T\M-w" 'diredp-copy-tags-this-file) ; `T M-w'
-(define-key dired-mode-map "T\C-y" 'diredp-paste-add-tags-this-file) ; `T C-y'
-(define-key dired-mode-map "T>+" 'diredp-do-tag) ; `T > +'
-(define-key dired-mode-map "T>-" 'diredp-do-untag) ; `T > -'
-(define-key dired-mode-map "T>0" 'diredp-do-remove-all-tags) ; `T > 0'
-(define-key dired-mode-map "T>p" 'diredp-do-paste-add-tags) ; `T > p'
-(define-key dired-mode-map "T>q" 'diredp-do-paste-replace-tags) ; `T > q'
-(define-key dired-mode-map "T>v" 'diredp-do-set-tag-value) ; `T > v'
-(define-key dired-mode-map "T>\C-y" 'diredp-do-paste-add-tags) ; `T > C-y'
-(define-key dired-mode-map "Tm%" 'diredp-mark-files-tagged-regexp) ; `T m %'
-(define-key dired-mode-map "Tm*" 'diredp-mark-files-tagged-all) ; `T m *'
-(define-key dired-mode-map "Tm+" 'diredp-mark-files-tagged-some) ; `T m +'
-(define-key dired-mode-map "Tm~*" 'diredp-mark-files-tagged-not-all) ; `T m ~ *'
-(define-key dired-mode-map "Tm~+" 'diredp-mark-files-tagged-none) ; `T m ~ +'
-(define-key dired-mode-map "Tu%" 'diredp-unmark-files-tagged-regexp) ; `T u %'
-(define-key dired-mode-map "Tu*" 'diredp-unmark-files-tagged-all) ; `T u *'
-(define-key dired-mode-map "Tu+" 'diredp-unmark-files-tagged-some) ; `T u +'
-(define-key dired-mode-map "Tu~*" 'diredp-unmark-files-tagged-not-all) ; `T u ~ *'
-(define-key dired-mode-map "Tu~+" 'diredp-unmark-files-tagged-none) ; `T u ~ +'
-;; $$$$$$ (define-key dired-mode-map [(control ?+)] 'diredp-do-tag)
-;; $$$$$$ (define-key dired-mode-map [(control ?-)] 'diredp-do-untag)
-
-
-;; Vanilla Emacs binds `c' to `dired-do-compress-to'. Use `M-z' instead'.
-;; (`dired-sort-menu.el' binds `c' to `dired-sort-menu-toggle-ignore-case'.)
-;;
-(when (fboundp 'dired-do-compress-to) ; Emacs 25+
- (define-key dired-mode-map (kbd "M-z") 'dired-do-compress-to))
-
-
-;; Commands for operating on the current line's file. When possible,
-;; these are lower-case versions of the upper-case commands for operating on
-;; the marked files. (Most of the other corresponding lower-case letters are already
-;; defined and cannot be used here.)
-
-;; $$$$$$ (define-key dired-mode-map [(control meta ?+)] 'diredp-tag-this-file)
-;; $$$$$$ (define-key dired-mode-map [(control meta ?-)] 'diredp-untag-this-file)
-(define-key dired-mode-map "\r" 'dired-find-file) ; `RET'
-(when (fboundp 'diredp-describe-file)
- (define-key dired-mode-map (kbd "C-h RET") 'diredp-describe-file) ; `C-h RET'
- (define-key dired-mode-map (kbd "C-h C-<return>") 'diredp-describe-file)) ; `C-h C-RET'
-(define-key dired-mode-map "%c" 'diredp-capitalize) ; `% c'
-(define-key dired-mode-map "b" 'diredp-byte-compile-this-file) ; `b'
-(define-key dired-mode-map [(control shift ?b)] 'diredp-bookmark-this-file) ; `C-B'
-(define-key dired-mode-map "\M-c" 'diredp-capitalize-this-file) ; `M-c'
-(when (fboundp 'diredp-chgrp-this-file)
- (define-key dired-mode-map [(control meta shift ?g)] 'diredp-chgrp-this-file)) ; `C-M-G'
-(define-key dired-mode-map "\M-i" 'diredp-insert-subdirs) ; `M-i'
-(define-key dired-mode-map "\M-l" 'diredp-downcase-this-file) ; `M-l'
-(define-key dired-mode-map "\C-\M-l" 'diredp-list-marked) ; `C-M-l'
-(define-key dired-mode-map [(meta shift ?m)] 'diredp-chmod-this-file) ; `M-M'
-(define-key dired-mode-map "\C-o" 'diredp-find-file-other-frame) ; `C-o'
-(when (fboundp 'diredp-chown-this-file)
- (define-key dired-mode-map [(meta shift ?o)] 'diredp-chown-this-file)) ; `M-O'
-(define-key dired-mode-map "\C-\M-o" 'dired-display-file) ; `C-M-o' (not `C-o')
-(define-key dired-mode-map "\M-p" 'diredp-print-this-file) ; `M-p'
-(define-key dired-mode-map "r" 'diredp-rename-this-file) ; `r'
-(when (fboundp 'image-dired-dired-display-image)
- (define-key dired-mode-map "\C-tI" 'diredp-image-show-this-file)) ; `C-t I'
-(define-key dired-mode-map [(meta shift ?t)] 'diredp-touch-this-file) ; `M-T'
-(define-key dired-mode-map [(control meta shift ?t)] 'dired-do-touch) ; `C-M-T'
-(define-key dired-mode-map "\M-u" 'diredp-upcase-this-file) ; `M-u'
-(define-key dired-mode-map "y" 'diredp-relsymlink-this-file) ; `y'
-(define-key dired-mode-map "z" 'diredp-compress-this-file) ; `z'
-(when (fboundp 'dired-show-file-type)
- (define-key dired-mode-map "_" 'dired-show-file-type)) ; `_' (underscore)
-(substitute-key-definition 'kill-line 'diredp-delete-this-file ; `C-k', `delete', `deleteline'
- dired-mode-map (current-global-map))
-
-
-;; Commands that handle marked below, recursively.
-;; Use `M-+' as a prefix key for all such commands.
-
-(define-prefix-command 'diredp-recursive-map)
-(define-key dired-mode-map "\M-+" diredp-recursive-map) ; `M-+'
-
-(define-key diredp-recursive-map "@" 'diredp-do-apply-function-recursive) ; `@'
-(when (> emacs-major-version 22)
- (define-key diredp-recursive-map ":d" 'diredp-do-decrypt-recursive) ; `: d'
- (define-key diredp-recursive-map ":e" 'diredp-do-encrypt-recursive) ; `: e'
- (define-key diredp-recursive-map ":s" 'diredp-do-sign-recursive) ; `: s'
- (define-key diredp-recursive-map ":v" 'diredp-do-verify-recursive) ; `: v'
- )
-(define-key diredp-recursive-map "%c" 'diredp-capitalize-recursive) ; `% c'
-(define-key diredp-recursive-map "%l" 'diredp-downcase-recursive) ; `% l'
-(define-key diredp-recursive-map "%m" 'diredp-mark-files-regexp-recursive) ; `% m'
-(define-key diredp-recursive-map "%u" 'diredp-upcase-recursive) ; `% u'
-(when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
- (define-key diredp-recursive-map "&" 'diredp-do-async-shell-command-recursive)) ; `&'
-(define-key diredp-recursive-map "!" 'diredp-do-shell-command-recursive) ; `!'
-(define-key diredp-recursive-map (kbd "C-M-*") 'diredp-marked-recursive-other-window) ; `C-M-*'
-(define-key diredp-recursive-map "A" 'diredp-do-search-recursive) ; `A'
-(define-key diredp-recursive-map "\M-b" 'diredp-do-bookmark-recursive) ; `M-b'
-(define-key diredp-recursive-map [(meta shift ?b)] 'diredp-do-bookmark-dirs-recursive) ; `M-B'
-(define-key diredp-recursive-map (kbd "C-M-b") ; `C-M-b'
- 'diredp-set-bookmark-file-bookmark-for-marked-recursive)
-(define-key diredp-recursive-map [(control meta shift ?b)] ; `C-M-B' (aka `C-M-S-b')
- 'diredp-do-bookmark-in-bookmark-file-recursive)
-(define-key diredp-recursive-map "C" 'diredp-do-copy-recursive) ; `C'
-(define-key diredp-recursive-map "D" 'diredp-do-delete-recursive) ; `D'
-(define-key diredp-recursive-map "F" 'diredp-do-find-marked-files-recursive) ; `F'
-(when (fboundp 'diredp-do-chgrp-recursive)
- (define-key diredp-recursive-map "G" 'diredp-do-chgrp-recursive)) ; `G'
-(define-key diredp-recursive-map "\M-g" 'diredp-do-grep-recursive) ; `M-g'
-(define-key diredp-recursive-map "H" 'diredp-do-hardlink-recursive) ; `H'
-(define-key diredp-recursive-map "\M-i" 'diredp-insert-subdirs-recursive) ; `M-i'
-(define-key diredp-recursive-map "\C-\M-l" 'diredp-list-marked-recursive) ; `C-M-l'
-(define-key diredp-recursive-map "M" 'diredp-do-chmod-recursive) ; `M'
-(when (fboundp 'diredp-do-chown-recursive)
- (define-key diredp-recursive-map "O" 'diredp-do-chown-recursive)) ; `O'
-(define-key diredp-recursive-map "P" 'diredp-do-print-recursive) ; `P'
-(define-key diredp-recursive-map "Q" 'diredp-do-query-replace-regexp-recursive) ; `Q'
-(define-key diredp-recursive-map "R" 'diredp-do-move-recursive) ; `R'
-(define-key diredp-recursive-map "S" 'diredp-do-symlink-recursive) ; `S'
-(define-key diredp-recursive-map (kbd "M-s a C-s") ; `M-s a C-s'
- 'diredp-do-isearch-recursive)
-(define-key diredp-recursive-map (kbd "M-s a C-M-s") ; `M-s a C-M-s'
- 'diredp-do-isearch-regexp-recursive)
-(define-key diredp-recursive-map [(control meta shift ?t)] 'diredp-do-touch-recursive) ; `C-M-T'
-(define-key diredp-recursive-map "\C-tc" 'diredp-image-dired-comment-files-recursive) ; `C-t c'
-(define-key diredp-recursive-map "\C-td" 'diredp-image-dired-display-thumbs-recursive) ; `C-t d'
-(define-key diredp-recursive-map "\C-tr" 'diredp-image-dired-delete-tag-recursive) ; `C-t r'
-(define-key diredp-recursive-map "\C-tt" 'diredp-image-dired-tag-files-recursive) ; `C-t t'
-(define-key diredp-recursive-map "\M-w" 'diredp-copy-filename-as-kill-recursive) ; `M-w'
-(define-key diredp-recursive-map "Y" 'diredp-do-relsymlink-recursive) ; `Y'
-
-
-;; Undefine some bindings that would try to modify a Dired buffer. Their key sequences will
-;; then appear to the user as available for local (Dired) definition.
-(when (fboundp 'undefine-killer-commands) (undefine-killer-commands dired-mode-map))
-
-
-(defgroup Dired-Plus nil
- "Various enhancements to Dired."
- :prefix "diredp-" :group 'dired
- :link `(url-link :tag "Send Bug Report"
- ,(concat "mailto:" "drew.adams" "@" "oracle" ".com?subject=\
-dired+.el bug: \
-&body=Describe bug here, starting with `emacs -q'. \
-Don't forget to mention your Emacs and library versions."))
- :link '(url-link :tag "Other Libraries by Drew"
- "http://www.emacswiki.org/DrewsElispLibraries")
- :link '(url-link :tag "Download"
- "http://www.emacswiki.org/dired+.el")
- :link '(url-link :tag "Description"
- "http://www.emacswiki.org/DiredPlus")
- :link '(emacs-commentary-link :tag "Commentary" "dired+"))
;;; Face Definitions
@@ -4608,10 +3298,11 @@ In particular, inode number, number of hard links, and file size."
;;; (dired-other-window arg switches))
;;;###autoload
-(defun diredp-dired-for-files (arg &optional switches) ; Not bound
+(defun diredp-dired-for-files (arg &optional switches) ; Bound to `C-x D F'
"Dired file names that you enter, in a Dired buffer that you name.
You are prompted for the name of the Dired buffer to use.
-You are then prompted for names of files and directories to list.
+You are then prompted for names of files and directories to list,
+ which can be located anywhere.
Use `C-g' when you are done.
With a prefix arg you are first prompted for the `ls' switches to use.
@@ -4622,14 +3313,14 @@ See also `dired' (including the advice)."
(dired arg switches))
;;;###autoload
-(defun diredp-dired-for-files-other-window (arg &optional switches) ; Not bound
- "Same as `diredp-dired-for-files' except uses another window."
+(defun diredp-dired-for-files-other-window (arg &optional switches) ; Bound to `C-x 4 D F'
+ "Same as `diredp-dired-for-files', except uses another window."
(interactive (let ((current-prefix-arg (if current-prefix-arg 0 -1)))
(dired-read-dir-and-switches "in other window " 'READ-EXTRA-FILES-P)))
(dired-other-window arg switches))
;;;###autoload
-(defun diredp-dired-recent-dirs (buffer &optional arg) ; Bound to `C-x R'
+(defun diredp-dired-recent-dirs (buffer &optional arg) ; Bound to `C-x D R'
"Open Dired in BUFFER, showing recently used directories.
You are prompted for BUFFER.
@@ -4651,7 +3342,7 @@ When entering directories to include or exclude, use `C-g' to end."
(dired (cons (generate-new-buffer-name buffer) (diredp-recent-dirs arg)) switches)))
;;;###autoload
-(defun diredp-dired-recent-dirs-other-window (buffer &optional arg) ; Bound to `C-x 4 R'
+(defun diredp-dired-recent-dirs-other-window (buffer &optional arg) ; Bound to `C-x 4 D R'
"Same as `diredp-dired-recent-dirs', but use other window."
(interactive (list (completing-read "Dired buffer name: " dired-buffers) current-prefix-arg))
(unless (require 'recentf nil t) (error "This command requires library `recentf.el'"))
@@ -4745,7 +3436,7 @@ A new list is returned - list THINGS is not modified."
;;; (read-string "Dired listing switches: " dired-listing-switches))))
;;;###autoload
-(defun diredp-dired-union (dired-name dirbufs &optional switches extra) ; Bound to `C-x D'
+(defun diredp-dired-union (dired-name dirbufs &optional switches extra) ; Bound to `C-x 4 D U'
"Create a Dired buffer that is the union of some existing Dired buffers.
With a non-negative prefix arg, you are prompted for `ls' switches.
With a non-positive prefix arg, you are prompted for file and dir
@@ -4812,7 +3503,16 @@ From Lisp:
(diredp-dired-union-1 dired-name dirbufs switches extra))
;;;###autoload
-(defun diredp-add-to-dired-buffer (dired-name to-add &optional switches) ; Bound to `C-x E'
+(defun diredp-dired-union-other-window (dired-name dirbufs &optional switches extra) ; Bound to `C-x 4 D U'
+ "Same as `diredp-dired-union', except use other window."
+ (interactive (diredp-dired-union-interactive-spec "UNION "
+ nil
+ (and current-prefix-arg
+ (<= (prefix-numeric-value current-prefix-arg) 0))))
+ (diredp-dired-union-1 dired-name dirbufs switches extra 'OTHERWIN))
+
+;;;###autoload
+(defun diredp-add-to-dired-buffer (dired-name to-add &optional switches) ; Bound to `C-x D A'
"Add individual file and directory names to a Dired buffer.
You are prompted for the buffer name.
With a prefix arg, you are also prompted for the `ls' switches.
@@ -4843,6 +3543,19 @@ From Lisp:
(list (nth 0 all) (nth 3 all) (nth 2 all))))
(diredp-dired-union-1 dired-name () switches to-add))
+;;;###autoload
+(defun diredp-add-to-dired-buffer-other-window (dired-name to-add &optional switches) ; Bound to `C-x 4 D A'
+ "Same as `diredp-add-to-dired-buffer', except use other window."
+ ;; Bind `current-prefix-arg' to force reading file/dir names.
+ ;; Read `ls' switches too, if user used prefix arg.
+ (interactive
+ (let* ((current-prefix-arg (if current-prefix-arg 0 -1))
+ (all (diredp-dired-union-interactive-spec "add files/dirs "
+ 'NO-DIRED-BUFS
+ 'READ-EXTRA-FILES-P)))
+ (list (nth 0 all) (nth 3 all) (nth 2 all))))
+ (diredp-dired-union-1 dired-name () switches to-add 'OTHERWIN))
+
;;;###autoload
(defun diredp-add-to-this-dired-buffer (dired-name to-add &optional switches) ; Not bound by default
"Same as `diredp-add-to-dired-buffer' for this Dired buffer."
@@ -4861,9 +3574,10 @@ From Lisp:
;; $$$$$ Maybe I should set `dired-sort-inhibit' to t for now (?),
;; since there is an Emacs bug (at least on Windows) that prevents
;; sorting from working for a Dired buffer with an explicit file list.
-(defun diredp-dired-union-1 (dired-name dirbufs switches extra)
+(defun diredp-dired-union-1 (dired-name dirbufs switches extra &optional otherwin)
"Helper for `diredp-dired-union' and `diredp-add-to-dired-buffer'.
-See `diredp-dired-union' for the argument descriptions."
+Non-nil optional OTHERWIN means use other window for the Dired buffer.
+See `diredp-dired-union' for the other argument descriptions."
(let ((dbuf (get-buffer dired-name))
(files extra)
(marked ())
@@ -4982,7 +3696,7 @@ The name is expanded in the directory for the last directory change."
)
;;;###autoload
-(defun diredp-fileset (flset-name) ; Bound to `C-x F'
+(defun diredp-fileset (flset-name) ; Bound to `C-x D S'
"Open Dired on the files in fileset FLSET-NAME."
(interactive
(progn (unless (require 'filesets nil t) (error "Feature `filesets' not provided"))
@@ -4991,7 +3705,7 @@ The name is expanded in the directory for the last directory change."
(diredp-fileset-1 flset-name))
;;;###autoload
-(defun diredp-fileset-other-window (flset-name) ; Bound to `C-x 4 F'
+(defun diredp-fileset-other-window (flset-name) ; Bound to `C-x 4 D S'
"Open Dired in another window on the files in fileset FLSET-NAME."
(interactive
(progn (unless (require 'filesets nil t) (error "Feature `filesets' not provided"))
@@ -5044,8 +3758,9 @@ With a prefix arg:
(dired-other-window this-subdir))))
;;;###autoload
-(defun diredp-dired-inserted-subdirs (&optional no-show-p msgp)
+(defun diredp-dired-inserted-subdirs (&optional no-show-p msgp) ; Bound to `C-M-i'
"Open Dired for each of the subdirs inserted in this Dired buffer.
+A separate Dired buffer is used for each of them.
With a prefix arg, create the Dired buffers but do not display them.
Markings and current Dired switches are preserved."
(interactive "P\np")
@@ -8037,7 +6752,7 @@ choice described for `diredp-do-grep'."
(when (memq system-type '(windows-nt ms-dos))
(define-derived-mode diredp-w32-drives-mode fundamental-mode "Drives"
- "Open Dired for an MS Windows drive (local or remote)."
+ "Mode for Dired buffer listing MS Windows drives (local or remote)."
(setq buffer-read-only t)))
;; The next two commands were originally taken from Emacs Wiki, page WThirtyTwoBrowseNetDrives:
@@ -8054,7 +6769,7 @@ This just invokes the Windows `NET USE' command."
(display-buffer "*Shell Command Output*")))
(when (memq system-type '(windows-nt ms-dos))
- (defun diredp-w32-drives (&optional other-window-p) ; Not bound
+ (defun diredp-w32-drives (&optional other-window-p) ; Bound to `:/'
"Visit a list of MS Windows drives for use by Dired.
With a prefix argument use another window for the list.
In the list, use `mouse-2' or `RET' to open Dired for a given drive.
@@ -10067,7 +8782,7 @@ With non-nil prefix arg, mark them instead."
(unless (eq mouse3-dired-function 'mouse3-dired-use-menu)
(funcall #'mouse3-dired-use-menu)
(revert-buffer))
- (let ((last-command 'mouse-save-then-kill)) (mouse-save-then-kill event 'IGNORE))))
+ (let ((last-command 'mouse-save-then-kill)) (mouse-save-then-kill event))))
;; REPLACE ORIGINAL in `dired.el' for Emacs 20.
@@ -10628,263 +9343,267 @@ Many Dired+ actions are available from the menu-bar menus and the
`mouse-3' context menu. This may include commands shown here as not
being bound to keys (i.e., listed as `M-x ...').
-General
--------
+General Here
+------------
"
-
- (and (fboundp 'dired-hide-details-mode)
- "* \\[dired-hide-details-mode]\t\t- Hide/show details
-")
-
-"* \\[revert-buffer]\t\t- Refresh (sync and show all)
-* \\[diredp-toggle-find-file-reuse-dir]\t- Toggle reusing directories
-"
-
- (and (featurep 'bookmark+)
- "* \\[diredp-highlight-autofiles-mode]\t- Toggle autofile highlighting
-
-")
(and (fboundp 'diredp-w32-drives)
- "* \\[diredp-w32-drives]\t- Go up to a list of MS Windows drives
+ " \\[diredp-w32-drives]\t\t- Go up to a list of MS Windows drives
+")
+ (and (fboundp 'dired-hide-details-mode)
+ " \\[dired-hide-details-mode]\t\t- Hide/show details
+")
+
+ " \\[revert-buffer]\t\t- Refresh (sync and show all)
+ \\[diredp-toggle-find-file-reuse-dir]\t- Toggle reusing directories
+"
+ " \\[diredp-marked-other-window]\t\t- Open Dired on marked files here
+ \\[diredp-dired-inserted-subdirs]\t\t- Dired separately each subdir inserted here
+"
+ (and (featurep 'bookmark+)
+ " \\[diredp-highlight-autofiles-mode]\t- Toggle autofile highlighting
")
- "* \\[diredp-marked-other-window]\t\t- Open Dired on marked
-* \\[diredp-fileset]\t\t- Open Dired on files in a fileset
-* \\[diredp-dired-for-files]\t- Open Dired on specific files
-* \\[diredp-dired-recent-dirs]\t\t- Open Dired on recently used dirs
-* \\[diredp-dired-union]\t\t- Create union of some Dired buffers
-* \\[diredp-dired-inserted-subdirs]\t- Dired each inserted subdir
+ "General Globally
+----------------
+
+\\<global-map>\
+ \\[diredp-add-to-dired-buffer]\t- Add files to a Dired buffer
+ \\[diredp-fileset]\t- Open Dired on files in a fileset
+ \\[diredp-dired-recent-dirs]\t- Open Dired on recently used dirs
+ \\[diredp-dired-union]\t- Create union of some Dired buffers
+ \\[diredp-dired-for-files]\t- Open Dired on files located anywhere
+\\<dired-mode-map>\
Mouse
-----
-* \\[diredp-mouse-3-menu]\t- Context-sensitive menu
+ \\[diredp-mouse-3-menu]\t- Context-sensitive menu
"
(and (where-is-internal 'diredp-mouse-describe-file dired-mode-map)
- "* \\[diredp-mouse-describe-file]\t- Describe file
+ " \\[diredp-mouse-describe-file]\t- Describe file
")
(and (where-is-internal 'diredp-mouse-describe-autofile dired-mode-map)
- "* \\[diredp-mouse-describe-autofile]\t- Describe autofile
+ " \\[diredp-mouse-describe-autofile]\t- Describe autofile
")
- "* \\[diredp-mouse-mark-region-files]\t\t- Mark all in region
-"
-
- (and (where-is-internal 'diredp-mouse-find-file dired-mode-map)
- "* \\[diredp-mouse-find-file]\t- Open in this window
-")
- (and (where-is-internal 'diredp-mouse-find-file-reuse-dir-buffer dired-mode-map)
- "* \\[diredp-mouse-find-file-reuse-dir-buffer]\t- Open in this window
-")
-
- (and (where-is-internal 'dired-mouse-find-file-other-window dired-mode-map)
- "* \\[dired-mouse-find-file-other-window]\t\t- Open in another window
-")
-
- "* \\[diredp-mouse-find-file-other-frame]\t\t- Open in another frame
+ " \\[diredp-mouse-mark-region-files]\t\t- Mark all in region
"
(and (fboundp 'dired-mouse-w32-browser) ; In `w32-browser.el'.
(where-is-internal 'dired-mouse-w32-browser dired-mode-map)
- "* \\[dired-mouse-w32-browser]\t\t- MS Windows `Open' action
+ " \\[dired-mouse-w32-browser]\t\t- MS Windows `Open' action
")
-
(and (fboundp 'dired-mouse-w32-browser-reuse-dir-buffer) ; In `w32-browser.el'.
(where-is-internal 'dired-mouse-w32-browser-reuse-dir-buffer dired-mode-map)
- "* \\[dired-mouse-w32-browser-reuse-dir-buffer]\t- MS Windows `Open' action
+ " \\[dired-mouse-w32-browser-reuse-dir-buffer]\t- MS Windows `Open' action
")
+ (and (where-is-internal 'diredp-mouse-find-file dired-mode-map)
+ " \\[diredp-mouse-find-file]\t- Open in this window
+")
+ (and (where-is-internal 'diredp-mouse-find-file-reuse-dir-buffer dired-mode-map)
+ " \\[diredp-mouse-find-file-reuse-dir-buffer]\t- Open in this window
+")
+
+ (and (where-is-internal 'dired-mouse-find-file-other-window dired-mode-map)
+ " \\[dired-mouse-find-file-other-window]\t\t- Open in another window
+")
+
+ " \\[diredp-mouse-find-file-other-frame]\t\t- Open in another frame
+"
+
"
Marking
-------
-* \\[dired-mark]\t\t- Mark this file/dir
-* \\[dired-unmark]\t\t- Unmark this file/dir
-* \\[dired-toggle-marks]\t\t- Toggle marked/unmarked
-* \\[dired-mark-sexp]\t\t- Mark all satisfying a predicate
-* \\[dired-unmark-all-marks]\t\t- Unmark all
-* \\[diredp-mark/unmark-extension]\t\t- Mark/unmark all that have a given extension
+ \\[dired-mark]\t\t- Mark this file/dir
+ \\[dired-unmark]\t\t- Unmark this file/dir
+ \\[dired-toggle-marks]\t\t- Toggle marked/unmarked
+ \\[dired-mark-sexp]\t\t- Mark all satisfying a predicate
+ \\[dired-unmark-all-marks]\t\t- Unmark all
+ \\[diredp-mark/unmark-extension]\t\t- Mark/unmark all that have a given extension
"
(and (fboundp 'dired-mark-omitted) ; In `dired-x.el'
- "* \\[dired-mark-omitted]\t\t- Mark omitted
+ " \\[dired-mark-omitted]\t\t- Mark omitted
")
- "* \\[diredp-mark-files-tagged-regexp]\t\t- Mark those with a tag that matches a regexp
-* \\[diredp-unmark-files-tagged-regexp]\t\t- Unmark those with a tag that matches a regexp
-* \\[diredp-mark-files-tagged-all]\t\t- Mark those with all of the given tags
-* \\[diredp-unmark-files-tagged-all]\t\t- Unmark those with all of the given tags
-* \\[diredp-mark-files-tagged-some]\t\t- Mark those with some of the given tags
-* \\[diredp-unmark-files-tagged-some]\t\t- Unmark those with some of the given tags
-* \\[diredp-mark-files-tagged-not-all]\t- Mark those without some of the given tags
-* \\[diredp-unmark-files-tagged-not-all]\t- Unmark those without some of the given tags
-* \\[diredp-mark-files-tagged-none]\t- Mark those with none of the given tags
-* \\[diredp-unmark-files-tagged-none]\t- Unmark those with none of the given tags
+ " \\[diredp-mark-files-tagged-regexp]\t\t- Mark those with a tag that matches a regexp
+ \\[diredp-unmark-files-tagged-regexp]\t\t- Unmark those with a tag that matches a regexp
+ \\[diredp-mark-files-tagged-all]\t\t- Mark those with all of the given tags
+ \\[diredp-unmark-files-tagged-all]\t\t- Unmark those with all of the given tags
+ \\[diredp-mark-files-tagged-some]\t\t- Mark those with some of the given tags
+ \\[diredp-unmark-files-tagged-some]\t\t- Unmark those with some of the given tags
+ \\[diredp-mark-files-tagged-not-all]\t- Mark those without some of the given tags
+ \\[diredp-unmark-files-tagged-not-all]\t- Unmark those without some of the given tags
+ \\[diredp-mark-files-tagged-none]\t- Mark those with none of the given tags
+ \\[diredp-unmark-files-tagged-none]\t- Unmark those with none of the given tags
"
"
Current file/subdir (current line)
----------------------------------
-* \\[diredp-describe-file]\t- Describe
-* \\[diredp-byte-compile-this-file]\t\t- Byte-compile
-* \\[diredp-compress-this-file]\t\t- Compress/uncompress
-* \\[diredp-print-this-file]\t\t- Print
-* \\[diredp-relsymlink-this-file]\t\t- Create relative symlink
-* \\[diredp-delete-this-file]\t\t- Delete (with confirmation)
-* \\[diredp-rename-this-file]\t\t- Rename
-* \\[diredp-capitalize-this-file]\t\t- Capitalize (rename)
-* \\[diredp-upcase-this-file]\t\t- Rename to uppercase
-* \\[diredp-downcase-this-file]\t\t- Rename to lowercase
-* \\[diredp-ediff]\t\t- Ediff
+ \\[diredp-describe-file]\t- Describe
+ \\[dired-find-file]\t\t- Open
"
- (and (featurep 'bookmark+)
- "* \\[diredp-tag-this-file]\t\t- Add some tags to this file/dir
-* \\[diredp-untag-this-file]\t\t- Remove some tags from this file/dir
-* \\[diredp-remove-all-tags-this-file]\t\t- Remove all tags from this file/dir
-* \\[diredp-copy-tags-this-file]\t\t- Copy the tags from this file/dir
-* \\[diredp-paste-add-tags-this-file]\t\t- Paste (add) copied tags to this file/dir
-* \\[diredp-paste-replace-tags-this-file]\t\t- Paste (replace) tags for this file/dir
-* \\[diredp-set-tag-value-this-file]\t\t- Set a tag value for this file/dir
-")
-
- "* \\[diredp-bookmark-this-file]\t\t- Bookmark
-"
-
(and (fboundp 'dired-mouse-w32-browser) ; In `w32-browser.el'.
(where-is-internal 'dired-mouse-w32-browser dired-mode-map)
- "* \\[dired-mouse-w32-browser]\t- MS Windows `Open' action
-* \\[dired-w32explore]\t- MS Windows Explorer
+ " \\[dired-mouse-w32-browser]\t- MS Windows `Open' action
+ \\[dired-w32explore]\t- MS Windows Explorer
+")
+
+ " \\[diredp-byte-compile-this-file]\t\t- Byte-compile
+ \\[diredp-compress-this-file]\t\t- Compress/uncompress
+ \\[diredp-print-this-file]\t\t- Print
+ \\[diredp-relsymlink-this-file]\t\t- Create relative symlink
+ \\[diredp-delete-this-file]\t\t- Delete (with confirmation)
+ \\[diredp-rename-this-file]\t\t- Rename
+ \\[diredp-capitalize-this-file]\t\t- Capitalize (rename)
+ \\[diredp-upcase-this-file]\t\t- Rename to uppercase
+ \\[diredp-downcase-this-file]\t\t- Rename to lowercase
+ \\[diredp-ediff]\t\t- Ediff
+ \\[diredp-bookmark-this-file]\t\t- Bookmark
+"
+ (and (featurep 'bookmark+)
+ " \\[diredp-tag-this-file]\t\t- Add some tags to this file/dir
+ \\[diredp-untag-this-file]\t\t- Remove some tags from this file/dir
+ \\[diredp-remove-all-tags-this-file]\t\t- Remove all tags from this file/dir
+ \\[diredp-copy-tags-this-file]\t\t- Copy the tags from this file/dir
+ \\[diredp-paste-add-tags-this-file]\t\t- Paste (add) copied tags to this file/dir
+ \\[diredp-paste-replace-tags-this-file]\t\t- Paste (replace) tags for this file/dir
+ \\[diredp-set-tag-value-this-file]\t\t- Set a tag value for this file/dir
")
(and (fboundp 'dired-mouse-w32-browser-reuse-dir-buffer) ; In `w32-browser.el'.
(where-is-internal 'dired-mouse-w32-browser-reuse-dir-buffer dired-mode-map)
- "* \\[dired-mouse-w32-browser-reuse-dir-buffer]\t- MS Windows `Open' action
-* \\[dired-w32explore]\t- MS Windows Explorer
+ " \\[dired-mouse-w32-browser-reuse-dir-buffer]\t- MS Windows `Open' action
+ \\[dired-w32explore]\t- MS Windows Explorer
")
"
Marked (or next prefix arg) files & subdirs here
------------------------------------------------
+"
+ (and (fboundp 'dired-multiple-w32-browser) ; In `w32-browser.el'.
+ "
+ \\[dired-multiple-w32-browser]\t- MS Windows `Open' action
+")
-* \\[diredp-list-marked]\t\t- List marked files and directories
-* \\[diredp-insert-subdirs]\t\t- Insert marked subdirectories
-* \\[dired-copy-filename-as-kill]\t\t- Copy names for pasting
-* \\[dired-do-find-marked-files]\t\t- Visit
-* \\[dired-do-copy]\t\t- Copy
-* \\[dired-do-rename]\t\t- Rename/move
-* \\[diredp-do-grep]\t\t- Run `grep'
-* \\[dired-do-search]\t\t- Search
+
+ " \\[diredp-list-marked]\t\t- List marked files and directories
+ \\[diredp-insert-subdirs]\t\t- Insert marked subdirectories
+ \\[dired-copy-filename-as-kill]\t\t- Copy names for pasting
+ \\[dired-do-find-marked-files]\t\t- Visit
+ \\[dired-do-copy]\t\t- Copy
+ \\[dired-do-rename]\t\t- Rename/move
+ \\[diredp-do-grep]\t\t- Run `grep'
+ \\[dired-do-search]\t\t- Search
"
(and (fboundp 'dired-do-find-regexp) ; Emacs 25+
- "* \\[dired-do-find-regexp]\t\t- Search using `find'
+ " \\[dired-do-find-regexp]\t\t- Search using `find'
")
(if (fboundp 'dired-do-query-replace-regexp) ; Emacs 22+
- "* \\[dired-do-query-replace-regexp]\t\t- Query-replace
+ " \\[dired-do-query-replace-regexp]\t\t- Query-replace
"
- "* \\[dired-do-query-replace]\t\t- Query-replace
+ " \\[dired-do-query-replace]\t\t- Query-replace
")
(and (fboundp 'dired-do-find-regexp-and-replace)
- "* \\[dired-do-find-regexp-and-replace]\t\t- Query-replace using `find'
+ " \\[dired-do-find-regexp-and-replace]\t\t- Query-replace using `find'
")
(and (fboundp 'dired-do-isearch)
- "* \\[dired-do-isearch]\t- Isearch
-* \\[dired-do-isearch-regexp]\t- Regexp isearch
+ " \\[dired-do-isearch]\t- Isearch
+ \\[dired-do-isearch-regexp]\t- Regexp isearch
")
(and (fboundp 'dired-do-async-shell-command)
- "* \\[dired-do-async-shell-command]\t\t- Run shell command asynchronously
+ " \\[dired-do-async-shell-command]\t\t- Run shell command asynchronously
")
- "* \\[dired-do-shell-command]\t\t- Run shell command
-* \\[diredp-marked-other-window]\t\t- Dired
-* \\[diredp-do-apply-function]\t\t- Apply Lisp function
-* \\[dired-do-compress]\t\t- Compress
-* \\[dired-do-byte-compile]\t\t- Byte-compile
-* \\[dired-do-load]\t\t- Load (Emacs Lisp)
+ " \\[dired-do-shell-command]\t\t- Run shell command
+ \\[diredp-marked-other-window]\t\t- Dired
+ \\[diredp-do-apply-function]\t\t- Apply Lisp function
+ \\[dired-do-compress]\t\t- Compress
+ \\[dired-do-byte-compile]\t\t- Byte-compile
+ \\[dired-do-load]\t\t- Load (Emacs Lisp)
-* \\[diredp-omit-marked]\t- Omit
-* \\[diredp-omit-unmarked]\t- Omit unmarked
+ \\[diredp-omit-marked]\t- Omit
+ \\[diredp-omit-unmarked]\t- Omit unmarked
"
(and (featurep 'bookmark+)
"
-* \\[diredp-do-tag]\t\t- Add some tags to marked
-* \\[diredp-do-untag]\t\t- Remove some tags from marked
-* \\[diredp-do-remove-all-tags]\t\t- Remove all tags from marked
-* \\[diredp-do-paste-add-tags]\t- Paste (add) copied tags to marked
-* \\[diredp-do-paste-replace-tags]\t\t- Paste (replace) tags for marked
-* \\[diredp-do-set-tag-value]\t\t- Set a tag value for marked
-* \\[diredp-mark-files-tagged-regexp]\t\t- Mark those with a tag that matches a regexp
-* \\[diredp-mark-files-tagged-all]\t\t- Mark those with all of the given tags
-* \\[diredp-mark-files-tagged-some]\t\t- Mark those with some of the given tags
-* \\[diredp-mark-files-tagged-not-all]\t- Mark those without some of the given tags
-* \\[diredp-mark-files-tagged-none]\t- Mark those with none of the given tags
-* \\[diredp-unmark-files-tagged-regexp]\t\t- Unmark those with a tag that matches a regexp
-* \\[diredp-unmark-files-tagged-all]\t\t- Unmark those with all of the given tags
-* \\[diredp-unmark-files-tagged-some]\t\t- Unmark those with some of the given tags
-* \\[diredp-unmark-files-tagged-not-all]\t- Unmark those without some of the given tags
-* \\[diredp-unmark-files-tagged-none]\t- Unmark those with none of the given tags")
+ \\[diredp-do-tag]\t\t- Add some tags to marked
+ \\[diredp-do-untag]\t\t- Remove some tags from marked
+ \\[diredp-do-remove-all-tags]\t\t- Remove all tags from marked
+ \\[diredp-do-paste-add-tags]\t- Paste (add) copied tags to marked
+ \\[diredp-do-paste-replace-tags]\t\t- Paste (replace) tags for marked
+ \\[diredp-do-set-tag-value]\t\t- Set a tag value for marked
+ \\[diredp-mark-files-tagged-regexp]\t\t- Mark those with a tag that matches a regexp
+ \\[diredp-mark-files-tagged-all]\t\t- Mark those with all of the given tags
+ \\[diredp-mark-files-tagged-some]\t\t- Mark those with some of the given tags
+ \\[diredp-mark-files-tagged-not-all]\t- Mark those without some of the given tags
+ \\[diredp-mark-files-tagged-none]\t- Mark those with none of the given tags
+ \\[diredp-unmark-files-tagged-regexp]\t\t- Unmark those with a tag that matches a regexp
+ \\[diredp-unmark-files-tagged-all]\t\t- Unmark those with all of the given tags
+ \\[diredp-unmark-files-tagged-some]\t\t- Unmark those with some of the given tags
+ \\[diredp-unmark-files-tagged-not-all]\t- Unmark those without some of the given tags
+ \\[diredp-unmark-files-tagged-none]\t- Unmark those with none of the given tags")
"
-* \\[diredp-do-bookmark]\t\t- Bookmark
+ \\[diredp-do-bookmark]\t\t- Bookmark
"
(and (featurep 'bookmark+)
- "* \\[diredp-set-bookmark-file-bookmark-for-marked]\t\t- \
+ " \\[diredp-set-bookmark-file-bookmark-for-marked]\t\t- \
Bookmark and create bookmark-file bookmark
-* \\[diredp-do-bookmark-in-bookmark-file]\t- Bookmark in specific bookmark file
-")
-
- (and (fboundp 'dired-multiple-w32-browser) ; In `w32-browser.el'.
- "
-* \\[dired-multiple-w32-browser]\t- MS Windows `Open' action
+ \\[diredp-do-bookmark-in-bookmark-file]\t- Bookmark in specific bookmark file
")
"
Marked files here and below (in marked subdirs)
-----------------------------------------------
+"
+ (and (fboundp 'dired-multiple-w32-browser) ; In `w32-browser.el'.
+ "
+ \\[diredp-multiple-w32-browser-recursive]\t- MS Windows `Open' action
+")
-* \\[diredp-list-marked-recursive]\t\t- List marked files and directories
-* \\[diredp-insert-subdirs-recursive]\t\t- Insert marked subdirectories
-* \\[diredp-copy-filename-as-kill-recursive]\t\t- Copy names for pasting
-* \\[diredp-do-find-marked-files-recursive]\t\t\t- Visit
-* \\[diredp-do-copy-recursive]\t\t\t- Copy
-* \\[diredp-do-move-recursive]\t\t\t- Move
-* \\[diredp-do-grep-recursive]\t\t- `grep'
-* \\[diredp-do-search-recursive]\t\t\t- Search
-* \\[diredp-do-query-replace-regexp-recursive]\t\t\t- Query-replace
-* \\[diredp-do-isearch-recursive]\t\t- Isearch
-* \\[diredp-do-isearch-regexp-recursive]\t- Regexp isearch
+ " \\[diredp-list-marked-recursive]\t\t- List marked files and directories
+ \\[diredp-insert-subdirs-recursive]\t\t- Insert marked subdirectories
+ \\[diredp-copy-filename-as-kill-recursive]\t\t- Copy names for pasting
+ \\[diredp-do-find-marked-files-recursive]\t\t\t- Visit
+ \\[diredp-do-copy-recursive]\t\t\t- Copy
+ \\[diredp-do-move-recursive]\t\t\t- Move
+ \\[diredp-do-grep-recursive]\t\t- `grep'
+ \\[diredp-do-search-recursive]\t\t\t- Search
+ \\[diredp-do-query-replace-regexp-recursive]\t\t\t- Query-replace
+ \\[diredp-do-isearch-recursive]\t\t- Isearch
+ \\[diredp-do-isearch-regexp-recursive]\t- Regexp isearch
"
(and (fboundp 'diredp-do-async-shell-command-recursive) ; Emacs 23+
- "* \\[diredp-do-async-shell-command-recursive]\t\t\t- Run shell command asynchronously
+ " \\[diredp-do-async-shell-command-recursive]\t\t\t- Run shell command asynchronously
")
- "* \\[diredp-do-shell-command-recursive]\t\t\t- Run shell command
-* \\[diredp-marked-recursive-other-window]\t\t- Dired
-* \\[diredp-list-marked-recursive]\t\t- List
-* \\[diredp-do-apply-function-recursive]\t\t\t- Apply Lisp function
+ " \\[diredp-do-shell-command-recursive]\t\t\t- Run shell command
+ \\[diredp-marked-recursive-other-window]\t\t- Dired
+ \\[diredp-list-marked-recursive]\t\t- List
+ \\[diredp-do-apply-function-recursive]\t\t\t- Apply Lisp function
-* \\[diredp-do-bookmark-recursive]\t\t- Bookmark
+ \\[diredp-do-bookmark-recursive]\t\t- Bookmark
"
(and (featurep 'bookmark+)
- "* \\[diredp-do-bookmark-in-bookmark-file-recursive]\t\t- Bookmark in bookmark file
-* \\[diredp-set-bookmark-file-bookmark-for-marked-recursive]\t\t- Create bookmark-file bookmark
-")
-
- (and (fboundp 'dired-multiple-w32-browser) ; In `w32-browser.el'.
- "
-* \\[diredp-multiple-w32-browser-recursive]\t- MS Windows `Open'
+ " \\[diredp-do-bookmark-in-bookmark-file-recursive]\t\t- Bookmark in bookmark file
+ \\[diredp-set-bookmark-file-bookmark-for-marked-recursive]\t\t- Create bookmark-file bookmark
")
@@ -10893,51 +9612,51 @@ Marked files here and below (in marked subdirs)
Tagging
-------
-* \\[diredp-tag-this-file]\t\t- Add some tags to this file/dir
-* \\[diredp-untag-this-file]\t\t- Remove some tags from this file/dir
-* \\[diredp-remove-all-tags-this-file]\t\t- Remove all tags from this file/dir
-* \\[diredp-copy-tags-this-file]\t\t- Copy the tags from this file/dir
-* \\[diredp-paste-add-tags-this-file]\t\t- Paste (add) copied tags to this file/dir
-* \\[diredp-paste-replace-tags-this-file]\t\t- Paste (replace) tags for this file/dir
-* \\[diredp-set-tag-value-this-file]\t\t- Set a tag value for this file/dir
-* \\[diredp-do-tag]\t\t- Add some tags to marked
-* \\[diredp-do-untag]\t\t- Remove some tags from marked
-* \\[diredp-do-remove-all-tags]\t\t- Remove all tags from marked
-* \\[diredp-do-paste-add-tags]\t- Paste (add) copied tags to marked
-* \\[diredp-do-paste-replace-tags]\t\t- Paste (replace) tags for marked
-* \\[diredp-do-set-tag-value]\t\t- Set a tag value for marked
-* \\[diredp-mark-files-tagged-regexp]\t\t- Mark those with a tag that matches a regexp
-* \\[diredp-mark-files-tagged-all]\t\t- Mark those with all of the given tags
-* \\[diredp-mark-files-tagged-some]\t\t- Mark those with some of the given tags
-* \\[diredp-mark-files-tagged-not-all]\t- Mark those without some of the given tags
-* \\[diredp-mark-files-tagged-none]\t- Mark those with none of the given tags
-* \\[diredp-unmark-files-tagged-regexp]\t\t- Unmark those with a tag that matches a regexp
-* \\[diredp-unmark-files-tagged-all]\t\t- Unmark those with all of the given tags
-* \\[diredp-unmark-files-tagged-some]\t\t- Unmark those with some of the given tags
-* \\[diredp-unmark-files-tagged-not-all]\t- Unmark those without some of the given tags
-* \\[diredp-unmark-files-tagged-none]\t- Unmark those with none of the given tags
+ \\[diredp-tag-this-file]\t\t- Add some tags to this file/dir
+ \\[diredp-untag-this-file]\t\t- Remove some tags from this file/dir
+ \\[diredp-remove-all-tags-this-file]\t\t- Remove all tags from this file/dir
+ \\[diredp-copy-tags-this-file]\t\t- Copy the tags from this file/dir
+ \\[diredp-paste-add-tags-this-file]\t\t- Paste (add) copied tags to this file/dir
+ \\[diredp-paste-replace-tags-this-file]\t\t- Paste (replace) tags for this file/dir
+ \\[diredp-set-tag-value-this-file]\t\t- Set a tag value for this file/dir
+ \\[diredp-do-tag]\t\t- Add some tags to marked
+ \\[diredp-do-untag]\t\t- Remove some tags from marked
+ \\[diredp-do-remove-all-tags]\t\t- Remove all tags from marked
+ \\[diredp-do-paste-add-tags]\t- Paste (add) copied tags to marked
+ \\[diredp-do-paste-replace-tags]\t\t- Paste (replace) tags for marked
+ \\[diredp-do-set-tag-value]\t\t- Set a tag value for marked
+ \\[diredp-mark-files-tagged-regexp]\t\t- Mark those with a tag that matches a regexp
+ \\[diredp-mark-files-tagged-all]\t\t- Mark those with all of the given tags
+ \\[diredp-mark-files-tagged-some]\t\t- Mark those with some of the given tags
+ \\[diredp-mark-files-tagged-not-all]\t- Mark those without some of the given tags
+ \\[diredp-mark-files-tagged-none]\t- Mark those with none of the given tags
+ \\[diredp-unmark-files-tagged-regexp]\t\t- Unmark those with a tag that matches a regexp
+ \\[diredp-unmark-files-tagged-all]\t\t- Unmark those with all of the given tags
+ \\[diredp-unmark-files-tagged-some]\t\t- Unmark those with some of the given tags
+ \\[diredp-unmark-files-tagged-not-all]\t- Unmark those without some of the given tags
+ \\[diredp-unmark-files-tagged-none]\t- Unmark those with none of the given tags
")
"
Bookmarking
-----------
-* \\[diredp-bookmark-this-file]\t\t- Bookmark this file/dir
-* \\[diredp-do-bookmark]\t\t- Bookmark marked"
+ \\[diredp-bookmark-this-file]\t\t- Bookmark this file/dir
+ \\[diredp-do-bookmark]\t\t- Bookmark marked"
(and (featurep 'bookmark+)
"
-* \\[diredp-set-bookmark-file-bookmark-for-marked]\t\t- \
+ \\[diredp-set-bookmark-file-bookmark-for-marked]\t\t- \
Bookmark marked and create bookmark-file bookmark
-* \\[diredp-do-bookmark-in-bookmark-file]\t- Bookmark marked, in specific bookmark file
+ \\[diredp-do-bookmark-in-bookmark-file]\t- Bookmark marked, in specific bookmark file
")
- "* \\[diredp-do-bookmark-recursive]\t- Bookmark marked, here and below
+ " \\[diredp-do-bookmark-recursive]\t- Bookmark marked, here and below
"
(and (featurep 'bookmark+)
- "* \\[diredp-do-bookmark-in-bookmark-file-recursive]\t- \
+ " \\[diredp-do-bookmark-in-bookmark-file-recursive]\t- \
Bookmark marked, here and below, in specific file
-* \\[diredp-set-bookmark-file-bookmark-for-marked-recursive]\t- \
+ \\[diredp-set-bookmark-file-bookmark-for-marked-recursive]\t- \
Set bookmark-file bookmark for marked here and below
")
@@ -11013,6 +9732,1358 @@ Dired+ bug: \
File `dired+.el' has a header `Update #' that you can use to identify it.\
%%0A%%0AEmacs version: %s.")
(emacs-version))))
+
+;;; Key Bindings.
+
+
+;; Menu Bar.
+;; New order is (left -> right):
+;;
+;; Dir Regexp Mark Multiple Single
+
+;; Get rid of menu bar predefined in `dired.el'.
+(define-key dired-mode-map [menu-bar] nil)
+;; Get rid of Edit menu bar menu to save space.
+(define-key dired-mode-map [menu-bar edit] 'undefined)
+
+
+;; `Single' menu.
+;;
+;; REPLACE ORIGINAL `Immediate' menu in `dired.el'.
+;;
+(defvar diredp-menu-bar-immediate-menu (make-sparse-keymap "Single"))
+(define-key dired-mode-map [menu-bar immediate] (cons "Single" diredp-menu-bar-immediate-menu))
+
+(if (fboundp 'diredp-describe-file)
+ (define-key diredp-menu-bar-immediate-menu [diredp-describe-file]
+ '(menu-item "Describe" diredp-describe-file
+ :help "Describe the file or directory at cursor"))
+ (define-key diredp-menu-bar-immediate-menu [diredp-describe-autofile]
+ '(menu-item "Describe" diredp-describe-autofile
+ :help "Describe the autofile at cursor"
+ :enable (featurep 'bookmark+))))
+(define-key diredp-menu-bar-immediate-menu [separator-describe] '("--")) ; ---------------------
+
+(when (fboundp 'diredp-chown-this-file)
+ (define-key diredp-menu-bar-immediate-menu [chown]
+ '(menu-item "Change Owner..." diredp-chown-this-file
+ :help "Change the owner of file at cursor")))
+(when (fboundp 'diredp-chgrp-this-file)
+ (define-key diredp-menu-bar-immediate-menu [chgrp]
+ '(menu-item "Change Group..." diredp-chgrp-this-file
+ :help "Change the group of file at cursor")))
+(define-key diredp-menu-bar-immediate-menu [chmod]
+ '(menu-item "Change Mode..." diredp-chmod-this-file
+ :help "Change mode (attributes) of file at cursor"))
+(when (fboundp 'dired-do-touch) ; Emacs 22+
+ (define-key diredp-menu-bar-immediate-menu [touch]
+ '(menu-item "Change Timestamp (`touch')..." diredp-touch-this-file
+ :help "Change the timestamp of file at cursor, using `touch'")))
+(define-key diredp-menu-bar-immediate-menu [separator-change] '("--")) ; -----------------------
+
+(define-key diredp-menu-bar-immediate-menu [load]
+ '(menu-item "Load" diredp-load-this-file
+ :help "Load this Emacs Lisp file"))
+(define-key diredp-menu-bar-immediate-menu [compile]
+ '(menu-item "Byte Compile" diredp-byte-compile-this-file
+ :help "Byte-compile this Emacs Lisp file"))
+(define-key diredp-menu-bar-immediate-menu [diredp-async-shell-command-this-file]
+ '(menu-item "Asynchronous Shell Command..." diredp-async-shell-command-this-file
+ :help "Run a shell command asynchronously on file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [command]
+ '(menu-item "Shell Command..." diredp-shell-command-this-file
+ :help "Run a shell command on file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [compress]
+ '(menu-item "Compress/Uncompress" diredp-compress-this-file
+ :help "Compress/uncompress file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [grep]
+ '(menu-item "Grep..." diredp-grep-this-file :help "Grep file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [print]
+ '(menu-item "Print..." diredp-print-this-file
+ :help "Print file at cursor, supplying print command"))
+
+(when (fboundp 'mkhtml-dired-files) ; In `mkhtml.el'.
+ (define-key diredp-menu-bar-immediate-menu [mkhtml-dired-files]
+ '(menu-item "Create HTML" mkhtml-dired-files
+ :help "Create an HTML file corresponding to file at cursor")))
+(define-key diredp-menu-bar-immediate-menu [separator-misc] '("--")) ; -------------------------
+
+(define-key diredp-menu-bar-immediate-menu [delete]
+ '(menu-item "Delete" diredp-delete-this-file :help "Delete file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [separator-delete] '("--")) ; -----------------------
+
+(define-key diredp-menu-bar-immediate-menu [hardlink]
+ '(menu-item "Hardlink to..." diredp-hardlink-this-file
+ :help "Make hard links for current or marked files"))
+(if (not (fboundp 'dired-do-relsymlink))
+ (define-key diredp-menu-bar-immediate-menu [symlink]
+ '(menu-item "Symlink to..." diredp-symlink-this-file
+ :visible (fboundp 'make-symbolic-link) :help "Make symbolic link for file at cursor"))
+ (define-key diredp-menu-bar-immediate-menu [symlink]
+ '(menu-item "Symlink to (Absolute)..." diredp-symlink-this-file
+ :help "Make absolute symbolic link for file at cursor"))
+ (define-key diredp-menu-bar-immediate-menu [relsymlink]
+ '(menu-item "Symlink to (Relative)..." diredp-relsymlink-this-file ; In `dired-x.el'.
+ :help "Make relative symbolic link for file at cursor")))
+(define-key diredp-menu-bar-immediate-menu [copy]
+ '(menu-item "Copy to..." diredp-copy-this-file :help "Copy file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [rename]
+ '(menu-item "Move to..." diredp-rename-this-file
+ :help "Rename file at cursor, or move it to a different directory"))
+(define-key diredp-menu-bar-immediate-menu [separator-link] '("--")) ; -------------------------
+
+(define-key diredp-menu-bar-immediate-menu [downcase]
+ '(menu-item "Downcase" diredp-downcase-this-file
+ ;; When running on plain MS-DOS, there is only one letter-case for file names.
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Rename file at cursor to a lower-case name"))
+(define-key diredp-menu-bar-immediate-menu [upcase]
+ '(menu-item "Upcase" diredp-upcase-this-file
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Rename file at cursor to an upper-case name"))
+(define-key diredp-menu-bar-immediate-menu [capitalize]
+ '(menu-item "Capitalize" diredp-capitalize-this-file
+ :help "Capitalize (initial caps) name of file at cursor"))
+(define-key diredp-menu-bar-immediate-menu [separator-rename] '("--")) ; -----------------------
+
+(define-key diredp-menu-bar-immediate-menu [backup-diff]
+ '(menu-item "Diff with Backup" dired-backup-diff
+ :help "Diff file at cursor with its latest backup"))
+(define-key diredp-menu-bar-immediate-menu [diff]
+ '(menu-item "Diff..." dired-diff
+ :help "Compare file at cursor with another file using `diff'"))
+(define-key diredp-menu-bar-immediate-menu [ediff]
+ '(menu-item "Compare..." diredp-ediff :help "Compare file at cursor with another file"))
+(define-key diredp-menu-bar-immediate-menu [separator-diff] '("--")) ; -------------------------
+
+(define-key diredp-menu-bar-immediate-menu [diredp-kill-this-tree]
+ '(menu-item "Remove This Inserted Subdir and Lower" diredp-kill-this-tree
+ :visible (and (fboundp 'diredp-kill-this-tree)
+ (not (equal
+ (expand-file-name (dired-current-directory))
+ (expand-file-name default-directory)))))) ; In subdir, not top.
+(define-key diredp-menu-bar-immediate-menu [dired-kill-subdir]
+ '(menu-item "Remove This Inserted Subdir" dired-kill-subdir
+ :visible (not (equal (expand-file-name (dired-current-directory))
+ (expand-file-name default-directory))))) ; In subdir, not top.
+(define-key diredp-menu-bar-immediate-menu [diredp-dired-this-subdir]
+ '(menu-item "Dired This Inserted Subdir (Tear Off)"
+ (lambda () (interactive) (diredp-dired-this-subdir t))
+ :visible (and (cdr dired-subdir-alist) ; First is current dir. Must have at least one more.
+ (not (equal (expand-file-name (dired-current-directory))
+ (expand-file-name default-directory)))) ; Must be sub, not top.
+ :help "Open Dired for subdir at or above point, tearing it off if inserted"))
+(define-key diredp-menu-bar-immediate-menu [insert-subdir]
+ '(menu-item "Insert This Subdir" dired-maybe-insert-subdir
+ :visible (and (atom (diredp-this-subdir))
+ (not (assoc (file-name-as-directory (diredp-this-subdir)) dired-subdir-alist)))
+ :enable (atom (diredp-this-subdir))
+ :help "Insert a listing of this subdirectory"))
+(define-key diredp-menu-bar-immediate-menu [goto-subdir]
+ '(menu-item "Go To Inserted Subdir" dired-maybe-insert-subdir
+ :visible (and (atom (diredp-this-subdir))
+ (assoc (file-name-as-directory (diredp-this-subdir)) dired-subdir-alist))
+ :enable (atom (diredp-this-subdir))
+ :help "Go to the inserted listing of this subdirectory"))
+(define-key diredp-menu-bar-immediate-menu [separator-subdir] '("--" ; ------------------------
+ :visible (or (atom (diredp-this-subdir)) ; Subdir line.
+ (not (equal (expand-file-name (dired-current-directory))
+ (expand-file-name default-directory)))))) ; Not top.
+
+(define-key diredp-menu-bar-immediate-menu [view]
+ '(menu-item "View (Read Only)" dired-view-file
+ :help "Examine file at cursor in read-only mode"))
+(define-key diredp-menu-bar-immediate-menu [display]
+ '(menu-item "Display in Other Window" dired-display-file
+ :help "Display file at cursor in a different window"))
+;; On Windows, bind more.
+(eval-after-load "w32-browser"
+ '(progn
+ (define-key diredp-menu-bar-immediate-menu [dired-w32-browser]
+ '(menu-item "Open Associated Windows App" dired-w32-browser
+ :help "Open file using the Windows app associated with its file type"))
+ (define-key diredp-menu-bar-immediate-menu [dired-w32explore]
+ '(menu-item "Open in Windows Explorer" dired-w32explore
+ :help "Open file in Windows Explorer"))))
+(define-key diredp-menu-bar-immediate-menu [find-file-other-frame]
+ '(menu-item "Open in Other Frame" diredp-find-file-other-frame
+ :help "Edit file at cursor in a different frame"))
+(define-key diredp-menu-bar-immediate-menu [find-file-other-window]
+ '(menu-item "Open in Other Window" dired-find-file-other-window
+ :help "Edit file at cursor in a different window"))
+(define-key diredp-menu-bar-immediate-menu [find-file]
+ '(menu-item "Open" dired-find-file :help "Edit file at cursor"))
+
+
+;; `Single' > `Image' menu.
+;;
+(defvar diredp-menu-bar-immediate-image-menu (make-sparse-keymap "Image"))
+(defalias 'diredp-menu-bar-immediate-image-menu diredp-menu-bar-immediate-image-menu)
+(define-key diredp-menu-bar-immediate-menu [image]
+ '(menu-item "Image" diredp-menu-bar-immediate-image-menu
+ :enable (let ((img-file (diredp-get-image-filename 'LOCALP 'NO-ERROR)))
+ (and (fboundp 'image-dired-dired-display-image) img-file))))
+
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-display-thumb]
+ '(menu-item "Go To Thumbnail" diredp-image-dired-display-thumb
+ :help "Pop to buffer showing the thumbnail of this image file"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-create-thumb]
+ '(menu-item "Create Thumbnail" diredp-image-dired-create-thumb
+ :help "Create a thumbnail image for this image file"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-edit-comment-and-tags]
+ '(menu-item "Edit Comment and Tags..." diredp-image-dired-edit-comment-and-tags
+ :help "Edit comment and tags for this image file"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-delete-tag]
+ '(menu-item "Delete Image Tag..." diredp-image-dired-delete-tag
+ :help "Remove an `image-dired' tag from this image file"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-tag-file]
+ '(menu-item "Add Tags..." diredp-image-dired-tag-file
+ :help "Add tags to this image file"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-comment-file]
+ '(menu-item "Add Comment..." diredp-image-dired-comment-file
+ :help "Add a comment to this image file"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-copy-with-exif-name]
+ '(menu-item "Copy with EXIF Name" diredp-image-dired-copy-with-exif-name
+ :help "Copy this image file to main image dir using EXIF name"))
+(define-key diredp-menu-bar-immediate-image-menu [image-dired-dired-display-external]
+ '(menu-item "Display Externally" image-dired-dired-display-external
+ :help "Display image using external viewer"))
+(define-key diredp-menu-bar-immediate-image-menu [image-dired-dired-display-image]
+ '(menu-item "Display to Fit Other Window" image-dired-dired-display-image
+ :help "Display scaled image to fit a separate window"))
+(define-key diredp-menu-bar-immediate-image-menu [diredp-image-show-this-file]
+ '(menu-item "Display Full Size Or Smaller" diredp-image-show-this-file
+ :help "Display image full size or at least prefix-arg lines high"))
+(define-key diredp-menu-bar-immediate-image-menu [dired-find-file]
+ '(menu-item "Display Full Size" dired-find-file
+ :help "Display image full size"))
+
+
+;; `Single' > `Encryption' menu.
+;;
+(when (fboundp 'epa-dired-do-encrypt) ; Emacs 23+
+ (defvar diredp-menu-bar-immediate-encryption-menu (make-sparse-keymap "Encryption"))
+ (define-key diredp-menu-bar-immediate-menu [encryption]
+ (cons "Encryption" diredp-menu-bar-immediate-encryption-menu))
+
+ (define-key diredp-menu-bar-immediate-encryption-menu [diredp-decrypt-this-file]
+ '(menu-item "Decrypt..." (lambda ()
+ (interactive)
+ (epa-decrypt-file (expand-file-name (dired-get-filename
+ nil 'NO-ERROR-P))))
+ :help "Decrypt this file"))
+ (define-key diredp-menu-bar-immediate-encryption-menu [diredp-verify-this-file]
+ '(menu-item "Verify..." (lambda ()
+ (interactive)
+ (epa-verify-file (expand-file-name (dired-get-filename
+ nil 'NO-ERROR-P))))
+ :help "Verify this file"))
+ (define-key diredp-menu-bar-immediate-encryption-menu [diredp-sign-this-file]
+ '(menu-item "Sign..." (lambda ()
+ (interactive)
+ (epa-sign-file (expand-file-name (dired-get-filename
+ nil 'NO-ERROR-P))
+ (epa-select-keys (epg-make-context)
+ "Select keys for signing.
+If no one is selected, default secret key is used. "
+ nil t)))
+ :help "Encrypt this file"))
+ (define-key diredp-menu-bar-immediate-encryption-menu [diredp-encrypt-this-file]
+ '(menu-item "Encrypt..." (lambda ()
+ (interactive)
+ (epa-encrypt-file (expand-file-name (dired-get-filename
+ nil 'NO-ERROR-P))
+ (epa-select-keys
+ (epg-make-context)
+ "Select recipients for encryption.
+If no one is selected, symmetric encryption will be performed. "
+ nil t)))
+ :help "Sign this file")))
+
+
+;; `Single' > `Bookmark' menu.
+;;
+(when (require 'bookmark+ nil t)
+ (defvar diredp-menu-bar-immediate-bookmarks-menu (make-sparse-keymap "Bookmark"))
+ (define-key diredp-menu-bar-immediate-menu [bookmark]
+ (cons "Bookmark" diredp-menu-bar-immediate-bookmarks-menu))
+
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-set-tag-value-this-file]
+ '(menu-item "Set Tag Value..." diredp-set-tag-value-this-file
+ :help "Set the value (not the name) of a given tag for this file"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-paste-replace-tags-this-file]
+ '(menu-item "Paste Tags (Replace)" diredp-paste-replace-tags-this-file
+ :help "Replace tags for this file with previously copied tags"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-paste-add-tags-this-file]
+ '(menu-item "Paste Tags (Add)" diredp-paste-add-tags-this-file
+ :help "Add previously copied tags to this file"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-copy-tags-this-file]
+ '(menu-item "Copy Tags" diredp-copy-tags-this-file
+ :help "Copy the tags from this file, so you can paste them to another"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-remove-all-tags-this-file]
+ '(menu-item "Remove All Tags" diredp-remove-all-tags-this-file
+ :help "Remove all tags from the file at cursor"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-untag-this-file]
+ '(menu-item "Remove Tags..." diredp-untag-this-file
+ :help "Remove some tags from the file at cursor (`C-u': remove all tags)"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-tag-this-file]
+ '(menu-item "Add Tags..." diredp-tag-this-file :help "Add some tags to the file at cursor"))
+ (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-bookmark-this-file]
+ '(menu-item "Bookmark..." diredp-bookmark-this-file
+ :help "Bookmark the file at cursor (create/set autofile)")))
+
+
+;; `Multiple' menu.
+;;
+;; REPLACE ORIGINAL "Operate" menu in `dired.el'.
+;;
+(defvar diredp-menu-bar-operate-menu (make-sparse-keymap "Multiple"))
+(define-key dired-mode-map [menu-bar operate] (cons "Multiple" diredp-menu-bar-operate-menu))
+
+(define-key diredp-menu-bar-operate-menu [diredp-describe-marked-autofiles]
+ '(menu-item "Describe Marked Autofiles" diredp-describe-marked-autofiles
+ :help "Show the metadata for the marked files that are autofiles"
+ :enable (featurep 'bookmark+)))
+(define-key diredp-menu-bar-operate-menu [separator-describe] '("--")) ; -----------------------
+
+(unless (memq system-type '(windows-nt ms-dos))
+ (define-key diredp-menu-bar-operate-menu [chown]
+ '(menu-item "Change Owner..." dired-do-chown
+ :help "Change the owner of marked files")))
+(unless (memq system-type '(windows-nt ms-dos))
+ (define-key diredp-menu-bar-operate-menu [chgrp]
+ '(menu-item "Change Group..." dired-do-chgrp
+ :help "Change the owner of marked files")))
+(define-key diredp-menu-bar-operate-menu [chmod]
+ '(menu-item "Change Mode..." dired-do-chmod
+ :help "Change mode (attributes) of marked files"))
+(when (fboundp 'dired-do-touch) ; Emacs 22+
+ (define-key diredp-menu-bar-operate-menu [touch]
+ '(menu-item "Change Timestamp (`touch')..." dired-do-touch
+ :help "Change the timestamp of the marked files, using `touch'")))
+(define-key diredp-menu-bar-operate-menu [separator-change] '("--")) ; -------------------------
+
+(define-key diredp-menu-bar-operate-menu [load]
+ '(menu-item "Load" dired-do-load :help "Load marked Emacs Lisp files"))
+(define-key diredp-menu-bar-operate-menu [compile]
+ '(menu-item "Byte Compile" dired-do-byte-compile :help "Byte-compile marked Emacs Lisp files"))
+(when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
+ (define-key diredp-menu-bar-operate-menu [async-command]
+ '(menu-item "Asynchronous Shell Command..." dired-do-async-shell-command
+ :help "Run a shell command asynchronously on each marked file")))
+(define-key diredp-menu-bar-operate-menu [command]
+ '(menu-item "Shell Command..." dired-do-shell-command
+ :help "Run a shell command on each marked file"))
+(when (fboundp 'dired-do-compress-to)
+ (define-key diredp-menu-bar-operate-menu [compress-to]
+ '(menu-item "Compress to..." dired-do-compress-to
+ :help "Compress marked files and dirs together, in the same archive")))
+(define-key diredp-menu-bar-operate-menu [compress]
+ '(menu-item "Compress/Uncompress" dired-do-compress :help "Compress/uncompress marked files"))
+(define-key diredp-menu-bar-operate-menu [diredp-do-apply-function]
+ '(menu-item "Apply Lisp Function..." diredp-do-apply-function
+ :help "Apply a Lisp function to each marked file name (`C-u': file contents, not name)"))
+(define-key diredp-menu-bar-operate-menu [print]
+ '(menu-item "Print..." dired-do-print :help "Print marked files, supplying print command"))
+
+(unless (require 'bookmark+ nil t)
+ (define-key diredp-menu-bar-immediate-menu [diredp-bookmark-this-file]
+ '(menu-item "Bookmark..." diredp-bookmark-this-file :help "Bookmark the file at cursor")))
+(when (fboundp 'mkhtml-dired-files) ; In `mkhtml.el'.
+ (define-key diredp-menu-bar-operate-menu [mkhtml-dired-files]
+ '(menu-item "Create HTML" mkhtml-dired-files
+ :help "Create HTML files corresponding to marked files")))
+(define-key diredp-menu-bar-operate-menu [separator-misc] '("--")) ; ---------------------------
+
+(define-key diredp-menu-bar-operate-menu [delete-flagged]
+ '(menu-item "Delete Flagged" dired-do-flagged-delete
+ :help "Delete all files flagged for deletion (D)"))
+(define-key diredp-menu-bar-operate-menu [delete]
+ '(menu-item "Delete Marked (not Flagged)" dired-do-delete
+ :help "Delete current file or all marked files (not flagged files)"))
+(define-key diredp-menu-bar-operate-menu [separator-delete] '("--")) ; -------------------------
+
+(define-key diredp-menu-bar-operate-menu [hardlink]
+ '(menu-item "Hardlink to..." dired-do-hardlink
+ :help "Make hard links for current or marked files"))
+(if (not (fboundp 'dired-do-relsymlink))
+ (define-key diredp-menu-bar-operate-menu [symlink]
+ '(menu-item "Symlink to..." dired-do-symlink
+ :visible (fboundp 'make-symbolic-link)
+ :help "Make symbolic links for current or marked files"))
+ (define-key diredp-menu-bar-operate-menu [symlink]
+ '(menu-item "Symlink to (Absolute)..." dired-do-symlink
+ :help "Make absolute symbolic links for current or marked files"))
+ (define-key diredp-menu-bar-operate-menu [relsymlink] ; In `dired-x.el'.
+ '(menu-item "Symlink to (Relative)..." dired-do-relsymlink
+ :help "Make relative symbolic links for current or marked files")))
+(define-key diredp-menu-bar-operate-menu [copy]
+ '(menu-item "Copy to..." dired-do-copy :help "Copy current file or all marked files"))
+(define-key diredp-menu-bar-operate-menu [rename]
+ '(menu-item "Move to..." dired-do-rename :help "Rename current file or move marked files"))
+(define-key diredp-menu-bar-operate-menu [separator-rename] '("--")) ; -------------------------
+
+(define-key diredp-menu-bar-operate-menu [capitalize]
+ '(menu-item "Capitalize" diredp-capitalize
+ :help "Capitalize (initial caps) the names of all marked files"))
+(define-key diredp-menu-bar-operate-menu [downcase]
+ '(menu-item "Downcase" dired-downcase
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Rename marked files to lowercase names"))
+(define-key diredp-menu-bar-operate-menu [upcase]
+ '(menu-item "Upcase" dired-upcase
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Rename marked files to uppercase names"))
+(define-key diredp-menu-bar-operate-menu [separator-lettercase] '("--")) ; ---------------------
+
+(when (fboundp 'dired-copy-filename-as-kill)
+ (define-key diredp-menu-bar-operate-menu [kill-ring]
+ '(menu-item "Copy File Names (to Paste)" dired-copy-filename-as-kill
+ :help "Copy names of marked files onto kill ring, for pasting")))
+(define-key diredp-menu-bar-operate-menu [diredp-list-marked]
+ '(menu-item "List Marked Files" diredp-list-marked
+ :help "List the files marked here (C-u C-u: all, C-u C-u C-u: all + dirs)"))
+(define-key diredp-menu-bar-operate-menu [diredp-insert-subdirs]
+ '(menu-item "Insert Subdirs" diredp-insert-subdirs
+ :help "Insert the marked subdirectories - like using `i' at each marked dir"))
+(define-key diredp-menu-bar-operate-menu [diredp-marked-other-window]
+ '(menu-item "Dired (Marked) in Other Window" diredp-marked-other-window
+ :enable (save-excursion (goto-char (point-min))
+ (and (re-search-forward (dired-marker-regexp) nil t)
+ (re-search-forward (dired-marker-regexp) nil t)))
+ :help "Open Dired on marked files only, in other window"))
+(define-key diredp-menu-bar-operate-menu [diredp-marked]
+ '(menu-item "Dired (Marked)" diredp-marked
+ :enable (save-excursion (goto-char (point-min))
+ (and (re-search-forward (dired-marker-regexp) nil t)
+ (re-search-forward (dired-marker-regexp) nil t)))
+ :help "Open Dired on marked files only"))
+;; On Windows, bind more.
+(eval-after-load "w32-browser"
+ '(define-key diredp-menu-bar-operate-menu [dired-multiple-w32-browser]
+ '(menu-item "Open Associated Windows Apps" dired-multiple-w32-browser
+ :help "Open files using the Windows apps associated with their file types")))
+(when (fboundp 'dired-do-find-marked-files)
+ (define-key diredp-menu-bar-operate-menu [find-files]
+ '(menu-item "Open" dired-do-find-marked-files ; In `dired-x.el'.
+ :help "Open each marked file for editing")))
+
+
+;; `Multiple' > `Images' menu.
+;;
+(defvar diredp-menu-bar-images-menu (make-sparse-keymap "Images"))
+(defalias 'diredp-menu-bar-images-menu diredp-menu-bar-images-menu)
+(define-key diredp-menu-bar-operate-menu [images]
+ '(menu-item "Images" diredp-menu-bar-images-menu
+ :enable (fboundp 'image-dired-display-thumbs)))
+
+;; Remove the items from `Multiple' menu.
+(define-key diredp-menu-bar-operate-menu [image-dired-delete-tag] nil)
+(define-key diredp-menu-bar-operate-menu [image-dired-tag-files] nil)
+(define-key diredp-menu-bar-operate-menu [image-dired-dired-comment-files] nil)
+(define-key diredp-menu-bar-operate-menu [image-dired-display-thumbs] nil)
+
+;; Add them to `Multiple' > `Images' menu.
+(define-key diredp-menu-bar-images-menu [image-dired-delete-tag]
+ '(menu-item "Delete Tag..." image-dired-delete-tag
+ :help "Delete tag from marked image files"))
+(define-key diredp-menu-bar-images-menu [image-dired-tag-files]
+ '(menu-item "Add Tags..." image-dired-tag-files
+ :help "Add tags to marked image files"))
+(define-key diredp-menu-bar-images-menu [image-dired-dired-comment-files]
+ '(menu-item "Add Comment..." image-dired-dired-comment-files
+ :help "Add comment to marked image files"))
+(define-key diredp-menu-bar-images-menu [image-dired-display-thumbs]
+ '(menu-item "Display Thumbnails" image-dired-display-thumbs
+ :help "Display thumbnails for marked image files"))
+(define-key diredp-menu-bar-images-menu [diredp-do-display-images]
+ '(menu-item "Display" diredp-do-display-images
+ :help "Display the marked image files"))
+
+
+;; `Multiple' > `Encryption' menu.
+;;
+(when (fboundp 'epa-dired-do-encrypt) ; Emacs 23+
+ (defvar diredp-menu-bar-encryption-menu (make-sparse-keymap "Encryption"))
+ (define-key diredp-menu-bar-operate-menu [encryption]
+ (cons "Encryption" diredp-menu-bar-encryption-menu))
+
+ ;; Remove the items from `Multiple' menu.
+ (define-key diredp-menu-bar-operate-menu [epa-dired-do-decrypt] nil)
+ (define-key diredp-menu-bar-operate-menu [epa-dired-do-verify] nil)
+ (define-key diredp-menu-bar-operate-menu [epa-dired-do-sign] nil)
+ (define-key diredp-menu-bar-operate-menu [epa-dired-do-encrypt] nil)
+
+ ;; Add them to `Multiple' > `Encryption' menu.
+ (define-key diredp-menu-bar-encryption-menu [epa-dired-do-decrypt]
+ '(menu-item "Decrypt..." epa-dired-do-decrypt :help "Decrypt the marked files"))
+ (define-key diredp-menu-bar-encryption-menu [epa-dired-do-verify]
+ '(menu-item "Verify..." epa-dired-do-verify :help "Verify the marked files"))
+ (define-key diredp-menu-bar-encryption-menu [epa-dired-do-sign]
+ '(menu-item "Sign..." epa-dired-do-sign :help "Sign the marked files"))
+ (define-key diredp-menu-bar-encryption-menu [epa-dired-do-encrypt]
+ '(menu-item "Encrypt..." epa-dired-do-encrypt :help "Encrypt the marked files")))
+
+
+;; `Multiple' > `Search' menu.
+;;
+(defvar diredp-menu-bar-operate-search-menu (make-sparse-keymap "Search"))
+(define-key diredp-menu-bar-operate-menu [search]
+ (cons "Search" diredp-menu-bar-operate-search-menu))
+(when (fboundp 'dired-do-isearch-regexp) ; Emacs 23+
+ (define-key diredp-menu-bar-operate-search-menu [isearch-regexp]
+ '(menu-item "Isearch Regexp Files..." dired-do-isearch-regexp
+ :help "Incrementally search marked files for regexp"))
+ (define-key diredp-menu-bar-operate-search-menu [isearch]
+ '(menu-item "Isearch Files..." dired-do-isearch
+ :help "Incrementally search marked files for string")))
+(when (fboundp 'dired-do-find-regexp-and-replace)
+ (define-key diredp-menu-bar-operate-search-menu [find-query-replace]
+ '(menu-item "Query Replace using `find'..." dired-do-find-regexp-and-replace
+ :help "Replace regexp in marked files using `find'")))
+(define-key diredp-menu-bar-operate-search-menu [query-replace]
+ (if (< emacs-major-version 21)
+ '(menu-item "Query Replace..." dired-do-query-replace)
+ '(menu-item "Query Replace..." dired-do-query-replace-regexp
+ :help "Replace regexp in marked files")))
+(when (fboundp 'dired-do-find-regexp)
+ (define-key diredp-menu-bar-operate-search-menu [find-regexp]
+ '(menu-item "Search Files using `find'..." dired-do-find-regexp
+ :help "Search marked files for regexp using `find'")))
+(define-key diredp-menu-bar-operate-search-menu [search]
+ '(menu-item "Search Files..." dired-do-search :help "Search marked files for regexp"))
+(define-key diredp-menu-bar-operate-search-menu [grep]
+ '(menu-item "Grep..." diredp-do-grep :help "Grep marked, next N, or all files shown"))
+
+
+;; `Multiple' > `Bookmark' menu.
+;;
+(defvar diredp-menu-bar-operate-bookmarks-menu (make-sparse-keymap "Bookmark"))
+(define-key diredp-menu-bar-operate-menu [bookmark]
+ (cons "Bookmark" diredp-menu-bar-operate-bookmarks-menu))
+
+(when (require 'bookmark+ nil t)
+ (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-set-tag-value]
+ '(menu-item "Set Tag Value..." diredp-do-set-tag-value
+ :help "Set the value of a given tag for the marked or next N files"))
+ (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-paste-replace-tags]
+ '(menu-item "Paste Tags (Replace)" diredp-do-paste-replace-tags
+ :help "Replace tags for the marked or next N files with copied tags"))
+ (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-paste-add-tags]
+ '(menu-item "Paste Tags (Add)" diredp-do-paste-add-tags
+ :help "Add previously copied tags to the marked or next N files"))
+ (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-remove-all-tags]
+ '(menu-item "Remove All Tags" diredp-do-remove-all-tags
+ :help "Remove all tags from the marked or next N files"))
+ (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-untag]
+ '(menu-item "Remove Tags..." diredp-do-untag
+ :help "Remove some tags from the marked or next N files"))
+ (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-tag]
+ '(menu-item "Add Tags..." diredp-do-tag
+ :help "Add some tags to the marked or next N files"))
+ (define-key diredp-menu-bar-operate-bookmarks-menu [separator-book-2] '("--"))) ; ------------
+
+(define-key diredp-menu-bar-operate-bookmarks-menu
+ [diredp-do-bookmark-in-bookmark-file-recursive]
+ '(menu-item "Bookmark in Bookmark File (Here and Below)..."
+ diredp-do-bookmark-in-bookmark-file-recursive
+ :help "Bookmark marked files (including in marked subdirs) in bookmark file and save it"))
+(define-key diredp-menu-bar-operate-bookmarks-menu
+ [diredp-set-bookmark-file-bookmark-for-marked-recursive]
+ '(menu-item "Create Bookmark-File Bookmark (Here and Below)..."
+ diredp-set-bookmark-file-bookmark-for-marked-recursive
+ :help "Create a bookmark-file bookmark for marked files, including in marked subdirs"))
+(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-dirs-recursive]
+ '(menu-item "Bookmark Dirs (Here and Below)..." diredp-do-bookmark-dirs-recursive
+ :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
+(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-recursive]
+ '(menu-item "Bookmark (Here and Below)..." diredp-do-bookmark-recursive
+ :help "Bookmark the marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-operate-bookmarks-menu [separator-book-1] '("--")) ; ---------------
+
+(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-in-bookmark-file]
+ '(menu-item "Bookmark in Bookmark File..." diredp-do-bookmark-in-bookmark-file
+ :help "Bookmark the marked files in BOOKMARK-FILE and save BOOKMARK-FILE"))
+(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-set-bookmark-file-bookmark-for-marked]
+ '(menu-item "Create Bookmark-File Bookmark..." diredp-set-bookmark-file-bookmark-for-marked
+ :help "Create a bookmark-file bookmark, and bookmark the marked files in it"))
+(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark]
+ '(menu-item "Bookmark..." diredp-do-bookmark :help "Bookmark the marked or next N files"))
+
+
+;; `Multiple' > `Marked Here and Below' menu.
+;;
+(defvar diredp-menu-bar-operate-recursive-menu (make-sparse-keymap "Marked Here and Below"))
+(define-key diredp-menu-bar-operate-menu [operate-recursive]
+ (cons "Marked Here and Below" diredp-menu-bar-operate-recursive-menu))
+
+
+(when (fboundp 'diredp-do-chown-recursive)
+ (define-key diredp-menu-bar-operate-recursive-menu [chown]
+ '(menu-item "Change Owner..." diredp-do-chown-recursive
+ :help "Change the owner of marked files, including those in marked subdirs")))
+(when (fboundp 'diredp-do-chgrp-recursive)
+ (define-key diredp-menu-bar-operate-recursive-menu [chgrp]
+ '(menu-item "Change Group..." diredp-do-chgrp-recursive
+ :help "Change the owner of marked files, including those in marked subdirs")))
+(define-key diredp-menu-bar-operate-recursive-menu [chmod]
+ '(menu-item "Change Mode..." diredp-do-chmod-recursive
+ :help "Change mode (attributes) of marked files, including those in marked subdirs"))
+(when (fboundp 'dired-do-touch) ; Emacs 22+
+ (define-key diredp-menu-bar-operate-recursive-menu [touch]
+ '(menu-item "Change Timestamp (`touch')..." diredp-do-touch-recursive
+ :help "Change timestamp of marked files, including those in marked subdirs")))
+(define-key diredp-menu-bar-operate-recursive-menu [separator-change] '("--")) ; ----------------
+
+(when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
+ (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-async-shell-command-recursive]
+ '(menu-item "Asynchronous Shell Command..." diredp-do-async-shell-command-recursive
+ :help "Run shell command asynchronously on marked files, including in marked subdirs")))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-shell-command-recursive]
+ '(menu-item "Shell Command..." diredp-do-shell-command-recursive
+ :help "Run shell command on the marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-apply-function-recursive]
+ '(menu-item "Apply Lisp Function..." diredp-do-apply-function-recursive
+ :help "Apply a Lisp function to the marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-print-recursive]
+ '(menu-item "Print..." diredp-do-print-recursive
+ :help "Print the marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-operate-recursive-menu [separator-misc] '("--")) ; ------------------
+
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-delete-recursive]
+ '(menu-item "Delete Marked (not Flagged)" diredp-do-delete-recursive
+ :help "Delete marked (not flagged) files, including in marked subdirs"))
+(define-key diredp-menu-bar-operate-recursive-menu [separator-delete] '("--")) ; ----------------
+
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-hardlink-recursive]
+ '(menu-item "Hardlink to..." diredp-do-hardlink-recursive
+ :help "Make hard links for marked files, including those in marked subdirs"))
+(if (not (fboundp 'dired-do-relsymlink))
+ (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-symlink-recursive]
+ '(menu-item "Symlink to..." diredp-do-symlink-recursive
+ :visible (fboundp 'make-symbolic-link)
+ :help "Make symbolic links for marked files, including those in marked subdirs"))
+ (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-symlink-recursive]
+ '(menu-item "Symlink to (Absolute)..." diredp-do-symlink-recursive
+ :help "Make absolute symbolic links for marked files, including those in marked subdirs"))
+ (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-relsymlink-recursive]
+ '(menu-item "Symlink to (Relative)..." diredp-do-relsymlink-recursive
+ :help "Make relative symbolic links for marked files, including those in marked subdirs")))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-copy-recursive]
+ '(menu-item "Copy to..." diredp-do-copy-recursive
+ :help "Copy marked files, including in marked subdirs, to a given directory"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-move-recursive]
+ '(menu-item "Move to..." diredp-do-move-recursive
+ :help "Move marked files, including in marked subdirs, to a given directory"))
+(define-key diredp-menu-bar-operate-recursive-menu [separator-copy-move] '("--")) ; -------------
+
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-capitalize-recursive]
+ '(menu-item "Capitalize" diredp-capitalize-recursive
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Capitalize the names of all marked files, including in marked subdirs"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-downcase-recursive]
+ '(menu-item "Downcase" diredp-downcase-recursive
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Rename marked files, including in marked subdirs, to lowercase names"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-upcase-recursive]
+ '(menu-item "Upcase" diredp-upcase-recursive
+ :enable (or (not (fboundp 'msdos-long-file-names)) (msdos-long-file-names))
+ :help "Rename marked files, including in marked subdirs, to uppercase names"))
+(define-key diredp-menu-bar-operate-recursive-menu [separator-lettercase] '("--")) ; ------------
+
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-list-marked-recursive]
+ '(menu-item "List Marked Files" diredp-list-marked-recursive
+ :help "List the files marked here and in marked subdirs, recursively"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-copy-filename-as-kill-recursive]
+ '(menu-item "Copy File Names (to Paste)" diredp-copy-filename-as-kill-recursive
+ :help "Copy names of files marked here and in marked subdirs, to `kill-ring'"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-insert-subdirs-recursive]
+ '(menu-item "Insert Subdirs" diredp-insert-subdirs-recursive
+ :help "Insert the marked subdirectories, gathered recursively"))
+(define-key diredp-menu-bar-operate-recursive-menu [separator-dirs] '("--")) ; ------------------
+
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-marked-recursive-other-window]
+ '(menu-item "Dired (Marked) in Other Window" diredp-marked-recursive-other-window
+ :help "Open Dired (in other window) on marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-marked-recursive]
+ '(menu-item "Dired (Marked)" diredp-marked-recursive
+ :help "Open Dired on marked files, including those in marked subdirs"))
+;; On Windows, bind more.
+(eval-after-load "w32-browser"
+ '(define-key diredp-menu-bar-operate-recursive-menu [diredp-multiple-w32-browser-recursive]
+ '(menu-item "Open Associated Windows Apps" diredp-multiple-w32-browser-recursive
+ :help "Run Windows apps for with marked files, including those in marked subdirs")))
+(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-find-marked-files-recursive]
+ '(menu-item "Open" diredp-do-find-marked-files-recursive
+ :help "Find marked files simultaneously, including those in marked subdirs"))
+
+
+;; `Multiple' > `Marked Here and Below' > `Images' menu.
+;;
+(defvar diredp-menu-bar-images-recursive-menu (make-sparse-keymap "Images"))
+(defalias 'diredp-menu-bar-images-recursive-menu diredp-menu-bar-images-recursive-menu)
+(define-key diredp-menu-bar-operate-recursive-menu [images]
+ '(menu-item "Images" diredp-menu-bar-images-recursive-menu
+ :enable (fboundp 'image-dired-delete-tag)))
+(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-delete-tag-recursive]
+ '(menu-item "Delete Image Tag..." diredp-image-dired-delete-tag-recursive
+ :help "Remove an `image-dired' tag from marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-tag-files-recursive]
+ '(menu-item "Add Image Tags..." diredp-image-dired-tag-files-recursive
+ :help "Add `image-dired' tags to marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-comment-files-recursive]
+ '(menu-item "Add Image Comment..." diredp-image-dired-comment-files-recursive
+ :help "Add image comment to marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-display-thumbs-recursive]
+ '(menu-item "Display Image Thumbnails" diredp-image-dired-display-thumbs-recursive
+ :help "Show thumbnails for marked image files, including those in marked subdirs"))
+
+
+;; `Multiple' > `Marked Here and Below' > `Encryption' menu.
+;;
+(when (fboundp 'epa-dired-do-encrypt) ; Emacs 23+
+ (defvar diredp-menu-bar-encryption-recursive-menu (make-sparse-keymap "Encryption"))
+ (define-key diredp-menu-bar-operate-recursive-menu [encryption]
+ (cons "Encryption" diredp-menu-bar-encryption-recursive-menu))
+ (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-decrypt-recursive]
+ '(menu-item "Decrypt..." diredp-do-decrypt-recursive
+ :help "Decrypt marked files, including those in marked subdirs"))
+ (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-verify-recursive]
+ '(menu-item "Verify..." diredp-do-verify-recursive
+ :help "Verify marked files, including those in marked subdirs"))
+ (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-sign-recursive]
+ '(menu-item "Sign..." diredp-do-sign-recursive
+ :help "Sign marked files, including those in marked subdirs"))
+ (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-encrypt-recursive]
+ '(menu-item "Encrypt..." diredp-do-encrypt-recursive
+ :help "Encrypt marked files, including those in marked subdirs")))
+
+
+;; `Multiple' > `Marked Here and Below' > `Search' menu.
+;;
+(defvar diredp-menu-bar-search-recursive-menu (make-sparse-keymap "Search"))
+(define-key diredp-menu-bar-operate-recursive-menu [search]
+ (cons "Search" diredp-menu-bar-search-recursive-menu))
+(when (fboundp 'dired-do-isearch-regexp) ; Emacs 23+
+ (define-key diredp-menu-bar-search-recursive-menu [diredp-do-isearch-regexp-recursive]
+ '(menu-item "Isearch Regexp Files..." diredp-do-isearch-regexp-recursive
+ :help "Incrementally regexp search marked files, including those in marked subdirs"))
+ (define-key diredp-menu-bar-search-recursive-menu [diredp-do-isearch-recursive]
+ '(menu-item "Isearch Files..." diredp-do-isearch-recursive
+ :help "Incrementally search marked files, including those in marked subdirs")))
+(define-key diredp-menu-bar-search-recursive-menu [diredp-do-query-replace-regexp-recursive]
+ '(menu-item "Query Replace..." diredp-do-query-replace-regexp-recursive
+ :help "Replace regexp in marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-search-recursive-menu [diredp-do-search-recursive]
+ '(menu-item "Search Files..." diredp-do-search-recursive
+ :help "Regexp search marked files, including those in marked subdirs"))
+(define-key diredp-menu-bar-search-recursive-menu [diredp-do-grep-recursive]
+ '(menu-item "Grep..." diredp-do-grep-recursive
+ :help "Run `grep' on the marked files, including those in marked subdirs"))
+
+
+;; `Multiple' > `Marked Here and Below' > `Bookmark' menu.
+;;
+(defvar diredp-menu-bar-bookmarks-recursive-menu (make-sparse-keymap "Bookmark"))
+(define-key diredp-menu-bar-operate-recursive-menu [bookmarks]
+ (cons "Bookmark" diredp-menu-bar-bookmarks-recursive-menu))
+(define-key diredp-menu-bar-bookmarks-recursive-menu
+ [diredp-do-bookmark-in-bookmark-file-recursive]
+ '(menu-item "Bookmark in Bookmark File..." diredp-do-bookmark-in-bookmark-file-recursive
+ :help "Bookmark marked files, including those in marked subdirs, in a bookmark file"))
+(define-key diredp-menu-bar-bookmarks-recursive-menu
+ [diredp-set-bookmark-file-bookmark-for-marked-recursive]
+ '(menu-item "Create Bookmark-File Bookmark..."
+ diredp-set-bookmark-file-bookmark-for-marked-recursive
+ :help "Create a bookmark-file bookmark for marked files, including in marked subdirs"))
+(define-key diredp-menu-bar-bookmarks-recursive-menu [diredp-do-bookmark-dirs-recursive]
+ '(menu-item "Bookmark Dirs..." diredp-do-bookmark-dirs-recursive
+ :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
+(define-key diredp-menu-bar-bookmarks-recursive-menu [diredp-do-bookmark-recursive]
+ '(menu-item "Bookmark..." diredp-do-bookmark-recursive
+ :help "Bookmark the marked files, including those in marked subdirs"))
+
+
+
+;; `Regexp' menu.
+;;
+;; REPLACE ORIGINAL `Regexp' menu in `dired.el'.
+;;
+(defvar diredp-menu-bar-regexp-menu (make-sparse-keymap "Regexp"))
+(define-key dired-mode-map [menu-bar regexp] (cons "Regexp" diredp-menu-bar-regexp-menu))
+
+(define-key diredp-menu-bar-regexp-menu [hardlink]
+ '(menu-item "Hardlink to..." dired-do-hardlink-regexp
+ :help "Make hard links for files matching regexp"))
+(if (not (fboundp 'dired-do-relsymlink-regexp))
+ (define-key diredp-menu-bar-regexp-menu [symlink]
+ '(menu-item "Symlink to..." dired-do-symlink-regexp
+ :visible (fboundp 'make-symbolic-link)
+ :help "Make symbolic links for files matching regexp"))
+ (define-key diredp-menu-bar-regexp-menu [symlink]
+ '(menu-item "Symlink to (Absolute)..." dired-do-symlink-regexp
+ :visible (fboundp 'make-symbolic-link)
+ :help "Make absolute symbolic links for files matching regexp"))
+ (define-key diredp-menu-bar-regexp-menu [relsymlink] ; In `dired-x.el'.
+ '(menu-item "Symlink to (Relative)..." dired-do-relsymlink-regexp
+ :visible (fboundp 'make-symbolic-link)
+ :help "Make relative symbolic links for files matching regexp")))
+(define-key diredp-menu-bar-regexp-menu [copy]
+ '(menu-item "Copy to..." dired-do-copy-regexp :help "Copy marked files matching regexp"))
+(define-key diredp-menu-bar-regexp-menu [rename]
+ '(menu-item "Move to..." dired-do-rename-regexp :help "Move marked files matching regexp"))
+(define-key diredp-menu-bar-regexp-menu [flag]
+ '(menu-item "Flag..." dired-flag-files-regexp :help "Flag files matching regexp for deletion"))
+(define-key diredp-menu-bar-regexp-menu [image-dired-mark-tagged-files]
+ '(menu-item "Mark Image Files Tagged..." image-dired-mark-tagged-files
+ :enable (fboundp 'image-dired-mark-tagged-files)
+ :help "Mark image files whose image tags match regexp"))
+(define-key diredp-menu-bar-regexp-menu [mark-cont]
+ '(menu-item "Mark Containing..." dired-mark-files-containing-regexp
+ :help "Mark files whose contents matches regexp"))
+(define-key diredp-menu-bar-regexp-menu [mark]
+ '(menu-item "Mark..." dired-mark-files-regexp
+ :help "Mark files matching regexp"))
+
+
+;; `Regexp' > `Here and Below' menu.
+;;
+(defvar diredp-menu-bar-regexp-recursive-menu (make-sparse-keymap "Here and Below"))
+(define-key diredp-menu-bar-regexp-menu [mark-recursive]
+ (cons "Here and Below" diredp-menu-bar-regexp-recursive-menu))
+(define-key diredp-menu-bar-regexp-recursive-menu [diredp-mark-files-regexp-recursive]
+ '(menu-item "Mark..." diredp-mark-files-regexp-recursive
+ :help "Mark all files matching a regexp, including those in marked subdirs"))
+
+
+;; "Mark" menu.
+;;
+;; REPLACE ORIGINAL `Mark' menu in `dired.el'.
+;;
+(defvar diredp-menu-bar-mark-menu (make-sparse-keymap "Mark"))
+(define-key dired-mode-map [menu-bar mark] (cons "Mark" diredp-menu-bar-mark-menu))
+
+(when (fboundp 'dired-flag-extension)
+ (define-key diredp-menu-bar-mark-menu [flag-extension] ; In `dired-x.el'
+ '(menu-item "Flag Extension..." dired-flag-extension
+ :help "Flag all files that have a certain extension, for deletion")))
+(define-key diredp-menu-bar-mark-menu [garbage-files]
+ '(menu-item "Flag Garbage Files" dired-flag-garbage-files
+ :help "Flag unneeded files for deletion"))
+(define-key diredp-menu-bar-mark-menu [backup-files]
+ '(menu-item "Flag Backup Files" dired-flag-backup-files
+ :help "Flag all backup files for deletion"))
+(define-key diredp-menu-bar-mark-menu [auto-save-files]
+ '(menu-item "Flag Auto-save Files" dired-flag-auto-save-files
+ :help "Flag auto-save files for deletion"))
+(define-key diredp-menu-bar-mark-menu [flag-region]
+ '(menu-item "Flag Region" diredp-flag-region-files-for-deletion
+ :enable (diredp-nonempty-region-p)
+ :help "Flag all files in the region (selection) for deletion"))
+(when (< emacs-major-version 21)
+ (put 'diredp-flag-region-files-for-deletion 'menu-enable '(diredp-nonempty-region-p)))
+(define-key diredp-menu-bar-mark-menu [deletion]
+ '(menu-item "Flag" dired-flag-file-deletion :help "Flag current line's file for deletion"))
+(define-key diredp-menu-bar-mark-menu [separator-flag] '("--")) ; ------------------------------
+
+(define-key diredp-menu-bar-mark-menu [prev]
+ '(menu-item "Previous Marked" dired-prev-marked-file :help "Move to previous marked file"))
+(define-key diredp-menu-bar-mark-menu [next]
+ '(menu-item "Next Marked" dired-next-marked-file :help "Move to next marked file"))
+(define-key diredp-menu-bar-mark-menu [marks]
+ '(menu-item "Change Marks..." dired-change-marks
+ :help "Replace marker with another character"))
+(define-key diredp-menu-bar-mark-menu [omit-unmarked]
+ '(menu-item "Omit Unmarked" diredp-omit-unmarked :help "Hide lines of unmarked files"))
+(define-key diredp-menu-bar-mark-menu [omit-marked]
+ '(menu-item "Omit Marked" diredp-omit-marked :help "Hide lines of marked files"))
+(define-key diredp-menu-bar-mark-menu [toggle-marks]
+ (if (> emacs-major-version 21)
+ '(menu-item "Toggle Marked/Unmarked" dired-toggle-marks
+ :help "Mark unmarked files, unmark marked ones")
+ '(menu-item "Toggle Marked/Unmarked" dired-toggle-marks
+ :help "Mark unmarked files, unmark marked ones")))
+(define-key diredp-menu-bar-mark-menu [separator-mark] '("--")) ; ------------------------------
+
+(when (fboundp 'dired-mark-sexp)
+ (define-key diredp-menu-bar-mark-menu [mark-sexp] ; In `dired-x.el'.
+ '(menu-item "Mark If..." dired-mark-sexp
+ :help "Mark files for which specified condition is true")))
+(define-key diredp-menu-bar-mark-menu [image-dired-mark-tagged-files]
+ '(menu-item "Mark Image Files Tagged..." image-dired-mark-tagged-files
+ :enable (fboundp 'image-dired-mark-tagged-files)
+ :help "Mark image files whose image tags match regexp"))
+(define-key diredp-menu-bar-mark-menu [mark-cont]
+ '(menu-item "Mark Containing..." dired-mark-files-containing-regexp
+ :help "Mark files whose contents matches regexp"))
+(define-key diredp-menu-bar-mark-menu [mark]
+ '(menu-item "Mark..." dired-mark-files-regexp
+ :help "Mark files matching regexp"))
+(when (fboundp 'dired-mark-omitted) ; In `dired-x.el'.
+ (define-key diredp-menu-bar-mark-menu [mark-omitted]
+ '(menu-item "Mark Omitted..." dired-mark-omitted
+ :help "Mark all omitted files and subdirectories")))
+(define-key diredp-menu-bar-mark-menu [mark-autofiles]
+ '(menu-item "Mark Autofiles..." diredp-mark-autofiles
+ :help "Mark all autofiles (bookmarks with same name as file)"
+ :enable (featurep 'bookmark+)))
+(define-key diredp-menu-bar-mark-menu [mark-extension]
+ '(menu-item "Mark Extension..." diredp-mark/unmark-extension
+ :help "Mark all files with specified extension"))
+(define-key diredp-menu-bar-mark-menu [symlinks]
+ '(menu-item "Mark Symlinks" dired-mark-symlinks
+ :visible (fboundp 'make-symbolic-link) :help "Mark all symbolic links"))
+(define-key diredp-menu-bar-mark-menu [directories]
+ '(menu-item "Mark Directories" dired-mark-directories
+ :help "Mark all directories except `.' and `..'"))
+(define-key diredp-menu-bar-mark-menu [directory]
+ '(menu-item "Mark Old Backups" dired-clean-directory
+ :help "Flag old numbered backups for deletion"))
+(define-key diredp-menu-bar-mark-menu [executables]
+ '(menu-item "Mark Executables" dired-mark-executables :help "Mark all executable files"))
+(define-key diredp-menu-bar-mark-menu [mark-region]
+ '(menu-item "Mark Region" diredp-mark-region-files
+ :enable (diredp-nonempty-region-p)
+ :help "Mark all of the files in the region (selection)"))
+(when (< emacs-major-version 21)
+ (put 'diredp-mark-region-files 'menu-enable '(diredp-nonempty-region-p)))
+(define-key diredp-menu-bar-mark-menu [mark]
+ '(menu-item "Mark" dired-mark :help "Mark current line's file for future operations"))
+(define-key diredp-menu-bar-mark-menu [separator-unmark] '("--")) ; ----------------------------
+
+(define-key diredp-menu-bar-mark-menu [unmark-autofiles]
+ '(menu-item "Unmark Autofiles..." diredp-unmark-autofiles
+ :help "Unmark all autofiles (bookmarks with same name as file)"
+ :enable (featurep 'bookmark+)))
+(define-key diredp-menu-bar-mark-menu [unmark-all]
+ '(menu-item "Unmark All" dired-unmark-all-marks :help "Remove all marks from all files"))
+(define-key diredp-menu-bar-mark-menu [unmark-with]
+ '(menu-item "Unmark Marked-With..." dired-unmark-all-files
+ :help "Remove a specific mark (or all marks) from every file"))
+(define-key diredp-menu-bar-mark-menu [unmark-region]
+ '(menu-item "Unmark Region" diredp-unmark-region-files
+ :enable (diredp-nonempty-region-p)
+ :help "Unmark all files in the region (selection)"))
+(when (< emacs-major-version 21)
+ (put 'diredp-unmark-region-files 'menu-enable '(diredp-nonempty-region-p)))
+(define-key diredp-menu-bar-mark-menu [unmark]
+ '(menu-item "Unmark" dired-unmark :help "Unmark or unflag current line's file"))
+
+
+;; `Mark' > `Tagged' menu.
+;;
+(when (require 'bookmark+ nil t)
+ (defvar diredp-mark-tags-menu (make-sparse-keymap "Tagged (Autofiles)")
+ "`Tags' submenu for Dired menu-bar `Mark' menu.")
+ (define-key diredp-menu-bar-mark-menu [mark-tags] (cons "Tagged" diredp-mark-tags-menu))
+
+ (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-none]
+ '(menu-item "Unmark Not Tagged with Any..." diredp-unmark-files-tagged-none
+ :help "Unmark files that are not tagged with *any* of the tags you enter"))
+ (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-not-all]
+ '(menu-item "Unmark Not Tagged with All..." diredp-unmark-files-tagged-not-all
+ :help "Unmark files that are not tagged with *all* tags"))
+ (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-some]
+ '(menu-item "Unmark Tagged with Some..." diredp-unmark-files-tagged-some
+ :help "Unmark files that are tagged with at least one of the tags you enter"))
+ (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-all]
+ '(menu-item "Unmark Tagged with All..." diredp-unmark-files-tagged-all
+ :help "Unmark files that are tagged with *each* tag you enter"))
+ (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-regexp]
+ '(menu-item "Unmark Tagged Matching Regexp..." diredp-unmark-files-tagged-regexp
+ :help "Unmark files that have at least one tag that matches a regexp"))
+
+ (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-none]
+ '(menu-item "Mark Not Tagged with Any..." diredp-mark-files-tagged-none
+ :help "Mark files that are not tagged with *any* of the tags you enter"))
+ (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-not-all]
+ '(menu-item "Mark Not Tagged with All..." diredp-mark-files-tagged-not-all
+ :help "Mark files that are not tagged with *all* tags"))
+ (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-some]
+ '(menu-item "Mark Tagged with Some..." diredp-mark-files-tagged-some
+ :help "Mark files that are tagged with at least one of the tags you enter"))
+ (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-all]
+ '(menu-item "Mark Tagged with All..." diredp-mark-files-tagged-all
+ :help "Mark files that are tagged with *each* tag you enter"))
+ (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-regexp]
+ '(menu-item "Mark Tagged Matching Regexp..." diredp-mark-files-tagged-regexp
+ :help "Mark files that have at least one tag that matches a regexp")))
+
+
+;; "Dir" menu.
+;;
+;; REPLACE ORIGINAL `Subdir' menu in `dired.el'.
+;;
+(defvar diredp-menu-bar-subdir-menu (make-sparse-keymap "Dir"))
+(define-key dired-mode-map [menu-bar subdir] (cons "Dir" diredp-menu-bar-subdir-menu))
+
+
+;; `Dir' > `Hide/Show' menu.
+;;
+(defvar diredp-hide/show-menu (make-sparse-keymap "Hide/Show")
+ "`Hide/Show' submenu for Dired menu-bar `Dir' menu.")
+(define-key diredp-menu-bar-subdir-menu [hide-show] (cons "Hide/Show" diredp-hide/show-menu))
+
+(when (fboundp 'dired-omit-mode)
+ (define-key diredp-hide/show-menu [dired-omit-mode]
+ '(menu-item "Hide/Show Uninteresting (Omit Mode)" dired-omit-mode
+ :help "Toggle omission of uninteresting files (Omit mode)")))
+(when (fboundp 'dired-hide-details-mode) ; Emacs 24.4+
+ (define-key diredp-hide/show-menu [hide-details]
+ '(menu-item "Hide/Show Details" dired-hide-details-mode
+ :help "Hide or show less important fields of directory listing")))
+(define-key diredp-hide/show-menu [hide-all]
+ '(menu-item "Hide/Show All Subdirs" dired-hide-all
+ :help "Hide all subdirectories, leave only header lines"))
+(define-key diredp-hide/show-menu [hide-subdir]
+ '(menu-item "Hide/Show Subdir" diredp-hide-subdir-nomove
+ :help "Hide or unhide current directory listing"))
+
+
+;; `Dir' > `Bookmark' menu.
+;;
+(defvar diredp-bookmark-menu (make-sparse-keymap "Bookmark")
+ "`Bookmark' submenu for Dired menu-bar `Dir' menu.")
+(define-key diredp-menu-bar-subdir-menu [bookmark] (cons "Bookmark" diredp-bookmark-menu))
+
+(define-key diredp-bookmark-menu [diredp-highlight-autofiles-mode]
+ '(menu-item "Toggle Autofile Highlighting" diredp-highlight-autofiles-mode
+ :help "Toggle whether to highlight autofile bookmarks"
+ :visible (and (featurep 'bookmark+) (featurep 'highlight))))
+(define-key diredp-bookmark-menu [diredp-do-bookmark-dirs-recursive]
+ '(menu-item "Bookmark Dirs Here and Below..." diredp-do-bookmark-dirs-recursive
+ :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
+(define-key diredp-bookmark-menu [bookmark-dired]
+ '(menu-item "Bookmark Dired Buffer..." bookmark-set :help "Bookmark this Dired buffer"))
+
+
+;; `Dir' > `Navigate' menu.
+;;
+(defvar diredp-navigate-menu (make-sparse-keymap "Navigate")
+ "`Navigate' submenu for Dired menu-bar `Dir' menu.")
+(define-key diredp-menu-bar-subdir-menu [navigate] (cons "Navigate" diredp-navigate-menu))
+
+(define-key diredp-navigate-menu [insert]
+ '(menu-item "Move To This Subdir" dired-maybe-insert-subdir
+ :help "Move to subdirectory line or listing"))
+(define-key diredp-navigate-menu [tree-down]
+ '(menu-item "Tree Down" dired-tree-down :help "Go to first subdirectory header down the tree"))
+(define-key diredp-navigate-menu [tree-up]
+ '(menu-item "Tree Up" dired-tree-up :help "Go to first subdirectory header up the tree"))
+(define-key diredp-navigate-menu [up]
+ '(menu-item "Up Directory" diredp-up-directory :help "Dired the parent directory"))
+(define-key diredp-navigate-menu [prev-subdir]
+ '(menu-item "Prev Subdir" diredp-prev-subdir :help "Go to previous subdirectory header line"))
+(define-key diredp-navigate-menu [next-subdir]
+ '(menu-item "Next Subdir" diredp-next-subdir :help "Go to next subdirectory header line"))
+(define-key diredp-navigate-menu [prev-dirline]
+ '(menu-item "Prev Dirline" diredp-prev-dirline :help "Move to previous directory-file line"))
+(define-key diredp-navigate-menu [next-dirline]
+ '(menu-item "Next Dirline" diredp-next-dirline :help "Move to next directory-file line"))
+
+(define-key diredp-menu-bar-subdir-menu [separator-subdir] '("--")) ; --------------------------
+
+(define-key diredp-menu-bar-subdir-menu [image-dired-dired-toggle-marked-thumbs]
+ '(menu-item "Toggle Image Thumbnails" image-dired-dired-toggle-marked-thumbs
+ :enable (fboundp 'image-dired-dired-toggle-marked-thumbs)
+ :help "Add or remove image thumbnails in front of marked file names"))
+(when (fboundp 'dired-isearch-filenames) ; Emacs 23+
+ (define-key diredp-menu-bar-subdir-menu [isearch-filenames-regexp]
+ '(menu-item "Isearch Regexp in File Names..." dired-isearch-filenames-regexp
+ :help "Incrementally search for regexp in file names only"))
+ (define-key diredp-menu-bar-subdir-menu [isearch-filenames]
+ '(menu-item "Isearch in File Names..." dired-isearch-filenames
+ :help "Incrementally search for literal text in file names only.")))
+(when (or (> emacs-major-version 21) (fboundp 'wdired-change-to-wdired-mode))
+ (define-key diredp-menu-bar-subdir-menu [wdired-mode]
+ '(menu-item "Edit File Names (WDired)" wdired-change-to-wdired-mode
+ :help "Put a Dired buffer in a mode in which filenames are editable"
+ :keys "C-x C-q" :filter (lambda (x) (and (derived-mode-p 'dired-mode) x)))))
+(when (fboundp 'dired-compare-directories) ; Emacs 22+
+ (define-key diredp-menu-bar-subdir-menu [compare-directories]
+ '(menu-item "Compare Directories..." dired-compare-directories
+ :help "Mark files with different attributes in two Dired buffers")))
+
+(define-key diredp-menu-bar-subdir-menu [separator-dired-on-set] '("--")) ; --------------------
+
+(define-key diredp-menu-bar-subdir-menu [diredp-dired-recent-dirs]
+ '(menu-item "Dired Recent Directories..." diredp-dired-recent-dirs
+ :visible (boundp 'recentf-list) :enable (and (boundp 'recentf-list) (consp recentf-list))
+ :help "Open a Dired buffer for recently used directories"))
+(define-key diredp-menu-bar-subdir-menu [diredp-dired-inserted-subdirs]
+ '(menu-item "Dired Each Inserted Subdir..." diredp-dired-inserted-subdirs
+ :enable (cdr dired-subdir-alist) ; First elt is current dir. Must have at least one more.
+ :help "Open Dired separately for each of the inserted subdirectories"))
+(define-key diredp-menu-bar-subdir-menu [diredp-add-to-this-dired-buffer]
+ '(menu-item "Add Entries Here..." diredp-add-to-this-dired-buffer
+ :help "Add individual file and directory names to the listing"
+ :keys "C-x E"))
+(define-key diredp-menu-bar-subdir-menu [diredp-dired-union]
+ '(menu-item "Dired Union..." diredp-dired-union
+ :help "Open Dired for the union of some existing Dired buffers"))
+(define-key diredp-menu-bar-subdir-menu [diredp-fileset-other-window]
+ '(menu-item "Dired Fileset..." diredp-fileset-other-window
+ :enable (> emacs-major-version 21) :help "Open Dired on an Emacs fileset"))
+(define-key diredp-menu-bar-subdir-menu [diredp-dired-for-files]
+ '(menu-item "Dired Files Located Anywhere" diredp-dired-for-files
+ :help "Open Dired on specific files whose names you provide"))
+(define-key diredp-menu-bar-subdir-menu [diredp-marked-other-window]
+ '(menu-item "Dired Marked Files in Other Window" diredp-marked-other-window
+ :enable (save-excursion (goto-char (point-min))
+ (and (re-search-forward (dired-marker-regexp) nil t)
+ (re-search-forward (dired-marker-regexp) nil t)))
+ :help "Open Dired on marked files only, in other window"))
+(define-key diredp-menu-bar-subdir-menu [diredp-marked]
+ '(menu-item "Dired Marked Files" diredp-marked
+ :enable (save-excursion (goto-char (point-min))
+ (and (re-search-forward (dired-marker-regexp) nil t)
+ (re-search-forward (dired-marker-regexp) nil t)))
+ :help "Open Dired on marked files only"))
+(define-key diredp-menu-bar-subdir-menu [dired]
+ '(menu-item "Dired (Filter via Wildcards)..." dired
+ :help "Explore a directory (you can provide wildcards)"))
+
+(define-key diredp-menu-bar-subdir-menu [separator-dired] '("--")) ; ---------------------
+
+(define-key diredp-menu-bar-subdir-menu [insert]
+ '(menu-item "Insert/Move-To This Subdir" dired-maybe-insert-subdir
+ :help "Move to subdirectory line or listing"))
+(define-key diredp-menu-bar-subdir-menu [revert]
+ '(menu-item "Refresh (Sync \& Show All)" revert-buffer :help "Update directory contents"))
+(define-key diredp-menu-bar-subdir-menu [create-directory] ; Moved from "Immediate".
+ '(menu-item "New Directory..." dired-create-directory :help "Create a directory"))
+
+
+;;; Mouse-3 menu binding.
+(define-key dired-mode-map [down-mouse-3] 'diredp-mouse-3-menu)
+(define-key dired-mode-map [mouse-3] 'ignore)
+
+
+;;; Non-menu Dired bindings.
+
+;; Move `dired-omit-mode' to `C-x M-o', so prefix key `M-o' is free for face/font-lock stuff.
+(define-key dired-mode-map "\C-x\M-o" (if (fboundp 'dired-omit-mode) 'dired-omit-mode 'dired-omit-toggle))
+(when (memq (lookup-key dired-mode-map "\M-o") '(dired-omit-mode dired-omit-toggle))
+ (define-key dired-mode-map "\M-o" nil))
+
+;; These are global, not just Dired mode. They are on prefix key `C-x D'.
+(unless (lookup-key ctl-x-map "D")
+ (define-key ctl-x-map "D" nil) ; For Emacs 20
+ (define-key ctl-x-map "DA" 'diredp-add-to-dired-buffer) ; `C-x D A'
+ (define-key ctl-x-map "DF" 'diredp-dired-for-files) ; `C-x D F'
+ (define-key ctl-x-map "DR" 'diredp-dired-recent-dirs) ; `C-x D R'
+ (define-key ctl-x-map "DS" 'diredp-fileset) ; `C-x D S'
+ (define-key ctl-x-map "DU" 'diredp-dired-union)) ; `C-x D U'
+
+(unless (lookup-key ctl-x-4-map "D")
+ (define-key ctl-x-4-map "D" nil) ; For Emacs 20
+ (define-key ctl-x-4-map "DA" 'diredp-add-to-dired-buffer-other-window) ; `C-x 4 D A'
+ (define-key ctl-x-4-map "DF" 'diredp-dired-for-files-other-window) ; `C-x 4 D F'
+ (define-key ctl-x-4-map "DR" 'diredp-dired-recent-dirs-other-window) ; `C-x 4 D R'
+ (define-key ctl-x-4-map "DS" 'diredp-fileset-other-window) ; `C-x 4 D S'
+ (define-key ctl-x-4-map "DU" 'diredp-dired-union-other-window)) ; `C-x 4 D U'
+
+;; Navigation
+(substitute-key-definition 'dired-up-directory 'diredp-up-directory dired-mode-map)
+(substitute-key-definition 'dired-next-line 'diredp-next-line dired-mode-map)
+(substitute-key-definition 'dired-previous-line 'diredp-previous-line dired-mode-map)
+(substitute-key-definition 'dired-next-dirline 'diredp-next-dirline dired-mode-map)
+(substitute-key-definition 'dired-prev-dirline 'diredp-prev-dirline dired-mode-map)
+(substitute-key-definition 'dired-next-subdir 'diredp-next-subdir dired-mode-map)
+(substitute-key-definition 'dired-prev-subdir 'diredp-prev-subdir dired-mode-map)
+
+
+(define-key dired-mode-map [S-down-mouse-1] 'ignore) ; (normally `mouse-set-font')
+;; `diredp-mouse-mark-region-files' provides Windows-Explorer behavior
+;; for selecting (marking) files.
+(define-key dired-mode-map [S-mouse-1] 'diredp-mouse-mark-region-files) ; `S-mouse-1'
+(define-key dired-mode-map [mouse-2] 'dired-mouse-find-file-other-window) ; `mouse-2'
+(define-key dired-mode-map [S-down-mouse-2] 'diredp-mouse-find-file) ; `S-mouse-2'
+(define-key dired-mode-map [S-mouse-2] 'ignore)
+(define-key dired-mode-map [M-mouse-2] 'diredp-mouse-find-file-other-frame) ; `M-mouse-2'
+
+;; On Windows, bind more.
+(eval-after-load "w32-browser"
+ '(progn
+ (define-key dired-mode-map [(control return)] 'dired-w32explore) ; `C-RET'
+ (define-key dired-mode-map [(meta return)] 'dired-w32-browser) ; `M-RET'
+ (define-key dired-mode-map [mouse-2] 'dired-mouse-w32-browser) ; `mouse-2'
+ (define-key dired-mode-map (kbd "<C-M-return>") 'dired-multiple-w32-browser))) ; `C-M-RET'
+
+(when (fboundp 'diredp-w32-drives)
+ (when (< emacs-major-version 21) (define-key dired-mode-map ":" nil)) ; For Emacs 20
+ (define-key dired-mode-map ":/" 'diredp-w32-drives)) ; `:/'
+
+;; Other keyboard keys
+(define-key dired-mode-map "@" 'diredp-do-apply-function) ; `@'
+(define-key dired-mode-map "\$" 'diredp-hide-subdir-nomove) ; `$'
+(define-key dired-mode-map "\M-$" 'dired-hide-subdir) ; `M-$'
+(define-key dired-mode-map "=" 'diredp-ediff) ; `='
+;; This replaces the `dired-x.el' binding of `dired-mark-extension'.
+(define-key dired-mode-map "*." 'diredp-mark/unmark-extension) ; `* .'
+(define-key dired-mode-map [(control meta ?*)] 'diredp-marked-other-window) ; `C-M-*'
+(define-key dired-mode-map "\M-a" 'dired-do-search) ; `M-a'
+(define-key dired-mode-map "\M-b" 'diredp-do-bookmark) ; `M-b'
+(define-key dired-mode-map "\C-\M-b" 'diredp-set-bookmark-file-bookmark-for-marked) ; `C-M-b'
+(define-key dired-mode-map [(control meta shift ?b)] ; `C-M-B' (aka `C-M-S-b')
+ 'diredp-do-bookmark-in-bookmark-file)
+(define-key dired-mode-map "\M-g" 'diredp-do-grep) ; `M-g'
+(when (fboundp 'mkhtml-dired-files) ; In `mkhtml.el'.
+ (define-key dired-mode-map "\M-h" 'mkhtml-dired-files)) ; `M-h'
+(define-key dired-mode-map "\C-\M-i" 'diredp-dired-inserted-subdirs) ; `C-M-i'
+(define-key dired-mode-map "\M-q" (if (< emacs-major-version 21)
+ 'dired-do-query-replace
+ 'dired-do-query-replace-regexp)) ; `M-q'
+(define-key dired-mode-map [(control meta shift ?r)] ; `C-M-R' (aka `C-M-S-r')
+ 'diredp-toggle-find-file-reuse-dir)
+(define-key dired-mode-map "U" 'dired-unmark-all-marks) ; `U'
+(substitute-key-definition 'describe-mode 'diredp-describe-mode ; `h', `C-h m'
+ dired-mode-map (current-global-map))
+
+;; Tags - same keys as in `*Bookmark List*'.
+;;
+;; NOTE: If this changes then need to update `dired-sort-menu+.el' to reflect the changes.
+;;
+(define-key dired-mode-map "T" nil) ; For Emacs 20
+(define-key dired-mode-map "T+" 'diredp-tag-this-file) ; `T +'
+(define-key dired-mode-map "T-" 'diredp-untag-this-file) ; `T -'
+(define-key dired-mode-map "T0" 'diredp-remove-all-tags-this-file) ; `T 0'
+(define-key dired-mode-map "Tc" 'diredp-copy-tags-this-file) ; `T c'
+(define-key dired-mode-map "Tp" 'diredp-paste-add-tags-this-file) ; `T p'
+(define-key dired-mode-map "Tq" 'diredp-paste-replace-tags-this-file) ; `T q'
+(define-key dired-mode-map "Tv" 'diredp-set-tag-value-this-file) ; `T v'
+(define-key dired-mode-map "T\M-w" 'diredp-copy-tags-this-file) ; `T M-w'
+(define-key dired-mode-map "T\C-y" 'diredp-paste-add-tags-this-file) ; `T C-y'
+(define-key dired-mode-map "T>+" 'diredp-do-tag) ; `T > +'
+(define-key dired-mode-map "T>-" 'diredp-do-untag) ; `T > -'
+(define-key dired-mode-map "T>0" 'diredp-do-remove-all-tags) ; `T > 0'
+(define-key dired-mode-map "T>p" 'diredp-do-paste-add-tags) ; `T > p'
+(define-key dired-mode-map "T>q" 'diredp-do-paste-replace-tags) ; `T > q'
+(define-key dired-mode-map "T>v" 'diredp-do-set-tag-value) ; `T > v'
+(define-key dired-mode-map "T>\C-y" 'diredp-do-paste-add-tags) ; `T > C-y'
+(define-key dired-mode-map "Tm%" 'diredp-mark-files-tagged-regexp) ; `T m %'
+(define-key dired-mode-map "Tm*" 'diredp-mark-files-tagged-all) ; `T m *'
+(define-key dired-mode-map "Tm+" 'diredp-mark-files-tagged-some) ; `T m +'
+(define-key dired-mode-map "Tm~*" 'diredp-mark-files-tagged-not-all) ; `T m ~ *'
+(define-key dired-mode-map "Tm~+" 'diredp-mark-files-tagged-none) ; `T m ~ +'
+(define-key dired-mode-map "Tu%" 'diredp-unmark-files-tagged-regexp) ; `T u %'
+(define-key dired-mode-map "Tu*" 'diredp-unmark-files-tagged-all) ; `T u *'
+(define-key dired-mode-map "Tu+" 'diredp-unmark-files-tagged-some) ; `T u +'
+(define-key dired-mode-map "Tu~*" 'diredp-unmark-files-tagged-not-all) ; `T u ~ *'
+(define-key dired-mode-map "Tu~+" 'diredp-unmark-files-tagged-none) ; `T u ~ +'
+;; $$$$$$ (define-key dired-mode-map [(control ?+)] 'diredp-do-tag)
+;; $$$$$$ (define-key dired-mode-map [(control ?-)] 'diredp-do-untag)
+
+
+;; Vanilla Emacs binds `c' to `dired-do-compress-to'. Use `M-z' instead'.
+;; (`dired-sort-menu.el' binds `c' to `dired-sort-menu-toggle-ignore-case'.)
+;;
+(when (fboundp 'dired-do-compress-to) ; Emacs 25+
+ (define-key dired-mode-map (kbd "M-z") 'dired-do-compress-to))
+
+
+;; Commands for operating on the current line's file. When possible,
+;; these are lower-case versions of the upper-case commands for operating on
+;; the marked files. (Most of the other corresponding lower-case letters are already
+;; defined and cannot be used here.)
+
+;; $$$$$$ (define-key dired-mode-map [(control meta ?+)] 'diredp-tag-this-file)
+;; $$$$$$ (define-key dired-mode-map [(control meta ?-)] 'diredp-untag-this-file)
+(define-key dired-mode-map "\r" 'dired-find-file) ; `RET'
+(when (fboundp 'diredp-describe-file)
+ (define-key dired-mode-map (kbd "C-h RET") 'diredp-describe-file) ; `C-h RET'
+ (define-key dired-mode-map (kbd "C-h C-<return>") 'diredp-describe-file)) ; `C-h C-RET'
+(define-key dired-mode-map "%c" 'diredp-capitalize) ; `% c'
+(define-key dired-mode-map "b" 'diredp-byte-compile-this-file) ; `b'
+(define-key dired-mode-map [(control shift ?b)] 'diredp-bookmark-this-file) ; `C-B'
+(define-key dired-mode-map "\M-c" 'diredp-capitalize-this-file) ; `M-c'
+(when (fboundp 'diredp-chgrp-this-file)
+ (define-key dired-mode-map [(control meta shift ?g)] 'diredp-chgrp-this-file)) ; `C-M-G'
+(define-key dired-mode-map "\M-i" 'diredp-insert-subdirs) ; `M-i'
+(define-key dired-mode-map "\M-l" 'diredp-downcase-this-file) ; `M-l'
+(define-key dired-mode-map "\C-\M-l" 'diredp-list-marked) ; `C-M-l'
+(define-key dired-mode-map [(meta shift ?m)] 'diredp-chmod-this-file) ; `M-M'
+(define-key dired-mode-map "\C-o" 'diredp-find-file-other-frame) ; `C-o'
+(when (fboundp 'diredp-chown-this-file)
+ (define-key dired-mode-map [(meta shift ?o)] 'diredp-chown-this-file)) ; `M-O'
+(define-key dired-mode-map "\C-\M-o" 'dired-display-file) ; `C-M-o' (not `C-o')
+(define-key dired-mode-map "\M-p" 'diredp-print-this-file) ; `M-p'
+(define-key dired-mode-map "r" 'diredp-rename-this-file) ; `r'
+(when (fboundp 'image-dired-dired-display-image)
+ (define-key dired-mode-map "\C-tI" 'diredp-image-show-this-file)) ; `C-t I'
+(define-key dired-mode-map [(meta shift ?t)] 'diredp-touch-this-file) ; `M-T'
+(define-key dired-mode-map [(control meta shift ?t)] 'dired-do-touch) ; `C-M-T'
+(define-key dired-mode-map "\M-u" 'diredp-upcase-this-file) ; `M-u'
+(define-key dired-mode-map "y" 'diredp-relsymlink-this-file) ; `y'
+(define-key dired-mode-map "z" 'diredp-compress-this-file) ; `z'
+(when (fboundp 'dired-show-file-type)
+ (define-key dired-mode-map "_" 'dired-show-file-type)) ; `_' (underscore)
+(substitute-key-definition 'kill-line 'diredp-delete-this-file ; `C-k', `delete', `deleteline'
+ dired-mode-map (current-global-map))
+
+
+;; Commands that handle marked below, recursively.
+;; Use `M-+' as a prefix key for all such commands.
+
+(define-prefix-command 'diredp-recursive-map)
+(define-key dired-mode-map "\M-+" diredp-recursive-map) ; `M-+'
+
+(define-key diredp-recursive-map "@" 'diredp-do-apply-function-recursive) ; `@'
+(when (> emacs-major-version 22)
+ (define-key diredp-recursive-map ":d" 'diredp-do-decrypt-recursive) ; `: d'
+ (define-key diredp-recursive-map ":e" 'diredp-do-encrypt-recursive) ; `: e'
+ (define-key diredp-recursive-map ":s" 'diredp-do-sign-recursive) ; `: s'
+ (define-key diredp-recursive-map ":v" 'diredp-do-verify-recursive) ; `: v'
+ )
+(define-key diredp-recursive-map "%c" 'diredp-capitalize-recursive) ; `% c'
+(define-key diredp-recursive-map "%l" 'diredp-downcase-recursive) ; `% l'
+(define-key diredp-recursive-map "%m" 'diredp-mark-files-regexp-recursive) ; `% m'
+(define-key diredp-recursive-map "%u" 'diredp-upcase-recursive) ; `% u'
+(when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
+ (define-key diredp-recursive-map "&" 'diredp-do-async-shell-command-recursive)) ; `&'
+(define-key diredp-recursive-map "!" 'diredp-do-shell-command-recursive) ; `!'
+(define-key diredp-recursive-map (kbd "C-M-*") 'diredp-marked-recursive-other-window) ; `C-M-*'
+(define-key diredp-recursive-map "A" 'diredp-do-search-recursive) ; `A'
+(define-key diredp-recursive-map "\M-b" 'diredp-do-bookmark-recursive) ; `M-b'
+(define-key diredp-recursive-map [(meta shift ?b)] 'diredp-do-bookmark-dirs-recursive) ; `M-B'
+(define-key diredp-recursive-map (kbd "C-M-b") ; `C-M-b'
+ 'diredp-set-bookmark-file-bookmark-for-marked-recursive)
+(define-key diredp-recursive-map [(control meta shift ?b)] ; `C-M-B' (aka `C-M-S-b')
+ 'diredp-do-bookmark-in-bookmark-file-recursive)
+(define-key diredp-recursive-map "C" 'diredp-do-copy-recursive) ; `C'
+(define-key diredp-recursive-map "D" 'diredp-do-delete-recursive) ; `D'
+(define-key diredp-recursive-map "F" 'diredp-do-find-marked-files-recursive) ; `F'
+(when (fboundp 'diredp-do-chgrp-recursive)
+ (define-key diredp-recursive-map "G" 'diredp-do-chgrp-recursive)) ; `G'
+(define-key diredp-recursive-map "\M-g" 'diredp-do-grep-recursive) ; `M-g'
+(define-key diredp-recursive-map "H" 'diredp-do-hardlink-recursive) ; `H'
+(define-key diredp-recursive-map "\M-i" 'diredp-insert-subdirs-recursive) ; `M-i'
+(define-key diredp-recursive-map "\C-\M-l" 'diredp-list-marked-recursive) ; `C-M-l'
+(define-key diredp-recursive-map "M" 'diredp-do-chmod-recursive) ; `M'
+(when (fboundp 'diredp-do-chown-recursive)
+ (define-key diredp-recursive-map "O" 'diredp-do-chown-recursive)) ; `O'
+(define-key diredp-recursive-map "P" 'diredp-do-print-recursive) ; `P'
+(define-key diredp-recursive-map "Q" 'diredp-do-query-replace-regexp-recursive) ; `Q'
+(define-key diredp-recursive-map "R" 'diredp-do-move-recursive) ; `R'
+(define-key diredp-recursive-map "S" 'diredp-do-symlink-recursive) ; `S'
+(define-key diredp-recursive-map (kbd "M-s a C-s") ; `M-s a C-s'
+ 'diredp-do-isearch-recursive)
+(define-key diredp-recursive-map (kbd "M-s a C-M-s") ; `M-s a C-M-s'
+ 'diredp-do-isearch-regexp-recursive)
+(define-key diredp-recursive-map [(control meta shift ?t)] 'diredp-do-touch-recursive) ; `C-M-T'
+(define-key diredp-recursive-map "\C-tc" 'diredp-image-dired-comment-files-recursive) ; `C-t c'
+(define-key diredp-recursive-map "\C-td" 'diredp-image-dired-display-thumbs-recursive) ; `C-t d'
+(define-key diredp-recursive-map "\C-tr" 'diredp-image-dired-delete-tag-recursive) ; `C-t r'
+(define-key diredp-recursive-map "\C-tt" 'diredp-image-dired-tag-files-recursive) ; `C-t t'
+(define-key diredp-recursive-map "\M-w" 'diredp-copy-filename-as-kill-recursive) ; `M-w'
+(define-key diredp-recursive-map "Y" 'diredp-do-relsymlink-recursive) ; `Y'
+
+(eval-after-load "w32-browser"
+ '(define-key diredp-recursive-map (kbd "<C-M-return>") 'diredp-multiple-w32-browser-recursive)) ; `C-M-RET'
+
+;; Undefine some bindings that would try to modify a Dired buffer. Their key sequences will
+;; then appear to the user as available for local (Dired) definition.
+(when (fboundp 'undefine-killer-commands) (undefine-killer-commands dired-mode-map))
;;;;;;;;;;;;
.emacs.d/elpa/dired+-20170221.1620/dired+.elc → .emacs.d/elpa/dired+-20170330.1047/dired+.elc
Binary file
.emacs.d/elpa/flycheck-20170309.145/flycheck-autoloads.el → .emacs.d/elpa/flycheck-20170324.340/flycheck-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "flycheck" "flycheck.el" (22725 53740 86691
-;;;;;; 952000))
+;;;### (autoloads nil "flycheck" "flycheck.el" (22753 9100 658367
+;;;;;; 329000))
;;; Generated autoloads from flycheck.el
(autoload 'flycheck-manual "flycheck" "\
@@ -228,7 +228,7 @@ Use this together with the `option', `option-list' and
;;;***
;;;### (autoloads nil nil ("flycheck-buttercup.el" "flycheck-ert.el"
-;;;;;; "flycheck-pkg.el") (22725 53740 80692 146000))
+;;;;;; "flycheck-pkg.el") (22753 9100 657367 344000))
;;;***
.emacs.d/elpa/flycheck-20170309.145/flycheck-buttercup.el → .emacs.d/elpa/flycheck-20170324.340/flycheck-buttercup.el
File renamed without changes
.emacs.d/elpa/flycheck-20170309.145/flycheck-ert.el → .emacs.d/elpa/flycheck-20170324.340/flycheck-ert.el
File renamed without changes
.emacs.d/elpa/flycheck-20170309.145/flycheck-ert.elc → .emacs.d/elpa/flycheck-20170324.340/flycheck-ert.elc
File renamed without changes
.emacs.d/elpa/flycheck-20170309.145/flycheck-pkg.el → .emacs.d/elpa/flycheck-20170324.340/flycheck-pkg.el
@@ -1,4 +1,4 @@
-(define-package "flycheck" "20170309.145" "On-the-fly syntax checking"
+(define-package "flycheck" "20170324.340" "On-the-fly syntax checking"
'((dash "2.12.1")
(pkg-info "0.4")
(let-alist "1.0.4")
.emacs.d/elpa/flycheck-20170309.145/flycheck.el → .emacs.d/elpa/flycheck-20170324.340/flycheck.el
@@ -171,6 +171,7 @@ attention to case differences."
coffee-coffeelint
coq
css-csslint
+ css-stylelint
d-dmd
dockerfile-hadolint
elixir-dogma
@@ -195,12 +196,12 @@ attention to case differences."
html-tidy
javascript-eslint
javascript-jshint
- javascript-gjslint
javascript-jscs
javascript-standard
json-jsonlint
json-python-json
less
+ less-stylelint
lua-luacheck
lua
perl
@@ -232,6 +233,7 @@ attention to case differences."
scala-scalastyle
scheme-chicken
scss-lint
+ scss-stylelint
sass/scss-sass-lint
sass
scss
@@ -700,7 +702,7 @@ This variable is a normal hook. See Info node `(elisp)Hooks'."
"Functions to run if the Flycheck status changed.
This hook is run whenever the status of Flycheck changes. Each
-hook function takes the status symbol as sinlge argument, as
+hook function takes the status symbol as single argument, as
given to `flycheck-report-status', which see.
This variable is a abnormal hook. See Info
@@ -2468,7 +2470,7 @@ buffer-local value of `flycheck-disabled-checkers'."
Set `flycheck-current-syntax-check' accordingly."
;; Allocate the current syntax check *before* starting it. This allows for
- ;; synchronous checks, which call the status callback immediately in there
+ ;; synchronous checks, which call the status callback immediately in their
;; start function.
(let* ((check (flycheck-syntax-check-new
:buffer (current-buffer)
@@ -6595,6 +6597,123 @@ See URL `https://github.com/CSSLint/csslint'."
:error-filter flycheck-dequalify-error-ids
:modes css-mode)
+(defconst flycheck-stylelint-args '("--formatter" "json")
+ "Common arguments to stylelint invocations.")
+
+(flycheck-def-config-file-var flycheck-stylelintrc
+ (css-stylelint scss-stylelint less-stylelint) nil
+ :safe #'stringp)
+
+(flycheck-def-option-var flycheck-stylelint-quiet
+ nil (css-stylelint scss-stylelint less-stylelint)
+ "Whether to run stylelint in quiet mode.
+
+When non-nil, enable quiet mode, via `--quiet'."
+ :type 'boolean
+ :safe #'booleanp
+ :package-version '(flycheck . 26))
+
+(defconst flycheck-stylelint-error-re
+ (flycheck-rx-to-string
+ '(: line-start (id (one-or-more word)) ": " (message) line-end)))
+
+(defun flycheck-parse-stylelint (output checker buffer)
+ "Parse stylelint errors from OUTPUT.
+
+CHECKER and BUFFER denoted the CHECKER that returned OUTPUT and
+the BUFFER that was checked respectively.
+
+The CHECKER usually returns the errors as JSON.
+
+If the CHECKER throws an Error it returns an Error message with a stacktrace."
+ (condition-case nil
+ (flycheck-parse-stylelint-json output checker buffer)
+
+ ;; The output could not be parsed as JSON
+ (json-error
+
+ ;; Extract a flycheck error from the output (with a regular expression)
+ ;; For match-string 4/5 see flycheck-rx-message/flycheck-rx-id
+ (when (string-match flycheck-stylelint-error-re output)
+ (list (flycheck-error-new-at
+ 1 nil 'error
+ (match-string 4 output)
+ :id (match-string 5 output)
+ :checker checker
+ :buffer buffer
+ :filename (buffer-file-name buffer)))))))
+
+(defun flycheck-parse-stylelint-json (output checker buffer)
+ "Parse stylelint JSON errors from OUTPUT.
+
+CHECKER and BUFFER denoted the CHECKER that returned OUTPUT and
+the BUFFER that was checked respectively.
+
+See URL `http://stylelint.io/developer-guide/formatters/' for information
+about the JSON format of stylelint."
+ (let ((json-object-type 'plist))
+
+ ;; stylelint returns a vector of result objects
+ ;; Since we only passed one file, the first element is enough
+ (let* ((stylelint-output (elt (json-read-from-string output) 0))
+ (filename (buffer-file-name buffer))
+
+ ;; Turn all deprecations into warnings
+ (deprecations
+ (mapcar (lambda (d)
+ (flycheck-error-new-at
+ 1 nil 'warning
+ (plist-get d :text)
+ :id "Deprecation Warning"
+ :checker checker
+ :buffer buffer
+ :filename filename))
+ (plist-get stylelint-output :deprecations)))
+
+ ;; Turn all invalid options into errors
+ (invalid-options
+ (mapcar (lambda (io)
+ (flycheck-error-new-at
+ 1 nil 'error
+ (plist-get io :text)
+ :id "Invalid Option"
+ :checker checker
+ :buffer buffer
+ :filename filename))
+ (plist-get stylelint-output :invalidOptionWarnings)))
+
+ ;; Read all linting warnings
+ (warnings
+ (mapcar (lambda (w)
+ (flycheck-error-new-at
+ (plist-get w :line) (plist-get w :column)
+ (pcase (plist-get w :severity)
+ (`"error" 'error)
+ (`"warning" 'warning)
+ ;; Default to info for unknown .severity
+ (_ 'info))
+ (plist-get w :text)
+ :id (plist-get w :rule)
+ :checker checker
+ :buffer buffer
+ :filename filename))
+ (plist-get stylelint-output :warnings))))
+
+ ;; Return the combined errors (deprecations, invalid options, warnings)
+ (append deprecations invalid-options warnings))))
+
+(flycheck-define-checker css-stylelint
+ "A CSS syntax and style checker using stylelint.
+
+See URL `http://stylelint.io/'."
+ :command ("stylelint"
+ (eval flycheck-stylelint-args)
+ (option-flag "--quiet" flycheck-stylelint-quiet)
+ (config-file "--config" flycheck-stylelintrc))
+ :standard-input t
+ :error-parser flycheck-parse-stylelint
+ :modes (css-mode))
+
(defconst flycheck-d-module-re
(rx "module" (one-or-more (syntax whitespace))
(group (one-or-more (not (syntax whitespace))))
@@ -7778,22 +7897,6 @@ See URL `https://github.com/eslint/eslint'."
:message (if have-config "found" "missing")
:face (if have-config 'success '(bold error)))))))
-(flycheck-def-config-file-var flycheck-gjslintrc javascript-gjslint ".gjslintrc"
- :safe #'stringp)
-
-(flycheck-define-checker javascript-gjslint
- "A Javascript syntax and style checker using Closure Linter.
-
-See URL `https://developers.google.com/closure/utilities'."
- :command ("gjslint" "--unix_mode"
- (config-file "--flagfile" flycheck-gjslintrc)
- source)
- :error-patterns ((warning
- line-start (file-name) ":" line ":("
- (id (one-or-more digit)) ") " (message) line-end))
- :modes (js-mode js2-mode js3-mode rjsx-mode)
- :next-checkers ((warning . javascript-jscs)))
-
(defun flycheck-parse-jscs (output checker buffer)
"Parse JSCS OUTPUT from CHECKER and BUFFER.
@@ -7894,6 +7997,19 @@ See URL `http://lesscss.org'."
line-end))
:modes less-css-mode)
+(flycheck-define-checker less-stylelint
+ "A LESS syntax and style checker using stylelint.
+
+See URL `http://stylelint.io/'."
+ :command ("stylelint"
+ (eval flycheck-stylelint-args)
+ "--syntax" "less"
+ (option-flag "--quiet" flycheck-stylelint-quiet)
+ (config-file "--config" flycheck-stylelintrc))
+ :standard-input t
+ :error-parser flycheck-parse-stylelint
+ :modes (less-css-mode))
+
(flycheck-def-config-file-var flycheck-luacheckrc lua-luacheck ".luacheckrc"
:safe #'stringp)
@@ -8785,28 +8901,45 @@ if it is not modified, i.e. after it has been saved."
(flycheck-def-option-var flycheck-rust-crate-type "lib" (rust-cargo rust)
"The type of the Rust Crate to check.
-The value of this variable is a string denoting the crate type,
-for the `--crate-type' flag."
- :type 'string
+For `rust-cargo', the value should be a string denoting the
+target type passed to Cargo. See
+`flycheck-rust-valid-crate-type-p' for the list of allowed
+values.
+
+For `rust', the value should be a string denoting the crate type
+for the `--crate-type' flag of rustc."
+ :type '(choice (const :tag "nil (rust/rust-cargo)" nil)
+ (const :tag "lib (rust/rust-cargo)" "lib")
+ (const :tag "bin (rust/rust-cargo)" "bin")
+ (const :tag "example (rust-cargo)" "example")
+ (const :tag "test (rust-cargo)" "test")
+ (const :tag "bench (rust-cargo)" "bench")
+ (const :tag "rlib (rust)" "rlib")
+ (const :tag "dylib (rust)" "dylib")
+ (const :tag "cdylib (rust)" "cdylib")
+ (const :tag "staticlib (rust)" "staticlib")
+ (const :tag "metadata (rust)" "metadata"))
:safe #'stringp
:package-version '(flycheck . "0.20"))
(make-variable-buffer-local 'flycheck-rust-crate-type)
(flycheck-def-option-var flycheck-rust-binary-name nil rust-cargo
- "The name of the binary to pass to `cargo rustc --bin'.
+ "The name of the binary to pass to `cargo rustc --CRATE-TYPE'.
The value of this variable is a string denoting the name of the
-binary to build: Either the name of the crate, or the name of one
-of the files under `src/bin'.
+target to check: usually the name of the crate, or the name of
+one of the files under `src/bin', `tests', `examples' or
+`benches'.
-This variable is used only when `flycheck-rust-crate-type' is
-`bin', and is only useful for crates with multiple targets."
+This always requires a non-nil value, unless
+`flycheck-rust-crate-type' is `lib' or nil, in which case it is
+ignored."
:type 'string
:safe #'stringp
:package-version '(flycheck . "28"))
(make-variable-buffer-local 'flycheck-rust-binary-name)
-(flycheck-def-option-var flycheck-rust-library-path nil (rust-cargo rust)
+(flycheck-def-option-var flycheck-rust-library-path nil rust
"A list of library directories for Rust.
The value of this variable is a list of strings, where each
@@ -8831,32 +8964,72 @@ Relative paths are relative to the file being checked."
(flycheck-error-message err)))
errors))
+(defun flycheck-rust-valid-crate-type-p (crate-type)
+ "Whether CRATE-TYPE is a valid target type for Cargo.
+
+A valid Cargo target type is one of `lib', `bin', `example',
+`test' or `bench'."
+ (member crate-type '(nil "lib" "bin" "example" "test" "bench")))
+
(flycheck-define-checker rust-cargo
"A Rust syntax checker using Cargo.
This syntax checker requires Rust 1.15 or newer. See URL
`https://www.rust-lang.org'."
:command ("cargo" "rustc"
- (eval (cond
- ((string= flycheck-rust-crate-type "lib") "--lib")
- (flycheck-rust-binary-name
- (list "--bin" flycheck-rust-binary-name))))
+ (eval (when flycheck-rust-crate-type
+ (concat "--" flycheck-rust-crate-type)))
+ ;; All crate targets except "lib" need a binary name
+ (eval (when (and flycheck-rust-crate-type
+ (not (string= flycheck-rust-crate-type "lib")))
+ flycheck-rust-binary-name))
"--message-format=json"
(eval flycheck-cargo-rustc-args)
"--" "-Z" "no-trans"
- (option-flag "--test" flycheck-rust-check-tests)
- (option-list "-L" flycheck-rust-library-path concat)
+ ;; Passing the "--test" flag when the target is a test binary or
+ ;; bench is unnecessary and triggers an error.
+ (eval (when flycheck-rust-check-tests
+ (unless (member flycheck-rust-crate-type '("test" "bench"))
+ "--test")))
(eval flycheck-rust-args))
:error-parser flycheck-parse-cargo-rustc
:error-filter flycheck-rust-error-filter
:error-explainer flycheck-rust-error-explainer
:modes rust-mode
- :predicate (lambda ()
- ;; Since we build the entire project with cargo rustc we require
- ;; that the buffer is saved. And of course, we also need a Cargo
- ;; file :)
- (and (flycheck-buffer-saved-p)
- (locate-dominating-file (buffer-file-name) "Cargo.toml"))))
+ :predicate flycheck-buffer-saved-p
+ :enabled (lambda ()
+ (-when-let (file (buffer-file-name))
+ (locate-dominating-file file "Cargo.toml")))
+ :verify (lambda (_)
+ (-when-let (file (buffer-file-name))
+ (let* ((has-toml (locate-dominating-file file "Cargo.toml"))
+ (valid-crate-type (flycheck-rust-valid-crate-type-p
+ flycheck-rust-crate-type))
+ (need-binary-name
+ (and flycheck-rust-crate-type
+ (not (string= flycheck-rust-crate-type "lib")))))
+ (list
+ (flycheck-verification-result-new
+ :label "Cargo.toml"
+ :message (if has-toml "Found" "Missing")
+ :face (if has-toml 'success '(bold warning)))
+ (flycheck-verification-result-new
+ :label "Crate type"
+ :message (if valid-crate-type
+ (format "%s" flycheck-rust-crate-type)
+ (format "%s (invalid, should be one of 'lib', 'bin', 'test', 'example' or 'bench')"
+ flycheck-rust-crate-type))
+ :face (if valid-crate-type 'success '(bold error)))
+ (flycheck-verification-result-new
+ :label "Binary name"
+ :message (cond
+ ((not need-binary-name) "Not required")
+ ((not flycheck-rust-binary-name) "Required")
+ (t (format "%s" flycheck-rust-binary-name)))
+ :face (cond
+ ((not need-binary-name) 'success)
+ ((not flycheck-rust-binary-name) '(bold error))
+ (t 'success))))))))
(flycheck-define-checker rust
"A Rust syntax checker using Rust compiler.
@@ -9116,6 +9289,19 @@ See URL `https://github.com/brigade/scss-lint'."
'(bold error)
'success)))))))
+(flycheck-define-checker scss-stylelint
+ "A SCSS syntax and style checker using stylelint.
+
+See URL `http://stylelint.io/'."
+ :command ("stylelint"
+ (eval flycheck-stylelint-args)
+ "--syntax" "scss"
+ (option-flag "--quiet" flycheck-stylelint-quiet)
+ (config-file "--config" flycheck-stylelintrc))
+ :standard-input t
+ :error-parser flycheck-parse-stylelint
+ :modes (scss-mode))
+
(flycheck-def-option-var flycheck-scss-compass nil scss
"Whether to enable the Compass CSS framework.
.emacs.d/elpa/flycheck-20170309.145/flycheck.elc → .emacs.d/elpa/flycheck-20170324.340/flycheck.elc
Binary file
.emacs.d/elpa/git-commit-20170308.146/git-commit-pkg.el
@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "git-commit" "20170308.146" "Edit Git commit messages" '((emacs "24.4") (dash "20170207.2056") (with-editor "20170111.609")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
.emacs.d/elpa/git-commit-20170308.146/git-commit-autoloads.el → .emacs.d/elpa/git-commit-20170314.1414/git-commit-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "git-commit" "git-commit.el" (22725 53738 527742
-;;;;;; 439000))
+;;;### (autoloads nil "git-commit" "git-commit.el" (22753 9099 475385
+;;;;;; 133000))
;;; Generated autoloads from git-commit.el
(defvar global-git-commit-mode t "\
.emacs.d/elpa/git-commit-20170314.1414/git-commit-pkg.el
@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "git-commit" "20170314.1414" "Edit Git commit messages" '((emacs "24.4") (dash "20170207.2056") (with-editor "20170111.609")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
.emacs.d/elpa/git-commit-20170308.146/git-commit.el → .emacs.d/elpa/git-commit-20170314.1414/git-commit.el
@@ -12,7 +12,7 @@
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
;; Package-Requires: ((emacs "24.4") (dash "20170207.2056") (with-editor "20170111.609"))
-;; Package-Version: 20170308.146
+;; Package-Version: 20170314.1414
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
@@ -427,8 +427,7 @@ already using it, then you probably shouldn't start doing so."
(setq save-place nil))
(save-excursion
(goto-char (point-min))
- (when (= (line-beginning-position)
- (line-end-position))
+ (when (looking-at "\\`\\(\\'\\|\n[^\n]\\)")
(open-line 1)))
(run-hooks 'git-commit-setup-hook)
(set-buffer-modified-p nil))
.emacs.d/elpa/git-commit-20170308.146/git-commit.elc → .emacs.d/elpa/git-commit-20170314.1414/git-commit.elc
Binary file
.emacs.d/elpa/hydra-20170108.148/hydra-autoloads.el → .emacs.d/elpa/hydra-20170325.815/hydra-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "hydra" "hydra.el" (22712 4601 717668 835000))
+;;;### (autoloads nil "hydra" "hydra.el" (22753 9099 98390 807000))
;;; Generated autoloads from hydra.el
(autoload 'defhydra "hydra" "\
@@ -63,7 +63,7 @@ result of `defhydra'.
;;;***
;;;### (autoloads nil nil ("hydra-examples.el" "hydra-ox.el" "hydra-pkg.el"
-;;;;;; "lv.el") (22712 4601 719668 822000))
+;;;;;; "lv.el") (22753 9099 100390 777000))
;;;***
.emacs.d/elpa/hydra-20170108.148/hydra-examples.el → .emacs.d/elpa/hydra-20170325.815/hydra-examples.el
File renamed without changes
.emacs.d/elpa/hydra-20170108.148/hydra-ox.el → .emacs.d/elpa/hydra-20170325.815/hydra-ox.el
File renamed without changes
.emacs.d/elpa/hydra-20170108.148/hydra-ox.elc → .emacs.d/elpa/hydra-20170325.815/hydra-ox.elc
File renamed without changes
.emacs.d/elpa/hydra-20170108.148/hydra-pkg.el → .emacs.d/elpa/hydra-20170325.815/hydra-pkg.el
@@ -1,4 +1,4 @@
-(define-package "hydra" "20170108.148" "Make bindings that stick around."
+(define-package "hydra" "20170325.815" "Make bindings that stick around."
'((cl-lib "0.5"))
:url "https://github.com/abo-abo/hydra" :keywords
'("bindings"))
.emacs.d/elpa/hydra-20170108.148/hydra.el → .emacs.d/elpa/hydra-20170325.815/hydra.el
@@ -225,9 +225,10 @@ When nil, you can specify your own at each location like this: _ 5a_."
:type 'string)
(defcustom hydra-look-for-remap nil
- "When non-nil and when calling a head with a simple command, hydra will lookup
-for a potential remap command according to the current active keymap and call it
-instead if found"
+ "When non-nil, hydra binding behaves as keymap binding with [remap].
+When calling a head with a simple command, hydra will lookup for a potential
+remap command according to the current active keymap and call it instead if
+found"
:type 'boolean)
(make-obsolete-variable
@@ -415,11 +416,11 @@ Return DEFAULT if PROP is not in H."
(hydra-plist-get-default (cl-cdddr h) prop default))
(defun hydra--head-set-property (h prop value)
- "set a property PROP to the value VALUE in the hydra head H"
+ "In hydra Head H, set a property PROP to the value VALUE."
(cons (car h) (plist-put (cdr h) prop value)))
(defun hydra--head-has-property (h prop)
- "return non nil if heads H has the property PROP"
+ "Return non nil if heads H has the property PROP."
(plist-member (cdr h) prop))
(defun hydra--body-foreign-keys (body)
@@ -747,8 +748,8 @@ HEADS is a list of heads."
(format "The body can be accessed via `%S'." body-name)))
(defun hydra--call-interactively-remap-maybe (cmd)
- "`call-interactively' the given CMD or its remapped equivalent according to
-current active keymap if applicable and if `hydra-look-for-remap' is non nil"
+ "`call-interactively' the given CMD or its remapped equivalent.
+Only when `hydra-look-for-remap' is non nil."
(let ((remapped-cmd (if hydra-look-for-remap
(command-remapping `,cmd)
nil)))
@@ -1002,12 +1003,17 @@ was defined."
heads)))
(defun hydra--sort-heads (normalized-heads)
- "Return a list of heads with non-nil doc sorted by ascending column property
-each head of NORMALIZED-HEADS must have a column property"
+ "Return a list of heads with non-nil doc grouped by column property.
+Each head of NORMALIZED-HEADS must have a column property."
(let* ((heads-wo-nil-doc (cl-remove-if-not (lambda (head) (nth 2 head)) normalized-heads))
+ (columns-list (delete-dups (mapcar (lambda (head) (hydra--head-property head :column))
+ normalized-heads)))
+ (get-col-index-fun (lambda (head) (cl-position (hydra--head-property head :column)
+ columns-list
+ :test 'equal)))
(heads-sorted (cl-sort heads-wo-nil-doc (lambda (it other)
- (string< (hydra--head-property it :column)
- (hydra--head-property other :column))))))
+ (< (funcall get-col-index-fun it)
+ (funcall get-col-index-fun other))))))
;; this operation partition the sorted head list into lists of heads with same column property
(cl-loop for head in heads-sorted
for column-name = (hydra--head-property head :column)
@@ -1019,8 +1025,7 @@ each head of NORMALIZED-HEADS must have a column property"
finally return (append heads-all-columns (list heads-one-column)))))
(defun hydra--pad-heads (heads-groups padding-head)
- "Return a list of heads copied from HEADS-GROUPS where each heads group have the same length.
-This is achieved by adding PADDING-HEAD were needed."
+ "Return a copy of HEADS-GROUPS padded where applicable with PADDING-HEAD."
(cl-loop for heads-group in heads-groups
for this-head-group-length = (length heads-group)
with head-group-max-length = (apply #'max (mapcar (lambda (heads) (length heads)) heads-groups))
@@ -1031,29 +1036,31 @@ This is achieved by adding PADDING-HEAD were needed."
finally return balanced-heads-groups))
(defun hydra--generate-matrix (heads-groups)
- "Return a copy of HEADS-GROUPS with following differences:
-2 virtual heads acting as table header were added to each heads-group
-each head is decorated with 2 new properties max-doc-len and max-key-len representing the maximum dimension of their owning group
-every heads-group have equal length by adding padding heads where applicable."
+ "Return a copy of HEADS-GROUPS decorated with table formating information.
+Details of modification:
+2 virtual heads acting as table header were added to each heads-group.
+Each head is decorated with 2 new properties max-doc-len and max-key-len
+representing the maximum dimension of their owning group.
+ Every heads-group have equal length by adding padding heads where applicable."
(when heads-groups
(cl-loop for heads-group in (hydra--pad-heads heads-groups '(" " nil " " :exit t))
- for column-name = (hydra--head-property (nth 0 heads-group) :column)
- for max-key-len = (apply #'max (mapcar (lambda (x) (length (car x))) heads-group))
- for max-doc-len = (apply #'max
- (length column-name)
- (mapcar (lambda (x) (length (hydra--to-string (nth 2 x)))) heads-group))
- for header-virtual-head = `(" " nil ,column-name :column ,column-name :exit t)
- for separator-virtual-head = `(" " nil ,(make-string (+ 2 max-doc-len max-key-len) ?-) :column ,column-name :exit t)
- for decorated-heads = (copy-tree (apply 'list header-virtual-head separator-virtual-head heads-group))
- collect (mapcar (lambda (it)
- (hydra--head-set-property it :max-key-len max-key-len)
- (hydra--head-set-property it :max-doc-len max-doc-len))
- decorated-heads)
- into decorated-heads-matrix
- finally return decorated-heads-matrix)))
+ for column-name = (hydra--head-property (nth 0 heads-group) :column)
+ for max-key-len = (apply #'max (mapcar (lambda (x) (length (car x))) heads-group))
+ for max-doc-len = (apply #'max
+ (length column-name)
+ (mapcar (lambda (x) (length (hydra--to-string (nth 2 x)))) heads-group))
+ for header-virtual-head = `(" " nil ,column-name :column ,column-name :exit t)
+ for separator-virtual-head = `(" " nil ,(make-string (+ 2 max-doc-len max-key-len) ?-) :column ,column-name :exit t)
+ for decorated-heads = (copy-tree (apply 'list header-virtual-head separator-virtual-head heads-group))
+ collect (mapcar (lambda (it)
+ (hydra--head-set-property it :max-key-len max-key-len)
+ (hydra--head-set-property it :max-doc-len max-doc-len))
+ decorated-heads)
+ into decorated-heads-matrix
+ finally return decorated-heads-matrix)))
(defun hydra--hint-from-matrix (body heads-matrix)
- "Generate a formated table-style docstring according to BODY and HEADS-MATRIX data and structure.
+ "Generate a formated table-style docstring according to BODY and HEADS-MATRIX.
HEADS-MATRIX is expected to be a list of heads with following features:
Each heads must have the same length
Each head must have a property max-key-len and max-doc-len."
.emacs.d/elpa/hydra-20170108.148/hydra.elc → .emacs.d/elpa/hydra-20170325.815/hydra.elc
Binary file
.emacs.d/elpa/hydra-20170108.148/lv.el → .emacs.d/elpa/hydra-20170325.815/lv.el
File renamed without changes
.emacs.d/elpa/hydra-20170108.148/lv.elc → .emacs.d/elpa/hydra-20170325.815/lv.elc
File renamed without changes
.emacs.d/elpa/ivy-20170312.844/colir.el → .emacs.d/elpa/ivy-20170328.1957/colir.el
File renamed without changes
.emacs.d/elpa/ivy-20170312.844/colir.elc → .emacs.d/elpa/ivy-20170328.1957/colir.elc
File renamed without changes
.emacs.d/elpa/ivy-20170312.844/dir → .emacs.d/elpa/ivy-20170328.1957/dir
File renamed without changes
.emacs.d/elpa/ivy-20170312.844/ivy-autoloads.el → .emacs.d/elpa/ivy-20170328.1957/ivy-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "ivy" "ivy.el" (22725 53737 126787 808000))
+;;;### (autoloads nil "ivy" "ivy.el" (22753 9098 355401 989000))
;;; Generated autoloads from ivy.el
(autoload 'ivy-resume "ivy" "\
@@ -116,7 +116,7 @@ Switch to another buffer in another window.
;;;***
;;;### (autoloads nil nil ("colir.el" "ivy-overlay.el" "ivy-pkg.el")
-;;;;;; (22725 53737 111788 294000))
+;;;;;; (22753 9098 352402 34000))
;;;***
.emacs.d/elpa/ivy-20170312.844/ivy-help.org → .emacs.d/elpa/ivy-20170328.1957/ivy-help.org
File renamed without changes
.emacs.d/elpa/ivy-20170312.844/ivy-overlay.el → .emacs.d/elpa/ivy-20170328.1957/ivy-overlay.el
@@ -39,7 +39,13 @@
(defun ivy-left-pad (str width)
"Pad STR from left with WIDTH spaces."
(let ((padding (make-string width ?\ )))
- (mapconcat (lambda (x) (concat padding x))
+ (mapconcat (lambda (x)
+ (setq x (concat padding x))
+ (if (> (length x) (window-width))
+ (concat
+ (substring x 0 (- (window-width) 4))
+ "...")
+ x))
(split-string str "\n")
"\n")))
@@ -97,11 +103,9 @@ Hide the minibuffer contents and cursor."
(+ (if (eq major-mode 'org-mode)
(* org-indent-indentation-per-level (org-current-level))
0)
- (if (eq (ivy-state-caller ivy-last)
- 'ivy-completion-in-region)
- (- ivy-completion-beg ivy-completion-end)
- 0)
- (current-column))))))
+ (save-excursion
+ (goto-char ivy-completion-beg)
+ (current-column)))))))
(add-face-text-property cursor-pos (1+ cursor-pos)
'ivy-cursor t overlay-str)
(ivy-overlay-show-after overlay-str)))))
.emacs.d/elpa/ivy-20170312.844/ivy-overlay.elc → .emacs.d/elpa/ivy-20170328.1957/ivy-overlay.elc
Binary file
.emacs.d/elpa/ivy-20170312.844/ivy-pkg.el → .emacs.d/elpa/ivy-20170328.1957/ivy-pkg.el
@@ -1,4 +1,4 @@
-(define-package "ivy" "20170312.844" "Incremental Vertical completYon"
+(define-package "ivy" "20170328.1957" "Incremental Vertical completYon"
'((emacs "24.1"))
:url "https://github.com/abo-abo/swiper" :keywords
'("matching"))
.emacs.d/elpa/ivy-20170312.844/ivy.el → .emacs.d/elpa/ivy-20170328.1957/ivy.el
@@ -346,7 +346,8 @@ action functions.")
;; A lambda that transforms candidates only for display
display-transformer-fn
directory
- caller)
+ caller
+ current)
(defvar ivy-last (make-ivy-state)
"The last parameters passed to `ivy-read'.
@@ -354,6 +355,13 @@ action functions.")
This should eventually become a stack so that you could use
`ivy-read' recursively.")
+(defvar ivy-recursive-last nil)
+
+(defvar ivy-recursive-restore t
+ "When non-nil, restore the above state when exiting the minibuffer.
+This variable is let-bound to nil by functions that take care of
+the restoring themselves.")
+
(defsubst ivy-set-action (action)
"Set the current `ivy-last' field to ACTION."
(setf (ivy-state-action ivy-last) action))
@@ -389,9 +397,6 @@ of `history-length'.")
(defvar ivy-text ""
"Store the user's string as it is typed in.")
-(defvar ivy--current ""
- "Current candidate.")
-
(defvar ivy--index 0
"Store the index of the current candidate.")
@@ -457,7 +462,14 @@ When non-nil, it should contain at least one %d.")
(defvar ivy--old-text ""
"Store old `ivy-text' for dynamic completion.")
-(defvar ivy-case-fold-search 'auto
+(defcustom ivy-case-fold-search-default 'auto
+ "The default value for `ivy-case-fold-search'."
+ :type '(choice
+ (const :tag "Auto" auto)
+ (const :tag "Always" always)
+ (const :tag "Never" nil)))
+
+(defvar ivy-case-fold-search ivy-case-fold-search-default
"Store the current overriding `case-fold-search'.")
(defvar Info-current-file)
@@ -502,11 +514,12 @@ When non-nil, it should contain at least one %d.")
(defun ivy--done (text)
"Insert TEXT and exit minibuffer."
- (if (and ivy--directory
- (not (eq (ivy-state-history ivy-last) 'grep-files-history)))
- (insert (setq ivy--current (expand-file-name
- text ivy--directory)))
- (insert (setq ivy--current text)))
+ (insert
+ (setf (ivy-state-current ivy-last)
+ (if (and ivy--directory
+ (not (eq (ivy-state-history ivy-last) 'grep-files-history)))
+ (expand-file-name text ivy--directory)
+ text)))
(setq ivy-exit 'done)
(exit-minibuffer))
@@ -520,7 +533,7 @@ When non-nil, it should contain at least one %d.")
;; the action from `ivy-dispatching-done' may not need a
;; candidate at all
(eq this-command 'ivy-dispatching-done))
- (ivy--done ivy--current))
+ (ivy--done (ivy-state-current ivy-last)))
((memq (ivy-state-collection ivy-last)
'(read-file-name-internal internal-complete-buffer))
(if (or (not (eq confirm-nonexistent-file-or-buffer t))
@@ -548,7 +561,7 @@ key (a string), cmd and doc (a string)."
(format "%s\n%s\n"
(if (eq this-command 'ivy-read-action)
"Select action: "
- ivy--current)
+ (ivy-state-current ivy-last))
(mapconcat
(lambda (x)
(format "%s: %s"
@@ -629,7 +642,7 @@ When ARG is t, exit with current text, ignoring the candidates."
(ivy--directory
(ivy--directory-done))
((eq (ivy-state-collection ivy-last) 'Info-read-node-name-1)
- (if (member ivy--current '("(./)" "(../)"))
+ (if (member (ivy-state-current ivy-last) '("(./)" "(../)"))
(ivy-quit-and-run
(ivy-read "Go to file: " 'read-file-name-internal
:action (lambda (x)
@@ -650,8 +663,8 @@ When ARG is t, exit with current text, ignoring the candidates."
(ivy--exhibit))
((and
(> ivy--length 0)
- (not (string= ivy--current "./"))
- (setq dir (ivy-expand-file-if-directory ivy--current)))
+ (not (string= (ivy-state-current ivy-last) "./"))
+ (setq dir (ivy-expand-file-if-directory (ivy-state-current ivy-last))))
(ivy--cd dir)
(ivy--exhibit))
((and (not (string= ivy-text ""))
@@ -670,8 +683,8 @@ When ARG is t, exit with current text, ignoring the candidates."
ivy-text))
((string-match
"\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
- ivy--current)
- (setq ivy-text ivy--current))))
+ (ivy-state-current ivy-last))
+ (setq ivy-text (ivy-state-current ivy-last)))))
(string-match
"\\`/\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
ivy-text))
@@ -765,7 +778,7 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
"Exit the minibuffer with current input instead of current candidate."
(interactive)
(delete-minibuffer-contents)
- (insert (setq ivy--current
+ (insert (setf (ivy-state-current ivy-last)
(if ivy--directory
(expand-file-name ivy-text ivy--directory)
ivy-text)))
@@ -791,7 +804,7 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
:history (ivy-state-history ivy-last)
:preselect (unless (eq (ivy-state-collection ivy-last)
'read-file-name-internal)
- ivy--current)
+ (ivy-state-current ivy-last))
:keymap (ivy-state-keymap ivy-last)
:update-fn (ivy-state-update-fn ivy-last)
:sort (ivy-state-sort ivy-last)
@@ -971,6 +984,12 @@ Example use:
;; do whatever with str - the corresponding file will not be opened
)")
+(defun ivy-recursive-restore ()
+ (when (and ivy-recursive-last
+ ivy-recursive-restore
+ (not (eq ivy-last ivy-recursive-last)))
+ (ivy--reset-state (setq ivy-last ivy-recursive-last))))
+
(defun ivy-call ()
"Call the current action without exiting completion."
(interactive)
@@ -994,20 +1013,21 @@ Example use:
;; Previously, the cdr of the selected candidate would be returned.
;; Now, the whole candidate is returned.
(let (idx)
- (if (setq idx (get-text-property 0 'idx ivy--current))
+ (if (setq idx (get-text-property 0 'idx (ivy-state-current ivy-last)))
(nth idx collection)
- (assoc ivy--current collection)))))
+ (assoc (ivy-state-current ivy-last) collection)))))
(ivy--directory
- (expand-file-name ivy--current ivy--directory))
- ((equal ivy--current "")
+ (expand-file-name (ivy-state-current ivy-last) ivy--directory))
+ ((equal (ivy-state-current ivy-last) "")
ivy-text)
(t
- ivy--current))))
+ (ivy-state-current ivy-last)))))
(if (eq action 'identity)
(funcall action x)
(select-window (ivy--get-window ivy-last))
(prog1 (with-current-buffer (ivy-state-buffer ivy-last)
- (funcall action x))
+ (unwind-protect (funcall action x)
+ (ivy-recursive-restore)))
(unless (or (eq ivy-exit 'done)
(equal (selected-window)
(active-minibuffer-window))
@@ -1098,7 +1118,7 @@ If so, move to that directory, while keeping only the file name."
'ivy-index))))
(when idx
(ivy--exhibit)
- (setq ivy--index idx))))
+ (ivy-set-index idx))))
(defun ivy--cd (dir)
"When completing file names, move to directory DIR."
@@ -1106,7 +1126,7 @@ If so, move to that directory, while keeping only the file name."
(error "Unexpected")
(setq ivy--old-cands nil)
(setq ivy--old-re nil)
- (setq ivy--index 0)
+ (ivy-set-index 0)
(setq ivy--all-candidates
(ivy--sorted-files (setq ivy--directory dir)))
(setq ivy-text "")
@@ -1291,10 +1311,9 @@ This only has an effect if multiple sorting functions are
specified for the current collection in
`ivy-sort-functions-alist'."
(interactive)
- (let ((cell
- (assoc (ivy-state-collection ivy-last) ivy-sort-functions-alist)))
- (when (listp (cdr cell))
- (setcdr cell (append (cddr cell) (list (cadr cell))))
+ (let ((cell (assoc (ivy-state-collection ivy-last) ivy-sort-functions-alist)))
+ (when (consp (cdr cell))
+ (setcdr cell `(,@(cddr cell) ,(cadr cell)))
(ivy--reset-state ivy-last))))
(defvar ivy-index-functions-alist
@@ -1377,11 +1396,6 @@ Directories come first."
(cl-remove-if-not predicate seq)
seq))))
-(defvar ivy-recursive-restore t
- "When non-nil, restore the above state when exiting the minibuffer.
-This variable is let-bound to nil by functions that take care of
-the restoring themselves.")
-
;;** Entry Point
;;;###autoload
(cl-defun ivy-read (prompt collection
@@ -1466,7 +1480,7 @@ customizations apply to the current completion session."
(list (car source) (funcall (car source)))
ivy--extra-candidates))))))
(setq ivy--extra-candidates '((original-source)))))
- (let ((recursive-ivy-last (and (active-minibuffer-window) ivy-last))
+ (let ((ivy-recursive-last (and (active-minibuffer-window) ivy-last))
(transformer-fn
(plist-get ivy--display-transformers-list
(or caller (and (functionp collection)
@@ -1516,26 +1530,22 @@ customizations apply to the current completion session."
hist)
(when (eq ivy-exit 'done)
(let ((item (if ivy--directory
- ivy--current
+ (ivy-state-current ivy-last)
ivy-text)))
(unless (equal item "")
(set hist (cons (propertize item 'ivy-index ivy--index)
(delete item
(cdr (symbol-value hist))))))))
- ivy--current))
+ (ivy-state-current ivy-last)))
(remove-hook 'post-command-hook #'ivy--exhibit)
(ivy-overlay-cleanup)
(when (setq unwind (ivy-state-unwind ivy-last))
(funcall unwind))
(unless (eq ivy-exit 'done)
- (when recursive-ivy-last
- (ivy--reset-state (setq ivy-last recursive-ivy-last)))))
+ (ivy-recursive-restore)))
(ivy-call)
- (when (> (length ivy--current) 0)
- (remove-text-properties 0 1 '(idx) ivy--current))
- (when (and recursive-ivy-last
- ivy-recursive-restore)
- (ivy--reset-state (setq ivy-last recursive-ivy-last))))))
+ (when (> (length (ivy-state-current ivy-last)) 0)
+ (remove-text-properties 0 1 '(idx) (ivy-state-current ivy-last))))))
(defun ivy--reset-state (state)
"Reset the ivy to STATE.
@@ -1557,7 +1567,7 @@ This is useful for recursive `ivy-read'."
(setq initial-input (cdr (assoc this-command
ivy-initial-inputs-alist))))
(setq ivy--directory nil)
- (setq ivy-case-fold-search 'auto)
+ (setq ivy-case-fold-search ivy-case-fold-search-default)
(setq ivy--regex-function
(or re-builder
(and (functionp collection)
@@ -1683,23 +1693,23 @@ This is useful for recursive `ivy-read'."
(setq ivy--old-cands nil)
(when (integerp preselect)
(setq ivy--old-re "")
- (setq ivy--index preselect))
+ (ivy-set-index preselect))
(when initial-input
;; Needed for anchor to work
(setq ivy--old-cands coll)
(setq ivy--old-cands (ivy--filter initial-input coll)))
(setq ivy--all-candidates coll)
(unless (integerp preselect)
- (setq ivy--index (or
- (and dynamic-collection
- ivy--index)
- (and preselect
- (ivy--preselect-index
- preselect
- (if initial-input
- ivy--old-cands
- coll)))
- 0))))
+ (ivy-set-index (or
+ (and dynamic-collection
+ ivy--index)
+ (and preselect
+ (ivy--preselect-index
+ preselect
+ (if initial-input
+ ivy--old-cands
+ coll)))
+ 0))))
(setq ivy-exit nil)
(setq ivy--default
(if (region-active-p)
@@ -1779,7 +1789,10 @@ INHERIT-INPUT-METHOD is currently ignored."
:history history
:keymap nil
:sort t
- :caller this-command))))
+ :caller (cond ((called-interactively-p 'any)
+ this-command)
+ ((and collection (symbolp collection))
+ collection))))))
(defvar ivy-completion-beg nil
"Completion bounds start.")
@@ -1792,32 +1805,33 @@ INHERIT-INPUT-METHOD is currently ignored."
(defun ivy-completion-in-region-action (str)
"Insert STR, erasing the previous one.
The previous string is between `ivy-completion-beg' and `ivy-completion-end'."
+ (when (consp str)
+ (setq str (cdr str)))
(when (stringp str)
- (with-ivy-window
- (let ((fake-cursors (and (featurep 'multiple-cursors)
- (mc/all-fake-cursors)))
- (pt (point))
- (beg ivy-completion-beg)
- (end ivy-completion-end))
- (when ivy-completion-beg
- (delete-region
- ivy-completion-beg
- ivy-completion-end))
- (setq ivy-completion-beg
- (move-marker (make-marker) (point)))
- (insert (substring-no-properties str))
- (setq ivy-completion-end
- (move-marker (make-marker) (point)))
- (save-excursion
- (dolist (cursor fake-cursors)
- (goto-char (overlay-start cursor))
- (delete-region (+ (point) (- beg pt))
- (+ (point) (- end pt)))
- (insert (substring-no-properties str))
- ;; manually move the fake cursor
- (move-overlay cursor (point) (1+ (point)))
- (move-marker (overlay-get cursor 'point) (point))
- (move-marker (overlay-get cursor 'mark) (point))))))))
+ (let ((fake-cursors (and (featurep 'multiple-cursors)
+ (mc/all-fake-cursors)))
+ (pt (point))
+ (beg ivy-completion-beg)
+ (end ivy-completion-end))
+ (when ivy-completion-beg
+ (delete-region
+ ivy-completion-beg
+ ivy-completion-end))
+ (setq ivy-completion-beg
+ (move-marker (make-marker) (point)))
+ (insert (substring-no-properties str))
+ (setq ivy-completion-end
+ (move-marker (make-marker) (point)))
+ (save-excursion
+ (dolist (cursor fake-cursors)
+ (goto-char (overlay-start cursor))
+ (delete-region (+ (point) (- beg pt))
+ (+ (point) (- end pt)))
+ (insert (substring-no-properties str))
+ ;; manually move the fake cursor
+ (move-overlay cursor (point) (1+ (point)))
+ (move-marker (overlay-get cursor 'point) (point))
+ (move-marker (overlay-get cursor 'mark) (point)))))))
(defun ivy-completion-common-length (str)
"Return the length of the first 'completions-common-part face in STR."
@@ -2274,10 +2288,10 @@ If SUBEXP is nil, the text properties are applied to the whole match."
(not (string= ivy-text "/")))
(let ((default-directory ivy--directory))
(and
- (not (equal ivy--current ""))
- (file-directory-p ivy--current)
- (file-exists-p ivy--current))))
- (ivy--cd (expand-file-name ivy--current ivy--directory)))))
+ (not (equal (ivy-state-current ivy-last) ""))
+ (file-directory-p (ivy-state-current ivy-last))
+ (file-exists-p (ivy-state-current ivy-last)))))
+ (ivy--cd (expand-file-name (ivy-state-current ivy-last) ivy--directory)))))
(defcustom ivy-magic-tilde t
"When non-nil, ~ will move home when selecting files.
@@ -2401,18 +2415,22 @@ Should be run via minibuffer `post-command-hook'."
'(setq ivy--flx-cache (flx-make-string-cache)))
(defun ivy-toggle-case-fold ()
- "Toggle the case folding between nil and auto.
-In any completion session, the case folding starts in auto:
+ "Toggle the case folding between nil and auto/always.
-- when the input is all lower case, `case-fold-search' is t
-- otherwise nil.
+If auto, `case-fold-search' is t, when the input is all lower case,
+otherwise nil.
-You can toggle this to make `case-fold-search' nil regardless of input."
+If always, `case-fold-search' is always t, regardless of the input.
+
+Otherwise `case-fold-search' is always nil, regardless of the input.
+
+In any completion session, the case folding starts in
+`ivy-case-fold-search-default'."
(interactive)
(setq ivy-case-fold-search
(if ivy-case-fold-search
nil
- 'auto))
+ (or ivy-case-fold-search-default 'auto)))
;; reset cache so that the candidate list updates
(setq ivy--old-re nil))
@@ -2447,7 +2465,8 @@ CANDIDATES are assumed to be static."
(matcher (ivy-state-matcher ivy-last))
(case-fold-search
(and ivy-case-fold-search
- (string= name (downcase name))))
+ (or (eq ivy-case-fold-search 'always)
+ (string= name (downcase name)))))
(cands (cond
(matcher
(funcall matcher re candidates))
@@ -2604,35 +2623,35 @@ before substring matches."
(cdr (assoc t ivy-index-functions-alist))
#'ivy-recompute-index-zero)))
(unless (eq this-command 'ivy-resume)
- (setq ivy--index
- (or
- (cl-position (if (and (> (length name) 0)
- (eq ?^ (aref name 0)))
- (substring name 1)
- name) cands
- :test #'equal)
- (and ivy--directory
- (cl-position
- (concat re-str "/") cands
- :test #'equal))
- (and (eq caller 'ivy-switch-buffer)
- (> (length name) 0)
- 0)
- (and (not (string= name ""))
- (not (and ivy--flx-featurep
- (eq ivy--regex-function 'ivy--regex-fuzzy)
- (< (length cands) 200)))
- ivy--old-cands
- (cl-position (nth ivy--index ivy--old-cands)
- cands))
- (funcall func re-str cands))))
+ (ivy-set-index
+ (or
+ (cl-position (if (and (> (length name) 0)
+ (eq ?^ (aref name 0)))
+ (substring name 1)
+ name) cands
+ :test #'equal)
+ (and ivy--directory
+ (cl-position
+ (concat re-str "/") cands
+ :test #'equal))
+ (and (eq caller 'ivy-switch-buffer)
+ (> (length name) 0)
+ 0)
+ (and (not (string= name ""))
+ (not (and ivy--flx-featurep
+ (eq ivy--regex-function 'ivy--regex-fuzzy)
+ (< (length cands) 200)))
+ ivy--old-cands
+ (cl-position (nth ivy--index ivy--old-cands)
+ cands))
+ (funcall func re-str cands))))
(when (or (string= name "")
(string= name "^"))
- (setq ivy--index
- (or (ivy--preselect-index
- (ivy-state-preselect ivy-last)
- cands)
- ivy--index)))))
+ (ivy-set-index
+ (or (ivy--preselect-index
+ (ivy-state-preselect ivy-last)
+ cands)
+ ivy--index)))))
(defun ivy-recompute-index-swiper (_re-str cands)
(condition-case nil
@@ -2927,9 +2946,9 @@ SEPARATOR is used to join the candidates."
CANDS is a list of strings."
(setq ivy--length (length cands))
(when (>= ivy--index ivy--length)
- (setq ivy--index (max (1- ivy--length) 0)))
+ (ivy-set-index (max (1- ivy--length) 0)))
(if (null cands)
- (setq ivy--current "")
+ (setf (ivy-state-current ivy-last) "")
(let* ((half-height (/ ivy-height 2))
(start (max 0 (- ivy--index half-height)))
(end (min (+ start (1- ivy-height)) ivy--length))
@@ -2937,7 +2956,7 @@ CANDS is a list of strings."
(cands (cl-subseq cands start end))
(index (- ivy--index start))
transformer-fn)
- (setq ivy--current (copy-sequence (nth index cands)))
+ (setf (ivy-state-current ivy-last) (copy-sequence (nth index cands)))
(when (setq transformer-fn (ivy-state-display-transformer-fn ivy-last))
(with-ivy-window
(setq cands (mapcar transformer-fn cands))))
@@ -3333,9 +3352,9 @@ Don't finish completion."
(interactive)
(delete-minibuffer-contents)
(if (and ivy--directory
- (string-match "/$" ivy--current))
- (insert (substring ivy--current 0 -1))
- (insert ivy--current)))
+ (string-match "/$" (ivy-state-current ivy-last)))
+ (insert (substring (ivy-state-current ivy-last) 0 -1))
+ (insert (ivy-state-current ivy-last))))
(defun ivy-toggle-fuzzy ()
"Toggle the re builder between `ivy--regex-fuzzy' and `ivy--regex-plus'."
@@ -3618,14 +3637,14 @@ EVENT gives the mouse position."
(ivy-occur-press)
(select-window (ivy--get-window ivy-occur-last)))
-(defvar ivy-help-file (let ((default-directory
- (if load-file-name
- (file-name-directory load-file-name)
- default-directory)))
- (if (file-exists-p "ivy-help.org")
- (expand-file-name "ivy-help.org")
- (if (file-exists-p "doc/ivy-help.org")
- (expand-file-name "doc/ivy-help.org"))))
+(defconst ivy-help-file (let ((default-directory
+ (if load-file-name
+ (file-name-directory load-file-name)
+ default-directory)))
+ (if (file-exists-p "ivy-help.org")
+ (expand-file-name "ivy-help.org")
+ (if (file-exists-p "doc/ivy-help.org")
+ (expand-file-name "doc/ivy-help.org"))))
"The file for `ivy-help'.")
(defun ivy-help ()
.emacs.d/elpa/ivy-20170312.844/ivy.elc → .emacs.d/elpa/ivy-20170328.1957/ivy.elc
Binary file
.emacs.d/elpa/ivy-20170312.844/ivy.info → .emacs.d/elpa/ivy-20170328.1957/ivy.info
File renamed without changes
.emacs.d/elpa/magit-20170311.925/AUTHORS.md → .emacs.d/elpa/magit-20170401.1145/AUTHORS.md
File renamed without changes
.emacs.d/elpa/magit-20170311.925/COPYING → .emacs.d/elpa/magit-20170401.1145/COPYING
File renamed without changes
.emacs.d/elpa/magit-20170311.925/dir → .emacs.d/elpa/magit-20170401.1145/dir
File renamed without changes
.emacs.d/elpa/magit-20170311.925/git-rebase.el → .emacs.d/elpa/magit-20170401.1145/git-rebase.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/git-rebase.elc → .emacs.d/elpa/magit-20170401.1145/git-rebase.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-apply.el → .emacs.d/elpa/magit-20170401.1145/magit-apply.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-apply.elc → .emacs.d/elpa/magit-20170401.1145/magit-apply.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-autoloads.el → .emacs.d/elpa/magit-20170401.1145/magit-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "git-rebase" "git-rebase.el" (22725 53733 171915
-;;;;;; 887000))
+;;;### (autoloads nil "git-rebase" "git-rebase.el" (22753 9096 323432
+;;;;;; 572000))
;;; Generated autoloads from git-rebase.el
(autoload 'git-rebase-mode "git-rebase" "\
@@ -23,7 +23,7 @@ running 'man git-rebase' at the command line) for details.
;;;***
-;;;### (autoloads nil "magit" "magit.el" (22725 53733 273912 583000))
+;;;### (autoloads nil "magit" "magit.el" (22753 9096 340432 316000))
;;; Generated autoloads from magit.el
(autoload 'magit-merge-popup "magit" nil t)
@@ -148,7 +148,7 @@ Execute a shell command asynchronously, displaying the output.
With a prefix argument run the command in the root of the current
repository, otherwise in `default-directory'.
-\(fn ARGS DIRECTORY)" t nil)
+\(fn CMD DIRECTORY)" t nil)
(autoload 'magit-shell-command-topdir "magit" "\
Execute a shell command asynchronously, displaying the output.
@@ -165,8 +165,8 @@ Git, and Emacs in the echo area.
;;;***
-;;;### (autoloads nil "magit-apply" "magit-apply.el" (22725 53733
-;;;;;; 204914 818000))
+;;;### (autoloads nil "magit-apply" "magit-apply.el" (22753 9096
+;;;;;; 328432 497000))
;;; Generated autoloads from magit-apply.el
(autoload 'magit-stage-file "magit-apply" "\
@@ -202,8 +202,8 @@ Remove all changes from the staging area.
;;;***
-;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22725
-;;;;;; 53733 125917 376000))
+;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22753
+;;;;;; 9096 314432 707000))
;;; Generated autoloads from magit-autorevert.el
(defvar magit-revert-buffers t)
@@ -232,8 +232,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
;;;***
-;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22725 53733
-;;;;;; 198915 12000))
+;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22753 9096
+;;;;;; 327432 512000))
;;; Generated autoloads from magit-bisect.el
(autoload 'magit-bisect-popup "magit-bisect" nil t)
@@ -284,8 +284,8 @@ bisect run'.
;;;***
-;;;### (autoloads nil "magit-blame" "magit-blame.el" (22725 53733
-;;;;;; 261912 972000))
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (22753 9096
+;;;;;; 338432 346000))
;;; Generated autoloads from magit-blame.el
(autoload 'magit-blame-popup "magit-blame" nil t)
@@ -309,8 +309,8 @@ only arguments available from `magit-blame-popup' should be used.
;;;***
-;;;### (autoloads nil "magit-branch" "magit-branch.el" (22725 53733
-;;;;;; 192915 207000))
+;;;### (autoloads nil "magit-branch" "magit-branch.el" (22753 9096
+;;;;;; 326432 527000))
;;; Generated autoloads from magit-branch.el
(autoload 'magit-branch-popup "magit" nil t)
@@ -538,13 +538,13 @@ When `never' (the default) then the variable is never set.
;;;***
-;;;### (autoloads nil "magit-commit" "magit-commit.el" (22725 53733
-;;;;;; 129917 247000))
+;;;### (autoloads nil "magit-commit" "magit-commit.el" (22753 9096
+;;;;;; 315432 692000))
;;; Generated autoloads from magit-commit.el
(autoload 'magit-commit "magit-commit" "\
-Create a new commit on HEAD.
-With a prefix argument amend to the commit at HEAD instead.
+Create a new commit on `HEAD'.
+With a prefix argument, amend to the commit at `HEAD' instead.
\(git commit [--amend] ARGS)
@@ -621,8 +621,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
;;;***
-;;;### (autoloads nil "magit-diff" "magit-diff.el" (22725 53733 255913
-;;;;;; 166000))
+;;;### (autoloads nil "magit-diff" "magit-diff.el" (22753 9096 337432
+;;;;;; 361000))
;;; Generated autoloads from magit-diff.el
(autoload 'magit-diff-popup "magit-diff" "\
@@ -706,8 +706,8 @@ for a revision.
;;;***
-;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22725 53733
-;;;;;; 231913 944000))
+;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22753 9096
+;;;;;; 333432 421000))
;;; Generated autoloads from magit-ediff.el
(autoload 'magit-ediff-popup "magit-ediff" nil t)
@@ -775,7 +775,7 @@ FILE must be relative to the top directory of the repository.
\(fn FILE)" t nil)
(autoload 'magit-ediff-show-working-tree "magit-ediff" "\
-Show changes between HEAD and working tree using Ediff.
+Show changes between `HEAD' and working tree using Ediff.
FILE must be relative to the top directory of the repository.
\(fn FILE)" t nil)
@@ -795,8 +795,8 @@ stash that were staged.
;;;***
-;;;### (autoloads nil "magit-extras" "magit-extras.el" (22725 53733
-;;;;;; 135917 52000))
+;;;### (autoloads nil "magit-extras" "magit-extras.el" (22753 9096
+;;;;;; 316432 677000))
;;; Generated autoloads from magit-extras.el
(autoload 'magit-run-git-gui "magit-extras" "\
@@ -806,7 +806,7 @@ Run `git gui' for the current git repository.
(autoload 'magit-run-git-gui-blame "magit-extras" "\
Run `git gui blame' on the given FILENAME and COMMIT.
-Interactively run it for the current file and the HEAD, with a
+Interactively run it for the current file and the `HEAD', with a
prefix or when the current file cannot be determined let the user
choose. When the current buffer is visiting FILENAME instruct
blame to center around the line point is on.
@@ -898,8 +898,8 @@ on a position in a file-visiting buffer.
;;;***
-;;;### (autoloads nil "magit-files" "magit-files.el" (22725 53733
-;;;;;; 176915 725000))
+;;;### (autoloads nil "magit-files" "magit-files.el" (22753 9096
+;;;;;; 324432 557000))
;;; Generated autoloads from magit-files.el
(autoload 'magit-find-file "magit-files" "\
@@ -946,8 +946,8 @@ Checkout FILE from REV.
;;;***
-;;;### (autoloads nil "magit-log" "magit-log.el" (22725 53733 237913
-;;;;;; 749000))
+;;;### (autoloads nil "magit-log" "magit-log.el" (22753 9096 334432
+;;;;;; 407000))
;;; Generated autoloads from magit-log.el
(autoload 'magit-log-buffer-file-popup "magit-log" "\
@@ -1029,15 +1029,15 @@ Show commits in a branch that are not merged in the upstream branch.
;;;***
-;;;### (autoloads nil "magit-notes" "magit-notes.el" (22725 53733
-;;;;;; 317911 159000))
+;;;### (autoloads nil "magit-notes" "magit-notes.el" (22753 9096
+;;;;;; 348432 196000))
;;; Generated autoloads from magit-notes.el
(autoload 'magit-notes-popup "magit" nil t)
;;;***
-;;;### (autoloads nil "magit-refs" "magit-refs.el" (22725 53733 140916
-;;;;;; 890000))
+;;;### (autoloads nil "magit-refs" "magit-refs.el" (22753 9096 317432
+;;;;;; 662000))
;;; Generated autoloads from magit-refs.el
(autoload 'magit-show-refs-popup "magit" nil t)
@@ -1062,8 +1062,8 @@ Refs are compared with a branch read from the user.
;;;***
-;;;### (autoloads nil "magit-remote" "magit-remote.el" (22725 53733
-;;;;;; 295911 871000))
+;;;### (autoloads nil "magit-remote" "magit-remote.el" (22753 9096
+;;;;;; 344432 256000))
;;; Generated autoloads from magit-remote.el
(autoload 'magit-clone "magit-remote" "\
@@ -1076,7 +1076,7 @@ Then show the status buffer for the new repository.
(autoload 'magit-remote-add "magit-remote" "\
Add a remote named REMOTE and fetch it.
-\(fn REMOTE URL)" t nil)
+\(fn REMOTE URL &optional ARGS)" t nil)
(autoload 'magit-remote-rename "magit-remote" "\
Rename the remote named OLD to NEW.
@@ -1279,7 +1279,7 @@ Create patches for the commits in RANGE.
When a single commit is given for RANGE, create a patch for the
changes introduced by that commit (unlike 'git format-patch'
which creates patches for all commits that are reachable from
-HEAD but not from the specified commit).
+`HEAD' but not from the specified commit).
\(fn RANGE ARGS)" t nil)
@@ -1295,8 +1295,8 @@ is asked to pull. START has to be reachable from that commit.
;;;***
-;;;### (autoloads nil "magit-repos" "magit-repos.el" (22725 53733
-;;;;;; 249913 361000))
+;;;### (autoloads nil "magit-repos" "magit-repos.el" (22753 9096
+;;;;;; 336432 376000))
;;; Generated autoloads from magit-repos.el
(autoload 'magit-list-repositories "magit-repos" "\
@@ -1310,8 +1310,8 @@ control which repositories are displayed.
;;;***
-;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22725
-;;;;;; 53733 283912 259000))
+;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22753
+;;;;;; 9096 342432 286000))
;;; Generated autoloads from magit-sequence.el
(autoload 'magit-sequencer-continue "magit-sequence" "\
@@ -1461,8 +1461,8 @@ Abort the current rebase operation, restoring the original branch.
;;;***
-;;;### (autoloads nil "magit-stash" "magit-stash.el" (22725 53733
-;;;;;; 220914 300000))
+;;;### (autoloads nil "magit-stash" "magit-stash.el" (22753 9096
+;;;;;; 331432 452000))
;;; Generated autoloads from magit-stash.el
(autoload 'magit-stash-popup "magit-stash" nil t)
@@ -1561,8 +1561,8 @@ Show all diffs of a stash in a buffer.
;;;***
-;;;### (autoloads nil "magit-status" "magit-status.el" (22725 53733
-;;;;;; 243913 555000))
+;;;### (autoloads nil "magit-status" "magit-status.el" (22753 9096
+;;;;;; 335432 391000))
;;; Generated autoloads from magit-status.el
(autoload 'magit-init "magit-status" "\
@@ -1593,8 +1593,8 @@ then offer to initialize it as a new repository.
;;;***
-;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22725
-;;;;;; 53733 322910 997000))
+;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22753
+;;;;;; 9096 349432 181000))
;;; Generated autoloads from magit-submodule.el
(autoload 'magit-submodule-popup "magit-submodule" nil t)
@@ -1684,8 +1684,8 @@ Display a list of the current repository's submodules.
;;;***
-;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22725 53733
-;;;;;; 182915 530000))
+;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22753 9096
+;;;;;; 325432 542000))
;;; Generated autoloads from magit-subtree.el
(autoload 'magit-subtree-popup "magit-subtree" nil t)
@@ -1721,8 +1721,8 @@ Extract the history of the subtree PREFIX.
;;;***
-;;;### (autoloads nil "magit-utils" "magit-utils.el" (22725 53733
-;;;;;; 120917 538000))
+;;;### (autoloads nil "magit-utils" "magit-utils.el" (22753 9096
+;;;;;; 313432 723000))
;;; Generated autoloads from magit-utils.el
(autoload 'magit-emacs-Q-command "magit-utils" "\
@@ -1746,8 +1746,8 @@ Extract the history of the subtree PREFIX.
;;;***
-;;;### (autoloads nil "magit-wip" "magit-wip.el" (22725 53733 150916
-;;;;;; 567000))
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (22753 9096 319432
+;;;;;; 632000))
;;; Generated autoloads from magit-wip.el
(defvar magit-wip-after-save-mode nil "\
@@ -1815,8 +1815,8 @@ command which is about to be called are committed.
;;;***
-;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22725
-;;;;;; 53733 306911 515000))
+;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22753
+;;;;;; 9096 346432 226000))
;;; Generated autoloads from magit-worktree.el
(autoload 'magit-worktree-checkout "magit-worktree" "\
@@ -1833,7 +1833,7 @@ Create a new BRANCH and check it out in a new worktree at PATH.
;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-margin.el"
;;;;;; "magit-mode.el" "magit-obsolete.el" "magit-pkg.el" "magit-process.el"
-;;;;;; "magit-section.el") (22725 53733 301911 677000))
+;;;;;; "magit-section.el") (22753 9096 345432 241000))
;;;***
.emacs.d/elpa/magit-20170311.925/magit-autorevert.el → .emacs.d/elpa/magit-20170401.1145/magit-autorevert.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-autorevert.elc → .emacs.d/elpa/magit-20170401.1145/magit-autorevert.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-bisect.el → .emacs.d/elpa/magit-20170401.1145/magit-bisect.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-bisect.elc → .emacs.d/elpa/magit-20170401.1145/magit-bisect.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-blame.el → .emacs.d/elpa/magit-20170401.1145/magit-blame.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-blame.elc → .emacs.d/elpa/magit-20170401.1145/magit-blame.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-branch.el → .emacs.d/elpa/magit-20170401.1145/magit-branch.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-branch.elc → .emacs.d/elpa/magit-20170401.1145/magit-branch.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-commit.el → .emacs.d/elpa/magit-20170401.1145/magit-commit.el
@@ -146,8 +146,8 @@ an error while using those is harder to recover from."
;;;###autoload
(defun magit-commit (&optional args)
- "Create a new commit on HEAD.
-With a prefix argument amend to the commit at HEAD instead.
+ "Create a new commit on `HEAD'.
+With a prefix argument, amend to the commit at `HEAD' instead.
\n(git commit [--amend] ARGS)"
(interactive (if current-prefix-arg
(list (cons "--amend" (magit-commit-arguments)))
.emacs.d/elpa/magit-20170311.925/magit-commit.elc → .emacs.d/elpa/magit-20170401.1145/magit-commit.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-core.el → .emacs.d/elpa/magit-20170401.1145/magit-core.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-core.elc → .emacs.d/elpa/magit-20170401.1145/magit-core.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-diff.el → .emacs.d/elpa/magit-20170401.1145/magit-diff.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-diff.elc → .emacs.d/elpa/magit-20170401.1145/magit-diff.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-ediff.el → .emacs.d/elpa/magit-20170401.1145/magit-ediff.el
@@ -77,7 +77,7 @@ staged changes, fall back to a two-buffer Ediff.
More specifically, a stash is a merge commit, stash@{N}, with
potentially three parents.
-* stash@{N}^1 represents the HEAD commit at the time the stash
+* stash@{N}^1 represents the `HEAD' commit at the time the stash
was created.
* stash@{N}^2 records any changes that were staged when the stash
@@ -401,7 +401,7 @@ FILE must be relative to the top directory of the repository."
;;;###autoload
(defun magit-ediff-show-working-tree (file)
- "Show changes between HEAD and working tree using Ediff.
+ "Show changes between `HEAD' and working tree using Ediff.
FILE must be relative to the top directory of the repository."
(interactive
(list (magit-read-file-choice "Show changes in file"
.emacs.d/elpa/magit-20170311.925/magit-ediff.elc → .emacs.d/elpa/magit-20170401.1145/magit-ediff.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-extras.el → .emacs.d/elpa/magit-20170401.1145/magit-extras.el
@@ -56,7 +56,7 @@
;;;###autoload
(defun magit-run-git-gui-blame (commit filename &optional linenum)
"Run `git gui blame' on the given FILENAME and COMMIT.
-Interactively run it for the current file and the HEAD, with a
+Interactively run it for the current file and the `HEAD', with a
prefix or when the current file cannot be determined let the user
choose. When the current buffer is visiting FILENAME instruct
blame to center around the line point is on."
.emacs.d/elpa/magit-20170311.925/magit-extras.elc → .emacs.d/elpa/magit-20170401.1145/magit-extras.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-files.el → .emacs.d/elpa/magit-20170401.1145/magit-files.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-files.elc → .emacs.d/elpa/magit-20170401.1145/magit-files.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-git.el → .emacs.d/elpa/magit-20170401.1145/magit-git.el
@@ -340,7 +340,7 @@ message and add a section in the respective process buffer."
Actually first insert the raw output at point. If there is no
output call `magit-cancel-section'. Otherwise temporarily narrow
the buffer to the inserted text, move to its beginning, and then
-call function WASHER with no argument."
+call function WASHER with ARGS as its sole argument."
(declare (indent 1))
(let ((beg (point)))
(setq args (-flatten args))
@@ -966,10 +966,10 @@ which is different from the current branch and still exists."
(defun magit-get-current-tag (&optional rev with-distance)
"Return the closest tag reachable from REV.
-If optional REV is nil then default to \"HEAD\".
+If optional REV is nil then default to `HEAD'.
If optional WITH-DISTANCE is non-nil then return (TAG COMMITS),
if it is `dirty' return (TAG COMMIT DIRTY). COMMITS is the number
-of commits in \"HEAD\" but not in TAG and DIRTY is t if there are
+of commits in `HEAD' but not in TAG and DIRTY is t if there are
uncommitted changes, nil otherwise."
(--when-let (magit-git-str "describe" "--long" "--tags"
(and (eq with-distance 'dirty) "--dirty") rev)
@@ -985,7 +985,7 @@ uncommitted changes, nil otherwise."
(defun magit-get-next-tag (&optional rev with-distance)
"Return the closest tag from which REV is reachable.
-If optional REV is nil then default to \"HEAD\".
+If optional REV is nil then default to `HEAD'.
If no such tag can be found or if the distance is 0 (in which
case it is the current tag, not the next) return nil instead.
If optional WITH-DISTANCE is non-nil then return (TAG COMMITS)
@@ -1154,10 +1154,13 @@ Return a list of two integers: (A>B B>A)."
(defun magit-abbrev-length ()
(--if-let (magit-get "core.abbrev")
(string-to-number it)
- (--if-let (magit-rev-parse "--short" "HEAD")
- (length it)
- ;; We are either in an empty repository or not in a repository.
- 7)))
+ ;; Guess the length git will be using based on an example
+ ;; abbreviation. Actually HEAD's abbreviation might be an
+ ;; outlier, so use the shorter of the abbreviations for two
+ ;; commits. When a commit does not exist, then fall back
+ ;; to the default of 7. See #3034.
+ (min (--if-let (magit-rev-parse "--short" "HEAD") (length it) 7)
+ (--if-let (magit-rev-parse "--short" "HEAD~") (length it) 7))))
(defun magit-abbrev-arg (&optional arg)
(format "--%s=%d" (or arg "abbrev") (magit-abbrev-length)))
.emacs.d/elpa/magit-20170311.925/magit-git.elc → .emacs.d/elpa/magit-20170401.1145/magit-git.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-log.el → .emacs.d/elpa/magit-20170401.1145/magit-log.el
@@ -786,7 +786,7 @@ to visit the commit at point.
Type \\[magit-branch-popup] to see available branch commands.
Type \\[magit-merge-popup] to merge the branch or commit at point.
Type \\[magit-cherry-pick-popup] to apply the commit at point.
-Type \\[magit-reset] to reset HEAD to the commit at point.
+Type \\[magit-reset] to reset `HEAD' to the commit at point.
\\{magit-log-mode-map}"
:group 'magit-log
@@ -1353,7 +1353,7 @@ Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
to visit the commit at point.
Type \\[magit-cherry-pick-popup] to apply the commit at point.
-Type \\[magit-reset] to reset HEAD to the commit at point.
+Type \\[magit-reset] to reset `HEAD' to the commit at point.
\\{magit-reflog-mode-map}"
:group 'magit-log
.emacs.d/elpa/magit-20170311.925/magit-log.elc → .emacs.d/elpa/magit-20170401.1145/magit-log.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-margin.el → .emacs.d/elpa/magit-20170401.1145/magit-margin.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-margin.elc → .emacs.d/elpa/magit-20170401.1145/magit-margin.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-mode.el → .emacs.d/elpa/magit-20170401.1145/magit-mode.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-mode.elc → .emacs.d/elpa/magit-20170401.1145/magit-mode.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-notes.el → .emacs.d/elpa/magit-20170401.1145/magit-notes.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-notes.elc → .emacs.d/elpa/magit-20170401.1145/magit-notes.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-obsolete.el → .emacs.d/elpa/magit-20170401.1145/magit-obsolete.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-obsolete.elc → .emacs.d/elpa/magit-20170401.1145/magit-obsolete.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-pkg.el → .emacs.d/elpa/magit-20170401.1145/magit-pkg.el
@@ -1,4 +1,4 @@
-(define-package "magit" "20170311.925" "A Git porcelain inside Emacs"
+(define-package "magit" "20170401.1145" "A Git porcelain inside Emacs"
'((emacs "24.4")
(async "20170219.942")
(dash "20170207.2056")
.emacs.d/elpa/magit-20170311.925/magit-process.el → .emacs.d/elpa/magit-20170401.1145/magit-process.el
@@ -43,6 +43,9 @@
(eval-when-compile (require 'dired))
(declare-function dired-uncache 'dired)
+(eval-when-compile (require 'auth-source))
+(declare-function auth-source-search 'auth-source)
+
;;; Options
(defcustom magit-git-output-coding-system
.emacs.d/elpa/magit-20170311.925/magit-process.elc → .emacs.d/elpa/magit-20170401.1145/magit-process.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-refs.el → .emacs.d/elpa/magit-20170401.1145/magit-refs.el
@@ -144,7 +144,7 @@ the outcome.
With a prefix argument update the buffer to show commit counts
and lists of cherry commits relative to the reference at point
- instead of relative to the current buffer or HEAD.
+ instead of relative to the current buffer or `HEAD'.
Instead of adding this symbol, consider pressing \"C-u y o RET\".
@@ -160,7 +160,7 @@ the outcome.
`checkout-any'
Check out the reference at point. If that reference is a tag
- or a remote branch, then this results in a detached HEAD.
+ or a remote branch, then this results in a detached `HEAD'.
Instead of adding this symbol, consider pressing \"b b RET\",
like you would do in other buffers.
@@ -201,7 +201,7 @@ to visit the commit or branch at point.
Type \\[magit-branch-popup] to see available branch commands.
Type \\[magit-merge-popup] to merge the branch or commit at point.
Type \\[magit-cherry-pick-popup] to apply the commit at point.
-Type \\[magit-reset] to reset HEAD to the commit at point.
+Type \\[magit-reset] to reset `HEAD' to the commit at point.
\\{magit-refs-mode-map}"
:group 'magit-refs
.emacs.d/elpa/magit-20170311.925/magit-refs.elc → .emacs.d/elpa/magit-20170401.1145/magit-refs.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-remote.el → .emacs.d/elpa/magit-20170401.1145/magit-remote.el
@@ -104,6 +104,9 @@ variable isn't already set."
(magit-define-popup magit-remote-popup
"Popup console for remote commands."
:man-page "git-remote"
+ :default-arguments '("-f")
+ :switches '("Switches for add"
+ (?f "Fetch after add" "-f"))
:actions '((?a "Add" magit-remote-add)
(?r "Rename" magit-remote-rename)
(?k "Remove" magit-remote-remove)
@@ -116,19 +119,20 @@ variable isn't already set."
url)))
;;;###autoload
-(defun magit-remote-add (remote url)
+(defun magit-remote-add (remote url &optional args)
"Add a remote named REMOTE and fetch it."
(interactive (list (magit-read-string-ns "Remote name")
- (magit-read-url "Remote url")))
+ (magit-read-url "Remote url")
+ (magit-remote-arguments)))
(if (pcase (list magit-remote-add-set-remote.pushDefault
(magit-get "remote.pushDefault"))
(`(,(pred stringp) ,_) t)
((or `(ask ,_) `(ask-if-unset nil))
(y-or-n-p (format "Set `remote.pushDefault' to \"%s\"? " remote))))
- (progn (magit-call-git "remote" "add" "-f" remote url)
+ (progn (magit-call-git "remote" "add" args remote url)
(setf (magit-get "remote.pushDefault") remote)
(magit-refresh))
- (magit-run-git-async "remote" "add" "-f" remote url)))
+ (magit-run-git-async "remote" "add" args remote url)))
;;;###autoload
(defun magit-remote-rename (old new)
@@ -722,7 +726,7 @@ To add this command to the push popup add this to your init file:
When a single commit is given for RANGE, create a patch for the
changes introduced by that commit (unlike 'git format-patch'
which creates patches for all commits that are reachable from
-HEAD but not from the specified commit)."
+`HEAD' but not from the specified commit)."
(interactive
(list (-if-let (revs (magit-region-values 'commit))
(concat (car (last revs)) "^.." (car revs))
.emacs.d/elpa/magit-20170311.925/magit-remote.elc → .emacs.d/elpa/magit-20170401.1145/magit-remote.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-repos.el → .emacs.d/elpa/magit-20170401.1145/magit-repos.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-repos.elc → .emacs.d/elpa/magit-20170401.1145/magit-repos.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-section.el → .emacs.d/elpa/magit-20170401.1145/magit-section.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-section.elc → .emacs.d/elpa/magit-20170401.1145/magit-section.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-sequence.el → .emacs.d/elpa/magit-20170401.1145/magit-sequence.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-sequence.elc → .emacs.d/elpa/magit-20170401.1145/magit-sequence.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-stash.el → .emacs.d/elpa/magit-20170401.1145/magit-stash.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-stash.elc → .emacs.d/elpa/magit-20170401.1145/magit-stash.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-status.el → .emacs.d/elpa/magit-20170401.1145/magit-status.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-status.elc → .emacs.d/elpa/magit-20170401.1145/magit-status.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-submodule.el → .emacs.d/elpa/magit-20170401.1145/magit-submodule.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-submodule.elc → .emacs.d/elpa/magit-20170401.1145/magit-submodule.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-subtree.el → .emacs.d/elpa/magit-20170401.1145/magit-subtree.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-subtree.elc → .emacs.d/elpa/magit-20170401.1145/magit-subtree.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-utils.el → .emacs.d/elpa/magit-20170401.1145/magit-utils.el
@@ -45,6 +45,9 @@
(declare-function ido-completing-read+ 'ido-completing-read+)
(declare-function Info-get-token 'info)
+(eval-when-compile (require 'vc-git))
+(declare-function vc-git--run-command-string 'vc-git)
+
(defvar magit-wip-before-change-mode)
;;; Options
@@ -552,6 +555,22 @@ and https://github.com/magit/magit/issues/2295."
(and (file-directory-p filename)
(file-accessible-directory-p filename)))
+(when (version<= "25.1" emacs-version)
+ (with-eval-after-load 'vc-git
+ (defun vc-git-conflicted-files (directory)
+ "Return the list of files with conflicts in DIRECTORY."
+ (let* ((status
+ (vc-git--run-command-string directory "diff-files"
+ "--name-status"))
+ (lines (when status (split-string status "\n" 'omit-nulls)))
+ files)
+ (dolist (line lines files)
+ (when (string-match "\\([ MADRCU?!]\\)[ \t]+\\(.+\\)" line)
+ (let ((state (match-string 1 line))
+ (file (match-string 2 line)))
+ (when (equal state "U")
+ (push (expand-file-name file directory) files)))))))))
+
;;; Kludges for Incompatible Modes
(defvar whitespace-mode)
.emacs.d/elpa/magit-20170311.925/magit-utils.elc → .emacs.d/elpa/magit-20170401.1145/magit-utils.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit-wip.el → .emacs.d/elpa/magit-20170401.1145/magit-wip.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-wip.elc → .emacs.d/elpa/magit-20170401.1145/magit-wip.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-worktree.el → .emacs.d/elpa/magit-20170401.1145/magit-worktree.el
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit-worktree.elc → .emacs.d/elpa/magit-20170401.1145/magit-worktree.elc
File renamed without changes
.emacs.d/elpa/magit-20170311.925/magit.el → .emacs.d/elpa/magit-20170401.1145/magit.el
@@ -117,7 +117,7 @@
(defface magit-head
'((((class color) (background light)) :inherit magit-branch-local)
(((class color) (background dark)) :inherit magit-branch-local))
- "Face for the symbolic ref \"HEAD\"."
+ "Face for the symbolic ref `HEAD'."
:group 'magit-faces)
(defface magit-refname
@@ -218,7 +218,10 @@ merge failed to give the user the opportunity to inspect the
merge.
\(git merge --no-edit|--no-commit [ARGS] REV)"
- (interactive (list (magit-read-other-branch-or-commit "Merge")
+ (interactive (list (magit-read-other-branch-or-commit
+ "Merge" nil
+ (and (derived-mode-p 'magit-merge-preview-mode)
+ (car magit-refresh-args)))
(magit-merge-arguments)
current-prefix-arg))
(magit-merge-assert)
@@ -600,18 +603,14 @@ Run Git in the top-level directory of the current repository.
(magit-git-command args directory))
;;;###autoload
-(defun magit-shell-command (args directory)
+(defun magit-shell-command (cmd directory)
"Execute a shell command asynchronously, displaying the output.
With a prefix argument run the command in the root of the current
repository, otherwise in `default-directory'."
(interactive (magit-read-shell-command "Shell command (pwd: %s)"))
- (require 'eshell)
- (with-temp-buffer
- (insert args)
- (setq args (mapcar 'eval (eshell-parse-arguments (point-min)
- (point-max))))
- (setq default-directory directory)
- (apply #'magit-start-process (car args) nil (cdr args)))
+ (let ((default-directory directory))
+ (magit-start-process shell-file-name nil
+ shell-command-switch cmd))
(magit-process-buffer))
;;;###autoload
@@ -877,8 +876,8 @@ Git, and Emacs in the echo area."
debug)
(unless (and toplib
(equal (file-name-nondirectory toplib) "magit.el"))
- (setq toplib (locate-library "magit.el"))
- (setq toplib (and toplib (file-chase-links toplib))))
+ (setq toplib (locate-library "magit.el")))
+ (setq toplib (and toplib (file-chase-links toplib)))
(push toplib debug)
(when toplib
(let* ((topdir (file-name-directory toplib))
.emacs.d/elpa/magit-20170311.925/magit.elc → .emacs.d/elpa/magit-20170401.1145/magit.elc
Binary file
.emacs.d/elpa/magit-20170311.925/magit.info → .emacs.d/elpa/magit-20170401.1145/magit.info
@@ -27,7 +27,7 @@ END-INFO-DIR-ENTRY
Indirect:
magit.info-1: 1222
-magit.info-2: 322678
+magit.info-2: 322709
Tag Table:
(Indirect)
@@ -74,95 +74,95 @@ Node: Select from Log92497
Node: Reflog94601
Node: Cherries96125
Node: Diffing97870
-Node: Refreshing Diffs100889
-Node: Diff Buffer103870
-Node: Diff Options106464
-Node: Revision Buffer109834
-Node: Ediffing110789
-Node: References Buffer114379
-Node: References Sections121678
-Node: Bisecting122553
-Node: Visiting Blobs124291
-Node: Blaming124800
-Node: Manipulating128229
-Node: Repository Setup128545
-Node: Staging and Unstaging129585
-Node: Staging from File-Visiting Buffers133674
-Node: Applying134842
-Node: Committing136735
-Node: Initiating a Commit137318
-Node: Editing Commit Messages140629
-Node: Branching151025
-Node: The Two Remotes151225
-Node: The Branch Popup153850
-Node: The Branch Config Popup163195
-Node: Merging169098
-Node: Resolving Conflicts171265
-Node: Rebasing176270
-Node: Editing Rebase Sequences179910
-Node: Information About In-Progress Rebase182940
-Ref: Information About In-Progress Rebase-Footnote-1189776
-Node: Cherry Picking190362
-Node: Reverting191967
-Node: Resetting193330
-Node: Stashing194841
-Node: Transferring199035
-Node: Remotes199273
-Node: Fetching200551
-Node: Pulling201916
-Node: Pushing202761
-Node: Creating and Sending Patches207504
-Node: Applying Patches208199
-Node: Miscellaneous209196
-Node: Tagging209499
-Node: Notes210283
-Node: Submodules212807
-Node: Listing Submodules213021
-Node: Submodule Popup214840
-Node: Subtree216123
-Node: Common Commands217370
-Node: Wip Modes219115
-Node: Minor Mode for Buffers Visiting Files225911
-Node: Minor Mode for Buffers Visiting Blobs229385
-Node: Customizing230198
-Node: Per-Repository Configuration231870
-Node: Essential Settings233517
-Node: Safety233841
-Node: Performance235674
-Node: Plumbing243636
-Node: Calling Git244460
-Node: Getting a Value from Git245983
-Node: Calling Git for Effect249087
-Node: Section Plumbing255591
-Node: Creating Sections255819
-Node: Section Selection259718
-Node: Matching Sections261398
-Node: Refreshing Buffers266830
-Node: Conventions269965
-Node: Confirmation and Completion270142
-Node: Theming Faces271040
-Node: FAQ279191
-Node: FAQ - How to …?279584
-Node: How to show git's output?279948
-Node: How to install the gitman info manual?280702
-Node: How to show diffs for gpg-encrypted files?281672
-Node: How does branching and pushing work?282268
-Node: Can Magit be used as ‘ediff-version-control-package’?282647
-Node: FAQ - Issues and Errors284643
-Node: Magit is slow285387
-Node: I changed several thousand files at once and now Magit is unusable285612
-Node: I am having problems committing286352
-Node: I am using MS Windows and cannot push with Magit286833
-Node: I am using OS X and SOMETHING works in shell but not in Magit287450
-Node: Diffs contain control sequences288256
-Node: Expanding a file to show the diff causes it to disappear289330
-Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer289887
-Node: The mode-line information isn't always up-to-date290939
-Node: Emacs 245 hangs when loading Magit292006
-Node: Keystroke Index292556
-Node: Command Index322678
-Node: Function Index352906
-Node: Variable Index366216
+Node: Refreshing Diffs100896
+Node: Diff Buffer103877
+Node: Diff Options106471
+Node: Revision Buffer109841
+Node: Ediffing110796
+Node: References Buffer114392
+Node: References Sections121691
+Node: Bisecting122566
+Node: Visiting Blobs124304
+Node: Blaming124813
+Node: Manipulating128242
+Node: Repository Setup128558
+Node: Staging and Unstaging129598
+Node: Staging from File-Visiting Buffers133687
+Node: Applying134855
+Node: Committing136748
+Node: Initiating a Commit137331
+Node: Editing Commit Messages140642
+Node: Branching151038
+Node: The Two Remotes151238
+Node: The Branch Popup153863
+Node: The Branch Config Popup163208
+Node: Merging169111
+Node: Resolving Conflicts171278
+Node: Rebasing176287
+Node: Editing Rebase Sequences179927
+Node: Information About In-Progress Rebase182957
+Ref: Information About In-Progress Rebase-Footnote-1189793
+Node: Cherry Picking190379
+Node: Reverting191984
+Node: Resetting193347
+Node: Stashing194858
+Node: Transferring199052
+Node: Remotes199290
+Node: Fetching200568
+Node: Pulling201933
+Node: Pushing202778
+Node: Creating and Sending Patches207521
+Node: Applying Patches208216
+Node: Miscellaneous209213
+Node: Tagging209516
+Node: Notes210300
+Node: Submodules212824
+Node: Listing Submodules213038
+Node: Submodule Popup214857
+Node: Subtree216140
+Node: Common Commands217387
+Node: Wip Modes219132
+Node: Minor Mode for Buffers Visiting Files225928
+Node: Minor Mode for Buffers Visiting Blobs229402
+Node: Customizing230215
+Node: Per-Repository Configuration231887
+Node: Essential Settings233534
+Node: Safety233858
+Node: Performance235691
+Node: Plumbing243653
+Node: Calling Git244477
+Node: Getting a Value from Git246000
+Node: Calling Git for Effect249104
+Node: Section Plumbing255622
+Node: Creating Sections255850
+Node: Section Selection259749
+Node: Matching Sections261429
+Node: Refreshing Buffers266861
+Node: Conventions269996
+Node: Confirmation and Completion270173
+Node: Theming Faces271071
+Node: FAQ279222
+Node: FAQ - How to …?279615
+Node: How to show git's output?279979
+Node: How to install the gitman info manual?280733
+Node: How to show diffs for gpg-encrypted files?281703
+Node: How does branching and pushing work?282299
+Node: Can Magit be used as ‘ediff-version-control-package’?282678
+Node: FAQ - Issues and Errors284674
+Node: Magit is slow285418
+Node: I changed several thousand files at once and now Magit is unusable285643
+Node: I am having problems committing286383
+Node: I am using MS Windows and cannot push with Magit286864
+Node: I am using OS X and SOMETHING works in shell but not in Magit287481
+Node: Diffs contain control sequences288287
+Node: Expanding a file to show the diff causes it to disappear289361
+Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer289918
+Node: The mode-line information isn't always up-to-date290970
+Node: Emacs 245 hangs when loading Magit292037
+Node: Keystroke Index292587
+Node: Command Index322709
+Node: Function Index352937
+Node: Variable Index366247
End Tag Table
.emacs.d/elpa/magit-20170311.925/magit.info-1 → .emacs.d/elpa/magit-20170401.1145/magit.info-1
@@ -2668,8 +2668,8 @@ the default value of ‘magit-diff-arguments’ is used instead.
RANGE should be a range (A..B or A…B) but can also be a single
commit. If one side of the range is omitted, then it defaults to
- HEAD. If just a commit is given, then changes in the working tree
- relative to that commit are shown.
+ ‘HEAD’. If just a commit is given, then changes in the working
+ tree relative to that commit are shown.
If the region is active, use the revisions on the first and last
line of the region. With a prefix argument, instead of diffing the
@@ -3047,7 +3047,7 @@ information on how to use Ediff itself, see *note (ediff)Top::.
‘E w’ (‘magit-ediff-show-working-tree’)
- Show changes in a file between HEAD and working tree using Ediff.
+ Show changes in a file between ‘HEAD’ and working tree using Ediff.
‘E c’ (‘magit-ediff-show-commit’)
@@ -4656,7 +4656,7 @@ of commands and binding ‘C-c ^ C-h’ and press ‘RET’ while point is on a
command name to read its documentation.
Normally you would edit one version and then tell Smerge to keep only
-that version. Use ‘C-c ^ m’ (‘smerge-keep-mine)’ to keep the "HEAD"
+that version. Use ‘C-c ^ m’ (‘smerge-keep-mine’) to keep the ‘HEAD’
version or ‘C-c ^ o’ (‘smerge-keep-other’) to keep the version that
follows "|||||||". Then use ‘C-c ^ n’ to move to the next conflicting
area in the same file. Once you are done resolving conflicts, return to
@@ -4718,7 +4718,7 @@ In-Progress Rebase.
All commits that are reachable from head but not from the selected
branch TARGET are being rebased."
-‘r o’ (‘magit-rebase-subset’)
+‘r s’ (‘magit-rebase-subset’)
Start a non-interactive rebase sequence with commits from START to
‘HEAD’ onto NEWBASE. START has to be selected from a list of recent
@@ -6717,7 +6717,7 @@ refresh because that also automatically moves to the next change.
first insert the raw output at point. If there is no output call
‘magit-cancel-section’. Otherwise temporarily narrow the buffer to
the inserted text, move to its beginning, and then call function
- WASHER with no argument.
+ WASHER with ARGS as its sole argument.
And now for the asynchronous variants.
@@ -7921,10 +7921,10 @@ Appendix B Keystroke Index
* r f: Rebasing. (line 66)
* r i: Rebasing. (line 62)
* r m: Rebasing. (line 70)
-* r o: Rebasing. (line 40)
* r p: Rebasing. (line 25)
* r r: Rebasing. (line 81)
-* r s: Rebasing. (line 88)
+* r s: Rebasing. (line 40)
+* r s <1>: Rebasing. (line 88)
* r u: Rebasing. (line 30)
* r w: Rebasing. (line 74)
* RET: Diff Buffer. (line 6)
.emacs.d/elpa/magit-20170311.925/magit.info-2 → .emacs.d/elpa/magit-20170401.1145/magit.info-2
File renamed without changes
.emacs.d/elpa/markdown-mode-20161222.1416/markdown-mode-autoloads.el → .emacs.d/elpa/markdown-mode-20170317.1202/markdown-mode-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22712 4657
-;;;;;; 827296 218000))
+;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22753 9093
+;;;;;; 357477 213000))
;;; Generated autoloads from markdown-mode.el
(autoload 'markdown-mode "markdown-mode" "\
.emacs.d/elpa/markdown-mode-20161222.1416/markdown-mode-pkg.el → .emacs.d/elpa/markdown-mode-20170317.1202/markdown-mode-pkg.el
@@ -1,2 +1,2 @@
;;; -*- no-byte-compile: t -*-
-(define-package "markdown-mode" "20161222.1416" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))
+(define-package "markdown-mode" "20170317.1202" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))
.emacs.d/elpa/markdown-mode-20161222.1416/markdown-mode.el → .emacs.d/elpa/markdown-mode-20170317.1202/markdown-mode.el
@@ -33,7 +33,7 @@
;; Maintainer: Jason R. Blevins <jrblevin@sdf.org>
;; Created: May 24, 2007
;; Version: 2.1
-;; Package-Version: 20161222.1416
+;; Package-Version: 20170317.1202
;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
;; Keywords: Markdown, GitHub Flavored Markdown, itex
;; URL: http://jblevins.org/projects/markdown-mode/
@@ -885,7 +885,7 @@
;; * Google's Open Source Programs Office for recognizing the project with
;; a monetary contribution in June 2015.
;; * Howard Melman <hmelman@gmail.com> for supporting GFM checkboxes
-;; as buttons.
+;; as buttons and several bug reports.
;; * Danny McClanahan <danieldmcclanahan@gmail.com> for live preview
;; mode, completion of GFM programming language names, improved
;; font lock for fenced code blocks and metadata blocks, `cl-lib'
@@ -1476,7 +1476,7 @@ or
"Regular expression for matching Pandoc metadata.")
(defconst markdown-regex-yaml-metadata-border
- "\\(\\-\\{3\\}\\)$"
+ "\\(-\\{3\\}\\)$"
"Regular expression for matching yaml metadata.")
(defconst markdown-regex-yaml-pandoc-metadata-end-border
@@ -1634,7 +1634,8 @@ easier.")
"Return regexp to find all \"start\" sections of fenced block constructs.
Which construct is actually contained in the match must be found separately."
(mapconcat
- 'identity
+ #'identity
+ ;; FIXME: Why `cl-mapcar' rather than `mapcar'?
(cl-mapcar (lambda (entry) (markdown-maybe-funcall-regexp (caar entry)))
markdown-fenced-block-pairs)
"\\|"))
@@ -4108,18 +4109,18 @@ NIL is returned instead."
(>= (current-indentation) 4))))
(forward-line -1))
(when result
- ; Advance if there is a next line that is either blank or indented.
- ; (Need to check if we're on the last line, because
- ; markdown-next-line-blank-p returns true for last line in buffer.)
+ ;; Advance if there is a next line that is either blank or indented.
+ ;; (Need to check if we're on the last line, because
+ ;; markdown-next-line-blank-p returns true for last line in buffer.)
(while (and (/= (line-end-position) (point-max))
(or (markdown-next-line-blank-p)
(>= (markdown-next-line-indent) 4)))
(forward-line))
- ; Move back while the current line is blank.
+ ;; Move back while the current line is blank.
(while (markdown-cur-line-blank-p)
(forward-line -1))
- ; Advance to capture this line and a single trailing newline (if there
- ; is one).
+ ;; Advance to capture this line and a single trailing newline (if there
+ ;; is one).
(forward-line)
(append result (list (point)))))))
@@ -5883,7 +5884,8 @@ Standalone XHTML output is identified by an occurrence of
'mime-charset))
"iso-8859-1"))))
(if (> (length markdown-css-paths) 0)
- (insert (mapconcat 'markdown-stylesheet-link-string markdown-css-paths "\n")))
+ (insert (mapconcat #'markdown-stylesheet-link-string
+ markdown-css-paths "\n")))
(when (> (length markdown-xhtml-header-content) 0)
(insert markdown-xhtml-header-content))
(insert "\n</head>\n\n"
@@ -6636,7 +6638,7 @@ BEG and END are the limits of scanned region."
This can be toggled with `markdown-toggle-inline-images'
or \\[markdown-toggle-inline-images]."
(interactive)
- (mapc 'delete-overlay markdown-inline-image-overlays)
+ (mapc #'delete-overlay markdown-inline-image-overlays)
(setq markdown-inline-image-overlays nil))
(defun markdown-display-inline-images ()
@@ -6726,9 +6728,9 @@ or \\[markdown-toggle-inline-images]."
'markdown-end-of-defun)
;; Paragraph filling
(set
- ; Should match start of lines that start or separate paragraphs
+ ;; Should match start of lines that start or separate paragraphs
(make-local-variable 'paragraph-start)
- (mapconcat 'identity
+ (mapconcat #'identity
'(
"\f" ; starts with a literal line-feed
"[ \t\f]*$" ; space-only line
@@ -6739,14 +6741,14 @@ or \\[markdown-toggle-inline-images]."
)
"\\|"))
(set
- ; Should match lines that separate paragraphs without being
- ; part of any paragraph:
+ ;; Should match lines that separate paragraphs without being
+ ;; part of any paragraph:
(make-local-variable 'paragraph-separate)
- (mapconcat 'identity
+ (mapconcat #'identity
'("[ \t\f]*$" ; space-only line
- ; The following is not ideal, but the Fill customization
- ; options really only handle paragraph-starting prefixes,
- ; not paragraph-ending suffixes:
+ ;; The following is not ideal, but the Fill customization
+ ;; options really only handle paragraph-starting prefixes,
+ ;; not paragraph-ending suffixes:
".* $" ; line ending in two spaces
"^#+"
"[ \t]*\\[\\^\\S-*\\]:[ \t]*$") ; just the start of a footnote def
.emacs.d/elpa/markdown-mode-20161222.1416/markdown-mode.elc → .emacs.d/elpa/markdown-mode-20170317.1202/markdown-mode.elc
Binary file
.emacs.d/elpa/swiper-20170225.356/swiper-autoloads.el → .emacs.d/elpa/swiper-20170328.737/swiper-autoloads.el
@@ -3,7 +3,7 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "swiper" "swiper.el" (22712 4603 912654 261000))
+;;;### (autoloads nil "swiper" "swiper.el" (22753 9092 560489 208000))
;;; Generated autoloads from swiper.el
(autoload 'swiper-avy "swiper" "\
.emacs.d/elpa/swiper-20170225.356/swiper-pkg.el → .emacs.d/elpa/swiper-20170328.737/swiper-pkg.el
@@ -1,2 +1,2 @@
;;; -*- no-byte-compile: t -*-
-(define-package "swiper" "20170225.356" "Isearch with an overview. Oh, man!" '((emacs "24.1") (ivy "0.8.0")) :url "https://github.com/abo-abo/swiper" :keywords '("matching"))
+(define-package "swiper" "20170328.737" "Isearch with an overview. Oh, man!" '((emacs "24.1") (ivy "0.8.0")) :url "https://github.com/abo-abo/swiper" :keywords '("matching"))
.emacs.d/elpa/swiper-20170225.356/swiper.el → .emacs.d/elpa/swiper-20170328.737/swiper.el
@@ -4,7 +4,7 @@
;; Author: Oleh Krehel <ohwoeowho@gmail.com>
;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170225.356
+;; Package-Version: 20170328.737
;; Version: 0.8.0
;; Package-Requires: ((emacs "24.1") (ivy "0.8.0"))
;; Keywords: matching
@@ -140,6 +140,7 @@
(declare-function avy--process "ext:avy")
(declare-function avy--overlay-post "ext:avy")
(declare-function avy-action-goto "ext:avy")
+(declare-function avy-candidate-beg "ext:avy")
(declare-function avy--done "ext:avy")
(declare-function avy--make-backgrounds "ext:avy")
(declare-function avy-window-list "ext:avy")
@@ -157,10 +158,28 @@
(error "Package avy isn't installed"))
(unless (string= ivy-text "")
(let* ((avy-all-windows nil)
+ ;; We'll have overlapping overlays, so we sort all the
+ ;; overlays in the visible region by their start, and then
+ ;; throw out non-Swiper overlays or overlapping Swiper
+ ;; overlays.
+ (visible-overlays (cl-sort (with-ivy-window
+ (overlays-in (window-start)
+ (window-end)))
+ #'< :key #'overlay-start))
+ (min-overlay-start 0)
+ (overlays-for-avy (cl-remove-if-not
+ (lambda (ov)
+ (when (and (>= (overlay-start ov)
+ min-overlay-start)
+ (memq (overlay-get ov 'face)
+ swiper-faces))
+ (setq min-overlay-start (overlay-start ov))))
+ visible-overlays))
(candidates (append
- (with-ivy-window
- (avy--regex-candidates
- (ivy--regex ivy-text)))
+ (mapcar (lambda (ov)
+ (cons (overlay-start ov)
+ (overlay-get ov 'window)))
+ overlays-for-avy)
(save-excursion
(save-restriction
(narrow-to-region (window-start) (window-end))
@@ -193,7 +212,7 @@
(ivy-done)
(ivy-call))
(ivy-quit-and-run
- (avy-action-goto (caar candidate)))))))
+ (avy-action-goto (avy-candidate-beg candidate)))))))
(declare-function mc/create-fake-cursor-at-point "ext:multiple-cursors-core")
(declare-function multiple-cursors-mode "ext:multiple-cursors-core")
@@ -552,13 +571,13 @@ Matched candidates should have `swiper-invocation-face'."
"Called when `ivy' input is updated."
(with-ivy-window
(swiper--cleanup)
- (when (> (length ivy--current) 0)
+ (when (> (length (ivy-state-current ivy-last)) 0)
(let* ((re (funcall ivy--regex-function ivy-text))
(re (if (stringp re) re (caar re)))
(re (replace-regexp-in-string
" " "\t"
re))
- (str (get-text-property 0 'swiper-line-number ivy--current))
+ (str (get-text-property 0 'swiper-line-number (ivy-state-current ivy-last)))
(num (if (string-match "^[0-9]+" str)
(string-to-number (match-string 0 str))
0)))
@@ -872,7 +891,7 @@ Run `swiper' for those buffers."
:action 'swiper-all-action
:unwind #'swiper--cleanup
:update-fn (lambda ()
- (swiper-all-action ivy--current))
+ (swiper-all-action (ivy-state-current ivy-last)))
:dynamic-collection t
:keymap swiper-all-map
:caller 'swiper-multi)))
.emacs.d/elpa/swiper-20170225.356/swiper.elc → .emacs.d/elpa/swiper-20170328.737/swiper.elc
Binary file
.emacs.d/elpa/which-key-20170209.729/which-key-pkg.el
@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "which-key" "20170209.729" "Display available keybindings in popup" '((emacs "24.3")) :url "https://github.com/justbur/emacs-which-key")
.emacs.d/elpa/which-key-20170209.729/which-key-autoloads.el → .emacs.d/elpa/which-key-20170315.1055/which-key-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "which-key" "which-key.el" (22712 4600 614676
-;;;;;; 160000))
+;;;### (autoloads nil "which-key" "which-key.el" (22753 9092 88496
+;;;;;; 312000))
;;; Generated autoloads from which-key.el
(defvar which-key-mode nil "\
.emacs.d/elpa/which-key-20170315.1055/which-key-pkg.el
@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "which-key" "20170315.1055" "Display available keybindings in popup" '((emacs "24.3")) :url "https://github.com/justbur/emacs-which-key")
.emacs.d/elpa/which-key-20170209.729/which-key.el → .emacs.d/elpa/which-key-20170315.1055/which-key.el
@@ -4,7 +4,7 @@
;; Author: Justin Burkett <justin@burkett.cc>
;; URL: https://github.com/justbur/emacs-which-key
-;; Package-Version: 20170209.729
+;; Package-Version: 20170315.1055
;; Version: 2.0
;; Keywords:
;; Package-Requires: ((emacs "24.3"))
@@ -1460,7 +1460,10 @@ alists. Returns a list (key separator description)."
(let* ((key (car key-binding))
(orig-desc (cdr key-binding))
(group (which-key--group-p orig-desc))
- (keys (concat (which-key--current-key-string) " " key))
+ ;; At top-level prefix is nil
+ (keys (if which-key--current-prefix
+ (concat (which-key--current-key-string) " " key)
+ key))
(local (eq (which-key--safe-lookup-key local-map (kbd keys))
(intern orig-desc)))
(hl-face (which-key--highlight-face orig-desc))
.emacs.d/elpa/which-key-20170209.729/which-key.elc → .emacs.d/elpa/which-key-20170315.1055/which-key.elc
Binary file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/comment
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: sh-ow <sh-ow@users.noreply.github.com>
-# name: comment
-# key: co
-# --
-${1:$(yas-trimmed-comment-start)} ${1:comment}${1:$(unless (eq (length comment-end) 0) (concat " " (yas-trimmed-comment-end)))}$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/commentline
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: sh-ow <sh-ow@users.noreply.github.com>
-# name: commentline
-# key: col
-# --
-${1:$(yas-trimmed-comment-start)} ${1:comment} ${1:$(let* ((str "")
- (curr (current-column))
- (start (yas-trimmed-comment-start))
- (lastcom (substring start -1))
- (end (yas-trimmed-comment-end)))
- (while (< (length str) (- 79 (+ curr (length end))))
- (setq str (concat str lastcom)))
- (concat str end))}$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/function_docstring
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: function_docstring
-# key: fd
-# group: definitions
-# --
-def ${1:name}($2):
- \"\"\"$3
- ${2:$(python-args-to-docstring)}
- \"\"\"
- $0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cider-repl-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/enh-ruby-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ensime-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js2-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js3-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/typerex-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/web-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/antlr-mode/project → .emacs.d/elpa/yasnippet-20170326.1030/snippets/antlr-mode/project
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/antlr-mode/property → .emacs.d/elpa/yasnippet-20170326.1030/snippets/antlr-mode/property
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/antlr-mode/target → .emacs.d/elpa/yasnippet-20170326.1030/snippets/antlr-mode/target
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/applescript-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/applescript-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/.yas-setup.el → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/.yas-setup.el
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/.yas-setup.elc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/.yas-setup.elc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/acl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/acl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/acm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/acm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ajf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ajf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/alo → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/alo
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ano → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ano
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/beginend → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/beginend
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/boost_require → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/boost_require
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cerr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cerr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cin → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cin
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/class11 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/class11
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cni → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cni
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cnt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cnt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/const_[] → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/const_[]
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/constructor → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/constructor
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cout → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cout
@@ -3,6 +3,6 @@
# name: cout
# key: cout
# --
-`(progn (save-excursion) (goto-char (point-min)) (unless (re-search-forward
+`(progn (goto-char (point-min)) (unless (re-search-forward
"^using\\s-+namespace std;" nil 'no-errer) "std::"))
`cout << $0${1: << "${2:\n}"};
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cpb → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cpb
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cpi → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cpi
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cpn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cpn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cpp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cpp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cpy → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cpy
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/cstd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/cstd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/d+= → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/d+=
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/d_operator → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/d_operator
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/d_operator[] → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/d_operator[]
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/d_operator[]_const → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/d_operator[]_const
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/d_operator_istream → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/d_operator_istream
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/d_operator_ostream → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/d_operator_ostream
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/delete → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/delete
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/delete[] → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/delete[]
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/doc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/doc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/dynamic_casting → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/dynamic_casting
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/enum → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/enum
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/eql → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/eql
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/erm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/erm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ffo → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ffo
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fil → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fil
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fin → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fin
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fixture → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fixture
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fln → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fln
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fnd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fnd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fne → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fne
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fni → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fni
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fori → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fori
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fre → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fre
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/friend → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/friend
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/fun_declaration → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/fun_declaration
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/gnn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/gnn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/gnr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/gnr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/gtest → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/gtest
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ignore → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ignore
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ihp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ihp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ihu → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ihu
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/inline → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/inline
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/io → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/io
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ipr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ipr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ipt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ipt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/iss → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/iss
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/isu → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/isu
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ita → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ita
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/iterator → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/iterator
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ltr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ltr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/lwr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/lwr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/lxc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/lxc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/map → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/map
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/member_function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/member_function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/mkh → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/mkh
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/mme → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/mme
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/mne → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/mne
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/module → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/module
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/mpb → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/mpb
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/mrg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/mrg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/msm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/msm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/mxe → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/mxe
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/namespace → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/namespace
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/nno → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/nno
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ns → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ns
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/nth → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/nth
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/nxp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/nxp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/oit → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/oit
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator!= → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator!=
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator+ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator+
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator+= → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator+=
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator= → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator=
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator== → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator==
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator[] → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator[]
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator_istream → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator_istream
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/operator_ostream → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/operator_ostream
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ostream → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ostream
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/pack → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/pack
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/phh → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/phh
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ppt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ppt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/private → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/private
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/protected → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/protected
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/prp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/prp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/psc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/psc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/pst → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/pst
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ptc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ptc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ptn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ptn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/public → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/public
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rci → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rci
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rmc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rmc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rmf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rmf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rmi → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rmi
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rmv → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rmv
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rpc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rpc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rpi → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rpi
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rpl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rpl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rtc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rtc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rte → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rte
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rvc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rvc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/rvr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/rvr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/shf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/shf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/spt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/spt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/srh → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/srh
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/srn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/srn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/srt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/srt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/sstream → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/sstream
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/std → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/std
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/std_colon → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/std_colon
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/sth → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/sth
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/sti → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/sti
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/sto → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/sto
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/str → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/str
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/sts → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/sts
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/stv → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/stv
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/swr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/swr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/template → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/template
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/test case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/test case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/test_main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/test_main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/test_suite → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/test_suite
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/tfm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/tfm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/this → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/this
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/throw → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/throw
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/trm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/trm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/tryw → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/tryw
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/ucp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/ucp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/upr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/upr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/uqe → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/uqe
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/using → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/using
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c++-mode/vector → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c++-mode/vector
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/compile → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/compile
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/define → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/define
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/malloc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/malloc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/packed → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/packed
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/printf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/printf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/stdio → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/stdio
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/stdlib → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/stdlib
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/string → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/string
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/union → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/union
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/c-mode/unistd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/c-mode/unistd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/case
@@ -1,8 +1,9 @@
# -*- mode: snippet -*-
# name : case : {...}
# key: case
+# expand-env: ((yas-also-auto-indent-first-line t))
# --
-`(indent-region (- (point) 20) (+ (point) 20) nil)`case ${2:constexpr}:${3: \{}
+case ${2:constexpr}:${3: \{}
$0
break;
${3:$(if (string-match "\{" yas-text) "\}" "")}
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/do → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/do
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/else → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/else
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/file_description → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/file_description
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/fopen → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/fopen
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/for_n → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/for_n
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/function_description → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/function_description
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/ifdef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/ifdef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/inc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/inc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/inc.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/inc.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/math → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/math
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/member_description → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/member_description
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/once → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/once
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/printf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/printf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/struct → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/struct
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/switch → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/switch
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/ternary → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/ternary
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/typedef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/typedef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cc-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cc-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/action → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/action
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/bash → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/bash
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/cookbook_file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/cookbook_file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/cron → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/cron
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/cronf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/cronf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/deploy → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/deploy
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/directory → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/directory
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/directoryf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/directoryf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/env → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/env
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/execute → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/execute
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/executef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/executef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/filef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/filef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/git → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/git
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/group → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/group
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/http_request → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/http_request
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/http_requestp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/http_requestp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/ignore_failure → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/ignore_failure
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/inc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/inc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/link → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/link
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/linkf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/linkf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/log → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/log
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/machine → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/machine
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/meta → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/meta
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/not_if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/not_if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/notifies → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/notifies
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/only_if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/only_if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/pac → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/pac
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/pak → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/pak
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/provider → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/provider
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/python → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/python
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/remote_file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/remote_file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/retries → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/retries
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/role → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/role
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/ruby → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/ruby
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/script → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/script
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/service → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/service
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/servicep → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/servicep
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/subscribes → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/subscribes
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/supports → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/supports
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/template → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/template
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/templatev → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/templatev
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/chef-mode/user → .emacs.d/elpa/yasnippet-20170326.1030/snippets/chef-mode/user
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/cider-repl-mode/.yas-parents
@@ -0,0 +1,1 @@
+clojure-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/bench → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/bench
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/bp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/bp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/def
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/defm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/defm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/defn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/defn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/defr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/defr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/deft → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/deft
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/doseq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/doseq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/fn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/fn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/ifl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/ifl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/is → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/is
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/let → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/let
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/map → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/map
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/map.lambda → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/map.lambda
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/mdoc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/mdoc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/ns → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/ns
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/opts → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/opts
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/pr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/pr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/print → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/print
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/reduce → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/reduce
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/require → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/require
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/test → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/test
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/use → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/use
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/when → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/when
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/clojure-mode/whenl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/clojure-mode/whenl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/add_executable → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/add_executable
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/add_library → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/add_library
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/cmake_minimum_required → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/cmake_minimum_required
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/foreach → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/foreach
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/ifelse → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/ifelse
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/include → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/include
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/macro → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/macro
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/message → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/message
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/option → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/option
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/project → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/project
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cmake-mode/set → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cmake-mode/set
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/conf-unix-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/conf-unix-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/conf-unix-mode/section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/conf-unix-mode/section
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cperl-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cperl-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/emit_signal → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/emit_signal
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/EV → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/EV
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/intuniform → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/intuniform
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/math → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/math
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/nan → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/nan
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/omnet → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/omnet
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/parameter_omnetpp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/parameter_omnetpp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/scheduleAt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/scheduleAt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/cpp-omnet-mode/uniform → .emacs.d/elpa/yasnippet-20170326.1030/snippets/cpp-omnet-mode/uniform
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/attrib → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/attrib
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/attrib.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/attrib.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/attrib.2 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/attrib.2
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/comment.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/comment.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/comment.2 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/comment.2
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/comment.3 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/comment.3
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/fore → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/fore
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/method → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/method
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/namespace → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/namespace
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/prop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/prop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/region → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/region
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/using → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/using
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/using.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/using.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/csharp-mode/using.2 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/csharp-mode/using.2
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/bg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/bg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/bg.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/bg.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/bor → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/bor
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/cl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/cl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/disp.block → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/disp.block
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/disp.inline → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/disp.inline
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/disp.none → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/disp.none
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/ff → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/ff
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/fs → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/fs
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/mar.bottom → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/mar.bottom
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/mar.left → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/mar.left
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/mar.mar → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/mar.mar
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/mar.margin → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/mar.margin
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/mar.right → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/mar.right
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/mar.top → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/mar.top
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/pad.bottom → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/pad.bottom
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/pad.left → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/pad.left
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/pad.pad → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/pad.pad
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/pad.padding → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/pad.padding
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/pad.right → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/pad.right
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/pad.top → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/pad.top
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/css-mode/v → .emacs.d/elpa/yasnippet-20170326.1030/snippets/css-mode/v
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/call-macro
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <call-macro>
+# key: m
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "call-macro"))
+# binding: direct-keybinding
+# --
+<call-macro n="$1"><with-param pos="$2"/>$0</call-macro>
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/choose
@@ -0,0 +1,10 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <choose><when><test> elements
+# key: c
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "choose"))
+# binding: direct-keybinding
+# --
+<choose><when>
+ <test><equal>$0</equal></test>
+
+</when></choose>
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/clip
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <clip> elements
+# key: c
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "clip"))
+# binding: direct-keybinding
+# --
+<clip pos="$1" ${2:side="tl"} part="$3"/>$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/e-in-mono-section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/e-in-mono-section
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/e-in-pardef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/e-in-pardef
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/let
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <let> elements
+# key: l
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "let"))
+# binding: direct-keybinding
+# --
+<let>$0</let>
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/lit
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <lit> elements
+# key: l
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "lit"))
+# binding: direct-keybinding
+# --
+<lit v="$1"/>$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/lit-tag
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <lit-tag> elements
+# key: lt
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "lit-tag"))
+# binding: direct-keybinding
+# --
+<lit-tag v="$1"/>$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/otherwise
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <otherwise> elements
+# key: o
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "otherwise"))
+# binding: direct-keybinding
+# --
+<otherwise>$0</otherwise>
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/p → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/p
@@ -1,7 +1,7 @@
# -*- mode: snippet; require-final-newline: nil -*-
# name: <p> element
-# key: <p
-# condition: (progn (backward-char 2) (equal (dix-enclosing-elt 'noerror) "e"))
+# key: p
+# condition: (progn (backward-char 1) (equal (dix-enclosing-elt 'noerror) "e"))
# binding: direct-keybinding
# --
<p><l>$1</l> <r>$1$0</r></p>
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/par → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/par
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/pardef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/pardef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/s → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/s
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/sdef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/sdef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/dix-mode/section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/section
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/var
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <var> elements
+# key: v
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "var"))
+# binding: direct-keybinding
+# --
+<var n="$1"/>$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/when
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <when> elements
+# key: w
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "when"))
+# binding: direct-keybinding
+# --
+<when>$0</when>
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/dix-mode/with-param
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: <with-param>
+# key: w
+# condition: (progn (backward-char 1) (dix-transfer-enclosing-allows "with-param"))
+# binding: direct-keybinding
+# --
+<with-param pos="$1"/>$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/call → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/call
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/cast → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/cast
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/cond → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/cond
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/def
@@ -2,6 +2,6 @@
# name: def
# key: def
# --
-def ${1:method}${2:(${3:args})} do
+def ${1:function}${2:(${3:args})} do
$0
end
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/defmacro → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/defmacro
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/defmacrop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/defmacrop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/defmodule → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/defmodule
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/defp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/defp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/do → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/do
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/doc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/doc
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/fn
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: fn
+# key: fn
+# --
+fn ${1:x} -> $1$0 end
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/for
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: for
+# key: for
+# --
+for ${2:x} <- ${1:enum} do
+ $2$0
+end
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/hcall → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/hcall
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/hcast → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/hcast
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/hinfo → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/hinfo
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/if
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: if
+# key: if
+# --
+if ${1:condition} do
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/ife
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: if-else
+# key: ife
+# --
+if ${1:condition} do
+ $2
+else
+ $3
+end
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/io → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/io
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/iop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/iop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/mdoc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/mdoc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/elixir-mode/pry → .emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/pry
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/test
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: test
+# key: test
+# --
+test "$1" do
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/elixir-mode/unless
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: unless
+# key: unless
+# --
+unless ${1:condition} do
+ $0
+end
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/.read_me → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/.read_me
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/add-hook → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/add-hook
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/and → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/and
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/append → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/append
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/apply → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/apply
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/aref → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/aref
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/aset → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/aset
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/assq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/assq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/autoload → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/autoload
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/backward-char → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/backward-char
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/beginning-of-line → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/beginning-of-line
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/bounds-of-thing-at-point → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/bounds-of-thing-at-point
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/buffer-file-name → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/buffer-file-name
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/buffer-modified-p → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/buffer-modified-p
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/buffer-substring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/buffer-substring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/buffer-substring-no-properties → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/buffer-substring-no-properties
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/car → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/car
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/cdr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/cdr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/concat → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/concat
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/cond → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/cond
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/condition-case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/condition-case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/cons → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/cons
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/consp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/consp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/const → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/const
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/copy-directory → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/copy-directory
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/copy-file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/copy-file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/current-buffer → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/current-buffer
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/custom-autoload → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/custom-autoload
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/defalias → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/defalias
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/defcustom → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/defcustom
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/define-key → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/define-key
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/defsubst → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/defsubst
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/defun → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/defun
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/defvar → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/defvar
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/delete-char → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/delete-char
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/delete-directory → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/delete-directory
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/delete-file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/delete-file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/delete-region → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/delete-region
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/directory-files → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/directory-files
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/dired.process_marked → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/dired.process_marked
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/dolist → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/dolist
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/end-of-line → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/end-of-line
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/eq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/eq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/equal → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/equal
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/error → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/error
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/ert-deftest → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/ert-deftest
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/expand-file-name → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/expand-file-name
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/fboundp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/fboundp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file-name-directory → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file-name-directory
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file-name-extension → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file-name-extension
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file-name-nondirectory → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file-name-nondirectory
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file-name-sans-extension → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file-name-sans-extension
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file-relative-name → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file-relative-name
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file.process → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file.process
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/file.read-lines → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/file.read-lines
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/find-file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/find-file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/find-replace → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/find-replace
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/format → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/format
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/forward-char → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/forward-char
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/forward-line → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/forward-line
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/funcall → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/funcall
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/get → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/get
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/global-set-key → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/global-set-key
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/goto-char → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/goto-char
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/grabstring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/grabstring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/grabthing → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/grabthing
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/hash → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/hash
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/insert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/insert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/insert-file-contents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/insert-file-contents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/interactive → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/interactive
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/kbd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/kbd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/kill-buffer → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/kill-buffer
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/lambda → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/lambda
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/length → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/length
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/let → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/let
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/line-beginning-position → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/line-beginning-position
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/line-end-position → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/line-end-position
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/list → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/list
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/looking-at → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/looking-at
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/make-directory → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/make-directory
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/make-local-variable → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/make-local-variable
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/mapc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/mapc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/mapcar → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/mapcar
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/match-beginning → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/match-beginning
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/match-end → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/match-end
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/match-string → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/match-string
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/memq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/memq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/message → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/message
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/minor_mode → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/minor_mode
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/not → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/not
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/nth → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/nth
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/null → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/null
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/number-to-string → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/number-to-string
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/or → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/or
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/point → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/point
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/point-max → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/point-max
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/point-min → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/point-min
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/princ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/princ
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/print → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/print
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/progn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/progn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/push → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/push
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/put → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/put
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/re-search-backward → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/re-search-backward
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/re-search-forward → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/re-search-forward
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/region-active-p → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/region-active-p
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/region-beginning → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/region-beginning
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/region-end → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/region-end
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/rename-file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/rename-file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/repeat → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/repeat
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/replace-regexp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/replace-regexp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/replace-regexp-in-string → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/replace-regexp-in-string
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/require → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/require
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/save-buffer → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/save-buffer
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/save-excursion → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/save-excursion
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/search-backward → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/search-backward
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/search-backward-regexp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/search-backward-regexp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/search-forward → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/search-forward
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/search-forward-regexp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/search-forward-regexp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/set → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/set
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/set-buffer → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/set-buffer
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/set-file-modes → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/set-file-modes
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/set-mark → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/set-mark
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/setq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/setq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/should → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/should
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/skip-chars-backward → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/skip-chars-backward
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/skip-chars-forward → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/skip-chars-forward
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/split-string → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/split-string
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/string → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/string
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/string-match → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/string-match
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/string-to-number → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/string-to-number
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/string= → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/string=
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/stringp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/stringp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/substring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/substring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/thing-at-point → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/thing-at-point
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/traverse_dir → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/traverse_dir
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/unless → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/unless
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/use-package
@@ -0,0 +1,6 @@
+#contributor: Daniel Hitzel
+#name: use-package
+#key: up
+# --
+(use-package ${1:package-name}
+:ensure t$0)
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/use-package-binding
@@ -0,0 +1,5 @@
+#contributor: Daniel Hitzel
+#name: use-package binding
+#key: upb
+# --
+:bind ("${1:binding}" . ${2:function-name})
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/vector → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/vector
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/when → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/when
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/widget-get → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/widget-get
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/with-current-buffer → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/with-current-buffer
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/word-or-region → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/word-or-region
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/word_regexp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/word_regexp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-dired.process_marked → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-dired.process_marked
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-file.process → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-file.process
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-file.read-lines → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-file.read-lines
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-find-replace → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-find-replace
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-grabstring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-grabstring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-grabthing → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-grabthing
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-traverse_dir → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-traverse_dir
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/x-word-or-region → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/x-word-or-region
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/emacs-lisp-mode/yes-or-no-p → .emacs.d/elpa/yasnippet-20170326.1030/snippets/emacs-lisp-mode/yes-or-no-p
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/enh-ruby-mode/.yas-parents
@@ -0,0 +1,1 @@
+ruby-mode
.emacs.d/elpa/yasnippet-20170326.1030/snippets/ensime-mode/.yas-parents
@@ -0,0 +1,1 @@
+scala-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erc-mode/blist → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erc-mode/blist
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erc-mode/help → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erc-mode/help
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/after → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/after
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/begin → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/begin
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/beh → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/beh
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/compile → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/compile
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/def
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/exp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/exp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/fun → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/fun
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/ifdef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/ifdef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/ifndef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/ifndef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/imp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/imp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/inc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/inc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/inc.lib → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/inc.lib
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/loop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/loop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/mod → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/mod
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/rcv → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/rcv
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/rcv.after → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/rcv.after
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/rec → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/rec
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/erlang-mode/undef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/erlang-mode/undef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/bd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/bd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/c → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/c
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/ch → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/ch
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/cx → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/cx
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/dc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/dc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/do → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/do
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/dp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/dp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/forall → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/forall
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/in → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/in
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/inc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/inc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/intr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/intr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/l → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/l
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/module → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/module
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/pa → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/pa
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/program → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/program
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/puref → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/puref
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/pures → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/pures
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/re → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/re
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/subroutine → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/subroutine
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/until → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/until
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/where → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/where
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/f90-mode/wr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/f90-mode/wr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/checkbox → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/checkbox
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/component → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/component
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/declare → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/declare
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/declarelicense → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/declarelicense
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/declarename → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/declarename
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/declareversion → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/declareversion
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/hbargraph → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/hbargraph
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/header → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/header
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/hgroup → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/hgroup
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/hslider → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/hslider
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/nentry → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/nentry
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/par → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/par
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/process → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/process
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/processx → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/processx
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/prod → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/prod
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/rule → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/rule
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/seq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/seq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/sum → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/sum
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/tgroup → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/tgroup
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/vbargraph → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/vbargraph
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/vgroup → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/vgroup
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/vslider → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/vslider
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/faust-mode/with → .emacs.d/elpa/yasnippet-20170326.1030/snippets/faust-mode/with
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/git-commit-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/git-commit-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/git-commit-mode/fixes → .emacs.d/elpa/yasnippet-20170326.1030/snippets/git-commit-mode/fixes
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/git-commit-mode/references → .emacs.d/elpa/yasnippet-20170326.1030/snippets/git-commit-mode/references
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/benchmark → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/benchmark
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/const → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/const
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/const( → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/const(
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/dd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/dd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/default → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/default
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/else → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/else
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/error → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/error
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/example → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/example
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/forrange → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/forrange
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/func → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/func
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/iferr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/iferr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/import( → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/import(
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/lambda → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/lambda
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/map → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/map
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/parallel_benchmark → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/parallel_benchmark
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/printf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/printf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/select → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/select
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/switch → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/switch
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/test → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/test
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/testmain → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/testmain
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/type → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/type
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/var → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/var
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/go-mode/var( → .emacs.d/elpa/yasnippet-20170326.1030/snippets/go-mode/var(
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/def
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/dict → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/dict
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/println → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/println
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/groovy-mode/times → .emacs.d/elpa/yasnippet-20170326.1030/snippets/groovy-mode/times
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/data → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/data
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/doc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/doc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/efix → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/efix
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/functione → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/functione
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/instance → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/instance
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/module → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/module
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/new class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/new class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/pragma → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/pragma
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/haskell-mode/print → .emacs.d/elpa/yasnippet-20170326.1030/snippets/haskell-mode/print
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/dd → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/dd
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/dl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/dl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/doctype → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/doctype
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/doctype.html5 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/doctype.html5
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/doctype.xhtml1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/doctype.xhtml1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/doctype.xhtml1_1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/doctype.xhtml1_1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/doctype.xhtml1_strict → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/doctype.xhtml1_strict
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/doctype.xhtml1_transitional → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/doctype.xhtml1_transitional
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/dt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/dt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/form → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/form
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/html → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/html
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/html.xmlns → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/html.xmlns
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/link.import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/link.import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/link.stylesheet → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/link.stylesheet
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/link.stylesheet-ie → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/link.stylesheet-ie
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/mailto → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/mailto
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/meta → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/meta
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/meta.http-equiv → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/meta.http-equiv
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/script.javascript → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/script.javascript
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/script.javascript-src → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/script.javascript-src
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/textarea → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/textarea
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/html-mode/th → .emacs.d/elpa/yasnippet-20170326.1030/snippets/html-mode/th
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/apr_assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/apr_assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/assertEquals → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/assertEquals
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/cls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/cls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/constructor → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/constructor
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/define test method → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/define test method
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/doc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/doc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/equals → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/equals
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/file_class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/file_class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/fori → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/fori
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/getter → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/getter
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/ife → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/ife
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/iterator → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/iterator
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/javadoc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/javadoc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/lambda → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/lambda
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/main_class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/main_class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/method → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/method
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/new → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/new
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/override → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/override
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/param → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/param
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/printf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/printf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/println → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/println
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/return → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/return
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/test → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/test
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/testClass → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/testClass
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/this → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/this
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/toString → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/toString
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/java-mode/value → .emacs.d/elpa/yasnippet-20170326.1030/snippets/java-mode/value
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/al → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/al
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/com → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/com
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/debugger → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/debugger
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/each → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/each
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/el → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/el
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/ev.add → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/ev.add
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/ev.fire → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/ev.fire
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/init → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/init
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/log → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/log
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/multiline-comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/multiline-comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/param-comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/param-comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/req.html → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/req.html
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/req.json → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/req.json
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/return-comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/return-comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/type-inline-comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/type-inline-comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/js-mode/type-multiline-comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/js-mode/type-multiline-comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/js2-mode/.yas-parents
@@ -0,0 +1,1 @@
+js-mode
.emacs.d/elpa/yasnippet-20170326.1030/snippets/js3-mode/.yas-parents
@@ -0,0 +1,1 @@
+js-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/acronym → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/acronym
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/alertblock → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/alertblock
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/alg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/alg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/article → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/article
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/begin → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/begin
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/block → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/block
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/capgls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/capgls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/caption → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/caption
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/cite → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/cite
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/code → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/code
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/columns → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/columns
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/documentclass → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/documentclass
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/emph → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/emph
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/enumerate → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/enumerate
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/figure → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/figure
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/frac → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/frac
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/frame → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/frame
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/gls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/gls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/glspl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/glspl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/includegraphics → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/includegraphics
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/item → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/item
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/itemize → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/itemize
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/label → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/label
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/listing → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/listing
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv-cvcomputer → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv-cvcomputer
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv-cventry → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv-cventry
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv-cvlanguage → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv-cvlanguage
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv-cvline → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv-cvline
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv-cvlistdoubleitem → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv-cvlistdoubleitem
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/moderncv-cvlistitem → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/moderncv-cvlistitem
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/movie → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/movie
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/newcommand → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/newcommand
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/newglossaryentry → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/newglossaryentry
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/note → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/note
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/python → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/python
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/question → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/question
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/section
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/subf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/subf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/subfigure → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/subfigure
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/subsec → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/subsec
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/textbf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/textbf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/latex-mode/usepackage → .emacs.d/elpa/yasnippet-20170326.1030/snippets/latex-mode/usepackage
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-interaction-mode/defun → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-interaction-mode/defun
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/comment → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/comment
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/defpackage → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/defpackage
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/do → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/do
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/foreach → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/foreach
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/format → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/format
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/ifelse → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/ifelse
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/ifnot → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/ifnot
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/slot → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/slot
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/switch → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/switch
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lisp-mode/typecast → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lisp-mode/typecast
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/do
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: do
+# key: do
+# --
+do
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/eif
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: if elseif
+# key: eif
+# --
+if $1 then
+ $2
+elseif $3 then
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/eife
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# name: if elseif else
+# key: eife
+# --
+if $1 then
+ $2
+elseif $3 then
+ $4
+else
+ $0
+end
.emacs.d/elpa/yasnippet-20170310.1724/snippets/lua-mode/fun → .emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/fun
@@ -2,6 +2,6 @@
# name: fun
# key: fun
# --
-function ()
- ${1:return something}
-end
\ No newline at end of file
+function ($1)
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/if
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: if
+# key: if
+# --
+if $1 then
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/ife
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: if else
+# key: ife
+# --
+if $1 then
+ $2
+else
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/iparis
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: for in iparis
+# key: iparis
+# --
+for ${1:idx}, ${2:val} in ipairs(${3:table_name}) do
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/paris
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: for in pairs
+# key: pairs
+# --
+for ${1:name}, ${2:val} in pairs(${3:table_name}) do
+ $0
+end
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/repeat
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: repeat util
+# key: repeat
+# --
+repeat
+ $0
+until $1
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/require
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: require
+# key: require
+# --
+local $1 = require "$2"
.emacs.d/elpa/yasnippet-20170326.1030/snippets/lua-mode/while
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: while
+# key: while
+# --
+while $1 do
+ $0
+end
.emacs.d/elpa/yasnippet-20170310.1724/snippets/m4-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/m4-mode/def
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-automake-mode/noinst_HEADERS → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-automake-mode/noinst_HEADERS
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-bsdmake-mode/echo → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-bsdmake-mode/echo
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-bsdmake-mode/gen → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-bsdmake-mode/gen
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-bsdmake-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-bsdmake-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-bsdmake-mode/PHONY → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-bsdmake-mode/PHONY
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-bsdmake-mode/var → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-bsdmake-mode/var
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/abspath → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/abspath
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/addprefix → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/addprefix
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/addsuffix → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/addsuffix
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/dir → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/dir
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/make → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/make
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/notdir → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/notdir
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/patsubst → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/patsubst
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/phony → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/phony
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/shell → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/shell
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/special → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/special
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/template → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/template
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-gmake-mode/wildcard → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-gmake-mode/wildcard
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-mode/all → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-mode/all
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/makefile-mode/clean → .emacs.d/elpa/yasnippet-20170326.1030/snippets/makefile-mode/clean
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/malabar-mode/variable → .emacs.d/elpa/yasnippet-20170326.1030/snippets/malabar-mode/variable
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/+ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/+
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/- → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/-
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/_ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/_
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/` → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/`
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h1.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h1.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h1.2 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h1.2
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h2.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h2.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h2.2 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h2.2
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h3 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h3
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h4 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h4
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h5 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h5
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/h6 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/h6
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/highlight → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/highlight
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/hr.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/hr.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/hr.2 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/hr.2
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/img → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/img
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/link → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/link
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/ol → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/ol
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/rimg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/rimg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/rlb → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/rlb
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/rlink → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/rlink
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/markdown-mode/utf8 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/markdown-mode/utf8
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/chan → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/chan
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/connections → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/connections
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/network → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/network
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/simple → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/simple
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ned-mode/submodules → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ned-mode/submodules
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/command → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/command
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/dbg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/dbg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/event → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/event
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/ifdef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/ifdef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/interface → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/interface
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/module → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/module
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/nx → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/nx
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/provides → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/provides
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/sim → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/sim
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/TOSSIM → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/TOSSIM
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/uint8_t → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/uint8_t
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nesc-mode/uses → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nesc-mode/uses
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/buildPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/buildPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/checkPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/checkPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/configurePhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/configurePhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/distPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/distPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/fixPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/fixPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/installCheckPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/installCheckPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/installPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/installPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/package_github → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/package_github
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/package_url → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/package_url
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/patchPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/patchPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/phases → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/phases
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nix-mode/unpackPhase → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nix-mode/unpackPhase
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/define → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/define
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/include → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/include
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/insert_macro → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/insert_macro
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/instdir → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/instdir
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/macro → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/macro
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/message → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/message
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/outdir → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/outdir
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/outfile → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/outfile
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nsis-mode/section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nsis-mode/section
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/body → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/body
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/br → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/br
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/doctype → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/doctype
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/doctype_xhtml1_strict → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/doctype_xhtml1_strict
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/doctype_xhtml1_transitional → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/doctype_xhtml1_transitional
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/form → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/form
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/href → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/href
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/html → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/html
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/img → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/img
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/input → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/input
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/link → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/link
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/meta → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/meta
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/name → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/name
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/quote → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/quote
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/style → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/style
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/tag → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/tag
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/tag_closing → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/tag_closing
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/nxml-mode/tag_newline → .emacs.d/elpa/yasnippet-20170326.1030/snippets/nxml-mode/tag_newline
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/octave-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/octave-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/octave-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/octave-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/octave-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/octave-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/dot → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/dot
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/elisp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/elisp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/embedded → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/embedded
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/entry → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/entry
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/figure → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/figure
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/img → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/img
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/latex → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/latex
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/matrix → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/matrix
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/uml → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/uml
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/org-mode/verse → .emacs.d/elpa/yasnippet-20170326.1030/snippets/org-mode/verse
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/eval → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/eval
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/fore → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/fore
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/ife → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/ife
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/ifee → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/ifee
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/sub → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/sub
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/unless → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/unless
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/xfore → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/xfore
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/xif → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/xif
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/xunless → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/xunless
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/perl-mode/xwhile → .emacs.d/elpa/yasnippet-20170326.1030/snippets/perl-mode/xwhile
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/.yas-setup.el → .emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/.yas-setup.el
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/.yas-setup.elc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/.yas-setup.elc
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/comment
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# contributor: sh-ow <sh-ow@users.noreply.github.com>
+# name: comment
+# key: co
+# --
+`(yas-trimmed-comment-start)` ${1:comment}`(unless (eq (length comment-end) 0) (concat " " (yas-trimmed-comment-end)))`$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/commentblock → .emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/commentblock
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/commentline
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# contributor: sh-ow <sh-ow@users.noreply.github.com>
+# name: commentline
+# key: col
+# --
+`(yas-trimmed-comment-start)` ${1:comment} ${1:$(let* ((start (yas-trimmed-comment-start))
+ (lastcom (aref start (1- (length start))))
+ (end (yas-trimmed-comment-end))
+ (endpadlen (- 79 (+ (current-column) (length end)))))
+ (concat (make-string (max endpadlen 0) lastcom)
+ end))}$0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/fixme → .emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/fixme
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/todo → .emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/todo
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/prog-mode/xxx → .emacs.d/elpa/yasnippet-20170326.1030/snippets/prog-mode/xxx
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/.yas-setup.el → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/.yas-setup.el
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/.yas-setup.elc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/.yas-setup.elc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__contains__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__contains__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__enter__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__enter__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__exit__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__exit__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__getitem__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__getitem__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__len__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__len__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__new__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__new__
@@ -3,6 +3,6 @@
# key: new
# group: dunder methods
# --
-def __new__(mcs, name, bases, dict):
+def __new__(mcs, name, bases, dct):
$0
- return type.__new__(mcs, name, bases, dict)
+ return type.__new__(mcs, name, bases, dct)
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/__setitem__ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/__setitem__
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/all → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/all
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/arg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/arg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/arg_positional → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/arg_positional
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertEqual → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertEqual
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertFalse → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertFalse
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertIn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertIn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertNotEqual → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertNotEqual
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertNotIn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertNotIn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertRaises → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertRaises
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertRaises.with → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertRaises.with
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/assertTrue → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/assertTrue
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/celery_pdb → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/celery_pdb
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/classmethod → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/classmethod
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/cls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/cls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/dec → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/dec
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/deftest → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/deftest
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/django_test_class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/django_test_class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/doc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/doc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/doctest → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/doctest
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/embed
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: embed
+# key: embed
+# --
+from IPython import embed; embed()
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/eq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/eq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/from → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/from
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/function_docstring
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# name: function_docstring
+# key: fd
+# group: definitions
+# NOTE: Use minimum indentation, because Emacs 25+ doesn't dedent docstrings.
+# --
+def ${1:name}($2):
+ \"\"\"$3
+ ${2:$(python-args-to-docstring)}
+ \"\"\"
+ $0
\ No newline at end of file
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/function_docstring_numpy → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/function_docstring_numpy
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/ife → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/ife
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/ifmain → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/ifmain
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/import → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/import
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/init → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/init
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/init_docstring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/init_docstring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/interact → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/interact
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/ipdbdebug → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/ipdbdebug
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/iter → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/iter
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/lambda → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/lambda
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/list → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/list
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/logger_name → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/logger_name
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/logging → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/logging
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/metaclass → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/metaclass
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/method → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/method
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/method_docstring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/method_docstring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/not_impl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/not_impl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/np → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/np
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/parse_args → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/parse_args
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/parser → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/parser
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/pass → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/pass
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/pl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/pl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/print → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/print
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/prop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/prop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/reg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/reg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/repr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/repr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/return → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/return
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/scls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/scls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/script → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/script
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/self → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/self
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/self_without_dot → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/self_without_dot
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/selfassign → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/selfassign
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/setdef → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/setdef
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/setup → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/setup
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/size → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/size
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/static → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/static
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/str → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/str
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/super → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/super
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/test_class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/test_class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/test_file → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/test_file
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/trace → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/trace
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/tryelse → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/tryelse
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/unicode → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/unicode
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/utf8 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/utf8
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/with → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/with
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/python-mode/with_statement → .emacs.d/elpa/yasnippet-20170326.1030/snippets/python-mode/with_statement
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/autoclass → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/autoclass
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/autofunction → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/autofunction
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/automodule → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/automodule
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/chapter → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/chapter
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/code → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/code
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/digraph → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/digraph
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/graph → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/graph
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/graphviz → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/graphviz
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/image → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/image
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/inheritance → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/inheritance
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/literal_include → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/literal_include
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/meta → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/meta
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/module → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/module
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/parsed_literal → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/parsed_literal
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/pause → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/pause
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/section
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/term → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/term
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/title → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/title
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/url → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/url
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/verbatim → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/verbatim
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rst-mode/warning → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rst-mode/warning
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/# → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/#
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/=b → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/=b
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/all → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/all
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/am → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/am
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/any → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/any
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/app → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/app
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/attribute → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/attribute
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/bench → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/bench
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/bm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/bm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/cla → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/cla
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/cls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/cls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/collect → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/collect
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/Comp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/Comp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/dee → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/dee
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/def
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/deli → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/deli
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/det → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/det
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/dow → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/dow
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/ea → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/ea
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/eac → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/eac
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/eai → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/eai
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/eav → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/eav
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/eawi → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/eawi
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/Enum → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/Enum
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/forin → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/forin
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/formula → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/formula
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/GLOB → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/GLOB
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/ife → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/ife
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/inc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/inc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/init → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/init
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/inject → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/inject
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/map → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/map
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/mm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/mm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/mod → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/mod
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/pry
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: binding.pry
+# key: pry
+# --
+require 'pry'; binding.pry
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/r → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/r
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/rb → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/rb
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/red → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/red
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/reject → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/reject
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/rel → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/rel
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/req → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/req
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/rw → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/rw
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/select → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/select
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/str → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/str
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/test class → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/test class
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/tim → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/tim
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/to_ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/to_
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/tu → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/tu
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/until → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/until
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/upt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/upt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/w → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/w
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/when → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/when
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/y → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/y
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/ruby-mode/zip → .emacs.d/elpa/yasnippet-20170326.1030/snippets/ruby-mode/zip
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/allow → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/allow
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/allow! → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/allow!
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/asserteq → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/asserteq
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/cfg → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/cfg
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/cfg= → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/cfg=
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/closure → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/closure
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/deny → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/deny
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/deny! → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/deny!
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/derive → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/derive
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/drop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/drop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/enum → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/enum
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/fn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/fn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/fnr → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/fnr
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/fns → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/fns
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/fnw → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/fnw
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/ife → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/ife
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/ifl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/ifl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/impl → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/impl
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/implt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/implt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/let → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/let
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/letm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/letm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/lett → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/lett
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/lettm → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/lettm
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/loop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/loop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/macro → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/macro
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/match → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/match
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/print → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/print
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/println → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/println
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/spawn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/spawn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/static → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/static
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/struct → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/struct
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/test → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/test
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/testmod → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/testmod
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/trait → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/trait
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/type → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/type
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/warn → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/warn
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/warn! → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/warn!
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rust-mode/whilel → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rust-mode/whilel
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/app → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/app
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/case → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/case
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/cc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/cc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/co → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/co
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/cons → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/cons
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/def → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/def
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/doc → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/doc
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/ls → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/ls
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/match → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/match
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/ob → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/ob
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/throw → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/throw
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/scala-mode/valueclass → .emacs.d/elpa/yasnippet-20170326.1030/snippets/scala-mode/valueclass
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/args → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/args
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/bang → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/bang
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/for loop → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/for loop
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/function → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/function
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/if → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/if
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/ife → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/ife
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/safe-bang → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/safe-bang
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sh-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sh-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/snippet-mode/cont → .emacs.d/elpa/yasnippet-20170326.1030/snippets/snippet-mode/cont
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/snippet-mode/elisp → .emacs.d/elpa/yasnippet-20170326.1030/snippets/snippet-mode/elisp
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/snippet-mode/field → .emacs.d/elpa/yasnippet-20170326.1030/snippets/snippet-mode/field
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/snippet-mode/group → .emacs.d/elpa/yasnippet-20170326.1030/snippets/snippet-mode/group
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/snippet-mode/mirror → .emacs.d/elpa/yasnippet-20170326.1030/snippets/snippet-mode/mirror
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/snippet-mode/vars → .emacs.d/elpa/yasnippet-20170326.1030/snippets/snippet-mode/vars
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/column → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/column
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/constraint → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/constraint
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/constraint.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/constraint.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/create → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/create
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/create.1 → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/create.1
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/insert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/insert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/sql-mode/references → .emacs.d/elpa/yasnippet-20170326.1030/snippets/sql-mode/references
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/text-mode/.yas-parents → .emacs.d/elpa/yasnippet-20170326.1030/snippets/text-mode/.yas-parents
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/assert → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/assert
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/docstring → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/docstring
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/for → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/for
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/fun → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/fun
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/guard → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/guard
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/ifthen → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/ifthen
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/ifthenelse → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/ifthenelse
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/let → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/let
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/list_comprehension → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/list_comprehension
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/main → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/main
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/match → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/match
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/module → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/module
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/open → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/open
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/printf → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/printf
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/rec → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/rec
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/try → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/try
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/type → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/type
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/type_type → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/type_type
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/val → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/val
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/tuareg-mode/while → .emacs.d/elpa/yasnippet-20170326.1030/snippets/tuareg-mode/while
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/typerex-mode/.yas-parents
@@ -0,0 +1,1 @@
+tuareg-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/udev-mode/add → .emacs.d/elpa/yasnippet-20170326.1030/snippets/udev-mode/add
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/udev-mode/ENV → .emacs.d/elpa/yasnippet-20170326.1030/snippets/udev-mode/ENV
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/udev-mode/env$ → .emacs.d/elpa/yasnippet-20170326.1030/snippets/udev-mode/env$
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/udev-mode/GOTO → .emacs.d/elpa/yasnippet-20170326.1030/snippets/udev-mode/GOTO
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/udev-mode/KERNEL → .emacs.d/elpa/yasnippet-20170326.1030/snippets/udev-mode/KERNEL
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/udev-mode/run → .emacs.d/elpa/yasnippet-20170326.1030/snippets/udev-mode/run
File renamed without changes
.emacs.d/elpa/yasnippet-20170326.1030/snippets/web-mode/.yas-parents
@@ -0,0 +1,1 @@
+html-mode
.emacs.d/elpa/yasnippet-20170310.1724/snippets/yaml-mode/entry → .emacs.d/elpa/yasnippet-20170326.1030/snippets/yaml-mode/entry
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/yaml-mode/list → .emacs.d/elpa/yasnippet-20170326.1030/snippets/yaml-mode/list
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/yaml-mode/section → .emacs.d/elpa/yasnippet-20170326.1030/snippets/yaml-mode/section
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/.gitignore → .emacs.d/elpa/yasnippet-20170326.1030/snippets/.gitignore
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/.nosearch → .emacs.d/elpa/yasnippet-20170326.1030/snippets/.nosearch
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/CONTRIBUTORS.txt → .emacs.d/elpa/yasnippet-20170326.1030/snippets/CONTRIBUTORS.txt
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/LICENSE → .emacs.d/elpa/yasnippet-20170326.1030/snippets/LICENSE
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/README.md → .emacs.d/elpa/yasnippet-20170326.1030/snippets/README.md
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/snippets/rename_add_contr.py → .emacs.d/elpa/yasnippet-20170326.1030/snippets/rename_add_contr.py
File renamed without changes
.emacs.d/elpa/yasnippet-20170310.1724/yasnippet-autoloads.el → .emacs.d/elpa/yasnippet-20170326.1030/yasnippet-autoloads.el
@@ -3,8 +3,8 @@
;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-;;;### (autoloads nil "yasnippet" "yasnippet.el" (22725 53728 755058
-;;;;;; 925000))
+;;;### (autoloads nil "yasnippet" "yasnippet.el" (22753 9091 101511
+;;;;;; 168000))
;;; Generated autoloads from yasnippet.el
(autoload 'yas-minor-mode "yasnippet" "\
@@ -52,8 +52,8 @@ A mode for editing yasnippets
;;;***
-;;;### (autoloads nil nil ("yasnippet-pkg.el") (22725 53719 984342
-;;;;;; 960000))
+;;;### (autoloads nil nil ("yasnippet-pkg.el") (22753 9089 955528
+;;;;;; 416000))
;;;***
.emacs.d/elpa/yasnippet-20170310.1724/yasnippet-pkg.el → .emacs.d/elpa/yasnippet-20170326.1030/yasnippet-pkg.el
@@ -1,4 +1,4 @@
-(define-package "yasnippet" "20170310.1724" "Yet another snippet extension for Emacs."
+(define-package "yasnippet" "20170326.1030" "Yet another snippet extension for Emacs."
'((cl-lib "0.5"))
:url "http://github.com/joaotavora/yasnippet" :keywords
'("convenience" "emulation"))
.emacs.d/elpa/yasnippet-20170310.1724/yasnippet.el → .emacs.d/elpa/yasnippet-20170326.1030/yasnippet.el
@@ -558,6 +558,10 @@ conditions.
(defvar yas--snippet-id-seed 0
"Contains the next id for a snippet.")
+(defvar yas--original-auto-fill-function nil
+ "The original value of `auto-fill-function'.")
+(make-variable-buffer-local 'yas--original-auto-fill-function)
+
(defun yas--snippet-next-id ()
(let ((id yas--snippet-id-seed))
(cl-incf yas--snippet-id-seed)
@@ -764,6 +768,12 @@ which decides on the snippet to expand.")
(defvar yas-minor-mode-hook nil
"Hook run when `yas-minor-mode' is turned on.")
+(defun yas--auto-fill-wrapper ()
+ (when (and auto-fill-function
+ (not (eq auto-fill-function #'yas--auto-fill)))
+ (setq yas--original-auto-fill-function auto-fill-function)
+ (setq auto-fill-function #'yas--auto-fill)))
+
;;;###autoload
(define-minor-mode yas-minor-mode
"Toggle YASnippet mode.
@@ -796,12 +806,17 @@ Key bindings:
(set-default name nil)
(set (make-local-variable name) t)))
;; Perform JIT loads
- ;;
- (yas--load-pending-jits))
+ (yas--load-pending-jits)
+ ;; Install auto-fill handler.
+ (yas--auto-fill-wrapper) ; Now...
+ (add-hook 'auto-fill-mode-hook #'yas--auto-fill-wrapper)) ; or later.
(t
- ;; Uninstall the direct keymaps and the post-command hook
- ;;
+ ;; Uninstall the direct keymaps, post-command hook, and
+ ;; auto-fill handler.
(remove-hook 'post-command-hook #'yas--post-command-handler t)
+ (remove-hook 'auto-fill-mode-hook #'yas--auto-fill-wrapper)
+ (when (local-variable-p 'yas--original-auto-fill-function)
+ (setq auto-fill-function yas--original-auto-fill-function))
(setq emulation-mode-map-alists
(remove 'yas--direct-keymaps emulation-mode-map-alists)))))
@@ -3004,6 +3019,15 @@ Update each field with the result of calling FUN."
(setf (yas--exit-marker snippet-exit)
(funcall fun (yas--exit-marker snippet-exit))))))
+(defun yas--snippet-live-p (snippet)
+ "Return non-nil if SNIPPET hasn't been committed."
+ (catch 'live
+ (yas--snippet-map-markers (lambda (m)
+ (if (markerp m) m
+ (throw 'live nil)))
+ snippet)
+ t))
+
(defun yas--apply-transform (field-or-mirror field &optional empty-on-nil-p)
"Calculate transformed string for FIELD-OR-MIRROR from FIELD.
@@ -3298,7 +3322,7 @@ This renders the snippet as ordinary text."
(yas--snapshot-marker-location m))
(set-marker m nil)))
snippet)
- (let ((ctrl-ov (yas--snapshot-overlay-location
+ (let ((ctrl-ov (yas--snapshot-overlay-line-location
(yas--snippet-control-overlay snippet))))
(push (list ctrl-ov dst-base-line snippet) to-move)
(delete-overlay (car ctrl-ov))))
@@ -3332,7 +3356,10 @@ This renders the snippet as ordinary text."
(lambda (l-m-r-w)
(goto-char base-pos)
(forward-line (nth 0 l-m-r-w))
- (yas--restore-marker-location (cdr l-m-r-w))
+ (save-restriction
+ (narrow-to-region (line-beginning-position)
+ (line-end-position))
+ (yas--restore-marker-location (cdr l-m-r-w)))
(nth 1 l-m-r-w))
snippet)
(goto-char base-pos)
@@ -3534,19 +3561,50 @@ field start. This hook does nothing if an undo is in progress."
yas--inhibit-overlay-hooks
(not (overlayp yas--active-field-overlay)) ; Avoid Emacs bug #21824.
(yas--undo-in-progress))
- (let* ((inhibit-modification-hooks t)
+ (let* ((inhibit-modification-hooks nil)
+ (yas--inhibit-overlay-hooks t)
(field (overlay-get overlay 'yas--field))
(snippet (overlay-get yas--active-field-overlay 'yas--snippet)))
- (save-match-data
- (yas--letenv (yas--snippet-expand-env snippet)
- (when (yas--skip-and-clear-field-p field beg end length)
- ;; We delete text starting from the END of insertion.
- (yas--skip-and-clear field end))
- (setf (yas--field-modified-p field) t)
- (yas--advance-end-maybe field (overlay-end overlay))
- (save-excursion
- (yas--field-update-display field))
- (yas--update-mirrors snippet))))))
+ (if (yas--snippet-live-p snippet)
+ (save-match-data
+ (yas--letenv (yas--snippet-expand-env snippet)
+ (when (yas--skip-and-clear-field-p field beg end length)
+ ;; We delete text starting from the END of insertion.
+ (yas--skip-and-clear field end))
+ (setf (yas--field-modified-p field) t)
+ (yas--advance-end-maybe field (overlay-end overlay))
+ (save-excursion
+ (yas--field-update-display field))
+ (yas--update-mirrors snippet)))
+ (lwarn '(yasnippet zombie) :warning "Killing zombie snippet!")
+ (delete-overlay overlay)))))
+
+(defun yas--auto-fill ()
+ (let* ((orig-point (point))
+ (end (progn (forward-paragraph) (point)))
+ (beg (progn (backward-paragraph) (point)))
+ (snippets (yas-active-snippets beg end))
+ (remarkers nil)
+ (reoverlays nil))
+ (dolist (snippet snippets)
+ (dolist (m (yas--collect-snippet-markers snippet))
+ (push (yas--snapshot-marker-location m beg end) remarkers))
+ (push (yas--snapshot-overlay-location
+ (yas--snippet-control-overlay snippet) beg end)
+ reoverlays))
+ (goto-char orig-point)
+ (let ((yas--inhibit-overlay-hooks t))
+ (funcall yas--original-auto-fill-function))
+ (save-excursion
+ (setq end (progn (forward-paragraph) (point)))
+ (setq beg (progn (backward-paragraph) (point))))
+ (save-excursion
+ (save-restriction
+ (narrow-to-region beg end)
+ (mapc #'yas--restore-marker-location remarkers)
+ (mapc #'yas--restore-overlay-location reoverlays))
+ (mapc #'yas--update-mirrors snippets))))
+
;;; Apropos protection overlays:
;;
@@ -3687,17 +3745,10 @@ considered when expanding the snippet."
;; them mostly to make the undo information
;;
(setq yas--start-column (current-column))
- (let ((yas--inhibit-overlay-hooks t)
- ;; Avoid major-mode's syntax propertizing function,
- ;; since we mess with the syntax-table and also
- ;; insert things that are not valid in the
- ;; major-mode language syntax anyway.
- (syntax-propertize-function nil))
+ (let ((yas--inhibit-overlay-hooks t))
(insert content)
(setq snippet
- (yas--snippet-create expand-env start (point))))
- ;; Invalidate any syntax-propertizing done while `syntax-propertize-function' was nil
- (syntax-ppss-flush-cache start))
+ (yas--snippet-create expand-env start (point)))))
;; stacked-expansion: This checks for stacked expansion, save the
;; `yas--previous-active-field' and advance its boundary.
@@ -3947,7 +3998,10 @@ expansion.")
necessary fields, mirrors and exit points.
Meant to be called in a narrowed buffer, does various passes"
- (let ((parse-start (point)))
+ (let ((parse-start (point))
+ ;; Avoid major-mode's syntax propertizing function, since we
+ ;; change the syntax-table while calling `scan-sexps'.
+ (syntax-propertize-function nil))
;; Reset the yas--dollar-regions
;;
(setq yas--dollar-regions nil)
@@ -4010,7 +4064,10 @@ Meant to be called in a narrowed buffer, does various passes"
;; indent the best we can
;;
(goto-char parse-start)
- (yas--indent snippet)))
+ ;; Invalidate any syntax-propertizing done while
+ ;; `syntax-propertize-function' was nil.
+ (syntax-ppss-flush-cache parse-start))
+ (yas--indent snippet))
;; HACK: Some implementations of `indent-line-function' (called via
;; `indent-according-to-mode') delete text before they insert (like
@@ -4024,34 +4081,48 @@ Meant to be called in a narrowed buffer, does various passes"
;; indentation generally affects whitespace at the beginning, not the
;; end.
;;
+;; Two other cases where we apply a similar strategy:
+;;
+;; 1. Handling `auto-fill-mode', in this case we need to use the
+;; current paragraph instead of line.
+;;
+;; 2. Moving snippets from an `org-src' temp buffer into the main org
+;; buffer, in this case we need to count the line offsets (because org
+;; may add indentation on each line making character positions
+;; unreliable).
+;;
;; This is all best-effort heuristic stuff, but it should cover 99% of
;; use-cases.
-(defun yas--snapshot-marker-location (marker)
+(defun yas--snapshot-marker-location (marker &optional beg end)
"Returns info for restoring MARKER's location after indent.
-The returned value is a list of the form (MARKER REGEXP WS-COUNT).
-If MARKER is not on current line, then return nil."
- (when (and (<= (line-beginning-position) marker)
- (<= marker (line-end-position)))
- (let ((before
- (split-string (buffer-substring-no-properties
- (line-beginning-position) marker) "[[:space:]]+" t))
- (after
- (split-string (buffer-substring-no-properties
- marker (line-end-position)) "[[:space:]]+" t)))
- (list marker
- (concat "[[:space:]]*"
- (mapconcat (lambda (s)
- (if (eq s marker) "\\(\\)"
- (regexp-quote s)))
- (nconc before (list marker) after)
- "[[:space:]]*"))
- (progn (goto-char marker)
- (skip-syntax-forward " " (line-end-position))
- (- (point) marker))))))
+The returned value is a list of the form (MARKER REGEXP WS-COUNT)."
+ (unless beg (setq beg (line-beginning-position)))
+ (unless end (setq end (line-end-position)))
+ (let ((before (split-string (buffer-substring-no-properties beg marker)
+ "[[:space:]\n]+" t))
+ (after (split-string (buffer-substring-no-properties marker end)
+ "[[:space:]\n]+" t)))
+ (list marker
+ (concat "[[:space:]\n]*"
+ (mapconcat (lambda (s)
+ (if (eq s marker) "\\(\\)"
+ (regexp-quote s)))
+ (nconc before (list marker) after)
+ "[[:space:]\n]*"))
+ (progn (goto-char marker)
+ (skip-syntax-forward " " end)
+ (- (point) marker)))))
-(defun yas--snapshot-overlay-location (overlay)
- "Like `yas--snapshot-marker-location', but for overlays.
+(defun yas--snapshot-overlay-location (overlay beg end)
+ "Like `yas--snapshot-marker-location' for overlays.
+The returned format is (OVERLAY (RE WS) (RE WS))."
+ (list overlay
+ (cdr (yas--snapshot-marker-location (overlay-start overlay) beg end))
+ (cdr (yas--snapshot-marker-location (overlay-end overlay) beg end))))
+
+(defun yas--snapshot-overlay-line-location (overlay)
+ "Return info for restoring OVERLAY's line based location.
The returned format is (OVERLAY (LINE RE WS) (LINE RE WS))."
(let ((loc-beg (progn (goto-char (overlay-start overlay))
(yas--snapshot-marker-location (point))))
@@ -4064,35 +4135,47 @@ The returned format is (OVERLAY (LINE RE WS) (LINE RE WS))."
(list overlay loc-beg loc-end)))
(defun yas--goto-saved-location (regexp ws-count)
- "Move point to location saved by `yas--snapshot-marker-location'."
- (beginning-of-line)
- (save-restriction
- ;; Narrowing is the only way to limit `looking-at'.
- (narrow-to-region (point) (line-end-position))
- (if (not (looking-at regexp))
- (lwarn '(yasnippet re-marker) :warning
- "Couldn't find: %S" regexp)
- (goto-char (match-beginning 1))
- (skip-syntax-forward " ")
- (skip-syntax-backward " " (- (point) ws-count)))))
+ "Move point to location saved by `yas--snapshot-marker-location'.
+Buffer must be narrowed to BEG..END used to create the snapshot info."
+ (goto-char (point-min))
+ (if (not (looking-at regexp))
+ (lwarn '(yasnippet re-marker) :warning
+ "Couldn't find: %S" regexp)
+ (goto-char (match-beginning 1))
+ (skip-syntax-forward " ")
+ (skip-syntax-backward " " (- (point) ws-count))))
(defun yas--restore-marker-location (re-marker)
"Restores marker based on info from `yas--snapshot-marker-location'.
-Assumes point is currently on the 'same' line as before."
+Buffer must be narrowed to BEG..END used to create the snapshot info."
(apply #'yas--goto-saved-location (cdr re-marker))
(set-marker (car re-marker) (point)))
(defun yas--restore-overlay-location (ov-locations)
- "Restores overlay based on info from `yas--snapshot-overlay-location'."
- (move-overlay (car ov-locations)
- (save-excursion
- (forward-line (car (nth 1 ov-locations)))
- (apply #'yas--goto-saved-location (cdr (nth 1 ov-locations)))
- (point))
- (save-excursion
- (forward-line (car (nth 2 ov-locations)))
- (apply #'yas--goto-saved-location (cdr (nth 2 ov-locations)))
- (point))))
+ "Restores marker based on info from `yas--snapshot-marker-location'.
+Buffer must be narrowed to BEG..END used to create the snapshot info."
+ (cl-destructuring-bind (overlay loc-beg loc-end) ov-locations
+ (move-overlay overlay
+ (progn (apply #'yas--goto-saved-location loc-beg)
+ (point))
+ (progn (apply #'yas--goto-saved-location loc-end)
+ (point)))))
+
+
+(defun yas--restore-overlay-line-location (ov-locations)
+ "Restores overlay based on info from `yas--snapshot-overlay-line-location'."
+ (save-restriction
+ (move-overlay (car ov-locations)
+ (save-excursion
+ (forward-line (car (nth 1 ov-locations)))
+ (narrow-to-region (line-beginning-position) (line-end-position))
+ (apply #'yas--goto-saved-location (cdr (nth 1 ov-locations)))
+ (point))
+ (save-excursion
+ (forward-line (car (nth 2 ov-locations)))
+ (narrow-to-region (line-beginning-position) (line-end-position))
+ (apply #'yas--goto-saved-location (cdr (nth 2 ov-locations)))
+ (point)))))
(defun yas--indent-region (from to snippet)
"Indent the lines between FROM and TO with `indent-according-to-mode'.
@@ -4103,15 +4186,21 @@ The SNIPPET's markers are preserved."
(goto-char from)
(save-restriction
(widen)
- (cl-loop if (/= (line-beginning-position) (line-end-position)) do
+ (cl-loop for bol = (line-beginning-position)
+ for eol = (line-end-position)
+ if (/= bol eol) do
;; Indent each non-empty line.
- (let ((remarkers
- (delq nil (mapcar #'yas--snapshot-marker-location
- snippet-markers))))
+ (let ((remarkers nil))
+ (dolist (m snippet-markers)
+ (when (and (<= bol m) (<= m eol))
+ (push (yas--snapshot-marker-location m bol eol)
+ remarkers)))
(unwind-protect
(progn (back-to-indentation)
(indent-according-to-mode))
- (mapc #'yas--restore-marker-location remarkers)))
+ (save-restriction
+ (narrow-to-region bol (line-end-position))
+ (mapc #'yas--restore-marker-location remarkers))))
while (and (zerop (forward-line 1))
(< (point) to)))))))
.emacs.d/elpa/yasnippet-20170310.1724/yasnippet.elc → .emacs.d/elpa/yasnippet-20170326.1030/yasnippet.elc
Binary file