Update elpa packages · home@c2bf85eba6dd

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "dired-narrow" "dired-narrow.el" (22712 4598
-;;;;;;  319691 399000))
+;;;### (autoloads nil "dired-narrow" "dired-narrow.el" (22725 53743
+;;;;;;  166592 209000))
 ;;; Generated autoloads from dired-narrow.el
 
 (autoload 'dired-narrow-regexp "dired-narrow" "\

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "dired-narrow" "20160918.740" "Live-narrowing of search results for dired" '((dash "2.7.0") (dired-hacks-utils "0.0.1")) :keywords '("files"))
+(define-package "dired-narrow" "20170309.329" "Live-narrowing of search results for dired" '((dash "2.7.0") (dired-hacks-utils "0.0.1")) :keywords '("files"))

@@ -5,7 +5,7 @@
 ;; Author: Matúš Goljer <matus.goljer@gmail.com>
 ;; Maintainer: Matúš Goljer <matus.goljer@gmail.com>
 ;; Version: 0.0.1
-;; Package-Version: 20160918.740
+;; Package-Version: 20170309.329
 ;; Created: 14th February 2014
 ;; Package-requires: ((dash "2.7.0") (dired-hacks-utils "0.0.1"))
 ;; Keywords: files
@@ -38,10 +38,11 @@
 ;; available.  You can customize the binding by changing
 ;; `dired-narrow-map'.
 
-;; * `dired-narrow-next-file' (<down>) - move the point to the next file
-;; * `dired-narrow-previous-file' (<up>) - move the point to the
+;; * `dired-narrow-next-file' (<down> or C-n) - move the point to the
+;;   next file
+;; * `dired-narrow-previous-file' (<up> or C-p) - move the point to the
 ;;   previous file
-;; * `dired-narrow-enter-directory' (<right>) - descend into the
+;; * `dired-narrow-enter-directory' (<right> or C-j) - descend into the
 ;;   directory under point and immediately go back to narrowing mode
 
 ;; You can customize what happens after exiting the live filtering
@@ -81,6 +82,9 @@
     (define-key map (kbd "<up>") 'dired-narrow-previous-file)
     (define-key map (kbd "<down>") 'dired-narrow-next-file)
     (define-key map (kbd "<right>") 'dired-narrow-enter-directory)
+    (define-key map (kbd "C-p") 'dired-narrow-previous-file)
+    (define-key map (kbd "C-n") 'dired-narrow-next-file)
+    (define-key map (kbd "C-j") 'dired-narrow-enter-directory)
     (define-key map (kbd "C-g") 'minibuffer-keyboard-quit)
     (define-key map (kbd "RET") 'exit-minibuffer)
     (define-key map (kbd "<return>") 'exit-minibuffer)
@@ -117,7 +121,7 @@ Units are seconds."
 (defface dired-narrow-blink
   '((t :background "#eadc62"
        :foreground "black"))
-  "The face used to highlight a chosen file 
+  "The face used to highlight a chosen file
 when `dired-narrow-exit-when-one-left' and `dired-narrow-enable-blinking' are true."
   :group 'dired-narrow)

Binary file

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "editorconfig" "editorconfig.el" (22712 4656
-;;;;;;  195307 57000))
+;;;### (autoloads nil "editorconfig" "editorconfig.el" (22725 53742
+;;;;;;  489614 133000))
 ;;; Generated autoloads from editorconfig.el
 
 (autoload 'editorconfig-display-current-properties "editorconfig" "\
@@ -40,7 +40,7 @@ mode is not listed in `editorconfig-exclude-modes'.
 ;;;***
 
 ;;;### (autoloads nil "editorconfig-conf-mode" "editorconfig-conf-mode.el"
-;;;;;;  (22712 4656 193307 70000))
+;;;;;;  (22725 53742 478614 489000))
 ;;; Generated autoloads from editorconfig-conf-mode.el
 
 (autoload 'editorconfig-conf-mode "editorconfig-conf-mode" "\
@@ -53,7 +53,7 @@ Major mode for editing .editorconfig files.
 ;;;***
 
 ;;;### (autoloads nil "editorconfig-core" "editorconfig-core.el"
-;;;;;;  (22712 4656 192307 77000))
+;;;;;;  (22725 53742 473614 651000))
 ;;; Generated autoloads from editorconfig-core.el
 
 (autoload 'editorconfig-core-get-properties "editorconfig-core" "\
@@ -81,7 +81,7 @@ hash object instead.
 ;;;***
 
 ;;;### (autoloads nil "editorconfig-fnmatch" "editorconfig-fnmatch.el"
-;;;;;;  (22712 4656 189307 97000))
+;;;;;;  (22725 53742 466614 878000))
 ;;; Generated autoloads from editorconfig-fnmatch.el
 
 (autoload 'editorconfig-fnmatch-p "editorconfig-fnmatch" "\
@@ -105,7 +105,7 @@ be used:
 ;;;***
 
 ;;;### (autoloads nil nil ("editorconfig-core-handle.el" "editorconfig-pkg.el")
-;;;;;;  (22712 4656 196307 50000))
+;;;;;;  (22725 53742 495613 938000))
 
 ;;;***

File renamed without changes

@@ -1,4 +1,4 @@
-(define-package "editorconfig" "20170222.2141" "EditorConfig Emacs Plugin"
+(define-package "editorconfig" "20170309.2006" "EditorConfig Emacs Plugin"
   '((cl-lib "0.5"))
   :url "https://github.com/editorconfig/editorconfig-emacs#readme")
 ;; Local Variables:

@@ -454,7 +454,13 @@ applies available properties."
               (editorconfig-set-trailing-nl (gethash 'insert_final_newline props))
               (editorconfig-set-trailing-ws (gethash 'trim_trailing_whitespace props))
               (editorconfig-set-line-length (gethash 'max_line_length props))
-              (run-hook-with-args 'editorconfig-custom-hooks props))))
+              (condition-case err
+                  (run-hook-with-args 'editorconfig-custom-hooks props)
+                (error
+                 (display-warning 'editorconfig-custom-hooks
+                                  (concat (error-message-string err)
+                                          ". Stop running hook.")
+                                  :warning))))))
       (error
        (display-warning 'editorconfig
                         (concat (error-message-string err)

Binary file

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "flycheck" "flycheck.el" (22712 4654 705316
-;;;;;;  953000))
+;;;### (autoloads nil "flycheck" "flycheck.el" (22725 53740 86691
+;;;;;;  952000))
 ;;; Generated autoloads from flycheck.el
 
 (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"
-;;;;;;  "flycheck-pkg.el") (22712 4654 704316 959000))
+;;;;;;  "flycheck-pkg.el") (22725 53740 80692 146000))
 
 ;;;***

File renamed without changes

Binary file

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

@@ -3140,7 +3140,8 @@ otherwise."
        ;; and the current buffer has no file name, too, or if it refers to the
        ;; same file as the current buffer.
        (or (and (not file-name) (not buffer-file-name))
-           (flycheck-same-files-p file-name (buffer-file-name)))
+           (and buffer-file-name file-name
+                (flycheck-same-files-p file-name buffer-file-name)))
        message
        (not (string-empty-p message))
        (flycheck-error-line err)))))
