Update packages

This commit is contained in:
Gergely Polonkai 2016-10-13 11:00:25 +02:00
parent 92fde9d71e
commit 293f74a0f6
92 changed files with 331 additions and 274 deletions

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "flycheck" "flycheck.el" (22523 21256 196498 ;;;### (autoloads nil "flycheck" "flycheck.el" (22527 12709 290696
;;;;;; 256000)) ;;;;;; 478000))
;;; Generated autoloads from flycheck.el ;;; Generated autoloads from flycheck.el
(autoload 'flycheck-manual "flycheck" "\ (autoload 'flycheck-manual "flycheck" "\
@ -228,7 +228,7 @@ Use this together with the `option', `option-list' and
;;;*** ;;;***
;;;### (autoloads nil nil ("flycheck-buttercup.el" "flycheck-ert.el" ;;;### (autoloads nil nil ("flycheck-buttercup.el" "flycheck-ert.el"
;;;;;; "flycheck-pkg.el") (22523 21256 192498 226000)) ;;;;;; "flycheck-pkg.el") (22527 12709 286696 474000))
;;;*** ;;;***

View File

@ -1,4 +1,4 @@
(define-package "flycheck" "20161007.427" "On-the-fly syntax checking" (define-package "flycheck" "20161012.433" "On-the-fly syntax checking"
'((dash "2.12.1") '((dash "2.12.1")
(pkg-info "0.4") (pkg-info "0.4")
(let-alist "1.0.4") (let-alist "1.0.4")

View File

@ -8,7 +8,7 @@
;; Clément Pit--Claudel <clement.pitclaudel@live.com> ;; Clément Pit--Claudel <clement.pitclaudel@live.com>
;; URL: http://www.flycheck.org ;; URL: http://www.flycheck.org
;; Keywords: convenience, languages, tools ;; Keywords: convenience, languages, tools
;; Version: 30-cvs ;; Version: 31-cvs
;; Package-Requires: ((dash "2.12.1") (pkg-info "0.4") (let-alist "1.0.4") (seq "1.11") (emacs "24.3")) ;; Package-Requires: ((dash "2.12.1") (pkg-info "0.4") (let-alist "1.0.4") (seq "1.11") (emacs "24.3"))
;; This file is not part of GNU Emacs. ;; This file is not part of GNU Emacs.

View File

@ -1,2 +0,0 @@
;;; -*- no-byte-compile: t -*-
(define-package "git-commit" "20161009.252" "Edit Git commit messages" '((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "git-commit" "git-commit.el" (22523 21254 332484 ;;;### (autoloads nil "git-commit" "git-commit.el" (22527 12708 294695
;;;;;; 538000)) ;;;;;; 533000))
;;; Generated autoloads from git-commit.el ;;; Generated autoloads from git-commit.el
(defvar global-git-commit-mode t "\ (defvar global-git-commit-mode t "\

View File

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "git-commit" "20161011.1738" "Edit Git commit messages" '((emacs "24.4") (dash "20160820.501") (with-editor "20160929.734")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))

View File

@ -11,8 +11,8 @@
;; Marius Vollmer <marius.vollmer@gmail.com> ;; Marius Vollmer <marius.vollmer@gmail.com>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li> ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
;; Package-Requires: ((emacs "24.4") (dash "20160820.501") (with-editor "20160812.1457")) ;; Package-Requires: ((emacs "24.4") (dash "20160820.501") (with-editor "20160929.734"))
;; Package-Version: 20161009.252 ;; Package-Version: 20161011.1738
;; Keywords: git tools vc ;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit ;; Homepage: https://github.com/magit/magit

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22523 21252 ;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22527 12706
;;;;;; 592471 731000)) ;;;;;; 658693 982000))
;;; Generated autoloads from helm-adaptive.el ;;; Generated autoloads from helm-adaptive.el
(defvar helm-adaptive-mode nil "\ (defvar helm-adaptive-mode nil "\
@ -30,8 +30,8 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'.
;;;*** ;;;***
;;;### (autoloads nil "helm-apt" "helm-apt.el" (22523 21252 552471 ;;;### (autoloads nil "helm-apt" "helm-apt.el" (22527 12706 618693
;;;;;; 436000)) ;;;;;; 945000))
;;; Generated autoloads from helm-apt.el ;;; Generated autoloads from helm-apt.el
(autoload 'helm-apt "helm-apt" "\ (autoload 'helm-apt "helm-apt" "\
@ -42,8 +42,8 @@ With a prefix arg reload cache.
;;;*** ;;;***
;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22523 21252 ;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22527 12706
;;;;;; 652472 172000)) ;;;;;; 706694 27000))
;;; Generated autoloads from helm-bookmark.el ;;; Generated autoloads from helm-bookmark.el
(autoload 'helm-bookmarks "helm-bookmark" "\ (autoload 'helm-bookmarks "helm-bookmark" "\
@ -60,8 +60,8 @@ only if external library addressbook-bookmark.el is available.
;;;*** ;;;***
;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22523 21252 ;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22527 12706
;;;;;; 540471 347000)) ;;;;;; 606693 934000))
;;; Generated autoloads from helm-buffers.el ;;; Generated autoloads from helm-buffers.el
(autoload 'helm-buffers-list "helm-buffers" "\ (autoload 'helm-buffers-list "helm-buffers" "\
@ -76,8 +76,8 @@ Preconfigured `helm' lightweight version (buffer -> recentf).
;;;*** ;;;***
;;;### (autoloads nil "helm-color" "helm-color.el" (22523 21252 624471 ;;;### (autoloads nil "helm-color" "helm-color.el" (22527 12706 686694
;;;;;; 966000)) ;;;;;; 9000))
;;; Generated autoloads from helm-color.el ;;; Generated autoloads from helm-color.el
(autoload 'helm-colors "helm-color" "\ (autoload 'helm-colors "helm-color" "\
@ -87,8 +87,8 @@ Preconfigured `helm' for color.
;;;*** ;;;***
;;;### (autoloads nil "helm-command" "helm-command.el" (22523 21252 ;;;### (autoloads nil "helm-command" "helm-command.el" (22527 12706
;;;;;; 492470 995000)) ;;;;;; 550693 880000))
;;; Generated autoloads from helm-command.el ;;; Generated autoloads from helm-command.el
(autoload 'helm-M-x "helm-command" "\ (autoload 'helm-M-x "helm-command" "\
@ -106,8 +106,8 @@ You can get help on each command by persistent action.
;;;*** ;;;***
;;;### (autoloads nil "helm-config" "helm-config.el" (22523 21252 ;;;### (autoloads nil "helm-config" "helm-config.el" (22527 12706
;;;;;; 648472 143000)) ;;;;;; 702694 24000))
;;; Generated autoloads from helm-config.el ;;; Generated autoloads from helm-config.el
(autoload 'helm-configuration "helm-config" "\ (autoload 'helm-configuration "helm-config" "\
@ -117,8 +117,8 @@ Customize `helm'.
;;;*** ;;;***
;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22523 21252 ;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22527 12706
;;;;;; 564471 525000)) ;;;;;; 630693 956000))
;;; Generated autoloads from helm-dabbrev.el ;;; Generated autoloads from helm-dabbrev.el
(autoload 'helm-dabbrev "helm-dabbrev" "\ (autoload 'helm-dabbrev "helm-dabbrev" "\
@ -128,8 +128,8 @@ Preconfigured helm for dynamic abbreviations.
;;;*** ;;;***
;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22523 21252 640472 ;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22527 12706 694694
;;;;;; 85000)) ;;;;;; 16000))
;;; Generated autoloads from helm-elisp.el ;;; Generated autoloads from helm-elisp.el
(autoload 'helm-lisp-completion-at-point "helm-elisp" "\ (autoload 'helm-lisp-completion-at-point "helm-elisp" "\
@ -183,7 +183,7 @@ Preconfigured helm for complex command history.
;;;*** ;;;***
;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el" ;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el"
;;;;;; (22523 21252 496471 24000)) ;;;;;; (22527 12706 562693 892000))
;;; Generated autoloads from helm-elisp-package.el ;;; Generated autoloads from helm-elisp-package.el
(autoload 'helm-list-elisp-packages "helm-elisp-package" "\ (autoload 'helm-list-elisp-packages "helm-elisp-package" "\
@ -199,8 +199,8 @@ Same as `helm-list-elisp-packages' but don't fetch packages on remote.
;;;*** ;;;***
;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22523 21252 ;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22527 12706
;;;;;; 484470 935000)) ;;;;;; 538693 870000))
;;; Generated autoloads from helm-elscreen.el ;;; Generated autoloads from helm-elscreen.el
(autoload 'helm-elscreen "helm-elscreen" "\ (autoload 'helm-elscreen "helm-elscreen" "\
@ -215,8 +215,8 @@ Preconfigured helm to list elscreen in history order.
;;;*** ;;;***
;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22523 21252 ;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22527 12706
;;;;;; 520471 201000)) ;;;;;; 578693 906000))
;;; Generated autoloads from helm-eshell.el ;;; Generated autoloads from helm-eshell.el
(autoload 'helm-esh-pcomplete "helm-eshell" "\ (autoload 'helm-esh-pcomplete "helm-eshell" "\
@ -231,8 +231,8 @@ Preconfigured helm for eshell history.
;;;*** ;;;***
;;;### (autoloads nil "helm-eval" "helm-eval.el" (22523 21252 596471 ;;;### (autoloads nil "helm-eval" "helm-eval.el" (22527 12706 662693
;;;;;; 760000)) ;;;;;; 986000))
;;; Generated autoloads from helm-eval.el ;;; Generated autoloads from helm-eval.el
(autoload 'helm-eval-expression "helm-eval" "\ (autoload 'helm-eval-expression "helm-eval" "\
@ -252,8 +252,8 @@ Preconfigured helm for `helm-source-calculation-result'.
;;;*** ;;;***
;;;### (autoloads nil "helm-external" "helm-external.el" (22523 21252 ;;;### (autoloads nil "helm-external" "helm-external.el" (22527 12706
;;;;;; 468470 818000)) ;;;;;; 530693 861000))
;;; Generated autoloads from helm-external.el ;;; Generated autoloads from helm-external.el
(autoload 'helm-run-external-command "helm-external" "\ (autoload 'helm-run-external-command "helm-external" "\
@ -266,8 +266,8 @@ You can set your own list of commands with
;;;*** ;;;***
;;;### (autoloads nil "helm-files" "helm-files.el" (22523 21252 568471 ;;;### (autoloads nil "helm-files" "helm-files.el" (22527 12706 638693
;;;;;; 554000)) ;;;;;; 964000))
;;; Generated autoloads from helm-files.el ;;; Generated autoloads from helm-files.el
(autoload 'helm-projects-history "helm-files" "\ (autoload 'helm-projects-history "helm-files" "\
@ -355,8 +355,8 @@ It allows additionally to delete more than one connection at once.
;;;*** ;;;***
;;;### (autoloads nil "helm-font" "helm-font.el" (22523 21252 524471 ;;;### (autoloads nil "helm-font" "helm-font.el" (22527 12706 582693
;;;;;; 230000)) ;;;;;; 910000))
;;; Generated autoloads from helm-font.el ;;; Generated autoloads from helm-font.el
(autoload 'helm-select-xfont "helm-font" "\ (autoload 'helm-select-xfont "helm-font" "\
@ -371,8 +371,8 @@ Preconfigured helm for `ucs-names' math symbols.
;;;*** ;;;***
;;;### (autoloads nil "helm-grep" "helm-grep.el" (22523 21252 656472 ;;;### (autoloads nil "helm-grep" "helm-grep.el" (22527 12706 710694
;;;;;; 201000)) ;;;;;; 32000))
;;; Generated autoloads from helm-grep.el ;;; Generated autoloads from helm-grep.el
(autoload 'helm-goto-precedent-file "helm-grep" "\ (autoload 'helm-goto-precedent-file "helm-grep" "\
@ -399,8 +399,8 @@ With a prefix arg ARG git-grep the whole repository.
;;;*** ;;;***
;;;### (autoloads nil "helm-help" "helm-help.el" (22523 21252 464470 ;;;### (autoloads nil "helm-help" "helm-help.el" (22527 12706 522693
;;;;;; 789000)) ;;;;;; 854000))
;;; Generated autoloads from helm-help.el ;;; Generated autoloads from helm-help.el
(autoload 'helm-documentation "helm-help" "\ (autoload 'helm-documentation "helm-help" "\
@ -420,8 +420,8 @@ String displayed in mode-line in `helm-source-find-files'.")
;;;*** ;;;***
;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22523 21252 ;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22527 12706
;;;;;; 544471 378000)) ;;;;;; 614693 941000))
;;; Generated autoloads from helm-id-utils.el ;;; Generated autoloads from helm-id-utils.el
(autoload 'helm-gid "helm-id-utils" "\ (autoload 'helm-gid "helm-id-utils" "\
@ -435,8 +435,8 @@ See <https://www.gnu.org/software/idutils/>.
;;;*** ;;;***
;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22523 21252 532471 ;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22527 12706 594693
;;;;;; 289000)) ;;;;;; 922000))
;;; Generated autoloads from helm-imenu.el ;;; Generated autoloads from helm-imenu.el
(autoload 'helm-imenu "helm-imenu" "\ (autoload 'helm-imenu "helm-imenu" "\
@ -453,8 +453,8 @@ or it have an association in `helm-imenu-all-buffer-assoc'.
;;;*** ;;;***
;;;### (autoloads nil "helm-info" "helm-info.el" (22523 21252 528471 ;;;### (autoloads nil "helm-info" "helm-info.el" (22527 12706 586693
;;;;;; 259000)) ;;;;;; 915000))
;;; Generated autoloads from helm-info.el ;;; Generated autoloads from helm-info.el
(autoload 'helm-info "helm-info" "\ (autoload 'helm-info "helm-info" "\
@ -470,8 +470,8 @@ With a prefix-arg insert symbol at point.
;;;*** ;;;***
;;;### (autoloads nil "helm-locate" "helm-locate.el" (22523 21252 ;;;### (autoloads nil "helm-locate" "helm-locate.el" (22527 12706
;;;;;; 476470 877000)) ;;;;;; 534693 865000))
;;; Generated autoloads from helm-locate.el ;;; Generated autoloads from helm-locate.el
(autoload 'helm-projects-find-files "helm-locate" "\ (autoload 'helm-projects-find-files "helm-locate" "\
@ -498,8 +498,8 @@ Where db_path is a filename matched by
;;;*** ;;;***
;;;### (autoloads nil "helm-man" "helm-man.el" (22523 21252 604471 ;;;### (autoloads nil "helm-man" "helm-man.el" (22527 12706 666693
;;;;;; 819000)) ;;;;;; 991000))
;;; Generated autoloads from helm-man.el ;;; Generated autoloads from helm-man.el
(autoload 'helm-man-woman "helm-man" "\ (autoload 'helm-man-woman "helm-man" "\
@ -510,8 +510,8 @@ With a prefix arg reinitialize the cache.
;;;*** ;;;***
;;;### (autoloads nil "helm-misc" "helm-misc.el" (22523 21252 584471 ;;;### (autoloads nil "helm-misc" "helm-misc.el" (22527 12706 654693
;;;;;; 672000)) ;;;;;; 979000))
;;; Generated autoloads from helm-misc.el ;;; Generated autoloads from helm-misc.el
(autoload 'helm-browse-menubar "helm-misc" "\ (autoload 'helm-browse-menubar "helm-misc" "\
@ -552,8 +552,8 @@ Preconfigured `helm' that provide completion of `comint' history.
;;;*** ;;;***
;;;### (autoloads nil "helm-mode" "helm-mode.el" (22523 21252 448470 ;;;### (autoloads nil "helm-mode" "helm-mode.el" (22527 12706 510693
;;;;;; 672000)) ;;;;;; 842000))
;;; Generated autoloads from helm-mode.el ;;; Generated autoloads from helm-mode.el
(autoload 'helm-comp-read "helm-mode" "\ (autoload 'helm-comp-read "helm-mode" "\
@ -724,8 +724,8 @@ Note: This mode is incompatible with Emacs23.
;;;*** ;;;***
;;;### (autoloads nil "helm-net" "helm-net.el" (22523 21252 616471 ;;;### (autoloads nil "helm-net" "helm-net.el" (22527 12706 682694
;;;;;; 907000)) ;;;;;; 6000))
;;; Generated autoloads from helm-net.el ;;; Generated autoloads from helm-net.el
(autoload 'helm-surfraw "helm-net" "\ (autoload 'helm-surfraw "helm-net" "\
@ -745,8 +745,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest.
;;;*** ;;;***
;;;### (autoloads nil "helm-org" "helm-org.el" (22523 21252 664472 ;;;### (autoloads nil "helm-org" "helm-org.el" (22527 12706 714694
;;;;;; 261000)) ;;;;;; 36000))
;;; Generated autoloads from helm-org.el ;;; Generated autoloads from helm-org.el
(autoload 'helm-org-agenda-files-headings "helm-org" "\ (autoload 'helm-org-agenda-files-headings "helm-org" "\
@ -777,8 +777,8 @@ Preconfigured helm for org templates.
;;;*** ;;;***
;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22523 21252 ;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22527 12706
;;;;;; 612471 878000)) ;;;;;; 678694 1000))
;;; Generated autoloads from helm-regexp.el ;;; Generated autoloads from helm-regexp.el
(autoload 'helm-moccur-mode "helm-regexp" "\ (autoload 'helm-moccur-mode "helm-regexp" "\
@ -817,8 +817,8 @@ The prefix arg can be set before calling
;;;*** ;;;***
;;;### (autoloads nil "helm-ring" "helm-ring.el" (22523 21252 460470 ;;;### (autoloads nil "helm-ring" "helm-ring.el" (22527 12706 518693
;;;;;; 759000)) ;;;;;; 850000))
;;; Generated autoloads from helm-ring.el ;;; Generated autoloads from helm-ring.el
(defvar helm-push-mark-mode nil "\ (defvar helm-push-mark-mode nil "\
@ -876,8 +876,8 @@ This command is useful when used with persistent action.
;;;*** ;;;***
;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22523 21252 ;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22527 12706
;;;;;; 536471 318000)) ;;;;;; 602693 930000))
;;; Generated autoloads from helm-semantic.el ;;; Generated autoloads from helm-semantic.el
(autoload 'helm-semantic "helm-semantic" "\ (autoload 'helm-semantic "helm-semantic" "\
@ -899,8 +899,8 @@ Fill in the symbol at point by default.
;;;*** ;;;***
;;;### (autoloads nil "helm-sys" "helm-sys.el" (22523 21252 556471 ;;;### (autoloads nil "helm-sys" "helm-sys.el" (22527 12706 622693
;;;;;; 465000)) ;;;;;; 949000))
;;; Generated autoloads from helm-sys.el ;;; Generated autoloads from helm-sys.el
(defvar helm-top-poll-mode nil "\ (defvar helm-top-poll-mode nil "\
@ -935,8 +935,8 @@ Preconfigured helm for xrandr.
;;;*** ;;;***
;;;### (autoloads nil "helm-tags" "helm-tags.el" (22523 21252 512471 ;;;### (autoloads nil "helm-tags" "helm-tags.el" (22527 12706 574693
;;;;;; 142000)) ;;;;;; 902000))
;;; Generated autoloads from helm-tags.el ;;; Generated autoloads from helm-tags.el
(autoload 'helm-etags-select "helm-tags" "\ (autoload 'helm-etags-select "helm-tags" "\
@ -955,8 +955,8 @@ This function aggregates three sources of tag files:
;;;*** ;;;***
;;;### (autoloads nil "helm-utils" "helm-utils.el" (22523 21252 488470 ;;;### (autoloads nil "helm-utils" "helm-utils.el" (22527 12706 542693
;;;;;; 966000)) ;;;;;; 873000))
;;; Generated autoloads from helm-utils.el ;;; Generated autoloads from helm-utils.el
(defvar helm-popup-tip-mode nil "\ (defvar helm-popup-tip-mode nil "\
@ -977,7 +977,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") ;;;### (autoloads nil nil ("helm-easymenu.el" "helm-pkg.el" "helm-types.el")
;;;;;; (22523 21252 672472 320000)) ;;;;;; (22527 12706 722694 43000))
;;;*** ;;;***

