Update packages · home@a7220f33e32c

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "ace-window" "0.9.0" "Quickly switch windows." '((avy "0.2.0")) :url "https://github.com/abo-abo/ace-window" :keywords '("window" "location"))

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "ace-window" "ace-window.el" (22795 36599 630957
-;;;;;;  312000))
+;;;### (autoloads nil "ace-window" "ace-window.el" (22839 4078 461833
+;;;;;;  89000))
 ;;; Generated autoloads from ace-window.el
 
 (autoload 'ace-select-window "ace-window" "\
@@ -22,8 +22,8 @@ Ace swap window.
 
 \(fn)" t nil)
 
-(autoload 'ace-maximize-window "ace-window" "\
-Ace maximize window.
+(autoload 'ace-delete-other-windows "ace-window" "\
+Ace delete other windows.
 
 \(fn)" t nil)

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "ace-window" "20170421.428" "Quickly switch windows." '((avy "0.2.0")) :commit "0a59342b7aafa9f89b477b0cc28f41a1abb8096c" :url "https://github.com/abo-abo/ace-window" :keywords '("window" "location"))

@@ -5,6 +5,7 @@
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; Maintainer: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/ace-window
+;; Package-Version: 20170421.428
 ;; Version: 0.9.0
 ;; Package-Requires: ((avy "0.2.0"))
 ;; Keywords: window, location
@@ -70,11 +71,13 @@
   :prefix "aw-")
 
 (defcustom aw-keys '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)
-  "Keys for selecting window.")
+  "Keys for selecting window."
+  :type '(repeat character))
 
 (defcustom aw-scope 'global
   "The scope used by `ace-window'."
   :type '(choice
+          (const :tag "visible frames" visible)
           (const :tag "global" global)
           (const :tag "frame" frame)))
 
@@ -107,6 +110,11 @@ This will make `ace-window' act different from `other-window' for
   one or two windows."
   :type 'boolean)
 
+(defcustom aw-reverse-frame-list nil
+  "When non-nil `ace-window' will order frames for selection in
+the reverse of `frame-list'"
+  :type 'boolean)
+
 (defface aw-leading-char-face
     '((((class color)) (:foreground "red"))
       (((background dark)) (:foreground "gray100"))
@@ -142,6 +150,8 @@ This will make `ace-window' act different from `other-window' for
             (string= "initial_terminal" (terminal-name f))
             (aw-ignored-p w))))
     (cl-case aw-scope
+      (visible
+       (cl-mapcan #'window-list (visible-frame-list)))
       (global
        (cl-mapcan #'window-list (frame-list)))
       (frame
@@ -200,9 +210,12 @@ LEAF is (PT . WND)."
               (concat
                (cl-case aw-leading-char-style
                  (char
-                  (apply #'string (last path)))
+                  (string (avy--key-to-char (car (last path)))))
                  (path
-                  (apply #'string (reverse path)))
+                  (mapconcat
+                   (lambda (x) (string (avy--key-to-char x)))
+                   (reverse path)
+                   ""))
                  (t
                   (error "Bad `aw-leading-char-style': %S"
                          aw-leading-char-style)))
@@ -250,10 +263,12 @@ LEAF is (PT . WND)."
 (defvar aw-dispatch-alist
   '((?x aw-delete-window " Ace - Delete Window")
     (?m aw-swap-window " Ace - Swap Window")
+    (?M aw-move-window " Ace - Move Window")
     (?n aw-flip-window)
+    (?c aw-split-window-fair " Ace - Split Fair Window")
     (?v aw-split-window-vert " Ace - Split Vert Window")
     (?b aw-split-window-horz " Ace - Split Horz Window")
-    (?i delete-other-windows " Ace - Maximize Window")
+    (?i delete-other-windows " Ace - Delete Other Windows")
     (?o delete-other-windows))
   "List of actions for `aw-dispatch-default'.")
 
@@ -274,6 +289,7 @@ Amend MODE-LINE to the mode line for the duration of the selection."
   (setq aw-action action)
   (let ((start-window (selected-window))
         (next-window-scope (cl-case aw-scope
+                             ('visible 'visible)
                              ('global 'visible)
                              ('frame 'frame)))
         (wnd-list (aw-window-list))
@@ -293,7 +309,8 @@ Amend MODE-LINE to the mode line for the duration of the selection."
                       (not aw-dispatch-always)
                       (not aw-ignore-current))
                  (let ((wnd (next-window nil nil next-window-scope)))
-                   (while (and (aw-ignored-p wnd)
+                   (while (and (or (not (memq wnd wnd-list))
+                                   (aw-ignored-p wnd))
                                (not (equal wnd start-window)))
                      (setq wnd (next-window wnd nil next-window-scope)))
                    wnd))
@@ -308,6 +325,7 @@ Amend MODE-LINE to the mode line for the duration of the selection."
                    (remove-hook 'post-command-hook 'helm--maybe-update-keymap)
                    (unwind-protect
                         (let* ((avy-handler-function aw-dispatch-function)
+                               (avy-translate-char-function #'identity)
                                (res (avy-read (avy-tree candidate-list aw-keys)
                                               #'aw--lead-overlay
                                               #'avy--remove-leading-chars)))
@@ -343,12 +361,15 @@ Amend MODE-LINE to the mode line for the duration of the selection."
              #'aw-swap-window))
 
 ;;;###autoload
-(defun ace-maximize-window ()
-  "Ace maximize window."
+(defun ace-delete-other-windows ()
+  "Ace delete other windows."
   (interactive)
-  (aw-select " Ace - Maximize Window"
+  (aw-select " Ace - Delete Other Windows"
              #'delete-other-windows))
 
+(define-obsolete-function-alias
+  'ace-maximize-window 'ace-delete-other-windows "0.10.0")
+
 ;;;###autoload
 (defun ace-window (arg)
   "Select a window.
@@ -384,7 +405,7 @@ Windows are numbered top down, left to right."
         (e2 (window-edges wnd2)))
     (cond ((string< (frame-parameter f1 'window-id)
                     (frame-parameter f2 'window-id))
-           t)
+           aw-reverse-frame-list)
           ((< (car e1) (car e2))
            t)
           ((> (car e1) (car e2))
@@ -421,13 +442,12 @@ Windows are numbered top down, left to right."
 (defun aw-switch-to-window (window)
   "Switch to the window WINDOW."
   (let ((frame (window-frame window)))
+    (aw--push-window (selected-window))
     (when (and (frame-live-p frame)
                (not (eq frame (selected-frame))))
       (select-frame-set-input-focus frame))
     (if (window-live-p window)
-        (progn
-          (aw--push-window (selected-window))
-          (select-window window))
+        (select-window window)
       (error "Got a dead window %S" window))))
 
 (defun aw-flip-window ()
@@ -472,6 +492,14 @@ Windows are numbered top down, left to right."
             (swap-windows window this-window)
           (swap-windows this-window window))))))
 
+(defun aw-move-window (window)
+  "Move the current buffer to WINDOW.
+Switch the current window to the previous buffer."
+  (let ((buffer (current-buffer)))
+    (switch-to-buffer (other-buffer))
+    (aw-switch-to-window window)
+    (switch-to-buffer buffer)))
+
 (defun aw-split-window-vert (window)
   "Split WINDOW vertically."
   (select-window window)
@@ -482,6 +510,21 @@ Windows are numbered top down, left to right."
   (select-window window)
   (split-window-horizontally))
 
+(defcustom aw-fair-aspect-ratio 2
+  "The aspect ratio to aim for when splitting windows.
+Sizes are based on the number of characters, not pixels.
+Increase to prefer wider windows, or decrease for taller windows."
+  :type 'number)
+
+(defun aw-split-window-fair (window)
+  "Split WINDOW vertically or horizontally, based on its current dimensions.
+Modify `aw-fair-aspect-ratio' to tweak behavior."
+  (let ((w (window-body-width window))
+        (h (window-body-height window)))
+    (if (< (* h aw-fair-aspect-ratio) w)
+        (aw-split-window-horz window)
+      (aw-split-window-vert window))))
+
 (defun aw-offset (window)
   "Return point in WINDOW that's closest to top left corner.
 The point is writable, i.e. it's not part of space after newline."
@@ -535,45 +578,6 @@ The point is writable, i.e. it's not part of space after newline."
        (apply #'string (reverse path))
        'face 'aw-mode-line-face)))))
 
-;;;; ChangeLog:
-
-;; 2015-06-04  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Merge commit '97a2f9340b19c1b8c31455b3219fb88f39d38f1b' from ace-window
-;; 
-;; 2015-05-09  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Merge commit 'b114cf8a93224c85c51e95db52bf359131130476' from ace-window
-;; 
-;; 2015-05-08  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Merge commit 'cc38c044a13e6df822431d6c706cf4b9255900bd' from ace-window
-;; 
-;; 	Move the dependencies into a new ELPA package avy.
-;; 
-;; 2015-04-16  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Merge commit 'd592e36f33ac7e1fece462c5b7157f330c732630' from ace-window
-;; 
-;; 2015-03-22  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Merge commit 'a22acac260a93530f98b1fe84b4b5edc2a6bdc0e' from ace-window
-;; 
-;; 2015-03-21  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Merge commit '243c680396edc99db85cc3152a7bbf020aa7a233' from ace-window
-;; 
-;; 2015-03-21  Oleh Krehel	 <ohwoeowho@gmail.com>
-;; 
-;; 	Add 'packages/ace-window/' from commit
-;; 	'2580bf9bd7f66ed4e923a125ee8efcc4b6a043e0'
-;; 
-;; 	git-subtree-dir: packages/ace-window git-subtree-mainline:
-;; 	6afd0453ab48e472d725a32f99a238cb06cd5265 git-subtree-split:
-;; 	2580bf9bd7f66ed4e923a125ee8efcc4b6a043e0
-;; 
-
-
 (provide 'ace-window)
 
 ;;; ace-window.el ends here

Binary file

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "async" "async.el" (22792 62882 671116 407000))
+;;;### (autoloads nil "async" "async.el" (22839 4077 734842 308000))
 ;;; Generated autoloads from async.el
 
 (autoload 'async-start-process "async" "\
@@ -68,8 +68,8 @@ returns nil.  It can still be useful, however, as an argument to
 
 ;;;***
 
-;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22792
-;;;;;;  62882 670116 426000))
+;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22839
+;;;;;;  4077 733842 321000))
 ;;; Generated autoloads from async-bytecomp.el
 
 (autoload 'async-byte-recompile-directory "async-bytecomp" "\
@@ -97,8 +97,8 @@ Async compilation of packages can be controlled by
 
 ;;;***
 
-;;;### (autoloads nil "dired-async" "dired-async.el" (22792 62882
-;;;;;;  666116 503000))
+;;;### (autoloads nil "dired-async" "dired-async.el" (22839 4077
+;;;;;;  719842 498000))
 ;;; Generated autoloads from dired-async.el
 
 (defvar dired-async-mode nil "\
@@ -118,8 +118,8 @@ Do dired actions asynchronously.
 
 ;;;***
 
-;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22792
-;;;;;;  62882 672116 387000))
+;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22839
+;;;;;;  4077 735842 296000))
 
 ;;;***

File renamed without changes

Binary file

@@ -1,4 +1,4 @@
-(define-package "async" "20170429.2207" "Asynchronous processing in Emacs" 'nil :keywords
+(define-package "async" "20170502.2343" "Asynchronous processing in Emacs" 'nil :keywords
   '("async")
   :url "https://github.com/jwiegley/emacs-async")
 ;; Local Variables:

@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <jwiegley@gmail.com>
 ;; Created: 18 Jun 2012
-;; Version: 1.9
+;; Version: 1.9.2
 
 ;; Keywords: async
 ;; X-URL: https://github.com/jwiegley/emacs-async

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "company" "company.el" (22792 62880 32167 457000))
+;;;### (autoloads nil "company" "company.el" (22839 4076 129862 672000))
 ;;; Generated autoloads from company.el
 
 (autoload 'company-mode "company" "\
@@ -73,8 +73,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22792
-;;;;;;  62880 45167 206000))
+;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22839
+;;;;;;  4076 143862 494000))
 ;;; Generated autoloads from company-abbrev.el
 
 (autoload 'company-abbrev "company-abbrev" "\
@@ -84,8 +84,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22792 62880
-;;;;;;  42167 264000))
+;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22839 4076
+;;;;;;  139862 544000))
 ;;; Generated autoloads from company-bbdb.el
 
 (autoload 'company-bbdb "company-bbdb" "\
@@ -95,8 +95,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-css" "company-css.el" (22792 62880
-;;;;;;  31167 476000))
+;;;### (autoloads nil "company-css" "company-css.el" (22839 4076
+;;;;;;  128862 684000))
 ;;; Generated autoloads from company-css.el
 
 (autoload 'company-css "company-css" "\
@@ -106,8 +106,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22792
-;;;;;;  62880 37167 360000))
+;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22839
+;;;;;;  4076 135862 595000))
 ;;; Generated autoloads from company-dabbrev.el
 
 (autoload 'company-dabbrev "company-dabbrev" "\
@@ -118,7 +118,7 @@ dabbrev-like `company-mode' completion backend.
 ;;;***
 
 ;;;### (autoloads nil "company-dabbrev-code" "company-dabbrev-code.el"
-;;;;;;  (22792 62880 35167 399000))
+;;;;;;  (22839 4076 133862 621000))
 ;;; Generated autoloads from company-dabbrev-code.el
 
 (autoload 'company-dabbrev-code "company-dabbrev-code" "\
@@ -130,8 +130,8 @@ comments or strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-elisp" "company-elisp.el" (22792 62880
-;;;;;;  47167 167000))
+;;;### (autoloads nil "company-elisp" "company-elisp.el" (22839 4076
+;;;;;;  145862 468000))
 ;;; Generated autoloads from company-elisp.el
 
 (autoload 'company-elisp "company-elisp" "\
@@ -141,8 +141,8 @@ comments or strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-etags" "company-etags.el" (22792 62880
-;;;;;;  33167 438000))
+;;;### (autoloads nil "company-etags" "company-etags.el" (22839 4076
+;;;;;;  131862 646000))
 ;;; Generated autoloads from company-etags.el
 
 (autoload 'company-etags "company-etags" "\
@@ -152,8 +152,8 @@ comments or strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-files" "company-files.el" (22792 62880
-;;;;;;  38167 341000))
+;;;### (autoloads nil "company-files" "company-files.el" (22839 4076
+;;;;;;  136862 582000))
 ;;; Generated autoloads from company-files.el
 
 (autoload 'company-files "company-files" "\
@@ -165,8 +165,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-gtags" "company-gtags.el" (22792 62880
-;;;;;;  26167 573000))
+;;;### (autoloads nil "company-gtags" "company-gtags.el" (22839 4076
+;;;;;;  124862 735000))
 ;;; Generated autoloads from company-gtags.el
 
 (autoload 'company-gtags "company-gtags" "\
@@ -176,8 +176,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-ispell" "company-ispell.el" (22792
-;;;;;;  62880 46167 186000))
+;;;### (autoloads nil "company-ispell" "company-ispell.el" (22839
+;;;;;;  4076 144862 481000))
 ;;; Generated autoloads from company-ispell.el
 
 (autoload 'company-ispell "company-ispell" "\
@@ -187,8 +187,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-keywords" "company-keywords.el" (22792
-;;;;;;  62880 40167 302000))
+;;;### (autoloads nil "company-keywords" "company-keywords.el" (22839
+;;;;;;  4076 137862 570000))
 ;;; Generated autoloads from company-keywords.el
 
 (autoload 'company-keywords "company-keywords" "\
@@ -198,8 +198,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-nxml" "company-nxml.el" (22792 62880
-;;;;;;  43167 244000))
+;;;### (autoloads nil "company-nxml" "company-nxml.el" (22839 4076
+;;;;;;  140862 532000))
 ;;; Generated autoloads from company-nxml.el
 
 (autoload 'company-nxml "company-nxml" "\
@@ -209,8 +209,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22792
-;;;;;;  62880 29167 515000))
+;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22839
+;;;;;;  4076 127862 697000))
 ;;; Generated autoloads from company-oddmuse.el
 
 (autoload 'company-oddmuse "company-oddmuse" "\
@@ -220,8 +220,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-semantic" "company-semantic.el" (22792
-;;;;;;  62880 27167 554000))
+;;;### (autoloads nil "company-semantic" "company-semantic.el" (22839
+;;;;;;  4076 125862 722000))
 ;;; Generated autoloads from company-semantic.el
 
 (autoload 'company-semantic "company-semantic" "\
@@ -231,8 +231,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-tempo" "company-tempo.el" (22792 62880
-;;;;;;  36167 380000))
+;;;### (autoloads nil "company-tempo" "company-tempo.el" (22839 4076
+;;;;;;  134862 608000))
 ;;; Generated autoloads from company-tempo.el
 
 (autoload 'company-tempo "company-tempo" "\
@@ -242,8 +242,8 @@ File paths with spaces are only supported inside strings.
 
 ;;;***
 
-;;;### (autoloads nil "company-xcode" "company-xcode.el" (22792 62880
-;;;;;;  44167 225000))
+;;;### (autoloads nil "company-xcode" "company-xcode.el" (22839 4076
+;;;;;;  142862 506000))
 ;;; Generated autoloads from company-xcode.el
 
 (autoload 'company-xcode "company-xcode" "\
@@ -254,7 +254,7 @@ File paths with spaces are only supported inside strings.
 ;;;***
 
 ;;;### (autoloads nil "company-yasnippet" "company-yasnippet.el"
-;;;;;;  (22792 62880 44167 225000))
+;;;;;;  (22839 4076 141862 519000))
 ;;; Generated autoloads from company-yasnippet.el
 
 (autoload 'company-yasnippet "company-yasnippet" "\
@@ -286,7 +286,7 @@ shadow backends that come after it.  Recommended usages:
 
 ;;;### (autoloads nil nil ("company-capf.el" "company-clang.el" "company-cmake.el"
 ;;;;;;  "company-eclim.el" "company-pkg.el" "company-template.el")
-;;;;;;  (22792 62880 41167 283000))
+;;;;;;  (22839 4076 138862 557000))
 
 ;;;***

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

@@ -1,4 +1,4 @@
-(define-package "company" "20170420.1837" "Modular text completion framework"
+(define-package "company" "20170517.1436" "Modular text completion framework"
   '((emacs "24.3"))
   :url "http://company-mode.github.io/" :keywords
   '("abbrev" "convenience" "matching"))

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

@@ -1509,8 +1509,9 @@ prefix match (same case) will be prioritized."
       (setq company-prefix new-prefix)
       (company-update-candidates c)
       c)
-     ((company-auto-complete-p (buffer-substring-no-properties
-                                (point) company-point))
+     ((and (> (point) company-point)
+           (company-auto-complete-p (buffer-substring-no-properties
+                                     (point) company-point)))
       ;; auto-complete
       (save-excursion
         (goto-char company-point)

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "counsel" "20170501.1903" "Various completion functions using Ivy" '((emacs "24.3") (swiper "0.9.0")) :url "https://github.com/abo-abo/swiper" :keywords '("completion" "matching"))

@@ -3,8 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "counsel" "counsel.el" (22792 62876 647232
-;;;;;;  925000))
+;;;### (autoloads nil "counsel" "counsel.el" (22839 4072 848904 341000))
 ;;; Generated autoloads from counsel.el
 
 (autoload 'counsel-el "counsel" "\
@@ -113,6 +112,11 @@ Search through all available git stashes.
 
 \(fn)" t nil)
 
+(autoload 'counsel-git-change-worktree "counsel" "\
+Find the file corresponding to the current buffer on a different worktree.
+
+\(fn)" t nil)
+
 (autoload 'counsel-git-log "counsel" "\
 Call the \"git log --grep\" shell command.
 
@@ -206,6 +210,16 @@ Set tags for the current agenda item.
 
 \(fn)" t nil)
 
+(autoload 'counsel-org-goto "counsel" "\
+Go to a different location in the current file.
+
+\(fn)" t nil)
+
+(autoload 'counsel-org-goto-all "counsel" "\
+Go to a different location in any org file.
+
+\(fn)" t nil)
+
 (autoload 'counsel-tmm "counsel" "\
 Text-mode emulation of looking and choosing from a menubar.
 
@@ -291,6 +305,13 @@ Inline C/C++ completion using Irony.
 
 \(fn)" t nil)
 
+(autoload 'counsel-apropos "counsel" "\
+Show all matching symbols.
+See `apropos' for further information about what is considered
+a symbol and how to search for them.
+
+\(fn)" t nil)
+
 (defvar counsel-mode nil "\
 Non-nil if Counsel mode is enabled.
 See the `counsel-mode' command

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "counsel" "20170605.255" "Various completion functions using Ivy" '((emacs "24.3") (swiper "0.9.0")) :commit "2d291911ef5d3cf29fd5e44ecc50b6270c1df18a" :url "https://github.com/abo-abo/swiper" :keywords '("completion" "matching"))

@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170501.1903
+;; Package-Version: 20170605.255
 ;; Version: 0.9.1
 ;; Package-Requires: ((emacs "24.3") (swiper "0.9.0"))
 ;; Keywords: completion, matching
@@ -367,11 +367,12 @@ Update the minibuffer with the amount of lines collected every
     (setq ivy-completion-beg (point))
     (setq ivy-completion-end (point))
     (ivy-read "Unicode name: "
-              (mapcar (lambda (x)
-                        (propertize
-                         (format "%06X % -60s%c" (cdr x) (car x) (cdr x))
-                         'result (cdr x)))
-                      (ucs-names))
+              (nreverse
+               (mapcar (lambda (x)
+                         (propertize
+                          (format "%06X % -60s%c" (cdr x) (car x) (cdr x))
+                          'result (cdr x)))
+                       (ucs-names)))
               :action (lambda (char)
                         (with-ivy-window
                           (delete-region ivy-completion-beg ivy-completion-end)
@@ -444,12 +445,12 @@ Update the minibuffer with the amount of lines collected every
        (when (or (get vv 'variable-documentation)
                  (and (boundp vv) (not (keywordp vv))))
          (push (symbol-name vv) cands))))
-    cands))
+    (delete "" cands)))
 
 (defun counsel-describe-variable-transformer (var)
   "Propertize VAR if it's a custom variable."
   (if (custom-variable-p (intern var))
-      (propertize var 'face 'ivy-highlight-face)
+      (ivy-append-face var 'ivy-highlight-face)
     var))
 
 (ivy-set-display-transformer
@@ -485,7 +486,7 @@ Variables declared using `defcustom' are highlighted according to
 (defun counsel-describe-function-transformer (function-name)
   "Propertize FUNCTION-NAME if it's an interactive function."
   (if (commandp (intern function-name))
-      (propertize function-name 'face 'ivy-highlight-face)
+      (ivy-append-face function-name 'ivy-highlight-face)
     function-name))
 
 (ivy-set-display-transformer
@@ -1326,6 +1327,40 @@ done") "\n" t)))
   :type 'integer
   :group 'ivy)
 
+;;** `counsel-git-change-worktree'
+(autoload 'string-trim-right "subr-x")
+(defun counsel-git-change-worktree-action (git-root-dir tree)
+  "Find the corresponding file in the worktree located at TREE.
+
+The current buffer is assumed to be in a subdirectory of GIT-ROOT-DIR."
+  (let* ((new-root-dir (counsel-git-worktree-parse-root tree))
+         (tree-filename (file-relative-name (buffer-file-name) git-root-dir))
+         (file-name (expand-file-name tree-filename new-root-dir)))
+    (find-file file-name)))
+
+(defun counsel-git-worktree-list ()
+  "List worktrees in the git repository containing the current buffer."
+  (let ((cmd-output (shell-command-to-string "git worktree list")))
+    (and (string-match "fatal: Not a git repository" cmd-output)
+         (error "Not in a git repository!"))
+    (delete "" (split-string (string-trim-right cmd-output) "\n"))))
+
+(defun counsel-git-worktree-parse-root (tree)
+  (substring tree 0 (string-match " " tree)))
+
+;;;###autoload
+(defun counsel-git-change-worktree ()
+  "Find the file corresponding to the current buffer on a different worktree."
+  (interactive)
+  (let ((git-root-dir (string-trim-right (shell-command-to-string "git rev-parse --show-toplevel"))))
+    (ivy-read "Select worktree: "
+              (or (cl-delete git-root-dir (counsel-git-worktree-list)
+                             :key #'counsel-git-worktree-parse-root :test #'string=)
+                  (error "No other worktrees!"))
+              :action (lambda (tree) (counsel-git-change-worktree-action git-root-dir tree))
+              :require-match t
+              :caller 'counsel-git-change-worktree)))
+
 ;;;###autoload
 (defun counsel-git-log ()
   "Call the \"git log --grep\" shell command."
@@ -1808,7 +1843,7 @@ If non-nil, EXTRA-AG-ARGS string is appended to BASE-CMD."
                                (match-string 1 (buffer-name)))))))
          (cands (split-string
                  (shell-command-to-string
-                  (format counsel-ag-base-command (shell-quote-argument regex)))
+                  (format counsel-ag-base-command (concat "-- " (shell-quote-argument regex))))
                  "\n"
                  t)))
     ;; Need precise number of header lines for `wgrep' to work.
@@ -1837,7 +1872,7 @@ This uses `counsel-ag' with `counsel-pt-base-command' replacing
     (counsel-ag initial-input)))
 
 ;;** `counsel-rg'
-(defcustom counsel-rg-base-command "rg -i --no-heading --line-number %s ."
+(defcustom counsel-rg-base-command "rg -i --no-heading --line-number --max-columns 150 %s ."
   "Used to in place of `counsel-rg-base-command' to search with
 ripgrep using `counsel-rg'."
   :type 'string
@@ -1930,21 +1965,27 @@ the command."
                    (setq file-name (match-string-no-properties 1 x))
                    (setq line-number (match-string-no-properties 2 x)))
                   (t nil))
-        (find-file file-name)
-        (setq line-number (string-to-number line-number))
-        (if (null counsel-grep-last-line)
-            (progn
-              (goto-char (point-min))
-              (forward-line (1- (setq counsel-grep-last-line line-number))))
-          (forward-line (- line-number counsel-grep-last-line))
-          (setq counsel-grep-last-line line-number))
-        (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)
-        (run-hooks 'counsel-grep-post-action-hook)
-        (if (eq ivy-exit 'done)
-            (swiper--ensure-visible)
-          (isearch-range-invisible (line-beginning-position)
-                                   (line-end-position))
-          (swiper--add-overlays (ivy--regex ivy-text)))))))
+        ;; If the file buffer is already open, just get it. Prevent doing
+        ;; `find-file', as that file could have already been opened using
+        ;; `find-file-literally'.
+        (let ((buf (get-file-buffer file-name)))
+          (unless buf
+            (setq buf (find-file file-name)))
+          (with-current-buffer buf
+            (setq line-number (string-to-number line-number))
+            (if (null counsel-grep-last-line)
+                (progn
+                  (goto-char (point-min))
+                  (forward-line (1- (setq counsel-grep-last-line line-number))))
+              (forward-line (- line-number counsel-grep-last-line))
+              (setq counsel-grep-last-line line-number))
+            (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)
+            (run-hooks 'counsel-grep-post-action-hook)
+            (if (eq ivy-exit 'done)
+                (swiper--ensure-visible)
+              (isearch-range-invisible (line-beginning-position)
+                                       (line-end-position))
+              (swiper--add-overlays (ivy--regex ivy-text)))))))))
 
 (defun counsel-grep-occur ()
   "Generate a custom occur buffer for `counsel-grep'."
@@ -2019,21 +2060,23 @@ the command."
 (defun counsel-grep-or-swiper ()
   "Call `swiper' for small buffers and `counsel-grep' for large ones."
   (interactive)
-  (if (and (buffer-file-name)
-           (not (buffer-narrowed-p))
-           (not (ignore-errors
-                  (file-remote-p (buffer-file-name))))
-           (not (string-match
-                 counsel-compressed-file-regex
-                 (buffer-file-name)))
-           (> (buffer-size)
-              (if (eq major-mode 'org-mode)
-                  (/ counsel-grep-swiper-limit 4)
-                counsel-grep-swiper-limit)))
-      (progn
-        (save-buffer)
-        (counsel-grep))
-    (swiper--ivy (swiper--candidates))))
+  (let ((fname (buffer-file-name)))
+    (if (and fname
+             (not (buffer-narrowed-p))
+             (not (ignore-errors
+                    (file-remote-p fname)))
+             (not (string-match
+                   counsel-compressed-file-regex
+                   fname))
+             (> (buffer-size)
+                (if (eq major-mode 'org-mode)
+                    (/ counsel-grep-swiper-limit 4)
+                  counsel-grep-swiper-limit)))
+        (progn
+          (when (file-writable-p fname)
+            (save-buffer))
+          (counsel-grep))
+      (swiper--ivy (swiper--candidates)))))
 
 ;;** `counsel-recoll'
 (defun counsel-recoll-function (string)
@@ -2228,6 +2271,180 @@ INITIAL-INPUT can be given as the initial minibuffer input."
            (org-agenda-set-tags nil nil))
       (fset 'org-set-tags store))))
 
+(defcustom counsel-org-goto-display-style 'path
+  "The style for displaying headlines in `counsel-org-goto' functions.
+
+If headline, the title and the leading stars are displayed.
+
+If path, the path hierarchy is displayed.  For each entry the title is shown.
+`counsel-org-goto-separator' is used as separator between entries.
+
+If title or any other value, only the title of the headline is displayed.
+
+Use `counsel-org-goto-display-tags' and `counsel-org-goto-display-todo' to
+display tags and todo keywords respectively."
+  :type '(choice
+          (const :tag "Title only" title)
+          (const :tag "Headline" headline)
+          (const :tag "Path" path))
+  :group 'ivy)
+
+(defcustom counsel-org-goto-separator "/"
+  "Character(s) to separate path entries in `counsel-org-goto' functions.
+This variable has no effect unless `counsel-org-goto-display-style' is
+set to path."
+  :type 'string
+  :group 'ivy)
+
+(defcustom counsel-org-goto-display-tags nil
+  "If non-nil, display tags in `counsel-org-goto' functions."
+  :type 'boolean
+  :group 'ivy)
+
+(defcustom counsel-org-goto-display-todo nil
+  "If non-nil, display todo keywords in `counsel-org-goto' functions."
+  :type 'boolean
+  :group 'ivy)
+
+(defcustom counsel-org-goto-face-style nil
+  "The face used for displaying headlines in `counsel-org-goto' functions.
+
+If org, the default faces from `org-mode' are applied, i.e. org-level-1
+through org-level-8.  Note that no cycling is in effect, therefore headlines
+on levels 9 and higher will not be styled.
+
+If verbatim, the face used in the buffer is applied.  For simple headlines
+this is usually the same as org except that it depends on how much of the
+buffer has been completely loaded.  If your buffer exceeds a certain size,
+headlines are styled lazily depending on which parts of the tree are visible.
+Headlines which are not styled yet in the buffer will appear unstyled in the
+minibuffer as well.  If your headlines contain parts which are fontified
+differently than the headline itself (eg. todo keywords, tags, links) and you
+want these parts to be styled properly, verbatim is the way to go, otherwise
+you are probably better off using org instead.
+
+If custom, the faces defined in `counsel-org-goto-custom-faces' are applied.
+Note that no cycling is in effect, therefore if there is no face defined
+for a certain level, headlines on that level will not be styled.
+
+If nil or any other value, no face is applied to the headline.
+
+See `counsel-org-goto-display-tags' and `counsel-org-goto-display-todo' if
+you want to display tags and todo keywords in your headlines."
+  :type '(choice
+          (const :tag "Same as org-mode" org)
+          (const :tag "Verbatim" verbatim)
+          (const :tag "Custom" custom))
+  :group 'ivy)
+
+(defcustom counsel-org-goto-custom-faces nil
+  "Custom faces for displaying headlines in `counsel-org-goto' functions.
+
+The n-th entry is used for headlines on level n, starting with n = 1.  If
+a headline is an a level for which there is no entry in the list, it will
+not be styled.
+
+This variable has no effect unless `counsel-org-goto-face-style' is set
+to custom."
+  :type '(repeat face)
+  :group 'ivy)
+
+(declare-function org-get-heading "org")
+(declare-function org-goto-marker-or-bmk "org")
+(declare-function outline-next-heading "outline")
+
+;;;###autoload
+(defun counsel-org-goto ()
+  "Go to a different location in the current file."
+  (interactive)
+  (let ((entries (counsel-org-goto--get-headlines)))
+    (ivy-read "Goto: "
+              entries
+              :history 'counsel-org-goto-history
+              :action 'counsel-org-goto-action
+              :caller 'counsel-org-goto)))
+
+;;;###autoload
+(defun counsel-org-goto-all ()
+  "Go to a different location in any org file."
+  (interactive)
+  (let (entries)
+    (dolist (b (buffer-list))
+      (with-current-buffer b
+        (when (derived-mode-p 'org-mode)
+          (if entries
+              (nconc entries (counsel-org-goto--get-headlines))
+            (setq entries (counsel-org-goto--get-headlines))))))
+    (ivy-read "Goto: "
+              entries
+              :history 'counsel-org-goto-history
+              :action 'counsel-org-goto-action
+              :caller 'counsel-org-goto-all)))
+
+(defun counsel-org-goto-action (x)
+  "Go to headline in candidate X."
+  (org-goto-marker-or-bmk (cdr x)))
+
+(defun counsel-org-goto--get-headlines ()
+  "Get all headlines from the current org buffer."
+  (save-excursion
+    (let (entries
+          start-pos
+          stack
+          (stack-level 0))
+      (goto-char (point-min))
+      (setq start-pos (or (and (org-at-heading-p)
+                               (point))
+                          (outline-next-heading)))
+      (while start-pos
+        (let ((name (org-get-heading
+                     (not counsel-org-goto-display-tags)
+                     (not counsel-org-goto-display-todo)))
+              level)
+          (search-forward " ")
+          (setq level
+                (- (length (buffer-substring-no-properties start-pos (point)))
+                   1))
+          (cond ((eq counsel-org-goto-display-style 'path)
+                 ;; Update stack. The empty entry guards against incorrect
+                 ;; headline hierarchies e.g. a level 3 headline immediately
+                 ;; following a level 1 entry.
+                 (while (<= level stack-level)
+                   (pop stack)
+                   (cl-decf stack-level))
+                 (while (> level stack-level)
+                   (push "" stack)
+                   (cl-incf stack-level))
+                 (setf (car stack) (counsel-org-goto--add-face name level))
+                 (setq name (mapconcat
+                             #'identity
+                             (reverse stack)
+                             counsel-org-goto-separator)))
+                (t
+                 (when (eq counsel-org-goto-display-style 'headline)
+                   (setq name (concat (make-string level ?*) " " name)))
+                 (setq name (counsel-org-goto--add-face name level))))
+          (push (cons name (point-marker)) entries))
+        (setq start-pos (outline-next-heading)))
+      (nreverse entries))))
+
+(defun counsel-org-goto--add-face (name level)
+  "Add face to headline NAME on LEVEL.
+The face can be customized through `counsel-org-goto-face-style'."
+  (or (and (eq counsel-org-goto-face-style 'org)
+           (propertize
+            name
+            'face
+            (concat "org-level-" (number-to-string level))))
+      (and (eq counsel-org-goto-face-style 'verbatim)
+           name)
+      (and (eq counsel-org-goto-face-style 'custom)
+           (propertize
+            name
+            'face
+            (nth (1- level) counsel-org-goto-custom-faces)))
+      (propertize name 'face 'minibuffer-prompt)))
+
 ;;** `counsel-mark-ring'
 (defun counsel--pad (string length)
   "Pad string to length with spaces."
@@ -2242,15 +2459,17 @@ INITIAL-INPUT can be given as the initial minibuffer input."
            (let ((padding (length (format "%s: " (line-number-at-pos (eobp))))))
              (save-mark-and-excursion
               (goto-char (point-min))
-              (mapcar (lambda (mark)
-                        (let* ((position (marker-position mark))
-                               (line-number (line-number-at-pos position))
-                               (line-marker (counsel--pad (format "%s:" line-number) padding))
-                               (bol (point-at-bol line-number))
-                               (eol (point-at-eol line-number))
-                               (line (buffer-substring bol eol)))
-                          (cons (format "%s%s" line-marker line) position)))
-                      (cl-remove-duplicates mark-ring :test #'equal)))))))
+              (sort (mapcar (lambda (mark)
+                              (let* ((position (marker-position mark))
+                                     (line-number (line-number-at-pos position))
+                                     (line-marker (counsel--pad (format "%s:" line-number) padding))
+                                     (bol (point-at-bol line-number))
+                                     (eol (point-at-eol line-number))
+                                     (line (buffer-substring bol eol)))
+                                (cons (format "%s%s" line-marker line) position)))
+                            (cl-remove-duplicates mark-ring :test #'equal))
+                    (lambda (m1 m2)
+                      (< (cdr m1) (cdr m2)))))))))
     (ivy-read "Marks: " candidates
               :action (lambda (elem)
                         (goto-char (cdr elem))))))
@@ -2418,6 +2637,10 @@ Additional Actions:
     (insert (substring-no-properties s))
     (setq ivy-completion-end (point))))
 
+(defun counsel-yank-pop-action-remove (s)
+  "Remove S from the kill ring."
+  (setq kill-ring (delete s kill-ring)))
+
 ;;;###autoload
 (defun counsel-yank-pop ()
   "Ivy replacement for `yank-pop'."
@@ -2435,7 +2658,7 @@ Additional Actions:
          (mapcar #'ivy-cleanup-string
                  (cl-remove-if
                   (lambda (s)
-                    (string-match "\\`[\n[:blank:]]+\\'" s))
+                    (string-match "\\`[\n[:blank:]]*\\'" s))
                   (delete-dups kill-ring)))))
     (let ((ivy-format-function #'counsel--yank-pop-format-function)
           (ivy-height 5))
@@ -2443,6 +2666,10 @@ Additional Actions:
                 :action 'counsel-yank-pop-action
                 :caller 'counsel-yank-pop))))
 
+(ivy-set-actions
+ 'counsel-yank-pop
+ '(("d" counsel-yank-pop-action-remove "delete")))
+
 ;;** `counsel-imenu'
 (defvar imenu-auto-rescan)
 (defvar imenu-auto-rescan-maxout)
@@ -3408,31 +3635,62 @@ candidate."
   (interactive)
   (irony-completion-candidates-async 'counsel-irony-callback))
 
-(defun counsel-irony-callback (&optional _cands)
+(defun counsel-irony-callback (candidates)
   (interactive)
-  (let ((coll (irony-completion-at-point)))
-    (when coll
-      (setq ivy-completion-beg (nth 0 coll))
-      (setq ivy-completion-end (nth 1 coll))
-      (ivy-read "code: " (mapcar #'counsel-irony-annotate
-                                 (nth 2 coll))
-                :caller 'counsel-irony
-                :action 'ivy-completion-in-region-action))))
+  (let* ((symbol-bounds (irony-completion-symbol-bounds))
+         (beg (car symbol-bounds))
+         (end (cdr symbol-bounds))
+         (prefix (buffer-substring-no-properties beg end)))
+  (setq ivy-completion-beg beg
+        ivy-completion-end end)
+    (ivy-read "code: " (mapcar #'counsel-irony-annotate candidates)
+              :predicate (lambda (candidate)
+                           (string-prefix-p prefix (car candidate)))
+              :caller 'counsel-irony
+              :action 'ivy-completion-in-region-action)))
 
 (defun counsel-irony-annotate (x)
-  (cons
-   (condition-case nil
-       (concat
-        x " "
-        (irony-completion--capf-annotate x))
-     (error x))
-   x))
+  (cons (concat (car x) (irony-completion-annotation x))
+        (car x)))
 
 (add-to-list 'ivy-display-functions-alist '(counsel-irony . ivy-display-function-overlay))
 
 (declare-function irony-completion-candidates-async "ext:irony-completion")
-(declare-function irony-completion-at-point "ext:irony-completion")
-(declare-function irony-completion--capf-annotate "ext:irony-completion")
+(declare-function irony-completion-symbol-bounds "ext:irony-completion")
+(declare-function irony-completion-annotation "ext:irony-completion")
+
+;;** `counsel-apropos'
+;;;###autoload
+(defun counsel-apropos ()
+  "Show all matching symbols.
+See `apropos' for further information about what is considered
+a symbol and how to search for them."
+  (interactive)
+  (ivy-read "Search for symbol (word list or regexp): "
+            (counsel-symbol-list)
+            :history 'counsel-apropos-history
+            :action (lambda (pattern)
+                      (when (= (length pattern) 0)
+                        (user-error "Please specify a pattern"))
+                      ;; If the user selected a candidate form the list, we use
+                      ;; a pattern which matches only the selected symbol.
+                      (if (memq this-command '(ivy-immediate-done ivy-alt-done))
+                          ;; Regexp pattern are passed verbatim, other input is
+                          ;; split into words.
+                          (if (string-equal (regexp-quote pattern) pattern)
+                              (apropos (split-string pattern "[ \t]+" t))
+                            (apropos pattern))
+                        (apropos (concat "^" pattern "$"))))
+            :caller 'counsel-apropos))
+
+(defun counsel-symbol-list ()
+  "Return a list of all symbols."
+  (let (cands)
+    (mapatoms
+     (lambda (symbol)
+       (when (or (boundp symbol) (fboundp symbol))
+         (push (symbol-name symbol) cands))))
+    (delete "" cands)))
 
 ;;** `counsel-mode'
 (defvar counsel-mode-map

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "dash" "20170207.2056" "A modern list library for Emacs" 'nil :keywords '("lists"))

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil nil ("dash.el") (22712 4597 193698 875000))
+;;;### (autoloads nil nil ("dash.el") (22839 4070 918928 878000))
 
 ;;;***

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "dash" "20170523.219" "A modern list library for Emacs" 'nil :commit "524e6fe86ba240d4405d3de1c862921fb8085c8d" :keywords '("lists"))

@@ -4,7 +4,7 @@
 
 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Version: 2.13.0
-;; Package-Version: 20170207.2056
+;; Package-Version: 20170523.219
 ;; Keywords: lists
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -389,7 +389,7 @@ See also: `-map-when', `-replace-first'"
   `(-map-first (lambda (it) ,pred) (lambda (it) (ignore it) ,rep) ,list))
 
 (defun -map-last (pred rep list)
-  "Replace first item in LIST satisfying PRED with result of REP called on this item.
+  "Replace last item in LIST satisfying PRED with result of REP called on this item.
 
 See also: `-map-when', `-replace-last'"
   (nreverse (-map-first pred rep (reverse list))))

Binary file

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "dired+" "dired+.el" (22792 62874 423275 932000))
+;;;### (autoloads nil "dired+" "dired+.el" (22839 4068 719956 860000))
 ;;; Generated autoloads from dired+.el
 
 (defvar diff-switches "-c" "\

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "dired+" "20170409.1822" "Extensions to Dired." 'nil :url "https://www.emacswiki.org/emacs/download/dired%2b.el" :keywords '("unix" "mouse" "directories" "diredp" "dired"))
+(define-package "dired+" "20170530.1023" "Extensions to Dired." 'nil :url "https://www.emacswiki.org/emacs/download/dired%2b.el" :keywords '("unix" "mouse" "directories" "diredp" "dired"))

@@ -7,11 +7,11 @@
 ;; Copyright (C) 1999-2017, Drew Adams, all rights reserved.
 ;; Created: Fri Mar 19 15:58:58 1999
 ;; Version: 2017.04.09
-;; Package-Version: 20170409.1822
+;; Package-Version: 20170530.1023
 ;; Package-Requires: ()
-;; Last-Updated: Sun Apr  9 18:23:14 2017 (-0700)
+;; Last-Updated: Tue May 30 10:22:48 2017 (-0700)
 ;;           By: dradams
-;;     Update #: 10133
+;;     Update #: 10144
 ;; URL: https://www.emacswiki.org/emacs/download/dired%2b.el
 ;; Doc URL: http://www.emacswiki.org/DiredPlus
 ;; Keywords: unix, mouse, directories, diredp, dired
@@ -530,9 +530,10 @@
 ;;    `diredp-remove-if', `diredp-remove-if-not',
 ;;    `diredp-root-directory-p', `diredp-set-header-line-breadcrumbs'
 ;;    (Emacs 22+), `diredp-set-tag-value', `diredp-set-union',
-;;    `diredp-string-match-p', `diredp-tag',
-;;    `diredp-this-file-marked-p', `diredp-this-file-unmarked-p',
-;;    `diredp-this-subdir', `diredp-untag', `diredp-y-or-n-files-p'.
+;;    `diredp--set-up-font-locking', `diredp-string-match-p',
+;;    `diredp-tag', `diredp-this-file-marked-p',
+;;    `diredp-this-file-unmarked-p', `diredp-this-subdir',
+;;    `diredp-untag', `diredp-y-or-n-files-p'.
 ;;
 ;;  Variables defined here:
 ;;
@@ -659,6 +660,11 @@
 ;;
 ;;; Change Log:
 ;;
+;; 2017/05/30 dadams
+;;     Fixed typo: direp--set-up-font-locking -> diredp--set-up-font-locking.
+;; 2017/05/22 dadams
+;;     Added: direp--set-up-font-locking.
+;;     Use direp--set-up-font-locking instead of lambda in dired-mode-hook.
 ;; 2017/04/09 dadams
 ;;     Version 2017.04.09.
 ;;     Added: diredp-multiple-move-copy-link-menu, diredp-multiple-rename-menu, diredp-multiple-dired-menu,
@@ -3267,19 +3273,21 @@ In particular, inode number, number of hard links, and file size."
    ) "2nd level of Dired highlighting.  See `font-lock-maximum-decoration'.")
 
 
+(defun diredp--set-up-font-locking ()
+  "Add this to `dired-mode-hook' to provide for second-level fontifying."
+  (set (make-local-variable 'font-lock-defaults)
+       ;; Two levels.  Use 3-element list, since it is standard to have one more
+       ;; than the number of levels.  This is necessary for it to work with
+       ;; `font(-lock)-menus.el'.
+       '((dired-font-lock-keywords
+          dired-font-lock-keywords
+          diredp-font-lock-keywords-1)
+         t nil nil beginning-of-line))
+  ;; Refresh `font-lock-keywords' from `font-lock-defaults'
+  (when (fboundp 'font-lock-refresh-defaults) (font-lock-refresh-defaults)))
+
 ;;; Provide for the second level of fontifying.
-(add-hook 'dired-mode-hook
-          (lambda ()
-            (set (make-local-variable 'font-lock-defaults)
-                 ;; Two levels.  Use 3-element list, since it is standard to have one more
-                 ;; than the number of levels.  This is necessary for it to work with
-                 ;; `font(-lock)-menus.el'.
-                 '((dired-font-lock-keywords
-                    dired-font-lock-keywords
-                    diredp-font-lock-keywords-1)
-                   t nil nil beginning-of-line))
-            ;; Refresh `font-lock-keywords' from `font-lock-defaults'
-            (when (fboundp 'font-lock-refresh-defaults) (font-lock-refresh-defaults))))
+(add-hook 'dired-mode-hook 'diredp--set-up-font-locking)
 
 ;; Ensure that Dired buffers are refontified when you use `g' or otherwise read in the file list.
 (defun diredp-refontify-buffer ()

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" (22792 62867
-;;;;;;  30418 845000))
+;;;### (autoloads nil "editorconfig" "editorconfig.el" (22839 4059
+;;;;;;  627072 841000))
 ;;; 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"
-;;;;;;  (22792 62867 28418 883000))
+;;;;;;  (22839 4059 625072 867000))
 ;;; 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"
-;;;;;;  (22792 62867 27418 903000))
+;;;;;;  (22839 4059 624072 880000))
 ;;; 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"
-;;;;;;  (22792 62867 24418 961000))
+;;;;;;  (22839 4059 621072 918000))
 ;;; 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")
-;;;;;;  (22792 62867 31418 825000))
+;;;;;;  (22839 4059 628072 828000))
 
 ;;;***

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

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

@@ -123,6 +123,8 @@ show line numbers on the left:
     (emacs-lisp-mode lisp-indent-offset)
     (erlang-mode erlang-indent-level)
     (ess-mode ess-indent-offset)
+    (feature-mode feature-indent-offset
+                  feature-indent-level)
     (fsharp-mode fsharp-continuation-offset
                  fsharp-indent-level
                  fsharp-indent-offset)
@@ -374,7 +376,7 @@ TRIM-TRAILING-WS."
   "Set the max line length (`fill-column') to LENGTH."
   (when (and (editorconfig-string-integer-p length)
              (> (string-to-number length) 0))
-    (set-fill-column (string-to-number length))))
+    (setq fill-column (string-to-number length))))
 
 (defun editorconfig-call-editorconfig-exec ()
   "Call EditorConfig core and return output."

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" (22792 62864 78475
-;;;;;;  890000))
+;;;### (autoloads nil "flycheck" "flycheck.el" (22839 4058 26093
+;;;;;;  305000))
 ;;; 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") (22792 62864 77475 909000))
+;;;;;;  "flycheck-pkg.el") (22839 4058 25093 318000))
 
 ;;;***

File renamed without changes

Binary file

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

@@ -177,6 +177,7 @@ attention to case differences."
     elixir-dogma
     emacs-lisp
     emacs-lisp-checkdoc
+    erlang-rebar3
     erlang
     eruby-erubis
     fortran-gfortran
@@ -3005,15 +3006,18 @@ ERR is a Flycheck error.  MODE may be one of the following symbols:
      Return the line region.
 
 Otherwise signal an error."
-  (pcase mode
-    (`columns (or (flycheck-error-column-region err)
-                  (flycheck-error-line-region err)))
-    (`symbols (or (flycheck-error-thing-region 'symbol err)
+  ;; Ignoring fields speeds up calls to `line-end-position' in
+  ;; `flycheck-error-column-region' and `flycheck-error-line-region'.
+  (let ((inhibit-field-text-motion t))
+    (pcase mode
+      (`columns (or (flycheck-error-column-region err)
+                    (flycheck-error-line-region err)))
+      (`symbols (or (flycheck-error-thing-region 'symbol err)
+                    (flycheck-error-region-for-mode err 'columns)))
+      (`sexps (or (flycheck-error-thing-region 'sexp err)
                   (flycheck-error-region-for-mode err 'columns)))
-    (`sexps (or (flycheck-error-thing-region 'sexp err)
-                (flycheck-error-region-for-mode err 'columns)))
-    (`lines (flycheck-error-line-region err))
-    (_ (error "Invalid mode %S" mode))))
+      (`lines (flycheck-error-line-region err))
+      (_ (error "Invalid mode %S" mode)))))
 
 (defun flycheck-error-pos (err)
   "Get the buffer position of ERR.
@@ -3105,6 +3109,7 @@ Add ERRORS to `flycheck-current-errors' and process each error
 with `flycheck-process-error-functions'."
   (setq flycheck-current-errors (sort (append errors flycheck-current-errors)
                                       #'flycheck-error-<))
+  (overlay-recenter (point-max))
   (seq-do (lambda (err)
             (run-hook-with-args-until-success 'flycheck-process-error-functions
                                               err))
@@ -3709,6 +3714,7 @@ overlays."
 
 (defun flycheck-delete-all-overlays ()
   "Remove all flycheck overlays in the current buffer."
+  (overlay-recenter (point-max))
   (flycheck-delete-marked-overlays)
   (save-restriction
     (widen)
@@ -3722,6 +3728,7 @@ overlays."
 
 (defun flycheck-delete-marked-overlays ()
   "Delete all overlays marked for deletion."
+  (overlay-recenter (point-max))
   (seq-do #'delete-overlay flycheck-overlays-to-delete)
   (setq flycheck-overlays-to-delete nil))
 
@@ -6375,12 +6382,9 @@ warnings."
 (flycheck-define-checker c/c++-gcc
   "A C/C++ syntax checker using GCC.
 
-Requires GCC 4.8 or newer.  See URL `https://gcc.gnu.org/'."
+Requires GCC 4.4 or newer.  See URL `https://gcc.gnu.org/'."
   :command ("gcc"
             "-fshow-column"
-            "-fno-diagnostics-show-caret" ; Do not visually indicate the source location
-            "-fno-diagnostics-show-option" ; Do not show the corresponding
-                                        ; warning group
             "-iquote" (eval (flycheck-c/c++-quoted-include-directory))
             (option "-std=" flycheck-gcc-language-standard concat)
             (option-flag "-pedantic" flycheck-gcc-pedantic)
@@ -6411,7 +6415,8 @@ Requires GCC 4.8 or newer.  See URL `https://gcc.gnu.org/'."
    (info line-start (or "<stdin>" (file-name)) ":" line ":" column
          ": note: " (message) line-end)
    (warning line-start (or "<stdin>" (file-name)) ":" line ":" column
-            ": warning: " (message) line-end)
+            ": warning: " (message (one-or-more (not (any "\n["))))
+            (optional "[" (id (one-or-more not-newline)) "]") line-end)
    (error line-start (or "<stdin>" (file-name)) ":" line ":" column
           ": " (or "fatal error" "error") ": " (message) line-end))
   :error-filter
@@ -7167,6 +7172,62 @@ See URL `http://www.erlang.org/'."
   :modes erlang-mode
   :enabled (lambda () (string-suffix-p ".erl" (buffer-file-name))))
 
+(defun contains-rebar-config (dir-name)
+  "Return DIR-NAME if DIR-NAME/rebar.config exists, nil otherwise."
+  (when (file-exists-p (expand-file-name "rebar.config" dir-name))
+    dir-name))
+
+(defun locate-rebar3-project-root (file-name &optional prev-file-name acc)
+  "Find the top-most rebar project root for source FILE-NAME.
+
+A project root directory is any directory containing a
+rebar.config file.  Find the top-most directory to move out of any
+nested dependencies.
+
+FILE-NAME is a source file for which to find the project.
+
+PREV-FILE-NAME helps us prevent infinite looping
+
+ACC is an accumulator that keeps the list of results, the first
+non-nil of which will be our project root.
+
+Return the absolute path to the directory"
+  (if (string= file-name prev-file-name)
+      (car (remove nil acc))
+    (let ((current-dir (file-name-directory file-name)))
+      (locate-rebar3-project-root
+       (directory-file-name current-dir)
+       file-name
+       (cons (contains-rebar-config current-dir) acc)))))
+
+(defun flycheck-rebar3-project-root (&optional _checker)
+  "Return directory where rebar.config is located."
+  (locate-rebar3-project-root buffer-file-name))
+
+(flycheck-define-checker erlang-rebar3
+  "An Erlang syntax checker using the rebar3 build tool."
+  :command ("rebar3" "compile")
+  :error-parser
+  (lambda (output checker buffer)
+    ;; rebar3 outputs ANSI terminal colors, which don't match up with
+    ;; :error-patterns, so we strip those color codes from the output
+    ;; here before passing it along to the default behavior. The
+    ;; relevant disucssion can be found at
+    ;; https://github.com/flycheck/flycheck/pull/1144
+    (require 'ansi-color)
+    (flycheck-parse-with-patterns
+     (and (fboundp 'ansi-color-filter-apply) (ansi-color-filter-apply output))
+     checker buffer))
+  :error-patterns
+  ((warning line-start
+            (file-name) ":" line ": Warning:" (message) line-end)
+   (error line-start
+          (file-name) ":" line ": " (message) line-end))
+  :modes erlang-mode
+  :enabled flycheck-rebar3-project-root
+  :predicate flycheck-buffer-saved-p
+  :working-directory flycheck-rebar3-project-root)
+
 (flycheck-define-checker eruby-erubis
   "A eRuby syntax checker using the `erubis' command.
 
@@ -7661,7 +7722,7 @@ See URL `https://github.com/commercialhaskell/stack'."
             source)
   :error-patterns
   ((warning line-start (file-name) ":" line ":" column ":"
-            (or " " "\n    ") "Warning:"
+            (or " " "\n    ") (in "Ww") "arning:"
             (optional " " "[" (id (one-or-more not-newline)) "]")
             (optional "\n")
             (message
@@ -7711,7 +7772,7 @@ See URL `https://www.haskell.org/ghc/'."
             source)
   :error-patterns
   ((warning line-start (file-name) ":" line ":" column ":"
-            (or " " "\n    ") "Warning:"
+            (or " " "\n    ") (in "Ww") "arning:"
             (optional " " "[" (id (one-or-more not-newline)) "]")
             (optional "\n")
             (message
@@ -8444,7 +8505,6 @@ Requires Flake8 3.0 or newer. See URL
 `https://flake8.readthedocs.io/'."
   :command ("flake8"
             "--format=default"
-            "--stdin-display-name" source-original
             (config-file "--config" flycheck-flake8rc)
             (option "--max-complexity" flycheck-flake8-maximum-complexity nil
                     flycheck-option-int)
@@ -8454,11 +8514,10 @@ Requires Flake8 3.0 or newer. See URL
   :standard-input t
   :error-filter (lambda (errors)
                   (let ((errors (flycheck-sanitize-errors errors)))
-                    (seq-do #'flycheck-flake8-fix-error-level errors)
-                    errors))
+                    (seq-map #'flycheck-flake8-fix-error-level errors)))
   :error-patterns
   ((warning line-start
-            (file-name) ":" line ":" (optional column ":") " "
+            "stdin:" line ":" (optional column ":") " "
             (id (one-or-more (any alpha)) (one-or-more digit)) " "
             (message (one-or-more not-newline))
             line-end))
@@ -8739,11 +8798,16 @@ See URL `https://github.com/mivok/markdownlint'."
   "Nix checker using nix-instantiate.
 
 See URL `https://nixos.org/nix/manual/#sec-nix-instantiate'."
-  :command ("nix-instantiate" "--parse" source-inplace)
+  :command ("nix-instantiate" "--parse" "-")
+  :standard-input t
   :error-patterns
   ((error line-start
           "error: " (message) " at " (file-name) ":" line ":" column
           line-end))
+  :error-filter
+  (lambda (errors)
+    (flycheck-sanitize-errors
+     (flycheck-remove-error-file-names "(string)" errors)))
   :modes nix-mode)
 
 (defun flycheck-locate-sphinx-source-directory ()
@@ -8921,7 +8985,7 @@ See URL `http://jruby.org/'."
   :standard-input t
   :error-patterns
   ((error line-start "SyntaxError in -:" line ": " (message) line-end)
-   (warning line-start "-:" line " warning: " (message) line-end)
+   (warning line-start "-:" line ":" " warning: " (message) line-end)
    (error line-start  "-:" line ": " (message) line-end))
   :modes (enh-ruby-mode ruby-mode)
   :next-checkers ((warning . ruby-rubylint)))
@@ -9474,6 +9538,19 @@ By default, no warnings are excluded."
   :safe #'flycheck-string-list-p
   :package-version '(flycheck . "0.21"))
 
+(flycheck-def-option-var flycheck-shellcheck-follow-sources t sh-shellcheck
+  "Whether to follow external sourced files in scripts.
+
+Shellcheck will follow and parse sourced files so long as a
+pre-runtime resolvable path to the file is present.  This can
+either be part of the source command itself:
+   source /full/path/to/file.txt
+or added as a shellcheck directive before the source command:
+   # shellcheck source=/full/path/to/file.txt."
+  :type 'boolean
+  :safe #'booleanp
+  :package-version '(flycheck . "31"))
+
 (flycheck-define-checker sh-shellcheck
   "A shell script syntax and style checker using Shellcheck.
 
@@ -9481,6 +9558,7 @@ See URL `https://github.com/koalaman/shellcheck/'."
   :command ("shellcheck"
             "--format" "checkstyle"
             "--shell" (eval (symbol-name sh-shell))
+            (option-flag "--external-sources" flycheck-shellcheck-follow-sources)
             (option "--exclude" flycheck-shellcheck-excluded-warnings list
                     flycheck-option-comma-separated-list)
             "-")

Binary file

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

@@ -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" (22753 9099 475385
-;;;;;;  133000))
+;;;### (autoloads nil "git-commit" "git-commit.el" (22839 4054 318140
+;;;;;;  761000))
 ;;; Generated autoloads from git-commit.el
 
 (defvar global-git-commit-mode t "\
@@ -26,6 +26,13 @@ provide such a commit message.
 
 \(fn &optional ARG)" t nil)
 
+(defconst git-commit-filename-regexp "/\\(\\(\\(COMMIT\\|NOTES\\|PULLREQ\\|TAG\\)_EDIT\\|MERGE_\\|\\)MSG\\|BRANCH_DESCRIPTION\\)\\'")
+
+(autoload 'git-commit-setup "git-commit" "\
+
+
+\(fn)" nil nil)
+
 ;;;***
 
 ;; Local Variables:

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "git-commit" "20170510.910" "Edit Git commit messages" '((emacs "24.4") (dash "20170207.2056") (with-editor "20170111.609")) :commit "d783e7b2427ed0c2d25895bcecc7190b9e953b97" :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: 20170314.1414
+;; Package-Version: 20170510.910
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
@@ -192,7 +192,7 @@ called.  If any of them returns nil, then the commit is not
 performed and the buffer is not killed.  The user should then
 fix the issue and try again.
 
-The functions are called with one argument.  If it is non-nil
+The functions are called with one argument.  If it is non-nil,
 then that indicates that the user used a prefix argument to
 force finishing the session despite issues.  Functions should
 usually honor this wish and return non-nil."
@@ -237,6 +237,9 @@ already using it, then you probably shouldn't start doing so."
   :type '(choice (const :tag "use regular fill-column")
                  number))
 
+(make-obsolete-variable 'git-commit-fill-column 'fill-column
+                        "Magit 2.11.0" 'set)
+
 (defcustom git-commit-known-pseudo-headers
   '("Signed-off-by" "Acked-by" "Cc"
     "Suggested-by" "Reported-by" "Tested-by" "Reviewed-by")
@@ -367,6 +370,7 @@ already using it, then you probably shouldn't start doing so."
 
 ;;; Hooks
 
+;;;###autoload
 (defconst git-commit-filename-regexp "/\\(\
 \\(\\(COMMIT\\|NOTES\\|PULLREQ\\|TAG\\)_EDIT\\|MERGE_\\|\\)MSG\
 \\|BRANCH_DESCRIPTION\\)\\'")
@@ -388,6 +392,7 @@ already using it, then you probably shouldn't start doing so."
        (string-match-p git-commit-filename-regexp buffer-file-name)
        (git-commit-setup)))
 
+;;;###autoload
 (defun git-commit-setup ()
   ;; cygwin git will pass a cygwin path (/cygdrive/c/foo/.git/...),
   ;; try to handle this in window-nt Emacs.
@@ -474,6 +479,7 @@ to `git-commit-fill-column'."
   (when (and (numberp git-commit-fill-column)
              (not (local-variable-p 'fill-column)))
     (setq fill-column git-commit-fill-column))
+  (setq-local comment-auto-fill-only-comments nil)
   (turn-on-auto-fill))
 
 (defun git-commit-turn-on-flyspell ()

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "gotest" "20170303.13" "Launch GO unit tests" '((emacs "24.3") (s "1.11.0") (f "0.19.0") (go-mode "1.4.0")) :url "https://github.com/nlamirault/gotest.el" :keywords '("languages" "go" "tests"))

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "gotest" "gotest.el" (22793 55920 893669 801000))
+;;;### (autoloads nil "gotest" "gotest.el" (22839 4053 520150 982000))
 ;;; Generated autoloads from gotest.el
 
 (autoload 'go-test-current-test "gotest" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "gotest" "20170522.53" "Launch GO unit tests" '((emacs "24.3") (s "1.11.0") (f "0.19.0") (go-mode "1.4.0")) :commit "c15bdcb78a46167e7a3fbaf5f71cbeddf2f13b78" :url "https://github.com/nlamirault/gotest.el" :keywords '("languages" "go" "tests"))

@@ -2,7 +2,7 @@
 
 ;; Author: Nicolas Lamirault <nicolas.lamirault@gmail.com>
 ;; URL: https://github.com/nlamirault/gotest.el
-;; Package-Version: 20170303.13
+;; Package-Version: 20170522.53
 ;; Version: 0.13.0
 ;; Keywords: languages, go, tests
 
@@ -168,7 +168,7 @@ arguments in that order.")
   '((go-test-testing . ("^\t\\([[:alnum:]-_/.]+\\.go\\):\\([0-9]+\\): .*$" 1 2)) ;; stdlib package testing
     (go-test-testify . ("^\tLocation:\t\\([[:alnum:]-_/.]+\\.go\\):\\([0-9]+\\)$" 1 2)) ;; testify package assert
     (go-test-gopanic . ("^\t\\([[:alnum:]-_/.]+\\.go\\):\\([0-9]+\\) \\+0x\\(?:[0-9a-f]+\\)" 1 2)) ;; panic()
-    (go-test-compile . ("^\\([[:alnum:]-_/.]+\\.go\\):\\([0-9]+\\):\\([0-9]+\\): .*$" 1 2 3)) ;; go compiler
+    (go-test-compile . ("^\\([[:alnum:]-_/.]+\\.go\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\)? .*$" 1 2 3)) ;; go compiler
     (go-test-linkage . ("^\\([[:alnum:]-_/.]+\\.go\\):\\([0-9]+\\): undefined: .*$" 1 2))) ;; go linker
   "Alist of values for `go-test-compilation-error-regexp-alist'.
 See also: `compilation-error-regexp-alist-alist'.")

Binary file

File renamed without changes

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 "ivy" "ivy.el" (22792 62858 959574 782000))
+;;;### (autoloads nil "ivy" "ivy.el" (22839 4052 636162 310000))
 ;;; Generated autoloads from ivy.el
 
 (autoload 'ivy-resume "ivy" "\
@@ -39,6 +39,8 @@ KEYMAP is composed with `ivy-minibuffer-map'.
 If PRESELECT is not nil, then select the corresponding candidate
 out of the ones that match the INITIAL-INPUT.
 
+DEF is for compatibility with `completing-read'.
+
 UPDATE-FN is called each time the current candidate(s) is changed.
 
 When SORT is t, use `ivy-sort-functions-alist' for sorting.
@@ -60,7 +62,7 @@ CALLER is a symbol to uniquely identify the caller to `ivy-read'.
 It is used, along with COLLECTION, to determine which
 customizations apply to the current completion session.
 
-\(fn PROMPT COLLECTION &key PREDICATE REQUIRE-MATCH INITIAL-INPUT HISTORY PRESELECT KEYMAP UPDATE-FN SORT ACTION UNWIND RE-BUILDER MATCHER DYNAMIC-COLLECTION CALLER)" nil nil)
+\(fn PROMPT COLLECTION &key PREDICATE REQUIRE-MATCH INITIAL-INPUT HISTORY PRESELECT DEF KEYMAP UPDATE-FN SORT ACTION UNWIND RE-BUILDER MATCHER DYNAMIC-COLLECTION CALLER)" nil nil)
 
 (autoload 'ivy-completing-read "ivy" "\
 Read a string in the minibuffer, with completion.
@@ -116,7 +118,7 @@ Switch to another buffer in another window.
 ;;;***
 
 ;;;### (autoloads nil nil ("colir.el" "ivy-overlay.el" "ivy-pkg.el")
-;;;;;;  (22792 62858 956574 840000))
+;;;;;;  (22839 4052 633162 349000))
 
 ;;;***

File renamed without changes

Binary file

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

@@ -351,7 +351,8 @@ action functions.")
   display-transformer-fn
   directory
   caller
-  current)
+  current
+  def)
 
 (defvar ivy-last (make-ivy-state)
   "The last parameters passed to `ivy-read'.
@@ -756,7 +757,10 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
   (interactive)
   (let* ((parts (or (split-string ivy-text " " t) (list "")))
          (postfix (car (last parts)))
-         (completion-ignore-case t)
+         (case-fold-search (and ivy-case-fold-search
+                                (or (eq ivy-case-fold-search 'always)
+                                    (string= ivy-text (downcase ivy-text)))))
+         (completion-ignore-case case-fold-search)
          (startp (string-match "^\\^" postfix))
          (new (try-completion (if startp
                                   (substring postfix 1)
@@ -768,6 +772,9 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
                                             (when i
                                               (substring str i))))
                                         ivy--old-cands)))))
+    (when (and (eq ivy-case-fold-search 'auto)
+               (stringp new))
+      (setq new (downcase new)))
     (cond ((eq new t) nil)
           ((string= new ivy-text) nil)
           (new
@@ -1253,10 +1260,10 @@ On error (read-only), call `ivy-on-del-error-function'."
             (avy--process
              (nreverse candidates)
              (avy--style-fn avy-style)))))
-    (when (numberp candidate)
-      (ivy-set-index (- (line-number-at-pos candidate) 2))
-      (ivy--exhibit)
-      (ivy-done))))
+    (goto-char candidate)
+    (ivy--done
+     (buffer-substring-no-properties
+      (point) (line-end-position)))))
 
 (defun ivy-sort-file-function-default (x y)
   "Compare two files X and Y.
@@ -1409,12 +1416,18 @@ Directories come first."
           (cl-remove-if-not predicate seq)
         seq))))
 
+(defvar ivy-auto-select-single-candidate nil
+  "When non-nil, auto-select the candidate if it is the only one.
+When t, it is the same as if the user were prompted and selected the candidate
+by calling the default action.  This variable has no use unless the collection
+contains a single candidate.")
+
 ;;** Entry Point
 ;;;###autoload
 (cl-defun ivy-read (prompt collection
                     &key
                       predicate require-match initial-input
-                      history preselect keymap update-fn sort
+                      history preselect def keymap update-fn sort
                       action unwind re-builder matcher
                       dynamic-collection caller)
   "Read a string in the minibuffer, with completion.
@@ -1444,6 +1457,8 @@ KEYMAP is composed with `ivy-minibuffer-map'.
 If PRESELECT is not nil, then select the corresponding candidate
 out of the ones that match the INITIAL-INPUT.
 
+DEF is for compatibility with `completing-read'.
+
 UPDATE-FN is called each time the current candidate(s) is changed.
 
 When SORT is t, use `ivy-sort-functions-alist' for sorting.
@@ -1524,7 +1539,8 @@ customizations apply to the current completion session."
            :dynamic-collection dynamic-collection
            :display-transformer-fn transformer-fn
            :directory default-directory
-           :caller caller))
+           :caller caller
+           :def def))
     (ivy--reset-state ivy-last)
     (prog1
         (unwind-protect
@@ -1538,12 +1554,18 @@ customizations apply to the current completion session."
                          ((display-graphic-p) nil)
                          ((null resize-mini-windows) 'grow-only)
                          (t resize-mini-windows))))
-                 (read-from-minibuffer
-                  prompt
-                  (ivy-state-initial-input ivy-last)
-                  (make-composed-keymap keymap ivy-minibuffer-map)
-                  nil
-                  hist)
+                 (if (and ivy-auto-select-single-candidate
+                          (= (length ivy--all-candidates) 1))
+                     (progn
+                       (setf (ivy-state-current ivy-last)
+                             (car ivy--all-candidates))
+                       (setq ivy-exit 'done))
+                   (read-from-minibuffer
+                    prompt
+                    (ivy-state-initial-input ivy-last)
+                    (make-composed-keymap keymap ivy-minibuffer-map)
+                    nil
+                    hist))
                  (when (eq ivy-exit 'done)
                    (let ((item (if ivy--directory
                                    (ivy-state-current ivy-last)
@@ -1578,7 +1600,8 @@ This is useful for recursive `ivy-read'."
         (dynamic-collection (ivy-state-dynamic-collection state))
         (initial-input (ivy-state-initial-input state))
         (require-match (ivy-state-require-match state))
-        (caller (ivy-state-caller state)))
+        (caller (ivy-state-caller state))
+        (def (ivy-state-def state)))
     (unless initial-input
       (setq initial-input (cdr (assoc this-command
                                       ivy-initial-inputs-alist))))
@@ -1693,6 +1716,12 @@ This is useful for recursive `ivy-read'."
              (setq coll (all-completions "" collection predicate)))
             (t
              (setq coll collection)))
+      (when def
+        (cond ((listp def)
+               (setq coll (cl-union def coll :test 'equal)))
+              ((member def coll))
+              (t
+               (push def coll))))
       (when sort
         (if (and (functionp collection)
                  (setq sort-fn (ivy--sort-function collection)))
@@ -1703,15 +1732,6 @@ This is useful for recursive `ivy-read'."
                      (setq sort-fn (ivy--sort-function caller)))
             (setq coll (cl-sort (copy-sequence coll) sort-fn)))))
       (setq coll (ivy--set-candidates coll))
-      (when preselect
-        (unless (or (not (stringp preselect))
-                    (and require-match
-                         (not (eq collection 'internal-complete-buffer)))
-                    dynamic-collection
-                    (let ((re (regexp-quote preselect)))
-                      (cl-find-if (lambda (x) (string-match re x))
-                                  coll)))
-          (setq coll (cons preselect coll))))
       (setq ivy--old-re nil)
       (setq ivy--old-cands nil)
       (when (integerp preselect)
@@ -1801,14 +1821,17 @@ INHERIT-INPUT-METHOD is currently ignored."
                 collection
                 :predicate predicate
                 :require-match (and collection require-match)
-                :initial-input (if (consp initial-input)
-                                   (car initial-input)
-                                 (if (and (stringp initial-input)
-                                          (string-match "\\+" initial-input))
-                                     (replace-regexp-in-string
-                                      "\\+" "\\\\+" initial-input)
-                                   initial-input))
+                :initial-input (cond ((consp initial-input)
+                                      (car initial-input))
+                                     ((and (stringp initial-input)
+                                           (not (eq collection 'read-file-name-internal))
+                                           (string-match "\\+" initial-input))
+                                      (replace-regexp-in-string
+                                       "\\+" "\\\\+" initial-input))
+                                     (t
+                                      initial-input))
                 :preselect (if (listp def) (car def) def)
+                :def def
                 :history history
                 :keymap nil
                 :sort t
@@ -1895,7 +1918,8 @@ The previous string is between `ivy-completion-beg' and `ivy-completion-end'."
         (if (null (cdr comps))
             (if (string= str (car comps))
                 (message "Sole match")
-              (setf (ivy-state-window ivy-last) (selected-window))
+              (unless (minibuffer-window-active-p (selected-window))
+                (setf (ivy-state-window ivy-last) (selected-window)))
               (ivy-completion-in-region-action
                (substring-no-properties
                 (car comps))))
@@ -2147,7 +2171,8 @@ depending on the number of candidates."
   (when (display-graphic-p)
     (setq truncate-lines t))
   (setq-local max-mini-window-height ivy-height)
-  (when ivy-fixed-height-minibuffer
+  (when (and ivy-fixed-height-minibuffer
+             (not (eq (ivy-state-caller ivy-last) 'ivy-completion-in-region)))
     (set-window-text-height (selected-window)
                             (+ ivy-height
                                (if ivy-add-newline-after-prompt
@@ -2292,34 +2317,62 @@ If SUBEXP is nil, the text properties are applied to the whole match."
             (cl-sort (copy-sequence collection) sort-fn)
           collection)))))
 
+(defcustom ivy-magic-slash-non-match-action 'ivy-magic-slash-non-match-cd-selected
+  "Action to take when a slash is added to the end of a non existing directory.
+Possible choices are 'ivy-magic-slash-non-match-cd-selected,
+'ivy-magic-slash-non-match-create, or nil"
+  :type '(choice
+          (const :tag "Use currently selected directory"
+                 ivy-magic-slash-non-match-cd-selected)
+          (const :tag "Create and use new directory"
+                 ivy-magic-slash-non-match-create)
+          (const :tag "Do nothing"
+                 nil)))
+
+(defun ivy--create-and-cd (dir)
+  (make-directory dir)
+  (ivy--cd dir))
+
 (defun ivy--magic-file-slash ()
-  (cond ((member ivy-text ivy--all-candidates)
-         (ivy--cd (expand-file-name ivy-text ivy--directory)))
-        ((string-match "//\\'" ivy-text)
-         (if (and default-directory
-                  (string-match "\\`[[:alpha:]]:/" default-directory))
-             (ivy--cd (match-string 0 default-directory))
-           (ivy--cd "/")))
-        ((string-match "\\`/ssh:" ivy-text)
-         (ivy--cd (file-name-directory ivy-text)))
-        ((string-match "[[:alpha:]]:/\\'" ivy-text)
-         (let ((drive-root (match-string 0 ivy-text)))
-           (when (file-exists-p drive-root)
-             (ivy--cd drive-root))))
-        ((and (or (> ivy--index 0)
-                  (= ivy--length 1)
+  (when (or (and (eq this-command 'self-insert-command)
+                 (eolp))
+            (eq this-command 'ivy-partial-or-done))
+    (cond ((member ivy-text ivy--all-candidates)
+           (ivy--cd (expand-file-name ivy-text ivy--directory)))
+          ((string-match "//\\'" ivy-text)
+           (if (and default-directory
+                    (string-match "\\`[[:alpha:]]:/" default-directory))
+               (ivy--cd (match-string 0 default-directory))
+             (ivy--cd "/")))
+          ((string-match "\\`/ssh:" ivy-text)
+           (ivy--cd (file-name-directory ivy-text)))
+          ((string-match "[[:alpha:]]:/\\'" ivy-text)
+           (let ((drive-root (match-string 0 ivy-text)))
+             (when (file-exists-p drive-root)
+               (ivy--cd drive-root))))
+          ((and (file-exists-p ivy-text)
+                (not (string= ivy-text "/"))
+                (file-directory-p ivy-text))
+           (ivy--cd ivy-text))
+          ((and (or (> ivy--index 0)
+                    (= ivy--length 1)
+                    (not (string= ivy-text "/")))
+                (let ((default-directory ivy--directory))
+                  (and
+                   (not (equal (ivy-state-current ivy-last) ""))
+                   (file-directory-p (ivy-state-current ivy-last))
+                   (file-exists-p (ivy-state-current ivy-last)))))
+           (when (eq ivy-magic-slash-non-match-action 'ivy-magic-slash-non-match-cd-selected)
+             (ivy--cd
+              (expand-file-name (ivy-state-current ivy-last) ivy--directory)))
+           (when (and (eq ivy-magic-slash-non-match-action 'ivy-magic-slash-non-match-create)
+                      (not (string= ivy-text "/")))
+             (ivy--create-and-cd (expand-file-name ivy-text ivy--directory))))
+          (t
+           (when (and
+                  (eq ivy-magic-slash-non-match-action 'ivy-magic-slash-non-match-create)
                   (not (string= ivy-text "/")))
-              (let ((default-directory ivy--directory))
-                (and
-                 (not (equal (ivy-state-current ivy-last) ""))
-                 (file-directory-p (ivy-state-current ivy-last))
-                 (file-exists-p (ivy-state-current ivy-last)))))
-         (ivy--cd
-          (expand-file-name (ivy-state-current ivy-last) ivy--directory)))
-        ((and (file-exists-p ivy-text)
-              (not (string= ivy-text "/"))
-              (file-directory-p ivy-text))
-         (ivy--cd ivy-text))))
+             (ivy--create-and-cd (expand-file-name ivy-text ivy--directory)))))))
 
 (defcustom ivy-magic-tilde t
   "When non-nil, ~ will move home when selecting files.
@@ -3323,12 +3376,18 @@ Skip buffers that match `ivy-ignore-buffers'."
 (ivy-set-display-transformer
  'internal-complete-buffer 'ivy-switch-buffer-transformer)
 
+(defun ivy-append-face (str face)
+  (let ((new (copy-sequence str)))
+    (font-lock-append-text-property
+     0 (length new) 'face face new)
+    new))
+
 (defun ivy-switch-buffer-transformer (str)
   (let ((b (get-buffer str)))
     (if (and b
              (buffer-file-name b)
              (buffer-modified-p b))
-        (propertize str 'face 'ivy-modified-buffer)
+        (ivy-append-face str 'ivy-modified-buffer)
       str)))
 
 (defun ivy-switch-buffer-occur ()

Binary file

File renamed without changes

Binary file

@@ -1,178 +0,0 @@
-This is magit.info, produced by makeinfo version 5.2 from magit.texi.
-
-Magit is an interface to the version control system Git, implemented as
-an Emacs package.  Magit aspires to be a complete Git porcelain.  While
-we cannot (yet) claim that Magit wraps and improves upon each and every
-Git command, it is complete enough to allow even experienced Git users
-to perform almost all of their daily version control tasks directly from
-within Emacs.  While many fine Git clients exist, only Magit and Git
-itself deserve to be called porcelains.
-
-     Copyright (C) 2015-2017 Jonas Bernoulli <jonas@bernoul.li>
-
-     You can redistribute this document and/or modify it under the terms
-     of the GNU General Public License as published by the Free Software
-     Foundation, either version 3 of the License, or (at your option)
-     any later version.
-
-     This document is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-     General Public License for more details.
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* Magit: (magit).       Using Git from Emacs with Magit.
-END-INFO-DIR-ENTRY
-
-
-Indirect:
-magit.info-1: 1222
-magit.info-2: 327584
-
-Tag Table:
-(Indirect)
-Node: Top1222
-Node: Introduction6098
-Node: Installation10821
-Node: Installing from an Elpa Archive11161
-Node: Installing from the Git Repository12287
-Node: Post-Installation Tasks14953
-Node: Getting Started16327
-Node: Interface Concepts21712
-Node: Modes and Buffers21986
-Node: Switching Buffers23731
-Node: Naming Buffers28272
-Node: Quitting Windows31107
-Node: Automatic Refreshing of Magit Buffers32739
-Node: Automatic Saving of File-Visiting Buffers35507
-Node: Automatic Reverting of File-Visiting Buffers36692
-Node: Risk of Reverting Automatically41688
-Node: Sections44071
-Node: Section Movement45012
-Node: Section Visibility48939
-Node: Section Hooks52414
-Node: Section Types and Values54695
-Node: Section Options55965
-Node: Popup Buffers and Prefix Commands56437
-Node: Completion and Confirmation57751
-Node: Running Git61035
-Node: Viewing Git Output61271
-Node: Running Git Manually62271
-Node: Git Executable64673
-Node: Global Git Arguments66955
-Node: Inspecting67761
-Node: Status Buffer68908
-Node: Status Sections71794
-Node: Status Header Sections77673
-Node: Status Options80230
-Node: Repository List81984
-Node: Logging84142
-Node: Refreshing Logs86681
-Node: Log Buffer88066
-Node: Log Margin90926
-Node: Select from Log93566
-Node: Reflog95670
-Node: Cherries97194
-Node: Diffing98939
-Node: Refreshing Diffs101965
-Node: Diff Buffer104946
-Node: Diff Options107540
-Node: Revision Buffer110910
-Node: Ediffing111865
-Node: References Buffer115461
-Node: References Sections122760
-Node: Bisecting123635
-Node: Visiting Blobs125373
-Node: Blaming125882
-Node: Manipulating129311
-Node: Repository Setup129627
-Node: Staging and Unstaging130667
-Node: Staging from File-Visiting Buffers134756
-Node: Applying135924
-Node: Committing137817
-Node: Initiating a Commit138400
-Node: Editing Commit Messages141711
-Node: Branching152107
-Node: The Two Remotes152307
-Node: The Branch Popup154932
-Node: The Branch Config Popup164277
-Node: Merging170180
-Node: Resolving Conflicts172347
-Node: Rebasing177356
-Node: Editing Rebase Sequences180996
-Node: Information About In-Progress Rebase184026
-Ref: Information About In-Progress Rebase-Footnote-1190862
-Node: Cherry Picking191448
-Node: Reverting193053
-Node: Resetting194416
-Node: Stashing195833
-Node: Transferring200027
-Node: Remotes200265
-Node: Fetching201543
-Node: Pulling202908
-Node: Pushing203753
-Node: Creating and Sending Patches208496
-Node: Applying Patches209191
-Node: Miscellaneous210188
-Node: Tagging210491
-Node: Notes211275
-Node: Submodules213799
-Node: Listing Submodules214013
-Node: Submodule Popup215832
-Node: Subtree217115
-Node: Common Commands218362
-Node: Wip Modes220107
-Node: Minor Mode for Buffers Visiting Files226903
-Node: Minor Mode for Buffers Visiting Blobs230377
-Node: Customizing231190
-Node: Per-Repository Configuration232862
-Node: Essential Settings234509
-Node: Safety234833
-Node: Performance236666
-Node: Microsoft Windows Performance243598
-Node: MacOS Performance244791
-Ref: MacOS Performance-Footnote-1246027
-Ref: MacOS Performance-Footnote-2246109
-Ref: MacOS Performance-Footnote-3246169
-Node: Plumbing246335
-Node: Calling Git247159
-Node: Getting a Value from Git248682
-Node: Calling Git for Effect251786
-Node: Section Plumbing258304
-Node: Creating Sections258532
-Node: Section Selection262431
-Node: Matching Sections264111
-Node: Refreshing Buffers269543
-Node: Conventions272678
-Node: Confirmation and Completion272855
-Node: Theming Faces273753
-Node: FAQ281904
-Node: FAQ - How to …?282361
-Node: How to show git's output?282725
-Node: How to install the gitman info manual?283479
-Node: How to show diffs for gpg-encrypted files?284449
-Node: How does branching and pushing work?285045
-Node: Can Magit be used as ‘ediff-version-control-package’?285424
-Node: FAQ - Issues and Errors287420
-Node: Magit is slow288164
-Node: I changed several thousand files at once and now Magit is unusable288389
-Node: I am having problems committing289129
-Node: I am using MS Windows and cannot push with Magit289610
-Node: I am using OS X and SOMETHING works in shell but not in Magit290227
-Node: Diffs contain control sequences291033
-Node: Expanding a file to show the diff causes it to disappear292107
-Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer292664
-Node: The mode-line information isn't always up-to-date293716
-Node: Emacs 245 hangs when loading Magit294783
-Node: Debugging Tools295333
-Node: Keystroke Index297085
-Node: Command Index327584
-Node: Function Index358177
-Node: Variable Index371487
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:

@@ -40,6 +40,7 @@ Contributors
 
 - Aaron Culich <aculich@gmail.com>
 - Abdo Roig-Maranges <abdo.roig@gmail.com>
+- Adam Benanti <0entropy@protonmail.com>
 - Adam Porter <adam@alphapapa.net>
 - Adam Spiers <emacs@adamspiers.org>
 - Adeodato Simó <dato@net.com.org.es>
@@ -137,6 +138,7 @@ Contributors
 - Josiah Schwab <jschwab@gmail.com>
 - Julien Danjou <julien@danjou.info>
 - Justin Caratzas <justin.caratzas@gmail.com>
+- Justin Thomas <justin.thomas1@gmail.com>
 - Kan-Ru Chen <kanru@kanru.info>
 - Keshav Kini <keshav.kini@gmail.com>
 - Kévin Le Gouguec <kevin.legouguec@gmail.com>

File renamed without changes

@@ -334,7 +334,8 @@ current line."
   (when (and (looking-at git-rebase-line)
              (not (eq (char-after) (string-to-char comment-start))))
     (let ((inhibit-read-only t))
-      (insert comment-start))
+      (insert comment-start)
+      (insert " "))
     (when git-rebase-auto-advance
       (forward-line))))
 
@@ -450,7 +451,7 @@ buffer down."
   "Move N lines backward (forward if N is negative).
 Like `forward-line' but go into the opposite direction."
   (interactive "p")
-  (forward-line (- n)))
+  (forward-line (- (or n 1))))
 
 ;;; Mode
 
@@ -481,6 +482,10 @@ running 'man git-rebase' at the command line) for details."
   (setq-local redisplay-unhighlight-region-function 'git-rebase-unhighlight-region)
   (add-hook 'with-editor-pre-cancel-hook  'git-rebase-autostash-save  nil t)
   (add-hook 'with-editor-post-cancel-hook 'git-rebase-autostash-apply nil t)
+  (setq imenu-prev-index-position-function
+        #'magit-imenu--rebase-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        #'magit-imenu--rebase-extract-index-name-function)
   (when (boundp 'save-place)
     (setq save-place nil)))
 
@@ -500,25 +505,25 @@ running 'man git-rebase' at the command line) for details."
 (defun git-rebase-match-comment-line (limit)
   (re-search-forward (concat git-rebase-comment-re ".*") limit t))
 
-(defun git-rebase-match-killed-action (limit)
-  (re-search-forward (concat git-rebase-comment-re "[^ \n].*") limit t))
-
 (defun git-rebase-mode-font-lock-keywords ()
   "Font lock keywords for Git-Rebase mode."
-  `(("^\\([efprs]\\|pick\\|reword\\|edit\\|squash\\|fixup\\) \\([^ \n]+\\) \\(.*\\)"
-     (1 'font-lock-keyword-face)
-     (2 'git-rebase-hash)
-     (3 'git-rebase-description))
-    ("^\\(exec\\) \\(.*\\)"
-     (1 'font-lock-keyword-face)
-     (2 'git-rebase-description))
-    (git-rebase-match-comment-line 0 'font-lock-comment-face)
-    (git-rebase-match-killed-action 0 'git-rebase-killed-action t)
-    (,(format "^%s Rebase \\([^ ]*\\) onto \\([^ ]*\\)" comment-start)
-     (1 'git-rebase-comment-hash t)
-     (2 'git-rebase-comment-hash t))
-    (,(format "^%s \\(Commands:\\)" comment-start)
-     (1 'git-rebase-comment-heading t))))
+  (let ((action-re "\
+\\([efprs]\\|pick\\|reword\\|edit\\|squash\\|fixup\\) \\([^ \n]+\\) \\(.*\\)"))
+    `((,(concat "^" action-re)
+       (1 'font-lock-keyword-face)
+       (2 'git-rebase-hash)
+       (3 'git-rebase-description))
+      ("^\\(exec\\) \\(.*\\)"
+       (1 'font-lock-keyword-face)
+       (2 'git-rebase-description))
+      (git-rebase-match-comment-line 0 'font-lock-comment-face)
+      (,(concat git-rebase-comment-re " *" action-re)
+       0 'git-rebase-killed-action t)
+      (,(format "^%s Rebase \\([^ ]*\\) onto \\([^ ]*\\)" comment-start)
+       (1 'git-rebase-comment-hash t)
+       (2 'git-rebase-comment-hash t))
+      (,(format "^%s \\(Commands:\\)" comment-start)
+       (1 'git-rebase-comment-heading t)))))
 
 (defun git-rebase-mode-show-keybindings ()
   "Modify the \"Commands:\" section of the comment Git generates

Binary file

@@ -52,8 +52,8 @@
   "Whether Magit uses the system's trash can.
 
 You should absolutely not disable this and also remove `discard'
-from `magit-no-confirm'.  Even if you have all of the Magit-Wip
-modes enabled you shouldn't do that, because those modes to not
+from `magit-no-confirm'.  You shouldn't do that even if you have
+all of the Magit-Wip modes enabled, because those modes do not
 track any files that are not tracked in the proper branch."
   :package-version '(magit . "2.1.0")
   :group 'magit-essentials
@@ -224,7 +224,7 @@ requiring confirmation."
   (interactive
    (let* ((atpoint (magit-section-when (file)))
           (current (magit-file-relative-name))
-          (choices (nconc (magit-modified-files)
+          (choices (nconc (magit-unstaged-files)
                           (magit-untracked-files)))
           (default (car (member (or atpoint current) choices))))
      (list (if (or current-prefix-arg (not default))
@@ -511,7 +511,7 @@ without requiring confirmation."
                 (sections
                  (magit-discard-apply-n sections 'magit-apply-diffs)))
           (when binaries
-            (let ((modified (magit-modified-files t)))
+            (let ((modified (magit-unstaged-files t)))
               (setq binaries (--separate (member it modified) binaries)))
             (when (cadr binaries)
               (magit-call-git "reset" "--" (cadr binaries)))

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-rebase" "git-rebase.el" (22792 62855 367644
-;;;;;;  155000))
+;;;### (autoloads nil "git-rebase" "git-rebase.el" (22839 4048 643213
+;;;;;;  533000))
 ;;; 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" (22792 62855 385643 807000))
+;;;### (autoloads nil "magit" "magit.el" (22839 4048 662213 289000))
 ;;; Generated autoloads from magit.el
  (autoload 'magit-merge-popup "magit" nil t)
 
@@ -171,7 +171,7 @@ is run in the top-level directory of the current working tree.
 
 (autoload 'magit-version "magit" "\
 Return the version of Magit currently in use.
-If optional argument PRINT-DEST is non-nil output
+If optional argument PRINT-DEST is non-nil, output
 stream (interactively, the echo area, or the current buffer with
 a prefix argument), also print the used versions of Magit, Git,
 and Emacs to it.
@@ -180,8 +180,8 @@ and Emacs to it.
 
 ;;;***
 
-;;;### (autoloads nil "magit-apply" "magit-apply.el" (22792 62855
-;;;;;;  373644 39000))
+;;;### (autoloads nil "magit-apply" "magit-apply.el" (22839 4048
+;;;;;;  649213 456000))
 ;;; Generated autoloads from magit-apply.el
 
 (autoload 'magit-stage-file "magit-apply" "\
@@ -217,8 +217,8 @@ Remove all changes from the staging area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22792
-;;;;;;  62855 358644 328000))
+;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22839
+;;;;;;  4048 635213 635000))
 ;;; Generated autoloads from magit-autorevert.el
 
 (defvar magit-revert-buffers t)
@@ -247,8 +247,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
 
 ;;;***
 
-;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22792 62855
-;;;;;;  372644 58000))
+;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22839 4048
+;;;;;;  648213 468000))
 ;;; Generated autoloads from magit-bisect.el
  (autoload 'magit-bisect-popup "magit-bisect" nil t)
 
@@ -299,8 +299,8 @@ bisect run'.
 
 ;;;***
 
-;;;### (autoloads nil "magit-blame" "magit-blame.el" (22792 62855
-;;;;;;  383643 846000))
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (22839 4048
+;;;;;;  660213 314000))
 ;;; Generated autoloads from magit-blame.el
  (autoload 'magit-blame-popup "magit-blame" nil t)
 
@@ -324,15 +324,15 @@ only arguments available from `magit-blame-popup' should be used.
 
 ;;;***
 
-;;;### (autoloads nil "magit-branch" "magit-branch.el" (22792 62855
-;;;;;;  371644 78000))
+;;;### (autoloads nil "magit-branch" "magit-branch.el" (22839 4048
+;;;;;;  647213 481000))
 ;;; Generated autoloads from magit-branch.el
  (autoload 'magit-branch-popup "magit" nil t)
 
 (autoload 'magit-checkout "magit-branch" "\
 Checkout REVISION, updating the index and the working tree.
-If REVISION is a local branch then that becomes the current
-branch.  If it is something else then `HEAD' becomes detached.
+If REVISION is a local branch, then that becomes the current
+branch.  If it is something else, then `HEAD' becomes detached.
 Checkout fails if the working tree or the staging area contain
 changes.
 
@@ -553,8 +553,8 @@ When `never' (the default) then the variable is never set.
 
 ;;;***
 
-;;;### (autoloads nil "magit-commit" "magit-commit.el" (22792 62855
-;;;;;;  359644 309000))
+;;;### (autoloads nil "magit-commit" "magit-commit.el" (22839 4048
+;;;;;;  636213 622000))
 ;;; Generated autoloads from magit-commit.el
 
 (autoload 'magit-commit "magit-commit" "\
@@ -636,8 +636,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
 
 ;;;***
 
-;;;### (autoloads nil "magit-diff" "magit-diff.el" (22792 62855 382643
-;;;;;;  865000))
+;;;### (autoloads nil "magit-diff" "magit-diff.el" (22839 4048 659213
+;;;;;;  327000))
 ;;; Generated autoloads from magit-diff.el
 
 (autoload 'magit-diff-popup "magit-diff" "\
@@ -721,8 +721,8 @@ for a revision.
 
 ;;;***
 
-;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22792 62855
-;;;;;;  378643 942000))
+;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22839 4048
+;;;;;;  655213 378000))
 ;;; Generated autoloads from magit-ediff.el
  (autoload 'magit-ediff-popup "magit-ediff" nil t)
 
@@ -746,7 +746,7 @@ FILE has to be relative to the top directory of the repository.
 Compare REVA:FILEA with REVB:FILEB using Ediff.
 
 FILEA and FILEB have to be relative to the top directory of the
-repository.  If REVA or REVB is nil then this stands for the
+repository.  If REVA or REVB is nil, then this stands for the
 working tree state.
 
 If the region is active, use the revisions on the first and last
@@ -810,8 +810,8 @@ stash that were staged.
 
 ;;;***
 
-;;;### (autoloads nil "magit-extras" "magit-extras.el" (22792 62855
-;;;;;;  360644 290000))
+;;;### (autoloads nil "magit-extras" "magit-extras.el" (22839 4048
+;;;;;;  637213 610000))
 ;;; Generated autoloads from magit-extras.el
 
 (autoload 'magit-run-git-gui "magit-extras" "\
@@ -865,7 +865,7 @@ like pretty much every other keymap:
 (autoload 'magit-dired-jump "magit-extras" "\
 Visit file at point using Dired.
 With a prefix argument, visit in another window.  If there
-is no file at point then instead visit `default-directory'.
+is no file at point, then instead visit `default-directory'.
 
 \(fn &optional OTHER-WINDOW)" t nil)
 
@@ -911,10 +911,17 @@ on a position in a file-visiting buffer.
 
 \(fn &optional WHOAMI FILE-NAME)" t nil)
 
+(autoload 'magit-abort-dwim "magit-extras" "\
+Abort current operation.
+Depending on the context, this will abort a merge, a rebase, a
+patch application, a cherry-pick, a revert, or a bisect.
+
+\(fn)" t nil)
+
 ;;;***
 
-;;;### (autoloads nil "magit-files" "magit-files.el" (22792 62855
-;;;;;;  368644 135000))
+;;;### (autoloads nil "magit-files" "magit-files.el" (22839 4048
+;;;;;;  644213 520000))
 ;;; Generated autoloads from magit-files.el
 
 (autoload 'magit-find-file "magit-files" "\
@@ -961,8 +968,125 @@ Checkout FILE from REV.
 
 ;;;***
 
-;;;### (autoloads nil "magit-log" "magit-log.el" (22792 62855 379643
-;;;;;;  923000))
+;;;### (autoloads nil "magit-imenu" "magit-imenu.el" (22839 4048
+;;;;;;  654213 391000))
+;;; Generated autoloads from magit-imenu.el
+
+(autoload 'magit-imenu--log-prev-index-position-function "magit-imenu" "\
+Move point to previous line in current buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--log-extract-index-name-function "magit-imenu" "\
+Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--diff-prev-index-position-function "magit-imenu" "\
+Move point to previous file line in current buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--diff-extract-index-name-function "magit-imenu" "\
+Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--status-create-index-function "magit-imenu" "\
+Return an alist of all imenu entries in current buffer.
+This function is used as a value for
+`imenu-create-index-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--refs-create-index-function "magit-imenu" "\
+Return an alist of all imenu entries in current buffer.
+This function is used as a value for
+`imenu-create-index-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--cherry-create-index-function "magit-imenu" "\
+Return an alist of all imenu entries in current buffer.
+This function is used as a value for
+`imenu-create-index-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--submodule-prev-index-position-function "magit-imenu" "\
+Move point to previous line in magit-submodule-list buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--submodule-extract-index-name-function "magit-imenu" "\
+Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--repolist-prev-index-position-function "magit-imenu" "\
+Move point to previous line in magit-repolist buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--repolist-extract-index-name-function "magit-imenu" "\
+Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--process-prev-index-position-function "magit-imenu" "\
+Move point to previous process in magit-process buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--process-extract-index-name-function "magit-imenu" "\
+Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--rebase-prev-index-position-function "magit-imenu" "\
+Move point to previous commit in git-rebase buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'.
+
+\(fn)" nil nil)
+
+(autoload 'magit-imenu--rebase-extract-index-name-function "magit-imenu" "\
+Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil "magit-log" "magit-log.el" (22839 4048 656213
+;;;;;;  366000))
 ;;; Generated autoloads from magit-log.el
 
 (autoload 'magit-log-buffer-file-popup "magit-log" "\
@@ -1044,15 +1168,15 @@ Show commits in a branch that are not merged in the upstream branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-notes" "magit-notes.el" (22792 62855
-;;;;;;  394643 633000))
+;;;### (autoloads nil "magit-notes" "magit-notes.el" (22839 4048
+;;;;;;  671213 173000))
 ;;; Generated autoloads from magit-notes.el
  (autoload 'magit-notes-popup "magit" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "magit-refs" "magit-refs.el" (22792 62855 361644
-;;;;;;  271000))
+;;;### (autoloads nil "magit-refs" "magit-refs.el" (22839 4048 638213
+;;;;;;  597000))
 ;;; Generated autoloads from magit-refs.el
  (autoload 'magit-show-refs-popup "magit" nil t)
 
@@ -1077,8 +1201,8 @@ Refs are compared with a branch read from the user.
 
 ;;;***
 
-;;;### (autoloads nil "magit-remote" "magit-remote.el" (22792 62855
-;;;;;;  389643 730000))
+;;;### (autoloads nil "magit-remote" "magit-remote.el" (22839 4048
+;;;;;;  666213 237000))
 ;;; Generated autoloads from magit-remote.el
 
 (autoload 'magit-clone "magit-remote" "\
@@ -1310,8 +1434,8 @@ is asked to pull.  START has to be reachable from that commit.
 
 ;;;***
 
-;;;### (autoloads nil "magit-repos" "magit-repos.el" (22792 62855
-;;;;;;  381643 884000))
+;;;### (autoloads nil "magit-repos" "magit-repos.el" (22839 4048
+;;;;;;  658213 340000))
 ;;; Generated autoloads from magit-repos.el
 
 (autoload 'magit-list-repositories "magit-repos" "\
@@ -1325,8 +1449,8 @@ control which repositories are displayed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22792
-;;;;;;  62855 387643 768000))
+;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22839
+;;;;;;  4048 664213 263000))
 ;;; Generated autoloads from magit-sequence.el
 
 (autoload 'magit-sequencer-continue "magit-sequence" "\
@@ -1476,8 +1600,8 @@ Abort the current rebase operation, restoring the original branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-stash" "magit-stash.el" (22792 62855
-;;;;;;  376643 981000))
+;;;### (autoloads nil "magit-stash" "magit-stash.el" (22839 4048
+;;;;;;  652213 417000))
 ;;; Generated autoloads from magit-stash.el
  (autoload 'magit-stash-popup "magit-stash" nil t)
 
@@ -1576,8 +1700,8 @@ Show all diffs of a stash in a buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-status" "magit-status.el" (22792 62855
-;;;;;;  380643 903000))
+;;;### (autoloads nil "magit-status" "magit-status.el" (22839 4048
+;;;;;;  657213 353000))
 ;;; Generated autoloads from magit-status.el
 
 (autoload 'magit-init "magit-status" "\
@@ -1596,7 +1720,7 @@ Non-interactively DIRECTORY is (re-)initialized unconditionally.
 Show the status of the current Git repository in a buffer.
 With a prefix argument prompt for a repository to be shown.
 With two prefix arguments prompt for an arbitrary directory.
-If that directory isn't the root of an existing repository
+If that directory isn't the root of an existing repository,
 then offer to initialize it as a new repository.
 
 \(fn &optional DIRECTORY)" t nil)
@@ -1608,8 +1732,8 @@ then offer to initialize it as a new repository.
 
 ;;;***
 
-;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22792
-;;;;;;  62855 395643 614000))
+;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22839
+;;;;;;  4048 672213 160000))
 ;;; Generated autoloads from magit-submodule.el
  (autoload 'magit-submodule-popup "magit-submodule" nil t)
 
@@ -1699,15 +1823,15 @@ Display a list of the current repository's submodules.
 
 ;;;***
 
-;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22792 62855
-;;;;;;  369644 116000))
+;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22839 4048
+;;;;;;  645213 507000))
 ;;; Generated autoloads from magit-subtree.el
  (autoload 'magit-subtree-popup "magit-subtree" nil t)
 
 (autoload 'magit-subtree-add "magit-subtree" "\
-Add COMMIT from REPOSITORY as a new subtree at PREFIX.
+Add REF from REPOSITORY as a new subtree at PREFIX.
 
-\(fn PREFIX REPOSITORY COMMIT ARGS)" t nil)
+\(fn PREFIX REPOSITORY REF ARGS)" t nil)
 
 (autoload 'magit-subtree-add-commit "magit-subtree" "\
 Add COMMIT as a new subtree at PREFIX.
@@ -1720,9 +1844,9 @@ Merge COMMIT into the PREFIX subtree.
 \(fn PREFIX COMMIT ARGS)" t nil)
 
 (autoload 'magit-subtree-pull "magit-subtree" "\
-Pull COMMIT from REPOSITORY into the PREFIX subtree.
+Pull REF from REPOSITORY into the PREFIX subtree.
 
-\(fn PREFIX REPOSITORY COMMIT ARGS)" t nil)
+\(fn PREFIX REPOSITORY REF ARGS)" t nil)
 
 (autoload 'magit-subtree-push "magit-subtree" "\
 Extract the history of the subtree PREFIX and push it to REF on REPOSITORY.
@@ -1736,8 +1860,8 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-utils" "magit-utils.el" (22792 62855
-;;;;;;  356644 367000))
+;;;### (autoloads nil "magit-utils" "magit-utils.el" (22839 4048
+;;;;;;  633213 661000))
 ;;; Generated autoloads from magit-utils.el
 
 (autoload 'magit-emacs-Q-command "magit-utils" "\
@@ -1762,8 +1886,8 @@ See info node `(magit)Debugging Tools' for more information.
 
 ;;;***
 
-;;;### (autoloads nil "magit-wip" "magit-wip.el" (22792 62855 363644
-;;;;;;  232000))
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (22839 4048 640213
+;;;;;;  571000))
 ;;; Generated autoloads from magit-wip.el
 
 (defvar magit-wip-after-save-mode nil "\
@@ -1831,8 +1955,8 @@ command which is about to be called are committed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22792
-;;;;;;  62855 392643 672000))
+;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22839
+;;;;;;  4048 669213 199000))
 ;;; Generated autoloads from magit-worktree.el
 
 (autoload 'magit-worktree-checkout "magit-worktree" "\
@@ -1849,7 +1973,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") (22792 62855 391643 691000))
+;;;;;;  "magit-section.el") (22839 4048 667213 225000))
 
 ;;;***

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

@@ -191,8 +191,8 @@ and change branch related variables."
 ;;;###autoload
 (defun magit-checkout (revision)
   "Checkout REVISION, updating the index and the working tree.
-If REVISION is a local branch then that becomes the current
-branch.  If it is something else then `HEAD' becomes detached.
+If REVISION is a local branch, then that becomes the current
+branch.  If it is something else, then `HEAD' becomes detached.
 Checkout fails if the working tree or the staging area contain
 changes.
 \n(git checkout REVISION)."
@@ -383,19 +383,16 @@ defaulting to the branch at point."
      (if (if (> (length branches) 1)
              (magit-confirm t nil "Delete %i branches" branches)
            (setq branches
-                 (list (magit-read-branch (if current-prefix-arg
+                 (list (magit-read-branch (if force
                                               "Force delete branch"
                                             "Delete branch")
                                           (magit-get-previous-branch)))))
          (unless force
-           (--when-let (-intersection
-                        (-union (magit-list-unmerged-branches)
-                                (magit-list-unmerged-to-upstream-branches))
-                        branches)
+           (--when-let (-remove #'magit-branch-merged-p branches)
              (if (magit-confirm 'delete-unmerged-branch
                    "Delete unmerged branch %s"
                    "Delete %i unmerged branches" it)
-                 (setq force t)
+                 (setq force branches)
                (or (setq branches (-difference branches it))
                    (user-error "Abort")))))
        (user-error "Abort"))
@@ -440,8 +437,22 @@ defaulting to the branch at point."
                      (?d "[d]etach HEAD & delete"     'detach)
                      (?c "[c]heckout master & delete" 'master)
                      (?a "[a]bort"                    'abort)))
-            (`detach (magit-call-git "checkout" "--detach"))
-            (`master (magit-call-git "checkout" "master"))
+            (`detach (unless (or (equal force '(4))
+                                 (member branch force)
+                                 (magit-branch-merged-p branch t)
+                                 (magit-confirm 'delete-unmerged-branch
+                                   "Delete unmerged branch %s" ""
+                                   (list branch)))
+                       (user-error "Abort"))
+                     (magit-call-git "checkout" "--detach"))
+            (`master (unless (or (equal force '(4))
+                                 (member branch force)
+                                 (magit-branch-merged-p branch "master")
+                                 (magit-confirm 'delete-unmerged-branch
+                                   "Delete unmerged branch %s" ""
+                                   (list branch)))
+                       (user-error "Abort"))
+                     (magit-call-git "checkout" "master"))
             (`abort  (user-error "Abort")))
           (setq force t))
         (magit-run-git "branch" (if force "-D" "-d") branch))))))

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

@@ -607,21 +607,27 @@ and `:slant'."
 (put 'magit-diff-section-file-args 'permanent-local t)
 (put 'magit-diff-section-arguments 'permanent-local t)
 
+(defun magit-diff-get-buffer-args ()
+  (cond ((and magit-use-sticky-arguments
+              (derived-mode-p 'magit-diff-mode))
+         (list (nth 2 magit-refresh-args)
+               (nth 3 magit-refresh-args)))
+        ((and (eq magit-use-sticky-arguments t)
+              (--when-let (magit-mode-get-buffer 'magit-diff-mode)
+                (with-current-buffer it
+                  (list (nth 2 magit-refresh-args)
+                        (nth 3 magit-refresh-args))))))
+        (t
+         (list (default-value 'magit-diff-arguments) nil))))
+
 (defun magit-diff-arguments (&optional refresh)
   (cond ((memq magit-current-popup '(magit-diff-popup magit-diff-refresh-popup))
          (magit-popup-export-file-args magit-current-popup-args))
-        ((derived-mode-p 'magit-diff-mode)
-         (list (nth 2 magit-refresh-args)
-               (nth 3 magit-refresh-args)))
-        (refresh
+        ((and refresh (not (derived-mode-p 'magit-diff-mode)))
          (list magit-diff-section-arguments
                magit-diff-section-file-args))
         (t
-         (-if-let (buffer (magit-mode-get-buffer 'magit-diff-mode))
-             (with-current-buffer buffer
-               (list (nth 2 magit-refresh-args)
-                     (nth 3 magit-refresh-args)))
-           (list (default-value 'magit-diff-arguments) nil)))))
+         (magit-diff-get-buffer-args))))
 
 ;;;###autoload
 (defun magit-diff-popup (arg)
@@ -633,11 +639,7 @@ and `:slant'."
          ;; we should get the current values.  However it is much
          ;; more likely that we will end up updating the diff buffer,
          ;; and we therefore use the value from that buffer.
-         (-if-let (buffer (magit-mode-get-buffer 'magit-diff-mode))
-             (with-current-buffer buffer
-               (magit-popup-import-file-args (nth 2 magit-refresh-args)
-                                             (nth 3 magit-refresh-args)))
-           (default-value 'magit-diff-arguments))))
+         (apply #'magit-popup-import-file-args (magit-diff-get-buffer-args))))
     (magit-invoke-popup 'magit-diff-popup nil arg)))
 
 ;;;###autoload
@@ -894,6 +896,12 @@ be committed."
 
 (defvar-local magit-buffer-revision-hash nil)
 
+(defun magit-show-commit--arguments ()
+  (-let [(args diff-files) (magit-diff-arguments)]
+    (list args (if (derived-mode-p 'magit-log-mode)
+                   (nth 2 magit-refresh-args)
+                 diff-files))))
+
 ;;;###autoload
 (defun magit-show-commit (rev &optional args files module)
   "Visit the revision at point in another buffer.
@@ -904,12 +912,11 @@ for a revision."
           (atpoint (or (and (bound-and-true-p magit-blame-mode)
                             (magit-blame-chunk-get :hash))
                        mcommit
-                       magit-buffer-refname
                        (magit-branch-or-commit-at-point)
                        (magit-tag-at-point))))
      (nconc (cons (or (and (not current-prefix-arg) atpoint)
                       (magit-read-branch-or-commit "Show commit" atpoint))
-                  (magit-diff-arguments))
+                  (magit-show-commit--arguments))
             (and mcommit (list (magit-section-parent-value
                                 (magit-current-section)))))))
   (require 'magit)
@@ -1094,7 +1101,9 @@ the buffer in another window."
                    (or (get-file-buffer file)
                        (find-file-noselect file)))))
       (magit-display-file-buffer buf)
-      (with-current-buffer buf
+      (with-selected-window
+          (or (get-buffer-window buf 'visible)
+              (error "File buffer is not visible"))
         (when line
           (setq line
                 (cond ((eq rev 'staged)
@@ -1141,7 +1150,7 @@ whether `magit-diff-visit-file' uses this function."
 
 (defun magit-display-file-buffer-other-window (buffer)
   "Display BUFFER in another window.
-With a prefix argument display it the current window.
+With a prefix argument display it in the current window.
 Option `magit-display-file-buffer-function' controls
 whether `magit-diff-visit-file' uses this function."
   (if (or current-prefix-arg (get-buffer-window buffer))
@@ -1354,7 +1363,7 @@ commit or stash at point, then prompt for a commit."
                               (`scroll-down (point-max)))))))
           (let ((magit-display-buffer-noselect t))
             (if (eq cmd 'magit-show-commit)
-                (apply #'magit-show-commit rev (magit-diff-arguments))
+                (apply #'magit-show-commit rev (magit-show-commit--arguments))
               (funcall cmd rev))))
       (call-interactively #'magit-show-commit))))
 
@@ -1394,7 +1403,11 @@ Staging and applying changes is documented in info node
 
 \\{magit-diff-mode-map}"
   :group 'magit-diff
-  (hack-dir-local-variables-non-file-buffer))
+  (hack-dir-local-variables-non-file-buffer)
+  (setq imenu-prev-index-position-function
+        'magit-imenu--diff-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        'magit-imenu--diff-extract-index-name-function))
 
 (defun magit-diff-refresh-buffer (rev-or-range const _args files)
   "Refresh the current `magit-diff-mode' buffer.
@@ -1757,8 +1770,8 @@ Staging and applying changes is documented in info node
                             " " rev
                             (pcase (length files)
                               (0)
-                              (1 (concat " in file " (car files)))
-                              (_ (concat " in files "
+                              (1 (concat " limited to file " (car files)))
+                              (_ (concat " limited to files "
                                          (mapconcat #'identity files ", ")))))
                     'face 'magit-header-line))
   (setq magit-buffer-revision-hash (magit-rev-parse rev))
@@ -1933,6 +1946,24 @@ or a ref which is not a branch, then it inserts nothing."
                (if magit-revision-use-gravatar-kludge slice2 slice1)
                (if magit-revision-use-gravatar-kludge slice1 slice2)))))))
 
+(defvar-local magit-revision-files nil)
+
+(defun magit-revision-toggle-file-filter ()
+  "Toggle the file restriction of the current revision buffer."
+  (interactive)
+  (with-current-buffer (or (and (derived-mode-p 'magit-revision-mode)
+                                (current-buffer))
+                           (magit-mode-get-buffer 'magit-revision-mode)
+                           (user-error "No revision buffer found"))
+    (let ((files (nth 3 magit-refresh-args)))
+      (unless (or magit-revision-files files)
+        (user-error "No file filter to toggle"))
+      (setf (nth 3 magit-refresh-args) (if (not files)
+                                           magit-revision-files
+                                         (setq magit-revision-files files)
+                                         nil))
+      (magit-refresh))))
+
 ;;; Diff Sections
 
 (defvar magit-unstaged-section-map
@@ -2052,7 +2083,7 @@ starts and ends inside the body of a that section, then the type
 is `region'.  If the region is empty after a mouse click, then
 `hunk' is returned instead of `region'.
 
-If optional STRICT is non-nil then return nil if the diff type of
+If optional STRICT is non-nil, then return nil if the diff type of
 the section at point is `untracked' or the section at point is not
 actually a `diff' but a `diffstat' section."
   (let ((siblings (and (not ssection) (magit-region-sections))))
@@ -2101,7 +2132,7 @@ actually a `diff' but a `diffstat' section."
 (defun magit-diff-highlight (section selection)
   "Highlight the diff-related SECTION.
 If SECTION is not a diff-related section, then do nothing and
-return nil.  If SELECTION is non-nil then it is a list of sections
+return nil.  If SELECTION is non-nil, then it is a list of sections
 selected by the region, including SECTION.  All of these sections
 are highlighted."
   (if (and (magit-section-match 'commit section)

Binary file

@@ -206,7 +206,7 @@ FILE has to be relative to the top directory of the repository."
   "Compare REVA:FILEA with REVB:FILEB using Ediff.
 
 FILEA and FILEB have to be relative to the top directory of the
-repository.  If REVA or REVB is nil then this stands for the
+repository.  If REVA or REVB is nil, then this stands for the
 working tree state.
 
 If the region is active, use the revisions on the first and last
@@ -380,7 +380,7 @@ and discard changes using Ediff, use `magit-ediff-stage'.
 FILE must be relative to the top directory of the repository."
   (interactive
    (list (magit-read-file-choice "Show unstaged changes for file"
-                                 (magit-modified-files)
+                                 (magit-unstaged-files)
                                  "No unstaged files")))
   (magit-with-toplevel
     (let ((conf (current-window-configuration))

Binary file

@@ -124,7 +124,7 @@ like pretty much every other keymap:
 (defun magit-dired-jump (&optional other-window)
   "Visit file at point using Dired.
 With a prefix argument, visit in another window.  If there
-is no file at point then instead visit `default-directory'."
+is no file at point, then instead visit `default-directory'."
   (interactive "P")
   (dired-jump other-window (-if-let (file (magit-file-at-point))
                                (progn (setq file (expand-file-name file))
@@ -247,5 +247,19 @@ on a position in a file-visiting buffer."
                           (prompt-for-change-log-name))))
   (magit-add-change-log-entry whoami file-name t))
 
+;;; Miscellaneous
+
+;;;###autoload
+(defun magit-abort-dwim ()
+  "Abort current operation.
+Depending on the context, this will abort a merge, a rebase, a
+patch application, a cherry-pick, a revert, or a bisect."
+  (interactive)
+  (cond ((magit-merge-state)             (magit-merge-abort))
+        ((magit-rebase-in-progress-p)    (magit-rebase-abort))
+        ((magit-am-in-progress-p)        (magit-am-abort))
+        ((magit-sequencer-in-progress-p) (magit-sequencer-abort))
+        ((magit-bisect-in-progress-p)    (magit-bisect-reset))))
+
 (provide 'magit-extras)
 ;;; magit-extras.el ends here

Binary file

@@ -335,7 +335,7 @@ Currently this only adds the following key bindings.
 
 (defun magit-file-rename (file newname)
   "Rename the FILE to NEWNAME.
-If FILE isn't tracked in Git fallback to using `rename-file'."
+If FILE isn't tracked in Git, fallback to using `rename-file'."
   (interactive
    (let* ((file (magit-read-file "Rename file"))
           (newname (read-file-name (format "Rename %s to file: " file))))
@@ -371,7 +371,7 @@ tree."
 With a prefix argument FORCE do so even when FILE has uncommitted
 changes.
 
-If FILE isn't tracked in Git fallback to using `delete-file'."
+If FILE isn't tracked in Git, fallback to using `delete-file'."
   (interactive (list (magit-read-file "Delete file")))
   (if (magit-file-tracked-p file)
       (magit-run-git "rm" (and force "--force") "--" file)

Binary file

@@ -108,6 +108,7 @@ this."
 
 (defcustom magit-git-global-arguments
   `("--no-pager" "--literal-pathspecs" "-c" "core.preloadindex=true"
+    "-c" "log.showSignature=false"
     ,@(and (eq system-type 'windows-nt)
            (list "-c" "i18n.logOutputEncoding=UTF-8")))
   "Global Git arguments.
@@ -167,7 +168,7 @@ has the form (REGEXP FACE FORMATTER).  REGEXP is a regular
 expression used to match full refs.  The first entry whose REGEXP
 matches the reference is used.  The first regexp submatch becomes
 the \"label\" that represents the ref and is propertized with
-font FONT.  If FORMATTER is non-nil it should be a function that
+font FONT.  If FORMATTER is non-nil, it should be a function that
 takes two arguments, the full ref and the face.  It is supposed
 to return a propertized label that represents the ref."
   :package-version '(magit . "2.1.0")
@@ -246,7 +247,7 @@ framework ultimately determines how the collection is displayed."
          ;; `shell-quote-argument'), but Git for Windows expects shell
          ;; quoting in the dos style.
          (shell-file-name (if (and (eq system-type 'windows-nt)
-                                   ;; If we have Cygwin mount points
+                                   ;; If we have Cygwin mount points,
                                    ;; the git flavor is cygwin, so dos
                                    ;; shell quoting is probably wrong.
                                    (not magit-cygwin-mount-points))
@@ -281,8 +282,8 @@ to do the following.
 
 (defun magit-git-str (&rest args)
   "Execute Git with ARGS, returning the first line of its output.
-If there is no output return nil.  If the output begins with a
-newline return an empty string.  Like `magit-git-string' but
+If there is no output, return nil.  If the output begins with a
+newline, return an empty string.  Like `magit-git-string' but
 ignore `magit-git-debug'."
   (setq args (-flatten args))
   (magit--with-refresh-cache (cons default-directory args)
@@ -343,8 +344,8 @@ add a section in the respective process buffer."
 
 (defun magit-git-string (&rest args)
   "Execute Git with ARGS, returning the first line of its output.
-If there is no output return nil.  If the output begins with a
-newline return an empty string."
+If there is no output, return nil.  If the output begins with a
+newline, return an empty string."
   (setq args (-flatten args))
   (magit--with-refresh-cache (cons default-directory args)
     (with-temp-buffer
@@ -376,7 +377,7 @@ message and add a section in the respective process buffer."
 (defun magit-git-wash (washer &rest args)
   "Execute Git with ARGS, inserting washed output at point.
 Actually first insert the raw output at point.  If there is no
-output call `magit-cancel-section'.  Otherwise temporarily narrow
+output, call `magit-cancel-section'.  Otherwise temporarily narrow
 the buffer to the inserted text, move to its beginning, and then
 call function WASHER with ARGS as its sole argument."
   (declare (indent 1))
@@ -572,9 +573,9 @@ a bare repository."
 (defun magit-file-relative-name (&optional file tracked)
   "Return the path of FILE relative to the repository root.
 
-If optional FILE is nil or omitted return the relative path of
+If optional FILE is nil or omitted, return the relative path of
 the file being visited in the current buffer, if any, else nil.
-If the file is not inside a Git repository then return nil.
+If the file is not inside a Git repository, then return nil.
 
 If TRACKED is non-nil, return the path only if it matches a
 tracked file."
@@ -601,20 +602,16 @@ tracked file."
 (defun magit-untracked-files (&optional all files)
   (magit-list-files "--other" (unless all "--exclude-standard") "--" files))
 
-(defun magit-modified-files (&optional nomodules)
+(defun magit-unstaged-files (&optional nomodules files)
   (magit-git-items "diff-files" "-z" "--name-only"
-                   (and nomodules "--ignore-submodules")))
+                   (and nomodules "--ignore-submodules")
+                   "--" files))
 
 (defun magit-staged-files (&optional nomodules files)
   (magit-git-items "diff-index" "-z" "--name-only" "--cached"
                    (and nomodules "--ignore-submodules")
                    (magit-headish) "--" files))
 
-(defun magit-unstaged-files (&optional nomodules files)
-  (magit-git-items "diff-index" "-z" "--name-only"
-                   (and nomodules "--ignore-submodules")
-                   (magit-headish) "--" files))
-
 (defun magit-staged-binary-files ()
   (--mapcat (and (string-match "^-\t-\t\\(.+\\)" it)
                  (list (match-string 1 it)))
@@ -765,12 +762,12 @@ are considered."
 
 (defun magit-rev-parse (&rest args)
   "Execute `git rev-parse ARGS', returning first line of output.
-If there is no output return nil."
+If there is no output, return nil."
   (apply #'magit-git-string "rev-parse" args))
 
 (defun magit-rev-parse-safe (&rest args)
   "Execute `git rev-parse ARGS', returning first line of output.
-If there is no output return nil.  Like `magit-rev-parse' but
+If there is no output, return nil.  Like `magit-rev-parse' but
 ignore `magit-git-debug'."
   (apply #'magit-git-str "rev-parse" args))
 
@@ -854,6 +851,26 @@ string \"true\", otherwise return nil."
 (defun magit-ref-exists-p (ref)
   (magit-git-success "show-ref" "--verify" ref))
 
+(defun magit-ref-equal (a b)
+  "Return t if the refs A and B are `equal'.
+A symbolic-ref pointing to some ref, is `equal' to that ref,
+as are two symbolic-refs pointing to the same ref."
+  (equal (magit-ref-fullname a)
+         (magit-ref-fullname b)))
+
+(defun magit-ref-eq (a b)
+  "Return t if the refs A and B are `eq'.
+A symbolic-ref is `eq' to itself, but not to the ref it points
+to, or to some other symbolic-ref that points to the same ref."
+  (let ((symbolic-a (magit-symbolic-ref-p a))
+        (symbolic-b (magit-symbolic-ref-p b)))
+    (or (and symbolic-a
+             symbolic-b
+             (equal a b))
+        (and (not symbolic-a)
+             (not symbolic-b)
+             (magit-ref-equal a b)))))
+
 (defun magit-headish ()
   "Return \"HEAD\" or if that doesn't exist the hash of the empty tree."
   (if (magit-no-commit-p)
@@ -885,7 +902,8 @@ string \"true\", otherwise return nil."
            (car magit-refresh-args))))
 
 (defun magit-branch-or-commit-at-point ()
-  (or (magit-section-case
+  (or magit-buffer-refname
+      (magit-section-case
         (branch (magit-section-value it))
         (commit (let ((rev (magit-section-value it)))
                   (or (magit-get-shortname rev) rev)))
@@ -996,6 +1014,33 @@ which is different from the current branch and still exists."
       (unless (equal remote ".")
         remote))))
 
+(defun magit-branch-merged-p (branch &optional target)
+  "Return non-nil if BRANCH is either merged into its upstream or TARGET.
+
+If optional TARGET is nil, then check whether BRANCH is merged
+into the current branch instead.  If TARGET is t, then check
+whether BRANCH is merged into any other local branch.  In both
+cases the upstream check is also performed.
+
+If BRANCH isn't merged into its upstream, TARGET is nil, and
+`HEAD' is detached, then return nil, even when BRANCH is merged
+into `HEAD' or some local branch.
+
+BRANCH can also be a revision or non-branch reference, though in
+that case the upstream check obviously is meaningless and always
+fails."
+  (or (magit-branch-merged-into-upstream-p branch)
+      (if (eq target t)
+          (delete (magit-name-local-branch branch)
+                  (magit-list-containing-branches branch))
+        (--when-let (or target (magit-get-current-branch))
+          (magit-git-success "merge-base" "--is-ancestor" branch it)))))
+
+(defun magit-branch-merged-into-upstream-p (branch)
+  "Return t if BRANCH is merged into its upstream."
+  (--when-let (magit-get-upstream-branch branch)
+    (magit-git-success "merge-base" "--is-ancestor" branch it)))
+
 (defun magit-split-branch-name (branch)
   (cond ((member branch (magit-list-local-branch-names))
          (cons "." branch))
@@ -1008,7 +1053,7 @@ which is different from the current branch and still exists."
 (defun magit-get-current-tag (&optional rev with-distance)
   "Return the closest tag reachable from REV.
 
-If optional REV is nil then default to `HEAD'.
+If optional REV is nil, then default to `HEAD'.
 If optional WITH-DISTANCE is non-nil then return (TAG COMMITS),
 if it is `dirty' return (TAG COMMIT DIRTY). COMMITS is the number
 of commits in `HEAD' but not in TAG and DIRTY is t if there are
@@ -1027,10 +1072,10 @@ uncommitted changes, nil otherwise."
 (defun magit-get-next-tag (&optional rev with-distance)
   "Return the closest tag from which REV is reachable.
 
-If optional REV is nil then default to `HEAD'.
+If optional REV is nil, then default to `HEAD'.
 If no such tag can be found or if the distance is 0 (in which
-case it is the current tag, not the next) return nil instead.
-If optional WITH-DISTANCE is non-nil then return (TAG COMMITS)
+case it is the current tag, not the next), return nil instead.
+If optional WITH-DISTANCE is non-nil, then return (TAG COMMITS)
 where COMMITS is the number of commits in TAG but not in REV."
   (--when-let (magit-git-str "describe" "--contains" (or rev "HEAD"))
     (save-match-data
@@ -1183,6 +1228,9 @@ PATH has to be relative to the super-repository."
             ((string-equal line "detached"))))
     (nreverse worktrees)))
 
+(defun magit-symbolic-ref-p (name)
+  (magit-git-success "symbolic-ref" "--quiet" name))
+
 (defun magit-ref-p (rev)
   (or (car (member rev (magit-list-refs)))
       (car (member rev (magit-list-refnames)))))
@@ -1363,7 +1411,7 @@ Return a list of two integers: (A>B B>A)."
 
 (defun magit-commit-worktree (message &optional arg &rest other-parents)
   (magit-with-temp-index "HEAD" arg
-    (and (magit-update-files (magit-modified-files))
+    (and (magit-update-files (magit-unstaged-files))
          (apply #'magit-commit-tree message nil "HEAD" other-parents))))
 
 (defun magit-update-files (files)

Binary file

@@ -0,0 +1,243 @@
+;;; magit-imenu.el --- Integrate Imenu in magit major modes  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2010-2017  The Magit Project Contributors
+;;
+;; You should have received a copy of the AUTHORS.md file which
+;; lists all contributors.  If not, see http://magit.vc/authors.
+
+;; Author: Damien Cassou <damien@cassou.me>
+;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
+
+;; Magit is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; Magit is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+;; License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see http://www.gnu.org/licenses.
+
+;;; Commentary:
+
+;; Emacs' major modes can facilitate navigation in their buffers by
+;; supporting Imenu.  In such major modes, launching Imenu (M-x imenu)
+;; makes Emacs display a list of items (e.g., function definitions in
+;; a programming major mode).  Selecting an item from this list moves
+;; point to this item.
+
+;; magit-imenu.el adds Imenu support to every major mode in Magit
+
+;;; Code:
+
+(require 'subr-x)
+
+(require 'magit)
+(require 'git-rebase)
+
+(defun magit-imenu--index-function (entry-types menu-types)
+  "Return an alist of imenu entries in current buffer.
+
+ENTRY-TYPES is a list of section types to be selected through
+`imenu'.
+
+MENU-TYPES is a list of section types containing elements of
+ENTRY-TYPES.  Elements of MENU-TYPES are are used to categories
+elements of ENTRY-TYPES.
+
+This function is used as a helper for functions set as
+`imenu-create-index-function'."
+  (let ((entries (make-hash-table :test 'equal)))
+    (goto-char (point-max))
+    (while (magit-section--backward-find
+            (lambda ()
+              (let* ((section (magit-current-section))
+                     (type (magit-section-type section))
+                     (parent (magit-section-parent section))
+                     (parent-type (magit-section-type parent)))
+                (and (-contains-p entry-types type)
+                     (-contains-p menu-types parent-type)))))
+      (let* ((section (magit-current-section))
+             (name (buffer-substring-no-properties
+                    (line-beginning-position)
+                    (line-end-position)))
+             (parent (magit-section-parent section))
+             (parent-title (buffer-substring-no-properties
+                            (magit-section-start parent)
+                            (1- (magit-section-content parent)))))
+        (puthash parent-title
+                 (cons (cons name (point))
+                       (gethash parent-title entries (list)))
+                 entries)))
+    (-map (lambda (menu-title)
+            (cons menu-title (gethash menu-title entries)))
+          (hash-table-keys entries))))
+
+;;; Log mode
+
+;;;###autoload
+(defun magit-imenu--log-prev-index-position-function ()
+  "Move point to previous line in current buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'."
+  (magit-section--backward-find
+   (lambda ()
+     (-contains-p '(commit stash)
+                  (magit-section-type (magit-current-section))))))
+
+;;;###autoload
+(defun magit-imenu--log-extract-index-name-function ()
+  "Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line."
+  (save-match-data
+    (looking-at "\\([^ ]+\\)[ *|]+\\(.+\\)$")
+    (format "%s: %s"
+            (match-string-no-properties 1)
+            (match-string-no-properties 2))))
+
+;;; Diff mode
+
+;;;###autoload
+(defun magit-imenu--diff-prev-index-position-function ()
+  "Move point to previous file line in current buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'."
+  (magit-section--backward-find
+   (lambda ()
+     (and (equal (magit-section-type (magit-current-section)) 'file)
+          (not (equal (magit-section-type
+                       (magit-section-parent (magit-current-section)))
+                      'diffstat))))))
+
+;;;###autoload
+(defun magit-imenu--diff-extract-index-name-function ()
+  "Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line."
+  (buffer-substring-no-properties (line-beginning-position)
+                                  (line-end-position)))
+
+;;; Status mode
+
+;;;###autoload
+(defun magit-imenu--status-create-index-function ()
+  "Return an alist of all imenu entries in current buffer.
+This function is used as a value for
+`imenu-create-index-function'."
+  (magit-imenu--index-function
+   '(file commit stash)
+   '(unpushed unstaged unpulled untracked staged stashes)))
+
+;;;; Refs mode
+
+;;;###autoload
+(defun magit-imenu--refs-create-index-function ()
+  "Return an alist of all imenu entries in current buffer.
+This function is used as a value for
+`imenu-create-index-function'."
+  (magit-imenu--index-function
+   '(branch commit tag)
+   '(local remote tags)))
+
+;;;; Cherry mode
+
+;;;###autoload
+(defun magit-imenu--cherry-create-index-function ()
+  "Return an alist of all imenu entries in current buffer.
+This function is used as a value for
+`imenu-create-index-function'."
+  (magit-imenu--index-function
+   '(commit)
+   '(cherries)))
+
+;;;; Submodule list mode
+
+;;;###autoload
+(defun magit-imenu--submodule-prev-index-position-function ()
+  "Move point to previous line in magit-submodule-list buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'."
+  (unless (bobp)
+    (forward-line -1)))
+
+;;;###autoload
+(defun magit-imenu--submodule-extract-index-name-function ()
+  "Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line."
+  (elt (tabulated-list-get-entry) 0))
+
+;;;; Repolist mode
+
+;;;###autoload
+(defun magit-imenu--repolist-prev-index-position-function ()
+  "Move point to previous line in magit-repolist buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'."
+  (unless (bobp)
+    (forward-line -1)))
+
+;;;###autoload
+(defun magit-imenu--repolist-extract-index-name-function ()
+  "Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line."
+  (let ((entry (tabulated-list-get-entry)))
+    (format "%s (%s)"
+            (elt entry 0)
+            (elt entry (1- (length entry))))))
+
+;;;; Process mode
+
+;;;###autoload
+(defun magit-imenu--process-prev-index-position-function ()
+  "Move point to previous process in magit-process buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'."
+  (magit-section--backward-find
+   (lambda ()
+     (eq
+      (magit-section-type (magit-current-section))
+      'process))))
+
+;;;###autoload
+(defun magit-imenu--process-extract-index-name-function ()
+  "Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line."
+  (buffer-substring-no-properties (line-beginning-position)
+                                  (line-end-position)))
+
+;;;; Rebase mode
+
+;;;###autoload
+(defun magit-imenu--rebase-prev-index-position-function ()
+  "Move point to previous commit in git-rebase buffer.
+This function is used as a value for
+`imenu-prev-index-position-function'."
+  (catch 'found
+    (while (not (bobp))
+      (git-rebase-backward-line)
+      (when (git-rebase-line-p)
+        (throw 'found t)))))
+
+;;;###autoload
+(defun magit-imenu--rebase-extract-index-name-function ()
+  "Return imenu name for line at point.
+This function is used as a value for
+`imenu-extract-index-name-function'.  Point should be at the
+beginning of the line."
+  (buffer-substring-no-properties (line-beginning-position)
+                                  (line-end-position)))
+
+(provide 'magit-imenu)
+;;; magit-imenu.el ends here

Binary file

@@ -425,21 +425,27 @@ the upstream isn't ahead of the current branch) show."
     (?a "[a]uthor date"    "author-date")
     (?c "[c]ommitter date" "date")))
 
+(defun magit-log-get-buffer-args ()
+  (cond ((and magit-use-sticky-arguments
+              (derived-mode-p 'magit-log-mode))
+         (list (nth 1 magit-refresh-args)
+               (nth 2 magit-refresh-args)))
+        ((and (eq magit-use-sticky-arguments t)
+              (--when-let (magit-mode-get-buffer 'magit-log-mode)
+                (with-current-buffer it
+                  (list (nth 1 magit-refresh-args)
+                        (nth 2 magit-refresh-args))))))
+        (t
+         (list (default-value 'magit-log-arguments) nil))))
+
 (defun magit-log-arguments (&optional refresh)
   (cond ((memq magit-current-popup
                '(magit-log-popup magit-log-refresh-popup))
          (magit-popup-export-file-args magit-current-popup-args))
-        ((derived-mode-p 'magit-log-mode)
-         (list (nth 1 magit-refresh-args)
-               (nth 2 magit-refresh-args)))
-        (refresh
+        ((and refresh (not (derived-mode-p 'magit-log-mode)))
          (list magit-log-section-arguments nil))
         (t
-         (-if-let (buffer (magit-mode-get-buffer 'magit-log-mode))
-             (with-current-buffer buffer
-               (list (nth 1 magit-refresh-args)
-                     (nth 2 magit-refresh-args)))
-           (list (default-value 'magit-log-arguments) nil)))))
+         (magit-log-get-buffer-args))))
 
 (defun magit-log-popup (arg)
   "Popup console for log commands."
@@ -449,11 +455,7 @@ the upstream isn't ahead of the current branch) show."
            (`magit-log-mode magit-log-mode-refresh-popup)
            (_               magit-log-refresh-popup)))
         (magit-log-arguments
-         (-if-let (buffer (magit-mode-get-buffer 'magit-log-mode))
-             (with-current-buffer buffer
-               (magit-popup-import-file-args (nth 1 magit-refresh-args)
-                                             (nth 2 magit-refresh-args)))
-           (default-value 'magit-log-arguments))))
+         (apply #'magit-popup-import-file-args (magit-log-get-buffer-args))))
     (magit-invoke-popup 'magit-log-popup nil arg)))
 
 ;;;###autoload
@@ -781,7 +783,11 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point.
 
 \\{magit-log-mode-map}"
   :group 'magit-log
-  (hack-dir-local-variables-non-file-buffer))
+  (hack-dir-local-variables-non-file-buffer)
+  (setq imenu-prev-index-position-function
+        'magit-imenu--log-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        'magit-imenu--log-extract-index-name-function))
 
 (defvar magit-log-disable-graph-hack-args
   '("-G" "--grep" "--author")
@@ -1080,8 +1086,8 @@ When the use of a section movement command puts point on that
 button, then automatically show more commits, without the user
 having to press \"+\".
 
-This function is called `magit-section-movement-hook',
-and exists mostly for backward compatibility reasons."
+This function is called by `magit-section-movement-hook' and
+exists mostly for backward compatibility reasons."
   (when (and (eq (magit-section-type section) 'longer)
              magit-log-auto-more)
     (magit-log-double-commit-limit)
@@ -1103,13 +1109,14 @@ If there is no revision buffer in the same frame, then do nothing."
       (setq magit--update-revision-buffer (list commit buffer))
       (run-with-idle-timer
        magit-update-other-window-delay nil
-       (lambda ()
-         (-let [(rev buf) magit--update-revision-buffer]
-           (setq magit--update-revision-buffer nil)
-           (when (buffer-live-p buf)
-             (let ((magit-display-buffer-noselect t))
-               (apply #'magit-show-commit rev (magit-diff-arguments)))))
-         (setq magit--update-revision-buffer nil))))))
+       (let ((args (magit-show-commit--arguments)))
+         (lambda ()
+           (-let [(rev buf) magit--update-revision-buffer]
+             (setq magit--update-revision-buffer nil)
+             (when (buffer-live-p buf)
+               (let ((magit-display-buffer-noselect t))
+                 (apply #'magit-show-commit rev args))))
+           (setq magit--update-revision-buffer nil)))))))
 
 (defvar magit--update-blob-buffer nil)
 
@@ -1293,7 +1300,9 @@ Type \\[magit-cherry-pick-popup] to apply the commit at point.
 
 \\{magit-cherry-mode-map}"
   :group 'magit-log
-  (hack-dir-local-variables-non-file-buffer))
+  (hack-dir-local-variables-non-file-buffer)
+  (setq imenu-create-index-function
+        'magit-imenu--cherry-create-index-function))
 
 ;;;###autoload
 (defun magit-cherry (head upstream)

Binary file

File renamed without changes

Binary file

@@ -189,6 +189,43 @@ support additional %-sequences."
                 (function-item magit-restore-window-configuration)
                 (function :tag "Function")))
 
+(defcustom magit-use-sticky-arguments t
+  "How to reuse arguments from existing diff and log buffers.
+
+nil       Always use the default value of the variable
+          `magit-log-arguments' for log commands.  Likewise,
+          always use the default value of the variable
+          `magit-diff-arguments' for diff command calls.
+
+current   If the mode of the current buffer is derived from
+          `magit-log-mode' or `magit-diff-mode', reuse the
+          arguments from that buffer instead of those given by
+          the variable `magit-log-arguments' or
+          `magit-diff-arguments', respectively.
+
+t         Like `current', but if the mode of the current buffer
+          is not derived from `magit-log-mode' or
+          `magit-diff-mode', use the arguments from the current
+          repository's active (i.e. non-locked) `magit-log-mode'
+          or `magit-diff-mode' buffer, respectively, if it
+          exists.
+
+          Note that commands that generate a
+          `magit-revision-mode' or `magit-stash-mode' buffer will
+          also collect their diff arguments from the active
+          `magit-diff-mode' buffer.
+
+In general, there is a separation between the \"sticky\"
+arguments for log and diff buffers, but there is one special
+case: if the current buffer is a log buffer,
+`magit-show-commit' (considered a diff command) uses the file
+filter from the log buffer."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-buffers
+  :type '(choice (const :tag "disabled" nil)
+                 (const :tag "sticky for current" current)
+                 (const :tag "sticky" t)))
+
 (defcustom magit-region-highlight-hook
   '(magit-section-update-region magit-diff-update-hunk-region)
   "Functions used to highlight the region.
@@ -230,10 +267,10 @@ improve performance."
 (defcustom magit-save-repository-buffers t
   "Whether to save file-visiting buffers when appropriate.
 
-If non-nil then all modified file-visiting buffers belonging
+If non-nil, then all modified file-visiting buffers belonging
 to the current repository may be saved before running Magit
 commands and before creating or refreshing Magit buffers.
-If `dontask' then this is done without user intervention, for
+If `dontask', then this is done without user intervention, for
 any other non-nil value the user has to confirm each save.
 
 The default is t to avoid surprises, but `dontask' is the
@@ -1036,14 +1073,16 @@ buffer which visits a file in the current repository.  Optional
 argument (the prefix) non-nil means save all with no questions."
   (interactive "P")
   (-when-let (topdir (magit-rev-parse-safe "--show-toplevel"))
-    (save-some-buffers
-     arg (-partial (lambda (topdir)
-                     (and buffer-file-name
-                          ;; Avoid needlessly connecting to unrelated remotes.
-                          (string-prefix-p topdir (file-truename buffer-file-name))
-                          (equal (magit-rev-parse-safe "--show-toplevel")
-                                 topdir)))
-                   topdir))))
+    (let ((remote (file-remote-p topdir)))
+      (save-some-buffers
+       arg (lambda ()
+             (and buffer-file-name
+                  ;; Avoid needlessly connecting to unrelated remotes.
+                  (equal (file-remote-p buffer-file-name)
+                         remote)
+                  (string-prefix-p topdir (file-truename buffer-file-name))
+                  (equal (magit-rev-parse-safe "--show-toplevel")
+                         topdir)))))))
 
 ;;; Restore Window Configuration

Binary file

@@ -92,7 +92,7 @@ undefined."
 The current notes ref is the value of Git variable
 `core.notesRef' or \"refs/notes/commits\" if that is undefined.
 
-When there are conflict, then they have to resolved in the
+When there are conflicts, then they have to be resolved in the
 temporary worktree \".git/NOTES_MERGE_WORKTREE\".  When
 done use `magit-notes-merge-commit' to finish.  To abort
 use `magit-notes-merge-abort'."

Binary file

@@ -121,5 +121,10 @@ use `magit-pre-refresh-hook', `magit-post-refresh-hook',
 (define-obsolete-function-alias 'magit-checkout-file
   'magit-file-checkout "Magit 2.9.1")
 
+;;; Obsolete since v2.11.0
+
+(define-obsolete-function-alias 'magit-modified-files
+  'magit-unstaged-files "Magit 2.11.0")
+
 (provide 'magit-obsolete)
 ;;; magit-obsolete.el ends here

Binary file

@@ -1,4 +1,4 @@
-(define-package "magit" "20170425.638" "A Git porcelain inside Emacs"
+(define-package "magit" "20170531.1739" "A Git porcelain inside Emacs"
   '((emacs "24.4")
     (async "20170219.942")
     (dash "20170207.2056")

@@ -208,7 +208,11 @@ non-nil, then the password is read from the user instead."
 (define-derived-mode magit-process-mode magit-mode "Magit Process"
   "Mode for looking at Git process output."
   :group 'magit-process
-  (hack-dir-local-variables-non-file-buffer))
+  (hack-dir-local-variables-non-file-buffer)
+  (setq imenu-prev-index-position-function
+        'magit-imenu--process-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        'magit-imenu--process-extract-index-name-function))
 
 (defun magit-process-buffer (&optional nodisplay)
   "Display the current repository's process buffer.

Binary file

@@ -128,7 +128,7 @@ in another buffer.
 However \"RET\" used to behave differently in `magit-refs-mode'
 buffers, doing surprising things, some of which cannot really be
 described as \"visit this thing\".  If you have grown accustomed
-to such inconsistent, but to you useful, behavior then you can
+to such inconsistent, but to you useful, behavior, then you can
 restore that by adding one or more of the below symbols to the
 value of this option.  But keep in mind that by doing so you
 don't only introduce inconsistencies, you also lose some
@@ -205,7 +205,9 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point.
 
 \\{magit-refs-mode-map}"
   :group 'magit-refs
-  (hack-dir-local-variables-non-file-buffer))
+  (hack-dir-local-variables-non-file-buffer)
+  (setq imenu-create-index-function
+        #'magit-imenu--refs-create-index-function))
 
 (defun magit-refs-refresh-buffer (&rest _ignore)
   (setq magit-set-buffer-margin-refresh (not (magit-buffer-margin-p)))

Binary file

@@ -58,7 +58,7 @@ Then show the status buffer for the new repository."
    (let  ((url (magit-read-string-ns "Clone repository")))
      (list url (read-directory-name
                 "Clone to: " nil nil nil
-                (and (string-match "\\([^./]+\\)\\(\\.git\\)?$" url)
+                (and (string-match "\\([^/:]+?\\)\\(/?\\.git\\)?$" url)
                      (match-string 1 url))))))
   (setq directory (file-name-as-directory (expand-file-name directory)))
   (magit-run-git-async "clone" repository

Binary file

@@ -158,7 +158,11 @@ control which repositories are displayed."
                            (nconc (list title width t)
                                   (-flatten props)))
                          magit-repolist-columns)))
-  (tabulated-list-init-header))
+  (tabulated-list-init-header)
+  (setq imenu-prev-index-position-function
+        'magit-imenu--repolist-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        'magit-imenu--repolist-extract-index-name-function))
 
 ;;;; Columns
 
@@ -197,7 +201,7 @@ Show U if there is at least one unstaged file.
 Show S if there is at least one staged file.
 Only one letter is shown, the first that applies."
   (cond ((magit-untracked-files) "N")
-        ((magit-modified-files)  "U")
+        ((magit-unstaged-files)  "U")
         ((magit-staged-files)    "S")))
 
 (defun magit-repolist-column-unpulled-from-upstream (_id)

Binary file

@@ -24,7 +24,7 @@
 ;;; Commentary:
 
 ;; This library implements "sections" as used in all Magit buffers.
-;; If you have used Magit before then you probably know what that
+;; If you have used Magit before, then you probably know what that
 ;; means, otherwise think "read-only Org-Mode for Git", kinda.
 
 ;;; Code:
@@ -98,7 +98,7 @@ diff-related sections being the only exception."
     magit-section-set-visibility-from-cache)
   "Hook used to set the initial visibility of a section.
 Stop at the first function that returns non-nil.  The value
-should be `show' or `hide'.  If no function returns non-nil
+should be `show' or `hide'.  If no function returns non-nil,
 determine the visibility as usual, i.e. use the hardcoded
 section specific default (see `magit-insert-section')."
   :package-version '(magit . "2.4.0")
@@ -466,7 +466,7 @@ SECTION's body (and heading) obviously cannot be visible."
 
 (defun magit-section-show-level (level)
   "Show surrounding sections up to LEVEL.
-If LEVEL is negative show up to the absolute value.
+If LEVEL is negative, show up to the absolute value.
 Sections at higher levels are hidden."
   (if (< level 0)
       (let ((s (magit-current-section)))
@@ -588,13 +588,13 @@ precise."
              (magit-section-match-2 (cdr l1) (cdr l2))))))
 
 (defmacro magit-section-when (condition &rest body)
-  "If the section at point matches CONDITION evaluate BODY.
+  "If the section at point matches CONDITION, evaluate BODY.
 
 If the section matches, then evaluate BODY forms sequentially
 with `it' bound to the section and return the value of the last
 form.  If there are no BODY forms, then return the value of the
 section.  If the section does not match or if there is no section
-at point then return nil.
+at point, then return nil.
 
 See `magit-section-match' for the forms CONDITION can take."
   (declare (indent 1)
@@ -616,7 +616,7 @@ section is compared against each CONDITION; the BODY forms of the
 first match are evaluated sequentially and the value of the last
 form is returned.  Inside BODY the symbol `it' is bound to the
 section at point.  If no clause succeeds or if there is no
-section at point return nil.
+section at point, return nil.
 
 See `magit-section-match' for the forms CONDITION can take.
 Additionally a CONDITION of t is allowed in the final clause, and
@@ -770,7 +770,7 @@ The `content' property of the section struct is the end of the
 heading (which lasts from `start' to `content') and the beginning
 of the the body (which lasts from `content' to `end').  If the
 value of `content' is nil, then the section has no heading and
-its body cannot be collapsed.  If a section does have a heading
+its body cannot be collapsed.  If a section does have a heading,
 then its height must be exactly one line, including a trailing
 newline character.  This isn't enforced, you are responsible for
 getting it right.  The only exception is that this function does
@@ -885,7 +885,7 @@ highlighted using `magit-diff-highlight'.  Return t."
 
 (defun magit-section-highlight-selection (_ selection)
   "Highlight the section-selection region.
-If SELECTION is non-nil then it is a list of sections selected by
+If SELECTION is non-nil, then it is a list of sections selected by
 the region.  The headings of these sections are then highlighted.
 
 This is a fallback for people who don't want to highlight the
@@ -1032,9 +1032,9 @@ either `hide' or nil."
 (defun magit-section-siblings (section &optional direction)
   "Return a list of the sibling sections of SECTION.
 
-If optional DIRECTION is `prev' then return siblings that come
-before SECTION, if it is `next' then return siblings that come
-after SECTION.  For all other values return all siblings
+If optional DIRECTION is `prev', then return siblings that come
+before SECTION.  If it is `next', then return siblings that come
+after SECTION.  For all other values, return all siblings
 excluding SECTION itself."
   (-when-let (parent (magit-section-parent section))
     (let ((siblings  (magit-section-children parent)))
@@ -1072,7 +1072,7 @@ apply to diffs where things get a bit more complicated, but even
 here if the region looks like it usually does, then that's not
 a valid selection as far as this function is concerned.
 
-If optional TYPES is non-nil then the selection not only has to
+If optional TYPES is non-nil, then the selection not only has to
 be valid; the types of all selected sections additionally have to
 match one of TYPES, or nil is returned."
   (when (use-region-p)
@@ -1113,6 +1113,27 @@ If optional SECTION is nil, use the current section."
                 (magit-section-position-in-heading-p section (region-end))))
        t))
 
+(defun magit-section--backward-protected ()
+  "Move to the beginning of the current or the previous visible section.
+Same as `magit-section-backward' but for non-interactive use.
+Suppress `magit-section-movement-hook', and return a boolean to
+indicate whether a section was found, instead of raising an error
+if not."
+  (condition-case nil
+      (let ((magit-section-movement-hook nil))
+        (magit-section-backward)
+        t)
+    (user-error nil)))
+
+(defun magit-section--backward-find (predicate)
+  "Move to the first previous section satisfying PREDICATE.
+PREDICATE does not take any parameter and should not move
+point."
+  (let (found)
+    (while (and (setq found (magit-section--backward-protected))
+                (not (funcall predicate))))
+    found))
+
 (defun magit-wash-sequence (function)
   "Repeatedly call FUNCTION until it returns nil or eob is reached.
 FUNCTION has to move point forward or return nil."
@@ -1123,7 +1144,7 @@ FUNCTION has to move point forward or return nil."
 
 Add FUNCTION at the beginning of the hook list unless optional
 APPEND is non-nil, in which case FUNCTION is added at the end.
-If FUNCTION already is a member then move it to the new location.
+If FUNCTION already is a member, then move it to the new location.
 
 If optional AT is non-nil and a member of the hook list, then
 add FUNCTION next to that instead.  Add before or after AT, or

Binary file

File renamed without changes

Binary file

@@ -262,7 +262,7 @@ When the region is active offer to drop all contained stashes."
 (defun magit-stash-save (message index worktree untracked
                                  &optional refresh keep noerror ref)
   (if (or (and index     (magit-staged-files t))
-          (and worktree  (magit-modified-files t))
+          (and worktree  (magit-unstaged-files t))
           (and untracked (magit-untracked-files (eq untracked 'all))))
       (magit-with-toplevel
         (magit-stash-store message (or ref "refs/stash")
@@ -344,8 +344,8 @@ When the region is active offer to drop all contained stashes."
 (cl-defun magit-insert-stashes (&optional (ref   "refs/stash")
                                           (heading "Stashes:"))
   "Insert `stashes' section showing reflog for \"refs/stash\".
-If optional REF is non-nil show reflog for that instead.
-If optional HEADING is non-nil use that as section heading
+If optional REF is non-nil, show reflog for that instead.
+If optional HEADING is non-nil, use that as section heading
 instead of \"Stashes:\"."
   (when (magit-rev-verify ref)
     (magit-insert-section (stashes ref (not magit-status-expand-stashes))

Binary file

@@ -29,6 +29,8 @@
 
 (require 'magit)
 
+(require 'subr-x)
+
 ;;; Options
 
 (defgroup magit-status nil
@@ -166,7 +168,7 @@ Non-interactively DIRECTORY is (re-)initialized unconditionally."
   "Show the status of the current Git repository in a buffer.
 With a prefix argument prompt for a repository to be shown.
 With two prefix arguments prompt for an arbitrary directory.
-If that directory isn't the root of an existing repository
+If that directory isn't the root of an existing repository,
 then offer to initialize it as a new repository."
   (interactive
    (list (and (or current-prefix-arg (not (magit-toplevel)))
@@ -205,7 +207,7 @@ then offer to initialize it as a new repository."
             (display-warning 'magit (format "\
 Magit requires Git >= %s, but on %s the version is %s.
 
-If multiple Git versions are installed on the host then the
+If multiple Git versions are installed on the host, then the
 problem might be that TRAMP uses the wrong executable.
 
 First check the value of `magit-git-executable'.  Its value is
@@ -274,6 +276,8 @@ Type \\[magit-commit-popup] to create a commit.
 \\{magit-status-mode-map}"
   :group 'magit-status
   (hack-dir-local-variables-non-file-buffer)
+  (setq imenu-create-index-function
+        'magit-imenu--status-create-index-function)
   ;; Avoid listing all files as deleted when visiting a bare repo.
   (when (magit-bare-repo-p)
     (make-local-variable 'magit-status-sections-hook)

Binary file

@@ -80,7 +80,8 @@ an alist that supports the keys `:right-align' and `:pad-right'."
               (?u "Update" magit-submodule-update)
               (?s "Sync"   magit-submodule-sync)
               (?f "Fetch"  magit-submodule-fetch)
-              (?d "Deinit" magit-submodule-deinit)))
+              (?d "Deinit" magit-submodule-deinit)
+              (?l "List"   magit-list-submodules)))
 
 ;;;###autoload
 (defun magit-submodule-add (url &optional path name)
@@ -339,7 +340,11 @@ These sections can be expanded to show the respective commits."
                            (nconc (list title width t)
                                   (-flatten props)))
                          magit-submodule-list-columns)))
-  (tabulated-list-init-header))
+  (tabulated-list-init-header)
+  (setq imenu-prev-index-position-function
+        #'magit-imenu--submodule-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        #'magit-imenu--submodule-extract-index-name-function))
 
 (defun magit-modulelist-column-path (path)
   "Insert the relative path of the submodule."

Binary file

@@ -88,13 +88,15 @@
   (magit-run-git-async "subtree" subcmd (concat "--prefix=" prefix) args))
 
 ;;;###autoload
-(defun magit-subtree-add (prefix repository commit args)
-  "Add COMMIT from REPOSITORY as a new subtree at PREFIX."
-  (interactive (list (magit-subtree-prefix "Add subtree")
-                     (magit-read-string-ns "Repository")
-                     (magit-read-string-ns "Commit")
-                     (magit-subtree-args)))
-  (magit-git-subtree "add" prefix args repository commit))
+(defun magit-subtree-add (prefix repository ref args)
+  "Add REF from REPOSITORY as a new subtree at PREFIX."
+  (interactive
+   (cons (magit-subtree-prefix "Add subtree")
+         (let ((remote (magit-read-remote-or-url "From repository")))
+           (list remote
+                 (magit-read-refspec "Ref" remote)
+                 (magit-subtree-args)))))
+  (magit-git-subtree "add" prefix args repository ref))
 
 ;;;###autoload
 (defun magit-subtree-add-commit (prefix commit args)
@@ -113,19 +115,21 @@
   (magit-git-subtree "merge" prefix args commit))
 
 ;;;###autoload
-(defun magit-subtree-pull (prefix repository commit args)
-  "Pull COMMIT from REPOSITORY into the PREFIX subtree."
-  (interactive (list (magit-subtree-prefix "Pull into subtree")
-                     (magit-read-string-ns "From repository")
-                     (magit-read-string-ns "Commit")
-                     (magit-subtree-args)))
-  (magit-git-subtree "pull" prefix args repository commit))
+(defun magit-subtree-pull (prefix repository ref args)
+  "Pull REF from REPOSITORY into the PREFIX subtree."
+  (interactive
+   (cons (magit-subtree-prefix "Pull into subtree")
+         (let ((remote (magit-read-remote-or-url "From repository")))
+           (list remote
+                 (magit-read-refspec "Ref" remote)
+                 (magit-subtree-args)))))
+  (magit-git-subtree "pull" prefix args repository ref))
 
 ;;;###autoload
 (defun magit-subtree-push (prefix repository ref args)
   "Extract the history of the subtree PREFIX and push it to REF on REPOSITORY."
   (interactive (list (magit-subtree-prefix "Push subtree")
-                     (magit-read-string-ns "To repository")
+                     (magit-read-remote-or-url "To repository")
                      (magit-read-string-ns "To reference")
                      (magit-subtree-args)))
   (magit-git-subtree "push" prefix args repository ref))

Binary file

@@ -57,16 +57,22 @@
 (defcustom magit-completing-read-function 'magit-builtin-completing-read
   "Function to be called when requesting input from the user.
 
-For Helm users, the simplest way to get Helm completion is to
-turn on `helm-mode' and leave this option set to the default
-value.  However, if you prefer to not use `helm-mode' but still
-want Magit to use Helm for completion, you can set this option to
-`helm--completing-read-default'."
+If you have enabled `ivy-mode' or `helm-mode', then you don't
+have to customize this option; `magit-builtin-completing-read'
+will work just fine.  However, if you use Ido completion, then
+you do have to use `magit-ido-completion-read', because Ido is
+less well behaved than the former, more modern alternatives.
+
+If you would like to use Ivy or Helm completion with Magit but
+not enable the respective modes globally, then customize this
+option to use `ivy-completing-read'
+or `helm--completing-read-default'."
   :group 'magit-essentials
   :type '(radio (function-item magit-builtin-completing-read)
                 (function-item magit-ido-completing-read)
+                (function-item ivy-completing-read)
                 (function-item helm--completing-read-default)
-                (function :tag "Other")))
+                (function :tag "Other function")))
 
 (defcustom magit-no-confirm-default nil
   "A list of commands which should just use the default choice.
@@ -198,7 +204,7 @@ Global settings:
   When `magit-wip-before-change-mode' is enabled then these actions
   can fairly easily be undone: `discard', `reverse',
   `stage-all-changes', and `unstage-all-changes'.  If and only if
-  this mode is enabled then `safe-with-wip' has the same effect
+  this mode is enabled, then `safe-with-wip' has the same effect
   as adding all of these symbols individually."
   :package-version '(magit . "2.1.0")
   :group 'magit-essentials
@@ -320,7 +326,11 @@ that this wrapper makes the following changes:
 The use of another completing function and/or wrapper obviously
 results in additional differences."
   (let ((reply (funcall magit-completing-read-function
-                        (concat prompt ": ") collection predicate
+                        (concat prompt ": ")
+                        (if (and def (not (member def collection)))
+                            (cons def collection)
+                          collection)
+                        predicate
                         require-match initial-input hist def)))
     (if (string= reply "")
         (if require-match
@@ -339,7 +349,10 @@ results in additional differences."
   "Magit wrapper for standard `completing-read' function."
   (cl-letf (((symbol-function 'completion-pcm--all-completions)
              #'magit-completion-pcm--all-completions))
-    (completing-read (magit-prompt-with-default prompt def)
+    (completing-read (if (or (bound-and-true-p helm-mode)
+                             (bound-and-true-p ivy-mode))
+                         prompt
+                       (magit-prompt-with-default prompt def))
                      (magit--completion-table choices)
                      predicate require-match
                      initial-input hist def)))
@@ -551,7 +564,7 @@ See info node `(magit)Debugging Tools' for more information."
   "Bind variables to submatches according to VARLIST then evaluate BODY.
 Bind the symbols in VARLIST to submatches of the current match
 data, starting with 1 and incrementing by 1 for each symbol.  If
-the last match was against a string then that has to be provided
+the last match was against a string, then that has to be provided
 as STRING."
   (declare (indent 2) (debug (listp form body)))
   (let ((s (cl-gensym "string"))
@@ -567,7 +580,7 @@ as STRING."
 
 (defun magit-delete-match (&optional num)
   "Delete text matched by last search.
-If optional NUM is specified only delete that subexpression."
+If optional NUM is specified, only delete that subexpression."
   (delete-region (match-beginning (or num 0))
                  (match-end (or num 0))))
 
@@ -641,43 +654,6 @@ and https://github.com/magit/magit/issues/2295."
           ;; `completion-pcm--all-completions' that shipped with Emacs 25.1.
           (nreverse poss))))))
 
-;;; Kludges for Org
-
-(eval-when-compile
-  (require 'org-element nil t)
-  (require 'ox-extra nil t))
-(declare-function org-element-adopt-elements  "org-element"
-                  (parent &rest children))
-(declare-function org-element-contents        "org-element" (element))
-(declare-function org-element-extract-element "org-element" (element))
-(declare-function org-element-map             "org-element"
-                  (data types fun &optional info
-                        first-match no-recursion with-affiliated))
-(declare-function org-element-type            "org-element" (element))
-
-(with-eval-after-load 'ox-extra ; see #2914
-  (defun org-extra--merge-sections (data _backend info)
-    (org-element-map data 'headline
-      (lambda (hl)
-        (let ((sections
-               (cl-loop
-                for el in (org-element-map (org-element-contents hl)
-                              '(headline section) #'identity info)
-                until (eq (org-element-type el) 'headline)
-                collect el)))
-          (when (and sections
-                     (> (length sections) 1))
-            (apply #'org-element-adopt-elements
-                   (car sections)
-                   (cl-mapcan (lambda (s) (org-element-contents s))
-                              (cdr sections)))
-            (mapc #'org-element-extract-element (cdr sections)))))
-      info))
-
-  (advice-add 'org-export-ignore-headlines :after
-              'org-extra--merge-sections
-              '((name . "org-export-ignore-headlines--merge-sections"))))
-
 ;;; Kludges for Incompatible Modes
 
 (defvar whitespace-mode)

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

@@ -668,7 +668,7 @@ the index number.  That number is incremented by one, and becomes
 the index number of the entry to be inserted.  If you don't want
 to number the inserted revisions, then use nil for INDEX-REGEXP.
 
-If INDEX-REGEXP is non-nil then both POINT-FORMAT and EOB-FORMAT
+If INDEX-REGEXP is non-nil, then both POINT-FORMAT and EOB-FORMAT
 should contain \"%N\", which is replaced with the number that was
 determined in the previous step.
 
@@ -700,7 +700,7 @@ the current buffer according to `magit-pop-revision-stack-format'.
 Revisions can be put on the stack using `magit-copy-section-value'
 and `magit-copy-buffer-revision'.
 
-If the stack is empty or with a prefix argument instead read a
+If the stack is empty or with a prefix argument, instead read a
 revision in the minibuffer.  By using the minibuffer history this
 allows selecting an item which was popped earlier or to insert an
 arbitrary reference or revision without first pushing it onto the
@@ -881,7 +881,7 @@ Use the function by the same name instead of this variable.")
 ;;;###autoload
 (defun magit-version (&optional print-dest)
   "Return the version of Magit currently in use.
-If optional argument PRINT-DEST is non-nil output
+If optional argument PRINT-DEST is non-nil, output
 stream (interactively, the echo area, or the current buffer with
 a prefix argument), also print the used versions of Magit, Git,
 and Emacs to it."
@@ -1063,7 +1063,8 @@ library getting in the way.  Then restart Emacs.\n"
     (require 'magit-subtree)
     (require 'magit-ediff)
     (require 'magit-extras)
-    (require 'git-rebase)))
+    (require 'git-rebase)
+    (require 'magit-imenu)))
 
 (if after-init-time
     (progn (magit-startup-asserts)

Binary file

@@ -0,0 +1,178 @@
+This is magit.info, produced by makeinfo version 5.2 from magit.texi.
+
+Magit is an interface to the version control system Git, implemented as
+an Emacs package.  Magit aspires to be a complete Git porcelain.  While
+we cannot (yet) claim that Magit wraps and improves upon each and every
+Git command, it is complete enough to allow even experienced Git users
+to perform almost all of their daily version control tasks directly from
+within Emacs.  While many fine Git clients exist, only Magit and Git
+itself deserve to be called porcelains.
+
+     Copyright (C) 2015-2017 Jonas Bernoulli <jonas@bernoul.li>
+
+     You can redistribute this document and/or modify it under the terms
+     of the GNU General Public License as published by the Free Software
+     Foundation, either version 3 of the License, or (at your option)
+     any later version.
+
+     This document is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+     General Public License for more details.
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Magit: (magit).       Using Git from Emacs with Magit.
+END-INFO-DIR-ENTRY
+
+
+Indirect:
+magit.info-1: 1222
+magit.info-2: 329199
+
+Tag Table:
+(Indirect)
+Node: Top1222
+Node: Introduction6098
+Node: Installation10821
+Node: Installing from an Elpa Archive11161
+Node: Installing from the Git Repository12287
+Node: Post-Installation Tasks14953
+Node: Getting Started16327
+Node: Interface Concepts21712
+Node: Modes and Buffers21986
+Node: Switching Buffers23731
+Node: Naming Buffers28272
+Node: Quitting Windows31107
+Node: Automatic Refreshing of Magit Buffers32739
+Node: Automatic Saving of File-Visiting Buffers35507
+Node: Automatic Reverting of File-Visiting Buffers36692
+Node: Risk of Reverting Automatically41688
+Node: Sections44071
+Node: Section Movement45012
+Node: Section Visibility48939
+Node: Section Hooks52414
+Node: Section Types and Values54695
+Node: Section Options55965
+Node: Popup Buffers and Prefix Commands56437
+Node: Completion and Confirmation58820
+Node: Running Git62104
+Node: Viewing Git Output62340
+Node: Running Git Manually63340
+Node: Git Executable65742
+Node: Global Git Arguments68024
+Node: Inspecting68830
+Node: Status Buffer69977
+Node: Status Sections72863
+Node: Status Header Sections78742
+Node: Status Options81299
+Node: Repository List83053
+Node: Logging85211
+Node: Refreshing Logs87743
+Node: Log Buffer89128
+Node: Log Margin91988
+Node: Select from Log94628
+Node: Reflog96732
+Node: Cherries98256
+Node: Diffing100001
+Node: Refreshing Diffs103019
+Node: Diff Buffer106000
+Node: Diff Options108585
+Node: Revision Buffer111955
+Node: Ediffing113407
+Node: References Buffer117003
+Node: References Sections124302
+Node: Bisecting125177
+Node: Visiting Blobs126915
+Node: Blaming127424
+Node: Manipulating130853
+Node: Repository Setup131169
+Node: Staging and Unstaging132209
+Node: Staging from File-Visiting Buffers136298
+Node: Applying137466
+Node: Committing139359
+Node: Initiating a Commit139942
+Node: Editing Commit Messages143253
+Node: Branching153649
+Node: The Two Remotes153849
+Node: The Branch Popup156474
+Node: The Branch Config Popup165819
+Node: Merging171722
+Node: Resolving Conflicts173889
+Node: Rebasing178898
+Node: Editing Rebase Sequences182538
+Node: Information About In-Progress Rebase185568
+Ref: Information About In-Progress Rebase-Footnote-1192404
+Node: Cherry Picking192990
+Node: Reverting194595
+Node: Resetting195958
+Node: Stashing197375
+Node: Transferring201569
+Node: Remotes201807
+Node: Fetching203085
+Node: Pulling204450
+Node: Pushing205295
+Node: Creating and Sending Patches210038
+Node: Applying Patches210733
+Node: Miscellaneous211730
+Node: Tagging212033
+Node: Notes212817
+Node: Submodules215341
+Node: Listing Submodules215555
+Node: Submodule Popup217374
+Node: Subtree218657
+Node: Common Commands219904
+Node: Wip Modes221649
+Node: Minor Mode for Buffers Visiting Files228445
+Node: Minor Mode for Buffers Visiting Blobs231919
+Node: Customizing232732
+Node: Per-Repository Configuration234404
+Node: Essential Settings236051
+Node: Safety236375
+Node: Performance238208
+Node: Microsoft Windows Performance245140
+Node: MacOS Performance246333
+Ref: MacOS Performance-Footnote-1247569
+Ref: MacOS Performance-Footnote-2247651
+Ref: MacOS Performance-Footnote-3247711
+Node: Plumbing247877
+Node: Calling Git248701
+Node: Getting a Value from Git250224
+Node: Calling Git for Effect253328
+Node: Section Plumbing259846
+Node: Creating Sections260074
+Node: Section Selection263973
+Node: Matching Sections265653
+Node: Refreshing Buffers271085
+Node: Conventions274220
+Node: Confirmation and Completion274397
+Node: Theming Faces275295
+Node: FAQ283446
+Node: FAQ - How to …?283903
+Node: How to show git's output?284267
+Node: How to install the gitman info manual?285021
+Node: How to show diffs for gpg-encrypted files?285991
+Node: How does branching and pushing work?286587
+Node: Can Magit be used as ‘ediff-version-control-package’?286966
+Node: FAQ - Issues and Errors288962
+Node: Magit is slow289706
+Node: I changed several thousand files at once and now Magit is unusable289931
+Node: I am having problems committing290671
+Node: I am using MS Windows and cannot push with Magit291152
+Node: I am using OS X and SOMETHING works in shell but not in Magit291769
+Node: Diffs contain control sequences292575
+Node: Expanding a file to show the diff causes it to disappear293649
+Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer294206
+Node: The mode-line information isn't always up-to-date295258
+Node: Emacs 245 hangs when loading Magit296325
+Node: Debugging Tools296875
+Node: Keystroke Index298627
+Node: Command Index329199
+Node: Function Index359865
+Node: Variable Index373175
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:

@@ -1522,6 +1522,30 @@ you should setup a global binding:
 
      (global-set-key (kbd "C-x M-g") 'magit-dispatch-popup)
 
+   Most popups set their initial arguments according to the
+corresponding ‘magit-*-arguments’ variable.  Two popups, the log and
+diff popups (see *note Logging: Logging. and *note Diffing: Diffing.),
+may behave a bit differently, depending on the value of
+‘magit-use-sticky-arguments’.
+
+ -- User Option: magit-use-sticky-arguments
+
+     This option controls how diff and log commands reuse arguments from
+     existing buffers.
+
+     When ‘t’ (the default value), the log or diff popup reuses the
+     arguments from the current repository’s log or diff buffer,
+     respectively.  When no log or diff buffer exists for the current
+     repository, these popups use the default value of
+     ‘magit-log-arguments’ or ‘magit-diff-arguments’.
+
+     When ‘current’, log and diff popups will only reuse the arguments
+     if the current buffer is derived from ‘magit-log-mode’ or
+     ‘magit-diff-mode’, respectively.
+
+     When ‘nil’, the default value of ‘magit-log-arguments’ or
+     ‘magit-diff-arguments’ is always used.
+
 
 File: magit.info,  Node: Completion and Confirmation,  Next: Running Git,  Prev: Popup Buffers and Prefix Commands,  Up: Interface Concepts
 
@@ -2252,11 +2276,11 @@ on ‘l’, features several suffix commands, which show a specific log in a
 separate log buffer.
 
    Like other popups, the log popup also features several arguments that
-can be changed before invoking one of the suffix commands.  However in
-case of the log popup these arguments correspond to those currently in
-use in the current repository’s log buffer.  When the log popup is
-invoked while no log buffer exists for the current repository yet, then
-the default value of ‘magit-log-arguments’ is used instead.
+can be changed before invoking one of the suffix commands.  However, in
+the case of the log popup, these arguments may be taken from those
+currently in use in the current repository’s log buffer, depending on
+the value of ‘magit-use-sticky-arguments’ (see *note Popup Buffers and
+Prefix Commands: Popup Buffers and Prefix Commands.).
 
    For information about the various arguments, see *note
 (gitman)git-log::.
@@ -2670,11 +2694,11 @@ on ‘d’, features several suffix commands, which show a specific diff in
 a separate diff buffer.
 
    Like other popups, the diff popup also features several arguments
-that can be changed before invoking one of the suffix commands.  However
-in case of the diff popup these arguments correspond to those currently
-in use in the current repository’s diff buffer.  When the diff popup is
-invoked while no diff buffer exists for the current repository yet, then
-the default value of ‘magit-diff-arguments’ is used instead.
+that can be changed before invoking one of the suffix commands.
+However, in the case of the diff popup, these arguments may be taken
+from those currently in use in the current repository’s log buffer,
+depending on the value of ‘magit-use-sticky-arguments’ (see *note Popup
+Buffers and Prefix Commands: Popup Buffers and Prefix Commands.).
 
    Also see *note (gitman)git-diff::.
 
@@ -2701,7 +2725,7 @@ the default value of ‘magit-diff-arguments’ is used instead.
      revisions, choose a revision to view changes along, starting at the
      common ancestor of both revisions (i.e., use a "…" range).
 
-‘d w’     (‘magit-diff-worktree’)
+‘d w’     (‘magit-diff-working-tree’)
 
      Show changes between the current working tree and the ‘HEAD’
      commit.  With a prefix argument show changes between the working
@@ -2882,9 +2906,9 @@ File: magit.info,  Node: Diff Buffer,  Next: Diff Options,  Prev: Refreshing Dif
      hunk headers get less useful the "older" the changes are, and as a
      result, jumping to the appropriate position gets less reliable.
 
-     Also see ‘magit-diff-visit-file-worktree’, which visits the
-     respective blob, unless the diff shows changes in the worktree, the
-     index, or ‘HEAD’.
+     Also see ‘magit-diff-visit-file’, which visits the respective blob,
+     unless the diff shows changes in the worktree, the index, or
+     ‘HEAD’.
 
 ‘j’     (‘magit-jump-to-diffstat-or-diff’)
 
@@ -3009,6 +3033,15 @@ File: magit.info,  Node: Revision Buffer,  Prev: Diff Options,  Up: Diffing
      committer image, accordingly.  Either the car or the cdr may be
      nil.
 
+‘M-x magit-revision-toggle-file-filter’     (‘magit-revision-toggle-file-filter’)
+
+     This command toggles the file restriction of the current revision
+     buffer.  It is particularly useful when you display a revision from
+     a log buffer that is restricted to a file or files.  In this case,
+     the revision buffer is also restricted to these files, and this
+     command allows you to quickly switch between viewing all the
+     changes in the commit and the restricted subset.
+
 
 File: magit.info,  Node: Ediffing,  Next: References Buffer,  Prev: Diffing,  Up: Inspecting
 
@@ -7975,6 +8008,7 @@ Appendix C Keystroke Index
                                                               (line  88)
 * M-x magit-reverse-in-index:            Staging and Unstaging.
                                                               (line  63)
+* M-x magit-revision-toggle-file-filter: Revision Buffer.     (line  26)
 * M-x magit-stage-file:                  Staging from File-Visiting Buffers.
                                                               (line  10)
 * M-x magit-toggle-buffer-lock:          Modes and Buffers.   (line  17)

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")
-;;;;;;  (22792 62846 984805 989000))
+;;;;;;  (22839 4030 924441 902000))
 
 ;;;***

@@ -1,4 +1,4 @@
-(define-package "magit-popup" "20170420.544" "Define prefix-infix-suffix command combos"
+(define-package "magit-popup" "20170508.936" "Define prefix-infix-suffix command combos"
   '((emacs "24.4")
     (async "20170219.942")
     (dash "20170207.2056"))

@@ -200,7 +200,7 @@ The prefix used to toggle any switch can be changed by binding
 another key to `magit-invoke-popup-switch'.  Likewise binding
 another key to `magit-invoke-popup-option' changes the prefixed
 used to set any option.  The two prefixes have to be different.
-If you change these bindings you should also change the `prefix'
+If you change these bindings, you should also change the `prefix'
 property of the button types `magit-popup-switch-button' and
 `magit-popup-option-button'.
 
@@ -313,7 +313,7 @@ Don't confuse this with `magit-current-popup-args'.")
 Use this inside the `interactive' form of a popup aware command
 to determine whether it was invoked from a popup and if so from
 which popup.  If the current command was invoked without the use
-of a popup then this is nil.")
+of a popup, then this is nil.")
 
 (defvar magit-current-popup-action nil
   "The popup action now being executed.")
@@ -441,7 +441,7 @@ when the command is invoked directly, then it returns the default
 value of the variable `SHORTNAME-arguments'.
 
 Optional argument GROUP specifies the Custom group into which the
-option is placed.  If omitted then the option is placed into some
+option is placed.  If omitted, then the option is placed into some
 group the same way it is done when directly using `defcustom' and
 omitting the group, except when NAME begins with \"magit-\", in
 which case the group `magit-git-arguments' is used.
@@ -591,11 +591,11 @@ changed in `magit-popup-mode-keymap').
 DESC is a string describing the purpose of the argument, it is
 displayed in the popup.
 
-If optional ENABLE is non-nil then the switch is on by default.
+If optional ENABLE is non-nil, then the switch is on by default.
 
 SWITCH is inserted after all other switches already defined for
 POPUP, unless optional PREPEND is non-nil, in which case it is
-placed first.  If optional AT is non-nil then it should be the
+placed first.  If optional AT is non-nil, then it should be the
 KEY of another switch already defined for POPUP, the argument
 is then placed before or after AT, depending on PREPEND."
   (declare (indent defun))
@@ -621,7 +621,7 @@ and VALUE is its default value.
 
 OPTION is inserted after all other options already defined for
 POPUP, unless optional PREPEND is non-nil, in which case it is
-placed first.  If optional AT is non-nil then it should be the
+placed first.  If optional AT is non-nil, then it should be the
 KEY of another option already defined for POPUP, the argument
 is then placed before or after AT, depending on PREPEND."
   (declare (indent defun))
@@ -645,7 +645,7 @@ actually used for anything.
 
 COMMAND is inserted after all other commands already defined for
 POPUP, unless optional PREPEND is non-nil, in which case it is
-placed first.  If optional AT is non-nil then it should be the
+placed first.  If optional AT is non-nil, then it should be the
 KEY of another command already defined for POPUP, the command
 is then placed before or after AT, depending on PREPEND."
   (declare (indent defun))
@@ -667,7 +667,7 @@ displayed in the popup.
 
 COMMAND is inserted after all other commands already defined for
 POPUP, unless optional PREPEND is non-nil, in which case it is
-placed first.  If optional AT is non-nil then it should be the
+placed first.  If optional AT is non-nil, then it should be the
 KEY of another command already defined for POPUP, the command
 is then placed before or after AT, depending on PREPEND."
   (declare (indent defun))

Binary file

File renamed without changes

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "markdown-mode" "20170317.1202" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22753 9093
-;;;;;;  357477 213000))
+;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22839 4029
+;;;;;;  229463 841000))
 ;;; Generated autoloads from markdown-mode.el
 
 (autoload 'markdown-mode "markdown-mode" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "markdown-mode" "20170526.1213" "Major mode for Markdown-formatted text" '((emacs "24") (cl-lib "0.5")) :commit "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9" :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))

@@ -1,39 +1,13 @@
 ;;; markdown-mode.el --- Major mode for Markdown-formatted text -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2007-2016 Jason R. Blevins <jrblevin@sdf.org>
-;; Copyright (C) 2007, 2009 Edward O'Connor <ted@oconnor.cx>
-;; Copyright (C) 2007 Conal Elliott <conal@conal.net>
-;; Copyright (C) 2008 Greg Bognar <greg_bognar@hms.harvard.edu>
-;; Copyright (C) 2008 Dmitry Dzhus <mail@sphinx.net.ru>
-;; Copyright (C) 2008 Bryan Kyle <bryan.kyle@gmail.com>
-;; Copyright (C) 2008 Ben Voui <intrigeri@boum.org>
-;; Copyright (C) 2009 Ankit Solanki <ankit.solanki@gmail.com>
-;; Copyright (C) 2009 Hilko Bengen <bengen@debian.org>
-;; Copyright (C) 2009 Peter Williams <pezra@barelyenough.org>
-;; Copyright (C) 2010 George Ogata <george.ogata@gmail.com>
-;; Copyright (C) 2011 Eric Merritt <ericbmerritt@gmail.com>
-;; Copyright (C) 2011 Philippe Ivaldi <pivaldi@sfr.fr>
-;; Copyright (C) 2011 Jeremiah Dodds <jeremiah.dodds@gmail.com>
-;; Copyright (C) 2011 Christopher J. Madsen <cjm@cjmweb.net>
-;; Copyright (C) 2011 Shigeru Fukaya <shigeru.fukaya@gmail.com>
-;; Copyright (C) 2011 Joost Kremers <joostkremers@fastmail.fm>
-;; Copyright (C) 2011-2012 Donald Ephraim Curtis <dcurtis@milkbox.net>
-;; Copyright (C) 2012 Akinori Musha <knu@idaemons.org>
-;; Copyright (C) 2012 Zhenlei Jia <zhenlei.jia@gmail.com>
-;; Copyright (C) 2012 Peter Jones <pjones@pmade.com>
-;; Copyright (C) 2013 Matus Goljer <dota.keys@gmail.com>
-;; Copyright (C) 2015 Google, Inc. (Contributor: Samuel Freilich <sfreilich@google.com>)
-;; Copyright (C) 2015 Antonis Kanouras <antonis@metadosis.gr>
-;; Copyright (C) 2015 Howard Melman <hmelman@gmail.com>
-;; Copyright (C) 2015-2016 Danny McClanahan <danieldmcclanahan@gmail.com>
-;; Copyright (C) 2015-2016 Syohei Yoshida <syohex@gmail.com>
-;; Copyright (C) 2016 Vitalie Spinu <spinuvit@gmail.com>
+;; Copyright (C) 2007-2017 Jason R. Blevins and markdown-mode
+;; contributors (see the commit log for details).
 
 ;; Author: Jason R. Blevins <jrblevin@sdf.org>
 ;; Maintainer: Jason R. Blevins <jrblevin@sdf.org>
 ;; Created: May 24, 2007
-;; Version: 2.1
-;; Package-Version: 20170317.1202
+;; Version: 2.2
+;; Package-Version: 20170526.1213
 ;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
 ;; Keywords: Markdown, GitHub Flavored Markdown, itex
 ;; URL: http://jblevins.org/projects/markdown-mode/
@@ -58,14 +32,37 @@
 ;;; Commentary:
 
 ;; markdown-mode is a major mode for editing [Markdown][]-formatted
-;; text. The latest stable version is markdown-mode 2.1, released on
-;; January 9, 2016. See the [release notes][] for details.
-;; markdown-mode is free software, licensed under the GNU GPL.
+;; text. The latest stable version is markdown-mode 2.2, released on
+;; May 26, 2017. See the [release notes][] for details.
+;; markdown-mode is free software, licensed under the GNU GPL v2.
 
 ;; ![Markdown Mode Screenshot](http://jblevins.org/projects/markdown-mode/screenshots/20160108-001.png)
 
 ;; [Markdown]: http://daringfireball.net/projects/markdown/
-;; [release notes]: http://jblevins.org/projects/markdown-mode/rev-2-1
+;; [release notes]: http://jblevins.org/projects/markdown-mode/rev-2-2
+
+;;; Documentation:
+
+;; <a href="https://leanpub.com/markdown-mode"><img src="http://jblevins.org/projects/markdown-mode/guide-v2.2.png" align="right" height="350" width="252"></a>
+
+;; Documentation for Markdown Mode is available below, but Emacs is also
+;; a self-documenting editor.  That means that the source code itself
+;; contains additional documentation: each function has its own docstring
+;; available via `C-h f` (`describe-function'), individual keybindings
+;; can be investigated with `C-h k` (`describe-key'), and a complete list
+;; of keybindings is available using `C-h m` (`describe-mode').
+
+;; Additionally, to celebrate Markdown Mode's 10th birthday the package
+;; creator is writing a [Guide to Markdown Mode for Emacs][guide].  This
+;; ebook will supplement the existing documentation with in-depth
+;; discussion of advanced movement and editing commands, configuration
+;; examples, tips and tricks, and a survey of other packages that work
+;; with Markdown Mode.  It will be [published at Leanpub][guide] and
+;; possibly available through other channels.  Please visit
+;; the [book homepage][guide] to sign up to be notified when it is ready
+;; and to help determine the price.
+
+;;  [guide]: https://leanpub.com/markdown-mode
 
 ;;; Installation:
 
@@ -75,10 +72,12 @@
 ;; repository by adding the following to your `.emacs', `init.el',
 ;; or equivalent startup file:
 
-;;     (require 'package)
-;;     (add-to-list 'package-archives
-;;                  '("melpa-stable" . "https://stable.melpa.org/packages/"))
-;;     (package-initialize)
+;; ``` Lisp
+;; (require 'package)
+;; (add-to-list 'package-archives
+;;              '("melpa-stable" . "https://stable.melpa.org/packages/"))
+;; (package-initialize)
+;; ```
 
 ;; Then, after restarting Emacs or evaluating the above statements, issue
 ;; the following command: `M-x package-install RET markdown-mode RET`.
@@ -91,13 +90,15 @@
 ;; adding a declaration such as this one to your init file (as an
 ;; example; adjust settings as desired):
 ;;
-;;     (use-package markdown-mode
-;;       :ensure t
-;;       :commands (markdown-mode gfm-mode)
-;;       :mode (("README\\.md\\'" . gfm-mode)
-;;              ("\\.md\\'" . markdown-mode)
-;;              ("\\.markdown\\'" . markdown-mode))
-;;       :init (setq markdown-command "multimarkdown"))
+;; ``` Lisp
+;; (use-package markdown-mode
+;;   :ensure t
+;;   :commands (markdown-mode gfm-mode)
+;;   :mode (("README\\.md\\'" . gfm-mode)
+;;          ("\\.md\\'" . markdown-mode)
+;;          ("\\.markdown\\'" . markdown-mode))
+;;   :init (setq markdown-command "multimarkdown"))
+;; ```
 
 ;; [MELPA Stable]: http://stable.melpa.org/
 ;; [use-package]: https://github.com/jwiegley/use-package
@@ -110,14 +111,16 @@
 ;; `load-path'). You can then configure `markdown-mode' and `gfm-mode'
 ;; to load automatically by adding the following to your init file:
 
-;;     (autoload 'markdown-mode "markdown-mode"
-;;        "Major mode for editing Markdown files" t)
-;;     (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
-;;     (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+;; ``` Lisp
+;; (autoload 'markdown-mode "markdown-mode"
+;;    "Major mode for editing Markdown files" t)
+;; (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+;; (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
 ;;
-;;     (autoload 'gfm-mode "markdown-mode"
-;;        "Major mode for editing GitHub Flavored Markdown files" t)
-;;     (add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
+;; (autoload 'gfm-mode "markdown-mode"
+;;    "Major mode for editing GitHub Flavored Markdown files" t)
+;; (add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
+;; ```
 
 ;; [markdown-mode.el]: http://jblevins.org/projects/markdown-mode/markdown-mode.el
 
@@ -127,7 +130,9 @@
 ;; browse or clone the Git repository
 ;; [on GitHub](https://github.com/jrblevin/markdown-mode):
 
-;;     git clone https://github.com/jrblevin/markdown-mode.git
+;; ```
+;; git clone https://github.com/jrblevin/markdown-mode.git
+;; ```
 
 ;; If you prefer to install and use the development version, which may
 ;; become unstable at some times, you can either clone the Git
@@ -137,7 +142,9 @@
 ;; If you clone the repository directly, then make sure that Emacs can
 ;; find it by adding the following line to your startup file:
 ;;
-;;     (add-to-list 'load-path "/path/to/markdown-mode/repository")
+;; ``` Lisp
+;; (add-to-list 'load-path "/path/to/markdown-mode/repository")
+;; ```
 
 ;; **Packaged Installation**
 
@@ -322,7 +329,9 @@
 ;;     side-by-side with the source Markdown. **For all export commands,
 ;;     the output file will be overwritten without notice.**
 ;;     `markdown-live-preview-window-function' can be customized to open
-;;     in a browser other than `eww'.
+;;     in a browser other than `eww'.  If you want to force the
+;;     preview window to appear at the bottom or right, you can
+;;     customize `markdown-split-window-direction`.
 ;;
 ;;     To summarize:
 ;;
@@ -453,14 +462,16 @@
 ;;
 ;;   * Movement by Paragraph or Block: `M-{` and `M-}`
 ;;
-;;     The definition of a "paragraph" is slightly different in
-;;     markdown-mode than, say, text-mode, because markdown-mode
-;;     supports filling for list items and respects hard line breaks,
-;;     both of which break paragraphs.  So, markdown-mode overrides
-;;     the usual paragraph navigation commands `M-{` and `M-}` so that
-;;     with a `C-u` prefix, these commands jump to the beginning or
-;;     end of an entire block of text, respectively, where "blocks"
-;;     are separated by one or more lines.
+;;     These keys are usually bound to `forward-paragraph' and
+;;     `backward-paragraph', but those built-in Emacs functions are
+;;     based on simple regular expressions and can fail in Markdown.
+;;     Blocks in `markdown-mode' are code blocks, blockquotes, list
+;;     items, headings, horizontal rules, or plain text paragraphs
+;;     separated by whitespace.  Instead, they are bound to
+;;     `markdown-forward-block' and `markdown-backward-block'.
+;;     To mark or narrow to a block, you can use `M-h`
+;;     (`markdown-mark-block') and `C-x n b`
+;;     (`markdown-narrow-to-block').
 ;;
 ;;   * Movement by Defun: `C-M-a`, `C-M-e`, and `C-M-h`
 ;;
@@ -566,7 +577,7 @@
 ;;   * `markdown-header-scaling-values' - list of scaling values,
 ;;     relative to baseline, for headers of levels one through six,
 ;;     used when `markdown-header-scaling' is non-nil
-;;     (default: `(list 1.8 1.4 1.2 1.0 1.0 1.0)`).
+;;     (default: `(1.8 1.4 1.2 1.0 1.0 1.0)`).
 ;;
 ;;   * `markdown-list-indent-width' - depth of indentation for lists
 ;;     when inserting, promoting, and demoting list items (default: 4).
@@ -574,9 +585,10 @@
 ;;   * `markdown-indent-function' - the function to use for automatic
 ;;     indentation (default: `markdown-indent-line').
 ;;
-;;   * `markdown-indent-on-enter' - set to a non-nil value to
-;;     automatically indent new lines when the enter key is pressed
-;;     (default: `t')
+;;   * `markdown-indent-on-enter' - Set to a non-nil value to
+;;     automatically indent new lines when `RET' is pressed.
+;;     Set to `indent-and-new-item' to additionally continue lists
+;;     when `RET' is pressed (default: `t').
 ;;
 ;;   * `markdown-enable-wiki-links' - syntax highlighting for wiki
 ;;     links (default: `nil').  Set this to a non-nil value to turn on
@@ -641,7 +653,7 @@
 ;;     for `markdown-reference-location'.
 ;;
 ;;   * `markdown-nested-imenu-heading-index' - Use nested imenu
-;;     heading instead of a flat index (default: `nil').  A nested
+;;     heading instead of a flat index (default: `t').  A nested
 ;;     index may provide more natural browsing from the menu, but a
 ;;     flat list may allow for faster keyboard navigation via tab
 ;;     completion.
@@ -694,6 +706,8 @@
 ;; is also non-nil, Markdown Mode will highlight wiki links with
 ;; missing target file in a different color.  By default, Markdown
 ;; Mode only searches for target files in the current directory.
+;; Search in subdirectories can be enabled by setting
+;; `markdown-wiki-link-search-subdirectories' to a non-nil value.
 ;; Sequential parent directory search (as in [Ikiwiki][]) can be
 ;; enabled by setting `markdown-wiki-link-search-parent-directories'
 ;; to a non-nil value.
@@ -706,7 +720,9 @@
 ;; You can do this either by using `M-x customize-group markdown`
 ;; or by placing the following in your `.emacs` file:
 ;;
-;;     (setq markdown-command "markdown | smartypants")
+;; ``` Lisp
+;; (setq markdown-command "markdown | smartypants")
+;; ```
 ;;
 ;; [SmartyPants]: http://daringfireball.net/projects/smartypants/
 ;;
@@ -747,7 +763,7 @@
 ;;   variable names such as `a_test_variable` will not trigger
 ;;   emphasis (italics).
 ;;
-;; * **Fenced code blocks:** Code blocks quoted with backticks, with
+;; * **Fenced code blocks:** Code blocks quoted with backquotes, with
 ;;   optional programming language keywords, are highlighted in
 ;;   both `markdown-mode' and `gfm-mode'.  They can be inserted with
 ;;   `C-c C-s P`.  If there is an active region, the text in the
@@ -764,7 +780,9 @@
 ;;   (Emacs buttons) in both `markdown-mode' and `gfm-mode' when
 ;;   `markdown-make-gfm-checkboxes-buttons' is set to a non-nil value
 ;;   (and it is set to t by default).  These checkboxes can be
-;;   toggled by clicking `mouse-1` or pressing `RET` over the button.
+;;   toggled by clicking `mouse-1`, pressing `RET` over the button,
+;;   or by pressing `C-c C-x C-x` with the point anywhere in the task
+;;   list item.
 ;;
 ;; * **Wiki links:** Generic wiki links are supported in
 ;;   `markdown-mode', but in `gfm-mode' specifically they will be
@@ -772,6 +790,8 @@
 ;;   in filenames and the first letter of the filename will be
 ;;   capitalized.  For example, `[[wiki link]]' will map to a file
 ;;   named `Wiki-link` with the same extension as the current file.
+;;   If a file with this name does not exist in the current directory,
+;;   the first match in a subdirectory, if any, will be used instead.
 ;;
 ;; * **Newlines:** Neither `markdown-mode' nor `gfm-mode' do anything
 ;;   specifically with respect to newline behavior.  If you use
@@ -781,10 +801,12 @@
 ;;   for line wrapping in buffers.  You can do this with a
 ;;   `gfm-mode-hook' as follows:
 ;;
-;;         ;; Use visual-line-mode in gfm-mode
-;;         (defun my-gfm-mode-hook ()
-;;           (visual-line-mode 1))
-;;         (add-hook 'gfm-mode-hook 'my-gfm-mode-hook)
+;;     ``` Lisp
+;;     ;; Use visual-line-mode in gfm-mode
+;;     (defun my-gfm-mode-hook ()
+;;       (visual-line-mode 1))
+;;     (add-hook 'gfm-mode-hook 'my-gfm-mode-hook)
+;;     ```
 ;;
 ;; * **Preview:** GFM-specific preview can be powered by setting
 ;;   `markdown-command' to use [Docter][].  This may also be
@@ -797,107 +819,12 @@
 
 ;;; Acknowledgments:
 
-;; markdown-mode has benefited greatly from the efforts of the
-;; following people:
+;; markdown-mode has benefited greatly from the efforts of the many
+;; volunteers who have sent patches, test cases, bug reports,
+;; suggestions, helped with packaging, etc.  Thank you for your
+;; contributions!  See the [contributors graph][contrib] for details.
 ;;
-;;   * Cyril Brulebois <cyril.brulebois@enst-bretagne.fr> for Debian packaging.
-;;   * Conal Elliott <conal@conal.net> for a font-lock regexp patch.
-;;   * Edward O'Connor <hober0@gmail.com> for a font-lock regexp fix and
-;;     GitHub Flavored Markdown mode (`gfm-mode').
-;;   * Greg Bognar <greg_bognar@hms.harvard.edu> for menus and running
-;;     `markdown' with an active region.
-;;   * Daniel Burrows <dburrows@debian.org> for filing Debian bug #456592.
-;;   * Peter S. Galbraith <psg@debian.org> for maintaining `emacs-goodies-el`.
-;;   * Dmitry Dzhus <mail@sphinx.net.ru> for undefined reference checking.
-;;   * Carsten Dominik <carsten@orgmode.org> for `org-mode', from which the
-;;     visibility cycling functionality was derived, and for a bug fix
-;;     related to `orgtbl-mode'.
-;;   * Bryan Kyle <bryan.kyle@gmail.com> for indentation code.
-;;   * Ben Voui <intrigeri@boum.org> for font-lock face customizations.
-;;   * Ankit Solanki <ankit.solanki@gmail.com> for `longlines.el`
-;;     compatibility and custom CSS.
-;;   * Hilko Bengen <bengen@debian.org> for proper XHTML output.
-;;   * Jose A. Ortega Ruiz <jao@gnu.org> for Emacs 23 fixes.
-;;   * Nelson Minar <nelson@santafe.edu> for `html-helper-mode', from which
-;;     comment matching functions were derived.
-;;   * Alec Resnick <alec@sproutward.org> for bug reports.
-;;   * Joost Kremers <joostkremers@fastmail.fm> for footnote-handling
-;;     functions, bug reports regarding indentation, and
-;;     fixes for byte-compilation warnings.
-;;   * Peter Williams <pezra@barelyenough.org> for `fill-paragraph'
-;;     enhancements.
-;;   * George Ogata <george.ogata@gmail.com> for fixing several
-;;     byte-compilation warnings.
-;;   * Eric Merritt <ericbmerritt@gmail.com> for wiki link features.
-;;   * Philippe Ivaldi <pivaldi@sfr.fr> for XHTML preview
-;;     customizations and XHTML export.
-;;   * Jeremiah Dodds <jeremiah.dodds@gmail.com> for supporting
-;;     Markdown processors which do not accept input from stdin.
-;;   * Werner Dittmann <werner.dittmann@t-online.de> for bug reports
-;;     regarding the `cl` dependency and `auto-fill-mode' and indentation.
-;;   * Scott Pfister <scott.pfister@gmail.com> for generalizing the space
-;;     substitution character for mapping wiki links to filenames.
-;;   * Marcin Kasperski <marcin.kasperski@mekk.waw.pl> for a patch to
-;;     escape shell commands.
-;;   * Christopher J. Madsen <cjm@cjmweb.net> for patches to fix a match
-;;     data bug and to prefer `visual-line-mode' in `gfm-mode'.
-;;   * Shigeru Fukaya <shigeru.fukaya@gmail.com> for better adherence to
-;;     Emacs Lisp coding conventions.
-;;   * Donald Ephraim Curtis <dcurtis@milkbox.net> for fixing the `fill-paragraph'
-;;     regexp, refactoring the compilation and preview functions,
-;;     heading font-lock generalizations, list renumbering,
-;;     and kill ring save.
-;;   * Kevin Porter <kportertx@gmail.com> for wiki link handling in `gfm-mode'.
-;;   * Max Penet <max.penet@gmail.com> and Peter Eisentraut <peter_e@gmx.net>
-;;     for an autoload token for `gfm-mode'.
-;;   * Ian Yang <me@iany.me> for improving the reference definition regex.
-;;   * Akinori Musha <knu@idaemons.org> for an imenu index function.
-;;   * Michael Sperber <sperber@deinprogramm.de> for XEmacs fixes.
-;;   * Francois Gannaz <francois.gannaz@free.fr> for suggesting charset
-;;     declaration in XHTML output.
-;;   * Zhenlei Jia <zhenlei.jia@gmail.com> for smart exdention function.
-;;   * Matus Goljer <dota.keys@gmail.com> for improved wiki link following
-;;     and GFM code block insertion.
-;;   * Peter Jones <pjones@pmade.com> for link following functions.
-;;   * Bryan Fink <bryan.fink@gmail.com> for a bug report regarding
-;;     externally modified files.
-;;   * Vegard Vesterheim <vegard.vesterheim@uninett.no> for a bug fix
-;;     related to `orgtbl-mode'.
-;;   * Makoto Motohashi <mkt.motohashi@gmail.com> for before- and after-
-;;     export hooks, unit test improvements, and updates to support
-;;     wide characters.
-;;   * Michael Dwyer <mdwyer@ehtech.in> for `gfm-mode' underscore regexp.
-;;   * Chris Lott <chris@chrislott.org> for suggesting reference label
-;;     completion.
-;;   * Gunnar Franke <Gunnar.Franke@gmx.de> for a completion bug report.
-;;   * David Glasser <glasser@meteor.com> for a `paragraph-separate' fix.
-;;   * Daniel Brotsky <dev@brotsky.com> for better auto-fill defaults.
-;;   * Samuel Freilich <sfreilich@google.com> for improved filling
-;;     behavior regarding list items, footnotes, and reference
-;;     definitions, improved killing of footnotes, and numerous other
-;;     tests and bug fixes.
-;;   * Antonis Kanouras <antonis@metadosis.gr> for strikethrough support.
-;;   * Tim Visher <tim.visher@gmail.com> for multiple CSS files and other
-;;     general improvements.
-;;   * Matt McClure <matthewlmcclure@gmail.com> for a patch to prevent
-;;     overwriting source files with .html extensions upon export.
-;;   * Roger Bolsius <roger.bolsius@gmail.com> for ordered list improvements.
-;;   * Google's Open Source Programs Office for recognizing the project with
-;;     a monetary contribution in June 2015.
-;;   * Howard Melman <hmelman@gmail.com> for supporting GFM checkboxes
-;;     as buttons and several bug reports.
-;;   * Danny McClanahan <danieldmcclanahan@gmail.com> for live preview
-;;     mode, completion of GFM programming language names, improved
-;;     font lock for fenced code blocks and metadata blocks, `cl-lib'
-;;     updates, and numerous other improvements.
-;;   * Syohei Yoshida <syohex@gmail.com> for better heading detection
-;;     and movement functions, improved italic font lock, fixing adaptive
-;;     filling for hanging list items, more efficient fontification,
-;;     and numerous other improvements.
-;;   * Vitalie Spinu <spinuvit@gmail.com> for improvements to font
-;;     lock and source code aesthetics.
-;;   * Kévin Le Gouguec <kevin.legouguec@gmail.com> for improvements
-;;     related to ATX headings and Pandoc fancy lists.
+;;  [contrib]: https://github.com/jrblevin/markdown-mode/graphs/contributors
 
 ;;; Bugs:
 
@@ -913,10 +840,10 @@
 ;; markdown-mode was written and is maintained by Jason Blevins.  The
 ;; first version was released on May 24, 2007.
 ;;
-;;   * 2007-05-24: Version 1.1
-;;   * 2007-05-25: Version 1.2
+;;   * 2007-05-24: [Version 1.1][]
+;;   * 2007-05-25: [Version 1.2][]
 ;;   * 2007-06-05: [Version 1.3][]
-;;   * 2007-06-29: Version 1.4
+;;   * 2007-06-29: [Version 1.4][]
 ;;   * 2007-10-11: [Version 1.5][]
 ;;   * 2008-06-04: [Version 1.6][]
 ;;   * 2009-10-01: [Version 1.7][]
@@ -925,8 +852,12 @@
 ;;   * 2013-01-25: [Version 1.9][]
 ;;   * 2013-03-24: [Version 2.0][]
 ;;   * 2016-01-09: [Version 2.1][]
+;;   * 2016-05-26: [Version 2.2][]
 ;;
+;; [Version 1.1]: http://jblevins.org/projects/markdown-mode/rev-1-1
+;; [Version 1.2]: http://jblevins.org/projects/markdown-mode/rev-1-2
 ;; [Version 1.3]: http://jblevins.org/projects/markdown-mode/rev-1-3
+;; [Version 1.4]: http://jblevins.org/projects/markdown-mode/rev-1-4
 ;; [Version 1.5]: http://jblevins.org/projects/markdown-mode/rev-1-5
 ;; [Version 1.6]: http://jblevins.org/projects/markdown-mode/rev-1-6
 ;; [Version 1.7]: http://jblevins.org/projects/markdown-mode/rev-1-7
@@ -935,6 +866,7 @@
 ;; [Version 1.9]: http://jblevins.org/projects/markdown-mode/rev-1-9
 ;; [Version 2.0]: http://jblevins.org/projects/markdown-mode/rev-2-0
 ;; [Version 2.1]: http://jblevins.org/projects/markdown-mode/rev-2-1
+;; [Version 2.2]: http://jblevins.org/projects/markdown-mode/rev-2-2
 
 
 ;;; Code:
@@ -954,7 +886,7 @@
 
 ;;; Constants =================================================================
 
-(defconst markdown-mode-version "2.1"
+(defconst markdown-mode-version "2.2"
   "Markdown mode version number.")
 
 (defconst markdown-output-buffer-name "*markdown-output*"
@@ -1040,10 +972,11 @@ promotion and demotion functions."
   :type 'boolean)
 
 (defcustom markdown-asymmetric-header nil
-  "Determines if header style will be asymmetric.
-Set to non-nil to only have header characters to the left of the title.
-The default will ensure header characters are placed to the left and right
-of the title."
+  "Determines if atx header style will be asymmetric.
+Set to a non-nil value to use asymmetric header styling, placing
+header markup only at the beginning of the line. By default,
+balanced markup will be inserted at the beginning and end of the
+line around the header title."
   :group 'markdown
   :type 'boolean)
 
@@ -1053,13 +986,31 @@ of the title."
   :type 'function)
 
 (defcustom markdown-indent-on-enter t
-  "Automatically indent new lines when enter key is pressed.
-When this variable is set to t, pressing RET will call
-`newline-and-indent'.  When set to nil, define RET to call
-`newline' as usual.  In the latter case, you can still use
-auto-indentation by pressing \\[newline-and-indent]."
+  "Determines indentation behavior when pressing \\[newline].
+Possible settings are nil, t, and 'indent-and-new-item.
+
+When non-nil, pressing \\[newline] will call `newline-and-indent'
+to indent the following line according to the context using
+`markdown-indent-function'.  In this case, note that
+\\[electric-newline-and-maybe-indent] can still be used to insert
+a newline without indentation.
+
+When set to 'indent-and-new-item and the point is in a list item
+when \\[newline] is pressed, the list will be continued on the next
+line, where a new item will be inserted.
+
+When set to nil, simply call `newline' as usual.  In this case,
+you can still indent lines using \\[markdown-cycle] and continue
+lists with \\[markdown-insert-list-item].
+
+Note that this assumes the variable `electric-indent-mode' is
+non-nil (enabled).  When it is *disabled*, the behavior of
+\\[newline] and `\\[electric-newline-and-maybe-indent]' are
+reversed."
   :group 'markdown
-  :type 'boolean)
+  :type '(choice (const :tag "Don't automatically indent" nil)
+                 (const :tag "Automatically indent" t)
+                 (const :tag "Automatically indent and insert new list items" indent-and-new-item)))
 
 (defcustom markdown-enable-wiki-links nil
   "Syntax highlighting for wiki links.
@@ -1077,6 +1028,14 @@ Otherwise, they will be treated as [[PageName|alias text]]."
   :type 'boolean
   :safe 'booleanp)
 
+(defcustom markdown-wiki-link-search-subdirectories nil
+  "When non-nil, search for wiki link targets in subdirectories.
+This is the default search behavior for GitHub and is
+automatically set to t in `gfm-mode'."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+
 (defcustom markdown-wiki-link-search-parent-directories nil
   "When non-nil, search for wiki link targets in parent directories.
 This is the default search behavior of Ikiwiki."
@@ -1165,7 +1124,7 @@ and `iso-latin-1'.  Use `list-coding-systems' for more choices."
   :group 'markdown
   :type 'string)
 
-(defcustom markdown-nested-imenu-heading-index nil
+(defcustom markdown-nested-imenu-heading-index t
   "Use nested or flat imenu heading index.
 A nested index may provide more natural browsing from the menu,
 but a flat list may allow for faster keyboard navigation via tab
@@ -1183,6 +1142,20 @@ completion."
   :group 'markdown
   :type 'boolean)
 
+(defcustom markdown-split-window-direction 'any
+  "Preference for splitting windows for static and live preview.
+The default value is 'any, which instructs Emacs to use
+`split-window-sensibly' to automatically choose how to split
+windows based on the values of `split-width-threshold' and
+`split-height-threshold' and the available windows.  To force
+vertically split (left and right) windows, set this to 'vertical
+or 'right.  To force horizontally split (top and bottom) windows,
+set this to 'horizontal or 'below."
+  :group 'markdown
+  :type '(choice (const :tag "Automatic" any)
+                 (const :tag "Right (vertical)" right)
+                 (const :tag "Below (horizontal)" below)))
+
 (defcustom markdown-live-preview-window-function
   'markdown-live-preview-window-eww
   "Function to display preview of Markdown output within Emacs.
@@ -1192,12 +1165,15 @@ the buffer."
   :type 'function)
 
 (defcustom markdown-live-preview-delete-export 'delete-on-destroy
-  "Delete exported html file when using `markdown-live-preview-export'.
+  "Delete exported HTML file when using `markdown-live-preview-export'.
 If set to 'delete-on-export, delete on every export. When set to
 'delete-on-destroy delete when quitting from command
 `markdown-live-preview-mode'. Never delete if set to nil."
   :group 'markdown
-  :type 'symbol)
+  :type '(choice
+          (const :tag "Delete on every export" delete-on-export)
+          (const :tag "Delete when quitting live preview" delete-on-destroy)
+          (const :tag "Never delete" nil)))
 
 (defcustom markdown-list-indent-width 4
   "Depth of indentation for markdown lists.
@@ -1303,10 +1279,10 @@ Group 6 matches the closing hash marks of an atx heading.")
   "\\(?:\\`\\|[^\\]\\)\\(\\(`+\\)\\(\\(?:.\\|\n[^\n]\\)*?[^`]\\)\\(\\2\\)\\)\\(?:[^`]\\|\\'\\)"
   "Regular expression for matching inline code fragments.
 
-Group 1 matches the entire code fragment including the backticks.
-Group 2 matches the opening backticks.
-Group 3 matches the code fragment itself, without backticks.
-Group 4 matches the closing backticks.
+Group 1 matches the entire code fragment including the backquotes.
+Group 2 matches the opening backquotes.
+Group 3 matches the code fragment itself, without backquotes.
+Group 4 matches the closing backquotes.
 
 The leading, unnumbered group ensures that the leading backquote
 character is not escaped.
@@ -1322,22 +1298,26 @@ Groups 1 and 3 match the opening and closing tags.
 Group 2 matches the key sequence.")
 
 (defconst markdown-regex-gfm-code-block-open
- "^[[:blank:]]*\\(```\\)[ ]?\\([^[:space:]]+\\|{[^}]*}\\)?\\([[:space:]]*?\\)$"
+ "^[[:blank:]]*\\(```\\)[[:blank:]]*\\({\\)?[[:blank:]]*\\([^[:space:]]+?\\)?\\(?:[[:blank:]]+\\(.+?\\)\\)?[[:blank:]]*\\(}\\)?[[:blank:]]*$"
  "Regular expression matching opening of GFM code blocks.
-Group 1 matches the opening three backticks.
-Group 2 matches the language identifier (optional).")
+Group 1 matches the opening three backquotes.
+Group 2 matches the opening brace (optional).
+Group 3 matches the language identifier (optional).
+Group 4 matches the info string (optional).
+Group 5 matches the closing brace (optional).
+Groups need to agree with `markdown-regex-tilde-fence-begin'.")
 
 (defconst markdown-regex-gfm-code-block-close
  "^[[:blank:]]*\\(```\\)\\s *?$"
  "Regular expression matching closing of GFM code blocks.
-Group 1 matches the closing three backticks.")
+Group 1 matches the closing three backquotes.")
 
 (defconst markdown-regex-pre
   "^\\(    \\|\t\\).*$"
   "Regular expression for matching preformatted text sections.")
 
 (defconst markdown-regex-list
-  "^\\([ \t]*\\)\\([0-9#]+\\.\\|[\\*\\+-]\\)\\([ \t]+\\)"
+  "^\\([ \t]*\\)\\([0-9#]+\\.\\|[\\*\\+:-]\\)\\([ \t]+\\)"
   "Regular expression for matching list items.")
 
 (defconst markdown-regex-bold
@@ -1427,9 +1407,13 @@ Group 6 matches the closing square brackets.")
 Group 1 matches the text to become a button.")
 
 (defconst markdown-regex-block-separator
-  "\\(\\`\\|\\(\n[ \t]*\n\\)[^\n \t]\\)"
+  "\n[\n\t\f ]*\n"
   "Regular expression for matching block boundaries.")
 
+(defconst markdown-regex-block-separator-noindent
+  (concat "\\(\\`\\|\\(" markdown-regex-block-separator "\\)[^\n\t\f ]\\)")
+  "Regexp for block separators before lines with no indentation.")
+
 (defconst markdown-regex-math-inline-single
   "\\(?:^\\|[^\\]\\)\\(\\$\\)\\(\\(?:[^\\$]\\|\\\\.\\)*\\)\\(\\$\\)"
   "Regular expression for itex $..$ math mode expressions.
@@ -1449,15 +1433,22 @@ Groups 1 and 3 match the opening and closing delimiters.
 Group 2 matches the mathematical expression contained within.")
 
 (defsubst markdown-make-tilde-fence-regex (num-tildes &optional end-of-line)
-  "Return regexp matching a Pandoc code fence at least NUM-TILDES long.
+  "Return regexp matching a tilde code fence at least NUM-TILDES long.
 END-OF-LINE is the regexp construct to indicate end of line; $ if
 missing."
-  (format "%s%d%s%s" "^\\([~]\\{" num-tildes ",\\}\\)" (or end-of-line "$")))
+  (format "%s%d%s%s" "^[[:blank:]]*\\([~]\\{" num-tildes ",\\}\\)"
+          (or end-of-line "$")))
 
 (defconst markdown-regex-tilde-fence-begin
   (markdown-make-tilde-fence-regex
-   3 "[ ]?\\([^[:space:]]+\\|{[^}]*}\\)?\\([[:space:]]*?\\)$")
-  "Regular expression for matching Pandoc tildes.")
+   3 "[[:blank:]]*\\({\\)?[[:blank:]]*\\([^[:space:]]+?\\)?\\(?:[[:blank:]]+\\(.+?\\)\\)?[[:blank:]]*\\(}\\)?[[:blank:]]*$")
+  "Regular expression for matching tilde-fenced code blocks.
+Group 1 matches the opening tildes.
+Group 2 matches the opening brace (optional).
+Group 3 matches the language identifier (optional).
+Group 4 matches the info string (optional).
+Group 5 matches the closing brace (optional).
+Groups need to agree with `markdown-regex-gfm-code-block-open'.")
 
 (defconst markdown-regex-declarative-metadata
   "^\\([[:alpha:]][[:alpha:] _-]*?\\)\\([:=][ \t]*\\)\\(.*\\)$"
@@ -1518,7 +1509,7 @@ Function is called repeatedly until it returns nil. For details, see
                                (point-max))))
              (code-match (markdown-code-block-at-pos new-start))
              (new-start (or (and code-match (cl-first code-match)) new-start))
-             (code-match (markdown-code-block-at-pos end))
+             (code-match (and (< end (point-max)) (markdown-code-block-at-pos end)))
              (new-end (or (and code-match (cl-second code-match)) new-end)))
         (unless (and (eq new-start start) (eq new-end end))
           (cons new-start (min new-end (point-max))))))))
@@ -1529,6 +1520,11 @@ Delegates to `markdown-syntax-propertize-extend-region'. START
 and END are the previous region to refontify."
   (let ((res (markdown-syntax-propertize-extend-region start end)))
     (when res
+      ;; syntax-propertize-function is not called when character at
+      ;; (point-max) is deleted, but font-lock-extend-region-functions
+      ;; are called.  Force a syntax property update in that case.
+      (when (= end (point-max))
+        (markdown-syntax-propertize (car res) (cdr res)))
       (setq jit-lock-start (car res)
             jit-lock-end (cdr res)))))
 
@@ -1567,14 +1563,14 @@ and END are the previous region to refontify."
          ((looking-at markdown-regex-list)
           (setq levels (markdown-update-list-levels
                         (match-string 2) (current-indentation) levels))
-          (markdown-end-of-block-element))
+          (markdown-end-of-text-block))
          ;; If this is the end of the indentation level, adjust levels accordingly.
          ;; Only match end of indentation level if levels is not the empty list.
          ((and (car levels) (looking-at-p close-regexp))
           (setq levels (markdown-update-list-levels
                         nil (current-indentation) levels))
-          (markdown-end-of-block-element))
-         (t (markdown-end-of-block-element))))
+          (markdown-end-of-text-block))
+         (t (markdown-end-of-text-block))))
 
       (when (and open close)
         ;; Set text property data
@@ -1932,7 +1928,8 @@ start which was previously propertized."
   (while (re-search-forward markdown-regex-header end t)
     (unless (markdown-code-block-at-pos (match-beginning 0))
       (put-text-property
-       (match-beginning 0) (match-end 0) 'markdown-heading t)
+       (match-beginning 0) (match-end 0) 'markdown-heading
+       (match-data t))
       (put-text-property
        (match-beginning 0) (match-end 0)
        (cond ((match-string-no-properties 2) 'markdown-heading-1-setext)
@@ -1949,8 +1946,8 @@ start which was previously propertized."
      ;; Comment start
      ((and (not in-comment)
            (re-search-forward markdown-regex-comment-start end t)
-           (save-match-data (not (markdown-code-at-point-p)))
-           (save-match-data (not (markdown-code-block-at-point))))
+           (not (markdown-inline-code-at-point-p))
+           (not (markdown-code-block-at-point-p)))
       (let ((open-beg (match-beginning 0)))
         (put-text-property open-beg (1+ open-beg)
                            'syntax-table (string-to-syntax "<"))
@@ -1995,13 +1992,15 @@ start which was previously propertized."
 (defun markdown-syntax-propertize (start end)
   "Function used as `syntax-propertize-function'.
 START and END delimit region to propertize."
-  (remove-text-properties start end markdown--syntax-properties)
-  (markdown-syntax-propertize-fenced-block-constructs start end)
-  (markdown-syntax-propertize-yaml-metadata start end)
-  (markdown-syntax-propertize-pre-blocks start end)
-  (markdown-syntax-propertize-blockquotes start end)
-  (markdown-syntax-propertize-headings start end)
-  (markdown-syntax-propertize-comments start end))
+  (with-silent-modifications
+    (save-excursion
+      (remove-text-properties start end markdown--syntax-properties)
+      (markdown-syntax-propertize-fenced-block-constructs start end)
+      (markdown-syntax-propertize-yaml-metadata start end)
+      (markdown-syntax-propertize-pre-blocks start end)
+      (markdown-syntax-propertize-blockquotes start end)
+      (markdown-syntax-propertize-headings start end)
+      (markdown-syntax-propertize-comments start end))))
 
 
 ;;; Font Lock =================================================================
@@ -2059,6 +2058,9 @@ START and END delimit region to propertize."
 (defvar markdown-language-keyword-face 'markdown-language-keyword-face
   "Face name to use for programming language identifiers.")
 
+(defvar markdown-language-info-face 'markdown-language-info-face
+  "Face name to use for programming info strings.")
+
 (defvar markdown-link-face 'markdown-link-face
   "Face name to use for links.")
 
@@ -2161,6 +2163,11 @@ START and END delimit region to propertize."
   "Face for programming language identifiers."
   :group 'markdown-faces)
 
+(defface markdown-language-info-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for programming language info strings."
+  :group 'markdown-faces)
+
 (defface markdown-link-face
   '((t (:inherit font-lock-keyword-face)))
   "Face for links."
@@ -2252,12 +2259,13 @@ Used when `markdown-header-scaling' is non-nil."
 
 (defun markdown-make-header-faces ()
   "Build the faces used for Markdown headers."
-  (defface markdown-header-face
-    `((t (:inherit (,(when markdown-header-scaling 'variable-pitch)
-                     font-lock-function-name-face)
-                   :weight bold)))
-    "Base face for headers."
-    :group 'markdown-faces)
+  (let ((inherit-faces '(font-lock-function-name-face)))
+    (when markdown-header-scaling
+      (setq inherit-faces (cons 'variable-pitch inherit-faces)))
+    (defface markdown-header-face
+      `((t (:inherit ,inherit-faces :weight bold)))
+      "Base face for headers."
+      :group 'markdown-faces))
   (dotimes (num 6)
     (let* ((num1 (1+ num))
            (face-name (intern (format "markdown-header-face-%s" num1)))
@@ -2303,11 +2311,17 @@ See `font-lock-syntactic-face-function' for details."
                                          (2 markdown-markup-face)
                                          (3 markdown-metadata-value-face)))
     (markdown-match-gfm-open-code-blocks . ((1 markdown-markup-face)
-                                            (2 markdown-language-keyword-face nil t)))
+                                            (2 markdown-markup-face nil t)
+                                            (3 markdown-language-keyword-face nil t)
+                                            (4 markdown-language-info-face nil t)
+                                            (5 markdown-markup-face nil t)))
     (markdown-match-gfm-close-code-blocks . ((1 markdown-markup-face)))
     (markdown-match-gfm-code-blocks . ((0 markdown-pre-face)))
     (markdown-match-fenced-start-code-block . ((1 markdown-markup-face)
-                                               (2 markdown-language-keyword-face nil t)))
+                                               (2 markdown-markup-face nil t)
+                                               (3 markdown-language-keyword-face nil t)
+                                               (4 markdown-language-info-face nil t)
+                                               (5 markdown-markup-face nil t)))
     (markdown-match-fenced-end-code-block . ((0 markdown-markup-face)))
     (markdown-match-fenced-code-blocks . ((0 markdown-pre-face)))
     (markdown-match-pre-blocks . ((0 markdown-pre-face)))
@@ -2355,21 +2369,21 @@ See `font-lock-syntactic-face-function' for details."
     (,markdown-regex-footnote . ((1 markdown-markup-face)          ; [^
                                  (2 markdown-footnote-face)        ; label
                                  (3 markdown-markup-face)))        ; ]
-    (,markdown-regex-link-inline . ((1 markdown-markup-face nil t) ; ! (optional)
-                                    (2 markdown-markup-face)       ; [
-                                    (3 markdown-link-face)         ; text
-                                    (4 markdown-markup-face)       ; ]
-                                    (5 markdown-markup-face)       ; (
-                                    (6 markdown-url-face)          ; url
+    (markdown-match-inline-links . ((1 markdown-markup-face nil t)     ; ! (optional)
+                                    (2 markdown-markup-face)           ; [
+                                    (3 markdown-link-face)             ; text
+                                    (4 markdown-markup-face)           ; ]
+                                    (5 markdown-markup-face)           ; (
+                                    (6 markdown-url-face)              ; url
                                     (7 markdown-link-title-face nil t) ; "title" (optional)
                                     (8 markdown-markup-face)))         ; )
-    (,markdown-regex-link-reference . ((1 markdown-markup-face nil t) ; ! (optional)
+    (markdown-match-reference-links . ((1 markdown-markup-face nil t) ; ! (optional)
                                        (2 markdown-markup-face)       ; [
                                        (3 markdown-link-face)         ; text
                                        (4 markdown-markup-face)       ; ]
                                        (5 markdown-markup-face)       ; [
                                        (6 markdown-reference-face)    ; label
-                                       (7 markdown-markup-face)))     ; ]
+                                       (8 markdown-markup-face)))     ; ]
     (,markdown-regex-reference-definition . ((1 markdown-markup-face) ; [
                                              (2 markdown-reference-face) ; label
                                              (3 markdown-markup-face)    ; ]
@@ -2467,6 +2481,48 @@ in XEmacs 21."
         'outline-hide-subtree
       'hide-subtree)))
 
+;; Provide directory-name-p to Emacs 24
+(defsubst markdown-directory-name-p (name)
+  "Return non-nil if NAME ends with a directory separator character.
+Taken from `directory-name-p' from Emacs 25 and provided here for
+backwards compatibility."
+  (let ((len (length name))
+        (lastc ?.))
+    (if (> len 0)
+        (setq lastc (aref name (1- len))))
+    (or (= lastc ?/)
+        (and (memq system-type '(windows-nt ms-dos))
+             (= lastc ?\\)))))
+
+;; Provide a function to find files recursively in Emacs 24.
+(defalias 'markdown-directory-files-recursively
+  (if (fboundp 'directory-files-recursively)
+      'directory-files-recursively
+    (lambda (dir regexp)
+    "Return list of all files under DIR that have file names matching REGEXP.
+This function works recursively.  Files are returned in \"depth first\"
+order, and files from each directory are sorted in alphabetical order.
+Each file name appears in the returned list in its absolute form.
+Based on `directory-files-recursively' from Emacs 25 and provided
+here for backwards compatibility."
+  (let ((result nil)
+        (files nil)
+        ;; When DIR is "/", remote file names like "/method:" could
+        ;; also be offered.  We shall suppress them.
+        (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir)))))
+    (dolist (file (sort (file-name-all-completions "" dir)
+                        'string<))
+      (unless (member file '("./" "../"))
+        (if (markdown-directory-name-p file)
+            (let* ((leaf (substring file 0 (1- (length file))))
+                   (full-file (expand-file-name leaf dir)))
+              (setq result
+                    (nconc result (markdown-directory-files-recursively
+                                   full-file regexp))))
+          (when (string-match regexp file)
+            (push (expand-file-name file dir) files)))))
+    (nconc result (nreverse files))))))
+
 
 ;;; Markdown Parsing Functions ================================================
 
@@ -2540,7 +2596,7 @@ Return nil if the current line is not the beginning of a list item."
   (end-of-line)
   (let (stop)
     (while (not (or stop (bobp)))
-      (re-search-backward markdown-regex-block-separator nil t)
+      (re-search-backward markdown-regex-block-separator-noindent nil t)
       (when (match-end 2)
         (goto-char (match-end 2))
         (cond
@@ -2735,7 +2791,28 @@ If the point is not in a list item, do nothing."
 
 (defun markdown-cur-list-item-bounds ()
   "Return bounds and indentation of the current list item.
-Return a list of the form (begin end indent nonlist-indent marker).
+Return a list of the following form:
+
+    (begin end indent nonlist-indent marker checkbox)
+
+The named components are:
+
+  - begin: Position of beginning of list item, including leading indentation.
+  - end: Position of the end of the list item, including list item text.
+  - indent: Number of characters of indentation before list marker (an integer).
+  - nonlist-indent: Number characters of indentation, list
+    marker, and whitespace following list marker (an integer).
+  - marker: String containing the list marker and following whitespace
+            (e.g., \"- \" or \"* \").
+
+As an example, for the following unordered list item
+
+   - item
+
+the returned list would be
+
+    (1 14 3 5 \"- \")
+
 If the point is not inside a list item, return nil.
 Leave match data intact for `markdown-regex-list'."
   (let (cur prev-begin prev-end indent nonlist-indent marker)
@@ -2746,9 +2823,10 @@ Leave match data intact for `markdown-regex-list'."
       (end-of-line)
       (when (re-search-backward markdown-regex-list nil t)
         (setq prev-begin (match-beginning 0))
-        (setq indent (length (match-string 1)))
+        (setq indent (length (match-string-no-properties 1)))
         (setq nonlist-indent (length (match-string 0)))
-        (setq marker (concat (match-string 2) (match-string 3)))
+        (setq marker (concat (match-string-no-properties 2)
+                             (match-string-no-properties 3)))
         (save-match-data
           (markdown-cur-list-item-end nonlist-indent)
           (setq prev-end (point)))
@@ -2757,6 +2835,10 @@ Leave match data intact for `markdown-regex-list'."
                    nonlist-indent)
           (list prev-begin prev-end indent nonlist-indent marker))))))
 
+(defun markdown-list-item-at-point-p ()
+  "Return t if there is a list item at the point and nil otherwise."
+  (save-match-data (markdown-cur-list-item-bounds)))
+
 (defun markdown-bounds-of-thing-at-point (thing)
   "Call `bounds-of-thing-at-point' for THING with slight modifications.
 Does not include trailing newlines when THING is 'line.  Handles the
@@ -2802,7 +2884,7 @@ intact additional processing."
           (cl-pushnew target refs :test #'equal)))
       (reverse refs))))
 
-(defun markdown-code-at-point-p ()
+(defun markdown-inline-code-at-point ()
   "Return non-nil if the point is at an inline code fragment.
 Return nil otherwise.  Set match data according to
 `markdown-match-code' upon success.
@@ -2812,15 +2894,14 @@ because `thing-at-point-looking-at' does not work reliably with
 `markdown-regex-code'.
 
 The match data is set as follows:
-Group 1 matches the opening backticks.
-Group 2 matches the code fragment itself, without backticks.
-Group 3 matches the closing backticks."
-  (interactive)
+Group 1 matches the opening backquotes.
+Group 2 matches the code fragment itself, without backquotes.
+Group 3 matches the closing backquotes."
   (save-excursion
     (let ((old-point (point))
-          (end-of-block (progn (markdown-end-of-block) (point)))
+          (end-of-block (progn (markdown-end-of-text-block) (point)))
           found)
-      (markdown-beginning-of-block)
+      (markdown-beginning-of-text-block)
       (while (and (markdown-match-code end-of-block)
                   (setq found t)
                   (< (match-end 0) old-point)))
@@ -2828,6 +2909,15 @@ Group 3 matches the closing backticks."
            (<= (match-beginning 0) old-point) ; match contains old-point
            (>= (match-end 0) old-point)))))
 
+(defun markdown-inline-code-at-point-p ()
+  "Return non-nil if there is inline code at the point.
+This is a predicate function counterpart to
+`markdown-inline-code-at-point' which does not modify the match
+data.  See `markdown-code-block-at-point-p' for code blocks."
+  (save-match-data (markdown-inline-code-at-point)))
+
+(make-obsolete 'markdown-code-at-point-p 'markdown-inline-code-at-point-p "v2.2")
+
 (defun markdown-code-block-at-pos (pos)
   "Return match data list if there is a code block at POS.
 This includes pre blocks, tilde-fenced code blocks, and GFM
@@ -2840,11 +2930,23 @@ quoted code blocks.  Return nil otherwise."
       (and (bound-and-true-p poly-markdown-mode)
            (get-text-property pos 'chunkmode))))
 
-(defun markdown-code-block-at-point ()
-  "Return match data if the point is inside a code block.
-This includes pre blocks, tilde-fenced code blocks, and
-GFM quoted code blocks.  Calls `markdown-code-block-at-pos'."
-  (markdown-code-block-at-pos (point)))
+;; Function was renamed to emphasize that it does not modify match-data.
+(defalias 'markdown-code-block-at-point 'markdown-code-block-at-point-p)
+
+(defun markdown-code-block-at-point-p ()
+  "Return non-nil if there is a code block at the point.
+This includes pre blocks, tilde-fenced code blocks, and GFM
+quoted code blocks.  This function does not modify the match
+data.  See `markdown-inline-code-at-point-p' for inline code."
+  (save-match-data (markdown-code-block-at-pos (point))))
+
+(defun markdown-heading-at-point ()
+  "Return non-nil if there is a heading at the point.
+Set match data for `markdown-regex-header'."
+  (let ((match-data (get-text-property (point) 'markdown-heading)))
+    (when match-data
+      (set-match-data match-data)
+      t)))
 
 
 ;;; Markdown Font Lock Matching Functions =====================================
@@ -3051,7 +3153,7 @@ analysis."
   "Match horizontal rules comments from the point to LAST."
   (while (and (re-search-forward markdown-regex-hr last t)
               (or (markdown-on-heading-p)
-                  (markdown-code-block-at-point))
+                  (markdown-code-block-at-point-p))
               (< (match-end 0) last))
     (forward-line))
   (beginning-of-line)
@@ -3069,6 +3171,92 @@ analysis."
         (set-match-data (list beg (point)))
         t))))
 
+(defun markdown-match-generic-links (last ref)
+  "Match inline links from point to LAST.
+When REF is non-nil, match reference links instead of standard
+links with URLs."
+  ;; Clear match data to test for a match after functions returns.
+  (set-match-data nil)
+  ;; Search for the next potential link (not in a code block).
+  (while (and (re-search-forward "\\(!\\)?\\(\\[\\)" last t)
+              (markdown-code-block-at-point)
+              (< (point) last)))
+  ;; Match opening exclamation point (optional) and left bracket.
+  (when (match-beginning 2)
+    (let* ((bang (match-beginning 1))
+           (first-begin (match-beginning 2))
+           ;; Find end of block to prevent matching across blocks.
+           (end-of-block (save-excursion
+                           (progn
+                             (goto-char (match-beginning 2))
+                             (markdown-end-of-text-block)
+                             (point))))
+           ;; Move over balanced expressions to closing right bracket.
+           ;; Catch unbalanced expression errors and return nil.
+           (first-end (condition-case nil
+                           (and (goto-char first-begin)
+                                (scan-sexps (point) 1))
+                         (error nil)))
+           ;; Continue with point at CONT-POINT upon failure.
+           (cont-point (min (1+ first-begin) last))
+           second-begin second-end url-begin url-end
+           title-begin title-end)
+      ;; When bracket found, in range, and followed by a left paren/bracket...
+      (when (and first-end (< first-end end-of-block) (goto-char first-end)
+                 (char-equal (char-after (point)) (if ref ?\[ ?\()))
+        ;; Scan across balanced expressions for closing parenthesis/bracket.
+        (setq second-begin (point)
+              second-end (condition-case nil
+                            (scan-sexps (point) 1)
+                          (error nil)))
+        ;; Check that closing parenthesis/bracket is in range.
+        (if (and second-end (<= second-end end-of-block) (<= second-end last))
+            (progn
+              ;; Search for (optional) title inside closing parenthesis
+              (when (and (not ref) (search-forward "\"" second-end t))
+                (setq title-begin (1- (point))
+                      title-end (and (goto-char second-end)
+                                     (search-backward "\"" (1+ title-begin) t))
+                      title-end (and title-end (1+ title-end))))
+              ;; Store URL/reference range
+              (setq url-begin (1+ second-begin)
+                    url-end (1- (or title-begin second-end)))
+              ;; Set match data, move point beyond link, and return
+              (set-match-data
+               (list (or bang first-begin) second-end  ; 0 - all
+                     bang (and bang (1+ bang))         ; 1 - bang
+                     first-begin (1+ first-begin)      ; 2 - markup
+                     (1+ first-begin) (1- first-end)   ; 3 - link text
+                     (1- first-end) first-end          ; 4 - markup
+                     second-begin (1+ second-begin)    ; 5 - markup
+                     url-begin url-end                 ; 6 - url/reference
+                     title-begin title-end             ; 7 - title
+                     (1- second-end) second-end))      ; 8 - markup
+              ;; Nullify cont-point and leave point at end and
+              (setq cont-point nil)
+              (goto-char second-end))
+          ;; If no closing parenthesis in range, update continuation point
+          (setq cont-point (min end-of-block last))))
+      (cond
+       ;; On failure, continue searching at cont-point
+       ((and cont-point (< cont-point last))
+        ;;(message "Failure, starting over at cont-point = %d" cont-point)
+        (goto-char cont-point)
+        (markdown-match-generic-links last ref))
+       ;; No more text, return nil
+       ((and cont-point (= cont-point last))
+        nil)
+       ;; Return t if a match occurred
+       (t t)))))
+
+(defun markdown-match-inline-links (last)
+  "Match standard inline links from point to LAST."
+  (markdown-match-generic-links last nil))
+
+(defun markdown-match-reference-links (last)
+  "Match inline reference links from point to LAST."
+  (markdown-match-generic-links last t))
+
 (defun markdown-get-match-boundaries (start-header end-header last &optional pos)
   (save-excursion
     (goto-char (or pos (point-min)))
@@ -3353,7 +3541,7 @@ place the cursor in between them."
                      markdown-regex-code 1 3)))
         (markdown-wrap-or-insert "`" "`" nil (car bounds) (cdr bounds)))
     ;; Code markup removal, code markup for word, or empty markup insertion
-    (if (markdown-code-at-point-p)
+    (if (markdown-inline-code-at-point)
         (markdown-unwrap-thing-at-point nil 0 2)
       (markdown-wrap-or-insert "`" "`" 'word nil nil))))
 
@@ -3374,17 +3562,64 @@ place the cursor in between them."
         (markdown-unwrap-thing-at-point nil 0 2)
       (markdown-wrap-or-insert "<kbd>" "</kbd>" 'word nil nil))))
 
-(defun markdown-insert-link ()
-  "Insert an inline link, using region or word as link text if possible.
-If there is an active region, use the region as the link text.  If the
-point is at a word, use the word as the link text.  In these cases, the
-point will be left at the position for inserting a URL.  If there is no
-active region and the point is not at word, simply insert link markup and
-place the point in the position to enter link text."
+(defun markdown-insert-inline-link (text url &optional title)
+  "Insert an inline link with TEXT pointing to URL.
+Optionally, the user can provide a TITLE."
+  (let ((cur (point)))
+    (setq title (and title (concat " \"" title "\"")))
+    (insert (concat "[" text "](" url title ")"))
+    (cond ((not text) (goto-char (+ 1 cur)))
+          ((not url) (goto-char (+ 3 (length text) cur))))))
+
+(defun markdown-insert-inline-link-dwim ()
+  "Insert an inline link of the form [link](url) at point.
+If there is an active region, the text in the region will be used
+as the URL, if it appears to be a URL, or else as the link text.
+If the point is at a URL, use it to create a new link. If the
+point is at a reference link, convert it to an inline link. If
+the point is at a word, use the word as the link text. In these
+cases, the point will be left at the position for inserting a
+URL. If there is no active region and the point is not at word,
+simply insert link markup and place the point in the position to
+enter link text."
   (interactive)
-  (let ((bounds (markdown-wrap-or-insert "[" "]()")))
-    (when bounds
-      (goto-char (- (cdr bounds) 1)))))
+  (cond
+   ;; If there is an active region, remove existing links in the
+   ;; region and use resulting region as link text for a new link.
+   ((markdown-use-region-p)
+    (let* ((bounds (markdown-unwrap-things-in-region
+                    (region-beginning) (region-end)
+                    markdown-regex-link-inline 0 3))
+           (text (buffer-substring (car bounds) (cdr bounds))))
+      (delete-region (car bounds) (cdr bounds))
+      (markdown-insert-inline-link text nil)))
+   ;; If there is an inline link at the point, remove it and add the
+   ;; link text to the kill ring.
+   ((thing-at-point-looking-at markdown-regex-link-inline)
+    (kill-new (match-string 3))
+    (delete-region (match-beginning 0) (match-end 0)))
+   ;; If there is an angle URL at the point, use it for a new link.
+   ((thing-at-point-looking-at markdown-regex-angle-uri)
+    (let ((url (match-string 2)))
+      (delete-region (match-beginning 0) (match-end 0))
+      (markdown-insert-inline-link nil url)))
+   ;; If there is a plain URL at the point, use it for a new link.
+   ((thing-at-point-looking-at markdown-regex-uri)
+    (let ((url (match-string 0)))
+      (delete-region (match-beginning 0) (match-end 0))
+      (markdown-insert-inline-link nil url)))
+   ;; If there is a reference link at point, convert to inline link.
+   ((thing-at-point-looking-at markdown-regex-link-reference)
+    (let ((beg (match-beginning 0))
+          (end (match-end 0))
+          (text (match-string 3))
+          (url (markdown-link-link)))
+      (delete-region beg end)
+      (markdown-insert-inline-link text url)))
+   ;; Otherwise, insert a link
+   (t (let ((bounds (markdown-wrap-or-insert "[" "]()")))
+        (when bounds
+          (goto-char (- (cdr bounds) 1)))))))
 
 (defun markdown-insert-reference-link (text label &optional url title)
   "Insert a reference link and, optionally, a reference definition.
@@ -3410,7 +3645,7 @@ be used to populate the title attribute when converted to XHTML."
   (let ((end (point)))
     (cl-case markdown-reference-location
       (end         (goto-char (point-max)))
-      (immediately (markdown-end-of-block))
+      (immediately (markdown-end-of-text-block))
       (header      (markdown-end-of-defun)))
     (unless (markdown-cur-line-blank-p) (insert "\n"))
     (insert "\n[" label "]: ")
@@ -3867,8 +4102,8 @@ if three backquotes inserted at the beginning of line."
 
 (defun markdown-gfm-add-used-language (lang)
   "Clean LANG and add to list of used languages."
-  (add-to-list 'markdown-gfm-used-languages
-               (markdown-clean-language-string lang)))
+  (setq markdown-gfm-used-languages
+          (cons lang (remove lang markdown-gfm-used-languages))))
 
 (defun markdown-insert-gfm-code-block (&optional lang)
   "Insert GFM code block for language LANG.
@@ -3881,10 +4116,9 @@ automatically in order to have the correct markup."
            (condition-case nil
                (markdown-clean-language-string
                 (completing-read
-                 (format "Programming language [%s]: "
-                         (or (car markdown-gfm-used-languages) "none"))
+                 "Programming language: "
                  (markdown-gfm-get-corpus)
-                 nil 'confirm nil
+                 nil 'confirm (car markdown-gfm-used-languages)
                  'markdown-gfm-language-history))
              (quit "")))))
   (unless (string= lang "") (markdown-gfm-add-used-language lang))
@@ -3923,9 +4157,11 @@ automatically in order to have the correct markup."
                     (goto-char (car pos-prop))
                     (save-match-data
                       (set-match-data (get-text-property (point) prop))
-                      (when (and (match-beginning 2) (match-end 2))
+                      ;; Note: Hard-coded group number assumes tilde
+                      ;; and GFM fenced code regexp groups agree.
+                      (when (and (match-beginning 3) (match-end 3))
                         (buffer-substring-no-properties
-                         (match-beginning 2) (match-end 2)))))
+                         (match-beginning 3) (match-end 3)))))
        do (progn (when lang (markdown-gfm-add-used-language lang))
                  (goto-char (next-single-property-change (point) prop)))))))
 
@@ -3960,7 +4196,7 @@ automatically in order to have the correct markup."
   "Position the cursor at the proper location for a new footnote text."
   (cond
    ((eq markdown-footnote-location 'end) (goto-char (point-max)))
-   ((eq markdown-footnote-location 'immediately) (markdown-end-of-block))
+   ((eq markdown-footnote-location 'immediately) (markdown-end-of-text-block))
    ((eq markdown-footnote-location 'header) (markdown-end-of-defun))))
 
 (defun markdown-footnote-kill ()
@@ -4139,7 +4375,7 @@ text to kill ring), and list items."
   (let (val)
     (cond
      ;; Inline code
-     ((markdown-code-at-point-p)
+     ((markdown-inline-code-at-point)
       (kill-new (match-string 2))
       (delete-region (match-beginning 0) (match-end 0)))
      ;; ATX header
@@ -4287,11 +4523,33 @@ duplicate positions, which are handled up by calling functions."
     (reverse positions)))
 
 (defun markdown-enter-key ()
-  "Handle RET according to to the value of `markdown-indent-on-enter'."
+  "Handle RET according to value of `markdown-indent-on-enter'.
+When it is nil, simply call `newline'.  Otherwise, indent the next line
+following RET using `markdown-indent-line'.  Furthermore, when it
+is set to 'indent-and-new-item and the point is in a list item,
+start a new item with the same indentation. If the point is in an
+empty list item, remove it (so that pressing RET twice when in a
+list simply adds a blank line)."
   (interactive)
-  (newline)
-  (when markdown-indent-on-enter
-    (markdown-indent-line)))
+  (if (not markdown-indent-on-enter)
+      (newline)
+    (let (bounds)
+      (if (and (memq markdown-indent-on-enter '(indent-and-new-item))
+               (setq bounds (markdown-cur-list-item-bounds)))
+          (let ((beg (cl-first bounds))
+                (end (cl-second bounds))
+                (length (cl-fourth bounds)))
+            ;; Point is in a list item
+            (if (= (- end beg) length)
+                ;; Delete blank list
+                (progn
+                  (delete-region beg end)
+                  (newline)
+                  (markdown-indent-line))
+              (call-interactively #'markdown-insert-list-item)))
+        ;; Point is not in a list
+        (newline)
+        (markdown-indent-line)))))
 
 (defun markdown-exdent-or-delete (arg)
   "Handle BACKSPACE by cycling through indentation points.
@@ -4580,7 +4838,7 @@ Assumes match data is available for `markdown-regex-italic'."
 (defvar markdown-mode-map
   (let ((map (make-keymap)))
     ;; Element insertion
-    (define-key map "\C-c\C-al" 'markdown-insert-link)
+    (define-key map "\C-c\C-al" 'markdown-insert-inline-link-dwim)
     (define-key map "\C-c\C-aL" 'markdown-insert-reference-link-dwim)
     (define-key map "\C-c\C-au" 'markdown-insert-uri)
     (define-key map "\C-c\C-af" 'markdown-insert-footnote)
@@ -4660,9 +4918,12 @@ Assumes match data is available for `markdown-regex-italic'."
     (define-key map (kbd "M-S-<down>") 'markdown-move-subtree-down)
     (define-key map (kbd "M-S-<left>") 'markdown-promote-subtree)
     (define-key map (kbd "M-S-<right>") 'markdown-demote-subtree)
+    ;; Blocks
+    (define-key map (kbd "M-{") 'markdown-backward-block)
+    (define-key map (kbd "M-}") 'markdown-forward-block)
+    (define-key map (kbd "M-h") 'markdown-mark-block)
+    (define-key map (kbd "C-x n b") 'markdown-narrow-to-block)
     ;; Movement
-    (define-key map (kbd "M-{") 'markdown-backward-paragraph)
-    (define-key map (kbd "M-}") 'markdown-forward-paragraph)
     (define-key map (kbd "M-n") 'markdown-next-link)
     (define-key map (kbd "M-p") 'markdown-previous-link)
     ;; Alternative keys (in case of problems with the arrow keys)
@@ -4671,6 +4932,7 @@ Assumes match data is available for `markdown-regex-italic'."
     (define-key map (kbd "C-c C-x l") 'markdown-promote)
     (define-key map (kbd "C-c C-x r") 'markdown-demote)
     (define-key map (kbd "C-c C-x m") 'markdown-insert-list-item)
+    (define-key map (kbd "C-c C-x C-x") 'markdown-toggle-gfm-checkbox)
     map)
   "Keymap for Markdown major mode.")
 
@@ -4689,77 +4951,113 @@ See also `markdown-mode-map'.")
 (easy-menu-define markdown-mode-menu markdown-mode-map
   "Menu for Markdown mode"
   '("Markdown"
+    "---"
+    ("Movement"
+     ["Jump" markdown-jump]
+     ["Follow Link" markdown-follow-thing-at-point]
+     ["Next Link" markdown-next-link]
+     ["Previous Link" markdown-previous-link]
+     "---"
+     ["Next Visible Heading" markdown-next-visible-heading]
+     ["Previous Visible Heading" markdown-previous-visible-heading]
+     ["Forward Same Level" markdown-forward-same-level]
+     ["Backward Same Level" markdown-backward-same-level]
+     ["Up to Parent Heading" markdown-up-heading]
+     "---"
+     ["Forward Block" markdown-forward-block]
+     ["Backward Block" markdown-backward-block])
     ("Show/Hide"
-     ["Cycle visibility" markdown-cycle (markdown-on-heading-p)]
-     ["Cycle global visibility" markdown-shifttab])
+     ["Cycle Visibility" markdown-cycle (markdown-on-heading-p)]
+     ["Cycle Visibility Globally" markdown-shifttab])
     "---"
-    ["Compile" markdown-other-window]
-    ["Preview" markdown-preview]
-    ["Export" markdown-export]
-    ["Export & View" markdown-export-and-preview]
-    ["Open" markdown-open]
-    ["Live Export" markdown-live-preview-mode
-     :style toggle :selected markdown-live-preview-mode]
-    ["Kill ring save" markdown-kill-ring-save]
-    "---"
-    ("Headings"
-     ["Automatic" markdown-insert-header-dwim]
-     ["Automatic (prefer setext)" markdown-insert-header-setext-dwim]
+    ("Headings & Structure"
+     ["Automatic Heading" markdown-insert-header-dwim]
+     ["Automatic Heading (Setext)" markdown-insert-header-setext-dwim]
+     ("Specific Heading (atx)"
+      ["First Level Setext" markdown-insert-header-setext-1]
+      ["Second Level Setext" markdown-insert-header-setext-2])
+     ("Specific Heading (Setext)"
+      ["First Level atx" markdown-insert-header-atx-1]
+      ["Second Level atx" markdown-insert-header-atx-2]
+      ["Third Level atx" markdown-insert-header-atx-3]
+      ["Fourth Level atx" markdown-insert-header-atx-4]
+      ["Fifth Level atx" markdown-insert-header-atx-5]
+      ["Sixth Level atx" markdown-insert-header-atx-6])
+     ["Horizontal Rule" markdown-insert-hr]
      "---"
-     ["First level setext" markdown-insert-header-setext-1]
-     ["Second level setext" markdown-insert-header-setext-2]
+     ["Move Subtree Up" markdown-move-subtree-up :keys "M-S-<up>"]
+     ["Move Subtree Down" markdown-move-subtree-down :keys "M-S-<down>"]
+     ["Promote Subtree" markdown-promote-subtree :keys "M-S-<left>"]
+     ["Demote Subtree" markdown-demote-subtree :keys "M-S-<right>"]
+     ["Promote Header" markdown-promote :keys "M-<left>"]
+     ["Demote Header" markdown-demote :keys "M-<right>"])
+    ("Region Editing"
+     ["Indent Region" markdown-indent-region]
+     ["Exdent Region" markdown-exdent-region])
+    ("Lists"
+     ["Insert List Item" markdown-insert-list-item]
+     ["Move List Item Up" markdown-move-up :keys "M-<up>"]
+     ["Move List Item Down" markdown-move-down :keys "M-<down>"]
+     ["Exdent List Item" markdown-promote :keys "M-<left>"]
+     ["Indent List Item" markdown-demote :keys "M-<right>"]
+     ["Renumber List" markdown-cleanup-list-numbers]
+     ["Toggle Task List Item" markdown-toggle-gfm-checkbox])
+    ("Links & Images"
+     ["Plain URL" markdown-insert-uri]
+     ["Inline Link" markdown-insert-inline-link-dwim]
+     ["Inline Image" markdown-insert-image]
+     ["Reference Link" markdown-insert-reference-link-dwim]
+     ["Reference Image" markdown-insert-reference-image]
+     ["Footnote" markdown-insert-footnote]
+     ["Wiki Link" markdown-insert-wiki-link]
      "---"
-     ["First level atx" markdown-insert-header-atx-1]
-     ["Second level atx" markdown-insert-header-atx-2]
-     ["Third level atx" markdown-insert-header-atx-3]
-     ["Fourth level atx" markdown-insert-header-atx-4]
-     ["Fifth level atx" markdown-insert-header-atx-5]
-     ["Sixth level atx" markdown-insert-header-atx-6])
+     ["Check References" markdown-check-refs]
+     ["Toggle Inline Images" markdown-toggle-inline-images
+      :style radio
+      :selected markdown-inline-image-overlays]
+     ["Toggle Wiki Links" markdown-toggle-wiki-links
+      :style radio
+      :selected markdown-enable-wiki-links])
+    ("Styles"
+     ["Bold" markdown-insert-bold]
+     ["Italic" markdown-insert-italic]
+     ["Code" markdown-insert-code]
+     ["Strikethrough" markdown-insert-strike-through]
+     ["Keyboard" markdown-insert-kbd]
+     "---"
+     ["Blockquote" markdown-insert-blockquote]
+     ["Preformatted" markdown-insert-pre]
+     ["GFM Code Block" markdown-insert-gfm-code-block]
+     "---"
+     ["Blockquote Region" markdown-blockquote-region]
+     ["Preformatted Region" markdown-pre-region]
+     "---"
+     ["Enable LaTeX math" markdown-toggle-math
+      :style radio
+      :selected markdown-enable-math])
     "---"
-    ["Bold" markdown-insert-bold]
-    ["Italic" markdown-insert-italic]
-    ["Strikethrough" markdown-insert-strike-through]
-    ["Blockquote" markdown-insert-blockquote]
-    ["Preformatted" markdown-insert-pre]
-    ["Code" markdown-insert-code]
+    ("Preview & Export"
+     ["Compile" markdown-other-window]
+     ["Preview" markdown-preview]
+     ["Export" markdown-export]
+     ["Export & View" markdown-export-and-preview]
+     ["Open" markdown-open]
+     ["Live Export" markdown-live-preview-mode
+      :style radio
+      :selected markdown-live-preview-mode]
+     ["Kill ring save" markdown-kill-ring-save])
+    ("Markup Completion and Cycling"
+     ["Complete Markup" markdown-complete]
+     ["Promote Element" markdown-promote]
+     ["Demote Element" markdown-demote])
     "---"
-    ["Insert inline link" markdown-insert-link]
-    ["Insert reference link" markdown-insert-reference-link-dwim]
-    ["Insert URL" markdown-insert-uri]
-    ["Insert inline image" markdown-insert-image]
-    ["Insert reference image" markdown-insert-reference-image]
-    ["Insert list item" markdown-insert-list-item]
-    ["Insert horizontal rule" markdown-insert-hr]
-    ["Insert footnote" markdown-insert-footnote]
-    ["Kill element" markdown-kill-thing-at-point]
+    ["Kill Element" markdown-kill-thing-at-point]
     "---"
-    ["Jump" markdown-jump]
-    ["Follow link" markdown-follow-thing-at-point]
-    ("Outline"
-     ["Next visible heading" markdown-next-visible-heading]
-     ["Previous visible heading" markdown-previous-visible-heading]
-     ["Forward same level" markdown-forward-same-level]
-     ["Backward same level" markdown-backward-same-level]
-     ["Up to parent heading" markdown-up-heading])
-    "---"
-    ("Completion and Cycling"
-     ["Complete" markdown-complete]
-     ["Promote" markdown-promote]
-     ["Demote" markdown-demote])
-    ("List editing"
-     ["Indent list item" markdown-demote]
-     ["Exdent list item" markdown-promote])
-    ("Region shifting"
-     ["Indent region" markdown-indent-region]
-     ["Exdent region" markdown-exdent-region])
-    "---"
-    ["Toggle inline images" markdown-toggle-inline-images]
-    ["Check references" markdown-check-refs]
-    ["Clean up list numbering" markdown-cleanup-list-numbers]
-    ["Complete markup" markdown-complete-buffer]
-    "---"
-    ["Version" markdown-show-version]
-    ))
+    ("Documentation"
+     ["Version" markdown-show-version]
+     ["Homepage" markdown-mode-info]
+     ["Describe Mode" (describe-function 'markdown-mode)]
+     ["Guide" (browse-url "https://leanpub.com/markdown-mode")])))
 
 
 ;;; imenu =====================================================================
@@ -4776,7 +5074,7 @@ See `imenu-create-index-function' and `imenu--index-alist' for details."
     (save-excursion
       (goto-char (point-min))
       (while (re-search-forward markdown-regex-header (point-max) t)
-        (unless (markdown-code-block-at-point)
+        (unless (markdown-code-block-at-point-p)
           (cond
            ((match-string-no-properties 2) ;; level 1 setext
             (setq heading (match-string-no-properties 1))
@@ -4821,7 +5119,7 @@ See `imenu-create-index-function' and `imenu--index-alist' for details."
     (save-excursion
       (goto-char (point-min))
       (while (re-search-forward markdown-regex-header (point-max) t)
-        (when (and (not (markdown-code-block-at-point))
+        (when (and (not (markdown-code-block-at-point-p))
                    (not (markdown-text-property-at-point 'markdown-yaml-metadata-begin)))
           (cond
            ((setq heading (match-string-no-properties 1))
@@ -4843,7 +5141,7 @@ See `imenu-create-index-function' and `imenu--index-alist' for details."
     (let* ((text (match-string-no-properties 3))
            (reference (match-string-no-properties 6))
            (target (downcase (if (string= reference "") text reference)))
-           (loc (cadr (markdown-reference-definition target))))
+           (loc (cadr (save-match-data (markdown-reference-definition target)))))
       (if loc
           (goto-char loc)
         (goto-char (match-beginning 0))
@@ -5126,6 +5424,12 @@ increase the indentation by one level."
         ;; Compute indentation and marker for new list item
         (setq cur-indent (nth 2 bounds))
         (setq marker (nth 4 bounds))
+        ;; Is this a GFM checkbox?
+        (when (save-excursion
+                (goto-char (cl-first bounds))
+                (forward-char (cl-fourth bounds))
+                (looking-at "\\(\\[\\)[xX ]\\(\\]\\s-*\\)"))
+          (setq marker (concat marker (match-string 1) " " (match-string 2))))
         (cond
          ;; Dedent: decrement indentation, find previous marker.
          ((= arg 4)
@@ -5168,7 +5472,7 @@ increase the indentation by one level."
                                     (substring (match-string 2) 0 space-adjust)
                                   (or old-spacing ". "))))
               (insert (concat new-indent new-prefix new-spacing)))))
-         ;; Unordered list, or ordered list with hash mark
+         ;; Unordered list, GFM task list, or ordered list with hash mark
          ((string-match-p "[\\*\\+-]\\|#\\." marker)
           (insert new-indent marker)))))))
 
@@ -5322,62 +5626,126 @@ move back to the ARG-th preceding section."
     (goto-char (point-max)))
   (skip-syntax-backward "-"))
 
-(defun markdown-beginning-of-block ()
-  "Move the point to the start of the previous text block."
-  (interactive)
-  (if (re-search-backward markdown-regex-block-separator nil t)
-      (goto-char (or (match-end 2) (match-end 0)))
-    (goto-char (point-min))))
+(make-obsolete 'markdown-beginning-of-block 'markdown-beginning-of-text-block "v2.2")
 
-(defun markdown-end-of-block ()
-  "Move the point to the start of the next text block."
-  (interactive)
+(defun markdown-beginning-of-text-block ()
+  "Move backward to previous beginning of a plain text block.
+This function simply looks for blank lines without considering
+the surrounding context in light of Markdown syntax.  For that, see
+`markdown-backward-block'."
+  (let ((start (point)))
+    (if (re-search-backward markdown-regex-block-separator nil t)
+        (goto-char (match-end 0))
+      (goto-char (point-min)))
+    (when (and (= start (point)) (not (bobp)))
+      (forward-line -1)
+      (if (re-search-backward markdown-regex-block-separator nil t)
+          (goto-char (match-end 0))
+        (goto-char (point-min))))))
+
+(make-obsolete 'markdown-end-of-block 'markdown-end-of-text-block "v2.2")
+
+(defun markdown-end-of-text-block ()
+  "Move forward to next beginning of a plain text block.
+This function simply looks for blank lines without considering
+the surrounding context in light of Markdown syntax.  For that, see
+`markdown-forward-block'."
   (beginning-of-line)
   (skip-syntax-forward "-")
   (when (= (point) (point-min))
     (forward-char))
   (if (re-search-forward markdown-regex-block-separator nil t)
-      (goto-char (or (match-end 2) (match-end 0)))
+      (goto-char (match-end 0))
     (goto-char (point-max)))
   (skip-syntax-backward "-")
   (forward-line))
 
-(defun markdown-forward-paragraph (arg)
-  "Move forward one or more paragraphs or by one block.
-When ARG is nil or a numeric prefix, call `forward-paragraph'
-with ARG.  When called with \\[universal-argument], call
-`markdown-end-of-block' instead."
-  (interactive "P")
+(defun markdown-backward-block (&optional arg)
+  "Move the point to the start of the current Markdown block.
+Moves across complete code blocks, list items, and blockquotes,
+but otherwise stops at blank lines, headers, and horizontal
+rules.  With argument ARG, do it ARG times; a negative argument
+ARG = -N means move forward N blocks."
+  (interactive "p")
   (or arg (setq arg 1))
-  (cond ((integerp arg)
-         (forward-paragraph arg))
-        ((equal arg '(4))
-         (markdown-end-of-block))))
+  (if (< arg 0)
+      (markdown-forward-block (- arg))
+    (dotimes (_ arg)
+      ;; Skip over whitespace in between blocks when moving backward.
+      (skip-syntax-backward "-")
+      (beginning-of-line)
+      ;; Proceed forward based on the type of block.
+      (let (bounds)
+        (cond
+         ;; Code blocks
+         ((markdown-code-block-at-point-p)
+          (forward-line -1)
+          (while (and (markdown-code-block-at-point-p) (not (bobp)))
+            (forward-line -1))
+          (forward-line))
+         ;; Headings
+         ((markdown-heading-at-point)
+          (goto-char (match-beginning 0)))
+         ;; Horizontal rules
+         ((looking-at markdown-regex-hr))
+         ;; Blockquotes
+         ((looking-at markdown-regex-blockquote)
+          (forward-line -1)
+          (while (and (looking-at markdown-regex-blockquote) (not (bobp)))
+            (forward-line -1))
+          (forward-line))
+         ;; List items
+         ((setq bounds (markdown-cur-list-item-bounds))
+          (goto-char (cl-first bounds)))
+         ;; Other
+         (t
+          (unless (markdown-prev-line-blank-p)
+            ;; Already moved to beginning-of-line, so don't move back
+            ;; again when already at the beginning of a block.
+            (markdown-beginning-of-text-block))))))
+    (skip-syntax-forward "-")))
 
-(defun markdown-backward-paragraph (arg)
-  "Move backward one or more paragraphs or by one block.
-When ARG is nil or a numeric prefix, call `backward-paragraph'
-with ARG.  When called with \\[universal-argument], call
-`markdown-beginning-of-block' instead."
-  (interactive "P")
+(defun markdown-forward-block (&optional arg)
+  "Move forward to the next end of a Markdown block.
+Moves across complete code blocks, list items, and blockquotes,
+but otherwise stops at blank lines, headers, and horizontal
+rules.  With argument ARG, do it ARG times; a negative argument
+ARG = -N means move backward N blocks."
+  (interactive "p")
   (or arg (setq arg 1))
-  (cond ((integerp arg)
-         (backward-paragraph arg))
-        ((equal arg '(4))
-         (markdown-beginning-of-block))))
-
-(defun markdown-end-of-block-element ()
-  "Move the point to the start of the next block unit.
-Stops at blank lines, list items, headers, and horizontal rules."
-  (interactive)
-  (forward-line)
-  (while (and (or (not (markdown-prev-line-blank-p))
-                  (markdown-cur-line-blank-p))
-              (not (or (looking-at-p markdown-regex-list)
-                       (looking-at-p markdown-regex-header)
-                       (looking-at-p markdown-regex-hr)))
-              (not (eobp)))
-    (forward-line)))
+  (if (< arg 0)
+      (markdown-backward-block (- arg))
+    (dotimes (_ arg)
+      ;; Skip over whitespace in between blocks when moving forward.
+      (if (markdown-cur-line-blank-p)
+          (skip-syntax-forward "-")
+        (beginning-of-line))
+      ;; Proceed forward based on the type of block.
+      (let (bounds)
+        (cond
+         ;; Code blocks
+         ((markdown-code-block-at-point-p)
+          (forward-line)
+          (while (and (markdown-code-block-at-point-p) (not (eobp)))
+            (forward-line)))
+         ;; Headings
+         ((looking-at markdown-regex-header)
+          (goto-char (or (match-end 4) (match-end 2) (match-end 3)))
+          (forward-line))
+         ;; Horizontal rules
+         ((looking-at markdown-regex-hr)
+          (forward-line))
+         ;; Blockquotes
+         ((looking-at markdown-regex-blockquote)
+          (forward-line)
+          (while (and (looking-at markdown-regex-blockquote) (not (eobp)))
+            (forward-line)))
+         ;; List items
+         ((setq bounds (markdown-cur-list-item-bounds))
+          (goto-char (cl-second bounds))
+          (forward-line))
+         ;; Other
+         (t (markdown-end-of-text-block)))))))
 
 (defun markdown-next-link ()
   "Jump to next inline, reference, or wiki link.
@@ -5390,7 +5758,7 @@ See `markdown-wiki-link-p' and `markdown-previous-wiki-link'."
       (goto-char (+ (match-end 0) 1)))
     ;; Search for the next wiki link and move to the beginning.
     (while (and (re-search-forward (markdown-make-regex-link-generic) nil t)
-                (markdown-code-block-at-point)
+                (markdown-code-block-at-point-p)
                 (< (point) (point-max))))
     (if (and (not (eq (point) opoint))
              (or (markdown-link-p) (markdown-wiki-link-p)))
@@ -5407,7 +5775,7 @@ See `markdown-wiki-link-p' and `markdown-next-wiki-link'."
   (interactive)
   (let ((opoint (point)))
     (while (and (re-search-backward (markdown-make-regex-link-generic) nil t)
-                (markdown-code-block-at-point)
+                (markdown-code-block-at-point-p)
                 (> (point) (point-min))))
     (if (and (not (eq (point) opoint))
              (or (markdown-link-p) (markdown-wiki-link-p)))
@@ -5415,22 +5783,6 @@ See `markdown-wiki-link-p' and `markdown-next-wiki-link'."
       (goto-char opoint)
       nil)))
 
-(defun markdown-next-heading ()
-  "Move to the next heading line of any level.
-With argument, repeats or can move backward if negative."
-  (let ((pos (outline-next-heading)))
-    (while (markdown-code-block-at-point)
-      (setq pos (outline-next-heading)))
-    pos))
-
-(defun markdown-previous-heading ()
-  "Move to the previous heading line of any level.
-With argument, repeats or can move backward if negative."
-  (let ((pos (outline-previous-heading)))
-    (while (markdown-code-block-at-point)
-      (setq pos (outline-previous-heading)))
-    pos))
-
 
 ;;; Outline ===================================================================
 
@@ -5439,11 +5791,12 @@ With argument, repeats or can move backward if negative."
 MOVE-FN is a function and ARG is its argument. For example,
 headings inside preformatted code blocks may match
 `outline-regexp' but should not be considered as headings."
-  (funcall move-fn arg)
-  (let ((prev -1))
-    (while (and (/= prev (point)) (markdown-code-block-at-point))
+  (let ((prev -1) (start (point)))
+    (if arg (funcall move-fn arg) (funcall move-fn))
+    (while (and (/= prev (point)) (markdown-code-block-at-point-p))
       (setq prev (point))
-      (funcall move-fn arg))))
+      (if arg (funcall move-fn arg) (funcall move-fn)))
+    (if (= (point) start) nil (point))))
 
 (defun markdown-next-visible-heading (arg)
   "Move to the next visible heading line of any level.
@@ -5459,6 +5812,14 @@ passed to `outline-previous-visible-heading'."
   (interactive "p")
   (markdown-move-heading-common 'outline-previous-visible-heading arg))
 
+(defun markdown-next-heading ()
+  "Move to the next heading line of any level."
+  (markdown-move-heading-common 'outline-next-heading))
+
+(defun markdown-previous-heading ()
+  "Move to the previous heading line of any level."
+  (markdown-move-heading-common 'outline-previous-heading))
+
 (defun markdown-forward-same-level (arg)
   "Move forward to the ARG'th heading at same level as this one.
 Stop at the first and last headings of a superior heading."
@@ -5468,7 +5829,7 @@ Stop at the first and last headings of a superior heading."
 (defun markdown-back-to-heading-over-code-block (&optional invisible-ok)
   (beginning-of-line)
   (or (and (outline-on-heading-p invisible-ok)
-           (not (markdown-code-block-at-point)))
+           (not (markdown-code-block-at-point-p)))
       (let ((header-re (concat "^\\(?:" outline-regexp "\\)"))
             found)
         (save-excursion
@@ -5476,7 +5837,7 @@ Stop at the first and last headings of a superior heading."
             (let (finish)
               (while (and (not finish) (re-search-backward header-re nil t))
                 (when (and (or invisible-ok (not (outline-invisible-p)))
-                           (not (markdown-code-block-at-point)))
+                           (not (markdown-code-block-at-point-p)))
                   (setq finish t)))
               (if (not finish)
                   (error "Before first heading")
@@ -5502,6 +5863,8 @@ Stop at the first and last headings of a superior heading."
   "Move to the visible heading line of which the present line is a subheading.
 With argument, move up ARG levels."
   (interactive "p")
+  (and (called-interactively-p 'any)
+       (not (eq last-command 'markdown-up-heading)) (push-mark))
   (markdown-move-heading-common 'outline-up-heading arg))
 
 (defun markdown-back-to-heading (&optional invisible-ok)
@@ -5522,9 +5885,9 @@ non-nil.
 Derived from `org-end-of-subtree'."
   (markdown-back-to-heading invisible-OK)
   (let ((first t)
-        (level (funcall outline-level)))
+        (level (markdown-outline-level)))
     (while (and (not (eobp))
-                (or first (> (funcall outline-level) level)))
+                (or first (> (markdown-outline-level) level)))
       (setq first nil)
       (markdown-next-heading))
     (if (memq (preceding-char) '(?\n ?\^M))
@@ -5558,7 +5921,7 @@ setext header, but should not be folded."
     (unless (outline-on-heading-p)
       (outline-next-visible-heading 1))
     (while (< (point) (point-max))
-      (when (markdown-code-block-at-point)
+      (when (markdown-code-block-at-point-p)
         (outline-flag-region (1- (point-at-bol)) (point-at-eol) t))
       (outline-next-visible-heading 1))))
 
@@ -5569,7 +5932,7 @@ setext header, but should not be folded."
   (let (finish)
     (while (and (not finish) (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
                                                 nil 'move))
-      (unless (markdown-code-block-at-point)
+      (unless (markdown-code-block-at-point-p)
         (goto-char (match-beginning 0))
         (setq finish t))))
   (when (and (bolp) (or outline-blank-line (eobp)) (not (bobp)))
@@ -5671,10 +6034,10 @@ Calls `markdown-cycle' with argument t."
 (defun markdown-outline-level ()
   "Return the depth to which a statement is nested in the outline."
   (cond
-   ((markdown-code-block-at-point) 7)
+   ((markdown-code-block-at-point-p) 7) ;; Only 6 header levels are defined.
    ((match-end 2) 1)
    ((match-end 3) 2)
-   ((- (match-end 4) (match-beginning 4)))))
+   ((match-end 4) (- (match-end 4) (match-beginning 4)))))
 
 (defun markdown-promote-subtree (&optional arg)
   "Promote the current subtree of ATX headings.
@@ -5686,7 +6049,7 @@ demote."
   (save-excursion
     (when (and (or (thing-at-point-looking-at markdown-regex-header-atx)
                    (re-search-backward markdown-regex-header-atx nil t))
-               (not (markdown-code-block-at-point)))
+               (not (markdown-code-block-at-point-p)))
       (let ((level (length (match-string 1)))
             (promote-or-demote (if arg 1 -1))
             (remove 't))
@@ -5714,6 +6077,36 @@ demote."
   (interactive)
   (outline-move-subtree-down 1))
 
+
+;;; Marking and Narrowing =====================================================
+
+(defun markdown-mark-block ()
+  "Put mark at end of this block, point at beginning.
+The block marked is the one that contains point or follows point.
+
+Interactively, if this command is repeated or (in Transient Mark
+mode) if the mark is active, it marks the next block after the
+ones already marked."
+  (interactive)
+  (if (or (and (eq last-command this-command) (mark t))
+          (and transient-mark-mode mark-active))
+      (set-mark
+       (save-excursion
+         (goto-char (mark))
+         (markdown-forward-block)
+         (point)))
+    (let ((beginning-of-defun-function 'markdown-backward-block)
+          (end-of-defun-function 'markdown-forward-block))
+      (mark-defun))))
+
+(defun markdown-narrow-to-block ()
+  "Make text outside current block invisible.
+The current block is the one that contains point or follows point."
+  (interactive)
+  (let ((beginning-of-defun-function 'markdown-backward-block)
+        (end-of-defun-function 'markdown-forward-block))
+    (narrow-to-defun)))
+
 
 ;;; Generic Structure Editing, Completion, and Cycling Commands ===============
 
@@ -6077,7 +6470,14 @@ displaying the rendered output."
         (delete-file outfile-name)))))
 
 (defun markdown-display-buffer-other-window (buf)
-  (let ((cur-buf (current-buffer)))
+  (let ((cur-buf (current-buffer))
+        split-width-threshold split-height-threshold)
+    (cond ((memq markdown-split-window-direction '(vertical below))
+           (setq split-width-threshold nil)
+           (setq split-height-threshold 0))
+          ((memq markdown-split-window-direction '(horizontal right))
+           (setq split-width-threshold 0)
+           (setq split-height-threshold nil)))
     (switch-to-buffer-other-window buf)
     (set-buffer cur-buf)))
 
@@ -6144,7 +6544,7 @@ update this buffer's contents."
 See `markdown-wiki-link-p' for more information."
   (let ((case-fold-search nil))
     (and (not (markdown-wiki-link-p))
-         (not (markdown-code-block-at-point))
+         (not (markdown-code-block-at-point-p))
          (or (thing-at-point-looking-at markdown-regex-link-inline)
              (thing-at-point-looking-at markdown-regex-link-reference)
              (thing-at-point-looking-at markdown-regex-uri)
@@ -6202,7 +6602,7 @@ link name must be available via `match-string'."
   (when markdown-enable-wiki-links
     (let ((case-fold-search nil))
       (and (thing-at-point-looking-at markdown-regex-wiki-link)
-           (not (markdown-code-block-at-point))
+           (not (markdown-code-block-at-point-p))
            (or (not buffer-file-name)
                (not (string-equal (buffer-file-name)
                                   (markdown-convert-wiki-link-to-filename
@@ -6228,30 +6628,40 @@ The location of the alias component depends on the value of
   "Generate a filename from the wiki link NAME.
 Spaces in NAME are replaced with `markdown-link-space-sub-char'.
 When in `gfm-mode', follow GitHub's conventions where [[Test Test]]
-and [[test test]] both map to Test-test.ext."
-  (let ((basename (markdown-replace-regexp-in-string
-                   "[[:space:]\n]" markdown-link-space-sub-char name)))
-    (when (eq major-mode 'gfm-mode)
-      (setq basename (concat (upcase (substring basename 0 1))
-                             (downcase (substring basename 1 nil)))))
-    (let* ((default
-            (concat basename
-                    (if (and (buffer-file-name)
-                             (file-name-extension (buffer-file-name)))
-                        (concat "."
-                                (file-name-extension (buffer-file-name))))))
-           (current default))
-      (catch 'done
-        (condition-case nil
-            (cl-loop
-             (if (or (not markdown-wiki-link-search-parent-directories)
-                     (file-exists-p current))
-                 (throw 'done current))
-             (if (string-equal (expand-file-name current)
-                               (concat "/" default))
-                 (throw 'done default))
-             (setq current (concat "../" current)))
-          (error default))))))
+and [[test test]] both map to Test-test.ext.  Look in the current
+directory first, then in subdirectories if
+`markdown-wiki-link-search-subdirectories' is non-nil, and then
+in parent directories if
+`markdown-wiki-link-search-parent-directories' is non-nil."
+  (let* ((basename (markdown-replace-regexp-in-string
+                    "[[:space:]\n]" markdown-link-space-sub-char name))
+         (basename (if (eq major-mode 'gfm-mode)
+                       (concat (upcase (substring basename 0 1))
+                               (downcase (substring basename 1 nil)))
+                     basename))
+         directory extension default candidates dir)
+    (when buffer-file-name
+      (setq directory (file-name-directory buffer-file-name)
+            extension (file-name-extension buffer-file-name)))
+    (setq default (concat basename
+                          (when extension (concat "." extension))))
+    (cond
+     ;; Look in current directory first.
+     ((or (null buffer-file-name)
+          (file-exists-p default))
+      default)
+     ;; Possibly search in subdirectories, next.
+     ((and markdown-wiki-link-search-subdirectories
+           (setq candidates
+                 (markdown-directory-files-recursively
+                  directory (concat "^" default "$"))))
+      (car candidates))
+     ;; Possibly search in parent directories as a last resort.
+     ((and markdown-wiki-link-search-parent-directories
+           (setq dir (locate-dominating-file directory default)))
+      (concat dir default))
+     ;; If nothing is found, return default in current directory.
+     (t default))))
 
 (defun markdown-follow-wiki-link (name &optional other)
   "Follow the wiki link NAME.
@@ -6259,12 +6669,15 @@ Convert the name to a file name and call `find-file'.  Ensure that
 the new buffer remains in `markdown-mode'.  Open the link in another
 window when OTHER is non-nil."
   (let ((filename (markdown-convert-wiki-link-to-filename name))
-        (wp (file-name-directory buffer-file-name)))
-    (when other (other-window 1))
-    (let ((default-directory wp))
-      (find-file filename)))
-  (when (not (eq major-mode 'markdown-mode))
-    (markdown-mode)))
+        (wp (when buffer-file-name
+              (file-name-directory buffer-file-name))))
+    (if (not wp)
+        (error "Must be visiting a file")
+      (when other (other-window 1))
+      (let ((default-directory wp))
+        (find-file filename)))
+    (when (not (eq major-mode 'markdown-mode))
+      (markdown-mode))))
 
 (defun markdown-follow-wiki-link-at-point (&optional arg)
   "Find Wiki Link at point.
@@ -6296,7 +6709,7 @@ and highlight accordingly."
   (goto-char from)
   (save-match-data
     (while (re-search-forward markdown-regex-wiki-link to t)
-      (when (not (markdown-code-block-at-point))
+      (when (not (markdown-code-block-at-point-p))
         (let ((highlight-beginning (match-beginning 1))
               (highlight-end (match-end 1))
               (file-name
@@ -6428,7 +6841,8 @@ This is an exact copy of `line-number-at-pos' for use in emacs21."
 
 (defun markdown-inside-link-p ()
   "Return t if point is within a link."
-  (thing-at-point-looking-at (markdown-make-regex-link-generic)))
+  (save-match-data
+    (thing-at-point-looking-at (markdown-make-regex-link-generic))))
 
 (defun markdown-line-is-reference-definition-p ()
   "Return whether the current line is a (non-footnote) reference defition."
@@ -6441,7 +6855,7 @@ This is an exact copy of `line-number-at-pos' for use in emacs21."
   "Return prefix for filling paragraph or nil if not determined."
   (cond
    ;; List item inside blockquote
-   ((looking-at "^[ \t]*>[ \t]*\\(\\(?:[0-9]+\\|#\\)\\.\\|[*+-]\\)[ \t]+")
+   ((looking-at "^[ \t]*>[ \t]*\\(\\(?:[0-9]+\\|#\\)\\.\\|[*+:-]\\)[ \t]+")
     (markdown-replace-regexp-in-string
      "[0-9\\.*+-]" " " (match-string-no-properties 0)))
    ;; Blockquote
@@ -6455,7 +6869,29 @@ This is an exact copy of `line-number-at-pos' for use in emacs21."
    ;; No match
    (t nil)))
 
+(defun markdown-fill-paragraph (&optional justify)
+  "Fill paragraph at or after point.
+This function is like \\[fill-paragraph], but it skips Markdown
+code blocks.  If the point is in a code block, or just before one,
+do not fill.  Otherwise, call `fill-paragraph' as usual. If
+JUSTIFY is non-nil, justify text as well.  Since this function
+handles filling itself, it always returns t so that
+`fill-paragraph' doesn't run."
+  (interactive "P")
+  (unless (or (markdown-code-block-at-point-p)
+              (save-excursion
+                (back-to-indentation)
+                (skip-syntax-forward "-")
+                (markdown-code-block-at-point-p)))
+    (fill-paragraph justify))
+  t)
+
 (defun markdown-fill-forward-paragraph-function (&optional arg)
+  "Function used by `fill-paragraph' to move over ARG paragraphs.
+This is a `fill-forward-paragraph-function' for `markdown-mode'.
+It is called with a single argument specifying the number of
+paragraphs to move.  Just like `forward-paragraph', it should
+return the number of paragraphs left to move."
   (let* ((arg (or arg 1))
          (paragraphs-remaining (forward-paragraph arg))
          (start (point)))
@@ -6488,7 +6924,9 @@ This is an exact copy of `line-number-at-pos' for use in emacs21."
             nil nil nil nil
             (font-lock-syntactic-face-function . markdown-syntactic-face)))
     ;; Refontify buffer
-    (when (fboundp 'font-lock-refresh-defaults) (font-lock-refresh-defaults))
+    (when (and font-lock-mode (fboundp 'font-lock-refresh-defaults))
+      (font-lock-refresh-defaults))
+
     ;; Add or remove hooks related to extensions
     (markdown-setup-wiki-link-hooks)))
 
@@ -6501,6 +6939,7 @@ before regenerating font-lock rules for extensions."
              (assoc 'markdown-enable-math file-local-variables-alist))
     (markdown-reload-extensions)))
 
+
 ;;; Wiki Links ================================================================
 
 (defun markdown-toggle-wiki-links (&optional arg)
@@ -6549,6 +6988,7 @@ hooks in `markdown-setup-wiki-link-hooks' for fontification instead."
     (list
      (cons markdown-regex-wiki-link '((1 markdown-link-face prepend))))))
 
+
 ;;; Math Support ==============================================================
 
 (make-obsolete 'markdown-enable-math 'markdown-toggle-math "v2.1")
@@ -6586,7 +7026,7 @@ if ARG is omitted or nil."
                                                            (3 markdown-markup-face))))))
 
 
-;;; GFM Checkboxes as Buttons =================================================
+;;; GFM Checkboxes ============================================================
 
 (require 'button)
 
@@ -6594,17 +7034,34 @@ if ARG is omitted or nil."
   'follow-link t
   'face 'markdown-gfm-checkbox-face
   'mouse-face 'markdown-highlight-face
-  'action #'markdown-toggle-gfm-checkbox)
+  'action #'markdown-toggle-gfm-checkbox-button)
 
-(defun markdown-toggle-gfm-checkbox (button)
+(defun markdown-toggle-gfm-checkbox ()
+  "Toggle GFM checkbox at point.
+Returns the resulting status as a string, either \"[x]\" or \"[ ]\".
+Returns nil if there is no task list item at the point."
+  (interactive)
+  (save-match-data
+    (save-excursion
+      (let ((bounds (markdown-cur-list-item-bounds)))
+        (when bounds
+          ;; Move to beginning of task list item
+          (goto-char (cl-first bounds))
+          ;; Advance to column of first non-whitespace after marker
+          (forward-char (cl-fourth bounds))
+          (cond ((looking-at "\\[ \\]")
+                 (replace-match "[x]" nil t)
+                 (match-string-no-properties 0))
+                ((looking-at "\\[[xX]\\]")
+                 (replace-match "[ ]" nil t)
+                 (match-string-no-properties 0))))))))
+
+(defun markdown-toggle-gfm-checkbox-button (button)
   "Toggle GFM checkbox BUTTON on click."
   (save-match-data
     (save-excursion
       (goto-char (button-start button))
-      (cond ((looking-at "\\[ \\]")
-             (replace-match "[x]" nil t))
-            ((looking-at "\\[[xX]\\]")
-             (replace-match "[ ]" nil t))))))
+      (markdown-toggle-gfm-checkbox))))
 
 (defun markdown-make-gfm-checkboxes-buttons (start end)
   "Make GFM checkboxes buttons in region between START and END."
@@ -6682,6 +7139,11 @@ or \\[markdown-toggle-inline-images]."
   (interactive)
   (message "markdown-mode, version %s" markdown-mode-version))
 
+(defun markdown-mode-info ()
+  "Open the `markdown-mode' homepage."
+  (interactive)
+  (browse-url "http://jblevins.org/projects/markdown-mode/"))
+
 ;;;###autoload
 (define-derived-mode markdown-mode text-mode "Markdown"
   "Major mode for editing Markdown files."
@@ -6727,6 +7189,8 @@ or \\[markdown-toggle-inline-images]."
   (set (make-local-variable 'end-of-defun-function)
        'markdown-end-of-defun)
   ;; Paragraph filling
+  (set (make-local-variable 'fill-paragraph-function)
+       'markdown-fill-paragraph)
   (set
    ;; Should match start of lines that start or separate paragraphs
    (make-local-variable 'paragraph-start)
@@ -6734,6 +7198,7 @@ or \\[markdown-toggle-inline-images]."
                   '(
                     "\f" ; starts with a literal line-feed
                     "[ \t\f]*$" ; space-only line
+                    "\\(?:[ \t]*>\\)+[ \t\f]*$"; empty line in blockquote
                     "[ \t]*[*+-][ \t]+" ; unordered list item
                     "[ \t]*\\(?:[0-9]+\\|#\\)\\.[ \t]+" ; ordered list item
                     "[ \t]*\\[\\S-*\\]:[ \t]+" ; link ref def
@@ -6746,6 +7211,7 @@ or \\[markdown-toggle-inline-images]."
    (make-local-variable 'paragraph-separate)
    (mapconcat #'identity
               '("[ \t\f]*$" ; space-only line
+                "\\(?:[ \t]*>\\)+[ \t\f]*$"; empty line in blockquote
                 ;; The following is not ideal, but the Fill customization
                 ;; options really only handle paragraph-starting prefixes,
                 ;; not paragraph-ending suffixes:
@@ -6825,6 +7291,7 @@ or \\[markdown-toggle-inline-images]."
 (define-derived-mode gfm-mode markdown-mode "GFM"
   "Major mode for editing GitHub Flavored Markdown files."
   (setq markdown-link-space-sub-char "-")
+  (setq markdown-wiki-link-search-subdirectories t)
   (set (make-local-variable 'font-lock-defaults)
        '(gfm-font-lock-keywords))
   ;; do the initial link fontification

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 "pandoc-mode" "pandoc-mode.el" (22782 4330
-;;;;;;  710847 487000))
+;;;### (autoloads nil "pandoc-mode" "pandoc-mode.el" (22839 4023
+;;;;;;  30544 216000))
 ;;; Generated autoloads from pandoc-mode.el
 
 (autoload 'pandoc-mode "pandoc-mode" "\
@@ -21,7 +21,7 @@ This is for use in major mode hooks.
 ;;;***
 
 ;;;### (autoloads nil nil ("pandoc-mode-pkg.el" "pandoc-mode-utils.el")
-;;;;;;  (22782 4330 757846 31000))
+;;;;;;  (22839 4023 36544 138000))
 
 ;;;***

@@ -1,4 +1,4 @@
-(define-package "pandoc-mode" "20161104.1521" "Minor mode for interacting with Pandoc"
+(define-package "pandoc-mode" "20170503.606" "Minor mode for interacting with Pandoc"
   '((hydra "0.10.0")
     (dash "2.10.0"))
   :keywords

@@ -135,7 +135,7 @@ matches KEY."
   :group 'pandoc
   :type '(choice (const :tag "Open BibTeX file" pandoc-goto-citation-reference)
                  (const :tag "Open Ebib" pandoc-open-in-ebib)
-                 (const :tag "Show entry in *Help* buffer" pandoc-show-entry-as-help)
+                 (const :tag "Show entry in *Help* buffer" pandoc-citation-entry-as-help)
                  (function :tag "Use a custom function")))
 
 (defcustom pandoc-major-modes
@@ -394,8 +394,8 @@ with the default value NIL.")
 
 (defvar-local pandoc--settings-modified-flag nil "T if the current settings were modified and not saved.")
 
-(defvar pandoc--output-buffer (get-buffer-create " *Pandoc output*"))
-(defvar pandoc--log-buffer (get-buffer-create " *Pandoc log*"))
+(defvar pandoc--output-buffer-name " *Pandoc output*")
+(defvar pandoc--log-buffer-name " *Pandoc log*")
 
 (defvar pandoc--options-menu nil
   "Auxiliary variable for creating the options menu.")
@@ -429,7 +429,7 @@ If TYPE is `message', also display the message in the echo area.
 Any other value just logs the message, adding an empty line after
 it.  The arguments FORMAT-STRING and ARGS function as with
 `message'."
-  (with-current-buffer (get-buffer-create pandoc--log-buffer)
+  (with-current-buffer (get-buffer-create pandoc--log-buffer-name)
     (goto-char (point-max))
     (insert (apply #'format format-string args) "\n\n"))
   (when (eq type 'message)

Binary file

@@ -157,8 +157,8 @@
     (setq pandoc--local-settings (copy-tree pandoc--options))
     (pandoc--set 'read (cdr (assq major-mode pandoc-major-modes)))
     (setq pandoc--settings-modified-flag nil)
-    (or (buffer-live-p pandoc--output-buffer)
-        (setq pandoc--output-buffer (get-buffer-create " *Pandoc output*")))
+    ;; Make sure the output buffer exists.
+    (get-buffer-create pandoc--output-buffer-name)
     (pandoc-faces-load))
    ((not pandoc-mode)    ; pandoc-mode is turned off
     (setq pandoc--local-settings nil
@@ -459,7 +459,7 @@ also ignored in this case."
           (insert-buffer-substring-no-properties buffer (car region) (cdr region))
           (message "Running %s on %s" (file-name-nondirectory pandoc--local-binary) display-name)
           (pandoc-process-directives (pandoc--get 'write))
-          (with-current-buffer (get-buffer-create pandoc--output-buffer)
+          (with-current-buffer (get-buffer-create pandoc--output-buffer-name)
             (erase-buffer))
           (pandoc--log 'log "%s\n%s" (make-string 50 ?=) (current-time-string))
           (pandoc--log 'log "Calling %s with:\n\n%s %s" (file-name-nondirectory pandoc--local-binary) pandoc--local-binary (mapconcat #'identity option-list " "))
@@ -476,21 +476,21 @@ also ignored in this case."
             (cond
              (pandoc-use-async
               (let* ((process-connection-type pandoc-process-connection-type)
-                     (process (apply #'start-process "pandoc-process" pandoc--output-buffer pandoc--local-binary option-list)))
+                     (process (apply #'start-process "pandoc-process" (get-buffer-create pandoc--output-buffer-name) pandoc--local-binary option-list)))
                 (set-process-sentinel process (lambda (_ e)
                                                 (cond
                                                  ((string-equal e "finished\n")
                                                   (funcall log-success display-name pandoc--local-binary)
                                                   (run-hooks 'pandoc-async-success-hook))
                                                  (t (funcall log-failure display-name pandoc--local-binary)
-                                                    (display-buffer pandoc--output-buffer)))))
+                                                    (display-buffer pandoc--output-buffer-name)))))
                 (process-send-region process (point-min) (point-max))
                 (process-send-eof process)))
              ((not pandoc-use-async)
-              (if (= 0 (apply #'call-process-region (point-min) (point-max) pandoc--local-binary nil pandoc--output-buffer t option-list))
+              (if (= 0 (apply #'call-process-region (point-min) (point-max) pandoc--local-binary nil (get-buffer-create pandoc--output-buffer-name) t option-list))
                   (funcall log-success display-name pandoc--local-binary)
                 (funcall log-failure display-name pandoc--local-binary)
-                (display-buffer pandoc--output-buffer))))))))))
+                (display-buffer pandoc--output-buffer-name))))))))))
 
 (defun pandoc-run-pandoc (prefix)
   "Run pandoc on the current document.
@@ -726,7 +726,7 @@ options and their values."
 (defun pandoc-view-output ()
   "Displays the *Pandoc output* buffer."
   (interactive)
-  (display-buffer pandoc--output-buffer))
+  (display-buffer pandoc--output-buffer-name))
 
 (defun pandoc-view-settings ()
   "Displays the settings file in a *Help* buffer."
@@ -754,7 +754,7 @@ options and their values."
 (defun pandoc-view-log ()
   "Display the log buffer in a temporary window."
   (interactive)
-  (display-buffer pandoc--log-buffer))
+  (display-buffer (get-buffer-create pandoc--log-buffer-name)))
 
 (defun pandoc-insert-@ ()
   "Insert a new labeled (@) list marker at point."
@@ -1482,7 +1482,7 @@ This function is for use in `pandoc-citation-jump-function'."
         (ebib bibfile key)
       (error "Key '%s' not found" key))))
 
-(defun pandoc-show-entry-as-help (key biblist)
+(defun pandoc-citation-entry-as-help (key biblist)
   "Show the BibTeX item KEY in a *Help* buffer.
 BIBLIST is a list of BibTeX files in which to search for KEY.

Binary file

File renamed without changes

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "restclient" "20160801.707" "An interactive HTTP client for Emacs" 'nil :keywords '("http"))

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "restclient" "restclient.el" (22712 4660 717277
-;;;;;;  25000))
+;;;### (autoloads nil "restclient" "restclient.el" (22839 4019 731587
+;;;;;;  82000))
 ;;; Generated autoloads from restclient.el
 
 (autoload 'restclient-http-send-current "restclient" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "restclient" "20170516.137" "An interactive HTTP client for Emacs" 'nil :commit "07a3888bb36d0e29608142ebe743b4362b800f40" :keywords '("http"))

@@ -6,7 +6,7 @@
 ;; Maintainer: Pavel Kurnosov <pashky@gmail.com>
 ;; Created: 01 Apr 2012
 ;; Keywords: http
-;; Package-Version: 20160801.707
+;; Package-Version: 20170516.137
 
 ;; This file is not part of GNU Emacs.
 ;; This file is public domain software. Do what you want.
@@ -107,11 +107,14 @@
 (defvar restclient-request-time-end nil)
 
 (defvar restclient-response-loaded-hook nil
-  "Hook run after response buffer created and data loaded.")
+  "Hook run after response buffer is formatted.")
 
 (defvar restclient-http-do-hook nil
   "Hook to run before making request.")
 
+(defvar restclient-response-received-hook nil
+  "Hook run after data is loaded into response buffer.")
+
 (defcustom restclient-vars-max-passes 10
   "Maximum number of recursive variable references. This is to prevent hanging if two variables reference each other directly or indirectly."
   :group 'restclient
@@ -144,7 +147,7 @@
   "^\\(:[^: ]+\\)[ \t]*:?=[ \t]*\\(<<\\)[ \t]*$")
 
 (defconst restclient-file-regexp
-  "^<[ \t]*\\([^<>]+\\)[ \t]*$")
+  "^<[ \t]*\\([^<>\n\r]+\\)[ \t]*$")
 
 (defconst restclient-content-type-regexp
   "^Content-[Tt]ype: \\(\\w+\\)/\\(?:[^\\+\r\n]*\\+\\)*\\([^;\r\n]+\\)")
@@ -295,6 +298,7 @@ The buffer contains the raw HTTP response sent by the server."
                             (current-buffer)
                             bufname
                             restclient-same-buffer-response)
+        (run-hooks 'restclient-response-received-hook)
         (unless raw
           (restclient-prettify-response method url))
         (buffer-enable-undo)
@@ -416,7 +420,7 @@ The buffer contains the raw HTTP response sent by the server."
   (if (= 0 (or (string-match restclient-file-regexp entity) 1))
       (restclient-read-file (match-string 1 entity))
     (restclient-replace-all-in-string vars entity)))
-  
+
 (defun restclient-http-parse-current-and-do (func &rest args)
   (save-excursion
     (goto-char (restclient-current-min))

Binary file

@@ -4,8 +4,8 @@
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
 ;;;### (autoloads nil nil ("spaceline-config.el" "spaceline-pkg.el"
-;;;;;;  "spaceline-segments.el" "spaceline.el") (22712 4610 808608
-;;;;;;  469000))
+;;;;;;  "spaceline-segments.el" "spaceline.el") (22839 4019 26596
+;;;;;;  250000))
 
 ;;;***

@@ -25,36 +25,39 @@
 
 (defun spaceline--theme (left second-left &rest additional-segments)
   "Convenience function for the spacemacs and emacs themes."
-  (spaceline-install `(,left
-                anzu
-                auto-compile
-                ,second-left
-                major-mode
-                (process :when active)
-                ((flycheck-error flycheck-warning flycheck-info)
-                 :when active)
-                (minor-modes :when active)
-                (mu4e-alert-segment :when active)
-                (erc-track :when active)
-                (version-control :when active)
-                (org-pomodoro :when active)
-                (org-clock :when active)
-                nyan-cat)
-
-              `(which-function
-                (python-pyvenv :fallback python-pyenv)
-                purpose
-                (battery :when active)
-                selection-info
-                input-method
-                ((buffer-encoding-abbrev
-                  point-position
-                  line-column)
-                 :separator " | ")
-                (global :when active)
-                ,@additional-segments
-                buffer-position
-                hud))
+  (spaceline-install
+    `(,left
+      (anzu :priority 4)
+      auto-compile
+      ,second-left
+      major-mode
+      (process :when active)
+      ((flycheck-error flycheck-warning flycheck-info)
+       :when active
+       :priority 3)
+      (minor-modes :when active)
+      (mu4e-alert-segment :when active)
+      (erc-track :when active)
+      (version-control :when active
+                       :priority 7)
+      (org-pomodoro :when active)
+      (org-clock :when active)
+      nyan-cat)
+    `(which-function
+      (python-pyvenv :fallback python-pyenv)
+      purpose
+      (battery :when active)
+      (selection-info :priority 2)
+      input-method
+      ((buffer-encoding-abbrev
+        point-position
+        line-column)
+       :separator " | "
+       :priority 3)
+      (global :when active)
+      ,@additional-segments
+      (buffer-position :priority 0)
+      (hud :priority 0)))
 
   (setq-default mode-line-format '("%e" (:eval (spaceline-ml-main)))))
 
@@ -68,9 +71,10 @@ ADDITIONAL-SEGMENTS are inserted on the right, between `global' and
             workspace-number
             window-number)
            :fallback evil-state
-           :separator "|"
-           :face highlight-face)
-         '(buffer-modified buffer-size buffer-id remote-host)
+           :face highlight-face
+           :priority 0)
+         '((buffer-modified buffer-size buffer-id remote-host)
+           :priority 1)
          additional-segments))
 
 (defun spaceline-emacs-theme (&rest additional-segments)
@@ -91,6 +95,8 @@ ADDITIONAL-SEGMENTS are inserted on the right, between `global' and
 ;; Helm custom mode
 ;; ================
 
+(defvar helm-ag-show-status-function)
+
 (defun spaceline--helm-ag-update ()
   (setq mode-line-format '("%e" (:eval (spaceline-ml-helm-done)))))
 
@@ -101,17 +107,17 @@ ADDITIONAL-SEGMENTS are inserted on the right, between `global' and
   (if spaceline-helm-mode
       (progn
         (spaceline-install 'helm
-                    '((helm-buffer-id :face highlight-face)
-                      helm-number
-                      helm-follow
-                      helm-prefix-argument)
-                    '(helm-help))
+          '((helm-buffer-id :face highlight-face)
+            helm-number
+            helm-follow
+            helm-prefix-argument)
+          '(helm-help))
         (spaceline-install 'helm-done
-                    '(((helm-buffer-id helm-done) :face highlight-face)
-                      helm-number
-                      helm-follow
-                      helm-prefix-argument)
-                    '(helm-help))
+          '(((helm-buffer-id helm-done) :face highlight-face)
+            helm-number
+            helm-follow
+            helm-prefix-argument)
+          '(helm-help))
         (defadvice helm-display-mode-line (after spaceline-helm)
           "Set up a custom helm modeline."
           (setq spaceline--helm-current-source source

Binary file

@@ -1,4 +1,4 @@
-(define-package "spaceline" "20170102.59" "Modeline configuration library for powerline"
+(define-package "spaceline" "20170530.434" "Modeline configuration library for powerline"
   '((emacs "24.3")
     (cl-lib "0.5")
     (powerline "2.3")

@@ -18,11 +18,11 @@
 ;;; Commentary:
 
 ;; This file contains a variety of segments that may be of general interest in
-;; many people's modelines. It contains both "stock" segments which are usable
+;; many people's modelines.  It contains both "stock" segments which are usable
 ;; without any additional packages, as well as a number of segments which depend
 ;; on optional third-party packages.
 
-;; Note: The `global' segment is defined in spaceline.el, not here. It's the
+;; Note: The `global' segment is defined in spaceline.el, not here.  It's the
 ;; only exception.
 
 ;;; Code:
@@ -145,16 +145,19 @@
 (declare-function pdf-cache-number-of-pages 'pdf-view)
 
 (defun spaceline--pdfview-page-number ()
+  "The current `pdf-view-mode' page number to display in the mode-line.
+Return a formated string containing the current and last page number for the
+currently displayed pdf file in `pdf-view-mode'."
   (format "(%d/%d)"
           ;; `pdf-view-current-page' is a macro in an optional dependency
           ;; any better solutions?
           (eval `(pdf-view-current-page))
-	  (pdf-cache-number-of-pages)))
+          (pdf-cache-number-of-pages)))
 
 (spaceline-define-segment line-column
   "The current line and column numbers, or `(current page/number of pages)`
 in pdf-view mode (enabled by the `pdf-tools' package)."
-  (if (eq 'pdf-view-mode major-mode)
+  (if (eq major-mode 'pdf-view-mode)
       (spaceline--pdfview-page-number)
     "%l:%2c"))
 
@@ -235,8 +238,8 @@ segment.  Otherwise only show the active input method, if any."
     ("*helm-ag*" . (lambda ()
                      (format "HELM Ag: Using %s"
                              (car (split-string helm-ag-base-command))))))
-  "Alist of custom helm buffer names to use. The cdr can also be
-a function that returns a name to use.")
+  "Alist of custom helm buffer names to use.
+The cdr can also be a function that returns a name to use.")
 (spaceline-define-segment helm-buffer-id
   "Helm session identifier."
   (when (bound-and-true-p helm-alive-p)
@@ -283,7 +286,7 @@ a function that returns a name to use.")
         (propertize (format "C-u %s" arg) 'face 'helm-prefarg)))))
 
 (defvar spaceline--helm-current-source nil
-  "The currently active helm source")
+  "The currently active helm source.")
 (spaceline-define-segment helm-follow
   "Helm follow indicator."
   (when (and (bound-and-true-p helm-alive-p)
@@ -386,7 +389,7 @@ package."
        (t (concat (if (string= "AC" type) " AC" "") percentage time))))))
 
 (defun spaceline--fancy-battery-face ()
-  "Return a face appropriate for powerline"
+  "Return a face appropriate for powerline."
   (let ((type (cdr (assq ?L fancy-battery-last-status))))
     (if (and type (string= "AC" type))
         'fancy-battery-charging
@@ -402,8 +405,9 @@ package."
 This segment overrides the modeline functionality of
 `fancy-battery-mode'."
   (when (bound-and-true-p fancy-battery-mode)
-    (powerline-raw (s-trim (spaceline--fancy-battery-mode-line))
-                   (spaceline--fancy-battery-face)))
+    (let ((text (spaceline--fancy-battery-mode-line)))
+      (and text (powerline-raw (s-trim text)
+                               (spaceline--fancy-battery-face)))))
   :global-override fancy-battery-mode-line)
 
 (defvar spaceline-org-clock-format-function
@@ -520,9 +524,10 @@ enabled."
   :group 'spaceline)
 
 (defvar spaceline-flycheck-bullet "•%s"
-  "The bullet used for the flycheck segment. This should be a
-  format string with a single `%s'-expression corresponding to
-  the number of errors.")
+  "The bullet used for the flycheck segment.
+This should be a format string with a single `%s'-expression corresponding to
+the number of errors.")
+
 (defmacro spaceline--flycheck-lighter (state)
   "Return flycheck information for the given error type STATE."
   `(let* ((counts (flycheck-count-errors flycheck-current-errors))
@@ -595,6 +600,7 @@ and total packages"
     (let* ((current (format-mode-line which-func-current)))
       (when (string-match "{\\(.*\\)}" current)
         (setq current (match-string 1 current)))
+      (setq current (replace-regexp-in-string "%" "%%" current))
       (propertize current
                   'local-map which-func-keymap
                   'face 'which-func

Binary file

@@ -210,8 +210,7 @@ This function does not run in-place.  It returns a new list."
 The following bindings are available in BODY:
 - `segment': The segment itself, either a symbol or a literal
   value, or a list of such.
-- `segment-symbol': The function that evaluates `segment', if it
-  is a symbol.
+- `sym': The function that evaluates `segment', if it is a symbol.
 - `sym-form': The form that evaluates the segment, if it is a
   symbol.
 - `input-props': The property list part of SPEC, if present.
@@ -291,7 +290,7 @@ Returns a list of forms."
            ;; A temporary variable to check whether this segment has produced
            ;; output. It is uninterned to prevent it from clashing with those
            ;; of children or parent segments.
-           (prev-res-var (make-symbol "prev-res"))
+           (previous-result (make-symbol "spaceline--previous-result"))
 
            clean-up-code)
 
@@ -313,7 +312,7 @@ Returns a list of forms."
         ,@(when tight-left `((setq needs-separator nil)))
 
         ;; Store the current result pointer in the temp variable
-        (let ((,prev-res-var result))
+        (let ((,previous-result result))
 
           ;; Top-level non-tight segments need padding
           ,@(unless (or deep tight-left)
@@ -354,24 +353,31 @@ Returns a list of forms."
                 ;; empty string here
                 `(,@(spaceline--gen-produce face side)
                   (push (powerline-raw (format "%s" ,segment) ,face) result)))))
-          ;; At this point, if prev-res-var is `eq' to result, the segment did
+          ;; At this point, if previous-result is `eq' to result, the segment did
           ;; not produce output
           ,@(cond
              ;; For deep segments (not top level) with fallback, we call the
              ;; fallback if they failed to produce
              ((and fallback deep)
-              `((unless (eq ,prev-res-var result)
+              `((unless (eq ,previous-result result)
                   ,@(spaceline--gen-segment fallback side nest-props deep))))
              ;; For top level segments with fallbacks, we call the fallback if
              ;; they failed to produce, or clean up if they did
              ((and fallback (not deep))
-              `((if (eq ,prev-res-var result)
+              `((if (eq ,previous-result result)
                     (progn ,@(spaceline--gen-segment fallback side nest-props deep))
                   ,@clean-up-code)))
-             ;; For top level segments without fallbacks, we clean up if they produced
+             ;; For top level segments without fallbacks, we clean up if they
+             ;; produced
              ((and (not fallback) (not deep))
-              `((unless (eq ,prev-res-var result)
-                  ,@clean-up-code)))))))))
+              `((unless (eq ,previous-result result)
+                  ,@clean-up-code))))
+          ,@(when (not deep)
+              `((if (not (eq ,previous-result result))
+                    (let ((len (length (format-mode-line (powerline-render result)))))
+                      (setq segment-length (- len result-length))
+                      (setq result-length len))
+                  (setq segment-length 0)))))))))
 
 (defun spaceline-compile (&rest args)
   "Compile a modeline.
@@ -406,6 +412,9 @@ Each element in LEFT and RIGHT must be a valid segment. Namely,
   the list is a plist.
 
 The supported properties are
+- `:priority', a number representing the priority of appearance
+  of that segment over the others, the lower the higher the priority.
+  -1 is the default and the lowest.
 - `:when', a form that must evaluate to non-nil for the segment to
   show (default t)
 - `:face', the face with which to render the segment; may either
@@ -421,11 +430,12 @@ The supported properties are
   either side (default nil)
 - `:fallback', another segment that will be called if no output
   is produced"
+  (declare (indent defun))
   (interactive)
   (if (not args)
       ;; Recompile all modelines
       (dolist (target spaceline--mode-lines)
-        (spaceline-install (car target)))
+        (spaceline-compile (car target)))
     (let* (;; Handle the different calling conventions
            (nargs (length args))
            (target (if (cl-oddp nargs) (pop args) 'main))
@@ -434,81 +444,228 @@ The supported properties are
            (right-segs (if (> nargs 1) (pop args)
                          (cddr (assq target spaceline--mode-lines))))
            (target-func (intern (format "spaceline-ml-%s" target)))
-
            ;; Special support for the global segment: compile list of excludes
            (global-excludes (append (spaceline--global-excludes left-segs)
                                     (spaceline--global-excludes right-segs)))
+           ;; Symbols for runtime data
+           (left-symbol (intern (format "spaceline--segments-code-%s-left" target)))
+           (right-symbol (intern (format "spaceline--segments-code-%s-right" target)))
+           (priority-symbol (intern (format "spaceline--runtime-data-%s" target)))
+           (left-code `(spaceline--code-for-side
+                        ,global-excludes ,left-symbol ,left-segs l))
+           (right-code `(spaceline--code-for-side
+                         ,global-excludes ,right-symbol ,right-segs r)))
 
-
-           (sep-style (format "powerline-%s" powerline-default-separator))
-
-           ;; Generate code for the left hand side; some of the bindings needed
-           ;; for the code generated by the `spaceline--gen' functions are let-bound
-           ;; here
-           (sep-dirs (spaceline--get-separator-dirs 'l))
-           (left-code
-            `(let ((default-face face1) (other-face face2)
-                   (default-sep ',(intern (format "%s-%s" sep-style (car sep-dirs))))
-                   (other-sep ',(intern (format "%s-%s" sep-style (cdr sep-dirs))))
-                   (global-excludes ',global-excludes)
-                   prior next-prior produced needs-separator separator-face result)
-               ,@(apply 'append (mapcar (lambda (s) (spaceline--gen-segment s 'l)) left-segs))
-               ,@(spaceline--gen-separator 'line-face 'l)
-               ;; Output is pushed onto the result in the wrong order, so we
-               ;; reverse it here
-               (reverse result)))
-
-           ;; The right side works the same as the left, except all the segments
-           ;; are reversed (here and deeper in the tree) while the output is not
-           (sep-dirs (spaceline--get-separator-dirs 'r))
-           (right-code
-            `(let ((default-face face1) (other-face face2)
-                   (default-sep ',(intern (format "%s-%s" sep-style (car sep-dirs))))
-                   (other-sep ',(intern (format "%s-%s" sep-style (cdr sep-dirs))))
-                   (global-excludes ',global-excludes)
-                   prior next-prior needs-separator separator-face result)
-               ,@(apply 'append (mapcar (lambda (s) (spaceline--gen-segment s 'r)) (reverse right-segs)))
-               ,@(spaceline--gen-separator 'line-face 'r)
-               result)))
+      ;; Declare the global runtime defaults
+      (spaceline--declare-runtime left-segs right-segs
+                           left-symbol
+                           right-symbol
+                           priority-symbol)
 
       ;; Update the stored segments so that recompilation will work
       (unless (assq target spaceline--mode-lines)
         (push `(,target) spaceline--mode-lines))
       (setcdr (assq target spaceline--mode-lines) `(,left-segs . ,right-segs))
 
-      ;; Define the modeline evaluation function. This part runs the hook, and
-      ;; let-binds all the variables which don't depend on the side (left or
-      ;; right).
-      (eval `(defun ,target-func ()
-               (run-hooks 'spaceline-pre-hook)
-               (let* ((active-strict (powerline-selected-window-active))
-                      (active (or spaceline-always-show-segments active-strict))
-                      (line-face (spaceline--get-face 'line active-strict))
-                      (highlight-face (spaceline--get-face 'highlight active-strict))
-                      (face1 (spaceline--get-face 'face1 active-strict))
-                      (face2 (spaceline--get-face 'face2 active-strict))
-                      (lhs ,left-code)
-                      (rhs ,right-code))
-                 (concat
-                  ,@(when spaceline-inflation
-                      `((propertize "\u200b" 'display
-                                    '((raise ,(/ (1- spaceline-inflation) -2.0))
-                                      (height ,spaceline-inflation)))))
-                  (powerline-render lhs)
-                  (powerline-fill line-face (powerline-width rhs))
-                  (powerline-render rhs)))))
+      ;; Define the function that Emacs will call to generate the mode-line's
+      ;; format string every time the mode-line is refreshed.
+      (eval (macroexpand-all
+             `(defun ,target-func ()
+                ;; Initialize the local runtime if necessary
+                (unless ,priority-symbol
+                  (spaceline--init-runtime ',left-symbol
+                                    ',right-symbol
+                                    ',priority-symbol))
+                ;; Render the modeline
+                (let ((fmt (spaceline--render-mode-line ,left-code ,right-code)))
+                  (when (spaceline--adjust-to-window ,priority-symbol fmt)
+                    (setq fmt (spaceline--render-mode-line ,left-code ,right-code)))
+                  fmt))))
 
-      ;; Possibly byte compile the output
       (when spaceline-byte-compile
         (let ((byte-compile-warnings nil))
           (byte-compile target-func)))
 
-      ;; This is not strictly required, but it lets people use `spaceline-compile' as
-      ;; an all-in-one fix-everything button
+      ;; This is not strictly required, but it lets people use
+      ;; `spaceline-compile' as an all-in-one fix-everything button
       (powerline-reset))))
 
 (defalias 'spaceline-install 'spaceline-compile)
 
+(defmacro spaceline--code-for-side
+    (global-excludes runtime-symbol segments side)
+  "Generate the code that will evaluate all segments for one side.
+
+GLOBAL-EXCLUDES is used for the global segment, see `spaceline-define-segment'.
+
+RUNTIME-SYMBOL is a symbol storing the runtime data for this side, one
+three-element vector for each top-level segment, see
+`spaceline--declare-runtime' and `spaceline--init-runtime'.
+
+SEGMENTS is a list of segment specifications (see `spaceline--compile') and SIDE
+is either l or r, respectively for the left and the right side."
+  (let ((sep-style (format "powerline-%s" powerline-default-separator))
+        (sep-dirs (spaceline--get-separator-dirs side)))
+    `(let* ((default-face face1)
+            (other-face face2)
+            (default-sep ',(intern (format "%s-%s" sep-style (car sep-dirs))))
+            (other-sep ',(intern (format "%s-%s" sep-style (cdr sep-dirs))))
+            (global-excludes ',global-excludes)
+            (result-length 0)
+            (segment-length 0)
+            (runtime-pointer ,runtime-symbol)
+            prior
+            next-prior
+            needs-separator
+            separator-face
+            result)
+       ,@(--map `(let ((runtime-data (pop runtime-pointer)))
+                   (when (spaceline--shown runtime-data) ; Only render if this segment is shown
+                     ,@(spaceline--gen-segment it side)
+                     (spaceline--set-length runtime-data segment-length))) ; Update the length
+                (if (eq 'l side) segments (reverse segments)))
+       ,@(spaceline--gen-separator 'line-face side)
+       ;; XXX: This code is dead
+       ;; ;; use the same condition as in spaceline--gen-separator to
+       ;; ;; increase the size of the last visible segment accordingly:
+       ;; (when needs-separator
+       ;;   (let* ((last-visible-segment (--last (not (equal 0 (cdr (assoc 'length (cdr it)))))
+       ;;                                        ,segments-code))
+       ;;          (last-visible-segment-length (assoc 'length last-visible-segment)))
+       ;;     (cl-incf (cdr last-visible-segment-length))))
+       ,(if (eq side 'l) '(reverse result) 'result))))
+
+(defmacro spaceline--priority (val) `(aref ,val 0))
+(defmacro spaceline--length (val) `(aref ,val 1))
+(defmacro spaceline--shown (val) `(aref ,val 2))
+(defmacro spaceline--set-length (vec val) `(aset ,vec 1 ,val))
+(defmacro spaceline--set-shown (vec val) `(aset ,vec 2 ,val))
+
+(defun spaceline--declare-runtime
+    (segments-left segments-right left-symbol right-symbol priority-symbol)
+  "Initialize the global runtime data for a modeline.
+
+The runtime consist of a three-element vector for each top-level
+segment in the modeline. The elements are:
+- priority: The priority of the segment (derived from its `:priority' property)
+- length: The rendered length of the segment
+- shown: Whether the segment is displayed or not
+
+The effect of this function is to create the default values for
+these vectors, and store them in the varibles LEFT-SYMBOL and
+RIGHT-SYMBOL, respectively, which are lists. The variable
+PRIORITY-SYMBOL is initialized with default value nil.
+
+See `spaceline--init-runtime' for more information."
+  (let ((left (--map (spaceline--parse-segment-spec it
+                       (vector (or (plist-get props :priority) -1) 0 t))
+                     segments-left))
+        (right (--map (spaceline--parse-segment-spec it
+                        (vector (or (plist-get props :priority) -1) 0 t))
+                      segments-right)))
+    (eval `(defvar-local ,left-symbol nil "See `spaceline--declare-runtime'."))
+    (set-default left-symbol left)
+    (eval `(defvar-local ,right-symbol nil "See `spaceline--declare-runtime'."))
+    (set-default right-symbol (reverse right)))
+
+  (eval `(defvar-local ,priority-symbol nil "See `spaceline--declare-runtime'."))
+  (set-default priority-symbol nil)
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (kill-local-variable left-symbol)
+      (kill-local-variable right-symbol)
+      (kill-local-variable priority-symbol))))
+
+(defmacro spaceline--render-mode-line (left-code right-code)
+  "Call powerline to generate the mode-line format string.
+LEFT-CODE and RIGHT-CODE are the code that will be used "
+  `(progn
+     (run-hooks 'spaceline-pre-hook)
+     (let* ((active-strict (powerline-selected-window-active))
+            (active (or spaceline-always-show-segments active-strict))
+            (line-face (spaceline--get-face 'line active-strict))
+            (highlight-face (spaceline--get-face 'highlight active-strict))
+            (face1 (spaceline--get-face 'face1 active-strict))
+            (face2 (spaceline--get-face 'face2 active-strict))
+            (lhs ,left-code)
+            (rhs ,right-code))
+       (concat
+        ,@(when spaceline-inflation
+            `((propertize "\u200b" 'display
+                          '((raise ,(/ (1- spaceline-inflation) -2.0))
+                            (height ,spaceline-inflation)))))
+        (powerline-render lhs)
+        (powerline-fill line-face (powerline-width rhs))
+        (powerline-render rhs)))))
+
+(defun spaceline--init-runtime (left-symbol right-symbol priority-symbol)
+  "Initialize data structures used for the responsiveness of the modeline.
+
+This function
+- creates local deep copies of the global values of LEFT-SYMBOL and RIGHT-SYMBOL,
+- initializes PRIORITY-SYMBOl, a reordering of the same vectors whose order
+  (by priority) decides the order of segments disappearance / reappearance with
+  the size of the window.
+
+Note that the changes in the resulting PRIORITY-SYMBOL list are
+visible from LEFT-SYMBOL and RIGHT-SYMBOL, and vice versa. This
+creates a data structure that is efficiently accessible both in
+order of priority and order of segments."
+  (let ((left (--map (copy-tree it) (default-value left-symbol)))
+        (right (--map (copy-tree it) (default-value right-symbol)))
+        priority)
+    (set (make-local-variable left-symbol) left)
+    (set (make-local-variable right-symbol) right)
+    (while (or left right)
+      (when left (push (pop left) priority))
+      (when right (push (pop right) priority)))
+    (set (make-local-variable priority-symbol)
+         (sort priority 'spaceline--compare-priorities))))
+
+(defmacro spaceline--adjust-to-window (responsiveness-runtime-data format)
+  "Adjust the spaceline to the window by hiding or showing segments.
+
+RESPONSIVENESS-RUNTIME-DATA is a list of segments runtime data used to hide or
+show segments, see `spaceline--declare-runtime' for more info about
+how responsiveness works.
+
+FMT is the rendered modeline with the current visibility settings.
+
+Returns a truthy value if the visibility of any segment changed."
+  ;; `1-' to not count the space generated by `powerline-fill'
+  `(let ((total-length (1- (length (format-mode-line ,format))))
+         (width (window-width))
+         changed)
+     (if (> total-length (window-width))
+         ;; The modeline is too long, so try to hide some segments that are shown
+         (let ((to-hide (--drop-while (not (spaceline--shown it))
+                                      ,responsiveness-runtime-data)))
+           (--each-while to-hide
+               (< width total-length)
+             (cl-decf total-length (spaceline--length it))
+             (spaceline--set-shown it nil)
+             (setq changed t)))
+       ;; The modeline is shorter than it could be, so try to show some hidden segments
+       (let ((to-show (--drop-while (spaceline--shown it)
+                                    (reverse ,responsiveness-runtime-data))))
+         (--each-while to-show
+             (> width (+ total-length (spaceline--length it)))
+           (cl-incf total-length (spaceline--length it))
+           (spaceline--set-shown it t)
+           (setq changed t))))
+     changed))
+
+(defun spaceline--compare-priorities (first-alist second-alist)
+  "Comparison predicate for sorting the segments runtime data by priority.
+Used as a predicate for `sort' in `spaceline--init-runtime'."
+  (let ((first (spaceline--priority first-alist))
+        (second (spaceline--priority second-alist)))
+    (cond
+     ((equal first second) nil)
+     ((equal first -1) t)
+     ((equal second -1) nil)
+     (t (> first second)))))
+
 (defmacro spaceline-define-segment (name value &rest props)
   "Define a modeline segment called NAME with value VALUE and properties PROPS.
 
@@ -591,7 +748,7 @@ the changes to take effect."
                      (cons "" (-difference global-mode-string global-excludes))
                    global-mode-string)))
     (when (spaceline--mode-line-nonempty global)
-      (powerline-raw global))))
+      (string-trim (powerline-raw global)))))
 
 (provide 'spaceline)

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "swiper" "20170410.24" "Isearch with an overview. Oh, man!" '((emacs "24.1") (ivy "0.9.0")) :url "https://github.com/abo-abo/swiper" :keywords '("matching"))

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "swiper" "swiper.el" (22792 62844 78862 67000))
+;;;### (autoloads nil "swiper" "swiper.el" (22839 4017 315618 515000))
 ;;; Generated autoloads from swiper.el
 
 (autoload 'swiper-avy "swiper" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "swiper" "20170515.1409" "Isearch with an overview. Oh, man!" '((emacs "24.1") (ivy "0.9.0")) :commit "7621e5f84518e15297cc66ce79b15550c79ade3a" :url "https://github.com/abo-abo/swiper" :keywords '("matching"))

@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170410.24
+;; Package-Version: 20170515.1409
 ;; Version: 0.9.1
 ;; Package-Requires: ((emacs "24.1") (ivy "0.9.0"))
 ;; Keywords: matching
@@ -801,17 +801,19 @@ Run `swiper' for those buffers."
   "Return non-nil if BUFFER should be considered by `swiper-all'."
   (let ((major-mode (with-current-buffer buffer major-mode)))
     (cond
-     ;; Ignore TAGS buffers, they tend to add duplicate results.
-     ((eq major-mode #'tags-table-mode) nil)
-     ;; Always consider dired buffers, even though they're not backed
-     ;; by a file.
-     ((eq major-mode #'dired-mode) t)
-     ;; Always consider stash buffers too, as they may have
-     ;; interesting content not present in any buffers. We don't #'
-     ;; quote to satisfy the byte-compiler.
-     ((eq major-mode 'magit-stash-mode) t)
-     ;; Otherwise, only consider the file if it's backed by a file.
-     (t (buffer-file-name buffer)))))
+      ;; Ignore TAGS buffers, they tend to add duplicate results.
+      ((eq major-mode #'tags-table-mode) nil)
+      ;; Always consider dired buffers, even though they're not backed
+      ;; by a file.
+      ((eq major-mode #'dired-mode) t)
+      ;; Always consider stash buffers too, as they may have
+      ;; interesting content not present in any buffers. We don't #'
+      ;; quote to satisfy the byte-compiler.
+      ((eq major-mode 'magit-stash-mode) t)
+      ;; Email buffers have no file, but are useful to search
+      ((eq major-mode 'gnus-article-mode) t)
+      ;; Otherwise, only consider the file if it's backed by a file.
+      (t (buffer-file-name buffer)))))
 
 ;;* `swiper-all'
 (defun swiper-all-function (str)

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "which-key" "20170501.544" "Display available keybindings in popup" '((emacs "24.3")) :url "https://github.com/justbur/emacs-which-key")

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "which-key" "which-key.el" (22792 62843 312876
-;;;;;;  847000))
+;;;### (autoloads nil "which-key" "which-key.el" (22839 4016 219632
+;;;;;;  784000))
 ;;; Generated autoloads from which-key.el
 
 (defvar which-key-mode nil "\
@@ -53,7 +53,8 @@ may either be a string, as in
 
 a cons of two strings as in
 
-\(which-key-add-key-based-replacements \"C-x 8\" '(\"unicode\" . \"Unicode keys\"))
+\(which-key-add-key-based-replacements \"C-x 8\"
+                                        '(\"unicode\" . \"Unicode keys\"))
 
 or a function that takes a (KEY . BINDING) cons and returns a
 replacement.

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "which-key" "20170530.526" "Display available keybindings in popup" '((emacs "24.4")) :commit "3144b4c1fc774b63fc2350a0171e8ef01ab63298" :url "https://github.com/justbur/emacs-which-key")

@@ -4,10 +4,10 @@
 
 ;; Author: Justin Burkett <justin@burkett.cc>
 ;; URL: https://github.com/justbur/emacs-which-key
-;; Package-Version: 20170501.544
-;; Version: 2.0
+;; Package-Version: 20170530.526
+;; Version: 3.0.1
 ;; Keywords:
-;; Package-Requires: ((emacs "24.3"))
+;; Package-Requires: ((emacs "24.4"))
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@
 
 (require 'cl-lib)
 (require 'button)
+(require 'regexp-opt)
 
 ;; For compiler
 (defvar evil-operator-shortcut-map)
@@ -132,6 +133,12 @@ that represent a sub-map). Default is \"+\"."
   :group 'which-key
   :type 'string)
 
+(defcustom which-key-compute-remaps nil
+  "If non-nil, show remapped command if a command has been
+remapped given the currently active keymaps."
+  :group 'which-key
+  :type 'boolean)
+
 (defvar which-key-key-replacement-alist nil)
 (make-obsolete-variable 'which-key-key-replacement-alist
                         'which-key-replacement-alist "2016-11-21")
@@ -349,7 +356,11 @@ are
 See the README and the docstrings for those functions for more
 information."
   :group 'which-key
-  :type 'function)
+  :type '(choice (function-item which-key-key-order)
+                 (function-item which-key-key-order-alpha)
+                 (function-item which-key-description-order)
+                 (function-item which-key-prefix-then-key-order)
+                 (function-item which-key-local-then-key-order)))
 
 (defcustom which-key-sort-uppercase-first t
   "If non-nil, uppercase comes before lowercase in sorting
@@ -580,8 +591,6 @@ Used when `which-key-popup-type' is frame.")
   "Internal: Backup the value of `prefix-help-command'.")
 (defvar which-key--pages-plist nil
   "Internal: Holds page objects")
-(defvar which-key--lighter-backup nil
-  "Internal: Holds lighter backup")
 (defvar which-key--current-prefix nil
   "Internal: Holds current prefix")
 (defvar which-key--current-page-n nil
@@ -780,7 +789,8 @@ bottom."
 ;;; Helper functions to modify replacement lists.
 
 ;;;###autoload
-(defun which-key-add-key-based-replacements (key-sequence replacement &rest more)
+(defun which-key-add-key-based-replacements
+    (key-sequence replacement &rest more)
   "Replace the description of KEY-SEQUENCE with REPLACEMENT.
 KEY-SEQUENCE is a string suitable for use in `kbd'. REPLACEMENT
 may either be a string, as in
@@ -789,7 +799,8 @@ may either be a string, as in
 
 a cons of two strings as in
 
-\(which-key-add-key-based-replacements \"C-x 8\" '(\"unicode\" . \"Unicode keys\")\)
+\(which-key-add-key-based-replacements \"C-x 8\"
+                                        '(\"unicode\" . \"Unicode keys\")\)
 
 or a function that takes a \(KEY . BINDING\) cons and returns a
 replacement.
@@ -967,6 +978,7 @@ total height."
     (when (and which-key-idle-secondary-delay
                which-key--secondary-timer-active)
       (which-key--start-timer))
+    (which-key--lighter-restore)
     (cl-case which-key-popup-type
       ;; Not necessary to hide minibuffer
       ;; (minibuffer (which-key--hide-buffer-minibuffer))
@@ -1016,7 +1028,8 @@ is shown, or if there is no need to start the closing timer."
       (frame (which-key--show-buffer-frame act-popup-dim))
       (custom (funcall which-key-custom-show-popup-function act-popup-dim)))))
 
-(defun which-key--fit-buffer-to-window-horizontally (&optional window &rest params)
+(defun which-key--fit-buffer-to-window-horizontally
+    (&optional window &rest params)
   "Slightly modified version of `fit-buffer-to-window'.
 Use &rest params because `fit-buffer-to-window' has a different
 call signature in different emacs versions"
@@ -1065,9 +1078,12 @@ call signature in different emacs versions"
          (frame-width (+ (cdr act-popup-dim) 2))
          (new-window (if (and (frame-live-p which-key--frame)
                               (eq which-key--buffer
-                                  (window-buffer (frame-root-window which-key--frame))))
-                         (which-key--show-buffer-reuse-frame frame-height frame-width)
-                       (which-key--show-buffer-new-frame frame-height frame-width))))
+                                  (window-buffer
+                                   (frame-root-window which-key--frame))))
+                         (which-key--show-buffer-reuse-frame
+                          frame-height frame-width)
+                       (which-key--show-buffer-new-frame
+                        frame-height frame-width))))
     (when new-window
       ;; display successful
       (setq which-key--frame (window-frame new-window))
@@ -1100,8 +1116,8 @@ call signature in different emacs versions"
 (defun which-key--show-buffer-reuse-frame (frame-height frame-width)
   "Helper for `which-key--show-buffer-frame'."
   (let ((window
-         (display-buffer-reuse-window which-key--buffer
-                                      `((reusable-frames . ,which-key--frame)))))
+         (display-buffer-reuse-window
+          which-key--buffer `((reusable-frames . ,which-key--frame)))))
     (when window
       ;; display successful
       (set-frame-size (window-frame window) frame-width frame-height)
@@ -1142,8 +1158,10 @@ width) in lines and characters respectively."
        ;; 1 is a kludge to make sure there is no overlap
        (- (frame-height) (window-text-height (minibuffer-window)) 1)
      ;; (window-mode-line-height which-key--window))
-     ;; FIXME: change to something like (min which-*-height (calculate-max-height))
-     (which-key--height-or-percentage-to-height which-key-side-window-max-height))
+     ;; FIXME: change to something like
+     ;; (min which-*-height (calculate-max-height))
+     (which-key--height-or-percentage-to-height
+      which-key-side-window-max-height))
    ;; width
    (max 0
         (- (if (member which-key-side-window-location '(left right))
@@ -1194,18 +1212,22 @@ width) in lines and characters respectively."
       (cond ((or aem? bem?) (and aem? (not bem?)))
             ((and asp? bsp?)
              (if (string-equal (substring a 0 3) (substring b 0 3))
-                 (which-key--key-description< (substring a 3) (substring b 3) alpha)
+                 (which-key--key-description<
+                  (substring a 3) (substring b 3) alpha)
                (which-key--string< a b alpha)))
             ((or asp? bsp?) asp?)
             ((and a1? b1?) (which-key--string< a b alpha))
             ((or a1? b1?) a1?)
             ((and afn? bfn?)
-             (< (string-to-number (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" a))
-                (string-to-number (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" b))))
+             (< (string-to-number
+                 (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" a))
+                (string-to-number
+                 (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" b))))
             ((or afn? bfn?) afn?)
             ((and apr? bpr?)
              (if (string-equal (substring a 0 2) (substring b 0 2))
-                 (which-key--key-description< (substring a 2) (substring b 2) alpha)
+                 (which-key--key-description<
+                  (substring a 2) (substring b 2) alpha)
                (which-key--string< a b alpha)))
             ((or apr? bpr?) apr?)
             (t (which-key--string< a b alpha))))))
@@ -1282,7 +1304,8 @@ local bindings coming first. Within these categories order using
 
 (defun which-key--get-replacements (key-binding &optional use-major-mode)
   (let ((alist (or (and use-major-mode
-                        (cdr-safe (assq major-mode which-key-replacement-alist)))
+                        (cdr-safe
+                         (assq major-mode which-key-replacement-alist)))
                    which-key-replacement-alist))
         res case-fold-search)
     (catch 'res
@@ -1445,7 +1468,8 @@ ORIGINAL-DESCRIPTION is the description given by
                   ((and original-description
                         (fboundp (intern original-description))
                         (documentation (intern original-description))
-                        (let* ((doc (documentation (intern original-description)))
+                        (let* ((doc (documentation
+                                     (intern original-description)))
                                (str (replace-regexp-in-string "\n" " " doc))
                                (max (floor (* (frame-width) 0.8))))
                           (if (> (length str) max)
@@ -1507,14 +1531,30 @@ alists. Returns a list (key separator description)."
      keymap)
     bindings))
 
-;; adapted from helm-descbinds
+(defun which-key--compute-binding (binding)
+  "Replace BINDING with remapped binding if it exists.
+
+Requires `which-key-compute-remaps' to be non-nil"
+  (let (remap)
+    (if (and which-key-compute-remaps
+             (setq remap (command-remapping (intern binding))))
+        (copy-sequence (symbol-name remap))
+      binding)))
+
 (defun which-key--get-current-bindings ()
   "Generate a list of current active bindings."
   (let ((key-str-qt (regexp-quote (key-description which-key--current-prefix)))
         (buffer (current-buffer))
-        (ignore-bindings '("self-insert-command" "ignore" "ignore-event" "company-ignore"))
-        (ignore-keys-regexp "mouse-\\|wheel-\\|remap\\|drag-\\|scroll-bar\\|select-window\\|switch-frame\\|-state")
-        (ignore-sections-regexp "\\(Key translations\\|Function key map translations\\|Input decoding map translations\\)"))
+        (ignore-bindings '("self-insert-command" "ignore"
+                           "ignore-event" "company-ignore"))
+        (ignore-keys-regexp
+         (eval-when-compile
+           (regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
+                         "select-window" "switch-frame" "-state"))))
+        (ignore-sections-regexp
+         (eval-when-compile
+           (regexp-opt '("Key translations" "Function key map translations"
+                         "Input decoding map translations")))))
     (with-temp-buffer
       (setq-local indent-tabs-mode t)
       (setq-local tab-width 8)
@@ -1531,12 +1571,8 @@ alists. Returns a list (key separator description)."
             (setq header-p nil)
             (forward-line 3))
            ((= (char-after) ?\f)
-            ;; (push (cons header (nreverse section)) bindings)
-            ;; (setq section nil)
             (setq header-p t))
-           ((looking-at "^[ \t]*$")
-            ;; ignore
-            )
+           ((looking-at "^[ \t]*$"))
            ((or (not (string-match-p ignore-sections-regexp header))
                 which-key--current-prefix)
             (let ((binding-start (save-excursion
@@ -1544,10 +1580,8 @@ alists. Returns a list (key separator description)."
                                         (match-end 0))))
                   key binding)
               (when binding-start
-                (setq key (buffer-substring-no-properties (point) binding-start)
-                      ;; key (replace-regexp-in-string"^[ \t\n]+" "" key)
-                      ;; key (replace-regexp-in-string"[ \t\n]+$" "" key)
-                      )
+                (setq key (buffer-substring-no-properties
+                           (point) binding-start))
                 (setq binding (buffer-substring-no-properties
                                binding-start
                                (line-end-position)))
@@ -1559,19 +1593,27 @@ alists. Returns a list (key separator description)."
                          (string-match (format "^%s[ \t]\\([^ \t]+\\)[ \t]+$"
                                                key-str-qt) key))
                     (unless (assoc-string (match-string 1 key) bindings)
-                      (push (cons (match-string 1 key) binding) bindings)))
+                      (push (cons (match-string 1 key)
+                                  (which-key--compute-binding binding))
+                            bindings)))
                    ((and which-key--current-prefix
                          (string-match
                           (format
                            "^%s[ \t]\\([^ \t]+\\) \\.\\. %s[ \t]\\([^ \t]+\\)[ \t]+$"
                            key-str-qt key-str-qt) key))
-                    (let ((stripped-key
-                           (concat (match-string 1 key) " \.\. " (match-string 2 key))))
+                    (let ((stripped-key (concat (match-string 1 key)
+                                                " \.\. "
+                                                (match-string 2 key))))
                       (unless (assoc-string stripped-key bindings)
-                        (push (cons stripped-key binding) bindings))))
-                   ((string-match "^\\([^ \t]+\\|[^ \t]+ \\.\\. [^ \t]+\\)[ \t]+$" key)
+                        (push (cons stripped-key
+                                    (which-key--compute-binding binding))
+                              bindings))))
+                   ((string-match
+                     "^\\([^ \t]+\\|[^ \t]+ \\.\\. [^ \t]+\\)[ \t]+$" key)
                     (unless (assoc-string (match-string 1 key) bindings)
-                      (push (cons (match-string 1 key) binding) bindings)))))))))
+                      (push (cons (match-string 1 key)
+                                  (which-key--compute-binding binding))
+                            bindings)))))))))
           (forward-line))
         (nreverse bindings)))))
 
@@ -1722,14 +1764,14 @@ is the width of the live window."
   (when which-key-show-remaining-keys
     (let ((n-shown (nth page-n (plist-get which-key--pages-plist :keys/page)))
           (n-tot (plist-get which-key--pages-plist :tot-keys)))
-      (setq which-key--lighter-backup (cadr (assq 'which-key-mode minor-mode-alist)))
       (setcar (cdr (assq 'which-key-mode minor-mode-alist))
               (format " WK: %s/%s keys" n-shown n-tot)))))
 
 (defun which-key--lighter-restore ()
   "Restore the lighter for which-key."
   (when which-key-show-remaining-keys
-    (setcar (cdr (assq 'which-key-mode minor-mode-alist)) which-key--lighter-backup)))
+    (setcar (cdr (assq 'which-key-mode minor-mode-alist))
+            which-key-lighter)))
 
 (defun which-key--echo (text)
   "Echo TEXT to minibuffer without logging."
@@ -1754,8 +1796,8 @@ is the width of the live window."
       (defalias 'which-key--universal-argument--description
         'universal-argument--description)
     (defun which-key--universal-argument--description ()
-      ;; Backport of the definition of universal-argument--description in emacs25
-      ;; on 2015-12-04
+      ;; Backport of the definition of universal-argument--description in
+      ;; emacs25 on 2015-12-04
       (when prefix-arg
         (concat "C-u"
                 (pcase prefix-arg
@@ -1822,8 +1864,9 @@ and a page count."
               (prefix (format (concat "%-" (int-to-string first-col-width) "s")
                               full-prefix))
               (page-cnt (if (> n-pages 1)
-                            (format (concat "%-" (int-to-string first-col-width) "s")
-                                    page-cnt)
+                            (format
+                             (concat "%-" (int-to-string first-col-width) "s")
+                             page-cnt)
                           (make-string first-col-width 32)))
               lines first-line new-end)
          (if (= 1 height)
@@ -1861,7 +1904,9 @@ and a page count."
              (lambda ()
                (with-current-buffer which-key--buffer
                  (setq-local mode-line-format
-                             (concat " " full-prefix " " status-line " " nxt-pg-hint))))))
+                             (concat " " full-prefix
+                                     " " status-line
+                                     " " nxt-pg-hint))))))
       (_ (cons page nil)))))
 
 (defun which-key--show-page (n)
@@ -1878,7 +1923,8 @@ enough space based on your settings and frame size." prefix-keys)
       (when (= n-pages (1+ n)) (setq which-key--on-last-page t))
       (let ((page-echo (which-key--process-page page-n which-key--pages-plist))
             (height (plist-get which-key--pages-plist :page-height))
-            (width (nth page-n (plist-get which-key--pages-plist :page-widths))))
+            (width
+             (nth page-n (plist-get which-key--pages-plist :page-widths))))
         (which-key--lighter-status page-n)
         (if (eq which-key-popup-type 'minibuffer)
             (which-key--echo (car page-echo))
@@ -2008,28 +2054,36 @@ after first page."
 `which-key-C-h-map'. This command is always accessible (from any
 prefix) if `which-key-use-C-h-commands' is non nil."
   (interactive)
-  (let* ((prefix-keys (key-description which-key--current-prefix))
-         (full-prefix (which-key--full-prefix prefix-keys current-prefix-arg t))
-         (prompt (concat (when (string-equal prefix-keys "")
-                           (propertize (concat " "
-                                               (or which-key--current-show-keymap-name
-                                                   "Top-level bindings"))
-                                       'face 'which-key-note-face))
-                         full-prefix
-                         (propertize
-                          (substitute-command-keys
-                           (concat
-                            " \\<which-key-C-h-map>"
-                            " \\[which-key-show-next-page-cycle]" which-key-separator "next-page,"
-                            " \\[which-key-show-previous-page-cycle]" which-key-separator "previous-page,"
-                            " \\[which-key-undo-key]" which-key-separator "undo-key,"
-                            " \\[which-key-show-standard-help]" which-key-separator "help,"
-                            " \\[which-key-abort]" which-key-separator "abort"))
-                          'face 'which-key-note-face)))
-         (key (string (read-key prompt)))
-         (cmd (lookup-key which-key-C-h-map key))
-         (which-key-inhibit t))
-    (if cmd (funcall cmd) (which-key-turn-page 0))))
+  (if (not (which-key--popup-showing-p))
+      (which-key-show-standard-help)
+    (let* ((prefix-keys (key-description which-key--current-prefix))
+           (full-prefix (which-key--full-prefix prefix-keys current-prefix-arg t))
+           (prompt (concat (when (string-equal prefix-keys "")
+                             (propertize
+                              (concat " "
+                                      (or which-key--current-show-keymap-name
+                                          "Top-level bindings"))
+                              'face 'which-key-note-face))
+                           full-prefix
+                           (propertize
+                            (substitute-command-keys
+                             (concat
+                              " \\<which-key-C-h-map>"
+                              " \\[which-key-show-next-page-cycle]"
+                              which-key-separator "next-page,"
+                              " \\[which-key-show-previous-page-cycle]"
+                              which-key-separator "previous-page,"
+                              " \\[which-key-undo-key]"
+                              which-key-separator "undo-key,"
+                              " \\[which-key-show-standard-help]"
+                              which-key-separator "help,"
+                              " \\[which-key-abort]"
+                              which-key-separator "abort"))
+                            'face 'which-key-note-face)))
+           (key (string (read-key prompt)))
+           (cmd (lookup-key which-key-C-h-map key))
+           (which-key-inhibit t))
+      (if cmd (funcall cmd) (which-key-turn-page 0)))))
 
 ;;; Update
 
@@ -2041,7 +2095,9 @@ prefix) if `which-key-use-C-h-commands' is non nil."
         (throw 'match t)))))
 
 (defun which-key--try-2-side-windows (keys page-n loc1 loc2 &rest _ignore)
-  "Try to show KEYS (PAGE-N) in LOC1 first. Only if no keys fit fallback to LOC2."
+  "Try to show KEYS (PAGE-N) in LOC1 first.
+
+Only if no keys fit fallback to LOC2."
   (let (pages1)
     (let ((which-key-side-window-location loc1)
           (which-key--multiple-locations t))
@@ -2070,9 +2126,11 @@ is selected interactively from all available keymaps."
                       (lambda (m)
                         (and (boundp m)
                              (keymapp (symbol-value m))
-                             (not (equal (symbol-value m) (make-sparse-keymap)))))
+                             (not (equal (symbol-value m)
+                                         (make-sparse-keymap)))))
                       t nil 'which-key-keymap-history))))
-    (which-key--show-keymap (symbol-name keymap-sym) (symbol-value keymap-sym))))
+    (which-key--show-keymap (symbol-name keymap-sym)
+                            (symbol-value keymap-sym))))
 
 (defun which-key-show-minor-mode-keymap ()
   "Show the top-level bindings in KEYMAP using which-key. KEYMAP
@@ -2183,14 +2241,10 @@ Finally, show the buffer."
                (* 1000 (float-time (time-since start-time)))))))
 
 (defun which-key--update ()
-  "Function run by timer to possibly trigger `which-key--create-buffer-and-show'."
+  "Function run by timer to possibly trigger
+`which-key--create-buffer-and-show'."
   (let ((prefix-keys (this-single-command-keys))
         delay-time)
-    ;; (when (> (length prefix-keys) 0)
-    ;;  (message "key: %s" (key-description prefix-keys)))
-    ;; (when (> (length prefix-keys) 0)
-    ;;  (message "key binding: %s" (key-binding prefix-keys)))
-    ;; Taken from guide-key
     (when (and (equal prefix-keys [key-chord])
                (bound-and-true-p key-chord-mode))
       (setq prefix-keys
@@ -2238,10 +2292,11 @@ Finally, show the buffer."
                     (null this-command)))
            (when (and (not (equal prefix-keys which-key--current-prefix))
                       (or (null which-key-delay-functions)
-                          (null (setq delay-time (run-hook-with-args-until-success
-                                                  'which-key-delay-functions
-                                                  (key-description prefix-keys)
-                                                  (length prefix-keys))))
+                          (null (setq delay-time
+                                      (run-hook-with-args-until-success
+                                       'which-key-delay-functions
+                                       (key-description prefix-keys)
+                                       (length prefix-keys))))
                           (sit-for delay-time)))
              (which-key--create-buffer-and-show prefix-keys)
              (when (and which-key-idle-secondary-delay
@@ -2252,7 +2307,8 @@ Finally, show the buffer."
                 ;; basic test for it being a hydra
                 (not (eq (lookup-key overriding-terminal-local-map "\C-u")
                          'hydra--universal-argument)))
-           (which-key--create-buffer-and-show nil overriding-terminal-local-map))
+           (which-key--create-buffer-and-show
+            nil overriding-terminal-local-map))
           ((and which-key-show-operator-state-maps
                 (bound-and-true-p evil-state)
                 (eq evil-state 'operator)
@@ -2287,7 +2343,8 @@ Finally, show the buffer."
   (setq which-key--paging-timer
         (run-with-idle-timer
          0.2 t (lambda ()
-                 (when (or (not (member real-last-command which-key--paging-functions))
+                 (when (or (not (member real-last-command
+                                        which-key--paging-functions))
                            (and (< 0 (length (this-single-command-keys)))
                                 (not (equal which-key--current-prefix
                                             (this-single-command-keys)))))
@@ -2296,24 +2353,5 @@ Finally, show the buffer."
                    (cancel-timer which-key--paging-timer)
                    (which-key--start-timer))))))
 
-;;; backport some functions for 24.3
-
-;; found at https://github.com/Lindydancer/andersl-old-emacs-support/blob/master/andersl-old-emacs-support.el
-(unless (fboundp 'frame-fringe-width)
-  (defun frame-fringe-width (&optional frame)
-    "Return fringe width of FRAME in pixels."
-    (let ((left-pair (assq 'left-fringe (frame-parameters frame)))
-          (right-pair (assq 'right-fringe (frame-parameters frame))))
-      (+ (if left-pair (cdr left-pair) 0)
-         (if right-pair (cdr right-pair) 0)))))
-
-(unless (fboundp 'frame-scroll-bar-width)
-  (defun frame-scroll-bar-width (&optional frame)
-    "Return scroll bar width of FRAME in pixels."
-    (let ((pair (assq 'scroll-bar-width (frame-parameters frame))))
-      (if pair
-          (cdr pair)
-        0))))
-
 (provide 'which-key)
 ;;; which-key.el ends here

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 ("with-editor-pkg.el" "with-editor.el")
-;;;;;;  (22792 62841 923903 646000))
+;;;;;;  (22839 4014 235658 634000))
 
 ;;;***

@@ -1,4 +1,4 @@
-(define-package "with-editor" "20170417.1458" "Use the Emacsclient as $EDITOR"
+(define-package "with-editor" "20170517.1242" "Use the Emacsclient as $EDITOR"
   '((emacs "24.4")
     (async "1.9")
     (dash "2.13.0"))

@@ -748,7 +748,7 @@ See info node `(with-editor)Debugging' for instructions."
           (fun (let ((warning-minimum-level :error)
                      (warning-minimum-log-level :error))
                  (with-editor-locate-emacsclient))))
-      (insert "magit-emacsclient-executable:\n"
+      (insert "with-editor-emacsclient-executable:\n"
               (format " value:   %s (%s)\n" val
                       (and val (with-editor-emacsclient-version val)))
               (format " default: %s (%s)\n" def
@@ -762,7 +762,8 @@ See info node `(with-editor)Debugging' for instructions."
     (--each (with-editor-emacsclient-path)
       (insert (format "    %s (%s)\n" it (car (file-attributes it))))
       (when (file-directory-p it)
-        (dolist (exec (directory-files it t "emacsclient"))
+        ;; Don't match emacsclientw.exe, it makes popup windows.
+        (dolist (exec (directory-files it t "emacsclient\\(?:[^w]\\|\\'\\)"))
           (insert (format "      %s (%s)\n" exec
                           (with-editor-emacsclient-version exec))))))))

Binary file

File renamed without changes

Binary file

File renamed without changes

Binary file

File renamed without changes

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 "yasnippet" "yasnippet.el" (22792 62820 406318
-;;;;;;  459000))
+;;;### (autoloads nil "yasnippet" "yasnippet.el" (22839 4012 725678
+;;;;;;  324000))
 ;;; 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") (22792 62819 160342
-;;;;;;  459000))
+;;;### (autoloads nil nil ("yasnippet-pkg.el") (22839 4011 498694
+;;;;;;  334000))
 
 ;;;***

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

@@ -3580,6 +3580,11 @@ field start.  This hook does nothing if an undo is in progress."
   (unless (or (not after?)
               yas--inhibit-overlay-hooks
               (not (overlayp yas--active-field-overlay)) ; Avoid Emacs bug #21824.
+              ;; If a single change hits multiple overlays of the same
+              ;; snippet, then we delete the snippet the first time,
+              ;; and then subsequent calls get a deleted overlay.
+              ;; Don't delete the snippet again!
+              (not (overlay-buffer overlay))
               (yas--undo-in-progress))
     (let* ((inhibit-modification-hooks nil)
            (yas--inhibit-overlay-hooks t)
@@ -3708,7 +3713,14 @@ Move the overlays, or create them if they do not exit."
 ;; running. This would mean a lot of overlay modification hooks
 ;; running, but if managed correctly (including overlay priorities)
 ;; they should account for all situations...
-;;
+
+(defvar yas--first-indent-undo nil
+  "Internal variable for indent undo entries.
+Used to pass info from `yas--indent-region' to `yas-expand-snippet'.")
+(defvar yas--return-first-indent-undo nil
+  "Whether to record undo info in `yas--indent-region'.
+See also `yas--first-indent-undo'.")
+
 (defun yas-expand-snippet (content &optional start end expand-env)
   "Expand snippet CONTENT at current point.
 
@@ -3737,6 +3749,7 @@ considered when expanding the snippet."
          (to-delete (and start
                          end
                          (buffer-substring-no-properties start end)))
+         (yas--first-indent-undo nil)
          snippet)
     (goto-char start)
     (setq yas--indent-original-column (current-column))
@@ -3760,7 +3773,8 @@ considered when expanding the snippet."
            ;;    plain text will get recorded at the end.
            ;;
            ;;    stacked expansion: also shoosh the overlay modification hooks
-           (let ((buffer-undo-list t))
+           (let ((buffer-undo-list t)
+                 (yas--return-first-indent-undo t))
              ;; snippet creation might evaluate users elisp, which
              ;; might generate errors, so we have to be ready to catch
              ;; them mostly to make the undo information
@@ -3786,23 +3800,20 @@ considered when expanding the snippet."
            (unless (yas--snippet-fields snippet)
              (yas-exit-snippet snippet))
 
-           ;; Push two undo actions: the deletion of the inserted contents of
-           ;; the new snippet (without the "key") followed by an apply of
-           ;; `yas--take-care-of-redo' on the newly inserted snippet boundaries
-           ;;
-           ;; A small exception, if `yas-also-auto-indent-first-line'
-           ;; is t and `yas--indent' decides to indent the line to a
-           ;; point before the actual expansion point, undo would be
-           ;; messed up. We call the early point "newstart"".  case,
-           ;; and attempt to fix undo.
-           ;;
-           (let ((newstart (overlay-start (yas--snippet-control-overlay snippet)))
-                 (end (overlay-end (yas--snippet-control-overlay snippet))))
-             (when (< newstart start)
-               (push (cons (make-string (- start newstart) ? ) newstart) buffer-undo-list))
-             (push (cons newstart end) buffer-undo-list)
-             (push `(apply yas--take-care-of-redo ,start ,end ,snippet)
-                   buffer-undo-list))
+           ;; Undo actions from indent of snippet's 1st line.
+           (setq buffer-undo-list
+                 (nconc yas--first-indent-undo buffer-undo-list))
+           ;; Undo action for the expand snippet contents.
+           (push (cons (overlay-start (yas--snippet-control-overlay snippet))
+                       (overlay-end (yas--snippet-control-overlay snippet)))
+                 buffer-undo-list)
+           ;; Follow up with `yas--take-care-of-redo' on the newly
+           ;; inserted snippet boundaries.
+           (push `(apply yas--take-care-of-redo ,start
+                         ,(overlay-end (yas--snippet-control-overlay snippet))
+                         ,snippet)
+                 buffer-undo-list)
+
            ;; Now, schedule a move to the first field
            ;;
            (let ((first-field (car (yas--snippet-fields snippet))))
@@ -4020,45 +4031,30 @@ expansion.")
 necessary fields, mirrors and exit points.
 
 Meant to be called in a narrowed buffer, does various passes"
-  (let ((parse-start (point))
-        ;; Avoid major-mode's syntax propertizing function, since we
-        ;; change the syntax-table while calling `scan-sexps'.
-        (syntax-propertize-function nil))
-    ;; Reset the yas--dollar-regions
-    ;;
-    (setq yas--dollar-regions nil)
-    ;; protect just the backquotes
-    ;;
-    (yas--protect-escapes nil '(?`))
-    ;; replace all backquoted expressions
-    ;;
-    (goto-char parse-start)
-    (yas--save-backquotes)
-    ;; protect escaped characters
-    ;;
-    (yas--protect-escapes)
-    ;; Parse indent markers: `$>'.
-    (goto-char parse-start)
-    (yas--indent-parse-create)
-    ;; parse fields with {}
-    ;;
-    (goto-char parse-start)
-    (yas--field-parse-create snippet)
-    ;; parse simple mirrors and fields
-    ;;
-    (goto-char parse-start)
-    (yas--simple-mirror-parse-create snippet)
-    ;; parse mirror transforms
-    ;;
-    (goto-char parse-start)
-    (yas--transform-mirror-parse-create snippet)
-    ;; calculate adjacencies of fields and mirrors
-    ;;
+  (let ((parse-start (point)))
+    ;; Avoid major-mode's syntax propertizing function, since we
+    ;; change the syntax-table while calling `scan-sexps'.
+    (let ((syntax-propertize-function nil))
+      (setq yas--dollar-regions nil)  ; Reset the yas--dollar-regions.
+      (yas--protect-escapes nil '(?`))  ; Protect just the backquotes.
+      (goto-char parse-start)
+      (yas--save-backquotes)     ; Replace all backquoted expressions.
+      (yas--protect-escapes)     ; Protect escaped characters.
+      (goto-char parse-start)
+      (yas--indent-parse-create)        ; Parse indent markers: `$>'.
+      (goto-char parse-start)
+      (yas--field-parse-create snippet) ; Parse fields with {}.
+      (goto-char parse-start)
+      (yas--simple-mirror-parse-create snippet) ; Parse simple mirrors & fields.
+      (goto-char parse-start)
+      (yas--transform-mirror-parse-create snippet) ; Parse mirror transforms.
+      ;; Invalidate any syntax-propertizing done while
+      ;; `syntax-propertize-function' was nil.
+      (syntax-ppss-flush-cache parse-start))
+    ;; Set "next" links of fields & mirrors.
     (yas--calculate-adjacencies snippet)
-    ;; Delete $-constructs
-    ;;
     (save-restriction
-      (widen)
+      (widen)                           ; Delete $-constructs.
       (yas--delete-regions yas--dollar-regions))
     ;; Make sure to do this insertion *after* deleting the dollar
     ;; regions, otherwise we invalidate the calculated positions of
@@ -4073,23 +4069,12 @@ Meant to be called in a narrowed buffer, does various passes"
                 (get-register yas-wrap-around-region))
            (insert (prog1 (get-register yas-wrap-around-region)
                      (set-register yas-wrap-around-region nil)))))
-    ;; restore backquoted expression values
-    ;;
-    (yas--restore-backquotes)
-    ;; restore escapes
-    ;;
+    (yas--restore-backquotes)  ; Restore backquoted expression values.
     (goto-char parse-start)
-    (yas--restore-escapes)
-    ;; update mirrors for the first time
-    ;;
-    (yas--update-mirrors snippet)
-    ;; indent the best we can
-    ;;
-    (goto-char parse-start)
-    ;; Invalidate any syntax-propertizing done while
-    ;; `syntax-propertize-function' was nil.
-    (syntax-ppss-flush-cache parse-start))
-  (yas--indent snippet))
+    (yas--restore-escapes)        ; Restore escapes.
+    (yas--update-mirrors snippet) ; Update mirrors for the first time.
+    (goto-char parse-start))
+  (yas--indent snippet))                ; Indent the best we can.
 
 ;; HACK: Some implementations of `indent-line-function' (called via
 ;; `indent-according-to-mode') delete text before they insert (like
@@ -4210,12 +4195,17 @@ Buffer must be narrowed to BEG..END used to create the snapshot info."
 (defun yas--indent-region (from to snippet)
   "Indent the lines between FROM and TO with `indent-according-to-mode'.
 The SNIPPET's markers are preserved."
-  (let* ((snippet-markers (yas--collect-snippet-markers snippet))
-         (to (set-marker (make-marker) to)))
-    (save-excursion
-      (goto-char from)
-      (save-restriction
-        (widen)
+  (save-excursion
+    (save-restriction
+      (widen)
+      (let* ((snippet-markers (yas--collect-snippet-markers snippet))
+             (to (set-marker (make-marker) to))
+             (control-ov (yas--snippet-control-overlay snippet))
+             (1st-bol (progn (goto-char (if control-ov (overlay-start control-ov)
+                                          from))
+                             (beginning-of-line)
+                             (point))))
+        (goto-char from)
         (cl-loop for bol = (line-beginning-position)
                  for eol = (line-end-position)
                  if (/= bol eol) do
@@ -4227,7 +4217,13 @@ The SNIPPET's markers are preserved."
                              remarkers)))
                    (unwind-protect
                        (progn (back-to-indentation)
-                              (indent-according-to-mode))
+                              (if (and yas--return-first-indent-undo
+                                       (= 1st-bol bol))
+                                  (let ((buffer-undo-list nil))
+                                    (indent-according-to-mode)
+                                    (setq yas--first-indent-undo
+                                          (delq nil buffer-undo-list)))
+                                (indent-according-to-mode)))
                      (save-restriction
                        (narrow-to-region bol (line-end-position))
                        (mapc #'yas--restore-marker-location remarkers))))
@@ -4351,7 +4347,8 @@ with their evaluated value into `yas--backquote-markers-and-strings'."
   (ignore-errors
     (save-match-data ; `scan-sexps' may modify match data.
       (with-syntax-table (standard-syntax-table)
-        (scan-sexps from count)))))
+        (let ((parse-sexp-lookup-properties nil))
+          (scan-sexps from count))))))
 
 (defun yas--make-marker (pos)
   "Create a marker at POS with nil `marker-insertion-type'."

Binary file

@@ -1,1 +0,0 @@
-Good signature from 474F05837FBDEF9B GNU ELPA Signing Agent <elpasign@elpa.gnu.org> (trust undefined) created at 2015-06-05T11:05:01+0200 using DSA
\ No newline at end of file

Commit a7220f33e32c

Commit `a7220f33e32c`