@@ -7893,6 +7894,21 @@ See URL `http://lesscss.org'."
           line-end))
   :modes less-css-mode)
 
+(flycheck-def-config-file-var flycheck-luacheckrc lua-luacheck ".luacheckrc"
+  :safe #'stringp)
+
+(flycheck-def-option-var flycheck-luacheck-standards nil lua-luacheck
+  "The standards to use in luacheck.
+
+The value of this variable is either a list of strings denoting
+the standards to use, or nil to pass nothing to luacheck.  When
+non-nil, pass the standards via one or more `--std' options."
+  :type '(choice (const :tag "Default" nil)
+                 (repeat :tag "Custom standards"
+                         (string :tag "Standard name")))
+  :safe #'flycheck-string-list-p)
+(make-variable-buffer-local 'flycheck-luacheck-standards)
+
 (flycheck-define-checker lua-luacheck
   "A Lua syntax checker using luacheck.
 
@@ -7901,6 +7917,8 @@ See URL `https://github.com/mpeterv/luacheck'."
             "--formatter" "plain"
             "--codes"                   ; Show warning codes
             "--no-color"
+            (option-list "--std" flycheck-luacheck-standards)
+            (config-file "--config" flycheck-luacheckrc)
             "--filename" source-original
             ;; Read from standard input
             "-")
@@ -9388,7 +9406,7 @@ Relative paths are relative to the file being checked."
 (flycheck-define-checker verilog-verilator
   "A Verilog syntax checker using the Verilator Verilog HDL simulator.
 
-See URL `http://www.veripool.org/wiki/verilator'."
+See URL `https://www.veripool.org/wiki/verilator'."
   :command ("verilator" "--lint-only" "-Wall"
             (option-list "-I" flycheck-verilator-include-path concat)
             source)

Binary file

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "git-commit" "git-commit.el" (22712 4645 999374
-;;;;;;  772000))
+;;;### (autoloads nil "git-commit" "git-commit.el" (22725 53738 527742
+;;;;;;  439000))
 ;;; Generated autoloads from git-commit.el
 
 (defvar global-git-commit-mode t "\

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "git-commit" "20170214.347" "Edit Git commit messages" '((emacs "24.4") (dash "20170207.2056") (with-editor "20170111.609")) :url "https://github.com/magit/magit" :keywords '("git" "tools" "vc"))
+(define-package "git-commit" "20170308.146" "Edit Git commit messages" '((emacs "24.4") (dash "20170207.2056") (with-editor "20170111.609")) :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 "20170207.2056") (with-editor "20170111.609"))
-;; Package-Version: 20170214.347
+;; Package-Version: 20170308.146
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit

File renamed without changes

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "ivy" "ivy.el" (22712 4603 175659 154000))
+;;;### (autoloads nil "ivy" "ivy.el" (22725 53737 126787 808000))
 ;;; Generated autoloads from ivy.el
 
 (autoload 'ivy-resume "ivy" "\
@@ -116,7 +116,7 @@ Switch to another buffer in another window.
 ;;;***
 
 ;;;### (autoloads nil nil ("colir.el" "ivy-overlay.el" "ivy-pkg.el")
-;;;;;;  (22712 4603 172659 174000))
+;;;;;;  (22725 53737 111788 294000))
 
 ;;;***

File renamed without changes

Binary file

@@ -1,4 +1,4 @@
-(define-package "ivy" "20170225.351" "Incremental Vertical completYon"
+(define-package "ivy" "20170312.844" "Incremental Vertical completYon"
   '((emacs "24.1"))
   :url "https://github.com/abo-abo/swiper" :keywords
   '("matching"))

@@ -1767,7 +1767,7 @@ INHERIT-INPUT-METHOD is currently ignored."
       (ivy-read (replace-regexp-in-string "%" "%%" prompt)
                 collection
                 :predicate predicate
-                :require-match require-match
+                :require-match (and collection require-match)
                 :initial-input (if (consp initial-input)
                                    (car initial-input)
                                  (if (and (stringp initial-input)
@@ -1873,7 +1873,6 @@ The previous string is between `ivy-completion-beg' and `ivy-completion-end'."
                        (mapcar #'substring-no-properties comps)
                        :predicate predicate
                        :action #'ivy-completion-in-region-action
-                       :require-match t
                        :caller 'ivy-completion-in-region)
              t)))))))
 
@@ -3524,7 +3523,8 @@ updated original buffer."
           ((memq caller '(counsel-git-grep counsel-grep counsel-ag counsel-rg))
            (let ((inhibit-read-only t))
              (erase-buffer)
-             (funcall (plist-get ivy--occurs-list caller)))))))
+             (funcall (plist-get ivy--occurs-list caller)))))
+    (setq ivy-occur-last ivy-last)))
 
 (declare-function wgrep-change-to-wgrep-mode "ext:wgrep")

Binary file

File renamed without changes

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil nil ("ivy-hydra.el") (22712 4604 77653 165000))
+;;;### (autoloads nil nil ("ivy-hydra.el") (22725 53736 265815 691000))
 
 ;;;***

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "ivy-hydra" "20170301.1213" "Additional key bindings for Ivy" '((emacs "24.1") (ivy "0.8.0") (hydra "0.13.4")) :url "https://github.com/abo-abo/swiper" :keywords '("completion" "matching" "bindings"))
+(define-package "ivy-hydra" "20170302.1033" "Additional key bindings for Ivy" '((emacs "24.1") (ivy "0.8.0") (hydra "0.13.4")) :url "https://github.com/abo-abo/swiper" :keywords '("completion" "matching" "bindings"))

@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170301.1213
+;; Package-Version: 20170302.1033
 ;; Version: 0.8.0
 ;; Package-Requires: ((emacs "24.1") (ivy "0.8.0") (hydra "0.13.4"))
 ;; Keywords: completion, matching, bindings