View File

@ -1,4 +1,4 @@
(define-package "helm" "20161008.1318" "Helm is an Emacs incremental and narrowing framework" (define-package "helm" "20161010.1043" "Helm is an Emacs incremental and narrowing framework"
'((emacs "24.4") '((emacs "24.4")
(async "1.9") (async "1.9")
(popup "0.5.3") (popup "0.5.3")

View File

@ -113,7 +113,7 @@ This affect also sorting functions in the same way."
(cancel-timer helm-top--poll-timer)) (cancel-timer helm-top--poll-timer))
(condition-case nil (condition-case nil
(progn (progn
(when (and (helm-alive-p) (null no-update)) (when (and (helm-alive-p) (not (helm-action-window)) (null no-update))
;; Fix quitting while process is running ;; Fix quitting while process is running
;; by binding `with-local-quit' in init function ;; by binding `with-local-quit' in init function
;; Issue #1521. ;; Issue #1521.
@ -421,7 +421,8 @@ Show actions only on line starting by a PID."
(helm :sources 'helm-source-top (helm :sources 'helm-source-top
:buffer "*helm top*" :full-frame t :buffer "*helm top*" :full-frame t
:candidate-number-limit 9999 :candidate-number-limit 9999
:preselect "^\\s-*[0-9]+") :preselect "^\\s-*[0-9]+"
:truncate-lines helm-show-action-window-other-window)
(remove-hook 'helm-after-update-hook 'helm-top--skip-top-line)))) (remove-hook 'helm-after-update-hook 'helm-top--skip-top-line))))
;;;###autoload ;;;###autoload

