diff --git a/elpa/ag-20160702.1128/ag-pkg.el b/elpa/ag-20160702.1128/ag-pkg.el deleted file mode 100644 index 13a6df9..0000000 --- a/elpa/ag-20160702.1128/ag-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "ag" "20160702.1128" "A front-end for ag ('the silver searcher'), the C ack replacement." '((dash "2.8.0") (s "1.9.0") (cl-lib "0.5"))) diff --git a/elpa/ag-20160702.1128/ag-autoloads.el b/elpa/ag-20160731.1323/ag-autoloads.el similarity index 95% rename from elpa/ag-20160702.1128/ag-autoloads.el rename to elpa/ag-20160731.1323/ag-autoloads.el index 15cce1d..1467a57 100644 --- a/elpa/ag-20160702.1128/ag-autoloads.el +++ b/elpa/ag-20160731.1323/ag-autoloads.el @@ -1,9 +1,9 @@ ;;; ag-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "ag" "ag.el" (22404 60275 653932 131000)) +;;;### (autoloads nil "ag" "ag.el" (22454 5337 972625 179000)) ;;; Generated autoloads from ag.el (autoload 'ag "ag" "\ diff --git a/elpa/ag-20160731.1323/ag-pkg.el b/elpa/ag-20160731.1323/ag-pkg.el new file mode 100644 index 0000000..a6e6ef3 --- /dev/null +++ b/elpa/ag-20160731.1323/ag-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "ag" "20160731.1323" "A front-end for ag ('the silver searcher'), the C ack replacement." '((dash "2.8.0") (s "1.9.0") (cl-lib "0.5"))) diff --git a/elpa/ag-20160702.1128/ag.el b/elpa/ag-20160731.1323/ag.el similarity index 99% rename from elpa/ag-20160702.1128/ag.el rename to elpa/ag-20160731.1323/ag.el index 51bf380..464bae9 100644 --- a/elpa/ag-20160702.1128/ag.el +++ b/elpa/ag-20160731.1323/ag.el @@ -5,7 +5,7 @@ ;; Author: Wilfred Hughes ;; Created: 11 January 2013 ;; Version: 0.48 -;; Package-Version: 20160702.1128 +;; Package-Version: 20160731.1323 ;; Package-Requires: ((dash "2.8.0") (s "1.9.0") (cl-lib "0.5")) ;;; Commentary: @@ -224,7 +224,7 @@ If REGEXP is non-nil, treat STRING as a regular expression." (setq arguments (cons "--nogroup" arguments))) (unless regexp (setq arguments (cons "--literal" arguments))) - (when (eq system-type 'windows-nt) + (when (or (eq system-type 'windows-nt) (eq system-type 'cygwin)) ;; Use --vimgrep to work around issue #97 on Windows. (setq arguments (cons "--vimgrep" arguments))) (when (char-or-string-p file-regex) diff --git a/elpa/coffee-mode-20160520.146/coffee-mode-pkg.el b/elpa/coffee-mode-20160520.146/coffee-mode-pkg.el deleted file mode 100644 index f8958ac..0000000 --- a/elpa/coffee-mode-20160520.146/coffee-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "coffee-mode" "20160520.146" "Major mode for CoffeeScript code" '((emacs "24.1") (cl-lib "0.5")) :url "http://github.com/defunkt/coffee-mode" :keywords '("coffeescript" "major" "mode")) diff --git a/elpa/coffee-mode-20160520.146/coffee-mode-autoloads.el b/elpa/coffee-mode-20160808.1712/coffee-mode-autoloads.el similarity index 79% rename from elpa/coffee-mode-20160520.146/coffee-mode-autoloads.el rename to elpa/coffee-mode-20160808.1712/coffee-mode-autoloads.el index 9521923..f823ae1 100644 --- a/elpa/coffee-mode-20160520.146/coffee-mode-autoloads.el +++ b/elpa/coffee-mode-20160808.1712/coffee-mode-autoloads.el @@ -1,10 +1,10 @@ ;;; coffee-mode-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "coffee-mode" "coffee-mode.el" (22387 29375 -;;;;;; 378447 595000)) +;;;### (autoloads nil "coffee-mode" "coffee-mode.el" (22454 5298 +;;;;;; 807704 278000)) ;;; Generated autoloads from coffee-mode.el (autoload 'coffee-mode "coffee-mode" "\ diff --git a/elpa/coffee-mode-20160808.1712/coffee-mode-pkg.el b/elpa/coffee-mode-20160808.1712/coffee-mode-pkg.el new file mode 100644 index 0000000..12403a1 --- /dev/null +++ b/elpa/coffee-mode-20160808.1712/coffee-mode-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "coffee-mode" "20160808.1712" "Major mode for CoffeeScript code" '((emacs "24.1") (cl-lib "0.5")) :url "http://github.com/defunkt/coffee-mode" :keywords '("coffeescript" "major" "mode")) diff --git a/elpa/coffee-mode-20160520.146/coffee-mode.el b/elpa/coffee-mode-20160808.1712/coffee-mode.el similarity index 99% rename from elpa/coffee-mode-20160520.146/coffee-mode.el rename to elpa/coffee-mode-20160808.1712/coffee-mode.el index 8f1c3a6..a69c80f 100644 --- a/elpa/coffee-mode-20160520.146/coffee-mode.el +++ b/elpa/coffee-mode-20160808.1712/coffee-mode.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2010 Chris Wanstrath ;; Version: 0.6.3 -;; Package-Version: 20160520.146 +;; Package-Version: 20160808.1712 ;; Keywords: CoffeeScript major mode ;; Author: Chris Wanstrath ;; URL: http://github.com/defunkt/coffee-mode @@ -113,6 +113,10 @@ with CoffeeScript." "Indentation can insert tabs if this is t." :type 'boolean) +(defcustom coffee-show-mode 'js-mode + "Major mode to used to show the compiled Javascript." + :type 'function) + (defcustom coffee-after-compile-hook nil "Hook called after compile to Javascript" :type 'hook) @@ -281,10 +285,10 @@ called `coffee-compiled-buffer-name'." (coffee-parse-error-output compile-output))) (let ((props (list :sourcemap (coffee--map-file-name file) :line line :column column :source file))) - (let ((buffer-file-name "tmp.js")) - (setq buffer-read-only t) - (set-auto-mode) - (run-hook-with-args 'coffee-after-compile-hook props)))))))) + (setq buffer-read-only t) + (when (fboundp coffee-show-mode) + (funcall coffee-show-mode)) + (run-hook-with-args 'coffee-after-compile-hook props))))))) (defun coffee-start-compile-process (curbuf line column) (lambda (start end) diff --git a/elpa/company-20160709.1536/company-abbrev.el b/elpa/company-20160730.1516/company-abbrev.el similarity index 100% rename from elpa/company-20160709.1536/company-abbrev.el rename to elpa/company-20160730.1516/company-abbrev.el diff --git a/elpa/company-20160709.1536/company-autoloads.el b/elpa/company-20160730.1516/company-autoloads.el similarity index 81% rename from elpa/company-20160709.1536/company-autoloads.el rename to elpa/company-20160730.1516/company-autoloads.el index cfc4e3e..745ff6c 100644 --- a/elpa/company-20160709.1536/company-autoloads.el +++ b/elpa/company-20160730.1516/company-autoloads.el @@ -1,10 +1,9 @@ ;;; company-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "company" "company.el" (22404 60273 313919 -;;;;;; 883000)) +;;;### (autoloads nil "company" "company.el" (22454 5294 352599 524000)) ;;; Generated autoloads from company.el (autoload 'company-mode "company" "\ @@ -38,8 +37,9 @@ keymap during active completions (`company-active-map'): \(fn &optional ARG)" t nil) (defvar global-company-mode nil "\ -Non-nil if Global-Company mode is enabled. -See the command `global-company-mode' for a description of this minor mode. +Non-nil if Global Company mode is enabled. +See the `global-company-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `global-company-mode'.") @@ -48,7 +48,7 @@ or call the function `global-company-mode'.") (autoload 'global-company-mode "company" "\ Toggle Company mode in all buffers. -With prefix ARG, enable Global-Company mode if ARG is positive; +With prefix ARG, enable Global Company mode if ARG is positive; otherwise, disable it. If called from Lisp, enable the mode if ARG is omitted or nil. @@ -73,8 +73,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22404 -;;;;;; 60273 385920 259000)) +;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22454 +;;;;;; 5294 949613 562000)) ;;; Generated autoloads from company-abbrev.el (autoload 'company-abbrev "company-abbrev" "\ @@ -84,8 +84,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22404 60273 -;;;;;; 369920 176000)) +;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22454 5294 +;;;;;; 768609 306000)) ;;; Generated autoloads from company-bbdb.el (autoload 'company-bbdb "company-bbdb" "\ @@ -95,8 +95,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-css" "company-css.el" (22404 60273 -;;;;;; 305919 841000)) +;;;### (autoloads nil "company-css" "company-css.el" (22454 5294 +;;;;;; 307598 466000)) ;;; Generated autoloads from company-css.el (autoload 'company-css "company-css" "\ @@ -106,8 +106,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22404 -;;;;;; 60273 337920 9000)) +;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22454 +;;;;;; 5294 565604 532000)) ;;; 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" -;;;;;; (22404 60273 329919 967000)) +;;;;;; (22454 5294 475602 417000)) ;;; 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" (22404 60273 -;;;;;; 397920 322000)) +;;;### (autoloads nil "company-elisp" "company-elisp.el" (22454 5295 +;;;;;; 17615 161000)) ;;; 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" (22404 60273 -;;;;;; 321919 925000)) +;;;### (autoloads nil "company-etags" "company-etags.el" (22454 5294 +;;;;;; 396600 559000)) ;;; 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" (22404 60273 -;;;;;; 341920 29000)) +;;;### (autoloads nil "company-files" "company-files.el" (22454 5294 +;;;;;; 611605 614000)) ;;; 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" (22404 60273 -;;;;;; 277919 694000)) +;;;### (autoloads nil "company-gtags" "company-gtags.el" (22454 5294 +;;;;;; 137594 469000)) ;;; 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" (22404 -;;;;;; 60273 393920 301000)) +;;;### (autoloads nil "company-ispell" "company-ispell.el" (22454 +;;;;;; 5294 983614 361000)) ;;; 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" (22404 -;;;;;; 60273 353920 92000)) +;;;### (autoloads nil "company-keywords" "company-keywords.el" (22454 +;;;;;; 5294 678607 190000)) ;;; 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" (22404 60273 -;;;;;; 373920 196000)) +;;;### (autoloads nil "company-nxml" "company-nxml.el" (22454 5294 +;;;;;; 802610 105000)) ;;; 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" (22404 -;;;;;; 60273 285919 736000)) +;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22454 +;;;;;; 5294 239596 867000)) ;;; 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" (22404 -;;;;;; 60273 277919 694000)) +;;;### (autoloads nil "company-semantic" "company-semantic.el" (22454 +;;;;;; 5294 171595 268000)) ;;; 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" (22404 60273 -;;;;;; 333919 988000)) +;;;### (autoloads nil "company-tempo" "company-tempo.el" (22454 5294 +;;;;;; 520603 474000)) ;;; 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" (22404 60273 -;;;;;; 381920 238000)) +;;;### (autoloads nil "company-xcode" "company-xcode.el" (22454 5294 +;;;;;; 871611 728000)) ;;; 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" -;;;;;; (22404 60273 377920 217000)) +;;;;;; (22454 5294 837610 928000)) ;;; 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") -;;;;;; (22404 60273 409561 422000)) +;;;;;; (22454 5294 726608 318000)) ;;;*** diff --git a/elpa/company-20160709.1536/company-bbdb.el b/elpa/company-20160730.1516/company-bbdb.el similarity index 100% rename from elpa/company-20160709.1536/company-bbdb.el rename to elpa/company-20160730.1516/company-bbdb.el diff --git a/elpa/company-20160709.1536/company-capf.el b/elpa/company-20160730.1516/company-capf.el similarity index 100% rename from elpa/company-20160709.1536/company-capf.el rename to elpa/company-20160730.1516/company-capf.el diff --git a/elpa/company-20160709.1536/company-clang.el b/elpa/company-20160730.1516/company-clang.el similarity index 100% rename from elpa/company-20160709.1536/company-clang.el rename to elpa/company-20160730.1516/company-clang.el diff --git a/elpa/company-20160709.1536/company-cmake.el b/elpa/company-20160730.1516/company-cmake.el similarity index 100% rename from elpa/company-20160709.1536/company-cmake.el rename to elpa/company-20160730.1516/company-cmake.el diff --git a/elpa/company-20160709.1536/company-css.el b/elpa/company-20160730.1516/company-css.el similarity index 100% rename from elpa/company-20160709.1536/company-css.el rename to elpa/company-20160730.1516/company-css.el diff --git a/elpa/company-20160709.1536/company-dabbrev-code.el b/elpa/company-20160730.1516/company-dabbrev-code.el similarity index 98% rename from elpa/company-20160709.1536/company-dabbrev-code.el rename to elpa/company-20160730.1516/company-dabbrev-code.el index 9331087..37f287c 100644 --- a/elpa/company-20160709.1536/company-dabbrev-code.el +++ b/elpa/company-20160730.1516/company-dabbrev-code.el @@ -96,7 +96,7 @@ comments or strings." (`t (list major-mode)) (`code company-dabbrev-code-modes) (`all `all)) - t))) + (not company-dabbrev-code-everywhere)))) (ignore-case company-dabbrev-code-ignore-case) (duplicates t))) diff --git a/elpa/company-20160709.1536/company-dabbrev.el b/elpa/company-20160730.1516/company-dabbrev.el similarity index 100% rename from elpa/company-20160709.1536/company-dabbrev.el rename to elpa/company-20160730.1516/company-dabbrev.el diff --git a/elpa/company-20160709.1536/company-eclim.el b/elpa/company-20160730.1516/company-eclim.el similarity index 100% rename from elpa/company-20160709.1536/company-eclim.el rename to elpa/company-20160730.1516/company-eclim.el diff --git a/elpa/company-20160709.1536/company-elisp.el b/elpa/company-20160730.1516/company-elisp.el similarity index 100% rename from elpa/company-20160709.1536/company-elisp.el rename to elpa/company-20160730.1516/company-elisp.el diff --git a/elpa/company-20160709.1536/company-etags.el b/elpa/company-20160730.1516/company-etags.el similarity index 100% rename from elpa/company-20160709.1536/company-etags.el rename to elpa/company-20160730.1516/company-etags.el diff --git a/elpa/company-20160709.1536/company-files.el b/elpa/company-20160730.1516/company-files.el similarity index 93% rename from elpa/company-20160709.1536/company-files.el rename to elpa/company-20160730.1516/company-files.el index 4397df9..4410281 100644 --- a/elpa/company-20160709.1536/company-files.el +++ b/elpa/company-20160730.1516/company-files.el @@ -40,13 +40,15 @@ The values should use the same format as `completion-ignored-extensions'." (defun company-files--directory-files (dir prefix) ;; Don't use directory-files. It produces directories without trailing /. - (let ((comp (sort (file-name-all-completions prefix dir) - (lambda (s1 s2) (string-lessp (downcase s1) (downcase s2)))))) - (when company-files-exclusions - (setq comp (company-files--exclusions-filtered comp))) - (if (equal prefix "") - (delete "../" (delete "./" comp)) - comp))) + (condition-case err + (let ((comp (sort (file-name-all-completions prefix dir) + (lambda (s1 s2) (string-lessp (downcase s1) (downcase s2)))))) + (when company-files-exclusions + (setq comp (company-files--exclusions-filtered comp))) + (if (equal prefix "") + (delete "../" (delete "./" comp)) + comp)) + (file-error nil))) (defun company-files--exclusions-filtered (completions) (let* ((dir-exclusions (cl-delete-if-not #'company-files--trailing-slash-p diff --git a/elpa/company-20160709.1536/company-gtags.el b/elpa/company-20160730.1516/company-gtags.el similarity index 100% rename from elpa/company-20160709.1536/company-gtags.el rename to elpa/company-20160730.1516/company-gtags.el diff --git a/elpa/company-20160709.1536/company-ispell.el b/elpa/company-20160730.1516/company-ispell.el similarity index 100% rename from elpa/company-20160709.1536/company-ispell.el rename to elpa/company-20160730.1516/company-ispell.el diff --git a/elpa/company-20160709.1536/company-keywords.el b/elpa/company-20160730.1516/company-keywords.el similarity index 100% rename from elpa/company-20160709.1536/company-keywords.el rename to elpa/company-20160730.1516/company-keywords.el diff --git a/elpa/company-20160709.1536/company-nxml.el b/elpa/company-20160730.1516/company-nxml.el similarity index 100% rename from elpa/company-20160709.1536/company-nxml.el rename to elpa/company-20160730.1516/company-nxml.el diff --git a/elpa/company-20160709.1536/company-oddmuse.el b/elpa/company-20160730.1516/company-oddmuse.el similarity index 100% rename from elpa/company-20160709.1536/company-oddmuse.el rename to elpa/company-20160730.1516/company-oddmuse.el diff --git a/elpa/company-20160709.1536/company-pkg.el b/elpa/company-20160730.1516/company-pkg.el similarity index 75% rename from elpa/company-20160709.1536/company-pkg.el rename to elpa/company-20160730.1516/company-pkg.el index b83eca4..f55faf6 100644 --- a/elpa/company-20160709.1536/company-pkg.el +++ b/elpa/company-20160730.1516/company-pkg.el @@ -1,4 +1,4 @@ -(define-package "company" "20160709.1536" "Modular text completion framework" +(define-package "company" "20160730.1516" "Modular text completion framework" '((emacs "24.1") (cl-lib "0.5")) :url "http://company-mode.github.io/" :keywords diff --git a/elpa/company-20160709.1536/company-semantic.el b/elpa/company-20160730.1516/company-semantic.el similarity index 100% rename from elpa/company-20160709.1536/company-semantic.el rename to elpa/company-20160730.1516/company-semantic.el diff --git a/elpa/company-20160709.1536/company-template.el b/elpa/company-20160730.1516/company-template.el similarity index 100% rename from elpa/company-20160709.1536/company-template.el rename to elpa/company-20160730.1516/company-template.el diff --git a/elpa/company-20160709.1536/company-tempo.el b/elpa/company-20160730.1516/company-tempo.el similarity index 100% rename from elpa/company-20160709.1536/company-tempo.el rename to elpa/company-20160730.1516/company-tempo.el diff --git a/elpa/company-20160709.1536/company-xcode.el b/elpa/company-20160730.1516/company-xcode.el similarity index 100% rename from elpa/company-20160709.1536/company-xcode.el rename to elpa/company-20160730.1516/company-xcode.el diff --git a/elpa/company-20160709.1536/company-yasnippet.el b/elpa/company-20160730.1516/company-yasnippet.el similarity index 100% rename from elpa/company-20160709.1536/company-yasnippet.el rename to elpa/company-20160730.1516/company-yasnippet.el diff --git a/elpa/company-20160709.1536/company.el b/elpa/company-20160730.1516/company.el similarity index 99% rename from elpa/company-20160709.1536/company.el rename to elpa/company-20160730.1516/company.el index 1721005..d297bd3 100644 --- a/elpa/company-20160709.1536/company.el +++ b/elpa/company-20160730.1516/company.el @@ -920,6 +920,9 @@ matches IDLE-BEGIN-AFTER-RE, return it wrapped in a cons." (if (functionp company-backend) (apply company-backend args) (apply #'company--multi-backend-adapter company-backend args)) + (user-error (user-error + "Company: backend %s user-error: %s" + company-backend (error-message-string err))) (error (error "Company: backend %s error \"%s\" with args %s" company-backend (error-message-string err) args)))) diff --git a/elpa/dash-20160619.611/dash-pkg.el b/elpa/dash-20160619.611/dash-pkg.el deleted file mode 100644 index 2d41f78..0000000 --- a/elpa/dash-20160619.611/dash-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "dash" "20160619.611" "A modern list library for Emacs" 'nil :keywords '("lists")) diff --git a/elpa/dash-20160619.611/dash-autoloads.el b/elpa/dash-20160813.951/dash-autoloads.el similarity index 58% rename from elpa/dash-20160619.611/dash-autoloads.el rename to elpa/dash-20160813.951/dash-autoloads.el index f24a9d7..b4ee5eb 100644 --- a/elpa/dash-20160619.611/dash-autoloads.el +++ b/elpa/dash-20160813.951/dash-autoloads.el @@ -1,9 +1,9 @@ ;;; dash-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil nil ("dash.el") (22387 29373 79163 715000)) +;;;### (autoloads nil nil ("dash.el") (22454 5337 8602 510000)) ;;;*** diff --git a/elpa/dash-20160813.951/dash-pkg.el b/elpa/dash-20160813.951/dash-pkg.el new file mode 100644 index 0000000..527f212 --- /dev/null +++ b/elpa/dash-20160813.951/dash-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "dash" "20160813.951" "A modern list library for Emacs" 'nil :keywords '("lists")) diff --git a/elpa/dash-20160619.611/dash.el b/elpa/dash-20160813.951/dash.el similarity index 99% rename from elpa/dash-20160619.611/dash.el rename to elpa/dash-20160813.951/dash.el index d10954b..f4917b9 100644 --- a/elpa/dash-20160619.611/dash.el +++ b/elpa/dash-20160813.951/dash.el @@ -1,10 +1,10 @@ ;;; dash.el --- A modern list library for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Magnar Sveen -;; Version: 2.12.1 -;; Package-Version: 20160619.611 +;; Version: 2.13.0 +;; Package-Version: 20160813.951 ;; Keywords: lists ;; This program is free software; you can redistribute it and/or modify diff --git a/elpa/erlang-20160615.633/erlang-pkg.el b/elpa/erlang-20160615.633/erlang-pkg.el deleted file mode 100644 index c90a8b7..0000000 --- a/elpa/erlang-20160615.633/erlang-pkg.el +++ /dev/null @@ -1,4 +0,0 @@ -(define-package "erlang" "20160615.633" "Erlang major mode" 'nil) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/erlang-20160615.633/erlang-autoloads.el b/elpa/erlang-20160719.535/erlang-autoloads.el similarity index 94% rename from elpa/erlang-20160615.633/erlang-autoloads.el rename to elpa/erlang-20160719.535/erlang-autoloads.el index 6515b08..a41a3d9 100644 --- a/elpa/erlang-20160615.633/erlang-autoloads.el +++ b/elpa/erlang-20160719.535/erlang-autoloads.el @@ -1,9 +1,9 @@ ;;; erlang-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "erlang" "erlang.el" (22387 29371 497412 949000)) +;;;### (autoloads nil "erlang" "erlang.el" (22454 5334 245537 541000)) ;;; Generated autoloads from erlang.el (autoload 'erlang-mode "erlang" "\ @@ -118,8 +118,8 @@ editing control characters: ;;;*** -;;;### (autoloads nil "erlang-start" "erlang-start.el" (22387 29371 -;;;;;; 473431 317000)) +;;;### (autoloads nil "erlang-start" "erlang-start.el" (22454 5334 +;;;;;; 87533 826000)) ;;; Generated autoloads from erlang-start.el (let ((a '("\\.erl\\'" . erlang-mode)) (b '("\\.hrl\\'" . erlang-mode))) (or (assoc (car a) auto-mode-alist) (setq auto-mode-alist (cons a auto-mode-alist))) (or (assoc (car b) auto-mode-alist) (setq auto-mode-alist (cons b auto-mode-alist)))) @@ -132,7 +132,7 @@ editing control characters: ;;;### (autoloads nil nil ("erlang-eunit.el" "erlang-flymake.el" ;;;;;; "erlang-pkg.el" "erlang-skels-old.el" "erlang-skels.el" "erlang-test.el" -;;;;;; "erlang_appwiz.el") (22387 29371 532912 630000)) +;;;;;; "erlang_appwiz.el") (22454 5334 358540 198000)) ;;;*** diff --git a/elpa/erlang-20160615.633/erlang-eunit.el b/elpa/erlang-20160719.535/erlang-eunit.el similarity index 100% rename from elpa/erlang-20160615.633/erlang-eunit.el rename to elpa/erlang-20160719.535/erlang-eunit.el diff --git a/elpa/erlang-20160615.633/erlang-flymake.el b/elpa/erlang-20160719.535/erlang-flymake.el similarity index 100% rename from elpa/erlang-20160615.633/erlang-flymake.el rename to elpa/erlang-20160719.535/erlang-flymake.el diff --git a/elpa/erlang-20160719.535/erlang-pkg.el b/elpa/erlang-20160719.535/erlang-pkg.el new file mode 100644 index 0000000..71976f9 --- /dev/null +++ b/elpa/erlang-20160719.535/erlang-pkg.el @@ -0,0 +1,4 @@ +(define-package "erlang" "20160719.535" "Erlang major mode" 'nil) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/erlang-20160615.633/erlang-skels-old.el b/elpa/erlang-20160719.535/erlang-skels-old.el similarity index 100% rename from elpa/erlang-20160615.633/erlang-skels-old.el rename to elpa/erlang-20160719.535/erlang-skels-old.el diff --git a/elpa/erlang-20160615.633/erlang-skels.el b/elpa/erlang-20160719.535/erlang-skels.el similarity index 99% rename from elpa/erlang-20160615.633/erlang-skels.el rename to elpa/erlang-20160719.535/erlang-skels.el index ce26c83..c1152f3 100644 --- a/elpa/erlang-20160615.633/erlang-skels.el +++ b/elpa/erlang-20160719.535/erlang-skels.el @@ -903,7 +903,7 @@ Please see the function `tempo-define-template'.") "%% gen_statem:start_link/[3,4], this function is called by the new" n "%% process to initialize." n (erlang-skel-separator-end 2) - "-spec init(Args :: term()) -> " n> + "-spec init(Args :: term()) ->" n> "{gen_statem:callback_mode()," n> "State :: term(), Data :: term()} |" n> "{gen_statem:callback_mode()," n> @@ -927,7 +927,7 @@ Please see the function `tempo-define-template'.") "-spec state_name(" n> "gen_statem:event_type(), Msg :: term()," n> "Data :: term()) ->" n> - "gen_statem:state_function_result(). " n + "gen_statem:state_function_result()." n "state_name({call,Caller}, _Msg, Data) ->" n> "{next_state, state_name, Data, [{reply,Caller,ok}]}." n n @@ -940,7 +940,7 @@ Please see the function `tempo-define-template'.") "-spec handle_event(" n> "gen_statem:event_type(), Msg :: term()," n> "State :: term(), Data :: term()) ->" n> - "gen_statem:handle_event_result(). " n + "gen_statem:handle_event_result()." n "handle_event({call,From}, _Msg, State, Data) ->" n> "{next_state, State, Data, [{reply,From,ok}]}." n n @@ -965,9 +965,11 @@ Please see the function `tempo-define-template'.") "-spec code_change(" n> "OldVsn :: term() | {down,term()}," n> "State :: term(), Data :: term(), Extra :: term()) ->" n> - "{ok, NewState :: term(), NewData :: term()}." n + "{gen_statem:callback_mode()," n> + "NewState :: term(), NewData :: term()} |" n> + "(Reason :: term())." n "code_change(_OldVsn, State, Data, _Extra) ->" n> - "{ok, State, Data}." n + "{state_functions, State, Data}." n n (erlang-skel-double-separator-start 3) "%%% Internal functions" n diff --git a/elpa/erlang-20160615.633/erlang-start.el b/elpa/erlang-20160719.535/erlang-start.el similarity index 100% rename from elpa/erlang-20160615.633/erlang-start.el rename to elpa/erlang-20160719.535/erlang-start.el diff --git a/elpa/erlang-20160615.633/erlang-test.el b/elpa/erlang-20160719.535/erlang-test.el similarity index 100% rename from elpa/erlang-20160615.633/erlang-test.el rename to elpa/erlang-20160719.535/erlang-test.el diff --git a/elpa/erlang-20160615.633/erlang.el b/elpa/erlang-20160719.535/erlang.el similarity index 100% rename from elpa/erlang-20160615.633/erlang.el rename to elpa/erlang-20160719.535/erlang.el diff --git a/elpa/erlang-20160615.633/erlang_appwiz.el b/elpa/erlang-20160719.535/erlang_appwiz.el similarity index 100% rename from elpa/erlang-20160615.633/erlang_appwiz.el rename to elpa/erlang-20160719.535/erlang_appwiz.el diff --git a/elpa/gh-20160626.1349/gh-autoloads.el b/elpa/gh-20160626.1349/gh-autoloads.el deleted file mode 100644 index 7bd84d1..0000000 --- a/elpa/gh-20160626.1349/gh-autoloads.el +++ /dev/null @@ -1,162 +0,0 @@ -;;; gh-autoloads.el --- automatically extracted autoloads -;; -;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) - -;;;### (autoloads nil "gh-api" "gh-api.el" (22387 29369 466970 131000)) -;;; Generated autoloads from gh-api.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-api 'nil "gh-api" "Github API") - -(eieio-defclass-autoload 'gh-api-v3 '(gh-api) "gh-api" "Github API v3") - -;;;*** - -;;;### (autoloads nil "gh-auth" "gh-auth.el" (22387 29369 526924 -;;;;;; 94000)) -;;; Generated autoloads from gh-auth.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-authenticator 'nil "gh-auth" "Abstract authenticator") - -(eieio-defclass-autoload 'gh-password-authenticator '(gh-authenticator) "gh-auth" "Password-based authenticator") - -(eieio-defclass-autoload 'gh-oauth-authenticator '(gh-authenticator) "gh-auth" "Oauth-based authenticator") - -;;;*** - -;;;### (autoloads nil "gh-cache" "gh-cache.el" (22387 29369 498945 -;;;;;; 578000)) -;;; Generated autoloads from gh-cache.el - -(require 'eieio) - -;;;*** - -;;;### (autoloads nil "gh-common" "gh-common.el" (22387 29369 478960 -;;;;;; 924000)) -;;; Generated autoloads from gh-common.el - -(require 'eieio) - -;;;*** - -;;;### (autoloads nil "gh-gist" "gh-gist.el" (22387 29369 442988 -;;;;;; 546000)) -;;; Generated autoloads from gh-gist.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-gist-api '(gh-api-v3) "gh-gist" "Gist API") - -(eieio-defclass-autoload 'gh-gist-gist-stub '(gh-object) "gh-gist" "Class for user-created gist objects") - -(eieio-defclass-autoload 'gh-gist-gist '(gh-gist-gist-stub) "gh-gist" "Gist object") - -;;;*** - -;;;### (autoloads nil "gh-issue-comments" "gh-issue-comments.el" -;;;;;; (22387 29369 490951 716000)) -;;; Generated autoloads from gh-issue-comments.el - -(require 'eieio) - -;;;*** - -;;;### (autoloads nil "gh-issues" "gh-issues.el" (22387 29369 502942 -;;;;;; 509000)) -;;; Generated autoloads from gh-issues.el - -(require 'eieio) - -;;;*** - -;;;### (autoloads nil "gh-oauth" "gh-oauth.el" (22387 29369 430997 -;;;;;; 753000)) -;;; Generated autoloads from gh-oauth.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-oauth-api '(gh-api-v3) "gh-oauth" "OAuth API") - -;;;*** - -;;;### (autoloads nil "gh-orgs" "gh-orgs.el" (22387 29369 482957 -;;;;;; 854000)) -;;; Generated autoloads from gh-orgs.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-orgs-api '(gh-api-v3) "gh-orgs" "Orgs API") - -(eieio-defclass-autoload 'gh-orgs-org-stub '(gh-object) "gh-orgs" nil) - -;;;*** - -;;;### (autoloads nil "gh-pull-comments" "gh-pull-comments.el" (22387 -;;;;;; 29369 518930 232000)) -;;; Generated autoloads from gh-pull-comments.el - -(require 'eieio) - -;;;*** - -;;;### (autoloads nil "gh-pulls" "gh-pulls.el" (22387 29369 506939 -;;;;;; 440000)) -;;; Generated autoloads from gh-pulls.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-pulls-api '(gh-api-v3) "gh-pulls" "Git pull requests API") - -(eieio-defclass-autoload 'gh-pulls-request '(gh-pulls-request-stub) "gh-pulls" "Git pull requests API") - -;;;*** - -;;;### (autoloads nil "gh-repos" "gh-repos.el" (22387 29369 494948 -;;;;;; 647000)) -;;; Generated autoloads from gh-repos.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-repos-api '(gh-api-v3) "gh-repos" "Repos API") - -(eieio-defclass-autoload 'gh-repos-repo-stub '(gh-object) "gh-repos" "Class for user-created repository objects") - -(eieio-defclass-autoload 'gh-repos-repo '(gh-repos-repo-stub) "gh-repos" "Class for GitHub repositories") - -;;;*** - -;;;### (autoloads nil "gh-url" "gh-url.el" (22387 29369 419006 961000)) -;;; Generated autoloads from gh-url.el - -(require 'eieio) - -;;;*** - -;;;### (autoloads nil "gh-users" "gh-users.el" (22387 29369 474963 -;;;;;; 993000)) -;;; Generated autoloads from gh-users.el - -(require 'eieio) - -(eieio-defclass-autoload 'gh-users-api '(gh-api-v3) "gh-users" "Users API") - -(eieio-defclass-autoload 'gh-users-user '(gh-user) "gh-users" nil) - -;;;*** - -;;;### (autoloads nil nil ("gh-pkg.el" "gh-profile.el" "gh-search.el" -;;;;;; "gh.el") (22387 29369 541412 67000)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; End: -;;; gh-autoloads.el ends here diff --git a/elpa/gh-20160626.1349/gh-issue-comments.el b/elpa/gh-20160626.1349/gh-issue-comments.el deleted file mode 100644 index 88218d9..0000000 --- a/elpa/gh-20160626.1349/gh-issue-comments.el +++ /dev/null @@ -1,110 +0,0 @@ -;;; gh-issue-comments.el --- issue comments api for github - -;; Copyright (C) 2014 Travis Thieman - -;; Author: Travis Thieman -;; Keywords: - -;; 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 of the License, 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. If not, see . - -;;; Commentary: - -;; TODOS: -;; * Support listing all comments in a repository - -;; Basic usage: - -;; (setf api (gh-issue-comments-api "api" :sync nil :cache nil :num-retries 1)) -;; (setf comments (gh-issue-comments-list api "user" "repo" "issue id")) -;; (setq my-comment (make-instance 'gh-issue-comments-comment :body "This is great!")) -;; (gh-issue-comments-new api "user" "repo" "issue id" my-comment) - -;;; Code: - -(eval-when-compile - (require 'cl)) - -;;;###autoload -(require 'eieio) - -(require 'gh-api) -(require 'gh-auth) -(require 'gh-common) - -(require 'gh-issues) - -(defclass gh-issue-comments-api (gh-api-v3) - ((comment-cls :allocation :class :initform gh-issue-comments-comment)) - "GitHub Issue Comments api") - -(defclass gh-issue-comments-comment (gh-object) - ((url :initarg :url) - (html-url :initarg :html-url) - (body :initarg :body) - (user :initarg :user :initform nil) - (created-at :initarg :created_at) - (updated-at :initarg :updated_at) - - (user-cls :allocation :class :initform gh-user)) - "issues comment") - -(defmethod gh-object-read-into ((comment gh-issue-comments-comment) data) - (call-next-method) - (with-slots (url html-url body user created-at updated-at) - comment - (setq url (gh-read data 'url) - html-url (gh-read data 'html_url) - body (gh-read data 'body) - user (gh-object-read (or (oref comment :user) - (oref comment user-cls)) - (gh-read data 'user)) - created-at (gh-read data 'created_at) - updated-at (gh-read data 'updated_at)))) - -(defmethod gh-issue-comments-list ((api gh-issue-comments-api) user repo issue-id) - (gh-api-authenticated-request - api (gh-object-list-reader (oref api comment-cls)) "GET" - (format "/repos/%s/%s/issues/%s/comments" user repo issue-id))) - -(defmethod gh-issue-comments-get ((api gh-issue-comments-api) user repo comment-id) - (gh-api-authenticated-request - api (gh-object-reader (oref api comment-cls)) "GET" - (format "/repos/%s/%s/issues/comments/%s" user repo comment-id))) - -(defmethod gh-issue-comments-req-to-update ((req gh-issue-comments-comment)) - `(("body" . ,(oref req body)))) - -(defmethod gh-issue-comments-update ((api gh-issue-comments-api) user repo comment-id comment) - (gh-api-authenticated-request - api (gh-object-reader (oref api comment-cls)) "PATCH" - (format "/repos/%s/%s/issues/comments/%s" user repo comment-id) - (gh-issue-comments-req-to-update comment))) - -(defmethod gh-issue-comments-new ((api gh-issue-comments-api) user repo issue-id comment) - (gh-api-authenticated-request - api (gh-object-reader (oref api comment-cls)) "POST" - (format "/repos/%s/%s/issues/%s/comments" user repo issue-id) - (gh-issue-comments-req-to-update comment))) - -(defmethod gh-issue-comments-delete ((api gh-issue-comments-api) user repo comment-id) - (gh-api-authenticated-request - api nil "DELETE" - (format "/repos/%s/%s/issues/comments/%s" user repo comment-id))) - -(provide 'gh-issue-comments) -;;; gh-issue-comments.el ends here - -;; Local Variables: -;; indent-tabs-mode: nil -;; End: diff --git a/elpa/gh-20160626.1349/gh-pkg.el b/elpa/gh-20160626.1349/gh-pkg.el deleted file mode 100644 index 4a158b5..0000000 --- a/elpa/gh-20160626.1349/gh-pkg.el +++ /dev/null @@ -1,7 +0,0 @@ -(define-package "gh" "20160626.1349" "A GitHub library for Emacs" - '((emacs "24.4") - (pcache "0.3.1") - (logito "0.1"))) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/gh-20160626.1349/gh-pull-comments.el b/elpa/gh-20160626.1349/gh-pull-comments.el deleted file mode 100644 index ab0d901..0000000 --- a/elpa/gh-20160626.1349/gh-pull-comments.el +++ /dev/null @@ -1,139 +0,0 @@ -;;; gh-pull-comments.el --- pull request comments api for github - -;; Copyright (C) 2014 Toni Reina - -;; Author: Toni Reina -;; Keywords: - -;; 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 of the License, 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. If not, see . - -;;; Commentary: - -;; TODOS: -;; * Support listing all comments in a repository - -;; Basic usage: - -;; (setf api (gh-pull-comments-api "api" :sync nil :cache nil :num-retries 1)) -;; (setf comments (gh-pull-comments-list api "user" "repo" "pull request id")) -;; (setq my-comment (make-instance 'gh-pull-comments-comment -;; :body "This is great!" -;; :path "README.md" -;; :position 2 -;; :commit-id "commit sha")) -;; (gh-pull-comments-new api "user" "repo" "pull request id" my-comment) - -;;; Code: - -(eval-when-compile - (require 'cl)) - -;;;###autoload -(require 'eieio) - -(require 'gh-api) -(require 'gh-auth) -(require 'gh-common) - -(defclass gh-pull-comments-api (gh-api-v3) - ((pull-comment-cls :allocation :class :initform gh-pull-comments-comment)) - "GitHub Pull Request Comments API") - -(defclass gh-pull-comments-comment (gh-object) - ((url :initarg :url) - (html-url :initarg :html-url) - (id :initarg :id) - (body :initarg :body) - (user :initarg :user :initform nil) - (path :initarg :path) - (diff-hunk :initarg :diff-hunk) - (position :initarg :position) - (original-position :initarg :original-position) - (commit-id :initarg :commit-id) - (original-commit-id :initarg :original-commit-id) - (in-reply-to :initarg :in-reply-to :initform nil) - (created-at :initarg :created_at) - (updated-at :initarg :updated_at) - (user-cls :allocation :class :initform gh-user)) - "Class for Pull Requests comments") - -(defmethod gh-object-read-into ((comment gh-pull-comments-comment) data) - (call-next-method) - (with-slots (url html-url id body user path diff-hunk position - original-position commit-id original-commit-id in-reply-to - created-at updated-at) - comment - (setq url (gh-read data 'url) - html-url (gh-read data 'html_url) - id (gh-read data 'id) - body (gh-read data 'body) - user (gh-object-read (or (oref comment :user) - (oref comment user-cls)) - (gh-read data 'user)) - path (gh-read data 'path) - diff-hunk (gh-read data 'diff_hunk) - position (gh-read data 'position) - original-position (gh-read data 'original_position) - commit-id (gh-read data 'commit_id) - original-commit-id (gh-read data 'original_commit_id) - in-reply-to (gh-read data 'in_reply_to) - created-at (gh-read data 'created_at) - updated-at (gh-read data 'updated_at)))) - -(defmethod gh-pull-comments-list ((api gh-pull-comments-api) user repo pull-id) - (gh-api-authenticated-request - api (gh-object-list-reader (oref api pull-comment-cls)) "GET" - (format "/repos/%s/%s/pulls/%s/comments" user repo pull-id))) - -(defmethod gh-pull-comments-get ((api gh-pull-comments-api) user repo pull-id) - (gh-api-authenticated-request - api (gh-object-reader (oref api pull-comment-cls)) "GET" - (format "/repos/%s/%s/pulls/comments/%s" user repo pull-id))) - -(defmethod gh-pull-comments-req-to-create ((req gh-pull-comments-comment)) - (let ((in-reply-to (oref req in-reply-to)) - (to-update `(("body" . ,(oref req body))))) - (if in-reply-to - (nconc to-update `(("in_reply_to" . ,in-reply-to))) - (nconc to-update `(("commit_id" . ,(oref req commit-id)) - ("path" . ,(oref req path)) - ("position" . ,(oref req position))))) - to-update)) - -(defmethod gh-pull-comments-req-to-update ((req gh-pull-comments-comment)) - `(("body" . ,(oref req body)))) - -(defmethod gh-pull-comments-update ((api gh-pull-comments-api) user repo comment-id comment) - (gh-api-authenticated-request - api (gh-object-reader (oref api pull-comment-cls)) "PATCH" - (format "/repos/%s/%s/pulls/comments/%s" user repo comment-id) - (gh-pull-comments-req-to-update comment))) - -(defmethod gh-pull-comments-new ((api gh-pull-comments-api) user repo pull-id comment) - (gh-api-authenticated-request - api (gh-object-reader (oref api pull-comment-cls)) "POST" - (format "/repos/%s/%s/pulls/%s/comments" user repo pull-id) - (gh-pull-comments-req-to-create comment))) - -(defmethod gh-pull-comments-delete ((api gh-pull-comments-api) user repo comment-id) - (gh-api-authenticated-request - api nil "DELETE" - (format "/repos/%s/%s/pulls/comments/%s" user repo comment-id))) - -(provide 'gh-pull-comments) -;;; gh-pull-comments.el ends here - -;; Local Variables: -;; indent-tabs-mode: nil -;; End: diff --git a/elpa/gh-20160626.1349/gh-api.el b/elpa/gh-20160728.1525/gh-api.el similarity index 96% rename from elpa/gh-20160626.1349/gh-api.el rename to elpa/gh-20160728.1525/gh-api.el index 78776c5..b99fd43 100644 --- a/elpa/gh-20160626.1349/gh-api.el +++ b/elpa/gh-20160728.1525/gh-api.el @@ -80,10 +80,12 @@ (unless (or (null cache) (and (eieio-object-p cache) (object-of-class-p cache 'gh-cache))) - (oset api :cache (funcall (oref api cache-cls) - (format "gh/%s/%s" - classname - (gh-api-get-username api))))))) + (oset api :cache (make-instance + (oref api cache-cls) + :object-name + (format "gh/%s/%s" + classname + (gh-api-get-username api))))))) (defmethod gh-api-expand-resource ((api gh-api) resource) @@ -116,9 +118,11 @@ (or (oref api :auth) (funcall gh-api-v3-authenticator "auth"))))) +;;;###autoload (defclass gh-api-request (gh-url-request) ((default-response-cls :allocation :class :initform gh-api-response))) +;;;###autoload (defclass gh-api-response (gh-url-response) ()) @@ -134,10 +138,12 @@ (defmethod gh-url-response-set-data ((resp gh-api-response) data) (call-next-method resp (gh-api-json-decode data))) +;;;###autoload (defclass gh-api-paged-request (gh-api-request) ((default-response-cls :allocation :class :initform gh-api-paged-response) (page-limit :initarg :page-limit :initform -1))) +;;;###autoload (defclass gh-api-paged-response (gh-api-response) ()) @@ -235,6 +241,7 @@ (oref req default-response-cls) :transform transformer)))))) +;;;###autoload (defclass gh-api-callback (gh-url-callback) ((cache :initarg :cache) (key :initarg :key) diff --git a/elpa/gh-20160626.1349/gh-auth.el b/elpa/gh-20160728.1525/gh-auth.el similarity index 98% rename from elpa/gh-20160626.1349/gh-auth.el rename to elpa/gh-20160728.1525/gh-auth.el index fae66ae..7a9486a 100644 --- a/elpa/gh-20160626.1349/gh-auth.el +++ b/elpa/gh-20160728.1525/gh-auth.el @@ -103,6 +103,7 @@ (defmethod gh-auth-modify-request ((auth gh-authenticator) req) req) +;;;###autoload (defclass gh-auth-2fa-callback (gh-url-callback) ((req :initarg :req :initform nil)) "2-factor callback") @@ -152,7 +153,7 @@ ((token :initarg :token :protection :private :initform nil)) "Oauth-based authenticator") -(defmethod initialize-instance :static ((auth gh-oauth-authenticator) &rest args) +(defmethod initialize-instance ((auth gh-oauth-authenticator) &rest args) (call-next-method) (or (oref auth :token) (oset auth :token (gh-auth-get-oauth-token)))) diff --git a/elpa/gh-20160728.1525/gh-autoloads.el b/elpa/gh-20160728.1525/gh-autoloads.el new file mode 100644 index 0000000..11b7b5a --- /dev/null +++ b/elpa/gh-20160728.1525/gh-autoloads.el @@ -0,0 +1,255 @@ +;;; gh-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +;;;### (autoloads nil "gh-api" "gh-api.el" (22454 5329 956436 690000)) +;;; Generated autoloads from gh-api.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-api 'nil "gh-api" "Github API") + +(eieio-defclass-autoload 'gh-api-v3 '(gh-api) "gh-api" "Github API v3") + +(eieio-defclass-autoload 'gh-api-request '(gh-url-request) "gh-api" nil) + +(eieio-defclass-autoload 'gh-api-response '(gh-url-response) "gh-api" nil) + +(eieio-defclass-autoload 'gh-api-paged-request '(gh-api-request) "gh-api" nil) + +(eieio-defclass-autoload 'gh-api-paged-response '(gh-api-response) "gh-api" nil) + +(eieio-defclass-autoload 'gh-api-callback '(gh-url-callback) "gh-api" nil) + +;;;*** + +;;;### (autoloads nil "gh-auth" "gh-auth.el" (22454 5330 384446 754000)) +;;; Generated autoloads from gh-auth.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-authenticator 'nil "gh-auth" "Abstract authenticator") + +(eieio-defclass-autoload 'gh-auth-2fa-callback '(gh-url-callback) "gh-auth" "2-factor callback") + +(eieio-defclass-autoload 'gh-password-authenticator '(gh-authenticator) "gh-auth" "Password-based authenticator") + +(eieio-defclass-autoload 'gh-oauth-authenticator '(gh-authenticator) "gh-auth" "Oauth-based authenticator") + +;;;*** + +;;;### (autoloads nil "gh-cache" "gh-cache.el" (22454 5330 226443 +;;;;;; 38000)) +;;; Generated autoloads from gh-cache.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-cache '(pcache-repository) "gh-cache" nil) + +(eieio-defclass-autoload 'gh-cache-entry '(pcache-entry) "gh-cache" nil) + +;;;*** + +;;;### (autoloads nil "gh-comments" "gh-comments.el" (22454 5329 +;;;;;; 753431 916000)) +;;; Generated autoloads from gh-comments.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-comments-api-mixin 'nil "gh-comments" :abstract) + +;;;*** + +;;;### (autoloads nil "gh-common" "gh-common.el" (22454 5330 91439 +;;;;;; 864000)) +;;; Generated autoloads from gh-common.el + +(require 'eieio) + +(autoload 'gh-marshal-default-spec "gh-common" "\ + + +\(fn SLOT)" nil nil) + +(autoload 'gh-defclass "gh-common" "\ + + +\(fn NAME SUPERCLASS SLOTS &rest OPTIONS-AND-DOC)" nil t) + +(gh-defclass gh-object nil nil) + +(gh-defclass gh-ref-object (gh-object) ((id :initarg :id) (url :initarg :url) (html-url :initarg :html-url))) + +(gh-defclass gh-user (gh-ref-object) ((login :initarg :login) (gravatar-url :initarg :gravatar-url)) "Github user object") + +(gh-defclass gh-comment (gh-ref-object) ((body :initarg :body) (user :initarg :user :initform nil :marshal-type gh-user) (created-at :initarg :created_at) (updated-at :initarg :updated_at)) "Github comment object") + +;;;*** + +;;;### (autoloads nil "gh-gist" "gh-gist.el" (22454 5329 821433 515000)) +;;; Generated autoloads from gh-gist.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-gist-api '(gh-api-v3) "gh-gist" "Gist API") + +(gh-defclass gh-gist-gist-stub (gh-object) ((files :initarg :files :type list :initform nil :marshal-type (list gh-gist-gist-file)) (public :initarg :public :marshal-type bool) (description :initarg :description)) "Class for user-created gist objects") + +(gh-defclass gh-gist-history-change (gh-object) ((total :initarg :total) (additions :initarg :additions) (deletions :initarg :deletions))) + +(gh-defclass gh-gist-history-entry (gh-object) ((user :initarg :user :initform nil :marshal-type gh-user) (version :initarg :version) (committed :initarg :committed :marshal ((alist . committed_at))) (change :initarg :change :marshal ((alist . change_status)) :marshal-type gh-gist-history-change) (url :initarg :url))) + +(gh-defclass gh-gist-fork-entry (gh-ref-object) ((user :initarg :user :initform nil :marshal-type gh-user) (created :initarg :created :marshal ((alist . created_at))) (updated :initarg :updated :marshal ((alist . updated_at))))) + +(gh-defclass gh-gist-gist (gh-ref-object gh-gist-gist-stub) ((date :initarg :date :marshal ((alist . created_at))) (update :initarg :update :marshal ((alist . updated_at))) (push-url :initarg :push-url :marshal ((alist . git_push_url))) (pull-url :initarg :pull-url :marshal ((alist . git_pull_url))) (comments :initarg :comments) (user :initarg :user :initform nil :marshal-type gh-user :marshal ((alist . owner))) (history :initarg :history :initform nil :type list :marshal-type (list gh-gist-history-entry)) (forks :initarg :forks :initform nil :type list :marshal-type (list gh-gist-fork-entry))) "Gist object") + +(gh-defclass gh-gist-gist-file (gh-object) ((filename :initarg :filename) (size :initarg :size) (url :initarg :url :marshal ((alist . raw_url))) (content :initarg :content))) + +;;;*** + +;;;### (autoloads nil "gh-issue-comments" "gh-issue-comments.el" +;;;;;; (22454 5330 158441 440000)) +;;; Generated autoloads from gh-issue-comments.el + +(require 'eieio) + +;;;*** + +;;;### (autoloads nil "gh-issues" "gh-issues.el" (22454 5330 260443 +;;;;;; 838000)) +;;; Generated autoloads from gh-issues.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-issues-api '(gh-api-v3 gh-comments-api-mixin) "gh-issues" "Github Issues api") + +(gh-defclass gh-issues-issue (gh-ref-object) ((number :initarg :number) (state :initarg :state) (title :initarg :title) (body :initarg :body) (user :initarg :user :initform nil :marshal-type gh-user) (labels :initarg :labels :initform nil :marshal-type (list gh-issues-label)) (assignee :initarg :assignee :initform nil :marshal-type gh-user) (milestone :initarg :milestone :initform nil :marshal-type gh-issues-milestone) (comments :initarg :comments :initform 0) (pull-request :initarg :pull-request :marshal-type gh-issues-pull-request) (closed-at :initarg :created-at) (created-at :initarg :created-at) (updated-at :initarg :updated-at)) "issues request") + +(gh-defclass gh-issues-pull-request (gh-object) ((html-url :initarg :html-url) (diff-url :initarg :diff-url) (patch-url :initarg :patch-url))) + +(gh-defclass gh-issues-label (gh-ref-object) ((name :initarg :name) (color :initarg :color))) + +(gh-defclass gh-issues-milestone (gh-ref-object) ((number :initarg :number) (state :initarg :state) (title :initarg :title) (description :initarg :description) (creator :initarg :creator :initform nil :marshal-type gh-user) (open-issues :initarg :open-issues) (closed-issues :initarg :closed-issues) (created-at :initarg :created-at) (due-on :initarg :due-on)) "github milestone") + +(gh-defclass gh-issues-comment (gh-comment) nil) + +;;;*** + +;;;### (autoloads nil "gh-oauth" "gh-oauth.el" (22454 5329 791432 +;;;;;; 810000)) +;;; Generated autoloads from gh-oauth.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-oauth-api '(gh-api-v3) "gh-oauth" "OAuth API") + +(eieio-defclass-autoload 'gh-oauth-password-authenticator '(gh-password-authenticator) "gh-oauth" nil) + +(gh-defclass gh-oauth-authorization (gh-ref-object) ((scopes :initarg :scopes) (token :initarg :token) (app :initarg :app :initform nil :marshal-type gh-oauth-app) (updated-at :initarg :updated-at) (created-at :initarg :created-at))) + +(gh-defclass gh-oauth-app (gh-object) ((url :initarg :url) (name :initarg :name))) + +;;;*** + +;;;### (autoloads nil "gh-orgs" "gh-orgs.el" (22454 5330 124440 640000)) +;;; Generated autoloads from gh-orgs.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-orgs-api '(gh-api-v3) "gh-orgs" "Orgs API") + +(gh-defclass gh-orgs-org-stub (gh-ref-object) ((login :initarg :login) (avatar-url :initarg :avatar-url) (description :initarg :description))) + +(gh-defclass gh-orgs-plan (gh-object) ((name :initarg :name) (space :initarg :space) (private-repos :initarg :private-repos))) + +(gh-defclass gh-orgs-org (gh-orgs-org-stub) ((name :initarg :name) (company :initarg :company) (blog :initarg :blog) (location :initarg :location) (email :initarg :email) (public-repos :initarg :public-repos) (public-gists :initarg :public-gists) (followers :initarg :followers) (following :initarg :following) (created-at :initarg :created-at) (type :initarg :type) (total-private-repos :initarg :total-private-repos) (owned-private-repos :initarg :owned-private-repos) (private-gists :initarg :private-gists) (disk-usage :initarg :disk-usage) (collaborators :initarg :collaborators) (billing-email :initarg :billing-email) (plan :initarg :plan :initform nil :marshal-type gh-orgs-plan)) "Class for GitHub organizations") + +;;;*** + +;;;### (autoloads nil "gh-pull-comments" "gh-pull-comments.el" (22454 +;;;;;; 5330 339445 696000)) +;;; Generated autoloads from gh-pull-comments.el + +(require 'eieio) + +;;;*** + +;;;### (autoloads nil "gh-pulls" "gh-pulls.el" (22454 5330 294444 +;;;;;; 637000)) +;;; Generated autoloads from gh-pulls.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-pulls-cache '(gh-cache) "gh-pulls" nil) + +(eieio-defclass-autoload 'gh-pulls-api '(gh-api-v3 gh-comments-api-mixin) "gh-pulls" "Git pull requests API") + +(gh-defclass gh-pulls-comment (gh-comment) ((path :initarg :path) (diff-hunk :initarg :diff-hunk) (position :initarg :position) (original-position :initarg :original-position) (commit-id :initarg :commit-id) (original-commit-id :initarg :original-commit-id) (in-reply-to :initarg :in-reply-to :initform nil))) + +(gh-defclass gh-pulls-request-stub (gh-ref-object) ((diff-url :initarg :diff-url) (patch-url :initarg :patch-url) (issue-url :initarg :issue-url) (number :initarg :number) (state :initarg :state) (title :initarg :title) (body :initarg :body) (created-at :initarg :created-at) (updated-at :initarg :updated-at) (closed-at :initarg :closed-at) (merged-at :initarg :merged-at) (head :initarg :head :initform nil :marshal-type gh-repos-ref) (base :initarg :base :initform nil :marshal-type gh-repos-ref))) + +(gh-defclass gh-pulls-request (gh-pulls-request-stub) ((merged :initarg :merged) (mergeable :initarg :mergeable) (merged-by :initarg :merged-by) (comments :initarg :comments) (user :initarg :user :initform nil :marshal-type gh-user) (commits :initarg :commits) (additions :initarg :additions) (deletions :initarg :deletions) (changed-files :initarg :changed-files)) "Git pull requests API") + +;;;*** + +;;;### (autoloads nil "gh-repos" "gh-repos.el" (22454 5330 192442 +;;;;;; 239000)) +;;; Generated autoloads from gh-repos.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-repos-api '(gh-api-v3) "gh-repos" "Repos API") + +(gh-defclass gh-repos-repo-stub (gh-object) ((name :initarg :name) (description :initarg :description) (homepage :initarg :homepage) (private :initarg :private)) "Class for user-created repository objects") + +(gh-defclass gh-repos-repo (gh-ref-object gh-repos-repo-stub) ((clone-url :initarg :clone-url) (git-url :initarg :git-url) (ssh-url :initarg :ssh-url) (svn-url :initarg :svn-url) (mirror-url :initarg :mirror-url) (owner :initarg :owner :initform nil :marshal-type gh-user) (full-name :initarg :full-name) (language :initarg :language) (fork :initarg :fork) (forks :initarg :forks) (forks-count :initarg :forks-count) (watchers :initarg :watchers) (watchers-count :initarg :watchers-count) (stargazers-count :initarg :stargazers-count) (size :initarg :size) (master-branch :initarg :master-branch) (open-issues :initarg :open-issues) (pushed-at :initarg :pushed-at) (created-at :initarg :created-at) (updated-at :initarg :updated-at) (organisation :initarg :organisation :initform nil :marshal-type gh-user) (parent :initarg :parent :marshal-type gh-repos-repo) (source :initarg :source :marshal-type gh-repos-repo) (has-issues :initarg :has-issues) (has-wiki :initarg :has-wiki) (has-downloads :initarg :has-downloads)) "Class for GitHub repositories") + +(gh-defclass gh-repos-ref (gh-object) ((label :initarg :label) (ref :initarg :ref :initform nil) (sha :initarg :sha :initform nil) (user :initarg :user :initform nil :marshal-type gh-user) (repo :initarg :repo :initform nil :marshal-type gh-repos-repo))) + +;;;*** + +;;;### (autoloads nil "gh-search" "gh-search.el" (22454 5329 866434 +;;;;;; 573000)) +;;; Generated autoloads from gh-search.el + +(eieio-defclass-autoload 'gh-search-api '(gh-api-v3) "gh-search" nil) + +;;;*** + +;;;### (autoloads nil "gh-url" "gh-url.el" (22454 5329 685430 317000)) +;;; Generated autoloads from gh-url.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-url-request 'nil "gh-url" nil) + +(eieio-defclass-autoload 'gh-url-response 'nil "gh-url" nil) + +(eieio-defclass-autoload 'gh-url-callback 'nil "gh-url" nil) + +;;;*** + +;;;### (autoloads nil "gh-users" "gh-users.el" (22454 5330 46438 +;;;;;; 806000)) +;;; Generated autoloads from gh-users.el + +(require 'eieio) + +(eieio-defclass-autoload 'gh-users-api '(gh-api-v3) "gh-users" "Users API") + +(gh-defclass gh-users-user (gh-user) ((gravatar-id :initarg :gravatar-id) (html-url :initarg :html-url) (followers-url :initarg :followers-url) (following-url :initarg :following-url) (gists-url :initarg :gists-url) (starred-url :initarg :starred-url) (subscriptions-url :initarg :subscriptions-url) (organizations-url :initarg :organizations-url) (repos-url :initarg :repos-url) (events-url :initarg :events-url) (received-events-url :initarg :received-events-url) (type :initarg :type) (site-admin :initarg :site-admin) (name :initarg :name) (company :initarg :company) (blog :initarg :blog) (location :initarg :location) (email :initarg :email) (hireable :initarg :hireable) (bio :initarg :bio) (public-repos :initarg :public-repos) (public-gists :initarg :public-gists) (followers :initarg :followers) (following :initarg :following) (created-at :initarg :created-at) (update-at :initarg :update-at))) + +;;;*** + +;;;### (autoloads nil nil ("gh-pkg.el" "gh-profile.el" "gh.el") (22454 +;;;;;; 5330 1437 747000)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; gh-autoloads.el ends here diff --git a/elpa/gh-20160626.1349/gh-cache.el b/elpa/gh-20160728.1525/gh-cache.el similarity index 98% rename from elpa/gh-20160626.1349/gh-cache.el rename to elpa/gh-20160728.1525/gh-cache.el index 124bf61..a3050ee 100644 --- a/elpa/gh-20160626.1349/gh-cache.el +++ b/elpa/gh-20160728.1525/gh-cache.el @@ -36,11 +36,12 @@ (defconst gh-cache-outdated-expiration-delay (* 60 60 24)) -(defconst gh-cache-internal-version-constant 3) +(defconst gh-cache-internal-version-constant 4) (defconst gh-cache-version-constant (format "%s/gh-%s" pcache-version-constant gh-cache-internal-version-constant)) +;;;###autoload (defclass gh-cache (pcache-repository) ((version-constant :allocation :class) (entries :initarg :entries :initform (make-hash-table :test 'equal)) @@ -51,6 +52,7 @@ (oset-default 'gh-cache version-constant gh-cache-version-constant) +;;;###autoload (defclass gh-cache-entry (pcache-entry) ((etag :initarg :etag :initform nil) (outdated :initarg :outdated :initform nil) diff --git a/elpa/gh-20160728.1525/gh-comments.el b/elpa/gh-20160728.1525/gh-comments.el new file mode 100644 index 0000000..99631d2 --- /dev/null +++ b/elpa/gh-20160728.1525/gh-comments.el @@ -0,0 +1,71 @@ +;;; gh-comments.el --- support for comment-enabled APIs + +;; Copyright (C) 2014-2015 Yann Hodique + +;; Author: Yann Hodique +;; Keywords: + +;; This file 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 2, or (at your option) +;; any later version. + +;; This file 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 GNU Emacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; + +;;; Code: + +(eval-when-compile + (require 'cl)) + +;;;###autoload +(require 'eieio) + +(require 'gh-common) +(require 'gh-api) + +;;;###autoload +(defclass gh-comments-api-mixin () + ((comment-cls :allocation :class :initform gh-comment)) + :abstract t) + +(defmethod gh-comments-list ((api gh-comments-api-mixin) base) + (gh-api-authenticated-request + api (gh-object-list-reader (oref api comment-cls)) "GET" + (format "%s/comments" (gh-ref-object-base base)))) + +(defmethod gh-comments-get ((api gh-comments-api-mixin) base comment-id) + (gh-api-authenticated-request + api (gh-object-reader (oref api comment-cls)) "GET" + (format "%s/comments/%s" (gh-ref-object-base base) comment-id))) + +(defmethod gh-comments-update ((api gh-comments-api-mixin) base comment-id comment) + (gh-api-authenticated-request + api (gh-object-reader (oref api comment-cls)) "PATCH" + (format "%s/comments/%s" (gh-ref-object-base base) comment-id) + (gh-comment-req-to-update comment))) + +(defmethod gh-comments-new ((api gh-comments-api-mixin) base comment) + (gh-api-authenticated-request + api (gh-object-reader (oref api comment-cls)) "POST" + (format "%s/comments" (gh-ref-object-base base)) + (gh-comment-req-to-update comment))) + +(defmethod gh-comments-delete ((api gh-comments-api-mixin) base comment-id) + (gh-api-authenticated-request + api nil "DELETE" + (format "%s/comments/%s" (gh-ref-object-base base) comment-id))) + +(provide 'gh-comments) +;;; gh-comments.el ends here diff --git a/elpa/gh-20160626.1349/gh-common.el b/elpa/gh-20160728.1525/gh-common.el similarity index 65% rename from elpa/gh-20160626.1349/gh-common.el rename to elpa/gh-20160728.1525/gh-common.el index 09d8d6a..4a9a8c7 100644 --- a/elpa/gh-20160626.1349/gh-common.el +++ b/elpa/gh-20160728.1525/gh-common.el @@ -32,54 +32,16 @@ ;;;###autoload (require 'eieio) +(require 'dash) +(require 'marshal) +(require 's) (require 'gh-profile) (defgroup gh nil "Github API client libraries." :group 'applications) -(defclass gh-object () - ()) - -(defmethod gh-object-read :static ((obj gh-object) data) - (let ((target (if (object-p obj) obj - (make-instance obj)))) - (when data - (gh-object-read-into target data)) - target)) - -(defmethod gh-object-reader :static ((obj gh-object)) - (apply-partially 'gh-object-read obj)) - -(defmethod gh-object-list-read :static ((obj gh-object) data) - (mapcar (gh-object-reader obj) data)) - -(defmethod gh-object-list-reader :static ((obj gh-object)) - (apply-partially 'gh-object-list-read obj)) - -(defmethod gh-object-read-into ((obj gh-object) data)) - -(defmethod slot-unbound ((obj gh-object) cls slot-name fn) - (if (eq fn 'oref) nil - (call-next-method))) - -(defclass gh-user (gh-object) - ((login :initarg :login) - (id :initarg :id) - (avatar-url :initarg :avatar-url) - (gravatar-url :initarg :gravatar-url) - (url :initarg :url)) - "Github user object") - -(defmethod gh-object-read-into ((user gh-user) data) - (call-next-method) - (with-slots (login id avatar-url gravatar-url url) - user - (setq login (gh-read data 'login) - id (gh-read data 'id) - avatar-url (gh-read data 'avatar_url) - gravatar-url (gh-read data 'gravatar_url) - url (gh-read data 'url)))) +;;; Helper functions (defun gh-read (obj field) (cdr (assoc field obj))) @@ -108,6 +70,80 @@ (with-output-to-string (apply 'process-file git nil standard-output nil args)))) +;;; Base classes for common objects + +;;;###autoload +(defun gh-marshal-default-spec (slot) + (let ((slot-name (symbol-name slot))) + (list (cons 'alist + (intern (s-replace "-" "_" slot-name)))))) + +;;;###autoload +(defmacro gh-defclass (name superclass slots &rest options-and-doc) + `(marshal-defclass ,name ,superclass ,slots ,@options-and-doc + :marshal-default-spec gh-marshal-default-spec)) + +;;;###autoload +(gh-defclass gh-object () + ()) + +(defmethod gh-object-read :static ((obj gh-object) data) + (let ((target (if (object-p obj) obj + (make-instance obj)))) + (when data + (gh-object-read-into target data)) + target)) + +(defmethod gh-object-reader :static ((obj gh-object)) + (apply-partially 'gh-object-read obj)) + +(defmethod gh-object-list-read :static ((obj gh-object) data) + (mapcar (gh-object-reader obj) data)) + +(defmethod gh-object-list-reader :static ((obj gh-object)) + (apply-partially 'gh-object-list-read obj)) + +(defmethod gh-object-read-into ((obj gh-object) data) + (unmarshal obj data 'alist)) + +(defmethod slot-unbound ((obj gh-object) cls slot-name fn) + (if (eq fn 'oref) nil + (call-next-method))) + +;;;###autoload +(gh-defclass gh-ref-object (gh-object) + ((id :initarg :id) + (url :initarg :url) + (html-url :initarg :html-url))) + +(defmethod gh-ref-object-base ((obj gh-ref-object)) + (let ((url (oref obj :url))) + (--> (s-split "/" url t) + (-slice it 2) + (s-join "/" it) + (concat "/" it)))) + +(defmethod gh-ref-object-base (obj) + (if (stringp obj) obj + (error "illegal input for `gh-ref-object-base'"))) + +;;;###autoload +(gh-defclass gh-user (gh-ref-object) + ((login :initarg :login) + (gravatar-url :initarg :gravatar-url)) + "Github user object") + +;;;###autoload +(gh-defclass gh-comment (gh-ref-object) + ((body :initarg :body) + (user :initarg :user :initform nil :marshal-type gh-user) + (created-at :initarg :created_at) + (updated-at :initarg :updated_at)) + "Github comment object") + +(defmethod gh-comment-req-to-update ((req gh-comment)) + `(("body" . ,(oref req :body)))) + (provide 'gh-common) ;;; gh-common.el ends here diff --git a/elpa/gh-20160626.1349/gh-gist.el b/elpa/gh-20160728.1525/gh-gist.el similarity index 63% rename from elpa/gh-20160626.1349/gh-gist.el rename to elpa/gh-20160728.1525/gh-gist.el index 90c52eb..bb7479d 100644 --- a/elpa/gh-20160626.1349/gh-gist.el +++ b/elpa/gh-20160728.1525/gh-gist.el @@ -42,85 +42,70 @@ "Gist API") ;;;###autoload -(defclass gh-gist-gist-stub (gh-object) - ((files :initarg :files :type list :initform nil) - (public :initarg :public) - (description :initarg :description) - - (file-cls :allocation :class :initform gh-gist-gist-file)) +(gh-defclass gh-gist-gist-stub (gh-object) + ((files :initarg :files :type list :initform nil :marshal-type (list gh-gist-gist-file)) + (public :initarg :public :marshal-type bool) + (description :initarg :description)) "Class for user-created gist objects") -(defmethod gh-object-read-into ((stub gh-gist-gist-stub) data) - (call-next-method) - (with-slots (files public description) - stub - (setq files (gh-object-list-read (oref stub file-cls) - (gh-read data 'files)) - public (gh-read data 'public) - description (gh-read data 'description)))) +;;;###autoload +(gh-defclass gh-gist-history-change (gh-object) + ((total :initarg :total) + (additions :initarg :additions) + (deletions :initarg :deletions))) ;;;###autoload -(defclass gh-gist-gist (gh-gist-gist-stub) - ((date :initarg :date) - (update :initarg :update) - (push-url :initarg :push-url) - (pull-url :initarg :pull-url) - (html-url :initarg :html-url) - (comments :initarg :comments) - (user :initarg :user :initform nil) - (id :initarg :id :type string) - (url :initarg :url :type string) - (forks :initarg :forks :initform nil) +(gh-defclass gh-gist-history-entry (gh-object) + ((user :initarg :user :initform nil :marshal-type gh-user) + (version :initarg :version) + (committed :initarg :committed :marshal ((alist . committed_at))) + (change :initarg :change :marshal ((alist . change_status)) + :marshal-type gh-gist-history-change) + (url :initarg :url))) - (user-cls :allocation :class :initform gh-user)) +;;;###autoload +(gh-defclass gh-gist-fork-entry (gh-ref-object) + ((user :initarg :user :initform nil :marshal-type gh-user) + (created :initarg :created :marshal ((alist . created_at))) + (updated :initarg :updated :marshal ((alist . updated_at))))) + +;;;###autoload +(gh-defclass gh-gist-gist (gh-ref-object gh-gist-gist-stub) + ((date :initarg :date :marshal ((alist . created_at))) + (update :initarg :update :marshal ((alist . updated_at))) + (push-url :initarg :push-url :marshal ((alist . git_push_url))) + (pull-url :initarg :pull-url :marshal ((alist . git_pull_url))) + (comments :initarg :comments) + (user :initarg :user :initform nil :marshal-type gh-user :marshal ((alist . owner))) + (history :initarg :history :initform nil :type list :marshal-type (list gh-gist-history-entry)) + (forks :initarg :forks :initform nil :type list :marshal-type (list gh-gist-fork-entry))) "Gist object") -(defmethod gh-object-read-into ((gist gh-gist-gist) data) - (call-next-method) - (with-slots (date update push-url pull-url html-url comments user - id url forks) - gist - (setq date (gh-read data 'created_at) - update (gh-read data 'updated_at) - push-url (gh-read data 'git_push_url) - pull-url (gh-read data 'git_pull_url) - html-url (gh-read data 'html_url) - comments (gh-read data 'comments) - user (gh-object-read (or (oref gist :user) - (oref gist user-cls)) - (gh-read data 'user)) - id (gh-read data 'id) - url (gh-read data 'url) - forks (gh-read data 'forks)))) - -(defclass gh-gist-gist-file (gh-object) +;;;###autoload +(gh-defclass gh-gist-gist-file (gh-object) ((filename :initarg :filename) (size :initarg :size) - (url :initarg :url) + (url :initarg :url :marshal ((alist . raw_url))) (content :initarg :content))) -(defmethod gh-object-read-into ((file gh-gist-gist-file) data) - (call-next-method) - (with-slots (filename size url content) - file - (setq - filename (gh-read data 'filename) - size (gh-read data 'size) - url (gh-read data 'raw_url) - content (gh-read data 'content)))) - (defmethod gh-gist-gist-to-obj ((gist gh-gist-gist-stub)) - `(("description" . ,(oref gist :description)) - ("public" . ,(oref gist :public)) - ("files" . ,(mapcar 'gh-gist-gist-file-to-obj (oref gist :files))))) + (let ((files (mapcar #'gh-gist-gist-file-to-obj (oref gist :files)))) + `(("description" . ,(oref gist :description)) + ("public" . ,(oref gist :public)) + ,@(and files (list (cons "files" files)))))) (defmethod gh-gist-gist-has-files ((gist gh-gist-gist-stub)) (not (memq nil (mapcar (lambda (f) (oref f :content)) (oref gist :files))))) (defmethod gh-gist-gist-file-to-obj ((file gh-gist-gist-file)) - `(,(oref file :filename) . (("filename" . ,(oref file :filename)) - ("content" . ,(oref file :content))))) + (let* ((filename (oref file :filename)) + (content (oref file :content)) + (file (if content + `(("filename" . ,filename) + ("content" . ,content)) + nil))) + (cons filename file))) (defmethod gh-gist-list ((api gh-gist-api) &optional username) (gh-api-authenticated-request diff --git a/elpa/gh-20160728.1525/gh-issue-comments.el b/elpa/gh-20160728.1525/gh-issue-comments.el new file mode 100644 index 0000000..8887e9a --- /dev/null +++ b/elpa/gh-20160728.1525/gh-issue-comments.el @@ -0,0 +1,72 @@ +;;; gh-issue-comments.el --- issue comments api for github + +;; Copyright (C) 2014 Travis Thieman + +;; Author: Travis Thieman +;; Keywords: + +;; 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 of the License, 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. If not, see . + +;;; Commentary: + +;; TODOS: +;; * Support listing all comments in a repository + +;; Basic usage: + +;; (setf api (gh-issue-comments-api "api" :sync nil :cache nil :num-retries 1)) +;; (setf comments (gh-issue-comments-list api "user" "repo" "issue id")) +;; (setq my-comment (make-instance 'gh-issue-comments-comment :body "This is great!")) +;; (gh-issue-comments-new api "user" "repo" "issue id" my-comment) + +;;; Code: + +(eval-when-compile + (require 'cl)) + +;;;###autoload +(require 'eieio) + +(require 'gh-api) +(require 'gh-auth) +(require 'gh-common) + +(require 'gh-issues) + +(let ((ver "1.0.0")) + (define-obsolete-function-alias + 'gh-issue-comments-api 'gh-issues-api ver) + (define-obsolete-function-alias + 'gh-issue-comments-comment 'gh-issues-comment ver) + + (define-obsolete-function-alias + 'gh-issue-comments-req-to-update 'gh-comment-req-to-update ver) + + (define-obsolete-function-alias + 'gh-issue-comments-list 'gh-issues-comments-list ver) + (define-obsolete-function-alias + 'gh-issue-comments-get 'gh-issues-comments-get ver) + (define-obsolete-function-alias + 'gh-issue-comments-update 'gh-issues-comments-update ver) + (define-obsolete-function-alias + 'gh-issue-comments-new 'gh-issues-comments-new ver) + (define-obsolete-function-alias + 'gh-issue-comments-delete 'gh-issues-comments-delete ver)) + +(provide 'gh-issue-comments) +;;; gh-issue-comments.el ends here + +;; Local Variables: +;; indent-tabs-mode: nil +;; End: diff --git a/elpa/gh-20160626.1349/gh-issues.el b/elpa/gh-20160728.1525/gh-issues.el similarity index 68% rename from elpa/gh-20160626.1349/gh-issues.el rename to elpa/gh-20160728.1525/gh-issues.el index 4a1eddc..17f332e 100644 --- a/elpa/gh-20160626.1349/gh-issues.el +++ b/elpa/gh-20160728.1525/gh-issues.el @@ -1,5 +1,7 @@ ;;; gh-issues.el --- issues api for github +;; Copyright (C) 2014-2015 Yann Hodique +;; Copyright (C) 2014 Travis Thieman ;; Copyright (C) 2012 Raimon Grau ;; Author: Raimon Grau @@ -27,6 +29,9 @@ ;; (last (oref issues data)) ; get one issue ;; (setq mi (make-instance 'gh-issues-issue :body "issue body" :title "issue title")) ;; (gh-issues-issue-new api "user" "repo" mi) +;; (setf comments (gh-issues-comments-list api "user" "repo" "issue id")) +;; (setq my-comment (make-instance 'gh-issues-comment :body "This is great!")) +;; (gh-issues-comments-new api "user" "repo" "issue id" my-comment) ;;; Code: @@ -38,103 +43,67 @@ (require 'gh-api) (require 'gh-auth) +(require 'gh-comments) (require 'gh-common) (require 'gh-repos) -(defclass gh-issues-api (gh-api-v3) +;;;###autoload +(defclass gh-issues-api (gh-api-v3 gh-comments-api-mixin) ((issue-cls :allocation :class :initform gh-issues-issue) (milestone-cls :allocation :class :initform gh-issues-milestone) - (label-cls :allocation :class :initform gh-issues-label)) + (label-cls :allocation :class :initform gh-issues-label) + (comment-cls :allocation :class :initform gh-issues-comment)) "Github Issues api") -(defclass gh-issues-issue (gh-object) - ((url :initarg :url) - (html-url :initarg :html-url) - (number :initarg :number) +;;;###autoload +(gh-defclass gh-issues-issue (gh-ref-object) + ((number :initarg :number) (state :initarg :state) (title :initarg :title) (body :initarg :body) - (user :initarg :user :initform nil) - (labels :initarg :labels :initform nil) - (assignee :initarg :assignee :initform nil) - (milestone :initarg :milestone :initform nil) - (open_issues :initarg :open_issues) - (closed_issues :initarg :closed_issues) - (created_at :initarg :created_at) - (due_on :initarg :due_on) - - (user-cls :allocation :class :initform gh-user) - (milestone-cls :allocation :class :initform gh-issues-milestone)) + (user :initarg :user :initform nil :marshal-type gh-user) + (labels :initarg :labels :initform nil :marshal-type (list gh-issues-label)) + (assignee :initarg :assignee :initform nil :marshal-type gh-user) + (milestone :initarg :milestone :initform nil :marshal-type gh-issues-milestone) + (comments :initarg :comments :initform 0) + (pull-request :initarg :pull-request :marshal-type gh-issues-pull-request) + (closed-at :initarg :created-at) + (created-at :initarg :created-at) + (updated-at :initarg :updated-at)) "issues request") -(defclass gh-issues-label (gh-object) - ((url :initarg :url) - (name :initarg :name) +;;;###autoload +(gh-defclass gh-issues-pull-request (gh-object) + ((html-url :initarg :html-url) + (diff-url :initarg :diff-url) + (patch-url :initarg :patch-url))) + +;;;###autoload +(gh-defclass gh-issues-label (gh-ref-object) + ((name :initarg :name) (color :initarg :color))) -(defclass gh-issues-milestone (gh-object) - ((url :initarg :url) - (number :initarg :number) +(defmethod gh-issues-label-req-to-update ((label gh-issues-label)) + `(("name" . ,(oref label :name)) + ("color" . ,(oref label :color)))) + +;;;###autoload +(gh-defclass gh-issues-milestone (gh-ref-object) + ((number :initarg :number) (state :initarg :state) (title :initarg :title) (description :initarg :description) - (creator :initarg :creator :initform nil) - (open_issues :initarg :open_issues) - (closed_issues :initarg :closed_issues) - (created_at :initarg :created_at) - (due_on :initarg :due_on) - - (user-cls :allocation :class :initform gh-user)) + (creator :initarg :creator :initform nil :marshal-type gh-user) + (open-issues :initarg :open-issues ) + (closed-issues :initarg :closed-issues) + (created-at :initarg :created-at) + (due-on :initarg :due-on)) "github milestone") -(defmethod gh-object-read-into ((issue gh-issues-issue) data) - (call-next-method) - (with-slots (url html-url number state title body - user labels assignee milestone open_issues - closed_issues created_at due_on) - issue - (setq url (gh-read data 'url) - html-url (gh-read data 'html_url) - number (gh-read data 'number) - state (gh-read data 'state) - title (gh-read data 'title) - body (gh-read data 'body) - user (gh-object-read (or (oref issue :user) - (oref issue user-cls)) - (gh-read data 'user)) - labels (gh-read data 'labels) - assignee (gh-object-read (or (oref issue :assignee) - (oref issue user-cls)) - (gh-read data 'assignee)) - milestone (gh-object-read (or (oref issue :milestone) - (oref issue milestone-cls)) - (gh-read data 'milestone)) - open_issues (gh-read data 'open_issues) - closed_issues (gh-read data 'closed_issues) - created_at (gh-read data 'created_at) - due_on (gh-read data 'due_on)))) - - -(defmethod gh-object-read-into ((milestone gh-issues-milestone) data) - (call-next-method) - (with-slots (url number state title description creator - open_issues closed_issues - created_at due_on) - milestone - (setq url (gh-read data 'url) - number (gh-read data 'number) - state (gh-read data 'state) - title (gh-read data 'title) - description (gh-read data 'description) - creator (gh-object-read (or (oref milestone :creator) - (oref milestone user-cls)) - (gh-read data 'creator)) - - open_issues (gh-read data 'open_issues) - closed_issues (gh-read data 'closed_issues) - created_at (gh-read data 'created_at) - due_on (gh-read data 'due_on)))) +;;;###autoload +(gh-defclass gh-issues-comment (gh-comment) + ()) (defmethod gh-issues-issue-list ((api gh-issues-api) user repo) (gh-api-authenticated-request @@ -206,23 +175,7 @@ (format "/repos/%s/%s/issues" user repo) (gh-issues-issue-req-to-update issue))) -;;; labels -(defclass gh-issues-label (gh-object) - ((url :initarg :url) - (name :initarg :name) - (color :initarg :color))) - -(defmethod gh-object-read-into ((label gh-issues-label) data) - (call-next-method) - (with-slots (url name color) - label - (setq url (gh-read data 'url) - name (gh-read data 'name) - color (gh-read data 'color)))) - -(defmethod gh-issues-label-req-to-update ((label gh-issues-label)) - `(("name" . ,(oref label name)) - ("color" . ,(oref label color)))) +;;; Labels (defmethod gh-issues-label-get ((api gh-issues-api) user repo name) (gh-api-authenticated-request @@ -281,6 +234,26 @@ api (gh-object-list-reader (oref api label-cls)) "GET" (format "/repos/%s/%s/milestones/%s/labels" user repo milestone-id)))) +;;; Comments + +(defmethod gh-issues-comments-list ((api gh-issues-api) user repo issue-id) + (gh-comments-list api (format "/repos/%s/%s/issues/%s" user repo issue-id))) + +(defmethod gh-issues-comments-get ((api gh-issues-api) user repo comment-id) + (gh-comments-get api (format "/repos/%s/%s/issues" user repo) comment-id)) + +(defmethod gh-issues-comments-update ((api gh-issues-api) + user repo comment-id comment) + (gh-comments-update api (format "/repos/%s/%s/issues" user repo) + comment-id (gh-comment-req-to-update comment))) + +(defmethod gh-issues-comments-new ((api gh-issues-api) + user repo issue-id comment) + (gh-comments-new api (format "/repos/%s/%s/issues/%s" user repo issue-id) + (gh-comment-req-to-update comment))) + +(defmethod gh-issues-comments-delete ((api gh-issues-api) user repo comment-id) + (gh-comments-delete api (format "/repos/%s/%s/issues" user repo) comment-id)) ;;; helpers diff --git a/elpa/gh-20160626.1349/gh-oauth.el b/elpa/gh-20160728.1525/gh-oauth.el similarity index 72% rename from elpa/gh-20160626.1349/gh-oauth.el rename to elpa/gh-20160728.1525/gh-oauth.el index 774a83a..b4192fc 100644 --- a/elpa/gh-20160626.1349/gh-oauth.el +++ b/elpa/gh-20160728.1525/gh-oauth.el @@ -41,6 +41,7 @@ ((auth-cls :allocation :class :initform gh-oauth-authorization)) "OAuth API") +;;;###autoload (defclass gh-oauth-password-authenticator (gh-password-authenticator) ((remember :allocation :class :initform nil))) @@ -49,42 +50,19 @@ (let ((gh-api-v3-authenticator 'gh-oauth-password-authenticator)) (call-next-method))) -(defclass gh-oauth-authorization (gh-object) - ((id :initarg :id) - (url :initarg :url) - (scopes :initarg :scopes) +;;;###autoload +(gh-defclass gh-oauth-authorization (gh-ref-object) + ((scopes :initarg :scopes) (token :initarg :token) - (app :initarg :app :initform nil) + (app :initarg :app :initform nil :marshal-type gh-oauth-app) (updated-at :initarg :updated-at) - (created-at :initarg :created-at) + (created-at :initarg :created-at))) - (app-cls :allocation :class :initform gh-oauth-app))) - -(defmethod gh-object-read-into ((auth gh-oauth-authorization) data) - (call-next-method) - (with-slots (id url scopes token app updated-at created-at) - auth - (setq id (gh-read data 'id) - url (gh-read data 'url) - scopes (gh-read data 'scopes) - token (gh-read data 'token) - app (gh-object-read (or (oref auth :app) - (oref auth app-cls)) - (gh-read data 'app)) - updated-at (gh-read data 'updated_at) - created-at (gh-read data 'created_at)))) - -(defclass gh-oauth-app (gh-object) +;;;###autoload +(gh-defclass gh-oauth-app (gh-object) ((url :initarg :url) (name :initarg :name))) -(defmethod gh-object-read-into ((app gh-oauth-app) data) - (call-next-method) - (with-slots (url name) - app - (setq url (gh-read data 'url) - name (gh-read data 'name)))) - (defmethod gh-oauth-auth-list ((api gh-oauth-api)) (gh-api-authenticated-request api (gh-object-list-reader (oref api auth-cls)) "GET" diff --git a/elpa/gh-20160626.1349/gh-orgs.el b/elpa/gh-20160728.1525/gh-orgs.el similarity index 58% rename from elpa/gh-20160626.1349/gh-orgs.el rename to elpa/gh-20160728.1525/gh-orgs.el index d4121b8..2f263f1 100644 --- a/elpa/gh-20160626.1349/gh-orgs.el +++ b/elpa/gh-20160728.1525/gh-orgs.el @@ -42,35 +42,19 @@ "Orgs API") ;;;###autoload -(defclass gh-orgs-org-stub (gh-object) +(gh-defclass gh-orgs-org-stub (gh-ref-object) ((login :initarg :login) - (id :initarg :id) - (url :initarg :url) - (avatar-url :initarg :avatar-url))) + (avatar-url :initarg :avatar-url) + (description :initarg :description))) -(defmethod gh-object-read-into ((stub gh-orgs-org-stub) data) - (call-next-method) - (with-slots (login id url avatar-url) - stub - (setq login (gh-read data 'login) - id (gh-read data 'id) - url (gh-read data 'url) - avatar-url (gh-read data 'avatar_url)))) - -(defclass gh-orgs-plan (gh-object) +;;;###autoload +(gh-defclass gh-orgs-plan (gh-object) ((name :initarg :name) (space :initarg :space) (private-repos :initarg :private-repos))) -(defmethod gh-object-read-into ((plan gh-orgs-plan) data) - (call-next-method) - (with-slots (name space private-repos) - plan - (setq name (gh-read data 'name) - space (gh-read data 'space) - private-repos (gh-read data 'private_repos)))) - -(defclass gh-orgs-org (gh-orgs-org-stub) +;;;###autoload +(gh-defclass gh-orgs-org (gh-orgs-org-stub) ((name :initarg :name) (company :initarg :company) (blog :initarg :blog) @@ -80,7 +64,6 @@ (public-gists :initarg :public-gists) (followers :initarg :followers) (following :initarg :following) - (html-url :initarg :html-url) (created-at :initarg :created-at) (type :initarg :type) (total-private-repos :initarg :total-private-repos) @@ -89,42 +72,9 @@ (disk-usage :initarg :disk-usage) (collaborators :initarg :collaborators) (billing-email :initarg :billing-email) - (plan :initarg :plan :initform nil) - - (plan-cls :allocation :class :initform gh-orgs-plan)) + (plan :initarg :plan :initform nil :marshal-type gh-orgs-plan)) "Class for GitHub organizations") -(defmethod gh-object-read-into ((org gh-orgs-org) data) - (call-next-method) - (with-slots (name company blog location email - public-repos public-gists followers following - html-url created-at type - total-private-repos owned-private-repos - private-gists disk-usage collaborators - billing-email plan) - org - (setq name (gh-read data 'name) - company (gh-read data 'company) - blog (gh-read data 'blog) - location (gh-read data 'location) - email (gh-read data 'email) - public-repos (gh-read data 'public_repos) - public-gists (gh-read data 'public_gists) - followers (gh-read data 'followers) - following (gh-read data 'following) - html-url (gh-read data 'html_url) - created-at (gh-read data 'created_at) - type (gh-read data 'type) - total-private-repos (gh-read data 'total_private_repos) - owned-private-repos (gh-read data 'owned_private_repos) - private-gists (gh-read data 'private_gists) - disk-usage (gh-read data 'disk_usage) - collaborators (gh-read data 'collaborators) - billing-email (gh-read data 'billing_email) - plan (gh-object-read (or (oref org :plan) - (oref org plan-cls)) - (gh-read data 'plan))))) - (defmethod gh-orgs-org-to-obj ((org gh-orgs-org)) `(,@(when (slot-boundp org :billing-email) (list (cons "billing_email" (oref org :billing-email)))) diff --git a/elpa/gh-20160728.1525/gh-pkg.el b/elpa/gh-20160728.1525/gh-pkg.el new file mode 100644 index 0000000..c1f1140 --- /dev/null +++ b/elpa/gh-20160728.1525/gh-pkg.el @@ -0,0 +1,10 @@ +(define-package "gh" "20160728.1525" "A GitHub library for Emacs" + '((emacs "24.3") + (s "1.9.0") + (dash "2.9.0") + (pcache "0.4.1") + (logito "0.1") + (marshal "0.6.3"))) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/gh-20160626.1349/gh-profile.el b/elpa/gh-20160728.1525/gh-profile.el similarity index 100% rename from elpa/gh-20160626.1349/gh-profile.el rename to elpa/gh-20160728.1525/gh-profile.el diff --git a/elpa/gh-20160728.1525/gh-pull-comments.el b/elpa/gh-20160728.1525/gh-pull-comments.el new file mode 100644 index 0000000..5cd73c5 --- /dev/null +++ b/elpa/gh-20160728.1525/gh-pull-comments.el @@ -0,0 +1,78 @@ +;;; gh-pull-comments.el --- pull request comments api for github + +;; Copyright (C) 2014 Toni Reina + +;; Author: Toni Reina +;; Keywords: + +;; 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 of the License, 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. If not, see . + +;;; Commentary: + +;; TODOS: +;; * Support listing all comments in a repository + +;; Basic usage: + +;; (setf api (gh-pull-comments-api "api" :sync nil :cache nil :num-retries 1)) +;; (setf comments (gh-pull-comments-list api "user" "repo" "pull request id")) +;; (setq my-comment (make-instance 'gh-pull-comments-comment +;; :body "This is great!" +;; :path "README.md" +;; :position 2 +;; :commit-id "commit sha")) +;; (gh-pull-comments-new api "user" "repo" "pull request id" my-comment) + +;;; Code: + +(eval-when-compile + (require 'cl)) + +;;;###autoload +(require 'eieio) + +(require 'gh-api) +(require 'gh-auth) +(require 'gh-common) + +(require 'gh-pulls) + +(let ((ver "1.0.0")) + (define-obsolete-function-alias + 'gh-pull-comments-api 'gh-pulls-api ver) + (define-obsolete-function-alias + 'gh-pull-comments-comment 'gh-pulls-comment ver) + + (define-obsolete-function-alias + 'gh-pull-comments-req-to-update 'gh-comment-req-to-update ver) + (define-obsolete-function-alias + 'gh-pull-comments-req-to-create 'gh-pulls-comment-req-to-create) + + (define-obsolete-function-alias + 'gh-pull-comments-list 'gh-pulls-comments-list ver) + (define-obsolete-function-alias + 'gh-pull-comments-get 'gh-pulls-comments-get ver) + (define-obsolete-function-alias + 'gh-pull-comments-update 'gh-pulls-comments-update ver) + (define-obsolete-function-alias + 'gh-pull-comments-new 'gh-pulls-comments-new ver) + (define-obsolete-function-alias + 'gh-pull-comments-delete 'gh-pulls-comments-delete ver)) + +(provide 'gh-pull-comments) +;;; gh-pull-comments.el ends here + +;; Local Variables: +;; indent-tabs-mode: nil +;; End: diff --git a/elpa/gh-20160626.1349/gh-pulls.el b/elpa/gh-20160728.1525/gh-pulls.el similarity index 57% rename from elpa/gh-20160626.1349/gh-pulls.el rename to elpa/gh-20160728.1525/gh-pulls.el index 99e391e..9472943 100644 --- a/elpa/gh-20160626.1349/gh-pulls.el +++ b/elpa/gh-20160728.1525/gh-pulls.el @@ -34,26 +34,48 @@ (require 'gh-api) (require 'gh-auth) +(require 'gh-comments) (require 'gh-common) (require 'gh-repos) +;;;###autoload (defclass gh-pulls-cache (gh-cache) ((invalidation-chain :allocation :class :initform '(("^/repos/.*/.*/pulls$" . "\0") ("^/repos/.*/.*/pulls/.*$" . "\0"))))) ;;;###autoload -(defclass gh-pulls-api (gh-api-v3) +(defclass gh-pulls-api (gh-api-v3 gh-comments-api-mixin) ((cache-cls :allocation :class :initform gh-pulls-cache) - (req-cls :allocation :class :initform gh-pulls-request)) + (req-cls :allocation :class :initform gh-pulls-request) + (comment-cls :allocation :class :initform gh-pulls-comment)) "Git pull requests API") -(defclass gh-pulls-request-stub (gh-object) - ((url :initarg :url) - (html-url :initarg :html-url) - (diff-url :initarg :diff-url) +;;;###autoload +(gh-defclass gh-pulls-comment (gh-comment) + ((path :initarg :path) + (diff-hunk :initarg :diff-hunk) + (position :initarg :position) + (original-position :initarg :original-position) + (commit-id :initarg :commit-id) + (original-commit-id :initarg :original-commit-id) + (in-reply-to :initarg :in-reply-to :initform nil))) + +(defmethod gh-pulls-comment-req-to-create ((req gh-pulls-comment)) + (let ((in-reply-to (oref req in-reply-to)) + (to-update `(("body" . ,(oref req body))))) + (if in-reply-to + (nconc to-update `(("in_reply_to" . ,in-reply-to))) + (nconc to-update `(("commit_id" . ,(oref req commit-id)) + ("path" . ,(oref req path)) + ("position" . ,(oref req position))))) + to-update)) + +;;;###autoload +(gh-defclass gh-pulls-request-stub (gh-ref-object) + ((diff-url :initarg :diff-url) (patch-url :initarg :patch-url) (issue-url :initarg :issue-url) (number :initarg :number) @@ -64,71 +86,22 @@ (updated-at :initarg :updated-at) (closed-at :initarg :closed-at) (merged-at :initarg :merged-at) - (head :initarg :head :initform nil) - (base :initarg :base :initform nil) - - (ref-cls :allocation :class :initform gh-repos-ref))) - -(defmethod gh-object-read-into ((stub gh-pulls-request-stub) data) - (call-next-method) - (with-slots (url html-url diff-url patch-url issue-url number - state title body created-at updated-at - closed-at merged-at head base) - stub - (setq url (gh-read data 'url) - html-url (gh-read data 'html_url) - diff-url (gh-read data 'diff_url) - patch-url (gh-read data 'patch_url) - issue-url (gh-read data 'issue_url) - number (gh-read data 'number) - state (gh-read data 'state) - title (gh-read data 'title) - body (gh-read data 'body) - created-at (gh-read data 'created_at) - updated-at (gh-read data 'updated_at) - closed-at (gh-read data 'closed_at) - merged-at (gh-read data 'merged_at) - head (gh-object-read (or (oref stub :head) - (oref stub ref-cls)) - (gh-read data 'head)) - base (gh-object-read (or (oref stub :base) - (oref stub ref-cls)) - (gh-read data 'base))))) + (head :initarg :head :initform nil :marshal-type gh-repos-ref) + (base :initarg :base :initform nil :marshal-type gh-repos-ref))) ;;;###autoload -(defclass gh-pulls-request (gh-pulls-request-stub) +(gh-defclass gh-pulls-request (gh-pulls-request-stub) ((merged :initarg :merged) (mergeable :initarg :mergeable) (merged-by :initarg :merged-by) (comments :initarg :comments) - (user :initarg :user :initform nil) + (user :initarg :user :initform nil :marshal-type gh-user) (commits :initarg :commits) (additions :initarg :additions) (deletions :initarg :deletions) - (changed-files :initarg :changed-files) - - (ref-cls :allocation :class :initform gh-repos-ref) - (user-cls :allocation :class :initform gh-user)) + (changed-files :initarg :changed-files)) "Git pull requests API") -(defmethod gh-object-read-into ((req gh-pulls-request) data) - (call-next-method) - (with-slots (merged mergeable - merged-by comments user commits additions - deletions changed-files) - req - (setq merged (gh-read data 'merged) - mergeable (gh-read data 'mergeable) - merged-by (gh-read data 'merged_by) - comments (gh-read data 'comments) - user (gh-object-read (or (oref req :user) - (oref req user-cls)) - (gh-read data 'user)) - commits (gh-read data 'commits) - additions (gh-read data 'additions) - deletions (gh-read data 'deletions) - changed-files (gh-read data 'changed_files)))) - (defmethod gh-pulls-req-to-new ((req gh-pulls-request)) (let ((head (oref req :head)) (base (oref req :base))) @@ -164,6 +137,27 @@ (format "/repos/%s/%s/pulls/%s" user repo id) (gh-pulls-req-to-update req))) +;;; Comments + +(defmethod gh-pulls-comments-list ((api gh-pulls-api) user repo pull-id) + (gh-comments-list api (format "/repos/%s/%s/pulls/%s" user repo pull-id))) + +(defmethod gh-pulls-comments-get ((api gh-pulls-api) user repo comment-id) + (gh-comments-get api (format "/repos/%s/%s/pulls" user repo) comment-id)) + +(defmethod gh-pulls-comments-update ((api gh-pulls-api) + user repo comment-id comment) + (gh-comments-update api (format "/repos/%s/%s/pulls" user repo) + comment-id (gh-comment-req-to-update comment))) + +(defmethod gh-pulls-comments-new ((api gh-pulls-api) + user repo pull-id comment) + (gh-comments-new api (format "/repos/%s/%s/pulls/%s" user repo pull-id) + (gh-pulls-comment-req-to-create comment))) + +(defmethod gh-pulls-comments-delete ((api gh-pulls-api) user repo comment-id) + (gh-comments-delete api (format "/repos/%s/%s/pulls" user repo) comment-id)) + (provide 'gh-pulls) ;;; gh-pulls.el ends here diff --git a/elpa/gh-20160626.1349/gh-repos.el b/elpa/gh-20160728.1525/gh-repos.el similarity index 75% rename from elpa/gh-20160626.1349/gh-repos.el rename to elpa/gh-20160728.1525/gh-repos.el index 328a61d..ce9037c 100644 --- a/elpa/gh-20160626.1349/gh-repos.el +++ b/elpa/gh-20160728.1525/gh-repos.el @@ -43,33 +43,21 @@ "Repos API") ;;;###autoload -(defclass gh-repos-repo-stub (gh-object) +(gh-defclass gh-repos-repo-stub (gh-object) ((name :initarg :name) (description :initarg :description) (homepage :initarg :homepage) (private :initarg :private)) "Class for user-created repository objects") -(defmethod gh-object-read-into ((stub gh-repos-repo-stub) data) - (call-next-method) - (with-slots (name description homepage private) - stub - (setq name (gh-read data 'name) - description (gh-read data 'description) - homepage (gh-read data 'homepage) - private (gh-read data 'private)))) - ;;;###autoload -(defclass gh-repos-repo (gh-repos-repo-stub) - ((url :initarg :url) - (html-url :initarg :html-url) - (clone-url :initarg :clone-url) +(gh-defclass gh-repos-repo (gh-ref-object gh-repos-repo-stub) + ((clone-url :initarg :clone-url) (git-url :initarg :git-url) (ssh-url :initarg :ssh-url) (svn-url :initarg :svn-url) (mirror-url :initarg :mirror-url) - (owner :initarg :owner :initform nil) - (id :initarg :id) + (owner :initarg :owner :initform nil :marshal-type gh-user) (full-name :initarg :full-name) (language :initarg :language) (fork :initarg :fork) @@ -84,84 +72,21 @@ (pushed-at :initarg :pushed-at) (created-at :initarg :created-at) (updated-at :initarg :updated-at) - (organisation :initarg :organisation :initform nil) - (parent :initarg :parent) - (source :initarg :source) + (organisation :initarg :organisation :initform nil :marshal-type gh-user) + (parent :initarg :parent :marshal-type gh-repos-repo) + (source :initarg :source :marshal-type gh-repos-repo) (has-issues :initarg :has-issues) (has-wiki :initarg :has-wiki) - (has-downloads :initarg :has-downloads) - - (owner-cls :allocation :class :initform gh-user) - (organisation-cls :allocation :class :initform gh-user) - (parent-cls :allocation :class :initform gh-repos-repo) - (source-cls :allocation :class :initform gh-repos-repo)) + (has-downloads :initarg :has-downloads)) "Class for GitHub repositories") -(defmethod gh-object-read-into ((repo gh-repos-repo) data) - (call-next-method) - (with-slots (url html-url clone-url git-url ssh-url svn-url mirror-url - id owner full-name language fork forks forks-count - watchers watchers-count size master-branch open-issues - pushed-at created-at organisation parent source - has-issues has-wiki has-downloads) - repo - (setq url (gh-read data 'url) - html-url (gh-read data 'html_url) - clone-url (gh-read data 'clone_url) - git-url (gh-read data 'git_url) - ssh-url (gh-read data 'ssh_url) - svn-url (gh-read data 'svn_url) - mirror-url (gh-read data 'mirror_url) - id (gh-read data 'id) - owner (gh-object-read (or (oref repo :owner) - (oref repo owner-cls)) - (gh-read data 'owner)) - full-name (gh-read data 'full_name) - language (gh-read data 'language) - fork (gh-read data 'fork) - forks (gh-read data 'forks) - forks-count (gh-read data 'forks_count) - watchers (gh-read data 'watchers) - watchers-count (gh-read data 'watchers_count) - size (gh-read data 'size) - master-branch (gh-read data 'master_branch) - open-issues (gh-read data 'open_issues) - pushed-at (gh-read data 'pushed_at) - created-at (gh-read data 'created_at) - organisation (gh-object-read (or (oref repo :organisation) - (oref repo organisation-cls)) - (gh-read data 'organisation)) - parent (gh-object-read (oref repo parent-cls) - (gh-read data 'parent)) - source (gh-object-read (oref repo source-cls) - (gh-read data 'source)) - has-issues (gh-read data 'has_issues) - has-wiki (gh-read data 'has_wiki) - has-downloads (gh-read data 'has_downloads)))) - -(defclass gh-repos-ref (gh-object) +;;;###autoload +(gh-defclass gh-repos-ref (gh-object) ((label :initarg :label) (ref :initarg :ref :initform nil) (sha :initarg :sha :initform nil) - (user :initarg :user :initform nil) - (repo :initarg :repo :initform nil) - - (user-cls :allocation :class :initform gh-user) - (repo-cls :allocation :class :initform gh-repos-repo))) - -(defmethod gh-object-read-into ((r gh-repos-ref) data) - (call-next-method) - (with-slots (label ref sha user repo) - r - (setq label (gh-read data 'label) - ref (gh-read data 'ref) - sha (gh-read data 'sha) - user (gh-object-read (or (oref r :user) - (oref r user-cls)) - (gh-read data 'user)) - repo (gh-object-read (or (oref r :repo) - (oref r repo-cls)) - (gh-read data 'repo))))) + (user :initarg :user :initform nil :marshal-type gh-user) + (repo :initarg :repo :initform nil :marshal-type gh-repos-repo))) (defmethod gh-repos-user-list ((api gh-repos-api) &optional username) (gh-api-authenticated-request diff --git a/elpa/gh-20160626.1349/gh-search.el b/elpa/gh-20160728.1525/gh-search.el similarity index 99% rename from elpa/gh-20160626.1349/gh-search.el rename to elpa/gh-20160728.1525/gh-search.el index c0248ca..373e7cd 100644 --- a/elpa/gh-20160626.1349/gh-search.el +++ b/elpa/gh-20160728.1525/gh-search.el @@ -25,6 +25,7 @@ (require 'gh-users) (require 'gh-repos) +;;;###autoload (defclass gh-search-api (gh-api-v3) ((repo-cls :allocation :class :initform gh-repos-repo) (user-cls :allocation :class :initform gh-users-user))) diff --git a/elpa/gh-20160626.1349/gh-url.el b/elpa/gh-20160728.1525/gh-url.el similarity index 94% rename from elpa/gh-20160626.1349/gh-url.el rename to elpa/gh-20160728.1525/gh-url.el index d8dddfd..3c23f6c 100644 --- a/elpa/gh-20160626.1349/gh-url.el +++ b/elpa/gh-20160728.1525/gh-url.el @@ -34,6 +34,7 @@ (require 'url-http) +;;;###autoload (defclass gh-url-request () ((method :initarg :method :type string) (url :initarg :url :type string) @@ -46,6 +47,7 @@ (default-response-cls :allocation :class :initform gh-url-response))) +;;;###autoload (defclass gh-url-response () ((data-received :initarg :data-received :initform nil) (data :initarg :data :initform nil) @@ -63,6 +65,7 @@ data)) (oset resp :data-received t))) +;;;###autoload (defclass gh-url-callback () nil) @@ -140,14 +143,14 @@ (defun gh-url-set-response (status req-resp) (set-buffer-multibyte t) (destructuring-bind (req resp) req-resp - (condition-case err - (let ((responses-req (clone req))) - (oset resp :-req responses-req) - (gh-url-response-init resp (current-buffer))) - (error - (let ((num (oref req :num-retries))) - (if (or (null num) (zerop num)) - (signal (car err) (cdr err)) + (let ((responses-req (clone req)) + (num (oref req :num-retries))) + (oset resp :-req responses-req) + (if (or (null num) (zerop num)) + (gh-url-response-init resp (current-buffer)) + (condition-case err + (gh-url-response-init resp (current-buffer)) + (error (oset req :num-retries (1- num)) (gh-url-run-request req resp))))))) diff --git a/elpa/gh-20160626.1349/gh-users.el b/elpa/gh-20160728.1525/gh-users.el similarity index 60% rename from elpa/gh-20160626.1349/gh-users.el rename to elpa/gh-20160728.1525/gh-users.el index dbc8956..930b19e 100644 --- a/elpa/gh-20160626.1349/gh-users.el +++ b/elpa/gh-20160728.1525/gh-users.el @@ -42,7 +42,7 @@ "Users API") ;;;###autoload -(defclass gh-users-user (gh-user) +(gh-defclass gh-users-user (gh-user) ((gravatar-id :initarg :gravatar-id) (html-url :initarg :html-url) (followers-url :initarg :followers-url) @@ -70,40 +70,6 @@ (created-at :initarg :created-at) (update-at :initarg :update-at))) -(defmethod gh-object-read-into ((user gh-users-user) data) - (call-next-method) - (with-slots (gravatar-id html-url followers-url following-url - gists-url starred-url subscriptions-url organizations-url - repos-url events-url received-events-url type site-admin name - company blog location email hireable bio public-repos - public-gists followers following created-at update-at) - user - (setq gravatar-id (gh-read data 'gravatar_id) - html-url (gh-read data 'html_url) - following-url (gh-read data 'following_url) - gists-url (gh-read data 'gists_url) - starred-url (gh-read data 'starred_url) - subscriptions-url (gh-read data 'subscriptions_url) - organizations-url (gh-read data 'organizations_url) - repos-url (gh-read data 'repos_url) - events-url (gh-read data 'events_url) - received-events-url (gh-read data 'received_events_url) - type (gh-read data 'type) - site-admin (gh-read data 'site_admin) - name (gh-read data 'name) - company (gh-read data 'company) - blog (gh-read data 'blog) - location (gh-read data 'location) - email (gh-read data 'email) - hireable (gh-read data 'hireable) - bio (gh-read data 'bio) - public-repos (gh-read data 'public_repos) - public-gists (gh-read data 'public_gists) - followers (gh-read data 'followers) - following (gh-read data 'following) - created-at (gh-read data 'created_at) - update-at (gh-read data 'update_at)))) - (defmethod gh-users-get ((api gh-users-api) &optional username) (gh-api-authenticated-request api (gh-object-reader (oref api users-cls)) "GET" diff --git a/elpa/gh-20160626.1349/gh.el b/elpa/gh-20160728.1525/gh.el similarity index 100% rename from elpa/gh-20160626.1349/gh.el rename to elpa/gh-20160728.1525/gh.el diff --git a/elpa/go-mode-20160512.110/go-mode-autoloads.el b/elpa/go-mode-20160715.205/go-mode-autoloads.el similarity index 95% rename from elpa/go-mode-20160512.110/go-mode-autoloads.el rename to elpa/go-mode-20160715.205/go-mode-autoloads.el index fa993ce..e47bbb2 100644 --- a/elpa/go-mode-20160512.110/go-mode-autoloads.el +++ b/elpa/go-mode-20160715.205/go-mode-autoloads.el @@ -3,8 +3,7 @@ ;;; Code: -;;;### (autoloads nil "go-mode" "go-mode.el" (22387 29367 888183 -;;;;;; 643000)) +;;;### (autoloads nil "go-mode" "go-mode.el" (22454 5326 453354 320000)) ;;; Generated autoloads from go-mode.el (autoload 'go-mode "go-mode" "\ @@ -96,8 +95,7 @@ Tries to look for a URL at point. ;;;*** -;;;### (autoloads nil nil ("go-mode-pkg.el") (22387 29367 902180 -;;;;;; 904000)) +;;;### (autoloads nil nil ("go-mode-pkg.el") (22454 5326 404353 168000)) ;;;*** diff --git a/elpa/go-mode-20160512.110/go-mode-pkg.el b/elpa/go-mode-20160715.205/go-mode-pkg.el similarity index 70% rename from elpa/go-mode-20160512.110/go-mode-pkg.el rename to elpa/go-mode-20160715.205/go-mode-pkg.el index b4e5c39..5248f2c 100644 --- a/elpa/go-mode-20160512.110/go-mode-pkg.el +++ b/elpa/go-mode-20160715.205/go-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "go-mode" "20160512.110" "Major mode for the Go programming language" 'nil :url "https://github.com/dominikh/go-mode.el" :keywords +(define-package "go-mode" "20160715.205" "Major mode for the Go programming language" 'nil :url "https://github.com/dominikh/go-mode.el" :keywords '("languages" "go")) ;; Local Variables: ;; no-byte-compile: t diff --git a/elpa/go-mode-20160512.110/go-mode.el b/elpa/go-mode-20160715.205/go-mode.el similarity index 99% rename from elpa/go-mode-20160512.110/go-mode.el rename to elpa/go-mode-20160715.205/go-mode.el index 7d152a0..8acc0e1 100644 --- a/elpa/go-mode-20160512.110/go-mode.el +++ b/elpa/go-mode-20160715.205/go-mode.el @@ -199,7 +199,7 @@ point to the wrapper script." (defcustom gofmt-command "gofmt" "The 'gofmt' command. Some users may replace this with 'goimports' -from https://github.com/bradfitz/goimports." +from https://golang.org/x/tools/cmd/goimports." :type 'string :group 'go) diff --git a/elpa/grizzl-20160130.2351/grizzl-pkg.el b/elpa/grizzl-20160130.2351/grizzl-pkg.el deleted file mode 100644 index bf87f2c..0000000 --- a/elpa/grizzl-20160130.2351/grizzl-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "grizzl" "20160130.2351" "Fast fuzzy search index for Emacs." '((cl-lib "0.5") (emacs "24.3")) :url "https://github.com/grizzl/grizzl" :keywords '("convenience" "usability")) diff --git a/elpa/grizzl-20160130.2351/grizzl-autoloads.el b/elpa/grizzl-20160818.37/grizzl-autoloads.el similarity index 92% rename from elpa/grizzl-20160130.2351/grizzl-autoloads.el rename to elpa/grizzl-20160818.37/grizzl-autoloads.el index aa8f249..940c7e5 100644 --- a/elpa/grizzl-20160130.2351/grizzl-autoloads.el +++ b/elpa/grizzl-20160818.37/grizzl-autoloads.el @@ -1,9 +1,9 @@ ;;; grizzl-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "grizzl" "grizzl.el" (22297 19824 853945 777000)) +;;;### (autoloads nil "grizzl" "grizzl.el" (22454 5325 478331 394000)) ;;; Generated autoloads from grizzl.el (autoload 'grizzl-make-index "grizzl" "\ diff --git a/elpa/grizzl-20160818.37/grizzl-pkg.el b/elpa/grizzl-20160818.37/grizzl-pkg.el new file mode 100644 index 0000000..9b26233 --- /dev/null +++ b/elpa/grizzl-20160818.37/grizzl-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "grizzl" "20160818.37" "Fast fuzzy search index for Emacs." '((cl-lib "0.5") (emacs "24.3")) :url "https://github.com/grizzl/grizzl" :keywords '("convenience" "usability")) diff --git a/elpa/grizzl-20160130.2351/grizzl.el b/elpa/grizzl-20160818.37/grizzl.el similarity index 97% rename from elpa/grizzl-20160130.2351/grizzl.el rename to elpa/grizzl-20160818.37/grizzl.el index 625800a..a822828 100644 --- a/elpa/grizzl-20160130.2351/grizzl.el +++ b/elpa/grizzl-20160818.37/grizzl.el @@ -6,7 +6,7 @@ ;; Author: Chris Corbyn ;; Maintainer: Bozhidar Batsov ;; URL: https://github.com/grizzl/grizzl -;; Package-Version: 20160130.2351 +;; Package-Version: 20160818.37 ;; Version: 0.1.2 ;; Keywords: convenience, usability ;; Package-Requires: ((cl-lib "0.5") (emacs "24.3")) @@ -268,6 +268,10 @@ If the :END option is specified, up to :END results are returned." "Face for selected result." :group 'grizzl-mode) +(defface grizzl-prompt-face + `((t :inherit 'mode-line-inactive)) + "Face used for grizzl prompt." + :group 'grizzl-mode) ;;; --- Minor Mode Definition @@ -380,12 +384,13 @@ if this is the current selection." (let* ((count (grizzl-result-count *grizzl-current-result*)) (match-info (format " (%d candidate%s) ---- *-" count (if (= count 1) "" "s")))) - (concat (propertize (format "-*%s *-" prompt) 'face 'modeline-inactive) + (concat (propertize (format "-*%s *-" prompt) 'face 'grizzl-prompt-face) + (propertize " " - 'face 'modeline-inactive + 'face 'grizzl-prompt-face 'display `(space :align-to (- right ,(1+ (length match-info))))) - (propertize match-info 'face 'modeline-inactive)))) + (propertize match-info 'face 'grizzl-prompt-face)))) (defun grizzl-current-selection () "Get the currently selected index in `grizzl-completing-read'." diff --git a/elpa/helm-20160711.1143/helm-plugin.el b/elpa/helm-20160711.1143/helm-plugin.el deleted file mode 100644 index d88fa94..0000000 --- a/elpa/helm-20160711.1143/helm-plugin.el +++ /dev/null @@ -1,108 +0,0 @@ -;;; helm-plugin.el --- Helm plugins -*- lexical-binding: t -*- - -;; Copyright (C) 2012 ~ 2016 Thierry Volpiatto - -;; 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 of the License, 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. If not, see . - -;;; Code: - -(require 'cl-lib) -(require 'helm) -(require 'helm-utils) - - -;;; Plug-in: `info-index' -;; -;; -(defun helm-make-info-source (source file) - `(,@source - (name . ,(concat "Info Index: " file)) - (info-file . ,file) - (init . helm-info-init) - (display-to-real . helm-info-display-to-real) - (get-line . buffer-substring) - (candidates-in-buffer) - (action ("Goto node" . helm-info-goto)))) - -(defun helm-compile-source--info-index (source) - (helm-aif (helm-interpret-value (assoc-default 'info-index source)) - (helm-make-info-source source it) - source)) - -(add-to-list 'helm-compile-source-functions 'helm-compile-source--info-index) - - -;;; Plug-in: `candidates-file' -;; -;; List all lines in a file. -(defun helm-compile-source--candidates-file (source) - (if (assoc-default 'candidates-file source) - `((init helm-p-candidates-file-init - ,@(let ((orig-init (assoc-default 'init source))) - (cond ((null orig-init) nil) - ((functionp orig-init) (list orig-init)) - (t orig-init)))) - (candidates-in-buffer) - ,@source) - source)) -(add-to-list 'helm-compile-source-functions 'helm-compile-source--candidates-file) - -(defun helm-p-candidates-file-init () - (cl-destructuring-bind (file &optional updating) - (helm-mklist (helm-attr 'candidates-file)) - (setq file (helm-interpret-value file)) - (with-current-buffer (helm-candidate-buffer 'global) - (insert-file-contents file) - (when updating - (buffer-disable-undo) - (font-lock-mode -1) - (auto-revert-mode 1))))) - - -;;; Plug-in: `persistent-help' -;; -;; Add help about persistent action in `helm-buffer' header. -(defun helm-compile-source--persistent-help (source) - (if (assoc 'header-line source) - source - (append source '((header-line . helm-persistent-help-string))))) -(add-to-list 'helm-compile-source-functions 'helm-compile-source--persistent-help) - -(defun helm-persistent-help-string () - (substitute-command-keys - (concat "\\\\[helm-execute-persistent-action]: " - (or (helm-interpret-value (helm-attr 'persistent-help)) - (helm-aif (or (assoc-default - 'persistent-action - (helm-get-current-source)) - (assoc-default - 'action (helm-get-current-source))) - (cond ((symbolp it) - (symbol-name it)) - ((listp it) - (or (ignore-errors (caar it)) "")))) - "") - " (keeping session)"))) - - - -(provide 'helm-plugin) - -;; Local Variables: -;; byte-compile-warnings: (not cl-functions obsolete) -;; coding: utf-8 -;; indent-tabs-mode: nil -;; End: - -;;; helm-plugin ends here diff --git a/elpa/helm-20160711.1143/emacs-helm.sh b/elpa/helm-20160818.623/emacs-helm.sh similarity index 100% rename from elpa/helm-20160711.1143/emacs-helm.sh rename to elpa/helm-20160818.623/emacs-helm.sh diff --git a/elpa/helm-20160711.1143/helm-adaptive.el b/elpa/helm-20160818.623/helm-adaptive.el similarity index 100% rename from elpa/helm-20160711.1143/helm-adaptive.el rename to elpa/helm-20160818.623/helm-adaptive.el diff --git a/elpa/helm-20160711.1143/helm-apt.el b/elpa/helm-20160818.623/helm-apt.el similarity index 100% rename from elpa/helm-20160711.1143/helm-apt.el rename to elpa/helm-20160818.623/helm-apt.el diff --git a/elpa/helm-20160711.1143/helm-autoloads.el b/elpa/helm-20160818.623/helm-autoloads.el similarity index 84% rename from elpa/helm-20160711.1143/helm-autoloads.el rename to elpa/helm-20160818.623/helm-autoloads.el index dd93205..9fa8a6b 100644 --- a/elpa/helm-20160711.1143/helm-autoloads.el +++ b/elpa/helm-20160818.623/helm-autoloads.el @@ -1,15 +1,16 @@ ;;; helm-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22404 60264 -;;;;;; 321872 842000)) +;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22454 5322 +;;;;;; 428259 677000)) ;;; Generated autoloads from helm-adaptive.el (defvar helm-adaptive-mode nil "\ Non-nil if Helm-Adaptive mode is enabled. -See the command `helm-adaptive-mode' for a description of this minor mode. +See the `helm-adaptive-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `helm-adaptive-mode'.") @@ -29,8 +30,8 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'. ;;;*** -;;;### (autoloads nil "helm-apt" "helm-apt.el" (22404 60264 293872 -;;;;;; 696000)) +;;;### (autoloads nil "helm-apt" "helm-apt.el" (22454 5322 190254 +;;;;;; 80000)) ;;; Generated autoloads from helm-apt.el (autoload 'helm-apt "helm-apt" "\ @@ -41,8 +42,8 @@ With a prefix arg reload cache. ;;;*** -;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22404 60264 -;;;;;; 389873 198000)) +;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22454 5322 +;;;;;; 866269 976000)) ;;; Generated autoloads from helm-bookmark.el (autoload 'helm-bookmarks "helm-bookmark" "\ @@ -59,8 +60,8 @@ only if external library addressbook-bookmark.el is available. ;;;*** -;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22404 60264 -;;;;;; 281872 633000)) +;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22454 5322 +;;;;;; 122252 481000)) ;;; Generated autoloads from helm-buffers.el (autoload 'helm-buffers-list "helm-buffers" "\ @@ -75,8 +76,8 @@ Preconfigured `helm' lightweight version (buffer -> recentf). ;;;*** -;;;### (autoloads nil "helm-color" "helm-color.el" (22404 60264 373873 -;;;;;; 114000)) +;;;### (autoloads nil "helm-color" "helm-color.el" (22454 5322 731266 +;;;;;; 803000)) ;;; Generated autoloads from helm-color.el (autoload 'helm-colors "helm-color" "\ @@ -86,8 +87,8 @@ Preconfigured `helm' for color. ;;;*** -;;;### (autoloads nil "helm-command" "helm-command.el" (22404 60264 -;;;;;; 229872 361000)) +;;;### (autoloads nil "helm-command" "helm-command.el" (22454 5321 +;;;;;; 795244 793000)) ;;; Generated autoloads from helm-command.el (autoload 'helm-M-x "helm-command" "\ @@ -105,8 +106,8 @@ You can get help on each command by persistent action. ;;;*** -;;;### (autoloads nil "helm-config" "helm-config.el" (22404 60264 -;;;;;; 385873 177000)) +;;;### (autoloads nil "helm-config" "helm-config.el" (22454 5322 +;;;;;; 821268 918000)) ;;; Generated autoloads from helm-config.el (autoload 'helm-configuration "helm-config" "\ @@ -116,8 +117,8 @@ Customize `helm'. ;;;*** -;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22404 60264 -;;;;;; 301872 738000)) +;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22454 5322 +;;;;;; 257255 656000)) ;;; Generated autoloads from helm-dabbrev.el (autoload 'helm-dabbrev "helm-dabbrev" "\ @@ -127,8 +128,8 @@ Preconfigured helm for dynamic abbreviations. ;;;*** -;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22404 60264 381873 -;;;;;; 156000)) +;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22454 5322 777267 +;;;;;; 884000)) ;;; Generated autoloads from helm-elisp.el (autoload 'helm-lisp-completion-at-point "helm-elisp" "\ @@ -182,7 +183,7 @@ Preconfigured helm for complex command history. ;;;*** ;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el" -;;;;;; (22404 60264 237872 403000)) +;;;;;; (22454 5321 829245 592000)) ;;; Generated autoloads from helm-elisp-package.el (autoload 'helm-list-elisp-packages "helm-elisp-package" "\ @@ -198,8 +199,8 @@ Same as `helm-list-elisp-packages' but don't fetch packages on remote. ;;;*** -;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22404 60264 -;;;;;; 217872 298000)) +;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22454 5321 +;;;;;; 728243 218000)) ;;; Generated autoloads from helm-elscreen.el (autoload 'helm-elscreen "helm-elscreen" "\ @@ -214,8 +215,8 @@ Preconfigured helm to list elscreen in history order. ;;;*** -;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22404 60264 -;;;;;; 249872 465000)) +;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22454 5321 +;;;;;; 942248 250000)) ;;; Generated autoloads from helm-eshell.el (autoload 'helm-esh-pcomplete "helm-eshell" "\ @@ -230,8 +231,8 @@ Preconfigured helm for eshell history. ;;;*** -;;;### (autoloads nil "helm-eval" "helm-eval.el" (22404 60264 345872 -;;;;;; 967000)) +;;;### (autoloads nil "helm-eval" "helm-eval.el" (22454 5322 518261 +;;;;;; 793000)) ;;; Generated autoloads from helm-eval.el (autoload 'helm-eval-expression "helm-eval" "\ @@ -251,8 +252,8 @@ Preconfigured helm for `helm-source-calculation-result'. ;;;*** -;;;### (autoloads nil "helm-external" "helm-external.el" (22404 60264 -;;;;;; 197872 194000)) +;;;### (autoloads nil "helm-external" "helm-external.el" (22454 5321 +;;;;;; 638241 101000)) ;;; Generated autoloads from helm-external.el (autoload 'helm-run-external-command "helm-external" "\ @@ -265,10 +266,15 @@ You can set your own list of commands with ;;;*** -;;;### (autoloads nil "helm-files" "helm-files.el" (22404 60264 305872 -;;;;;; 759000)) +;;;### (autoloads nil "helm-files" "helm-files.el" (22454 5322 291256 +;;;;;; 455000)) ;;; Generated autoloads from helm-files.el +(autoload 'helm-projects-history "helm-files" "\ + + +\(fn)" t nil) + (autoload 'helm-browse-project "helm-files" "\ Preconfigured helm to browse projects. Browse files and see status of project with its vcs. @@ -339,8 +345,8 @@ Preconfigured `helm' for `recentf'. ;;;*** -;;;### (autoloads nil "helm-font" "helm-font.el" (22404 60264 257872 -;;;;;; 507000)) +;;;### (autoloads nil "helm-font" "helm-font.el" (22454 5321 987249 +;;;;;; 307000)) ;;; Generated autoloads from helm-font.el (autoload 'helm-select-xfont "helm-font" "\ @@ -355,8 +361,8 @@ Preconfigured helm for `ucs-names' math symbols. ;;;*** -;;;### (autoloads nil "helm-grep" "helm-grep.el" (22404 60264 397873 -;;;;;; 239000)) +;;;### (autoloads nil "helm-grep" "helm-grep.el" (22454 5322 912271 +;;;;;; 58000)) ;;; Generated autoloads from helm-grep.el (autoload 'helm-goto-precedent-file "helm-grep" "\ @@ -383,8 +389,8 @@ With a prefix arg ARG git-grep the whole repository. ;;;*** -;;;### (autoloads nil "helm-help" "helm-help.el" (22404 60264 193872 -;;;;;; 173000)) +;;;### (autoloads nil "helm-help" "helm-help.el" (22454 5321 593240 +;;;;;; 43000)) ;;; Generated autoloads from helm-help.el (autoload 'helm-documentation "helm-help" "\ @@ -404,8 +410,8 @@ String displayed in mode-line in `helm-source-find-files'.") ;;;*** -;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22404 60264 -;;;;;; 285872 654000)) +;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22454 5322 +;;;;;; 156253 281000)) ;;; Generated autoloads from helm-id-utils.el (autoload 'helm-gid "helm-id-utils" "\ @@ -419,8 +425,8 @@ See . ;;;*** -;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22404 60264 273872 -;;;;;; 591000)) +;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22454 5322 54250 +;;;;;; 883000)) ;;; Generated autoloads from helm-imenu.el (autoload 'helm-imenu "helm-imenu" "\ @@ -437,8 +443,8 @@ or it have an association in `helm-imenu-all-buffer-assoc'. ;;;*** -;;;### (autoloads nil "helm-info" "helm-info.el" (22404 60264 261872 -;;;;;; 528000)) +;;;### (autoloads nil "helm-info" "helm-info.el" (22454 5322 20250 +;;;;;; 83000)) ;;; Generated autoloads from helm-info.el (autoload 'helm-info "helm-info" "\ @@ -454,8 +460,8 @@ With a prefix-arg insert symbol at point. ;;;*** -;;;### (autoloads nil "helm-locate" "helm-locate.el" (22404 60264 -;;;;;; 209872 256000)) +;;;### (autoloads nil "helm-locate" "helm-locate.el" (22454 5321 +;;;;;; 683242 159000)) ;;; Generated autoloads from helm-locate.el (autoload 'helm-projects-find-files "helm-locate" "\ @@ -482,8 +488,8 @@ Where db_path is a filename matched by ;;;*** -;;;### (autoloads nil "helm-man" "helm-man.el" (22404 60264 349872 -;;;;;; 988000)) +;;;### (autoloads nil "helm-man" "helm-man.el" (22454 5322 563262 +;;;;;; 851000)) ;;; Generated autoloads from helm-man.el (autoload 'helm-man-woman "helm-man" "\ @@ -494,8 +500,8 @@ With a prefix arg reinitialize the cache. ;;;*** -;;;### (autoloads nil "helm-misc" "helm-misc.el" (22404 60264 317872 -;;;;;; 821000)) +;;;### (autoloads nil "helm-misc" "helm-misc.el" (22454 5322 383258 +;;;;;; 619000)) ;;; Generated autoloads from helm-misc.el (autoload 'helm-browse-menubar "helm-misc" "\ @@ -536,8 +542,8 @@ Preconfigured `helm' that provide completion of `comint' history. ;;;*** -;;;### (autoloads nil "helm-mode" "helm-mode.el" (22404 60264 185872 -;;;;;; 131000)) +;;;### (autoloads nil "helm-mode" "helm-mode.el" (22454 5321 482237 +;;;;;; 433000)) ;;; Generated autoloads from helm-mode.el (autoload 'helm-comp-read "helm-mode" "\ @@ -625,13 +631,16 @@ Keys description: `helm-source-in-buffer' which is much faster. Argument VOLATILE have no effect when CANDIDATES-IN-BUFFER is non--nil. +- MATCH-PART: Allow matching only one part of candidate. + See match-part documentation in `helm-source'. + Any prefix args passed during `helm-comp-read' invocation will be recorded in `helm-current-prefix-arg', otherwise if prefix args were given before `helm-comp-read' invocation, the value of `current-prefix-arg' will be used. That's mean you can pass prefix args before or after calling a command that use `helm-comp-read' See `helm-M-x' for example. -\(fn PROMPT COLLECTION &key TEST INITIAL-INPUT DEFAULT PRESELECT (buffer \"*Helm Completions*\") MUST-MATCH FUZZY REVERSE-HISTORY (requires-pattern 0) HISTORY INPUT-HISTORY (case-fold helm-comp-read-case-fold-search) (del-input t) (persistent-action nil) (persistent-help \"DoNothing\") (mode-line helm-comp-read-mode-line) HELP-MESSAGE (keymap helm-comp-read-map) (name \"Helm Completions\") CANDIDATES-IN-BUFFER EXEC-WHEN-ONLY-ONE QUIT-WHEN-NO-CAND (volatile t) SORT (fc-transformer (quote helm-cr-default-transformer)) HIST-FC-TRANSFORMER MARKED-CANDIDATES NOMARK (alistp t) (candidate-number-limit helm-candidate-number-limit))" nil nil) +\(fn PROMPT COLLECTION &key TEST INITIAL-INPUT DEFAULT PRESELECT (BUFFER \"*Helm Completions*\") MUST-MATCH FUZZY REVERSE-HISTORY (REQUIRES-PATTERN 0) HISTORY INPUT-HISTORY (CASE-FOLD helm-comp-read-case-fold-search) (DEL-INPUT t) (PERSISTENT-ACTION nil) (PERSISTENT-HELP \"DoNothing\") (MODE-LINE helm-comp-read-mode-line) HELP-MESSAGE (KEYMAP helm-comp-read-map) (NAME \"Helm Completions\") CANDIDATES-IN-BUFFER MATCH-PART EXEC-WHEN-ONLY-ONE QUIT-WHEN-NO-CAND (VOLATILE t) SORT (FC-TRANSFORMER \\='helm-cr-default-transformer) HIST-FC-TRANSFORMER MARKED-CANDIDATES NOMARK (ALISTP t) (CANDIDATE-NUMBER-LIMIT helm-candidate-number-limit))" nil nil) (autoload 'helm-read-file-name "helm-mode" "\ Read a file name with helm completion. @@ -669,11 +678,12 @@ Keys description: - MODE-LINE: A mode line message, default is `helm-read-file-name-mode-line-string'. -\(fn PROMPT &key (name \"Read File Name\") (initial-input default-directory) (buffer \"*Helm file completions*\") TEST (case-fold helm-file-name-case-fold-search) PRESELECT HISTORY MUST-MATCH DEFAULT MARKED-CANDIDATES (candidate-number-limit helm-ff-candidate-number-limit) NOMARK (alistp t) (persistent-action (quote helm-find-files-persistent-action)) (persistent-help \"Hit1 Expand Candidate, Hit2 or (C-u) Find file\") (mode-line helm-read-file-name-mode-line-string))" nil nil) +\(fn PROMPT &key (NAME \"Read File Name\") (INITIAL-INPUT default-directory) (BUFFER \"*Helm file completions*\") TEST (CASE-FOLD helm-file-name-case-fold-search) PRESELECT HISTORY MUST-MATCH DEFAULT MARKED-CANDIDATES (CANDIDATE-NUMBER-LIMIT helm-ff-candidate-number-limit) NOMARK (ALISTP t) (PERSISTENT-ACTION \\='helm-find-files-persistent-action) (PERSISTENT-HELP \"Hit1 Expand Candidate, Hit2 or (C-u) Find file\") (MODE-LINE helm-read-file-name-mode-line-string))" nil nil) (defvar helm-mode nil "\ Non-nil if Helm mode is enabled. -See the command `helm-mode' for a description of this minor mode. +See the `helm-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `helm-mode'.") @@ -704,8 +714,8 @@ Note: This mode is incompatible with Emacs23. ;;;*** -;;;### (autoloads nil "helm-net" "helm-net.el" (22404 60264 369873 -;;;;;; 93000)) +;;;### (autoloads nil "helm-net" "helm-net.el" (22454 5322 686265 +;;;;;; 744000)) ;;; Generated autoloads from helm-net.el (autoload 'helm-surfraw "helm-net" "\ @@ -725,8 +735,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest. ;;;*** -;;;### (autoloads nil "helm-org" "helm-org.el" (22404 60264 401873 -;;;;;; 260000)) +;;;### (autoloads nil "helm-org" "helm-org.el" (22454 5322 957272 +;;;;;; 116000)) ;;; Generated autoloads from helm-org.el (autoload 'helm-org-agenda-files-headings "helm-org" "\ @@ -757,8 +767,8 @@ Preconfigured helm for org templates. ;;;*** -;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22404 60264 -;;;;;; 361873 51000)) +;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22454 5322 +;;;;;; 642264 709000)) ;;; Generated autoloads from helm-regexp.el (autoload 'helm-moccur-mode "helm-regexp" "\ @@ -797,13 +807,14 @@ The prefix arg can be set before calling ;;;*** -;;;### (autoloads nil "helm-ring" "helm-ring.el" (22404 60264 189872 -;;;;;; 152000)) +;;;### (autoloads nil "helm-ring" "helm-ring.el" (22454 5321 548238 +;;;;;; 985000)) ;;; Generated autoloads from helm-ring.el (defvar helm-push-mark-mode nil "\ Non-nil if Helm-Push-Mark mode is enabled. -See the command `helm-push-mark-mode' for a description of this minor mode. +See the `helm-push-mark-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `helm-push-mark-mode'.") @@ -855,8 +866,8 @@ This command is useful when used with persistent action. ;;;*** -;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22404 60264 -;;;;;; 277872 612000)) +;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22454 5322 +;;;;;; 88251 682000)) ;;; Generated autoloads from helm-semantic.el (autoload 'helm-semantic "helm-semantic" "\ @@ -878,13 +889,14 @@ Fill in the symbol at point by default. ;;;*** -;;;### (autoloads nil "helm-sys" "helm-sys.el" (22404 60264 297872 -;;;;;; 717000)) +;;;### (autoloads nil "helm-sys" "helm-sys.el" (22454 5322 223254 +;;;;;; 856000)) ;;; Generated autoloads from helm-sys.el (defvar helm-top-poll-mode nil "\ Non-nil if Helm-Top-Poll mode is enabled. -See the command `helm-top-poll-mode' for a description of this minor mode. +See the `helm-top-poll-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `helm-top-poll-mode'.") @@ -913,8 +925,8 @@ Preconfigured helm for xrandr. ;;;*** -;;;### (autoloads nil "helm-tags" "helm-tags.el" (22404 60264 245872 -;;;;;; 444000)) +;;;### (autoloads nil "helm-tags" "helm-tags.el" (22454 5321 897247 +;;;;;; 191000)) ;;; Generated autoloads from helm-tags.el (autoload 'helm-etags-select "helm-tags" "\ @@ -933,13 +945,14 @@ This function aggregates three sources of tag files: ;;;*** -;;;### (autoloads nil "helm-utils" "helm-utils.el" (22404 60264 221872 -;;;;;; 319000)) +;;;### (autoloads nil "helm-utils" "helm-utils.el" (22454 5321 761243 +;;;;;; 994000)) ;;; Generated autoloads from helm-utils.el (defvar helm-popup-tip-mode nil "\ Non-nil if Helm-Popup-Tip mode is enabled. -See the command `helm-popup-tip-mode' for a description of this minor mode. +See the `helm-popup-tip-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `helm-popup-tip-mode'.") @@ -954,8 +967,7 @@ 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") (22404 60264 -;;;;;; 421892 158000)) +;;;;;; "helm-pkg.el" "helm-types.el") (22454 5323 1273 151000)) ;;;*** diff --git a/elpa/helm-20160711.1143/helm-bookmark.el b/elpa/helm-20160818.623/helm-bookmark.el similarity index 99% rename from elpa/helm-20160711.1143/helm-bookmark.el rename to elpa/helm-20160818.623/helm-bookmark.el index ce3ded4..b14e85e 100644 --- a/elpa/helm-20160711.1143/helm-bookmark.el +++ b/elpa/helm-20160818.623/helm-bookmark.el @@ -480,6 +480,7 @@ than `w3m-browse-url' use it." (defclass helm-bookmark-overwrite-inheritor (helm-source) ()) (defmethod helm--setup-source ((source helm-bookmark-overwrite-inheritor)) + (call-next-method) (setf (slot-value source 'action) (helm-append-at-nth (remove '("Jump to BM other window" . helm-bookmark-jump-other-window) diff --git a/elpa/helm-20160711.1143/helm-buffers.el b/elpa/helm-20160818.623/helm-buffers.el similarity index 96% rename from elpa/helm-20160711.1143/helm-buffers.el rename to elpa/helm-20160818.623/helm-buffers.el index f3c019b..14b3cfd 100644 --- a/elpa/helm-20160711.1143/helm-buffers.el +++ b/elpa/helm-20160818.623/helm-buffers.el @@ -23,7 +23,6 @@ (require 'helm-utils) (require 'helm-elscreen) (require 'helm-grep) -(require 'helm-plugin) (require 'helm-regexp) (require 'helm-help) @@ -213,7 +212,7 @@ Only buffer names are fuzzy matched when this is enabled, " A function with no arguments to create buffer list.") (init :initform 'helm-buffers-list--init) (candidates :initform helm-buffers-list-cache) - (matchplugin :initform nil) + (multimatch :initform nil) (match :initform 'helm-buffers-match-function) (persistent-action :initform 'helm-buffers-list-persistent-action) (resume :initform (lambda () @@ -224,6 +223,7 @@ Only buffer names are fuzzy matched when this is enabled, (keymap :initform helm-buffer-map) (migemo :initform 'nomultimatch) (volatile :initform t) + (resume :initform (lambda () (setq helm-buffers-in-project-p nil))) (help-message :initform 'helm-buffer-help-message) (persistent-help :initform @@ -660,9 +660,10 @@ If REGEXP-FLAG is given use `query-replace-regexp'." (defun helm-kill-marked-buffers (_ignore) (let* ((bufs (helm-marked-candidates)) (killed-bufs (cl-count-if 'kill-buffer bufs))) - (with-helm-buffer - (setq helm-marked-candidates nil - helm-visible-mark-overlays nil)) + (when (buffer-live-p helm-buffer) + (with-helm-buffer + (setq helm-marked-candidates nil + helm-visible-mark-overlays nil))) (message "Killed %s buffer(s)" killed-bufs))) (defun helm-buffer-run-kill-buffers () @@ -735,17 +736,21 @@ If REGEXP-FLAG is given use `query-replace-regexp'." (helm-exit-and-execute-action 'helm-ediff-marked-buffers-merge))) (put 'helm-buffer-run-ediff-merge 'helm-only t) -(defun helm-buffers-persistent-kill-1 (buffer) +(defun helm-buffers-persistent-kill-1 (buffer-or-name) "Persistent action to kill buffer." - (if (eql (get-buffer buffer) (get-buffer helm-current-buffer)) - (progn - (message "Can't kill `helm-current-buffer' without quitting session") - (sit-for 1)) - (with-current-buffer (get-buffer buffer) - (kill-buffer buffer)) - (helm-delete-current-selection) - (with-helm-temp-hook 'helm-after-persistent-action-hook - (helm-force-update (regexp-quote (helm-get-selection nil t)))))) + (let ((buf (get-buffer buffer-or-name)) helm-buf-or-cur) + (if (or (and (eql buf (get-buffer helm-current-buffer)) + (setq helm-buf-or-cur "helm-current-buffer")) + (and (eql buf (get-buffer helm-buffer)) + (setq helm-buf-or-cur "helm-buffer"))) + (progn + (message "Can't kill `%s' without quitting session" helm-buf-or-cur) + (sit-for 1)) + (with-current-buffer buf + (kill-buffer buffer-or-name)) + (helm-delete-current-selection) + (with-helm-temp-hook 'helm-after-persistent-action-hook + (helm-force-update (regexp-quote (helm-get-selection nil t))))))) (defun helm-buffers--quote-truncated-buffer (buffer) (let ((bufname (and (bufferp buffer) @@ -765,9 +770,11 @@ If REGEXP-FLAG is given use `query-replace-regexp'." do (progn (helm-preselect (format "^%s" (helm-buffers--quote-truncated-buffer b))) - (when (y-or-n-p (format "kill buffer (%s)? " b)) - (helm-buffers-persistent-kill-1 b)) - (message nil))) + (save-selected-window + (when (y-or-n-p (format "kill buffer (%s)? " b)) + (helm-buffers-persistent-kill-1 b))) + (message nil) + (helm--remove-marked-and-update-mode-line b))) (with-helm-buffer (setq helm-marked-candidates nil helm-visible-mark-overlays nil)) @@ -836,12 +843,12 @@ Can be used by any source that list buffers." (cons 'helm-skip-boring-buffers (remove 'helm-shadow-boring-buffers filter-attrs)) - helm-source-buffers-list t) + helm-source-buffers-list) (helm-attrset 'filtered-candidate-transformer (cons 'helm-shadow-boring-buffers (remove 'helm-skip-boring-buffers filter-attrs)) - helm-source-buffers-list t)) + helm-source-buffers-list)) (helm-force-update)))) (put 'helm-buffers-toggle-show-hidden-buffers 'helm-only t) diff --git a/elpa/helm-20160711.1143/helm-color.el b/elpa/helm-20160818.623/helm-color.el similarity index 100% rename from elpa/helm-20160711.1143/helm-color.el rename to elpa/helm-20160818.623/helm-color.el diff --git a/elpa/helm-20160711.1143/helm-command.el b/elpa/helm-20160818.623/helm-command.el similarity index 99% rename from elpa/helm-20160711.1143/helm-command.el rename to elpa/helm-20160818.623/helm-command.el index 3eafc59..3b2fe05 100644 --- a/elpa/helm-20160711.1143/helm-command.el +++ b/elpa/helm-20160818.623/helm-command.el @@ -240,6 +240,7 @@ than the default which is OBARRAY." :help-message 'helm-M-x-help-message :keymap helm-M-x-map :must-match t + :match-part (lambda (c) (car (split-string c))) :fuzzy helm-M-x-fuzzy-match :nomark t :candidates-in-buffer t diff --git a/elpa/helm-20160711.1143/helm-config.el b/elpa/helm-20160818.623/helm-config.el similarity index 100% rename from elpa/helm-20160711.1143/helm-config.el rename to elpa/helm-20160818.623/helm-config.el diff --git a/elpa/helm-20160711.1143/helm-dabbrev.el b/elpa/helm-20160818.623/helm-dabbrev.el similarity index 100% rename from elpa/helm-20160711.1143/helm-dabbrev.el rename to elpa/helm-20160818.623/helm-dabbrev.el diff --git a/elpa/helm-20160711.1143/helm-easymenu.el b/elpa/helm-20160818.623/helm-easymenu.el similarity index 100% rename from elpa/helm-20160711.1143/helm-easymenu.el rename to elpa/helm-20160818.623/helm-easymenu.el diff --git a/elpa/helm-20160711.1143/helm-elisp-package.el b/elpa/helm-20160818.623/helm-elisp-package.el similarity index 93% rename from elpa/helm-20160711.1143/helm-elisp-package.el rename to elpa/helm-20160818.623/helm-elisp-package.el index 059c05e..f9147d9 100644 --- a/elpa/helm-20160711.1143/helm-elisp-package.el +++ b/elpa/helm-20160818.623/helm-elisp-package.el @@ -59,6 +59,7 @@ ;; properly (empty buffer) when called from lisp ;; with 'no-fetch (emacs-25 WA). (package-show-package-list) + (when helm--force-updating-p (message "Refreshing packages list...")) (list-packages helm-el-package--initialized-p)) (setq helm-el-package--initialized-p t) (message nil)) @@ -68,7 +69,7 @@ (setq helm-el-package--tabulated-list tabulated-list-entries) (buffer-string))) (setq helm-el-package--upgrades (helm-el-package-menu--find-upgrades)) - (if helm-force-updating-p + (if helm--force-updating-p (if helm-el-package--upgrades (message "%d package(s) can be upgraded, Refreshing packages list done" (length helm-el-package--upgrades)) @@ -256,7 +257,11 @@ for name = (if (fboundp 'package-desc-name) (and id (package-desc-name id)) (car id)) - for installed-p = (assq name package-alist) + for desc = (package-desc-status id) + for built-in-p = (and (package-built-in-p name) + (not (member desc '("available" "new" + "installed" "dependency")))) + for installed-p = (member desc '("installed" "dependency")) for upgrade-p = (assq name helm-el-package--upgrades) for user-installed-p = (and (boundp 'package-selected-packages) (memq name package-selected-packages)) @@ -267,15 +272,25 @@ 2 (+ (length (symbol-name name)) 2) 'face 'font-lock-variable-name-face c)) for cand = (cons c (car (split-string c))) - when (or (and upgrade-p + when (or (and built-in-p + (eq helm-el-package--show-only 'built-in)) + (and upgrade-p (eq helm-el-package--show-only 'upgrade)) (and installed-p (eq helm-el-package--show-only 'installed)) (and (not installed-p) - (eq helm-el-package--show-only 'uninstalled)) + (not built-in-p) + (eq helm-el-package--show-only 'uninstalled)) (eq helm-el-package--show-only 'all)) collect cand)) +(defun helm-el-package-show-built-in () + (interactive) + (with-helm-alive-p + (setq helm-el-package--show-only 'built-in) + (helm-update))) +(put 'helm-el-package-show-built-in 'helm-only t) + (defun helm-el-package-show-upgrade () (interactive) (with-helm-alive-p @@ -310,6 +325,7 @@ (define-key map (kbd "M-I") 'helm-el-package-show-installed) (define-key map (kbd "M-O") 'helm-el-package-show-uninstalled) (define-key map (kbd "M-U") 'helm-el-package-show-upgrade) + (define-key map (kbd "M-B") 'helm-el-package-show-built-in) (define-key map (kbd "M-A") 'helm-el-package-show-all) (define-key map (kbd "C-c i") 'helm-el-run-package-install) (define-key map (kbd "C-c r") 'helm-el-run-package-reinstall) @@ -333,14 +349,18 @@ ("Visit homepage" . helm-el-package-visit-homepage))))) (defun helm-el-package--action-transformer (actions candidate) - (let* ((pkg-desc (get-text-property - 0 'tabulated-list-id candidate)) + (let* ((pkg-desc (get-text-property 0 'tabulated-list-id candidate)) + (status (package-desc-status pkg-desc)) (pkg-name (package-desc-name pkg-desc)) + (built-in (and (package-built-in-p pkg-name) + (not (member status '("available" "new" + "installed" "dependency"))))) (acts (if helm-el-package--upgrades (append actions '(("Upgrade all packages" . helm-el-package-upgrade-all-action))) actions))) - (cond ((and (package-installed-p pkg-name) + (cond (built-in '(("Describe package" . helm-el-package-describe))) + ((and (package-installed-p pkg-name) (cdr (assq pkg-name helm-el-package--upgrades))) (append '(("Upgrade package(s)" . helm-el-package-upgrade) ("Uninstall package(s)" . helm-el-package-uninstall)) acts)) diff --git a/elpa/helm-20160711.1143/helm-elisp.el b/elpa/helm-20160818.623/helm-elisp.el similarity index 98% rename from elpa/helm-20160711.1143/helm-elisp.el rename to elpa/helm-20160818.623/helm-elisp.el index 3b8e9f2..abcf49d 100644 --- a/elpa/helm-20160711.1143/helm-elisp.el +++ b/elpa/helm-20160818.623/helm-elisp.el @@ -304,6 +304,7 @@ Return a cons \(beg . end\)." :data helm-lisp-completion--cache :persistent-action 'helm-lisp-completion-persistent-action :nomark t + :match-part (lambda (c) (car (split-string c))) :fuzzy-match helm-lisp-fuzzy-completion :persistent-help (helm-lisp-completion-persistent-help) :filtered-candidate-transformer @@ -673,13 +674,13 @@ i.e the `symbol-name' of any existing symbol." ;; ;; (defvar helm-source-advice - '((name . "Function Advice") - (candidates . helm-advice-candidates) - (action ("Toggle Enable/Disable" . helm-advice-toggle)) - (persistent-action . helm-advice-persistent-action) - (nomark) - (multiline) - (persistent-help . "Describe function / C-u C-j: Toggle advice"))) + (helm-build-sync-source "Function Advice" + :candidates 'helm-advice-candidates + :action (helm-make-actions "Toggle Enable/Disable" 'helm-advice-toggle) + :persistent-action 'helm-advice-persistent-action + :nomark t + :multiline t + :persistent-help "Describe function / C-u C-j: Toggle advice")) (defun helm-advice-candidates () (cl-loop for (fname) in ad-advised-functions diff --git a/elpa/helm-20160711.1143/helm-elscreen.el b/elpa/helm-20160818.623/helm-elscreen.el similarity index 100% rename from elpa/helm-20160711.1143/helm-elscreen.el rename to elpa/helm-20160818.623/helm-elscreen.el diff --git a/elpa/helm-20160711.1143/helm-eshell.el b/elpa/helm-20160818.623/helm-eshell.el similarity index 100% rename from elpa/helm-20160711.1143/helm-eshell.el rename to elpa/helm-20160818.623/helm-eshell.el diff --git a/elpa/helm-20160711.1143/helm-eval.el b/elpa/helm-20160818.623/helm-eval.el similarity index 100% rename from elpa/helm-20160711.1143/helm-eval.el rename to elpa/helm-20160818.623/helm-eval.el diff --git a/elpa/helm-20160711.1143/helm-external.el b/elpa/helm-20160818.623/helm-external.el similarity index 100% rename from elpa/helm-20160711.1143/helm-external.el rename to elpa/helm-20160818.623/helm-external.el diff --git a/elpa/helm-20160711.1143/helm-files.el b/elpa/helm-20160818.623/helm-files.el similarity index 98% rename from elpa/helm-20160711.1143/helm-files.el rename to elpa/helm-20160818.623/helm-files.el index 15b6d51..13944ea 100644 --- a/elpa/helm-20160711.1143/helm-files.el +++ b/elpa/helm-20160818.623/helm-files.el @@ -260,6 +260,14 @@ see `helm-ff-guess-ffap-filenames' for this." :group 'helm-files :type 'boolean) +(defcustom helm-find-file-ignore-thing-at-point nil + "Use only `default-directory' as default input in `helm-find-files'. +I.e text under cursor in `current-buffer' is ignored. +Note that when non-nil you will be unable to complete filename at point +in `current-buffer'." + :group 'helm-files + :type 'boolean) + (defcustom helm-substitute-in-filename-stay-on-remote nil "Don't switch back to local filesystem when expanding pattern with / or ~/." :group 'helm-files @@ -2061,7 +2069,8 @@ Note that only existing directories are saved here." (helm-delete-file c helm-ff-signal-error-on-dot-files 'synchro) (helm-delete-current-selection) - (message nil))))) + (message nil) + (helm--remove-marked-and-update-mode-line c))))) (with-helm-buffer (setq helm-marked-candidates nil helm-visible-mark-overlays nil)) @@ -3216,6 +3225,19 @@ Set `recentf-max-saved-items' to a bigger value if default is too small.") :ff-transformer-show-only-basename nil :buffer "*helm browse project*")) +(defvar helm-browse-project-history nil) + +;;;###autoload +(defun helm-projects-history () + (interactive) + (helm :sources + (helm-build-sync-source "Project history" + :candidates helm-browse-project-history + :action (lambda (candidate) + (with-helm-default-directory candidate + (helm-browse-project nil)))) + :buffer "*helm browse project history*")) + ;;;###autoload (defun helm-browse-project (arg) "Preconfigured helm to browse projects. @@ -3241,24 +3263,31 @@ and helm-type-buffer-actions) helm-type-buffer-actions)) (helm-buffers-in-project-p t)) - (cond ((and (require 'helm-ls-git nil t) - (fboundp 'helm-ls-git-root-dir) - (helm-ls-git-root-dir)) - (helm-ls-git-ls)) - ((and (require 'helm-ls-hg nil t) - (fboundp 'helm-hg-root) - (helm-hg-root)) - (helm-hg-find-files-in-project)) - ((and (require 'helm-ls-svn nil t) - (fboundp 'helm-ls-svn-root-dir) - (helm-ls-svn-root-dir)) - (helm-ls-svn-ls)) - (t (let ((cur-dir (helm-browse-project-get--root-dir - (helm-current-directory)))) - (if (or arg (gethash cur-dir helm--browse-project-cache)) - (helm-browse-project-find-files cur-dir (equal arg '(16))) - (helm :sources (helm-browse-project-build-buffers-source cur-dir) - :buffer "*helm browse project*"))))))) + (cl-flet ((push-to-hist (root) + (setq helm-browse-project-history + (cons root (delete root helm-browse-project-history))))) + (helm-acond ((and (require 'helm-ls-git nil t) + (fboundp 'helm-ls-git-root-dir) + (helm-ls-git-root-dir)) + (push-to-hist it) + (helm-ls-git-ls)) + ((and (require 'helm-ls-hg nil t) + (fboundp 'helm-hg-root) + (helm-hg-root)) + (push-to-hist it) + (helm-hg-find-files-in-project)) + ((and (require 'helm-ls-svn nil t) + (fboundp 'helm-ls-svn-root-dir) + (helm-ls-svn-root-dir)) + (push-to-hist it) + (helm-ls-svn-ls)) + ((helm-browse-project-get--root-dir (helm-current-directory)) + (if (or arg (gethash it helm--browse-project-cache)) + (progn + (push-to-hist it) + (helm-browse-project-find-files it (equal arg '(16)))) + (helm :sources (helm-browse-project-build-buffers-source it) + :buffer "*helm browse project*"))))))) (defun helm-browse-project-get--root-dir (directory) (cl-loop with dname = (file-name-as-directory directory) @@ -3576,22 +3605,25 @@ Don't call it from programs, use `helm-find-files-1' instead. This is the starting point for nearly all actions you can do on files." (interactive "P") (let* ((hist (and arg helm-ff-history (helm-find-files-history))) - (default-input (or hist (helm-find-files-initial-input))) - (input (cond ((and (eq major-mode 'org-agenda-mode) + (smart-input (or hist (helm-find-files-initial-input))) + (default-input (expand-file-name (helm-current-directory))) + (input (cond (helm-find-file-ignore-thing-at-point + default-input) + ((and (eq major-mode 'org-agenda-mode) org-directory - (not default-input)) + (not smart-input)) (expand-file-name org-directory)) - ((and (eq major-mode 'dired-mode) default-input) - (file-name-directory default-input)) - ((and (not (string= default-input "")) - default-input)) - (t (expand-file-name (helm-current-directory))))) + ((and (eq major-mode 'dired-mode) smart-input) + (file-name-directory smart-input)) + ((and (not (string= smart-input "")) + smart-input)) + (t default-input))) (input-as-presel (null (nth 0 (file-attributes input)))) (presel (helm-aif (or hist (and input-as-presel input) (buffer-file-name (current-buffer)) (and (eq major-mode 'dired-mode) - default-input)) + smart-input)) (if helm-ff-transformer-show-only-basename (helm-basename it) it)))) (set-text-properties 0 (length input) nil input) diff --git a/elpa/helm-20160711.1143/helm-font.el b/elpa/helm-20160818.623/helm-font.el similarity index 100% rename from elpa/helm-20160711.1143/helm-font.el rename to elpa/helm-20160818.623/helm-font.el diff --git a/elpa/helm-20160711.1143/helm-grep.el b/elpa/helm-20160818.623/helm-grep.el similarity index 100% rename from elpa/helm-20160711.1143/helm-grep.el rename to elpa/helm-20160818.623/helm-grep.el diff --git a/elpa/helm-20160711.1143/helm-help.el b/elpa/helm-20160818.623/helm-help.el similarity index 99% rename from elpa/helm-20160711.1143/helm-help.el rename to elpa/helm-20160818.623/helm-help.el index 47b84ea..e39e502 100644 --- a/elpa/helm-20160711.1143/helm-help.el +++ b/elpa/helm-20160818.623/helm-help.el @@ -990,6 +990,7 @@ This feature is only available with emacs-25. \\[helm-el-package-show-installed]\t\tShow installed packages only. \\[helm-el-package-show-uninstalled]\t\tShow not installed packages only. \\[helm-el-package-show-upgrade]\t\tShow upgradable packages only. +\\[helm-el-package-show-built-in]\t\tShow built-in packages only. \\[helm-el-run-package-install]\t\tInstall package(s). \\[helm-el-run-package-reinstall]\t\tReinstall package(s). \\[helm-el-run-package-uninstall]\t\tUninstall package(s). diff --git a/elpa/helm-20160711.1143/helm-id-utils.el b/elpa/helm-20160818.623/helm-id-utils.el similarity index 100% rename from elpa/helm-20160711.1143/helm-id-utils.el rename to elpa/helm-20160818.623/helm-id-utils.el diff --git a/elpa/helm-20160711.1143/helm-imenu.el b/elpa/helm-20160818.623/helm-imenu.el similarity index 100% rename from elpa/helm-20160711.1143/helm-imenu.el rename to elpa/helm-20160818.623/helm-imenu.el diff --git a/elpa/helm-20160711.1143/helm-info.el b/elpa/helm-20160818.623/helm-info.el similarity index 99% rename from elpa/helm-20160711.1143/helm-info.el rename to elpa/helm-20160818.623/helm-info.el index ecc8b3c..e63b3f1 100644 --- a/elpa/helm-20160711.1143/helm-info.el +++ b/elpa/helm-20160818.623/helm-info.el @@ -20,7 +20,6 @@ (require 'cl-lib) (require 'helm) (require 'helm-lib) -(require 'helm-plugin) (require 'info) (declare-function Info-index-nodes "info" (&optional file)) diff --git a/elpa/helm-20160711.1143/helm-locate.el b/elpa/helm-20160818.623/helm-locate.el similarity index 100% rename from elpa/helm-20160711.1143/helm-locate.el rename to elpa/helm-20160818.623/helm-locate.el diff --git a/elpa/helm-20160711.1143/helm-man.el b/elpa/helm-20160818.623/helm-man.el similarity index 100% rename from elpa/helm-20160711.1143/helm-man.el rename to elpa/helm-20160818.623/helm-man.el diff --git a/elpa/helm-20160711.1143/helm-misc.el b/elpa/helm-20160818.623/helm-misc.el similarity index 83% rename from elpa/helm-20160711.1143/helm-misc.el rename to elpa/helm-20160818.623/helm-misc.el index 202e5a9..0791170 100644 --- a/elpa/helm-20160711.1143/helm-misc.el +++ b/elpa/helm-20160818.623/helm-misc.el @@ -23,6 +23,9 @@ (declare-function display-time-world-display "time.el") (defvar display-time-world-list) +(declare-function LaTeX-math-mode "ext:latex.el") +(declare-function jabber-chat-with "ext:jabber.el") +(declare-function jabber-read-account "ext:jabber.el") (defgroup helm-misc nil @@ -70,14 +73,14 @@ append elm)) (defvar helm-source-latex-math - '((name . "Latex Math Menu") - (init . (lambda () - (with-helm-current-buffer - (LaTeX-math-mode 1)))) - (candidate-number-limit . 9999) - (candidates . helm-latex-math-candidates) - (action . (lambda (candidate) - (call-interactively candidate))))) + (helm-build-sync-source "Latex Math Menu" + :init (lambda () + (with-helm-current-buffer + (LaTeX-math-mode 1))) + :candidate-number-limit 9999 + :candidates 'helm-latex-math-candidates + :action (lambda (candidate) + (call-interactively candidate)))) ;;; Jabber Contacts (jabber.el) @@ -92,14 +95,14 @@ (cons (symbol-name item) item))))) (defvar helm-source-jabber-contacts - '((name . "Jabber Contacts") - (init . (lambda () (require 'jabber))) - (candidates . (lambda () (mapcar 'car (helm-jabber-online-contacts)))) - (action . (lambda (x) - (jabber-chat-with - (jabber-read-account) - (symbol-name - (cdr (assoc x (helm-jabber-online-contacts))))))))) + (helm-build-sync-source "Jabber Contacts" + :init (lambda () (require 'jabber)) + :candidates (lambda () (mapcar 'car (helm-jabber-online-contacts))) + :action (lambda (x) + (jabber-chat-with + (jabber-read-account) + (symbol-name + (cdr (assoc x (helm-jabber-online-contacts)))))))) ;;; World time ;; @@ -152,8 +155,13 @@ Optional argument MAPS is a list specifying which keymaps to use: it can contain the symbols `local', `global', and `minor', mean the current local map, current global map, and all current minor maps." (with-helm-current-buffer - ;; FIXME: do we still need to remove possible '(nil) candidates. - (lacarte-get-overall-menu-item-alist maps))) + ;; When a keymap doesn't have a [menu-bar] entry + ;; the filtered map returned and passed to + ;; `lacarte-get-a-menu-item-alist-22+' is nil, which + ;; fails because this code is not protected for such case. + (condition-case nil + (lacarte-get-overall-menu-item-alist maps) + (error nil)))) ;;;###autoload (defun helm-browse-menubar () @@ -162,7 +170,9 @@ current local map, current global map, and all current minor maps." (require 'lacarte) (helm :sources (mapcar (lambda (spec) (helm-make-source (car spec) 'helm-lacarte - :candidates (lambda () (helm-lacarte-get-candidates (cdr spec))))) + :candidates + (lambda () + (helm-lacarte-get-candidates (cdr spec))))) '(("Major Mode" . (local)) ("Minor Modes" . (minor)) ("Global Map" . (global)))) @@ -213,11 +223,11 @@ It is added to `extended-command-history'. (insert candidate))) (defvar helm-source-comint-input-ring - '((name . "Comint history") - (candidates . (lambda () - (with-helm-current-buffer - (ring-elements comint-input-ring)))) - (action . helm-comint-input-ring-action)) + (helm-build-sync-source "Comint history" + :candidates (lambda () + (with-helm-current-buffer + (ring-elements comint-input-ring))) + :action 'helm-comint-input-ring-action) "Source that provide helm completion against `comint-input-ring'.") @@ -225,12 +235,12 @@ It is added to `extended-command-history'. ;; ;; (defvar helm-source-ratpoison-commands - '((name . "Ratpoison Commands") - (init . helm-ratpoison-commands-init) - (candidates-in-buffer) - (action ("Execute the command" . helm-ratpoison-commands-execute)) - (display-to-real . helm-ratpoison-commands-display-to-real) - (candidate-number-limit))) + (helm-build-in-buffer-source "Ratpoison Commands" + :init 'helm-ratpoison-commands-init + :action (helm-make-actions + "Execute the command" 'helm-ratpoison-commands-execute) + :display-to-real 'helm-ratpoison-commands-display-to-real + :candidate-number-limit 999999)) (defun helm-ratpoison-commands-init () (unless (helm-candidate-buffer) @@ -258,11 +268,11 @@ It is added to `extended-command-history'. ;; ;; (defvar helm-source-stumpwm-commands - '((name . "Stumpwm Commands") - (init . helm-stumpwm-commands-init) - (candidates-in-buffer) - (action ("Execute the command" . helm-stumpwm-commands-execute)) - (candidate-number-limit))) + (helm-build-in-buffer-source "Stumpwm Commands" + :init 'helm-stumpwm-commands-init + :action (helm-make-actions + "Execute the command" 'helm-stumpwm-commands-execute) + :candidate-number-limit 999999)) (defun helm-stumpwm-commands-init () (with-current-buffer (helm-candidate-buffer 'global) diff --git a/elpa/helm-20160711.1143/helm-mode.el b/elpa/helm-20160818.623/helm-mode.el similarity index 99% rename from elpa/helm-20160711.1143/helm-mode.el rename to elpa/helm-20160818.623/helm-mode.el index c4e3773..aea5460 100644 --- a/elpa/helm-20160711.1143/helm-mode.el +++ b/elpa/helm-20160818.623/helm-mode.el @@ -309,6 +309,7 @@ If COLLECTION is an `obarray', a TEST should be needed. See `obarray'." (keymap helm-comp-read-map) (name "Helm Completions") candidates-in-buffer + match-part exec-when-only-one quit-when-no-cand (volatile t) @@ -403,6 +404,9 @@ Keys description: `helm-source-in-buffer' which is much faster. Argument VOLATILE have no effect when CANDIDATES-IN-BUFFER is non--nil. +- MATCH-PART: Allow matching only one part of candidate. + See match-part documentation in `helm-source'. + Any prefix args passed during `helm-comp-read' invocation will be recorded in `helm-current-prefix-arg', otherwise if prefix args were given before `helm-comp-read' invocation, the value of `current-prefix-arg' will be used. @@ -462,6 +466,7 @@ that use `helm-comp-read' See `helm-M-x' for example." (src-hist (helm-build-sync-source (format "%s History" name) :candidates history-get-candidates :fuzzy-match fuzzy + :match-part match-part :filtered-candidate-transformer (append '((lambda (candidates sources) (cl-loop for i in candidates @@ -479,6 +484,7 @@ that use `helm-comp-read' See `helm-M-x' for example." :action action-fn)) (src (helm-build-sync-source name :candidates get-candidates + :match-part match-part :filtered-candidate-transformer fc-transformer :requires-pattern requires-pattern :persistent-action persistent-action @@ -490,6 +496,7 @@ that use `helm-comp-read' See `helm-M-x' for example." :volatile volatile)) (src-1 (helm-build-in-buffer-source name :data get-candidates + :match-part match-part :filtered-candidate-transformer fc-transformer :requires-pattern requires-pattern :persistent-action persistent-action diff --git a/elpa/helm-20160711.1143/helm-multi-match.el b/elpa/helm-20160818.623/helm-multi-match.el similarity index 99% rename from elpa/helm-20160711.1143/helm-multi-match.el rename to elpa/helm-20160818.623/helm-multi-match.el index a926adb..ce6ed00 100644 --- a/elpa/helm-20160711.1143/helm-multi-match.el +++ b/elpa/helm-20160818.623/helm-multi-match.el @@ -54,9 +54,9 @@ when these options are used." ;; Internal -(defconst helm-mm-default-match-functions +(defvar helm-mm-default-match-functions '(helm-mm-exact-match helm-mm-match)) -(defconst helm-mm-default-search-functions +(defvar helm-mm-default-search-functions '(helm-mm-exact-search helm-mm-search)) diff --git a/elpa/helm-20160711.1143/helm-net.el b/elpa/helm-20160818.623/helm-net.el similarity index 100% rename from elpa/helm-20160711.1143/helm-net.el rename to elpa/helm-20160818.623/helm-net.el diff --git a/elpa/helm-20160711.1143/helm-org.el b/elpa/helm-20160818.623/helm-org.el similarity index 100% rename from elpa/helm-20160711.1143/helm-org.el rename to elpa/helm-20160818.623/helm-org.el diff --git a/elpa/helm-20160711.1143/helm-pkg.el b/elpa/helm-20160818.623/helm-pkg.el similarity index 56% rename from elpa/helm-20160711.1143/helm-pkg.el rename to elpa/helm-20160818.623/helm-pkg.el index 781c9a6..0db855e 100644 --- a/elpa/helm-20160711.1143/helm-pkg.el +++ b/elpa/helm-20160818.623/helm-pkg.el @@ -1,8 +1,8 @@ -(define-package "helm" "20160711.1143" "Helm is an Emacs incremental and narrowing framework" +(define-package "helm" "20160818.623" "Helm is an Emacs incremental and narrowing framework" '((emacs "24.3") (async "1.9") (popup "0.5.3") - (helm-core "1.9.8")) + (helm-core "1.9.9")) :url "https://emacs-helm.github.io/helm/") ;; Local Variables: ;; no-byte-compile: t diff --git a/elpa/helm-20160711.1143/helm-regexp.el b/elpa/helm-20160818.623/helm-regexp.el similarity index 99% rename from elpa/helm-20160711.1143/helm-regexp.el rename to elpa/helm-20160818.623/helm-regexp.el index 13a5623..6d06e92 100644 --- a/elpa/helm-20160711.1143/helm-regexp.el +++ b/elpa/helm-20160818.623/helm-regexp.el @@ -21,7 +21,6 @@ (require 'helm) (require 'helm-help) (require 'helm-utils) -(require 'helm-plugin) (declare-function helm-mm-split-pattern "helm-multi-match") @@ -140,7 +139,7 @@ i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b." :persistent-action #'helm-regexp-persistent-action :persistent-help "Show this line" :multiline t - :matchplugin nil + :multimatch nil :requires-pattern 2 :mode-line "Press TAB to select action." :action '(("Kill Regexp as sexp" . helm-kill-regexp-as-sexp) diff --git a/elpa/helm-20160711.1143/helm-ring.el b/elpa/helm-20160818.623/helm-ring.el similarity index 100% rename from elpa/helm-20160711.1143/helm-ring.el rename to elpa/helm-20160818.623/helm-ring.el diff --git a/elpa/helm-20160711.1143/helm-semantic.el b/elpa/helm-20160818.623/helm-semantic.el similarity index 100% rename from elpa/helm-20160711.1143/helm-semantic.el rename to elpa/helm-20160818.623/helm-semantic.el diff --git a/elpa/helm-20160711.1143/helm-sys.el b/elpa/helm-20160818.623/helm-sys.el similarity index 91% rename from elpa/helm-20160711.1143/helm-sys.el rename to elpa/helm-20160818.623/helm-sys.el index 79a6800..8346b5a 100644 --- a/elpa/helm-20160711.1143/helm-sys.el +++ b/elpa/helm-20160818.623/helm-sys.el @@ -337,41 +337,41 @@ Show actions only on line starting by a PID." (cadr (helm-xrandr-info))) (defvar helm-source-xrandr-change-resolution - '((name . "Change Resolution") - (candidates - . (lambda () - (with-temp-buffer - (call-process "xrandr" nil (current-buffer) nil - "--screen" (helm-xrandr-screen) "-q") - (goto-char 1) - (cl-loop with modes = nil - while (re-search-forward " \\([0-9]+x[0-9]+\\)" nil t) + (helm-build-sync-source "Change Resolution" + :candidates + (lambda () + (with-temp-buffer + (call-process "xrandr" nil (current-buffer) nil + "--screen" (helm-xrandr-screen) "-q") + (goto-char 1) + (cl-loop while (re-search-forward " \\([0-9]+x[0-9]+\\)" nil t) for mode = (match-string 1) unless (member mode modes) collect mode into modes - finally return modes)))) - (action - ("Change Resolution" - . (lambda (mode) - (call-process "xrandr" nil nil nil - "--screen" (helm-xrandr-screen) - "--output" (helm-xrandr-output) - "--mode" mode)))))) + finally return modes))) + :action + (helm-make-actions "Change Resolution" + (lambda (mode) + (call-process "xrandr" nil nil nil + "--screen" (helm-xrandr-screen) + "--output" (helm-xrandr-output) + "--mode" mode))))) ;;; Emacs process ;; ;; (defvar helm-source-emacs-process - '((name . "Emacs Process") - (init . (lambda () (list-processes--refresh))) - (candidates . (lambda () (mapcar #'process-name (process-list)))) - (persistent-action . (lambda (elm) - (delete-process (get-process elm)) - (helm-delete-current-selection))) - (persistent-help . "Kill Process") - (action ("Kill Process" . (lambda (elm) - (delete-process (get-process elm))))))) + (helm-build-sync-source "Emacs Process" + :init (lambda () (list-processes--refresh)) + :candidates (lambda () (mapcar #'process-name (process-list))) + :persistent-action (lambda (elm) + (delete-process (get-process elm)) + (helm-delete-current-selection)) + :persistent-help "Kill Process" + :action (helm-make-actions "Kill Process" + (lambda (elm) + (delete-process (get-process elm)))))) ;;;###autoload diff --git a/elpa/helm-20160711.1143/helm-tags.el b/elpa/helm-20160818.623/helm-tags.el similarity index 100% rename from elpa/helm-20160711.1143/helm-tags.el rename to elpa/helm-20160818.623/helm-tags.el diff --git a/elpa/helm-20160711.1143/helm-types.el b/elpa/helm-20160818.623/helm-types.el similarity index 100% rename from elpa/helm-20160711.1143/helm-types.el rename to elpa/helm-20160818.623/helm-types.el diff --git a/elpa/helm-20160711.1143/helm-utils.el b/elpa/helm-20160818.623/helm-utils.el similarity index 97% rename from elpa/helm-20160711.1143/helm-utils.el rename to elpa/helm-20160818.623/helm-utils.el index 1176013..52aef3f 100644 --- a/elpa/helm-20160711.1143/helm-utils.el +++ b/elpa/helm-20160818.623/helm-utils.el @@ -404,28 +404,30 @@ from its directory." "Sort predicate function for helm candidates. Args S1 and S2 can be single or \(display . real\) candidates, that is sorting is done against real value of candidate." - (let* ((pattern (regexp-quote helm-pattern)) - (reg1 (concat "\\_<" pattern "\\_>")) - (reg2 (concat "\\_<" pattern)) + (let* ((qpattern (regexp-quote helm-pattern)) + (reg1 (concat "\\_<" qpattern "\\_>")) + (reg2 (concat "\\_<" qpattern)) (reg3 helm-pattern) - (split (split-string pattern)) + (split (split-string helm-pattern)) (str1 (if (consp s1) (cdr s1) s1)) (str2 (if (consp s2) (cdr s2) s2)) (score (lambda (str r1 r2 r3 lst) - (+ (if (string-match (concat "\\`" pattern) str) 1 0) + (+ (if (string-match (concat "\\`" qpattern) str) 1 0) (cond ((string-match r1 str) 5) - ((and (string-match " " pattern) - (string-match (concat "\\_<" (car lst)) str) + ((and (string-match " " qpattern) + (string-match + (concat "\\_<" (regexp-quote (car lst))) str) (cl-loop for r in (cdr lst) always (string-match r str))) 4) - ((and (string-match " " pattern) - (cl-loop for r in lst always (string-match r str))) 3) + ((and (string-match " " qpattern) + (cl-loop for r in lst + always (string-match r str))) 3) ((string-match r2 str) 2) ((string-match r3 str) 1) (t 0))))) (sc1 (funcall score str1 reg1 reg2 reg3 split)) (sc2 (funcall score str2 reg1 reg2 reg3 split))) - (cond ((or (zerop (string-width pattern)) + (cond ((or (zerop (string-width qpattern)) (and (zerop sc1) (zerop sc2))) (string-lessp str1 str2)) ((= sc1 sc2) @@ -695,10 +697,10 @@ If STRING is non--nil return instead a space separated string." (require 'popup) (if helm-popup-tip-mode (progn - (add-hook 'helm-update-hook 'helm-show-help-echo) ; Needed for async sources. + (add-hook 'helm-after-update-hook 'helm-show-help-echo) ; Needed for async sources. (add-hook 'helm-move-selection-after-hook 'helm-show-help-echo) (add-hook 'helm-cleanup-hook 'helm-cancel-help-echo-timer)) - (remove-hook 'helm-update-hook 'helm-show-help-echo) + (remove-hook 'helm-after-update-hook 'helm-show-help-echo) (remove-hook 'helm-move-selection-after-hook 'helm-show-help-echo) (remove-hook 'helm-cleanup-hook 'helm-cancel-help-echo-timer))) diff --git a/elpa/helm-ag-20160702.324/helm-ag-autoloads.el b/elpa/helm-ag-20160809.337/helm-ag-autoloads.el similarity index 84% rename from elpa/helm-ag-20160702.324/helm-ag-autoloads.el rename to elpa/helm-ag-20160809.337/helm-ag-autoloads.el index 33f8a4e..1a7c676 100644 --- a/elpa/helm-ag-20160702.324/helm-ag-autoloads.el +++ b/elpa/helm-ag-20160809.337/helm-ag-autoloads.el @@ -1,10 +1,9 @@ ;;; helm-ag-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "helm-ag" "helm-ag.el" (22404 60254 733822 -;;;;;; 732000)) +;;;### (autoloads nil "helm-ag" "helm-ag.el" (22454 5319 583192 780000)) ;;; Generated autoloads from helm-ag.el (autoload 'helm-ag-pop-stack "helm-ag" "\ diff --git a/elpa/helm-ag-20160702.324/helm-ag-pkg.el b/elpa/helm-ag-20160809.337/helm-ag-pkg.el similarity index 51% rename from elpa/helm-ag-20160702.324/helm-ag-pkg.el rename to elpa/helm-ag-20160809.337/helm-ag-pkg.el index 4d5e0d1..b8901ec 100644 --- a/elpa/helm-ag-20160702.324/helm-ag-pkg.el +++ b/elpa/helm-ag-20160809.337/helm-ag-pkg.el @@ -1 +1,2 @@ -(define-package "helm-ag" "20160702.324" "the silver searcher with helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-ag") +;;; -*- no-byte-compile: t -*- +(define-package "helm-ag" "20160809.337" "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-20160702.324/helm-ag.el b/elpa/helm-ag-20160809.337/helm-ag.el similarity index 97% rename from elpa/helm-ag-20160702.324/helm-ag.el rename to elpa/helm-ag-20160809.337/helm-ag.el index 567eab7..05f3f0a 100644 --- a/elpa/helm-ag-20160702.324/helm-ag.el +++ b/elpa/helm-ag-20160809.337/helm-ag.el @@ -4,7 +4,7 @@ ;; Author: Syohei YOSHIDA ;; URL: https://github.com/syohex/emacs-helm-ag -;; Package-Version: 20160702.324 +;; Package-Version: 20160809.337 ;; Version: 0.56 ;; Package-Requires: ((emacs "24.3") (helm "1.7.7")) @@ -242,6 +242,14 @@ Default behaviour shows finish and result in mode-line." (while (re-search-forward "\xd" nil t) (replace-match ""))))) +(defun helm-ag--abbreviate-file-name () + (unless (helm-ag--windows-p) + (save-excursion + (goto-char (point-min)) + (forward-line 1) + (while (re-search-forward "^\\([^:]+\\)" nil t) + (replace-match (abbreviate-file-name (match-string-no-properties 1))))))) + (defun helm-ag--init () (let ((buf-coding buffer-file-coding-system)) (helm-attrset 'recenter t) @@ -260,6 +268,8 @@ Default behaviour shows finish and result in mode-line." (unless (executable-find (car cmds)) (error "'ag' is not installed.")) (error "Failed: '%s'" helm-ag--last-query)))) + (when helm-ag--buffer-search + (helm-ag--abbreviate-file-name)) (helm-ag--remove-carrige-returns) (helm-ag--save-current-context))))) @@ -578,6 +588,9 @@ Default behaviour shows finish and result in mode-line." (define-key map (kbd "C-c C-u") 'helm-ag--unmark) map)) +(defsubst helm-ag--edit-func-to-keys (func) + (key-description (car-safe (where-is-internal func helm-ag-edit-map)))) + (defun helm-ag--edit (_candidate) (let* ((helm-buf-dir (or helm-ag--default-directory helm-ag--last-default-directory @@ -607,8 +620,10 @@ Default behaviour shows finish and result in mode-line." (let ((inhibit-read-only t) (regexp (helm-ag--match-line-regexp))) (setq header-line-format - (format "[%s] C-c C-c: Commit, C-c C-k: Abort" - (abbreviate-file-name helm-ag--default-directory))) + (format "[%s] %s: Commit, %s: Abort" + (abbreviate-file-name helm-ag--default-directory) + (helm-ag--edit-func-to-keys #'helm-ag--edit-commit) + (helm-ag--edit-func-to-keys #'helm-ag--edit-abort))) (goto-char (point-min)) (while (re-search-forward regexp nil t) (let ((file-line-begin (match-beginning 4)) @@ -710,6 +725,8 @@ Special commands: (apply #'process-file (car helm-ag--last-command) nil t nil (cdr helm-ag--last-command)) (helm-ag--remove-carrige-returns) + (when helm-ag--buffer-search + (helm-ag--abbreviate-file-name)) (helm-ag--propertize-candidates helm-ag--last-query) (buffer-string)))) (helm-ag--put-result-in-save-buffer result helm-ag--search-this-file-p) @@ -890,6 +907,8 @@ Continue searching the parent directory? ")) (defun helm-ag--do-ag-propertize (input) (with-helm-window (helm-ag--remove-carrige-returns) + (when helm-ag--buffer-search + (helm-ag--abbreviate-file-name)) (helm-ag--propertize-candidates input) (when helm-ag-show-status-function (funcall helm-ag-show-status-function) @@ -1089,7 +1108,7 @@ Continue searching the parent directory? ")) (helm-do-ag--helm))))) (defun helm-ag--project-root () - (cl-loop for dir in '(".git/" ".hg/" ".svn/") + (cl-loop for dir in '(".git/" ".hg/" ".svn/" ".git") when (locate-dominating-file default-directory dir) return it)) diff --git a/elpa/helm-core-20160711.1141/helm-core-autoloads.el b/elpa/helm-core-20160818.5/helm-core-autoloads.el similarity index 94% rename from elpa/helm-core-20160711.1141/helm-core-autoloads.el rename to elpa/helm-core-20160818.5/helm-core-autoloads.el index a547cd8..aded00f 100644 --- a/elpa/helm-core-20160711.1141/helm-core-autoloads.el +++ b/elpa/helm-core-20160818.5/helm-core-autoloads.el @@ -1,9 +1,9 @@ ;;; helm-core-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "helm" "helm.el" (22404 60254 377820 872000)) +;;;### (autoloads nil "helm" "helm.el" (22454 5318 318163 35000)) ;;; Generated autoloads from helm.el (autoload 'helm-define-multi-key "helm" "\ @@ -35,7 +35,7 @@ See `helm-define-multi-key'. \(fn NAME DOCSTRING FUNS &optional DELAY)" nil t) -(put 'helm-multi-key-defun 'lisp-indent-function '2) +(function-put 'helm-multi-key-defun 'lisp-indent-function '2) (autoload 'helm-define-key-with-subkeys "helm" "\ Defines in MAP a KEY and SUBKEY to COMMAND. @@ -69,7 +69,7 @@ NOTE: SUBKEY and OTHER-SUBKEYS bindings support char syntax only \(fn MAP KEY SUBKEY COMMAND &optional OTHER-SUBKEYS MENU EXIT-FN)" nil nil) -(put 'helm-define-key-with-subkeys 'lisp-indent-function '1) +(function-put 'helm-define-key-with-subkeys 'lisp-indent-function '1) (autoload 'helm-debug-open-last-log "helm" "\ Open helm log file or buffer of last helm session. @@ -188,7 +188,7 @@ Enable/disable helm debugging from outside of helm session. ;;;*** ;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el" -;;;;;; "helm-source.el") (22404 60254 406327 599000)) +;;;;;; "helm-source.el") (22454 5318 397164 892000)) ;;;*** diff --git a/elpa/helm-core-20160711.1141/helm-core-pkg.el b/elpa/helm-core-20160818.5/helm-core-pkg.el similarity index 64% rename from elpa/helm-core-20160711.1141/helm-core-pkg.el rename to elpa/helm-core-20160818.5/helm-core-pkg.el index 3a43ea1..83b9873 100644 --- a/elpa/helm-core-20160711.1141/helm-core-pkg.el +++ b/elpa/helm-core-20160818.5/helm-core-pkg.el @@ -1,4 +1,4 @@ -(define-package "helm-core" "20160711.1141" "Development files for Helm" +(define-package "helm-core" "20160818.5" "Development files for Helm" '((emacs "24.3") (async "1.9")) :url "https://emacs-helm.github.io/helm/") diff --git a/elpa/helm-core-20160711.1141/helm-lib.el b/elpa/helm-core-20160818.5/helm-lib.el similarity index 99% rename from elpa/helm-core-20160711.1141/helm-lib.el rename to elpa/helm-core-20160818.5/helm-lib.el index 5759efc..d829faa 100644 --- a/elpa/helm-core-20160711.1141/helm-lib.el +++ b/elpa/helm-core-20160818.5/helm-lib.el @@ -164,7 +164,7 @@ of `cl-return' is possible to exit the loop." (let ((clause1 (car clauses))) `(let ((,sym ,(car clause1))) (helm-aif ,sym - ,@(cdr clause1) + (progn ,@(cdr clause1)) (helm-acond ,@(cdr clauses)))))))) (defun helm-current-line-contents () diff --git a/elpa/helm-core-20160711.1141/helm-multi-match.el b/elpa/helm-core-20160818.5/helm-multi-match.el similarity index 99% rename from elpa/helm-core-20160711.1141/helm-multi-match.el rename to elpa/helm-core-20160818.5/helm-multi-match.el index a926adb..ce6ed00 100644 --- a/elpa/helm-core-20160711.1141/helm-multi-match.el +++ b/elpa/helm-core-20160818.5/helm-multi-match.el @@ -54,9 +54,9 @@ when these options are used." ;; Internal -(defconst helm-mm-default-match-functions +(defvar helm-mm-default-match-functions '(helm-mm-exact-match helm-mm-match)) -(defconst helm-mm-default-search-functions +(defvar helm-mm-default-search-functions '(helm-mm-exact-search helm-mm-search)) diff --git a/elpa/helm-core-20160711.1141/helm-source.el b/elpa/helm-core-20160818.5/helm-source.el similarity index 94% rename from elpa/helm-core-20160711.1141/helm-source.el rename to elpa/helm-core-20160818.5/helm-source.el index 09890c6..048f7ae 100644 --- a/elpa/helm-core-20160711.1141/helm-source.el +++ b/elpa/helm-core-20160818.5/helm-source.el @@ -268,29 +268,31 @@ :initform nil :custom function :documentation - " Function called with one parameter; the selected candidate. + " Transform the selected candidate when passing it to action. - The function transforms the selected candidate, and the result - is passed to the action function. The display-to-real - attribute provides another way to pass to action other string than - the one shown in Helm buffer. + Function called with one parameter, the selected candidate. - Traditionally, it is possible to make candidates, - candidate-transformer or filtered-candidate-transformer - function return a list with (DISPLAY . REAL) pairs. But if REAL - can be generated from DISPLAY, display-to-real is more - convenient and faster. + Avoid recomputing all candidates with candidate-transformer + or filtered-candidate-transformer to give a new value to REAL, + instead the selected candidate is transformed only when passing it + to action. - NOTE: This is deprecated and you have better time using `filter-one-by-one'.") + Note that this is NOT a transformer, + so the display will not be modified by this function.") (real-to-display :initarg :real-to-display :initform nil :custom function :documentation - " Function called with one parameter; the selected candidate. + " Recompute all candidates computed previously with other transformers. + + Function called with one parameter, the selected candidate. + The real value of candidates will be shown in display. - See `display-to-real'.") + Note: This have nothing to do with display-to-real. + It is unuseful as the same can be performed by using more than + one function in transformers, it is kept only for backward compatibility.") (action-transformer :initarg :action-transformer @@ -480,19 +482,20 @@ " `helm-follow-mode' will execute persistent-action after this delay. Otherwise value of `helm-follow-input-idle-delay' is used if non--nil, If none of these are found fallback to `helm-input-idle-delay'.") - - (dont-plug - :initarg :dont-plug - :initform '(helm-compile-source--persistent-help) - :custom list - :documentation - " A list of compile functions plugin to ignore.") - - (matchplugin - :initarg :matchplugin + + (multimatch + :initarg :multimatch :initform t - :custom boolean) - + :custom boolean + :documentation + " Use the multi-match algorithm when non-nil. + I.e Allow specifying multiple patterns separated by spaces. + When a pattern is prefixed by \"!\" the negation of this pattern is used, + i.e match anything but this pattern. + It is the standard way of matching in helm and is enabled by default. + It can be used with fuzzy-matching enabled, but as soon helm detect a space, + each pattern will match by regexp and will not be fuzzy.") + (match-part :initarg :match-part :initform nil @@ -543,13 +546,6 @@ ((candidates :initform '("ERROR: You must specify the `candidates' slot, either with a list or a function")) - (dont-plug - :initform '(helm-compile-source--multi-match - helm-compile-source--persistent-help - ;; Ensure this will not be plugged - ;; if user have somewhere old helm-migemo.el. - helm-compile-source--migemo)) - (migemo :initarg :migemo :initform nil @@ -575,7 +571,7 @@ functions will be used. You can specify those functions as a list of functions or a single symbol function. - NOTE: This have the same effect as using :MATCHPLUGIN nil.")) + NOTE: This have the same effect as using :MULTIMATCH nil.")) "Use this class to make helm sources using a list of candidates. This list should be given as a normal list, a variable handling a list @@ -597,9 +593,7 @@ Matching is done basically with `string-match' against each candidate.") The process buffer should be nil, otherwise, if you use `helm-buffer' give to the process a sentinel.") - (matchplugin :initform nil) - (dont-plug :initform '(helm-compile-source--multi-match - helm-compile-source--persistent-help))) + (multimatch :initform nil)) "Use this class to define a helm source calling an external process. The :candidates slot is not allowed even if described because this class @@ -619,12 +613,6 @@ inherit from `helm-source'.") the buffer will be build with `helm-init-candidates-in-buffer'. This is an easy and fast method to build a `candidates-in-buffer' source.") - (dont-plug - :initform '(helm-compile-source--candidates-in-buffer - helm-compile-source--multi-match - helm-compile-source--persistent-help - helm-compile-source--migemo)) - (migemo :initarg :migemo :initform nil @@ -667,7 +655,7 @@ inherit from `helm-source'.") Buffer search function used by `helm-candidates-in-buffer'. By default, `helm-candidates-in-buffer' uses `re-search-forward'. The function should take one arg PATTERN. - If your search function needs to handle negation like matchplugin, + If your search function needs to handle negation like multimatch, this function should returns in such case a cons cell of two integers defining the beg and end positions to match in the line previously matched by `re-search-forward' or similar, and move point to next line @@ -688,11 +676,12 @@ inherit from `helm-source'.") list of functions or a single symbol function. NOTE: This have the same effect as using a nil value for - :MATCHPLUGIN slot.")) + :MULTIMATCH slot.")) "Use this source to make helm sources storing candidates inside a buffer. Contrarily to `helm-source-sync' candidates are matched using a function -like `re-search-forward', see below documentation of :search slot.") +like `re-search-forward', see below documentation of :search slot. +See `helm-candidates-in-buffer' for more infos.") (defclass helm-source-dummy (helm-source) ((candidates @@ -701,7 +690,7 @@ like `re-search-forward', see below documentation of :search slot.") (filtered-candidate-transformer :initform (lambda (_candidates _source) (list helm-pattern))) - (matchplugin + (multimatch :initform nil) (accept-empty @@ -903,10 +892,10 @@ an eieio class." (append (helm-mklist it) (list helm-fuzzy-match-fn))) (setf (slot-value source 'match) helm-fuzzy-match-fn))) - (when (slot-value source 'matchplugin) + (when (slot-value source 'multimatch) (setf (slot-value source 'match) (helm-source-mm-get-search-or-match-fns source 'match))) - (helm-aif (and (null (slot-value source 'matchplugin)) + (helm-aif (and (null (slot-value source 'multimatch)) (slot-value source 'migemo)) (unless (eq it 'nomultimatch) ; Use own migemo fn. (setf (slot-value source 'match) @@ -933,10 +922,10 @@ an eieio class." (append (helm-mklist it) (list helm-fuzzy-search-fn))) (setf (slot-value source 'search) (list helm-fuzzy-search-fn)))) - (when (slot-value source 'matchplugin) + (when (slot-value source 'multimatch) (setf (slot-value source 'search) (helm-source-mm-get-search-or-match-fns source 'search))) - (helm-aif (and (null (slot-value source 'matchplugin)) + (helm-aif (and (null (slot-value source 'multimatch)) (slot-value source 'migemo)) (unless (eq it 'nomultimatch) (setf (slot-value source 'search) @@ -952,8 +941,8 @@ an eieio class." (defmethod helm--setup-source ((source helm-source-async)) (cl-assert (null (slot-value source 'candidates)) nil "Incorrect use of `candidates' use `candidates-process' instead") - (cl-assert (null (slot-value source 'matchplugin)) - nil "`matchplugin' not allowed in async sources.")) + (cl-assert (null (slot-value source 'multimatch)) + nil "`multimatch' not allowed in async sources.")) (defmethod helm--setup-source ((source helm-source-dummy)) (let ((mtc (slot-value source 'match))) diff --git a/elpa/helm-core-20160711.1141/helm.el b/elpa/helm-core-20160818.5/helm.el similarity index 97% rename from elpa/helm-core-20160711.1141/helm.el rename to elpa/helm-core-20160818.5/helm.el index 6563054..ac5195e 100644 --- a/elpa/helm-core-20160711.1141/helm.el +++ b/elpa/helm-core-20160818.5/helm.el @@ -686,11 +686,8 @@ before creation of `helm-buffer'. Set local variables for This hook runs after `helm-buffer' is created but not from `helm-buffer'. The hook needs to specify in which buffer to run.") -(defvar helm-update-hook nil - "Run after the helm buffer is updated. -This hook runs at the beginning of buffer. The first candidate is -selected after running this hook. See also -`helm-after-update-hook'.") +(defvaralias 'helm-update-hook 'helm-after-update-hook) +(make-obsolete-variable 'helm-update-hook 'helm-after-update-hook "1.9.9") (defvar helm-after-update-hook nil "Runs after updating the helm buffer with the new input pattern. @@ -923,7 +920,6 @@ It also accepts function or variable symbol.") "Internal, store locally `helm-pattern' value for later use in `helm-resume'.") (defvar helm-source-name nil) (defvar helm-current-source nil) -(defvar helm-candidate-buffer-alist nil) (defvar helm-tick-hash (make-hash-table :test 'equal)) (defvar helm-issued-errors nil) (defvar helm--last-log-file nil @@ -937,7 +933,8 @@ It also accepts function or variable symbol.") (defvar helm-visible-mark-overlays nil) (defvar helm-update-blacklist-regexps '("^" "^ *" "$" "!" " " "\\b" "\\<" "\\>" "\\_<" "\\_>" ".*")) -(defvar helm-force-updating-p nil) +(defvar helm--force-updating-p nil + "[INTERNAL] Don't use this in your programs.") (defvar helm-exit-status 0 "Flag to inform if helm did exit or quit. 0 means helm did exit when executing an action. @@ -1354,26 +1351,19 @@ If NO-UPDATE is non-`nil', skip executing `helm-update'." (unless no-update (helm-update))) (defun helm-get-sources () - "Return compiled `helm-sources', which is memoized. - -Attributes: - -- type - `helm-type-attributes' are merged in. -- candidates-buffer - candidates, volatile and match attribute are created." + "Return compiled `helm-sources', which is memoized." (cond ;; action - ((helm-action-window) - helm-sources) + ((helm-action-window) helm-sources) ;; memoized (helm-compiled-sources) ;; first time (t (prog1 (setq helm-compiled-sources - (helm-compile-sources - helm-sources helm-compile-source-functions)) + (mapcar (lambda (source) + (if (listp source) source (symbol-value source))) + helm-sources)) (helm-log "helm-compiled-sources = %S" helm-compiled-sources))))) (defun helm-get-selection (&optional buffer force-display-part) @@ -1434,33 +1424,29 @@ of \(action-display . function\)." (defun helm-get-current-source () "Return the source for the current selection. -Allow also checking if helm-buffer contain candidates." +Return nil when `helm-buffer' is empty." (or helm-current-source (with-helm-buffer - ;; Return nil when no--candidates. - (cl-block exit - ;; This goto-char shouldn't be necessary, but point is moved to - ;; point-min somewhere else which shouldn't happen. - (goto-char (overlay-start helm-selection-overlay)) - (let* ((header-pos (or (helm-get-previous-header-pos) - (helm-get-next-header-pos))) - (source-name - (save-excursion - (unless header-pos - (cl-return-from exit nil)) - (goto-char header-pos) - (helm-current-line-contents)))) - (cl-loop for source in (helm-get-sources) thereis + ;; This is needed to not loose selection. + (goto-char (overlay-start helm-selection-overlay)) + (let ((header-pos (or (helm-get-previous-header-pos) + (helm-get-next-header-pos)))) + ;; Return nil when no--candidates. + (when header-pos + (cl-loop with source-name = (save-excursion + (goto-char header-pos) + (helm-current-line-contents)) + for source in (helm-get-sources) thereis (and (equal (assoc-default 'name source) source-name) source))))))) (defun helm-buffer-is-modified (buffer) "Return non-`nil' when BUFFER is modified since `helm' was invoked." - (let* ((b (get-buffer buffer)) - (key (concat (buffer-name b) "/" (helm-attr 'name))) + (let* ((buf (get-buffer buffer)) + (key (concat (buffer-name buf) "/" (helm-attr 'name))) (source-tick (or (gethash key helm-tick-hash) 0)) - (buffer-tick (buffer-chars-modified-tick b)) - (modifiedp (/= source-tick buffer-tick))) + (buffer-tick (buffer-chars-modified-tick buf)) + (modifiedp (/= source-tick buffer-tick))) (puthash key buffer-tick helm-tick-hash) (helm-log "buffer = %S" buffer) (helm-log "modifiedp = %S" modifiedp) @@ -1537,7 +1523,7 @@ Just like `setq' except that the vars are not set sequentially. IOW Don't use VALUE of previous VAR to set the VALUE of next VAR. \(fn VAR VALUE ...)" - (if helm-force-updating-p + (if helm--force-updating-p (with-helm-buffer (cl-loop for i on args by #'cddr do (set (make-local-variable (car i)) (cadr i)))) @@ -1852,7 +1838,6 @@ ANY-KEYMAP ANY-DEFAULT ANY-HISTORY See `helm'." (let ((non-essential t) ;; Prevent mouse jumping to the upper-right ;; hand corner of the frame (#1538). - mode-line-in-non-selected-windows mouse-autoselect-window focus-follows-mouse (input-method-verbose-flag helm-input-method-verbose-flag) @@ -1878,6 +1863,7 @@ ANY-KEYMAP ANY-DEFAULT ANY-HISTORY See `helm'." (helm-initialize any-resume any-input any-default any-sources) (helm-display-buffer helm-buffer) + (select-window (helm-window)) ;; We are now in helm-buffer. (when helm-prevent-escaping-from-minibuffer (helm--remap-mouse-mode 1)) ; Disable mouse bindings. @@ -2423,6 +2409,8 @@ For ANY-PRESELECT ANY-RESUME ANY-KEYMAP ANY-DEFAULT ANY-HISTORY, See `helm'." (helm-log "helm-execute-action-at-once-if-one = %S" helm-execute-action-at-once-if-one) (helm-log "helm-quit-if-no-candidate = %S" helm-quit-if-no-candidate) + (when (and src (helm-resume-p any-resume)) + (helm-display-mode-line src)) ;; Reset `helm-pattern' and update ;; display if no result found with precedent value of `helm-pattern' ;; unless `helm-quit-if-no-candidate' is non-`nil', in this case @@ -2673,24 +2661,6 @@ WARNING: Do not use this mode yourself, it is internal to helm." (add-hook 'helm-after-update-hook #'helm--reset-update-flag) - -;;; Core: source compiler -;; -;; -(defun helm-compile-sources (sources funcs) - "Compile SOURCES with FUNCS. -See `helm-compile-source-functions'. -Helm plug-ins are realized by this function." - (mapcar - (lambda (source) - (cl-loop with src = (if (listp source) source (symbol-value source)) - for noplug = (assoc 'dont-plug src) - for f in funcs - unless (and noplug (memq f (cdr noplug))) - do (setq src (funcall f src)) - finally (cl-return src))) - sources)) - ;; Core: all candidates @@ -3286,21 +3256,21 @@ to a particular place after finishing update." (cl-loop for src in sources for mtc in matches do (helm-render-source src mtc)))) - (helm-update-move-first-line) - (unless (assoc 'candidates-process source) - (helm-display-mode-line (helm-get-current-source)) - (helm-log-run-hook 'helm-after-update-hook)) + (helm--update-move-first-line) + (let ((src (or source (helm-get-current-source)))) + (unless (assoc 'candidates-process src) + (helm-display-mode-line src) + (helm-log-run-hook 'helm-after-update-hook))) (when preselect (helm-log "Update preselect candidate %s" preselect) (helm-preselect preselect source)) - (setq helm-force-updating-p nil)) + (setq helm--force-updating-p nil)) (helm-log "end update"))) (defun helm-update-source-p (source) "Whether SOURCE need updating or not." (let ((len (string-width - (if (or (assoc 'matchplugin source) - (null (assoc 'no-matchplugin source))) + (if (assoc 'multimatch source) ;; Don't count spaces entered when using ;; multi-match. (replace-regexp-in-string " " "" helm-pattern) @@ -3315,12 +3285,12 @@ to a particular place after finishing update." (not (member (replace-regexp-in-string "\\s\\ " " " helm-pattern) helm-update-blacklist-regexps))))) -(defun helm-update-move-first-line (&optional without-hook) +(defun helm--update-move-first-line () "Goto first line of `helm-buffer'." (goto-char (point-min)) - (unless without-hook - (save-excursion (helm-log-run-hook 'helm-update-hook))) - (helm-move-selection-common :where 'line :direction 'next :follow nil)) + (helm-move-selection-common :where 'line + :direction 'next + :follow nil)) (defun helm-force-update (&optional preselect) "Force recalculation and update of candidates. @@ -3336,7 +3306,7 @@ PRESELECT, if specified." (selection (helm-aif (helm-get-selection nil t) (regexp-quote it) it))) - (setq helm-force-updating-p t) + (setq helm--force-updating-p t) (when source (mapc 'helm-force-update--reinit (helm-get-sources))) @@ -3491,14 +3461,12 @@ this additional info after the source name by overlay." finally do (setcdr incomplete-line-info newline)))) (defun helm-output-filter--post-process () - (let ((src (helm-get-current-source))) - (helm-log-run-hook 'helm-update-hook) - (helm-aif (get-buffer-window helm-buffer 'visible) - (with-selected-window it - (helm-skip-noncandidate-line 'next) - (helm-mark-current-line) - (helm-display-mode-line src) - (helm-log-run-hook 'helm-after-update-hook))))) + (helm-aif (get-buffer-window helm-buffer 'visible) + (with-selected-window it + (helm-skip-noncandidate-line 'next) + (helm-mark-current-line) + (helm-display-mode-line (helm-get-current-source)) + (helm-log-run-hook 'helm-after-update-hook)))) (defun helm-process-deferred-sentinel-hook (process event file) "Defer remote processes in sentinels. @@ -3847,8 +3815,7 @@ Key arg DIRECTION can be one of: (when (helm-pos-multiline-p) (helm-move--beginning-of-multiline-candidate)) (helm-display-source-at-screen-top-maybe where) - (when (helm-get-previous-header-pos) - (helm-mark-current-line)) + (helm-mark-current-line) (when follow (helm-follow-execute-persistent-action-maybe)) (helm-display-mode-line (helm-get-current-source)) @@ -3949,12 +3916,15 @@ Key arg DIRECTION can be one of: (defun helm-move--goto-source-fn (source-or-name) (goto-char (point-min)) - (let ((name (if (stringp source-or-name) source-or-name - (assoc-default 'name source-or-name)))) - (condition-case err - (while (not (string= name (helm-current-line-contents))) - (goto-char (helm-get-next-header-pos))) - (error (helm-log "%S" err))))) + (let ((name (if (stringp source-or-name) + source-or-name + (assoc-default 'name source-or-name)))) + (if (string= name "") + (forward-line 1) + (condition-case err + (while (not (string= name (helm-current-line-contents))) + (goto-char (helm-get-next-header-pos))) + (error (helm-log "%S" err)))))) (defun helm-candidate-number-at-point () (if helm-alive-p @@ -4278,14 +4248,19 @@ to a list of forms.\n\n") (defun helm-preselect (candidate-or-regexp &optional source) "Move `helm-selection-overlay' to CANDIDATE-OR-REGEXP on startup. -Arg CANDIDATE-OR-REGEXP can be a string or a cons cell of two -strings. When cons cell, helm tries jumping to first element of +Arg CANDIDATE-OR-REGEXP can be a string, a cons cell of two +strings or a function called with no arg which will be in charge +of moving to a specific candidate. +When a cons cell, helm tries jumping to first element of cons cell and then to the second, and so on. This allows finer preselection if there are duplicates before the candidate we -want to preselect." +want to preselect. +Argument SOURCE will be used only when `helm-preselect' is called +from `helm-force-update' and should be in this case a valid source name +or a source alist." (with-helm-window (when candidate-or-regexp - (if (and helm-force-updating-p source) + (if (and helm--force-updating-p source) (helm-goto-source source) (goto-char (point-min)) (forward-line 1)) @@ -4403,13 +4378,11 @@ When at the end of minibuffer, deletes all." ;;; helm-source-in-buffer. ;; (defun helm-candidates-in-buffer (&optional source) - "The top level function used to store candidates in `helm-source-in-buffer'. + "The top level function used to store candidates with `helm-source-in-buffer'. -Candidates are stored in a buffer generated internally by -`helm-candidate-buffer' function. Each candidate must be placed -in one line. This function is meant to be used in -candidates-in-buffer or candidates attribute of an helm source. -It is especially fast for many (1000+) candidates. +Candidates are stored in a buffer generated internally +by `helm-candidate-buffer' function. +Each candidate must be placed in one line. The buffer is created and fed in the init attribute function of helm. @@ -4425,18 +4398,13 @@ A shortcut can be used to simplify: (helm-build-in-buffer-source \"test\" :data '(foo foa fob bar baz)) -`candidates-in-buffer' is now deprecated in favor of -`helm-source-in-buffer' class. - -Description provided here for backward compatibility. - By default, `helm' makes candidates by evaluating the candidates function, then narrows them by `string-match' for each candidate. But this is slow for large number of candidates. The new way is -to store all candidates in a buffer and then narrow with -`re-search-forward'. Search function is customizable by search +to store all candidates in a buffer and then narrow +with `re-search-forward'. Search function is customizable by search attribute. The important point is that buffer processing is MUCH FASTER than string list processing and is the Emacs way. @@ -4445,25 +4413,17 @@ candidate buffer. The candidates buffer is created or specified by `helm-candidate-buffer'. Candidates are stored in a line. The candidates function narrows all candidates, IOW creates a -subset of candidates dynamically. It is the task of -`helm-candidates-in-buffer'. As long as -`helm-candidate-buffer' is used,`(candidates-in-buffer)' is -sufficient in most cases. +subset of candidates dynamically. -Note that `(candidates-in-buffer)' is shortcut of three attributes: - (candidates . helm-candidates-in-buffer) - (volatile) - (match identity) -And `(candidates-in-buffer . func)' is shortcut of three attributes: - (candidates . func) - (volatile) - (match identity) -The expansion is performed in `helm-get-sources'. +Class `helm-source-in-buffer' is implemented with three attributes: + + (candidates . helm-candidates-in-buffer) + (volatile) + (match identity) -The `candidates-in-buffer' attribute implies the volatile attribute. The volatile attribute is needed because `helm-candidates-in-buffer' -creates candidates dynamically and need to be called every time -`helm-pattern' changes. +creates candidates dynamically and need to be called every +time `helm-pattern' changes. Because `helm-candidates-in-buffer' plays the role of `match' attribute function, specifying `(match identity)' makes the source slightly faster. @@ -4473,8 +4433,8 @@ on part of candidate returned by the call of function provided by this attribute The function should have one arg, candidate, and return only a specific part of candidate. -To customize `helm-candidates-in-buffer' behavior, use `search', -`get-line' and `match-part' attributes." +To customize `helm-candidates-in-buffer' behavior, +use `search', `get-line' and `match-part' attributes." (let ((src (or source (helm-get-current-source)))) (helm-candidates-in-buffer-1 (helm-candidate-buffer) @@ -4639,6 +4599,7 @@ Acceptable values of CREATE-OR-BUFFER: (local-bname (format " *helm candidates:%s*%s" helm-source-name (buffer-name helm-current-buffer))) + helm-candidate-buffer-alist (register-func (lambda () (setq helm-candidate-buffer-alist @@ -5189,6 +5150,13 @@ selection. When key WITH-WILDCARD is specified, expand it." (helm-log "Marked candidates = %S" candidates) candidates))) +(defun helm--remove-marked-and-update-mode-line (elm) + (with-helm-buffer + (setq helm-marked-candidates + (delete (rassoc elm helm-marked-candidates) + helm-marked-candidates)) + (helm-display-mode-line (helm-get-current-source)))) + (defun helm-current-source-name= (name) (save-excursion (goto-char (helm-get-previous-header-pos)) @@ -5223,7 +5191,7 @@ selection. When key WITH-WILDCARD is specified, expand it." (move-overlay o beg end)) (and (equal o-str (buffer-substring beg end)) (move-overlay o beg end)))))))))) -(add-hook 'helm-update-hook 'helm-revive-visible-mark) +(add-hook 'helm-after-update-hook 'helm-revive-visible-mark) (defun helm-next-point-in-list (curpos points &optional prev) (cond diff --git a/elpa/helm-gtags-20160417.555/helm-gtags-pkg.el b/elpa/helm-gtags-20160417.555/helm-gtags-pkg.el deleted file mode 100644 index a19a951..0000000 --- a/elpa/helm-gtags-20160417.555/helm-gtags-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "helm-gtags" "20160417.555" "GNU GLOBAL helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-gtags") diff --git a/elpa/helm-gtags-20160417.555/helm-gtags-autoloads.el b/elpa/helm-gtags-20160726.844/helm-gtags-autoloads.el similarity index 94% rename from elpa/helm-gtags-20160417.555/helm-gtags-autoloads.el rename to elpa/helm-gtags-20160726.844/helm-gtags-autoloads.el index 35a9108..b3bea15 100644 --- a/elpa/helm-gtags-20160417.555/helm-gtags-autoloads.el +++ b/elpa/helm-gtags-20160726.844/helm-gtags-autoloads.el @@ -1,10 +1,10 @@ ;;; helm-gtags-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "helm-gtags" "helm-gtags.el" (22297 20823 749050 -;;;;;; 904000)) +;;;### (autoloads nil "helm-gtags" "helm-gtags.el" (22454 5314 648076 +;;;;;; 739000)) ;;; Generated autoloads from helm-gtags.el (autoload 'helm-gtags-clear-all-cache "helm-gtags" "\ diff --git a/elpa/helm-gtags-20160726.844/helm-gtags-pkg.el b/elpa/helm-gtags-20160726.844/helm-gtags-pkg.el new file mode 100644 index 0000000..be04096 --- /dev/null +++ b/elpa/helm-gtags-20160726.844/helm-gtags-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "helm-gtags" "20160726.844" "GNU GLOBAL helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-gtags") diff --git a/elpa/helm-gtags-20160417.555/helm-gtags.el b/elpa/helm-gtags-20160726.844/helm-gtags.el similarity index 98% rename from elpa/helm-gtags-20160417.555/helm-gtags.el rename to elpa/helm-gtags-20160726.844/helm-gtags.el index 7e8fd17..a2d0f40 100644 --- a/elpa/helm-gtags-20160417.555/helm-gtags.el +++ b/elpa/helm-gtags-20160726.844/helm-gtags.el @@ -4,7 +4,7 @@ ;; Author: Syohei YOSHIDA ;; URL: https://github.com/syohex/emacs-helm-gtags -;; Package-Version: 20160417.555 +;; Package-Version: 20160726.844 ;; Version: 1.5.6 ;; Package-Requires: ((emacs "24.3") (helm "1.7.7")) @@ -73,6 +73,10 @@ "Ignore case in each search." :type 'boolean) +(defcustom helm-gtags-cygwin-use-global-w32-port t + "Use the GNU global win32 port in Cygwin." + :type 'boolean) + (defcustom helm-gtags-read-only nil "Gtags read only mode." :type 'boolean) @@ -293,6 +297,9 @@ Always update if value of this variable is nil." for libpath = (file-name-as-directory (expand-file-name path)) thereis (string= tagroot libpath)))) +(defsubst helm-gtags--convert-cygwin-windows-file-name-p () + (and (eq system-type 'cygwin) helm-gtags-cygwin-use-global-w32-port)) + (defun helm-gtags--tag-directory () (with-temp-buffer (helm-aif (getenv "GTAGSROOT") @@ -303,7 +310,7 @@ Always update if value of this variable is nil." (when (looking-at "^\\([^\r\n]+\\)") (let ((tag-path (match-string-no-properties 1))) (file-name-as-directory - (if (eq system-type 'cygwin) + (if (helm-gtags--convert-cygwin-windows-file-name-p) (cygwin-convert-file-name-from-windows tag-path) tag-path))))))) @@ -547,7 +554,7 @@ Always update if value of this variable is nil." (let* ((filename (helm-gtags--real-file-name)) (from-here-opt (format "--from-here=%d:%s" (line-number-at-pos) - (if (eq system-type 'cygwin) + (if (helm-gtags--convert-cygwin-windows-file-name-p) (cygwin-convert-file-name-to-windows filename) filename)))) (setq helm-gtags--last-input token) @@ -975,7 +982,7 @@ Always update if value of this variable is nil." (message "Failed: %s TAGS(%d)" action (process-exit-status process)))))) (defsubst helm-gtags--read-gtagslabel () - (let ((labels '("default" "native" "ctags" "pygments"))) + (let ((labels '("default" "native" "ctags" "new-ctags" "pygments"))) (completing-read "GTAGSLABEL(Default: default): " labels nil t nil nil "default"))) (defsubst helm-gtags--label-option (label) @@ -1001,9 +1008,9 @@ Always update if value of this variable is nil." (label (helm-gtags--read-gtagslabel)) (default-directory tagroot)) (message "gtags is generating tags....") - (unless (zerop (process-file "gtags" nil nil nil - "-q" (helm-gtags--label-option label))) - (error "Faild: 'gtags -q'")) + (let ((label-opt (helm-gtags--label-option label))) + (unless (zerop (process-file "gtags" nil nil nil "-q" label-opt)) + (error "Failed: 'gtags -q %s'" label-opt))) tagroot)))) (defun helm-gtags--current-file-and-line () diff --git a/elpa/helm-make-20160331.754/helm-make-pkg.el b/elpa/helm-make-20160331.754/helm-make-pkg.el deleted file mode 100644 index 6ce8fe4..0000000 --- a/elpa/helm-make-20160331.754/helm-make-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "helm-make" "20160331.754" "Select a Makefile target with helm" '((helm "1.5.3") (projectile "0.11.0")) :url "https://github.com/abo-abo/helm-make" :keywords '("makefile")) diff --git a/elpa/helm-make-20160331.754/helm-make-autoloads.el b/elpa/helm-make-20160807.1756/helm-make-autoloads.el similarity index 83% rename from elpa/helm-make-20160331.754/helm-make-autoloads.el rename to elpa/helm-make-20160807.1756/helm-make-autoloads.el index ca8dc71..5cd35dd 100644 --- a/elpa/helm-make-20160331.754/helm-make-autoloads.el +++ b/elpa/helm-make-20160807.1756/helm-make-autoloads.el @@ -1,10 +1,10 @@ ;;; helm-make-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "helm-make" "helm-make.el" (22297 53345 558923 -;;;;;; 533000)) +;;;### (autoloads nil "helm-make" "helm-make.el" (22454 5313 194042 +;;;;;; 549000)) ;;; Generated autoloads from helm-make.el (autoload 'helm-make "helm-make" "\ diff --git a/elpa/helm-make-20160807.1756/helm-make-pkg.el b/elpa/helm-make-20160807.1756/helm-make-pkg.el new file mode 100644 index 0000000..972d2b0 --- /dev/null +++ b/elpa/helm-make-20160807.1756/helm-make-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "helm-make" "20160807.1756" "Select a Makefile target with helm" '((helm "1.5.3") (projectile "0.11.0")) :url "https://github.com/abo-abo/helm-make" :keywords '("makefile")) diff --git a/elpa/helm-make-20160331.754/helm-make.el b/elpa/helm-make-20160807.1756/helm-make.el similarity index 92% rename from elpa/helm-make-20160331.754/helm-make.el rename to elpa/helm-make-20160807.1756/helm-make.el index 40bd9ce..0cb3fc8 100644 --- a/elpa/helm-make-20160331.754/helm-make.el +++ b/elpa/helm-make-20160807.1756/helm-make.el @@ -4,7 +4,7 @@ ;; Author: Oleh Krehel ;; URL: https://github.com/abo-abo/helm-make -;; Package-Version: 20160331.754 +;; Package-Version: 20160807.1756 ;; Version: 0.2.0 ;; Package-Requires: ((helm "1.5.3") (projectile "0.11.0")) ;; Keywords: makefile @@ -86,6 +86,14 @@ You can reset the cache by calling `helm-make-reset-db'." "When non-nil, don't allow selecting a target that's not on the list." :type 'boolean) +(defcustom helm-make-named-buffer nil + "When non-nil, name compilation buffer based on make target." + :type 'boolean) + +(defcustom helm-make-comint nil + "When non-nil, run helm-make in Comint mode instead of Compilation mode." + :type 'boolean) + (defvar helm-make-command nil "Store the make command.") @@ -98,7 +106,20 @@ An exception is \"GNUmakefile\", only GNU make unterstand it.") (defun helm--make-action (target) "Make TARGET." - (compile (format helm-make-command target))) + (let* ((make-command (format helm-make-command target)) + (compile-buffer (compile make-command helm-make-comint))) + (when helm-make-named-buffer + (helm--make-rename-buffer compile-buffer target)))) + +(defun helm--make-rename-buffer (buffer target) + "Rename the compilation BUFFER based on the make TARGET." + (let ((buffer-name (format "*compilation (%s)*" target))) + (when (get-buffer-window buffer-name) + (delete-window (get-buffer-window buffer-name))) + (when (get-buffer buffer-name) + (kill-buffer buffer-name)) + (with-current-buffer buffer + (rename-buffer buffer-name)))) (defcustom helm-make-completion-method 'helm "Method to select a candidate from a list of strings." diff --git a/elpa/ht-20160806.1753/ht-autoloads.el b/elpa/ht-20160806.1753/ht-autoloads.el new file mode 100644 index 0000000..cc73c3c --- /dev/null +++ b/elpa/ht-20160806.1753/ht-autoloads.el @@ -0,0 +1,15 @@ +;;; ht-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +;;;### (autoloads nil nil ("ht.el") (22454 5327 525379 527000)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; ht-autoloads.el ends here diff --git a/elpa/ht-20160806.1753/ht-pkg.el b/elpa/ht-20160806.1753/ht-pkg.el new file mode 100644 index 0000000..eb0368f --- /dev/null +++ b/elpa/ht-20160806.1753/ht-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "ht" "20160806.1753" "The missing hash table library for Emacs" '((dash "2.12.0")) :keywords '("hash table" "hash map" "hash")) diff --git a/elpa/ht-20160806.1753/ht.el b/elpa/ht-20160806.1753/ht.el new file mode 100644 index 0000000..4fe53ad --- /dev/null +++ b/elpa/ht-20160806.1753/ht.el @@ -0,0 +1,304 @@ +;;; ht.el --- The missing hash table library for Emacs + +;; Copyright (C) 2013 Wilfred Hughes + +;; Author: Wilfred Hughes +;; Version: 2.2 +;; Package-Version: 20160806.1753 +;; Keywords: hash table, hash map, hash +;; Package-Requires: ((dash "2.12.0")) + +;; 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 of the License, 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. If not, see . + +;;; Commentary: + +;; The missing hash table library for Emacs. +;; +;; See documentation at https://github.com/Wilfred/ht.el + +;;; Code: + +(require 'dash) + +(defmacro ht (&rest pairs) + "Create a hash table with the key-value pairs given. +Keys are compared with `equal'. + +\(fn (KEY-1 VALUE-1) (KEY-2 VALUE-2) ...)" + (let* ((table-symbol (make-symbol "ht-temp")) + (assignments + (mapcar + (lambda (pair) `(ht-set! ,table-symbol ,@pair)) + pairs))) + `(let ((,table-symbol (ht-create))) + ,@assignments + ,table-symbol))) + +(defun ht-create (&optional test) + "Create an empty hash table. + +TEST indicates the function used to compare the hash +keys. Default is `equal'. It can be `eq', `eql', `equal' or a +user-supplied test created via `define-hash-table-test'." + (make-hash-table :test (or test 'equal))) + +(defun ht<-alist (alist &optional test) + "Create a hash table with initial values according to ALIST. + +TEST indicates the function used to compare the hash +keys. Default is `equal'. It can be `eq', `eql', `equal' or a +user-supplied test created via `define-hash-table-test'." + (let ((h (ht-create test))) + ;; the first key-value pair in an alist gets precedence, so we + ;; start from the end of the list: + (dolist (pair (reverse alist) h) + (let ((key (car pair)) + (value (cdr pair))) + (ht-set! h key value))))) + +(defalias 'ht-from-alist 'ht<-alist) + +;; based on the excellent -partition from dash.el, but we aim to be self-contained +(defun ht/group-pairs (list) + "Return a new list with the items in LIST grouped into pairs. +Errors if LIST doesn't contain an even number of elements." + (let ((result) + (sublist) + (len 0)) + + (while list + ;; take the head of LIST and push onto SUBLIST + (setq sublist (cons (car list) sublist)) + (setq list (cdr list)) + + (setq len (1+ len)) + + (when (= len 2) + ;; push this two-item list onto RESULT + (setq result (cons (nreverse sublist) result)) + (setq sublist nil) + (setq len 0))) + + (when sublist (error "Expected an even number of elements")) + (nreverse result))) + +(defun ht<-plist (plist &optional test) + "Create a hash table with initial values according to PLIST. + +TEST indicates the function used to compare the hash +keys. Default is `equal'. It can be `eq', `eql', `equal' or a +user-supplied test created via `define-hash-table-test'." + (let ((h (ht-create test))) + (dolist (pair (ht/group-pairs plist) h) + (let ((key (car pair)) + (value (cadr pair))) + (ht-set! h key value))))) + +(defalias 'ht-from-plist 'ht<-plist) + +(defun ht-get (table key &optional default) + "Look up KEY in TABLE, and return the matching value. +If KEY isn't present, return DEFAULT (nil if not specified)." + (gethash key table default)) + +(defun ht-set! (table key value) + "Associate KEY in TABLE with VALUE." + (puthash key value table) + nil) + +(defalias 'ht-set 'ht-set!) + +(defun ht-update! (table from-table) + "Update TABLE according to every key-value pair in FROM-TABLE." + (maphash + (lambda (key value) (puthash key value table)) + from-table) + nil) + +(defalias 'ht-update 'ht-update!) + +(defun ht-merge (&rest tables) + "Crete a new tables that includes all the key-value pairs from TABLES. +If multiple have tables have the same key, the value in the last +table is used." + (let ((merged (ht-create))) + (mapc (lambda (table) (ht-update! merged table)) tables) + merged)) + +(defun ht-remove! (table key) + "Remove KEY from TABLE." + (remhash key table)) + +(defalias 'ht-remove 'ht-remove!) + +(defun ht-clear! (table) + "Remove all keys from TABLE." + (clrhash table) + nil) + +(defalias 'ht-clear 'ht-clear!) + +(defun ht-map (function table) + "Apply FUNCTION to each key-value pair of TABLE, and make a list of the results. +FUNCTION is called with two arguments, KEY and VALUE." + (let (results) + (maphash + (lambda (key value) + (push (funcall function key value) results)) + table) + results)) + +(defmacro ht-amap (form table) + "Anaphoric version of `ht-map'. +For every key-value pair in TABLE, evaluate FORM with the +variables KEY and VALUE bound." + `(ht-map (lambda (key value) ,form) ,table)) + +(defun ht-keys (table) + "Return a list of all the keys in TABLE." + (ht-amap key table)) + +(defun ht-values (table) + "Return a list of all the values in TABLE." + (ht-amap value table)) + +(defun ht-items (table) + "Return a list of two-element lists '(key value) from TABLE." + (ht-amap (list key value) table)) + +(defalias 'ht-each 'maphash + "Apply FUNCTION to each key-value pair of TABLE. +Returns nil, used for side-effects only.") + +(defmacro ht-aeach (form table) + "Anaphoric version of `ht-each'. +For every key-value pair in TABLE, evaluate FORM with the +variables key and value bound." + `(ht-each (lambda (key value) ,form) ,table)) + +(defun ht->plist (table) + "Return a flat list '(key1 value1 key2 value2...) from TABLE. + +Note that hash tables are unordered, so this cannot be an exact +inverse of `ht<-plist'. The following is not guaranteed: + +\(let ((data '(a b c d))) + (equalp data + (ht->plist (ht<-plist data))))" + (apply 'append (ht-items table))) + +(defalias 'ht-to-plist 'ht->plist) + +(defun ht-copy (table) + "Return a shallow copy of TABLE (keys and values are shared)." + (copy-hash-table table)) + +(defun ht->alist (table) + "Return a list of two-element lists '(key . value) from TABLE. + +Note that hash tables are unordered, so this cannot be an exact +inverse of `ht<-alist'. The following is not guaranteed: + +\(let ((data '((a . b) (c . d)))) + (equalp data + (ht->alist (ht<-alist data))))" + (ht-amap (cons key value) table)) + +(defalias 'ht-to-alist 'ht->alist) + +(defalias 'ht? 'hash-table-p) + +(defalias 'ht-p 'hash-table-p) + +(defun ht-contains? (table key) + "Return 't if TABLE contains KEY." + (not (eq (ht-get table key 'ht--not-found) 'ht--not-found))) + +(defalias 'ht-contains-p 'ht-contains?) + +(defun ht-size (table) + "Return the actual number of entries in TABLE." + (hash-table-count table)) + +(defun ht-empty? (table) + "Return true if the actual number of entries in TABLE is zero." + (zerop (ht-size table))) + +(defun ht-select (function table) + "Return a hash table containing all entries in TABLE for which +FUNCTION returns a truthy value. + +FUNCTION is called with two arguments, KEY and VALUE." + (let ((results (ht-create))) + (ht-each + (lambda (key value) + (when (funcall function key value) + (ht-set! results key value))) + table) + results)) + +(defun ht-reject (function table) + "Return a hash table containing all entries in TABLE for which +FUNCTION returns a falsy value. + +FUNCTION is called with two arguments, KEY and VALUE." + (let ((results (ht-create))) + (ht-each + (lambda (key value) + (unless (funcall function key value) + (ht-set! results key value))) + table) + results)) + +(defun ht-reject! (function table) + "Delete entries from TABLE for which FUNCTION returns a falsy value. + +FUNCTION is called with two arguments, KEY and VALUE." + (ht-each + (lambda (key value) + (when (funcall function key value) + (remhash key table))) + table) + nil) + +(defalias 'ht-delete-if 'ht-reject!) + +(defun ht-find (function table) + "Return (key, value) from TABLE for which FUNCTION returns a truthy value. +Return nil otherwise. + +FUNCTION is called with two arguments, KEY and VALUE." + (catch 'break + (ht-each + (lambda (key value) + (when (funcall function key value) + (throw 'break (list key value)))) + table))) + +(defun ht-equal? (table1 table2) + "Return t if TABLE1 and TABLE2 have the same keys and values. +Does not compare equality predicates." + (let ((keys1 (ht-keys table1)) + (keys2 (ht-keys table2)) + (sentinel (make-symbol "ht-sentinel"))) + (and (equal (length keys1) (length keys2)) + (--all? + (equal (ht-get table1 it) + (ht-get table2 it sentinel)) + keys1)))) + +(defalias 'ht-equal-p 'ht-equal?) + +(provide 'ht) +;;; ht.el ends here diff --git a/elpa/json-mode-20160710.1637/json-mode-autoloads.el b/elpa/json-mode-20160803.1606/json-mode-autoloads.el similarity index 72% rename from elpa/json-mode-20160710.1637/json-mode-autoloads.el rename to elpa/json-mode-20160803.1606/json-mode-autoloads.el index 51aad2c..2a101b0 100644 --- a/elpa/json-mode-20160710.1637/json-mode-autoloads.el +++ b/elpa/json-mode-20160803.1606/json-mode-autoloads.el @@ -1,10 +1,10 @@ ;;; json-mode-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "json-mode" "json-mode.el" (22404 60234 333716 -;;;;;; 283000)) +;;;### (autoloads nil "json-mode" "json-mode.el" (22454 5312 102016 +;;;;;; 872000)) ;;; Generated autoloads from json-mode.el (autoload 'json-mode "json-mode" "\ @@ -14,6 +14,8 @@ Major mode for editing JSON files (add-to-list 'auto-mode-alist '("\\.json$" . json-mode)) +(add-to-list 'auto-mode-alist '("\\.jsonld$" . json-mode)) + (autoload 'json-mode-show-path "json-mode" "\ diff --git a/elpa/json-mode-20160710.1637/json-mode-pkg.el b/elpa/json-mode-20160803.1606/json-mode-pkg.el similarity index 54% rename from elpa/json-mode-20160710.1637/json-mode-pkg.el rename to elpa/json-mode-20160803.1606/json-mode-pkg.el index 557d15c..c2db863 100644 --- a/elpa/json-mode-20160710.1637/json-mode-pkg.el +++ b/elpa/json-mode-20160803.1606/json-mode-pkg.el @@ -1 +1,2 @@ -(define-package "json-mode" "20160710.1637" "Major mode for editing JSON files" '((json-reformat "0.0.5") (json-snatcher "1.0.0")) :url "https://github.com/joshwnj/json-mode") +;;; -*- no-byte-compile: t -*- +(define-package "json-mode" "20160803.1606" "Major mode for editing JSON files" '((json-reformat "0.0.5") (json-snatcher "1.0.0")) :url "https://github.com/joshwnj/json-mode") diff --git a/elpa/json-mode-20160710.1637/json-mode.el b/elpa/json-mode-20160803.1606/json-mode.el similarity index 98% rename from elpa/json-mode-20160710.1637/json-mode.el rename to elpa/json-mode-20160803.1606/json-mode.el index c5d13af..6aef825 100644 --- a/elpa/json-mode-20160710.1637/json-mode.el +++ b/elpa/json-mode-20160803.1606/json-mode.el @@ -4,7 +4,7 @@ ;; Author: Josh Johnston ;; URL: https://github.com/joshwnj/json-mode -;; Package-Version: 20160710.1637 +;; Package-Version: 20160803.1606 ;; Version: 1.6.0 ;; Package-Requires: ((json-reformat "0.0.5") (json-snatcher "1.0.0")) @@ -68,6 +68,7 @@ ;;;###autoload (add-to-list 'auto-mode-alist '("\\.json$" . json-mode)) +;;;###autoload (add-to-list 'auto-mode-alist '("\\.jsonld$" . json-mode)) ;;;###autoload diff --git a/elpa/magit-20160710.1341/magit.info b/elpa/magit-20160710.1341/magit.info deleted file mode 100644 index 569a420..0000000 --- a/elpa/magit-20160710.1341/magit.info +++ /dev/null @@ -1,175 +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: 312586 - -Tag Table: -(Indirect) -Node: Top1222 -Node: Introduction6389 -Node: Installation11082 -Node: Updating from an older release11457 -Node: Installing from an Elpa archive13052 -Node: Installing from the Git repository14391 -Node: Post-installation tasks17187 -Node: Getting started18576 -Node: Interface concepts24311 -Node: Modes and Buffers24585 -Node: Switching Buffers26330 -Node: Naming Buffers30988 -Node: Quitting Windows33823 -Node: Automatic Refreshing of Magit Buffers35455 -Node: Automatic Saving of File-Visiting Buffers38223 -Node: Automatic Reverting of File-Visiting Buffers39408 -Node: Risk of Reverting Automatically44404 -Node: Sections46787 -Node: Section movement47728 -Node: Section visibility51655 -Node: Section hooks55246 -Node: Section types and values57527 -Node: Section options58797 -Node: Popup buffers and prefix commands59269 -Node: Completion and confirmation60583 -Node: Running Git63489 -Node: Viewing Git output63725 -Node: Running Git manually64725 -Node: Git executable66851 -Node: Global Git arguments68858 -Node: Inspecting69665 -Node: Status buffer70812 -Node: Status sections73677 -Node: Status header sections79086 -Node: Status options81643 -Node: Repository list82367 -Node: Logging84504 -Node: Refreshing logs87242 -Node: Log Buffer88627 -Node: Select from log91716 -Node: Reflog92656 -Node: Diffing93134 -Node: Refreshing diffs96154 -Node: Diff buffer99135 -Node: Diff options101037 -Node: Revision buffer102793 -Node: Ediffing103748 -Node: References buffer107338 -Node: References sections112048 -Node: Bisecting112923 -Node: Visiting blobs114419 -Node: Blaming114928 -Node: Manipulating118248 -Node: Repository setup118564 -Node: Staging and unstaging119604 -Node: Staging from file-visiting buffers123693 -Node: Applying124861 -Node: Committing126754 -Node: Initiating a commit127337 -Node: Editing commit messages130649 -Node: Branching141045 -Node: The two remotes141245 -Node: The branch popup143789 -Node: The branch config popup149878 -Node: Merging155784 -Node: Resolving conflicts157952 -Ref: orgradiotarget1159037 -Node: Rebasing162909 -Node: Editing rebase sequences166550 -Node: Information about in-progress rebase169580 -Ref: Information about in-progress rebase-Footnote-1176416 -Node: Cherry picking177002 -Node: Reverting178608 -Node: Resetting179971 -Node: Stashing181483 -Node: Transferring184657 -Node: Remotes184895 -Node: Fetching186181 -Node: Pulling187547 -Node: Pushing188393 -Node: Creating and sending patches193137 -Node: Applying patches193832 -Node: Miscellaneous194830 -Node: Tagging195133 -Node: Notes195918 -Node: Submodules198443 -Node: Subtree199755 -Node: Common commands201003 -Node: Wip modes202748 -Node: Minor mode for buffers visiting files209484 -Node: Minor mode for buffers visiting blobs212958 -Node: Customizing213763 -Node: Per-repository configuration215435 -Node: Essential settings217069 -Node: Safety217393 -Node: Performance219226 -Node: Plumbing227185 -Node: Calling Git227813 -Node: Getting a value from Git229336 -Node: Calling Git for effect232440 -Node: Section plumbing238944 -Node: Creating sections239172 -Node: Section selection243071 -Node: Matching sections244751 -Node: Refreshing buffers249960 -Node: Conventions253095 -Node: Confirmation and completion253272 -Node: Theming Faces254170 -Node: FAQ262321 -Node: Magit is slow263934 -Node: I changed several thousand files at once and now Magit is unusable264135 -Node: I am having problems committing264851 -Node: Diffs are collapsed after un-/staging265297 -Node: I don't understand how branching and pushing work266775 -Node: I don't like the key binding in v24267150 -Node: I cannot install the pre-requisites for Magit v2267489 -Node: I am using an Emacs release older than v244267954 -Node: I am using a Git release older than v194269567 -Node: I am using MS Windows and cannot push with Magit270554 -Node: I am using OS X and SOMETHING works in shell but not in Magit271158 -Node: How to install the gitman info manual?271949 -Node: How can I show Git's output?274490 -Node: Diffs contain control sequences275277 -Node: Expanding a file to show the diff causes it to disappear276282 -Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer276817 -Node: The mode-line information isn't always up-to-date277847 -Node: Can Magit be used as ‘ediff-version-control-package’?278915 -Node: How to show diffs for gpg-encrypted files?280959 -Node: Emacs 245 hangs when loading Magit281556 -Node: Symbol's value as function is void ‘--some’282131 -Node: Where is the branch manager282465 -Node: Keystroke Index282756 -Node: Command Index312586 -Node: Function Index342376 -Node: Variable Index356051 - -End Tag Table - - -Local Variables: -coding: utf-8 -End: diff --git a/elpa/magit-20160710.1341/AUTHORS.md b/elpa/magit-20160815.1946/AUTHORS.md similarity index 97% rename from elpa/magit-20160710.1341/AUTHORS.md rename to elpa/magit-20160815.1946/AUTHORS.md index 5049582..502b74c 100644 --- a/elpa/magit-20160710.1341/AUTHORS.md +++ b/elpa/magit-20160815.1946/AUTHORS.md @@ -60,6 +60,7 @@ Contributors - Andy Sawyer - Barak A. Pearlmutter - Bart Bakker +- Basil L. Contovounesios - Bastian Beischer - Ben Walton - Bradley Wright @@ -71,6 +72,7 @@ Contributors - Chris Done - Chris Moore - Chris Ring +- Chris Shoemaker - Christian Dietrich - Christian Kluge - Christopher Monsanto @@ -110,6 +112,7 @@ Contributors - Hans-Peter Deifel - Ian Eure - Ingo Lohmar +- Ivan Brennan - Jan Tatarik - Jasper St. Pierre - Jeff Bellegarde @@ -129,6 +132,7 @@ Contributors - Kimberly Wolk - Kyle Meyer - Laurent Laffont +- Laverne Schrock - Leandro Facchinetti - Lele Gaifax - Leo Liu @@ -144,6 +148,7 @@ Contributors - Marcin Bachry - Marco Craveiro - Marian Schubert +- Mario Rodas - Marius Vollmer - Mark Hepburn - Mark Karpov @@ -204,6 +209,7 @@ Contributors - Russell Black - Ryan C. Thompson - Samuel Bronson +- Samuel W. Flint - Sanjoy Das - Sean Bryant - Sebastian Wiesner diff --git a/elpa/magit-20160710.1341/COPYING b/elpa/magit-20160815.1946/COPYING similarity index 100% rename from elpa/magit-20160710.1341/COPYING rename to elpa/magit-20160815.1946/COPYING diff --git a/elpa/magit-20160710.1341/dir b/elpa/magit-20160815.1946/dir similarity index 100% rename from elpa/magit-20160710.1341/dir rename to elpa/magit-20160815.1946/dir diff --git a/elpa/magit-20160710.1341/git-rebase.el b/elpa/magit-20160815.1946/git-rebase.el similarity index 99% rename from elpa/magit-20160710.1341/git-rebase.el rename to elpa/magit-20160815.1946/git-rebase.el index 9b38b33..b543706 100644 --- a/elpa/magit-20160710.1341/git-rebase.el +++ b/elpa/magit-20160815.1946/git-rebase.el @@ -134,6 +134,7 @@ (define-key map (kbd "r") 'git-rebase-reword) (define-key map (kbd "w") 'git-rebase-reword) (define-key map (kbd "e") 'git-rebase-edit) + (define-key map (kbd "m") 'git-rebase-edit) (define-key map (kbd "s") 'git-rebase-squash) (define-key map (kbd "f") 'git-rebase-fixup) (define-key map (kbd "y") 'git-rebase-insert) diff --git a/elpa/magit-20160710.1341/magit-apply.el b/elpa/magit-20160815.1946/magit-apply.el similarity index 96% rename from elpa/magit-20160710.1341/magit-apply.el rename to elpa/magit-20160815.1946/magit-apply.el index ea8e341..a99000a 100644 --- a/elpa/magit-20160710.1341/magit-apply.el +++ b/elpa/magit-20160815.1946/magit-apply.el @@ -196,18 +196,19 @@ so causes the change to be applied to the index as well." With a prefix argument, INTENT, and an untracked file (or files) at point, stage the file but not its content." (interactive "P") - (--when-let (magit-apply--get-selection) - (pcase (list (magit-diff-type) (magit-diff-scope)) - (`(untracked ,_) (magit-stage-untracked intent)) - (`(unstaged region) (magit-apply-region it "--cached")) - (`(unstaged hunk) (magit-apply-hunk it "--cached")) - (`(unstaged hunks) (magit-apply-hunks it "--cached")) - (`(unstaged file) (magit-stage-1 "-u" (list (magit-section-value it)))) - (`(unstaged files) (magit-stage-1 "-u" (magit-region-values))) - (`(unstaged list) (magit-stage-1 "-u")) - (`(staged ,_) (user-error "Already staged")) - (`(committed ,_) (user-error "Cannot stage committed changes")) - (`(undefined ,_) (user-error "Cannot stage this change"))))) + (--if-let (and (derived-mode-p 'magit-mode) (magit-apply--get-selection)) + (pcase (list (magit-diff-type) (magit-diff-scope)) + (`(untracked ,_) (magit-stage-untracked intent)) + (`(unstaged region) (magit-apply-region it "--cached")) + (`(unstaged hunk) (magit-apply-hunk it "--cached")) + (`(unstaged hunks) (magit-apply-hunks it "--cached")) + (`(unstaged file) (magit-stage-1 "-u" (list (magit-section-value it)))) + (`(unstaged files) (magit-stage-1 "-u" (magit-region-values))) + (`(unstaged list) (magit-stage-1 "-u")) + (`(staged ,_) (user-error "Already staged")) + (`(committed ,_) (user-error "Cannot stage committed changes")) + (`(undefined ,_) (user-error "Cannot stage this change"))) + (call-interactively 'magit-stage-file))) ;;;###autoload (defun magit-stage-file (file) diff --git a/elpa/magit-20160710.1341/magit-autoloads.el b/elpa/magit-20160815.1946/magit-autoloads.el similarity index 95% rename from elpa/magit-20160710.1341/magit-autoloads.el rename to elpa/magit-20160815.1946/magit-autoloads.el index ccce6f6..8cf0582 100644 --- a/elpa/magit-20160710.1341/magit-autoloads.el +++ b/elpa/magit-20160815.1946/magit-autoloads.el @@ -1,10 +1,10 @@ ;;; magit-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "git-rebase" "git-rebase.el" (22404 60233 693712 -;;;;;; 948000)) +;;;### (autoloads nil "git-rebase" "git-rebase.el" (22454 5307 579910 +;;;;;; 542000)) ;;; 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" (22404 60233 789713 449000)) +;;;### (autoloads nil "magit" "magit.el" (22454 5308 98922 746000)) ;;; Generated autoloads from magit.el (autoload 'magit-status "magit" "\ @@ -423,8 +423,9 @@ defaulting to the tag at point. (autoload 'magit-file-popup "magit" nil t) (defvar global-magit-file-mode nil "\ -Non-nil if Global-Magit-File mode is enabled. -See the command `global-magit-file-mode' for a description of this minor mode. +Non-nil if Global Magit-File mode is enabled. +See the `global-magit-file-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `global-magit-file-mode'.") @@ -433,7 +434,7 @@ or call the function `global-magit-file-mode'.") (autoload 'global-magit-file-mode "magit" "\ Toggle Magit-File mode in all buffers. -With prefix ARG, enable Global-Magit-File mode if ARG is positive; +With prefix ARG, enable Global Magit-File mode if ARG is positive; otherwise, disable it. If called from Lisp, enable the mode if ARG is omitted or nil. @@ -489,8 +490,8 @@ Git, and Emacs in the echo area. ;;;*** -;;;### (autoloads nil "magit-apply" "magit-apply.el" (22404 60233 -;;;;;; 721713 93000)) +;;;### (autoloads nil "magit-apply" "magit-apply.el" (22454 5307 +;;;;;; 714913 717000)) ;;; Generated autoloads from magit-apply.el (autoload 'magit-stage-file "magit-apply" "\ @@ -526,15 +527,16 @@ Remove all changes from the staging area. ;;;*** -;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22404 -;;;;;; 60233 657712 760000)) +;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22454 +;;;;;; 5307 298903 935000)) ;;; Generated autoloads from magit-autorevert.el (defvar magit-revert-buffers t) (defvar magit-auto-revert-mode (and magit-revert-buffers (not global-auto-revert-mode) (not noninteractive)) "\ Non-nil if Magit-Auto-Revert mode is enabled. -See the command `magit-auto-revert-mode' for a description of this minor mode. +See the `magit-auto-revert-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `magit-auto-revert-mode'.") @@ -555,8 +557,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode. ;;;*** -;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22404 60233 -;;;;;; 717713 73000)) +;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22454 5307 +;;;;;; 680912 917000)) ;;; Generated autoloads from magit-bisect.el (autoload 'magit-bisect-popup "magit-bisect" nil t) @@ -607,8 +609,8 @@ bisect run'. ;;;*** -;;;### (autoloads nil "magit-blame" "magit-blame.el" (22404 60233 -;;;;;; 769713 343000)) +;;;### (autoloads nil "magit-blame" "magit-blame.el" (22454 5308 +;;;;;; 29921 124000)) ;;; Generated autoloads from magit-blame.el (autoload 'magit-blame-popup "magit-blame" nil t) @@ -632,8 +634,8 @@ only arguments available from `magit-blame-popup' should be used. ;;;*** -;;;### (autoloads nil "magit-commit" "magit-commit.el" (22404 60233 -;;;;;; 661712 781000)) +;;;### (autoloads nil "magit-commit" "magit-commit.el" (22454 5307 +;;;;;; 331904 711000)) ;;; Generated autoloads from magit-commit.el (autoload 'magit-commit "magit-commit" "\ @@ -715,8 +717,8 @@ Create a squash commit targeting COMMIT and instantly rebase. ;;;*** -;;;### (autoloads nil "magit-diff" "magit-diff.el" (22404 60233 761713 -;;;;;; 302000)) +;;;### (autoloads nil "magit-diff" "magit-diff.el" (22454 5307 995920 +;;;;;; 324000)) ;;; Generated autoloads from magit-diff.el (autoload 'magit-diff-popup "magit-diff" "\ @@ -800,8 +802,8 @@ for a revision. ;;;*** -;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22404 60233 -;;;;;; 749713 239000)) +;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22454 5307 +;;;;;; 928918 749000)) ;;; Generated autoloads from magit-ediff.el (autoload 'magit-ediff-popup "magit-ediff" nil t) @@ -889,8 +891,8 @@ stash that were staged. ;;;*** -;;;### (autoloads nil "magit-extras" "magit-extras.el" (22404 60233 -;;;;;; 665712 802000)) +;;;### (autoloads nil "magit-extras" "magit-extras.el" (22454 5307 +;;;;;; 365905 510000)) ;;; Generated autoloads from magit-extras.el (autoload 'magit-run-git-gui "magit-extras" "\ @@ -960,8 +962,8 @@ on a position in a file-visiting buffer. ;;;*** -;;;### (autoloads nil "magit-log" "magit-log.el" (22404 60233 753713 -;;;;;; 260000)) +;;;### (autoloads nil "magit-log" "magit-log.el" (22454 5307 961919 +;;;;;; 525000)) ;;; Generated autoloads from magit-log.el (autoload 'magit-log-buffer-file-popup "magit-log" "\ @@ -1031,6 +1033,11 @@ Display the `HEAD' reflog. \(fn)" t nil) +(autoload 'magit-log-move-to-parent "magit-log" "\ +Move to the Nth parent of the current commit. + +\(fn &optional N)" t nil) + (autoload 'magit-cherry "magit-log" "\ Show commits in a branch that are not merged in the upstream branch. @@ -1038,8 +1045,8 @@ Show commits in a branch that are not merged in the upstream branch. ;;;*** -;;;### (autoloads nil "magit-remote" "magit-remote.el" (22404 60233 -;;;;;; 805713 531000)) +;;;### (autoloads nil "magit-remote" "magit-remote.el" (22454 5308 +;;;;;; 200925 145000)) ;;; Generated autoloads from magit-remote.el (autoload 'magit-clone "magit-remote" "\ @@ -1271,8 +1278,8 @@ is asked to pull. START has to be reachable from that commit. ;;;*** -;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22404 -;;;;;; 60233 793713 468000)) +;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22454 +;;;;;; 5308 132923 546000)) ;;; Generated autoloads from magit-sequence.el (autoload 'magit-sequencer-continue "magit-sequence" "\ @@ -1422,8 +1429,8 @@ Abort the current rebase operation, restoring the original branch. ;;;*** -;;;### (autoloads nil "magit-stash" "magit-stash.el" (22404 60233 -;;;;;; 741713 198000)) +;;;### (autoloads nil "magit-stash" "magit-stash.el" (22454 5307 +;;;;;; 838916 633000)) ;;; Generated autoloads from magit-stash.el (autoload 'magit-stash-popup "magit-stash" nil t) @@ -1522,8 +1529,8 @@ Show all diffs of a stash in a buffer. ;;;*** -;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22404 -;;;;;; 60233 829713 656000)) +;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22454 +;;;;;; 5308 335928 319000)) ;;; Generated autoloads from magit-submodule.el (autoload 'magit-submodule-popup "magit-submodule" nil t) @@ -1606,10 +1613,15 @@ These sections can be expanded to show the respective commits. \(fn)" nil nil) +(autoload 'magit-list-submodules "magit-submodule" "\ +Display a list of the current repository's submodules. + +\(fn)" t nil) + ;;;*** -;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22404 60233 -;;;;;; 701712 989000)) +;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22454 5307 +;;;;;; 612911 319000)) ;;; Generated autoloads from magit-subtree.el (autoload 'magit-subtree-popup "magit-subtree" nil t) @@ -1645,13 +1657,14 @@ Extract the history of the subtree PREFIX. ;;;*** -;;;### (autoloads nil "magit-wip" "magit-wip.el" (22404 60233 677712 -;;;;;; 864000)) +;;;### (autoloads nil "magit-wip" "magit-wip.el" (22454 5307 455907 +;;;;;; 627000)) ;;; Generated autoloads from magit-wip.el (defvar magit-wip-after-save-mode nil "\ Non-nil if Magit-Wip-After-Save mode is enabled. -See the command `magit-wip-after-save-mode' for a description of this minor mode. +See the `magit-wip-after-save-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `magit-wip-after-save-mode'.") @@ -1672,7 +1685,8 @@ See `magit-wip-after-save-local-mode' for more information on Magit-Wip-After-Sa (defvar magit-wip-after-apply-mode nil "\ Non-nil if Magit-Wip-After-Apply mode is enabled. -See the command `magit-wip-after-apply-mode' for a description of this minor mode.") +See the `magit-wip-after-apply-mode' command +for a description of this minor mode.") (custom-autoload 'magit-wip-after-apply-mode "magit-wip" nil) @@ -1690,7 +1704,8 @@ in the index. (defvar magit-wip-before-change-mode nil "\ Non-nil if Magit-Wip-Before-Change mode is enabled. -See the command `magit-wip-before-change-mode' for a description of this minor mode.") +See the `magit-wip-before-change-mode' command +for a description of this minor mode.") (custom-autoload 'magit-wip-before-change-mode "magit-wip" nil) @@ -1713,7 +1728,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") -;;;;;; (22404 60233 846102 992000)) +;;;;;; (22454 5308 256926 461000)) ;;;*** diff --git a/elpa/magit-20160710.1341/magit-autorevert.el b/elpa/magit-20160815.1946/magit-autorevert.el similarity index 100% rename from elpa/magit-20160710.1341/magit-autorevert.el rename to elpa/magit-20160815.1946/magit-autorevert.el diff --git a/elpa/magit-20160710.1341/magit-bisect.el b/elpa/magit-20160815.1946/magit-bisect.el similarity index 96% rename from elpa/magit-20160710.1341/magit-bisect.el rename to elpa/magit-20160815.1946/magit-bisect.el index 41f8d91..9b58fee 100644 --- a/elpa/magit-20160710.1341/magit-bisect.el +++ b/elpa/magit-20160815.1946/magit-bisect.el @@ -29,6 +29,12 @@ (require 'magit) +(defcustom magit-bisect-show-graph t + "Whether to use `--graph' in the log showing commits yet to be bisected." + :package-version '(magit . "2.8.0") + :group 'magit-status + :type 'boolean) + (defface magit-bisect-good '((t :foreground "DarkOliveGreen")) "Face for good bisect revisions." @@ -161,7 +167,8 @@ bisect run'." (magit-insert-heading "Bisect Rest:") (magit-git-wash (apply-partially 'magit-log-wash-log 'bisect-vis) "bisect" "visualize" "git" "log" - "--format=%h%d %s" "--decorate=full")))) + "--format=%h%d %s" "--decorate=full" + (and magit-bisect-show-graph "--graph"))))) (defun magit-insert-bisect-log () "While bisecting, insert section logging bisect progress." diff --git a/elpa/magit-20160710.1341/magit-blame.el b/elpa/magit-20160815.1946/magit-blame.el similarity index 89% rename from elpa/magit-20160710.1341/magit-blame.el rename to elpa/magit-20160815.1946/magit-blame.el index cd08a70..d0e5f39 100644 --- a/elpa/magit-20160710.1341/magit-blame.el +++ b/elpa/magit-20160815.1946/magit-blame.el @@ -94,7 +94,7 @@ and then turned on again when turning off the latter." :foreground "black") (((class color) (background dark)) :background "grey25" - :foreground "black")) + :foreground "white")) "Face for blame headings." :group 'magit-faces) @@ -232,54 +232,55 @@ only arguments available from `magit-blame-popup' should be used. (if buffer-file-name (user-error "Buffer isn't visiting a tracked file") (user-error "Buffer isn't visiting a file")))))) - (magit-with-toplevel - (if revision - (magit-find-file revision file) - (let ((default-directory default-directory)) + (let ((toplevel (or (magit-toplevel) + (user-error "Not in git repository")))) + (let ((default-directory toplevel)) + (if revision + (magit-find-file revision file) (--if-let (find-buffer-visiting file) (progn (switch-to-buffer it) (save-buffer)) (find-file file)))) - ;; ^ Make sure this doesn't affect the value used below. b640c6f - (widen) - (when line - (setq magit-blame-recursive-p t) - (goto-char (point-min)) - (forward-line (1- line))) - (unless magit-blame-mode - (setq magit-blame-cache (make-hash-table :test 'equal)) - (let ((show-headings magit-blame-show-headings)) - (magit-blame-mode 1) - (setq-local magit-blame-show-headings show-headings)) - (message "Blaming...") - (let ((magit-process-popup-time -1) - (inhibit-magit-refresh t)) - (magit-run-git-async - "blame" "--incremental" args - "-L" (format "%s,%s" - (line-number-at-pos (window-start)) - (line-number-at-pos (1- (window-end nil t)))) - revision "--" file)) - (setq magit-blame-process magit-this-process) - (set-process-filter magit-this-process 'magit-blame-process-filter) - (set-process-sentinel - magit-this-process - `(lambda (process event) - (when (memq (process-status process) '(exit signal)) - (magit-process-sentinel process event) - (magit-blame-assert-buffer process) - (with-current-buffer (process-get process 'command-buf) - (when magit-blame-mode - (let ((magit-process-popup-time -1) - (inhibit-magit-refresh t) - (default-directory ,default-directory)) - (magit-run-git-async "blame" "--incremental" ,@args - ,revision "--" ,file)) - (setq magit-blame-process magit-this-process) - (set-process-filter - magit-this-process 'magit-blame-process-filter) - (set-process-sentinel - magit-this-process 'magit-blame-process-sentinel))))))))) + (let ((default-directory toplevel)) + (widen) + (when line + (setq magit-blame-recursive-p t) + (goto-char (point-min)) + (forward-line (1- line))) + (unless magit-blame-mode + (setq magit-blame-cache (make-hash-table :test 'equal)) + (let ((show-headings magit-blame-show-headings)) + (magit-blame-mode 1) + (setq-local magit-blame-show-headings show-headings)) + (message "Blaming...") + (let ((magit-process-popup-time -1) + (inhibit-magit-refresh t)) + (magit-run-git-async + "blame" "--incremental" args + "-L" (format "%s,%s" + (line-number-at-pos (window-start)) + (line-number-at-pos (1- (window-end nil t)))) + revision "--" file)) + (setq magit-blame-process magit-this-process) + (set-process-filter magit-this-process 'magit-blame-process-filter) + (set-process-sentinel + magit-this-process + `(lambda (process event) + (when (memq (process-status process) '(exit signal)) + (magit-process-sentinel process event) + (magit-blame-assert-buffer process) + (with-current-buffer (process-get process 'command-buf) + (when magit-blame-mode + (let ((magit-process-popup-time -1) + (inhibit-magit-refresh t) + (default-directory ,default-directory)) + (magit-run-git-async "blame" "--incremental" ,@args + ,revision "--" ,file)) + (setq magit-blame-process magit-this-process) + (set-process-filter + magit-this-process 'magit-blame-process-filter) + (set-process-sentinel + magit-this-process 'magit-blame-process-sentinel)))))))))) (defun magit-blame-process-sentinel (process event) (let ((status (process-status process))) @@ -484,7 +485,10 @@ then also kill the buffer." (goto-char (or next (point-max)))))))) (defun magit-blame-copy-hash () - "Save hash of the current chunk's commit to the kill ring." + "Save hash of the current chunk's commit to the kill ring. + +When the region is active, then save that to the `kill-ring', +like `kill-ring-save' would." (interactive) (if (use-region-p) (copy-region-as-kill nil nil 'region) diff --git a/elpa/magit-20160710.1341/magit-commit.el b/elpa/magit-20160815.1946/magit-commit.el similarity index 100% rename from elpa/magit-20160710.1341/magit-commit.el rename to elpa/magit-20160815.1946/magit-commit.el diff --git a/elpa/magit-20160710.1341/magit-core.el b/elpa/magit-20160815.1946/magit-core.el similarity index 100% rename from elpa/magit-20160710.1341/magit-core.el rename to elpa/magit-20160815.1946/magit-core.el diff --git a/elpa/magit-20160710.1341/magit-diff.el b/elpa/magit-20160815.1946/magit-diff.el similarity index 98% rename from elpa/magit-20160710.1341/magit-diff.el rename to elpa/magit-20160815.1946/magit-diff.el index 7fc4497..bceb00a 100644 --- a/elpa/magit-20160710.1341/magit-diff.el +++ b/elpa/magit-20160815.1946/magit-diff.el @@ -820,6 +820,7 @@ for a revision." (atpoint (or (and (bound-and-true-p magit-blame-mode) (magit-blame-chunk-get :hash)) mcommit + magit-buffer-refname (magit-branch-or-commit-at-point) (magit-tag-at-point)))) (nconc (cons (or (and (not current-prefix-arg) atpoint) @@ -1244,12 +1245,14 @@ is set in `magit-mode-setup'." (defun magit-insert-diff (rev-or-range) "Insert the diff into this `magit-diff-mode' buffer." - (magit-git-wash #'magit-diff-wash-diffs - "diff" rev-or-range "-p" "--no-prefix" - (and (member "--stat" (nth 2 magit-refresh-args)) "--numstat") - (nth 1 magit-refresh-args) - (nth 2 magit-refresh-args) "--" - (nth 3 magit-refresh-args))) + (let ((magit-git-global-arguments + (remove "--literal-pathspecs" magit-git-global-arguments))) + (magit-git-wash #'magit-diff-wash-diffs + "diff" rev-or-range "-p" "--no-prefix" + (and (member "--stat" (nth 2 magit-refresh-args)) "--numstat") + (nth 1 magit-refresh-args) + (nth 2 magit-refresh-args) "--" + (nth 3 magit-refresh-args)))) (defvar magit-file-section-map (let ((map (make-sparse-keymap))) @@ -1581,16 +1584,18 @@ Staging and applying changes is documented in info node (defun magit-insert-revision-diff (rev) "Insert the diff into this `magit-revision-mode' buffer." - ;; Before v2.2.0, "--format=" did not mean "no output". - ;; Instead the default format was used. So use "--format=%n" - ;; and then delete the empty lines. - (magit-git-wash (lambda (args) - (delete-region (point) (progn (forward-line 3) (point))) - (magit-diff-wash-diffs args)) - "show" "-p" "--cc" "--format=%n" "--no-prefix" - (and (member "--stat" (nth 2 magit-refresh-args)) "--numstat") - (nth 2 magit-refresh-args) (concat rev "^{commit}") "--" - (nth 3 magit-refresh-args))) + (let ((magit-git-global-arguments + (remove "--literal-pathspecs" magit-git-global-arguments))) + ;; Before v2.2.0, "--format=" did not mean "no output". + ;; Instead the default format was used. So use "--format=%n" + ;; and then delete the empty lines. + (magit-git-wash (lambda (args) + (delete-region (point) (progn (forward-line 3) (point))) + (magit-diff-wash-diffs args)) + "show" "-p" "--cc" "--format=%n" "--no-prefix" + (and (member "--stat" (nth 2 magit-refresh-args)) "--numstat") + (nth 2 magit-refresh-args) (concat rev "^{commit}") "--" + (nth 3 magit-refresh-args)))) (defun magit-insert-revision-tag (rev) "Insert tag message and headers into a revision buffer. diff --git a/elpa/magit-20160710.1341/magit-ediff.el b/elpa/magit-20160815.1946/magit-ediff.el similarity index 100% rename from elpa/magit-20160710.1341/magit-ediff.el rename to elpa/magit-20160815.1946/magit-ediff.el diff --git a/elpa/magit-20160710.1341/magit-extras.el b/elpa/magit-20160815.1946/magit-extras.el similarity index 100% rename from elpa/magit-20160710.1341/magit-extras.el rename to elpa/magit-20160815.1946/magit-extras.el diff --git a/elpa/magit-20160710.1341/magit-git.el b/elpa/magit-20160815.1946/magit-git.el similarity index 99% rename from elpa/magit-20160710.1341/magit-git.el rename to elpa/magit-20160815.1946/magit-git.el index 5323e35..0fed75e 100644 --- a/elpa/magit-20160710.1341/magit-git.el +++ b/elpa/magit-20160815.1946/magit-git.el @@ -742,18 +742,18 @@ string \"true\", otherwise return nil." (defun magit-name-local-branch (rev &optional lax) (--when-let (magit-git-string "name-rev" "--name-only" "--no-undefined" "--refs=refs/heads/*" rev) - (and (or lax (not (string-match-p "~" it))) it))) + (and (or lax (not (string-match-p "[~^]" it))) it))) (defun magit-name-remote-branch (rev &optional lax) (--when-let (magit-git-string "name-rev" "--name-only" "--no-undefined" "--refs=refs/remotes/*" rev) - (and (or lax (not (string-match-p "~" it))) + (and (or lax (not (string-match-p "[~^]" it))) (substring it 8)))) (defun magit-name-tag (rev &optional lax) (--when-let (magit-git-string "name-rev" "--name-only" "--no-undefined" "--refs=refs/tags/*" rev) - (and (or lax (not (string-match-p "~" it))) + (and (or lax (not (string-match-p "[~^]" it))) (substring it 5)))) (defun magit-ref-fullname (name) @@ -796,7 +796,8 @@ string \"true\", otherwise return nil." (or (magit-section-case (branch (magit-section-value it)) (commit (let ((rev (magit-section-value it))) - (or (magit-get-shortname rev) rev)))) + (or (magit-get-shortname rev) rev))) + (tag (magit-section-value it))) (and (derived-mode-p 'magit-revision-mode) (car magit-refresh-args)))) @@ -1433,7 +1434,7 @@ Return a list of two integers: (A>B B>A)." (defun magit-get-all (&rest keys) "Return all values of the Git config entry specified by KEYS." (let ((magit-git-debug nil)) - (magit-git-lines "config" "--get-all" (mapconcat 'identity keys ".")))) + (magit-git-items "config" "-z" "--get-all" (mapconcat 'identity keys ".")))) (defun magit-get-boolean (&rest keys) "Return the boolean value of Git config entry specified by KEYS." diff --git a/elpa/magit-20160710.1341/magit-log.el b/elpa/magit-20160815.1946/magit-log.el similarity index 95% rename from elpa/magit-20160710.1341/magit-log.el rename to elpa/magit-20160815.1946/magit-log.el index 4034da1..4978d3d 100644 --- a/elpa/magit-20160710.1341/magit-log.el +++ b/elpa/magit-20160815.1946/magit-log.el @@ -688,6 +688,24 @@ is displayed in the current frame." (user-error "No revision buffer in this frame"))) (magit-mode-bury-buffer (> arg 1)))) +;;;###autoload +(defun magit-log-move-to-parent (&optional n) + "Move to the Nth parent of the current commit." + (interactive "p") + (when (derived-mode-p 'magit-log-mode) + (magit-section-when commit + (let ((parent-rev (format "%s^%s" (magit-section-value it) (or n 1)))) + (-if-let (parent-hash (magit-rev-parse "--short" parent-rev)) + (-if-let (section (--first (equal (magit-section-value it) + parent-hash) + (magit-section-siblings it 'next))) + (magit-section-goto section) + (user-error + (substitute-command-keys + (concat "Parent " parent-hash " not found. Try typing " + "\\[magit-log-double-commit-limit] first")))) + (user-error "Parent %s does not exist" parent-rev)))))) + ;;; Log Mode (defvar magit-log-mode-map @@ -695,6 +713,7 @@ is displayed in the current frame." (set-keymap-parent map magit-mode-map) (define-key map "\C-c\C-b" 'magit-go-backward) (define-key map "\C-c\C-f" 'magit-go-forward) + (define-key map "\C-c\C-n" 'magit-log-move-to-parent) (define-key map "=" 'magit-log-toggle-commit-limit) (define-key map "+" 'magit-log-double-commit-limit) (define-key map "-" 'magit-log-half-commit-limit) @@ -762,26 +781,28 @@ Type \\[magit-reset] to reset HEAD to the commit at point. (defun magit-insert-log (revs &optional args files) "Insert a log section. Do not add this to a hook variable." - (magit-git-wash (apply-partially #'magit-log-wash-log 'log) - "log" - (format "--format=%%h%s %s[%%aN][%%at]%%s%s" - (if (member "--decorate" args) "%d" "") - (if (member "--show-signature" args) - (progn (setq args (remove "--show-signature" args)) "%G?") - "") - (if (member "++header" args) - (if (member "--graph" (setq args (remove "++header" args))) - (concat "\n" magit-log-revision-headers-format "\n") - (concat "\n" magit-log-revision-headers-format "\n")) - "")) - (progn - (--when-let (--first (string-match "^\\+\\+order=\\(.+\\)$" it) args) - (setq args (cons (format "--%s-order" (match-string 1 it)) - (remove it args)))) - (if (member "--decorate" args) - (cons "--decorate=full" (remove "--decorate" args)) - args)) - "--use-mailmap" "--no-prefix" revs "--" files)) + (let ((magit-git-global-arguments + (remove "--literal-pathspecs" magit-git-global-arguments))) + (magit-git-wash (apply-partially #'magit-log-wash-log 'log) + "log" + (format "--format=%%h%s %s[%%aN][%%at]%%s%s" + (if (member "--decorate" args) "%d" "") + (if (member "--show-signature" args) + (progn (setq args (remove "--show-signature" args)) "%G?") + "") + (if (member "++header" args) + (if (member "--graph" (setq args (remove "++header" args))) + (concat "\n" magit-log-revision-headers-format "\n") + (concat "\n" magit-log-revision-headers-format "\n")) + "")) + (progn + (--when-let (--first (string-match "^\\+\\+order=\\(.+\\)$" it) args) + (setq args (cons (format "--%s-order" (match-string 1 it)) + (remove it args)))) + (if (member "--decorate" args) + (cons "--decorate=full" (remove "--decorate" args)) + args)) + "--use-mailmap" "--no-prefix" revs "--" files))) (defvar magit-commit-section-map (let ((map (make-sparse-keymap))) @@ -820,6 +841,7 @@ Do not add this to a hook variable." (defconst magit-log-bisect-vis-re (concat "^" + "\\(?4:[-_/|\\*o. ]*\\)" ; graph "\\(?1:[0-9a-fA-F]+\\) " ; sha1 "\\(?:\\(?3:([^()]+)\\) \\)?" ; refs "\\(?2:.*\\)$")) ; msg @@ -893,7 +915,10 @@ Do not add this to a hook variable." (`bisect-log magit-log-bisect-log-re))) (magit-bind-match-strings (hash msg refs graph author date gpg cherry _ refsub side) nil - (let ((align (not (member "--stat" (cadr magit-refresh-args))))) + (let ((align (not (member "--stat" (cadr magit-refresh-args)))) + (non-graph-re (if (eq style 'bisect-vis) + magit-log-bisect-vis-re + magit-log-heading-re))) (magit-delete-line) (magit-insert-section section (commit hash) (pcase style @@ -945,8 +970,9 @@ Do not add this to a hook variable." (save-excursion (backward-char) (magit-format-log-margin author date))) - (when (and (eq style 'log) - (not (or (eobp) (looking-at magit-log-heading-re)))) + (when (and graph + (not (eobp)) + (not (looking-at non-graph-re))) (when (looking-at "") (magit-insert-heading) (delete-char 1) @@ -960,7 +986,7 @@ Do not add this to a hook variable." (delete-char 1)) (if (looking-at "^\\(---\\|\n\s\\|\ndiff\\)") (let ((limit (save-excursion - (and (re-search-forward magit-log-heading-re nil t) + (and (re-search-forward non-graph-re nil t) (match-beginning 0))))) (unless (magit-section-content magit-insert-section--current) (magit-insert-heading)) @@ -968,10 +994,10 @@ Do not add this to a hook variable." (magit-diff-wash-diffs (list "--stat") limit)) (when align (setq align (make-string (1+ abbrev) ? ))) - (when (and (not (eobp)) (not (looking-at magit-log-heading-re))) + (when (and (not (eobp)) (not (looking-at non-graph-re))) (when align (setq align (make-string (1+ abbrev) ? ))) - (while (and (not (eobp)) (not (looking-at magit-log-heading-re))) + (while (and (not (eobp)) (not (looking-at non-graph-re))) (when align (save-excursion (insert align))) (magit-format-log-margin) diff --git a/elpa/magit-20160710.1341/magit-mode.el b/elpa/magit-20160815.1946/magit-mode.el similarity index 100% rename from elpa/magit-20160710.1341/magit-mode.el rename to elpa/magit-20160815.1946/magit-mode.el diff --git a/elpa/magit-20160710.1341/magit-pkg.el b/elpa/magit-20160815.1946/magit-pkg.el similarity index 82% rename from elpa/magit-20160710.1341/magit-pkg.el rename to elpa/magit-20160815.1946/magit-pkg.el index e630381..047e3c5 100644 --- a/elpa/magit-20160710.1341/magit-pkg.el +++ b/elpa/magit-20160815.1946/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20160710.1341" "A Git porcelain inside Emacs" +(define-package "magit" "20160815.1946" "A Git porcelain inside Emacs" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113") diff --git a/elpa/magit-20160710.1341/magit-process.el b/elpa/magit-20160815.1946/magit-process.el similarity index 97% rename from elpa/magit-20160710.1341/magit-process.el rename to elpa/magit-20160815.1946/magit-process.el index c8cea6c..00ea456 100644 --- a/elpa/magit-20160710.1341/magit-process.el +++ b/elpa/magit-20160815.1946/magit-process.el @@ -45,6 +45,15 @@ ;;; Options +(defcustom magit-log-output-coding-system 'utf-8 + "Default coding system for receiving log output from Git. + +Should be consistent with the Git config value `i18n.logOutputEncoding'." + :package-version '(magit . "2.8.0") + :group 'magit-process + :group 'magit-log + :type '(coding-system :tag "Coding system to decode Git log output")) + (defcustom magit-process-connection-type (not (eq system-type 'cygwin)) "Connection type used for the Git process. @@ -139,10 +148,11 @@ itself from the hook, to avoid further futile attempts." ;; match-group 99 is used to identify a host "^\\(Enter \\)?[Pp]assword\\( for '\\(?99:.*\\)'\\)?: ?$" "^.*'s password: ?$" - "^Yubikey for .*: ?$") + "^Yubikey for .*: ?$" + "^Enter PIN for .*: ?$") "List of regexps matching password prompts of Git and its subprocesses. Also see `magit-process-find-password-functions'." - :package-version '(magit . "2.1.0") + :package-version '(magit . "2.8.0") :group 'magit-process :type '(repeat (regexp))) @@ -293,8 +303,10 @@ before use. Process output goes into a new section in the buffer returned by `magit-process-buffer'." (run-hooks 'magit-pre-call-git-hook) - (apply #'magit-call-process magit-git-executable - (magit-process-git-arguments args))) + (let ((coding-system-for-read + (or coding-system-for-read magit-log-output-coding-system))) + (apply #'magit-call-process magit-git-executable + (magit-process-git-arguments args)))) (defun magit-call-process (program &rest args) "Call PROGRAM synchronously in a separate process. @@ -442,8 +454,10 @@ and still alive), as well as the respective Magit status buffer. See `magit-start-process' for more information." (run-hooks 'magit-pre-start-git-hook) - (apply #'magit-start-process magit-git-executable input - (magit-process-git-arguments args))) + (let ((coding-system-for-read + (or coding-system-for-read magit-log-output-coding-system))) + (apply #'magit-start-process magit-git-executable input + (magit-process-git-arguments args)))) (defun magit-start-process (program &optional input &rest args) "Start PROGRAM, prepare for refresh, and return the process object. diff --git a/elpa/magit-20160710.1341/magit-remote.el b/elpa/magit-20160815.1946/magit-remote.el similarity index 100% rename from elpa/magit-20160710.1341/magit-remote.el rename to elpa/magit-20160815.1946/magit-remote.el diff --git a/elpa/magit-20160710.1341/magit-section.el b/elpa/magit-20160815.1946/magit-section.el similarity index 99% rename from elpa/magit-20160710.1341/magit-section.el rename to elpa/magit-20160815.1946/magit-section.el index e08db1a..bbe5c61 100644 --- a/elpa/magit-20160710.1341/magit-section.el +++ b/elpa/magit-20160815.1946/magit-section.el @@ -911,9 +911,10 @@ invisible." (previous (nth (length siblings) children))) (if (not arg) (--when-let (or previous (car (last children))) - (goto-char (magit-section-start it))) + (magit-section-goto it) + t) (when previous - (goto-char (magit-section-start previous))) + (magit-section-goto previous)) (if (and (stringp arg) (re-search-forward arg (magit-section-end parent) t)) diff --git a/elpa/magit-20160710.1341/magit-sequence.el b/elpa/magit-20160815.1946/magit-sequence.el similarity index 100% rename from elpa/magit-20160710.1341/magit-sequence.el rename to elpa/magit-20160815.1946/magit-sequence.el diff --git a/elpa/magit-20160710.1341/magit-stash.el b/elpa/magit-20160815.1946/magit-stash.el similarity index 100% rename from elpa/magit-20160710.1341/magit-stash.el rename to elpa/magit-20160815.1946/magit-stash.el diff --git a/elpa/magit-20160710.1341/magit-submodule.el b/elpa/magit-20160815.1946/magit-submodule.el similarity index 65% rename from elpa/magit-20160710.1341/magit-submodule.el rename to elpa/magit-20160815.1946/magit-submodule.el index db5faf6..ac803eb 100644 --- a/elpa/magit-20160710.1341/magit-submodule.el +++ b/elpa/magit-20160815.1946/magit-submodule.el @@ -25,6 +25,39 @@ (require 'magit) +;;; Options + +(defcustom magit-submodule-list-columns + '(("Path" 25 magit-modulelist-column-path nil) + ("Version" 25 magit-repolist-column-version nil) + ("Branch" 20 magit-repolist-column-branch nil) + ("LU" 3 magit-repolist-column-unpushed-to-upstream (:right-align t)) + ("LP" 3 magit-repolist-column-unpushed-to-pushremote (:right-align t))) + "List of columns displayed by `magit-list-submodules'. + +Each element has the form (HEADER WIDTH FORMAT PROPS). + +HEADER is the string displayed in the header. WIDTH is the width +of the column. FORMAT is a function that is called with one +argument, the repository identification (usually its basename), +and with `default-directory' bound to the toplevel of its working +tree. It has to return a string to be inserted or nil. PROPS is +an alist that supports the keys `:right-align' and `:pad-right'." + :package-version '(magit . "2.8.0") + :group 'magit-commands + :type `(repeat (list :tag "Column" + (string :tag "Header Label") + (integer :tag "Column Width") + (function :tag "Inserter Function") + (repeat :tag "Properties" + (list (choice :tag "Property" + (const :right-align) + (const :pad-right) + (symbol)) + (sexp :tag "Value")))))) + ;;; Commands ;;;###autoload (autoload 'magit-submodule-popup "magit-submodule" nil t) @@ -134,21 +167,35 @@ With a prefix argument fetch all remotes." "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-section (submodules 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)) - (--when-let (magit-git-string "describe" "--tags") - (when (string-match-p "\\`[0-9]" it) - (insert ?\s)) - (insert it)) - (insert ?\n))))) + (let ((col-format (format "%%-%is " (min 25 (/ (window-width) 3))))) + (dolist (module modules) + (let ((default-directory + (expand-file-name (file-name-as-directory module)))) + (magit-insert-section (file module t) + (insert (propertize (format col-format module) + 'face 'magit-diff-file-heading)) + (if (not (file-exists-p ".git")) + (insert "(uninitialized)") + (insert (format col-format + (--if-let (magit-get-current-branch) + (propertize it 'face 'magit-branch-local) + (propertize "(detached)" 'face 'warning)))) + (--when-let (magit-git-string "describe" "--tags") + (when (string-match-p "\\`[0-9]" it) + (insert ?\s)) + (insert (propertize it 'face 'magit-tag)))) + (insert ?\n)))))) (insert ?\n)))) +(defvar magit-submodules-section-map + (let ((map (make-sparse-keymap))) + (define-key map [remap magit-visit-thing] 'magit-list-submodules) + map) + "Keymap for `submodules' sections.") + ;;;###autoload (defun magit-insert-modules-unpulled-from-upstream () "Insert sections for modules that haven't been pulled from the upstream. @@ -211,6 +258,48 @@ These sections can be expanded to show the respective commits." (insert ?\n) (magit-cancel-section))))) +;;; List + +;;;###autoload +(defun magit-list-submodules () + "Display a list of the current repository's submodules." + (interactive) + (magit-display-buffer (magit-mode-get-buffer 'magit-submodule-list-mode t)) + (magit-submodule-list-mode) + (setq tabulated-list-entries + (mapcar (lambda (module) + (let ((default-directory + (expand-file-name (file-name-as-directory module)))) + (list module + (vconcat (--map (or (funcall (nth 2 it) module) "") + magit-submodule-list-columns))))) + (magit-get-submodules))) + (tabulated-list-print)) + +(defvar magit-submodule-list-mode-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map tabulated-list-mode-map) + (define-key map "g" 'magit-list-submodules) + (define-key map "\r" 'magit-repolist-status) + map) + "Local keymap for Magit-Submodule-List mode buffers.") + +(define-derived-mode magit-submodule-list-mode tabulated-list-mode "Modules" + "Major mode for browsing a list of Git submodules." + (setq x-stretch-cursor nil) + (setq tabulated-list-padding 0) + (setq tabulated-list-sort-key (cons "Path" nil)) + (setq tabulated-list-format + (vconcat (mapcar (-lambda ((title width _fn props)) + (nconc (list title width t) + (-flatten props))) + magit-submodule-list-columns))) + (tabulated-list-init-header)) + +(defun magit-modulelist-column-path (path) + "Insert the relative path of the submodule." + path) + ;;; magit-submodule.el ends soon (define-obsolete-function-alias 'magit-insert-unpulled-module-commits diff --git a/elpa/magit-20160710.1341/magit-subtree.el b/elpa/magit-20160815.1946/magit-subtree.el similarity index 100% rename from elpa/magit-20160710.1341/magit-subtree.el rename to elpa/magit-20160815.1946/magit-subtree.el diff --git a/elpa/magit-20160710.1341/magit-utils.el b/elpa/magit-20160815.1946/magit-utils.el similarity index 99% rename from elpa/magit-20160710.1341/magit-utils.el rename to elpa/magit-20160815.1946/magit-utils.el index 330420c..1fd5ae1 100644 --- a/elpa/magit-20160710.1341/magit-utils.el +++ b/elpa/magit-20160815.1946/magit-utils.el @@ -182,7 +182,7 @@ some of these messages useless. Messages which can currently be suppressed using this option are: * \"Turning on magit-auto-revert-mode...\"" - :package-version '(magit . "2.7.1") + :package-version '(magit . "2.8.0") :group 'magit :type '(repeat string)) diff --git a/elpa/magit-20160710.1341/magit-wip.el b/elpa/magit-20160815.1946/magit-wip.el similarity index 100% rename from elpa/magit-20160710.1341/magit-wip.el rename to elpa/magit-20160815.1946/magit-wip.el diff --git a/elpa/magit-20160710.1341/magit.el b/elpa/magit-20160815.1946/magit.el similarity index 99% rename from elpa/magit-20160710.1341/magit.el rename to elpa/magit-20160815.1946/magit.el index 293f562..2799825 100644 --- a/elpa/magit-20160710.1341/magit.el +++ b/elpa/magit-20160815.1946/magit.el @@ -297,7 +297,7 @@ the maximum depth to look for Git repositories. If it is 0, then only add DIRECTORY itself. For elements that are strings, the value of option `magit-repository-directories-depth' specifies the depth." - :package-version '(magit . "2.7.1") + :package-version '(magit . "2.8.0") :group 'magit :type '(repeat (choice (cons directory (integer :tag "Depth")) directory))) @@ -324,8 +324,8 @@ of the column. FORMAT is a function that is called with one argument, the repository identification (usually its basename), and with `default-directory' bound to the toplevel of its working tree. It has to return a string to be inserted or nil. PROPS is -an alist that supports the keys ~:right-align~ and ~:pad-right~." - :package-version '(magit . "2.7.1") +an alist that supports the keys `:right-align' and `:pad-right'." + :package-version '(magit . "2.8.0") :group 'magit-commands :type `(repeat (list :tag "Column" (string :tag "Header Label") @@ -1281,12 +1281,14 @@ is done using `magit-find-index-noselect'." (let ((coding-system-for-write buffer-file-coding-system)) (with-temp-file index (insert-buffer-substring buffer))) - (magit-call-git "update-index" "--cacheinfo" - (substring (magit-git-string "ls-files" "-s" file) 0 6) - (magit-git-string "hash-object" "-t" "blob" "-w" - (concat "--path=" file) - "--" index) - file) + (magit-with-toplevel + (magit-call-git "update-index" "--cacheinfo" + (substring (magit-git-string "ls-files" "-s" file) + 0 6) + (magit-git-string "hash-object" "-t" "blob" "-w" + (concat "--path=" file) + "--" index) + file)) (set-buffer-modified-p nil) (when magit-wip-after-apply-mode (magit-wip-commit-after-apply (list file) " after un-/stage"))) @@ -1918,7 +1920,7 @@ merge. (magit-merge-arguments) current-prefix-arg)) (magit-merge-assert) - (magit-run-git "merge" (if nocommit "--no-commit" "--no-edit") args rev)) + (magit-run-git-async "merge" (if nocommit "--no-commit" "--no-edit") args rev)) ;;;###autoload (defun magit-merge-editmsg (rev &optional args) @@ -1944,7 +1946,7 @@ inspect the merge and change the commit message. (magit-merge-arguments))) (magit-merge-assert) (cl-pushnew "--no-ff" args :test #'equal) - (magit-run-git "merge" "--no-commit" args rev)) + (magit-run-git-async "merge" "--no-commit" args rev)) ;;;###autoload (defun magit-merge-preview (rev) @@ -2811,6 +2813,14 @@ Usually this is just its basename." (concat " " v) v))) +(defun magit-repolist-column-branch (_id) + "Insert the current branch." + (magit-get-current-branch)) + +(defun magit-repolist-column-upstream (_id) + "Insert the upstream branch of the current branch." + (magit-get-current-branch)) + (defun magit-repolist-column-unpulled-from-upstream (_id) "Insert number of upstream commits not in the current branch." (--when-let (magit-get-upstream-branch) @@ -2820,7 +2830,7 @@ Usually this is just its basename." (defun magit-repolist-column-unpulled-from-pushremote (_id) "Insert number of commits in the push branch but not the current branch." (--when-let (magit-get-push-branch) - (when (magit-rev-parse-p it) + (when (magit-rev-verify it) (let ((n (cadr (magit-rev-diff-count "HEAD" it)))) (propertize (number-to-string n) 'face (if (> n 0) 'bold 'shadow)))))) @@ -2833,7 +2843,7 @@ Usually this is just its basename." (defun magit-repolist-column-unpushed-to-pushremote (_id) "Insert number of commits in the current branch but not its push branch." (--when-let (magit-get-push-branch) - (when (magit-rev-parse-p it) + (when (magit-rev-verify it) (let ((n (car (magit-rev-diff-count "HEAD" it)))) (propertize (number-to-string n) 'face (if (> n 0) 'bold 'shadow)))))) @@ -3044,7 +3054,7 @@ like `kill-ring-save' would, instead of behaving as described above." (interactive) (if (use-region-p) - (copy-region-as-kill (mark) (point) 'region) + (copy-region-as-kill nil nil 'region) (-when-let* ((section (magit-current-section)) (value (magit-section-value section))) (magit-section-case @@ -3087,7 +3097,7 @@ like `kill-ring-save' would, instead of behaving as described above." (interactive) (if (use-region-p) - (copy-region-as-kill (mark) (point) 'region) + (copy-region-as-kill nil nil 'region) (-when-let (rev (cond ((memq major-mode '(magit-cherry-mode magit-log-select-mode magit-reflog-mode @@ -3192,7 +3202,9 @@ Git, and Emacs in the echo area." (setq magit-version 'error) (when magit-version (push magit-version debug)) - (message "Cannot determine Magit's version %S" debug)) + (unless (equal (getenv "TRAVIS") "true") + ;; The repository is a sparse clone. + (message "Cannot determine Magit's version %S" debug))) magit-version)) (defun magit-startup-asserts () diff --git a/elpa/magit-20160815.1946/magit.info b/elpa/magit-20160815.1946/magit.info new file mode 100644 index 0000000..757af3c --- /dev/null +++ b/elpa/magit-20160815.1946/magit.info @@ -0,0 +1,175 @@ +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: 313551 + +Tag Table: +(Indirect) +Node: Top1222 +Node: Introduction6390 +Node: Installation11083 +Node: Updating from an older release11458 +Node: Installing from an Elpa archive13053 +Node: Installing from the Git repository14392 +Node: Post-installation tasks17188 +Node: Getting started18577 +Node: Interface concepts24312 +Node: Modes and Buffers24586 +Node: Switching Buffers26331 +Node: Naming Buffers30989 +Node: Quitting Windows33824 +Node: Automatic Refreshing of Magit Buffers35456 +Node: Automatic Saving of File-Visiting Buffers38224 +Node: Automatic Reverting of File-Visiting Buffers39409 +Node: Risk of Reverting Automatically44405 +Node: Sections46788 +Node: Section movement47729 +Node: Section visibility51656 +Node: Section hooks55247 +Node: Section types and values57528 +Node: Section options58798 +Node: Popup buffers and prefix commands59270 +Node: Completion and confirmation60584 +Node: Running Git63490 +Node: Viewing Git output63726 +Node: Running Git manually64726 +Node: Git executable66852 +Node: Global Git arguments68859 +Node: Inspecting69666 +Node: Status buffer70813 +Node: Status sections73678 +Node: Status header sections79087 +Node: Status options81644 +Node: Repository list82368 +Node: Logging84505 +Node: Refreshing logs87243 +Node: Log Buffer88628 +Node: Select from log91924 +Node: Reflog92864 +Node: Diffing93342 +Node: Refreshing diffs96362 +Node: Diff buffer99343 +Node: Diff options101245 +Node: Revision buffer103001 +Node: Ediffing103956 +Node: References buffer107546 +Node: References sections112256 +Node: Bisecting113131 +Node: Visiting blobs114870 +Node: Blaming115379 +Node: Manipulating118809 +Node: Repository setup119125 +Node: Staging and unstaging120165 +Node: Staging from file-visiting buffers124254 +Node: Applying125422 +Node: Committing127315 +Node: Initiating a commit127898 +Node: Editing commit messages131210 +Node: Branching141606 +Node: The two remotes141806 +Node: The branch popup144350 +Node: The branch config popup150577 +Node: Merging156483 +Node: Resolving conflicts158651 +Ref: orgradiotarget1159736 +Node: Rebasing163608 +Node: Editing rebase sequences167249 +Node: Information about in-progress rebase170279 +Ref: Information about in-progress rebase-Footnote-1177115 +Node: Cherry picking177701 +Node: Reverting179307 +Node: Resetting180670 +Node: Stashing182182 +Node: Transferring185356 +Node: Remotes185594 +Node: Fetching186880 +Node: Pulling188246 +Node: Pushing189092 +Node: Creating and sending patches193836 +Node: Applying patches194531 +Node: Miscellaneous195529 +Node: Tagging195832 +Node: Notes196617 +Node: Submodules199142 +Node: Subtree200644 +Node: Common commands201892 +Node: Wip modes203637 +Node: Minor mode for buffers visiting files210373 +Node: Minor mode for buffers visiting blobs213847 +Node: Customizing214652 +Node: Per-repository configuration216324 +Node: Essential settings217958 +Node: Safety218282 +Node: Performance220115 +Node: Plumbing228077 +Node: Calling Git228705 +Node: Getting a value from Git230228 +Node: Calling Git for effect233332 +Node: Section plumbing239836 +Node: Creating sections240064 +Node: Section selection243963 +Node: Matching sections245643 +Node: Refreshing buffers250852 +Node: Conventions253987 +Node: Confirmation and completion254164 +Node: Theming Faces255062 +Node: FAQ263213 +Node: Magit is slow264826 +Node: I changed several thousand files at once and now Magit is unusable265027 +Node: I am having problems committing265743 +Node: Diffs are collapsed after un-/staging266189 +Node: I don't understand how branching and pushing work267667 +Node: I don't like the key binding in v24268042 +Node: I cannot install the pre-requisites for Magit v2268381 +Node: I am using an Emacs release older than v244268846 +Node: I am using a Git release older than v194270459 +Node: I am using MS Windows and cannot push with Magit271446 +Node: I am using OS X and SOMETHING works in shell but not in Magit272050 +Node: How to install the gitman info manual?272841 +Node: How can I show Git's output?275382 +Node: Diffs contain control sequences276169 +Node: Expanding a file to show the diff causes it to disappear277174 +Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer277709 +Node: The mode-line information isn't always up-to-date278739 +Node: Can Magit be used as ‘ediff-version-control-package’?279807 +Node: How to show diffs for gpg-encrypted files?281851 +Node: Emacs 245 hangs when loading Magit282448 +Node: Symbol's value as function is void ‘--some’283023 +Node: Where is the branch manager283357 +Node: Keystroke Index283648 +Node: Command Index313551 +Node: Function Index343560 +Node: Variable Index357381 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/magit-20160710.1341/magit.info-1 b/elpa/magit-20160815.1946/magit.info-1 similarity index 99% rename from elpa/magit-20160710.1341/magit.info-1 rename to elpa/magit-20160815.1946/magit.info-1 index 4e69838..b39fda4 100644 --- a/elpa/magit-20160710.1341/magit.info-1 +++ b/elpa/magit-20160815.1946/magit.info-1 @@ -136,6 +136,7 @@ Status buffer * Status options:: + Logging * Refreshing logs:: @@ -548,7 +549,7 @@ outdated value for ‘load-path’. should display something like - Magit 2.4.0, Git 2.7.0, Emacs 24.5.1 + Magit 2.8.0, Git 2.9.0, Emacs 24.5.1 Then you might also want to read about options that many users likely want to customize. See *note Essential settings: Essential settings. @@ -1209,7 +1210,7 @@ using an Auto-Revert mode, and should therefore be avoided. If Emacs crashed or if you quit Emacs by mistake, then you would also lose the buffer content. There would be no autosave file still containing the intermediate version (because that was deleted when you saved the -buffer) and you would not be asked whether you want to safe the buffer +buffer) and you would not be asked whether you want to save the buffer (because it isn’t modified).  @@ -2372,6 +2373,12 @@ File: magit.info, Node: Log Buffer, Next: Select from log, Prev: Refreshing l Move forward in current buffer’s history. +‘C-c C-n’ (‘magit-log-move-to-parent’) + + Move to a parent of the current commit. By default, this is the + first parent, but a numeric prefix can be used to specify another + parent. + ‘SPC’ (‘magit-diff-show-or-scroll-up’) Update the commit or diff buffer for the thing at point. @@ -2948,10 +2955,10 @@ you should also change the others to keep things aligned. The following • ‘%n’ Name of this ref. - • ‘%u’ Upstream of this local branch and additional local vs. - upstream information. + • ‘%u’ Upstream of this local branch. - • ‘%U’ Upstream of this local branch. + • ‘%U’ Upstream of this local branch and additional local vs. + upstream information. -- Variable: magit-refs-local-branch-format @@ -3089,6 +3096,14 @@ commands instead. After bisecting, cleanup bisection state and return to original ‘HEAD’. + By default the status buffer shows information about the ongoing +bisect session. + + -- User Option: magit-bisect-show-graph + + This option controls whether a graph is displayed for the log of + commits that still have to be bisected. +  File: magit.info, Node: Visiting blobs, Next: Blaming, Prev: Bisecting, Up: Inspecting @@ -3184,6 +3199,9 @@ Also see *note (gitman)git-blame:: . Save the hash of the current chunk’s commit to the kill ring. + When the region is active, then save that to the ‘kill-ring’, like + ‘kill-ring-save’ would. + ‘t’ (‘magit-blame-toggle-headings’) Show or hide blame chunk headings. @@ -4008,6 +4026,11 @@ features are available from separate popups. prefer the former, then you should add branches such as ‘master’, ‘next’, and ‘maint’ to the value of this options. + -- Command: magit-branch-orphan + + This command creates and checks out a new orphan branch with + contents from a given revision. +  File: magit.info, Node: The branch config popup, Prev: The branch popup, Up: Branching @@ -5362,6 +5385,13 @@ File: magit.info, Node: Submodules, Next: Subtree, Prev: Notes, Up: Miscella Also see *note (gitman)git-submodule:: . + -- Command: magit-list-submodules + + This command displays of the current repository’s submodules. + + It can be invoked by pressing ‘RET’ on the section titled + "Modules". + ‘o’ (‘magit-submodule-popup’) This prefix command shows the following suffix commands along with @@ -5953,7 +5983,7 @@ In order to update the status buffer, ‘git’ has to be run a few dozen times. That is only problematic on Microsoft Windows, because that operating system is exceptionally slow at starting processes. Sadly this is an issue that can only be fixed by Microsoft itself, and they -don’t appear to particularly interested in doing so. +don’t appear to be particularly interested in doing so. Beside the subprocess issue, there also exist other Window-specific performance issues, some of which can be worked around. The maintainers @@ -7330,7 +7360,7 @@ Appendix B Keystroke Index * ! S: Running Git manually. (line 38) * $: Viewing Git output. (line 11) -* +: Log Buffer. (line 53) +* +: Log Buffer. (line 59) * + <1>: Refreshing diffs. (line 58) * -: Refreshing diffs. (line 54) * 0: Refreshing diffs. (line 62) @@ -7338,8 +7368,8 @@ Appendix B Keystroke Index * 2: Section visibility. (line 26) * 3: Section visibility. (line 26) * 4: Section visibility. (line 26) -* =: Log Buffer. (line 47) -* = <1>: Log Buffer. (line 57) +* =: Log Buffer. (line 53) +* = <1>: Log Buffer. (line 63) * ^: Section movement. (line 31) * a: Applying. (line 33) * A: Cherry picking. (line 8) @@ -7400,6 +7430,7 @@ Appendix B Keystroke Index (line 24) * C-c C-k <2>: Editing rebase sequences. (line 11) +* C-c C-n: Log Buffer. (line 27) * C-c C-o: Editing commit messages. (line 144) * C-c C-p: Editing commit messages. @@ -7454,7 +7485,7 @@ Appendix B Keystroke Index * d u: Diffing. (line 55) * d w: Diffing. (line 43) * D w: Refreshing diffs. (line 28) -* DEL: Log Buffer. (line 37) +* DEL: Log Buffer. (line 43) * DEL <1>: Diff buffer. (line 48) * DEL <2>: Blaming. (line 44) * DEL <3>: Editing rebase sequences. @@ -7573,21 +7604,21 @@ Appendix B Keystroke Index (line 39) * n <3>: Minor mode for buffers visiting blobs. (line 16) -* o: Submodules. (line 8) +* o: Submodules. (line 15) * O: Subtree. (line 8) -* o a: Submodules. (line 13) +* o a: Submodules. (line 20) * O a: Subtree. (line 20) -* o b: Submodules. (line 19) +* o b: Submodules. (line 26) * O c: Subtree. (line 24) -* o f: Submodules. (line 37) +* o f: Submodules. (line 44) * O f: Subtree. (line 32) -* o i: Submodules. (line 24) -* o i <1>: Submodules. (line 41) +* o i: Submodules. (line 31) +* o i <1>: Submodules. (line 48) * O m: Subtree. (line 28) * O p: Subtree. (line 36) -* o s: Submodules. (line 33) +* o s: Submodules. (line 40) * O s: Subtree. (line 41) -* o u: Submodules. (line 28) +* o u: Submodules. (line 35) * p: Section movement. (line 10) * p <1>: Blaming. (line 62) * P: Blaming. (line 66) @@ -7636,12 +7667,12 @@ Appendix B Keystroke Index * s <1>: Editing rebase sequences. (line 59) * s-: Section visibility. (line 22) -* SPC: Log Buffer. (line 27) +* SPC: Log Buffer. (line 33) * SPC <1>: Diff buffer. (line 44) * SPC <2>: Blaming. (line 34) * SPC <3>: Editing rebase sequences. (line 21) -* t: Blaming. (line 79) +* t: Blaming. (line 82) * t <1>: Tagging. (line 8) * T: Notes. (line 8) * T a: Notes. (line 70) diff --git a/elpa/magit-20160710.1341/magit.info-2 b/elpa/magit-20160815.1946/magit.info-2 similarity index 98% rename from elpa/magit-20160710.1341/magit.info-2 rename to elpa/magit-20160815.1946/magit.info-2 index 4e22bb8..778e44d 100644 Binary files a/elpa/magit-20160710.1341/magit.info-2 and b/elpa/magit-20160815.1946/magit.info-2 differ diff --git a/elpa/magit-popup-20160710.1341/dir b/elpa/magit-popup-20160813.642/dir similarity index 100% rename from elpa/magit-popup-20160710.1341/dir rename to elpa/magit-popup-20160813.642/dir diff --git a/elpa/magit-popup-20160710.1341/magit-popup-autoloads.el b/elpa/magit-popup-20160813.642/magit-popup-autoloads.el similarity index 69% rename from elpa/magit-popup-20160710.1341/magit-popup-autoloads.el rename to elpa/magit-popup-20160813.642/magit-popup-autoloads.el index 57b2928..28edc37 100644 --- a/elpa/magit-popup-20160710.1341/magit-popup-autoloads.el +++ b/elpa/magit-popup-20160813.642/magit-popup-autoloads.el @@ -1,10 +1,10 @@ ;;; magit-popup-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) ;;;### (autoloads nil nil ("magit-popup-pkg.el" "magit-popup.el") -;;;;;; (22404 60205 875465 195000)) +;;;;;; (22454 5305 392859 118000)) ;;;*** diff --git a/elpa/magit-popup-20160710.1341/magit-popup-pkg.el b/elpa/magit-popup-20160813.642/magit-popup-pkg.el similarity index 67% rename from elpa/magit-popup-20160710.1341/magit-popup-pkg.el rename to elpa/magit-popup-20160813.642/magit-popup-pkg.el index addf81b..5d556ea 100644 --- a/elpa/magit-popup-20160710.1341/magit-popup-pkg.el +++ b/elpa/magit-popup-20160813.642/magit-popup-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit-popup" "20160710.1341" "Define prefix-infix-suffix command combos" +(define-package "magit-popup" "20160813.642" "Define prefix-infix-suffix command combos" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113")) diff --git a/elpa/magit-popup-20160710.1341/magit-popup.el b/elpa/magit-popup-20160813.642/magit-popup.el similarity index 99% rename from elpa/magit-popup-20160710.1341/magit-popup.el rename to elpa/magit-popup-20160813.642/magit-popup.el index fb900ac..a237e3c 100644 --- a/elpa/magit-popup-20160710.1341/magit-popup.el +++ b/elpa/magit-popup-20160813.642/magit-popup.el @@ -179,6 +179,7 @@ that without users being aware of it could lead to tears. (define-key map [?\C-x ?\C-s] 'magit-popup-save-default-arguments) (define-key map [?\C-g] 'magit-popup-quit) (define-key map [??] 'magit-popup-help) + (define-key map [?\C-h ?k] 'magit-popup-help) (define-key map [?\C-h ?i] 'magit-popup-info) (define-key map [?\C-t] 'magit-popup-toggle-show-common-commands) (define-key map [?\d] 'backward-button) @@ -863,9 +864,10 @@ argument is used in which case the popup remains open. For a popup named `NAME-popup' that usually means setting the value of the custom option `NAME-arguments'." (interactive "P") - (customize-set-variable (magit-popup-get :variable) - (magit-popup-get-args)) - (unless arg (magit-popup-quit))) + (-if-let (var (magit-popup-get :variable)) + (progn (customize-set-variable var (magit-popup-get-args)) + (unless arg (magit-popup-quit))) + (user-error "Nothing to set"))) (defun magit-popup-save-default-arguments (arg) "Save default value for the arguments for the current popup. @@ -875,9 +877,10 @@ argument is used in which case the popup remains open. For a popup named `NAME-popup' that usually means saving the value of the custom option `NAME-arguments'." (interactive "P") - (customize-save-variable (magit-popup-get :variable) - (magit-popup-get-args)) - (unless arg (magit-popup-quit))) + (-if-let (var (magit-popup-get :variable)) + (progn (customize-save-variable var (magit-popup-get-args)) + (unless arg (magit-popup-quit))) + (user-error "Nothing to save"))) ;;; Help diff --git a/elpa/magit-popup-20160710.1341/magit-popup.info b/elpa/magit-popup-20160813.642/magit-popup.info similarity index 99% rename from elpa/magit-popup-20160710.1341/magit-popup.info rename to elpa/magit-popup-20160813.642/magit-popup.info index b80a74a..e06fc7c 100644 --- a/elpa/magit-popup-20160710.1341/magit-popup.info +++ b/elpa/magit-popup-20160813.642/magit-popup.info @@ -170,7 +170,7 @@ second key is always an alphabetic character. common to all popups. To avoid conflicts with suffix commands, the bindings of these common commands are not alphabetic characters. This section is shown by default so that documentation-resistant users get a -change to notice them. +chance to notice them. -- User Option: magit-popup-show-common-commands diff --git a/elpa/markdown-mode-20160629.459/markdown-mode-pkg.el b/elpa/markdown-mode-20160629.459/markdown-mode-pkg.el deleted file mode 100644 index 5aac68f..0000000 --- a/elpa/markdown-mode-20160629.459/markdown-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "markdown-mode" "20160629.459" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex")) diff --git a/elpa/markdown-mode-20160629.459/markdown-mode-autoloads.el b/elpa/markdown-mode-20160803.1848/markdown-mode-autoloads.el similarity index 77% rename from elpa/markdown-mode-20160629.459/markdown-mode-autoloads.el rename to elpa/markdown-mode-20160803.1848/markdown-mode-autoloads.el index 0c2032f..0af4993 100644 --- a/elpa/markdown-mode-20160629.459/markdown-mode-autoloads.el +++ b/elpa/markdown-mode-20160803.1848/markdown-mode-autoloads.el @@ -1,10 +1,10 @@ ;;; markdown-mode-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22404 60203 -;;;;;; 337555 4000)) +;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22454 5303 +;;;;;; 617817 380000)) ;;; Generated autoloads from markdown-mode.el (autoload 'markdown-mode "markdown-mode" "\ diff --git a/elpa/markdown-mode-20160803.1848/markdown-mode-pkg.el b/elpa/markdown-mode-20160803.1848/markdown-mode-pkg.el new file mode 100644 index 0000000..b1767c3 --- /dev/null +++ b/elpa/markdown-mode-20160803.1848/markdown-mode-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "markdown-mode" "20160803.1848" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex")) diff --git a/elpa/markdown-mode-20160629.459/markdown-mode.el b/elpa/markdown-mode-20160803.1848/markdown-mode.el similarity index 99% rename from elpa/markdown-mode-20160629.459/markdown-mode.el rename to elpa/markdown-mode-20160803.1848/markdown-mode.el index 9ad3c9e..e3e3400 100644 --- a/elpa/markdown-mode-20160629.459/markdown-mode.el +++ b/elpa/markdown-mode-20160803.1848/markdown-mode.el @@ -33,7 +33,7 @@ ;; Maintainer: Jason R. Blevins ;; Created: May 24, 2007 ;; Version: 2.1 -;; Package-Version: 20160629.459 +;; Package-Version: 20160803.1848 ;; Package-Requires: ((emacs "24") (cl-lib "0.5")) ;; Keywords: Markdown, GitHub Flavored Markdown, itex ;; URL: http://jblevins.org/projects/markdown-mode/ @@ -4818,14 +4818,16 @@ See `imenu-create-index-function' and `imenu--index-alist' for details." (save-excursion (goto-char (point-min)) (while (re-search-forward markdown-regex-header (point-max) t) - (cond - ((setq heading (match-string-no-properties 1)) - (setq pos (match-beginning 1))) - ((setq heading (match-string-no-properties 5)) - (setq pos (match-beginning 4)))) - (or (> (length heading) 0) - (setq heading empty-heading)) - (setq index (append index (list (cons heading pos))))) + (when (and (not (markdown-code-block-at-point)) + (not (markdown-text-property-at-point 'markdown-yaml-metadata-begin))) + (cond + ((setq heading (match-string-no-properties 1)) + (setq pos (match-beginning 1))) + ((setq heading (match-string-no-properties 5)) + (setq pos (match-beginning 4)))) + (or (> (length heading) 0) + (setq heading empty-heading)) + (setq index (append index (list (cons heading pos)))))) index))) @@ -5541,13 +5543,14 @@ setext header, but should not be folded." (goto-char (point-min)) ;; Unhide any false positives in metadata blocks (when (markdown-text-property-at-point 'markdown-yaml-metadata-begin) - (let* ((body (progn (forward-line) - (markdown-text-property-at-point - 'markdown-yaml-metadata-section))) - (end (progn (goto-char (cl-second body)) + (let ((body (progn (forward-line) (markdown-text-property-at-point - 'markdown-yaml-metadata-end)))) - (outline-flag-region (point-min) (1+ (cl-second end)) nil))) + 'markdown-yaml-metadata-section)))) + (when body + (let ((end (progn (goto-char (cl-second body)) + (markdown-text-property-at-point + 'markdown-yaml-metadata-end)))) + (outline-flag-region (point-min) (1+ (cl-second end)) nil))))) ;; Hide any false positives in code blocks (unless (outline-on-heading-p) (outline-next-visible-heading 1)) diff --git a/elpa/marshal-20160807.1954/marshal-autoloads.el b/elpa/marshal-20160807.1954/marshal-autoloads.el new file mode 100644 index 0000000..c3bd9ea --- /dev/null +++ b/elpa/marshal-20160807.1954/marshal-autoloads.el @@ -0,0 +1,33 @@ +;;; marshal-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +;;;### (autoloads nil "marshal" "marshal.el" (22454 5328 305397 868000)) +;;; Generated autoloads from marshal.el + +(autoload 'marshal "marshal" "\ + + +\(fn OBJ TYPE)" nil nil) + +(autoload 'unmarshal "marshal" "\ + + +\(fn OBJ BLOB TYPE)" nil nil) + +(autoload 'marshal-defclass "marshal" "\ + + +\(fn NAME SUPERCLASS SLOTS &rest OPTIONS-AND-DOC)" nil t) + +(function-put 'marshal-defclass 'lisp-indent-function '2) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; marshal-autoloads.el ends here diff --git a/elpa/marshal-20160807.1954/marshal-pkg.el b/elpa/marshal-20160807.1954/marshal-pkg.el new file mode 100644 index 0000000..bc625e7 --- /dev/null +++ b/elpa/marshal-20160807.1954/marshal-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "marshal" "20160807.1954" "eieio extension for automatic (un)marshalling" '((eieio "1.4") (json "1.3") (ht "2.1")) :url "https://github.com/sigma/marshal.el" :keywords '("eieio")) diff --git a/elpa/marshal-20160807.1954/marshal.el b/elpa/marshal-20160807.1954/marshal.el new file mode 100644 index 0000000..6e45fcb --- /dev/null +++ b/elpa/marshal-20160807.1954/marshal.el @@ -0,0 +1,492 @@ +;;; marshal.el --- eieio extension for automatic (un)marshalling + +;; Copyright (C) 2015 Yann Hodique + +;; Author: Yann Hodique +;; Keywords: eieio +;; Package-Version: 20160807.1954 +;; Version: 0.7.0 +;; URL: https://github.com/sigma/marshal.el +;; Package-Requires: ((eieio "1.4") (json "1.3") (ht "2.1")) + +;; This file 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 2, or (at your option) +;; any later version. + +;; This file 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 GNU Emacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; Inspired by Go tagged structs. 'alist, 'plist and 'json drivers are +;; provided, but implementing others just requires to inherit from +;; `marshal-driver'. + +;; Sometimes the types are not enough (for example with lists, whose elements +;; are not explicitly typed. In those cases, a small extension on top of types +;; can be used. Like for example :marshal-type (list string) + +;; Examples: + +;; 1. Regular use: + +;; (marshal-defclass plop () +;; ((foo :initarg :foo :type string :marshal ((alist . field_foo))) +;; (bar :initarg :bar :type integer :marshal ((alist . field_bar))) +;; (baz :initarg :baz :type integer :marshal ((alist . field_baz))))) + +;; (marshal-defclass plopi () +;; ((alpha :marshal ((alist . field_alpha))) +;; (beta :type plop :marshal ((alist . field_beta))))) + +;; (marshal (make-instance 'plop :foo "ok" :bar 42) 'alist) +;; => '((field_bar . 42) (field_foo . "ok")) + +;; (unmarshal 'plop '((field_foo . "plop") (field_bar . 0) (field_baz . 1)) 'alist) +;; => '[object plop "plop" "plop" 0 1] + +;; (marshal +;; (unmarshal 'plopi '((field_alpha . 42) +;; (field_beta . ((field_foo . "plop") +;; (field_bar . 0) +;; (field_baz . 1)))) 'alist) +;; 'alist) +;; => '((field_beta (field_baz . 1) (field_bar . 0) (field_foo . "plop")) (field_alpha . 42)) + +;; 2. Objects involving lists: + +;; (marshal-defclass foo/tree () +;; ((root :initarg :id :marshal ((plist . :root))) +;; (leaves :initarg :leaves :marshal ((plist . :leaves)) :marshal-type (list foo/tree)))) + +;; (marshal (make-instance 'foo/tree :id 0 +;; :leaves (list (make-instance 'foo/tree :id 1) +;; (make-instance 'foo/tree :id 2 +;; :leaves (list (make-instance 'foo/tree :id 3))))) +;; 'plist) +;; => (:root 0 :leaves ((:root 1) (:root 2 :leaves ((:root 3))))) + +;; (unmarshal 'foo/tree '(:root 0 :leaves ((:root 1) (:root 2 :leaves ((:root 3))))) 'plist) + +;; => [object foo/tree "foo/tree" 0 +;; ([object foo/tree "foo/tree" 1 nil] +;; [object foo/tree "foo/tree" 2 +;; ([object foo/tree "foo/tree" 3 nil])])] + +;; 3. Json + +;; (marshal (make-instance 'foo/tree :id 0 +;; :leaves (list (make-instance 'foo/tree :id 1) +;; (make-instance 'foo/tree :id 2 +;; :leaves (list (make-instance 'foo/tree :id 3))))) +;; 'json) +;; => "{\"leaves\":[{\"root\":1},{\"leaves\":[{\"root\":3}],\"root\":2}],\"root\":0}" + +;; (unmarshal 'foo/tree "{\"leaves\":[{\"root\":1},{\"leaves\":[{\"root\":3}],\"root\":2}],\"root\":0}" 'json) +;; => [object foo/tree "foo/tree" 0 +;; ([object foo/tree "foo/tree" 1 nil] +;; [object foo/tree "foo/tree" 2 +;; ([object foo/tree "foo/tree" 3 nil])])] + +;;; Code: + +(require 'json) +(require 'eieio) +(require 'ht) + +;;; eieio backward-compatibility +(dolist (sym '(object-class object-p oref oset)) + (let ((new-sym (intern (concat "eieio-" (symbol-name sym))))) + (unless (fboundp new-sym) + (fset new-sym sym)))) + +;;; json hotfix +(when (json-alist-p '(((foo)))) + (defun json-alist-p (list) + (while (consp list) + (setq list (if (and (consp (car list)) (atom (caar list))) + (cdr list) + 'not-alist))) + (null list))) + +;;; Defined drivers + +(defvar marshal-drivers nil "Alist of drivers") + +(defun marshal-register-driver (type driver) + (add-to-list 'marshal-drivers (cons type driver))) + +;;; Marshalling driver interface + +(defclass marshal-driver () + ((input :initarg :input) + (output :initarg :output))) + +(defmethod marshal-open ((obj marshal-driver) &optional input) + (if input + (oset obj :input input) + (oset obj :output nil))) + +(defmethod marshal-write ((obj marshal-driver) path value) + (unless (slot-boundp obj :output) + (error "Driver has not been opened in write mode"))) + +(defmethod marshal-read ((obj marshal-driver) path) + (unless (slot-boundp obj :input) + (error "Driver has not been opened in read mode"))) + +(defmethod marshal-close ((obj marshal-driver)) + (when (slot-boundp obj :output) + (oref obj :output))) + +(defmethod marshal-guess-type :static ((obj marshal-driver) blob) + (cond ((null blob) nil) + ((booleanp blob) 'bool) + ((stringp blob) 'string) + ((numberp blob) 'number) + ((listp blob) 'list) + ((ht? blob) 'hash))) + +(defmethod marshal-preprocess ((obj marshal-driver) blob) + blob) + +(defmethod marshal-postprocess ((obj marshal-driver) blob) + blob) + +(defmethod marshal-unmarshal-null :static ((obj marshal-driver)) + nil) + +(defmethod marshal-marshal-null :static ((obj marshal-driver)) + nil) + +(defmethod marshal-unmarshal-string :static ((obj marshal-driver) s) + (format "%s" s)) + +(defmethod marshal-marshal-string :static ((obj marshal-driver) s) + s) + +(defmethod marshal-unmarshal-number :static ((obj marshal-driver) i) + i) + +(defmethod marshal-marshal-number :static ((obj marshal-driver) i) + i) + +(defmethod marshal-unmarshal-bool :static ((obj marshal-driver) b) + (equal b t)) + +(defmethod marshal-marshal-bool :static ((obj marshal-driver) b) + (equal b t)) + +(defmethod marshal-unmarshal-list :static ((obj marshal-driver) l l-type) + (let ((type (or (and (object-p obj) (eieio-object-class obj)) + obj))) + (cons (unmarshal-internal (when (consp l-type) + (cadr l-type)) + (car l) type) + (unmarshal-internal l-type (cdr l) type)))) + +(defmethod marshal-marshal-list :static ((obj marshal-driver) l) + (unless (null l) + (let ((type (or (and (object-p obj) (eieio-object-class obj)) + obj))) + (cons (marshal-internal (car l) type) + (marshal-internal (cdr l) type))))) + +(defmethod marshal-unmarshal-hash :static ((obj marshal-driver) h h-type) + (let ((type (or (and (object-p obj) (eieio-object-class obj)) + obj)) + (k-type (when (consp h-type) (nth 1 h-type))) + (v-type (when (consp h-type) (nth 2 h-type)))) + (ht<-alist + (mapcar (lambda (item) + (cons (unmarshal-internal k-type (car item) type) + (unmarshal-internal v-type (cdr item) type))) h)))) + +(defmethod marshal-marshal-hash :static ((obj marshal-driver) h) + (unless (ht-empty? h) + (let ((type (or (and (object-p obj) (eieio-object-class obj)) + obj))) + (mapcar (lambda (item) + (cons (marshal-internal (car item) type) + (marshal-internal (cadr item) type))) + (ht-items h))))) + +;;; alist-based driver + +(defclass marshal-driver-alist (marshal-driver) + ()) + +(defmethod marshal-write ((obj marshal-driver-alist) path value) + (call-next-method) + (object-add-to-list obj :output (cons path value))) + +(defmethod marshal-read ((obj marshal-driver-alist) path) + (call-next-method) + (cdr (assoc path (oref obj :input)))) + +;;; json driver + +(defclass marshal-driver-json (marshal-driver-alist) + ()) + +(defmethod marshal-preprocess ((obj marshal-driver-json) blob) + (let ((json-array-type 'list) + (json-object-type 'alist)) + (json-read-from-string (call-next-method)))) + +(defmethod marshal-postprocess ((obj marshal-driver-json) blob) + (json-encode (call-next-method))) + +(defmethod marshal-unmarshal-bool :static ((obj marshal-driver-json) b) + (not (eq b json-false))) + +(defmethod marshal-marshal-bool :static ((obj marshal-driver-json) b) + (or b json-false)) + +;;; plist-based driver + +(defclass marshal-driver-plist (marshal-driver) + ()) + +(defmethod marshal-write ((obj marshal-driver-plist) path value) + (call-next-method) + (oset obj :output (plist-put (oref obj :output) path value))) + +(defmethod marshal-read ((obj marshal-driver-plist) path) + (call-next-method) + (plist-get (oref obj :input) path)) + +;;; helper functions + +(defun marshal--alist-add (alist key value &optional append) + (let ((existing (assoc key alist))) + (if (not existing) + (cons (cons key value) alist) + (setcdr existing (if append + (append (cdr existing) value) + value)) + alist))) + +(defun marshal--alist-merge (alist1 alist2 &optional append) + (let ((res alist1)) + (if alist2 + (let* ((pair (car alist2)) + (x (car pair)) + (y (cdr pair))) + (marshal--alist-merge + (marshal--alist-add alist1 x y append) + (cdr alist2))) + alist1))) + +(defun marshal--transpose-alist2 (l) + (let (res + (rows l)) + (while rows + (let* ((row (car rows)) + (x (car row)) + (cols (cdr row))) + (while cols + (let* ((col (car cols)) + (y (car col)) + (z (cdr col)) + (target (or (assoc y res) + (let ((p (cons y nil))) + (setq res (push p res)) + p)))) + (setcdr target (cons (cons x z) (cdr target)))) + (setq cols (cdr cols)))) + (setq rows (cdr rows))) + res)) + +;;; base-class for serializable objects + +(defclass marshal-base () + ((-marshal-info :allocation :class :initform nil :protection :protected) + (-type-info :allocation :class :initform nil :protection :protected))) + +(defmethod marshal-get-marshal-info :static ((obj marshal-base)) + nil) + +(defmethod marshal-get-type-info :static ((obj marshal-base)) + nil) + +(defun marshal-get-driver (type) + (let ((cls (or (and (class-p type) type) + (cdr (assoc type marshal-drivers)) + 'marshal-driver))) + (make-instance cls))) + +(defmethod marshal-internal ((obj marshal-base) type &optional hint) + (let* ((type (or (and (class-p type) + (car (rassoc type marshal-drivers))) + type)) + (driver (marshal-get-driver type)) + (marshal-info (cdr (assoc type (marshal-get-marshal-info obj))))) + (marshal-open driver) + (when marshal-info + (dolist (s (object-slots obj)) + (let ((path (cdr (assoc s marshal-info)))) + (when (and path + (slot-boundp obj s)) + + (marshal-write driver path + (marshal-internal + (eieio-oref obj s) + type + (cdr (assoc s (marshal-get-type-info obj))))))))) + (marshal-close driver))) + +(defmethod marshal-internal ((obj nil) type &optional hint) + (let ((driver (marshal-get-driver type))) + (cond ((and (null hint) (null obj)) + (marshal-marshal-null driver)) + ((or (eq obj t) + (and (null obj) (eq hint 'bool))) + (marshal-marshal-bool driver obj)) + ((stringp obj) + (marshal-marshal-string driver obj)) + ((numberp obj) + (marshal-marshal-number driver obj)) + ((listp obj) + (marshal-marshal-list driver obj)) + ((ht? obj) + (marshal-marshal-hash driver obj))))) + +;;;###autoload +(defun marshal (obj type) + (let ((driver (marshal-get-driver type))) + (marshal-postprocess driver + (marshal-internal obj type)))) + +(defmethod unmarshal--obj ((obj marshal-base) blob type) + (let ((driver (marshal-get-driver type)) + (marshal-info (cdr (assoc type (marshal-get-marshal-info obj))))) + (marshal-open driver blob) + (when (and marshal-info blob) + (dolist (s (object-slots obj)) + (let ((path (cdr (assoc s marshal-info)))) + (when path + (eieio-oset obj s + (unmarshal-internal + (cdr (assoc s (marshal-get-type-info obj))) + (marshal-read driver path) + type)))))) + (marshal-close driver) + obj)) + +(defun unmarshal-internal (obj blob type) + (let ((obj (if (class-p obj) + (make-instance obj) + obj))) + (unmarshal--internal obj blob type))) + +(defmethod unmarshal--internal ((obj nil) blob type) + (let* ((driver (marshal-get-driver type)) + (obj (or obj (marshal-guess-type driver blob)))) + (cond ((or (null obj) (null blob)) + (marshal-unmarshal-null driver)) + ((eq obj 'bool) + (marshal-unmarshal-bool driver blob)) + ((eq obj 'string) + (marshal-unmarshal-string driver blob)) + ((memq obj '(number integer)) + (marshal-unmarshal-number driver blob)) + ((or (eq obj 'list) + (and (consp obj) (eq (car obj) 'list))) + (marshal-unmarshal-list driver blob obj)) + ((or (eq obj 'hash) + (and (consp obj) (eq (car obj) 'hash))) + (marshal-unmarshal-hash driver blob obj))))) + +(defmethod unmarshal--internal ((obj marshal-base) blob type) + (let ((type (or (and (class-p type) + (car (rassoc type marshal-drivers))) + type))) + (unmarshal--obj obj blob type))) + +;;;###autoload +(defun unmarshal (obj blob type) + (let ((driver (marshal-get-driver type))) + (unmarshal-internal obj (marshal-preprocess driver blob) type))) + +;;;###autoload +(defmacro marshal-defclass (name superclass slots &rest options-and-doc) + (declare (debug t) (indent 2)) + (let* ((options (if (stringp (car options-and-doc)) + (cdr options-and-doc) + options-and-doc)) + (default-spec-func (or (plist-get options :marshal-default-spec) + 'ignore)) + (base-cls (or (plist-get options :marshal-base-cls) + 'marshal-base)) + (marshal-info (marshal--transpose-alist2 + (remove nil + (mapcar + (lambda (s) + (let ((name (car s))) + (let ((marshal + (or (plist-get (cdr s) :marshal) + (funcall default-spec-func name)))) + (when marshal + (cons name + (mapcar + (lambda (p) + (if (consp p) + p + (cons p name))) + marshal)))))) + slots)))) + (type-info (remove nil + (mapcar (lambda (s) + (let ((name (car s))) + (let ((type (or (plist-get (cdr s) :marshal-type) + (plist-get (cdr s) :type)))) + (when type + (cons name type))))) + slots)))) + `(progn + (defclass ,name (,@superclass ,base-cls) + (,@slots) + ,@options-and-doc) + + (defmethod marshal-get-marshal-info :static ((obj ,name)) + (let ((cls (if (eieio-object-p obj) + (eieio-object-class obj) + obj))) + (get cls :marshal-info))) + + (put ',name :marshal-info ',marshal-info) + (dolist (cls ',superclass) + (put ',name :marshal-info + (marshal--alist-merge (get ',name :marshal-info) + (marshal-get-marshal-info cls) t))) + + (defmethod marshal-get-type-info :static ((obj ,name)) + (let ((cls (if (eieio-object-p obj) + (eieio-object-class obj) + obj))) + (get cls :type-info))) + + (put ',name :type-info ',type-info) + (dolist (cls ',superclass) + (put ',name :type-info + (marshal--alist-merge (get ',name :type-info) + (marshal-get-type-info cls) t))) + + ,name))) + +;;; Default drivers +(marshal-register-driver 'alist 'marshal-driver-alist) +(marshal-register-driver 'plist 'marshal-driver-plist) +(marshal-register-driver 'json 'marshal-driver-json) + +(provide 'marshal) +;;; marshal.el ends here diff --git a/elpa/pcache-20160624.736/pcache-pkg.el b/elpa/pcache-20160624.736/pcache-pkg.el deleted file mode 100644 index 2b46aa9..0000000 --- a/elpa/pcache-20160624.736/pcache-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "pcache" "20160624.736" "persistent caching for Emacs." '((eieio "1.3"))) diff --git a/elpa/pcache-20160624.736/pcache-autoloads.el b/elpa/pcache-20160724.1929/pcache-autoloads.el similarity index 58% rename from elpa/pcache-20160624.736/pcache-autoloads.el rename to elpa/pcache-20160724.1929/pcache-autoloads.el index ccfe73e..42444f9 100644 --- a/elpa/pcache-20160624.736/pcache-autoloads.el +++ b/elpa/pcache-20160724.1929/pcache-autoloads.el @@ -1,9 +1,9 @@ ;;; pcache-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil nil ("pcache.el") (22387 29356 175133 516000)) +;;;### (autoloads nil nil ("pcache.el") (22454 5302 309786 624000)) ;;;*** diff --git a/elpa/pcache-20160724.1929/pcache-pkg.el b/elpa/pcache-20160724.1929/pcache-pkg.el new file mode 100644 index 0000000..83962f4 --- /dev/null +++ b/elpa/pcache-20160724.1929/pcache-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "pcache" "20160724.1929" "persistent caching for Emacs." '((eieio "1.3"))) diff --git a/elpa/pcache-20160624.736/pcache.el b/elpa/pcache-20160724.1929/pcache.el similarity index 97% rename from elpa/pcache-20160624.736/pcache.el rename to elpa/pcache-20160724.1929/pcache.el index bf867a3..6643a6c 100644 --- a/elpa/pcache-20160624.736/pcache.el +++ b/elpa/pcache-20160724.1929/pcache.el @@ -4,8 +4,8 @@ ;; Author: Yann Hodique ;; Keywords: -;; Package-Version: 20160624.736 -;; Version: 0.4.0 +;; Package-Version: 20160724.1929 +;; Version: 0.4.1 ;; Package-Requires: ((eieio "1.3")) ;; This file is free software; you can redistribute it and/or modify @@ -67,7 +67,10 @@ (defconst pcache-default-save-delay 300) -(defconst pcache-version-constant "0.4") +(defconst pcache-internal-version-constant "0.4") + +(defconst pcache-version-constant + (format "%s/%s" emacs-version pcache-internal-version-constant)) (defclass pcache-repository (eieio-persistent eieio-named) ((version :initarg :version :initform nil) diff --git a/elpa/projectile-20160711.143/projectile-pkg.el b/elpa/projectile-20160711.143/projectile-pkg.el deleted file mode 100644 index 0132b22..0000000 --- a/elpa/projectile-20160711.143/projectile-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "projectile" "20160711.143" "Manage and navigate projects in Emacs easily" '((dash "2.11.0") (pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience")) diff --git a/elpa/projectile-20160711.143/projectile-autoloads.el b/elpa/projectile-20160728.52/projectile-autoloads.el similarity index 98% rename from elpa/projectile-20160711.143/projectile-autoloads.el rename to elpa/projectile-20160728.52/projectile-autoloads.el index c407eac..1341476 100644 --- a/elpa/projectile-20160711.143/projectile-autoloads.el +++ b/elpa/projectile-20160728.52/projectile-autoloads.el @@ -1,10 +1,10 @@ ;;; projectile-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "projectile" "projectile.el" (22404 60195 637515 -;;;;;; 28000)) +;;;### (autoloads nil "projectile" "projectile.el" (22454 5300 957754 +;;;;;; 833000)) ;;; Generated autoloads from projectile.el (autoload 'projectile-version "projectile" "\ @@ -425,7 +425,8 @@ Otherwise behave as if called interactively. (defvar projectile-global-mode nil "\ Non-nil if Projectile-Global mode is enabled. -See the command `projectile-global-mode' for a description of this minor mode. +See the `projectile-global-mode' command +for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `projectile-global-mode'.") diff --git a/elpa/projectile-20160728.52/projectile-pkg.el b/elpa/projectile-20160728.52/projectile-pkg.el new file mode 100644 index 0000000..c22c65e --- /dev/null +++ b/elpa/projectile-20160728.52/projectile-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "projectile" "20160728.52" "Manage and navigate projects in Emacs easily" '((dash "2.11.0") (pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience")) diff --git a/elpa/projectile-20160711.143/projectile.el b/elpa/projectile-20160728.52/projectile.el similarity index 99% rename from elpa/projectile-20160711.143/projectile.el rename to elpa/projectile-20160728.52/projectile.el index 7f596f9..6277a2d 100644 --- a/elpa/projectile-20160711.143/projectile.el +++ b/elpa/projectile-20160728.52/projectile.el @@ -4,7 +4,7 @@ ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/projectile -;; Package-Version: 20160711.143 +;; Package-Version: 20160728.52 ;; Keywords: project, convenience ;; Version: 0.14.0 ;; Package-Requires: ((dash "2.11.0") (pkg-info "0.4")) @@ -1615,6 +1615,8 @@ With FLEX-MATCHING, match any file that contains the base name of current file" (concat "\." (file-name-extension project-file)))))) candidates)) file-list))) + (candidates + (-filter (lambda (file) (not (backup-file-name-p file))) candidates)) (candidates (-sort (lambda (file _) (let ((candidate-dirname (file-name-nondirectory (directory-file-name (file-name-directory file))))) @@ -1845,6 +1847,22 @@ a COMPILE-CMD, a TEST-CMD, and a RUN-CMD." 'run-command run-cmd) projectile-project-types)) +(defun projectile-cabal () + "Check if a project contains *.cabal files but no stack.yaml file." + (and (projectile-verify-file "*.cabal") + (not (projectile-verify-file "stack.yaml")))) + +(defun projectile-go () + "Check if a project contains Go source files." + (-any? (lambda (file) + (string= (file-name-extension file) "go")) + (projectile-current-project-files))) + +(defcustom projectile-go-function 'projectile-go + "Function to determine if project's type is go." + :group 'projectile + :type 'function) + (projectile-register-project-type 'emacs-cask '("Cask") "cask install") (projectile-register-project-type 'rails-rspec '("Gemfile" "app" "lib" "db" "config" "spec") "bundle exec rails server" "bundle exec rspec") (projectile-register-project-type 'rails-test '("Gemfile" "app" "lib" "db" "config" "test") "bundle exec rails server" "bundle exec rake test") @@ -1872,26 +1890,10 @@ a COMPILE-CMD, a TEST-CMD, and a RUN-CMD." (projectile-register-project-type 'haskell-cabal #'projectile-cabal "cabal build" "cabal test") (projectile-register-project-type 'rust-cargo '("Cargo.toml") "cargo build" "cargo test") (projectile-register-project-type 'r '("DESCRIPTION") "R CMD INSTALL --with-keep.source ." (concat "R CMD check -o " temporary-file-directory " .")) -(projectile-register-project-type 'go #'projectile-go "go build ./..." "go test ./...") +(projectile-register-project-type 'go projectile-go-function "go build ./..." "go test ./...") (projectile-register-project-type 'racket '("info.rkt") nil "raco test .") (projectile-register-project-type 'elixir '("mix.exs") "mix compile" "mix test") -(defun projectile-cabal () - "Check if a project contains *.cabal files but no stack.yaml file." - (and (projectile-verify-file "*.cabal") - (not (projectile-verify-file "stack.yaml")))) - -(defun projectile-go () - "Check if a project contains Go source files." - (-any? (lambda (file) - (string= (file-name-extension file) "go")) - (projectile-current-project-files))) - -(defcustom projectile-go-function 'projectile-go - "Function to determine if project's type is go." - :group 'projectile - :type 'function) - (defvar-local projectile-project-type nil "Buffer local var for overriding the auto-detected project type. Normally you'd set this from .dir-locals.el.") @@ -1942,13 +1944,15 @@ PROJECT-ROOT is the targeted directory. If nil, use (cond ((projectile-file-exists-p (expand-file-name ".git" project-root)) 'git) ((projectile-file-exists-p (expand-file-name ".hg" project-root)) 'hg) - ((projectile-file-exists-p (expand-file-name ".fossil" project-root)) 'fossil) + ((projectile-file-exists-p (expand-file-name ".fslckout" project-root)) 'fossil) + ((projectile-file-exists-p (expand-file-name "_FOSSIL_" project-root)) 'fossil) ((projectile-file-exists-p (expand-file-name ".bzr" project-root)) 'bzr) ((projectile-file-exists-p (expand-file-name "_darcs" project-root)) 'darcs) ((projectile-file-exists-p (expand-file-name ".svn" project-root)) 'svn) ((projectile-locate-dominating-file project-root ".git") 'git) ((projectile-locate-dominating-file project-root ".hg") 'hg) - ((projectile-locate-dominating-file project-root ".fossil") 'fossil) + ((projectile-locate-dominating-file project-root ".fslckout") 'fossil) + ((projectile-locate-dominating-file project-root "_FOSSIL_") 'fossil) ((projectile-locate-dominating-file project-root ".bzr") 'bzr) ((projectile-locate-dominating-file project-root "_darcs") 'darcs) ((projectile-locate-dominating-file project-root ".svn") 'svn) @@ -2197,7 +2201,7 @@ regular expression." "Regenerate the project's [e|g]tags." (interactive) (if (and (boundp 'ggtags-mode) - (memq projectile-tags-backend '(auto ggtags))) + (memq projectile-tags-backend '(auto ggtags))) (progn (let* ((ggtags-project-root (projectile-project-root)) (default-directory ggtags-project-root)) @@ -2230,20 +2234,20 @@ regular expression." (defun projectile-determine-find-tag-fn () "Determine which function to use for a call to `projectile-find-tag'." (cond - ((eq projectile-tags-backend 'auto) - (cond - ((fboundp 'ggtags-find-tag-dwim) - 'ggtags-find-tag-dwim) - ((fboundp 'etags-select-find-tag) - 'etags-select-find-tag) - (t 'find-tag))) - ((eq projectile-tags-backend 'ggtags) - (if (fboundp 'ggtags-find-tag-dwim) + ((eq projectile-tags-backend 'auto) + (cond + ((fboundp 'ggtags-find-tag-dwim) + 'ggtags-find-tag-dwim) + ((fboundp 'etags-select-find-tag) + 'etags-select-find-tag) + (t 'find-tag))) + ((eq projectile-tags-backend 'ggtags) + (if (fboundp 'ggtags-find-tag-dwim) 'ggtags-find-tag-dwim 'find-tag)) - ((eq projectile-tags-backend 'etags-select) - (if (fboundp 'etags-select-find-tag) + ((eq projectile-tags-backend 'etags-select) + (if (fboundp 'etags-select-find-tag) 'etags-select-find-tag 'find-tag)) - (t 'find-tag))) + (t 'find-tag))) ;;;###autoload (defun projectile-find-tag () @@ -2293,8 +2297,8 @@ regular expression." "Invoke `eshell' in the project's root." (interactive) (let ((eshell-buffer-name (concat "*eshell " (projectile-project-name) "*"))) - (projectile-with-default-dir (projectile-project-root) - (eshell)))) + (projectile-with-default-dir (projectile-project-root) + (eshell)))) ;;;###autoload (defun projectile-run-term (program) @@ -2885,7 +2889,7 @@ overwriting each other's changes." (projectile-save-known-projects))) (define-ibuffer-filter projectile-files - "Show Ibuffer with all buffers in the current project." + "Show Ibuffer with all buffers in the current project." (:reader (read-directory-name "Project root: " (ignore-errors (projectile-project-root))) :description nil) (with-current-buffer buf diff --git a/elpa/with-editor-20160408.201/dir b/elpa/with-editor-20160812.1457/dir similarity index 100% rename from elpa/with-editor-20160408.201/dir rename to elpa/with-editor-20160812.1457/dir diff --git a/elpa/with-editor-20160408.201/with-editor-autoloads.el b/elpa/with-editor-20160812.1457/with-editor-autoloads.el similarity index 69% rename from elpa/with-editor-20160408.201/with-editor-autoloads.el rename to elpa/with-editor-20160812.1457/with-editor-autoloads.el index 687a8b8..0729892 100644 --- a/elpa/with-editor-20160408.201/with-editor-autoloads.el +++ b/elpa/with-editor-20160812.1457/with-editor-autoloads.el @@ -1,10 +1,10 @@ ;;; with-editor-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) ;;;### (autoloads nil nil ("with-editor-pkg.el" "with-editor.el") -;;;;;; (22297 19795 743896 240000)) +;;;;;; (22454 5299 791727 417000)) ;;;*** diff --git a/elpa/with-editor-20160408.201/with-editor-pkg.el b/elpa/with-editor-20160812.1457/with-editor-pkg.el similarity index 69% rename from elpa/with-editor-20160408.201/with-editor-pkg.el rename to elpa/with-editor-20160812.1457/with-editor-pkg.el index 61c871a..50a056a 100644 --- a/elpa/with-editor-20160408.201/with-editor-pkg.el +++ b/elpa/with-editor-20160812.1457/with-editor-pkg.el @@ -1,4 +1,4 @@ -(define-package "with-editor" "20160408.201" "Use the Emacsclient as $EDITOR" +(define-package "with-editor" "20160812.1457" "Use the Emacsclient as $EDITOR" '((emacs "24.4") (async "1.5") (dash "2.12.1")) diff --git a/elpa/with-editor-20160408.201/with-editor.el b/elpa/with-editor-20160812.1457/with-editor.el similarity index 92% rename from elpa/with-editor-20160408.201/with-editor.el rename to elpa/with-editor-20160812.1457/with-editor.el index 459b1c8..423db88 100644 --- a/elpa/with-editor-20160408.201/with-editor.el +++ b/elpa/with-editor-20160812.1457/with-editor.el @@ -61,7 +61,7 @@ ;; appropriate mode hooks: ;; ;; (add-hook 'shell-mode-hook 'with-editor-export-editor) -;; (add-hook 'term-mode-hook 'with-editor-export-editor) +;; (add-hook 'term-exec-hook 'with-editor-export-editor) ;; (add-hook 'eshell-mode-hook 'with-editor-export-editor) ;; Some variants of this function exist, these two forms are @@ -184,7 +184,27 @@ Where the latter uses a socket to communicate with Emacs' server, this substitute prints edit requests to its standard output on which a process filter listens for such requests. As such it is not a complete substitute for a proper Emacsclient, it can only -be used as $EDITOR of child process of the current Emacs instance." +be used as $EDITOR of child process of the current Emacs instance. + +Some shells do not execute traps immediately when waiting for a +child process, but by default we do use such a blocking child +process. + +If you use such a shell (e.g. `csh' on FreeBSD, but not Debian), +then you have to edit this option. You can either replace \"sh\" +with \"bash\" (and install that), or you can use the older, less +performant implementation: + + \"sh -c '\\ + echo \\\"WITH-EDITOR: $$ OPEN $0\\\"; \\ + trap \\\"exit 0\\\" USR1; \\ + trap \\\"exit 1\" USR2; \\ + while true; do sleep 1; done'\" + +Note that this leads to a delay of up to a second. The delay can +be shortened by replacing \"sleep 1\" with \"sleep 0.01\", or if your +implementation does not support floats, then by using `nanosleep' +instead." :group 'with-editor :type 'string) @@ -637,27 +657,34 @@ else like the former." (defun shell-command--shell-command-with-editor-mode (fn command &optional output-buffer error-buffer) - (cond ((or (not (or with-editor--envvar shell-command-with-editor-mode)) - (not (string-match-p "&\\'" command))) - (funcall fn command output-buffer error-buffer)) - ((and with-editor-emacsclient-executable - (not (file-remote-p default-directory))) - (with-editor (funcall fn command output-buffer error-buffer))) - (t - (apply fn (format "%s=%s %s" - (or with-editor--envvar "EDITOR") - (shell-quote-argument with-editor-sleeping-editor) - command) - output-buffer error-buffer) - (ignore-errors - (let ((process (get-buffer-process - (or output-buffer - (get-buffer "*Async Shell Command*"))))) - (set-process-filter - process (lambda (proc str) - (comint-output-filter proc str) - (with-editor-process-filter proc str t))) - process))))) + ;; `shell-mode' and its hook are intended for buffers in which an + ;; interactive shell is running, but `shell-command' also turns on + ;; that mode, even though it only runs the shell to run a single + ;; command. The `with-editor-export-editor' hook function is only + ;; intended to be used in buffers in which an interactive shell is + ;; running, so it has to be remove here. + (let ((shell-mode-hook (remove 'with-editor-export-editor shell-mode-hook))) + (cond ((or (not (or with-editor--envvar shell-command-with-editor-mode)) + (not (string-match-p "&\\'" command))) + (funcall fn command output-buffer error-buffer)) + ((and with-editor-emacsclient-executable + (not (file-remote-p default-directory))) + (with-editor (funcall fn command output-buffer error-buffer))) + (t + (apply fn (format "%s=%s %s" + (or with-editor--envvar "EDITOR") + (shell-quote-argument with-editor-sleeping-editor) + command) + output-buffer error-buffer) + (ignore-errors + (let ((process (get-buffer-process + (or output-buffer + (get-buffer "*Async Shell Command*"))))) + (set-process-filter + process (lambda (proc str) + (comint-output-filter proc str) + (with-editor-process-filter proc str t))) + process)))))) (advice-add 'shell-command :around 'shell-command--shell-command-with-editor-mode) diff --git a/elpa/with-editor-20160408.201/with-editor.info b/elpa/with-editor-20160812.1457/with-editor.info similarity index 93% rename from elpa/with-editor-20160408.201/with-editor.info rename to elpa/with-editor-20160812.1457/with-editor.info index 22ccef1..b087166 100644 --- a/elpa/with-editor-20160408.201/with-editor.info +++ b/elpa/with-editor-20160812.1457/with-editor.info @@ -171,7 +171,25 @@ it receives a signal. not a complete substitute for a proper Emacsclient, it can only be used as ‘$EDITOR’ of child process of the current Emacs instance. - It is unlikely that you should ever have to customize this option. + Some shells do not execute traps immediately when waiting for a + child process, but by default we do use such a blocking child + process. + + If you use such a shell (e.g. ‘csh’ on FreeBSD, but not Debian), + then you have to edit this option. You can either replace ‘sh’ + with ‘bash’ (and install that), or you can use the older, less + performant implementation: + + "sh -c '\ + echo \"WITH-EDITOR: $$ OPEN $0\"; \ + trap \"exit 0\" USR1; \ + trap \"exit 1\" USR2; \ + while true; do sleep 1; done'" + + This leads to a delay of up to a second. The delay can be + shortened by replacing ‘sleep 1’ with ‘sleep 0.01’, or if your + implementation does not support floats, then by using ‘nanosleep + 0.01’ instead.  File: with-editor.info, Node: Using With-Editor commands, Prev: Configuring With-Editor, Up: Using the With-Editor package @@ -225,7 +243,7 @@ needs the editor set, or always arrange for the current Emacs instance to be used as editor by adding it to the appropriate mode hooks: (add-hook 'shell-mode-hook 'with-editor-export-editor) - (add-hook 'term-mode-hook 'with-editor-export-editor) + (add-hook 'term-exec-hook 'with-editor-export-editor) (add-hook 'eshell-mode-hook 'with-editor-export-editor) Some variants of this function exist; these two forms are equivalent: @@ -310,9 +328,9 @@ Tag Table: Node: Top1545 Node: Using the With-Editor package3236 Node: Configuring With-Editor3852 -Node: Using With-Editor commands7459 -Node: Using With-Editor as a library10622 -Node: Debugging12294 +Node: Using With-Editor commands8201 +Node: Using With-Editor as a library11364 +Node: Debugging13036  End Tag Table diff --git a/init.el b/init.el index ff8eb32..14c12c4 100644 --- a/init.el +++ b/init.el @@ -1,3 +1,5 @@ +(package-initialize) + (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -38,6 +40,9 @@ (("gnu" . "http://elpa.gnu.org/packages/") ("melpa" . "https://melpa.org/packages/") ("e6h" . "http://www.e6h.org/packages/")))) + '(package-selected-packages + (quote + (yaml-mode xlicense wakatime-mode vala-mode sass-mode nyan-mode muse minimap markdown-mode mark magit-gh-pulls magit-gerrit json-mode js2-mode jinja2-mode helm-make helm-gtags helm-flyspell helm-ag go-mode gitignore-mode gitconfig-mode git-gutter ggtags fiplr erlang django-mode company-shell company-quickhelp company-c-headers coffee-mode buffer-move ag))) '(safe-local-variable-values (quote ((company-clang-arguments "-I.." "-I/home/polesz/jhbuild/install/include/atk-1.0" "-I/home/polesz/jhbuild/install/include/at-spi-2.0" "-I/home/polesz/jhbuild/install/include/at-spi2-atk/2.0" "-I/home/polesz/jhbuild/install/include/cairo" "-I/home/polesz/jhbuild/install/include/gdk-pixbuf-2.0" "-I/home/polesz/jhbuild/install/include/gio-unix-2.0/" "-I/home/polesz/jhbuild/install/include/glib-2.0" "-I/home/polesz/jhbuild/install/include/gtk-3.0" "-I/home/polesz/jhbuild/install/include/harfbuzz" "-I/home/polesz/jhbuild/install/include/libgda-5.0" "-I/home/polesz/jhbuild/install/include/libgda-5.0/libgda" "-I/home/polesz/jhbuild/install/include/librsvg-2.0" "-I/home/polesz/jhbuild/install/include/libsoup-2.4" "-I/home/polesz/jhbuild/install/include/pango-1.0" "-I/home/polesz/jhbuild/install/include/swe-glib" "-I/home/polesz/jhbuild/install/include/webkitgtk-4.0" "-I/home/polesz/jhbuild/install/lib/glib-2.0/include" "-I/usr/include/dbus-1.0" "-I/usr/include/freetype2" "-I/usr/include/libdrm" "-I/usr/include/libpng16" "-I/usr/include/libxml2" "-I/usr/include/pixman-1" "-I/usr/lib64/dbus-1.0/include")