diff --git a/elpa/ag-20160321.1606/ag-autoloads.el b/elpa/ag-20160702.1128/ag-autoloads.el similarity index 85% rename from elpa/ag-20160321.1606/ag-autoloads.el rename to elpa/ag-20160702.1128/ag-autoloads.el index 2e7e6ec..15cce1d 100644 --- a/elpa/ag-20160321.1606/ag-autoloads.el +++ b/elpa/ag-20160702.1128/ag-autoloads.el @@ -3,11 +3,11 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "ag" "ag.el" (22297 19677 174516 738000)) +;;;### (autoloads nil "ag" "ag.el" (22404 60275 653932 131000)) ;;; Generated autoloads from ag.el (autoload 'ag "ag" "\ -Search using ag in a given DIRECTORY for a given search STRING, +Search using ag in a given DIRECTORY for a given literal search STRING, with STRING defaulting to the symbol under point. If called with a prefix, prompts for flags to pass to ag. @@ -15,9 +15,9 @@ If called with a prefix, prompts for flags to pass to ag. \(fn STRING DIRECTORY)" t nil) (autoload 'ag-files "ag" "\ -Search using ag in a given DIRECTORY for a given search STRING, -limited to files that match FILE-TYPE. STRING defaults to -the symbol under point. +Search using ag in a given DIRECTORY for a given literal search STRING, +limited to files that match FILE-TYPE. STRING defaults to the +symbol under point. If called with a prefix, prompts for flags to pass to ag. @@ -33,14 +33,14 @@ If called with a prefix, prompts for flags to pass to ag. (autoload 'ag-project "ag" "\ Guess the root of the current project and search it with ag -for the given string. +for the given literal search STRING. If called with a prefix, prompts for flags to pass to ag. \(fn STRING)" t nil) (autoload 'ag-project-files "ag" "\ -Search using ag for a given search STRING, +Search using ag for a given literal search STRING, limited to files that match FILE-TYPE. STRING defaults to the symbol under point. @@ -62,7 +62,7 @@ If called with a prefix, prompts for flags to pass to ag. (defalias 'ag-regexp-project-at-point 'ag-project-regexp) (autoload 'ag-dired "ag" "\ -Recursively find files in DIR matching PATTERN. +Recursively find files in DIR matching literal search STRING. The PATTERN is matched against the full path to the file, not only against the file name. @@ -72,7 +72,7 @@ The results are presented as a `dired-mode' buffer with See also `ag-dired-regexp'. -\(fn DIR PATTERN)" t nil) +\(fn DIR STRING)" t nil) (autoload 'ag-dired-regexp "ag" "\ Recursively find files in DIR matching REGEXP. diff --git a/elpa/ag-20160321.1606/ag-pkg.el b/elpa/ag-20160702.1128/ag-pkg.el similarity index 57% rename from elpa/ag-20160321.1606/ag-pkg.el rename to elpa/ag-20160702.1128/ag-pkg.el index 5865126..13a6df9 100644 --- a/elpa/ag-20160321.1606/ag-pkg.el +++ b/elpa/ag-20160702.1128/ag-pkg.el @@ -1 +1 @@ -(define-package "ag" "20160321.1606" "A front-end for ag ('the silver searcher'), the C ack replacement." '((dash "2.8.0") (s "1.9.0") (cl-lib "0.5"))) +(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-20160321.1606/ag.el b/elpa/ag-20160702.1128/ag.el similarity index 84% rename from elpa/ag-20160321.1606/ag.el rename to elpa/ag-20160702.1128/ag.el index ae7b661..51bf380 100644 --- a/elpa/ag-20160321.1606/ag.el +++ b/elpa/ag-20160702.1128/ag.el @@ -5,7 +5,7 @@ ;; Author: Wilfred Hughes ;; Created: 11 January 2013 ;; Version: 0.48 -;; Package-Version: 20160321.1606 +;; Package-Version: 20160702.1128 ;; Package-Requires: ((dash "2.8.0") (s "1.9.0") (cl-lib "0.5")) ;;; Commentary: @@ -39,6 +39,11 @@ (require 's) (require 'find-dired) ;; find-dired-filter +(defgroup ag nil + "A front-end for ag - The Silver Searcher." + :group 'tools + :group 'matching) + (defcustom ag-executable "ag" "Name of the ag executable to use." @@ -46,17 +51,30 @@ :group 'ag) (defcustom ag-arguments - (list "--line-number" "--smart-case" "--nogroup" "--column" "--stats" "--") - "Default arguments passed to ag. + (list "--smart-case" "--stats") + "Additional arguments passed to ag. -Ag.el requires --nogroup and --column, so we recommend you add any -additional arguments to the start of this list. +Ag.el internally uses --column, --line-number and --color +options (with specific colors) to match groups, so options +specified here should not conflict. --line-number is required on Windows, as otherwise ag will not print line numbers when the input is a stream." :type '(repeat (string)) :group 'ag) +(defcustom ag-context-lines nil + "Number of context lines to include before and after a matching line." + :type 'integer + :group 'ag) + +(defcustom ag-group-matches t + "Group matches in the same file together. + +If nil, the file name is repeated at the beginning of every match line." + :type 'boolean + :group 'ag) + (defcustom ag-highlight-search nil "Non-nil means we highlight the current search term in results. @@ -90,7 +108,7 @@ If set to nil, fall back to finding VCS root directories." :group 'ag) (defcustom ag-ignore-list nil - "A list of patterns to ignore when searching." + "A list of patterns for files/directories to ignore when searching." :type '(repeat (string)) :group 'ag) @@ -140,16 +158,29 @@ different window, according to `ag-reuse-window'." ;; handle weird file names (with colons in them) as well as possible. ;; E.g. we use [1-9][0-9]* rather than [0-9]+ so as to accept ":034:" ;; in file names. -(defvar ag/file-column-pattern +(defvar ag/file-column-pattern-nogroup "^\\(.+?\\):\\([1-9][0-9]*\\):\\([1-9][0-9]*\\):" "A regexp pattern that groups output into filename, line number and column number.") +(defvar ag/file-column-pattern-group + "^\\([[:digit:]]+\\):\\([[:digit:]]+\\):" + "A regexp pattern to match line number and column number with grouped output.") + +(defun ag/compilation-match-grouped-filename () + "Match filename backwards when a line/column match is found in grouped output mode." + (save-match-data + (save-excursion + (when (re-search-backward "^File: \\(.*\\)$" (point-min) t) + (list (match-string 1)))))) + (define-compilation-mode ag-mode "Ag" "Ag results compilation mode" (set (make-local-variable 'compilation-error-regexp-alist) - (list 'compilation-ag-nogroup)) + '(compilation-ag-nogroup compilation-ag-group)) (set (make-local-variable 'compilation-error-regexp-alist-alist) - (list (cons 'compilation-ag-nogroup (list ag/file-column-pattern 1 2 3)))) + (list (cons 'compilation-ag-nogroup (list ag/file-column-pattern-nogroup 1 2 3)) + (cons 'compilation-ag-group (list ag/file-column-pattern-group + 'ag/compilation-match-grouped-filename 1 2)))) (set (make-local-variable 'compilation-error-face) 'ag-hit-face) (set (make-local-variable 'next-error-function) #'ag/next-error-function) (set (make-local-variable 'compilation-finish-functions) @@ -158,7 +189,7 @@ different window, according to `ag-reuse-window'." (define-key ag-mode-map (kbd "p") #'compilation-previous-error) (define-key ag-mode-map (kbd "n") #'compilation-next-error) -(define-key ag-mode-map (kbd "k") '(lambda () (interactive) +(define-key ag-mode-map (kbd "k") '(lambda () (interactive) (let (kill-buffer-query-functions) (kill-buffer)))) (defun ag/buffer-name (search-string directory regexp) @@ -180,24 +211,30 @@ If REGEXP is non-nil, treat STRING as a regular expression." (let ((default-directory (file-name-as-directory directory)) (arguments ag-arguments) (shell-command-switch "-c")) + ;; Add double dashes at the end of command line if not specified in + ;; ag-arguments. + (unless (equal (car (last arguments)) "--") + (setq arguments (append arguments '("--")))) + (setq arguments + (append '("--line-number" "--column" "--color" "--color-match" "30;43" + "--color-path" "1;32") + arguments)) + (if ag-group-matches + (setq arguments (cons "--group" arguments)) + (setq arguments (cons "--nogroup" arguments))) (unless regexp (setq arguments (cons "--literal" arguments))) - (if ag-highlight-search - ;; We're highlighting, so pass additional arguments for - ;; highlighting the current search term using shell escape - ;; sequences. - (setq arguments (append '("--color" "--color-match" "30;43") arguments)) - ;; We're not highlighting. - (if (eq system-type 'windows-nt) - ;; Use --vimgrep to work around issue #97 on Windows. - (setq arguments (append '("--vimgrep") arguments)) - (setq arguments (append '("--nocolor") arguments)))) + (when (eq system-type 'windows-nt) + ;; Use --vimgrep to work around issue #97 on Windows. + (setq arguments (cons "--vimgrep" arguments))) (when (char-or-string-p file-regex) (setq arguments (append `("--file-search-regex" ,file-regex) arguments))) (when file-type (setq arguments (cons (format "--%s" file-type) arguments))) - (when (integerp current-prefix-arg) - (setq arguments (cons (format "--context=%d" (abs current-prefix-arg)) arguments))) + (if (integerp current-prefix-arg) + (setq arguments (cons (format "--context=%d" (abs current-prefix-arg)) arguments)) + (when ag-context-lines + (setq arguments (cons (format "--context=%d" ag-context-lines) arguments)))) (when ag-ignore-list (setq arguments (append (ag/format-ignore ag-ignore-list) arguments))) (unless (file-exists-p default-directory) @@ -385,7 +422,7 @@ matched literally." ;;;###autoload (defun ag (string directory) - "Search using ag in a given DIRECTORY for a given search STRING, + "Search using ag in a given DIRECTORY for a given literal search STRING, with STRING defaulting to the symbol under point. If called with a prefix, prompts for flags to pass to ag." @@ -395,9 +432,9 @@ If called with a prefix, prompts for flags to pass to ag." ;;;###autoload (defun ag-files (string file-type directory) - "Search using ag in a given DIRECTORY for a given search STRING, -limited to files that match FILE-TYPE. STRING defaults to -the symbol under point. + "Search using ag in a given DIRECTORY for a given literal search STRING, +limited to files that match FILE-TYPE. STRING defaults to the +symbol under point. If called with a prefix, prompts for flags to pass to ag." (interactive (list (ag/read-from-minibuffer "Search string") @@ -417,7 +454,7 @@ If called with a prefix, prompts for flags to pass to ag." ;;;###autoload (defun ag-project (string) "Guess the root of the current project and search it with ag -for the given string. +for the given literal search STRING. If called with a prefix, prompts for flags to pass to ag." (interactive (list (ag/read-from-minibuffer "Search string"))) @@ -425,7 +462,7 @@ If called with a prefix, prompts for flags to pass to ag." ;;;###autoload (defun ag-project-files (string file-type) - "Search using ag for a given search STRING, + "Search using ag for a given literal search STRING, limited to files that match FILE-TYPE. STRING defaults to the symbol under point. @@ -474,8 +511,8 @@ If called with a prefix, prompts for flags to pass to ag." (make-obsolete 'ag-regexp-project-at-point 'ag-project-regexp "0.46") ;;;###autoload -(defun ag-dired (dir pattern) - "Recursively find files in DIR matching PATTERN. +(defun ag-dired (dir string) + "Recursively find files in DIR matching literal search STRING. The PATTERN is matched against the full path to the file, not only against the file name. @@ -485,7 +522,7 @@ The results are presented as a `dired-mode' buffer with See also `ag-dired-regexp'." (interactive "DDirectory: \nsFile pattern: ") - (ag-dired-regexp dir (ag/escape-pcre pattern))) + (ag-dired-regexp dir (ag/escape-pcre string))) ;;;###autoload (defun ag-dired-regexp (dir regexp) @@ -578,30 +615,39 @@ See also `ag-dired-regexp'." (not (eq buffer current-buffer))) (kill-buffer buffer))))) -;; Taken from grep-filter, just changed the color regex. +;; Based on grep-filter. (defun ag-filter () - "Handle match highlighting escape sequences inserted by the ag process. + "Handle escape sequences inserted by the ag process. This function is called from `compilation-filter-hook'." - (when ag-highlight-search - (save-excursion + (save-excursion + (forward-line 0) + (let ((end (point)) beg) + (goto-char compilation-filter-start) (forward-line 0) - (let ((end (point)) beg) - (goto-char compilation-filter-start) - (forward-line 0) - (setq beg (point)) - ;; Only operate on whole lines so we don't get caught with part of an - ;; escape sequence in one chunk and the rest in another. - (when (< (point) end) - (setq end (copy-marker end)) + (setq beg (point)) + ;; Only operate on whole lines so we don't get caught with part of an + ;; escape sequence in one chunk and the rest in another. + (when (< (point) end) + (setq end (copy-marker end)) + (when ag-highlight-search ;; Highlight ag matches and delete marking sequences. - (while (re-search-forward "\033\\[30;43m\\(.*?\\)\033\\[[0-9]*m" end 1) + (while (re-search-forward "\033\\[30;43m\\(.*?\\)\033\\[0m\033\\[K" end 1) (replace-match (propertize (match-string 1) 'face nil 'font-lock-face 'ag-match-face) - t t)) - ;; Delete all remaining escape sequences + t t))) + ;; Add marker at start of line for files. This is used by the match + ;; in `compilation-error-regexp-alist' to extract the file name. + (when ag-group-matches (goto-char beg) - (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1) - (replace-match "" t t))))))) + (while (re-search-forward "\033\\[1;32m\\(.*\\)\033\\[0m\033\\[K" end 1) + (replace-match + (concat "File: " (propertize (match-string 1) 'face nil 'font-lock-face + 'compilation-info)) + t t))) + ;; Delete all remaining escape sequences + (goto-char beg) + (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1) + (replace-match "" t t)))))) (defun ag/get-supported-types () "Query the ag executable for which file types it recognises." diff --git a/elpa/async-20160513.128/async-pkg.el b/elpa/async-20160513.128/async-pkg.el deleted file mode 100644 index 5f6d550..0000000 --- a/elpa/async-20160513.128/async-pkg.el +++ /dev/null @@ -1,6 +0,0 @@ -(define-package "async" "20160513.128" "Asynchronous processing in Emacs" 'nil :keywords - '("async") - :url "http://elpa.gnu.org/packages/async.html") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/async-20160513.128/async-autoloads.el b/elpa/async-20160711.2235/async-autoloads.el similarity index 93% rename from elpa/async-20160513.128/async-autoloads.el rename to elpa/async-20160711.2235/async-autoloads.el index db4528c..40c8f8a 100644 --- a/elpa/async-20160513.128/async-autoloads.el +++ b/elpa/async-20160711.2235/async-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "async" "async.el" (22387 29376 289753 380000)) +;;;### (autoloads nil "async" "async.el" (22404 60275 161929 555000)) ;;; Generated autoloads from async.el (autoload 'async-start-process "async" "\ @@ -68,8 +68,8 @@ returns nil. It can still be useful, however, as an argument to ;;;*** -;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22387 -;;;;;; 29376 281759 465000)) +;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22404 +;;;;;; 60275 153929 514000)) ;;; Generated autoloads from async-bytecomp.el (autoload 'async-byte-recompile-directory "async-bytecomp" "\ @@ -96,8 +96,8 @@ Async compilation of packages can be controlled by ;;;*** -;;;### (autoloads nil "dired-async" "dired-async.el" (22387 29376 -;;;;;; 261774 676000)) +;;;### (autoloads nil "dired-async" "dired-async.el" (22404 60275 +;;;;;; 137929 430000)) ;;; Generated autoloads from dired-async.el (defvar dired-async-mode nil "\ @@ -116,8 +116,8 @@ Do dired actions asynchronously. ;;;*** -;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22387 -;;;;;; 29376 315816 570000)) +;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22404 +;;;;;; 60275 190952 741000)) ;;;*** diff --git a/elpa/async-20160513.128/async-bytecomp.el b/elpa/async-20160711.2235/async-bytecomp.el similarity index 100% rename from elpa/async-20160513.128/async-bytecomp.el rename to elpa/async-20160711.2235/async-bytecomp.el diff --git a/elpa/async-20160711.2235/async-pkg.el b/elpa/async-20160711.2235/async-pkg.el new file mode 100644 index 0000000..56db0c0 --- /dev/null +++ b/elpa/async-20160711.2235/async-pkg.el @@ -0,0 +1,6 @@ +(define-package "async" "20160711.2235" "Asynchronous processing in Emacs" 'nil :keywords + '("async") + :url "https://github.com/jwiegley/emacs-async") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/async-20160513.128/async.el b/elpa/async-20160711.2235/async.el similarity index 100% rename from elpa/async-20160513.128/async.el rename to elpa/async-20160711.2235/async.el diff --git a/elpa/async-20160513.128/dired-async.el b/elpa/async-20160711.2235/dired-async.el similarity index 100% rename from elpa/async-20160513.128/dired-async.el rename to elpa/async-20160711.2235/dired-async.el diff --git a/elpa/async-20160513.128/smtpmail-async.el b/elpa/async-20160711.2235/smtpmail-async.el similarity index 100% rename from elpa/async-20160513.128/smtpmail-async.el rename to elpa/async-20160711.2235/smtpmail-async.el diff --git a/elpa/company-20160626.1903/company-abbrev.el b/elpa/company-20160709.1536/company-abbrev.el similarity index 100% rename from elpa/company-20160626.1903/company-abbrev.el rename to elpa/company-20160709.1536/company-abbrev.el diff --git a/elpa/company-20160626.1903/company-autoloads.el b/elpa/company-20160709.1536/company-autoloads.el similarity index 84% rename from elpa/company-20160626.1903/company-autoloads.el rename to elpa/company-20160709.1536/company-autoloads.el index 919f21b..cfc4e3e 100644 --- a/elpa/company-20160626.1903/company-autoloads.el +++ b/elpa/company-20160709.1536/company-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "company" "company.el" (22387 29374 119407 -;;;;;; 928000)) +;;;### (autoloads nil "company" "company.el" (22404 60273 313919 +;;;;;; 883000)) ;;; Generated autoloads from company.el (autoload 'company-mode "company" "\ @@ -73,8 +73,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22387 -;;;;;; 29374 199346 932000)) +;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22404 +;;;;;; 60273 385920 259000)) ;;; Generated autoloads from company-abbrev.el (autoload 'company-abbrev "company-abbrev" "\ @@ -84,8 +84,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22387 29374 -;;;;;; 179362 181000)) +;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22404 60273 +;;;;;; 369920 176000)) ;;; Generated autoloads from company-bbdb.el (autoload 'company-bbdb "company-bbdb" "\ @@ -95,8 +95,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-css" "company-css.el" (22387 29374 -;;;;;; 115410 979000)) +;;;### (autoloads nil "company-css" "company-css.el" (22404 60273 +;;;;;; 305919 841000)) ;;; Generated autoloads from company-css.el (autoload 'company-css "company-css" "\ @@ -106,8 +106,8 @@ inserted. ;;;*** -;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22387 -;;;;;; 29374 151383 530000)) +;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22404 +;;;;;; 60273 337920 9000)) ;;; 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" -;;;;;; (22387 29374 139392 679000)) +;;;;;; (22404 60273 329919 967000)) ;;; 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" (22387 29374 -;;;;;; 207340 832000)) +;;;### (autoloads nil "company-elisp" "company-elisp.el" (22404 60273 +;;;;;; 397920 322000)) ;;; 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" (22387 29374 -;;;;;; 127401 829000)) +;;;### (autoloads nil "company-etags" "company-etags.el" (22404 60273 +;;;;;; 321919 925000)) ;;; 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" (22387 29374 -;;;;;; 159377 430000)) +;;;### (autoloads nil "company-files" "company-files.el" (22404 60273 +;;;;;; 341920 29000)) ;;; 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" (22387 29374 -;;;;;; 87432 327000)) +;;;### (autoloads nil "company-gtags" "company-gtags.el" (22404 60273 +;;;;;; 277919 694000)) ;;; 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" (22387 -;;;;;; 29374 203343 882000)) +;;;### (autoloads nil "company-ispell" "company-ispell.el" (22404 +;;;;;; 60273 393920 301000)) ;;; 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" (22387 -;;;;;; 29374 167371 330000)) +;;;### (autoloads nil "company-keywords" "company-keywords.el" (22404 +;;;;;; 60273 353920 92000)) ;;; 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" (22387 29374 -;;;;;; 187356 81000)) +;;;### (autoloads nil "company-nxml" "company-nxml.el" (22404 60273 +;;;;;; 373920 196000)) ;;; 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" (22387 -;;;;;; 29374 107417 78000)) +;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22404 +;;;;;; 60273 285919 736000)) ;;; 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" (22387 -;;;;;; 29374 91429 277000)) +;;;### (autoloads nil "company-semantic" "company-semantic.el" (22404 +;;;;;; 60273 277919 694000)) ;;; 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" (22387 29374 -;;;;;; 147386 580000)) +;;;### (autoloads nil "company-tempo" "company-tempo.el" (22404 60273 +;;;;;; 333919 988000)) ;;; 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" (22387 29374 -;;;;;; 195349 982000)) +;;;### (autoloads nil "company-xcode" "company-xcode.el" (22404 60273 +;;;;;; 381920 238000)) ;;; 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" -;;;;;; (22387 29374 191353 32000)) +;;;;;; (22404 60273 377920 217000)) ;;; 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") -;;;;;; (22387 29374 220274 120000)) +;;;;;; (22404 60273 409561 422000)) ;;;*** diff --git a/elpa/company-20160626.1903/company-bbdb.el b/elpa/company-20160709.1536/company-bbdb.el similarity index 100% rename from elpa/company-20160626.1903/company-bbdb.el rename to elpa/company-20160709.1536/company-bbdb.el diff --git a/elpa/company-20160626.1903/company-capf.el b/elpa/company-20160709.1536/company-capf.el similarity index 100% rename from elpa/company-20160626.1903/company-capf.el rename to elpa/company-20160709.1536/company-capf.el diff --git a/elpa/company-20160626.1903/company-clang.el b/elpa/company-20160709.1536/company-clang.el similarity index 100% rename from elpa/company-20160626.1903/company-clang.el rename to elpa/company-20160709.1536/company-clang.el diff --git a/elpa/company-20160626.1903/company-cmake.el b/elpa/company-20160709.1536/company-cmake.el similarity index 100% rename from elpa/company-20160626.1903/company-cmake.el rename to elpa/company-20160709.1536/company-cmake.el diff --git a/elpa/company-20160626.1903/company-css.el b/elpa/company-20160709.1536/company-css.el similarity index 100% rename from elpa/company-20160626.1903/company-css.el rename to elpa/company-20160709.1536/company-css.el diff --git a/elpa/company-20160626.1903/company-dabbrev-code.el b/elpa/company-20160709.1536/company-dabbrev-code.el similarity index 100% rename from elpa/company-20160626.1903/company-dabbrev-code.el rename to elpa/company-20160709.1536/company-dabbrev-code.el diff --git a/elpa/company-20160626.1903/company-dabbrev.el b/elpa/company-20160709.1536/company-dabbrev.el similarity index 100% rename from elpa/company-20160626.1903/company-dabbrev.el rename to elpa/company-20160709.1536/company-dabbrev.el diff --git a/elpa/company-20160626.1903/company-eclim.el b/elpa/company-20160709.1536/company-eclim.el similarity index 100% rename from elpa/company-20160626.1903/company-eclim.el rename to elpa/company-20160709.1536/company-eclim.el diff --git a/elpa/company-20160626.1903/company-elisp.el b/elpa/company-20160709.1536/company-elisp.el similarity index 100% rename from elpa/company-20160626.1903/company-elisp.el rename to elpa/company-20160709.1536/company-elisp.el diff --git a/elpa/company-20160626.1903/company-etags.el b/elpa/company-20160709.1536/company-etags.el similarity index 100% rename from elpa/company-20160626.1903/company-etags.el rename to elpa/company-20160709.1536/company-etags.el diff --git a/elpa/company-20160626.1903/company-files.el b/elpa/company-20160709.1536/company-files.el similarity index 76% rename from elpa/company-20160626.1903/company-files.el rename to elpa/company-20160709.1536/company-files.el index c19d3d6..4397df9 100644 --- a/elpa/company-20160626.1903/company-files.el +++ b/elpa/company-20160709.1536/company-files.el @@ -1,4 +1,4 @@ -;;; company-files.el --- company-mode completion backend for file paths +;;; company-files.el --- company-mode completion backend for file names ;; Copyright (C) 2009-2011, 2014-2015 Free Software Foundation, Inc. @@ -28,14 +28,38 @@ (require 'company) (require 'cl-lib) +(defgroup company-files nil + "Completion backend for file names." + :group 'company) + +(defcustom company-files-exclusions nil + "File name extensions and directory names to ignore. +The values should use the same format as `completion-ignored-extensions'." + :type '(const string) + :package-version '(company . "0.9.1")) + (defun company-files--directory-files (dir prefix) - (ignore-errors - ;; 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)))))) - (if (equal prefix "") - (delete "../" (delete "./" comp)) - comp)))) + ;; 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))) + +(defun company-files--exclusions-filtered (completions) + (let* ((dir-exclusions (cl-delete-if-not #'company-files--trailing-slash-p + company-files-exclusions)) + (file-exclusions (cl-set-difference company-files-exclusions + dir-exclusions))) + (cl-loop for c in completions + unless (if (company-files--trailing-slash-p c) + (member c dir-exclusions) + (cl-find-if (lambda (exclusion) + (string-suffix-p exclusion c)) + file-exclusions)) + collect c))) (defvar company-files--regexps (let* ((root (if (eq system-type 'windows-nt) diff --git a/elpa/company-20160626.1903/company-gtags.el b/elpa/company-20160709.1536/company-gtags.el similarity index 100% rename from elpa/company-20160626.1903/company-gtags.el rename to elpa/company-20160709.1536/company-gtags.el diff --git a/elpa/company-20160626.1903/company-ispell.el b/elpa/company-20160709.1536/company-ispell.el similarity index 100% rename from elpa/company-20160626.1903/company-ispell.el rename to elpa/company-20160709.1536/company-ispell.el diff --git a/elpa/company-20160626.1903/company-keywords.el b/elpa/company-20160709.1536/company-keywords.el similarity index 100% rename from elpa/company-20160626.1903/company-keywords.el rename to elpa/company-20160709.1536/company-keywords.el diff --git a/elpa/company-20160626.1903/company-nxml.el b/elpa/company-20160709.1536/company-nxml.el similarity index 100% rename from elpa/company-20160626.1903/company-nxml.el rename to elpa/company-20160709.1536/company-nxml.el diff --git a/elpa/company-20160626.1903/company-oddmuse.el b/elpa/company-20160709.1536/company-oddmuse.el similarity index 100% rename from elpa/company-20160626.1903/company-oddmuse.el rename to elpa/company-20160709.1536/company-oddmuse.el diff --git a/elpa/company-20160626.1903/company-pkg.el b/elpa/company-20160709.1536/company-pkg.el similarity index 75% rename from elpa/company-20160626.1903/company-pkg.el rename to elpa/company-20160709.1536/company-pkg.el index 071c3c2..b83eca4 100644 --- a/elpa/company-20160626.1903/company-pkg.el +++ b/elpa/company-20160709.1536/company-pkg.el @@ -1,4 +1,4 @@ -(define-package "company" "20160626.1903" "Modular text completion framework" +(define-package "company" "20160709.1536" "Modular text completion framework" '((emacs "24.1") (cl-lib "0.5")) :url "http://company-mode.github.io/" :keywords diff --git a/elpa/company-20160626.1903/company-semantic.el b/elpa/company-20160709.1536/company-semantic.el similarity index 100% rename from elpa/company-20160626.1903/company-semantic.el rename to elpa/company-20160709.1536/company-semantic.el diff --git a/elpa/company-20160626.1903/company-template.el b/elpa/company-20160709.1536/company-template.el similarity index 100% rename from elpa/company-20160626.1903/company-template.el rename to elpa/company-20160709.1536/company-template.el diff --git a/elpa/company-20160626.1903/company-tempo.el b/elpa/company-20160709.1536/company-tempo.el similarity index 100% rename from elpa/company-20160626.1903/company-tempo.el rename to elpa/company-20160709.1536/company-tempo.el diff --git a/elpa/company-20160626.1903/company-xcode.el b/elpa/company-20160709.1536/company-xcode.el similarity index 100% rename from elpa/company-20160626.1903/company-xcode.el rename to elpa/company-20160709.1536/company-xcode.el diff --git a/elpa/company-20160626.1903/company-yasnippet.el b/elpa/company-20160709.1536/company-yasnippet.el similarity index 100% rename from elpa/company-20160626.1903/company-yasnippet.el rename to elpa/company-20160709.1536/company-yasnippet.el diff --git a/elpa/company-20160626.1903/company.el b/elpa/company-20160709.1536/company.el similarity index 99% rename from elpa/company-20160626.1903/company.el rename to elpa/company-20160709.1536/company.el index 70bd5b4..1721005 100644 --- a/elpa/company-20160626.1903/company.el +++ b/elpa/company-20160709.1536/company.el @@ -83,7 +83,17 @@ buffer-local wherever it is set." (declare (debug defvar) (doc-string 3)) `(progn (defvar ,var ,val ,docstring) - (make-variable-buffer-local ',var))))) + (make-variable-buffer-local ',var)))) + + (unless (fboundp 'string-suffix-p) + (defun string-suffix-p (suffix string &optional ignore-case) + "Return non-nil if SUFFIX is a suffix of STRING. +If IGNORE-CASE is non-nil, the comparison is done without paying +attention to case differences." + (let ((start-pos (- (length string) (length suffix)))) + (and (>= start-pos 0) + (eq t (compare-strings suffix nil nil + string start-pos nil ignore-case))))))) (defgroup company nil "Extensible inline text completion mechanism" diff --git a/elpa/git-gutter-20160610.852/git-gutter-autoloads.el b/elpa/git-gutter-20160702.354/git-gutter-autoloads.el similarity index 94% rename from elpa/git-gutter-20160610.852/git-gutter-autoloads.el rename to elpa/git-gutter-20160702.354/git-gutter-autoloads.el index 1e1412b..0809ed5 100644 --- a/elpa/git-gutter-20160610.852/git-gutter-autoloads.el +++ b/elpa/git-gutter-20160702.354/git-gutter-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "git-gutter" "git-gutter.el" (22387 29368 367814 -;;;;;; 765000)) +;;;### (autoloads nil "git-gutter" "git-gutter.el" (22404 60266 753885 +;;;;;; 560000)) ;;; Generated autoloads from git-gutter.el (autoload 'git-gutter:linum-setup "git-gutter" "\ diff --git a/elpa/git-gutter-20160610.852/git-gutter-pkg.el b/elpa/git-gutter-20160702.354/git-gutter-pkg.el similarity index 61% rename from elpa/git-gutter-20160610.852/git-gutter-pkg.el rename to elpa/git-gutter-20160702.354/git-gutter-pkg.el index 653b929..9c3a67d 100644 --- a/elpa/git-gutter-20160610.852/git-gutter-pkg.el +++ b/elpa/git-gutter-20160702.354/git-gutter-pkg.el @@ -1 +1 @@ -(define-package "git-gutter" "20160610.852" "Port of Sublime Text plugin GitGutter" '((cl-lib "0.5") (emacs "24")) :url "https://github.com/syohex/emacs-git-gutter") +(define-package "git-gutter" "20160702.354" "Port of Sublime Text plugin GitGutter" '((cl-lib "0.5") (emacs "24")) :url "https://github.com/syohex/emacs-git-gutter") diff --git a/elpa/git-gutter-20160610.852/git-gutter.el b/elpa/git-gutter-20160702.354/git-gutter.el similarity index 98% rename from elpa/git-gutter-20160610.852/git-gutter.el rename to elpa/git-gutter-20160702.354/git-gutter.el index 562a265..2b0b0ff 100644 --- a/elpa/git-gutter-20160610.852/git-gutter.el +++ b/elpa/git-gutter-20160702.354/git-gutter.el @@ -4,7 +4,7 @@ ;; Author: Syohei YOSHIDA ;; URL: https://github.com/syohex/emacs-git-gutter -;; Package-Version: 20160610.852 +;; Package-Version: 20160702.354 ;; Version: 0.89 ;; Package-Requires: ((cl-lib "0.5") (emacs "24")) @@ -170,6 +170,10 @@ gutter information of other windows." "Ask whether commit/revert or not" :type 'boolean) +(defcustom git-gutter:display-p t + "Display diff information or not." + :type 'boolean) + (cl-defstruct git-gutter-hunk type content start-line end-line) @@ -509,12 +513,13 @@ gutter information of other windows." (setq git-gutter:init-function 'git-gutter:linum-init git-gutter:view-diff-function nil) (defadvice linum-update-window (after git-gutter:linum-update-window activate) - (if (and git-gutter-mode git-gutter:diffinfos) - (git-gutter:linum-update git-gutter:diffinfos) - (let ((curwin (get-buffer-window)) - (margin (or git-gutter:linum-prev-window-margin - (car (window-margins))))) - (set-window-margins curwin margin (cdr (window-margins curwin))))))) + (when git-gutter:display-p + (if (and git-gutter-mode git-gutter:diffinfos) + (git-gutter:linum-update git-gutter:diffinfos) + (let ((curwin (get-buffer-window)) + (margin (or git-gutter:linum-prev-window-margin + (car (window-margins))))) + (set-window-margins curwin margin (cdr (window-margins curwin)))))))) (defun git-gutter:show-backends () (mapconcat (lambda (backend) @@ -631,7 +636,7 @@ gutter information of other windows." (widen) (git-gutter:clear-gutter) (setq git-gutter:diffinfos diffinfos) - (when git-gutter:view-diff-function + (when (and git-gutter:display-p git-gutter:view-diff-function) (funcall git-gutter:view-diff-function diffinfos)))) (defun git-gutter:search-near-diff-index (diffinfos is-reverse) diff --git a/elpa/gitconfig-mode-20160319.302/gitconfig-mode-pkg.el b/elpa/gitconfig-mode-20160319.302/gitconfig-mode-pkg.el deleted file mode 100644 index e282571..0000000 --- a/elpa/gitconfig-mode-20160319.302/gitconfig-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "gitconfig-mode" "20160319.302" "Major mode for editing .gitconfig files" 'nil :url "https://github.com/magit/git-modes" :keywords '("convenience" "vc" "git")) diff --git a/elpa/gitconfig-mode-20160319.302/gitconfig-mode-autoloads.el b/elpa/gitconfig-mode-20160710.1913/gitconfig-mode-autoloads.el similarity index 87% rename from elpa/gitconfig-mode-20160319.302/gitconfig-mode-autoloads.el rename to elpa/gitconfig-mode-20160710.1913/gitconfig-mode-autoloads.el index cf522ab..fae4357 100644 --- a/elpa/gitconfig-mode-20160319.302/gitconfig-mode-autoloads.el +++ b/elpa/gitconfig-mode-20160710.1913/gitconfig-mode-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "gitconfig-mode" "gitconfig-mode.el" (22297 -;;;;;; 19828 264884 774000)) +;;;### (autoloads nil "gitconfig-mode" "gitconfig-mode.el" (22404 +;;;;;; 60264 981876 293000)) ;;; Generated autoloads from gitconfig-mode.el (autoload 'gitconfig-mode "gitconfig-mode" "\ diff --git a/elpa/gitconfig-mode-20160710.1913/gitconfig-mode-pkg.el b/elpa/gitconfig-mode-20160710.1913/gitconfig-mode-pkg.el new file mode 100644 index 0000000..26edee3 --- /dev/null +++ b/elpa/gitconfig-mode-20160710.1913/gitconfig-mode-pkg.el @@ -0,0 +1 @@ +(define-package "gitconfig-mode" "20160710.1913" "Major mode for editing .gitconfig files" 'nil :url "https://github.com/magit/git-modes" :keywords '("convenience" "vc" "git")) diff --git a/elpa/gitconfig-mode-20160319.302/gitconfig-mode.el b/elpa/gitconfig-mode-20160710.1913/gitconfig-mode.el similarity index 97% rename from elpa/gitconfig-mode-20160319.302/gitconfig-mode.el rename to elpa/gitconfig-mode-20160710.1913/gitconfig-mode.el index a2aa6de..6921dd3 100644 --- a/elpa/gitconfig-mode-20160319.302/gitconfig-mode.el +++ b/elpa/gitconfig-mode-20160710.1913/gitconfig-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/git-modes ;; Keywords: convenience vc git -;; Package-Version: 20160319.302 +;; Package-Version: 20160710.1913 ;; This file is not part of GNU Emacs. @@ -99,7 +99,8 @@ (1 'font-lock-type-face t nil) (2 'font-lock-function-name-face t t)) (,(rx line-start (zero-or-more (syntax whitespace)) symbol-start - (group (one-or-more (or (syntax word) (syntax symbol)))) + (group alphanumeric + (zero-or-more (or (syntax word) (syntax symbol)))) symbol-end (zero-or-more (syntax whitespace)) (optional "=" (zero-or-more not-newline)) line-end) (1 'font-lock-variable-name-face)) diff --git a/elpa/helm-20160625.2316/emacs-helm.sh b/elpa/helm-20160711.1143/emacs-helm.sh similarity index 100% rename from elpa/helm-20160625.2316/emacs-helm.sh rename to elpa/helm-20160711.1143/emacs-helm.sh diff --git a/elpa/helm-20160625.2316/helm-adaptive.el b/elpa/helm-20160711.1143/helm-adaptive.el similarity index 95% rename from elpa/helm-20160625.2316/helm-adaptive.el rename to elpa/helm-20160711.1143/helm-adaptive.el index d8be6b1..e76a61d 100644 --- a/elpa/helm-20160625.2316/helm-adaptive.el +++ b/elpa/helm-20160711.1143/helm-adaptive.el @@ -80,13 +80,7 @@ Format: ((SOURCE-NAME (SELECTED-CANDIDATE (PATTERN . NUMBER-OF-USE) ...) ...) .. "Return current source only if it use adaptive history, nil otherwise." (when helm-adaptive-mode (let* ((source (or source-name (helm-get-current-source))) - (adapt-source (or (assoc-default 'filtered-candidate-transformer - (assoc (assoc-default 'type source) - helm-type-attributes)) - (assoc-default 'candidate-transformer - (assoc (assoc-default 'type source) - helm-type-attributes)) - (assoc-default 'filtered-candidate-transformer source) + (adapt-source (or (assoc-default 'filtered-candidate-transformer source) (assoc-default 'candidate-transformer source)))) (if (listp adapt-source) (and (member 'helm-adaptive-sort adapt-source) source) diff --git a/elpa/helm-20160625.2316/helm-apt.el b/elpa/helm-20160711.1143/helm-apt.el similarity index 100% rename from elpa/helm-20160625.2316/helm-apt.el rename to elpa/helm-20160711.1143/helm-apt.el diff --git a/elpa/helm-20160625.2316/helm-autoloads.el b/elpa/helm-20160711.1143/helm-autoloads.el similarity index 89% rename from elpa/helm-20160625.2316/helm-autoloads.el rename to elpa/helm-20160711.1143/helm-autoloads.el index 3dca02f..dd93205 100644 --- a/elpa/helm-20160625.2316/helm-autoloads.el +++ b/elpa/helm-20160711.1143/helm-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22387 29367 -;;;;;; 188722 114000)) +;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22404 60264 +;;;;;; 321872 842000)) ;;; Generated autoloads from helm-adaptive.el (defvar helm-adaptive-mode nil "\ @@ -29,8 +29,8 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'. ;;;*** -;;;### (autoloads nil "helm-apt" "helm-apt.el" (22387 29367 144755 -;;;;;; 961000)) +;;;### (autoloads nil "helm-apt" "helm-apt.el" (22404 60264 293872 +;;;;;; 696000)) ;;; Generated autoloads from helm-apt.el (autoload 'helm-apt "helm-apt" "\ @@ -41,8 +41,8 @@ With a prefix arg reload cache. ;;;*** -;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22387 29367 -;;;;;; 236685 191000)) +;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22404 60264 +;;;;;; 389873 198000)) ;;; Generated autoloads from helm-bookmark.el (autoload 'helm-bookmarks "helm-bookmark" "\ @@ -59,8 +59,8 @@ only if external library addressbook-bookmark.el is available. ;;;*** -;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22387 29367 -;;;;;; 132765 192000)) +;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22404 60264 +;;;;;; 281872 633000)) ;;; Generated autoloads from helm-buffers.el (autoload 'helm-buffers-list "helm-buffers" "\ @@ -75,8 +75,8 @@ Preconfigured `helm' lightweight version (buffer -> recentf). ;;;*** -;;;### (autoloads nil "helm-color" "helm-color.el" (22387 29367 220697 -;;;;;; 499000)) +;;;### (autoloads nil "helm-color" "helm-color.el" (22404 60264 373873 +;;;;;; 114000)) ;;; Generated autoloads from helm-color.el (autoload 'helm-colors "helm-color" "\ @@ -86,8 +86,8 @@ Preconfigured `helm' for color. ;;;*** -;;;### (autoloads nil "helm-command" "helm-command.el" (22387 29367 -;;;;;; 76808 270000)) +;;;### (autoloads nil "helm-command" "helm-command.el" (22404 60264 +;;;;;; 229872 361000)) ;;; Generated autoloads from helm-command.el (autoload 'helm-M-x "helm-command" "\ @@ -105,8 +105,8 @@ You can get help on each command by persistent action. ;;;*** -;;;### (autoloads nil "helm-config" "helm-config.el" (22387 29367 -;;;;;; 228691 345000)) +;;;### (autoloads nil "helm-config" "helm-config.el" (22404 60264 +;;;;;; 385873 177000)) ;;; Generated autoloads from helm-config.el (autoload 'helm-configuration "helm-config" "\ @@ -116,8 +116,8 @@ Customize `helm'. ;;;*** -;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22387 29367 -;;;;;; 156746 731000)) +;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22404 60264 +;;;;;; 301872 738000)) ;;; Generated autoloads from helm-dabbrev.el (autoload 'helm-dabbrev "helm-dabbrev" "\ @@ -127,8 +127,8 @@ Preconfigured helm for dynamic abbreviations. ;;;*** -;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22387 29367 224694 -;;;;;; 422000)) +;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22404 60264 381873 +;;;;;; 156000)) ;;; Generated autoloads from helm-elisp.el (autoload 'helm-lisp-completion-at-point "helm-elisp" "\ @@ -182,7 +182,7 @@ Preconfigured helm for complex command history. ;;;*** ;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el" -;;;;;; (22387 29367 80805 193000)) +;;;;;; (22404 60264 237872 403000)) ;;; Generated autoloads from helm-elisp-package.el (autoload 'helm-list-elisp-packages "helm-elisp-package" "\ @@ -198,8 +198,8 @@ Same as `helm-list-elisp-packages' but don't fetch packages on remote. ;;;*** -;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22387 29367 -;;;;;; 68814 424000)) +;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22404 60264 +;;;;;; 217872 298000)) ;;; Generated autoloads from helm-elscreen.el (autoload 'helm-elscreen "helm-elscreen" "\ @@ -214,8 +214,8 @@ Preconfigured helm to list elscreen in history order. ;;;*** -;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22387 29367 -;;;;;; 100789 808000)) +;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22404 60264 +;;;;;; 249872 465000)) ;;; Generated autoloads from helm-eshell.el (autoload 'helm-esh-pcomplete "helm-eshell" "\ @@ -230,8 +230,8 @@ Preconfigured helm for eshell history. ;;;*** -;;;### (autoloads nil "helm-eval" "helm-eval.el" (22387 29367 196715 -;;;;;; 961000)) +;;;### (autoloads nil "helm-eval" "helm-eval.el" (22404 60264 345872 +;;;;;; 967000)) ;;; Generated autoloads from helm-eval.el (autoload 'helm-eval-expression "helm-eval" "\ @@ -251,8 +251,8 @@ Preconfigured helm for `helm-source-calculation-result'. ;;;*** -;;;### (autoloads nil "helm-external" "helm-external.el" (22387 29367 -;;;;;; 56823 655000)) +;;;### (autoloads nil "helm-external" "helm-external.el" (22404 60264 +;;;;;; 197872 194000)) ;;; Generated autoloads from helm-external.el (autoload 'helm-run-external-command "helm-external" "\ @@ -265,8 +265,8 @@ You can set your own list of commands with ;;;*** -;;;### (autoloads nil "helm-files" "helm-files.el" (22387 29367 172734 -;;;;;; 423000)) +;;;### (autoloads nil "helm-files" "helm-files.el" (22404 60264 305872 +;;;;;; 759000)) ;;; Generated autoloads from helm-files.el (autoload 'helm-browse-project "helm-files" "\ @@ -339,8 +339,8 @@ Preconfigured `helm' for `recentf'. ;;;*** -;;;### (autoloads nil "helm-font" "helm-font.el" (22387 29367 104786 -;;;;;; 731000)) +;;;### (autoloads nil "helm-font" "helm-font.el" (22404 60264 257872 +;;;;;; 507000)) ;;; Generated autoloads from helm-font.el (autoload 'helm-select-xfont "helm-font" "\ @@ -355,8 +355,8 @@ Preconfigured helm for `ucs-names' math symbols. ;;;*** -;;;### (autoloads nil "helm-grep" "helm-grep.el" (22387 29367 240682 -;;;;;; 114000)) +;;;### (autoloads nil "helm-grep" "helm-grep.el" (22404 60264 397873 +;;;;;; 239000)) ;;; Generated autoloads from helm-grep.el (autoload 'helm-goto-precedent-file "helm-grep" "\ @@ -383,8 +383,8 @@ With a prefix arg ARG git-grep the whole repository. ;;;*** -;;;### (autoloads nil "helm-help" "helm-help.el" (22387 29367 52826 -;;;;;; 733000)) +;;;### (autoloads nil "helm-help" "helm-help.el" (22404 60264 193872 +;;;;;; 173000)) ;;; Generated autoloads from helm-help.el (autoload 'helm-documentation "helm-help" "\ @@ -402,16 +402,10 @@ String displayed in mode-line in `helm-source-find-files'.") (defvar helm-top-mode-line "\\\\[helm-help]:Help \\\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend") -(autoload 'helm-describe-helm-attribute "helm-help" "\ -Display the full documentation of HELM-ATTRIBUTE. -HELM-ATTRIBUTE should be a symbol. - -\(fn HELM-ATTRIBUTE)" t nil) - ;;;*** -;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22387 29367 -;;;;;; 140759 38000)) +;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22404 60264 +;;;;;; 285872 654000)) ;;; Generated autoloads from helm-id-utils.el (autoload 'helm-gid "helm-id-utils" "\ @@ -425,8 +419,8 @@ See . ;;;*** -;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22387 29367 120774 -;;;;;; 423000)) +;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22404 60264 273872 +;;;;;; 591000)) ;;; Generated autoloads from helm-imenu.el (autoload 'helm-imenu "helm-imenu" "\ @@ -443,8 +437,8 @@ or it have an association in `helm-imenu-all-buffer-assoc'. ;;;*** -;;;### (autoloads nil "helm-info" "helm-info.el" (22387 29367 112780 -;;;;;; 578000)) +;;;### (autoloads nil "helm-info" "helm-info.el" (22404 60264 261872 +;;;;;; 528000)) ;;; Generated autoloads from helm-info.el (autoload 'helm-info "helm-info" "\ @@ -460,8 +454,8 @@ With a prefix-arg insert symbol at point. ;;;*** -;;;### (autoloads nil "helm-locate" "helm-locate.el" (22387 29367 -;;;;;; 60820 578000)) +;;;### (autoloads nil "helm-locate" "helm-locate.el" (22404 60264 +;;;;;; 209872 256000)) ;;; Generated autoloads from helm-locate.el (autoload 'helm-projects-find-files "helm-locate" "\ @@ -488,8 +482,8 @@ Where db_path is a filename matched by ;;;*** -;;;### (autoloads nil "helm-man" "helm-man.el" (22387 29367 200712 -;;;;;; 884000)) +;;;### (autoloads nil "helm-man" "helm-man.el" (22404 60264 349872 +;;;;;; 988000)) ;;; Generated autoloads from helm-man.el (autoload 'helm-man-woman "helm-man" "\ @@ -500,8 +494,8 @@ With a prefix arg reinitialize the cache. ;;;*** -;;;### (autoloads nil "helm-misc" "helm-misc.el" (22387 29367 180728 -;;;;;; 268000)) +;;;### (autoloads nil "helm-misc" "helm-misc.el" (22404 60264 317872 +;;;;;; 821000)) ;;; Generated autoloads from helm-misc.el (autoload 'helm-browse-menubar "helm-misc" "\ @@ -542,8 +536,8 @@ Preconfigured `helm' that provide completion of `comint' history. ;;;*** -;;;### (autoloads nil "helm-mode" "helm-mode.el" (22387 29366 904940 -;;;;;; 675000)) +;;;### (autoloads nil "helm-mode" "helm-mode.el" (22404 60264 185872 +;;;;;; 131000)) ;;; Generated autoloads from helm-mode.el (autoload 'helm-comp-read "helm-mode" "\ @@ -710,8 +704,8 @@ Note: This mode is incompatible with Emacs23. ;;;*** -;;;### (autoloads nil "helm-net" "helm-net.el" (22387 29367 216700 -;;;;;; 576000)) +;;;### (autoloads nil "helm-net" "helm-net.el" (22404 60264 369873 +;;;;;; 93000)) ;;; Generated autoloads from helm-net.el (autoload 'helm-surfraw "helm-net" "\ @@ -731,8 +725,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest. ;;;*** -;;;### (autoloads nil "helm-org" "helm-org.el" (22387 29367 244679 -;;;;;; 37000)) +;;;### (autoloads nil "helm-org" "helm-org.el" (22404 60264 401873 +;;;;;; 260000)) ;;; Generated autoloads from helm-org.el (autoload 'helm-org-agenda-files-headings "helm-org" "\ @@ -763,8 +757,8 @@ Preconfigured helm for org templates. ;;;*** -;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22387 29367 -;;;;;; 208706 730000)) +;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22404 60264 +;;;;;; 361873 51000)) ;;; Generated autoloads from helm-regexp.el (autoload 'helm-moccur-mode "helm-regexp" "\ @@ -803,8 +797,8 @@ The prefix arg can be set before calling ;;;*** -;;;### (autoloads nil "helm-ring" "helm-ring.el" (22387 29367 48829 -;;;;;; 810000)) +;;;### (autoloads nil "helm-ring" "helm-ring.el" (22404 60264 189872 +;;;;;; 152000)) ;;; Generated autoloads from helm-ring.el (defvar helm-push-mark-mode nil "\ @@ -861,8 +855,8 @@ This command is useful when used with persistent action. ;;;*** -;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22387 29367 -;;;;;; 128768 269000)) +;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22404 60264 +;;;;;; 277872 612000)) ;;; Generated autoloads from helm-semantic.el (autoload 'helm-semantic "helm-semantic" "\ @@ -884,8 +878,8 @@ Fill in the symbol at point by default. ;;;*** -;;;### (autoloads nil "helm-sys" "helm-sys.el" (22387 29367 148752 -;;;;;; 884000)) +;;;### (autoloads nil "helm-sys" "helm-sys.el" (22404 60264 297872 +;;;;;; 717000)) ;;; Generated autoloads from helm-sys.el (defvar helm-top-poll-mode nil "\ @@ -919,8 +913,8 @@ Preconfigured helm for xrandr. ;;;*** -;;;### (autoloads nil "helm-tags" "helm-tags.el" (22387 29367 92795 -;;;;;; 962000)) +;;;### (autoloads nil "helm-tags" "helm-tags.el" (22404 60264 245872 +;;;;;; 444000)) ;;; Generated autoloads from helm-tags.el (autoload 'helm-etags-select "helm-tags" "\ @@ -939,8 +933,8 @@ This function aggregates three sources of tag files: ;;;*** -;;;### (autoloads nil "helm-utils" "helm-utils.el" (22387 29367 72811 -;;;;;; 347000)) +;;;### (autoloads nil "helm-utils" "helm-utils.el" (22404 60264 221872 +;;;;;; 319000)) ;;; Generated autoloads from helm-utils.el (defvar helm-popup-tip-mode nil "\ @@ -960,8 +954,8 @@ Show help-echo informations in a popup tip at end of line. ;;;*** ;;;### (autoloads nil nil ("helm-easymenu.el" "helm-multi-match.el" -;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-types.el") (22387 29367 -;;;;;; 261328 856000)) +;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-types.el") (22404 60264 +;;;;;; 421892 158000)) ;;;*** diff --git a/elpa/helm-20160625.2316/helm-bookmark.el b/elpa/helm-20160711.1143/helm-bookmark.el similarity index 95% rename from elpa/helm-20160625.2316/helm-bookmark.el rename to elpa/helm-20160711.1143/helm-bookmark.el index 9ce49ce..ce3ded4 100644 --- a/elpa/helm-20160625.2316/helm-bookmark.el +++ b/elpa/helm-20160711.1143/helm-bookmark.el @@ -30,6 +30,7 @@ (declare-function message-buffers "message.el") (declare-function addressbook-set-mail-buffer-1 "ext:addressbook-bookmark.el" (&optional bookmark-name append cc)) +(declare-function helm-browse-project "helm-files" (arg)) (defgroup helm-bookmark nil @@ -456,8 +457,42 @@ than `w3m-browse-url' use it." "Specialized filter function for `helm-find-files' bookmarks." (helm-bookmark-filter-setup-alist 'helm-bookmark-helm-find-files-p)) +(defun helm-bookmark-browse-project (candidate) + "Run `helm-browse-project' from action." + (with-helm-default-directory + (bookmark-get-filename candidate) + (helm-browse-project nil))) + +(defun helm-bookmark-run-browse-project () + "Run `helm-bookmark-browse-project' from keyboard." + (interactive) + (with-helm-alive-p + (helm-exit-and-execute-action 'helm-bookmark-browse-project))) +(put 'helm-bookmark-run-browse-project 'helm-only t) + +(defvar helm-bookmark-find-files-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map helm-bookmark-map) + (define-key map (kbd "C-c o") 'ignore) + (define-key map (kbd "C-x C-d") 'helm-bookmark-run-browse-project) + map)) + +(defclass helm-bookmark-overwrite-inheritor (helm-source) ()) + +(defmethod helm--setup-source ((source helm-bookmark-overwrite-inheritor)) + (setf (slot-value source 'action) + (helm-append-at-nth + (remove '("Jump to BM other window" . helm-bookmark-jump-other-window) + helm-type-bookmark-actions) + '(("Browse project" . helm-bookmark-browse-project)) 1)) + (setf (slot-value source 'keymap) helm-bookmark-find-files-map)) + +(defclass helm-bookmark-find-files-class (helm-source-filtered-bookmarks + helm-bookmark-overwrite-inheritor) + ()) + (defvar helm-source-bookmark-helm-find-files - (helm-make-source "Bookmark helm-find-files sessions" 'helm-source-filtered-bookmarks + (helm-make-source "Bookmark helm-find-files sessions" 'helm-bookmark-find-files-class :init (lambda () (bookmark-maybe-load-default-file) (helm-init-candidates-in-buffer @@ -683,7 +718,7 @@ words from the buffer into the new bookmark name." "Jump to bookmark from keyboard." (interactive) (with-helm-alive-p - (helm-exit-and-execute-action 'bookmark-jump-other-window))) + (helm-exit-and-execute-action 'helm-bookmark-jump-other-window))) (put 'helm-bookmark-run-jump-other-window 'helm-only t) (defun helm-bookmark-run-delete () diff --git a/elpa/helm-20160625.2316/helm-buffers.el b/elpa/helm-20160711.1143/helm-buffers.el similarity index 99% rename from elpa/helm-20160625.2316/helm-buffers.el rename to elpa/helm-20160711.1143/helm-buffers.el index 509b9a6..f3c019b 100644 --- a/elpa/helm-20160625.2316/helm-buffers.el +++ b/elpa/helm-20160711.1143/helm-buffers.el @@ -423,7 +423,7 @@ Should be called after others transformers i.e (boring buffers)." (let ((preselect (helm-buffer--get-preselection (helm-get-selection)))) (setq helm-buffer-details-flag (not helm-buffer-details-flag)) - (helm-force-update preselect)))) + (helm-update preselect)))) (put 'helm-toggle-buffers-details 'helm-only t) (defun helm-buffers-sort-transformer (candidates _source) diff --git a/elpa/helm-20160625.2316/helm-color.el b/elpa/helm-20160711.1143/helm-color.el similarity index 100% rename from elpa/helm-20160625.2316/helm-color.el rename to elpa/helm-20160711.1143/helm-color.el diff --git a/elpa/helm-20160625.2316/helm-command.el b/elpa/helm-20160711.1143/helm-command.el similarity index 100% rename from elpa/helm-20160625.2316/helm-command.el rename to elpa/helm-20160711.1143/helm-command.el diff --git a/elpa/helm-20160625.2316/helm-config.el b/elpa/helm-20160711.1143/helm-config.el similarity index 98% rename from elpa/helm-20160625.2316/helm-config.el rename to elpa/helm-20160711.1143/helm-config.el index 1a1bf58..cea6bdc 100644 --- a/elpa/helm-20160625.2316/helm-config.el +++ b/elpa/helm-20160711.1143/helm-config.el @@ -146,7 +146,6 @@ ("(\\<\\(with-helm-default-directory\\)\\>" 1 font-lock-keyword-face) ("(\\<\\(with-helm-display-same-window\\)\\>" 1 font-lock-keyword-face) ("(\\<\\(with-helm-restore-variables\\)\\>" 1 font-lock-keyword-face) - ("(\\<\\(define-helm-type-attribute\\)\\>" 1 font-lock-keyword-face) ("(\\<\\(helm-multi-key-defun\\)\\>" 1 font-lock-keyword-face) ("(\\<\\(helm-while-no-input\\)\\>" 1 font-lock-keyword-face) ("(\\<\\(helm-aif\\)\\>" 1 font-lock-keyword-face) diff --git a/elpa/helm-20160625.2316/helm-dabbrev.el b/elpa/helm-20160711.1143/helm-dabbrev.el similarity index 100% rename from elpa/helm-20160625.2316/helm-dabbrev.el rename to elpa/helm-20160711.1143/helm-dabbrev.el diff --git a/elpa/helm-20160625.2316/helm-easymenu.el b/elpa/helm-20160711.1143/helm-easymenu.el similarity index 100% rename from elpa/helm-20160625.2316/helm-easymenu.el rename to elpa/helm-20160711.1143/helm-easymenu.el diff --git a/elpa/helm-20160625.2316/helm-elisp-package.el b/elpa/helm-20160711.1143/helm-elisp-package.el similarity index 100% rename from elpa/helm-20160625.2316/helm-elisp-package.el rename to elpa/helm-20160711.1143/helm-elisp-package.el diff --git a/elpa/helm-20160625.2316/helm-elisp.el b/elpa/helm-20160711.1143/helm-elisp.el similarity index 97% rename from elpa/helm-20160625.2316/helm-elisp.el rename to elpa/helm-20160711.1143/helm-elisp.el index c04dc95..3b8e9f2 100644 --- a/elpa/helm-20160625.2316/helm-elisp.el +++ b/elpa/helm-20160711.1143/helm-elisp.el @@ -89,8 +89,7 @@ fuzzy completion is not available in `completion-at-point'." helm-def-source--eieio-classes helm-def-source--eieio-generic helm-def-source--emacs-variables - helm-def-source--emacs-faces - helm-def-source--helm-attributes) + helm-def-source--emacs-faces) "A list of functions that build helm sources to use in `helm-apropos'." :group 'helm-elisp :type '(repeat (choice symbol))) @@ -550,24 +549,6 @@ Filename completion happen if string start after or between a double quote." ("Customize face" . (lambda (candidate) (customize-face (helm-symbolify candidate))))))) -(defun helm-def-source--helm-attributes (&optional _default) - (let ((def-act (lambda (candidate) - (let (special-display-buffer-names - special-display-regexps - helm-persistent-action-use-special-display) - (with-output-to-temp-buffer "*Help*" - (princ (get (intern candidate) 'helm-attrdoc))))))) - (helm-build-sync-source "Helm attributes" - :candidates (lambda () - (mapcar 'symbol-name helm-attributes)) - :fuzzy-match helm-apropos-fuzzy-match - :nomark t - :persistent-action (lambda (candidate) - (helm-elisp--persistent-help - candidate def-act)) - :persistent-help "Describe helm attribute" - :action def-act))) - (defun helm-def-source--emacs-commands (&optional default) (helm-build-in-buffer-source "Commands" :init `(lambda () diff --git a/elpa/helm-20160625.2316/helm-elscreen.el b/elpa/helm-20160711.1143/helm-elscreen.el similarity index 100% rename from elpa/helm-20160625.2316/helm-elscreen.el rename to elpa/helm-20160711.1143/helm-elscreen.el diff --git a/elpa/helm-20160625.2316/helm-eshell.el b/elpa/helm-20160711.1143/helm-eshell.el similarity index 100% rename from elpa/helm-20160625.2316/helm-eshell.el rename to elpa/helm-20160711.1143/helm-eshell.el diff --git a/elpa/helm-20160625.2316/helm-eval.el b/elpa/helm-20160711.1143/helm-eval.el similarity index 100% rename from elpa/helm-20160625.2316/helm-eval.el rename to elpa/helm-20160711.1143/helm-eval.el diff --git a/elpa/helm-20160625.2316/helm-external.el b/elpa/helm-20160711.1143/helm-external.el similarity index 100% rename from elpa/helm-20160625.2316/helm-external.el rename to elpa/helm-20160711.1143/helm-external.el diff --git a/elpa/helm-20160625.2316/helm-files.el b/elpa/helm-20160711.1143/helm-files.el similarity index 100% rename from elpa/helm-20160625.2316/helm-files.el rename to elpa/helm-20160711.1143/helm-files.el diff --git a/elpa/helm-20160625.2316/helm-font.el b/elpa/helm-20160711.1143/helm-font.el similarity index 100% rename from elpa/helm-20160625.2316/helm-font.el rename to elpa/helm-20160711.1143/helm-font.el diff --git a/elpa/helm-20160625.2316/helm-grep.el b/elpa/helm-20160711.1143/helm-grep.el similarity index 100% rename from elpa/helm-20160625.2316/helm-grep.el rename to elpa/helm-20160711.1143/helm-grep.el diff --git a/elpa/helm-20160625.2316/helm-help.el b/elpa/helm-20160711.1143/helm-help.el similarity index 70% rename from elpa/helm-20160625.2316/helm-help.el rename to elpa/helm-20160711.1143/helm-help.el index 8f97c30..47b84ea 100644 --- a/elpa/helm-20160625.2316/helm-help.el +++ b/elpa/helm-20160711.1143/helm-help.el @@ -1111,414 +1111,6 @@ f1/f2/f-n:NthAct \ f1/f2/f-n:NthAct \ \\[helm-toggle-suspend-update]:Tog.suspend") - -;;; Attribute Documentation -;; -;; -;;;###autoload -(defun helm-describe-helm-attribute (helm-attribute) - "Display the full documentation of HELM-ATTRIBUTE. -HELM-ATTRIBUTE should be a symbol." - (interactive (list (intern - (completing-read - "Describe helm attribute: " - (mapcar 'symbol-name helm-attributes) - nil t)))) - (with-output-to-temp-buffer "*Help*" - (princ (get helm-attribute 'helm-attrdoc)))) - -(helm-document-attribute 'name "mandatory" - " The name of the source. It is also the heading which appears - above the list of matches from the source. Must be unique.") - -(helm-document-attribute 'header-name "optional" - " A function returning the display string of the header. Its - argument is the name of the source. This attribute is useful to - add an additional information with the source name.") - -(helm-document-attribute 'candidates "mandatory if candidates-in-buffer attribute is not provided" - " Specifies how to retrieve candidates from the source. It can - either be a variable name, a function called with no parameters - or the actual list of candidates. - - The list must be a list whose members are strings, symbols - or (DISPLAY . REAL) pairs. - - In case of (DISPLAY . REAL) pairs, the DISPLAY string is shown - in the Helm buffer, but the REAL one is used as action - argument when the candidate is selected. This allows a more - readable presentation for candidates which would otherwise be, - for example, too long or have a common part shared with other - candidates which can be safely replaced with an abbreviated - string for display purposes. - - Note that if the (DISPLAY . REAL) form is used then pattern - matching is done on the displayed string, not on the real - value. - - If the candidates have to be retrieved asynchronously (for - example, by an external command which takes a while to run) - then the function should start the external command - asynchronously and return the associated process object. - Helm will take care of managing the process (receiving the - output from it, killing it if necessary, etc.). The process - should return candidates matching the current pattern (see - variable `helm-pattern'.) - You should use instead `candidates-process' attribute for - async processes, a warning will popup when using async process - in a `candidates' attribute. - - Note that currently results from asynchronous sources appear - last in the helm buffer regardless of their position in - `helm-sources'.") - -(helm-document-attribute 'candidates-process - "Same as `candidates' attributes but for process function." - " You should use this attribute when using a function involving - an async process instead of `candidates'.") - -(helm-document-attribute 'action "mandatory if type attribute is not provided" - " It is a list of (DISPLAY . FUNCTION) pairs or FUNCTION. - FUNCTION is called with one parameter: the selected candidate. - - An action other than the default can be chosen from this list - of actions for the currently selected candidate (by default - with TAB). The DISPLAY string is shown in the completions - buffer and the FUNCTION is invoked when an action is - selected. The first action of the list is the default.") - -(helm-document-attribute 'coerce "optional" - " It's a function called with one argument: the selected - candidate. - - This function is intended for type convertion. In normal case, - the selected candidate (string) is passed to action - function. If coerce function is specified, it is called just - before action function. - - Example: converting string to symbol - (coerce . intern)") - -(helm-document-attribute 'type "optional if action attribute is provided" - " Indicates the type of the items the source returns. - - Merge attributes not specified in the source itself from - `helm-type-attributes'. - - This attribute is implemented by plug-in.") - -(helm-document-attribute 'init "optional" - " Function called with no parameters when helm is started. It - is useful for collecting current state information which can be - used to create the list of candidates later. - - For example, if a source needs to work with the current - directory then it can store its value here, because later - helm does its job in the minibuffer and in the - `helm-buffer' and the current directory can be different - there.") - -(helm-document-attribute 'match "optional" - " List of functions called with one parameter: a candidate. The - function should return non-nil if the candidate matches the - current pattern (see variable `helm-pattern'). - - This attribute allows the source to override the default - pattern matching based on `string-match'. It can be used, for - example, to implement a source for file names and do the - pattern matching on the basename of files, since it's more - likely one is typing part of the basename when searching for a - file, instead of some string anywhere else in its path. - - If the list contains more than one function then the list of - matching candidates from the source is constructed by appending - the results after invoking the first function on all the - potential candidates, then the next function, and so on. The - matching candidates supplied by the first function appear first - in the list of results and then results from the other - functions, respectively. - - This attribute has no effect for asynchronous sources (see - attribute `candidates'), since they perform pattern matching - themselves.") - -(helm-document-attribute 'candidate-transformer "optional" - " It's a function or a list of functions called with one argument - when the completion list from the source is built. The argument - is the list of candidates retrieved from the source. The - function should return a transformed list of candidates which - will be used for the actual completion. If it is a list of - functions, it calls each function sequentially. - - This can be used to transform or remove items from the list of - candidates. - - Note that `candidates' is run already, so the given transformer - function should also be able to handle candidates with (DISPLAY - . REAL) format.") - -(helm-document-attribute 'filtered-candidate-transformer "optional" - " It has the same format as `candidate-transformer', except the - function is called with two parameters: the candidate list and - the source. - - This transformer is run on the candidate list which is already - filtered by the current pattern. While `candidate-transformer' - is run only once, it is run every time the input pattern is - changed. - - It can be used to transform the candidate list dynamically, for - example, based on the current pattern. - - In some cases it may also be more efficent to perform candidate - transformation here, instead of with `candidate-transformer' - even if this transformation is done every time the pattern is - changed. For example, if a candidate set is very large then - `candidate-transformer' transforms every candidate while only - some of them will actually be dislpayed due to the limit - imposed by `helm-candidate-number-limit'. - - Note that `candidates' and `candidate-transformer' is run - already, so the given transformer function should also be able - to handle candidates with (DISPLAY . REAL) format. - - This option has no effect for asynchronous sources. (Not yet, - at least.") - -(helm-document-attribute 'action-transformer "optional" - " It's a function or a list of functions called with two - arguments when the action list from the source is - assembled. The first argument is the list of actions, the - second is the current selection. If it is a list of functions, - it calls each function sequentially. - - The function should return a transformed action list. - - This can be used to customize the list of actions based on the - currently selected candidate.") - -(helm-document-attribute 'pattern-transformer "optional" - " It's a function or a list of functions called with one argument - before computing matches. Its argument is `helm-pattern'. - Functions should return transformed `helm-pattern'. - - It is useful to change interpretation of `helm-pattern'.") - -(helm-document-attribute 'volatile "optional" - " Indicates the source assembles the candidate list dynamically, - so it shouldn't be cached within a single Helm - invocation. It is only applicable to synchronous sources, - because asynchronous sources are not cached.") - -(helm-document-attribute 'requires-pattern "optional" - " If present matches from the source are shown only if the - pattern is not empty. Optionally, it can have an integer - parameter specifying the required length of input which is - useful in case of sources with lots of candidates.") - -(helm-document-attribute 'persistent-action "optional" - " Can be a either a Function called with one parameter (the - selected candidate) or a cons cell where first element is this - same function and second element a symbol (e.g. never-split) - that inform `helm-execute-persistent-action'to not split his - window to execute this persistent action.") - -(helm-document-attribute 'candidates-in-buffer "optional" - " Shortcut attribute for making and narrowing candidates using - buffers. This newly-introduced attribute prevents us from - forgetting to add volatile and match attributes. - - See docstring of `helm-candidates-in-buffer'. - - (candidates-in-buffer) is equivalent of three attributes: - (candidates . helm-candidates-in-buffer) - (volatile) - (match identity) - - (candidates-in-buffer . candidates-function) is equivalent of: - (candidates . candidates-function) - (volatile) - (match identity) - - This attribute is implemented by plug-in.") - -(helm-document-attribute 'search "optional" - " List of functions like `re-search-forward' or `search-forward'. - Buffer search function used by `helm-candidates-in-buffer'. - By default, `helm-candidates-in-buffer' uses - `re-search-forward'. This attribute is meant to be used with - (candidates . helm-candidates-in-buffer) or - (candidates-in-buffer) in short.") - -(helm-document-attribute 'get-line "optional" - " A function like `buffer-substring-no-properties' or `buffer-substring'. - This function converts point of line-beginning and point of line-end, - which represents a candidate computed by `helm-candidates-in-buffer'. - By default, `helm-candidates-in-buffer' uses - `buffer-substring-no-properties'.") - -(helm-document-attribute 'display-to-real "optional" - " Function called with one parameter; the selected candidate. - - 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 other string than one - shown in Helm buffer. - - 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.") - -(helm-document-attribute 'real-to-display "optional" - " Function called with one parameter; the selected candidate. - - The inverse of display-to-real attribute. - - The function transforms the selected candidate, which is passed - to the action function, for display. The real-to-display - attribute provides the other way to pass other string than one - shown in Helm buffer. - - Traditionally, it is possible to make candidates, - candidate-transformer or filtered-candidate-transformer - function return a list with (DISPLAY . REAL) pairs. But if - DISPLAY can be generated from REAL, real-to-display is more - convenient. - - Note that DISPLAY parts returned from candidates / - candidate-transformer are IGNORED as the name `display-to-real' - says.") - -(helm-document-attribute 'cleanup "optional" - " Function called with no parameters when *helm* buffer is - closed. It is useful for killing unneeded candidates buffer. - - Note that the function is executed BEFORE performing action.") - -(helm-document-attribute 'candidate-number-limit "optional" - " Override `helm-candidate-number-limit' only for this source.") - -(helm-document-attribute 'accept-empty "optional" - " Pass empty string \"\" to action function.") - -(helm-document-attribute 'dummy "optional" - " Set `helm-pattern' to candidate. If this attribute is - specified, The candidates attribute is ignored. - - This attribute is implemented by plug-in.") - -(helm-document-attribute 'multiline "optional" - " Enable to selection multiline candidates.") - -(helm-document-attribute 'update "optional" - (substitute-command-keys - " Function called with no parameters at before \"init\" function when \ -\\\\[helm-force-update] is pressed.")) - -(helm-document-attribute 'mode-line "optional" - " Source local `helm-mode-line-string' (included in - `mode-line-format'). It accepts also variable/function name.") - -(helm-document-attribute 'header-line "optional" - " Source local `header-line-format'. - It accepts also variable/function name. ") - -(helm-document-attribute - 'resume "optional" - " Function called with no parameters at end of initialization - when `helm-resume' is started. - If this function try to do something against `helm-buffer', \(e.g. updating, - searching etc...\) probably you should run it in a timer to ensure - `helm-buffer' is ready.") - -(helm-document-attribute 'keymap "optional" - " Specific keymap for this source. - It is useful to have a keymap per source when using more than - one source. Otherwise, a keymap can be set per command with - `helm' argument KEYMAP. NOTE: when a source have `helm-map' as - keymap attr, the global value of `helm-map' will override the - actual local one.") - -(helm-document-attribute 'help-message "optional" - " Help message for this source. - If not present, `helm-help-message' value will be used.") - -(helm-document-attribute 'match-part "optional" - " Allow matching candidate in the line with `candidates-in-buffer'. - In candidates-in-buffer sources, match is done with - `re-search-forward' which allow matching only a regexp on the - `helm-buffer'; when this search is done, match-part allow - matching only a specific part of the current line e.g. with a - line like this: - - filename:candidate-containing-the-word-filename - - What you want is to ignore \"filename\" part and match only - \"candidate-containing-the-word-filename\" - - So give a function matching only the part of candidate after \":\" - - If source contain match-part attribute, match is computed only - 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. - - NOTE: This have effect only on sources using - `candidates-in-buffer'.") - -(helm-document-attribute 'match-strict "optional" - " When specifying a match function within a source and - helm-multi-match is enabled, the result of all matching - functions will be concatened, which in some cases is not what - is wanted. When using `match-strict' only this or these - functions will be used. You can specify those functions as a - list of functions or a single symbol function. For anonymous - function don't add the dot, e.g: - - \(match-strict (lambda () (foo))).") - -(helm-document-attribute 'nohighlight "optional" - " Disable highlight match in this source.") - -(helm-document-attribute 'no-matchplugin "optional" - " Disable matchplugin for this source.") - -(helm-document-attribute 'history "optional" - " Allow passing history variable to helm from source. - It should be a quoted symbol evaluated from source, i.e: - (history . ,'history-var)") - -(helm-document-attribute 'follow "optional" - " Enable `helm-follow-mode' for this source only. - You must give it a value of 1 or -1, though giving a -1 value - is surely not what you want, e.g: (follow . 1) - - See `helm-follow-mode' for more infos") - -(helm-document-attribute 'follow-delay "optional" - " `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'.") - -(helm-document-attribute 'allow-dups "optional" - " Allow helm collecting duplicates candidates.") - -(helm-document-attribute 'filter-one-by-one "optional" - " A transformer function that treat candidates one by one. - It is called with one arg the candidate. - It is faster than `filtered-candidate-transformer' or `candidates-transformer', - but should be used only in sources that recompute constantly their candidates, - e.g. `helm-source-find-files'. - Filtering happen early and candidates are treated - one by one instead of re-looping on the whole list. - If used with `filtered-candidate-transformer' or `candidates-transformer' - these functions should treat the candidates transformed by the `filter-one-by-one' - function in consequence.") - -(helm-document-attribute 'nomark "optional" - " Don't allow marking candidates when this attribute is present.") (provide 'helm-help) diff --git a/elpa/helm-20160625.2316/helm-id-utils.el b/elpa/helm-20160711.1143/helm-id-utils.el similarity index 100% rename from elpa/helm-20160625.2316/helm-id-utils.el rename to elpa/helm-20160711.1143/helm-id-utils.el diff --git a/elpa/helm-20160625.2316/helm-imenu.el b/elpa/helm-20160711.1143/helm-imenu.el similarity index 100% rename from elpa/helm-20160625.2316/helm-imenu.el rename to elpa/helm-20160711.1143/helm-imenu.el diff --git a/elpa/helm-20160625.2316/helm-info.el b/elpa/helm-20160711.1143/helm-info.el similarity index 100% rename from elpa/helm-20160625.2316/helm-info.el rename to elpa/helm-20160711.1143/helm-info.el diff --git a/elpa/helm-20160625.2316/helm-locate.el b/elpa/helm-20160711.1143/helm-locate.el similarity index 100% rename from elpa/helm-20160625.2316/helm-locate.el rename to elpa/helm-20160711.1143/helm-locate.el diff --git a/elpa/helm-20160625.2316/helm-man.el b/elpa/helm-20160711.1143/helm-man.el similarity index 100% rename from elpa/helm-20160625.2316/helm-man.el rename to elpa/helm-20160711.1143/helm-man.el diff --git a/elpa/helm-20160625.2316/helm-misc.el b/elpa/helm-20160711.1143/helm-misc.el similarity index 100% rename from elpa/helm-20160625.2316/helm-misc.el rename to elpa/helm-20160711.1143/helm-misc.el diff --git a/elpa/helm-20160625.2316/helm-mode.el b/elpa/helm-20160711.1143/helm-mode.el similarity index 98% rename from elpa/helm-20160625.2316/helm-mode.el rename to elpa/helm-20160711.1143/helm-mode.el index 837d506..c4e3773 100644 --- a/elpa/helm-20160625.2316/helm-mode.el +++ b/elpa/helm-20160711.1143/helm-mode.el @@ -274,11 +274,17 @@ If COLLECTION is an `obarray', a TEST should be needed. See `obarray'." (helm-next-line)))) (defun helm-cr-default (default cands) - (cond ((and (stringp default) (not (string= default ""))) - (delq nil (cons default (delete default cands)))) - ((consp default) - (append default cands)) - (t cands))) + (delq nil + (cond ((and (stringp default) (not (string= default ""))) + (cons default (delete default cands))) + ((consp default) + (append (cl-loop for d in default + ;; Don't convert + ;; nil to "nil" (i.e the string) + ;; it will be delq'ed on top. + collect (if (null d) d (helm-stringify d))) + cands)) + (t cands)))) ;;;###autoload (cl-defun helm-comp-read (prompt collection @@ -460,9 +466,11 @@ that use `helm-comp-read' See `helm-M-x' for example." (append '((lambda (candidates sources) (cl-loop for i in candidates ;; Input is added to history in completing-read's - ;; and may be regexp-quoted, so unquote it. - for cand = (replace-regexp-in-string "\\s\\" "" i) - collect cand))) + ;; and may be regexp-quoted, so unquote it + ;; but check if cand is a string (it may be at this stage + ;; a symbol or nil) Issue #1553. + when (stringp i) + collect (replace-regexp-in-string "\\s\\" "" i)))) (and hist-fc-transformer (helm-mklist hist-fc-transformer))) :persistent-action persistent-action :persistent-help persistent-help diff --git a/elpa/helm-20160625.2316/helm-multi-match.el b/elpa/helm-20160711.1143/helm-multi-match.el similarity index 100% rename from elpa/helm-20160625.2316/helm-multi-match.el rename to elpa/helm-20160711.1143/helm-multi-match.el diff --git a/elpa/helm-20160625.2316/helm-net.el b/elpa/helm-20160711.1143/helm-net.el similarity index 99% rename from elpa/helm-20160625.2316/helm-net.el rename to elpa/helm-20160711.1143/helm-net.el index cc88539..26c007b 100644 --- a/elpa/helm-20160625.2316/helm-net.el +++ b/elpa/helm-20160711.1143/helm-net.el @@ -413,12 +413,13 @@ and not be prompted to kill firefox process. NOTE: Probably not supported on some systems (e.g Windows)." (interactive (list (read-string "URL: " (browse-url-url-at-point)) nil)) + (setq url (browse-url-encode-url url)) (let ((process-environment (browse-url-process-environment))) (call-process-shell-command (format "(%s %s %s &)" browse-url-firefox-program helm-browse-url-firefox-new-window - url)))) + (shell-quote-argument url))))) (defun helm-browse-url-chromium (url &optional _ignore) "Browse URL with google chrome browser." diff --git a/elpa/helm-20160625.2316/helm-org.el b/elpa/helm-20160711.1143/helm-org.el similarity index 100% rename from elpa/helm-20160625.2316/helm-org.el rename to elpa/helm-20160711.1143/helm-org.el diff --git a/elpa/helm-20160625.2316/helm-pkg.el b/elpa/helm-20160711.1143/helm-pkg.el similarity index 76% rename from elpa/helm-20160625.2316/helm-pkg.el rename to elpa/helm-20160711.1143/helm-pkg.el index af734d7..781c9a6 100644 --- a/elpa/helm-20160625.2316/helm-pkg.el +++ b/elpa/helm-20160711.1143/helm-pkg.el @@ -1,4 +1,4 @@ -(define-package "helm" "20160625.2316" "Helm is an Emacs incremental and narrowing framework" +(define-package "helm" "20160711.1143" "Helm is an Emacs incremental and narrowing framework" '((emacs "24.3") (async "1.9") (popup "0.5.3") diff --git a/elpa/helm-20160625.2316/helm-plugin.el b/elpa/helm-20160711.1143/helm-plugin.el similarity index 81% rename from elpa/helm-20160625.2316/helm-plugin.el rename to elpa/helm-20160711.1143/helm-plugin.el index 82f60d4..d88fa94 100644 --- a/elpa/helm-20160625.2316/helm-plugin.el +++ b/elpa/helm-20160711.1143/helm-plugin.el @@ -42,13 +42,6 @@ (add-to-list 'helm-compile-source-functions 'helm-compile-source--info-index) -(helm-document-attribute 'info-index "info-index plugin" - " Create a source of info index very easily. - - Example: - - (defvar helm-source-info-wget '((info-index . \"wget\"))") - ;;; Plug-in: `candidates-file' ;; @@ -76,21 +69,6 @@ (font-lock-mode -1) (auto-revert-mode 1))))) -(helm-document-attribute 'candidates-file "candidates-file plugin" - " Use a file as the candidates buffer. - - 1st argument is a filename, string or function name or variable - name. If optional 2nd argument is non-nil, the file is opened with - `auto-revert-mode' enabled. - - Example: - - \(defvar helm-source-test-file - '((name . \"test1\") - (candidates-file \"~/.emacs.el\" t))) - - Will list all lines in .emacs.el.") - ;;; Plug-in: `persistent-help' ;; @@ -117,13 +95,6 @@ "") " (keeping session)"))) - -;;; Document new attributes -;; -;; -(helm-document-attribute 'persistent-help "persistent-help plug-in" - " A string to explain persistent-action of this source. It also - accepts a function or a variable name.") (provide 'helm-plugin) diff --git a/elpa/helm-20160625.2316/helm-regexp.el b/elpa/helm-20160711.1143/helm-regexp.el similarity index 100% rename from elpa/helm-20160625.2316/helm-regexp.el rename to elpa/helm-20160711.1143/helm-regexp.el diff --git a/elpa/helm-20160625.2316/helm-ring.el b/elpa/helm-20160711.1143/helm-ring.el similarity index 100% rename from elpa/helm-20160625.2316/helm-ring.el rename to elpa/helm-20160711.1143/helm-ring.el diff --git a/elpa/helm-20160625.2316/helm-semantic.el b/elpa/helm-20160711.1143/helm-semantic.el similarity index 100% rename from elpa/helm-20160625.2316/helm-semantic.el rename to elpa/helm-20160711.1143/helm-semantic.el diff --git a/elpa/helm-20160625.2316/helm-sys.el b/elpa/helm-20160711.1143/helm-sys.el similarity index 100% rename from elpa/helm-20160625.2316/helm-sys.el rename to elpa/helm-20160711.1143/helm-sys.el diff --git a/elpa/helm-20160625.2316/helm-tags.el b/elpa/helm-20160711.1143/helm-tags.el similarity index 98% rename from elpa/helm-20160625.2316/helm-tags.el rename to elpa/helm-20160711.1143/helm-tags.el index 4cc4e6b..079c2b4 100644 --- a/elpa/helm-20160625.2316/helm-tags.el +++ b/elpa/helm-20160711.1143/helm-tags.el @@ -204,8 +204,9 @@ If no entry in cache, create one." ;; If an entry exists modify it. (setcdr it (helm-etags-mtime f)) ;; No entry create a new one. - (add-to-list 'helm-etags-mtime-alist - (cons f (helm-etags-mtime f)))))))))) + (cl-pushnew (cons f (helm-etags-mtime f)) + helm-etags-mtime-alist + :test 'equal)))))))) (defvar helm-source-etags-select nil "Helm source for Etags.") diff --git a/elpa/helm-20160625.2316/helm-types.el b/elpa/helm-20160711.1143/helm-types.el similarity index 100% rename from elpa/helm-20160625.2316/helm-types.el rename to elpa/helm-20160711.1143/helm-types.el diff --git a/elpa/helm-20160625.2316/helm-utils.el b/elpa/helm-20160711.1143/helm-utils.el similarity index 99% rename from elpa/helm-20160625.2316/helm-utils.el rename to elpa/helm-20160711.1143/helm-utils.el index e9300c7..1176013 100644 --- a/elpa/helm-20160625.2316/helm-utils.el +++ b/elpa/helm-20160711.1143/helm-utils.el @@ -384,8 +384,8 @@ from its directory." (string-match ffap-url-regexp it)) it (expand-file-name it)) default-directory)) - ((or (file-remote-p sel) - (file-exists-p sel)) + ((and (stringp sel) (or (file-remote-p sel) + (file-exists-p sel))) (expand-file-name sel)) ;; Grep. ((and grep-line (file-exists-p (car grep-line))) @@ -395,7 +395,7 @@ from its directory." (with-current-buffer (get-buffer (car grep-line)) (or (buffer-file-name) default-directory))) ;; Url. - ((and ffap-url-regexp (string-match ffap-url-regexp sel)) sel) + ((and (stringp sel) ffap-url-regexp (string-match ffap-url-regexp sel)) sel) ;; Default. (t default-preselection)))))) (put 'helm-quit-and-find-file 'helm-only t) diff --git a/elpa/helm-ag-20160622.2235/helm-ag-pkg.el b/elpa/helm-ag-20160622.2235/helm-ag-pkg.el deleted file mode 100644 index 4d4fe68..0000000 --- a/elpa/helm-ag-20160622.2235/helm-ag-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "helm-ag" "20160622.2235" "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-20160622.2235/helm-ag-autoloads.el b/elpa/helm-ag-20160702.324/helm-ag-autoloads.el similarity index 81% rename from elpa/helm-ag-20160622.2235/helm-ag-autoloads.el rename to elpa/helm-ag-20160702.324/helm-ag-autoloads.el index b9ddf27..33f8a4e 100644 --- a/elpa/helm-ag-20160622.2235/helm-ag-autoloads.el +++ b/elpa/helm-ag-20160702.324/helm-ag-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm-ag" "helm-ag.el" (22387 29365 905711 -;;;;;; 0)) +;;;### (autoloads nil "helm-ag" "helm-ag.el" (22404 60254 733822 +;;;;;; 732000)) ;;; Generated autoloads from helm-ag.el (autoload 'helm-ag-pop-stack "helm-ag" "\ @@ -15,14 +15,6 @@ (autoload 'helm-ag-clear-stack "helm-ag" "\ -\(fn)" t nil) - -(autoload 'helm-ag-mode "helm-ag" "\ -Major mode to provide actions in helm grep saved buffer. - -Special commands: -\\{helm-ag-mode-map} - \(fn)" t nil) (autoload 'helm-ag-this-file "helm-ag" "\ diff --git a/elpa/helm-ag-20160702.324/helm-ag-pkg.el b/elpa/helm-ag-20160702.324/helm-ag-pkg.el new file mode 100644 index 0000000..4d5e0d1 --- /dev/null +++ b/elpa/helm-ag-20160702.324/helm-ag-pkg.el @@ -0,0 +1 @@ +(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") diff --git a/elpa/helm-ag-20160622.2235/helm-ag.el b/elpa/helm-ag-20160702.324/helm-ag.el similarity index 99% rename from elpa/helm-ag-20160622.2235/helm-ag.el rename to elpa/helm-ag-20160702.324/helm-ag.el index bcb8d56..567eab7 100644 --- a/elpa/helm-ag-20160622.2235/helm-ag.el +++ b/elpa/helm-ag-20160702.324/helm-ag.el @@ -4,7 +4,7 @@ ;; Author: Syohei YOSHIDA ;; URL: https://github.com/syohex/emacs-helm-ag -;; Package-Version: 20160622.2235 +;; Package-Version: 20160702.324 ;; Version: 0.56 ;; Package-Requires: ((emacs "24.3") (helm "1.7.7")) @@ -430,7 +430,6 @@ Default behaviour shows finish and result in mode-line." :fuzzy-match helm-ag-fuzzy-match :action helm-ag--actions :candidate-number-limit 9999 - :keymap helm-ag-map :follow (and helm-follow-mode-persistent 1))) ;;;###autoload @@ -667,7 +666,6 @@ Default behaviour shows finish and result in mode-line." (define-key map (kbd "g") 'helm-ag--update-save-results) map)) -;;;###autoload (define-derived-mode helm-ag-mode special-mode "helm-ag" "Major mode to provide actions in helm grep saved buffer. @@ -768,7 +766,7 @@ Continue searching the parent directory? ")) (helm-ag--default-directory parent)) (setq helm-ag--last-default-directory default-directory) (helm-attrset 'name (helm-ag--helm-header default-directory) helm-ag-source) - (helm :sources '(helm-ag-source) :buffer "*helm-ag*"))))) + (helm :sources '(helm-ag-source) :buffer "*helm-ag*" :keymap helm-ag-map))))) (message nil))) ;;;###autoload @@ -782,7 +780,7 @@ Continue searching the parent directory? ")) (helm-attrset 'search-this-file (file-relative-name (buffer-file-name)) helm-ag-source) (helm-attrset 'name (format "Search at %s" filename) helm-ag-source) - (helm :sources '(helm-ag-source) :buffer "*helm-ag*"))) + (helm :sources '(helm-ag-source) :buffer "*helm-ag*" :keymap helm-ag-map))) ;;;###autoload (defun helm-ag (&optional basedir) @@ -798,7 +796,7 @@ Continue searching the parent directory? ")) (helm-ag--query) (helm-attrset 'search-this-file nil helm-ag-source) (helm-attrset 'name (helm-ag--helm-header helm-ag--default-directory) helm-ag-source) - (helm :sources '(helm-ag-source) :buffer "*helm-ag*")))) + (helm :sources '(helm-ag-source) :buffer "*helm-ag*" :keymap helm-ag-map)))) (defun helm-ag--split-string (str) (with-temp-buffer @@ -997,8 +995,7 @@ Continue searching the parent directory? ")) :nohighlight t :requires-pattern 3 :candidate-number-limit 9999 - :follow (and helm-follow-mode-persistent 1) - :keymap helm-do-ag-map)) + :follow (and helm-follow-mode-persistent 1))) (defun helm-ag--do-ag-up-one-level () (interactive) @@ -1015,7 +1012,7 @@ Continue searching the parent directory? ")) (helm-attrset 'name (helm-ag--helm-header parent) helm-source-do-ag) (helm :sources '(helm-source-do-ag) :buffer "*helm-ag*" - :input initial-input))))) + :keymap helm-do-ag-map :input initial-input))))) (message nil))) (defun helm-ag--set-do-ag-option () @@ -1047,7 +1044,7 @@ Continue searching the parent directory? ")) helm-ag--default-directory)))) (helm-attrset 'name (helm-ag--helm-header search-dir) helm-source-do-ag) - (helm :sources '(helm-source-do-ag) :buffer "*helm-ag*" + (helm :sources '(helm-source-do-ag) :buffer "*helm-ag*" :keymap helm-do-ag-map :input (or (helm-ag--marked-input) (helm-ag--insert-thing-at-point helm-ag-insert-at-point))))) diff --git a/elpa/helm-core-20160627.324/helm-core-autoloads.el b/elpa/helm-core-20160711.1141/helm-core-autoloads.el similarity index 98% rename from elpa/helm-core-20160627.324/helm-core-autoloads.el rename to elpa/helm-core-20160711.1141/helm-core-autoloads.el index d8541e8..a547cd8 100644 --- a/elpa/helm-core-20160627.324/helm-core-autoloads.el +++ b/elpa/helm-core-20160711.1141/helm-core-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "helm" "helm.el" (22387 29365 581960 874000)) +;;;### (autoloads nil "helm" "helm.el" (22404 60254 377820 872000)) ;;; Generated autoloads from helm.el (autoload 'helm-define-multi-key "helm" "\ @@ -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") (22387 29365 611862 481000)) +;;;;;; "helm-source.el") (22404 60254 406327 599000)) ;;;*** diff --git a/elpa/helm-core-20160627.324/helm-core-pkg.el b/elpa/helm-core-20160711.1141/helm-core-pkg.el similarity index 64% rename from elpa/helm-core-20160627.324/helm-core-pkg.el rename to elpa/helm-core-20160711.1141/helm-core-pkg.el index 35981f4..3a43ea1 100644 --- a/elpa/helm-core-20160627.324/helm-core-pkg.el +++ b/elpa/helm-core-20160711.1141/helm-core-pkg.el @@ -1,4 +1,4 @@ -(define-package "helm-core" "20160627.324" "Development files for Helm" +(define-package "helm-core" "20160711.1141" "Development files for Helm" '((emacs "24.3") (async "1.9")) :url "https://emacs-helm.github.io/helm/") diff --git a/elpa/helm-core-20160627.324/helm-lib.el b/elpa/helm-core-20160711.1141/helm-lib.el similarity index 100% rename from elpa/helm-core-20160627.324/helm-lib.el rename to elpa/helm-core-20160711.1141/helm-lib.el diff --git a/elpa/helm-core-20160627.324/helm-multi-match.el b/elpa/helm-core-20160711.1141/helm-multi-match.el similarity index 100% rename from elpa/helm-core-20160627.324/helm-multi-match.el rename to elpa/helm-core-20160711.1141/helm-multi-match.el diff --git a/elpa/helm-core-20160627.324/helm-source.el b/elpa/helm-core-20160711.1141/helm-source.el similarity index 99% rename from elpa/helm-core-20160627.324/helm-source.el rename to elpa/helm-core-20160711.1141/helm-source.el index 6510620..09890c6 100644 --- a/elpa/helm-core-20160627.324/helm-source.el +++ b/elpa/helm-core-20160711.1141/helm-source.el @@ -699,7 +699,7 @@ like `re-search-forward', see below documentation of :search slot.") :initform '("dummy")) (filtered-candidate-transformer - :initform 'helm-dummy-candidate) + :initform (lambda (_candidates _source) (list helm-pattern))) (matchplugin :initform nil) diff --git a/elpa/helm-core-20160627.324/helm.el b/elpa/helm-core-20160711.1141/helm.el similarity index 95% rename from elpa/helm-core-20160627.324/helm.el rename to elpa/helm-core-20160711.1141/helm.el index 42364f7..6563054 100644 --- a/elpa/helm-core-20160627.324/helm.el +++ b/elpa/helm-core-20160711.1141/helm.el @@ -662,16 +662,6 @@ See `helm-log-save-maybe' for more info." ;;; Variables. ;; ;; -(defvar helm-type-attributes nil - "It's a list of \(TYPE ATTRIBUTES ...\). -ATTRIBUTES are the same as attributes for `helm-sources'. TYPE -connects the value to the appropriate sources. Don't set this -directly, use `define-helm-type-attribute' instead. - -This alist is for specifying common attributes for multiple -sources. For example, sources which provide files can specify -common attributes with a `file' type.") - (defvar helm-source-filter nil "A list of source names to be displayed. Other sources won't appear in the search results. @@ -776,10 +766,7 @@ If `nil', `helm-debug-output' includes only variables with Default is `nil', which disables writing log messages because the size of `helm-debug-buffer' grows quickly.") -(defvar helm-compile-source-functions - '(helm-compile-source--type - helm-compile-source--dummy - helm-compile-source--candidates-in-buffer) +(defvar helm-compile-source-functions nil "Functions to compile elements of `helm-sources' (plug-in).") (defvar helm-mode-line-string "\ @@ -960,7 +947,6 @@ in some special circumstances. See `helm-exit-minibuffer' and `helm-keyboard-quit'.") (defvar helm-minibuffer-confirm-state nil) (defvar helm-quit nil) -(defvar helm-attributes nil "List of all `helm' attributes.") (defvar helm-buffers nil "Helm buffers listed in order of most recently used.") (defvar helm-current-position nil @@ -1053,7 +1039,7 @@ e.g (helm-log-error \"Error %s: %s\" (car err) (cdr err))." (apply 'helm-log (concat "ERROR: " (car args)) (cdr args)) (let ((msg (apply 'format args))) (unless (member msg helm-issued-errors) - (add-to-list 'helm-issued-errors msg)))) + (cl-pushnew msg helm-issued-errors :test 'equal)))) (defun helm-log-save-maybe () "Save log buffer if `helm-debug-root-directory' is set to a valid directory. @@ -1119,6 +1105,19 @@ and not `exit-minibuffer' or other unwanted functions." (> (length btf) 2)) return (cadr (cdr btf)))) +(defun helm-append-at-nth (seq elm index) + "Append ELM at INDEX in SEQ." + (let ((len (length seq))) + (cond ((> index len) (setq index len)) + ((< index 0) (setq index 0))) + (if (zerop index) + (append elm seq) + (cl-loop for i in seq + for count from 1 collect i + when (= count index) + if (listp elm) append elm + else collect elm)))) + ;; Test tools (defmacro with-helm-time-after-update (&rest body) @@ -1187,17 +1186,18 @@ and not `exit-minibuffer' or other unwanted functions." (progn ,@body) (error "Running helm command outside of context")))) + +;;; helm-attributes +;; (defun helm-attr (attribute-name &optional source compute) "Get the value of ATTRIBUTE-NAME of SRC. If SRC is omitted, use current source. If COMPUTE is non-`nil' compute value of ATTRIBUTE-NAME with `helm-interpret-value'. COMPUTE can have also 'ignorefn as value, in this case `helm-interpret-value' will return a function -as value unchanged, but will eval a symbol which is bound -(i.e a variable)." +as value unchanged, but will eval a symbol which is bound." (let ((src (or source (helm-get-current-source)))) - (helm-aif (or (assq attribute-name src) - (helm-get-attribute-from-source-type attribute-name src)) + (helm-aif (assq attribute-name src) (if compute (helm-interpret-value (cdr it) src compute) (cdr it))))) @@ -1210,60 +1210,18 @@ if SRC is omitted, use current source." (cl-defun helm-attrset (attribute-name value &optional - (src (helm-get-current-source)) - alter-type) + (src (helm-get-current-source))) "Set the value of ATTRIBUTE-NAME of source SRC to VALUE. -If ATTRIBUTE-NAME doesn't exists in source it is created with value VALUE. -If ALTER-TYPE is non-`nil' alter the value of ATTRIBUTE-NAME in `helm-attributes' -if it exists. +If ATTRIBUTE-NAME doesn't exists in source it is created with value VALUE.. If SRC is omitted, use current source. If operation succeed, return value, otherwise nil." - (let ((from-type (helm-get-attribute-from-source-type attribute-name src)) - done) - (helm-aif (or (assq attribute-name src) - (and alter-type from-type)) + (let (done) + (helm-aif (assq attribute-name src) (prog1 (setcdr it value) (setq done t)) - (unless from-type - (setcdr src (cons (cons attribute-name value) (cdr src))) - (setq done t))) + (setcdr src (cons (cons attribute-name value) (cdr src))) + (setq done t)) (and done value))) -(defun helm-get-attribute-from-source-type (attribute source) - "Get ATTRIBUTE from type attribute of SOURCE." - (when (assq 'type source) - (assq attribute - (assq (cdr (assq 'type source)) - helm-type-attributes)))) - -(defun helm-get-attribute-from-type (attribute type) - "Get ATTRIBUTE from TYPE. -arg TYPE is an existing type defined in `helm-type-attributes'." - (assq attribute (assq type helm-type-attributes))) - -(defun helm-get-actions-from-type (source) - "Get actions list from type attribute of SOURCE." - (when (assq 'type source) - (helm-get-attribute-from-source-type 'action source))) - -(defun helm-inherit-attribute-from-source (attribute source) - "Get the ATTRIBUTE of SOURCE." - (helm-aif (assq attribute source) - it - (helm-get-attribute-from-source-type attribute source))) - -(defun helm-append-at-nth (seq elm index) - "Append ELM at INDEX in SEQ." - (let ((len (length seq))) - (cond ((> index len) (setq index len)) - ((< index 0) (setq index 0))) - (if (zerop index) - (append elm seq) - (cl-loop for i in seq - for count from 1 collect i - when (= count index) - if (listp elm) append elm - else collect elm)))) - (defun helm-add-action-to-source (name fn source &optional index) "Add new action NAME linked to function FN to SOURCE. Function FN should be a valid function that takes one arg i.e candidate, @@ -1336,6 +1294,9 @@ only when predicate helm-ff-candidates-lisp-p return non-`nil': :test 'equal) source)))) + +;;; Source filter +;; (defun helm-set-source-filter (sources) "Set the value of `helm-source-filter' to SOURCES and update. @@ -2226,7 +2187,8 @@ value of `helm-full-frame' or `helm-split-window-default-side'." (not helm-split-window-in-side-p)) (delete-other-windows)) (display-buffer - buffer `(nil . ((window-height . ,helm-display-buffer-default-size)))))) + buffer `(nil . ((window-height . ,helm-display-buffer-default-size)))) + (helm-log-run-hook 'helm-window-configuration-hook))) ;;; Core: initialize @@ -3358,7 +3320,7 @@ to a particular place after finishing update." (goto-char (point-min)) (unless without-hook (save-excursion (helm-log-run-hook 'helm-update-hook))) - (helm-next-line)) + (helm-move-selection-common :where 'line :direction 'next :follow nil)) (defun helm-force-update (&optional preselect) "Force recalculation and update of candidates. @@ -3743,12 +3705,11 @@ DIRECTION is either 'next or 'previous." (" " mode-line-buffer-identification " " (:eval (format "L%-3d" (helm-candidate-number-at-point))) ,follow + " " (:eval ,(and marked - (concat - " " - (propertize - (format "M%d" (length marked)) - 'face 'helm-visible-mark)))) + (propertize + (format "M%d" (length marked)) + 'face 'helm-visible-mark))) (:eval (when ,helm--mode-line-display-prefarg (let ((arg (prefix-numeric-value (or prefix-arg current-prefix-arg)))) @@ -3849,7 +3810,7 @@ it is \"Candidate\(s\)\" by default." cand-name)) 'face 'helm-candidate-number))))) -(cl-defun helm-move-selection-common (&key where direction) +(cl-defun helm-move-selection-common (&key where direction (follow t)) "Move the selection marker to a new position. Position is determined by WHERE and DIRECTION. Key arg WHERE can be one of: @@ -3888,6 +3849,8 @@ Key arg DIRECTION can be one of: (helm-display-source-at-screen-top-maybe where) (when (helm-get-previous-header-pos) (helm-mark-current-line)) + (when follow + (helm-follow-execute-persistent-action-maybe)) (helm-display-mode-line (helm-get-current-source)) (helm-log-run-hook 'helm-move-selection-after-hook))))) @@ -4120,8 +4083,7 @@ candidates." header-pos (point-max))) (1+ (point-at-eol)))) - (setq helm-selection-point (overlay-start helm-selection-overlay))) - (helm-follow-execute-persistent-action-maybe)) + (setq helm-selection-point (overlay-start helm-selection-overlay)))) (defun helm-confirm-and-exit-minibuffer () "Maybe ask for confirmation when exiting helm. @@ -4438,103 +4400,8 @@ When at the end of minibuffer, deletes all." (helm--delete-minibuffer-contents-from str))) -;;; Plugins (Deprecated in favor of helm-types) +;;; helm-source-in-buffer. ;; -;; i.e Inherit instead of helm-type-* classes in your own classes. - -;; [DEPRECATED] Enable multi-match by default in old sources. -;; This is deprecated and will not run in sources -;; created by helm-source. -;; Keep it for backward compatibility with old sources. -(defun helm-compile-source--multi-match (source) - (if (assoc 'no-matchplugin source) - source - (let* ((searchers helm-mm-default-search-functions) - (defmatch (helm-aif (assoc-default 'match source) - (helm-mklist it))) - (defmatch-strict (helm-aif (assoc-default 'match-strict source) - (helm-mklist it))) - (defsearch (helm-aif (assoc-default 'search source) - (helm-mklist it))) - (defsearch-strict (helm-aif (assoc-default 'search-strict source) - (helm-mklist it))) - (matchfns (cond (defmatch-strict) - (defmatch - (append helm-mm-default-match-functions defmatch)) - (t helm-mm-default-match-functions))) - (searchfns (cond (defsearch-strict) - (defsearch - (append searchers defsearch)) - (t searchers)))) - `(,(if (assoc 'candidates-in-buffer source) - `(search ,@searchfns) `(match ,@matchfns)) - ,@source)))) - -(add-to-list 'helm-compile-source-functions 'helm-compile-source--multi-match) - -(defun helm-compile-source--type (source) - (helm-aif (assoc-default 'type source) - (append source (assoc-default it helm-type-attributes) nil) - source)) - -(defun define-helm-type-attribute (type definition &optional doc) - "Register type attribute of TYPE as DEFINITION with DOC. -DOC is displayed in `helm-type-attributes' docstring. - -Using this function is better than setting `helm-type-attributes' -directly." - (cl-loop for i in definition do - ;; without `ignore-errors', error at emacs22 - (ignore-errors (setf i (delete nil i)))) - (helm-add-type-attribute type definition) - (and doc (helm-document-type-attribute type doc)) - nil) - -(defun helm-document-attribute (attribute short-doc &optional long-doc) - "Register ATTRIBUTE documentation introduced by plug-in. -SHORT-DOC is displayed beside attribute name. -LONG-DOC is displayed below attribute name and short documentation." - (declare (indent 2)) - (if long-doc - (setq short-doc (concat "(" short-doc ")")) - (setq long-doc short-doc - short-doc "")) - (add-to-list 'helm-attributes attribute t) - (put attribute 'helm-attrdoc - (concat "- " (symbol-name attribute) - " " short-doc "\n\n" long-doc "\n"))) - -(defun helm-add-type-attribute (type definition) - (helm-aif (assq type helm-type-attributes) - (setq helm-type-attributes (delete it helm-type-attributes))) - (push (cons type definition) helm-type-attributes)) - -(defun helm-document-type-attribute (type doc) - (add-to-list 'helm-types type t) - (put type 'helm-typeattrdoc - (concat "- " (symbol-name type) "\n\n" doc "\n"))) - -;; Built-in plug-in: dummy -(defun helm-dummy-candidate (_candidate _source) - "Use `helm-pattern' as CANDIDATE in SOURCE." - ;; `source' is defined in filtered-candidate-transformer - (list helm-pattern)) - -(defun helm-compile-source--dummy (source) - (if (assoc 'dummy source) - (progn - (unless (helm-attr-defined - 'filtered-candidate-transformer source) - (helm-attrset 'filtered-candidate-transformer - 'helm-dummy-candidate source)) - (append source - '((candidates "dummy") - (accept-empty) - (match identity) - (volatile)))) - source)) - -;; Built-in plug-in: candidates-in-buffer (defun helm-candidates-in-buffer (&optional source) "The top level function used to store candidates in `helm-source-in-buffer'. @@ -4832,15 +4699,6 @@ Returns the resulting buffer." (and (stringp data) (insert data)))) buf)) -(defun helm-compile-source--candidates-in-buffer (source) - (helm-aif (assoc 'candidates-in-buffer source) - (append source - `((candidates . ,(or (cdr it) - (lambda () - (helm-candidates-in-buffer source)))) - (volatile) (match identity))) - source)) - ;;; Resplit helm window ;; @@ -5159,9 +5017,9 @@ Argument ACTION, when present, is used as second argument of `display-buffer'." (set (make-local-variable 'helm-visible-mark-overlays) nil))) (defun helm-this-visible-mark () - (cl-loop for o in helm-visible-mark-overlays - when (equal (point-at-bol) (overlay-start o)) - return o)) + (cl-loop for o in (overlays-at (point)) + when (overlay-get o 'visible-mark) + return o)) (defun helm-delete-visible-mark (overlay) (setq helm-marked-candidates @@ -5172,7 +5030,7 @@ Argument ACTION, when present, is used as second argument of `display-buffer'." (setq helm-visible-mark-overlays (delq overlay helm-visible-mark-overlays))) -(defun helm-make-visible-mark () +(defun helm-make-visible-mark (&optional src selection) (let ((o (make-overlay (point-at-bol) (if (helm-pos-multiline-p) (or (helm-get-next-candidate-separator-pos) @@ -5180,11 +5038,13 @@ Argument ACTION, when present, is used as second argument of `display-buffer'." (1+ (point-at-eol)))))) (overlay-put o 'priority 0) (overlay-put o 'face 'helm-visible-mark) - (overlay-put o 'source (assoc-default 'name (helm-get-current-source))) + (overlay-put o 'source (assoc-default 'name (or src (helm-get-current-source)))) (overlay-put o 'string (buffer-substring (overlay-start o) (overlay-end o))) - (overlay-put o 'real (helm-get-selection)) - (add-to-list 'helm-visible-mark-overlays o)) - (push (cons (helm-get-current-source) (helm-get-selection)) + (overlay-put o 'real (or selection (helm-get-selection))) + (overlay-put o 'visible-mark t) + (cl-pushnew o helm-visible-mark-overlays)) + (push (cons (or src (helm-get-current-source)) + (or selection (helm-get-selection))) helm-marked-candidates)) (defun helm-toggle-visible-mark () @@ -5215,56 +5075,54 @@ Argument ACTION, when present, is used as second argument of `display-buffer'." (interactive) (with-helm-alive-p (with-helm-window - (let ((nomark (assq 'nomark (helm-get-current-source))) - (follow (if helm-follow-mode 1 -1))) - (helm-follow-mode -1) - (unwind-protect - (if nomark - (message "Marking not allowed in this source") - (save-excursion - (goto-char (helm-get-previous-header-pos)) - (helm-next-line) - (let* ((next-head (helm-get-next-header-pos)) - (end (and next-head - (save-excursion - (goto-char next-head) - (forward-line -1) - (point)))) - (maxpoint (or end (point-max)))) - (while (< (point) maxpoint) - (helm-mark-current-line) - (let* ((prefix (get-text-property (point-at-bol) 'display)) - (cand (helm-get-selection)) - (bn (and (helm-file-completion-source-p) - (helm-basename cand))) - (src-name (assoc-default 'name - (helm-get-current-source)))) - (when (and (not (helm-this-visible-mark)) - (not (or (string= prefix "[?]") - (string= prefix "[@]")))) + (let* ((follow (if helm-follow-mode 1 -1)) + (src (helm-get-current-source)) + (nomark (assq 'nomark src)) + (src-name (assoc-default 'name src)) + (filecomp-p (or (helm-file-completion-source-p) + (string= src-name "Files from Current Directory"))) + (remote-p (and filecomp-p (file-remote-p helm-pattern)))) + (cl-letf (((symbol-function 'message) #'ignore)) + (helm-follow-mode -1) + (unwind-protect + (if nomark + (message "Marking not allowed in this source") + (save-excursion + (goto-char (helm-get-previous-header-pos)) + (forward-line 1) + (let* ((next-head (helm-get-next-header-pos)) + (end (and next-head + (save-excursion + (goto-char next-head) + (forward-line -1) + (point)))) + (maxpoint (or end (point-max)))) + (while (< (point) maxpoint) + (helm-mark-current-line) + (let* ((prefix (get-text-property (point-at-bol) 'display)) + (cand (helm-get-selection)) + (bn (and filecomp-p (helm-basename cand)))) ;; Don't mark possibles directories ending with . or .. ;; autosave files/links and non--existent file. (unless - (and (or (helm-file-completion-source-p) - (string= - src-name "Files from Current Directory")) - (or (string-match - "^[.]?#.*#?$\\|[^#]*[.]\\{1,2\\}$" bn) - ;; We need to test here when not using - ;; a transformer that tag prefix - ;; (i.e on tramp). - (not (file-exists-p cand)))) - (helm-make-visible-mark)))) - (if (helm-pos-multiline-p) - (progn - (goto-char - (or (helm-get-next-candidate-separator-pos) - (point-max))) - (forward-line 1)) - (forward-line 1)) - (end-of-line)))) - (helm-mark-current-line)) - (helm-follow-mode follow) (message nil)))))) + (or (helm-this-visible-mark) + (string= prefix "[?]") ; doesn't match + (and filecomp-p + (or (string-match-p ; autosave or dot files + "^[.]?#.*#?$\\|[^#]*[.]\\{1,2\\}$" bn) + ;; We need to test here when not using + ;; a transformer that put a prefix tag + ;; before candidate. + ;; (i.e no [?] prefix on tramp). + (and remote-p (not (file-exists-p cand)))))) + (helm-make-visible-mark src cand))) + (when (helm-pos-multiline-p) + (goto-char + (or (helm-get-next-candidate-separator-pos) + (point-max)))) + (forward-line 1)))) + (helm-mark-current-line)) + (helm-follow-mode follow))))))) (put 'helm-mark-all 'helm-only t) (defun helm-unmark-all () @@ -5292,7 +5150,7 @@ visible or invisible in all sources of current helm session" (helm-mark-all))))) (put 'helm-toggle-all-marks 'helm-only t) -(defun helm--compute-marked (real source wildcard) +(defun helm--compute-marked (real source &optional wildcard) (let* ((coerced (helm-coerce-selection real source)) (wilds (and wildcard (condition-case nil @@ -5318,8 +5176,9 @@ selection. When key WITH-WILDCARD is specified, expand it." (let ((candidates (cl-loop with current-src = (helm-get-current-source) for (source . real) in (reverse helm-marked-candidates) + for use-wc = (and with-wildcard (string-match-p "\\*" real)) when (equal (assq 'name source) (assq 'name current-src)) - append (helm--compute-marked real source with-wildcard) + append (helm--compute-marked real source use-wc) into cands finally return (or cands (append diff --git a/elpa/js2-mode-20160626.2025/js2-imenu-extras.el b/elpa/js2-mode-20160707.723/js2-imenu-extras.el similarity index 100% rename from elpa/js2-mode-20160626.2025/js2-imenu-extras.el rename to elpa/js2-mode-20160707.723/js2-imenu-extras.el diff --git a/elpa/js2-mode-20160626.2025/js2-mode-autoloads.el b/elpa/js2-mode-20160707.723/js2-mode-autoloads.el similarity index 87% rename from elpa/js2-mode-20160626.2025/js2-mode-autoloads.el rename to elpa/js2-mode-20160707.723/js2-mode-autoloads.el index a9ea407..1497d98 100644 --- a/elpa/js2-mode-20160626.2025/js2-mode-autoloads.el +++ b/elpa/js2-mode-20160707.723/js2-mode-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "js2-imenu-extras" "js2-imenu-extras.el" (22387 -;;;;;; 29360 905580 641000)) +;;;### (autoloads nil "js2-imenu-extras" "js2-imenu-extras.el" (22404 +;;;;;; 60250 41798 228000)) ;;; Generated autoloads from js2-imenu-extras.el (autoload 'js2-imenu-extras-setup "js2-imenu-extras" "\ @@ -19,8 +19,8 @@ Toggle Imenu support for frameworks and structural patterns. ;;;*** -;;;### (autoloads nil "js2-mode" "js2-mode.el" (22387 29360 929562 -;;;;;; 12000)) +;;;### (autoloads nil "js2-mode" "js2-mode.el" (22404 60250 57798 +;;;;;; 312000)) ;;; Generated autoloads from js2-mode.el (autoload 'js2-highlight-unused-variables-mode "js2-mode" "\ @@ -49,14 +49,14 @@ variables (`sgml-basic-offset' et al) locally, like so: (defun set-jsx-indentation () (setq-local sgml-basic-offset js2-basic-offset)) - (add-hook 'js2-jsx-mode-hook #'set-jsx-indentation) + (add-hook \\='js2-jsx-mode-hook #\\='set-jsx-indentation) \(fn)" t nil) ;;;*** ;;;### (autoloads nil nil ("js2-mode-pkg.el" "js2-old-indent.el") -;;;;;; (22387 29360 947929 521000)) +;;;;;; (22404 60250 71483 180000)) ;;;*** diff --git a/elpa/js2-mode-20160626.2025/js2-mode-pkg.el b/elpa/js2-mode-20160707.723/js2-mode-pkg.el similarity index 68% rename from elpa/js2-mode-20160626.2025/js2-mode-pkg.el rename to elpa/js2-mode-20160707.723/js2-mode-pkg.el index 0fb0f98..2a7d0e6 100644 --- a/elpa/js2-mode-20160626.2025/js2-mode-pkg.el +++ b/elpa/js2-mode-20160707.723/js2-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "js2-mode" "20160626.2025" "Improved JavaScript editing mode" +(define-package "js2-mode" "20160707.723" "Improved JavaScript editing mode" '((emacs "24.1") (cl-lib "0.5")) :url "https://github.com/mooz/js2-mode/" :keywords diff --git a/elpa/js2-mode-20160626.2025/js2-mode.el b/elpa/js2-mode-20160707.723/js2-mode.el similarity index 99% rename from elpa/js2-mode-20160626.2025/js2-mode.el rename to elpa/js2-mode-20160707.723/js2-mode.el index e0ad559..7866a0a 100644 --- a/elpa/js2-mode-20160626.2025/js2-mode.el +++ b/elpa/js2-mode-20160707.723/js2-mode.el @@ -6934,6 +6934,7 @@ of a simple name. Called before EXPR has a parent node." "member" "memberOf" "method" + "module" "name" "namespace" "since" @@ -11619,7 +11620,7 @@ variables (`sgml-basic-offset' et al) locally, like so: (defun set-jsx-indentation () (setq-local sgml-basic-offset js2-basic-offset)) - (add-hook 'js2-jsx-mode-hook #'set-jsx-indentation)" + (add-hook \\='js2-jsx-mode-hook #\\='set-jsx-indentation)" (set (make-local-variable 'indent-line-function) #'js2-jsx-indent-line)) (defun js2-mode-exit () diff --git a/elpa/js2-mode-20160626.2025/js2-old-indent.el b/elpa/js2-mode-20160707.723/js2-old-indent.el similarity index 100% rename from elpa/js2-mode-20160626.2025/js2-old-indent.el rename to elpa/js2-mode-20160707.723/js2-old-indent.el diff --git a/elpa/json-mode-20160601.356/json-mode-pkg.el b/elpa/json-mode-20160601.356/json-mode-pkg.el deleted file mode 100644 index 29d99d1..0000000 --- a/elpa/json-mode-20160601.356/json-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "json-mode" "20160601.356" "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-20160601.356/json-mode-autoloads.el b/elpa/json-mode-20160710.1637/json-mode-autoloads.el similarity index 89% rename from elpa/json-mode-20160601.356/json-mode-autoloads.el rename to elpa/json-mode-20160710.1637/json-mode-autoloads.el index 8807f67..51aad2c 100644 --- a/elpa/json-mode-20160601.356/json-mode-autoloads.el +++ b/elpa/json-mode-20160710.1637/json-mode-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "json-mode" "json-mode.el" (22387 29360 294055 -;;;;;; 690000)) +;;;### (autoloads nil "json-mode" "json-mode.el" (22404 60234 333716 +;;;;;; 283000)) ;;; Generated autoloads from json-mode.el (autoload 'json-mode "json-mode" "\ diff --git a/elpa/json-mode-20160710.1637/json-mode-pkg.el b/elpa/json-mode-20160710.1637/json-mode-pkg.el new file mode 100644 index 0000000..557d15c --- /dev/null +++ b/elpa/json-mode-20160710.1637/json-mode-pkg.el @@ -0,0 +1 @@ +(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") diff --git a/elpa/json-mode-20160601.356/json-mode.el b/elpa/json-mode-20160710.1637/json-mode.el similarity index 94% rename from elpa/json-mode-20160601.356/json-mode.el rename to elpa/json-mode-20160710.1637/json-mode.el index ab13bad..c5d13af 100644 --- a/elpa/json-mode-20160601.356/json-mode.el +++ b/elpa/json-mode-20160710.1637/json-mode.el @@ -4,7 +4,7 @@ ;; Author: Josh Johnston ;; URL: https://github.com/joshwnj/json-mode -;; Package-Version: 20160601.356 +;; Package-Version: 20160710.1637 ;; Version: 1.6.0 ;; Package-Requires: ((json-reformat "0.0.5") (json-snatcher "1.0.0")) @@ -80,10 +80,12 @@ ;; delete the window if we have one, ;; so we can recreate it in the correct position (if temp-window - (delete-window temp-window)) + (delete-window temp-window)) ;; always put the temp window below the json window - (set-window-buffer (split-window-below) temp-name)) + (set-window-buffer (if (fboundp 'split-window-below) + (split-window-below) + (split-window-vertically)) temp-name)) )) (define-key json-mode-map (kbd "C-c C-p") 'json-mode-show-path) diff --git a/elpa/magit-20160624.2127/AUTHORS.md b/elpa/magit-20160710.1341/AUTHORS.md similarity index 100% rename from elpa/magit-20160624.2127/AUTHORS.md rename to elpa/magit-20160710.1341/AUTHORS.md diff --git a/elpa/magit-20160624.2127/COPYING b/elpa/magit-20160710.1341/COPYING similarity index 100% rename from elpa/magit-20160624.2127/COPYING rename to elpa/magit-20160710.1341/COPYING diff --git a/elpa/magit-20160624.2127/dir b/elpa/magit-20160710.1341/dir similarity index 100% rename from elpa/magit-20160624.2127/dir rename to elpa/magit-20160710.1341/dir diff --git a/elpa/magit-20160624.2127/git-rebase.el b/elpa/magit-20160710.1341/git-rebase.el similarity index 100% rename from elpa/magit-20160624.2127/git-rebase.el rename to elpa/magit-20160710.1341/git-rebase.el diff --git a/elpa/magit-20160624.2127/magit-apply.el b/elpa/magit-20160710.1341/magit-apply.el similarity index 100% rename from elpa/magit-20160624.2127/magit-apply.el rename to elpa/magit-20160710.1341/magit-apply.el diff --git a/elpa/magit-20160624.2127/magit-autoloads.el b/elpa/magit-20160710.1341/magit-autoloads.el similarity index 97% rename from elpa/magit-20160624.2127/magit-autoloads.el rename to elpa/magit-20160710.1341/magit-autoloads.el index 8e88270..ccce6f6 100644 --- a/elpa/magit-20160624.2127/magit-autoloads.el +++ b/elpa/magit-20160710.1341/magit-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "git-rebase" "git-rebase.el" (22387 29359 694521 -;;;;;; 736000)) +;;;### (autoloads nil "git-rebase" "git-rebase.el" (22404 60233 693712 +;;;;;; 948000)) ;;; 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" (22387 29359 782453 339000)) +;;;### (autoloads nil "magit" "magit.el" (22404 60233 789713 449000)) ;;; Generated autoloads from magit.el (autoload 'magit-status "magit" "\ @@ -489,8 +489,8 @@ Git, and Emacs in the echo area. ;;;*** -;;;### (autoloads nil "magit-apply" "magit-apply.el" (22387 29359 -;;;;;; 714506 191000)) +;;;### (autoloads nil "magit-apply" "magit-apply.el" (22404 60233 +;;;;;; 721713 93000)) ;;; Generated autoloads from magit-apply.el (autoload 'magit-stage-file "magit-apply" "\ @@ -526,8 +526,8 @@ Remove all changes from the staging area. ;;;*** -;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22387 -;;;;;; 29359 654552 825000)) +;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22404 +;;;;;; 60233 657712 760000)) ;;; Generated autoloads from magit-autorevert.el (defvar magit-revert-buffers t) @@ -555,8 +555,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode. ;;;*** -;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22387 29359 -;;;;;; 710509 300000)) +;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22404 60233 +;;;;;; 717713 73000)) ;;; Generated autoloads from magit-bisect.el (autoload 'magit-bisect-popup "magit-bisect" nil t) @@ -607,8 +607,8 @@ bisect run'. ;;;*** -;;;### (autoloads nil "magit-blame" "magit-blame.el" (22387 29359 -;;;;;; 762468 884000)) +;;;### (autoloads nil "magit-blame" "magit-blame.el" (22404 60233 +;;;;;; 769713 343000)) ;;; Generated autoloads from magit-blame.el (autoload 'magit-blame-popup "magit-blame" nil t) @@ -632,8 +632,8 @@ only arguments available from `magit-blame-popup' should be used. ;;;*** -;;;### (autoloads nil "magit-commit" "magit-commit.el" (22387 29359 -;;;;;; 662546 607000)) +;;;### (autoloads nil "magit-commit" "magit-commit.el" (22404 60233 +;;;;;; 661712 781000)) ;;; Generated autoloads from magit-commit.el (autoload 'magit-commit "magit-commit" "\ @@ -715,8 +715,8 @@ Create a squash commit targeting COMMIT and instantly rebase. ;;;*** -;;;### (autoloads nil "magit-diff" "magit-diff.el" (22387 29359 754475 -;;;;;; 101000)) +;;;### (autoloads nil "magit-diff" "magit-diff.el" (22404 60233 761713 +;;;;;; 302000)) ;;; Generated autoloads from magit-diff.el (autoload 'magit-diff-popup "magit-diff" "\ @@ -800,8 +800,8 @@ for a revision. ;;;*** -;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22387 29359 -;;;;;; 746481 319000)) +;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22404 60233 +;;;;;; 749713 239000)) ;;; Generated autoloads from magit-ediff.el (autoload 'magit-ediff-popup "magit-ediff" nil t) @@ -889,8 +889,8 @@ stash that were staged. ;;;*** -;;;### (autoloads nil "magit-extras" "magit-extras.el" (22387 29359 -;;;;;; 666543 498000)) +;;;### (autoloads nil "magit-extras" "magit-extras.el" (22404 60233 +;;;;;; 665712 802000)) ;;; Generated autoloads from magit-extras.el (autoload 'magit-run-git-gui "magit-extras" "\ @@ -960,8 +960,8 @@ on a position in a file-visiting buffer. ;;;*** -;;;### (autoloads nil "magit-log" "magit-log.el" (22387 29359 750478 -;;;;;; 210000)) +;;;### (autoloads nil "magit-log" "magit-log.el" (22404 60233 753713 +;;;;;; 260000)) ;;; Generated autoloads from magit-log.el (autoload 'magit-log-buffer-file-popup "magit-log" "\ @@ -1038,8 +1038,8 @@ Show commits in a branch that are not merged in the upstream branch. ;;;*** -;;;### (autoloads nil "magit-remote" "magit-remote.el" (22387 29359 -;;;;;; 798440 903000)) +;;;### (autoloads nil "magit-remote" "magit-remote.el" (22404 60233 +;;;;;; 805713 531000)) ;;; Generated autoloads from magit-remote.el (autoload 'magit-clone "magit-remote" "\ @@ -1271,8 +1271,8 @@ is asked to pull. START has to be reachable from that commit. ;;;*** -;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22387 -;;;;;; 29359 786450 230000)) +;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22404 +;;;;;; 60233 793713 468000)) ;;; Generated autoloads from magit-sequence.el (autoload 'magit-sequencer-continue "magit-sequence" "\ @@ -1422,8 +1422,8 @@ Abort the current rebase operation, restoring the original branch. ;;;*** -;;;### (autoloads nil "magit-stash" "magit-stash.el" (22387 29359 -;;;;;; 734490 646000)) +;;;### (autoloads nil "magit-stash" "magit-stash.el" (22404 60233 +;;;;;; 741713 198000)) ;;; Generated autoloads from magit-stash.el (autoload 'magit-stash-popup "magit-stash" nil t) @@ -1522,8 +1522,8 @@ Show all diffs of a stash in a buffer. ;;;*** -;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22387 -;;;;;; 29359 818425 358000)) +;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22404 +;;;;;; 60233 829713 656000)) ;;; Generated autoloads from magit-submodule.el (autoload 'magit-submodule-popup "magit-submodule" nil t) @@ -1608,8 +1608,8 @@ These sections can be expanded to show the respective commits. ;;;*** -;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22387 29359 -;;;;;; 702515 518000)) +;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22404 60233 +;;;;;; 701712 989000)) ;;; Generated autoloads from magit-subtree.el (autoload 'magit-subtree-popup "magit-subtree" nil t) @@ -1645,8 +1645,8 @@ Extract the history of the subtree PREFIX. ;;;*** -;;;### (autoloads nil "magit-wip" "magit-wip.el" (22387 29359 674537 -;;;;;; 281000)) +;;;### (autoloads nil "magit-wip" "magit-wip.el" (22404 60233 677712 +;;;;;; 864000)) ;;; Generated autoloads from magit-wip.el (defvar magit-wip-after-save-mode nil "\ @@ -1713,7 +1713,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") -;;;;;; (22387 29359 834918 545000)) +;;;;;; (22404 60233 846102 992000)) ;;;*** diff --git a/elpa/magit-20160624.2127/magit-autorevert.el b/elpa/magit-20160710.1341/magit-autorevert.el similarity index 100% rename from elpa/magit-20160624.2127/magit-autorevert.el rename to elpa/magit-20160710.1341/magit-autorevert.el diff --git a/elpa/magit-20160624.2127/magit-bisect.el b/elpa/magit-20160710.1341/magit-bisect.el similarity index 100% rename from elpa/magit-20160624.2127/magit-bisect.el rename to elpa/magit-20160710.1341/magit-bisect.el diff --git a/elpa/magit-20160624.2127/magit-blame.el b/elpa/magit-20160710.1341/magit-blame.el similarity index 100% rename from elpa/magit-20160624.2127/magit-blame.el rename to elpa/magit-20160710.1341/magit-blame.el diff --git a/elpa/magit-20160624.2127/magit-commit.el b/elpa/magit-20160710.1341/magit-commit.el similarity index 100% rename from elpa/magit-20160624.2127/magit-commit.el rename to elpa/magit-20160710.1341/magit-commit.el diff --git a/elpa/magit-20160624.2127/magit-core.el b/elpa/magit-20160710.1341/magit-core.el similarity index 100% rename from elpa/magit-20160624.2127/magit-core.el rename to elpa/magit-20160710.1341/magit-core.el diff --git a/elpa/magit-20160624.2127/magit-diff.el b/elpa/magit-20160710.1341/magit-diff.el similarity index 99% rename from elpa/magit-20160624.2127/magit-diff.el rename to elpa/magit-20160710.1341/magit-diff.el index a2749aa..7fc4497 100644 --- a/elpa/magit-20160624.2127/magit-diff.el +++ b/elpa/magit-20160710.1341/magit-diff.el @@ -37,8 +37,6 @@ (declare-function magit-dired-jump 'magit) (declare-function magit-find-file-noselect 'magit) (declare-function magit-status-internal 'magit) -;; For `magit-diff-wash-revision' -(declare-function magit-insert-tags-header 'magit) ;; For `magit-diff-while-committing' (declare-function magit-commit-message-buffer 'magit) ;; For `magit-insert-revision-gravatar' diff --git a/elpa/magit-20160624.2127/magit-ediff.el b/elpa/magit-20160710.1341/magit-ediff.el similarity index 98% rename from elpa/magit-20160624.2127/magit-ediff.el rename to elpa/magit-20160710.1341/magit-ediff.el index e4b41cf..dbdb5dd 100644 --- a/elpa/magit-20160624.2127/magit-ediff.el +++ b/elpa/magit-20160710.1341/magit-ediff.el @@ -165,13 +165,16 @@ FILE has to be relative to the top directory of the repository." (bufA (magit-get-revision-buffer "HEAD" file)) (bufB (get-buffer (concat file ".~{index}~"))) (bufBrw (and bufB (with-current-buffer bufB (not buffer-read-only)))) - (bufC (get-file-buffer file))) + (bufC (get-file-buffer file)) + (fileBufC (or bufC (find-file-noselect file))) + (coding-system-for-read + (with-current-buffer fileBufC buffer-file-coding-system))) (ediff-buffers3 (or bufA (magit-find-file-noselect "HEAD" file)) (with-current-buffer (magit-find-file-index-noselect file t) (setq buffer-read-only nil) (current-buffer)) - (or bufC (find-file-noselect file)) + fileBufC `((lambda () (setq-local ediff-quit-hook diff --git a/elpa/magit-20160624.2127/magit-extras.el b/elpa/magit-20160710.1341/magit-extras.el similarity index 100% rename from elpa/magit-20160624.2127/magit-extras.el rename to elpa/magit-20160710.1341/magit-extras.el diff --git a/elpa/magit-20160624.2127/magit-git.el b/elpa/magit-20160710.1341/magit-git.el similarity index 99% rename from elpa/magit-20160624.2127/magit-git.el rename to elpa/magit-20160710.1341/magit-git.el index 548dc0b..5323e35 100644 --- a/elpa/magit-20160624.2127/magit-git.el +++ b/elpa/magit-20160710.1341/magit-git.el @@ -61,7 +61,7 @@ ;; wrappers "cmd/git.exe" or "cmd/git.cmd", which are much slower ;; than using "bin/git.exe" directly. (or (and (eq system-type 'windows-nt) - (--when-let (executable-find "git.exe") + (--when-let (executable-find "git") (or (ignore-errors ;; Git for Windows 2.x provides cygpath so we can ;; ask it for native paths. Using an upper case diff --git a/elpa/magit-20160624.2127/magit-log.el b/elpa/magit-20160710.1341/magit-log.el similarity index 99% rename from elpa/magit-20160624.2127/magit-log.el rename to elpa/magit-20160710.1341/magit-log.el index 6d1fc91..4034da1 100644 --- a/elpa/magit-20160624.2127/magit-log.el +++ b/elpa/magit-20160710.1341/magit-log.el @@ -32,9 +32,7 @@ (require 'magit-core) (require 'magit-diff) -(declare-function magit-blame-chunk-get 'magit-blame) (declare-function magit-blob-visit 'magit) -(declare-function magit-find-file-noselect 'magit) (declare-function magit-insert-head-branch-header 'magit) (declare-function magit-insert-upstream-branch-header 'magit) (declare-function magit-read-file-from-rev 'magit) diff --git a/elpa/magit-20160624.2127/magit-mode.el b/elpa/magit-20160710.1341/magit-mode.el similarity index 100% rename from elpa/magit-20160624.2127/magit-mode.el rename to elpa/magit-20160710.1341/magit-mode.el diff --git a/elpa/magit-20160624.2127/magit-pkg.el b/elpa/magit-20160710.1341/magit-pkg.el similarity index 82% rename from elpa/magit-20160624.2127/magit-pkg.el rename to elpa/magit-20160710.1341/magit-pkg.el index ba00ebf..e630381 100644 --- a/elpa/magit-20160624.2127/magit-pkg.el +++ b/elpa/magit-20160710.1341/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20160624.2127" "A Git porcelain inside Emacs" +(define-package "magit" "20160710.1341" "A Git porcelain inside Emacs" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113") diff --git a/elpa/magit-20160624.2127/magit-process.el b/elpa/magit-20160710.1341/magit-process.el similarity index 100% rename from elpa/magit-20160624.2127/magit-process.el rename to elpa/magit-20160710.1341/magit-process.el diff --git a/elpa/magit-20160624.2127/magit-remote.el b/elpa/magit-20160710.1341/magit-remote.el similarity index 100% rename from elpa/magit-20160624.2127/magit-remote.el rename to elpa/magit-20160710.1341/magit-remote.el diff --git a/elpa/magit-20160624.2127/magit-section.el b/elpa/magit-20160710.1341/magit-section.el similarity index 100% rename from elpa/magit-20160624.2127/magit-section.el rename to elpa/magit-20160710.1341/magit-section.el diff --git a/elpa/magit-20160624.2127/magit-sequence.el b/elpa/magit-20160710.1341/magit-sequence.el similarity index 100% rename from elpa/magit-20160624.2127/magit-sequence.el rename to elpa/magit-20160710.1341/magit-sequence.el diff --git a/elpa/magit-20160624.2127/magit-stash.el b/elpa/magit-20160710.1341/magit-stash.el similarity index 100% rename from elpa/magit-20160624.2127/magit-stash.el rename to elpa/magit-20160710.1341/magit-stash.el diff --git a/elpa/magit-20160624.2127/magit-submodule.el b/elpa/magit-20160710.1341/magit-submodule.el similarity index 100% rename from elpa/magit-20160624.2127/magit-submodule.el rename to elpa/magit-20160710.1341/magit-submodule.el diff --git a/elpa/magit-20160624.2127/magit-subtree.el b/elpa/magit-20160710.1341/magit-subtree.el similarity index 100% rename from elpa/magit-20160624.2127/magit-subtree.el rename to elpa/magit-20160710.1341/magit-subtree.el diff --git a/elpa/magit-20160624.2127/magit-utils.el b/elpa/magit-20160710.1341/magit-utils.el similarity index 100% rename from elpa/magit-20160624.2127/magit-utils.el rename to elpa/magit-20160710.1341/magit-utils.el diff --git a/elpa/magit-20160624.2127/magit-wip.el b/elpa/magit-20160710.1341/magit-wip.el similarity index 100% rename from elpa/magit-20160624.2127/magit-wip.el rename to elpa/magit-20160710.1341/magit-wip.el diff --git a/elpa/magit-20160624.2127/magit.el b/elpa/magit-20160710.1341/magit.el similarity index 97% rename from elpa/magit-20160624.2127/magit.el rename to elpa/magit-20160710.1341/magit.el index 9a07ab7..293f562 100644 --- a/elpa/magit-20160624.2127/magit.el +++ b/elpa/magit-20160710.1341/magit.el @@ -66,7 +66,6 @@ (eval-when-compile (require 'eshell)) (declare-function eshell-parse-arguments 'eshell) (eval-when-compile (require 'message)) -(declare-function message-goto-body 'message) (defconst magit--minimal-git "1.9.4") (defconst magit--minimal-emacs "24.4") @@ -483,7 +482,12 @@ Type \\[magit-commit-popup] to create a commit. \\{magit-status-mode-map}" :group 'magit-status - (hack-dir-local-variables-non-file-buffer)) + (hack-dir-local-variables-non-file-buffer) + ;; Avoid listing all files as deleted when visiting a bare repo. + (when (magit-bare-repo-p) + (make-local-variable 'magit-status-sections-hook) + (remove-hook 'magit-status-sections-hook #'magit-insert-staged-changes + 'local))) ;;;###autoload (defun magit-status (&optional directory) @@ -1190,68 +1194,76 @@ existing one." (defun magit-get-revision-buffer (rev file &optional create) (funcall (if create 'get-buffer-create 'get-buffer) - (format "%s.~%s~" file (subst-char-in-string ?/ ?_ rev)))) + (format "%s.~%s~" file (if (equal rev "") "index" + (subst-char-in-string ?/ ?_ rev))))) (defun magit-get-revision-buffer-create (rev file) (magit-get-revision-buffer rev file t)) +(defun magit-revert-rev-file-buffer (_ignore-auto noconfirm) + (when (or noconfirm + (and (not (buffer-modified-p)) + (catch 'found + (dolist (regexp revert-without-query) + (when (string-match regexp magit-buffer-file-name) + (throw 'found t))))) + (yes-or-no-p (format "Revert buffer from git %s? " + (if (equal magit-buffer-refname "") "{index}" + (concat "revision " magit-buffer-refname))))) + (let* ((inhibit-read-only t) + (default-directory (magit-toplevel)) + (file (file-relative-name magit-buffer-file-name)) + (coding-system-for-read (or coding-system-for-read 'undecided))) + (erase-buffer) + (magit-git-insert "cat-file" "-p" (concat magit-buffer-refname ":" file)) + (setq buffer-file-coding-system last-coding-system-used)) + (let ((buffer-file-name magit-buffer-file-name) + (after-change-major-mode-hook + (remq 'global-diff-hl-mode-enable-in-buffers + after-change-major-mode-hook))) + (normal-mode t)) + (setq buffer-read-only t) + (set-buffer-modified-p nil) + (goto-char (point-min)))) + +(defun magit-find-file-noselect-1 (rev file hookvar &optional revert) + "Read FILE from REV into a buffer and return the buffer. +FILE must be relative to the top directory of the repository. +An empty REV stands for index." + (let ((topdir (magit-toplevel))) + (when (file-name-absolute-p file) + (setq file (file-relative-name file topdir))) + (with-current-buffer (magit-get-revision-buffer-create rev file) + (when (or (not magit-buffer-file-name) + (if (eq revert 'ask-revert) + (y-or-n-p (format "%s already exists; revert it? " + (buffer-name)))) + revert) + (setq magit-buffer-revision + (if (string= rev "") "{index}" (magit-rev-format "%H" rev)) + magit-buffer-refname rev + magit-buffer-file-name (expand-file-name file topdir)) + (setq default-directory (file-name-directory magit-buffer-file-name)) + (setq-local revert-buffer-function #'magit-revert-rev-file-buffer) + (revert-buffer t t) + (run-hooks hookvar)) + (current-buffer)))) + (defvar magit-find-file-hook nil) +(add-hook 'magit-find-file-hook #'magit-blob-mode) (defun magit-find-file-noselect (rev file) "Read FILE from REV into a buffer and return the buffer. FILE must be relative to the top directory of the repository." - (let ((topdir (magit-toplevel))) - (when (file-name-absolute-p file) - (setq file (file-relative-name file topdir))) - (or (magit-get-revision-buffer rev file) - (with-current-buffer (magit-get-revision-buffer-create rev file) - (let ((inhibit-read-only t)) - (erase-buffer) - (magit-git-insert "cat-file" "-p" (concat rev ":" file))) - (setq magit-buffer-revision (magit-rev-format "%H" rev) - magit-buffer-refname rev - magit-buffer-file-name (expand-file-name file topdir)) - (let ((buffer-file-name magit-buffer-file-name) - (after-change-major-mode-hook - (remq 'global-diff-hl-mode-enable-in-buffers - after-change-major-mode-hook))) - (normal-mode t)) - (setq buffer-read-only t) - (set-buffer-modified-p nil) - (goto-char (point-min)) - (magit-blob-mode 1) - (run-hooks 'magit-find-file-hook) - (current-buffer))))) + (magit-find-file-noselect-1 rev file 'magit-find-file-hook)) (defvar magit-find-index-hook nil) (defun magit-find-file-index-noselect (file &optional revert) "Read FILE from the index into a buffer and return the buffer. FILE must to be relative to the top directory of the repository." - (let* ((bufname (concat file ".~{index}~")) - (origbuf (get-buffer bufname)) - (default-directory (magit-toplevel))) - (with-current-buffer (get-buffer-create bufname) - (when (or (not origbuf) revert - (y-or-n-p (format "%s already exists; revert it? " bufname))) - (let ((inhibit-read-only t) - (temp (car (split-string - (or (magit-git-string "checkout-index" "--temp" file) - (error "Error making temp file")) - "\t")))) - (erase-buffer) - (insert-file-contents temp nil nil nil t) - (delete-file temp))) - (setq magit-buffer-revision "{index}" - magit-buffer-refname "{index}" - magit-buffer-file-name (expand-file-name file)) - (let ((buffer-file-name magit-buffer-file-name)) - (normal-mode t)) - (setq buffer-read-only t) - (set-buffer-modified-p nil) - (goto-char (point-min)) - (run-hooks 'magit-find-index-hook) - (current-buffer)))) + (magit-find-file-noselect-1 "" file 'magit-find-index-hook + (or revert 'ask-revert))) (defun magit-update-index () "Update the index with the contents of the current buffer. @@ -1259,15 +1271,16 @@ The current buffer has to be visiting a file in the index, which is done using `magit-find-index-noselect'." (interactive) (let ((file (magit-file-relative-name))) - (unless (equal magit-buffer-refname "{index}") + (unless (equal magit-buffer-refname "") (user-error "%s isn't visiting the index" file)) (if (y-or-n-p (format "Update index with contents of %s" (buffer-name))) (let ((index (make-temp-file "index")) (buffer (current-buffer))) (when magit-wip-before-change-mode (magit-wip-commit-before-change (list file) " before un-/stage")) - (with-temp-file index - (insert-buffer-substring buffer)) + (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" @@ -2619,6 +2632,7 @@ Currently this only adds the following key bindings. (?m "Merging" magit-merge-popup) (?M "Remoting" magit-remote-popup) (?o "Submodules" magit-submodule-popup) + (?O "Subtrees" magit-subtree-popup) (?P "Pushing" magit-push-popup) (?r "Rebasing" magit-rebase-popup) (?t "Tagging" magit-tag-popup) diff --git a/elpa/magit-20160624.2127/magit.info b/elpa/magit-20160710.1341/magit.info similarity index 100% rename from elpa/magit-20160624.2127/magit.info rename to elpa/magit-20160710.1341/magit.info diff --git a/elpa/magit-20160624.2127/magit.info-1 b/elpa/magit-20160710.1341/magit.info-1 similarity index 100% rename from elpa/magit-20160624.2127/magit.info-1 rename to elpa/magit-20160710.1341/magit.info-1 diff --git a/elpa/magit-20160624.2127/magit.info-2 b/elpa/magit-20160710.1341/magit.info-2 similarity index 100% rename from elpa/magit-20160624.2127/magit.info-2 rename to elpa/magit-20160710.1341/magit.info-2 diff --git a/elpa/magit-popup-20160606.1041/dir b/elpa/magit-popup-20160710.1341/dir similarity index 100% rename from elpa/magit-popup-20160606.1041/dir rename to elpa/magit-popup-20160710.1341/dir diff --git a/elpa/magit-popup-20160606.1041/magit-popup-autoloads.el b/elpa/magit-popup-20160710.1341/magit-popup-autoloads.el similarity index 90% rename from elpa/magit-popup-20160606.1041/magit-popup-autoloads.el rename to elpa/magit-popup-20160710.1341/magit-popup-autoloads.el index 791f2c9..57b2928 100644 --- a/elpa/magit-popup-20160606.1041/magit-popup-autoloads.el +++ b/elpa/magit-popup-20160710.1341/magit-popup-autoloads.el @@ -4,7 +4,7 @@ (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) ;;;### (autoloads nil nil ("magit-popup-pkg.el" "magit-popup.el") -;;;;;; (22387 29358 286310 943000)) +;;;;;; (22404 60205 875465 195000)) ;;;*** diff --git a/elpa/magit-popup-20160606.1041/magit-popup-pkg.el b/elpa/magit-popup-20160710.1341/magit-popup-pkg.el similarity index 77% rename from elpa/magit-popup-20160606.1041/magit-popup-pkg.el rename to elpa/magit-popup-20160710.1341/magit-popup-pkg.el index 9d6c1c4..addf81b 100644 --- a/elpa/magit-popup-20160606.1041/magit-popup-pkg.el +++ b/elpa/magit-popup-20160710.1341/magit-popup-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit-popup" "20160606.1041" "Define prefix-infix-suffix command combos" +(define-package "magit-popup" "20160710.1341" "Define prefix-infix-suffix command combos" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113")) diff --git a/elpa/magit-popup-20160606.1041/magit-popup.el b/elpa/magit-popup-20160710.1341/magit-popup.el similarity index 99% rename from elpa/magit-popup-20160606.1041/magit-popup.el rename to elpa/magit-popup-20160710.1341/magit-popup.el index 830a0d4..fb900ac 100644 --- a/elpa/magit-popup-20160606.1041/magit-popup.el +++ b/elpa/magit-popup-20160710.1341/magit-popup.el @@ -63,7 +63,6 @@ (declare-function Man-next-section 'man) ;; For the `:variable' event type. -(declare-function magit-call-git 'magit-process) (declare-function magit-git-string 'magit-git) (declare-function magit-refresh 'magit-mode) (declare-function magit-get 'magit-git) @@ -71,7 +70,6 @@ ;; For branch actions. (declare-function magit-branch-set-face 'magit-git) -(declare-function magit-local-branch-p 'magit-git) ;;; Settings ;;;; Custom Groups diff --git a/elpa/magit-popup-20160606.1041/magit-popup.info b/elpa/magit-popup-20160710.1341/magit-popup.info similarity index 100% rename from elpa/magit-popup-20160606.1041/magit-popup.info rename to elpa/magit-popup-20160710.1341/magit-popup.info diff --git a/elpa/markdown-mode-20160610.1745/markdown-mode-pkg.el b/elpa/markdown-mode-20160610.1745/markdown-mode-pkg.el deleted file mode 100644 index 518fe59..0000000 --- a/elpa/markdown-mode-20160610.1745/markdown-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "markdown-mode" "20160610.1745" "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-20160610.1745/markdown-mode-autoloads.el b/elpa/markdown-mode-20160629.459/markdown-mode-autoloads.el similarity index 88% rename from elpa/markdown-mode-20160610.1745/markdown-mode-autoloads.el rename to elpa/markdown-mode-20160629.459/markdown-mode-autoloads.el index 6ab35c4..0c2032f 100644 --- a/elpa/markdown-mode-20160610.1745/markdown-mode-autoloads.el +++ b/elpa/markdown-mode-20160629.459/markdown-mode-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22387 29357 -;;;;;; 564180 716000)) +;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22404 60203 +;;;;;; 337555 4000)) ;;; Generated autoloads from markdown-mode.el (autoload 'markdown-mode "markdown-mode" "\ diff --git a/elpa/markdown-mode-20160629.459/markdown-mode-pkg.el b/elpa/markdown-mode-20160629.459/markdown-mode-pkg.el new file mode 100644 index 0000000..5aac68f --- /dev/null +++ b/elpa/markdown-mode-20160629.459/markdown-mode-pkg.el @@ -0,0 +1 @@ +(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-20160610.1745/markdown-mode.el b/elpa/markdown-mode-20160629.459/markdown-mode.el similarity index 99% rename from elpa/markdown-mode-20160610.1745/markdown-mode.el rename to elpa/markdown-mode-20160629.459/markdown-mode.el index 6140a4f..9ad3c9e 100644 --- a/elpa/markdown-mode-20160610.1745/markdown-mode.el +++ b/elpa/markdown-mode-20160629.459/markdown-mode.el @@ -33,7 +33,7 @@ ;; Maintainer: Jason R. Blevins ;; Created: May 24, 2007 ;; Version: 2.1 -;; Package-Version: 20160610.1745 +;; Package-Version: 20160629.459 ;; Package-Requires: ((emacs "24") (cl-lib "0.5")) ;; Keywords: Markdown, GitHub Flavored Markdown, itex ;; URL: http://jblevins.org/projects/markdown-mode/ @@ -6275,8 +6275,12 @@ See `markdown-wiki-link-p' and `markdown-follow-wiki-link'." (defun markdown-unfontify-region-wiki-links (from to) "Remove wiki link faces from the region specified by FROM and TO." (interactive "*r") - (remove-text-properties from to '(font-lock-face markdown-link-face)) - (remove-text-properties from to '(font-lock-face markdown-missing-link-face))) + (let ((modified (buffer-modified-p))) + (remove-text-properties from to '(font-lock-face markdown-link-face)) + (remove-text-properties from to '(font-lock-face markdown-missing-link-face)) + ;; remove-text-properties marks the buffer modified in emacs 24.3, + ;; undo that if it wasn't originally marked modified + (set-buffer-modified-p modified))) (defun markdown-fontify-region-wiki-links (from to) "Search region given by FROM and TO for wiki links and fontify them. diff --git a/elpa/popup-20160531.425/popup-pkg.el b/elpa/popup-20160531.425/popup-pkg.el deleted file mode 100644 index f43647d..0000000 --- a/elpa/popup-20160531.425/popup-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "popup" "20160531.425" "Visual Popup User Interface" '((cl-lib "0.5")) :keywords '("lisp")) diff --git a/elpa/popup-20160531.425/popup-autoloads.el b/elpa/popup-20160709.729/popup-autoloads.el similarity index 81% rename from elpa/popup-20160531.425/popup-autoloads.el rename to elpa/popup-20160709.729/popup-autoloads.el index cfdb055..b5a141c 100644 --- a/elpa/popup-20160531.425/popup-autoloads.el +++ b/elpa/popup-20160709.729/popup-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil nil ("popup.el") (22387 29355 788583 154000)) +;;;### (autoloads nil nil ("popup.el") (22404 60197 80130 979000)) ;;;*** diff --git a/elpa/popup-20160709.729/popup-pkg.el b/elpa/popup-20160709.729/popup-pkg.el new file mode 100644 index 0000000..8708840 --- /dev/null +++ b/elpa/popup-20160709.729/popup-pkg.el @@ -0,0 +1 @@ +(define-package "popup" "20160709.729" "Visual Popup User Interface" '((cl-lib "0.5")) :keywords '("lisp")) diff --git a/elpa/popup-20160531.425/popup.el b/elpa/popup-20160709.729/popup.el similarity index 99% rename from elpa/popup-20160531.425/popup.el rename to elpa/popup-20160709.729/popup.el index b358946..cda8081 100644 --- a/elpa/popup-20160531.425/popup.el +++ b/elpa/popup-20160709.729/popup.el @@ -4,7 +4,7 @@ ;; Author: Tomohiro Matsuyama ;; Keywords: lisp -;; Package-Version: 20160531.425 +;; Package-Version: 20160709.729 ;; Version: 0.5.3 ;; Package-Requires: ((cl-lib "0.5")) @@ -883,6 +883,7 @@ Pages up through POPUP." (define-key map [left] 'popup-isearch-close) (define-key map "\C-h" 'popup-isearch-delete) (define-key map (kbd "DEL") 'popup-isearch-delete) + (define-key map (kbd "C-y") 'popup-isearch-yank) map)) (defvar popup-menu-show-quick-help-function 'popup-menu-show-quick-help @@ -991,6 +992,9 @@ HELP-DELAY is a delay of displaying helps." ((eq binding 'popup-isearch-delete) (if (> (length pattern) 0) (setq pattern (substring pattern 0 (1- (length pattern)))))) + ((eq binding 'popup-isearch-yank) + (popup-isearch-update popup filter (car kill-ring) callback) + (cl-return nil)) (t (setq unread-command-events (append (listify-key-sequence key) unread-command-events)) diff --git a/elpa/projectile-20160623.23/projectile-pkg.el b/elpa/projectile-20160623.23/projectile-pkg.el deleted file mode 100644 index dee373a..0000000 --- a/elpa/projectile-20160623.23/projectile-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "projectile" "20160623.23" "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-20160623.23/projectile-autoloads.el b/elpa/projectile-20160711.143/projectile-autoloads.el similarity index 97% rename from elpa/projectile-20160623.23/projectile-autoloads.el rename to elpa/projectile-20160711.143/projectile-autoloads.el index ccdc871..c407eac 100644 --- a/elpa/projectile-20160623.23/projectile-autoloads.el +++ b/elpa/projectile-20160711.143/projectile-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "projectile" "projectile.el" (22387 29354 998184 -;;;;;; 979000)) +;;;### (autoloads nil "projectile" "projectile.el" (22404 60195 637515 +;;;;;; 28000)) ;;; Generated autoloads from projectile.el (autoload 'projectile-version "projectile" "\ @@ -45,6 +45,13 @@ Add the currently visited file to the cache. \(fn)" t nil) +(autoload 'projectile-discover-projects-in-directory "projectile" "\ +Discover any projects in DIRECTORY and add them to the projectile cache. +This function is not recursive and only adds projects with roots +at the top level of DIRECTORY. + +\(fn DIRECTORY)" t nil) + (autoload 'projectile-switch-to-buffer "projectile" "\ Switch to a project buffer. diff --git a/elpa/projectile-20160711.143/projectile-pkg.el b/elpa/projectile-20160711.143/projectile-pkg.el new file mode 100644 index 0000000..0132b22 --- /dev/null +++ b/elpa/projectile-20160711.143/projectile-pkg.el @@ -0,0 +1 @@ +(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-20160623.23/projectile.el b/elpa/projectile-20160711.143/projectile.el similarity index 97% rename from elpa/projectile-20160623.23/projectile.el rename to elpa/projectile-20160711.143/projectile.el index 6840cba..7f596f9 100644 --- a/elpa/projectile-20160623.23/projectile.el +++ b/elpa/projectile-20160711.143/projectile.el @@ -4,9 +4,9 @@ ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/projectile -;; Package-Version: 20160623.23 +;; Package-Version: 20160711.143 ;; Keywords: project, convenience -;; Version: 0.14.0-cvs +;; Version: 0.14.0 ;; Package-Requires: ((dash "2.11.0") (pkg-info "0.4")) ;; This file is NOT part of GNU Emacs. @@ -219,6 +219,26 @@ Otherwise consider the current directory the project root." :group 'projectile :type 'string) +(defcustom projectile-tags-backend 'auto + "The tag backend that Projectile should use. + +If set to 'auto', `projectile-find-tag' will automatically choose +which backend to use. Preference order is ggtags -> etags-select +-> find-tag. Variable can also be set to specify which backend to +use. If selected backend is unavailable, fall back to `find-tag'. + +If this variable is set to 'auto' and ggtags is available, or if +set to 'ggtags', then ggtags will be used for +`projectile-regenerate-tags'. For all other settings +`projectile-tags-command' will be used." + :group 'projectile + :type '(radio + (const :tag "auto" auto) + (const :tag "ggtags" ggtags) + (const :tag "etags" etags-select) + (const :tag "standard" find-tag)) + :package-version '(projectile . "0.14.0")) + (defcustom projectile-sort-order 'default "The sort order used for a project's files." :group 'projectile @@ -703,8 +723,11 @@ The cache is created both in memory and on the hard drive." ;; cache opened files automatically to reduce the need for cache invalidation (defun projectile-cache-files-find-file-hook () "Function for caching files with `find-file-hook'." - (when (and projectile-enable-caching (projectile-project-p)) - (projectile-cache-current-file))) + (let ((project-root (projectile-project-p))) + (when (and projectile-enable-caching + project-root + (not (projectile-ignored-project-p project-root))) + (projectile-cache-current-file)))) (defun projectile-cache-projects-find-file-hook () "Function for caching projects with `find-file-hook'." @@ -722,6 +745,23 @@ The cache is created both in memory and on the hard drive." projectile-cache-file)) (projectile-invalidate-cache nil))) +;;;###autoload +(defun projectile-discover-projects-in-directory (directory) + "Discover any projects in DIRECTORY and add them to the projectile cache. +This function is not recursive and only adds projects with roots +at the top level of DIRECTORY." + (interactive + (list (read-directory-name "Starting directory: "))) + (let ((subdirs (directory-files directory t))) + (mapcar + (lambda (dir) + (when (and (file-directory-p dir) + (not (member (file-name-nondirectory dir) '(".." ".")))) + (let ((default-directory dir)) + (when (projectile-project-p) + (projectile-add-known-project (projectile-project-root)))))) + subdirs))) + (defadvice delete-file (before purge-from-projectile-cache (filename &optional trash)) (if (and projectile-enable-caching (projectile-project-p)) @@ -898,7 +938,7 @@ Files are returned as relative paths to the project root." :type 'string :package-version '(projectile "0.14.0")) -(defcustom projectile-hg-command "hg locate -0 -I ." +(defcustom projectile-hg-command "hg locate -f -0 -I ." "Command used by projectile to get the files in a hg project." :group 'projectile :type 'string) @@ -1121,7 +1161,7 @@ this case unignored files will be absent from FILES." (string-equal (file-remote-p default-directory) (file-remote-p project-root)) (not (string-match-p "^http\\(s\\)?://" default-directory)) - (string-prefix-p project-root (file-truename default-directory))))) + (string-prefix-p project-root (file-truename default-directory) (eq system-type 'windows-nt))))) (defun projectile-ignored-buffer-p (buffer) "Check if BUFFER should be ignored." @@ -1834,6 +1874,7 @@ a COMPILE-CMD, a TEST-CMD, and a RUN-CMD." (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 '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." @@ -1985,7 +2026,7 @@ It assumes the test/ folder is at the same level as src/." ((member project-type '(rebar)) "_SUITE") ((member project-type '(emacs-cask)) "-test") ((member project-type '(rails-rspec ruby-rspec)) "_spec") - ((member project-type '(rails-test ruby-test lein-test boot-clj go)) "_test") + ((member project-type '(rails-test ruby-test lein-test boot-clj go elixir)) "_test") ((member project-type '(scons)) "test") ((member project-type '(maven symfony)) "Test") ((member project-type '(gradle gradlew grails)) "Spec") @@ -2155,7 +2196,8 @@ regular expression." (defun projectile-regenerate-tags () "Regenerate the project's [e|g]tags." (interactive) - (if (boundp 'ggtags-mode) + (if (and (boundp 'ggtags-mode) + (memq projectile-tags-backend '(auto ggtags))) (progn (let* ((ggtags-project-root (projectile-project-root)) (default-directory ggtags-project-root)) @@ -2174,7 +2216,8 @@ regular expression." (buffer-substring (point-min) (point-max))))) (unless (zerop exit-code) (error shell-output)) - (visit-tags-table tags-file)))) + (visit-tags-table tags-file) + (message "Regenerated %s" tags-file)))) (defun projectile-visit-project-tags-table () "Visit the current project's tags table." @@ -2184,19 +2227,31 @@ regular expression." (with-demoted-errors "Error loading tags-file: %s" (visit-tags-table tags-file t)))))) +(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) + 'ggtags-find-tag-dwim 'find-tag)) + ((eq projectile-tags-backend 'etags-select) + (if (fboundp 'etags-select-find-tag) + 'etags-select-find-tag 'find-tag)) + (t 'find-tag))) + ;;;###autoload (defun projectile-find-tag () "Find tag in project." (interactive) (projectile-visit-project-tags-table) ;; Auto-discover the user's preference for tags - (let ((find-tag-fn (cond - ((fboundp 'ggtags-find-tag-dwim) - 'ggtags-find-tag-dwim) - ((fboundp 'etags-select-find-tag) - 'etags-select-find-tag) - (t - 'find-tag)))) + (let ((find-tag-fn (projectile-determine-find-tag-fn))) (call-interactively find-tag-fn))) (defmacro projectile-with-default-dir (dir &rest body) @@ -3081,6 +3136,7 @@ is chosen." ["Open project in dired" projectile-dired] ["Switch to project" projectile-switch-project] ["Switch to open project" projectile-switch-open-project] + ["Discover projects in directory" projectile-discover-projects-in-directory] ["Search in project (grep)" projectile-grep] ["Search in project (ag)" projectile-ag] ["Replace in project" projectile-replace] diff --git a/elpa/s-20160508.2357/s-pkg.el b/elpa/s-20160508.2357/s-pkg.el deleted file mode 100644 index e04771c..0000000 --- a/elpa/s-20160508.2357/s-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "s" "20160508.2357" "The long lost Emacs string manipulation library." 'nil :keywords '("strings")) diff --git a/elpa/s-20160508.2357/s-autoloads.el b/elpa/s-20160711.525/s-autoloads.el similarity index 81% rename from elpa/s-20160508.2357/s-autoloads.el rename to elpa/s-20160711.525/s-autoloads.el index a7ee288..425571d 100644 --- a/elpa/s-20160508.2357/s-autoloads.el +++ b/elpa/s-20160711.525/s-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil nil ("s.el") (22387 29354 325039 556000)) +;;;### (autoloads nil nil ("s.el") (22404 60193 104225 718000)) ;;;*** diff --git a/elpa/s-20160711.525/s-pkg.el b/elpa/s-20160711.525/s-pkg.el new file mode 100644 index 0000000..25f48d7 --- /dev/null +++ b/elpa/s-20160711.525/s-pkg.el @@ -0,0 +1 @@ +(define-package "s" "20160711.525" "The long lost Emacs string manipulation library." 'nil :keywords '("strings")) diff --git a/elpa/s-20160508.2357/s.el b/elpa/s-20160711.525/s.el similarity index 98% rename from elpa/s-20160508.2357/s.el rename to elpa/s-20160711.525/s.el index e381256..5b6c6d7 100644 --- a/elpa/s-20160508.2357/s.el +++ b/elpa/s-20160711.525/s.el @@ -4,7 +4,7 @@ ;; Author: Magnar Sveen ;; Version: 1.10.0 -;; Package-Version: 20160508.2357 +;; Package-Version: 20160711.525 ;; Keywords: strings ;; This program is free software; you can redistribute it and/or modify @@ -71,13 +71,13 @@ See also `s-split'." (setq op (goto-char (point-min))) (while (and (re-search-forward separator nil t) (< 0 n)) - (let ((sub (buffer-substring-no-properties op (match-beginning 0)))) + (let ((sub (buffer-substring op (match-beginning 0)))) (unless (and omit-nulls (equal sub "")) (push sub r))) (setq op (goto-char (match-end 0))) (setq n (1- n))) - (let ((sub (buffer-substring-no-properties op (point-max)))) + (let ((sub (buffer-substring op (point-max)))) (unless (and omit-nulls (equal sub "")) (push sub r)))) @@ -185,7 +185,7 @@ See also `s-split'." (insert s) (let ((fill-column len)) (fill-region (point-min) (point-max))) - (buffer-substring-no-properties (point-min) (point-max)))) + (buffer-substring (point-min) (point-max)))) (defun s-center (len s) "If S is shorter than LEN, pad it with spaces so it is centered."