View File

@ -1,2 +0,0 @@
;;; -*- no-byte-compile: t -*-
(define-package "helm-ag" "20160923.2128" "the silver searcher with helm interface" '((emacs "24.4") (helm "2.0")) :url "https://github.com/syohex/emacs-helm-ag")

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "helm-ag" "helm-ag.el" (22505 21414 577827 ;;;### (autoloads nil "helm-ag" "helm-ag.el" (22527 12705 418692
;;;;;; 160000)) ;;;;;; 810000))
;;; Generated autoloads from helm-ag.el ;;; Generated autoloads from helm-ag.el
(autoload 'helm-ag-pop-stack "helm-ag" "\ (autoload 'helm-ag-pop-stack "helm-ag" "\

View File

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "helm-ag" "20161010.713" "the silver searcher with helm interface" '((emacs "24.4") (helm "2.0")) :url "https://github.com/syohex/emacs-helm-ag")

View File

@ -4,8 +4,8 @@
;; Author: Syohei YOSHIDA <syohex@gmail.com> ;; Author: Syohei YOSHIDA <syohex@gmail.com>
;; URL: https://github.com/syohex/emacs-helm-ag ;; URL: https://github.com/syohex/emacs-helm-ag
;; Package-Version: 20160923.2128 ;; Package-Version: 20161010.713
;; Version: 0.56 ;; Version: 0.57
;; Package-Requires: ((emacs "24.4") (helm "2.0")) ;; Package-Requires: ((emacs "24.4") (helm "2.0"))
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify

View File

@ -1 +0,0 @@
(define-package "helm-company" "20160516.2258" "Helm interface for company-mode" '((helm "1.5.9") (company "0.6.13")) :url "https://github.com/yasuyk/helm-company")

View File

@ -1,10 +1,10 @@
;;; helm-company-autoloads.el --- automatically extracted autoloads ;;; helm-company-autoloads.el --- automatically extracted autoloads
;; ;;
;;; Code: ;;; Code:
(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "helm-company" "helm-company.el" (22490 28021 ;;;### (autoloads nil "helm-company" "helm-company.el" (22527 12704
;;;;;; 120689 316000)) ;;;;;; 986692 401000))
;;; Generated autoloads from helm-company.el ;;; Generated autoloads from helm-company.el
(autoload 'helm-company "helm-company" "\ (autoload 'helm-company "helm-company" "\

View File

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "helm-company" "20161010.59" "Helm interface for company-mode" '((helm "1.5.9") (company "0.6.13")) :url "https://github.com/yasuyk/helm-company")

View File

@ -4,7 +4,7 @@
;; Author: Yasuyuki Oka <yasuyk@gmail.com> ;; Author: Yasuyuki Oka <yasuyk@gmail.com>
;; Version: 0.1.1 ;; Version: 0.1.1
;; Package-Version: 20160516.2258 ;; Package-Version: 20161010.59
;; URL: https://github.com/yasuyk/helm-company ;; URL: https://github.com/yasuyk/helm-company
;; Package-Requires: ((helm "1.5.9") (company "0.6.13")) ;; Package-Requires: ((helm "1.5.9") (company "0.6.13"))
@ -80,7 +80,7 @@ Set it to nil if you don't want this limit."
(defun helm-company-action-show-document (candidate) (defun helm-company-action-show-document (candidate)
"Show the documentation of the CANDIDATE." "Show the documentation of the CANDIDATE."
(interactive) (interactive)
(let ((selection (cl-find-if (lambda (s) (string-match-p candidate s)) helm-company-candidates)) (let* ((selection (cl-find-if (lambda (s) (string-match-p candidate s)) helm-company-candidates))
(buffer (helm-company-call-backend 'doc-buffer selection))) (buffer (helm-company-call-backend 'doc-buffer selection)))
(when buffer (when buffer
(display-buffer buffer)))) (display-buffer buffer))))

View File

@ -3,7 +3,7 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "helm" "helm.el" (22523 21247 808436 501000)) ;;;### (autoloads nil "helm" "helm.el" (22527 12704 426691 871000))
;;; Generated autoloads from helm.el ;;; Generated autoloads from helm.el
(autoload 'helm-define-multi-key "helm" "\ (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" ;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el"
;;;;;; "helm-source.el") (22523 21247 820436 589000)) ;;;;;; "helm-source.el") (22527 12704 442691 886000))
;;;*** ;;;***