@@ -97,7 +97,7 @@ _h_ ^+^ _l_ | _d_one      ^ ^  | _o_ops   | _m_: matcher %-5s(ivy--matcher-desc)
                      (cdr actions))
            ("M-o" nil "back")))))))
 
-(define-key ivy-mode-map (kbd "M-o") 'ivy-dispatching-done-hydra)
+(define-key ivy-minibuffer-map (kbd "M-o") 'ivy-dispatching-done-hydra)
 
 (provide 'ivy-hydra)

Binary file

@@ -98,6 +98,7 @@ Contributors
 - Dennis Paskorz <dennis@walltowall.com>
 - Divye Kapoor <divye@google.com>
 - Dominique Quatravaux <domq@google.com>
+- Duianto Vebotci <vebotci@openmailbox.org>
 - Eli Barzilay <eli@barzilay.org>
 - Eric Davis <ed@npri.org>
 - Eric Schulte <schulte.eric@gmail.com>

File renamed without changes

@@ -210,6 +210,7 @@
      . "show the commit at point in another buffer and select its window")
     (undo                         . "undo last change")
     (git-rebase-kill-line         . "drop the commit at point")
+    (git-rebase-insert            . "insert a line for an arbitrary commit")
     (git-rebase-noop              . "add noop action at point")))
 
 ;;; Commands

Binary file

File renamed without changes

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "git-rebase" "git-rebase.el" (22712 4649 340352
-;;;;;;  584000))
+;;;### (autoloads nil "git-rebase" "git-rebase.el" (22725 53733 171915
+;;;;;;  887000))
 ;;; 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" (22712 4649 358352 464000))
+;;;### (autoloads nil "magit" "magit.el" (22725 53733 273912 583000))
 ;;; Generated autoloads from magit.el
  (autoload 'magit-merge-popup "magit" nil t)
 
@@ -165,8 +165,8 @@ Git, and Emacs in the echo area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-apply" "magit-apply.el" (22712 4649
-;;;;;;  346352 544000))
+;;;### (autoloads nil "magit-apply" "magit-apply.el" (22725 53733
+;;;;;;  204914 818000))
 ;;; Generated autoloads from magit-apply.el
 
 (autoload 'magit-stage-file "magit-apply" "\
@@ -202,8 +202,8 @@ Remove all changes from the staging area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22712
-;;;;;;  4649 331352 643000))
+;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22725
+;;;;;;  53733 125917 376000))
 ;;; Generated autoloads from magit-autorevert.el
 
 (defvar magit-revert-buffers t)
@@ -232,8 +232,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
 
 ;;;***
 
