Upgrade packages
This commit is contained in:
parent
73837bf135
commit
879c820944
|
|
@ -3,7 +3,7 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "flycheck" "flycheck.el" (22490 51490 508000
|
||||
;;;### (autoloads nil "flycheck" "flycheck.el" (22499 37047 135000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from flycheck.el
|
||||
|
||||
|
|
@ -227,7 +227,7 @@ Use this together with the `option', `option-list' and
|
|||
;;;***
|
||||
|
||||
;;;### (autoloads nil nil ("flycheck-buttercup.el" "flycheck-ert.el"
|
||||
;;;;;; "flycheck-pkg.el") (22490 51490 517423 776000))
|
||||
;;;;;; "flycheck-pkg.el") (22499 37047 144207 585000))
|
||||
|
||||
;;;***
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(define-package "flycheck" "20160915.515" "On-the-fly syntax checking"
|
||||
(define-package "flycheck" "20160921.227" "On-the-fly syntax checking"
|
||||
'((dash "2.12.1")
|
||||
(pkg-info "0.4")
|
||||
(let-alist "1.0.4")
|
||||
|
|
@ -1186,6 +1186,14 @@ if PATTERN did not match."
|
|||
(when (re-search-forward pattern nil 'no-error)
|
||||
(match-string-no-properties 1)))))
|
||||
|
||||
(defun flycheck-buffer-empty-p (&optional buffer)
|
||||
"Whether a BUFFER is empty.
|
||||
|
||||
If buffer is nil or omitted check the current buffer.
|
||||
|
||||
Return non-nil if so, or nil if the buffer has content."
|
||||
(<= (buffer-size buffer) 0))
|
||||
|
||||
(defun flycheck-ephemeral-buffer-p ()
|
||||
"Determine whether the current buffer is an ephemeral buffer.
|
||||
|
||||
|
|
@ -1681,16 +1689,16 @@ Signal an error, if any property has an invalid value."
|
|||
(setq modes (list modes)))
|
||||
|
||||
(unless (functionp start)
|
||||
(error ":start %S of syntax checker %s is not a function" symbol start))
|
||||
(error ":start %S of syntax checker %s is not a function" start symbol))
|
||||
(unless (or (null interrupt) (functionp interrupt))
|
||||
(error ":interrupt %S of syntax checker %s is not a function"
|
||||
symbol interrupt))
|
||||
interrupt symbol))
|
||||
(unless (or (null print-doc) (functionp print-doc))
|
||||
(error ":print-doc %S of syntax checker %s is not a function"
|
||||
symbol print-doc))
|
||||
print-doc symbol))
|
||||
(unless (or (null verify) (functionp verify))
|
||||
(error ":verify %S of syntax checker %S is not a function"
|
||||
symbol verify))
|
||||
verify symbol))
|
||||
(unless modes
|
||||
(error "Missing :modes in syntax checker %s" symbol))
|
||||
(dolist (mode modes)
|
||||
|
|
@ -1699,10 +1707,10 @@ Signal an error, if any property has an invalid value."
|
|||
modes symbol mode)))
|
||||
(unless (or (null predicate) (functionp predicate))
|
||||
(error ":predicate %S of syntax checker %s is not a function"
|
||||
symbol predicate))
|
||||
predicate symbol))
|
||||
(unless (functionp filter)
|
||||
(error ":error-filter %S of syntax checker %s is not a function"
|
||||
symbol filter))
|
||||
filter symbol))
|
||||
(dolist (checker next-checkers)
|
||||
(flycheck-validate-next-checker checker))
|
||||
|
||||
|
|
@ -7553,7 +7561,9 @@ See URL `https://docs.python.org/3.5/library/json.html#command-line-interface'."
|
|||
;; Ignore the rest of the line which shows the char position.
|
||||
(one-or-more not-newline)
|
||||
line-end))
|
||||
:modes json-mode)
|
||||
:modes json-mode
|
||||
;; The JSON parser chokes if the buffer is empty and has no JSON inside
|
||||
:predicate (lambda () (not (flycheck-buffer-empty-p))))
|
||||
|
||||
(flycheck-define-checker less
|
||||
"A LESS syntax checker using lessc.
|
||||
|
|
@ -7744,7 +7754,7 @@ See URL `http://pear.php.net/package/PHP_CodeSniffer/'."
|
|||
:modes (php-mode php+-mode)
|
||||
;; phpcs seems to choke on empty standard input, hence skip phpcs if the
|
||||
;; buffer is empty, see https://github.com/flycheck/flycheck/issues/907
|
||||
:predicate (lambda () (> (buffer-size) 0)))
|
||||
:predicate (lambda () (not (flycheck-buffer-empty-p))))
|
||||
|
||||
(flycheck-define-checker processing
|
||||
"Processing command line tool.
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "git-commit" "git-commit.el" (22490 24936 815404
|
||||
;;;;;; 393000))
|
||||
;;;### (autoloads nil "git-commit" "git-commit.el" (22499 37044 186000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from git-commit.el
|
||||
|
||||
(defvar global-git-commit-mode t "\
|
||||
|
|
@ -1 +1 @@
|
|||
(define-package "git-commit" "20160821.1338" "Edit Git commit messages" '((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
|
||||
(define-package "git-commit" "20160920.1452" "Edit Git commit messages" '((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
|
||||
|
||||
;; Package-Requires: ((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457"))
|
||||
;; Package-Version: 20160821.1338
|
||||
;; Package-Version: 20160920.1452
|
||||
;; Keywords: git tools vc
|
||||
;; Homepage: https://github.com/magit/magit
|
||||
|
||||
|
|
@ -416,6 +416,9 @@ usually honor this wish and return non-nil."
|
|||
(setq-local comment-end-skip "\n")
|
||||
(setq-local comment-use-syntax nil)
|
||||
(setq-local font-lock-multiline t)
|
||||
(add-hook 'font-lock-extend-region-functions
|
||||
#'git-commit-extend-region-summary-line
|
||||
t t)
|
||||
(font-lock-add-keywords nil (git-commit-mode-font-lock-keywords) t))
|
||||
|
||||
(define-minor-mode git-commit-mode
|
||||
|
|
@ -615,6 +618,25 @@ With a numeric prefix ARG, go forward ARG comments."
|
|||
;; Non-empty non-comment second line
|
||||
(format "\\(?:\n%s\\|\n\\(.+\\)\\)?" comment-start)))
|
||||
|
||||
;; These are let-bound while `font-lock-extend-region-functions' are
|
||||
;; run.
|
||||
(defvar font-lock-beg)
|
||||
(defvar font-lock-end)
|
||||
|
||||
(defun git-commit-extend-region-summary-line ()
|
||||
"Identify the multiline summary-regexp construct.
|
||||
Added to `font-lock-extend-region-functions'."
|
||||
(save-excursion
|
||||
(save-match-data
|
||||
(goto-char (point-min))
|
||||
(when (looking-at (git-commit-summary-regexp))
|
||||
(let ((summary-beg (match-beginning 0))
|
||||
(summary-end (match-end 0)))
|
||||
(when (or (< summary-beg font-lock-beg summary-end)
|
||||
(< summary-beg font-lock-end summary-end))
|
||||
(setq font-lock-beg (min font-lock-beg summary-beg)
|
||||
font-lock-end (max font-lock-end summary-end))))))))
|
||||
|
||||
(defun git-commit-mode-font-lock-keywords ()
|
||||
`(;; Comments
|
||||
(,(format "^%s.*" comment-start)
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22490 24935
|
||||
;;;;;; 275408 774000))
|
||||
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22499 37042
|
||||
;;;;;; 911000 0))
|
||||
;;; 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" (22490 24935 247408
|
||||
;;;;;; 853000))
|
||||
;;;### (autoloads nil "helm-apt" "helm-apt.el" (22499 37042 869000
|
||||
;;;;;; 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 323408 637000))
|
||||
;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22499 37042
|
||||
;;;;;; 959000 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 227408 911000))
|
||||
;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22499 37042
|
||||
;;;;;; 853000 0))
|
||||
;;; 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" (22490 24935 307408
|
||||
;;;;;; 682000))
|
||||
;;;### (autoloads nil "helm-color" "helm-color.el" (22499 37042 943000
|
||||
;;;;;; 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 183409 35000))
|
||||
;;;### (autoloads nil "helm-command" "helm-command.el" (22499 37042
|
||||
;;;;;; 797000 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 315408 659000))
|
||||
;;;### (autoloads nil "helm-config" "helm-config.el" (22499 37042
|
||||
;;;;;; 955000 0))
|
||||
;;; Generated autoloads from helm-config.el
|
||||
|
||||
(autoload 'helm-configuration "helm-config" "\
|
||||
|
|
@ -116,8 +116,8 @@ Customize `helm'.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22490 24935
|
||||
;;;;;; 255408 831000))
|
||||
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22499 37042
|
||||
;;;;;; 879000 0))
|
||||
;;; 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" (22490 24935 311408
|
||||
;;;;;; 670000))
|
||||
;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22499 37042 947000
|
||||
;;;;;; 0))
|
||||
;;; 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"
|
||||
;;;;;; (22490 24935 191409 13000))
|
||||
;;;;;; (22499 37042 804000 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 171409 70000))
|
||||
;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22499 37042
|
||||
;;;;;; 785000 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 203408 979000))
|
||||
;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22499 37042
|
||||
;;;;;; 822000 0))
|
||||
;;; 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" (22490 24935 283408
|
||||
;;;;;; 750000))
|
||||
;;;### (autoloads nil "helm-eval" "helm-eval.el" (22499 37042 916000
|
||||
;;;;;; 0))
|
||||
;;; 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" (22490 24935
|
||||
;;;;;; 163409 93000))
|
||||
;;;### (autoloads nil "helm-external" "helm-external.el" (22499 37042
|
||||
;;;;;; 773000 0))
|
||||
;;; 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" (22490 24935 259408
|
||||
;;;;;; 818000))
|
||||
;;;### (autoloads nil "helm-files" "helm-files.el" (22499 37042 885000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-files.el
|
||||
|
||||
(autoload 'helm-projects-history "helm-files" "\
|
||||
|
|
@ -342,10 +342,20 @@ Preconfigured `helm' for `recentf'.
|
|||
|
||||
\(fn)" t nil)
|
||||
|
||||
(autoload 'helm-delete-tramp-connection "helm-files" "\
|
||||
Allow deleting tramp connection or marked tramp connections at once.
|
||||
|
||||
This replace `tramp-cleanup-connection' which is partially broken in
|
||||
emacs < to 25.1.50.1 (See Emacs Bug#24432).
|
||||
|
||||
It allows additionally to delete more than one connection at once.
|
||||
|
||||
\(fn)" t nil)
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-font" "helm-font.el" (22490 24935 207408
|
||||
;;;;;; 967000))
|
||||
;;;### (autoloads nil "helm-font" "helm-font.el" (22499 37042 830000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-font.el
|
||||
|
||||
(autoload 'helm-select-xfont "helm-font" "\
|
||||
|
|
@ -360,8 +370,8 @@ Preconfigured helm for `ucs-names' math symbols.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22490 24935 327408
|
||||
;;;;;; 625000))
|
||||
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22499 37042 964000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-grep.el
|
||||
|
||||
(autoload 'helm-goto-precedent-file "helm-grep" "\
|
||||
|
|
@ -388,8 +398,8 @@ With a prefix arg ARG git-grep the whole repository.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-help" "helm-help.el" (22490 24935 159409
|
||||
;;;;;; 104000))
|
||||
;;;### (autoloads nil "helm-help" "helm-help.el" (22499 37042 766000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-help.el
|
||||
|
||||
(autoload 'helm-documentation "helm-help" "\
|
||||
|
|
@ -409,8 +419,8 @@ String displayed in mode-line in `helm-source-find-files'.")
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22490 24935
|
||||
;;;;;; 239408 876000))
|
||||
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22499 37042
|
||||
;;;;;; 861000 0))
|
||||
;;; Generated autoloads from helm-id-utils.el
|
||||
|
||||
(autoload 'helm-gid "helm-id-utils" "\
|
||||
|
|
@ -424,8 +434,8 @@ See <https://www.gnu.org/software/idutils/>.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22490 24935 219408
|
||||
;;;;;; 933000))
|
||||
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22499 37042 839000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-imenu.el
|
||||
|
||||
(autoload 'helm-imenu "helm-imenu" "\
|
||||
|
|
@ -442,8 +452,8 @@ or it have an association in `helm-imenu-all-buffer-assoc'.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-info" "helm-info.el" (22490 24935 215408
|
||||
;;;;;; 945000))
|
||||
;;;### (autoloads nil "helm-info" "helm-info.el" (22499 37042 835000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-info.el
|
||||
|
||||
(autoload 'helm-info "helm-info" "\
|
||||
|
|
@ -459,8 +469,8 @@ With a prefix-arg insert symbol at point.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22490 24935
|
||||
;;;;;; 167409 82000))
|
||||
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22499 37042
|
||||
;;;;;; 777000 0))
|
||||
;;; Generated autoloads from helm-locate.el
|
||||
|
||||
(autoload 'helm-projects-find-files "helm-locate" "\
|
||||
|
|
@ -487,8 +497,8 @@ Where db_path is a filename matched by
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-man" "helm-man.el" (22490 24935 291408
|
||||
;;;;;; 728000))
|
||||
;;;### (autoloads nil "helm-man" "helm-man.el" (22499 37042 924000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-man.el
|
||||
|
||||
(autoload 'helm-man-woman "helm-man" "\
|
||||
|
|
@ -499,8 +509,8 @@ With a prefix arg reinitialize the cache.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22490 24935 271408
|
||||
;;;;;; 785000))
|
||||
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22499 37042 903000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-misc.el
|
||||
|
||||
(autoload 'helm-browse-menubar "helm-misc" "\
|
||||
|
|
@ -541,8 +551,8 @@ Preconfigured `helm' that provide completion of `comint' history.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22490 24935 143409
|
||||
;;;;;; 149000))
|
||||
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22499 37042 752000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-mode.el
|
||||
|
||||
(autoload 'helm-comp-read "helm-mode" "\
|
||||
|
|
@ -712,8 +722,8 @@ Note: This mode is incompatible with Emacs23.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-net" "helm-net.el" (22490 24935 303408
|
||||
;;;;;; 694000))
|
||||
;;;### (autoloads nil "helm-net" "helm-net.el" (22499 37042 939000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-net.el
|
||||
|
||||
(autoload 'helm-surfraw "helm-net" "\
|
||||
|
|
@ -733,8 +743,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-org" "helm-org.el" (22490 24935 331408
|
||||
;;;;;; 613000))
|
||||
;;;### (autoloads nil "helm-org" "helm-org.el" (22499 37042 970000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-org.el
|
||||
|
||||
(autoload 'helm-org-agenda-files-headings "helm-org" "\
|
||||
|
|
@ -765,8 +775,8 @@ Preconfigured helm for org templates.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22490 24935
|
||||
;;;;;; 299408 706000))
|
||||
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22499 37042
|
||||
;;;;;; 935000 0))
|
||||
;;; Generated autoloads from helm-regexp.el
|
||||
|
||||
(autoload 'helm-moccur-mode "helm-regexp" "\
|
||||
|
|
@ -805,8 +815,8 @@ The prefix arg can be set before calling
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22490 24935 151409
|
||||
;;;;;; 127000))
|
||||
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22499 37042 758000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-ring.el
|
||||
|
||||
(defvar helm-push-mark-mode nil "\
|
||||
|
|
@ -863,8 +873,8 @@ This command is useful when used with persistent action.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22490 24935
|
||||
;;;;;; 223408 922000))
|
||||
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22499 37042
|
||||
;;;;;; 847000 0))
|
||||
;;; Generated autoloads from helm-semantic.el
|
||||
|
||||
(autoload 'helm-semantic "helm-semantic" "\
|
||||
|
|
@ -886,8 +896,8 @@ Fill in the symbol at point by default.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22490 24935 251408
|
||||
;;;;;; 842000))
|
||||
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22499 37042 876000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-sys.el
|
||||
|
||||
(defvar helm-top-poll-mode nil "\
|
||||
|
|
@ -921,8 +931,8 @@ Preconfigured helm for xrandr.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22490 24935 199408
|
||||
;;;;;; 990000))
|
||||
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22499 37042 817000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-tags.el
|
||||
|
||||
(autoload 'helm-etags-select "helm-tags" "\
|
||||
|
|
@ -941,8 +951,8 @@ This function aggregates three sources of tag files:
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22490 24935 179409
|
||||
;;;;;; 47000))
|
||||
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22499 37042 791000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-utils.el
|
||||
|
||||
(defvar helm-popup-tip-mode nil "\
|
||||
|
|
@ -962,7 +972,7 @@ Show help-echo informations in a popup tip at end of line.
|
|||
;;;***
|
||||
|
||||
;;;### (autoloads nil nil ("helm-easymenu.el" "helm-pkg.el" "helm-types.el")
|
||||
;;;;;; (22490 24935 351383 40000))
|
||||
;;;;;; (22499 37042 988357 754000))
|
||||
|
||||
;;;***
|
||||
|
||||
|
|
@ -1688,20 +1688,39 @@ and should be used carefully elsewhere, or not at all, using
|
|||
(or helm-ff--tramp-methods
|
||||
(setq helm-ff--tramp-methods (mapcar 'car tramp-methods))))
|
||||
|
||||
(defun helm-ff-previous-mh-tramp-method (str)
|
||||
(save-match-data
|
||||
(with-temp-buffer
|
||||
(insert str)
|
||||
(when (re-search-backward
|
||||
(concat "\\([|]\\)\\("
|
||||
(mapconcat 'identity (helm-ff-get-tramp-methods) "\\|")
|
||||
"\\):")
|
||||
nil t)
|
||||
(list
|
||||
(buffer-substring-no-properties (point-at-bol) (match-beginning 2))
|
||||
(buffer-substring-no-properties (match-beginning 2) (match-end 2)))))))
|
||||
|
||||
(cl-defun helm-ff-tramp-hostnames (&optional (pattern helm-pattern))
|
||||
"Get a list of hosts for tramp method found in `helm-pattern'.
|
||||
Argument PATTERN default to `helm-pattern', it is here only for debugging
|
||||
purpose."
|
||||
(when (string-match helm-tramp-file-name-regexp pattern)
|
||||
(let ((method (match-string 1 pattern))
|
||||
(tn (match-string 0 pattern))
|
||||
(all-methods (helm-ff-get-tramp-methods)))
|
||||
(let* ((mh-method (helm-ff-previous-mh-tramp-method pattern))
|
||||
(method (or (cadr mh-method) (match-string 1 pattern)))
|
||||
(current-mh-host (helm-aif (and mh-method
|
||||
(helm-ff-get-host-from-tramp-invalid-fname pattern))
|
||||
(concat (car mh-method) method ":"
|
||||
(car (split-string it "|" t)))))
|
||||
(all-methods (helm-ff-get-tramp-methods)))
|
||||
(helm-fast-remove-dups
|
||||
(cl-loop for (f . h) in (tramp-get-completion-function method)
|
||||
append (cl-loop for e in (funcall f (car h))
|
||||
for host = (and (consp e) (cadr e))
|
||||
when (and host (not (member host all-methods)))
|
||||
collect (concat tn host)))
|
||||
(cons current-mh-host
|
||||
(cl-loop for (f . h) in (tramp-get-completion-function method)
|
||||
append (cl-loop for e in (funcall f (car h))
|
||||
for host = (and (consp e) (cadr e))
|
||||
when (and host (not (member host all-methods)))
|
||||
collect (concat (or (car mh-method) "/")
|
||||
method ":" host))))
|
||||
:test 'equal))))
|
||||
|
||||
(defun helm-ff-before-action-hook-fn ()
|
||||
|
|
@ -1720,7 +1739,7 @@ purpose."
|
|||
(string= (helm-ff-set-pattern pattern)
|
||||
"Invalid tramp file name"))
|
||||
|
||||
(defun helm-ff-tramp-postfixed-p (str methods)
|
||||
(defun helm-ff-tramp-postfixed-p (str)
|
||||
(let (result)
|
||||
(save-match-data
|
||||
(with-temp-buffer
|
||||
|
|
@ -1728,8 +1747,9 @@ purpose."
|
|||
(helm-awhile (search-forward ":" nil t)
|
||||
(if (save-excursion
|
||||
(forward-char -1)
|
||||
(looking-back (mapconcat 'identity methods "\\|")
|
||||
(point-at-bol)))
|
||||
(looking-back
|
||||
(mapconcat 'identity (helm-ff-get-tramp-methods) "\\|")
|
||||
(point-at-bol)))
|
||||
(setq result nil)
|
||||
(setq result it)))))
|
||||
result))
|
||||
|
|
@ -1738,7 +1758,7 @@ purpose."
|
|||
"Handle tramp filenames in `helm-pattern'."
|
||||
(let* ((methods (helm-ff-get-tramp-methods))
|
||||
;; Returns the position of last ":" entered.
|
||||
(postfixed (helm-ff-tramp-postfixed-p pattern methods))
|
||||
(postfixed (helm-ff-tramp-postfixed-p pattern))
|
||||
(reg "\\`/\\([^[/:]+\\|[^/]+]\\):.*:")
|
||||
cur-method tramp-name)
|
||||
;; In some rare cases tramp can return a nil input,
|
||||
|
|
@ -1808,8 +1828,7 @@ purpose."
|
|||
;; An empty pattern
|
||||
(string= path "")
|
||||
(and (string-match-p ":\\'" path)
|
||||
(helm-ff-tramp-postfixed-p
|
||||
path (helm-ff-get-tramp-methods)))
|
||||
(helm-ff-tramp-postfixed-p path))
|
||||
;; Check if base directory of PATH is valid.
|
||||
(helm-aif (file-name-directory path)
|
||||
;; If PATH is a valid directory IT=PATH,
|
||||
|
|
@ -2393,7 +2412,7 @@ This affect directly file CANDIDATE."
|
|||
(format "No program %s found to extract exif"
|
||||
helm-ff-exif-data-program)))
|
||||
|
||||
(defun helm-find-files-persistent-action (candidate)
|
||||
(cl-defun helm-find-files-persistent-action (candidate)
|
||||
"Open subtree CANDIDATE without quitting helm.
|
||||
If CANDIDATE is not a directory expand CANDIDATE filename.
|
||||
If CANDIDATE is alone, open file CANDIDATE filename.
|
||||
|
|
@ -2402,6 +2421,7 @@ First hit on C-j expand CANDIDATE second hit open file.
|
|||
If a prefix arg is given or `helm-follow-mode' is on open file."
|
||||
(let* ((follow (or (helm-follow-mode-p)
|
||||
helm--temp-follow-flag))
|
||||
(image-cand (string-match-p (image-file-name-regexp) candidate))
|
||||
(new-pattern (helm-get-selection))
|
||||
(num-lines-buf (with-current-buffer helm-buffer
|
||||
(count-lines (point-min) (point-max))))
|
||||
|
|
@ -2412,6 +2432,11 @@ If a prefix arg is given or `helm-follow-mode' is on open file."
|
|||
(set-text-properties 0 (length fname)
|
||||
nil fname)
|
||||
(insert fname))))))
|
||||
(unless image-cand
|
||||
(when follow
|
||||
(helm-follow-mode -1)
|
||||
(cl-return-from helm-find-files-persistent-action
|
||||
(message "Helm-follow-mode allowed only on images, disabling"))))
|
||||
(cond ((and (helm-ff-invalid-tramp-name-p)
|
||||
(string-match helm-tramp-file-name-regexp candidate))
|
||||
;; First hit insert hostname and
|
||||
|
|
@ -2442,7 +2467,7 @@ If a prefix arg is given or `helm-follow-mode' is on open file."
|
|||
(funcall insert-in-minibuffer new-pattern))
|
||||
;; An image file and it is the second hit on C-j,
|
||||
;; show the file in `image-dired'.
|
||||
((string-match (image-file-name-regexp) candidate)
|
||||
(image-cand
|
||||
(when (buffer-live-p (get-buffer image-dired-display-image-buffer))
|
||||
(kill-buffer image-dired-display-image-buffer))
|
||||
;; Fix emacs bug never fixed upstream.
|
||||
|
|
@ -3712,6 +3737,36 @@ locate."
|
|||
:ff-transformer-show-only-basename nil
|
||||
:buffer "*helm recentf*"))
|
||||
|
||||
;;;###autoload
|
||||
(defun helm-delete-tramp-connection ()
|
||||
"Allow deleting tramp connection or marked tramp connections at once.
|
||||
|
||||
This replace `tramp-cleanup-connection' which is partially broken in
|
||||
emacs < to 25.1.50.1 (See Emacs Bug#24432).
|
||||
|
||||
It allows additionally to delete more than one connection at once."
|
||||
(interactive)
|
||||
(let ((helm-quit-if-no-candidate
|
||||
(lambda ()
|
||||
(message "No Tramp connection found"))))
|
||||
(helm :sources (helm-build-sync-source "Tramp connections"
|
||||
:candidates (tramp-list-connections)
|
||||
:candidate-transformer (lambda (candidates)
|
||||
(cl-loop for v in candidates
|
||||
for name = (apply #'tramp-make-tramp-file-name
|
||||
(cl-loop for i across v collect i))
|
||||
when (or (processp (tramp-get-connection-process v))
|
||||
(buffer-live-p (get-buffer (tramp-buffer-name v))))
|
||||
collect (cons name v)))
|
||||
:action (lambda (_vec)
|
||||
(let ((vecs (helm-marked-candidates)))
|
||||
(cl-loop for v in vecs
|
||||
do (progn
|
||||
(tramp-cleanup-connection v)
|
||||
(remhash v tramp-cache-data))))))
|
||||
:buffer "*helm tramp connections*")))
|
||||
|
||||
|
||||
(provide 'helm-files)
|
||||
|
||||
;; Local Variables:
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(define-package "helm" "20160914.813" "Helm is an Emacs incremental and narrowing framework"
|
||||
(define-package "helm" "20160919.2219" "Helm is an Emacs incremental and narrowing framework"
|
||||
'((emacs "24.4")
|
||||
(async "1.9")
|
||||
(popup "0.5.3")
|
||||
|
|
@ -428,10 +428,10 @@ that is sorting is done against real value of candidate."
|
|||
"Extract hostname from an incomplete tramp file name.
|
||||
Return nil on valid file name remote or not."
|
||||
(let* ((str (helm-basename fname))
|
||||
(split (split-string str ":"))
|
||||
(meth (car (member (car split) (mapcar 'car tramp-methods)))))
|
||||
(when (and meth (<= (length split) 2))
|
||||
(cadr split))))
|
||||
(split (split-string str ":" t))
|
||||
(meth (car (member (car split)
|
||||
(helm-ff-get-tramp-methods)))))
|
||||
(when meth (car (last split)))))
|
||||
|
||||
(cl-defun helm-file-human-size (size &optional (kbsize helm-default-kbsize))
|
||||
"Return a string showing SIZE of a file in human readable form.
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
;;; -*- no-byte-compile: t -*-
|
||||
(define-package "helm-ag" "20160809.337" "the silver searcher with helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-ag")
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
;;; helm-ag-autoloads.el --- automatically extracted autoloads
|
||||
;;
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "helm-ag" "helm-ag.el" (22454 5319 583192 780000))
|
||||
;;;### (autoloads nil "helm-ag" "helm-ag.el" (22499 37040 953000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-ag.el
|
||||
|
||||
(autoload 'helm-ag-pop-stack "helm-ag" "\
|
||||
|
|
@ -0,0 +1 @@
|
|||
(define-package "helm-ag" "20160917.2126" "the silver searcher with helm interface" '((emacs "24.4") (helm "2.0")) :url "https://github.com/syohex/emacs-helm-ag")
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
;; Author: Syohei YOSHIDA <syohex@gmail.com>
|
||||
;; URL: https://github.com/syohex/emacs-helm-ag
|
||||
;; Package-Version: 20160809.337
|
||||
;; Package-Version: 20160917.2126
|
||||
;; Version: 0.56
|
||||
;; Package-Requires: ((emacs "24.3") (helm "1.7.7"))
|
||||
;; Package-Requires: ((emacs "24.4") (helm "2.0"))
|
||||
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
(require 'helm-grep)
|
||||
(require 'helm-utils)
|
||||
(require 'compile)
|
||||
(require 'subr-x)
|
||||
|
||||
(declare-function helm-read-file-name "helm-mode")
|
||||
(declare-function helm-grep-get-file-extensions "helm-grep")
|
||||
|
|
@ -286,7 +287,7 @@ Default behaviour shows finish and result in mode-line."
|
|||
;; 'pt' always show filename if matched file is only one.
|
||||
(setq this-file nil))
|
||||
(let* ((file-line (helm-grep-split-line candidate))
|
||||
(filename (or this-file (cl-first file-line)))
|
||||
(filename (or this-file (cl-first file-line) candidate))
|
||||
(line (if this-file
|
||||
(cl-first (split-string candidate ":"))
|
||||
(cl-second file-line)))
|
||||
|
|
@ -470,7 +471,7 @@ Default behaviour shows finish and result in mode-line."
|
|||
(let* ((searched-word (helm-ag--searched-word))
|
||||
(marked-word (helm-ag--marked-input))
|
||||
(query (read-string "Pattern: " (or marked-word searched-word) 'helm-ag--command-history)))
|
||||
(when (string= query "")
|
||||
(when (string-empty-p query)
|
||||
(error "Input is empty!!"))
|
||||
(setq helm-ag--last-query query)))
|
||||
|
||||
|
|
@ -613,7 +614,7 @@ Default behaviour shows finish and result in mode-line."
|
|||
(if (not marked-lines)
|
||||
(setq buf-content (buffer-substring-no-properties
|
||||
body-start (point-max)))
|
||||
(setq buf-content (concat (mapconcat 'identity marked-lines "\n") "\n")))))
|
||||
(setq buf-content (concat (string-join marked-lines "\n") "\n")))))
|
||||
(insert buf-content)
|
||||
(add-text-properties (point-min) (point-max)
|
||||
'(read-only t rear-nonsticky t front-sticky t))
|
||||
|
|
@ -846,7 +847,7 @@ Continue searching the parent directory? "))
|
|||
(car patterns))
|
||||
(cl-case helm-ag--command-feature
|
||||
(pt input)
|
||||
(pt-regexp (mapconcat 'identity patterns ".*"))
|
||||
(pt-regexp (string-join patterns ".*"))
|
||||
(otherwise (cl-loop for s in patterns
|
||||
if (helm-ag--convert-invert-pattern s)
|
||||
concat (concat "(?=" it ")")
|
||||
|
|
@ -922,16 +923,22 @@ Continue searching the parent directory? "))
|
|||
"\\*" ""
|
||||
(replace-regexp-in-string "\\." "\\\\." ext)))))
|
||||
|
||||
(defun helm-ag--show-result-p (options has-query)
|
||||
(or has-query
|
||||
(cl-loop for opt in options
|
||||
thereis (string-prefix-p "-g" opt))))
|
||||
|
||||
(defun helm-ag--construct-do-ag-command (pattern)
|
||||
(let* ((opt-query (helm-ag--parse-options-and-query pattern))
|
||||
(options (car opt-query))
|
||||
(query (cdr opt-query)))
|
||||
(query (cdr opt-query))
|
||||
(has-query (not (string= query ""))))
|
||||
(when helm-ag-use-emacs-lisp-regexp
|
||||
(setq query (helm-ag--elisp-regexp-to-pcre query)))
|
||||
(unless (string= query "")
|
||||
(when (helm-ag--show-result-p options has-query)
|
||||
(append (car helm-do-ag--commands)
|
||||
(cl-remove-if (lambda (x) (string= "--" x)) options)
|
||||
(list "--" (helm-ag--join-patterns query))
|
||||
options
|
||||
(and has-query (list (helm-ag--join-patterns query)))
|
||||
(cdr helm-do-ag--commands)))))
|
||||
|
||||
(defun helm-ag--do-ag-set-command ()
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
;;; -*- no-byte-compile: t -*-
|
||||
(define-package "helm-gtags" "20160726.844" "GNU GLOBAL helm interface" '((emacs "24.3") (helm "1.7.7")) :url "https://github.com/syohex/emacs-helm-gtags")
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
;;; helm-gtags-autoloads.el --- automatically extracted autoloads
|
||||
;;
|
||||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "helm-gtags" "helm-gtags.el" (22454 5314 648076
|
||||
;;;;;; 739000))
|
||||
;;;### (autoloads nil "helm-gtags" "helm-gtags.el" (22499 37039 266000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from helm-gtags.el
|
||||
|
||||
(autoload 'helm-gtags-clear-all-cache "helm-gtags" "\
|
||||
|
|
@ -0,0 +1 @@
|
|||
(define-package "helm-gtags" "20160917.2238" "GNU GLOBAL helm interface" '((emacs "24.4") (helm "2.0")) :url "https://github.com/syohex/emacs-helm-gtags")
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
;; Author: Syohei YOSHIDA <syohex@gmail.com>
|
||||
;; URL: https://github.com/syohex/emacs-helm-gtags
|
||||
;; Package-Version: 20160726.844
|
||||
;; Package-Version: 20160917.2238
|
||||
;; Version: 1.5.6
|
||||
;; Package-Requires: ((emacs "24.3") (helm "1.7.7"))
|
||||
;; Package-Requires: ((emacs "24.4") (helm "2.0"))
|
||||
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -54,6 +54,7 @@
|
|||
(require 'helm-files)
|
||||
(require 'which-func)
|
||||
(require 'pulse)
|
||||
(require 'subr-x)
|
||||
|
||||
(declare-function helm-comp-read "helm-mode")
|
||||
(declare-function cygwin-convert-file-name-from-windows "cygw32.c")
|
||||
|
|
@ -517,7 +518,7 @@ Always update if value of this variable is nil."
|
|||
(setq helm-gtags--local-directory dir)))
|
||||
(let ((input (or in helm-gtags--query))
|
||||
(options (helm-gtags--construct-options type nil)))
|
||||
(when (string= input "")
|
||||
(when (string-empty-p input)
|
||||
(error "Input is empty!!"))
|
||||
(setq helm-gtags--last-input input)
|
||||
(reverse (cons input options))))
|
||||
|
|
@ -1241,7 +1242,7 @@ Generate new TAG file in selected directory with `C-u C-u'"
|
|||
(let* ((cmds (helm-gtags--update-tags-command how-to))
|
||||
(proc (apply #'start-file-process "helm-gtags-update-tag" nil cmds)))
|
||||
(if (not proc)
|
||||
(message "Failed: %s" (mapconcat 'identity cmds " "))
|
||||
(message "Failed: %s" (string-join cmds " "))
|
||||
(set-process-sentinel proc (helm-gtags--make-gtags-sentinel 'update))
|
||||
(setq helm-gtags--last-update-time current-time))))))
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
(define-package "helm-themes" "20151008.2321" "Color theme selection with helm interface" '((helm-core "1.7.7")) :url "https://github.com/syohex/emacs-helm-themes")
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "helm-themes" "helm-themes.el" (22490 28013
|
||||
;;;;;; 420728 518000))
|
||||
;;;### (autoloads nil "helm-themes" "helm-themes.el" (22499 37037
|
||||
;;;;;; 933000 0))
|
||||
;;; Generated autoloads from helm-themes.el
|
||||
|
||||
(autoload 'helm-themes "helm-themes" "\
|
||||
|
|
@ -0,0 +1 @@
|
|||
(define-package "helm-themes" "20160917.2245" "Color theme selection with helm interface" '((helm-core "2.0") (emacs "24.4")) :url "https://github.com/syohex/emacs-helm-themes")
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
;;; helm-themes.el --- Color theme selection with helm interface -*- lexical-binding: t; -*-
|
||||
|
||||
;; Copyright (C) 2015 by Syohei YOSHIDA
|
||||
;; Copyright (C) 2016 by Syohei YOSHIDA
|
||||
|
||||
;; Author: Syohei YOSHIDA <syohex@gmail.com>
|
||||
;; URL: https://github.com/syohex/emacs-helm-themes
|
||||
;; Package-Version: 20151008.2321
|
||||
;; Package-Version: 20160917.2245
|
||||
;; Version: 0.05
|
||||
;; Package-Requires: ((helm-core "1.7.7"))
|
||||
;; Package-Requires: ((helm-core "2.0") (emacs "24.4"))
|
||||
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -62,12 +62,14 @@ Contributors
|
|||
- Bart Bakker <bart@thesoftwarecraft.com>
|
||||
- Basil L. Contovounesios <contovob@tcd.ie>
|
||||
- Bastian Beischer <beischer@physik.rwth-aachen.de>
|
||||
- bb2020 <bb2020@users.noreply.github.com>
|
||||
- Ben Walton <bwalton@artsci.utoronto.ca>
|
||||
- Bradley Wright <brad@intranation.com>
|
||||
- Brandon W Maister <quodlibetor@gmail.com>
|
||||
- Brian Warner <warner@lothar.com>
|
||||
- Bryan Shell <bryan.shell@orbitz.com>
|
||||
- Carl Lieberman <liebermancarl@gmail.com>
|
||||
- Chillar Anand <anand21nanda@gmail.com>
|
||||
- Chris Bernard <cebernard@gmail.com>
|
||||
- Chris Done <chrisdone@gmail.com>
|
||||
- Chris Moore <dooglus@gmail.com>
|
||||
|
|
@ -211,6 +213,7 @@ Contributors
|
|||
- Samuel Bronson <naesten@gmail.com>
|
||||
- Samuel W. Flint <swflint@flintfam.org>
|
||||
- Sanjoy Das <sanjoy@playingwithpointers.com>
|
||||
- Sean Allred <code@seanallred.com>
|
||||
- Sean Bryant <sbryant@hackinggibsons.com>
|
||||
- Sebastian Wiesner <lunaryorn@gmail.com>
|
||||
- Sébastien Gross <seb@chezwam.org>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
(define-key map (kbd "q") 'undefined)
|
||||
(define-key map [remap undo] 'git-rebase-undo)
|
||||
(define-key map (kbd "RET") 'git-rebase-show-commit)
|
||||
(define-key map (kbd "SPC") 'magit-diff-show-or-scroll-up)
|
||||
(define-key map (kbd "SPC") 'git-rebase-show-or-scroll-up)
|
||||
(define-key map (kbd "x") 'git-rebase-exec)
|
||||
(define-key map (kbd "c") 'git-rebase-pick)
|
||||
(define-key map (kbd "r") 'git-rebase-reword)
|
||||
|
|
@ -351,15 +351,26 @@ Like `undo' but works in read-only buffers."
|
|||
(let ((inhibit-read-only t))
|
||||
(undo arg)))
|
||||
|
||||
(defun git-rebase--show-commit (&optional scroll)
|
||||
(let ((disable-magit-save-buffers t))
|
||||
(save-excursion
|
||||
(goto-char (line-beginning-position))
|
||||
(--if-let (and (looking-at git-rebase-line)
|
||||
(match-string 2))
|
||||
(if scroll
|
||||
(magit-diff-show-or-scroll-up)
|
||||
(apply #'magit-show-commit it (magit-diff-arguments)))
|
||||
(ding)))))
|
||||
|
||||
(defun git-rebase-show-commit ()
|
||||
"Show the commit on the current line if any."
|
||||
(interactive)
|
||||
(save-excursion
|
||||
(goto-char (line-beginning-position))
|
||||
(--if-let (and (looking-at git-rebase-line)
|
||||
(match-string 2))
|
||||
(apply #'magit-show-commit it (magit-diff-arguments))
|
||||
(ding))))
|
||||
(git-rebase--show-commit))
|
||||
|
||||
(defun git-rebase-show-or-scroll-up ()
|
||||
"Update the commit buffer for commit on current line."
|
||||
(interactive)
|
||||
(git-rebase--show-commit t))
|
||||
|
||||
(defun git-rebase-backward-line (&optional n)
|
||||
"Move N lines backward (forward if N is negative).
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22490 24929 563425
|
||||
;;;;;; 266000))
|
||||
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22499 37036 509000
|
||||
;;;;;; 0))
|
||||
;;; 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" (22490 24929 639425 44000))
|
||||
;;;### (autoloads nil "magit" "magit.el" (22499 37036 591000 0))
|
||||
;;; 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" (22490 24929
|
||||
;;;;;; 583425 208000))
|
||||
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22499 37036
|
||||
;;;;;; 532000 0))
|
||||
;;; 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" (22490
|
||||
;;;;;; 24929 527425 371000))
|
||||
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22499
|
||||
;;;;;; 37036 461000 0))
|
||||
;;; 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" (22490 24929
|
||||
;;;;;; 579425 220000))
|
||||
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22499 37036
|
||||
;;;;;; 524000 0))
|
||||
;;; 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" (22490 24929
|
||||
;;;;;; 623425 91000))
|
||||
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22499 37036
|
||||
;;;;;; 570000 0))
|
||||
;;; 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" (22490 24929
|
||||
;;;;;; 531425 360000))
|
||||
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22499 37036
|
||||
;;;;;; 465000 0))
|
||||
;;; 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" (22490 24929 615425
|
||||
;;;;;; 114000))
|
||||
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22499 37036 565000
|
||||
;;;;;; 0))
|
||||
;;; 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" (22490 24929
|
||||
;;;;;; 603425 149000))
|
||||
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22499 37036
|
||||
;;;;;; 552000 0))
|
||||
;;; 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" (22490 24929
|
||||
;;;;;; 535425 348000))
|
||||
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22499 37036
|
||||
;;;;;; 476000 0))
|
||||
;;; 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" (22490 24929 607425
|
||||
;;;;;; 138000))
|
||||
;;;### (autoloads nil "magit-log" "magit-log.el" (22499 37036 560000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from magit-log.el
|
||||
|
||||
(autoload 'magit-log-buffer-file-popup "magit-log" "\
|
||||
|
|
@ -1043,8 +1043,8 @@ Show commits in a branch that are not merged in the upstream branch.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22490 24929
|
||||
;;;;;; 655424 997000))
|
||||
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22499 37036
|
||||
;;;;;; 641000 0))
|
||||
;;; Generated autoloads from magit-remote.el
|
||||
|
||||
(autoload 'magit-clone "magit-remote" "\
|
||||
|
|
@ -1276,8 +1276,8 @@ is asked to pull. START has to be reachable from that commit.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22490
|
||||
;;;;;; 24929 647425 21000))
|
||||
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22499
|
||||
;;;;;; 37036 628000 0))
|
||||
;;; Generated autoloads from magit-sequence.el
|
||||
|
||||
(autoload 'magit-sequencer-continue "magit-sequence" "\
|
||||
|
|
@ -1427,8 +1427,8 @@ Abort the current rebase operation, restoring the original branch.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22490 24929
|
||||
;;;;;; 595425 172000))
|
||||
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22499 37036
|
||||
;;;;;; 545000 0))
|
||||
;;; Generated autoloads from magit-stash.el
|
||||
(autoload 'magit-stash-popup "magit-stash" nil t)
|
||||
|
||||
|
|
@ -1527,8 +1527,8 @@ Show all diffs of a stash in a buffer.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22490
|
||||
;;;;;; 24929 671424 951000))
|
||||
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22499
|
||||
;;;;;; 37036 658000 0))
|
||||
;;; Generated autoloads from magit-submodule.el
|
||||
(autoload 'magit-submodule-popup "magit-submodule" nil t)
|
||||
|
||||
|
|
@ -1618,8 +1618,8 @@ Display a list of the current repository's submodules.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22490 24929
|
||||
;;;;;; 571425 243000))
|
||||
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22499 37036
|
||||
;;;;;; 515000 0))
|
||||
;;; Generated autoloads from magit-subtree.el
|
||||
(autoload 'magit-subtree-popup "magit-subtree" nil t)
|
||||
|
||||
|
|
@ -1655,8 +1655,8 @@ Extract the history of the subtree PREFIX.
|
|||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22490 24929 547425
|
||||
;;;;;; 313000))
|
||||
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22499 37036 487000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from magit-wip.el
|
||||
|
||||
(defvar magit-wip-after-save-mode nil "\
|
||||
|
|
@ -1723,7 +1723,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")
|
||||
;;;;;; (22490 24929 686201 65000))
|
||||
;;;;;; (22499 37036 664798 723000))
|
||||
|
||||
;;;***
|
||||
|
||||
|
|
@ -2082,8 +2082,14 @@ are highlighted."
|
|||
|
||||
(defun magit-diff-update-hunk-region (section)
|
||||
(when (and (eq (magit-diff-scope section t) 'region)
|
||||
(not (and (eq this-command 'mouse-drag-region)
|
||||
(eq (mark) (point)))))
|
||||
(not (and (if (version< emacs-version "25.1")
|
||||
(eq this-command 'mouse-drag-region)
|
||||
(or (eq last-command 'mouse-drag-region)
|
||||
;; When another window was previously
|
||||
;; selected then the last-command is
|
||||
;; a byte-code function.
|
||||
(byte-code-function-p last-command)))
|
||||
(eq (region-end) (region-beginning)))))
|
||||
(let ((sbeg (magit-section-start section))
|
||||
(cbeg (magit-section-content section))
|
||||
(rbeg (save-excursion (goto-char (region-beginning))
|
||||
|
|
@ -2097,11 +2103,11 @@ are highlighted."
|
|||
(when magit-diff-unmarked-lines-keep-foreground
|
||||
(setq face (list :background (face-attribute face :background))))
|
||||
(cl-flet ((ov (start end &rest args)
|
||||
(let ((ov (make-overlay start end nil t)))
|
||||
(overlay-put ov 'evaporate t)
|
||||
(while args (overlay-put ov (pop args) (pop args)))
|
||||
(push ov magit-region-overlays)
|
||||
ov)))
|
||||
(let ((ov (make-overlay start end nil t)))
|
||||
(overlay-put ov 'evaporate t)
|
||||
(while args (overlay-put ov (pop args) (pop args)))
|
||||
(push ov magit-region-overlays)
|
||||
ov)))
|
||||
(ov sbeg cbeg 'face 'magit-diff-lines-heading
|
||||
'display (concat (magit-diff-hunk-region-header section) "\n"))
|
||||
(ov cbeg rbeg 'face face 'priority 2)
|
||||
|
|
@ -51,7 +51,8 @@
|
|||
"Git and other external processes used by Magit."
|
||||
:group 'magit)
|
||||
|
||||
(defvar magit-git-environment nil
|
||||
(defvar magit-git-environment
|
||||
(list (format "INSIDE_EMACS=%s,magit" emacs-version))
|
||||
"Prepended to `process-environment' while running git.")
|
||||
|
||||
(defcustom magit-git-executable
|
||||
|
|
@ -74,11 +75,12 @@
|
|||
"alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
|
||||
"X" "git"))
|
||||
(setq magit-git-environment
|
||||
(list (concat "PATH="
|
||||
(cons (concat "PATH="
|
||||
(car (process-lines
|
||||
it "-c"
|
||||
"alias.P=!cygpath -wp \"$PATH\""
|
||||
"P")))))))
|
||||
"P")))
|
||||
magit-git-environment))))
|
||||
;; For 1.x, we search for bin/ next to cmd/.
|
||||
(let ((alt (directory-file-name (file-name-directory it))))
|
||||
(if (and (equal (file-name-nondirectory alt) "cmd")
|
||||
|
|
@ -1030,8 +1030,8 @@ Do not add this to a hook variable."
|
|||
'face 'magit-log-author)
|
||||
" "))
|
||||
(propertize (magit-format-duration
|
||||
(abs (truncate (- (float-time)
|
||||
(string-to-number date))))
|
||||
(abs (- (float-time)
|
||||
(string-to-number date)))
|
||||
(symbol-value duration-spec)
|
||||
unit-width)
|
||||
'face 'magit-log-date)
|
||||
|
|
@ -1343,8 +1343,7 @@ Type \\[magit-reset] to reset HEAD to the commit at point.
|
|||
(magit-insert-heading
|
||||
(format (propertize "Unpulled from %s:" 'face 'magit-section-heading)
|
||||
(magit-get-upstream-branch)))
|
||||
(magit-insert-log "..@{upstream}" magit-log-section-arguments)
|
||||
(magit-section-cache-visibility))))
|
||||
(magit-insert-log "..@{upstream}" magit-log-section-arguments))))
|
||||
|
||||
(magit-define-section-jumper magit-jump-to-unpulled-from-pushremote
|
||||
"Unpulled from <push-remote>" unpulled
|
||||
|
|
@ -1363,8 +1362,7 @@ Type \\[magit-reset] to reset HEAD to the commit at point.
|
|||
(magit-insert-heading
|
||||
(format (propertize "Unpulled from %s:" 'face 'magit-section-heading)
|
||||
(propertize it 'face 'magit-branch-remote)))
|
||||
(magit-insert-log (concat ".." it) magit-log-section-arguments)
|
||||
(magit-section-cache-visibility)))))
|
||||
(magit-insert-log (concat ".." it) magit-log-section-arguments)))))
|
||||
|
||||
(defvar magit-unpushed-section-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
|
|
@ -1382,8 +1380,7 @@ Type \\[magit-reset] to reset HEAD to the commit at point.
|
|||
(magit-insert-heading
|
||||
(format (propertize "Unmerged into %s:" 'face 'magit-section-heading)
|
||||
(magit-get-upstream-branch)))
|
||||
(magit-insert-log "@{upstream}.." magit-log-section-arguments)
|
||||
(magit-section-cache-visibility))))
|
||||
(magit-insert-log "@{upstream}.." magit-log-section-arguments))))
|
||||
|
||||
(magit-define-section-jumper magit-jump-to-unpushed-to-pushremote
|
||||
"Unpushed to <push-remote>" unpushed
|
||||
|
|
@ -1400,8 +1397,7 @@ Type \\[magit-reset] to reset HEAD to the commit at point.
|
|||
(magit-insert-heading
|
||||
(format (propertize "Unpushed to %s:" 'face 'magit-section-heading)
|
||||
(propertize it 'face 'magit-branch-remote)))
|
||||
(magit-insert-log (concat it "..") magit-log-section-arguments)
|
||||
(magit-section-cache-visibility)))))
|
||||
(magit-insert-log (concat it "..") magit-log-section-arguments)))))
|
||||
|
||||
(defun magit-insert-recent-commits (&optional collapse)
|
||||
"Insert section showing recent commits.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(define-package "magit" "20160907.945" "A Git porcelain inside Emacs"
|
||||
(define-package "magit" "20160921.834" "A Git porcelain inside Emacs"
|
||||
'((emacs "24.4")
|
||||
(async "20160711.223")
|
||||
(dash "20160820.501")
|
||||
|
|
@ -330,7 +330,9 @@ With a prefix argument also expand it." heading)
|
|||
(remove-overlays beg end 'invisible t)
|
||||
(let ((o (make-overlay beg end)))
|
||||
(overlay-put o 'evaporate t)
|
||||
(overlay-put o 'invisible t))))))
|
||||
(overlay-put o 'invisible t))))
|
||||
(when (memq (magit-section-type section) '(unpulled unpushed))
|
||||
(magit-section-cache-visibility section))))
|
||||
|
||||
(defun magit-section-toggle (section)
|
||||
"Toggle visibility of the body of the current section."
|
||||
|
|
@ -1040,10 +1042,10 @@ current section, the one point is in.
|
|||
|
||||
When the region looks like it would in any other buffer then
|
||||
the selection is invalid. When the selection is valid then the
|
||||
region uses the `magit-section-highlight'. This does not apply
|
||||
to diffs were things get a bit more complicated, but even here
|
||||
if the region looks like it usually does, then that's not a
|
||||
valid selection as far as this function is concerned.
|
||||
region uses the `magit-section-highlight' face. This does not
|
||||
apply to diffs were things get a bit more complicated, but even
|
||||
here if the region looks like it usually does, then that's not
|
||||
a valid selection as far as this function is concerned.
|
||||
|
||||
If optional TYPES is non-nil then the selection not only has to
|
||||
be valid; the types of all selected sections additionally have to
|
||||
|
|
@ -171,7 +171,8 @@ without prompting."
|
|||
'magit-commands
|
||||
:man-page "git-revert"
|
||||
:switches '((?s "Add Signed-off-by lines" "--signoff"))
|
||||
:options '((?s "Strategy" "--strategy="))
|
||||
:options '((?s "Strategy" "--strategy=")
|
||||
(?S "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key))
|
||||
:actions '((?V "Revert commit(s)" magit-revert)
|
||||
(?v "Revert changes" magit-revert-no-commit))
|
||||
:sequence-actions '((?V "Continue" magit-sequencer-continue)
|
||||
|
|
@ -3191,7 +3191,14 @@ Git, and Emacs in the echo area."
|
|||
(setq magit-version
|
||||
(and (fboundp 'package-desc-version)
|
||||
(package-version-join
|
||||
(package-desc-version (cadr it)))))))))))
|
||||
(package-desc-version (cadr it))))))))
|
||||
(progn
|
||||
(push 'debug debug)
|
||||
(let ((dirname (file-name-nondirectory
|
||||
(directory-file-name topdir))))
|
||||
(when (string-match "\\`magit-\\([0-9]\\{8\\}\\.[0-9]*\\)"
|
||||
dirname)
|
||||
(setq magit-version (match-string 1 dirname))))))))
|
||||
(if (stringp magit-version)
|
||||
(when (called-interactively-p 'any)
|
||||
(message "Magit %s, Git %s, Emacs %s, %s"
|
||||
|
|
@ -27,7 +27,7 @@ END-INFO-DIR-ENTRY
|
|||
|
||||
Indirect:
|
||||
magit.info-1: 1222
|
||||
magit.info-2: 315701
|
||||
magit.info-2: 315897
|
||||
|
||||
Tag Table:
|
||||
(Indirect)
|
||||
|
|
@ -130,44 +130,44 @@ Node: Essential settings220108
|
|||
Node: Safety220432
|
||||
Node: Performance222265
|
||||
Node: Plumbing230227
|
||||
Node: Calling Git230855
|
||||
Node: Getting a value from Git232378
|
||||
Node: Calling Git for effect235482
|
||||
Node: Section plumbing241986
|
||||
Node: Creating sections242214
|
||||
Node: Section selection246113
|
||||
Node: Matching sections247793
|
||||
Node: Refreshing buffers253002
|
||||
Node: Conventions256137
|
||||
Node: Confirmation and completion256314
|
||||
Node: Theming Faces257212
|
||||
Node: FAQ265363
|
||||
Node: Magit is slow266976
|
||||
Node: I changed several thousand files at once and now Magit is unusable267177
|
||||
Node: I am having problems committing267893
|
||||
Node: Diffs are collapsed after un-/staging268339
|
||||
Node: I don't understand how branching and pushing work269817
|
||||
Node: I don't like the key binding in v24270192
|
||||
Node: I cannot install the pre-requisites for Magit v2270531
|
||||
Node: I am using an Emacs release older than v244270996
|
||||
Node: I am using a Git release older than v194272609
|
||||
Node: I am using MS Windows and cannot push with Magit273596
|
||||
Node: I am using OS X and SOMETHING works in shell but not in Magit274200
|
||||
Node: How to install the gitman info manual?274991
|
||||
Node: How can I show Git's output?277532
|
||||
Node: Diffs contain control sequences278319
|
||||
Node: Expanding a file to show the diff causes it to disappear279324
|
||||
Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer279859
|
||||
Node: The mode-line information isn't always up-to-date280889
|
||||
Node: Can Magit be used as ‘ediff-version-control-package’?281957
|
||||
Node: How to show diffs for gpg-encrypted files?284001
|
||||
Node: Emacs 245 hangs when loading Magit284598
|
||||
Node: Symbol's value as function is void ‘--some’285173
|
||||
Node: Where is the branch manager285507
|
||||
Node: Keystroke Index285798
|
||||
Node: Command Index315701
|
||||
Node: Function Index345710
|
||||
Node: Variable Index359604
|
||||
Node: Calling Git231051
|
||||
Node: Getting a value from Git232574
|
||||
Node: Calling Git for effect235678
|
||||
Node: Section plumbing242182
|
||||
Node: Creating sections242410
|
||||
Node: Section selection246309
|
||||
Node: Matching sections247989
|
||||
Node: Refreshing buffers253198
|
||||
Node: Conventions256333
|
||||
Node: Confirmation and completion256510
|
||||
Node: Theming Faces257408
|
||||
Node: FAQ265559
|
||||
Node: Magit is slow267172
|
||||
Node: I changed several thousand files at once and now Magit is unusable267373
|
||||
Node: I am having problems committing268089
|
||||
Node: Diffs are collapsed after un-/staging268535
|
||||
Node: I don't understand how branching and pushing work270013
|
||||
Node: I don't like the key binding in v24270388
|
||||
Node: I cannot install the pre-requisites for Magit v2270727
|
||||
Node: I am using an Emacs release older than v244271192
|
||||
Node: I am using a Git release older than v194272805
|
||||
Node: I am using MS Windows and cannot push with Magit273792
|
||||
Node: I am using OS X and SOMETHING works in shell but not in Magit274396
|
||||
Node: How to install the gitman info manual?275187
|
||||
Node: How can I show Git's output?277728
|
||||
Node: Diffs contain control sequences278515
|
||||
Node: Expanding a file to show the diff causes it to disappear279520
|
||||
Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer280055
|
||||
Node: The mode-line information isn't always up-to-date281085
|
||||
Node: Can Magit be used as ‘ediff-version-control-package’?282153
|
||||
Node: How to show diffs for gpg-encrypted files?284197
|
||||
Node: Emacs 245 hangs when loading Magit284794
|
||||
Node: Symbol's value as function is void ‘--some’285369
|
||||
Node: Where is the branch manager285703
|
||||
Node: Keystroke Index285994
|
||||
Node: Command Index315897
|
||||
Node: Function Index345906
|
||||
Node: Variable Index359800
|
||||
|
||||
End Tag Table
|
||||
|
||||
|
|
@ -4283,7 +4283,7 @@ e.g.:
|
|||
Take the red pill.
|
||||
>>>>>>> feature
|
||||
|
||||
In this case you have chosen to take the red pill on one bracnh and
|
||||
In this case you have chosen to take the red pill on one branch and
|
||||
on another you picked the blue pill. Now that you are merging these two
|
||||
diverging branches, Git cannot possibly know which pill you want to
|
||||
take.
|
||||
|
|
@ -4927,7 +4927,7 @@ Also see *note (gitman)git-stash:: .
|
|||
staged changes, apply without preserving the stash index and forgo
|
||||
removing the stash.
|
||||
|
||||
‘z d’ (‘magit-stash-drop’)
|
||||
‘z k’ (‘magit-stash-drop’)
|
||||
|
||||
Remove a stash from the stash list. When the region is active,
|
||||
offer to drop all contained stashes.
|
||||
|
|
@ -6171,6 +6171,10 @@ packages, without having to depend on Magit. These libraries are
|
|||
described in separate manuals, see *note (with-editor)Top:: and *note
|
||||
(magit-popup)Top::.
|
||||
|
||||
If you are trying to find an unused key that you can bound to a
|
||||
command provided by your own Magit extension, then checkout
|
||||
<https://github.com/magit/magit/wiki/Plugin-Dispatch-Key-Registry>.
|
||||
|
||||
* Menu:
|
||||
|
||||
* Calling Git::
|
||||
|
|
@ -7781,10 +7785,10 @@ Appendix B Keystroke Index
|
|||
* z: Stashing. (line 8)
|
||||
* z a: Stashing. (line 58)
|
||||
* z b: Stashing. (line 84)
|
||||
* z d: Stashing. (line 71)
|
||||
* z f: Stashing. (line 88)
|
||||
* z i: Stashing. (line 20)
|
||||
* z I: Stashing. (line 46)
|
||||
* z k: Stashing. (line 71)
|
||||
* z l: Stashing. (line 76)
|
||||
* z p: Stashing. (line 64)
|
||||
* z v: Stashing. (line 80)
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22490 24926
|
||||
;;;;;; 595433 990000))
|
||||
;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22499 37034
|
||||
;;;;;; 850000 0))
|
||||
;;; Generated autoloads from markdown-mode.el
|
||||
|
||||
(autoload 'markdown-mode "markdown-mode" "\
|
||||
|
|
@ -1 +1 @@
|
|||
(define-package "markdown-mode" "20160830.820" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))
|
||||
(define-package "markdown-mode" "20160920.743" "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"))
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
;; Maintainer: Jason R. Blevins <jrblevin@sdf.org>
|
||||
;; Created: May 24, 2007
|
||||
;; Version: 2.1
|
||||
;; Package-Version: 20160830.820
|
||||
;; Package-Version: 20160920.743
|
||||
;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
|
||||
;; Keywords: Markdown, GitHub Flavored Markdown, itex
|
||||
;; URL: http://jblevins.org/projects/markdown-mode/
|
||||
|
|
@ -4299,14 +4299,16 @@ before the current point, then exdent the line one level.
|
|||
Otherwise, do normal delete by repeating
|
||||
`backward-delete-char-untabify' ARG times."
|
||||
(interactive "*p")
|
||||
(let ((cur-pos (current-column))
|
||||
(start-of-indention (save-excursion
|
||||
(back-to-indentation)
|
||||
(current-column)))
|
||||
(positions (markdown-calc-indents)))
|
||||
(if (and (> cur-pos 0) (= cur-pos start-of-indention))
|
||||
(indent-line-to (markdown-exdent-find-next-position cur-pos positions))
|
||||
(backward-delete-char-untabify arg))))
|
||||
(if (use-region-p)
|
||||
(backward-delete-char-untabify arg)
|
||||
(let ((cur-pos (current-column))
|
||||
(start-of-indention (save-excursion
|
||||
(back-to-indentation)
|
||||
(current-column)))
|
||||
(positions (markdown-calc-indents)))
|
||||
(if (and (> cur-pos 0) (= cur-pos start-of-indention))
|
||||
(indent-line-to (markdown-exdent-find-next-position cur-pos positions))
|
||||
(backward-delete-char-untabify arg)))))
|
||||
|
||||
(defun markdown-find-leftmost-column (beg end)
|
||||
"Find the leftmost column in the region from BEG to END."
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
|
||||
|
||||
;;;### (autoloads nil "projectile" "projectile.el" (22490 24925 611436
|
||||
;;;;;; 906000))
|
||||
;;;### (autoloads nil "projectile" "projectile.el" (22499 37033 362000
|
||||
;;;;;; 0))
|
||||
;;; Generated autoloads from projectile.el
|
||||
|
||||
(autoload 'projectile-version "projectile" "\
|
||||
|
|
@ -1 +1 @@
|
|||
(define-package "projectile" "20160830.138" "Manage and navigate projects in Emacs easily" '((pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
|
||||
(define-package "projectile" "20160921.902" "Manage and navigate projects in Emacs easily" '((pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
;; Author: Bozhidar Batsov <bozhidar@batsov.com>
|
||||
;; URL: https://github.com/bbatsov/projectile
|
||||
;; Package-Version: 20160830.138
|
||||
;; Package-Version: 20160921.902
|
||||
;; Keywords: project, convenience
|
||||
;; Version: 0.14.0
|
||||
;; Version: 0.15.0-cvs
|
||||
;; Package-Requires: ((pkg-info "0.4"))
|
||||
|
||||
;; This file is NOT part of GNU Emacs.
|
||||
|
|
@ -264,7 +264,7 @@ Two example filter functions are shipped by default -
|
|||
`projectile-buffers-with-file' and
|
||||
`projectile-buffers-with-file-or-process'."
|
||||
:group 'projectile
|
||||
:type 'symbol)
|
||||
:type 'function)
|
||||
|
||||
(defcustom projectile-project-name nil
|
||||
"If this value is non-nil, it will be used as project name.
|
||||
|
|
@ -279,7 +279,7 @@ It has precedence over function `projectile-project-name-function'."
|
|||
|
||||
If variable `projectile-project-name' is non-nil, this function will not be used."
|
||||
:group 'projectile
|
||||
:type 'symbol
|
||||
:type 'function
|
||||
:package-version '(projectile . "0.14.0"))
|
||||
|
||||
(defcustom projectile-project-root-files
|
||||
|
|
@ -426,7 +426,7 @@ it for functions working with buffers."
|
|||
|
||||
Any function that does not take arguments will do."
|
||||
:group 'projectile
|
||||
:type 'symbol)
|
||||
:type 'function)
|
||||
|
||||
(defcustom projectile-find-dir-includes-top-level nil
|
||||
"If true, add top-level dir to options offered by `projectile-find-dir'."
|
||||
|
|
@ -584,7 +584,7 @@ just return nil."
|
|||
(if (require 'pkg-info nil t)
|
||||
(let ((version (pkg-info-version-info 'projectile)))
|
||||
(when show-version
|
||||
(message "Projectile version: %s" version))
|
||||
(message "Projectile %s" version))
|
||||
version)
|
||||
(error "Cannot determine version without package pkg-info")))
|
||||
|
||||
|
|
@ -896,7 +896,7 @@ A thin wrapper around `file-truename' that handles nil."
|
|||
(defun projectile-get-project-directories ()
|
||||
"Get the list of project directories that are of interest to the user."
|
||||
(mapcar (lambda (subdir) (concat (projectile-project-root) subdir))
|
||||
(or (nth 0 (projectile-parse-dirconfig-file)) '(""))))
|
||||
(or (nth 0 (projectile-parse-dirconfig-file)) '(""))))
|
||||
|
||||
(defun projectile-dir-files (directory)
|
||||
"List the files in DIRECTORY and in its sub-directories.
|
||||
|
|
@ -920,15 +920,15 @@ Files are returned as relative paths to the project root."
|
|||
(propertize directory 'face 'font-lock-keyword-face)))))
|
||||
;; we need the files with paths relative to the project root
|
||||
(mapcar (lambda (file) (file-relative-name file root))
|
||||
(projectile-index-directory directory (projectile-filtering-patterns)
|
||||
progress-reporter))))
|
||||
(projectile-index-directory directory (projectile-filtering-patterns)
|
||||
progress-reporter))))
|
||||
|
||||
(defun projectile-dir-files-external (root directory)
|
||||
"Get the files for ROOT under DIRECTORY using external tools."
|
||||
(let ((default-directory directory))
|
||||
(mapcar (lambda (file)
|
||||
(file-relative-name (expand-file-name file directory) root))
|
||||
(projectile-get-repo-files))))
|
||||
(file-relative-name (expand-file-name file directory) root))
|
||||
(projectile-get-repo-files))))
|
||||
|
||||
(defcustom projectile-git-command "git ls-files -zco --exclude-standard"
|
||||
"Command used by projectile to get the files in a git project."
|
||||
|
|
@ -999,7 +999,8 @@ Files are returned as relative paths to the project root."
|
|||
(let ((vcs (projectile-project-vcs)))
|
||||
(cond
|
||||
((eq vcs 'git) projectile-git-ignored-command)
|
||||
(t (error "VCS command for ignored files not implemented yet")))))
|
||||
;; TODO: Add support for other VCS
|
||||
(t nil))))
|
||||
|
||||
(defun projectile-flatten (lst)
|
||||
"Take a nested list LST and return its contents as a single, flat list."
|
||||
|
|
@ -1072,7 +1073,8 @@ they are excluded from the results of this function."
|
|||
(defun projectile-get-repo-ignored-files ()
|
||||
"Get a list of the files ignored in the project."
|
||||
(let ((cmd (projectile-get-ext-ignored-command)))
|
||||
(projectile-files-via-ext-command cmd)))
|
||||
(when cmd
|
||||
(projectile-files-via-ext-command cmd))))
|
||||
|
||||
(defun projectile-files-via-ext-command (command)
|
||||
"Get a list of relative file names in the project root by executing COMMAND."
|
||||
|
|
@ -1154,7 +1156,7 @@ this case unignored files will be absent from FILES."
|
|||
(defun projectile-buffers-with-file-or-process (buffers)
|
||||
"Return only those BUFFERS backed by files or processes."
|
||||
(cl-remove-if-not (lambda (b) (or (buffer-file-name b)
|
||||
(get-buffer-process b))) buffers))
|
||||
(get-buffer-process b))) buffers))
|
||||
|
||||
(defun projectile-project-buffers ()
|
||||
"Get a list of project buffers."
|
||||
|
|
@ -1298,10 +1300,10 @@ resulting paths. The returned PATHS are absolute, based on the
|
|||
projectile project root."
|
||||
(let ((default-directory (projectile-project-root)))
|
||||
(projectile-flatten (mapcar
|
||||
(lambda (pattern)
|
||||
(or (file-expand-wildcards pattern t)
|
||||
(projectile-expand-root pattern)))
|
||||
paths))))
|
||||
(lambda (pattern)
|
||||
(or (file-expand-wildcards pattern t)
|
||||
(projectile-expand-root pattern)))
|
||||
paths))))
|
||||
|
||||
(defun projectile-normalise-patterns (patterns)
|
||||
"Remove paths from PATTERNS."
|
||||
|
|
@ -1681,15 +1683,15 @@ With FLEX-MATCHING, match any file that contains the base name of current file"
|
|||
project-file-list))
|
||||
(candidates
|
||||
(projectile-flatten (mapcar
|
||||
(lambda (file)
|
||||
(cl-remove-if-not
|
||||
(lambda (project-file)
|
||||
(string-match file
|
||||
(concat (file-name-base project-file)
|
||||
(unless (equal (file-name-extension project-file) nil)
|
||||
(concat "\." (file-name-extension project-file))))))
|
||||
candidates))
|
||||
file-list)))
|
||||
(lambda (file)
|
||||
(cl-remove-if-not
|
||||
(lambda (project-file)
|
||||
(string-match file
|
||||
(concat (file-name-base project-file)
|
||||
(unless (equal (file-name-extension project-file) nil)
|
||||
(concat "\." (file-name-extension project-file))))))
|
||||
candidates))
|
||||
file-list)))
|
||||
(candidates
|
||||
(cl-remove-if-not (lambda (file) (not (backup-file-name-p file))) candidates))
|
||||
(candidates
|
||||
|
|
@ -2277,10 +2279,10 @@ regular expression."
|
|||
(ag-ignore-list (unless (eq (projectile-project-vcs) 'git)
|
||||
;; ag supports git ignore files
|
||||
(cl-union ag-ignore-list
|
||||
(append
|
||||
(projectile-ignored-files-rel) (projectile-ignored-directories-rel)
|
||||
(projectile--globally-ignored-file-suffixes-glob)
|
||||
grep-find-ignored-files grep-find-ignored-directories))))
|
||||
(append
|
||||
(projectile-ignored-files-rel) (projectile-ignored-directories-rel)
|
||||
(projectile--globally-ignored-file-suffixes-glob)
|
||||
grep-find-ignored-files grep-find-ignored-directories))))
|
||||
;; reset the prefix arg, otherwise it will affect the ag-command
|
||||
(current-prefix-arg nil))
|
||||
(funcall ag-command search-term (projectile-project-root)))
|
||||
|
|
@ -2800,7 +2802,7 @@ An open project is a project with any open buffers."
|
|||
"Remove the current project (if any) from the list of PROJECTS."
|
||||
(if (projectile-project-p)
|
||||
(projectile-difference projects
|
||||
(list (abbreviate-file-name (projectile-project-root))))
|
||||
(list (abbreviate-file-name (projectile-project-root))))
|
||||
projects))
|
||||
|
||||
(defun projectile-relevant-known-projects ()
|
||||
|
|
@ -2844,12 +2846,15 @@ With a prefix ARG invokes `projectile-commander' instead of
|
|||
Invokes the command referenced by `projectile-switch-project-action' on switch.
|
||||
With a prefix ARG invokes `projectile-commander' instead of
|
||||
`projectile-switch-project-action.'"
|
||||
(let* ((default-directory project-to-switch)
|
||||
(switch-project-action (if arg
|
||||
(let ((switch-project-action (if arg
|
||||
'projectile-commander
|
||||
projectile-switch-project-action)))
|
||||
(run-hooks 'projectile-before-switch-project-hook)
|
||||
(funcall switch-project-action)
|
||||
;; use a temporary buffer to load PROJECT-TO-SWITCH's dir-locals before calling SWITCH-PROJECT-ACTION
|
||||
(with-temp-buffer
|
||||
(let ((default-directory project-to-switch))
|
||||
(hack-dir-local-variables-non-file-buffer)
|
||||
(funcall switch-project-action)))
|
||||
(run-hooks 'projectile-after-switch-project-hook)))
|
||||
|
||||
;;;###autoload
|
||||
|
|
@ -2960,6 +2965,7 @@ See `projectile-cleanup-known-projects'."
|
|||
|
||||
(defun projectile-add-known-project (project-root)
|
||||
"Add PROJECT-ROOT to the list of known projects."
|
||||
(interactive (list (read-directory-name "Add to known projects: ")))
|
||||
(unless (projectile-ignored-project-p project-root)
|
||||
(setq projectile-known-projects
|
||||
(delete-dups
|
||||
Loading…
Reference in New Issue