View File

@ -1,4 +1,4 @@
(define-package "helm-core" "20161009.405" "Development files for Helm" (define-package "helm-core" "20161012.1153" "Development files for Helm"
'((emacs "24.4") '((emacs "24.4")
(async "1.9")) (async "1.9"))
:url "https://emacs-helm.github.io/helm/") :url "https://emacs-helm.github.io/helm/")

View File

@ -605,6 +605,12 @@ See `helm-log-save-maybe' for more info."
:type 'string :type 'string
:group 'helm) :group 'helm)
(defcustom helm-show-action-window-other-window nil
"Show action buffer beside `helm-buffer' when non-nil.
Note that this may not fit well with some helm window configurations,
so it have only effect when `helm-always-two-windows' is non-nil."
:group 'helm
:type 'boolean)
;;; Faces ;;; Faces
;; ;;
@ -1023,6 +1029,7 @@ You should not modify this yourself unless you know what you are doing.")
"Flag to prevent helm popping up errors in candidates functions. "Flag to prevent helm popping up errors in candidates functions.
Should be set in candidates functions if needed, will be restored Should be set in candidates functions if needed, will be restored
at end of session.") at end of session.")
(defvar helm--action-prompt "Select action: ")
;; Utility: logging ;; Utility: logging
(defun helm-log (format-string &rest args) (defun helm-log (format-string &rest args)
@ -3555,15 +3562,20 @@ If action buffer is selected, back to the helm buffer."
(setq helm-saved-selection (helm-get-selection nil nil src)) (setq helm-saved-selection (helm-get-selection nil nil src))
(with-selected-frame (with-helm-window (selected-frame)) (with-selected-frame (with-helm-window (selected-frame))
(prog1 (prog1
(cond ((get-buffer-window helm-action-buffer 'visible) (helm-acond ((get-buffer-window helm-action-buffer 'visible)
(set-window-buffer (get-buffer-window helm-action-buffer) (set-window-buffer (get-buffer-window helm-action-buffer)
helm-buffer) helm-buffer)
(helm--set-action-prompt 'restore)
(when (and helm-show-action-window-other-window
helm-always-two-windows)
(delete-window it))
(kill-buffer helm-action-buffer) (kill-buffer helm-action-buffer)
(setq helm-saved-selection nil) (setq helm-saved-selection nil)
(helm-set-pattern helm-input 'noupdate)) (helm-set-pattern helm-input 'noupdate))
(helm-saved-selection (helm-saved-selection
(setq helm-saved-current-source src) (setq helm-saved-current-source src)
(let ((actions (helm-get-actions-from-current-source src))) (let ((actions (helm-get-actions-from-current-source src))
helm-onewindow-p)
(if (functionp actions) (if (functionp actions)
(message "Sole action: %s" (message "Sole action: %s"
(if (or (consp actions) (if (or (consp actions)
@ -3572,19 +3584,34 @@ If action buffer is selected, back to the helm buffer."
(helm-show-action-buffer actions) (helm-show-action-buffer actions)
;; Be sure the minibuffer is entirely deleted (#907). ;; Be sure the minibuffer is entirely deleted (#907).
(helm--delete-minibuffer-contents-from "") (helm--delete-minibuffer-contents-from "")
;; Make `helm-pattern' differs from the previous value. (helm--set-action-prompt)
(setq helm-pattern 'dummy)
(helm-check-minibuffer-input)))) (helm-check-minibuffer-input))))
(t (message "No Actions available"))) (t (message "No Actions available")))
(helm-display-mode-line (helm-get-current-source)) (helm-display-mode-line (helm-get-current-source))
(run-hooks 'helm-window-configuration-hook)))))) (run-hooks 'helm-window-configuration-hook))))))
(put 'helm-select-action 'helm-only t) (put 'helm-select-action 'helm-only t)
(defun helm--set-action-prompt (&optional restore)
(with-selected-window (minibuffer-window)
(let ((inhibit-read-only t)
(props '(face minibuffer-prompt
field t
read-only t
rear-nonsticky t
front-sticky t))
(prt (if restore helm--prompt helm--action-prompt)))
(erase-buffer)
(insert (apply #'propertize prt props)))))
(defun helm-show-action-buffer (actions) (defun helm-show-action-buffer (actions)
(with-current-buffer (get-buffer-create helm-action-buffer) (with-current-buffer (get-buffer-create helm-action-buffer)
(erase-buffer) (erase-buffer)
(buffer-disable-undo) (buffer-disable-undo)
(set-window-buffer (get-buffer-window helm-buffer) helm-action-buffer) (set-window-buffer (if (and helm-show-action-window-other-window
helm-always-two-windows)
(split-window (get-buffer-window helm-buffer) nil 'right)
(get-buffer-window helm-buffer))
helm-action-buffer)
(set (make-local-variable 'helm-sources) (set (make-local-variable 'helm-sources)
(list (list
(helm-build-sync-source "Actions" (helm-build-sync-source "Actions"
@ -3684,8 +3711,9 @@ mode and header lines."
(propertize (format " [prefarg:%s]" arg) (propertize (format " [prefarg:%s]" arg)
'face 'helm-prefarg))))) 'face 'helm-prefarg)))))
" " " "
(:eval (helm-show-candidate-number (:eval (with-helm-buffer
(car-safe helm-mode-line-string))) (helm-show-candidate-number
(car-safe helm-mode-line-string))))
" " helm--mode-line-string-real " " " " helm--mode-line-string-real " "
(:eval (make-string (window-width) ? ))) (:eval (make-string (window-width) ? )))
keymap (keymap (mode-line keymap keymap (keymap (mode-line keymap
@ -3726,7 +3754,9 @@ mode and header lines."
(cont (buffer-substring beg end)) (cont (buffer-substring beg end))
(pref (propertize (pref (propertize
" " " "
'display (if (string-match-p (regexp-quote helm--prompt) cont) 'display (if (string-match-p (regexp-opt `(,helm--prompt
,helm--action-prompt))
cont)
'(space :width left-fringe) '(space :width left-fringe)
(propertize (propertize
"->" "->"

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22525 59336 620520 ;;;### (autoloads nil "git-rebase" "git-rebase.el" (22527 12701 974689
;;;;;; 53000)) ;;;;;; 557000))
;;; Generated autoloads from git-rebase.el ;;; Generated autoloads from git-rebase.el
(autoload 'git-rebase-mode "git-rebase" "\ (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" (22525 59336 712520 692000)) ;;;### (autoloads nil "magit" "magit.el" (22527 12702 54689 632000))
;;; Generated autoloads from magit.el ;;; Generated autoloads from magit.el
(autoload 'magit-status "magit" "\ (autoload 'magit-status "magit" "\
@ -501,8 +501,8 @@ Git, and Emacs in the echo area.
;;;*** ;;;***
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22525 59336 ;;;### (autoloads nil "magit-apply" "magit-apply.el" (22527 12701
;;;;;; 648520 248000)) ;;;;;; 994689 575000))
;;; Generated autoloads from magit-apply.el ;;; Generated autoloads from magit-apply.el
(autoload 'magit-stage-file "magit-apply" "\ (autoload 'magit-stage-file "magit-apply" "\
@ -538,8 +538,8 @@ Remove all changes from the staging area.
;;;*** ;;;***
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22525 ;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22527
;;;;;; 59336 588519 830000)) ;;;;;; 12701 942689 527000))
;;; Generated autoloads from magit-autorevert.el ;;; Generated autoloads from magit-autorevert.el
(defvar magit-revert-buffers t) (defvar magit-revert-buffers t)
@ -568,8 +568,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
;;;*** ;;;***
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22525 59336 ;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22527 12701
;;;;;; 640520 192000)) ;;;;;; 990689 572000))
;;; Generated autoloads from magit-bisect.el ;;; Generated autoloads from magit-bisect.el
(autoload 'magit-bisect-popup "magit-bisect" nil t) (autoload 'magit-bisect-popup "magit-bisect" nil t)
@ -620,8 +620,8 @@ bisect run'.
;;;*** ;;;***
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22525 59336 ;;;### (autoloads nil "magit-blame" "magit-blame.el" (22527 12702
;;;;;; 700520 609000)) ;;;;;; 38689 617000))
;;; Generated autoloads from magit-blame.el ;;; Generated autoloads from magit-blame.el
(autoload 'magit-blame-popup "magit-blame" nil t) (autoload 'magit-blame-popup "magit-blame" nil t)
@ -645,8 +645,8 @@ only arguments available from `magit-blame-popup' should be used.
;;;*** ;;;***
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22525 59336 ;;;### (autoloads nil "magit-commit" "magit-commit.el" (22527 12701
;;;;;; 592519 858000)) ;;;;;; 950689 534000))
;;; Generated autoloads from magit-commit.el ;;; Generated autoloads from magit-commit.el
(autoload 'magit-commit "magit-commit" "\ (autoload 'magit-commit "magit-commit" "\
@ -728,8 +728,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
;;;*** ;;;***
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22525 59336 696520 ;;;### (autoloads nil "magit-diff" "magit-diff.el" (22527 12702 34689
;;;;;; 581000)) ;;;;;; 614000))
;;; Generated autoloads from magit-diff.el ;;; Generated autoloads from magit-diff.el
(autoload 'magit-diff-popup "magit-diff" "\ (autoload 'magit-diff-popup "magit-diff" "\
@ -813,8 +813,8 @@ for a revision.
;;;*** ;;;***
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22525 59336 ;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22527 12702
;;;;;; 684520 498000)) ;;;;;; 18689 598000))
;;; Generated autoloads from magit-ediff.el ;;; Generated autoloads from magit-ediff.el
(autoload 'magit-ediff-popup "magit-ediff" nil t) (autoload 'magit-ediff-popup "magit-ediff" nil t)
@ -902,8 +902,8 @@ stash that were staged.
;;;*** ;;;***
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22525 59336 ;;;### (autoloads nil "magit-extras" "magit-extras.el" (22527 12701
;;;;;; 596519 887000)) ;;;;;; 954689 537000))
;;; Generated autoloads from magit-extras.el ;;; Generated autoloads from magit-extras.el
(autoload 'magit-run-git-gui "magit-extras" "\ (autoload 'magit-run-git-gui "magit-extras" "\
@ -973,8 +973,8 @@ on a position in a file-visiting buffer.
;;;*** ;;;***
;;;### (autoloads nil "magit-log" "magit-log.el" (22525 59336 692520 ;;;### (autoloads nil "magit-log" "magit-log.el" (22527 12702 26689
;;;;;; 553000)) ;;;;;; 605000))
;;; Generated autoloads from magit-log.el ;;; Generated autoloads from magit-log.el
(autoload 'magit-log-buffer-file-popup "magit-log" "\ (autoload 'magit-log-buffer-file-popup "magit-log" "\
@ -1056,8 +1056,8 @@ Show commits in a branch that are not merged in the upstream branch.
;;;*** ;;;***
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22525 59336 ;;;### (autoloads nil "magit-remote" "magit-remote.el" (22527 12702
;;;;;; 728520 804000)) ;;;;;; 66689 643000))
;;; Generated autoloads from magit-remote.el ;;; Generated autoloads from magit-remote.el
(autoload 'magit-clone "magit-remote" "\ (autoload 'magit-clone "magit-remote" "\
@ -1289,8 +1289,8 @@ is asked to pull. START has to be reachable from that commit.
;;;*** ;;;***
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22525 ;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22527
;;;;;; 59336 716520 720000)) ;;;;;; 12702 58689 636000))
;;; Generated autoloads from magit-sequence.el ;;; Generated autoloads from magit-sequence.el
(autoload 'magit-sequencer-continue "magit-sequence" "\ (autoload 'magit-sequencer-continue "magit-sequence" "\
@ -1440,8 +1440,8 @@ Abort the current rebase operation, restoring the original branch.
;;;*** ;;;***
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22525 59336 ;;;### (autoloads nil "magit-stash" "magit-stash.el" (22527 12702
;;;;;; 668520 386000)) ;;;;;; 10689 590000))
;;; Generated autoloads from magit-stash.el ;;; Generated autoloads from magit-stash.el
(autoload 'magit-stash-popup "magit-stash" nil t) (autoload 'magit-stash-popup "magit-stash" nil t)
@ -1540,8 +1540,8 @@ Show all diffs of a stash in a buffer.
;;;*** ;;;***
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22525 ;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22527
;;;;;; 59336 744520 915000)) ;;;;;; 12702 78689 654000))
;;; Generated autoloads from magit-submodule.el ;;; Generated autoloads from magit-submodule.el
(autoload 'magit-submodule-popup "magit-submodule" nil t) (autoload 'magit-submodule-popup "magit-submodule" nil t)
@ -1631,8 +1631,8 @@ Display a list of the current repository's submodules.
;;;*** ;;;***
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22525 59336 ;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22527 12701
;;;;;; 628520 107000)) ;;;;;; 978689 560000))
;;; Generated autoloads from magit-subtree.el ;;; Generated autoloads from magit-subtree.el
(autoload 'magit-subtree-popup "magit-subtree" nil t) (autoload 'magit-subtree-popup "magit-subtree" nil t)
@ -1668,8 +1668,8 @@ Extract the history of the subtree PREFIX.
;;;*** ;;;***
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22525 59336 608519 ;;;### (autoloads nil "magit-wip" "magit-wip.el" (22527 12701 962689
;;;;;; 969000)) ;;;;;; 545000))
;;; Generated autoloads from magit-wip.el ;;; Generated autoloads from magit-wip.el
(defvar magit-wip-after-save-mode nil "\ (defvar magit-wip-after-save-mode nil "\
@ -1739,7 +1739,7 @@ command which is about to be called are committed.
;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el" ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el"
;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el") ;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el")
;;;;;; (22525 59336 732520 832000)) ;;;;;; (22527 12702 70689 646000))
;;;*** ;;;***

