diff --git a/elpa/async-20160223.146/async-autoloads.el b/elpa/async-20160425.551/async-autoloads.el similarity index 93% rename from elpa/async-20160223.146/async-autoloads.el rename to elpa/async-20160425.551/async-autoloads.el index 0d67ddb..9a65f8f 100644 --- a/elpa/async-20160223.146/async-autoloads.el +++ b/elpa/async-20160425.551/async-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "async" "async.el" (22221 60697 422000 0)) +;;;### (autoloads nil "async" "async.el" (22303 19287 502173 365000)) ;;; Generated autoloads from async.el (autoload 'async-start-process "async" "\ @@ -68,8 +68,8 @@ returns nil. It can still be useful, however, as an argument to ;;;*** -;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22221 -;;;;;; 60697 419000 0)) +;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22303 +;;;;;; 19287 498173 368000)) ;;; Generated autoloads from async-bytecomp.el (autoload 'async-byte-recompile-directory "async-bytecomp" "\ @@ -96,8 +96,8 @@ Async compilation of packages can be controlled by ;;;*** -;;;### (autoloads nil "dired-async" "dired-async.el" (22221 60697 -;;;;;; 412000 0)) +;;;### (autoloads nil "dired-async" "dired-async.el" (22303 19287 +;;;;;; 486173 378000)) ;;; Generated autoloads from dired-async.el (defvar dired-async-mode nil "\ @@ -116,8 +116,8 @@ Do dired actions asynchronously. ;;;*** -;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22221 -;;;;;; 60697 432884 878000)) +;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22303 +;;;;;; 19287 520307 139000)) ;;;*** diff --git a/elpa/async-20160223.146/async-bytecomp.el b/elpa/async-20160425.551/async-bytecomp.el similarity index 100% rename from elpa/async-20160223.146/async-bytecomp.el rename to elpa/async-20160425.551/async-bytecomp.el diff --git a/elpa/async-20160223.146/async-pkg.el b/elpa/async-20160425.551/async-pkg.el similarity index 68% rename from elpa/async-20160223.146/async-pkg.el rename to elpa/async-20160425.551/async-pkg.el index 2610c83..ab58946 100644 --- a/elpa/async-20160223.146/async-pkg.el +++ b/elpa/async-20160425.551/async-pkg.el @@ -1,4 +1,4 @@ -(define-package "async" "20160223.146" "Asynchronous processing in Emacs" 'nil :keywords +(define-package "async" "20160425.551" "Asynchronous processing in Emacs" 'nil :keywords '("async") :url "http://elpa.gnu.org/packages/async.html") ;; Local Variables: diff --git a/elpa/async-20160223.146/async.el b/elpa/async-20160425.551/async.el similarity index 100% rename from elpa/async-20160223.146/async.el rename to elpa/async-20160425.551/async.el diff --git a/elpa/async-20160223.146/dired-async.el b/elpa/async-20160425.551/dired-async.el similarity index 85% rename from elpa/async-20160223.146/dired-async.el rename to elpa/async-20160425.551/dired-async.el index ecab9cb..18e86fc 100644 --- a/elpa/async-20160223.146/dired-async.el +++ b/elpa/async-20160425.551/dired-async.el @@ -166,7 +166,8 @@ See `dired-create-files' for the behavior of arguments." (downcase operation) from))) (if (not to) (setq skipped (cons (dired-make-relative from) skipped)) - (let* ((overwrite (file-exists-p to)) + (let* ((overwrite (and (null (eq file-creator 'backup-file)) + (file-exists-p to))) (dired-overwrite-confirmed ; for dired-handle-overwrite (and overwrite (let ((help-form '(format "\ @@ -255,8 +256,31 @@ ESC or `q' to not overwrite any of the remaining files, ,(async-inject-variables dired-async-env-variables-regexp) (condition-case err (let ((dired-recursive-copies (quote always))) - (cl-loop for (f . d) in (quote ,async-fn-list) - do (funcall (quote ,file-creator) f d t))) + ;; Inline `backup-file' as long as it is not + ;; available in emacs. + (defalias 'backup-file + ;; Same feature as "cp --backup=numbered from to" + ;; Symlinks are copied as file from source unlike + ;; `dired-copy-file' which is same as cp -d. + ;; Directories are omitted. + (lambda (from to ok) + (cond ((file-directory-p from) (ignore)) + (t (let ((count 0)) + (while (let ((attrs (file-attributes to))) + (and attrs (null (nth 0 attrs)))) + (cl-incf count) + (setq to (concat (file-name-sans-versions to) + (format ".~%s~" count))))) + (condition-case err + (copy-file from to ok dired-copy-preserve-time) + (file-date-error + (push (dired-make-relative from) + dired-create-files-failures) + (dired-log "Can't set date on %s:\n%s\n" from err))))))) + ;; Now run the FILE-CREATOR function on files. + (cl-loop with fn = (quote ,file-creator) + for (from . dest) in (quote ,async-fn-list) + do (funcall fn from dest t))) (file-error (with-temp-file ,dired-async-log-file (insert (format "%S" err))))) diff --git a/elpa/async-20160223.146/smtpmail-async.el b/elpa/async-20160425.551/smtpmail-async.el similarity index 100% rename from elpa/async-20160223.146/smtpmail-async.el rename to elpa/async-20160425.551/smtpmail-async.el diff --git a/elpa/company-20160413.1347/company-abbrev.el b/elpa/company-20160424.1521/company-abbrev.el similarity index 100% rename from elpa/company-20160413.1347/company-abbrev.el rename to elpa/company-20160424.1521/company-abbrev.el diff --git a/elpa/company-20160413.1347/company-autoloads.el b/elpa/company-20160424.1521/company-autoloads.el similarity index 84% rename from elpa/company-20160413.1347/company-autoloads.el rename to elpa/company-20160424.1521/company-autoloads.el index 1a7f37b..3facc78 100644 --- a/elpa/company-20160413.1347/company-autoloads.el +++ b/elpa/company-20160424.1521/company-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "company" "company.el" (22297 19838 628699 -;;;;;; 424000)) +;;;### (autoloads nil "company" "company.el" (22303 19286 146174 +;;;;;; 415000)) ;;; Generated autoloads from company.el (autoload 'company-mode "company" "\ @@ -73,8 +73,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22297 -;;;;;; 19840 603664 101000)) +;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22303 +;;;;;; 19286 222174 356000)) ;;; Generated autoloads from company-abbrev.el (autoload 'company-abbrev "company-abbrev" "\ @@ -84,8 +84,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22297 19840 -;;;;;; 163671 971000)) +;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22303 19286 +;;;;;; 206174 368000)) ;;; Generated autoloads from company-bbdb.el (autoload 'company-bbdb "company-bbdb" "\ @@ -95,8 +95,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-css" "company-css.el" (22297 19838 -;;;;;; 501701 694000)) +;;;### (autoloads nil "company-css" "company-css.el" (22303 19286 +;;;;;; 142174 418000)) ;;; Generated autoloads from company-css.el (autoload 'company-css "company-css" "\ @@ -106,8 +106,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22297 -;;;;;; 19839 391685 775000)) +;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22303 +;;;;;; 19286 178174 390000)) ;;; 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" -;;;;;; (22297 19839 228688 691000)) +;;;;;; (22303 19286 170174 396000)) ;;; 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" (22297 19840 -;;;;;; 862659 468000)) +;;;### (autoloads nil "company-elisp" "company-elisp.el" (22303 19286 +;;;;;; 242174 341000)) ;;; 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" (22297 19838 -;;;;;; 926694 94000)) +;;;### (autoloads nil "company-etags" "company-etags.el" (22303 19286 +;;;;;; 154174 409000)) ;;; 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" (22297 19839 -;;;;;; 535683 204000)) +;;;### (autoloads nil "company-files" "company-files.el" (22303 19286 +;;;;;; 182174 387000)) ;;; 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" (22297 19837 -;;;;;; 942711 689000)) +;;;### (autoloads nil "company-gtags" "company-gtags.el" (22303 19286 +;;;;;; 114174 440000)) ;;; 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" (22297 -;;;;;; 19840 704662 296000)) +;;;### (autoloads nil "company-ispell" "company-ispell.el" (22303 +;;;;;; 19286 230174 350000)) ;;; 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" (22297 -;;;;;; 19839 758679 212000)) +;;;### (autoloads nil "company-keywords" "company-keywords.el" (22303 +;;;;;; 19286 194174 378000)) ;;; 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" (22297 19840 -;;;;;; 287669 753000)) +;;;### (autoloads nil "company-nxml" "company-nxml.el" (22303 19286 +;;;;;; 210174 365000)) ;;; 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" (22297 -;;;;;; 19838 346704 465000)) +;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22303 +;;;;;; 19286 134174 424000)) ;;; 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" (22297 -;;;;;; 19838 125708 417000)) +;;;### (autoloads nil "company-semantic" "company-semantic.el" (22303 +;;;;;; 19286 122174 434000)) ;;; 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" (22297 19839 -;;;;;; 349686 528000)) +;;;### (autoloads nil "company-tempo" "company-tempo.el" (22303 19286 +;;;;;; 174174 393000)) ;;; 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" (22297 19840 -;;;;;; 505665 854000)) +;;;### (autoloads nil "company-xcode" "company-xcode.el" (22303 19286 +;;;;;; 218174 359000)) ;;; 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" -;;;;;; (22297 19840 373668 214000)) +;;;;;; (22303 19286 214174 362000)) ;;; 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") -;;;;;; (22297 19841 194698 166000)) +;;;;;; (22303 19286 253549 387000)) ;;;*** diff --git a/elpa/company-20160413.1347/company-bbdb.el b/elpa/company-20160424.1521/company-bbdb.el similarity index 96% rename from elpa/company-20160413.1347/company-bbdb.el rename to elpa/company-20160424.1521/company-bbdb.el index 36307d0..872e1fc 100644 --- a/elpa/company-20160413.1347/company-bbdb.el +++ b/elpa/company-20160424.1521/company-bbdb.el @@ -50,7 +50,7 @@ (interactive (company-begin-backend 'company-bbdb)) (prefix (and (memq major-mode company-bbdb-modes) (featurep 'bbdb-com) - (looking-back "^\\(To\\|Cc\\|Bcc\\): *.*?\\([^,; ]*\\)" + (looking-back "^\\(To\\|Cc\\|Bcc\\): *.*? *\\([^,;]*\\)" (line-beginning-position)) (match-string-no-properties 2))) (candidates (company-bbdb--candidates arg)) diff --git a/elpa/company-20160413.1347/company-capf.el b/elpa/company-20160424.1521/company-capf.el similarity index 100% rename from elpa/company-20160413.1347/company-capf.el rename to elpa/company-20160424.1521/company-capf.el diff --git a/elpa/company-20160413.1347/company-clang.el b/elpa/company-20160424.1521/company-clang.el similarity index 100% rename from elpa/company-20160413.1347/company-clang.el rename to elpa/company-20160424.1521/company-clang.el diff --git a/elpa/company-20160413.1347/company-cmake.el b/elpa/company-20160424.1521/company-cmake.el similarity index 100% rename from elpa/company-20160413.1347/company-cmake.el rename to elpa/company-20160424.1521/company-cmake.el diff --git a/elpa/company-20160413.1347/company-css.el b/elpa/company-20160424.1521/company-css.el similarity index 100% rename from elpa/company-20160413.1347/company-css.el rename to elpa/company-20160424.1521/company-css.el diff --git a/elpa/company-20160413.1347/company-dabbrev-code.el b/elpa/company-20160424.1521/company-dabbrev-code.el similarity index 100% rename from elpa/company-20160413.1347/company-dabbrev-code.el rename to elpa/company-20160424.1521/company-dabbrev-code.el diff --git a/elpa/company-20160413.1347/company-dabbrev.el b/elpa/company-20160424.1521/company-dabbrev.el similarity index 97% rename from elpa/company-20160413.1347/company-dabbrev.el rename to elpa/company-20160424.1521/company-dabbrev.el index 85741f2..3a533d5 100644 --- a/elpa/company-20160413.1347/company-dabbrev.el +++ b/elpa/company-20160424.1521/company-dabbrev.el @@ -79,7 +79,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'." :type 'boolean :package-version '(company . "0.9.0")) -(defmacro company-dabrev--time-limit-while (test start limit freq &rest body) +(defmacro company-dabbrev--time-limit-while (test start limit freq &rest body) (declare (indent 3) (debug t)) `(let ((company-time-limit-while-counter 0)) (catch 'done @@ -107,7 +107,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'." (goto-char (if pos (1- pos) (point-min))) ;; Search before pos. (let ((tmp-end (point))) - (company-dabrev--time-limit-while (> tmp-end (point-min)) + (company-dabbrev--time-limit-while (> tmp-end (point-min)) start limit 1 (ignore-errors (forward-char -10000)) @@ -123,7 +123,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'." (setq tmp-end (point)))) (goto-char (or pos (point-min))) ;; Search after pos. - (company-dabrev--time-limit-while (re-search-forward regexp nil t) + (company-dabbrev--time-limit-while (re-search-forward regexp nil t) start limit 25 (if (and ignore-comments (save-match-data (company-in-string-or-comment))) (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t) diff --git a/elpa/company-20160413.1347/company-eclim.el b/elpa/company-20160424.1521/company-eclim.el similarity index 100% rename from elpa/company-20160413.1347/company-eclim.el rename to elpa/company-20160424.1521/company-eclim.el diff --git a/elpa/company-20160413.1347/company-elisp.el b/elpa/company-20160424.1521/company-elisp.el similarity index 100% rename from elpa/company-20160413.1347/company-elisp.el rename to elpa/company-20160424.1521/company-elisp.el diff --git a/elpa/company-20160413.1347/company-etags.el b/elpa/company-20160424.1521/company-etags.el similarity index 100% rename from elpa/company-20160413.1347/company-etags.el rename to elpa/company-20160424.1521/company-etags.el diff --git a/elpa/company-20160413.1347/company-files.el b/elpa/company-20160424.1521/company-files.el similarity index 100% rename from elpa/company-20160413.1347/company-files.el rename to elpa/company-20160424.1521/company-files.el diff --git a/elpa/company-20160413.1347/company-gtags.el b/elpa/company-20160424.1521/company-gtags.el similarity index 100% rename from elpa/company-20160413.1347/company-gtags.el rename to elpa/company-20160424.1521/company-gtags.el diff --git a/elpa/company-20160413.1347/company-ispell.el b/elpa/company-20160424.1521/company-ispell.el similarity index 100% rename from elpa/company-20160413.1347/company-ispell.el rename to elpa/company-20160424.1521/company-ispell.el diff --git a/elpa/company-20160413.1347/company-keywords.el b/elpa/company-20160424.1521/company-keywords.el similarity index 100% rename from elpa/company-20160413.1347/company-keywords.el rename to elpa/company-20160424.1521/company-keywords.el diff --git a/elpa/company-20160413.1347/company-nxml.el b/elpa/company-20160424.1521/company-nxml.el similarity index 100% rename from elpa/company-20160413.1347/company-nxml.el rename to elpa/company-20160424.1521/company-nxml.el diff --git a/elpa/company-20160413.1347/company-oddmuse.el b/elpa/company-20160424.1521/company-oddmuse.el similarity index 100% rename from elpa/company-20160413.1347/company-oddmuse.el rename to elpa/company-20160424.1521/company-oddmuse.el diff --git a/elpa/company-20160413.1347/company-pkg.el b/elpa/company-20160424.1521/company-pkg.el similarity index 75% rename from elpa/company-20160413.1347/company-pkg.el rename to elpa/company-20160424.1521/company-pkg.el index 8b8fb05..e143b4c 100644 --- a/elpa/company-20160413.1347/company-pkg.el +++ b/elpa/company-20160424.1521/company-pkg.el @@ -1,4 +1,4 @@ -(define-package "company" "20160413.1347" "Modular text completion framework" +(define-package "company" "20160424.1521" "Modular text completion framework" '((emacs "24.1") (cl-lib "0.5")) :url "http://company-mode.github.io/" :keywords diff --git a/elpa/company-20160413.1347/company-semantic.el b/elpa/company-20160424.1521/company-semantic.el similarity index 100% rename from elpa/company-20160413.1347/company-semantic.el rename to elpa/company-20160424.1521/company-semantic.el diff --git a/elpa/company-20160413.1347/company-template.el b/elpa/company-20160424.1521/company-template.el similarity index 100% rename from elpa/company-20160413.1347/company-template.el rename to elpa/company-20160424.1521/company-template.el diff --git a/elpa/company-20160413.1347/company-tempo.el b/elpa/company-20160424.1521/company-tempo.el similarity index 100% rename from elpa/company-20160413.1347/company-tempo.el rename to elpa/company-20160424.1521/company-tempo.el diff --git a/elpa/company-20160413.1347/company-xcode.el b/elpa/company-20160424.1521/company-xcode.el similarity index 100% rename from elpa/company-20160413.1347/company-xcode.el rename to elpa/company-20160424.1521/company-xcode.el diff --git a/elpa/company-20160413.1347/company-yasnippet.el b/elpa/company-20160424.1521/company-yasnippet.el similarity index 100% rename from elpa/company-20160413.1347/company-yasnippet.el rename to elpa/company-20160424.1521/company-yasnippet.el diff --git a/elpa/company-20160413.1347/company.el b/elpa/company-20160424.1521/company.el similarity index 100% rename from elpa/company-20160413.1347/company.el rename to elpa/company-20160424.1521/company.el diff --git a/elpa/git-commit-20160414.251/git-commit-autoloads.el b/elpa/git-commit-20160425.430/git-commit-autoloads.el similarity index 85% rename from elpa/git-commit-20160414.251/git-commit-autoloads.el rename to elpa/git-commit-20160425.430/git-commit-autoloads.el index 6c60c32..f071d15 100644 --- a/elpa/git-commit-20160414.251/git-commit-autoloads.el +++ b/elpa/git-commit-20160425.430/git-commit-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "git-commit" "git-commit.el" (22297 19830 709841 -;;;;;; 48000)) +;;;### (autoloads nil "git-commit" "git-commit.el" (22303 19285 486174 +;;;;;; 926000)) ;;; Generated autoloads from git-commit.el (defvar global-git-commit-mode t "\ @@ -25,11 +25,6 @@ provide such a commit message. \(fn &optional ARG)" t nil) -;;;*** - -;;;### (autoloads nil nil ("git-commit-pkg.el") (22297 19831 32984 -;;;;;; 389000)) - ;;;*** ;; Local Variables: diff --git a/elpa/git-commit-20160414.251/git-commit-pkg.el b/elpa/git-commit-20160425.430/git-commit-pkg.el similarity index 69% rename from elpa/git-commit-20160414.251/git-commit-pkg.el rename to elpa/git-commit-20160425.430/git-commit-pkg.el index 74f722d..f04366c 100644 --- a/elpa/git-commit-20160414.251/git-commit-pkg.el +++ b/elpa/git-commit-20160425.430/git-commit-pkg.el @@ -1 +1 @@ -(define-package "git-commit" "20160414.251" "Edit Git commit messages" '((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc")) +(define-package "git-commit" "20160425.430" "Edit Git commit messages" '((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc")) diff --git a/elpa/git-commit-20160414.251/git-commit.el b/elpa/git-commit-20160425.430/git-commit.el similarity index 99% rename from elpa/git-commit-20160414.251/git-commit.el rename to elpa/git-commit-20160425.430/git-commit.el index c5785bd..d350c03 100644 --- a/elpa/git-commit-20160414.251/git-commit.el +++ b/elpa/git-commit-20160425.430/git-commit.el @@ -13,7 +13,7 @@ ;; Package-Requires: ((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201")) ;; Keywords: git tools vc -;; Package-Version: 20160414.251 +;; Package-Version: 20160425.430 ;; Homepage: https://github.com/magit/magit ;; This file is not part of GNU Emacs. diff --git a/elpa/helm-20160421.621/emacs-helm.sh b/elpa/helm-20160425.958/emacs-helm.sh similarity index 100% rename from elpa/helm-20160421.621/emacs-helm.sh rename to elpa/helm-20160425.958/emacs-helm.sh diff --git a/elpa/helm-20160421.621/helm-adaptive.el b/elpa/helm-20160425.958/helm-adaptive.el similarity index 100% rename from elpa/helm-20160421.621/helm-adaptive.el rename to elpa/helm-20160425.958/helm-adaptive.el diff --git a/elpa/helm-20160421.621/helm-apt.el b/elpa/helm-20160425.958/helm-apt.el similarity index 100% rename from elpa/helm-20160421.621/helm-apt.el rename to elpa/helm-20160425.958/helm-apt.el diff --git a/elpa/helm-20160421.621/helm-autoloads.el b/elpa/helm-20160425.958/helm-autoloads.el similarity index 89% rename from elpa/helm-20160421.621/helm-autoloads.el rename to elpa/helm-20160425.958/helm-autoloads.el index a407d5e..898cc24 100644 --- a/elpa/helm-20160421.621/helm-autoloads.el +++ b/elpa/helm-20160425.958/helm-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22297 20826 -;;;;;; 911994 142000)) +;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22303 19284 +;;;;;; 902175 378000)) ;;; Generated autoloads from helm-adaptive.el (defvar helm-adaptive-mode nil "\ @@ -29,8 +29,8 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'. ;;;*** -;;;### (autoloads nil "helm-apt" "helm-apt.el" (22297 20826 663998 -;;;;;; 593000)) +;;;### (autoloads nil "helm-apt" "helm-apt.el" (22303 19284 870175 +;;;;;; 403000)) ;;; Generated autoloads from helm-apt.el (autoload 'helm-apt "helm-apt" "\ @@ -41,8 +41,8 @@ With a prefix arg reload cache. ;;;*** -;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22297 20827 -;;;;;; 343986 390000)) +;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22303 19284 +;;;;;; 950175 341000)) ;;; Generated autoloads from helm-bookmark.el (autoload 'helm-bookmarks "helm-bookmark" "\ @@ -59,8 +59,8 @@ only if external library addressbook-bookmark.el is available. ;;;*** -;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22297 20826 -;;;;;; 572000 244000)) +;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22303 19284 +;;;;;; 854175 415000)) ;;; Generated autoloads from helm-buffers.el (autoload 'helm-buffers-list "helm-buffers" "\ @@ -75,8 +75,8 @@ Preconfigured `helm' lightweight version (buffer -> recentf). ;;;*** -;;;### (autoloads nil "helm-color" "helm-color.el" (22297 20827 210988 -;;;;;; 776000)) +;;;### (autoloads nil "helm-color" "helm-color.el" (22303 19284 930175 +;;;;;; 357000)) ;;; Generated autoloads from helm-color.el (autoload 'helm-colors "helm-color" "\ @@ -86,8 +86,8 @@ Preconfigured `helm' for color. ;;;*** -;;;### (autoloads nil "helm-command" "helm-command.el" (22297 20826 -;;;;;; 137008 49000)) +;;;### (autoloads nil "helm-command" "helm-command.el" (22303 19284 +;;;;;; 806175 452000)) ;;; Generated autoloads from helm-command.el (autoload 'helm-M-x "helm-command" "\ @@ -103,8 +103,8 @@ You can get help on each command by persistent action. ;;;*** -;;;### (autoloads nil "helm-config" "helm-config.el" (22297 20827 -;;;;;; 301987 144000)) +;;;### (autoloads nil "helm-config" "helm-config.el" (22303 19284 +;;;;;; 942175 347000)) ;;; Generated autoloads from helm-config.el (autoload 'helm-configuration "helm-config" "\ @@ -114,8 +114,8 @@ Customize `helm'. ;;;*** -;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22297 20826 -;;;;;; 746997 104000)) +;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22303 19284 +;;;;;; 882175 394000)) ;;; Generated autoloads from helm-dabbrev.el (autoload 'helm-dabbrev "helm-dabbrev" "\ @@ -125,8 +125,8 @@ Preconfigured helm for dynamic abbreviations. ;;;*** -;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22297 20827 256987 -;;;;;; 951000)) +;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22303 19284 934175 +;;;;;; 353000)) ;;; Generated autoloads from helm-elisp.el (autoload 'helm-lisp-completion-at-point "helm-elisp" "\ @@ -180,7 +180,7 @@ Preconfigured helm for complex command history. ;;;*** ;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el" -;;;;;; (22297 20826 183007 225000)) +;;;;;; (22303 19284 810175 449000)) ;;; Generated autoloads from helm-elisp-package.el (autoload 'helm-list-elisp-packages "helm-elisp-package" "\ @@ -196,8 +196,8 @@ Same as `helm-list-elisp-packages' but don't fetch packages on remote. ;;;*** -;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22297 20826 -;;;;;; 63009 378000)) +;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22303 19284 +;;;;;; 794175 462000)) ;;; Generated autoloads from helm-elscreen.el (autoload 'helm-elscreen "helm-elscreen" "\ @@ -212,8 +212,8 @@ Preconfigured helm to list elscreen in history order. ;;;*** -;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22297 20826 -;;;;;; 307004 999000)) +;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22303 19284 +;;;;;; 826175 437000)) ;;; Generated autoloads from helm-eshell.el (autoload 'helm-esh-pcomplete "helm-eshell" "\ @@ -228,8 +228,8 @@ Preconfigured helm for eshell history. ;;;*** -;;;### (autoloads nil "helm-eval" "helm-eval.el" (22297 20826 994992 -;;;;;; 653000)) +;;;### (autoloads nil "helm-eval" "helm-eval.el" (22303 19284 910175 +;;;;;; 372000)) ;;; Generated autoloads from helm-eval.el (autoload 'helm-eval-expression "helm-eval" "\ @@ -249,8 +249,8 @@ Preconfigured helm for `helm-source-calculation-result'. ;;;*** -;;;### (autoloads nil "helm-external" "helm-external.el" (22297 20825 -;;;;;; 971011 29000)) +;;;### (autoloads nil "helm-external" "helm-external.el" (22303 19284 +;;;;;; 786175 468000)) ;;; Generated autoloads from helm-external.el (autoload 'helm-run-external-command "helm-external" "\ @@ -263,8 +263,8 @@ You can set your own list of commands with ;;;*** -;;;### (autoloads nil "helm-files" "helm-files.el" (22297 20826 787996 -;;;;;; 368000)) +;;;### (autoloads nil "helm-files" "helm-files.el" (22303 19284 886175 +;;;;;; 391000)) ;;; Generated autoloads from helm-files.el (autoload 'helm-browse-project "helm-files" "\ @@ -322,8 +322,8 @@ Preconfigured `helm' for `recentf'. ;;;*** -;;;### (autoloads nil "helm-font" "helm-font.el" (22297 20826 353004 -;;;;;; 173000)) +;;;### (autoloads nil "helm-font" "helm-font.el" (22303 19284 830175 +;;;;;; 434000)) ;;; Generated autoloads from helm-font.el (autoload 'helm-select-xfont "helm-font" "\ @@ -338,8 +338,8 @@ Preconfigured helm for `ucs-names' math symbols. ;;;*** -;;;### (autoloads nil "helm-grep" "helm-grep.el" (22297 20827 384985 -;;;;;; 653000)) +;;;### (autoloads nil "helm-grep" "helm-grep.el" (22303 19284 954175 +;;;;;; 338000)) ;;; Generated autoloads from helm-grep.el (autoload 'helm-goto-precedent-file "helm-grep" "\ @@ -366,8 +366,8 @@ With a prefix arg ARG git-grep the whole repository. ;;;*** -;;;### (autoloads nil "helm-help" "helm-help.el" (22297 20825 925011 -;;;;;; 854000)) +;;;### (autoloads nil "helm-help" "helm-help.el" (22303 19284 782175 +;;;;;; 471000)) ;;; Generated autoloads from helm-help.el (autoload 'helm-documentation "helm-help" "\ @@ -393,8 +393,8 @@ HELM-ATTRIBUTE should be a symbol. ;;;*** -;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22297 20826 -;;;;;; 617999 418000)) +;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22303 19284 +;;;;;; 862175 409000)) ;;; Generated autoloads from helm-id-utils.el (autoload 'helm-gid "helm-id-utils" "\ @@ -408,8 +408,8 @@ See . ;;;*** -;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22297 20826 481001 -;;;;;; 877000)) +;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22303 19284 846175 +;;;;;; 421000)) ;;; Generated autoloads from helm-imenu.el (autoload 'helm-imenu "helm-imenu" "\ @@ -424,8 +424,8 @@ Preconfigured helm for fetching imenu entries of all buffers. ;;;*** -;;;### (autoloads nil "helm-info" "helm-info.el" (22297 20826 398003 -;;;;;; 366000)) +;;;### (autoloads nil "helm-info" "helm-info.el" (22303 19284 838175 +;;;;;; 427000)) ;;; Generated autoloads from helm-info.el (autoload 'helm-info "helm-info" "\ @@ -441,8 +441,8 @@ With a prefix-arg insert symbol at point. ;;;*** -;;;### (autoloads nil "helm-locate" "helm-locate.el" (22297 20826 -;;;;;; 17010 203000)) +;;;### (autoloads nil "helm-locate" "helm-locate.el" (22303 19284 +;;;;;; 790175 465000)) ;;; Generated autoloads from helm-locate.el (autoload 'helm-projects-find-files "helm-locate" "\ @@ -469,8 +469,8 @@ Where db_path is a filename matched by ;;;*** -;;;### (autoloads nil "helm-man" "helm-man.el" (22297 20827 40991 -;;;;;; 828000)) +;;;### (autoloads nil "helm-man" "helm-man.el" (22303 19284 914175 +;;;;;; 369000)) ;;; Generated autoloads from helm-man.el (autoload 'helm-man-woman "helm-man" "\ @@ -481,8 +481,8 @@ With a prefix arg reinitialize the cache. ;;;*** -;;;### (autoloads nil "helm-misc" "helm-misc.el" (22297 20826 870994 -;;;;;; 878000)) +;;;### (autoloads nil "helm-misc" "helm-misc.el" (22303 19284 898175 +;;;;;; 381000)) ;;; Generated autoloads from helm-misc.el (autoload 'helm-browse-menubar "helm-misc" "\ @@ -523,8 +523,8 @@ Preconfigured `helm' that provide completion of `comint' history. ;;;*** -;;;### (autoloads nil "helm-mode" "helm-mode.el" (22297 20825 796014 -;;;;;; 170000)) +;;;### (autoloads nil "helm-mode" "helm-mode.el" (22303 19284 766175 +;;;;;; 484000)) ;;; Generated autoloads from helm-mode.el (autoload 'helm-comp-read "helm-mode" "\ @@ -691,8 +691,8 @@ Note: This mode is incompatible with Emacs23. ;;;*** -;;;### (autoloads nil "helm-net" "helm-net.el" (22297 20827 169989 -;;;;;; 513000)) +;;;### (autoloads nil "helm-net" "helm-net.el" (22303 19284 926175 +;;;;;; 360000)) ;;; Generated autoloads from helm-net.el (autoload 'helm-surfraw "helm-net" "\ @@ -712,8 +712,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest. ;;;*** -;;;### (autoloads nil "helm-org" "helm-org.el" (22297 20827 426984 -;;;;;; 900000)) +;;;### (autoloads nil "helm-org" "helm-org.el" (22303 19284 958175 +;;;;;; 335000)) ;;; Generated autoloads from helm-org.el (autoload 'helm-org-agenda-files-headings "helm-org" "\ @@ -744,8 +744,8 @@ Preconfigured helm for org templates. ;;;*** -;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22297 20827 -;;;;;; 127990 267000)) +;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22303 19284 +;;;;;; 922175 363000)) ;;; Generated autoloads from helm-regexp.el (autoload 'helm-moccur-mode "helm-regexp" "\ @@ -784,8 +784,8 @@ The prefix arg can be set before calling ;;;*** -;;;### (autoloads nil "helm-ring" "helm-ring.el" (22297 20825 884012 -;;;;;; 590000)) +;;;### (autoloads nil "helm-ring" "helm-ring.el" (22303 19284 778175 +;;;;;; 474000)) ;;; Generated autoloads from helm-ring.el (defvar helm-push-mark-mode nil "\ @@ -842,8 +842,8 @@ This command is useful when used with persistent action. ;;;*** -;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22297 20826 -;;;;;; 523001 123000)) +;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22303 19284 +;;;;;; 850175 418000)) ;;; Generated autoloads from helm-semantic.el (autoload 'helm-semantic "helm-semantic" "\ @@ -865,8 +865,8 @@ Fill in the symbol at point by default. ;;;*** -;;;### (autoloads nil "helm-sys" "helm-sys.el" (22297 20826 704997 -;;;;;; 857000)) +;;;### (autoloads nil "helm-sys" "helm-sys.el" (22303 19284 874175 +;;;;;; 400000)) ;;; Generated autoloads from helm-sys.el (autoload 'helm-top "helm-sys" "\ @@ -886,8 +886,8 @@ Preconfigured helm for xrandr. ;;;*** -;;;### (autoloads nil "helm-tags" "helm-tags.el" (22297 20826 262005 -;;;;;; 807000)) +;;;### (autoloads nil "helm-tags" "helm-tags.el" (22303 19284 822175 +;;;;;; 440000)) ;;; Generated autoloads from helm-tags.el (autoload 'helm-etags-select "helm-tags" "\ @@ -906,8 +906,8 @@ This function aggregates three sources of tag files: ;;;*** -;;;### (autoloads nil "helm-utils" "helm-utils.el" (22297 20826 91008 -;;;;;; 876000)) +;;;### (autoloads nil "helm-utils" "helm-utils.el" (22303 19284 798175 +;;;;;; 459000)) ;;; Generated autoloads from helm-utils.el (defvar helm-popup-tip-mode nil "\ @@ -927,8 +927,8 @@ Show help-echo informations in a popup tip at end of line. ;;;*** ;;;### (autoloads nil nil ("helm-easymenu.el" "helm-multi-match.el" -;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-types.el") (22297 20827 -;;;;;; 514325 542000)) +;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-types.el") (22303 19284 +;;;;;; 973293 164000)) ;;;*** diff --git a/elpa/helm-20160421.621/helm-bookmark.el b/elpa/helm-20160425.958/helm-bookmark.el similarity index 100% rename from elpa/helm-20160421.621/helm-bookmark.el rename to elpa/helm-20160425.958/helm-bookmark.el diff --git a/elpa/helm-20160421.621/helm-buffers.el b/elpa/helm-20160425.958/helm-buffers.el similarity index 99% rename from elpa/helm-20160421.621/helm-buffers.el rename to elpa/helm-20160425.958/helm-buffers.el index a59427f..7e405d6 100644 --- a/elpa/helm-20160421.621/helm-buffers.el +++ b/elpa/helm-20160425.958/helm-buffers.el @@ -324,10 +324,10 @@ See `ido-make-buffer-list' for more infos." (size (propertize (helm-buffer-size buf) 'face 'helm-buffer-size)) (proc (get-buffer-process buf)) - (dir (with-current-buffer buffer (abbreviate-file-name default-directory))) + (dir (with-current-buffer buffer (helm-aif default-directory (abbreviate-file-name it)))) (file-name (helm-aif (buffer-file-name buf) (abbreviate-file-name it))) (name (buffer-name buf)) - (name-prefix (when (file-remote-p dir) + (name-prefix (when (and dir (file-remote-p dir)) (propertize "@ " 'face 'helm-ff-prefix)))) ;; No fancy things on remote buffers. (if (and name-prefix helm-buffer-skip-remote-checking) diff --git a/elpa/helm-20160421.621/helm-color.el b/elpa/helm-20160425.958/helm-color.el similarity index 100% rename from elpa/helm-20160421.621/helm-color.el rename to elpa/helm-20160425.958/helm-color.el diff --git a/elpa/helm-20160421.621/helm-command.el b/elpa/helm-20160425.958/helm-command.el similarity index 100% rename from elpa/helm-20160421.621/helm-command.el rename to elpa/helm-20160425.958/helm-command.el diff --git a/elpa/helm-20160421.621/helm-config.el b/elpa/helm-20160425.958/helm-config.el similarity index 100% rename from elpa/helm-20160421.621/helm-config.el rename to elpa/helm-20160425.958/helm-config.el diff --git a/elpa/helm-20160421.621/helm-dabbrev.el b/elpa/helm-20160425.958/helm-dabbrev.el similarity index 100% rename from elpa/helm-20160421.621/helm-dabbrev.el rename to elpa/helm-20160425.958/helm-dabbrev.el diff --git a/elpa/helm-20160421.621/helm-easymenu.el b/elpa/helm-20160425.958/helm-easymenu.el similarity index 100% rename from elpa/helm-20160421.621/helm-easymenu.el rename to elpa/helm-20160425.958/helm-easymenu.el diff --git a/elpa/helm-20160421.621/helm-elisp-package.el b/elpa/helm-20160425.958/helm-elisp-package.el similarity index 100% rename from elpa/helm-20160421.621/helm-elisp-package.el rename to elpa/helm-20160425.958/helm-elisp-package.el diff --git a/elpa/helm-20160421.621/helm-elisp.el b/elpa/helm-20160425.958/helm-elisp.el similarity index 100% rename from elpa/helm-20160421.621/helm-elisp.el rename to elpa/helm-20160425.958/helm-elisp.el diff --git a/elpa/helm-20160421.621/helm-elscreen.el b/elpa/helm-20160425.958/helm-elscreen.el similarity index 100% rename from elpa/helm-20160421.621/helm-elscreen.el rename to elpa/helm-20160425.958/helm-elscreen.el diff --git a/elpa/helm-20160421.621/helm-eshell.el b/elpa/helm-20160425.958/helm-eshell.el similarity index 100% rename from elpa/helm-20160421.621/helm-eshell.el rename to elpa/helm-20160425.958/helm-eshell.el diff --git a/elpa/helm-20160421.621/helm-eval.el b/elpa/helm-20160425.958/helm-eval.el similarity index 100% rename from elpa/helm-20160421.621/helm-eval.el rename to elpa/helm-20160425.958/helm-eval.el diff --git a/elpa/helm-20160421.621/helm-external.el b/elpa/helm-20160425.958/helm-external.el similarity index 100% rename from elpa/helm-20160421.621/helm-external.el rename to elpa/helm-20160425.958/helm-external.el diff --git a/elpa/helm-20160421.621/helm-files.el b/elpa/helm-20160425.958/helm-files.el similarity index 98% rename from elpa/helm-20160421.621/helm-files.el rename to elpa/helm-20160425.958/helm-files.el index 5a66c84..6cc9377 100644 --- a/elpa/helm-20160421.621/helm-files.el +++ b/elpa/helm-20160425.958/helm-files.el @@ -54,6 +54,7 @@ (defvar recentf-list) (defvar helm-mm-matching-method) +(defvar dired-async-mode) (defgroup helm-files nil @@ -476,6 +477,7 @@ Don't set it directly, use instead `helm-ff-auto-update-initial-value'.") "Delete File(s) `M-D'" 'helm-delete-marked-files "Copy file(s) `M-C, C-u to follow'" 'helm-find-files-copy "Rename file(s) `M-R, C-u to follow'" 'helm-find-files-rename + "Backup files" 'helm-find-files-backup "Symlink files(s) `M-S, C-u to follow'" 'helm-find-files-symlink "Relsymlink file(s) `C-u to follow'" 'helm-find-files-relsymlink "Hardlink file(s) `M-H, C-u to follow'" 'helm-find-files-hardlink @@ -569,6 +571,22 @@ of current buffer." ;; staying in the directory visited instead of current. (or (car-safe helm-ff-history) default-directory)))))) +(defun helm-ff--count-and-collect-dups (files) + (cl-loop with dups = (make-hash-table :test 'equal) + for f in files + for file = (if (file-directory-p f) + (concat (helm-basename f) "/") + (helm-basename f)) + for count = (gethash file dups) + if count do (puthash file (1+ count) dups) + else do (puthash file 1 dups) + finally return (cl-loop for k being the hash-keys in dups + using (hash-value v) + if (> v 1) + collect (format "%s(%s)" k v) + else + collect k))) + (defun helm-find-files-do-action (action) "Generic function for creating actions from `helm-source-find-files'. ACTION must be an action supported by `helm-dired-action'." @@ -584,11 +602,7 @@ ACTION must be an action supported by `helm-dired-action'." helm-ff-auto-update-initial-value (dest (with-helm-display-marked-candidates helm-marked-buffer-name - (mapcar (lambda (f) - (if (file-directory-p f) - (concat (helm-basename f) "/") - (helm-basename f))) - ifiles) + (helm-ff--count-and-collect-dups ifiles) (with-helm-current-buffer (helm-read-file-name prompt @@ -604,6 +618,13 @@ ACTION must be an action supported by `helm-dired-action'." "Copy files from `helm-find-files'." (helm-find-files-do-action 'copy)) +(defun helm-find-files-backup (_candidate) + "Backup files from `helm-find-files'. +This reproduce the behavior of \"cp --backup=numbered from to\"." + (cl-assert (and (fboundp 'dired-async-mode) dired-async-mode) nil + "Backup only available when `dired-async-mode' is enabled") + (helm-find-files-do-action 'backup)) + (defun helm-find-files-rename (_candidate) "Rename files from `helm-find-files'." (helm-find-files-do-action 'rename)) @@ -857,7 +878,7 @@ See `helm-ff-serial-rename-1'." :must-match t))) done) (with-helm-display-marked-candidates - helm-marked-buffer-name (mapcar 'helm-basename cands) + helm-marked-buffer-name (helm-ff--count-and-collect-dups cands) (if (y-or-n-p (format "Rename %s file(s) to <%s> like this ?\n%s " (length cands) dir (format "%s <-> %s%s.%s" @@ -2602,12 +2623,11 @@ Find inside `require' and `declare-function' sexp." when (eq (car (file-attributes cd)) t) return cd))) -(defvar dired-async-mode) (cl-defun helm-dired-action (candidate &key action follow (files (dired-get-marked-files))) "Execute ACTION on FILES to CANDIDATE. Where ACTION is a symbol that can be one of: -'copy, 'rename, 'symlink,'relsymlink, 'hardlink. +'copy, 'rename, 'symlink,'relsymlink, 'hardlink or 'backup. Argument FOLLOW when non--nil specify to follow FILES to destination for the actions copy and rename." (when (get-buffer dired-log-buffer) (kill-buffer dired-log-buffer)) @@ -2621,12 +2641,13 @@ copy and rename." (rename 'dired-rename-file) (symlink 'make-symbolic-link) (relsymlink 'dired-make-relative-symlink) - (hardlink 'dired-hardlink))) + (hardlink 'dired-hardlink) + (backup 'backup-file))) (marker (cl-case action - ((copy rename) dired-keep-marker-copy) - (symlink dired-keep-marker-symlink) - (relsymlink dired-keep-marker-relsymlink) - (hardlink dired-keep-marker-hardlink))) + ((copy rename backup) dired-keep-marker-copy) + (symlink dired-keep-marker-symlink) + (relsymlink dired-keep-marker-relsymlink) + (hardlink dired-keep-marker-hardlink))) (dirflag (and (= (length files) 1) (file-directory-p (car files)) (not (file-directory-p candidate)))) @@ -2754,11 +2775,7 @@ Ask to kill buffers associated with that file, too." (len (length files))) (with-helm-display-marked-candidates helm-marked-buffer-name - (mapcar (lambda (f) - (if (file-directory-p f) - (concat (helm-basename f) "/") - (helm-basename f))) - files) + (helm-ff--count-and-collect-dups files) (if (not (y-or-n-p (format "Delete *%s File(s)" len))) (message "(No deletions performed)") (cl-dolist (i files) diff --git a/elpa/helm-20160421.621/helm-font.el b/elpa/helm-20160425.958/helm-font.el similarity index 100% rename from elpa/helm-20160421.621/helm-font.el rename to elpa/helm-20160425.958/helm-font.el diff --git a/elpa/helm-20160421.621/helm-grep.el b/elpa/helm-20160425.958/helm-grep.el similarity index 100% rename from elpa/helm-20160421.621/helm-grep.el rename to elpa/helm-20160425.958/helm-grep.el diff --git a/elpa/helm-20160421.621/helm-help.el b/elpa/helm-20160425.958/helm-help.el similarity index 99% rename from elpa/helm-20160421.621/helm-help.el rename to elpa/helm-20160425.958/helm-help.el index 3529253..fb3d345 100644 --- a/elpa/helm-20160421.621/helm-help.el +++ b/elpa/helm-20160425.958/helm-help.el @@ -384,6 +384,11 @@ Shortcut for basename without extension, only extension or all are available: - Only extension => \".%\" - All => \"%\" +So in the example above you could do instead: +At first prompt enter \".%\", at second \"jpg\" and hit `RET`. +Note that when using this instead of using \"JPG\" at first prompt, all extensions +will be renamed to \"jpg\" even if the extension of one of the files is e.g \"png\". + If you want to rename a serie of files from number 001 to 00x use \\# inside the replacement string when you will be prompted for it. @@ -397,8 +402,8 @@ Note: You can do this with the serial renames actions you will find in the actio for more sophisticated renaming, but using query replace regexp on filenames is a fast way for most common serial replacements. -Note also that unlike the serial renames action the renamed files stay in their initial directory -and are not renamed to current directory, IOW use this to rename files inside current directory. +Note also that unlike the serial rename actions the renamed files stay in their initial directory +and are not renamed to current directory, IOW use this (\\#) to rename files inside current directory. In the second prompt (replace regexp with) shortcut for `upcase', `downcase' and `capitalize' are available, respectively `%u', `%d' and `%c'. diff --git a/elpa/helm-20160421.621/helm-id-utils.el b/elpa/helm-20160425.958/helm-id-utils.el similarity index 100% rename from elpa/helm-20160421.621/helm-id-utils.el rename to elpa/helm-20160425.958/helm-id-utils.el diff --git a/elpa/helm-20160421.621/helm-imenu.el b/elpa/helm-20160425.958/helm-imenu.el similarity index 100% rename from elpa/helm-20160421.621/helm-imenu.el rename to elpa/helm-20160425.958/helm-imenu.el diff --git a/elpa/helm-20160421.621/helm-info.el b/elpa/helm-20160425.958/helm-info.el similarity index 100% rename from elpa/helm-20160421.621/helm-info.el rename to elpa/helm-20160425.958/helm-info.el diff --git a/elpa/helm-20160421.621/helm-locate.el b/elpa/helm-20160425.958/helm-locate.el similarity index 100% rename from elpa/helm-20160421.621/helm-locate.el rename to elpa/helm-20160425.958/helm-locate.el diff --git a/elpa/helm-20160421.621/helm-man.el b/elpa/helm-20160425.958/helm-man.el similarity index 100% rename from elpa/helm-20160421.621/helm-man.el rename to elpa/helm-20160425.958/helm-man.el diff --git a/elpa/helm-20160421.621/helm-misc.el b/elpa/helm-20160425.958/helm-misc.el similarity index 100% rename from elpa/helm-20160421.621/helm-misc.el rename to elpa/helm-20160425.958/helm-misc.el diff --git a/elpa/helm-20160421.621/helm-mode.el b/elpa/helm-20160425.958/helm-mode.el similarity index 100% rename from elpa/helm-20160421.621/helm-mode.el rename to elpa/helm-20160425.958/helm-mode.el diff --git a/elpa/helm-20160421.621/helm-multi-match.el b/elpa/helm-20160425.958/helm-multi-match.el similarity index 100% rename from elpa/helm-20160421.621/helm-multi-match.el rename to elpa/helm-20160425.958/helm-multi-match.el diff --git a/elpa/helm-20160421.621/helm-net.el b/elpa/helm-20160425.958/helm-net.el similarity index 100% rename from elpa/helm-20160421.621/helm-net.el rename to elpa/helm-20160425.958/helm-net.el diff --git a/elpa/helm-20160421.621/helm-org.el b/elpa/helm-20160425.958/helm-org.el similarity index 100% rename from elpa/helm-20160421.621/helm-org.el rename to elpa/helm-20160425.958/helm-org.el diff --git a/elpa/helm-20160421.621/helm-pkg.el b/elpa/helm-20160425.958/helm-pkg.el similarity index 76% rename from elpa/helm-20160421.621/helm-pkg.el rename to elpa/helm-20160425.958/helm-pkg.el index d18b51c..bcdd528 100644 --- a/elpa/helm-20160421.621/helm-pkg.el +++ b/elpa/helm-20160425.958/helm-pkg.el @@ -1,4 +1,4 @@ -(define-package "helm" "20160421.621" "Helm is an Emacs incremental and narrowing framework" +(define-package "helm" "20160425.958" "Helm is an Emacs incremental and narrowing framework" '((emacs "24.3") (async "1.7") (popup "0.5.3") diff --git a/elpa/helm-20160421.621/helm-plugin.el b/elpa/helm-20160425.958/helm-plugin.el similarity index 100% rename from elpa/helm-20160421.621/helm-plugin.el rename to elpa/helm-20160425.958/helm-plugin.el diff --git a/elpa/helm-20160421.621/helm-regexp.el b/elpa/helm-20160425.958/helm-regexp.el similarity index 100% rename from elpa/helm-20160421.621/helm-regexp.el rename to elpa/helm-20160425.958/helm-regexp.el diff --git a/elpa/helm-20160421.621/helm-ring.el b/elpa/helm-20160425.958/helm-ring.el similarity index 100% rename from elpa/helm-20160421.621/helm-ring.el rename to elpa/helm-20160425.958/helm-ring.el diff --git a/elpa/helm-20160421.621/helm-semantic.el b/elpa/helm-20160425.958/helm-semantic.el similarity index 100% rename from elpa/helm-20160421.621/helm-semantic.el rename to elpa/helm-20160425.958/helm-semantic.el diff --git a/elpa/helm-20160421.621/helm-sys.el b/elpa/helm-20160425.958/helm-sys.el similarity index 100% rename from elpa/helm-20160421.621/helm-sys.el rename to elpa/helm-20160425.958/helm-sys.el diff --git a/elpa/helm-20160421.621/helm-tags.el b/elpa/helm-20160425.958/helm-tags.el similarity index 100% rename from elpa/helm-20160421.621/helm-tags.el rename to elpa/helm-20160425.958/helm-tags.el diff --git a/elpa/helm-20160421.621/helm-types.el b/elpa/helm-20160425.958/helm-types.el similarity index 100% rename from elpa/helm-20160421.621/helm-types.el rename to elpa/helm-20160425.958/helm-types.el diff --git a/elpa/helm-20160421.621/helm-utils.el b/elpa/helm-20160425.958/helm-utils.el similarity index 100% rename from elpa/helm-20160421.621/helm-utils.el rename to elpa/helm-20160425.958/helm-utils.el diff --git a/elpa/helm-ag-20160411.417/helm-ag-autoloads.el b/elpa/helm-ag-20160424.546/helm-ag-autoloads.el similarity index 93% rename from elpa/helm-ag-20160411.417/helm-ag-autoloads.el rename to elpa/helm-ag-20160424.546/helm-ag-autoloads.el index ad8bd00..6eb0caf 100644 --- a/elpa/helm-ag-20160411.417/helm-ag-autoloads.el +++ b/elpa/helm-ag-20160424.546/helm-ag-autoloads.el @@ -3,8 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm-ag" "helm-ag.el" (22297 53346 754924 -;;;;;; 211000)) +;;;### (autoloads nil "helm-ag" "helm-ag.el" (22303 19283 86176 785000)) ;;; Generated autoloads from helm-ag.el (autoload 'helm-ag-pop-stack "helm-ag" "\ diff --git a/elpa/helm-ag-20160411.417/helm-ag-pkg.el b/elpa/helm-ag-20160424.546/helm-ag-pkg.el similarity index 60% rename from elpa/helm-ag-20160411.417/helm-ag-pkg.el rename to elpa/helm-ag-20160424.546/helm-ag-pkg.el index 2db8163..e7f4a9d 100644 --- a/elpa/helm-ag-20160411.417/helm-ag-pkg.el +++ b/elpa/helm-ag-20160424.546/helm-ag-pkg.el @@ -1 +1 @@ -(define-package "helm-ag" "20160411.417" "the silver searcher with helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-ag") +(define-package "helm-ag" "20160424.546" "the silver searcher with helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-ag") diff --git a/elpa/helm-ag-20160411.417/helm-ag.el b/elpa/helm-ag-20160424.546/helm-ag.el similarity index 99% rename from elpa/helm-ag-20160411.417/helm-ag.el rename to elpa/helm-ag-20160424.546/helm-ag.el index b1067c2..9a9cb12 100644 --- a/elpa/helm-ag-20160411.417/helm-ag.el +++ b/elpa/helm-ag-20160424.546/helm-ag.el @@ -4,7 +4,7 @@ ;; Author: Syohei YOSHIDA ;; URL: https://github.com/syohex/emacs-helm-ag -;; Package-Version: 20160411.417 +;; Package-Version: 20160424.546 ;; Version: 0.53 ;; Package-Requires: ((emacs "24.3") (helm "1.7.7")) @@ -288,7 +288,10 @@ Default behaviour shows finish and result in mode-line." (funcall find-func filename) (goto-char (point-min)) (when line - (forward-line (1- (string-to-number line)))))) + (forward-line (1- (string-to-number line)))) + (ignore-errors + (and (re-search-forward helm-ag--last-query (line-end-position) t) + (goto-char (match-beginning 0)))))) (defun helm-ag--open-file-with-temp-buffer (filename) (switch-to-buffer (get-buffer-create " *helm-ag persistent*")) diff --git a/elpa/magit-20160421.459/magit.info b/elpa/magit-20160421.459/magit.info deleted file mode 100644 index 73cbd46..0000000 --- a/elpa/magit-20160421.459/magit.info +++ /dev/null @@ -1,166 +0,0 @@ -This is magit.info, produced by makeinfo version 5.2 from magit.texi. - -Magit is an interface to the version control system Git, implemented as -an Emacs package. Magit aspires to be a complete Git porcelain. While -we cannot (yet) claim that Magit wraps and improves upon each and every -Git command, it is complete enough to allow even experienced Git users -to perform almost all of their daily version control tasks directly from -within Emacs. While many fine Git clients exist, only Magit and Git -itself deserve to be called porcelains. - - Copyright (C) 2015-2016 Jonas Bernoulli - - You can redistribute this document and/or modify it under the terms - of the GNU General Public License as published by the Free Software - Foundation, either version 3 of the License, or (at your option) - any later version. - - This document is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. -INFO-DIR-SECTION Emacs -START-INFO-DIR-ENTRY -* Magit: (magit). Using Git from Emacs with Magit. -END-INFO-DIR-ENTRY - - -Indirect: -magit.info-1: 1222 -magit.info-2: 321654 - -Tag Table: -(Indirect) -Node: Top1222 -Node: Introduction6032 -Node: Installation10725 -Node: Updating from an older release11100 -Node: Installing from an Elpa archive12695 -Node: Installing from the Git repository14034 -Node: Post-installation tasks16830 -Node: Getting started18219 -Node: Interface concepts23954 -Node: Modes and Buffers24228 -Node: Switching Buffers25974 -Node: Naming Buffers29038 -Node: Quitting Windows31873 -Node: Automatic Refreshing of Magit Buffers33505 -Node: Automatic Saving of File-Visiting Buffers36273 -Node: Automatic Reverting of File-Visiting Buffers37458 -Node: Risk of Reverting Automatically42454 -Node: Sections44837 -Node: Section movement45778 -Node: Section visibility49705 -Node: Section hooks53296 -Node: Section types and values55577 -Node: Section options56847 -Node: Popup buffers and prefix commands57319 -Node: Completion and confirmation58633 -Node: Running Git61539 -Node: Viewing Git output61775 -Node: Running Git manually62775 -Node: Git executable64901 -Node: Global Git arguments66908 -Node: Inspecting67715 -Node: Status buffer68842 -Node: Status sections71365 -Node: Status header sections76612 -Node: Status options79171 -Node: Logging79895 -Node: Refreshing logs82424 -Node: Log Buffer83809 -Node: Select from log86898 -Node: Reflog87838 -Node: Diffing88316 -Node: Refreshing diffs91128 -Node: Diff buffer94109 -Node: Diff options96011 -Node: Revision buffer97767 -Node: Ediffing98722 -Node: References buffer102180 -Node: References sections106890 -Node: Bisecting107765 -Node: Visiting blobs109261 -Node: Blaming109770 -Node: Manipulating113090 -Node: Repository setup113382 -Node: Staging and unstaging114422 -Node: Staging from file-visiting buffers118317 -Node: Applying119485 -Node: Committing121128 -Node: Initiating a commit121711 -Node: Editing commit messages125023 -Node: Branching135419 -Node: Merging148233 -Node: Rebasing150317 -Node: Editing rebase sequences153265 -Node: Rebase sequence log156299 -Node: Cherry picking163043 -Node: Reverting164649 -Node: Resetting166012 -Node: Stashing167522 -Node: Transferring170696 -Node: Remotes170934 -Node: Fetching172220 -Node: Pulling173586 -Node: Pushing174432 -Node: Creating and sending patches179176 -Node: Applying patches179871 -Node: Miscellaneous180869 -Node: Tagging181160 -Node: Notes181945 -Node: Submodules184470 -Node: Common commands185790 -Node: Wip modes187538 -Node: Minor mode for buffers visiting files194274 -Node: Minor mode for buffers visiting blobs196768 -Node: Customizing197573 -Node: Per-repository configuration199245 -Node: Essential settings200879 -Node: Safety201203 -Node: Performance203036 -Node: Committing Performance209709 -Node: Plumbing210690 -Node: Calling Git211318 -Node: Getting a value from Git212841 -Node: Calling Git for effect215945 -Node: Section plumbing222449 -Node: Creating sections222677 -Node: Section selection226576 -Node: Matching sections228256 -Node: Refreshing buffers233458 -Node: Conventions236593 -Node: Confirmation and completion236770 -Node: Theming Faces237668 -Node: FAQ245819 -Node: Magit is slow247230 -Node: I changed several thousand files at once and now Magit is unusable247431 -Node: I am having problems committing248147 -Node: Diffs are collapsed after un-/staging248593 -Node: I don't understand how branching and pushing work249864 -Node: I don't like the key binding in v24250239 -Node: I cannot install the pre-requisites for Magit v2250578 -Node: I am using an Emacs release older than v244251043 -Node: I am using a Git release older than v194252656 -Node: I am using MS Windows and cannot push with Magit253643 -Node: How to install the gitman info manual?254224 -Node: How can I show Git's output?256752 -Node: Diffs contain control sequences257539 -Node: Expanding a file to show the diff causes it to disappear258544 -Node: Point is wrong in the COMMIT_EDITMSG buffer259073 -Node: Can Magit be used as ediff-version-control-package?260091 -Node: How to show diffs for gpg-encrypted files?262115 -Node: Emacs 245 hangs when loading Magit262706 -Node: Symbol's value as function is void --some263275 -Node: Where is the branch manager263595 -Node: Keystroke Index263880 -Node: Command Index291671 -Node: Function Index321654 -Node: Variable Index333777 - -End Tag Table - - -Local Variables: -coding: utf-8 -End: diff --git a/elpa/magit-20160421.459/AUTHORS.md b/elpa/magit-20160425.430/AUTHORS.md similarity index 99% rename from elpa/magit-20160421.459/AUTHORS.md rename to elpa/magit-20160425.430/AUTHORS.md index 71b5537..1d345e9 100644 --- a/elpa/magit-20160421.459/AUTHORS.md +++ b/elpa/magit-20160425.430/AUTHORS.md @@ -5,7 +5,7 @@ The following people have contributed to Magit, including the libraries `git-commit.el`, `magit-popup.el`, and `with-editor.el` which are distributed as separate Elpa packages. -For statistics see http://magit.vc/stats/authors.html. +For statistics see https://magit.vc/stats/authors.html. Names below are sorted alphabetically. diff --git a/elpa/magit-20160421.459/COPYING b/elpa/magit-20160425.430/COPYING similarity index 100% rename from elpa/magit-20160421.459/COPYING rename to elpa/magit-20160425.430/COPYING diff --git a/elpa/magit-20160421.459/dir b/elpa/magit-20160425.430/dir similarity index 100% rename from elpa/magit-20160421.459/dir rename to elpa/magit-20160425.430/dir diff --git a/elpa/magit-20160421.459/git-rebase.el b/elpa/magit-20160425.430/git-rebase.el similarity index 100% rename from elpa/magit-20160421.459/git-rebase.el rename to elpa/magit-20160425.430/git-rebase.el diff --git a/elpa/magit-20160421.459/magit-apply.el b/elpa/magit-20160425.430/magit-apply.el similarity index 100% rename from elpa/magit-20160421.459/magit-apply.el rename to elpa/magit-20160425.430/magit-apply.el diff --git a/elpa/magit-20160421.459/magit-autoloads.el b/elpa/magit-20160425.430/magit-autoloads.el similarity index 96% rename from elpa/magit-20160421.459/magit-autoloads.el rename to elpa/magit-20160425.430/magit-autoloads.el index 1e210d4..5b1c309 100644 --- a/elpa/magit-20160421.459/magit-autoloads.el +++ b/elpa/magit-20160425.430/magit-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "git-rebase" "git-rebase.el" (22297 19813 681145 -;;;;;; 600000)) +;;;### (autoloads nil "git-rebase" "git-rebase.el" (22303 19282 518177 +;;;;;; 224000)) ;;; 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" (22297 19815 953104 965000)) +;;;### (autoloads nil "magit" "magit.el" (22303 19282 578177 178000)) ;;; Generated autoloads from magit.el (autoload 'magit-status "magit" "\ @@ -398,6 +398,7 @@ defaulting to the tag at point. \(fn TAGS)" t nil) (autoload 'magit-notes-popup "magit" nil t) + (autoload 'magit-file-popup "magit" nil t) (defvar global-magit-file-mode nil "\ Non-nil if Global-Magit-File mode is enabled. @@ -457,8 +458,8 @@ Git, and Emacs in the echo area. ;;;*** -;;;### (autoloads nil "magit-apply" "magit-apply.el" (22297 19814 -;;;;;; 251135 404000)) +;;;### (autoloads nil "magit-apply" "magit-apply.el" (22303 19282 +;;;;;; 530177 215000)) ;;; Generated autoloads from magit-apply.el (autoload 'magit-stage-file "magit-apply" "\ @@ -494,8 +495,8 @@ Remove all changes from the staging area. ;;;*** -;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22297 -;;;;;; 19812 575165 378000)) +;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22303 +;;;;;; 19282 474177 259000)) ;;; Generated autoloads from magit-autorevert.el (defvar magit-revert-buffers t) @@ -523,8 +524,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode. ;;;*** -;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22297 19814 -;;;;;; 112137 891000)) +;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22303 19282 +;;;;;; 526177 218000)) ;;; Generated autoloads from magit-bisect.el (autoload 'magit-bisect-popup "magit-bisect" nil t) @@ -575,8 +576,8 @@ bisect run'. ;;;*** -;;;### (autoloads nil "magit-blame" "magit-blame.el" (22297 19815 -;;;;;; 594111 386000)) +;;;### (autoloads nil "magit-blame" "magit-blame.el" (22303 19282 +;;;;;; 566177 187000)) ;;; Generated autoloads from magit-blame.el (autoload 'magit-blame-popup "magit-blame" nil t) @@ -600,8 +601,8 @@ only arguments available from `magit-blame-popup' should be used. ;;;*** -;;;### (autoloads nil "magit-commit" "magit-commit.el" (22297 19812 -;;;;;; 710162 964000)) +;;;### (autoloads nil "magit-commit" "magit-commit.el" (22303 19282 +;;;;;; 482177 252000)) ;;; Generated autoloads from magit-commit.el (autoload 'magit-commit "magit-commit" "\ @@ -683,8 +684,8 @@ Create a squash commit targeting COMMIT and instantly rebase. ;;;*** -;;;### (autoloads nil "magit-diff" "magit-diff.el" (22297 19815 500113 -;;;;;; 67000)) +;;;### (autoloads nil "magit-diff" "magit-diff.el" (22303 19282 562177 +;;;;;; 190000)) ;;; Generated autoloads from magit-diff.el (autoload 'magit-diff-dwim "magit-diff" "\ @@ -749,8 +750,8 @@ for a revision. ;;;*** -;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22297 19815 -;;;;;; 231117 878000)) +;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22303 19282 +;;;;;; 554177 196000)) ;;; Generated autoloads from magit-ediff.el (autoload 'magit-ediff-popup "magit-ediff" nil t) @@ -838,8 +839,8 @@ stash that were staged. ;;;*** -;;;### (autoloads nil "magit-extras" "magit-extras.el" (22297 19812 -;;;;;; 849160 478000)) +;;;### (autoloads nil "magit-extras" "magit-extras.el" (22303 19282 +;;;;;; 490177 246000)) ;;; Generated autoloads from magit-extras.el (autoload 'magit-run-git-gui "magit-extras" "\ @@ -909,8 +910,8 @@ on a position in a file-visiting buffer. ;;;*** -;;;### (autoloads nil "magit-log" "magit-log.el" (22297 19815 391115 -;;;;;; 16000)) +;;;### (autoloads nil "magit-log" "magit-log.el" (22303 19282 558177 +;;;;;; 193000)) ;;; Generated autoloads from magit-log.el (autoload 'magit-log-current "magit-log" "\ @@ -978,8 +979,8 @@ Show commits in a branch that are not merged in the upstream branch. ;;;*** -;;;### (autoloads nil "magit-remote" "magit-remote.el" (22297 19816 -;;;;;; 537094 521000)) +;;;### (autoloads nil "magit-remote" "magit-remote.el" (22303 19282 +;;;;;; 594177 165000)) ;;; Generated autoloads from magit-remote.el (autoload 'magit-clone "magit-remote" "\ @@ -1211,8 +1212,8 @@ is asked to pull. START has to be reachable from that commit. ;;;*** -;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22297 -;;;;;; 19816 152101 407000)) +;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22303 +;;;;;; 19282 586177 172000)) ;;; Generated autoloads from magit-sequence.el (autoload 'magit-sequencer-continue "magit-sequence" "\ @@ -1360,8 +1361,8 @@ Abort the current rebase operation, restoring the original branch. ;;;*** -;;;### (autoloads nil "magit-stash" "magit-stash.el" (22297 19814 -;;;;;; 722126 982000)) +;;;### (autoloads nil "magit-stash" "magit-stash.el" (22303 19282 +;;;;;; 546177 202000)) ;;; Generated autoloads from magit-stash.el (autoload 'magit-stash-popup "magit-stash" nil t) @@ -1460,8 +1461,8 @@ Show all diffs of a stash in a buffer. ;;;*** -;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22297 -;;;;;; 19817 180083 21000)) +;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22303 +;;;;;; 19282 606177 156000)) ;;; Generated autoloads from magit-submodule.el (autoload 'magit-submodule-popup "magit-submodule" nil t) @@ -1470,7 +1471,7 @@ Add the repository at URL as a submodule. Optional PATH is the path to the submodule relative to the root of the superproject. If it is nil, then the path is determined -based on URL. +based on the URL. Optional NAME is the name of the submodule. If it is nil, then PATH also becomes the name. @@ -1509,6 +1510,12 @@ Unregister the submodule at PATH. \(fn PATH)" t nil) +(autoload 'magit-insert-submodules "magit-submodule" "\ +Insert sections for all modules. +For each section insert the path and the output of `git describe --tags'. + +\(fn)" nil nil) + (autoload 'magit-insert-modules-unpulled-from-upstream "magit-submodule" "\ Insert sections for modules that haven't been pulled from the upstream. These sections can be expanded to show the respective commits. @@ -1535,8 +1542,8 @@ These sections can be expanded to show the respective commits. ;;;*** -;;;### (autoloads nil "magit-wip" "magit-wip.el" (22297 19813 56156 -;;;;;; 776000)) +;;;### (autoloads nil "magit-wip" "magit-wip.el" (22303 19282 502177 +;;;;;; 236000)) ;;; Generated autoloads from magit-wip.el (defvar magit-wip-after-save-mode nil "\ @@ -1603,7 +1610,7 @@ command which is about to be called are committed. ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el" ;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el") -;;;;;; (22297 19818 84560 140000)) +;;;;;; (22303 19282 617769 719000)) ;;;*** diff --git a/elpa/magit-20160421.459/magit-autorevert.el b/elpa/magit-20160425.430/magit-autorevert.el similarity index 100% rename from elpa/magit-20160421.459/magit-autorevert.el rename to elpa/magit-20160425.430/magit-autorevert.el diff --git a/elpa/magit-20160421.459/magit-bisect.el b/elpa/magit-20160425.430/magit-bisect.el similarity index 100% rename from elpa/magit-20160421.459/magit-bisect.el rename to elpa/magit-20160425.430/magit-bisect.el diff --git a/elpa/magit-20160421.459/magit-blame.el b/elpa/magit-20160425.430/magit-blame.el similarity index 100% rename from elpa/magit-20160421.459/magit-blame.el rename to elpa/magit-20160425.430/magit-blame.el diff --git a/elpa/magit-20160421.459/magit-commit.el b/elpa/magit-20160425.430/magit-commit.el similarity index 100% rename from elpa/magit-20160421.459/magit-commit.el rename to elpa/magit-20160425.430/magit-commit.el diff --git a/elpa/magit-20160421.459/magit-core.el b/elpa/magit-20160425.430/magit-core.el similarity index 100% rename from elpa/magit-20160421.459/magit-core.el rename to elpa/magit-20160425.430/magit-core.el diff --git a/elpa/magit-20160421.459/magit-diff.el b/elpa/magit-20160425.430/magit-diff.el similarity index 100% rename from elpa/magit-20160421.459/magit-diff.el rename to elpa/magit-20160425.430/magit-diff.el diff --git a/elpa/magit-20160421.459/magit-ediff.el b/elpa/magit-20160425.430/magit-ediff.el similarity index 100% rename from elpa/magit-20160421.459/magit-ediff.el rename to elpa/magit-20160425.430/magit-ediff.el diff --git a/elpa/magit-20160421.459/magit-extras.el b/elpa/magit-20160425.430/magit-extras.el similarity index 100% rename from elpa/magit-20160421.459/magit-extras.el rename to elpa/magit-20160425.430/magit-extras.el diff --git a/elpa/magit-20160421.459/magit-git.el b/elpa/magit-20160425.430/magit-git.el similarity index 100% rename from elpa/magit-20160421.459/magit-git.el rename to elpa/magit-20160425.430/magit-git.el diff --git a/elpa/magit-20160421.459/magit-log.el b/elpa/magit-20160425.430/magit-log.el similarity index 99% rename from elpa/magit-20160421.459/magit-log.el rename to elpa/magit-20160425.430/magit-log.el index f9c7729..8c68ef7 100644 --- a/elpa/magit-20160421.459/magit-log.el +++ b/elpa/magit-20160425.430/magit-log.el @@ -1364,10 +1364,11 @@ ahead of the current branch, then show the commits that have not yet been pulled into the current branch. If no upstream is configured or if the upstream is not ahead of the current branch, then show the last `magit-log-section-commit-count' commits." - (if (equal (magit-rev-parse "HEAD") - (magit-rev-parse "@{upstream}")) - (magit-insert-recent-commits t) - (magit-insert-unpulled-from-upstream))) + (let ((upstream (magit-rev-parse "@{upstream}"))) + (if (or (not upstream) + (equal upstream (magit-rev-parse "HEAD"))) + (magit-insert-recent-commits t) + (magit-insert-unpulled-from-upstream)))) ;;;; Auxiliary Log Sections diff --git a/elpa/magit-20160421.459/magit-mode.el b/elpa/magit-20160425.430/magit-mode.el similarity index 100% rename from elpa/magit-20160421.459/magit-mode.el rename to elpa/magit-20160425.430/magit-mode.el diff --git a/elpa/magit-20160421.459/magit-pkg.el b/elpa/magit-20160425.430/magit-pkg.el similarity index 64% rename from elpa/magit-20160421.459/magit-pkg.el rename to elpa/magit-20160425.430/magit-pkg.el index ddd61b5..3284180 100644 --- a/elpa/magit-20160421.459/magit-pkg.el +++ b/elpa/magit-20160425.430/magit-pkg.el @@ -1,10 +1,10 @@ -(define-package "magit" "20160421.459" "A Git porcelain inside Emacs" +(define-package "magit" "20160425.430" "A Git porcelain inside Emacs" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20160408.201") - (git-commit "20160412.130") - (magit-popup "20160408.156")) + (git-commit "20160414.251") + (magit-popup "20160414.251")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc")) ;; Local Variables: diff --git a/elpa/magit-20160421.459/magit-process.el b/elpa/magit-20160425.430/magit-process.el similarity index 100% rename from elpa/magit-20160421.459/magit-process.el rename to elpa/magit-20160425.430/magit-process.el diff --git a/elpa/magit-20160421.459/magit-remote.el b/elpa/magit-20160425.430/magit-remote.el similarity index 100% rename from elpa/magit-20160421.459/magit-remote.el rename to elpa/magit-20160425.430/magit-remote.el diff --git a/elpa/magit-20160421.459/magit-section.el b/elpa/magit-20160425.430/magit-section.el similarity index 100% rename from elpa/magit-20160421.459/magit-section.el rename to elpa/magit-20160425.430/magit-section.el diff --git a/elpa/magit-20160421.459/magit-sequence.el b/elpa/magit-20160425.430/magit-sequence.el similarity index 100% rename from elpa/magit-20160421.459/magit-sequence.el rename to elpa/magit-20160425.430/magit-sequence.el diff --git a/elpa/magit-20160421.459/magit-stash.el b/elpa/magit-20160425.430/magit-stash.el similarity index 100% rename from elpa/magit-20160421.459/magit-stash.el rename to elpa/magit-20160425.430/magit-stash.el diff --git a/elpa/magit-20160421.459/magit-submodule.el b/elpa/magit-20160425.430/magit-submodule.el similarity index 68% rename from elpa/magit-20160421.459/magit-submodule.el rename to elpa/magit-20160425.430/magit-submodule.el index 6e942ce..e83bf10 100644 --- a/elpa/magit-20160421.459/magit-submodule.el +++ b/elpa/magit-20160425.430/magit-submodule.el @@ -46,28 +46,34 @@ Optional PATH is the path to the submodule relative to the root of the superproject. If it is nil, then the path is determined -based on URL. +based on the URL. Optional NAME is the name of the submodule. If it is nil, then PATH also becomes the name." (interactive (magit-with-toplevel - (let ((path (read-file-name - "Add submodule: " nil nil nil - (magit-section-when [file untracked] - (directory-file-name (magit-section-value it)))))) - (when path - (setq path (file-name-as-directory (expand-file-name path))) - (when (member path (list "" default-directory)) - (setq path nil))) + (let ((path (magit-completing-read "Add submodules at path" + (magit-untracked-files) + #'magit-git-repo-p nil nil nil + (magit-section-when [file untracked] + (file-relative-name + (magit-section-value it) + default-directory))))) + (unless path + (user-error "No path selected")) (list (magit-read-string-ns "Remote url" - (and path (magit-git-repo-p path t) - (let ((default-directory path)) - (magit-get "remote" (or (magit-get-remote) "origin") - "url")))) - (and path (directory-file-name (file-relative-name path))) - (magit-read-string-ns "Name submodule" path))))) + (let ((default-directory (file-name-as-directory + (expand-file-name path)))) + (magit-get "remote" (or (magit-get-remote) "origin") "url"))) + (directory-file-name path) + (magit-read-string-ns + "Name submodule" nil nil + (or (--keep (-let [(var val) (split-string it "=")] + (and (equal val path) + (cadr (split-string var "\\.")))) + (magit-git-lines "config" "--list" "-f" ".gitmodules")) + (directory-file-name path))))))) (magit-run-git "submodule" "add" (and name (list "--name" name)) url path)) ;;;###autoload @@ -118,43 +124,61 @@ With a prefix argument fetch all remotes." ;;; Sections +;;;###autoload +(defun magit-insert-submodules () + "Insert sections for all modules. +For each section insert the path and the output of `git describe --tags'." + (-when-let (modules (magit-get-submodules)) + (magit-insert-section (modules nil t) + (magit-insert-heading "Modules:") + (magit-with-toplevel + (dolist (module modules) + (let ((default-directory + (expand-file-name (file-name-as-directory module)))) + (magit-insert-section (file module t) + (insert (format "%-25s " module)) + (let ((beg (point))) + (magit-git-insert "describe" "--tags") + (when (eq (point) beg) + (insert ?\n)))))))))) + ;;;###autoload (defun magit-insert-modules-unpulled-from-upstream () "Insert sections for modules that haven't been pulled from the upstream. These sections can be expanded to show the respective commits." - (magit-insert-submodules "Modules unpulled from @{upstream}" - 'modules-unpulled-from-upstream - 'magit-get-upstream-ref - "HEAD..%s")) + (magit--insert-modules-logs "Modules unpulled from @{upstream}" + 'modules-unpulled-from-upstream + 'magit-get-upstream-ref + "HEAD..%s")) ;;;###autoload (defun magit-insert-modules-unpulled-from-pushremote () "Insert sections for modules that haven't been pulled from the push-remote. These sections can be expanded to show the respective commits." - (magit-insert-submodules "Modules unpulled from " - 'modules-unpulled-from-pushremote - 'magit-get-push-branch - "HEAD..%s")) + (magit--insert-modules-logs "Modules unpulled from " + 'modules-unpulled-from-pushremote + 'magit-get-push-branch + "HEAD..%s")) ;;;###autoload (defun magit-insert-modules-unpushed-to-upstream () "Insert sections for modules that haven't been pushed to the upstream. These sections can be expanded to show the respective commits." - (magit-insert-submodules "Modules unmerged into @{upstream}" - 'modules-unpushed-to-upstream - 'magit-get-upstream-ref - "%s..HEAD")) + (magit--insert-modules-logs "Modules unmerged into @{upstream}" + 'modules-unpushed-to-upstream + 'magit-get-upstream-ref + "%s..HEAD")) ;;;###autoload (defun magit-insert-modules-unpushed-to-pushremote () "Insert sections for modules that haven't been pushed to the push-remote. These sections can be expanded to show the respective commits." - (magit-insert-submodules "Modules unpushed to " - 'modules-unpushed-to-pushremote - 'magit-get-push-branch - "%s..HEAD")) + (magit--insert-modules-logs "Modules unpushed to " + 'modules-unpushed-to-pushremote + 'magit-get-push-branch + "%s..HEAD")) -(defun magit-insert-submodules (heading type fn format) +(defun magit--insert-modules-logs (heading type fn format) "For internal use, don't add to a hook." (-when-let (modules (magit-get-submodules)) (magit-insert-section section ((eval type) nil t) diff --git a/elpa/magit-20160421.459/magit-utils.el b/elpa/magit-20160425.430/magit-utils.el similarity index 100% rename from elpa/magit-20160421.459/magit-utils.el rename to elpa/magit-20160425.430/magit-utils.el diff --git a/elpa/magit-20160421.459/magit-wip.el b/elpa/magit-20160425.430/magit-wip.el similarity index 100% rename from elpa/magit-20160421.459/magit-wip.el rename to elpa/magit-20160425.430/magit-wip.el diff --git a/elpa/magit-20160421.459/magit.el b/elpa/magit-20160425.430/magit.el similarity index 99% rename from elpa/magit-20160421.459/magit.el rename to elpa/magit-20160425.430/magit.el index 2668e91..07c6cc5 100644 --- a/elpa/magit-20160421.459/magit.el +++ b/elpa/magit-20160425.430/magit.el @@ -16,7 +16,7 @@ ;; Rémi Vanicat ;; Yann Hodique -;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20160408.201") (git-commit "20160412.130") (magit-popup "20160408.156")) +;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20160408.201") (git-commit "20160414.251") (magit-popup "20160414.251")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit @@ -2276,6 +2276,7 @@ the current repository." map) "Keymap for `magit-file-mode'.") +;;;###autoload (autoload 'magit-file-popup "magit" nil t) (magit-define-popup magit-file-popup "Popup console for Magit commands in file-visiting buffers." :actions '((?s "Stage" magit-stage-file) diff --git a/elpa/magit-20160425.430/magit.info b/elpa/magit-20160425.430/magit.info new file mode 100644 index 0000000..75f1f65 --- /dev/null +++ b/elpa/magit-20160425.430/magit.info @@ -0,0 +1,166 @@ +This is magit.info, produced by makeinfo version 5.2 from magit.texi. + +Magit is an interface to the version control system Git, implemented as +an Emacs package. Magit aspires to be a complete Git porcelain. While +we cannot (yet) claim that Magit wraps and improves upon each and every +Git command, it is complete enough to allow even experienced Git users +to perform almost all of their daily version control tasks directly from +within Emacs. While many fine Git clients exist, only Magit and Git +itself deserve to be called porcelains. + + Copyright (C) 2015-2016 Jonas Bernoulli + + You can redistribute this document and/or modify it under the terms + of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) + any later version. + + This document is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. +INFO-DIR-SECTION Emacs +START-INFO-DIR-ENTRY +* Magit: (magit). Using Git from Emacs with Magit. +END-INFO-DIR-ENTRY + + +Indirect: +magit.info-1: 1222 +magit.info-2: 323028 + +Tag Table: +(Indirect) +Node: Top1222 +Node: Introduction6180 +Node: Installation10873 +Node: Updating from an older release11248 +Node: Installing from an Elpa archive12843 +Node: Installing from the Git repository14182 +Node: Post-installation tasks16978 +Node: Getting started18367 +Node: Interface concepts24102 +Node: Modes and Buffers24376 +Node: Switching Buffers26122 +Node: Naming Buffers29186 +Node: Quitting Windows32021 +Node: Automatic Refreshing of Magit Buffers33653 +Node: Automatic Saving of File-Visiting Buffers36421 +Node: Automatic Reverting of File-Visiting Buffers37606 +Node: Risk of Reverting Automatically42602 +Node: Sections44985 +Node: Section movement45926 +Node: Section visibility49853 +Node: Section hooks53444 +Node: Section types and values55725 +Node: Section options56995 +Node: Popup buffers and prefix commands57467 +Node: Completion and confirmation58781 +Node: Running Git61687 +Node: Viewing Git output61923 +Node: Running Git manually62923 +Node: Git executable65049 +Node: Global Git arguments67056 +Node: Inspecting67863 +Node: Status buffer68990 +Node: Status sections71513 +Node: Status header sections76922 +Node: Status options79481 +Node: Logging80205 +Node: Refreshing logs82734 +Node: Log Buffer84119 +Node: Select from log87208 +Node: Reflog88148 +Node: Diffing88626 +Node: Refreshing diffs91438 +Node: Diff buffer94419 +Node: Diff options96321 +Node: Revision buffer98077 +Node: Ediffing99032 +Node: References buffer102490 +Node: References sections107200 +Node: Bisecting108075 +Node: Visiting blobs109571 +Node: Blaming110080 +Node: Manipulating113400 +Node: Repository setup113692 +Node: Staging and unstaging114732 +Node: Staging from file-visiting buffers118627 +Node: Applying119795 +Node: Committing121438 +Node: Initiating a commit122021 +Node: Editing commit messages125333 +Node: Branching135729 +Node: Merging148543 +Node: Rebasing150627 +Node: Editing rebase sequences153575 +Node: Rebase sequence log156609 +Node: Cherry picking163353 +Node: Reverting164959 +Node: Resetting166322 +Node: Stashing167832 +Node: Transferring171006 +Node: Remotes171244 +Node: Fetching172530 +Node: Pulling173896 +Node: Pushing174742 +Node: Creating and sending patches179486 +Node: Applying patches180181 +Node: Miscellaneous181179 +Node: Tagging181470 +Node: Notes182255 +Node: Submodules184780 +Node: Common commands186100 +Node: Wip modes187848 +Node: Minor mode for buffers visiting files194584 +Node: Minor mode for buffers visiting blobs197078 +Node: Customizing197883 +Node: Per-repository configuration199555 +Node: Essential settings201189 +Node: Safety201513 +Node: Performance203346 +Node: Plumbing210806 +Node: Calling Git211434 +Node: Getting a value from Git212957 +Node: Calling Git for effect216061 +Node: Section plumbing222565 +Node: Creating sections222793 +Node: Section selection226692 +Node: Matching sections228372 +Node: Refreshing buffers233574 +Node: Conventions236709 +Node: Confirmation and completion236886 +Node: Theming Faces237784 +Node: FAQ245935 +Node: Magit is slow247494 +Node: I changed several thousand files at once and now Magit is unusable247695 +Node: I am having problems committing248411 +Node: Diffs are collapsed after un-/staging248857 +Node: I don't understand how branching and pushing work250335 +Node: I don't like the key binding in v24250710 +Node: I cannot install the pre-requisites for Magit v2251049 +Node: I am using an Emacs release older than v244251514 +Node: I am using a Git release older than v194253127 +Node: I am using MS Windows and cannot push with Magit254114 +Node: I am using OS X and SOMETHING works in shell but not in Magit254718 +Node: How to install the gitman info manual?255509 +Node: How can I show Git's output?258050 +Node: Diffs contain control sequences258837 +Node: Expanding a file to show the diff causes it to disappear259842 +Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer260377 +Node: Can Magit be used as ‘ediff-version-control-package’?261415 +Node: How to show diffs for gpg-encrypted files?263459 +Node: Emacs 245 hangs when loading Magit264056 +Node: ‘Symbol's value as function is void --some’264631 +Node: Where is the branch manager264963 +Node: Keystroke Index265254 +Node: Command Index293045 +Node: Function Index323028 +Node: Variable Index335224 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/magit-20160421.459/magit.info-1 b/elpa/magit-20160425.430/magit.info-1 similarity index 98% rename from elpa/magit-20160421.459/magit.info-1 rename to elpa/magit-20160425.430/magit.info-1 index 5318474..71e27ad 100644 --- a/elpa/magit-20160421.459/magit.info-1 +++ b/elpa/magit-20160425.430/magit.info-1 @@ -266,15 +266,16 @@ FAQ * I am using an Emacs release older than v24.4: I am using an Emacs release older than v244. * I am using a Git release older than v1.9.4: I am using a Git release older than v194. * I am using MS Windows and cannot push with Magit:: +* I am using OS X and SOMETHING works in shell, but not in Magit: I am using OS X and SOMETHING works in shell but not in Magit. * How to install the gitman info manual?:: * How can I show Git's output?:: * Diffs contain control sequences:: * Expanding a file to show the diff causes it to disappear:: -* Point is wrong in the COMMIT_EDITMSG buffer:: -* Can Magit be used as ediff-version-control-package?:: +* Point is wrong in the ‘COMMIT_EDITMSG’ buffer:: +* Can Magit be used as ‘ediff-version-control-package’?:: * How to show diffs for gpg-encrypted files?:: * Emacs 24.5 hangs when loading Magit: Emacs 245 hangs when loading Magit. -* Symbol's value as function is void --some:: +* ‘Symbol's value as function is void --some’:: * Where is the branch manager::  @@ -1986,6 +1987,11 @@ default the following functions are also members of that hook: push-remote yet. These sections can be expanded to show the respective commits. + -- Function: magit-insert-submodules + + Insert sections for all modules. For each section insert the path + and the output of ‘git describe --tags’. + -- Function: magit-insert-unpulled-cherries Insert section showing unpulled commits. Like @@ -5545,10 +5551,6 @@ repositories, then you might want to disable certain features on a per-repository or per-repository-class basis only. See *note Per-repository configuration: Per-repository configuration. -* Menu: - -* Committing Performance:: - Microsoft Windows Performance ............................. @@ -5564,13 +5566,11 @@ of "Git for Windows" try to reduce their effect, and in order to benefit from the latest performance tweaks, should always use the latest release. Magit too tries to work around some Windows-specific issues. - But all these efforts might not be enough, forcing users to make some -changes themselves. For example, according to -, setting the following Git -variables might also help: + According to some sources setting the following Git variables can +also help. - git config --global core.preloadindex true - git config --global core.fscache true + git config --global core.preloadindex true # default since v2.1 + git config --global core.fscache true # default since v2.8 git config --global gc.auto 256 You should also check whether an anti-virus program is slowing things @@ -5638,9 +5638,6 @@ tags, then start by not displaying them: actually all exist. You can do so by pruning branches which no longer exist using ‘f-pa’. - -File: magit.info, Node: Committing Performance, Up: Performance - Committing Performance ...................... @@ -6479,15 +6476,16 @@ made it into the manual yet, see * I am using an Emacs release older than v24.4: I am using an Emacs release older than v244. * I am using a Git release older than v1.9.4: I am using a Git release older than v194. * I am using MS Windows and cannot push with Magit:: +* I am using OS X and SOMETHING works in shell, but not in Magit: I am using OS X and SOMETHING works in shell but not in Magit. * How to install the gitman info manual?:: * How can I show Git's output?:: * Diffs contain control sequences:: * Expanding a file to show the diff causes it to disappear:: -* Point is wrong in the COMMIT_EDITMSG buffer:: -* Can Magit be used as ediff-version-control-package?:: +* Point is wrong in the ‘COMMIT_EDITMSG’ buffer:: +* Can Magit be used as ‘ediff-version-control-package’?:: * How to show diffs for gpg-encrypted files?:: * Emacs 24.5 hangs when loading Magit: Emacs 245 hangs when loading Magit. -* Symbol's value as function is void --some:: +* ‘Symbol's value as function is void --some’:: * Where is the branch manager::  @@ -6528,7 +6526,11 @@ File: magit.info, Node: Diffs are collapsed after un-/staging, Next: I don't u A.4 Diffs are collapsed after un-/staging ========================================= -Currently when one part of a Magit buffer has to be updated the whole +This typically happens on Windows and/or large repositories where +preparing diffs takes longer than ‘magit-diff-expansion-threshold’. The +default is one second, try increasing it to a larger value. + + Currently when one part of a Magit buffer has to be updated the whole buffer is recreated from scratch. That obviously isn’t good for performance and will be fixed eventually. Meanwhile we need a kludge that prevents the update from taking very long under certain @@ -6630,7 +6632,7 @@ instructions for the release you are actually installing. is available from .  -File: magit.info, Node: I am using MS Windows and cannot push with Magit, Next: How to install the gitman info manual?, Prev: I am using a Git release older than v194, Up: FAQ +File: magit.info, Node: I am using MS Windows and cannot push with Magit, Next: I am using OS X and SOMETHING works in shell but not in Magit, Prev: I am using a Git release older than v194, Up: FAQ A.10 I am using MS Windows and cannot push with Magit ===================================================== @@ -6643,9 +6645,24 @@ push on the command line. .  -File: magit.info, Node: How to install the gitman info manual?, Next: How can I show Git's output?, Prev: I am using MS Windows and cannot push with Magit, Up: FAQ +File: magit.info, Node: I am using OS X and SOMETHING works in shell but not in Magit, Next: How to install the gitman info manual?, Prev: I am using MS Windows and cannot push with Magit, Up: FAQ -A.11 How to install the gitman info manual? +A.11 I am using OS X and SOMETHING works in shell, but not in Magit +=================================================================== + +This usually occurs because Emacs doesn’t have the same environment +variables as your shell. Try installing and configuring +. By default it +synchronizes ‘$PATH’, which helps Magit find the same ‘git’ as the one +you are using on the shell. + + If SOMETHING is "passphrase caching with gpg-agent for commit and/or +tag signing", then you’ll also need to synchronize ‘$GPG_AGENT_INFO’. + + +File: magit.info, Node: How to install the gitman info manual?, Next: How can I show Git's output?, Prev: I am using OS X and SOMETHING works in shell but not in Magit, Up: FAQ + +A.12 How to install the gitman info manual? =========================================== Git’s manpages can be exported as an info manual called ‘gitman’. @@ -6700,7 +6717,7 @@ just one of many issues.)  File: magit.info, Node: How can I show Git's output?, Next: Diffs contain control sequences, Prev: How to install the gitman info manual?, Up: FAQ -A.12 How can I show Git’s output? +A.13 How can I show Git’s output? ================================= To show the output of recently run git commands, press ‘$’ (or, if that @@ -6717,7 +6734,7 @@ For debugging purposes it’s possible to do so anyway by setting  File: magit.info, Node: Diffs contain control sequences, Next: Expanding a file to show the diff causes it to disappear, Prev: How can I show Git's output?, Up: FAQ -A.13 Diffs contain control sequences +A.14 Diffs contain control sequences ==================================== This happens when you configure Git to always color diffs and/or all of @@ -6737,9 +6754,9 @@ then you can override these settings just for Magit by using: "-c" "color.diff=false")))  -File: magit.info, Node: Expanding a file to show the diff causes it to disappear, Next: Point is wrong in the COMMIT_EDITMSG buffer, Prev: Diffs contain control sequences, Up: FAQ +File: magit.info, Node: Expanding a file to show the diff causes it to disappear, Next: Point is wrong in the ‘COMMIT_EDITMSG’ buffer, Prev: Diffs contain control sequences, Up: FAQ -A.14 Expanding a file to show the diff causes it to disappear +A.15 Expanding a file to show the diff causes it to disappear ============================================================= This is probably caused by a change of a ‘diff.*’ Git variable. You @@ -6747,10 +6764,10 @@ probably set that variable for a reason, and should therefore only undo that setting in Magit by customizing ‘magit-git-global-arguments’.  -File: magit.info, Node: Point is wrong in the COMMIT_EDITMSG buffer, Next: Can Magit be used as ediff-version-control-package?, Prev: Expanding a file to show the diff causes it to disappear, Up: FAQ +File: magit.info, Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer, Next: Can Magit be used as ‘ediff-version-control-package’?, Prev: Expanding a file to show the diff causes it to disappear, Up: FAQ -A.15 Point is wrong in the COMMIT_EDITMSG buffer -================================================ +A.16 Point is wrong in the ‘COMMIT_EDITMSG’ buffer +================================================== Neither Magit nor ‘git-commit‘ fiddle with point in the buffer used to write commit messages, so something else must be doing it. @@ -6771,10 +6788,10 @@ help: (pointback-mode -1))))  -File: magit.info, Node: Can Magit be used as ediff-version-control-package?, Next: How to show diffs for gpg-encrypted files?, Prev: Point is wrong in the COMMIT_EDITMSG buffer, Up: FAQ +File: magit.info, Node: Can Magit be used as ‘ediff-version-control-package’?, Next: How to show diffs for gpg-encrypted files?, Prev: Point is wrong in the ‘COMMIT_EDITMSG’ buffer, Up: FAQ -A.16 Can Magit be used as ediff-version-control-package? -======================================================== +A.17 Can Magit be used as ‘ediff-version-control-package’? +========================================================== No, it cannot. For that to work the functions ‘ediff-magit-internal’ and ‘ediff-magit-merge-internal’ would have to be implemented, and they @@ -6806,9 +6823,9 @@ Instead we provide the more useful command ‘magit-ediff-resolve’ which only shows yet-to-be resolved conflicts.  -File: magit.info, Node: How to show diffs for gpg-encrypted files?, Next: Emacs 245 hangs when loading Magit, Prev: Can Magit be used as ediff-version-control-package?, Up: FAQ +File: magit.info, Node: How to show diffs for gpg-encrypted files?, Next: Emacs 245 hangs when loading Magit, Prev: Can Magit be used as ‘ediff-version-control-package’?, Up: FAQ -A.17 How to show diffs for gpg-encrypted files? +A.18 How to show diffs for gpg-encrypted files? =============================================== Git supports showing diffs for encrypted files, but has to be told to do @@ -6819,9 +6836,9 @@ affects the diffs displayed inside Magit. echo "*.gpg filter=gpg diff=gpg" > .gitattributes  -File: magit.info, Node: Emacs 245 hangs when loading Magit, Next: Symbol's value as function is void --some, Prev: How to show diffs for gpg-encrypted files?, Up: FAQ +File: magit.info, Node: Emacs 245 hangs when loading Magit, Next: ‘Symbol's value as function is void --some’, Prev: How to show diffs for gpg-encrypted files?, Up: FAQ -A.18 Emacs 24.5 hangs when loading Magit +A.19 Emacs 24.5 hangs when loading Magit ======================================== This is actually triggered by loading Tramp. See @@ -6831,17 +6848,17 @@ can work around the problem by setting Google’s ‘8.8.8.8’) may also be sufficient to work around the issue.  -File: magit.info, Node: Symbol's value as function is void --some, Next: Where is the branch manager, Prev: Emacs 245 hangs when loading Magit, Up: FAQ +File: magit.info, Node: ‘Symbol's value as function is void --some’, Next: Where is the branch manager, Prev: Emacs 245 hangs when loading Magit, Up: FAQ -A.19 Symbol’s value as function is void –some -============================================= +A.20 ‘Symbol's value as function is void --some’ +================================================ Update ‘dash’, restart Emacs, and then it will be defined.  -File: magit.info, Node: Where is the branch manager, Prev: Symbol's value as function is void --some, Up: FAQ +File: magit.info, Node: Where is the branch manager, Prev: ‘Symbol's value as function is void --some’, Up: FAQ -A.20 Where is the branch manager +A.21 Where is the branch manager ================================ ‘y’ is bound to the command that shows the "refs buffer", the successor diff --git a/elpa/magit-20160421.459/magit.info-2 b/elpa/magit-20160425.430/magit.info-2 similarity index 99% rename from elpa/magit-20160421.459/magit.info-2 rename to elpa/magit-20160425.430/magit.info-2 index 7b78ff2..8c8e2ef 100644 Binary files a/elpa/magit-20160421.459/magit.info-2 and b/elpa/magit-20160425.430/magit.info-2 differ diff --git a/elpa/magit-popup-20160414.251/dir b/elpa/magit-popup-20160425.430/dir similarity index 100% rename from elpa/magit-popup-20160414.251/dir rename to elpa/magit-popup-20160425.430/dir diff --git a/elpa/magit-popup-20160414.251/magit-popup-autoloads.el b/elpa/magit-popup-20160425.430/magit-popup-autoloads.el similarity index 90% rename from elpa/magit-popup-20160414.251/magit-popup-autoloads.el rename to elpa/magit-popup-20160425.430/magit-popup-autoloads.el index e1c2c52..804b67f 100644 --- a/elpa/magit-popup-20160414.251/magit-popup-autoloads.el +++ b/elpa/magit-popup-20160425.430/magit-popup-autoloads.el @@ -4,7 +4,7 @@ (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) ;;;### (autoloads nil nil ("magit-popup-pkg.el" "magit-popup.el") -;;;;;; (22297 19803 512290 263000)) +;;;;;; (22303 19280 862120 891000)) ;;;*** diff --git a/elpa/magit-popup-20160414.251/magit-popup-pkg.el b/elpa/magit-popup-20160425.430/magit-popup-pkg.el similarity index 77% rename from elpa/magit-popup-20160414.251/magit-popup-pkg.el rename to elpa/magit-popup-20160425.430/magit-popup-pkg.el index f26a531..a2a86cd 100644 --- a/elpa/magit-popup-20160414.251/magit-popup-pkg.el +++ b/elpa/magit-popup-20160425.430/magit-popup-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit-popup" "20160414.251" "Define prefix-infix-suffix command combos" +(define-package "magit-popup" "20160425.430" "Define prefix-infix-suffix command combos" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113")) diff --git a/elpa/magit-popup-20160414.251/magit-popup.el b/elpa/magit-popup-20160425.430/magit-popup.el similarity index 100% rename from elpa/magit-popup-20160414.251/magit-popup.el rename to elpa/magit-popup-20160425.430/magit-popup.el diff --git a/elpa/magit-popup-20160414.251/magit-popup.info b/elpa/magit-popup-20160425.430/magit-popup.info similarity index 100% rename from elpa/magit-popup-20160414.251/magit-popup.info rename to elpa/magit-popup-20160425.430/magit-popup.info diff --git a/elpa/nyan-mode-20151017.2235/img/nyan-frame-1.xpm b/elpa/nyan-mode-20160425.1737/img/nyan-frame-1.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan-frame-1.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan-frame-1.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/nyan-frame-2.xpm b/elpa/nyan-mode-20160425.1737/img/nyan-frame-2.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan-frame-2.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan-frame-2.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/nyan-frame-3.xpm b/elpa/nyan-mode-20160425.1737/img/nyan-frame-3.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan-frame-3.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan-frame-3.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/nyan-frame-4.xpm b/elpa/nyan-mode-20160425.1737/img/nyan-frame-4.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan-frame-4.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan-frame-4.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/nyan-frame-5.xpm b/elpa/nyan-mode-20160425.1737/img/nyan-frame-5.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan-frame-5.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan-frame-5.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/nyan-frame-6.xpm b/elpa/nyan-mode-20160425.1737/img/nyan-frame-6.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan-frame-6.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan-frame-6.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/nyan.xpm b/elpa/nyan-mode-20160425.1737/img/nyan.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/nyan.xpm rename to elpa/nyan-mode-20160425.1737/img/nyan.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/outerspace.xpm b/elpa/nyan-mode-20160425.1737/img/outerspace.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/outerspace.xpm rename to elpa/nyan-mode-20160425.1737/img/outerspace.xpm diff --git a/elpa/nyan-mode-20151017.2235/img/rainbow.xpm b/elpa/nyan-mode-20160425.1737/img/rainbow.xpm similarity index 100% rename from elpa/nyan-mode-20151017.2235/img/rainbow.xpm rename to elpa/nyan-mode-20160425.1737/img/rainbow.xpm diff --git a/elpa/nyan-mode-20151017.2235/mus/nyanlooped.mp3 b/elpa/nyan-mode-20160425.1737/mus/nyanlooped.mp3 similarity index 100% rename from elpa/nyan-mode-20151017.2235/mus/nyanlooped.mp3 rename to elpa/nyan-mode-20160425.1737/mus/nyanlooped.mp3 diff --git a/elpa/nyan-mode-20151017.2235/nyan-mode-autoloads.el b/elpa/nyan-mode-20160425.1737/nyan-mode-autoloads.el similarity index 85% rename from elpa/nyan-mode-20151017.2235/nyan-mode-autoloads.el rename to elpa/nyan-mode-20160425.1737/nyan-mode-autoloads.el index 254acf3..bb9250e 100644 --- a/elpa/nyan-mode-20151017.2235/nyan-mode-autoloads.el +++ b/elpa/nyan-mode-20160425.1737/nyan-mode-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "nyan-mode" "nyan-mode.el" (22297 20817 530162 -;;;;;; 506000)) +;;;### (autoloads nil "nyan-mode" "nyan-mode.el" (22303 19279 998179 +;;;;;; 176000)) ;;; Generated autoloads from nyan-mode.el (defvar nyan-mode nil "\ @@ -27,8 +27,8 @@ option `scroll-bar-mode'. ;;;*** -;;;### (autoloads nil nil ("nyan-mode-pkg.el") (22297 20818 37579 -;;;;;; 311000)) +;;;### (autoloads nil nil ("nyan-mode-pkg.el") (22303 19280 74749 +;;;;;; 222000)) ;;;*** diff --git a/elpa/nyan-mode-20151017.2235/nyan-mode-pkg.el b/elpa/nyan-mode-20160425.1737/nyan-mode-pkg.el similarity index 51% rename from elpa/nyan-mode-20151017.2235/nyan-mode-pkg.el rename to elpa/nyan-mode-20160425.1737/nyan-mode-pkg.el index 87dc808..c2bfa3e 100644 --- a/elpa/nyan-mode-20151017.2235/nyan-mode-pkg.el +++ b/elpa/nyan-mode-20160425.1737/nyan-mode-pkg.el @@ -1,5 +1,5 @@ -(define-package "nyan-mode" "20151017.2235" "Nyan Cat shows position in current buffer in mode-line." 'nil :url "https://github.com/TeMPOraL/nyan-mode/" :keywords - '("nyan" "cat" "lulz" "pop tart cat" "build something amazing")) +(define-package "nyan-mode" "20160425.1737" "Nyan Cat shows position in current buffer in mode-line." 'nil :url "https://github.com/TeMPOraL/nyan-mode/" :keywords + '("nyan" "cat" "lulz" "scrolling" "pop tart cat" "build something amazing")) ;; Local Variables: ;; no-byte-compile: t ;; End: diff --git a/elpa/nyan-mode-20151017.2235/nyan-mode.el b/elpa/nyan-mode-20160425.1737/nyan-mode.el similarity index 53% rename from elpa/nyan-mode-20151017.2235/nyan-mode.el rename to elpa/nyan-mode-20160425.1737/nyan-mode.el index abe6816..418e3ff 100644 --- a/elpa/nyan-mode-20151017.2235/nyan-mode.el +++ b/elpa/nyan-mode-20160425.1737/nyan-mode.el @@ -1,246 +1,291 @@ -;;; nyan-mode.el --- Nyan Cat shows position in current buffer in mode-line. - -;; Nyanyanyanyanyanyanya! - -;; Author: Jacek "TeMPOraL" Zlydach -;; URL: https://github.com/TeMPOraL/nyan-mode/ -;; Version: 1.0.0 -;; Keywords: nyan, cat, lulz, pop tart cat, build something amazing - -;; This file is not part of GNU Emacs. - -;; ...yet. ;). - -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 3, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth -;; Floor, Boston, MA 02110-1301, USA. - -;;; Commentary: - -;; To activate, just load and put `(nyan-mode 1)' in your init file. - -;; Contributions and feature requests welcome! - -;; Inspired by (and in few places copied from) sml-modeline.el, -;; written by Lennart Borgman -;; See: http://bazaar.launchpad.net/~nxhtml/nxhtml/main/annotate/head%3A/util/sml-modeline.el - -;;; History: - -;; Started as a totally random idea back in August 2011. - -;; The homepage at http://nyan-mode.buildsomethingamazing.com died somewhen in 2014/2015 because reasons. -;; I might get the domain back one day. - -;;; Code: -(defgroup nyan nil - "Customization group for `nyan-mode'." - :group 'frames) - -(defun nyan-refresh () - "Refresh after option changes if loaded." - (when (featurep 'nyan-mode) - (when (and (boundp 'nyan-mode) - nyan-mode) - (nyan-mode -1) - (nyan-mode 1)))) - -(defcustom nyan-animation-frame-interval 0.2 - "Number of seconds between animation frames." - :set (lambda (sym val) - (set-default sym val) - (nyan-refresh)) - :group 'nyan) - -(defvar nyan-animation-timer nil) - -(defun nyan-start-animation () - (interactive) - (when (not (and nyan-animate-nyancat - nyan-animation-timer)) - (setq nyan-animation-timer (run-at-time "1 sec" - nyan-animation-frame-interval - 'nyan-swich-anim-frame)) - (setq nyan-animate-nyancat t))) - -(defun nyan-stop-animation () - (interactive) - (when (and nyan-animate-nyancat - nyan-animation-timer) - (cancel-timer nyan-animation-timer) - (setq nyan-animation-timer nil) - (setq nyan-animate-nyancat nil))) - -;; mplayer needs to be installed for that -(defun nyan-start-music () - (interactive) - (start-process-shell-command "nyan-music" "nyan-music" (concat "mplayer " +nyan-music+ " -loop 0"))) - -(defun nyan-stop-music () - (interactive) - (kill-process "nyan-music")) - -;;; FIXME bug, doesn't work for antoszka. -(defcustom nyan-wavy-trail nil - "If enabled, Nyan Cat's rainbow trail will be wavy." - :type '(choice (const :tag "Enabled" t) - (const :tag "Disabled" nil)) - :set (lambda (sym val) - (set-default sym val) - (nyan-refresh)) - :group 'nyan) - -(defcustom nyan-bar-length 32 - "Length of Nyan Cat bar in units; each unit is equal to an 8px - image. Minimum of 3 units are required for Nyan Cat." - :set (lambda (sym val) - (set-default sym val) - (nyan-refresh)) - :group 'nyan) - -(defcustom nyan-animate-nyancat nil - "Enable animation for Nyan Cat. -This can be t or nil." - :type '(choice (const :tag "Enabled" t) - (const :tag "Disabled" nil)) - :set (lambda (sym val) - (set-default sym val) - (if val - (nyan-start-animation) - (nyan-stop-animation)) - (nyan-refresh)) - :group 'nyan) - -(defcustom nyan-cat-face-number 1 - "Select cat face number for console." - ) - -(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name))) - -(defconst +nyan-cat-size+ 3) - -(defconst +nyan-cat-image+ (concat +nyan-directory+ "img/nyan.xpm")) -(defconst +nyan-rainbow-image+ (concat +nyan-directory+ "img/rainbow.xpm")) -(defconst +nyan-outerspace-image+ (concat +nyan-directory+ "img/outerspace.xpm")) - -(defconst +nyan-music+ (concat +nyan-directory+ "mus/nyanlooped.mp3")) - -;;; Load images of Nyan Cat an it's rainbow. -(defvar nyan-cat-image (if (image-type-available-p 'xpm) - (create-image +nyan-cat-image+ 'xpm nil :ascent 'center))) - -(defvar nyan-animation-frames (if (image-type-available-p 'xpm) - (mapcar (lambda (id) - (create-image (concat +nyan-directory+ (format "img/nyan-frame-%d.xpm" id)) - 'xpm nil :ascent 95)) - '(1 2 3 4 5 6)))) -(defvar nyan-current-frame 0) - -(defconst +nyan-catface+ [ - ["[]*" "[]#"] - ["(*^ｰﾟ)" "( ^ｰ^)" "(^ｰ^ )" "(ﾟｰ^*)"] - ["(´ω｀三 )" "( ´ω三｀ )" "( ´三ω｀ )" "( 三´ω｀)" - "( 三´ω｀)" "( ´三ω｀ )" "( ´ω三｀ )" "(´ω｀三 )"] - ["(´д｀;)" "( ´д`;)" "( ;´д`)" "(;´д` )"] - ["(」・ω・)」" "(／・ω・)／" "(」・ω・)」" "(／・ω・)／" - "(」・ω・)」" "(／・ω・)／" "(」・ω・)」" "＼(・ω・)／"] - ["(＞ワ＜三　　　)" "(　＞ワ三＜　　)" - "(　　＞三ワ＜　)" "(　　　三＞ワ＜)" - "(　　＞三ワ＜　)" "(　＞ワ三＜　　)"]]) - -(defun nyan-swich-anim-frame () - (setq nyan-current-frame (% (+ 1 nyan-current-frame) 6)) - (redraw-modeline)) - -(defun nyan-get-anim-frame () - (if nyan-animate-nyancat - (nth nyan-current-frame nyan-animation-frames) - nyan-cat-image)) - -(defun nyan-wavy-rainbow-ascent (number) - (if nyan-animate-nyancat - (min 100 (+ 90 - (* 3 (abs (- (/ 6 2) - (% (+ number nyan-current-frame) - 6)))))) - (if (zerop (% number 2)) 80 'center))) - -(defun nyan-number-of-rainbows () - (round (/ (* (round (* 100 - (/ (- (float (point)) - (float (point-min))) - (float (point-max))))) - (- nyan-bar-length +nyan-cat-size+)) - 100))) - -(defun nyan-catface () (aref +nyan-catface+ nyan-cat-face-number)) - -(defun nyan-catface-index () - (min (round (/ (* (round (* 100 - (/ (- (float (point)) - (float (point-min))) - (float (point-max))))) - (length (nyan-catface))) - 100)) (- (length (nyan-catface)) 1))) - -(defun nyan-create () - (let* ((rainbows (nyan-number-of-rainbows)) - (outerspaces (- nyan-bar-length rainbows +nyan-cat-size+)) - (rainbow-string "") - (xpm-support (image-type-available-p 'xpm)) - (nyancat-string (propertize - (aref (nyan-catface) (nyan-catface-index)) - 'display (nyan-get-anim-frame))) - (outerspace-string "")) - (dotimes (number rainbows) - (setq rainbow-string (concat rainbow-string - (if xpm-support - (propertize "|" - 'display (create-image +nyan-rainbow-image+ 'xpm nil :ascent (or (and nyan-wavy-trail - (nyan-wavy-rainbow-ascent number)) - (if nyan-animate-nyancat 95 'center)))) - "|")))) - (dotimes (number outerspaces) - (setq outerspace-string (concat outerspace-string - (if xpm-support - (propertize "-" - 'display (create-image +nyan-outerspace-image+ 'xpm nil :ascent (if nyan-animate-nyancat 95 'center))) - "-")))) - ;; Compute Nyan Cat string. - (concat rainbow-string - nyancat-string - outerspace-string))) - -(defvar nyan-old-car-mode-line-position nil) - -;;;###autoload -(define-minor-mode nyan-mode - "Use NyanCat to show buffer size and position in mode-line. -You can customize this minor mode, see option `nyan-mode'. - -Note: If you turn this mode on then you probably want to turn off -option `scroll-bar-mode'." - :global t - :group 'nyan - (if nyan-mode - (progn - (unless nyan-old-car-mode-line-position - (setq nyan-old-car-mode-line-position (car mode-line-position))) - (setcar mode-line-position '(:eval (list (nyan-create))))) - (setcar mode-line-position nyan-old-car-mode-line-position))) - - -(provide 'nyan-mode) - -;;; nyan-mode.el ends here +;;; nyan-mode.el --- Nyan Cat shows position in current buffer in mode-line. + +;; Nyanyanyanyanyanyanya! + +;; Author: Jacek "TeMPOraL" Zlydach +;; URL: https://github.com/TeMPOraL/nyan-mode/ +;; Version: 1.1.0 +;; Keywords: nyan, cat, lulz, scrolling, pop tart cat, build something amazing + +;; This file is not part of GNU Emacs. + +;; ...yet. ;). + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 3, or +;; (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth +;; Floor, Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; NEW! You can now click on the rainbow (or the empty space) +;; to scroll your buffer! + +;; NEW! You can now customize the minimum window width +;; below which the nyan-mode will be disabled, so that more important +;; information can be shown in the modeline. + +;; To activate, just load and put `(nyan-mode 1)' in your init file. + +;; Contributions and feature requests welcome! + +;; Inspired by (and in few places copied from) sml-modeline.el written by Lennart Borgman. +;; See: http://bazaar.launchpad.net/~nxhtml/nxhtml/main/annotate/head%3A/util/sml-modeline.el + +;;; History: + +;; 2016-04-26 - introduced click-to-scroll feature. + +;; Started as a totally random idea back in August 2011. + +;; The homepage at http://nyan-mode.buildsomethingamazing.com died somewhen in 2014/2015 because reasons. +;; I might get the domain back one day. + +;;; Code: + +(eval-when-compile (require 'cl)) + +(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name))) + +(defconst +nyan-cat-size+ 3) + +(defconst +nyan-cat-image+ (concat +nyan-directory+ "img/nyan.xpm")) +(defconst +nyan-rainbow-image+ (concat +nyan-directory+ "img/rainbow.xpm")) +(defconst +nyan-outerspace-image+ (concat +nyan-directory+ "img/outerspace.xpm")) + +(defconst +nyan-music+ (concat +nyan-directory+ "mus/nyanlooped.mp3")) + +(defconst +nyan-modeline-help-string+ "Nyanyanya!\nmouse-1: Scroll buffer position") + +(defvar nyan-old-car-mode-line-position nil) + +(defgroup nyan nil + "Customization group for `nyan-mode'." + :group 'frames) + +(defun nyan-refresh () + "Refresh after option changes if loaded." + (when (featurep 'nyan-mode) + (when (and (boundp 'nyan-mode) + nyan-mode) + (nyan-mode -1) + (nyan-mode 1)))) + +(defcustom nyan-animation-frame-interval 0.2 + "Number of seconds between animation frames." + :set (lambda (sym val) + (set-default sym val) + (nyan-refresh)) + :group 'nyan) + +(defvar nyan-animation-timer nil) + +(defun nyan-start-animation () + (interactive) + (when (not (and nyan-animate-nyancat + nyan-animation-timer)) + (setq nyan-animation-timer (run-at-time "1 sec" + nyan-animation-frame-interval + 'nyan-swich-anim-frame)) + (setq nyan-animate-nyancat t))) + +(defun nyan-stop-animation () + (interactive) + (when (and nyan-animate-nyancat + nyan-animation-timer) + (cancel-timer nyan-animation-timer) + (setq nyan-animation-timer nil) + (setq nyan-animate-nyancat nil))) + +;; mplayer needs to be installed for that +(defvar nyan-music-process nil) + +(defun nyan-start-music () + (interactive) + (unless nyan-music-process + (setq nyan-music-process (start-process-shell-command "nyan-music" "nyan-music" (concat "mplayer " +nyan-music+ " -loop 0"))))) + +(defun nyan-stop-music () + (interactive) + (when nyan-music-process + (delete-process nyan-music-process) + (setq nyan-music-process nil))) + +(defcustom nyan-minimum-window-width 64 + "Determines the minimum width of the window, below which nyan-mode will not be displayed. +This is important because nyan-mode will push out all informations from small windows." + :set (lambda (sym val) + (set-default sym val) + (nyan-refresh)) + :group 'nyan) + +;;; FIXME bug, doesn't work for antoszka. +(defcustom nyan-wavy-trail nil + "If enabled, Nyan Cat's rainbow trail will be wavy." + :type '(choice (const :tag "Enabled" t) + (const :tag "Disabled" nil)) + :set (lambda (sym val) + (set-default sym val) + (nyan-refresh)) + :group 'nyan) + +(defcustom nyan-bar-length 32 + "Length of Nyan Cat bar in units; each unit is equal to an 8px + image. Minimum of 3 units are required for Nyan Cat." + :set (lambda (sym val) + (set-default sym val) + (nyan-refresh)) + :group 'nyan) + +(defcustom nyan-animate-nyancat nil + "Enable animation for Nyan Cat. +This can be t or nil." + :type '(choice (const :tag "Enabled" t) + (const :tag "Disabled" nil)) + :set (lambda (sym val) + (set-default sym val) + (if val + (nyan-start-animation) + (nyan-stop-animation)) + (nyan-refresh)) + :group 'nyan) + +(defcustom nyan-cat-face-number 1 + "Select cat face number for console." + ) + +;;; Load images of Nyan Cat an it's rainbow. +(defvar nyan-cat-image (if (image-type-available-p 'xpm) + (create-image +nyan-cat-image+ 'xpm nil :ascent 'center))) + +(defvar nyan-animation-frames (if (image-type-available-p 'xpm) + (mapcar (lambda (id) + (create-image (concat +nyan-directory+ (format "img/nyan-frame-%d.xpm" id)) + 'xpm nil :ascent 95)) + '(1 2 3 4 5 6)))) +(defvar nyan-current-frame 0) + +(defconst +nyan-catface+ [ + ["[]*" "[]#"] + ["(*^ｰﾟ)" "( ^ｰ^)" "(^ｰ^ )" "(ﾟｰ^*)"] + ["(´ω｀三 )" "( ´ω三｀ )" "( ´三ω｀ )" "( 三´ω｀)" + "( 三´ω｀)" "( ´三ω｀ )" "( ´ω三｀ )" "(´ω｀三 )"] + ["(´д｀;)" "( ´д`;)" "( ;´д`)" "(;´д` )"] + ["(」・ω・)」" "(／・ω・)／" "(」・ω・)」" "(／・ω・)／" + "(」・ω・)」" "(／・ω・)／" "(」・ω・)」" "＼(・ω・)／"] + ["(＞ワ＜三　　　)" "(　＞ワ三＜　　)" + "(　　＞三ワ＜　)" "(　　　三＞ワ＜)" + "(　　＞三ワ＜　)" "(　＞ワ三＜　　)"]]) + + +(defun nyan-swich-anim-frame () + (setq nyan-current-frame (% (+ 1 nyan-current-frame) 6)) + (redraw-modeline)) + +(defun nyan-get-anim-frame () + (if nyan-animate-nyancat + (nth nyan-current-frame nyan-animation-frames) + nyan-cat-image)) + +(defun nyan-wavy-rainbow-ascent (number) + (if nyan-animate-nyancat + (min 100 (+ 90 + (* 3 (abs (- (/ 6 2) + (% (+ number nyan-current-frame) + 6)))))) + (if (zerop (% number 2)) 80 'center))) + +(defun nyan-number-of-rainbows () + (round (/ (* (round (* 100 + (/ (- (float (point)) + (float (point-min))) + (float (point-max))))) + (- nyan-bar-length +nyan-cat-size+)) + 100))) + +(defun nyan-catface () (aref +nyan-catface+ nyan-cat-face-number)) + +(defun nyan-catface-index () + (min (round (/ (* (round (* 100 + (/ (- (float (point)) + (float (point-min))) + (float (point-max))))) + (length (nyan-catface))) + 100)) (- (length (nyan-catface)) 1))) + +(defun nyan-scroll-buffer (percentage buffer) + (interactive) + (with-current-buffer buffer + (goto-char (floor (* percentage (point-max)))))) + +(defun nyan-add-scroll-handler (string percentage buffer) + (lexical-let ((percentage percentage) + (buffer buffer)) + (propertize string 'keymap `(keymap (mode-line keymap (down-mouse-1 . ,(lambda () (interactive) (nyan-scroll-buffer percentage buffer)))))))) + +(defun nyan-create () + (if (< (window-width) nyan-minimum-window-width) + "" ; disabled for too small windows + (let* ((rainbows (nyan-number-of-rainbows)) + (outerspaces (- nyan-bar-length rainbows +nyan-cat-size+)) + (rainbow-string "") + (xpm-support (image-type-available-p 'xpm)) + (nyancat-string (propertize + (aref (nyan-catface) (nyan-catface-index)) + 'display (nyan-get-anim-frame))) + (outerspace-string "") + (buffer (current-buffer))) + (dotimes (number rainbows) + (setq rainbow-string (concat rainbow-string + (nyan-add-scroll-handler + (if xpm-support + (propertize "|" + 'display (create-image +nyan-rainbow-image+ 'xpm nil :ascent (or (and nyan-wavy-trail + (nyan-wavy-rainbow-ascent number)) + (if nyan-animate-nyancat 95 'center)))) + "|") + (/ (float number) nyan-bar-length) buffer)))) + (dotimes (number outerspaces) + (setq outerspace-string (concat outerspace-string + (nyan-add-scroll-handler + (if xpm-support + (propertize "-" + 'display (create-image +nyan-outerspace-image+ 'xpm nil :ascent (if nyan-animate-nyancat 95 'center))) + "-") + (/ (float (+ rainbows +nyan-cat-size+ number)) nyan-bar-length) buffer)))) + ;; Compute Nyan Cat string. + (propertize (concat rainbow-string + nyancat-string + outerspace-string) + 'help-echo +nyan-modeline-help-string+)))) + +;;;###autoload +(define-minor-mode nyan-mode + "Use NyanCat to show buffer size and position in mode-line. +You can customize this minor mode, see option `nyan-mode'. + +Note: If you turn this mode on then you probably want to turn off +option `scroll-bar-mode'." + :global t + :group 'nyan + (if nyan-mode + (progn + (unless nyan-old-car-mode-line-position + (setq nyan-old-car-mode-line-position (car mode-line-position))) + (setcar mode-line-position '(:eval (list (nyan-create))))) + (setcar mode-line-position nyan-old-car-mode-line-position))) + + +(provide 'nyan-mode) + +;;; nyan-mode.el ends here diff --git a/elpa/yaml-mode-20160220.340/yaml-mode-pkg.el b/elpa/yaml-mode-20160220.340/yaml-mode-pkg.el deleted file mode 100644 index dbe69b4..0000000 --- a/elpa/yaml-mode-20160220.340/yaml-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "yaml-mode" "20160220.340" "Major mode for editing YAML files" '((emacs "24.1")) :keywords '("data" "yaml")) diff --git a/elpa/yaml-mode-20160220.340/yaml-mode-autoloads.el b/elpa/yaml-mode-20160426.138/yaml-mode-autoloads.el similarity index 79% rename from elpa/yaml-mode-20160220.340/yaml-mode-autoloads.el rename to elpa/yaml-mode-20160426.138/yaml-mode-autoloads.el index 4b476f8..9531010 100644 --- a/elpa/yaml-mode-20160220.340/yaml-mode-autoloads.el +++ b/elpa/yaml-mode-20160426.138/yaml-mode-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (22297 19793 585495 -;;;;;; 227000)) +;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (22303 19278 842180 +;;;;;; 72000)) ;;; Generated autoloads from yaml-mode.el (let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads)))) @@ -16,7 +16,7 @@ Simple mode to edit YAML. \(fn)" t nil) -(add-to-list 'auto-mode-alist '("\\.e?ya?ml$" . yaml-mode)) +(add-to-list 'auto-mode-alist '("\\.e?ya?ml\\'" . yaml-mode)) ;;;*** diff --git a/elpa/yaml-mode-20160426.138/yaml-mode-pkg.el b/elpa/yaml-mode-20160426.138/yaml-mode-pkg.el new file mode 100644 index 0000000..c83fab4 --- /dev/null +++ b/elpa/yaml-mode-20160426.138/yaml-mode-pkg.el @@ -0,0 +1 @@ +(define-package "yaml-mode" "20160426.138" "Major mode for editing YAML files" '((emacs "24.1")) :keywords '("data" "yaml")) diff --git a/elpa/yaml-mode-20160220.340/yaml-mode.el b/elpa/yaml-mode-20160426.138/yaml-mode.el similarity index 99% rename from elpa/yaml-mode-20160220.340/yaml-mode.el rename to elpa/yaml-mode-20160426.138/yaml-mode.el index 65ecda6..483ad28 100644 --- a/elpa/yaml-mode-20160220.340/yaml-mode.el +++ b/elpa/yaml-mode-20160426.138/yaml-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Vasilij Schneidermann ;; Package-Requires: ((emacs "24.1")) ;; Keywords: data yaml -;; Package-Version: 20160220.340 +;; Package-Version: 20160426.138 ;; Version: 0.0.12 ;; This file is not part of Emacs @@ -42,7 +42,7 @@ ;; handle files ending in '.yml', add something like: ;; ;; (require 'yaml-mode) -;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) +;; (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) ;; ;; to your .emacs file. ;; @@ -432,7 +432,7 @@ cross boundaries of block literals." yaml-mode-version) ;;;###autoload -(add-to-list 'auto-mode-alist '("\\.e?ya?ml$" . yaml-mode)) +(add-to-list 'auto-mode-alist '("\\.e?ya?ml\\'" . yaml-mode)) (provide 'yaml-mode)