-;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22712 4649
-;;;;;;  345352 550000))
+;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22725 53733
+;;;;;;  198915 12000))
 ;;; Generated autoloads from magit-bisect.el
  (autoload 'magit-bisect-popup "magit-bisect" nil t)
 
@@ -284,8 +284,8 @@ bisect run'.
 
 ;;;***
 
-;;;### (autoloads nil "magit-blame" "magit-blame.el" (22712 4649
-;;;;;;  356352 478000))
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (22725 53733
+;;;;;;  261912 972000))
 ;;; Generated autoloads from magit-blame.el
  (autoload 'magit-blame-popup "magit-blame" nil t)
 
@@ -309,8 +309,8 @@ only arguments available from `magit-blame-popup' should be used.
 
 ;;;***
 
-;;;### (autoloads nil "magit-branch" "magit-branch.el" (22712 4649
-;;;;;;  344352 557000))
+;;;### (autoloads nil "magit-branch" "magit-branch.el" (22725 53733
+;;;;;;  192915 207000))
 ;;; Generated autoloads from magit-branch.el
  (autoload 'magit-branch-popup "magit" nil t)
 
@@ -364,11 +364,13 @@ current branch will be used as the starting point as usual, but
 the upstream of the starting-point may be used as the upstream
 of the new branch, instead of the starting-point itself.
 
-If optional FROM is non-nil, then the source branch is reset to
-that commit, instead of to the last commit it shares with its
-upstream.  Interactively, FROM is non-nil, when the region
-selects some commits, and among those commits, FROM it is the
-commit that is the fewest commits ahead of the source branch.
+If optional FROM is non-nil, then the source branch is reset
+to `FROM~', instead of to the last commit it shares with its
+upstream.  Interactively, FROM is only ever non-nil, if the
+region selects some commits, and among those commits, FROM is
+the commit that is the fewest commits ahead of the source
+branch.  (It not yet possible to spin off a single commit,
+unless it is the only unpushed commit.  See #2920.)
 
 The commit at the other end of the selection actually does not
 matter, all commits between FROM and `HEAD' are moved to the new
@@ -536,8 +538,8 @@ When `never' (the default) then the variable is never set.
 
 ;;;***
 
-;;;### (autoloads nil "magit-commit" "magit-commit.el" (22712 4649
-;;;;;;  332352 637000))
+;;;### (autoloads nil "magit-commit" "magit-commit.el" (22725 53733
+;;;;;;  129917 247000))
 ;;; Generated autoloads from magit-commit.el
 
 (autoload 'magit-commit "magit-commit" "\
@@ -619,8 +621,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
 
 ;;;***
 
-;;;### (autoloads nil "magit-diff" "magit-diff.el" (22712 4649 355352
-;;;;;;  484000))
+;;;### (autoloads nil "magit-diff" "magit-diff.el" (22725 53733 255913
+;;;;;;  166000))
 ;;; Generated autoloads from magit-diff.el
 
 (autoload 'magit-diff-popup "magit-diff" "\
@@ -704,8 +706,8 @@ for a revision.
 
 ;;;***
 
-;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22712 4649
-;;;;;;  351352 511000))
+;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22725 53733
+;;;;;;  231913 944000))
 ;;; Generated autoloads from magit-ediff.el
  (autoload 'magit-ediff-popup "magit-ediff" nil t)
 
@@ -793,8 +795,8 @@ stash that were staged.
 
 ;;;***
 
-;;;### (autoloads nil "magit-extras" "magit-extras.el" (22712 4649
-;;;;;;  333352 630000))
+;;;### (autoloads nil "magit-extras" "magit-extras.el" (22725 53733
+;;;;;;  135917 52000))
 ;;; Generated autoloads from magit-extras.el
 
 (autoload 'magit-run-git-gui "magit-extras" "\
@@ -896,8 +898,8 @@ on a position in a file-visiting buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-files" "magit-files.el" (22712 4649
-;;;;;;  341352 577000))
+;;;### (autoloads nil "magit-files" "magit-files.el" (22725 53733
+;;;;;;  176915 725000))
 ;;; Generated autoloads from magit-files.el
 
 (autoload 'magit-find-file "magit-files" "\
@@ -944,8 +946,8 @@ Checkout FILE from REV.
 
 ;;;***
 
-;;;### (autoloads nil "magit-log" "magit-log.el" (22712 4649 352352
-;;;;;;  504000))
+;;;### (autoloads nil "magit-log" "magit-log.el" (22725 53733 237913
+;;;;;;  749000))
 ;;; Generated autoloads from magit-log.el
 
 (autoload 'magit-log-buffer-file-popup "magit-log" "\
@@ -1027,15 +1029,15 @@ Show commits in a branch that are not merged in the upstream branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-notes" "magit-notes.el" (22712 4649
-;;;;;;  366352 411000))
+;;;### (autoloads nil "magit-notes" "magit-notes.el" (22725 53733
+;;;;;;  317911 159000))
 ;;; Generated autoloads from magit-notes.el
  (autoload 'magit-notes-popup "magit" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "magit-refs" "magit-refs.el" (22712 4649 334352
-;;;;;;  624000))
+;;;### (autoloads nil "magit-refs" "magit-refs.el" (22725 53733 140916
+;;;;;;  890000))
 ;;; Generated autoloads from magit-refs.el
  (autoload 'magit-show-refs-popup "magit" nil t)
 
@@ -1060,8 +1062,8 @@ Refs are compared with a branch read from the user.
 
 ;;;***
 
-;;;### (autoloads nil "magit-remote" "magit-remote.el" (22712 4649
-;;;;;;  362352 437000))
+;;;### (autoloads nil "magit-remote" "magit-remote.el" (22725 53733
+;;;;;;  295911 871000))
 ;;; Generated autoloads from magit-remote.el
 
 (autoload 'magit-clone "magit-remote" "\
@@ -1293,8 +1295,8 @@ is asked to pull.  START has to be reachable from that commit.
 
 ;;;***
 
-;;;### (autoloads nil "magit-repos" "magit-repos.el" (22712 4649
-;;;;;;  354352 491000))
+;;;### (autoloads nil "magit-repos" "magit-repos.el" (22725 53733
+;;;;;;  249913 361000))
 ;;; Generated autoloads from magit-repos.el
 
 (autoload 'magit-list-repositories "magit-repos" "\
@@ -1308,8 +1310,8 @@ control which repositories are displayed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22712
-;;;;;;  4649 360352 451000))
+;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22725
+;;;;;;  53733 283912 259000))
 ;;; Generated autoloads from magit-sequence.el
 
 (autoload 'magit-sequencer-continue "magit-sequence" "\
@@ -1403,13 +1405,13 @@ Rebase the current branch onto its upstream branch.
 
 (autoload 'magit-rebase "magit-sequence" "\
 Rebase the current branch onto a branch read in the minibuffer.
-All commits that are reachable from head but not from the
+All commits that are reachable from `HEAD' but not from the
 selected branch TARGET are being rebased.
 
 \(fn TARGET ARGS)" t nil)
 
 (autoload 'magit-rebase-subset "magit-sequence" "\
-Rebase a subset of the current branches history onto a new base.
+Rebase a subset of the current branch's history onto a new base.
 Rebase commits from START to `HEAD' onto NEWBASE.
 START has to be selected from a list of recent commits.
 
@@ -1459,8 +1461,8 @@ Abort the current rebase operation, restoring the original branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-stash" "magit-stash.el" (22712 4649
-;;;;;;  349352 524000))
+;;;### (autoloads nil "magit-stash" "magit-stash.el" (22725 53733
+;;;;;;  220914 300000))
 ;;; Generated autoloads from magit-stash.el
  (autoload 'magit-stash-popup "magit-stash" nil t)
 
@@ -1559,8 +1561,8 @@ Show all diffs of a stash in a buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-status" "magit-status.el" (22712 4649
-;;;;;;  353352 497000))
+;;;### (autoloads nil "magit-status" "magit-status.el" (22725 53733
+;;;;;;  243913 555000))
 ;;; Generated autoloads from magit-status.el
 
 (autoload 'magit-init "magit-status" "\
@@ -1591,8 +1593,8 @@ then offer to initialize it as a new repository.
 
 ;;;***
 
-;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22712
-;;;;;;  4649 367352 404000))
+;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22725
+;;;;;;  53733 322910 997000))
 ;;; Generated autoloads from magit-submodule.el
  (autoload 'magit-submodule-popup "magit-submodule" nil t)
 
@@ -1682,8 +1684,8 @@ Display a list of the current repository's submodules.
 
 ;;;***
 
-;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22712 4649
-;;;;;;  342352 570000))
+;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22725 53733
+;;;;;;  182915 530000))
 ;;; Generated autoloads from magit-subtree.el
  (autoload 'magit-subtree-popup "magit-subtree" nil t)
 
@@ -1719,8 +1721,8 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-utils" "magit-utils.el" (22712 4649
-;;;;;;  329352 657000))
+;;;### (autoloads nil "magit-utils" "magit-utils.el" (22725 53733
+;;;;;;  120917 538000))
 ;;; Generated autoloads from magit-utils.el
 
 (autoload 'magit-emacs-Q-command "magit-utils" "\
@@ -1744,8 +1746,8 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-wip" "magit-wip.el" (22712 4649 336352
-;;;;;;  610000))
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (22725 53733 150916
+;;;;;;  567000))
 ;;; Generated autoloads from magit-wip.el
 
 (defvar magit-wip-after-save-mode nil "\
@@ -1813,8 +1815,8 @@ command which is about to be called are committed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22712
-;;;;;;  4649 364352 424000))
+;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22725
+;;;;;;  53733 306911 515000))
 ;;; Generated autoloads from magit-worktree.el
 
 (autoload 'magit-worktree-checkout "magit-worktree" "\
@@ -1831,7 +1833,7 @@ Create a new BRANCH and check it out in a new worktree at PATH.
 
 ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-margin.el"
 ;;;;;;  "magit-mode.el" "magit-obsolete.el" "magit-pkg.el" "magit-process.el"
-;;;;;;  "magit-section.el") (22712 4649 363352 431000))
+;;;;;;  "magit-section.el") (22725 53733 301911 677000))
 
 ;;;***

File renamed without changes

@@ -288,11 +288,13 @@ current branch will be used as the starting point as usual, but
 the upstream of the starting-point may be used as the upstream
 of the new branch, instead of the starting-point itself.
 
-If optional FROM is non-nil, then the source branch is reset to
-that commit, instead of to the last commit it shares with its
-upstream.  Interactively, FROM is non-nil, when the region
-selects some commits, and among those commits, FROM it is the
-commit that is the fewest commits ahead of the source branch.
+If optional FROM is non-nil, then the source branch is reset
+to `FROM~', instead of to the last commit it shares with its
+upstream.  Interactively, FROM is only ever non-nil, if the
+region selects some commits, and among those commits, FROM is
+the commit that is the fewest commits ahead of the source
+branch.  (It not yet possible to spin off a single commit,
+unless it is the only unpushed commit.  See #2920.)
 
 The commit at the other end of the selection actually does not
 matter, all commits between FROM and `HEAD' are moved to the new

Binary file

File renamed without changes

@@ -1,10 +1,10 @@
-(define-package "magit" "20170228.1717" "A Git porcelain inside Emacs"
+(define-package "magit" "20170311.925" "A Git porcelain inside Emacs"
   '((emacs "24.4")
-    (async "20161103.1036")
+    (async "20170219.942")
     (dash "20170207.2056")
     (with-editor "20170111.609")
-    (git-commit "20170128.745")
-    (magit-popup "20170209.1031"))
+    (git-commit "20170214.347")
+    (magit-popup "20170214.347"))
   :url "https://github.com/magit/magit" :keywords
   '("git" "tools" "vc"))
 ;; Local Variables:

File renamed without changes

@@ -113,7 +113,7 @@ tags."
 (defcustom magit-visit-ref-behavior nil
   "Control how `magit-visit-ref' behaves in `magit-refs-mode' buffers.
 
-By default `magit-visit-ref' behaves like `magit-show-commits',
+By default `magit-visit-ref' behaves like `magit-show-commit',
 in all buffers, including `magit-refs-mode' buffers.  When the
 type of the section at point is `commit' then \"RET\" is bound to
 `magit-show-commit', and when the type is either `branch' or

Binary file

@@ -90,9 +90,9 @@ Then show the status buffer for the new repository."
 
 If `ask', then always ask.  If `ask-if-unset', then ask, but only
 if the variable isn't set already.  If nil, then don't ever set.
-If the value is a string, then set without asking, provided the
-name of the name of the added remote is equal to that string and
-the variable isn't already set."
+If the value is a string, then set without asking, provided that
+the name of the added remote is equal to that string and the
+variable isn't already set."
   :package-version '(magit . "2.4.0")
   :group 'magit-commands
   :type '(choice (const  :tag "ask if unset" ask-if-unset)
@@ -121,7 +121,7 @@ the variable isn't already set."
   (interactive (list (magit-read-string-ns "Remote name")
                      (magit-read-url "Remote url")))
   (if (pcase (list magit-remote-add-set-remote.pushDefault
-                   (magit-get "remote.defaultPush"))
+                   (magit-get "remote.pushDefault"))
         (`(,(pred stringp) ,_) t)
         ((or `(ask ,_) `(ask-if-unset nil))
          (y-or-n-p (format "Set `remote.pushDefault' to \"%s\"? " remote))))

Binary file

File renamed without changes

@@ -290,12 +290,12 @@ This discards all changes made since the sequence started."
 (magit-define-popup magit-rebase-popup
   "Key menu for rebasing."
   :man-page "git-rebase"
-  :switches '((?k "Keep empty commits"    "--keep-empty")
-              (?p "Preserve merges"       "--preserve-merges")
-              (?c "Lie about author date" "--committer-date-is-author-date")
-              (?a "Autosquash"            "--autosquash")
-              (?A "Autostash"             "--autostash")
-              (?i "Interactive"           "--interactive"))
+  :switches '((?k "Keep empty commits"       "--keep-empty")
+              (?p "Preserve merges"          "--preserve-merges")
+              (?c "Lie about committer date" "--committer-date-is-author-date")
+              (?a "Autosquash"               "--autosquash")
+              (?A "Autostash"                "--autostash")
+              (?i "Interactive"              "--interactive"))
   :actions  '((lambda ()
                 (concat (propertize "Rebase " 'face 'magit-popup-heading)
                         (propertize (or (magit-get-current-branch) "HEAD")
@@ -350,7 +350,7 @@ If that variable is unset, then rebase onto `remote.pushDefault'."
 ;;;###autoload
 (defun magit-rebase (target args)
   "Rebase the current branch onto a branch read in the minibuffer.
-All commits that are reachable from head but not from the
+All commits that are reachable from `HEAD' but not from the
 selected branch TARGET are being rebased."
   (interactive (list (magit-read-other-branch-or-commit "Rebase onto")
                      (magit-rebase-arguments)))
@@ -360,7 +360,7 @@ selected branch TARGET are being rebased."
 
 ;;;###autoload
 (defun magit-rebase-subset (newbase start args)
-  "Rebase a subset of the current branches history onto a new base.
+  "Rebase a subset of the current branch's history onto a new base.
 Rebase commits from START to `HEAD' onto NEWBASE.
 START has to be selected from a list of recent commits."
   (interactive (list (magit-read-other-branch-or-commit

Binary file

File renamed without changes

@@ -16,7 +16,7 @@
 ;;	Rémi Vanicat      <vanicat@debian.org>
 ;;	Yann Hodique      <yann.hodique@gmail.com>
 
-;; Package-Requires: ((emacs "24.4") (async "20161103.1036") (dash "20170207.2056") (with-editor "20170111.609") (git-commit "20170128.745") (magit-popup "20170209.1031"))
+;; Package-Requires: ((emacs "24.4") (async "20170219.942") (dash "20170207.2056") (with-editor "20170111.609") (git-commit "20170214.347") (magit-popup "20170214.347"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit

File renamed without changes

@@ -27,7 +27,7 @@ END-INFO-DIR-ENTRY
 
 Indirect:
 magit.info-1: 1222
-magit.info-2: 322488
+magit.info-2: 322678
 
 Tag Table:
 (Indirect)
@@ -80,89 +80,89 @@ Node: Diff Options106464
 Node: Revision Buffer109834
 Node: Ediffing110789
 Node: References Buffer114379
-Node: References Sections121679
-Node: Bisecting122554
-Node: Visiting Blobs124292
-Node: Blaming124801
-Node: Manipulating128230
-Node: Repository Setup128546
-Node: Staging and Unstaging129586
-Node: Staging from File-Visiting Buffers133675
-Node: Applying134843
-Node: Committing136736
-Node: Initiating a Commit137319
-Node: Editing Commit Messages140630
-Node: Branching151026
-Node: The Two Remotes151226
-Node: The Branch Popup153770
-Node: The Branch Config Popup162998
-Node: Merging168901
-Node: Resolving Conflicts171068
-Node: Rebasing176073
-Node: Editing Rebase Sequences179713
-Node: Information About In-Progress Rebase182743
-Ref: Information About In-Progress Rebase-Footnote-1189579
-Node: Cherry Picking190165
-Node: Reverting191770
-Node: Resetting193133
-Node: Stashing194644
-Node: Transferring198838
-Node: Remotes199076
-Node: Fetching200361
-Node: Pulling201726
-Node: Pushing202571
-Node: Creating and Sending Patches207314
-Node: Applying Patches208009
-Node: Miscellaneous209006
-Node: Tagging209309
-Node: Notes210093
-Node: Submodules212617
-Node: Listing Submodules212831
-Node: Submodule Popup214650
-Node: Subtree215933
-Node: Common Commands217180
-Node: Wip Modes218925
-Node: Minor Mode for Buffers Visiting Files225721
-Node: Minor Mode for Buffers Visiting Blobs229195
-Node: Customizing230008
-Node: Per-Repository Configuration231680
-Node: Essential Settings233327
-Node: Safety233651
-Node: Performance235484
-Node: Plumbing243446
-Node: Calling Git244270
-Node: Getting a Value from Git245793
-Node: Calling Git for Effect248897
-Node: Section Plumbing255401
-Node: Creating Sections255629
-Node: Section Selection259528
-Node: Matching Sections261208
-Node: Refreshing Buffers266640
-Node: Conventions269775
-Node: Confirmation and Completion269952
-Node: Theming Faces270850
-Node: FAQ279001
-Node: FAQ - How to …?279394
-Node: How to show git's output?279758
-Node: How to install the gitman info manual?280512
-Node: How to show diffs for gpg-encrypted files?281482
-Node: How does branching and pushing work?282078
-Node: Can Magit be used as ‘ediff-version-control-package’?282457
-Node: FAQ - Issues and Errors284453
-Node: Magit is slow285197
-Node: I changed several thousand files at once and now Magit is unusable285422
-Node: I am having problems committing286162
-Node: I am using MS Windows and cannot push with Magit286643
-Node: I am using OS X and SOMETHING works in shell but not in Magit287260
-Node: Diffs contain control sequences288066
-Node: Expanding a file to show the diff causes it to disappear289140
-Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer289697
-Node: The mode-line information isn't always up-to-date290749
-Node: Emacs 245 hangs when loading Magit291816
-Node: Keystroke Index292366
-Node: Command Index322488
-Node: Function Index352716
-Node: Variable Index366026
+Node: References Sections121678
+Node: Bisecting122553
+Node: Visiting Blobs124291
+Node: Blaming124800
+Node: Manipulating128229
+Node: Repository Setup128545
+Node: Staging and Unstaging129585
+Node: Staging from File-Visiting Buffers133674
+Node: Applying134842
+Node: Committing136735
+Node: Initiating a Commit137318
+Node: Editing Commit Messages140629
+Node: Branching151025
+Node: The Two Remotes151225
+Node: The Branch Popup153850
+Node: The Branch Config Popup163195
+Node: Merging169098
+Node: Resolving Conflicts171265
+Node: Rebasing176270
+Node: Editing Rebase Sequences179910
+Node: Information About In-Progress Rebase182940
+Ref: Information About In-Progress Rebase-Footnote-1189776
+Node: Cherry Picking190362
+Node: Reverting191967
+Node: Resetting193330
+Node: Stashing194841
+Node: Transferring199035
+Node: Remotes199273
+Node: Fetching200551
+Node: Pulling201916
+Node: Pushing202761
+Node: Creating and Sending Patches207504
+Node: Applying Patches208199
+Node: Miscellaneous209196
+Node: Tagging209499
+Node: Notes210283
+Node: Submodules212807
+Node: Listing Submodules213021
+Node: Submodule Popup214840
+Node: Subtree216123
+Node: Common Commands217370
+Node: Wip Modes219115
+Node: Minor Mode for Buffers Visiting Files225911
+Node: Minor Mode for Buffers Visiting Blobs229385
+Node: Customizing230198
+Node: Per-Repository Configuration231870
+Node: Essential Settings233517
+Node: Safety233841
+Node: Performance235674
+Node: Plumbing243636
+Node: Calling Git244460
+Node: Getting a Value from Git245983
+Node: Calling Git for Effect249087
+Node: Section Plumbing255591
+Node: Creating Sections255819
+Node: Section Selection259718
+Node: Matching Sections261398
+Node: Refreshing Buffers266830
+Node: Conventions269965
+Node: Confirmation and Completion270142
+Node: Theming Faces271040
+Node: FAQ279191
+Node: FAQ - How to …?279584
+Node: How to show git's output?279948
+Node: How to install the gitman info manual?280702
+Node: How to show diffs for gpg-encrypted files?281672
+Node: How does branching and pushing work?282268
+Node: Can Magit be used as ‘ediff-version-control-package’?282647
+Node: FAQ - Issues and Errors284643
+Node: Magit is slow285387
+Node: I changed several thousand files at once and now Magit is unusable285612
+Node: I am having problems committing286352
+Node: I am using MS Windows and cannot push with Magit286833
+Node: I am using OS X and SOMETHING works in shell but not in Magit287450
+Node: Diffs contain control sequences288256
+Node: Expanding a file to show the diff causes it to disappear289330
+Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer289887
+Node: The mode-line information isn't always up-to-date290939
+Node: Emacs 245 hangs when loading Magit292006
+Node: Keystroke Index292556
+Node: Command Index322678
+Node: Function Index352906
+Node: Variable Index366216
 
 End Tag Table

@@ -3215,7 +3215,7 @@ you should also change the others to keep things aligned.  The following
      This option controls how ‘magit-visit-ref’ behaves in
      ‘magit-refs-mode’ buffers.
 
-     By default ‘magit-visit-ref’ behaves like ‘magit-show-commits’, in
+     By default ‘magit-visit-ref’ behaves like ‘magit-show-commit’, in
      all buffers, including ‘magit-refs-mode’ buffers.  When the type of
      the section at point is ‘commit’ then "RET" is bound to
      ‘magit-show-commit’, and when the type is either ‘branch’ or ‘tag’
@@ -4112,38 +4112,40 @@ upstream branch and the branch it is being pushed to, are usually the
 same remote branch.  But for a feature branch the upstream branch and
 the branch it is being pushed to should differ.
 
-   Feature branches too should _eventually_ end up in a remote branch
-such as ‘origin/master’ or ‘origin/maint’.  Such a branch should
-therefore be used as the upstream.  But feature branches shouldn’t be
-pushed directly to such branches.  Instead a feature branch ‘my-feature’
-is usually pushed to ‘my-fork/my-feature’ or ‘origin/my-feature’.  After
-the new feature has been reviewed, the maintainer merges the feature
-into ‘master’.  And finally ‘master’ (not ‘my-feature’ itself) is pushed
-to ‘origin/master’.
+   The commits on feature branches too should _eventually_ end up in a
+remote branch such as ‘origin/master’ or ‘origin/maint’.  Such a branch
+should therefore be used as the upstream.  But feature branches
+shouldn’t be pushed directly to such branches.  Instead a feature branch
+‘my-feature’ is usually pushed to ‘my-fork/my-feature’ or if you are a
+contributor ‘origin/my-feature’.  After the new feature has been
+reviewed, the maintainer merges the feature into ‘master’.  And finally
+‘master’ (not ‘my-feature’ itself) is pushed to ‘origin/master’.
 
    But new features seldom are perfect on the first try, and so feature
-branches usually have to be improved and re-pushed many times.  Pushing
-should therefore be easy to do, and for that reason some users have
-concluded that the remote branch to which a feature branch is being
-pushed should be set as the upstream.  Luckily Git has long ago gained
-support for a push-remote which can be configured separately from the
-upstream branch, using the variables ‘branch.<name>.pushRemote’ and
-‘remote.pushDefault’, so we no longer have to choose which of the two
-remotes should be used as "the remote".
+branches usually have to be reviewed, improved, and re-pushed several
+times.  Pushing should therefore be easy to do, and for that reason many
+Git users have concluded that it is best to use the remote branch to
+which the local feature branch is being pushed as its upstream.
+
+   But luckily Git has long ago gained support for a push-remote which
+can be configured separately from the upstream branch, using the
+variables ‘branch.<name>.pushRemote’ and ‘remote.pushDefault’.  So we no
+longer have to choose which of the two remotes should be used as "the
+remote".
 
    Each of the fetching, pulling, and pushing popups features three
-commands which act on the current branch and some other branch.  Of
+commands that act on the current branch and some other branch.  Of
 these, ‘p’ is bound to a command which acts on the push-remote, ‘u’ is
 bound to a command which acts on the upstream, and ‘e’ is bound to a
 command which acts on any other branch.  The status buffer shows
-unpushed and unpulled for both the push-remote and the upstream.
+unpushed and unpulled commits for both the push-remote and the upstream.
 
    It’s fairly simple to configure these two remotes.  The values of all
 the variables that are related to fetching, pulling, and pushing (as
 well as some other branch-related variables) can be inspected and
 changed using the popup ‘magit-branch-config-popup’, which is a
 sub-popup of many popups that deal with branches.  It is also possible
-to set the push-remote and/or upstream while pushing (see *note Pushing:
+to set the push-remote or upstream while pushing (see *note Pushing:
 Pushing.).
 
 
@@ -4218,10 +4220,12 @@ features are available from separate popups.
      new branch, instead of the starting-point itself.
 
      If optional FROM is non-nil, then the source branch is reset to
-     that commit, instead of to the last commit it shares with its
-     upstream.  Interactively, FROM is non-nil, when the region selects
-     some commits, and among those commits, FROM it is the commit that
-     is the fewest commits ahead of the source branch.
+     ‘FROM~’, instead of to the last commit it shares with its upstream.
+     Interactively, FROM is only ever non-nil, if the region selects
+     some commits, and among those commits, FROM is the commit that is
+     the fewest commits ahead of the source branch.  (It not yet
+     possible to spin off a single commit, unless it is the only
+     unpushed commit.  See #2920.)
 
      The commit at the other end of the selection actually does not
      matter, all commits between FROM and ‘HEAD’ are moved to the new
@@ -5345,9 +5349,9 @@ Also see *note (gitman)git-remote::.
 
      If ‘ask’, then always ask.  If ‘ask-if-unset’, then ask, but only
      if the variable isn’t set already.  If ‘nil’, then don’t ever set.
-     If the value is a string, then set without asking, provided the
-     name of the name of the added remote is equal to that string and
-     the variable isn’t already set.
+     If the value is a string, then set without asking, provided that
+     the name of the added remote is equal to that string and the
+     variable isn’t already set.
 
 
 File: magit.info,  Node: Fetching,  Next: Pulling,  Prev: Remotes,  Up: Transferring
@@ -7651,13 +7655,13 @@ Appendix B Keystroke Index
 * b c:                                   The Branch Popup.    (line  47)
 * B g:                                   Bisecting.           (line  36)
 * B k:                                   Bisecting.           (line  41)
-* b k:                                   The Branch Popup.    (line  98)
+* b k:                                   The Branch Popup.    (line 100)
 * b n:                                   The Branch Popup.    (line  37)
 * B r:                                   Bisecting.           (line  47)
-* b r:                                   The Branch Popup.    (line 104)
+* b r:                                   The Branch Popup.    (line 106)
 * B s:                                   Bisecting.           (line  24)
 * b s:                                   The Branch Popup.    (line  54)
-* b x:                                   The Branch Popup.    (line  82)
+* b x:                                   The Branch Popup.    (line  84)
 * c:                                     Initiating a Commit. (line   8)
 * c <1>:                                 Editing Rebase Sequences.
                                                               (line  72)

Binary file

File renamed without changes

@@ -4,7 +4,7 @@
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
 ;;;### (autoloads nil nil ("magit-popup-pkg.el" "magit-popup.el")
-;;;;;;  (22712 4645 179380 218000))
+;;;;;;  (22725 53730 486002 869000))
 
 ;;;***

@@ -1,6 +1,6 @@
-(define-package "magit-popup" "20170214.347" "Define prefix-infix-suffix command combos"
+(define-package "magit-popup" "20170308.146" "Define prefix-infix-suffix command combos"
   '((emacs "24.4")
-    (async "20161103.1036")
+    (async "20170219.942")
     (dash "20170207.2056"))
   :url "https://github.com/magit/magit" :keywords
   '("bindings"))

@@ -12,7 +12,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (async "20161103.1036") (dash "20170207.2056"))
+;; Package-Requires: ((emacs "24.4") (async "20170219.942") (dash "20170207.2056"))
 ;; Keywords: bindings
 ;; Homepage: https://github.com/magit/magit

File renamed without changes

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "yasnippet" "yasnippet.el" (22712 4620 67546
-;;;;;;  985000))
+;;;### (autoloads nil "yasnippet" "yasnippet.el" (22725 53728 755058
+;;;;;;  925000))
 ;;; Generated autoloads from yasnippet.el
 
 (autoload 'yas-minor-mode "yasnippet" "\
@@ -52,8 +52,8 @@ A mode for editing yasnippets
 
 ;;;***
 
-;;;### (autoloads nil nil ("yasnippet-pkg.el") (22712 4618 876554
-;;;;;;  894000))
+;;;### (autoloads nil nil ("yasnippet-pkg.el") (22725 53719 984342
+;;;;;;  960000))
 
 ;;;***

@@ -1,4 +1,4 @@
-(define-package "yasnippet" "20170216.1928" "Yet another snippet extension for Emacs."
+(define-package "yasnippet" "20170310.1724" "Yet another snippet extension for Emacs."
   '((cl-lib "0.5"))
   :url "http://github.com/joaotavora/yasnippet" :keywords
   '("convenience" "emulation"))

@@ -1352,7 +1352,7 @@ Returns (TEMPLATES START END). This function respects
       ((debug error) (cdr oops)))))
 
 (defun yas--eval-for-effect (form)
-  (yas--safely-run-hook (apply-partially #'eval form)))
+  (yas--safely-call-fun (apply-partially #'eval form)))
 
 (defun yas--read-lisp (string &optional nil-on-error)
   "Read STRING as a elisp expression and return it.
@@ -3166,7 +3166,11 @@ If there's none, exit the snippet."
 (defun yas--place-overlays (snippet field)
   "Correctly place overlays for SNIPPET's FIELD."
   (yas--make-move-field-protection-overlays snippet field)
-  (yas--make-move-active-field-overlay snippet field))
+  ;; Only move active field overlays if this is field is from the
+  ;; innermost snippet.
+  (when (eq snippet (car (yas-active-snippets (1- (yas--field-start field))
+                                              (1+ (yas--field-end field)))))
+    (yas--make-move-active-field-overlay snippet field)))
 
 (defun yas--move-to-field (snippet field)
   "Update SNIPPET to move to field FIELD.
@@ -3174,6 +3178,7 @@ If there's none, exit the snippet."
 Also create some protection overlays"
   (goto-char (yas--field-start field))
   (yas--place-overlays snippet field)
+  (overlay-put yas--active-field-overlay 'yas--snippet snippet)
   (overlay-put yas--active-field-overlay 'yas--field field)
   (let ((number (yas--field-number field)))
     ;; check for the special ${0: ...} field
@@ -3336,18 +3341,19 @@ This renders the snippet as ordinary text."
   (setq yas--snippets-to-move nil))
 
 (defun yas--safely-call-fun (fun)
+  "Call FUN and catch any errors."
   (condition-case error
       (funcall fun)
     ((debug error)
-     (yas--message 2 "Error running %s: %s"
-                   (if (symbolp fun) fun "a hook")
+     (yas--message 2 "Error running %s: %s" fun
                    (error-message-string error)))))
 
 (defun yas--safely-run-hook (hook)
+  "Call HOOK's functions.
+HOOK should be a symbol, a hook variable, as in `run-hooks'."
   (let ((debug-on-error (and (not (memq yas-good-grace '(t hooks)))
                              debug-on-error)))
-    (if (functionp hook) (yas--safely-call-fun hook)
-      (mapc #'yas--safely-call-fun hook))))
+    (yas--safely-call-fun (apply-partially #'run-hooks hook))))
 
 (defun yas--check-commit-snippet ()
   "Check if point exited the currently active field of the snippet.
@@ -3355,7 +3361,9 @@ This renders the snippet as ordinary text."
 If so cleans up the whole snippet up."
   (let* ((snippets (yas-active-snippets 'all))
          (snippets-left snippets)
-         (snippet-exit-transform nil)
+         (snippet-exit-transform)
+         ;; Record the custom snippet `yas-after-exit-snippet-hook'
+         ;; set in the expand-env field.
          (snippet-exit-hook yas-after-exit-snippet-hook))
     (dolist (snippet snippets)
       (let ((active-field (yas--snippet-active-field snippet)))
@@ -3383,9 +3391,10 @@ If so cleans up the whole snippet up."
                 (t
                  nil)))))
     (unless (or (null snippets) snippets-left)
-      (if snippet-exit-transform
-          (yas--eval-for-effect snippet-exit-transform))
-      (yas--safely-run-hook snippet-exit-hook))))
+      (when snippet-exit-transform
+        (yas--eval-for-effect snippet-exit-transform))
+      (let ((yas-after-exit-snippet-hook snippet-exit-hook))
+        (yas--safely-run-hook 'yas-after-exit-snippet-hook)))))
 
 ;; Apropos markers-to-points:
 ;;
@@ -3727,7 +3736,8 @@ considered when expanding the snippet."
            (let ((first-field (car (yas--snippet-fields snippet))))
              (when first-field
                (sit-for 0) ;; fix issue 125
-               (yas--move-to-field snippet first-field)))
+               (yas--letenv (yas--snippet-expand-env snippet)
+                 (yas--move-to-field snippet first-field))))
            (yas--message 4 "snippet expanded.")
            t))))

Binary file

@@ -0,0 +1,18 @@
+This global minor mode provides a simple way to switch between layouts and
+the buffers you left open before you switched (unless you closed it).
+
+It doesn't require any setup at all more than:
+(0blayout-mode)
+
+When you start Emacs with 0blayout loaded, you will have a default layout
+named "default", and then you can create new layouts (<prefix> C-c), switch
+layouts (<prefix> C-b), and kill the current layout (<prefix> C-k).
+The default <prefix> is (C-c C-l), but you can change it using:
+(0blayout-add-keybindings-with-prefix "<your prefix>")
+
+You can also customize-variable to change the name of the default session.
+
+The project is hosted at https://github.com/etu/0blayout
+There you can leave bug-reports and suggestions.
+
+Another comparable mode is eyebrowse which have been developed for longer.

Commit c2bf85eba6dd

Commit `c2bf85eba6dd`