View File

@ -107,10 +107,6 @@ instead customize `magit-diff-highlight-hunk-region-functions'."
:group 'magit-diff :group 'magit-diff
:type 'boolean) :type 'boolean)
(make-obsolete-variable 'magit-diff-show-lines-boundary
'magit-diff-highlight-hunk-region-functions
"Magit 2.9.0")
(defcustom magit-diff-highlight-hunk-region-functions (defcustom magit-diff-highlight-hunk-region-functions
'(magit-diff-highlight-hunk-region-dim-outside '(magit-diff-highlight-hunk-region-dim-outside
magit-diff-highlight-hunk-region-using-overlays) magit-diff-highlight-hunk-region-using-overlays)
@ -2324,6 +2320,11 @@ https://github.com/magit/magit/pull/2293 for more details)."
patch)) patch))
;;; magit-diff.el ends soon ;;; magit-diff.el ends soon
(make-obsolete-variable 'magit-diff-show-lines-boundary
'magit-diff-highlight-hunk-region-functions
"Magit 2.9.0")
(provide 'magit-diff) (provide 'magit-diff)
;; Local Variables: ;; Local Variables:
;; indent-tabs-mode: nil ;; indent-tabs-mode: nil

View File

@ -480,7 +480,9 @@ returning the truename."
(defun magit-inside-gitdir-p () (defun magit-inside-gitdir-p ()
"Return t if `default-directory' is below a repository directory." "Return t if `default-directory' is below a repository directory."
(magit-rev-parse-p "--is-inside-git-dir")) ;; This does not work if the gitdir is not located inside the
;; working tree: (magit-rev-parse-p "--is-inside-git-dir").
(file-in-directory-p default-directory (magit-git-dir)))
(defun magit-inside-worktree-p () (defun magit-inside-worktree-p ()
"Return t if `default-directory' is below the work tree of a repository." "Return t if `default-directory' is below the work tree of a repository."
@ -884,7 +886,11 @@ which is different from the current branch and still exists."
(let ((remote (magit-get "branch" branch "remote"))) (let ((remote (magit-get "branch" branch "remote")))
(and remote (not (equal remote ".")) (and remote (not (equal remote "."))
;; The user has opted in... ;; The user has opted in...
(or force (member branch magit-branch-prefer-remote-upstream)) (or force
(--any (if (magit-git-success "check-ref-format" "--branch" it)
(equal it branch)
(string-match-p it branch))
magit-branch-prefer-remote-upstream))
;; and local BRANCH tracks a remote branch... ;; and local BRANCH tracks a remote branch...
(let ((upstream (magit-get-upstream-branch branch))) (let ((upstream (magit-get-upstream-branch branch)))
;; whose upstream... ;; whose upstream...

View File

@ -1,10 +1,10 @@
(define-package "magit" "20161011.1700" "A Git porcelain inside Emacs" (define-package "magit" "20161012.1035" "A Git porcelain inside Emacs"
'((emacs "24.4") '((emacs "24.4")
(async "20160711.223") (async "20160711.223")
(dash "20160820.501") (dash "20160820.501")
(with-editor "20160929.734") (with-editor "20160929.734")
(git-commit "20160519.950") (git-commit "20160929.801")
(magit-popup "20160813.642")) (magit-popup "20160821.1338"))
:url "https://github.com/magit/magit" :keywords :url "https://github.com/magit/magit" :keywords
'("git" "tools" "vc")) '("git" "tools" "vc"))
;; Local Variables: ;; Local Variables:

View File

@ -16,7 +16,7 @@
;; Rémi Vanicat <vanicat@debian.org> ;; Rémi Vanicat <vanicat@debian.org>
;; Yann Hodique <yann.hodique@gmail.com> ;; Yann Hodique <yann.hodique@gmail.com>
;; Package-Requires: ((emacs "24.4") (async "20160711.223") (dash "20160820.501") (with-editor "20160929.734") (git-commit "20160519.950") (magit-popup "20160813.642")) ;; Package-Requires: ((emacs "24.4") (async "20160711.223") (dash "20160820.501") (with-editor "20160929.734") (git-commit "20160929.801") (magit-popup "20160821.1338"))
;; Keywords: git tools vc ;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit ;; Homepage: https://github.com/magit/magit
@ -131,26 +131,6 @@ all."
(defvar magit-status-refresh-hook nil (defvar magit-status-refresh-hook nil
"Hook run after a status buffer has been refreshed.") "Hook run after a status buffer has been refreshed.")
(make-obsolete-variable 'magit-status-refresh-hook "\
use `magit-pre-refresh-hook', `magit-post-refresh-hook',
`magit-refresh-buffer-hook', or `magit-status-mode-hook' instead.
If you want to run a function every time the status buffer is
refreshed, in order to do something with that buffer, then use:
(add-hook 'magit-refresh-buffer-hook
(lambda ()
(when (derived-mode-p 'magit-status-mode)
...)))
If your hook function should run regardless of whether the
status buffer exists or not, then use `magit-pre-refresh-hook'
or `magit-post-refresh-hook'.
If your hook function only has to be run once, when the buffer
is first created, then `magit-status-mode-hook' instead.
" "Magit 2.4.0")
(defcustom magit-status-expand-stashes t (defcustom magit-status-expand-stashes t
"Whether the list of stashes is expanded initially." "Whether the list of stashes is expanded initially."
:package-version '(magit . "2.3.0") :package-version '(magit . "2.3.0")
@ -265,11 +245,20 @@ for remote branches, but not for local branches.
You might prefer to always use some remote branch as upstream. You might prefer to always use some remote branch as upstream.
If the chosen starting-point is (1) a local branch, (2) whose If the chosen starting-point is (1) a local branch, (2) whose
name is a member of the value of this option, (3) the upstream of name matches a member of the value of this option, (3) the
that local branch is a remote branch with the same name, and (4) upstream of that local branch is a remote branch with the same
that remote branch can be fast-forwarded to the local branch, name, and (4) that remote branch can be fast-forwarded to the
then the chosen branch is used as starting-point, but its own local branch, then the chosen branch is used as starting-point,
upstream is used as the upstream of the new branch. but its own upstream is used as the upstream of the new branch.
Members of this option's value are treated as branch names that
have to match exactly unless they contain a character that makes
them invalid as a branch name. Recommended characters to use
to trigger interpretation as a regexp are \"*\" and \"^\". Some
other characters which you might expect to be invalid, actually
are not, e.g. \".+$\" are all perfectly valid. More precisely,
if `git check-ref-format --branch STRING' exits with a non-zero
status, then treat STRING as a regexp.
Assuming the chosen branch matches these conditions you would end Assuming the chosen branch matches these conditions you would end
up with with e.g.: up with with e.g.:
@ -3492,6 +3481,26 @@ If the value already is just \"git\" but TRAMP never-the-less
doesn't find the executable, then consult the info node doesn't find the executable, then consult the info node
`(tramp)Remote programs'.\n" remote) :error))))) `(tramp)Remote programs'.\n" remote) :error)))))
(make-obsolete-variable 'magit-status-refresh-hook "\
use `magit-pre-refresh-hook', `magit-post-refresh-hook',
`magit-refresh-buffer-hook', or `magit-status-mode-hook' instead.
If you want to run a function every time the status buffer is
refreshed, in order to do something with that buffer, then use:
(add-hook 'magit-refresh-buffer-hook
(lambda ()
(when (derived-mode-p 'magit-status-mode)
...)))
If your hook function should run regardless of whether the
status buffer exists or not, then use `magit-pre-refresh-hook'
or `magit-post-refresh-hook'.
If your hook function only has to be run once, when the buffer
is first created, then `magit-status-mode-hook' instead.
" "Magit 2.4.0")
(define-obsolete-function-alias 'global-magit-file-buffer-mode (define-obsolete-function-alias 'global-magit-file-buffer-mode
'global-magit-file-mode "Magit 2.3.0") 'global-magit-file-mode "Magit 2.3.0")
(define-obsolete-function-alias 'magit-insert-head-header (define-obsolete-function-alias 'magit-insert-head-header

View File

@ -27,7 +27,7 @@ END-INFO-DIR-ENTRY
 
Indirect: Indirect:
magit.info-1: 1222 magit.info-1: 1222
magit.info-2: 320475 magit.info-2: 321010
 
Tag Table: Tag Table:
(Indirect) (Indirect)
@ -94,80 +94,80 @@ Node: Editing commit messages133649
Node: Branching144045 Node: Branching144045
Node: The two remotes144245 Node: The two remotes144245
Node: The branch popup146789 Node: The branch popup146789
Node: The branch config popup155490 Node: The branch config popup156025
Node: Merging161396 Node: Merging161931
Node: Resolving conflicts163564 Node: Resolving conflicts164099
Ref: orgradiotarget1164649 Ref: orgradiotarget1165184
Node: Rebasing168521 Node: Rebasing169056
Node: Editing rebase sequences172162 Node: Editing rebase sequences172697
Node: Information about in-progress rebase175192 Node: Information about in-progress rebase175727
Ref: Information about in-progress rebase-Footnote-1182028 Ref: Information about in-progress rebase-Footnote-1182563
Node: Cherry picking182614 Node: Cherry picking183149
Node: Reverting184220 Node: Reverting184755
Node: Resetting185583 Node: Resetting186118
Node: Stashing187095 Node: Stashing187630
Node: Transferring190269 Node: Transferring190804
Node: Remotes190507 Node: Remotes191042
Node: Fetching191793 Node: Fetching192328
Node: Pulling193159 Node: Pulling193694
Node: Pushing194005 Node: Pushing194540
Node: Creating and sending patches198749 Node: Creating and sending patches199284
Node: Applying patches199444 Node: Applying patches199979
Node: Miscellaneous200442 Node: Miscellaneous200977
Node: Tagging200745 Node: Tagging201280
Node: Notes201530 Node: Notes202065
Node: Submodules204055 Node: Submodules204590
Node: Listing submodules204270 Node: Listing submodules204805
Node: Submodule popup206089 Node: Submodule popup206624
Node: Subtree207372 Node: Subtree207907
Node: Common commands208620 Node: Common commands209155
Node: Wip modes210365 Node: Wip modes210900
Node: Minor mode for buffers visiting files217101 Node: Minor mode for buffers visiting files217636
Node: Minor mode for buffers visiting blobs220575 Node: Minor mode for buffers visiting blobs221110
Node: Customizing221380 Node: Customizing221915
Node: Per-repository configuration223052 Node: Per-repository configuration223587
Node: Essential settings224686 Node: Essential settings225221
Node: Safety225010 Node: Safety225545
Node: Performance226843 Node: Performance227378
Node: Plumbing234805 Node: Plumbing235340
Node: Calling Git235629 Node: Calling Git236164
Node: Getting a value from Git237152 Node: Getting a value from Git237687
Node: Calling Git for effect240256 Node: Calling Git for effect240791
Node: Section plumbing246760 Node: Section plumbing247295
Node: Creating sections246988 Node: Creating sections247523
Node: Section selection250887 Node: Section selection251422
Node: Matching sections252567 Node: Matching sections253102
Node: Refreshing buffers257776 Node: Refreshing buffers258311
Node: Conventions260911 Node: Conventions261446
Node: Confirmation and completion261088 Node: Confirmation and completion261623
Node: Theming Faces261986 Node: Theming Faces262521
Node: FAQ270137 Node: FAQ270672
Node: Magit is slow271750 Node: Magit is slow272285
Node: I changed several thousand files at once and now Magit is unusable271951 Node: I changed several thousand files at once and now Magit is unusable272486
Node: I am having problems committing272667 Node: I am having problems committing273202
Node: Diffs are collapsed after un-/staging273113 Node: Diffs are collapsed after un-/staging273648
Node: I don't understand how branching and pushing work274591 Node: I don't understand how branching and pushing work275126
Node: I don't like the key binding in v24274966 Node: I don't like the key binding in v24275501
Node: I cannot install the pre-requisites for Magit v2275305 Node: I cannot install the pre-requisites for Magit v2275840
Node: I am using an Emacs release older than v244275770 Node: I am using an Emacs release older than v244276305
Node: I am using a Git release older than v194277383 Node: I am using a Git release older than v194277918
Node: I am using MS Windows and cannot push with Magit278370 Node: I am using MS Windows and cannot push with Magit278905
Node: I am using OS X and SOMETHING works in shell but not in Magit278974 Node: I am using OS X and SOMETHING works in shell but not in Magit279509
Node: How to install the gitman info manual?279765 Node: How to install the gitman info manual?280300
Node: How can I show Git's output?282306 Node: How can I show Git's output?282841
Node: Diffs contain control sequences283093 Node: Diffs contain control sequences283628
Node: Expanding a file to show the diff causes it to disappear284098 Node: Expanding a file to show the diff causes it to disappear284633
Node: Point is wrong in the COMMIT_EDITMSG buffer284633 Node: Point is wrong in the COMMIT_EDITMSG buffer285168
Node: The mode-line information isn't always up-to-date285663 Node: The mode-line information isn't always up-to-date286198
Node: Can Magit be used as ediff-version-control-package?286731 Node: Can Magit be used as ediff-version-control-package?287266
Node: How to show diffs for gpg-encrypted files?288775 Node: How to show diffs for gpg-encrypted files?289310
Node: Emacs 245 hangs when loading Magit289372 Node: Emacs 245 hangs when loading Magit289907
Node: Symbol's value as function is void --some289947 Node: Symbol's value as function is void --some290482
Node: Where is the branch manager290281 Node: Where is the branch manager290816
Node: Keystroke Index290572 Node: Keystroke Index291107
Node: Command Index320475 Node: Command Index321010
Node: Function Index350484 Node: Function Index351019
Node: Variable Index364378 Node: Variable Index364913
 
End Tag Table End Tag Table

View File

@ -4073,12 +4073,21 @@ features are available from separate popups.
remote branches, but not for local branches. remote branches, but not for local branches.
You might prefer to always use some remote branch as upstream. If You might prefer to always use some remote branch as upstream. If
the chosen starting-point is (1) a local branch, (2) whose name is the chosen starting-point is (1) a local branch, (2) whose name
a member of the value of this option, (3) the upstream of that matches a member of the value of this option, (3) the upstream of
local branch is a remote branch with the same name, and (4) that that local branch is a remote branch with the same name, and (4)
remote branch can be fast-forwarded to the local branch, then the that remote branch can be fast-forwarded to the local branch, then
chosen branch is used as starting-point, but its own upstream is the chosen branch is used as starting-point, but its own upstream
used as the upstream of the new branch. is used as the upstream of the new branch.
Members of this options value are treated as branch names that
have to match exactly unless they contain a character that makes
them invalid as a branch name. Recommended characters to use to
trigger interpretation as a regexp are "*" and "^". Some other
characters which you might expect to be invalid, actually are not,
e.g. ".+$" are all perfectly valid. More precisely, if git
check-ref-format branch STRING exits with a non-zero status, then
treat STRING as a regexp.
Assuming the chosen branch matches these conditions you would end Assuming the chosen branch matches these conditions you would end
up with with e.g.: up with with e.g.: