Update elpa · home@4fd2ddc0f0a0

@@ -1,6 +0,0 @@
-(define-package "apropospriate-theme" "20170321.907" "A colorful, low-contrast, light & dark theme set for Emacs with a fun name." 'nil :keywords
-  '("color" "theme")
-  :url "https://github.com/waymondo/apropospriate-theme")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:

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 "apropospriate" "apropospriate.el" (22753 9106
-;;;;;;  776275 254000))
+;;;### (autoloads nil "apropospriate" "apropospriate.el" (22792 62884
+;;;;;;  647078 176000))
 ;;; Generated autoloads from apropospriate.el
 
 (and load-file-name (boundp 'custom-theme-load-path) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
@@ -12,8 +12,8 @@
 ;;;***
 
 ;;;### (autoloads nil nil ("apropospriate-dark-theme.el" "apropospriate-light-theme.el"
-;;;;;;  "apropospriate-theme-pkg.el" "apropospriate-theme.el") (22753
-;;;;;;  9106 778275 224000))
+;;;;;;  "apropospriate-theme-pkg.el" "apropospriate-theme.el") (22792
+;;;;;;  62884 649078 138000))
 
 ;;;***

@@ -0,0 +1,6 @@
+(define-package "apropospriate-theme" "20170418.1352" "A colorful, low-contrast, light & dark theme set for Emacs with a fun name." 'nil :keywords
+  '("color" "theme")
+  :url "https://github.com/waymondo/apropospriate-theme")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:

File renamed without changes

@@ -200,7 +200,7 @@ Set to `1.0' or nil to prevent font size manipulation."
      `(ivy-confirm-face ((,class (:foreground ,green))))
      `(ivy-match-required-face ((,class (:foreground ,red))))
      `(ivy-remote ((,class (:foreground ,cyan))))
-     `(ivy-virtual ((,class (:inherit ido-virtual))))
+     `(ivy-virtual ((,class (:foreground ,cyan))))
      `(ivy-minibuffer-match-face-1 ((,class (:foreground ,yellow :background nil))))
      `(ivy-minibuffer-match-face-2 ((,class (:foreground ,yellow :background nil))))
      `(ivy-minibuffer-match-face-3 ((,class (:foreground ,yellow :background nil))))
@@ -356,7 +356,7 @@ Set to `1.0' or nil to prevent font size manipulation."
      `(undo-tree-visualizer-register-face ((,class (:foreground ,yellow))))
      `(erm-syn-errline ((,class (:box nil :underline (:style wave :color ,red)))))
      `(erm-syn-warnline ((,class (:box nil :underline (:style wave :color ,orange)))))
-     `(dired-directory ((,class (:inherit ido-subdir))))
+     `(dired-directory ((,class (:foreground ,brown))))
      `(dired-header ((,class (:inherit header-line))))
      `(diredp-compressed-file-suffix ((,class (:foreground ,blue))))
      `(diredp-dir-heading ((,class (:inherit dired-header))))
@@ -554,11 +554,11 @@ Set to `1.0' or nil to prevent font size manipulation."
      `(bm-persistent-face ((,class (:inherit secondary-selection))))
      `(bm-fringe-face ((,class (:inherit fringe))))
      `(bm-fringe-persistent-face ((,class (:inherit fringe))))
-     `(neo-dir-link-face ((,class (:inherit ido-subdir))))
+     `(neo-dir-link-face ((,class (:foreground ,brown))))
      `(neo-expand-btn-face ((,class (:foreground ,base02))))
      `(neo-header-face ((,class (:inherit header-line))))
      `(neo-file-link-face ((,class (:foreground ,base03))))
-     `(neo-root-dir-face ((,class (:foregroud ,base02))))
+     `(neo-root-dir-face ((,class (:foreground ,base02))))
      `(org-ellipsis ((,class (:inherit font-lock-keyword-face))))
      `(org-level-1 ((,class (:inherit header-line :height 1.3))))
      `(org-level-2 ((,class (:inherit header-line :height 1.2))))
@@ -567,7 +567,12 @@ Set to `1.0' or nil to prevent font size manipulation."
      `(org-level-5 ((,class (:inherit header-line))))
      `(org-level-6 ((,class (:inherit header-line))))
      `(org-level-7 ((,class (:inherit header-line))))
-     `(org-level-8 ((,class (:inherit header-line)))))
+     `(org-level-8 ((,class (:inherit header-line))))
+     `(hydra-face-red ((,class (:foreground ,red :bold t))))
+     `(hydra-face-blue ((,class (:foreground ,blue :bold t))))
+     `(hydra-face-amaranth ((,class (:foreground ,red-1 :bold t))))
+     `(hydra-face-pink ((,class (:foreground ,pink :bold t))))
+     `(hydra-face-teal ((,class (:foreground ,cyan :bold t)))))
 
     (custom-theme-set-variables
      theme-name

@@ -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" (22712 4644 32387 835000))
+;;;### (autoloads nil "async" "async.el" (22792 62882 671116 407000))
 ;;; 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" (22712
-;;;;;;  4644 31387 842000))
+;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22792
+;;;;;;  62882 670116 426000))
 ;;; 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" (22712 4644
-;;;;;;  27387 869000))
+;;;### (autoloads nil "dired-async" "dired-async.el" (22792 62882
+;;;;;;  666116 503000))
 ;;; 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") (22712
-;;;;;;  4644 33387 829000))
+;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22792
+;;;;;;  62882 672116 387000))
 
 ;;;***

File renamed without changes

Binary file

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

File renamed without changes

@@ -61,7 +61,7 @@ It is called just before calling `smtpmail-send-it'.")
           (set-buffer-multibyte nil)
           ;; Pass in the variable environment for smtpmail
           ,(async-inject-variables
-            "\\`\\(smtpmail\\|async-smtpmail\\|\\(user-\\)?mail\\)-\\|auth-sources\\|epg"
+            "\\`\\(smtpmail\\|async-smtpmail\\|\\(user-\\)?mail\\)-\\|auth-sources\\|epg\\|nsm"
             nil "\\`\\(mail-header-format-function\\|smtpmail-address-buffer\\|mail-mode-abbrev-table\\)")
           (run-hooks 'async-smtpmail-before-send-hook)
           (smtpmail-send-it)))

Binary file

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "avy" "avy.el" (22753 9106 361281 499000))
+;;;### (autoloads nil "avy" "avy.el" (22792 62881 720134 804000))
 ;;; Generated autoloads from avy.el
 
 (autoload 'avy-goto-char "avy" "\
@@ -155,7 +155,7 @@ The window scope is determined by `avy-all-windows' or
 \(fn ARG)" t nil)
 
 (autoload 'avy-move-region "avy" "\
-Select two lines and move the text between them here.
+Select two lines and move the text between them above the current line.
 
 \(fn)" t nil)

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "avy" "20170402.112" "tree-based completion" '((emacs "24.1") (cl-lib "0.5")) :url "https://github.com/abo-abo/avy" :keywords '("point" "location"))
+(define-package "avy" "20170411.608" "tree-based completion" '((emacs "24.1") (cl-lib "0.5")) :url "https://github.com/abo-abo/avy" :keywords '("point" "location"))

@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/avy
-;; Package-Version: 20170402.112
+;; Package-Version: 20170411.608
 ;; Version: 0.4.0
 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
 ;; Keywords: point, location
@@ -490,6 +490,10 @@ multiple DISPLAY-FN invokations."
 Commands using `avy-with' macro can be resumed."
   (interactive))
 
+(defvar avy-command nil
+  "Store the current command symbol.
+E.g. 'avy-goto-line or 'avy-goto-char.")
+
 (defmacro avy-with (command &rest body)
   "Set `avy-keys' according to COMMAND and execute BODY.
 Set `avy-style' according to COMMMAND as well."
@@ -498,7 +502,8 @@ Set `avy-style' according to COMMMAND as well."
   `(let ((avy-keys (or (cdr (assq ',command avy-keys-alist))
                        avy-keys))
          (avy-style (or (cdr (assq ',command avy-styles-alist))
-                        avy-style)))
+                        avy-style))
+         (avy-command ',command))
      (setq avy-action nil)
      (setf (symbol-function 'avy-resume)
            (lambda ()
@@ -524,7 +529,9 @@ Set `avy-style' according to COMMMAND as well."
   (save-excursion
     (let (str)
       (goto-char pt)
-      (forward-sexp)
+      (if (eq avy-command 'avy-goto-line)
+          (end-of-line)
+        (forward-sexp))
       (setq str (buffer-substring pt (point)))
       (kill-new str)
       (message "Copied: %s" str)))
@@ -1482,21 +1489,23 @@ The window scope is determined by `avy-all-windows' or
 
 ;;;###autoload
 (defun avy-move-region ()
-  "Select two lines and move the text between them here."
+  "Select two lines and move the text between them above the current line."
   (interactive)
   (avy-with avy-move-region
     (let* ((initial-window (selected-window))
            (beg (avy--line))
-           (end (save-excursion
-                  (goto-char (avy--line))
-                  (forward-line)
-                  (point)))
-           (text (buffer-substring beg end))
-           (pad (if (bolp) "" "\n")))
+           (end (avy--line))
+           text)
+      (when (> beg end)
+        (cl-rotatef beg end))
+      (setq end (save-excursion
+                  (goto-char end)
+                  (1+ (line-end-position))))
+      (setq text (buffer-substring beg end))
       (move-beginning-of-line nil)
       (delete-region beg end)
       (select-window initial-window)
-      (insert text pad))))
+      (insert text))))
 
 ;;;###autoload
 (defun avy-kill-region (arg)
@@ -1617,10 +1626,10 @@ saves the line(s) as if killed, but does not kill it(them)."
 (defun avy--read-candidates ()
   "Read as many chars as possible and return their occurences.
 At least one char must be read, and then repeatedly one next char
-may be read if it is entered before `avy-timeout-seconds'.  `DEL'
-deletes the last char entered, and `RET' exits with the currently
-read string immediately instead of waiting for another char for
-`avy-timeout-seconds'.
+may be read if it is entered before `avy-timeout-seconds'.  `C-h'
+or `DEL' deletes the last char entered, and `RET' exits with the
+currently read string immediately instead of waiting for another
+char for `avy-timeout-seconds'.
 The format of the result is the same as that of `avy--regex-candidates'.
 This function obeys `avy-all-windows' setting."
   (let ((str "") char break overlays regex)
@@ -1643,8 +1652,8 @@ This function obeys `avy-all-windows' setting."
                ;; Handle RET
                ((= char 13)
                 (setq break t))
-               ;; Handle DEL
-               ((= char 127)
+               ;; Handle C-h, DEL
+               ((memq char '(8 127))
                 (let ((l (length str)))
                   (when (>= l 1)
                     (setq str (substring str 0 (1- l))))))

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 "company" "company.el" (22753 9105 286297 677000))
+;;;### (autoloads nil "company" "company.el" (22792 62880 32167 457000))
 ;;; Generated autoloads from company.el
 
 (autoload 'company-mode "company" "\
@@ -73,8 +73,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22753
-;;;;;;  9105 300297 467000))
+;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22792
+;;;;;;  62880 45167 206000))
 ;;; Generated autoloads from company-abbrev.el
 
 (autoload 'company-abbrev "company-abbrev" "\
@@ -84,8 +84,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22753 9105
-;;;;;;  296297 527000))
+;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22792 62880
+;;;;;;  42167 264000))
 ;;; Generated autoloads from company-bbdb.el
 
 (autoload 'company-bbdb "company-bbdb" "\
@@ -95,8 +95,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-css" "company-css.el" (22753 9105
-;;;;;;  285297 693000))
+;;;### (autoloads nil "company-css" "company-css.el" (22792 62880
+;;;;;;  31167 476000))
 ;;; Generated autoloads from company-css.el
 
 (autoload 'company-css "company-css" "\
@@ -106,8 +106,8 @@ inserted.
 
 ;;;***
 
-;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22753
-;;;;;;  9105 291297 602000))
+;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22792
+;;;;;;  62880 37167 360000))
 ;;; 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"
-;;;;;;  (22753 9105 289297 632000))
+;;;;;;  (22792 62880 35167 399000))
 ;;; 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" (22753 9105
-;;;;;;  302297 437000))
+;;;### (autoloads nil "company-elisp" "company-elisp.el" (22792 62880
+;;;;;;  47167 167000))
 ;;; 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" (22753 9105
-;;;;;;  288297 648000))
+;;;### (autoloads nil "company-etags" "company-etags.el" (22792 62880
+;;;;;;  33167 438000))
 ;;; 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" (22753 9105
-;;;;;;  292297 587000))
+;;;### (autoloads nil "company-files" "company-files.el" (22792 62880
+;;;;;;  38167 341000))
 ;;; 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" (22753 9105
-;;;;;;  281297 753000))
+;;;### (autoloads nil "company-gtags" "company-gtags.el" (22792 62880
+;;;;;;  26167 573000))
 ;;; 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" (22753
-;;;;;;  9105 301297 452000))
+;;;### (autoloads nil "company-ispell" "company-ispell.el" (22792
+;;;;;;  62880 46167 186000))
 ;;; 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" (22753
-;;;;;;  9105 294297 557000))
+;;;### (autoloads nil "company-keywords" "company-keywords.el" (22792
+;;;;;;  62880 40167 302000))
 ;;; 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" (22753 9105
-;;;;;;  297297 512000))
+;;;### (autoloads nil "company-nxml" "company-nxml.el" (22792 62880
+;;;;;;  43167 244000))
 ;;; 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" (22753
-;;;;;;  9105 284297 708000))
+;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22792
+;;;;;;  62880 29167 515000))
 ;;; 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" (22753
-;;;;;;  9105 282297 738000))
+;;;### (autoloads nil "company-semantic" "company-semantic.el" (22792
+;;;;;;  62880 27167 554000))
 ;;; 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" (22753 9105
-;;;;;;  290297 617000))
+;;;### (autoloads nil "company-tempo" "company-tempo.el" (22792 62880
+;;;;;;  36167 380000))
 ;;; 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" (22753 9105
-;;;;;;  299297 482000))
+;;;### (autoloads nil "company-xcode" "company-xcode.el" (22792 62880
+;;;;;;  44167 225000))
 ;;; 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"
-;;;;;;  (22753 9105 298297 497000))
+;;;;;;  (22792 62880 44167 225000))
 ;;; 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")
-;;;;;;  (22753 9105 295297 542000))
+;;;;;;  (22792 62880 41167 283000))
 
 ;;;***

File renamed without changes

@@ -70,7 +70,7 @@ The values should use the same format as `completion-ignored-extensions'."
          (begin (concat "\\(?:\\.\\{1,2\\}/\\|~/\\|" root "\\)")))
     (list (concat "\"\\(" begin "[^\"\n]*\\)")
           (concat "\'\\(" begin "[^\'\n]*\\)")
-          (concat "\\(?:[ \t]\\|^\\)\\(" begin "[^ \t\n]*\\)"))))
+          (concat "\\(?:[ \t=]\\|^\\)\\(" begin "[^ \t\n]*\\)"))))
 
 (defun company-files--grab-existing-name ()
   ;; Grab the file name.

Binary file

File renamed without changes

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

File renamed without changes

@@ -1,6 +1,6 @@
 ;;; company-template.el --- utility library for template expansion
 
-;; Copyright (C) 2009, 2010, 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014-2017 Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -35,6 +35,11 @@
     (define-key keymap (kbd "TAB") 'company-template-forward-field)
     keymap))
 
+(defvar company-template-field-map
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap (kbd "C-d") 'company-template-clear-field)
+    keymap))
+
 (defvar-local company-template--buffer-templates nil)
 
 ;; interactive ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -55,19 +60,52 @@
 
 (defun company-template-forward-field ()
   (interactive)
+  (let ((start (point))
+        (next-field-start (company-template-find-next-field)))
+    (push-mark)
+    (goto-char next-field-start)
+    (company-template-remove-field (company-template-field-at start))))
+
+(defun company-template-clear-field ()
+  "Clear the field at point."
+  (interactive)
+  (let ((ovl (company-template-field-at (point))))
+    (when ovl
+      (company-template-remove-field ovl t)
+      (let ((after-clear-fn
+             (overlay-get ovl 'company-template-after-clear)))
+        (when (functionp after-clear-fn)
+          (funcall after-clear-fn))))))
+
+(defun company-template--after-clear-c-like-field ()
+  "Function that can be called after deleting a field of a c-like template.
+For c-like templates it is set as `after-post-fn' property on fields in
+`company-template-add-field'.  If there is a next field, delete everything
+from point to it.  If there is no field after point, remove preceding comma
+if present."
+  (let* ((pos (point))
+         (next-field-start (company-template-find-next-field))
+         (last-field-p (not (company-template-field-at next-field-start))))
+    (cond ((and (not last-field-p)
+                (< pos next-field-start)
+                (string-match "^[ ]*,+[ ]*$" (buffer-substring-no-properties
+                                              pos next-field-start)))
+           (delete-region pos next-field-start))
+          ((and last-field-p
+                (looking-back ",+[ ]*" (line-beginning-position)))
+           (delete-region (match-beginning 0) pos)))))
+
+(defun company-template-find-next-field ()
   (let* ((start (point))
-         (templates (company-template-templates-at (point)))
+         (templates (company-template-templates-at start))
          (minimum (apply 'max (mapcar 'overlay-end templates)))
          (fields (cl-loop for templ in templates
                           append (overlay-get templ 'company-template-fields))))
-    (dolist (pos (mapcar 'overlay-start fields))
+    (dolist (pos (mapcar 'overlay-start fields) minimum)
       (and pos
-           (> pos (point))
+           (> pos start)
            (< pos minimum)
-           (setq minimum pos)))
-    (push-mark)
-    (goto-char minimum)
-    (company-template-remove-field (company-template-field-at start))))
+           (setq minimum pos)))))
 
 (defun company-template-field-at (&optional point)
   (cl-loop for ovl in (overlays-at (or point (point)))
@@ -93,10 +131,12 @@
         (delq templ company-template--buffer-templates))
   (delete-overlay templ))
 
-(defun company-template-add-field (templ beg end &optional display)
+(defun company-template-add-field (templ beg end &optional display after-clear-fn)
   "Add new field to template TEMPL spanning from BEG to END.
 When DISPLAY is non-nil, set the respective property on the overlay.
-Leave point at the end of the field."
+Leave point at the end of the field.
+AFTER-CLEAR-FN is a function that can be used to apply custom behavior
+after deleting a field in `company-template-remove-field'."
   (cl-assert templ)
   (when (> end (overlay-end templ))
     (move-overlay templ (overlay-start templ) end))
@@ -109,6 +149,10 @@ Leave point at the end of the field."
       (overlay-put ov 'display display))
     (overlay-put ov 'company-template-parent templ)
     (overlay-put ov 'insert-in-front-hooks '(company-template-insert-hook))
+    (when after-clear-fn
+      (overlay-put ov 'company-template-after-clear after-clear-fn))
+    (overlay-put ov 'keymap company-template-field-map)
+    (overlay-put ov 'priority 101)
     (push ov siblings)
     (overlay-put templ 'company-template-fields siblings)))
 
@@ -179,7 +223,8 @@ Leave point at the end of the field."
   (let ((last-pos (point)))
     (while (re-search-forward "\\([^,]+\\),?" end 'move)
       (when (zerop (car (parse-partial-sexp last-pos (point))))
-        (company-template-add-field templ last-pos (match-end 1))
+        (company-template-add-field templ last-pos (match-end 1) nil
+                                    #'company-template--after-clear-c-like-field)
         (skip-chars-forward " ")
         (setq last-pos (point))))))

Binary file

File renamed without changes

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "company-quickhelp" "20170402.35" "Popup documentation for completion candidates" '((emacs "24.4") (company "0.8.9") (pos-tip "0.4.6")) :url "https://www.github.com/expez/company-quickhelp" :keywords '("company" "popup" "documentation" "quickhelp"))

@@ -4,7 +4,7 @@
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
 ;;;### (autoloads nil "company-quickhelp" "company-quickhelp.el"
-;;;;;;  (22753 9104 377311 358000))
+;;;;;;  (22792 62877 320219 910000))
 ;;; Generated autoloads from company-quickhelp.el
 
 (autoload 'company-quickhelp-local-mode "company-quickhelp" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "company-quickhelp" "20170429.1052" "Popup documentation for completion candidates" '((emacs "24.3") (company "0.8.9") (pos-tip "0.4.6")) :url "https://www.github.com/expez/company-quickhelp" :keywords '("company" "popup" "documentation" "quickhelp"))

@@ -4,10 +4,10 @@
 
 ;; Author: Lars Andersen <expez@expez.com>
 ;; URL: https://www.github.com/expez/company-quickhelp
-;; Package-Version: 20170402.35
+;; Package-Version: 20170429.1052
 ;; Keywords: company popup documentation quickhelp
 ;; Version: 2.2.0
-;; Package-Requires: ((emacs "24.4") (company "0.8.9") (pos-tip "0.4.6"))
+;; Package-Requires: ((emacs "24.3") (company "0.8.9") (pos-tip "0.4.6"))
 
 ;; This file is not part of GNU Emacs.
 
@@ -96,32 +96,32 @@ be triggered manually using `company-quickhelp-show'."
        (company-quickhelp--cancel-timer))
      (company-quickhelp--hide))))
 
-(defun company-quickhelp--doc-and-meta (doc)
-  ;; The company backend can either return a buffer with the doc or a
-  ;; cons containing the doc buffer and a position at which to start
-  ;; reading.
-  (let ((doc-buffer (if (consp doc) (car doc) doc))
-        (doc-begin (when (consp doc) (cdr doc))))
-    (with-current-buffer doc-buffer
-      (let ((truncated t))
-        (goto-char (or doc-begin (point-min)))
-        (if company-quickhelp-max-lines
-            (forward-line company-quickhelp-max-lines)
-          (goto-char (point-max)))
-        (beginning-of-line)
-        (when (= (line-number-at-pos)
-                 (save-excursion (goto-char (point-max)) (line-number-at-pos)))
-          (setq truncated nil))
-        (while (and (not (= (line-number-at-pos) 1))
-                    (or
-                     ;; [back] appears at the end of the help elisp help buffer
-                     (looking-at-p "\\[back\\]")
-                     ;; [source] cider's help buffer contains a link to source
-                     (looking-at-p "\\[source\\]")
-                     (looking-at-p "^\\s-*$")))
-          (forward-line -1))
-        (list :doc (buffer-substring-no-properties (point-min) (point-at-eol))
-              :truncated truncated)))))
+(defun company-quickhelp--skip-footers-backwards ()
+  "Skip backwards over footers and blank lines."
+  (beginning-of-line)
+  (while (and (not (= (point-at-eol) (point-min)))
+              (or
+               ;; [back] appears at the end of the help elisp help buffer
+               (looking-at-p "\\[back\\]")
+               ;; [source] cider's help buffer contains a link to source
+               (looking-at-p "\\[source\\]")
+               (looking-at-p "^\\s-*$")))
+    (forward-line -1)))
+
+(defun company-quickhelp--goto-max-line ()
+  "Go to last line to display in popup."
+  (if company-quickhelp-max-lines
+      (forward-line company-quickhelp-max-lines)
+    (goto-char (point-max))))
+
+(defun company-quickhelp--docstring-from-buffer (start)
+  "Fetch docstring from START."
+  (goto-char start)
+  (company-quickhelp--goto-max-line)
+  (let ((truncated (< (point-at-eol) (point-max))))
+    (company-quickhelp--skip-footers-backwards)
+    (list :doc (buffer-substring-no-properties start (point-at-eol))
+          :truncated truncated)))
 
 (defun company-quickhelp--completing-read (prompt candidates &rest rest)
   "`cider', and probably other libraries, prompt the user to
@@ -129,15 +129,30 @@ resolve ambiguous documentation requests.  Instead of failing we
 just grab the first candidate and press forward."
   (car candidates))
 
+(defun company-quickhelp--fetch-docstring (backend)
+  "Fetch docstring from BACKEND."
+  (let ((quickhelp-str (company-call-backend 'quickhelp-string backend)))
+    (if (stringp quickhelp-str)
+        (with-temp-buffer
+          (insert quickhelp-str)
+          (company-quickhelp--docstring-from-buffer (point-min)))
+      (let ((doc (company-call-backend 'doc-buffer backend)))
+        (when doc
+          ;; The company backend can either return a buffer with the doc or a
+          ;; cons containing the doc buffer and a position at which to start
+          ;; reading.
+          (let ((doc-buffer (if (consp doc) (car doc) doc))
+                (doc-begin (when (consp doc) (cdr doc))))
+            (with-current-buffer doc-buffer
+              (company-quickhelp--docstring-from-buffer (or doc-begin (point-min))))))))))
+
 (defun company-quickhelp--doc (selected)
   (cl-letf (((symbol-function 'completing-read)
              #'company-quickhelp--completing-read))
-    (let* ((doc (company-call-backend 'doc-buffer selected))
-           (doc-and-meta (when doc
-                           (company-quickhelp--doc-and-meta doc)))
+    (let* ((doc-and-meta (company-quickhelp--fetch-docstring selected))
            (truncated (plist-get doc-and-meta :truncated))
            (doc (plist-get doc-and-meta :doc)))
-      (unless (string= doc "")
+      (unless (member doc '(nil ""))
         (if truncated
             (concat doc "\n\n[...]")
           doc)))))

Binary file

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

@@ -3,7 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "counsel" "counsel.el" (22753 9103 984317 272000))
+;;;### (autoloads nil "counsel" "counsel.el" (22792 62876 647232
+;;;;;;  925000))
 ;;; Generated autoloads from counsel.el
 
 (autoload 'counsel-el "counsel" "\
@@ -29,11 +30,17 @@ Insert a Unicode character at point.
 (autoload 'counsel-describe-variable "counsel" "\
 Forward to `describe-variable'.
 
+Variables declared using `defcustom' are highlighted according to
+`ivy-highlight-face'.
+
 \(fn)" t nil)
 
 (autoload 'counsel-describe-function "counsel" "\
 Forward to `describe-function'.
 
+Interactive functions (i.e., commands) are highlighted according
+to `ivy-highlight-face'.
+
 \(fn)" t nil)
 
 (autoload 'counsel-set-variable "counsel" "\

@@ -0,0 +1,2 @@
+;;; -*- 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"))

@@ -1,12 +1,12 @@
 ;;; counsel.el --- Various completion functions using Ivy -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2016  Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170328.737
-;; Version: 0.8.0
-;; Package-Requires: ((emacs "24.3") (swiper "0.8.0"))
+;; Package-Version: 20170501.1903
+;; Version: 0.9.1
+;; Package-Requires: ((emacs "24.3") (swiper "0.9.0"))
 ;; Keywords: completion, matching
 
 ;; This file is part of GNU Emacs.
@@ -391,7 +391,7 @@ Update the minibuffer with the amount of lines collected every
 
 (ivy-set-actions
  'counsel-describe-variable
- '(("i" counsel-info-lookup-symbol "info")
+ '(("I" counsel-info-lookup-symbol "info")
    ("d" counsel--find-symbol "definition")))
 
 (defvar counsel-describe-symbol-history nil
@@ -430,7 +430,7 @@ Update the minibuffer with the amount of lines collected every
                  (find-library
                   (prin1-to-string sym)))
                 (t
-                 (error "Couldn't fild definition of %s"
+                 (error "Couldn't find definition of %s"
                         sym))))))))
 
 (define-obsolete-function-alias 'counsel-symbol-at-point
@@ -446,9 +446,21 @@ Update the minibuffer with the amount of lines collected every
          (push (symbol-name vv) cands))))
     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)
+    var))
+
+(ivy-set-display-transformer
+ 'counsel-describe-variable 'counsel-describe-variable-transformer)
+
 ;;;###autoload
 (defun counsel-describe-variable ()
-  "Forward to `describe-variable'."
+  "Forward to `describe-variable'.
+
+Variables declared using `defcustom' are highlighted according to
+`ivy-highlight-face'."
   (interactive)
   (let ((enable-recursive-minibuffers t))
     (ivy-read
@@ -467,12 +479,24 @@ Update the minibuffer with the amount of lines collected every
 ;;** `counsel-describe-function'
 (ivy-set-actions
  'counsel-describe-function
- '(("i" counsel-info-lookup-symbol "info")
+ '(("I" counsel-info-lookup-symbol "info")
    ("d" counsel--find-symbol "definition")))
 
+(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)
+    function-name))
+
+(ivy-set-display-transformer
+ 'counsel-describe-function 'counsel-describe-function-transformer)
+
 ;;;###autoload
 (defun counsel-describe-function ()
-  "Forward to `describe-function'."
+  "Forward to `describe-function'.
+
+Interactive functions \(i.e., commands) are highlighted according
+to `ivy-highlight-face'."
   (interactive)
   (let ((enable-recursive-minibuffers t))
     (ivy-read "Describe function: "
@@ -526,11 +550,12 @@ X is an item of a radio- or choice-type defcustom."
   (let (y)
     (when (and (listp x)
                (consp (setq y (last x))))
-      (setq x (car y))
-      (cons (prin1-to-string x)
-            (if (symbolp x)
-                (list 'quote x)
-              x)))))
+      (unless (equal y '(function))
+        (setq x (car y))
+        (cons (prin1-to-string x)
+              (if (symbolp x)
+                  (list 'quote x)
+                x))))))
 
 ;;;###autoload
 (defun counsel-set-variable ()
@@ -569,7 +594,9 @@ input corresponding to the chosen variable."
                   (if (assoc res cands)
                       (cdr (assoc res cands))
                     (read res)))
-            (eval `(setq ,sym ,res))))
+            (set sym (if (and (listp res) (eq (car res) 'quote))
+                         (cadr res)
+                       res))))
       (unless (boundp sym)
         (set sym nil))
       (counsel-read-setq-expression sym))))
@@ -823,7 +850,7 @@ Usable with `ivy-resume', `ivy-next-line-and-call' and
 (ivy-set-actions
  'counsel-descbinds
  '(("d" counsel-descbinds-action-find "definition")
-   ("i" counsel-descbinds-action-info "info")))
+   ("I" counsel-descbinds-action-info "info")))
 
 (defvar counsel-descbinds-history nil
   "History for `counsel-descbinds'.")
@@ -905,7 +932,7 @@ Describe the selected candidate."
 
 (ivy-set-actions
  'counsel-git
- '(("j" find-file-other-window "other")
+ '(("j" find-file-other-window "other window")
    ("x" counsel-find-file-extern "open externally")))
 
 ;;;###autoload
@@ -1334,11 +1361,34 @@ done") "\n" t)))
             :action (lambda (x)
                       (let ((default-directory (file-name-directory x)))
                         (counsel-find-file)))))
+
+(defcustom counsel-root-command "sudo"
+  "Command to gain root privileges."
+  :type 'string
+  :group 'ivy)
+
+(defun counsel-find-file-as-root (x)
+  "Find file with root privileges."
+  (let* ((host (file-remote-p x 'host))
+         (file-name (format "/%s:%s:%s"
+                            counsel-root-command
+                            (or host "")
+                            (expand-file-name
+                             (if host
+                                 (file-remote-p x 'localname)
+                               x)))))
+    ;; If the current buffer visits the same file we are about to open,
+    ;; replace the current buffer with the new one.
+    (if (eq (current-buffer) (get-file-buffer x))
+        (find-alternate-file file-name)
+      (find-file file-name))))
+
 (ivy-set-actions
  'counsel-find-file
  '(("j" find-file-other-window "other window")
    ("b" counsel-find-file-cd-bookmark-action "cd bookmark")
-   ("x" counsel-find-file-extern "open externally")))
+   ("x" counsel-find-file-extern "open externally")
+   ("r" counsel-find-file-as-root "open as root")))
 
 (defcustom counsel-find-file-at-point nil
   "When non-nil, add file-at-point to the list of candidates."
@@ -1475,7 +1525,7 @@ When INITIAL-INPUT is non-nil, use it in the minibuffer during completion."
             :caller 'counsel-recentf))
 (ivy-set-actions
  'counsel-recentf
- '(("j" find-file-other-window "other-window")
+ '(("j" find-file-other-window "other window")
    ("x" counsel-find-file-extern "open externally")))
 
 ;;** `counsel-locate'
@@ -2207,6 +2257,7 @@ INITIAL-INPUT can be given as the initial minibuffer input."
 
 ;;** `counsel-package'
 (defvar package--initialized)
+(defvar package-alist)
 (defvar package-archive-contents)
 (declare-function package-installed-p "package")
 (declare-function package-delete "package")
@@ -2247,7 +2298,8 @@ Additional Actions:
 (defun counsel-package-action (pkg-cons)
   (let ((pkg (cadr pkg-cons)))
     (if (package-installed-p pkg)
-        (package-delete pkg)
+        (package-delete
+         (cadr (assoc pkg package-alist)))
       (package-install pkg))))
 
 (defun counsel-package-action-describe (pkg-cons)
@@ -2383,8 +2435,7 @@ Additional Actions:
          (mapcar #'ivy-cleanup-string
                  (cl-remove-if
                   (lambda (s)
-                    (or (< (length s) 3)
-                        (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))
@@ -2695,80 +2746,189 @@ And insert it into the minibuffer. Useful during
             :caller 'counsel-rhythmbox))
 
 ;;** `counsel-linux-app'
-(defvar counsel-linux-apps-alist nil
-  "List of data located in /usr/share/applications.")
-
-(defvar counsel-linux-apps-faulty nil
-  "List of faulty data located in /usr/share/applications.")
-
 (defcustom counsel-linux-apps-directories
   '("/usr/local/share/applications/" "/usr/share/applications/")
   "Directories in which to search for applications (.desktop files)."
   :group 'counsel
   :type '(list directory))
 
-(defun counsel-linux-apps-list ()
-  (let ((files (apply 'append
-                      (mapcar
-                       (lambda (dir)
-                         (when (file-exists-p dir)
-                           (directory-files dir t ".*\\.desktop$")))
-                       counsel-linux-apps-directories))))
-    (dolist (file (cl-set-difference files (append (mapcar 'car counsel-linux-apps-alist)
-                                                   counsel-linux-apps-faulty)
-                                     :test 'equal))
-      (with-temp-buffer
-        (insert-file-contents file)
-        (let (name comment exec)
+(defcustom counsel-linux-app-format-function 'counsel-linux-app-format-function-default
+  "Function to format linux application names the `counsel-linux-app' menu.
+The format function will be passed the application's name, comment, and command
+as arguments."
+  :group 'counsel
+  :type '(choice
+          (const :tag "Command : Name - Comment" counsel-linux-app-format-function-default)
+          (const :tag "Name - Comment (Command)" counsel-linux-app-format-function-name-first)
+          (const :tag "Name - Comment" counsel-linux-app-format-function-name-only)
+          (const :tag "Command" counsel-linux-app-format-function-command-only)
+          (function :tag "Custom")))
+
+(defvar counsel-linux-apps-faulty nil
+  "List of faulty desktop files.")
+
+(defvar counsel--linux-apps-cache nil
+  "Cache of desktop files data.")
+
+(defvar counsel--linux-apps-cached-files nil
+  "List of cached desktop files.")
+
+(defvar counsel--linux-apps-cache-timestamp nil
+  "Time when we last updated the cached application list.")
+
+(defvar counsel--linux-apps-cache-format-function nil
+  "The function used to format the cached Linux application menu.")
+
+(defun counsel-linux-app-format-function-default (name comment exec)
+  "Default linux application name formatter."
+  (format "% -45s: %s%s"
+          (propertize exec 'face 'font-lock-builtin-face)
+          name
+          (if comment
+              (concat " - " comment)
+            "")))
+
+(defun counsel-linux-app-format-function-name-first (name comment exec)
+  "Format linux application names with the name (and comment) first."
+  (format "%s%s (%s)"
+          name
+          (if comment
+              (concat " - " comment)
+            "")
+          (propertize exec 'face 'font-lock-builtin-face)))
+
+(defun counsel-linux-app-format-function-name-only (name comment _exec)
+  "Format linux application names with the name (and comment) only."
+  (format "%s%s"
+          name
+          (if comment
+              (concat " - " comment)
+            "")))
+
+(defun counsel-linux-app-format-function-command-only (_name _comment exec)
+  "Display only the command (Exec field) when formatting linux application names."
+  exec)
+
+(defun counsel-linux-apps-list-desktop-files ()
+  "Return an alist of (desktop-name . desktop-file) pairs for all Linux applications.
+
+   This function always returns it's elements in a stable order."
+  (let ((hash (make-hash-table :test #'equal))
+        result)
+    (dolist (dir counsel-linux-apps-directories)
+      (when (file-exists-p dir)
+        (let ((dir (file-name-as-directory dir)))
+          (dolist (file (directory-files-recursively dir ".*\\.desktop$"))
+            (let ((id (subst-char-in-string ?/ ?- (file-relative-name file dir))))
+              (unless (gethash id hash)
+                (push (cons id file) result)
+                (puthash id file hash)))))))
+    result))
+
+(defun counsel-linux-apps-parse (desktop-entries-alist)
+  "Parse the given alist of desktop entries ((id . file-name)).
+
+Any desktop entries that fail to parse are recorded in `counsel-linux-apps-faulty'."
+  (let (result)
+    (setq counsel-linux-apps-faulty nil)
+    (dolist (entry desktop-entries-alist result)
+      (let ((id (car entry))
+            (file (cdr entry)))
+        (with-temp-buffer
+          (insert-file-contents file)
           (goto-char (point-min))
-          (if (null (re-search-forward "^Name *= *\\(.*\\)$" nil t))
-              (message "Warning: File %s has no Name" file)
-            (setq name (match-string 1))
-            (goto-char (point-min))
-            (when (re-search-forward "^Comment *= *\\(.*\\)$" nil t)
-              (setq comment (match-string 1)))
-            (goto-char (point-min))
-            (when (re-search-forward "^Exec *= *\\(.*\\)$" nil t)
-              (setq exec (match-string 1)))
-            (if (and exec (not (equal exec "")))
-                (add-to-list
-                 'counsel-linux-apps-alist
-                 (cons (format "% -45s: %s%s"
-                               (propertize exec 'face 'font-lock-builtin-face)
-                               name
-                               (if comment
-                                   (concat " - " comment)
-                                 ""))
-                       file))
-              (add-to-list 'counsel-linux-apps-faulty file)))))))
-  counsel-linux-apps-alist)
+          (let ((start (re-search-forward "^\\[Desktop Entry\\] *$" nil t))
+                (end (re-search-forward "^\\[" nil t))
+                name comment exec)
+            (catch 'break
+              (unless start
+                (push file counsel-linux-apps-faulty)
+                (message "Warning: File %s has no [Desktop Entry] group" file)
+                (throw 'break nil))
+
+              (goto-char start)
+              (when (re-search-forward "^\\(Hidden\\|NoDisplay\\) *= *\\(1\\|true\\) *$" end t)
+                (throw 'break nil))
+              (setq name (match-string 1))
+
+              (goto-char start)
+              (unless (re-search-forward "^Type *= *Application *$" end t)
+                (throw 'break nil))
+              (setq name (match-string 1))
+
+              (goto-char start)
+              (unless (re-search-forward "^Name *= *\\(.+\\)$" end t)
+                (push file counsel-linux-apps-faulty)
+                (message "Warning: File %s has no Name" file)
+                (throw 'break nil))
+              (setq name (match-string 1))
+
+              (goto-char start)
+              (when (re-search-forward "^Comment *= *\\(.+\\)$" end t)
+                (setq comment (match-string 1)))
+
+              (goto-char start)
+              (unless (re-search-forward "^Exec *= *\\(.+\\)$" end t)
+                ;; Don't warn because this can technically be a valid desktop file.
+                (throw 'break nil))
+              (setq exec (match-string 1))
+
+              (goto-char start)
+              (when (re-search-forward "^TryExec *= *\\(.+\\)$" end t)
+                (let ((try-exec (match-string 1)))
+                  (unless (locate-file try-exec exec-path nil #'file-executable-p)
+                    (throw 'break nil))))
+
+              (push
+               (cons (funcall counsel-linux-app-format-function name comment exec) id)
+               result))))))))
+
+(defun counsel-linux-apps-list ()
+  (let* ((new-desktop-alist (counsel-linux-apps-list-desktop-files))
+         (new-files (mapcar 'cdr new-desktop-alist)))
+    (unless (and
+             (eq counsel-linux-app-format-function
+                 counsel--linux-apps-cache-format-function)
+             (equal new-files counsel--linux-apps-cached-files)
+             (null (cl-find-if
+                    (lambda (file)
+                      (time-less-p
+                       counsel--linux-apps-cache-timestamp
+                       (nth 5 (file-attributes file))))
+                    new-files)))
+      (setq counsel--linux-apps-cache (counsel-linux-apps-parse new-desktop-alist)
+            counsel--linux-apps-cache-format-function counsel-linux-app-format-function
+            counsel--linux-apps-cache-timestamp (current-time)
+            counsel--linux-apps-cached-files new-files)))
+  counsel--linux-apps-cache)
+
 
 (defun counsel-linux-app-action-default (desktop-shortcut)
   "Launch DESKTOP-SHORTCUT."
   (setq desktop-shortcut (cdr desktop-shortcut))
-  (call-process-shell-command
-   (format "gtk-launch %s" (file-name-nondirectory desktop-shortcut))))
+  (call-process "gtk-launch" nil nil nil desktop-shortcut))
 
 (defun counsel-linux-app-action-file (desktop-shortcut)
   "Launch DESKTOP-SHORTCUT with a selected file."
   (setq desktop-shortcut (cdr desktop-shortcut))
-  (let* ((entry (rassoc desktop-shortcut counsel-linux-apps-alist))
-         (short-name (and entry
-                          (string-match "\\([^ ]*\\) " (car entry))
-                          (match-string 1 (car entry))))
-         (file (and short-name
-                    (read-file-name
-                     (format "Run %s on: " short-name)))))
+  (let ((file (read-file-name "Open: ")))
     (if file
-        (call-process-shell-command
-         (format "gtk-launch %s \"%s\""
-                 (file-name-nondirectory desktop-shortcut)
-                 file))
+        (call-process "gtk-launch" nil nil nil desktop-shortcut file)
+      (user-error "cancelled"))))
+
+(defun counsel-linux-app-action-open-desktop (desktop-shortcut)
+  "Open DESKTOP-SHORTCUT"
+  (setq desktop-shortcut (cdr desktop-shortcut))
+  (let ((file
+         (cdr (assoc desktop-shortcut (counsel-linux-apps-list-desktop-files)))))
+    (if file
+        (find-file file)
       (user-error "cancelled"))))
 
 (ivy-set-actions
  'counsel-linux-app
- '(("f" counsel-linux-app-action-file "run on a file")))
+ '(("f" counsel-linux-app-action-file "run on a file")
+   ("d" counsel-linux-app-action-open-desktop "open desktop file")))
 
 ;;;###autoload
 (defun counsel-linux-app ()
@@ -2778,6 +2938,7 @@ And insert it into the minibuffer. Useful during
             :action #'counsel-linux-app-action-default
             :caller 'counsel-linux-app))
 
+;;** `counsel-company'
 (defvar company-candidates)
 (defvar company-point)
 (defvar company-common)
@@ -2793,7 +2954,6 @@ And insert it into the minibuffer. Useful during
   (unless company-candidates
     (company-complete))
   (when company-point
-    (company-complete-common)
     (when (looking-back company-common (line-beginning-position))
       (setq ivy-completion-beg (match-beginning 0))
       (setq ivy-completion-end (match-end 0)))
@@ -3248,7 +3408,7 @@ candidate."
   (interactive)
   (irony-completion-candidates-async 'counsel-irony-callback))
 
-(defun counsel-irony-callback ()
+(defun counsel-irony-callback (&optional _cands)
   (interactive)
   (let ((coll (irony-completion-at-point)))
     (when coll
@@ -3264,7 +3424,7 @@ candidate."
    (condition-case nil
        (concat
         x " "
-        (irony-completion--at-point-annotate x))
+        (irony-completion--capf-annotate x))
      (error x))
    x))
 
@@ -3272,7 +3432,7 @@ candidate."
 
 (declare-function irony-completion-candidates-async "ext:irony-completion")
 (declare-function irony-completion-at-point "ext:irony-completion")
-(declare-function irony-completion--at-point-annotate "ext:irony-completion")
+(declare-function irony-completion--capf-annotate "ext:irony-completion")
 
 ;;** `counsel-mode'
 (defvar counsel-mode-map
@@ -3282,6 +3442,7 @@ candidate."
                 (describe-bindings . counsel-descbinds)
                 (describe-function . counsel-describe-function)
                 (describe-variable . counsel-describe-variable)
+                (describe-face . counsel-describe-face)
                 (find-file . counsel-find-file)
                 (find-library . counsel-find-library)
                 (imenu . counsel-imenu)

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "diminish" "20151215.915" "Diminished modes are minor modes with no modeline display" 'nil :url "https://github.com/myrjola/diminish.el" :keywords '("extensions" "diminish" "minor" "codeprose"))

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "diminish" "diminish.el" (22712 4599 386684
-;;;;;;  314000))
+;;;### (autoloads nil "diminish" "diminish.el" (22792 62875 417256
+;;;;;;  708000))
 ;;; Generated autoloads from diminish.el
 
 (autoload 'diminish "diminish" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "diminish" "20170419.1036" "Diminished modes are minor modes with no modeline display" 'nil :url "https://github.com/myrjola/diminish.el" :keywords '("extensions" "diminish" "minor" "codeprose"))

@@ -5,7 +5,7 @@
 ;; Author: Will Mengarini <seldon@eskimo.com>
 ;; Maintainer: Martin Yrjölä <martin.yrjola@gmail.com>
 ;; URL: <https://github.com/myrjola/diminish.el>
-;; Package-Version: 20151215.915
+;; Package-Version: 20170419.1036
 ;; Created: Th 19 Feb 98
 ;; Version: 0.45
 ;; Keywords: extensions, diminish, minor, codeprose
@@ -179,7 +179,8 @@ to TO-WHAT if it's > 1 char long & doesn't already begin with a space."
   (let ((minor (assq mode minor-mode-alist)))
     (when minor
         (progn (callf or to-what "")
-               (when (> (length to-what) 1)
+               (when (and (stringp to-what)
+                          (> (length to-what) 1))
                  (or (= (string-to-char to-what) ?\ )
                      (callf2 concat " " to-what)))
                (or (assq mode diminished-mode-alist)

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" (22753 9102 854334 279000))
+;;;### (autoloads nil "dired+" "dired+.el" (22792 62874 423275 932000))
 ;;; Generated autoloads from dired+.el
 
 (defvar diff-switches "-c" "\
@@ -1545,7 +1545,7 @@ non-empty directories is allowed.
 \(fn &optional ARG)" t nil)
 
 (autoload 'dired-mark-files-regexp "dired+" "\
-Mark all files matching REGEXP for use in later commands.
+Mark all file names matching REGEXP for use in later commands.
 `.' and `..' are never marked or unmarked by this command.
 
 Whether to mark or unmark, and what form of file name to match, are

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

@@ -6,12 +6,12 @@
 ;; Maintainer: Drew Adams (concat "drew.adams" "@" "oracle" ".com")
 ;; Copyright (C) 1999-2017, Drew Adams, all rights reserved.
 ;; Created: Fri Mar 19 15:58:58 1999
-;; Version: 2013.07.23
-;; Package-Version: 20170330.1047
+;; Version: 2017.04.09
+;; Package-Version: 20170409.1822
 ;; Package-Requires: ()
-;; Last-Updated: Thu Mar 30 10:47:25 2017 (-0700)
+;; Last-Updated: Sun Apr  9 18:23:14 2017 (-0700)
 ;;           By: dradams
-;;     Update #: 9907
+;;     Update #: 10133
 ;; URL: https://www.emacswiki.org/emacs/download/dired%2b.el
 ;; Doc URL: http://www.emacswiki.org/DiredPlus
 ;; Keywords: unix, mouse, directories, diredp, dired
@@ -540,19 +540,22 @@
 ;;    `diredp-files-within-dirs-done', `diredp-font-lock-keywords-1',
 ;;    `diredp-hide-details-last-state' (Emacs 24.4+),
 ;;    `diredp-hide-details-toggled' (Emacs 24.4+),
-;;    `diredp-hide/show-menu', `diredp-list-files-map',
-;;    `diredp-loaded-p', `diredp-menu-bar-encryption-menu',
-;;    `diredp-menu-bar-images-menu.',
-;;    `diredp-menu-bar-immediate-menu',
-;;    `diredp-menu-bar-immediate-bookmarks-menu',
-;;    `diredp-menu-bar-immediate-encryption-menu',
-;;    `diredp-menu-bar-mark-menu', `diredp-menu-bar-operate-menu',
-;;    `diredp-menu-bar-operate-bookmarks-menu',
-;;    `diredp-menu-bar-operate-recursive-menu',
-;;    `diredp-menu-bar-regexp-menu',
-;;    `diredp-menu-bar-regexp-recursive-menu',
-;;    `diredp-menu-bar-subdir-menu', `diredp-navigate-menu',
-;;    `diredp-re-no-dot', `diredp-w32-drives-mode-map'.
+;;    `diredp-hide/show-menu', `diredp-images-recursive-menu',
+;;    `diredp-list-files-map', `diredp-loaded-p',
+;;    `diredp-menu-bar-dir-menu', `diredp-menu-bar-marks-menu',
+;;    `diredp-menu-bar-multiple-menu', `diredp-menu-bar-regexp-menu',
+;;    `diredp-menu-bar-single-menu', `diredp-multiple-bookmarks-menu',
+;;    `diredp-multiple-delete-menu', `diredp-multiple-dired-menu',
+;;    `diredp-multiple-images-menu',
+;;    `diredp-multiple-encryption-menu',
+;;    `diredp-multiple-move-copy-link-menu',
+;;    `diredp-multiple-omit-menu', `diredp-multiple-recursive-menu',
+;;    `diredp-multiple-rename-menu', `diredp-multiple-search-menu',
+;;    `diredp-navigate-menu', `diredp-regexp-recursive-menu',
+;;    `diredp-re-no-dot', `diredp-single-bookmarks-menu',
+;;    `diredp-single-encryption-menu', `diredp-single-image-menu',
+;;    `diredp-single-move-copy-link-menu', `diredp-single-open-menu',
+;;    `diredp-single-rename-menu', `diredp-w32-drives-mode-map'.
 ;;
 ;;  Macros defined here:
 ;;
@@ -656,6 +659,26 @@
 ;;
 ;;; Change Log:
 ;;
+;; 2017/04/09 dadams
+;;     Version 2017.04.09.
+;;     Added: diredp-multiple-move-copy-link-menu, diredp-multiple-rename-menu, diredp-multiple-dired-menu,
+;;            diredp-multiple-omit-menu, diredp-multiple-delete-menu, diredp-single-bookmarks-menu,
+;;            diredp-single-encryption-menu, diredp-single-image-menu, diredp-single-open-menu,
+;;            diredp-single-move-copy-link-menu, diredp-single-rename-menu.
+;;            Moved single menu items there.
+;;     Renamed: diredp-menu-bar-encryption-menu        to diredp-multiple-encryption-menu,
+;;              diredp-menu-bar-mark-menu              to diredp-menu-bar-marks-menu,
+;;              diredp-menu-bar-operate-menu           to diredp-menu-bar-multiple-menu,
+;;              diredp-menu-bar-operate-bookmarks-menu to diredp-multiple-bookmarks-menu,
+;;              diredp-menu-bar-operate-recursive-menu to diredp-multiple-recursive-menu,
+;;              diredp-menu-bar-operate-search-menu    to diredp-multiple-search-menu,
+;;              diredp-menu-bar-images-menu            to diredp-multiple-images-menu,
+;;              diredp-menu-bar-images-recursive-menu  to diredp-images-recursive-menu,
+;;              diredp-menu-bar-immediate-menu         to diredp-menu-bar-single-menu,
+;;              diredp-menu-bar-regexp-recursive-menu  to diredp-regexp-recursive-menu,
+;;              diredp-menu-bar-subdir-menu            to diredp-menu-bar-dir-menu.
+;;     Added dired-do-rename to diredp-multiple-rename-menu.
+;;     diredp-nonempty-region-p: Ensure (mark) also.
 ;; 2017/03/30 dadams
 ;;     Moved key bindings to end of file.  Moved defgroup before defcustoms.
 ;;     Bind dired-multiple-w32-browser to C-M-RET, diredp-multiple-w32-browser-recursive to M-+ C-M-RET.
@@ -1633,7 +1656,11 @@ rather than FUN itself, to `minibuffer-setup-hook'."
 (defvar diredp-hide-details-propagate-flag)       ; Here, Emacs 24.4+
 (defvar diredp-hide-details-toggled)              ; Here, Emacs 24.4+
 (defvar diredp-highlight-autofiles-mode)          ; Here, Emacs 22+
-(defvar diredp-menu-bar-immediate-bookmarks-menu) ; Here, if Bookmark+ is available
+(defvar diredp-menu-bar-encryption-menu)          ; Here, Emacs 23+
+(defvar diredp-menu-bar-images-recursive-menu)    ; Here (old name)
+(defvar diredp-menu-bar-regexp-recursive-menu)    ; Here (old name)
+(defvar diredp-menu-bar-subdir-menu)              ; Here (old name)
+(defvar diredp-single-bookmarks-menu)             ; Here, if Bookmark+ is available
 (defvar filesets-data)                            ; In `filesets.el'
 (defvar grep-use-null-device)                     ; In `grep.el'
 (defvar header-line-format)                       ; Emacs 22+
@@ -2037,7 +2064,7 @@ one is kept."
 
 (defun diredp-nonempty-region-p ()
   "Return non-nil if region is active and non-empty."
-  (and transient-mark-mode  mark-active  (> (region-end) (region-beginning))))
+  (and transient-mark-mode  mark-active  (mark)  (> (region-end) (region-beginning))))
 
 (defun diredp-get-image-filename (&optional localp no-error-if-not-filep)
   "Return the image-file name on this line, or nil if no image file.
@@ -7935,7 +7962,7 @@ FUNCTION should not manipulate the files.  It should just read input
 ;;
 ;;;###autoload
 (defun dired-mark-files-regexp (regexp &optional marker-char localp)
-  "Mark all files matching REGEXP for use in later commands.
+  "Mark all file names matching REGEXP for use in later commands.
 `.' and `..' are never marked or unmarked by this command.
 
 Whether to mark or unmark, and what form of file name to match, are
@@ -9751,210 +9778,237 @@ File `dired+.el' has a header `Update #' that you can use to identify it.\
 ;;
 ;; REPLACE ORIGINAL `Immediate' menu in `dired.el'.
 ;;
-(defvar diredp-menu-bar-immediate-menu (make-sparse-keymap "Single"))
-(define-key dired-mode-map [menu-bar immediate] (cons "Single" diredp-menu-bar-immediate-menu))
+(defvar diredp-menu-bar-single-menu (make-sparse-keymap "Single"))
+(define-key dired-mode-map [menu-bar immediate] (cons "Single" diredp-menu-bar-single-menu))
+
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-immediate-menu 'diredp-menu-bar-single-menu))
+(make-obsolete-variable 'diredp-menu-bar-immediate-menu 'diredp-menu-bar-single-menu) ; 2017-04-09
 
 (if (fboundp 'diredp-describe-file)
-    (define-key diredp-menu-bar-immediate-menu [diredp-describe-file]
+    (define-key diredp-menu-bar-single-menu [diredp-describe-file]
       '(menu-item "Describe" diredp-describe-file
         :help "Describe the file or directory at cursor"))
-  (define-key diredp-menu-bar-immediate-menu [diredp-describe-autofile]
+  (define-key diredp-menu-bar-single-menu [diredp-describe-autofile]
     '(menu-item "Describe" diredp-describe-autofile
       :help "Describe the autofile at cursor"
       :enable (featurep 'bookmark+))))
-(define-key diredp-menu-bar-immediate-menu [separator-describe] '("--")) ; ---------------------
+(define-key diredp-menu-bar-single-menu [separator-describe] '("--")) ; ---------------------
 
 (when (fboundp 'diredp-chown-this-file)
-  (define-key diredp-menu-bar-immediate-menu [chown]
+  (define-key diredp-menu-bar-single-menu [chown]
     '(menu-item "Change Owner..." diredp-chown-this-file
       :help "Change the owner of file at cursor")))
 (when (fboundp 'diredp-chgrp-this-file)
-  (define-key diredp-menu-bar-immediate-menu [chgrp]
+  (define-key diredp-menu-bar-single-menu [chgrp]
     '(menu-item "Change Group..." diredp-chgrp-this-file
       :help "Change the group of file at cursor")))
-(define-key diredp-menu-bar-immediate-menu [chmod]
+(define-key diredp-menu-bar-single-menu [chmod]
   '(menu-item "Change Mode..." diredp-chmod-this-file
     :help "Change mode (attributes) of file at cursor"))
 (when (fboundp 'dired-do-touch)         ; Emacs 22+
-  (define-key diredp-menu-bar-immediate-menu [touch]
+  (define-key diredp-menu-bar-single-menu [touch]
     '(menu-item "Change Timestamp (`touch')..." diredp-touch-this-file
       :help "Change the timestamp of file at cursor, using `touch'")))
-(define-key diredp-menu-bar-immediate-menu [separator-change] '("--")) ; -----------------------
+(define-key diredp-menu-bar-single-menu [separator-change] '("--")) ; -----------------------
 
-(define-key diredp-menu-bar-immediate-menu [load]
+(define-key diredp-menu-bar-single-menu [load]
   '(menu-item "Load" diredp-load-this-file
     :help "Load this Emacs Lisp file"))
-(define-key diredp-menu-bar-immediate-menu [compile]
+(define-key diredp-menu-bar-single-menu [compile]
   '(menu-item "Byte Compile" diredp-byte-compile-this-file
     :help "Byte-compile this Emacs Lisp file"))
-(define-key diredp-menu-bar-immediate-menu [diredp-async-shell-command-this-file]
+(define-key diredp-menu-bar-single-menu [diredp-async-shell-command-this-file]
   '(menu-item "Asynchronous Shell Command..." diredp-async-shell-command-this-file
     :help "Run a shell command asynchronously on file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [command]
+(define-key diredp-menu-bar-single-menu [command]
   '(menu-item "Shell Command..." diredp-shell-command-this-file
     :help "Run a shell command on file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [compress]
+(define-key diredp-menu-bar-single-menu [compress]
   '(menu-item "Compress/Uncompress" diredp-compress-this-file
     :help "Compress/uncompress file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [grep]
+(define-key diredp-menu-bar-single-menu [grep]
   '(menu-item "Grep..." diredp-grep-this-file :help "Grep file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [print]
+(define-key diredp-menu-bar-single-menu [print]
   '(menu-item "Print..." diredp-print-this-file
     :help "Print file at cursor, supplying print command"))
 
 (when (fboundp 'mkhtml-dired-files)     ; In `mkhtml.el'.
-  (define-key diredp-menu-bar-immediate-menu [mkhtml-dired-files]
+  (define-key diredp-menu-bar-single-menu [mkhtml-dired-files]
     '(menu-item "Create HTML" mkhtml-dired-files
       :help "Create an HTML file corresponding to file at cursor")))
-(define-key diredp-menu-bar-immediate-menu [separator-misc] '("--")) ; -------------------------
+(define-key diredp-menu-bar-single-menu [separator-misc] '("--")) ; -------------------------
 
-(define-key diredp-menu-bar-immediate-menu [delete]
+(define-key diredp-menu-bar-single-menu [delete]
   '(menu-item "Delete" diredp-delete-this-file :help "Delete file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [separator-delete] '("--")) ; -----------------------
+(define-key diredp-menu-bar-single-menu [separator-delete] '("--")) ; -----------------------
 
-(define-key diredp-menu-bar-immediate-menu [hardlink]
-  '(menu-item "Hardlink to..." diredp-hardlink-this-file
-    :help "Make hard links for current or marked files"))
-(if (not (fboundp 'dired-do-relsymlink))
-    (define-key diredp-menu-bar-immediate-menu [symlink]
-      '(menu-item "Symlink to..." diredp-symlink-this-file
-        :visible (fboundp 'make-symbolic-link) :help "Make symbolic link for file at cursor"))
-  (define-key diredp-menu-bar-immediate-menu [symlink]
-    '(menu-item "Symlink to (Absolute)..." diredp-symlink-this-file
-      :help "Make absolute symbolic link for file at cursor"))
-  (define-key diredp-menu-bar-immediate-menu [relsymlink]
-    '(menu-item "Symlink to (Relative)..." diredp-relsymlink-this-file ; In `dired-x.el'.
-      :help "Make relative symbolic link for file at cursor")))
-(define-key diredp-menu-bar-immediate-menu [copy]
-  '(menu-item "Copy to..." diredp-copy-this-file :help "Copy file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [rename]
-  '(menu-item "Move to..." diredp-rename-this-file
-    :help "Rename file at cursor, or move it to a different directory"))
-(define-key diredp-menu-bar-immediate-menu [separator-link] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-immediate-menu [downcase]
-  '(menu-item "Downcase" diredp-downcase-this-file
-    ;; When running on plain MS-DOS, there is only one letter-case for file names.
-    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
-    :help "Rename file at cursor to a lower-case name"))
-(define-key diredp-menu-bar-immediate-menu [upcase]
-  '(menu-item "Upcase" diredp-upcase-this-file
-    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
-    :help "Rename file at cursor to an upper-case name"))
-(define-key diredp-menu-bar-immediate-menu [capitalize]
-  '(menu-item "Capitalize" diredp-capitalize-this-file
-    :help "Capitalize (initial caps) name of file at cursor"))
-(define-key diredp-menu-bar-immediate-menu [separator-rename] '("--")) ; -----------------------
-
-(define-key diredp-menu-bar-immediate-menu [backup-diff]
+(define-key diredp-menu-bar-single-menu [backup-diff]
   '(menu-item "Diff with Backup" dired-backup-diff
     :help "Diff file at cursor with its latest backup"))
-(define-key diredp-menu-bar-immediate-menu [diff]
+(define-key diredp-menu-bar-single-menu [diff]
   '(menu-item "Diff..." dired-diff
     :help "Compare file at cursor with another file using `diff'"))
-(define-key diredp-menu-bar-immediate-menu [ediff]
+(define-key diredp-menu-bar-single-menu [ediff]
   '(menu-item "Compare..." diredp-ediff :help "Compare file at cursor with another file"))
-(define-key diredp-menu-bar-immediate-menu [separator-diff] '("--")) ; -------------------------
+(define-key diredp-menu-bar-single-menu [separator-diff] '("--")) ; -------------------------
 
-(define-key diredp-menu-bar-immediate-menu [diredp-kill-this-tree]
+(define-key diredp-menu-bar-single-menu [diredp-kill-this-tree]
   '(menu-item "Remove This Inserted Subdir and Lower" diredp-kill-this-tree
     :visible (and (fboundp 'diredp-kill-this-tree)
               (not (equal
                     (expand-file-name (dired-current-directory))
                     (expand-file-name default-directory)))))) ; In subdir, not top.
-(define-key diredp-menu-bar-immediate-menu [dired-kill-subdir]
+(define-key diredp-menu-bar-single-menu [dired-kill-subdir]
   '(menu-item "Remove This Inserted Subdir" dired-kill-subdir
     :visible (not (equal (expand-file-name (dired-current-directory))
                          (expand-file-name default-directory))))) ; In subdir, not top.
-(define-key diredp-menu-bar-immediate-menu [diredp-dired-this-subdir]
+(define-key diredp-menu-bar-single-menu [diredp-dired-this-subdir]
   '(menu-item "Dired This Inserted Subdir (Tear Off)"
     (lambda () (interactive) (diredp-dired-this-subdir t))
     :visible (and (cdr dired-subdir-alist) ; First is current dir.  Must have at least one more.
               (not (equal (expand-file-name (dired-current-directory))
                           (expand-file-name default-directory)))) ; Must be sub, not top.
     :help "Open Dired for subdir at or above point, tearing it off if inserted"))
-(define-key diredp-menu-bar-immediate-menu [insert-subdir]
+(define-key diredp-menu-bar-single-menu [insert-subdir]
   '(menu-item "Insert This Subdir" dired-maybe-insert-subdir
     :visible (and (atom (diredp-this-subdir))
               (not (assoc (file-name-as-directory (diredp-this-subdir)) dired-subdir-alist)))
     :enable (atom (diredp-this-subdir))
     :help "Insert a listing of this subdirectory"))
-(define-key diredp-menu-bar-immediate-menu [goto-subdir]
+(define-key diredp-menu-bar-single-menu [goto-subdir]
   '(menu-item "Go To Inserted Subdir" dired-maybe-insert-subdir
     :visible (and (atom (diredp-this-subdir))
               (assoc (file-name-as-directory (diredp-this-subdir)) dired-subdir-alist))
     :enable (atom (diredp-this-subdir))
     :help "Go to the inserted listing of this subdirectory"))
-(define-key diredp-menu-bar-immediate-menu [separator-subdir] '("--" ; ------------------------
+(define-key diredp-menu-bar-single-menu [separator-subdir] '("--" ; ------------------------
             :visible (or (atom (diredp-this-subdir)) ; Subdir line.
                          (not (equal (expand-file-name (dired-current-directory))
                                      (expand-file-name default-directory)))))) ; Not top.
 
-(define-key diredp-menu-bar-immediate-menu [view]
+(define-key diredp-menu-bar-single-menu [view]
   '(menu-item "View (Read Only)" dired-view-file
     :help "Examine file at cursor in read-only mode"))
-(define-key diredp-menu-bar-immediate-menu [display]
+(define-key diredp-menu-bar-single-menu [display]
   '(menu-item "Display in Other Window" dired-display-file
     :help "Display file at cursor in a different window"))
+
+
+;; `Single' > `Open' menu.
+;;
+(defvar diredp-single-open-menu (make-sparse-keymap "Rename")
+  "`Open' submenu for Dired menu-bar `Single' menu.")
+(define-key diredp-menu-bar-single-menu [multiple-open] (cons "Open" diredp-single-open-menu))
+
 ;; On Windows, bind more.
 (eval-after-load "w32-browser"
   '(progn
-    (define-key diredp-menu-bar-immediate-menu [dired-w32-browser]
+    (define-key diredp-single-open-menu [dired-w32-browser]
       '(menu-item "Open Associated Windows App" dired-w32-browser
         :help "Open file using the Windows app associated with its file type"))
-    (define-key diredp-menu-bar-immediate-menu [dired-w32explore]
+    (define-key diredp-single-open-menu [dired-w32explore]
       '(menu-item "Open in Windows Explorer" dired-w32explore
         :help "Open file in Windows Explorer"))))
-(define-key diredp-menu-bar-immediate-menu [find-file-other-frame]
+(define-key diredp-single-open-menu [find-file-other-frame]
   '(menu-item "Open in Other Frame" diredp-find-file-other-frame
     :help "Edit file at cursor in a different frame"))
-(define-key diredp-menu-bar-immediate-menu [find-file-other-window]
+(define-key diredp-single-open-menu [find-file-other-window]
   '(menu-item "Open in Other Window" dired-find-file-other-window
     :help "Edit file at cursor in a different window"))
-(define-key diredp-menu-bar-immediate-menu [find-file]
+(define-key diredp-single-open-menu [find-file]
   '(menu-item "Open" dired-find-file :help "Edit file at cursor"))
 
 
+;; `Single' > `Rename' menu.
+;;
+(defvar diredp-single-rename-menu (make-sparse-keymap "Rename")
+  "`Rename' submenu for Dired menu-bar `Single' menu.")
+(define-key diredp-menu-bar-single-menu [multiple-case] (cons "Rename" diredp-single-rename-menu))
+
+(define-key diredp-single-rename-menu [single-rename-capitalize]
+  '(menu-item "Capitalize" diredp-capitalize-this-file
+    :help "Capitalize (initial caps) name of file at cursor"))
+(define-key diredp-single-rename-menu [single-rename-downcase]
+  '(menu-item "Downcase" diredp-downcase-this-file
+    ;; When running on plain MS-DOS, there is only one letter-case for file names.
+    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
+    :help "Rename file at cursor to a lower-case name"))
+(define-key diredp-single-rename-menu [single-rename-upcase]
+  '(menu-item "Upcase" diredp-upcase-this-file
+    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
+    :help "Rename file at cursor to an upper-case name"))
+
+
+;; `Single' > `Move / Copy / Link' menu.
+;;
+(defvar diredp-single-move-copy-link-menu (make-sparse-keymap "Move / Copy / Link")
+  "`Move / Copy / Link' submenu for Dired menu-bar `Single' menu.")
+(define-key diredp-menu-bar-single-menu [multiple-move-copy-link]
+  (cons "Move / Copy / Link" diredp-single-move-copy-link-menu))
+
+(define-key diredp-single-move-copy-link-menu [single-hardlink]
+  '(menu-item "Hardlink to..." diredp-hardlink-this-file
+    :help "Make hard links for current or marked files"))
+(if (not (fboundp 'dired-do-relsymlink))
+    (define-key diredp-single-move-copy-link-menu [single-symlink]
+      '(menu-item "Symlink to..." diredp-symlink-this-file
+        :visible (fboundp 'make-symbolic-link) :help "Make symbolic link for file at cursor"))
+  (define-key diredp-single-move-copy-link-menu [single-symlink]
+    '(menu-item "Symlink to (Absolute)..." diredp-symlink-this-file
+      :help "Make absolute symbolic link for file at cursor"))
+  (define-key diredp-single-move-copy-link-menu [single-relsymlink]
+    '(menu-item "Symlink to (Relative)..." diredp-relsymlink-this-file ; In `dired-x.el'.
+      :help "Make relative symbolic link for file at cursor")))
+(define-key diredp-single-move-copy-link-menu [single-copy]
+  '(menu-item "Copy to..." diredp-copy-this-file :help "Copy file at cursor"))
+(define-key diredp-single-move-copy-link-menu [single-rename]
+  '(menu-item "Move to..." diredp-rename-this-file
+    :help "Rename file at cursor, or move it to a different directory"))
+
+
 ;; `Single' > `Image' menu.
 ;;
-(defvar diredp-menu-bar-immediate-image-menu (make-sparse-keymap "Image"))
-(defalias 'diredp-menu-bar-immediate-image-menu diredp-menu-bar-immediate-image-menu)
-(define-key diredp-menu-bar-immediate-menu [image]
-  '(menu-item "Image" diredp-menu-bar-immediate-image-menu
+(defvar diredp-single-image-menu (make-sparse-keymap "Image"))
+(defalias 'diredp-single-image-menu diredp-single-image-menu)
+(define-key diredp-menu-bar-single-menu [image]
+  '(menu-item "Image" diredp-single-image-menu
     :enable (let ((img-file  (diredp-get-image-filename 'LOCALP 'NO-ERROR)))
               (and (fboundp 'image-dired-dired-display-image)  img-file))))
 
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-display-thumb]
+(define-key diredp-single-image-menu [diredp-image-dired-display-thumb]
   '(menu-item "Go To Thumbnail" diredp-image-dired-display-thumb
     :help "Pop to buffer showing the thumbnail of this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-create-thumb]
+(define-key diredp-single-image-menu [diredp-image-dired-create-thumb]
   '(menu-item "Create Thumbnail" diredp-image-dired-create-thumb
     :help "Create a thumbnail image for this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-edit-comment-and-tags]
+(define-key diredp-single-image-menu [diredp-image-dired-edit-comment-and-tags]
   '(menu-item "Edit Comment and Tags..." diredp-image-dired-edit-comment-and-tags
     :help "Edit comment and tags for this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-delete-tag]
+(define-key diredp-single-image-menu [diredp-image-dired-delete-tag]
   '(menu-item "Delete Image Tag..." diredp-image-dired-delete-tag
     :help "Remove an `image-dired' tag from this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-tag-file]
+(define-key diredp-single-image-menu [diredp-image-dired-tag-file]
   '(menu-item "Add Tags..." diredp-image-dired-tag-file
     :help "Add tags to this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-comment-file]
+(define-key diredp-single-image-menu [diredp-image-dired-comment-file]
   '(menu-item "Add Comment..." diredp-image-dired-comment-file
     :help "Add a comment to this image file"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-dired-copy-with-exif-name]
+(define-key diredp-single-image-menu [diredp-image-dired-copy-with-exif-name]
   '(menu-item "Copy with EXIF Name" diredp-image-dired-copy-with-exif-name
     :help "Copy this image file to main image dir using EXIF name"))
-(define-key diredp-menu-bar-immediate-image-menu [image-dired-dired-display-external]
+(define-key diredp-single-image-menu [image-dired-dired-display-external]
   '(menu-item "Display Externally" image-dired-dired-display-external
     :help "Display image using external viewer"))
-(define-key diredp-menu-bar-immediate-image-menu [image-dired-dired-display-image]
+(define-key diredp-single-image-menu [image-dired-dired-display-image]
   '(menu-item "Display to Fit Other Window" image-dired-dired-display-image
     :help "Display scaled image to fit a separate window"))
-(define-key diredp-menu-bar-immediate-image-menu [diredp-image-show-this-file]
+(define-key diredp-single-image-menu [diredp-image-show-this-file]
   '(menu-item "Display Full Size Or Smaller" diredp-image-show-this-file
     :help "Display image full size or at least prefix-arg lines high"))
-(define-key diredp-menu-bar-immediate-image-menu [dired-find-file]
+(define-key diredp-single-image-menu [dired-find-file]
   '(menu-item "Display Full Size" dired-find-file
     :help "Display image full size"))
 
@@ -9962,23 +10016,23 @@ File `dired+.el' has a header `Update #' that you can use to identify it.\
 ;; `Single' > `Encryption' menu.
 ;;
 (when (fboundp 'epa-dired-do-encrypt)   ; Emacs 23+
-  (defvar diredp-menu-bar-immediate-encryption-menu (make-sparse-keymap "Encryption"))
-  (define-key diredp-menu-bar-immediate-menu [encryption]
-    (cons "Encryption" diredp-menu-bar-immediate-encryption-menu))
+  (defvar diredp-single-encryption-menu (make-sparse-keymap "Encryption"))
+  (define-key diredp-menu-bar-single-menu [encryption]
+    (cons "Encryption" diredp-single-encryption-menu))
 
-  (define-key diredp-menu-bar-immediate-encryption-menu [diredp-decrypt-this-file]
+  (define-key diredp-single-encryption-menu [diredp-decrypt-this-file]
     '(menu-item "Decrypt..." (lambda ()
                                (interactive)
                                (epa-decrypt-file (expand-file-name (dired-get-filename
                                                                     nil 'NO-ERROR-P))))
       :help "Decrypt this file"))
-  (define-key diredp-menu-bar-immediate-encryption-menu [diredp-verify-this-file]
+  (define-key diredp-single-encryption-menu [diredp-verify-this-file]
     '(menu-item "Verify..." (lambda ()
                               (interactive)
                               (epa-verify-file (expand-file-name (dired-get-filename
                                                                   nil 'NO-ERROR-P))))
       :help "Verify this file"))
-  (define-key diredp-menu-bar-immediate-encryption-menu [diredp-sign-this-file]
+  (define-key diredp-single-encryption-menu [diredp-sign-this-file]
     '(menu-item "Sign..." (lambda ()
                             (interactive)
                             (epa-sign-file (expand-file-name (dired-get-filename
@@ -9988,7 +10042,7 @@ File `dired+.el' has a header `Update #' that you can use to identify it.\
 If no one is selected, default secret key is used.  "
                                                             nil t)))
       :help "Encrypt this file"))
-  (define-key diredp-menu-bar-immediate-encryption-menu [diredp-encrypt-this-file]
+  (define-key diredp-single-encryption-menu [diredp-encrypt-this-file]
     '(menu-item "Encrypt..." (lambda ()
                                (interactive)
                                (epa-encrypt-file (expand-file-name (dired-get-filename
@@ -10004,31 +10058,31 @@ If no one is selected, symmetric encryption will be performed.  "
 ;; `Single' > `Bookmark' menu.
 ;;
 (when (require 'bookmark+ nil t)
-  (defvar diredp-menu-bar-immediate-bookmarks-menu (make-sparse-keymap "Bookmark"))
-  (define-key diredp-menu-bar-immediate-menu [bookmark]
-    (cons "Bookmark" diredp-menu-bar-immediate-bookmarks-menu))
+  (defvar diredp-single-bookmarks-menu (make-sparse-keymap "Bookmark"))
+  (define-key diredp-menu-bar-single-menu [bookmark]
+    (cons "Bookmark" diredp-single-bookmarks-menu))
 
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-set-tag-value-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-set-tag-value-this-file]
     '(menu-item "Set Tag Value..." diredp-set-tag-value-this-file
       :help "Set the value (not the name) of a given tag for this file"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-paste-replace-tags-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-paste-replace-tags-this-file]
     '(menu-item "Paste Tags (Replace)" diredp-paste-replace-tags-this-file
       :help "Replace tags for this file with previously copied tags"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-paste-add-tags-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-paste-add-tags-this-file]
     '(menu-item "Paste Tags (Add)" diredp-paste-add-tags-this-file
       :help "Add previously copied tags to this file"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-copy-tags-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-copy-tags-this-file]
     '(menu-item "Copy Tags" diredp-copy-tags-this-file
       :help "Copy the tags from this file, so you can paste them to another"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-remove-all-tags-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-remove-all-tags-this-file]
     '(menu-item "Remove All Tags" diredp-remove-all-tags-this-file
       :help "Remove all tags from the file at cursor"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-untag-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-untag-this-file]
     '(menu-item "Remove Tags..." diredp-untag-this-file
       :help "Remove some tags from the file at cursor (`C-u': remove all tags)"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-tag-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-tag-this-file]
     '(menu-item "Add Tags..." diredp-tag-this-file :help "Add some tags to the file at cursor"))
-  (define-key diredp-menu-bar-immediate-bookmarks-menu [diredp-bookmark-this-file]
+  (define-key diredp-single-bookmarks-menu [diredp-bookmark-this-file]
     '(menu-item "Bookmark..." diredp-bookmark-this-file
       :help "Bookmark the file at cursor (create/set autofile)")))
 
@@ -10037,166 +10091,226 @@ If no one is selected, symmetric encryption will be performed.  "
 ;;
 ;; REPLACE ORIGINAL "Operate" menu in `dired.el'.
 ;;
-(defvar diredp-menu-bar-operate-menu (make-sparse-keymap "Multiple"))
-(define-key dired-mode-map [menu-bar operate] (cons "Multiple" diredp-menu-bar-operate-menu))
+(defvar diredp-menu-bar-multiple-menu (make-sparse-keymap "Multiple"))
+(define-key dired-mode-map [menu-bar operate] (cons "Multiple" diredp-menu-bar-multiple-menu))
 
-(define-key diredp-menu-bar-operate-menu [diredp-describe-marked-autofiles]
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-operate-menu 'diredp-menu-bar-multiple-menu))
+(make-obsolete-variable 'diredp-menu-bar-operate-menu 'diredp-menu-bar-multiple-menu) ; 2017-04-09
+
+(define-key diredp-menu-bar-multiple-menu [diredp-describe-marked-autofiles]
   '(menu-item "Describe Marked Autofiles" diredp-describe-marked-autofiles
     :help "Show the metadata for the marked files that are autofiles"
     :enable (featurep 'bookmark+)))
-(define-key diredp-menu-bar-operate-menu [separator-describe] '("--")) ; -----------------------
+(define-key diredp-menu-bar-multiple-menu [separator-describe] '("--")) ; -----------------------
 
 (unless (memq system-type '(windows-nt ms-dos))
-  (define-key diredp-menu-bar-operate-menu [chown]
+  (define-key diredp-menu-bar-multiple-menu [chown]
     '(menu-item "Change Owner..." dired-do-chown
       :help "Change the owner of marked files")))
 (unless (memq system-type '(windows-nt ms-dos))
-  (define-key diredp-menu-bar-operate-menu [chgrp]
+  (define-key diredp-menu-bar-multiple-menu [chgrp]
     '(menu-item "Change Group..." dired-do-chgrp
       :help "Change the owner of marked files")))
-(define-key diredp-menu-bar-operate-menu [chmod]
+(define-key diredp-menu-bar-multiple-menu [chmod]
   '(menu-item "Change Mode..." dired-do-chmod
     :help "Change mode (attributes) of marked files"))
 (when (fboundp 'dired-do-touch)         ; Emacs 22+
-  (define-key diredp-menu-bar-operate-menu [touch]
+  (define-key diredp-menu-bar-multiple-menu [touch]
     '(menu-item "Change Timestamp (`touch')..." dired-do-touch
       :help "Change the timestamp of the marked files, using `touch'")))
-(define-key diredp-menu-bar-operate-menu [separator-change] '("--")) ; -------------------------
+(define-key diredp-menu-bar-multiple-menu [separator-change] '("--")) ; -------------------------
 
-(define-key diredp-menu-bar-operate-menu [load]
+(define-key diredp-menu-bar-multiple-menu [load]
   '(menu-item "Load" dired-do-load :help "Load marked Emacs Lisp files"))
-(define-key diredp-menu-bar-operate-menu [compile]
+(define-key diredp-menu-bar-multiple-menu [compile]
   '(menu-item "Byte Compile" dired-do-byte-compile :help "Byte-compile marked Emacs Lisp files"))
 (when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
-  (define-key diredp-menu-bar-operate-menu [async-command]
+  (define-key diredp-menu-bar-multiple-menu [async-command]
     '(menu-item "Asynchronous Shell Command..." dired-do-async-shell-command
       :help "Run a shell command asynchronously on each marked file")))
-(define-key diredp-menu-bar-operate-menu [command]
+(define-key diredp-menu-bar-multiple-menu [command]
   '(menu-item "Shell Command..." dired-do-shell-command
     :help "Run a shell command on each marked file"))
 (when (fboundp 'dired-do-compress-to)
-  (define-key diredp-menu-bar-operate-menu [compress-to]
+  (define-key diredp-menu-bar-multiple-menu [compress-to]
     '(menu-item "Compress to..." dired-do-compress-to
       :help "Compress marked files and dirs together, in the same archive")))
-(define-key diredp-menu-bar-operate-menu [compress]
+(define-key diredp-menu-bar-multiple-menu [compress]
   '(menu-item "Compress/Uncompress" dired-do-compress :help "Compress/uncompress marked files"))
-(define-key diredp-menu-bar-operate-menu [diredp-do-apply-function]
+(define-key diredp-menu-bar-multiple-menu [diredp-do-apply-function]
     '(menu-item "Apply Lisp Function..." diredp-do-apply-function
       :help "Apply a Lisp function to each marked file name (`C-u': file contents, not name)"))
-(define-key diredp-menu-bar-operate-menu [print]
+(define-key diredp-menu-bar-multiple-menu [print]
   '(menu-item "Print..." dired-do-print :help "Print marked files, supplying print command"))
 
 (unless (require 'bookmark+ nil t)
-  (define-key diredp-menu-bar-immediate-menu [diredp-bookmark-this-file]
+  (define-key diredp-menu-bar-multiple-menu [diredp-bookmark-this-file]
     '(menu-item "Bookmark..." diredp-bookmark-this-file :help "Bookmark the file at cursor")))
 (when (fboundp 'mkhtml-dired-files)     ; In `mkhtml.el'.
-  (define-key diredp-menu-bar-operate-menu [mkhtml-dired-files]
+  (define-key diredp-menu-bar-multiple-menu [mkhtml-dired-files]
     '(menu-item "Create HTML" mkhtml-dired-files
       :help "Create HTML files corresponding to marked files")))
-(define-key diredp-menu-bar-operate-menu [separator-misc] '("--")) ; ---------------------------
-
-(define-key diredp-menu-bar-operate-menu [delete-flagged]
-  '(menu-item "Delete Flagged" dired-do-flagged-delete
-    :help "Delete all files flagged for deletion (D)"))
-(define-key diredp-menu-bar-operate-menu [delete]
-  '(menu-item "Delete Marked (not Flagged)" dired-do-delete
-    :help "Delete current file or all marked files (not flagged files)"))
-(define-key diredp-menu-bar-operate-menu [separator-delete] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-operate-menu [hardlink]
-  '(menu-item "Hardlink to..." dired-do-hardlink
-    :help "Make hard links for current or marked files"))
-(if (not (fboundp 'dired-do-relsymlink))
-    (define-key diredp-menu-bar-operate-menu [symlink]
-      '(menu-item "Symlink to..." dired-do-symlink
-        :visible (fboundp 'make-symbolic-link)
-        :help "Make symbolic links for current or marked files"))
-  (define-key diredp-menu-bar-operate-menu [symlink]
-    '(menu-item "Symlink to (Absolute)..." dired-do-symlink
-      :help "Make absolute symbolic links for current or marked files"))
-  (define-key diredp-menu-bar-operate-menu [relsymlink] ; In `dired-x.el'.
-    '(menu-item "Symlink to (Relative)..." dired-do-relsymlink
-      :help "Make relative symbolic links for current or marked files")))
-(define-key diredp-menu-bar-operate-menu [copy]
-  '(menu-item "Copy to..." dired-do-copy :help "Copy current file or all marked files"))
-(define-key diredp-menu-bar-operate-menu [rename]
-  '(menu-item "Move to..." dired-do-rename :help "Rename current file or move marked files"))
-(define-key diredp-menu-bar-operate-menu [separator-rename] '("--")) ; -------------------------
-
-(define-key diredp-menu-bar-operate-menu [capitalize]
-  '(menu-item "Capitalize" diredp-capitalize
-    :help "Capitalize (initial caps) the names of all marked files"))
-(define-key diredp-menu-bar-operate-menu [downcase]
-  '(menu-item "Downcase" dired-downcase
-    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
-    :help "Rename marked files to lowercase names"))
-(define-key diredp-menu-bar-operate-menu [upcase]
-  '(menu-item "Upcase" dired-upcase
-    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
-    :help "Rename marked files to uppercase names"))
-(define-key diredp-menu-bar-operate-menu [separator-lettercase] '("--")) ; ---------------------
+(define-key diredp-menu-bar-multiple-menu [separator-misc] '("--")) ; ---------------------------
 
 (when (fboundp 'dired-copy-filename-as-kill)
-  (define-key diredp-menu-bar-operate-menu [kill-ring]
+  (define-key diredp-menu-bar-multiple-menu [kill-ring]
     '(menu-item "Copy File Names (to Paste)" dired-copy-filename-as-kill
       :help "Copy names of marked files onto kill ring, for pasting")))
-(define-key diredp-menu-bar-operate-menu [diredp-list-marked]
+(define-key diredp-menu-bar-multiple-menu [diredp-list-marked]
     '(menu-item "List Marked Files" diredp-list-marked
       :help "List the files marked here (C-u C-u: all, C-u C-u C-u: all + dirs)"))
-(define-key diredp-menu-bar-operate-menu [diredp-insert-subdirs]
+(define-key diredp-menu-bar-multiple-menu [diredp-insert-subdirs]
   '(menu-item "Insert Subdirs" diredp-insert-subdirs
     :help "Insert the marked subdirectories - like using `i' at each marked dir"))
-(define-key diredp-menu-bar-operate-menu [diredp-marked-other-window]
-  '(menu-item "Dired (Marked) in Other Window" diredp-marked-other-window
-    :enable (save-excursion (goto-char (point-min))
-                            (and (re-search-forward (dired-marker-regexp) nil t)
-                                 (re-search-forward (dired-marker-regexp) nil t)))
-    :help "Open Dired on marked files only, in other window"))
-(define-key diredp-menu-bar-operate-menu [diredp-marked]
-  '(menu-item "Dired (Marked)" diredp-marked
-    :enable (save-excursion (goto-char (point-min))
-                            (and (re-search-forward (dired-marker-regexp) nil t)
-                                 (re-search-forward (dired-marker-regexp) nil t)))
-    :help "Open Dired on marked files only"))
 ;; On Windows, bind more.
 (eval-after-load "w32-browser"
-  '(define-key diredp-menu-bar-operate-menu [dired-multiple-w32-browser]
+  '(define-key diredp-menu-bar-multiple-menu [dired-multiple-w32-browser]
       '(menu-item "Open Associated Windows Apps" dired-multiple-w32-browser
         :help "Open files using the Windows apps associated with their file types")))
 (when (fboundp 'dired-do-find-marked-files)
-  (define-key diredp-menu-bar-operate-menu [find-files]
+  (define-key diredp-menu-bar-multiple-menu [find-files]
     '(menu-item "Open" dired-do-find-marked-files ; In `dired-x.el'.
       :help "Open each marked file for editing")))
 
 
+;; `Multiple' > `Dired' menu.
+;;
+(defvar diredp-multiple-dired-menu (make-sparse-keymap "Dired")
+  "`Dired' submenu for Dired menu-bar `Multiple' menu.")
+(define-key diredp-menu-bar-multiple-menu [multiple-dired]
+  `(menu-item "Dired" ,diredp-multiple-dired-menu
+    :enable (save-excursion (goto-char (point-min))
+                            (and (re-search-forward (dired-marker-regexp) nil t)
+                                 (re-search-forward (dired-marker-regexp) nil t)))
+    :help "Open Dired on marked files and dirs only"))
+
+(define-key diredp-multiple-dired-menu [diredp-marked-other-window]
+  '(menu-item "Dired Marked in Other Window" diredp-marked-other-window
+    :enable (save-excursion (goto-char (point-min))
+                            (and (re-search-forward (dired-marker-regexp) nil t)
+                                 (re-search-forward (dired-marker-regexp) nil t)))
+    :help "Open Dired on marked files and dirs only, in other window"))
+(define-key diredp-multiple-dired-menu [diredp-marked]
+  '(menu-item "Dired Marked" diredp-marked
+    :enable (save-excursion (goto-char (point-min))
+                            (and (re-search-forward (dired-marker-regexp) nil t)
+                                 (re-search-forward (dired-marker-regexp) nil t)))
+    :help "Open Dired on marked files and dirs only"))
+
+
+;; `Multiple' > `Omit' menu.
+;;
+(defvar diredp-multiple-omit-menu (make-sparse-keymap "Omit")
+  "`Omit' submenu for Dired menu-bar `Multiple' menu.")
+(define-key diredp-menu-bar-multiple-menu [multiple-omit] (cons "Omit" diredp-multiple-omit-menu))
+
+(define-key diredp-multiple-omit-menu [omit-unmarked]
+  '(menu-item "Omit Unmarked" diredp-omit-unmarked :help "Hide lines of unmarked files"))
+(define-key diredp-multiple-omit-menu [omit-marked]
+  '(menu-item "Omit Marked" diredp-omit-marked :help "Hide lines of marked files"))
+
+
+;; `Multiple' > `Delete' menu.
+;;
+(defvar diredp-multiple-delete-menu (make-sparse-keymap "Delete")
+  "`Delete' submenu for Dired menu-bar `Multiple' menu.")
+(define-key diredp-menu-bar-multiple-menu [multiple-delete] (cons "Delete" diredp-multiple-delete-menu))
+
+(define-key diredp-multiple-delete-menu [delete-flagged]
+  '(menu-item "Delete Flagged" dired-do-flagged-delete
+    :help "Delete all files flagged for deletion (D)"))
+(define-key diredp-multiple-delete-menu [delete]
+  '(menu-item "Delete Marked (not Flagged)" dired-do-delete
+    :help "Delete current file or all marked files (not flagged files)"))
+
+
+;; `Multiple' > `Rename' menu.
+;;
+(defvar diredp-multiple-rename-menu (make-sparse-keymap "Rename")
+  "`Rename' submenu for Dired menu-bar `Multiple' menu.")
+(define-key diredp-menu-bar-multiple-menu [multiple-case] (cons "Rename" diredp-multiple-rename-menu))
+
+(define-key diredp-multiple-rename-menu [multiple-rename-rename]
+  '(menu-item "Move to Dir... / Rename This..." dired-do-rename
+    :help "Move marked (or next N) files, or rename current file"))
+
+(define-key diredp-multiple-rename-menu [multiple-rename-capitalize]
+  '(menu-item "Capitalize" diredp-capitalize
+    :help "Capitalize (initial caps) the names of all marked files"))
+(define-key diredp-multiple-rename-menu [multiple-rename-downcase]
+  '(menu-item "Downcase" dired-downcase
+    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
+    :help "Rename marked files to lowercase names"))
+(define-key diredp-multiple-rename-menu [multiple-rename-upcase]
+  '(menu-item "Upcase" dired-upcase
+    :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
+    :help "Rename marked files to uppercase names"))
+
+
+;; `Multiple' > `Move / Copy / Link' menu.
+;;
+(defvar diredp-multiple-move-copy-link-menu (make-sparse-keymap "Move / Copy / Link")
+  "`Move / Copy / Link' submenu for Dired menu-bar `Multiple' menu.")
+(define-key diredp-menu-bar-multiple-menu [multiple-move-copy-link]
+  (cons "Move / Copy / Link" diredp-multiple-move-copy-link-menu))
+
+(define-key diredp-multiple-move-copy-link-menu [multiple-move-copy-link-hardlink]
+  '(menu-item "Hardlink to..." dired-do-hardlink
+    :help "Make hard links for current or marked files"))
+(if (not (fboundp 'dired-do-relsymlink))
+    (define-key diredp-multiple-move-copy-link-menu [multiple-move-copy-link-symlink]
+      '(menu-item "Symlink to..." dired-do-symlink
+        :visible (fboundp 'make-symbolic-link)
+        :help "Make symbolic links for current or marked files"))
+  (define-key diredp-multiple-move-copy-link-menu [multiple-move-copy-link-symlink]
+    '(menu-item "Symlink to (Absolute)..." dired-do-symlink
+      :help "Make absolute symbolic links for current or marked files"))
+  (define-key diredp-multiple-move-copy-link-menu [multiple-move-copy-link-relsymlink] ; In `dired-x.el'.
+    '(menu-item "Symlink to (Relative)..." dired-do-relsymlink
+      :help "Make relative symbolic links for current or marked files")))
+(define-key diredp-multiple-move-copy-link-menu [multiple-move-copy-link-copy]
+  '(menu-item "Copy to..." dired-do-copy :help "Copy current file or all marked files"))
+(define-key diredp-multiple-move-copy-link-menu [multiple-move-copy-link-rename]
+  '(menu-item "Move to..." dired-do-rename :help "Rename current file or move marked files"))
+
+
 ;; `Multiple' > `Images' menu.
 ;;
-(defvar diredp-menu-bar-images-menu (make-sparse-keymap "Images"))
-(defalias 'diredp-menu-bar-images-menu diredp-menu-bar-images-menu)
-(define-key diredp-menu-bar-operate-menu [images]
-  '(menu-item "Images" diredp-menu-bar-images-menu
+(defvar diredp-multiple-images-menu (make-sparse-keymap "Images"))
+(defalias 'diredp-multiple-images-menu diredp-multiple-images-menu)
+(define-key diredp-menu-bar-multiple-menu [images]
+  '(menu-item "Images" diredp-multiple-images-menu
     :enable (fboundp 'image-dired-display-thumbs)))
 
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-images-menu 'diredp-multiple-images-menu))
+(make-obsolete-variable 'diredp-menu-bar-images-menu 'diredp-multiple-images-menu) ; 2017-04-09
+
 ;; Remove the items from `Multiple' menu.
-(define-key diredp-menu-bar-operate-menu [image-dired-delete-tag] nil)
-(define-key diredp-menu-bar-operate-menu [image-dired-tag-files] nil)
-(define-key diredp-menu-bar-operate-menu [image-dired-dired-comment-files] nil)
-(define-key diredp-menu-bar-operate-menu [image-dired-display-thumbs] nil)
+(define-key diredp-menu-bar-multiple-menu [image-dired-delete-tag] nil)
+(define-key diredp-menu-bar-multiple-menu [image-dired-tag-files] nil)
+(define-key diredp-menu-bar-multiple-menu [image-dired-dired-comment-files] nil)
+(define-key diredp-menu-bar-multiple-menu [image-dired-display-thumbs] nil)
 
 ;; Add them to `Multiple' > `Images' menu.
-(define-key diredp-menu-bar-images-menu [image-dired-delete-tag]
+(define-key diredp-multiple-images-menu [image-dired-delete-tag]
   '(menu-item "Delete Tag..." image-dired-delete-tag
     :help "Delete tag from marked image files"))
-(define-key diredp-menu-bar-images-menu [image-dired-tag-files]
+(define-key diredp-multiple-images-menu [image-dired-tag-files]
   '(menu-item "Add Tags..." image-dired-tag-files
     :help "Add tags to marked image files"))
-(define-key diredp-menu-bar-images-menu [image-dired-dired-comment-files]
+(define-key diredp-multiple-images-menu [image-dired-dired-comment-files]
   '(menu-item "Add Comment..." image-dired-dired-comment-files
     :help "Add comment to marked image files"))
-(define-key diredp-menu-bar-images-menu [image-dired-display-thumbs]
+(define-key diredp-multiple-images-menu [image-dired-display-thumbs]
   '(menu-item "Display Thumbnails" image-dired-display-thumbs
     :help "Display thumbnails for marked image files"))
-(define-key diredp-menu-bar-images-menu [diredp-do-display-images]
+(define-key diredp-multiple-images-menu [diredp-do-display-images]
   '(menu-item "Display" diredp-do-display-images
     :help "Display the marked image files"))
 
@@ -10204,237 +10318,276 @@ If no one is selected, symmetric encryption will be performed.  "
 ;; `Multiple' > `Encryption' menu.
 ;;
 (when (fboundp 'epa-dired-do-encrypt)   ; Emacs 23+
-  (defvar diredp-menu-bar-encryption-menu (make-sparse-keymap "Encryption"))
-  (define-key diredp-menu-bar-operate-menu [encryption]
-    (cons "Encryption" diredp-menu-bar-encryption-menu))
+  (defvar diredp-multiple-encryption-menu (make-sparse-keymap "Encryption"))
+  (define-key diredp-menu-bar-multiple-menu [encryption]
+    (cons "Encryption" diredp-multiple-encryption-menu))
+
+  ;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+  ;; works for newer Emacs too.
+  (when (fboundp 'defvaralias)          ; Emacs 22+
+    (defvaralias 'diredp-menu-bar-encryption-menu 'diredp-multiple-encryption-menu))
+  (make-obsolete-variable 'diredp-menu-bar-encryption-menu 'diredp-multiple-encryption-menu) ; 2017-04-09
+
+  (when (boundp 'diredp-menu-bar-encryption-menu)
+    (defalias 'diredp-menu-bar-encryption-menu diredp-menu-bar-encryption-menu))
+  (make-obsolete 'diredp-menu-bar-encryption-menu 'diredp-multiple-encryption-menu) ; 2017-04-09
 
   ;; Remove the items from `Multiple' menu.
-  (define-key diredp-menu-bar-operate-menu [epa-dired-do-decrypt] nil)
-  (define-key diredp-menu-bar-operate-menu [epa-dired-do-verify] nil)
-  (define-key diredp-menu-bar-operate-menu [epa-dired-do-sign] nil)
-  (define-key diredp-menu-bar-operate-menu [epa-dired-do-encrypt] nil)
+  (define-key diredp-menu-bar-multiple-menu [epa-dired-do-decrypt] nil)
+  (define-key diredp-menu-bar-multiple-menu [epa-dired-do-verify] nil)
+  (define-key diredp-menu-bar-multiple-menu [epa-dired-do-sign] nil)
+  (define-key diredp-menu-bar-multiple-menu [epa-dired-do-encrypt] nil)
 
   ;; Add them to `Multiple' > `Encryption' menu.
-  (define-key diredp-menu-bar-encryption-menu [epa-dired-do-decrypt]
+  (define-key diredp-multiple-encryption-menu [epa-dired-do-decrypt]
     '(menu-item "Decrypt..." epa-dired-do-decrypt :help "Decrypt the marked files"))
-  (define-key diredp-menu-bar-encryption-menu [epa-dired-do-verify]
+  (define-key diredp-multiple-encryption-menu [epa-dired-do-verify]
     '(menu-item "Verify..." epa-dired-do-verify :help "Verify the marked files"))
-  (define-key diredp-menu-bar-encryption-menu [epa-dired-do-sign]
+  (define-key diredp-multiple-encryption-menu [epa-dired-do-sign]
     '(menu-item "Sign..." epa-dired-do-sign :help "Sign the marked files"))
-  (define-key diredp-menu-bar-encryption-menu [epa-dired-do-encrypt]
+  (define-key diredp-multiple-encryption-menu [epa-dired-do-encrypt]
     '(menu-item "Encrypt..." epa-dired-do-encrypt :help "Encrypt the marked files")))
 
 
 ;; `Multiple' > `Search' menu.
 ;;
-(defvar diredp-menu-bar-operate-search-menu (make-sparse-keymap "Search"))
-(define-key diredp-menu-bar-operate-menu [search]
-  (cons "Search" diredp-menu-bar-operate-search-menu))
+(defvar diredp-multiple-search-menu (make-sparse-keymap "Search"))
+(define-key diredp-menu-bar-multiple-menu [search]
+  (cons "Search" diredp-multiple-search-menu))
+
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-operate-search-menu 'diredp-multiple-search-menu))
+(make-obsolete-variable 'diredp-menu-bar-operate-search-menu 'diredp-multiple-search-menu) ; 2017-04-09
+
 (when (fboundp 'dired-do-isearch-regexp) ; Emacs 23+
-  (define-key diredp-menu-bar-operate-search-menu [isearch-regexp]
+  (define-key diredp-multiple-search-menu [isearch-regexp]
     '(menu-item "Isearch Regexp Files..." dired-do-isearch-regexp
       :help "Incrementally search marked files for regexp"))
-  (define-key diredp-menu-bar-operate-search-menu [isearch]
+  (define-key diredp-multiple-search-menu [isearch]
     '(menu-item "Isearch Files..." dired-do-isearch
       :help "Incrementally search marked files for string")))
 (when (fboundp 'dired-do-find-regexp-and-replace)
-  (define-key diredp-menu-bar-operate-search-menu [find-query-replace]
+  (define-key diredp-multiple-search-menu [find-query-replace]
     '(menu-item "Query Replace using `find'..." dired-do-find-regexp-and-replace
       :help "Replace regexp in marked files using `find'")))
-(define-key diredp-menu-bar-operate-search-menu [query-replace]
+(define-key diredp-multiple-search-menu [query-replace]
   (if (< emacs-major-version 21)
       '(menu-item "Query Replace..." dired-do-query-replace)
     '(menu-item "Query Replace..." dired-do-query-replace-regexp
       :help "Replace regexp in marked files")))
 (when (fboundp 'dired-do-find-regexp)
-  (define-key diredp-menu-bar-operate-search-menu [find-regexp]
+  (define-key diredp-multiple-search-menu [find-regexp]
     '(menu-item "Search Files using `find'..." dired-do-find-regexp
       :help "Search marked files for regexp using `find'")))
-(define-key diredp-menu-bar-operate-search-menu [search]
+(define-key diredp-multiple-search-menu [search]
   '(menu-item "Search Files..." dired-do-search :help "Search marked files for regexp"))
-(define-key diredp-menu-bar-operate-search-menu [grep]
+(define-key diredp-multiple-search-menu [grep]
   '(menu-item "Grep..." diredp-do-grep :help "Grep marked, next N, or all files shown"))
 
 
 ;; `Multiple' > `Bookmark' menu.
 ;;
-(defvar diredp-menu-bar-operate-bookmarks-menu (make-sparse-keymap "Bookmark"))
-(define-key diredp-menu-bar-operate-menu [bookmark]
-  (cons "Bookmark" diredp-menu-bar-operate-bookmarks-menu))
+(defvar diredp-multiple-bookmarks-menu (make-sparse-keymap "Bookmark"))
+(define-key diredp-menu-bar-multiple-menu [bookmark]
+  (cons "Bookmark" diredp-multiple-bookmarks-menu))
+
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-operate-bookmarks-menu 'diredp-multiple-bookmarks-menu))
+(make-obsolete-variable 'diredp-menu-bar-operate-bookmarks-menu 'diredp-multiple-bookmarks-menu) ; 2017-04-09
 
 (when (require 'bookmark+ nil t)
-  (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-set-tag-value]
+  (define-key diredp-multiple-bookmarks-menu [diredp-do-set-tag-value]
     '(menu-item "Set Tag Value..." diredp-do-set-tag-value
       :help "Set the value of a given tag for the marked or next N files"))
-  (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-paste-replace-tags]
+  (define-key diredp-multiple-bookmarks-menu [diredp-do-paste-replace-tags]
     '(menu-item "Paste Tags (Replace)" diredp-do-paste-replace-tags
       :help "Replace tags for the marked or next N files with copied tags"))
-  (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-paste-add-tags]
+  (define-key diredp-multiple-bookmarks-menu [diredp-do-paste-add-tags]
     '(menu-item "Paste Tags (Add)" diredp-do-paste-add-tags
       :help "Add previously copied tags to the marked or next N files"))
-  (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-remove-all-tags]
+  (define-key diredp-multiple-bookmarks-menu [diredp-do-remove-all-tags]
     '(menu-item "Remove All Tags" diredp-do-remove-all-tags
       :help "Remove all tags from the marked or next N files"))
-  (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-untag]
+  (define-key diredp-multiple-bookmarks-menu [diredp-do-untag]
     '(menu-item "Remove Tags..." diredp-do-untag
       :help "Remove some tags from the marked or next N files"))
-  (define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-tag]
+  (define-key diredp-multiple-bookmarks-menu [diredp-do-tag]
     '(menu-item "Add Tags..." diredp-do-tag
       :help "Add some tags to the marked or next N files"))
-  (define-key diredp-menu-bar-operate-bookmarks-menu [separator-book-2] '("--"))) ; ------------
+  (define-key diredp-multiple-bookmarks-menu [separator-book-2] '("--"))) ; ------------
 
-(define-key diredp-menu-bar-operate-bookmarks-menu
+(define-key diredp-multiple-bookmarks-menu
     [diredp-do-bookmark-in-bookmark-file-recursive]
   '(menu-item "Bookmark in Bookmark File (Here and Below)..."
     diredp-do-bookmark-in-bookmark-file-recursive
     :help "Bookmark marked files (including in marked subdirs) in bookmark file and save it"))
-(define-key diredp-menu-bar-operate-bookmarks-menu
+(define-key diredp-multiple-bookmarks-menu
     [diredp-set-bookmark-file-bookmark-for-marked-recursive]
   '(menu-item "Create Bookmark-File Bookmark (Here and Below)..."
     diredp-set-bookmark-file-bookmark-for-marked-recursive
     :help "Create a bookmark-file bookmark for marked files, including in marked subdirs"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-dirs-recursive]
+(define-key diredp-multiple-bookmarks-menu [diredp-do-bookmark-dirs-recursive]
     '(menu-item "Bookmark Dirs (Here and Below)..." diredp-do-bookmark-dirs-recursive
       :help "Bookmark this Dired buffer and marked subdirectory Dired buffers, recursively."))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-recursive]
+(define-key diredp-multiple-bookmarks-menu [diredp-do-bookmark-recursive]
   '(menu-item "Bookmark (Here and Below)..." diredp-do-bookmark-recursive
     :help "Bookmark the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [separator-book-1] '("--")) ; ---------------
+(define-key diredp-multiple-bookmarks-menu [separator-book-1] '("--")) ; ---------------
 
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark-in-bookmark-file]
+(define-key diredp-multiple-bookmarks-menu [diredp-do-bookmark-in-bookmark-file]
   '(menu-item "Bookmark in Bookmark File..." diredp-do-bookmark-in-bookmark-file
     :help "Bookmark the marked files in BOOKMARK-FILE and save BOOKMARK-FILE"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-set-bookmark-file-bookmark-for-marked]
+(define-key diredp-multiple-bookmarks-menu [diredp-set-bookmark-file-bookmark-for-marked]
   '(menu-item "Create Bookmark-File Bookmark..." diredp-set-bookmark-file-bookmark-for-marked
     :help "Create a bookmark-file bookmark, and bookmark the marked files in it"))
-(define-key diredp-menu-bar-operate-bookmarks-menu [diredp-do-bookmark]
+(define-key diredp-multiple-bookmarks-menu [diredp-do-bookmark]
   '(menu-item "Bookmark..." diredp-do-bookmark :help "Bookmark the marked or next N files"))
 
 
 ;; `Multiple' > `Marked Here and Below' menu.
 ;;
-(defvar diredp-menu-bar-operate-recursive-menu (make-sparse-keymap "Marked Here and Below"))
-(define-key diredp-menu-bar-operate-menu [operate-recursive]
-  (cons "Marked Here and Below" diredp-menu-bar-operate-recursive-menu))
+(defvar diredp-multiple-recursive-menu (make-sparse-keymap "Marked Here and Below"))
+(define-key diredp-menu-bar-multiple-menu [operate-recursive]
+  (cons "Marked Here and Below" diredp-multiple-recursive-menu))
 
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-operate-recursive-menu 'diredp-multiple-recursive-menu))
+(make-obsolete-variable 'diredp-menu-bar-operate-recursive-menu 'diredp-multiple-recursive-menu) ; 2017-04-09
 
 (when (fboundp 'diredp-do-chown-recursive)
-  (define-key diredp-menu-bar-operate-recursive-menu [chown]
+  (define-key diredp-multiple-recursive-menu [chown]
     '(menu-item "Change Owner..." diredp-do-chown-recursive
       :help "Change the owner of marked files, including those in marked subdirs")))
 (when (fboundp 'diredp-do-chgrp-recursive)
-  (define-key diredp-menu-bar-operate-recursive-menu [chgrp]
+  (define-key diredp-multiple-recursive-menu [chgrp]
     '(menu-item "Change Group..." diredp-do-chgrp-recursive
       :help "Change the owner of marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [chmod]
+(define-key diredp-multiple-recursive-menu [chmod]
   '(menu-item "Change Mode..." diredp-do-chmod-recursive
     :help "Change mode (attributes) of marked files, including those in marked subdirs"))
 (when (fboundp 'dired-do-touch)         ; Emacs 22+
-  (define-key diredp-menu-bar-operate-recursive-menu [touch]
+  (define-key diredp-multiple-recursive-menu [touch]
     '(menu-item "Change Timestamp (`touch')..." diredp-do-touch-recursive
       :help "Change timestamp of marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-change] '("--")) ; ----------------
+(define-key diredp-multiple-recursive-menu [separator-change] '("--")) ; ----------------
 
 (when (fboundp 'dired-do-async-shell-command) ; Emacs 23+
-  (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-async-shell-command-recursive]
+  (define-key diredp-multiple-recursive-menu [diredp-do-async-shell-command-recursive]
     '(menu-item "Asynchronous Shell Command..." diredp-do-async-shell-command-recursive
       :help "Run shell command asynchronously on marked files, including in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-shell-command-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-shell-command-recursive]
     '(menu-item "Shell Command..." diredp-do-shell-command-recursive
       :help "Run shell command on the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-apply-function-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-apply-function-recursive]
     '(menu-item "Apply Lisp Function..." diredp-do-apply-function-recursive
       :help "Apply a Lisp function to the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-print-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-print-recursive]
     '(menu-item "Print..." diredp-do-print-recursive
       :help "Print the marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-misc] '("--")) ; ------------------
+(define-key diredp-multiple-recursive-menu [separator-misc] '("--")) ; ------------------
 
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-delete-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-delete-recursive]
     '(menu-item "Delete Marked (not Flagged)" diredp-do-delete-recursive
       :help "Delete marked (not flagged) files, including in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-delete] '("--")) ; ----------------
+(define-key diredp-multiple-recursive-menu [separator-delete] '("--")) ; ----------------
 
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-hardlink-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-hardlink-recursive]
   '(menu-item "Hardlink to..." diredp-do-hardlink-recursive
     :help "Make hard links for marked files, including those in marked subdirs"))
 (if (not (fboundp 'dired-do-relsymlink))
-    (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-symlink-recursive]
+    (define-key diredp-multiple-recursive-menu [diredp-do-symlink-recursive]
       '(menu-item "Symlink to..." diredp-do-symlink-recursive
         :visible (fboundp 'make-symbolic-link)
         :help "Make symbolic links for marked files, including those in marked subdirs"))
-  (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-symlink-recursive]
+  (define-key diredp-multiple-recursive-menu [diredp-do-symlink-recursive]
     '(menu-item "Symlink to (Absolute)..." diredp-do-symlink-recursive
       :help "Make absolute symbolic links for marked files, including those in marked subdirs"))
-  (define-key diredp-menu-bar-operate-recursive-menu [diredp-do-relsymlink-recursive]
+  (define-key diredp-multiple-recursive-menu [diredp-do-relsymlink-recursive]
     '(menu-item "Symlink to (Relative)..." diredp-do-relsymlink-recursive
       :help "Make relative symbolic links for marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-copy-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-copy-recursive]
     '(menu-item "Copy to..." diredp-do-copy-recursive
       :help "Copy marked files, including in marked subdirs, to a given directory"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-move-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-move-recursive]
     '(menu-item "Move to..." diredp-do-move-recursive
       :help "Move marked files, including in marked subdirs, to a given directory"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-copy-move] '("--")) ; -------------
+(define-key diredp-multiple-recursive-menu [separator-copy-move] '("--")) ; -------------
 
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-capitalize-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-capitalize-recursive]
   '(menu-item "Capitalize" diredp-capitalize-recursive
     :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
     :help "Capitalize the names of all marked files, including in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-downcase-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-downcase-recursive]
   '(menu-item "Downcase" diredp-downcase-recursive
     :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
     :help "Rename marked files, including in marked subdirs, to lowercase names"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-upcase-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-upcase-recursive]
   '(menu-item "Upcase" diredp-upcase-recursive
     :enable (or (not (fboundp 'msdos-long-file-names))  (msdos-long-file-names))
     :help "Rename marked files, including in marked subdirs, to uppercase names"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-lettercase] '("--")) ; ------------
+(define-key diredp-multiple-recursive-menu [separator-lettercase] '("--")) ; ------------
 
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-list-marked-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-list-marked-recursive]
     '(menu-item "List Marked Files" diredp-list-marked-recursive
       :help "List the files marked here and in marked subdirs, recursively"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-copy-filename-as-kill-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-copy-filename-as-kill-recursive]
     '(menu-item "Copy File Names (to Paste)" diredp-copy-filename-as-kill-recursive
       :help "Copy names of files marked here and in marked subdirs, to `kill-ring'"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-insert-subdirs-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-insert-subdirs-recursive]
   '(menu-item "Insert Subdirs" diredp-insert-subdirs-recursive
     :help "Insert the marked subdirectories, gathered recursively"))
-(define-key diredp-menu-bar-operate-recursive-menu [separator-dirs] '("--")) ; ------------------
+(define-key diredp-multiple-recursive-menu [separator-dirs] '("--")) ; ------------------
 
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-marked-recursive-other-window]
+(define-key diredp-multiple-recursive-menu [diredp-marked-recursive-other-window]
     '(menu-item "Dired (Marked) in Other Window" diredp-marked-recursive-other-window
       :help "Open Dired (in other window) on marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-marked-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-marked-recursive]
     '(menu-item "Dired (Marked)" diredp-marked-recursive
       :help "Open Dired on marked files, including those in marked subdirs"))
 ;; On Windows, bind more.
 (eval-after-load "w32-browser"
-  '(define-key diredp-menu-bar-operate-recursive-menu [diredp-multiple-w32-browser-recursive]
+  '(define-key diredp-multiple-recursive-menu [diredp-multiple-w32-browser-recursive]
     '(menu-item "Open Associated Windows Apps" diredp-multiple-w32-browser-recursive
       :help "Run Windows apps for with marked files, including those in marked subdirs")))
-(define-key diredp-menu-bar-operate-recursive-menu [diredp-do-find-marked-files-recursive]
+(define-key diredp-multiple-recursive-menu [diredp-do-find-marked-files-recursive]
     '(menu-item "Open" diredp-do-find-marked-files-recursive
       :help "Find marked files simultaneously, including those in marked subdirs"))
 
 
 ;; `Multiple' > `Marked Here and Below' > `Images' menu.
 ;;
-(defvar diredp-menu-bar-images-recursive-menu (make-sparse-keymap "Images"))
-(defalias 'diredp-menu-bar-images-recursive-menu diredp-menu-bar-images-recursive-menu)
-(define-key diredp-menu-bar-operate-recursive-menu [images]
-  '(menu-item "Images" diredp-menu-bar-images-recursive-menu
+(defvar diredp-images-recursive-menu (make-sparse-keymap "Images"))
+(defalias 'diredp-images-recursive-menu diredp-images-recursive-menu)
+
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-images-recursive-menu 'diredp-images-recursive-menu))
+(make-obsolete-variable 'diredp-menu-bar-images-recursive-menu 'diredp-images-recursive-menu) ; 2017-04-09
+
+(when (boundp 'diredp-menu-bar-images-recursive-menu)
+  (defalias 'diredp-menu-bar-images-recursive-menu diredp-menu-bar-images-recursive-menu))
+(make-obsolete 'diredp-menu-bar-images-recursive-menu 'diredp-images-recursive-menu) ; 2017-04-09
+
+(define-key diredp-multiple-recursive-menu [images]
+  '(menu-item "Images" diredp-images-recursive-menu
     :enable (fboundp 'image-dired-delete-tag)))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-delete-tag-recursive]
+(define-key diredp-images-recursive-menu [diredp-image-dired-delete-tag-recursive]
   '(menu-item "Delete Image Tag..." diredp-image-dired-delete-tag-recursive
     :help "Remove an `image-dired' tag from marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-tag-files-recursive]
+(define-key diredp-images-recursive-menu [diredp-image-dired-tag-files-recursive]
   '(menu-item "Add Image Tags..." diredp-image-dired-tag-files-recursive
     :help "Add `image-dired' tags to marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-comment-files-recursive]
+(define-key diredp-images-recursive-menu [diredp-image-dired-comment-files-recursive]
   '(menu-item "Add Image Comment..." diredp-image-dired-comment-files-recursive
     :help "Add image comment to marked files, including those in marked subdirs"))
-(define-key diredp-menu-bar-images-recursive-menu [diredp-image-dired-display-thumbs-recursive]
+(define-key diredp-images-recursive-menu [diredp-image-dired-display-thumbs-recursive]
   '(menu-item "Display Image Thumbnails" diredp-image-dired-display-thumbs-recursive
     :help "Show thumbnails for marked image files, including those in marked subdirs"))
 
@@ -10443,7 +10596,7 @@ If no one is selected, symmetric encryption will be performed.  "
 ;;
 (when (fboundp 'epa-dired-do-encrypt)   ; Emacs 23+
   (defvar diredp-menu-bar-encryption-recursive-menu (make-sparse-keymap "Encryption"))
-  (define-key diredp-menu-bar-operate-recursive-menu [encryption]
+  (define-key diredp-multiple-recursive-menu [encryption]
     (cons "Encryption" diredp-menu-bar-encryption-recursive-menu))
   (define-key diredp-menu-bar-encryption-recursive-menu [diredp-do-decrypt-recursive]
     '(menu-item "Decrypt..." diredp-do-decrypt-recursive
@@ -10462,7 +10615,7 @@ If no one is selected, symmetric encryption will be performed.  "
 ;; `Multiple' > `Marked Here and Below' > `Search' menu.
 ;;
 (defvar diredp-menu-bar-search-recursive-menu (make-sparse-keymap "Search"))
-(define-key diredp-menu-bar-operate-recursive-menu [search]
+(define-key diredp-multiple-recursive-menu [search]
   (cons "Search" diredp-menu-bar-search-recursive-menu))
 (when (fboundp 'dired-do-isearch-regexp) ; Emacs 23+
   (define-key diredp-menu-bar-search-recursive-menu [diredp-do-isearch-regexp-recursive]
@@ -10485,7 +10638,7 @@ If no one is selected, symmetric encryption will be performed.  "
 ;; `Multiple' > `Marked Here and Below' > `Bookmark' menu.
 ;;
 (defvar diredp-menu-bar-bookmarks-recursive-menu (make-sparse-keymap "Bookmark"))
-(define-key diredp-menu-bar-operate-recursive-menu [bookmarks]
+(define-key diredp-multiple-recursive-menu [bookmarks]
   (cons "Bookmark" diredp-menu-bar-bookmarks-recursive-menu))
 (define-key diredp-menu-bar-bookmarks-recursive-menu
     [diredp-do-bookmark-in-bookmark-file-recursive]
@@ -10548,181 +10701,247 @@ If no one is selected, symmetric encryption will be performed.  "
 
 ;; `Regexp' > `Here and Below' menu.
 ;;
-(defvar diredp-menu-bar-regexp-recursive-menu (make-sparse-keymap "Here and Below"))
+(defvar diredp-regexp-recursive-menu (make-sparse-keymap "Here and Below"))
 (define-key diredp-menu-bar-regexp-menu [mark-recursive]
-  (cons "Here and Below" diredp-menu-bar-regexp-recursive-menu))
-(define-key diredp-menu-bar-regexp-recursive-menu [diredp-mark-files-regexp-recursive]
+  (cons "Here and Below" diredp-regexp-recursive-menu))
+(define-key diredp-regexp-recursive-menu [diredp-mark-files-regexp-recursive]
     '(menu-item "Mark..." diredp-mark-files-regexp-recursive
       :help "Mark all files matching a regexp, including those in marked subdirs"))
 
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-regexp-recursive-menu 'diredp-regexp-recursive-menu))
+(make-obsolete-variable 'diredp-menu-bar-regexp-recursive-menu 'diredp-regexp-recursive-menu) ; 2017-04-09
 
-;; "Mark" menu.
+(when (boundp 'diredp-menu-bar-regexp-recursive-menu)
+  (defalias 'diredp-menu-bar-regexp-recursive-menu diredp-menu-bar-regexp-recursive-menu))
+(make-obsolete 'diredp-menu-bar-regexp-recursive-menu 'diredp-regexp-recursive-menu) ; 2017-04-09
+
+
+;; "Marks" menu.
 ;;
-;; REPLACE ORIGINAL `Mark' menu in `dired.el'.
+;; REPLACE ORIGINAL `Marks' menu in `dired.el'.
 ;;
-(defvar diredp-menu-bar-mark-menu (make-sparse-keymap "Mark"))
-(define-key dired-mode-map [menu-bar mark] (cons "Mark" diredp-menu-bar-mark-menu))
+(defvar diredp-menu-bar-marks-menu (make-sparse-keymap "Marks"))
+(define-key dired-mode-map [menu-bar mark] (cons "Marks" diredp-menu-bar-marks-menu))
 
-(when (fboundp 'dired-flag-extension)
-  (define-key diredp-menu-bar-mark-menu [flag-extension] ; In `dired-x.el'
-    '(menu-item "Flag Extension..." dired-flag-extension
-      :help "Flag all files that have a certain extension, for deletion")))
-(define-key diredp-menu-bar-mark-menu [garbage-files]
-  '(menu-item "Flag Garbage Files" dired-flag-garbage-files
-    :help "Flag unneeded files for deletion"))
-(define-key diredp-menu-bar-mark-menu [backup-files]
-  '(menu-item "Flag Backup Files" dired-flag-backup-files
-    :help "Flag all backup files for deletion"))
-(define-key diredp-menu-bar-mark-menu [auto-save-files]
-  '(menu-item "Flag Auto-save Files" dired-flag-auto-save-files
-    :help "Flag auto-save files for deletion"))
-(define-key diredp-menu-bar-mark-menu [flag-region]
-  '(menu-item "Flag Region" diredp-flag-region-files-for-deletion
-    :enable (diredp-nonempty-region-p)
-    :help "Flag all files in the region (selection) for deletion"))
-(when (< emacs-major-version 21)
-  (put 'diredp-flag-region-files-for-deletion 'menu-enable '(diredp-nonempty-region-p)))
-(define-key diredp-menu-bar-mark-menu [deletion]
-  '(menu-item "Flag" dired-flag-file-deletion :help "Flag current line's file for deletion"))
-(define-key diredp-menu-bar-mark-menu [separator-flag] '("--")) ; ------------------------------
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-mark-menu 'diredp-menu-bar-marks-menu))
+(make-obsolete-variable 'diredp-menu-bar-mark-menu 'diredp-menu-bar-marks-menu) ; 2017-04-09
 
-(define-key diredp-menu-bar-mark-menu [prev]
+(define-key diredp-menu-bar-marks-menu [prev]
   '(menu-item "Previous Marked" dired-prev-marked-file :help "Move to previous marked file"))
-(define-key diredp-menu-bar-mark-menu [next]
+(define-key diredp-menu-bar-marks-menu [next]
   '(menu-item "Next Marked" dired-next-marked-file :help "Move to next marked file"))
-(define-key diredp-menu-bar-mark-menu [marks]
+(define-key diredp-menu-bar-marks-menu [marks]
   '(menu-item "Change Marks..." dired-change-marks
     :help "Replace marker with another character"))
-(define-key diredp-menu-bar-mark-menu [omit-unmarked]
-  '(menu-item "Omit Unmarked" diredp-omit-unmarked :help "Hide lines of unmarked files"))
-(define-key diredp-menu-bar-mark-menu [omit-marked]
-  '(menu-item "Omit Marked" diredp-omit-marked :help "Hide lines of marked files"))
-(define-key diredp-menu-bar-mark-menu [toggle-marks]
+(define-key diredp-menu-bar-marks-menu [toggle-marks]
   (if (> emacs-major-version 21)
       '(menu-item "Toggle Marked/Unmarked" dired-toggle-marks
         :help "Mark unmarked files, unmark marked ones")
     '(menu-item "Toggle Marked/Unmarked" dired-toggle-marks
       :help "Mark unmarked files, unmark marked ones")))
-(define-key diredp-menu-bar-mark-menu [separator-mark] '("--")) ; ------------------------------
-
-(when (fboundp 'dired-mark-sexp)
-  (define-key diredp-menu-bar-mark-menu [mark-sexp] ; In `dired-x.el'.
-    '(menu-item "Mark If..." dired-mark-sexp
-      :help "Mark files for which specified condition is true")))
-(define-key diredp-menu-bar-mark-menu [image-dired-mark-tagged-files]
-  '(menu-item "Mark Image Files Tagged..." image-dired-mark-tagged-files
-    :enable (fboundp 'image-dired-mark-tagged-files)
-    :help "Mark image files whose image tags match regexp"))
-(define-key diredp-menu-bar-mark-menu [mark-cont]
-  '(menu-item "Mark Containing..." dired-mark-files-containing-regexp
-    :help "Mark files whose contents matches regexp"))
-(define-key diredp-menu-bar-mark-menu [mark]
-  '(menu-item "Mark..." dired-mark-files-regexp
-    :help "Mark files matching regexp"))
-(when (fboundp 'dired-mark-omitted)     ; In `dired-x.el'.
-  (define-key diredp-menu-bar-mark-menu [mark-omitted]
-    '(menu-item "Mark Omitted..." dired-mark-omitted
-      :help "Mark all omitted files and subdirectories")))
-(define-key diredp-menu-bar-mark-menu [mark-autofiles]
-  '(menu-item "Mark Autofiles..." diredp-mark-autofiles
-    :help "Mark all autofiles (bookmarks with same name as file)"
-    :enable (featurep 'bookmark+)))
-(define-key diredp-menu-bar-mark-menu [mark-extension]
-  '(menu-item "Mark Extension..." diredp-mark/unmark-extension
-    :help "Mark all files with specified extension"))
-(define-key diredp-menu-bar-mark-menu [symlinks]
-  '(menu-item "Mark Symlinks" dired-mark-symlinks
-    :visible (fboundp 'make-symbolic-link) :help "Mark all symbolic links"))
-(define-key diredp-menu-bar-mark-menu [directories]
-  '(menu-item "Mark Directories" dired-mark-directories
-    :help "Mark all directories except `.' and `..'"))
-(define-key diredp-menu-bar-mark-menu [directory]
-  '(menu-item "Mark Old Backups" dired-clean-directory
-    :help "Flag old numbered backups for deletion"))
-(define-key diredp-menu-bar-mark-menu [executables]
-  '(menu-item "Mark Executables" dired-mark-executables :help "Mark all executable files"))
-(define-key diredp-menu-bar-mark-menu [mark-region]
-  '(menu-item "Mark Region" diredp-mark-region-files
-    :enable (diredp-nonempty-region-p)
-    :help "Mark all of the files in the region (selection)"))
-(when (< emacs-major-version 21)
-  (put 'diredp-mark-region-files 'menu-enable '(diredp-nonempty-region-p)))
-(define-key diredp-menu-bar-mark-menu [mark]
-  '(menu-item "Mark" dired-mark :help "Mark current line's file for future operations"))
-(define-key diredp-menu-bar-mark-menu [separator-unmark] '("--")) ; ----------------------------
-
-(define-key diredp-menu-bar-mark-menu [unmark-autofiles]
-  '(menu-item "Unmark Autofiles..." diredp-unmark-autofiles
-    :help "Unmark all autofiles (bookmarks with same name as file)"
-    :enable (featurep 'bookmark+)))
-(define-key diredp-menu-bar-mark-menu [unmark-all]
-  '(menu-item "Unmark All" dired-unmark-all-marks :help "Remove all marks from all files"))
-(define-key diredp-menu-bar-mark-menu [unmark-with]
-  '(menu-item "Unmark Marked-With..." dired-unmark-all-files
-    :help "Remove a specific mark (or all marks) from every file"))
-(define-key diredp-menu-bar-mark-menu [unmark-region]
-  '(menu-item "Unmark Region" diredp-unmark-region-files
-    :enable (diredp-nonempty-region-p)
-    :help "Unmark all files in the region (selection)"))
-(when (< emacs-major-version 21)
-  (put 'diredp-unmark-region-files 'menu-enable '(diredp-nonempty-region-p)))
-(define-key diredp-menu-bar-mark-menu [unmark]
-  '(menu-item "Unmark" dired-unmark :help "Unmark or unflag current line's file"))
 
 
 ;; `Mark' > `Tagged' menu.
 ;;
 (when (require 'bookmark+ nil t)
-  (defvar diredp-mark-tags-menu (make-sparse-keymap "Tagged (Autofiles)")
-    "`Tags' submenu for Dired menu-bar `Mark' menu.")
-  (define-key diredp-menu-bar-mark-menu [mark-tags] (cons "Tagged" diredp-mark-tags-menu))
+  (defvar diredp-marks-tags-menu (make-sparse-keymap "Tagged (Autofiles)")
+    "`Tags' submenu for Dired menu-bar `Marks' menu.")
+  (define-key diredp-menu-bar-marks-menu [mark-tags] (cons "Tagged" diredp-marks-tags-menu))
 
-  (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-none]
+  (define-key diredp-marks-tags-menu [diredp-unmark-files-tagged-none]
     '(menu-item "Unmark Not Tagged with Any..." diredp-unmark-files-tagged-none
       :help "Unmark files that are not tagged with *any* of the tags you enter"))
-  (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-not-all]
+  (define-key diredp-marks-tags-menu [diredp-unmark-files-tagged-not-all]
     '(menu-item "Unmark Not Tagged with All..." diredp-unmark-files-tagged-not-all
       :help "Unmark files that are not tagged with *all* tags"))
-  (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-some]
+  (define-key diredp-marks-tags-menu [diredp-unmark-files-tagged-some]
     '(menu-item "Unmark Tagged with Some..." diredp-unmark-files-tagged-some
       :help "Unmark files that are tagged with at least one of the tags you enter"))
-  (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-all]
+  (define-key diredp-marks-tags-menu [diredp-unmark-files-tagged-all]
     '(menu-item "Unmark Tagged with All..." diredp-unmark-files-tagged-all
       :help "Unmark files that are tagged with *each* tag you enter"))
-  (define-key diredp-mark-tags-menu [diredp-unmark-files-tagged-regexp]
+  (define-key diredp-marks-tags-menu [diredp-unmark-files-tagged-regexp]
     '(menu-item "Unmark Tagged Matching Regexp..." diredp-unmark-files-tagged-regexp
       :help "Unmark files that have at least one tag that matches a regexp"))
+  (define-key diredp-marks-tags-menu [separator-marks-tags] '("--")) ; -------------------------
 
-  (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-none]
+  (define-key diredp-marks-tags-menu [diredp-mark-files-tagged-none]
     '(menu-item "Mark Not Tagged with Any..." diredp-mark-files-tagged-none
       :help "Mark files that are not tagged with *any* of the tags you enter"))
-  (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-not-all]
+  (define-key diredp-marks-tags-menu [diredp-mark-files-tagged-not-all]
     '(menu-item "Mark Not Tagged with All..." diredp-mark-files-tagged-not-all
       :help "Mark files that are not tagged with *all* tags"))
-  (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-some]
+  (define-key diredp-marks-tags-menu [diredp-mark-files-tagged-some]
     '(menu-item "Mark Tagged with Some..." diredp-mark-files-tagged-some
       :help "Mark files that are tagged with at least one of the tags you enter"))
-  (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-all]
+  (define-key diredp-marks-tags-menu [diredp-mark-files-tagged-all]
     '(menu-item "Mark Tagged with All..." diredp-mark-files-tagged-all
       :help "Mark files that are tagged with *each* tag you enter"))
-  (define-key diredp-mark-tags-menu [diredp-mark-files-tagged-regexp]
+  (define-key diredp-marks-tags-menu [diredp-mark-files-tagged-regexp]
     '(menu-item "Mark Tagged Matching Regexp..." diredp-mark-files-tagged-regexp
       :help "Mark files that have at least one tag that matches a regexp")))
 
 
+;; `Marks' > `Omit' menu.
+;;
+(defvar diredp-marks-omit-menu (make-sparse-keymap "Omit")
+  "`Omit' submenu for Dired menu-bar `Marks' menu.")
+(define-key diredp-menu-bar-marks-menu [marks-omit] (cons "Omit" diredp-marks-omit-menu))
+
+(define-key diredp-marks-omit-menu [marks-omit-unmarked]
+  '(menu-item "Omit Unmarked" diredp-omit-unmarked :help "Hide lines of unmarked files"))
+(define-key diredp-marks-omit-menu [marks-omit-marked]
+  '(menu-item "Omit Marked" diredp-omit-marked :help "Hide lines of marked files"))
+
+
+;; `Marks' > `Flag' menu.
+;;
+(defvar diredp-marks-flag-menu (make-sparse-keymap "Flag")
+  "`Flag' submenu for Dired menu-bar `Marks' menu.")
+(define-key diredp-menu-bar-marks-menu [mark-flag] (cons "Flag" diredp-marks-flag-menu))
+
+(when (fboundp 'dired-flag-extension)
+  (define-key diredp-marks-flag-menu [marks-flag-extension] ; In `dired-x.el'
+    '(menu-item "Flag Extension..." dired-flag-extension
+      :help "Flag all files that have a certain extension, for deletion")))
+(define-key diredp-marks-flag-menu [marks-flag-garbage-files]
+  '(menu-item "Flag Garbage Files" dired-flag-garbage-files
+    :help "Flag unneeded files for deletion"))
+(define-key diredp-marks-flag-menu [marks-flag-backup-files]
+  '(menu-item "Flag Backup Files" dired-flag-backup-files
+    :help "Flag all backup files for deletion"))
+(define-key diredp-marks-flag-menu [marks-flag-auto-save-files]
+  '(menu-item "Flag Auto-save Files" dired-flag-auto-save-files
+    :help "Flag auto-save files for deletion"))
+(define-key diredp-marks-flag-menu [marks-flag-region]
+  '(menu-item "Flag Region" diredp-flag-region-files-for-deletion
+    :visible (diredp-nonempty-region-p)
+    :help "Flag all files in the region (selection) for deletion"))
+(when (< emacs-major-version 21)
+  (put 'diredp-flag-region-files-for-deletion 'menu-enable '(diredp-nonempty-region-p)))
+(define-key diredp-marks-flag-menu [marks-flag-deletion]
+  '(menu-item "Flag This" dired-flag-file-deletion
+    :visible (not (diredp-nonempty-region-p))
+    :help "Flag current line's file for deletion"))
+;; @@@ (define-key diredp-menu-bar-marks-menu [separator-flag] '("--")) ; ------------------------------
+
+;; @@@@ (define-key diredp-menu-bar-marks-menu [separator-mark] '("--")) ; ------------------------------
+
+
+
+;; @@@(define-key diredp-marks-mark-menu [separator-unmark] '("--")) ; ----------------------------
+
+
+;; `Marks' > `Unmark' menu.
+;;
+(defvar diredp-marks-unmark-menu (make-sparse-keymap "Unmark")
+  "`Unmark' submenu for Dired menu-bar `Marks' menu.")
+(define-key diredp-menu-bar-marks-menu [mark-mark] (cons "Unmark" diredp-marks-unmark-menu))
+
+(define-key diredp-marks-unmark-menu [unmark-autofiles]
+  '(menu-item "Unmark Autofiles..." diredp-unmark-autofiles
+    :help "Unmark all autofiles (bookmarks with same name as file)"
+    :enable (featurep 'bookmark+)))
+(define-key diredp-marks-unmark-menu [unmark-all]
+  '(menu-item "Unmark All" dired-unmark-all-marks :help "Remove all marks from all files"))
+(define-key diredp-marks-unmark-menu [unmark-with]
+  '(menu-item "Unmark Marked-With..." dired-unmark-all-files
+    :help "Remove a specific mark (or all marks) from every file"))
+(define-key diredp-marks-unmark-menu [unmark-region]
+  '(menu-item "Unmark Region" diredp-unmark-region-files
+    :visible (diredp-nonempty-region-p)
+    :help "Unmark all files in the region (selection)"))
+(when (< emacs-major-version 21)
+  (put 'diredp-unmark-region-files 'menu-enable '(diredp-nonempty-region-p)))
+(define-key diredp-marks-unmark-menu [unmark-this]
+  '(menu-item "Unmark This" dired-unmark
+    :visible (not (diredp-nonempty-region-p))
+    :help "Unmark or unflag current line's file"))
+
+
+;; `Marks' > `Mark' menu.
+;;
+(defvar diredp-marks-mark-menu (make-sparse-keymap "Mark")
+  "`Mark' submenu for Dired menu-bar `Marks' menu.")
+(define-key diredp-menu-bar-marks-menu [marks-mark] (cons "Mark" diredp-marks-mark-menu))
+
+(when (fboundp 'dired-mark-sexp)
+  (define-key diredp-marks-mark-menu [marks-mark-sexp] ; In `dired-x.el'.
+    '(menu-item "Mark If..." dired-mark-sexp
+      :help "Mark files for which specified condition is true")))
+(define-key diredp-marks-mark-menu [marks-image-dired-mark-tagged-files]
+  '(menu-item "Mark Image Files Tagged..." image-dired-mark-tagged-files
+    :enable (fboundp 'image-dired-mark-tagged-files)
+    :help "Mark image files whose image tags match regexp"))
+(define-key diredp-marks-mark-menu [marks-mark-cont]
+  '(menu-item "Mark Content Matching Regexp..." dired-mark-files-containing-regexp
+    :help "Mark files whose contents matches regexp"))
+(define-key diredp-marks-mark-menu [marks-mark...]
+  '(menu-item "Mark Name Matching Regexp..." dired-mark-files-regexp
+    :help "Mark file names matching regexp"))
+(when (fboundp 'dired-mark-omitted)     ; In `dired-x.el'.
+  (define-key diredp-marks-mark-menu [marks-mark-omitted]
+    '(menu-item "Mark Omitted..." dired-mark-omitted
+      :help "Mark all omitted files and subdirectories")))
+(define-key diredp-marks-mark-menu [marks-mark-autofiles]
+  '(menu-item "Mark Autofiles..." diredp-mark-autofiles
+    :help "Mark all autofiles (bookmarks with same name as file)"
+    :enable (featurep 'bookmark+)))
+(define-key diredp-marks-mark-menu [marks-mark-extension]
+  '(menu-item "Mark Extension..." diredp-mark/unmark-extension
+    :help "Mark all files with specified extension"))
+(define-key diredp-marks-mark-menu [marks-mark-symlinks]
+  '(menu-item "Mark Symlinks" dired-mark-symlinks
+    :visible (fboundp 'make-symbolic-link) :help "Mark all symbolic links"))
+(define-key diredp-marks-mark-menu [marks-mark-directories]
+  '(menu-item "Mark Directories" dired-mark-directories
+    :help "Mark all directories except `.' and `..'"))
+(define-key diredp-marks-mark-menu [marks-mark-directory]
+  '(menu-item "Mark Old Backups" dired-clean-directory
+    :help "Flag old numbered backups for deletion"))
+(define-key diredp-marks-mark-menu [marks-mark-executables]
+  '(menu-item "Mark Executables" dired-mark-executables :help "Mark all executable files"))
+(define-key diredp-marks-mark-menu [marks-mark-region]
+  '(menu-item "Mark Region" diredp-mark-region-files
+    :visible (diredp-nonempty-region-p)
+    :help "Mark all of the files in the region (selection)"))
+(when (< emacs-major-version 21)
+  (put 'diredp-mark-region-files 'menu-enable '(diredp-nonempty-region-p)))
+(define-key diredp-marks-mark-menu [marks-mark-this]
+  '(menu-item "Mark This" dired-mark
+    :visible (not (diredp-nonempty-region-p))
+    :help "Mark current line's file for future operations"))
+
+
 ;; "Dir" menu.
 ;;
 ;; REPLACE ORIGINAL `Subdir' menu in `dired.el'.
 ;;
-(defvar diredp-menu-bar-subdir-menu (make-sparse-keymap "Dir"))
-(define-key dired-mode-map [menu-bar subdir] (cons "Dir" diredp-menu-bar-subdir-menu))
+(defvar diredp-menu-bar-dir-menu (make-sparse-keymap "Dir"))
+(define-key dired-mode-map [menu-bar subdir] (cons "Dir" diredp-menu-bar-dir-menu))
+
+;; We don't use `define-obsolete-variable-alias' so that byte-compilation in older Emacs
+;; works for newer Emacs too.
+(when (fboundp 'defvaralias)            ; Emacs 22+
+  (defvaralias 'diredp-menu-bar-subdir-menu 'diredp-dir-menu))
+(make-obsolete-variable 'diredp-menu-bar-subdir-menu 'diredp-dir-menu) ; 2017-04-09
+
+(when (boundp 'diredp-menu-bar-subdir-menu)
+  (defalias 'diredp-menu-bar-subdir-menu diredp-menu-bar-subdir-menu))
+(make-obsolete 'diredp-menu-bar-subdir-menu 'diredp-dir-menu) ; 2017-04-09
 
 
 ;; `Dir' > `Hide/Show' menu.
 ;;
 (defvar diredp-hide/show-menu (make-sparse-keymap "Hide/Show")
   "`Hide/Show' submenu for Dired menu-bar `Dir' menu.")
-(define-key diredp-menu-bar-subdir-menu [hide-show] (cons "Hide/Show" diredp-hide/show-menu))
+(define-key diredp-menu-bar-dir-menu [hide-show] (cons "Hide/Show" diredp-hide/show-menu))
 
 (when (fboundp 'dired-omit-mode)
   (define-key diredp-hide/show-menu [dired-omit-mode]
@@ -10744,7 +10963,7 @@ If no one is selected, symmetric encryption will be performed.  "
 ;;
 (defvar diredp-bookmark-menu (make-sparse-keymap "Bookmark")
   "`Bookmark' submenu for Dired menu-bar `Dir' menu.")
-(define-key diredp-menu-bar-subdir-menu [bookmark] (cons "Bookmark" diredp-bookmark-menu))
+(define-key diredp-menu-bar-dir-menu [bookmark] (cons "Bookmark" diredp-bookmark-menu))
 
 (define-key diredp-bookmark-menu [diredp-highlight-autofiles-mode]
   '(menu-item "Toggle Autofile Highlighting" diredp-highlight-autofiles-mode
@@ -10761,7 +10980,7 @@ If no one is selected, symmetric encryption will be performed.  "
 ;;
 (defvar diredp-navigate-menu (make-sparse-keymap "Navigate")
   "`Navigate' submenu for Dired menu-bar `Dir' menu.")
-(define-key diredp-menu-bar-subdir-menu [navigate] (cons "Navigate" diredp-navigate-menu))
+(define-key diredp-menu-bar-dir-menu [navigate] (cons "Navigate" diredp-navigate-menu))
 
 (define-key diredp-navigate-menu [insert]
   '(menu-item "Move To This Subdir" dired-maybe-insert-subdir
@@ -10781,76 +11000,76 @@ If no one is selected, symmetric encryption will be performed.  "
 (define-key diredp-navigate-menu [next-dirline]
   '(menu-item "Next Dirline" diredp-next-dirline :help "Move to next directory-file line"))
 
-(define-key diredp-menu-bar-subdir-menu [separator-subdir] '("--")) ; --------------------------
+(define-key diredp-menu-bar-dir-menu [separator-subdir] '("--")) ; --------------------------
 
-(define-key diredp-menu-bar-subdir-menu [image-dired-dired-toggle-marked-thumbs]
+(define-key diredp-menu-bar-dir-menu [image-dired-dired-toggle-marked-thumbs]
   '(menu-item "Toggle Image Thumbnails" image-dired-dired-toggle-marked-thumbs
     :enable (fboundp 'image-dired-dired-toggle-marked-thumbs)
     :help "Add or remove image thumbnails in front of marked file names"))
 (when (fboundp 'dired-isearch-filenames) ; Emacs 23+
-  (define-key diredp-menu-bar-subdir-menu [isearch-filenames-regexp]
+  (define-key diredp-menu-bar-dir-menu [isearch-filenames-regexp]
     '(menu-item "Isearch Regexp in File Names..." dired-isearch-filenames-regexp
       :help "Incrementally search for regexp in file names only"))
-  (define-key diredp-menu-bar-subdir-menu [isearch-filenames]
+  (define-key diredp-menu-bar-dir-menu [isearch-filenames]
     '(menu-item "Isearch in File Names..." dired-isearch-filenames
       :help "Incrementally search for literal text in file names only.")))
 (when (or (> emacs-major-version 21)  (fboundp 'wdired-change-to-wdired-mode))
-  (define-key diredp-menu-bar-subdir-menu [wdired-mode]
+  (define-key diredp-menu-bar-dir-menu [wdired-mode]
     '(menu-item "Edit File Names (WDired)" wdired-change-to-wdired-mode
       :help "Put a Dired buffer in a mode in which filenames are editable"
       :keys "C-x C-q" :filter (lambda (x) (and (derived-mode-p 'dired-mode)  x)))))
 (when (fboundp 'dired-compare-directories) ; Emacs 22+
-  (define-key diredp-menu-bar-subdir-menu [compare-directories]
+  (define-key diredp-menu-bar-dir-menu [compare-directories]
     '(menu-item "Compare Directories..." dired-compare-directories
       :help "Mark files with different attributes in two Dired buffers")))
 
-(define-key diredp-menu-bar-subdir-menu [separator-dired-on-set] '("--")) ; --------------------
+(define-key diredp-menu-bar-dir-menu [separator-dired-on-set] '("--")) ; --------------------
 
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-recent-dirs]
+(define-key diredp-menu-bar-dir-menu [diredp-dired-recent-dirs]
   '(menu-item "Dired Recent Directories..." diredp-dired-recent-dirs
     :visible (boundp 'recentf-list) :enable  (and (boundp 'recentf-list)  (consp recentf-list))
     :help "Open a Dired buffer for recently used directories"))
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-inserted-subdirs]
+(define-key diredp-menu-bar-dir-menu [diredp-dired-inserted-subdirs]
   '(menu-item "Dired Each Inserted Subdir..." diredp-dired-inserted-subdirs
     :enable (cdr dired-subdir-alist)    ; First elt is current dir.  Must have at least one more.
     :help "Open Dired separately for each of the inserted subdirectories"))
-(define-key diredp-menu-bar-subdir-menu [diredp-add-to-this-dired-buffer]
+(define-key diredp-menu-bar-dir-menu [diredp-add-to-this-dired-buffer]
   '(menu-item "Add Entries Here..." diredp-add-to-this-dired-buffer
     :help "Add individual file and directory names to the listing"
     :keys "C-x E"))
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-union]
+(define-key diredp-menu-bar-dir-menu [diredp-dired-union]
   '(menu-item "Dired Union..." diredp-dired-union
     :help "Open Dired for the union of some existing Dired buffers"))
-(define-key diredp-menu-bar-subdir-menu [diredp-fileset-other-window]
+(define-key diredp-menu-bar-dir-menu [diredp-fileset-other-window]
   '(menu-item "Dired Fileset..." diredp-fileset-other-window
     :enable (> emacs-major-version 21) :help "Open Dired on an Emacs fileset"))
-(define-key diredp-menu-bar-subdir-menu [diredp-dired-for-files]
+(define-key diredp-menu-bar-dir-menu [diredp-dired-for-files]
   '(menu-item "Dired Files Located Anywhere" diredp-dired-for-files
     :help "Open Dired on specific files whose names you provide"))
-(define-key diredp-menu-bar-subdir-menu [diredp-marked-other-window]
+(define-key diredp-menu-bar-dir-menu [diredp-marked-other-window]
   '(menu-item "Dired Marked Files in Other Window" diredp-marked-other-window
     :enable (save-excursion (goto-char (point-min))
                             (and (re-search-forward (dired-marker-regexp) nil t)
                                  (re-search-forward (dired-marker-regexp) nil t)))
     :help "Open Dired on marked files only, in other window"))
-(define-key diredp-menu-bar-subdir-menu [diredp-marked]
+(define-key diredp-menu-bar-dir-menu [diredp-marked]
   '(menu-item "Dired Marked Files" diredp-marked
     :enable (save-excursion (goto-char (point-min))
                             (and (re-search-forward (dired-marker-regexp) nil t)
                                  (re-search-forward (dired-marker-regexp) nil t)))
     :help "Open Dired on marked files only"))
-(define-key diredp-menu-bar-subdir-menu [dired]
+(define-key diredp-menu-bar-dir-menu [dired]
   '(menu-item "Dired (Filter via Wildcards)..." dired
     :help "Explore a directory (you can provide wildcards)"))
 
-(define-key diredp-menu-bar-subdir-menu [separator-dired] '("--")) ; ---------------------
+(define-key diredp-menu-bar-dir-menu [separator-dired] '("--")) ; ---------------------
 
-(define-key diredp-menu-bar-subdir-menu [insert]
+(define-key diredp-menu-bar-dir-menu [insert]
   '(menu-item "Insert/Move-To This Subdir" dired-maybe-insert-subdir
     :help "Move to subdirectory line or listing"))
-(define-key diredp-menu-bar-subdir-menu [revert]
+(define-key diredp-menu-bar-dir-menu [revert]
   '(menu-item "Refresh (Sync \& Show All)" revert-buffer :help "Update directory contents"))
-(define-key diredp-menu-bar-subdir-menu [create-directory] ; Moved from "Immediate".
+(define-key diredp-menu-bar-dir-menu [create-directory] ; Moved from "Immediate".
   '(menu-item "New Directory..." dired-create-directory :help "Create a directory"))

Binary file

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "dockerfile-mode" "dockerfile-mode.el" (22712
-;;;;;;  4660 393279 176000))
+;;;### (autoloads nil "dockerfile-mode" "dockerfile-mode.el" (22792
+;;;;;;  62867 537409 47000))
 ;;; Generated autoloads from dockerfile-mode.el
 
 (autoload 'dockerfile-build-buffer "dockerfile-mode" "\

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "dockerfile-mode" "20170221.1317" "Major mode for editing Docker's Dockerfiles" 'nil)
+(define-package "dockerfile-mode" "20170418.1024" "Major mode for editing Docker's Dockerfiles" 'nil)

@@ -1,5 +1,5 @@
 ;;; dockerfile-mode.el --- Major mode for editing Docker's Dockerfiles
-;; Package-Version: 20170221.1317
+;; Package-Version: 20170418.1024
 
 ;; Copyright (c) 2013 Spotify AB
 ;;
@@ -82,6 +82,7 @@ Each element of the list will be passed as a separate
     (modify-syntax-entry ?# "<" table)
     (modify-syntax-entry ?\n ">" table)
     (modify-syntax-entry ?' "\"" table)
+    (modify-syntax-entry ?= "." table)
     table)
   "Syntax table for `dockerfile-mode'.")

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" (22725 53742
-;;;;;;  489614 133000))
+;;;### (autoloads nil "editorconfig" "editorconfig.el" (22792 62867
+;;;;;;  30418 845000))
 ;;; 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"
-;;;;;;  (22725 53742 478614 489000))
+;;;;;;  (22792 62867 28418 883000))
 ;;; 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"
-;;;;;;  (22725 53742 473614 651000))
+;;;;;;  (22792 62867 27418 903000))
 ;;; 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"
-;;;;;;  (22725 53742 466614 878000))
+;;;;;;  (22792 62867 24418 961000))
 ;;; 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")
-;;;;;;  (22725 53742 495613 938000))
+;;;;;;  (22792 62867 31418 825000))
 
 ;;;***

@@ -39,7 +39,7 @@
   "Syntax table in use in `editorconfig-conf-mode' buffers.")
 
 ;;;###autoload
-(define-derived-mode editorconfig-conf-mode conf-unix-mode "EditorConfig"
+(define-derived-mode editorconfig-conf-mode conf-unix-mode "Conf[EditorConfig]"
   "Major mode for editing .editorconfig files."
   (set-variable 'indent-line-function 'indent-relative)
   (let ((key-property-list

Binary file

File renamed without changes

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

@@ -39,7 +39,12 @@
 
 ;;; Code:
 (require 'cl-lib)
-(eval-when-compile (require 'rx))
+(eval-when-compile
+  (require 'rx)
+  (defvar tex-indent-basic)
+  (defvar tex-indent-item)
+  (defvar tex-indent-arg)
+  (defvar evil-shift-width))
 
 (declare-function editorconfig-core-get-properties-hash
                   "editorconfig-core"

File renamed without changes

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "f" "20161002.800" "Modern API for working with files and directories" '((s "1.7.0") (dash "2.2.0")) :url "http://github.com/rejeep/f.el" :keywords '("files" "directories"))

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil nil ("f.el") (22712 4621 522537 323000))
+;;;### (autoloads nil nil ("f.el") (22792 62865 658445 359000))
 
 ;;;***

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "f" "20170404.1039" "Modern API for working with files and directories" '((s "1.7.0") (dash "2.2.0")) :url "http://github.com/rejeep/f.el" :keywords '("files" "directories"))

@@ -5,7 +5,7 @@
 ;; Author: Johan Andersson <johan.rejeep@gmail.com>
 ;; Maintainer: Johan Andersson <johan.rejeep@gmail.com>
 ;; Version: 0.19.0
-;; Package-Version: 20161002.800
+;; Package-Version: 20170404.1039
 ;; Keywords: files, directories
 ;; URL: http://github.com/rejeep/f.el
 ;; Package-Requires: ((s "1.7.0") (dash "2.2.0"))
@@ -542,7 +542,7 @@ RECURSIVE - Search for files and directories recursive."
     ,recursive))
 
 (defun f-directories (path &optional fn recursive)
-  "Find all directories in PATH.  See `f-entries`."
+  "Find all directories in PATH.  See `f-entries'."
   (let ((directories (-select 'f-directory? (f--collect-entries path recursive))))
     (if fn (-select fn directories) directories)))
 
@@ -556,7 +556,7 @@ RECURSIVE - Search for files and directories recursive."
     ,recursive))
 
 (defun f-files (path &optional fn recursive)
-  "Find all files in PATH.  See `f-entries`."
+  "Find all files in PATH.  See `f-entries'."
   (let ((files (-select 'f-file? (f--collect-entries path recursive))))
     (if fn (-select fn files) files)))

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" (22753 9100 658367
-;;;;;;  329000))
+;;;### (autoloads nil "flycheck" "flycheck.el" (22792 62864 78475
+;;;;;;  890000))
 ;;; 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") (22753 9100 657367 344000))
+;;;;;;  "flycheck-pkg.el") (22792 62864 77475 909000))
 
 ;;;***

File renamed without changes

Binary file

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

@@ -221,9 +221,11 @@ attention to case differences."
     racket
     rpm-rpmlint
     markdown-mdl
+    nix
     rst-sphinx
     rst
     ruby-rubocop
+    ruby-reek
     ruby-rubylint
     ruby
     ruby-jruby
@@ -5595,6 +5597,30 @@ See URL `http://phpmd.org/' for more information about phpmd."
                       errors)))))))))
        (nreverse errors)))))
 
+(defun flycheck-parse-reek (output checker buffer)
+  "Parse Reek warnings from JSON OUTPUT.
+
+CHECKER and BUFFER denote the CHECKER that returned OUTPUT and
+the BUFFER that was checked respectively.
+
+See URL `https://github.com/troessner/reek' for more information
+about Reek."
+  (let ((errors nil))
+    (dolist (message (car (flycheck-parse-json output)))
+      (let-alist message
+        (dolist (line (delete-dups .lines))
+          (push
+           (flycheck-error-new-at
+            line
+            nil
+            'warning (concat .context " " .message)
+            :id .smell_type
+            :checker checker
+            :buffer buffer
+            :filename .source)
+           errors))))
+    (nreverse errors)))
+
 (defun flycheck-parse-tslint (output checker buffer)
   "Parse TSLint errors from JSON OUTPUT.
 
@@ -8642,6 +8668,13 @@ See URL `https://sourceforge.net/projects/rpmlint/'."
       (unless (flycheck-error-line err)
         (setf (flycheck-error-line err) 1)))
     errors)
+  :error-explainer
+  (lambda (error)
+    (-when-let* ((error-message (flycheck-error-message error))
+                 (message-id (save-match-data (string-match "\\([^ ]+\\)" error-message)
+                                              (match-string 1 error-message))))
+      (with-output-to-string
+        (call-process "rpmlint" nil standard-output nil "-I" message-id))))
   :modes (sh-mode rpm-spec-mode)
   :predicate (lambda () (or (not (eq major-mode 'sh-mode))
                             ;; In `sh-mode', we need the proper shell
@@ -8702,6 +8735,17 @@ See URL `https://github.com/mivok/markdownlint'."
      (flycheck-remove-error-file-names "(stdin)" errors)))
   :modes (markdown-mode gfm-mode))
 
+(flycheck-define-checker nix
+  "Nix checker using nix-instantiate.
+
+See URL `https://nixos.org/nix/manual/#sec-nix-instantiate'."
+  :command ("nix-instantiate" "--parse" source-inplace)
+  :error-patterns
+  ((error line-start
+          "error: " (message) " at " (file-name) ":" line ":" column
+          line-end))
+  :modes nix-mode)
+
 (defun flycheck-locate-sphinx-source-directory ()
   "Locate the Sphinx source directory for the current buffer.
 
@@ -8799,6 +8843,23 @@ See URL `http://batsov.com/rubocop/'."
           (optional (id (one-or-more (not (any ":")))) ": ") (message)
           line-end))
   :modes (enh-ruby-mode ruby-mode)
+  :next-checkers ((warning . ruby-reek)
+                  (warning . ruby-rubylint)))
+
+;; Default to `nil' to let Reek find its configuration file by itself
+(flycheck-def-config-file-var flycheck-reekrc ruby-reek nil
+  :safe #'string-or-null-p
+  :package-version '(flycheck . "30"))
+
+(flycheck-define-checker ruby-reek
+  "A Ruby smell checker using reek.
+
+See URL `https://github.com/troessner/reek'."
+  :command ("reek" "--format" "json"
+            (config-file "--config" flycheck-reekrc)
+            source)
+  :error-parser flycheck-parse-reek
+  :modes (enh-ruby-mode ruby-mode)
   :next-checkers ((warning . ruby-rubylint)))
 
 ;; Default to `nil' to let Rubylint find its configuration file by itself, and
@@ -8833,7 +8894,7 @@ current versions of MRI and JRuby, but may break when used with
 other implementations or future versions of these
 implementations.
 
-Please consider using `ruby-rubocop' or `ruby-rubylint' instead.
+Please consider using `ruby-rubocop' or `ruby-reek' instead.
 
 See URL `https://www.ruby-lang.org/'."
   :command ("ruby" "-w" "-c")

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "git-annex" "20170120.931" "Mode for easy editing of git-annex'd files" 'nil :url "https://github.com/jwiegley/git-annex-el" :keywords '("files" "data" "git" "annex"))

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil nil ("git-annex.el") (22712 4649 811349 456000))
+;;;### (autoloads nil nil ("git-annex.el") (22792 62860 217550 482000))
 
 ;;;***

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "git-annex" "20170417.1653" "Mode for easy editing of git-annex'd files" 'nil :url "https://github.com/jwiegley/git-annex-el" :keywords '("files" "data" "git" "annex"))

@@ -5,7 +5,7 @@
 ;; Author: John Wiegley <jwiegley@gmail.com>
 ;; Created: 20 Oct 2012
 ;; Version: 1.1
-;; Package-Version: 20170120.931
+;; Package-Version: 20170417.1653
 ;; Keywords: files data git annex
 ;; X-URL: https://github.com/jwiegley/git-annex-el
 
@@ -38,6 +38,8 @@
 ;;     @ a    Add file to Git annex
 ;;     @ e    Edit an annexed file
 
+;;; Code:
+
 (eval-when-compile
   (require 'dired nil t)	      ; for variable dired-mode-map
   (require 'dired-aux nil t)	      ; for function dired-relist-file

File renamed without changes

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "highlight-indentation" "20161012.209" "Minor modes for highlighting indentation" 'nil :url "https://github.com/antonj/Highlight-Indentation-for-Emacs")

@@ -4,7 +4,7 @@
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
 ;;;### (autoloads nil "highlight-indentation" "highlight-indentation.el"
-;;;;;;  (22712 4612 94599 930000))
+;;;;;;  (22792 62859 737559 754000))
 ;;; Generated autoloads from highlight-indentation.el
 
 (autoload 'highlight-indentation-mode "highlight-indentation" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "highlight-indentation" "20170502.43" "Minor modes for highlighting indentation" 'nil :url "https://github.com/antonj/Highlight-Indentation-for-Emacs")

@@ -2,7 +2,7 @@
 ;; Author: Anton Johansson <anton.johansson@gmail.com> - http://antonj.se
 ;; Created: Dec 15 23:42:04 2010
 ;; Version: 0.7.0
-;; Package-Version: 20161012.209
+;; Package-Version: 20170502.43
 ;; URL: https://github.com/antonj/Highlight-Indentation-for-Emacs
 ;;
 ;; This program is free software; you can redistribute it and/or
@@ -146,6 +146,10 @@
          web-mode-html-offset)
         ((and (local-variable-p 'c-basic-offset) (boundp 'c-basic-offset))
          c-basic-offset)
+        ((and (eq major-mode 'yaml-mode) (boundp 'yaml-indent-offset))
+         yaml-indent-offset)
+        ((and (eq major-mode 'elixir-mode) (boundp 'elixir-smie-indent-basic))
+         elixir-smie-indent-basic)
         (t
          (default-value 'highlight-indentation-offset))))

Binary file

@@ -1,6 +1,6 @@
 ;;; colir.el --- Color blending library -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2016  Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>

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" (22753 9098 355401 989000))
+;;;### (autoloads nil "ivy" "ivy.el" (22792 62858 959574 782000))
 ;;; Generated autoloads from ivy.el
 
 (autoload 'ivy-resume "ivy" "\
@@ -116,7 +116,7 @@ Switch to another buffer in another window.
 ;;;***
 
 ;;;### (autoloads nil nil ("colir.el" "ivy-overlay.el" "ivy-pkg.el")
-;;;;;;  (22753 9098 352402 34000))
+;;;;;;  (22792 62858 956574 840000))
 
 ;;;***

File renamed without changes

@@ -1,6 +1,6 @@
-;;; ivy-overlay.el --- Overlay display functions for Ivy  -*- lexical-binding: t; -*-
+;;; ivy-overlay.el --- Overlay display functions for Ivy  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016  Oleh Krehel
+;; Copyright (C) 2016-2017  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; Keywords: convenience
@@ -77,6 +77,10 @@ Then attach the overlay the character before point."
 
 (declare-function org-current-level "org")
 (defvar org-indent-indentation-per-level)
+(defvar ivy-last)
+(defvar ivy-text)
+(defvar ivy-completion-beg)
+(declare-function ivy--get-window "ivy")
 
 (defun ivy-display-function-overlay (str)
   "Called from the minibuffer, display STR in an overlay in Ivy window.

File renamed without changes

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

@@ -1,10 +1,10 @@
 ;;; ivy.el --- Incremental Vertical completYon -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2016  Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.8.0
+;; Version: 0.9.1
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: matching
 
@@ -117,6 +117,10 @@
   '((t :inherit font-lock-builtin-face))
   "Face used by Ivy for displaying keys in `ivy-read-action'.")
 
+(defface ivy-highlight-face
+  '((t :inherit highlight))
+  "Face used by Ivy to highlight certain candidates.")
+
 (setcdr (assoc load-file-name custom-current-group-alist) 'ivy)
 
 (defcustom ivy-height 10
@@ -243,7 +247,7 @@ are about to be displayed, not on the whole collection."
 Each static source is a function that takes no argument and
 returns a list of strings.
 
-The '(original-source) determines the position of the original
+The (original-source) determines the position of the original
 dynamic source.
 
 Extra dynamic sources aren't supported yet.
@@ -401,7 +405,7 @@ of `history-length'.")
   "Store the index of the current candidate.")
 
 (defvar ivy-exit nil
-  "Store 'done if the completion was successfully selected.
+  "Store `done' if the completion was successfully selected.
 Otherwise, store nil.")
 
 (defvar ivy--all-candidates nil
@@ -457,7 +461,7 @@ When non-nil, it should contain at least one %d.")
   "Number of groups in the current `ivy--regex'.")
 
 (defvar ivy--full-length nil
-  "When :dynamic-collection is non-nil, this can be the total amount of candidates.")
+  "The total amount of candidates when :dynamic-collection is non-nil.")
 
 (defvar ivy--old-text ""
   "Store old `ivy-text' for dynamic completion.")
@@ -587,7 +591,7 @@ selection, non-nil otherwise."
              (action-idx (cl-position-if
                           (lambda (x) (equal (car x) key))
                           (cdr actions))))
-        (cond ((string= key "")
+        (cond ((member key '("" ""))
                nil)
               ((null action-idx)
                (message "%s is not bound" key)
@@ -615,8 +619,8 @@ selection, non-nil otherwise."
   (setq ivy-current-prefix-arg current-prefix-arg)
   (let ((actions (copy-sequence (ivy-state-action ivy-last))))
     (unwind-protect
-        (when (ivy-read-action)
-          (ivy-call))
+         (when (ivy-read-action)
+           (ivy-call))
       (ivy-set-action actions)))
   (ivy-shrink-after-dispatching))
 
@@ -757,11 +761,13 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
          (new (try-completion (if startp
                                   (substring postfix 1)
                                 postfix)
-                              (mapcar (lambda (str)
-                                        (let ((i (string-match postfix str)))
-                                          (when i
-                                            (substring str i))))
-                                      ivy--old-cands))))
+                              (if (ivy-state-dynamic-collection ivy-last)
+                                  ivy--all-candidates
+                                (mapcar (lambda (str)
+                                          (let ((i (string-match postfix str)))
+                                            (when i
+                                              (substring str i))))
+                                        ivy--old-cands)))))
     (cond ((eq new t) nil)
           ((string= new ivy-text) nil)
           (new
@@ -779,7 +785,9 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
   (interactive)
   (delete-minibuffer-contents)
   (insert (setf (ivy-state-current ivy-last)
-                (if ivy--directory
+                (if (and ivy--directory
+                         (not (eq (ivy-state-history ivy-last)
+                                  'grep-files-history)))
                     (expand-file-name ivy-text ivy--directory)
                   ivy-text)))
   (setq ivy-exit 'done)
@@ -1010,14 +1018,19 @@ Example use:
                     ;; Alist type.
                     ((and (consp collection)
                           (consp (car collection))
-                          ;; Previously, the cdr of the selected candidate would be returned.
-                          ;; Now, the whole candidate is returned.
+                          ;; Previously, the cdr of the selected
+                          ;; candidate would be returned.  Now, the
+                          ;; whole candidate is returned.
                           (let (idx)
-                            (if (setq idx (get-text-property 0 'idx (ivy-state-current ivy-last)))
+                            (if (setq idx (get-text-property
+                                           0 'idx (ivy-state-current ivy-last)))
                                 (nth idx collection)
-                              (assoc (ivy-state-current ivy-last) collection)))))
+                              (assoc (ivy-state-current ivy-last)
+                                     collection)))))
                     (ivy--directory
-                     (expand-file-name (ivy-state-current ivy-last) ivy--directory))
+                     (expand-file-name
+                      (ivy-state-current ivy-last)
+                      ivy--directory))
                     ((equal (ivy-state-current ivy-last) "")
                      ivy-text)
                     (t
@@ -1402,7 +1415,8 @@ Directories come first."
                     &key
                       predicate require-match initial-input
                       history preselect keymap update-fn sort
-                      action unwind re-builder matcher dynamic-collection caller)
+                      action unwind re-builder matcher
+                      dynamic-collection caller)
   "Read a string in the minibuffer, with completion.
 
 PROMPT is a format string, normally ending in a colon and a
@@ -1485,8 +1499,9 @@ customizations apply to the current completion session."
          (plist-get ivy--display-transformers-list
                     (or caller (and (functionp collection)
                                     collection))))
-        (ivy-display-function (unless (window-minibuffer-p)
-                                (cdr (assoc caller ivy-display-functions-alist)))))
+        (ivy-display-function
+         (unless (window-minibuffer-p)
+           (cdr (assoc caller ivy-display-functions-alist)))))
     (setq ivy-last
           (make-ivy-state
            :prompt prompt
@@ -1518,10 +1533,11 @@ customizations apply to the current completion session."
                (let* ((hist (or history 'ivy-history))
                       (minibuffer-completion-table collection)
                       (minibuffer-completion-predicate predicate)
-                      (resize-mini-windows (cond
-                                             ((display-graphic-p) nil)
-                                             ((null resize-mini-windows) 'grow-only)
-                                             (t resize-mini-windows))))
+                      (resize-mini-windows
+                       (cond
+                         ((display-graphic-p) nil)
+                         ((null resize-mini-windows) 'grow-only)
+                         (t resize-mini-windows))))
                  (read-from-minibuffer
                   prompt
                   (ivy-state-initial-input ivy-last)
@@ -1608,19 +1624,26 @@ This is useful for recursive `ivy-read'."
                         (not (equal initial-input "")))
                (cond ((file-directory-p initial-input)
                       (when (and (eq this-command 'dired-do-copy)
-                                 (equal (file-name-nondirectory initial-input) ""))
+                                 (equal (file-name-nondirectory initial-input)
+                                        ""))
                         (setf (ivy-state-preselect state) (setq preselect nil)))
                       (setq ivy--directory initial-input)
                       (setq initial-input nil)
                       (when preselect
-                        (let ((preselect-directory (file-name-directory preselect)))
+                        (let ((preselect-directory
+                               (file-name-directory preselect)))
                           (when (and preselect-directory
-                                     (not (equal (expand-file-name preselect-directory)
-                                                 (expand-file-name ivy--directory))))
-                            (setf (ivy-state-preselect state) (setq preselect nil))))))
-                     ((ignore-errors (file-exists-p (file-name-directory initial-input)))
+                                     (not (equal
+                                           (expand-file-name
+                                            preselect-directory)
+                                           (expand-file-name ivy--directory))))
+                            (setf (ivy-state-preselect state)
+                                  (setq preselect nil))))))
+                     ((ignore-errors
+                        (file-exists-p (file-name-directory initial-input)))
                       (setq ivy--directory (file-name-directory initial-input))
-                      (setf (ivy-state-preselect state) (file-name-nondirectory initial-input)))))
+                      (setf (ivy-state-preselect state)
+                            (file-name-nondirectory initial-input)))))
              (require 'dired)
              (when preselect
                (let ((preselect-directory (file-name-directory preselect)))
@@ -1725,7 +1748,7 @@ This is useful for recursive `ivy-read'."
          prompt)
         ((null ivy-count-format)
          (error
-          "`ivy-count-format' can't be nil.  Set it to an empty string instead"))
+          "`ivy-count-format' can't be nil.  Set it to \"\" instead"))
         ((string-match "%d.*%d" ivy-count-format)
          (let ((w (length (number-to-string
                            (length ivy--all-candidates))))
@@ -1834,14 +1857,16 @@ The previous string is between `ivy-completion-beg' and `ivy-completion-end'."
           (move-marker (overlay-get cursor 'mark) (point)))))))
 
 (defun ivy-completion-common-length (str)
-  "Return the length of the first 'completions-common-part face in STR."
+  "Return the length of the first `completions-common-part' face in STR."
   (let ((pos 0)
         (len (length str))
         face-sym)
     (while (and (<= pos len)
-                (let ((prop (or (prog1 (get-text-property pos 'face str)
+                (let ((prop (or (prog1 (get-text-property
+                                        pos 'face str)
                                   (setq face-sym 'face))
-                                (prog1 (get-text-property pos 'font-lock-face str)
+                                (prog1 (get-text-property
+                                        pos 'font-lock-face str)
                                   (setq face-sym 'font-lock-face)))))
                   (not (eq 'completions-common-part
                            (if (listp prop) (car prop) prop)))))
@@ -2229,7 +2254,9 @@ The returned value should be the updated PROMPT.")
             (setq n-str (concat n-str "\n")))
           (let ((regex (format "\\([^\n]\\{%d\\}\\)[^\n]" (window-width))))
             (while (string-match regex n-str)
-              (setq n-str (replace-match (concat (match-string 1 n-str) "\n") nil t n-str 1))))
+              (setq n-str (replace-match
+                           (concat (match-string 1 n-str) "\n")
+                           nil t n-str 1))))
           (set-text-properties 0 (length n-str)
                                `(face minibuffer-prompt ,@std-props)
                                n-str)
@@ -2279,10 +2306,6 @@ If SUBEXP is nil, the text properties are applied to the whole match."
          (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 "/")))
@@ -2291,7 +2314,12 @@ If SUBEXP is nil, the text properties are applied to the whole match."
                  (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)))))
+         (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))))
 
 (defcustom ivy-magic-tilde t
   "When non-nil, ~ will move home when selecting files.
@@ -2375,9 +2403,11 @@ Should be run via minibuffer `post-command-hook'."
           (let ((text-height (cdr (window-text-pixel-size)))
                 (body-height (window-body-height nil t)))
             (when (> text-height body-height)
-              ;; Note: the size increment needs to be at least frame-char-height,
-              ;; otherwise resizing won't do anything.
-              (let ((delta (max (- text-height body-height) (frame-char-height))))
+              ;; Note: the size increment needs to be at least
+              ;; frame-char-height, otherwise resizing won't do
+              ;; anything.
+              (let ((delta (max (- text-height body-height)
+                                (frame-char-height))))
                 (window-resize nil delta nil t t))))
         (let ((text-height (count-screen-lines))
               (body-height (window-body-height)))
@@ -2487,7 +2517,8 @@ CANDIDATES are assumed to be static."
                           ivy--old-cands)))
                       (t
                        (ivy--re-filter re candidates)))))
-        (if (memq (cdr (assoc (ivy-state-caller ivy-last) ivy-index-functions-alist))
+        (if (memq (cdr (assoc (ivy-state-caller ivy-last)
+                              ivy-index-functions-alist))
                   '(ivy-recompute-index-swiper
                     ivy-recompute-index-swiper-async))
             (progn
@@ -2517,8 +2548,9 @@ CANDIDATES are assumed to be static."
                    res))))
     (setq ivy--all-candidates res)))
 
-(defcustom ivy-sort-matches-functions-alist '((t . nil)
-                                              (ivy-switch-buffer . ivy-sort-function-buffer))
+(defcustom ivy-sort-matches-functions-alist
+  '((t . nil)
+    (ivy-switch-buffer . ivy-sort-function-buffer))
   "An alist of functions for sorting matching candidates.
 
 Unlike `ivy-sort-functions-alist', which is used to sort the
@@ -2603,14 +2635,14 @@ before substring matches."
         (setq re-prefix (concat "^" base-re)))
       (dolist (s candidates)
         (cond
-         ((and (assoc s ivy--virtual-buffers) (string-match re-prefix s))
-          (push s res-virtual-prefix))
-         ((assoc s ivy--virtual-buffers)
-          (push s res-virtual-noprefix))
-         ((string-match re-prefix s)
-          (push s res-prefix))
-         (t
-          (push s res-noprefix))))
+          ((and (assoc s ivy--virtual-buffers) (string-match re-prefix s))
+           (push s res-virtual-prefix))
+          ((assoc s ivy--virtual-buffers)
+           (push s res-virtual-noprefix))
+          ((string-match re-prefix s)
+           (push s res-prefix))
+          (t
+           (push s res-noprefix))))
       (nconc
        (nreverse res-prefix)
        (nreverse res-noprefix)
@@ -2742,7 +2774,8 @@ no sorting is done.")
 (defun ivy--flx-sort (name cands)
   "Sort according to closeness to string NAME the string list CANDS."
   (condition-case nil
-      (let* (;; an optimized regex for fuzzy matching
+      (let* (
+             ;; an optimized regex for fuzzy matching
              ;; "abc" → "\\`[^a]*a[^b]*b[^c]*c"
              (fuzzy-regex (if (= (elt name 0) ?^)
                               (concat "^"
@@ -2918,7 +2951,8 @@ SEPARATOR is used to join the candidates."
                          ((zerop i)
                           (car ivy-minibuffer-faces))
                          (t
-                          (nth (1+ (mod (+ i 2) (1- (length ivy-minibuffer-faces))))
+                          (nth (1+ (mod (+ i 2)
+                                        (1- (length ivy-minibuffer-faces))))
                                ivy-minibuffer-faces)))))
               (ivy-add-face-text-property
                (match-beginning i) (match-end i)
@@ -2987,13 +3021,15 @@ CANDS is a list of strings."
         virtual-buffers)
     (dolist (head (append
                    (copy-sequence recentf-list)
-                   (delq nil (mapcar (lambda (bookmark)
-                                       (let (file)
-                                         (when (setq file (assoc 'filename bookmark))
-                                           (unless (string= (cdr file) "   - no file -")
-                                             (cons (car bookmark)
-                                                   (cdr file))))))
-                                     bookmarks))))
+                   (delq nil (mapcar
+                              (lambda (bookmark)
+                                (let (file)
+                                  (when (setq file (assoc 'filename bookmark))
+                                    (unless (string= (cdr file)
+                                                     "   - no file -")
+                                      (cons (car bookmark)
+                                            (cdr file))))))
+                              bookmarks))))
       (let ((file-name (if (stringp head)
                            head
                          (cdr head)))
@@ -3005,7 +3041,8 @@ CANDS is a list of strings."
         (when (equal name "")
           (if (consp head)
               (setq name (car head))
-            (setq name (file-name-nondirectory (directory-file-name file-name)))))
+            (setq name (file-name-nondirectory
+                        (directory-file-name file-name)))))
         (and (not (equal name ""))
              (null (get-file-buffer file-name))
              (not (assoc name virtual-buffers))
@@ -3112,20 +3149,21 @@ Currently, the split configuration (i.e. horizonal or vertical)
 and point positions are saved, but the split positions aren't.
 Use `ivy-pop-view' to delete any item from `ivy-views'."
   (interactive)
-  (let* ((view (cl-labels ((ft (tr)
-                             (if (consp tr)
-                                 (if (eq (car tr) t)
-                                     (cons 'vert
-                                           (mapcar #'ft (cddr tr)))
-                                   (cons 'horz
-                                         (mapcar #'ft (cddr tr))))
-                               (with-current-buffer (window-buffer tr)
-                                 (cond ((buffer-file-name)
-                                        (list 'file (buffer-file-name) (point)))
-                                       ((eq major-mode 'dired-mode)
-                                        (list 'file default-directory (point)))
-                                       (t
-                                        (list 'buffer (buffer-name) (point))))))))
+  (let* ((view (cl-labels
+                   ((ft (tr)
+                      (if (consp tr)
+                          (if (eq (car tr) t)
+                              (cons 'vert
+                                    (mapcar #'ft (cddr tr)))
+                            (cons 'horz
+                                  (mapcar #'ft (cddr tr))))
+                        (with-current-buffer (window-buffer tr)
+                          (cond ((buffer-file-name)
+                                 (list 'file (buffer-file-name) (point)))
+                                ((eq major-mode 'dired-mode)
+                                 (list 'file default-directory (point)))
+                                (t
+                                 (list 'buffer (buffer-name) (point))))))))
                  (ft (car (window-tree)))))
          (view-name (ivy-read "Name view: " nil
                               :initial-input (ivy-default-view-name))))
@@ -3256,6 +3294,11 @@ BUFFER may be a string or nil."
     ivy--rename-buffer-action
     "rename")))
 
+(ivy-set-actions
+ t
+ '(("i" (lambda (x) (insert (if (stringp x) x (car x)))) "insert")
+   ("w" (lambda (x) (kill-new (if (stringp x) x (car x)))) "copy")))
+
 (defun ivy--switch-buffer-matcher (regexp candidates)
   "Return REGEXP-matching CANDIDATES.
 Skip buffers that match `ivy-ignore-buffers'."
@@ -3630,7 +3673,8 @@ EVENT gives the mouse position."
                (selected-window))
               (when (timerp ivy-occur-timer)
                 (cancel-timer ivy-occur-timer))
-              (setq ivy-occur-timer (run-at-time 1.0 nil 'swiper--cleanup))))))))
+              (setq ivy-occur-timer
+                    (run-at-time 1.0 nil 'swiper--cleanup))))))))
 
 (defun ivy-occur-press-and-switch ()
   (interactive)

Binary file

File renamed without changes

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

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

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

@@ -1,12 +1,12 @@
 ;;; ivy-hydra.el --- Additional key bindings for Ivy  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2016  Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170302.1033
-;; Version: 0.8.0
-;; Package-Requires: ((emacs "24.1") (ivy "0.8.0") (hydra "0.13.4"))
+;; Package-Version: 20170412.30
+;; Version: 0.9.1
+;; Package-Requires: ((emacs "24.1") (ivy "0.9.0") (hydra "0.13.4"))
 ;; Keywords: completion, matching, bindings
 
 ;; This file is part of GNU Emacs.
@@ -78,15 +78,25 @@ _h_ ^+^ _l_ | _d_one      ^ ^  | _o_ops   | _m_: matcher %-5s(ivy--matcher-desc)
         (lambda (_) (find-function 'hydra-ivy/body)))
        :exit t))
 
+(defvar ivy-dispatching-done-columns 2
+  "Number of columns to use if the hint does not fit on one line.")
+
 (defun ivy-dispatching-done-hydra ()
   "Select one of the available actions and call `ivy-done'."
   (interactive)
-  (let ((actions (ivy-state-action ivy-last)))
+  (let* ((actions (ivy-state-action ivy-last))
+         (estimated-len (+ 25 (length
+                               (mapconcat
+                                (lambda (x) (format "[%s] %s" (nth 0 x) (nth 2 x)))
+                                (cdr actions) ", "))))
+         (n-columns (if (> estimated-len (window-width))
+                        ivy-dispatching-done-columns
+                      nil)))
     (if (null (ivy--actionp actions))
         (ivy-done)
       (funcall
        (eval
-        `(defhydra ivy-read-action (:color teal)
+        `(defhydra ivy-read-action (:color teal :columns ,n-columns)
            "action"
            ,@(mapcar (lambda (x)
                        (list (nth 0 x)
@@ -95,7 +105,8 @@ _h_ ^+^ _l_ | _d_one      ^ ^  | _o_ops   | _m_: matcher %-5s(ivy--matcher-desc)
                                 (ivy-done))
                              (nth 2 x)))
                      (cdr actions))
-           ("M-o" nil "back")))))))
+           ("M-o" nil "back")
+           ("C-g" nil)))))))
 
 (define-key ivy-minibuffer-map (kbd "M-o") 'ivy-dispatching-done-hydra)

Binary file

@@ -1,172 +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: 322709
-
-Tag Table:
-(Indirect)
-Node: Top1222
-Node: Introduction6078
-Node: Installation10801
-Node: Installing from an Elpa Archive11141
-Node: Installing from the Git Repository12267
-Node: Post-Installation Tasks14933
-Node: Getting Started16187
-Node: Interface Concepts21572
-Node: Modes and Buffers21846
-Node: Switching Buffers23591
-Node: Naming Buffers28132
-Node: Quitting Windows30967
-Node: Automatic Refreshing of Magit Buffers32599
-Node: Automatic Saving of File-Visiting Buffers35367
-Node: Automatic Reverting of File-Visiting Buffers36552
-Node: Risk of Reverting Automatically41548
-Node: Sections43931
-Node: Section Movement44872
-Node: Section Visibility48799
-Node: Section Hooks52274
-Node: Section Types and Values54555
-Node: Section Options55825
-Node: Popup Buffers and Prefix Commands56297
-Node: Completion and Confirmation57611
-Node: Running Git60517
-Node: Viewing Git Output60753
-Node: Running Git Manually61753
-Node: Git Executable63879
-Node: Global Git Arguments65886
-Node: Inspecting66692
-Node: Status Buffer67839
-Node: Status Sections70725
-Node: Status Header Sections76604
-Node: Status Options79161
-Node: Repository List80915
-Node: Logging83073
-Node: Refreshing Logs85612
-Node: Log Buffer86997
-Node: Log Margin89857
-Node: Select from Log92497
-Node: Reflog94601
-Node: Cherries96125
-Node: Diffing97870
-Node: Refreshing Diffs100896
-Node: Diff Buffer103877
-Node: Diff Options106471
-Node: Revision Buffer109841
-Node: Ediffing110796
-Node: References Buffer114392
-Node: References Sections121691
-Node: Bisecting122566
-Node: Visiting Blobs124304
-Node: Blaming124813
-Node: Manipulating128242
-Node: Repository Setup128558
-Node: Staging and Unstaging129598
-Node: Staging from File-Visiting Buffers133687
-Node: Applying134855
-Node: Committing136748
-Node: Initiating a Commit137331
-Node: Editing Commit Messages140642
-Node: Branching151038
-Node: The Two Remotes151238
-Node: The Branch Popup153863
-Node: The Branch Config Popup163208
-Node: Merging169111
-Node: Resolving Conflicts171278
-Node: Rebasing176287
-Node: Editing Rebase Sequences179927
-Node: Information About In-Progress Rebase182957
-Ref: Information About In-Progress Rebase-Footnote-1189793
-Node: Cherry Picking190379
-Node: Reverting191984
-Node: Resetting193347
-Node: Stashing194858
-Node: Transferring199052
-Node: Remotes199290
-Node: Fetching200568
-Node: Pulling201933
-Node: Pushing202778
-Node: Creating and Sending Patches207521
-Node: Applying Patches208216
-Node: Miscellaneous209213
-Node: Tagging209516
-Node: Notes210300
-Node: Submodules212824
-Node: Listing Submodules213038
-Node: Submodule Popup214857
-Node: Subtree216140
-Node: Common Commands217387
-Node: Wip Modes219132
-Node: Minor Mode for Buffers Visiting Files225928
-Node: Minor Mode for Buffers Visiting Blobs229402
-Node: Customizing230215
-Node: Per-Repository Configuration231887
-Node: Essential Settings233534
-Node: Safety233858
-Node: Performance235691
-Node: Plumbing243653
-Node: Calling Git244477
-Node: Getting a Value from Git246000
-Node: Calling Git for Effect249104
-Node: Section Plumbing255622
-Node: Creating Sections255850
-Node: Section Selection259749
-Node: Matching Sections261429
-Node: Refreshing Buffers266861
-Node: Conventions269996
-Node: Confirmation and Completion270173
-Node: Theming Faces271071
-Node: FAQ279222
-Node: FAQ - How to …?279615
-Node: How to show git's output?279979
-Node: How to install the gitman info manual?280733
-Node: How to show diffs for gpg-encrypted files?281703
-Node: How does branching and pushing work?282299
-Node: Can Magit be used as ‘ediff-version-control-package’?282678
-Node: FAQ - Issues and Errors284674
-Node: Magit is slow285418
-Node: I changed several thousand files at once and now Magit is unusable285643
-Node: I am having problems committing286383
-Node: I am using MS Windows and cannot push with Magit286864
-Node: I am using OS X and SOMETHING works in shell but not in Magit287481
-Node: Diffs contain control sequences288287
-Node: Expanding a file to show the diff causes it to disappear289361
-Node: Point is wrong in the ‘COMMIT_EDITMSG’ buffer289918
-Node: The mode-line information isn't always up-to-date290970
-Node: Emacs 245 hangs when loading Magit292037
-Node: Keystroke Index292587
-Node: Command Index322709
-Node: Function Index352937
-Node: Variable Index366247
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:

@@ -120,6 +120,7 @@ Contributors
 - Hans-Peter Deifel <hpdeifel@gmx.de>
 - Ian Eure <ian.eure@gmail.com>
 - Ingo Lohmar <i.lohmar@gmail.com>
+- Ioan-Adrian Ratiu <adi@adirat.com>
 - Ivan Brennan <ivan.brennan@gmail.com>
 - Jan Tatarik <jan.tatarik@xing.com>
 - Jasper St. Pierre <jstpierre@mecheye.net>
@@ -226,6 +227,7 @@ Contributors
 - Sanjoy Das <sanjoy@playingwithpointers.com>
 - Sean Allred <code@seanallred.com>
 - Sean Bryant <sbryant@hackinggibsons.com>
+- Sean Whitton <spwhitton@spwhitton.name>
 - Sebastian Wiesner <lunaryorn@gmail.com>
 - Sébastien Gross <seb@chezwam.org>
 - Seong-Kook Shin <cinsky@gmail.com>

File renamed without changes

@@ -42,7 +42,7 @@
 (defvar auto-revert-verbose)
 ;; For `magit-stage-untracked'
 (declare-function magit-submodule-add 'magit-submodule)
-(declare-function magit-submodule-read-name 'magit-submodule)
+(declare-function magit-submodule-read-name-for-path 'magit-submodule)
 
 (require 'dired)
 
@@ -281,9 +281,10 @@ ignored) files.
         (magit-submodule-add
          (let ((default-directory
                  (file-name-as-directory (expand-file-name repo))))
-           (magit-get "remote" (or (magit-get-remote) "origin") "url"))
+           (or (magit-get "remote" (or (magit-get-remote) "origin") "url")
+               (concat (file-name-as-directory ".") repo)))
          repo
-         (magit-submodule-read-name repo))))
+         (magit-submodule-read-name-for-path repo))))
     (magit-wip-commit-after-apply files " after stage")))
 
 ;;;; Unstage

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" (22753 9096 323432
-;;;;;;  572000))
+;;;### (autoloads nil "git-rebase" "git-rebase.el" (22792 62855 367644
+;;;;;;  155000))
 ;;; 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" (22753 9096 340432 316000))
+;;;### (autoloads nil "magit" "magit.el" (22792 62855 385643 807000))
 ;;; Generated autoloads from magit.el
  (autoload 'magit-merge-popup "magit" nil t)
 
@@ -131,42 +131,57 @@ defaulting to the tag at point.
  (autoload 'magit-run-popup "magit" nil t)
 
 (autoload 'magit-git-command "magit" "\
-Execute a Git subcommand asynchronously, displaying the output.
-With a prefix argument run Git in the root of the current
-repository, otherwise in `default-directory'.
+Execute COMMAND asynchonously; display output.
 
-\(fn ARGS DIRECTORY)" t nil)
+Interactively, prompt for COMMAND in the minibuffer. \"git \" is
+used as initial input, but can be deleted to run another command.
+
+With a prefix argument COMMAND is run in the top-level directory
+of the current working tree, otherwise in `default-directory'.
+
+\(fn COMMAND)" t nil)
 
 (autoload 'magit-git-command-topdir "magit" "\
-Execute a Git subcommand asynchronously, displaying the output.
-Run Git in the top-level directory of the current repository.
+Execute COMMAND asynchonously; display output.
 
-\(fn)" t nil)
+Interactively, prompt for COMMAND in the minibuffer. \"git \" is
+used as initial input, but can be deleted to run another command.
+
+COMMAND is run in the top-level directory of the current
+working tree.
+
+\(fn COMMAND)" t nil)
 
 (autoload 'magit-shell-command "magit" "\
-Execute a shell command asynchronously, displaying the output.
-With a prefix argument run the command in the root of the current
-repository, otherwise in `default-directory'.
+Execute COMMAND asynchonously; display output.
 
-\(fn CMD DIRECTORY)" t nil)
+Interactively, prompt for COMMAND in the minibuffer.  With a
+prefix argument COMMAND is run in the top-level directory of
+the current working tree, otherwise in `default-directory'.
+
+\(fn COMMAND)" t nil)
 
 (autoload 'magit-shell-command-topdir "magit" "\
-Execute a shell command asynchronously, displaying the output.
-Run the command in the top-level directory of the current repository.
+Execute COMMAND asynchonously; display output.
 
-\(fn)" t nil)
+Interactively, prompt for COMMAND in the minibuffer.  COMMAND
+is run in the top-level directory of the current working tree.
+
+\(fn COMMAND)" t nil)
 
 (autoload 'magit-version "magit" "\
 Return the version of Magit currently in use.
-When called interactive also show the used versions of Magit,
-Git, and Emacs in the echo area.
+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.
 
-\(fn)" t nil)
+\(fn &optional PRINT-DEST)" t nil)
 
 ;;;***
 
-;;;### (autoloads nil "magit-apply" "magit-apply.el" (22753 9096
-;;;;;;  328432 497000))
+;;;### (autoloads nil "magit-apply" "magit-apply.el" (22792 62855
+;;;;;;  373644 39000))
 ;;; Generated autoloads from magit-apply.el
 
 (autoload 'magit-stage-file "magit-apply" "\
@@ -202,8 +217,8 @@ Remove all changes from the staging area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22753
-;;;;;;  9096 314432 707000))
+;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22792
+;;;;;;  62855 358644 328000))
 ;;; Generated autoloads from magit-autorevert.el
 
 (defvar magit-revert-buffers t)
@@ -232,8 +247,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
 
 ;;;***
 
-;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22753 9096
-;;;;;;  327432 512000))
+;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22792 62855
+;;;;;;  372644 58000))
 ;;; Generated autoloads from magit-bisect.el
  (autoload 'magit-bisect-popup "magit-bisect" nil t)
 
@@ -284,8 +299,8 @@ bisect run'.
 
 ;;;***
 
-;;;### (autoloads nil "magit-blame" "magit-blame.el" (22753 9096
-;;;;;;  338432 346000))
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (22792 62855
+;;;;;;  383643 846000))
 ;;; Generated autoloads from magit-blame.el
  (autoload 'magit-blame-popup "magit-blame" nil t)
 
@@ -309,8 +324,8 @@ only arguments available from `magit-blame-popup' should be used.
 
 ;;;***
 
-;;;### (autoloads nil "magit-branch" "magit-branch.el" (22753 9096
-;;;;;;  326432 527000))
+;;;### (autoloads nil "magit-branch" "magit-branch.el" (22792 62855
+;;;;;;  371644 78000))
 ;;; Generated autoloads from magit-branch.el
  (autoload 'magit-branch-popup "magit" nil t)
 
@@ -538,8 +553,8 @@ When `never' (the default) then the variable is never set.
 
 ;;;***
 
-;;;### (autoloads nil "magit-commit" "magit-commit.el" (22753 9096
-;;;;;;  315432 692000))
+;;;### (autoloads nil "magit-commit" "magit-commit.el" (22792 62855
+;;;;;;  359644 309000))
 ;;; Generated autoloads from magit-commit.el
 
 (autoload 'magit-commit "magit-commit" "\
@@ -621,8 +636,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
 
 ;;;***
 
-;;;### (autoloads nil "magit-diff" "magit-diff.el" (22753 9096 337432
-;;;;;;  361000))
+;;;### (autoloads nil "magit-diff" "magit-diff.el" (22792 62855 382643
+;;;;;;  865000))
 ;;; Generated autoloads from magit-diff.el
 
 (autoload 'magit-diff-popup "magit-diff" "\
@@ -706,8 +721,8 @@ for a revision.
 
 ;;;***
 
-;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22753 9096
-;;;;;;  333432 421000))
+;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22792 62855
+;;;;;;  378643 942000))
 ;;; Generated autoloads from magit-ediff.el
  (autoload 'magit-ediff-popup "magit-ediff" nil t)
 
@@ -795,8 +810,8 @@ stash that were staged.
 
 ;;;***
 
-;;;### (autoloads nil "magit-extras" "magit-extras.el" (22753 9096
-;;;;;;  316432 677000))
+;;;### (autoloads nil "magit-extras" "magit-extras.el" (22792 62855
+;;;;;;  360644 290000))
 ;;; Generated autoloads from magit-extras.el
 
 (autoload 'magit-run-git-gui "magit-extras" "\
@@ -898,8 +913,8 @@ on a position in a file-visiting buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-files" "magit-files.el" (22753 9096
-;;;;;;  324432 557000))
+;;;### (autoloads nil "magit-files" "magit-files.el" (22792 62855
+;;;;;;  368644 135000))
 ;;; Generated autoloads from magit-files.el
 
 (autoload 'magit-find-file "magit-files" "\
@@ -946,8 +961,8 @@ Checkout FILE from REV.
 
 ;;;***
 
-;;;### (autoloads nil "magit-log" "magit-log.el" (22753 9096 334432
-;;;;;;  407000))
+;;;### (autoloads nil "magit-log" "magit-log.el" (22792 62855 379643
+;;;;;;  923000))
 ;;; Generated autoloads from magit-log.el
 
 (autoload 'magit-log-buffer-file-popup "magit-log" "\
@@ -1029,15 +1044,15 @@ Show commits in a branch that are not merged in the upstream branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-notes" "magit-notes.el" (22753 9096
-;;;;;;  348432 196000))
+;;;### (autoloads nil "magit-notes" "magit-notes.el" (22792 62855
+;;;;;;  394643 633000))
 ;;; Generated autoloads from magit-notes.el
  (autoload 'magit-notes-popup "magit" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "magit-refs" "magit-refs.el" (22753 9096 317432
-;;;;;;  662000))
+;;;### (autoloads nil "magit-refs" "magit-refs.el" (22792 62855 361644
+;;;;;;  271000))
 ;;; Generated autoloads from magit-refs.el
  (autoload 'magit-show-refs-popup "magit" nil t)
 
@@ -1062,8 +1077,8 @@ Refs are compared with a branch read from the user.
 
 ;;;***
 
-;;;### (autoloads nil "magit-remote" "magit-remote.el" (22753 9096
-;;;;;;  344432 256000))
+;;;### (autoloads nil "magit-remote" "magit-remote.el" (22792 62855
+;;;;;;  389643 730000))
 ;;; Generated autoloads from magit-remote.el
 
 (autoload 'magit-clone "magit-remote" "\
@@ -1244,11 +1259,11 @@ To add this command to the push popup add this to your init file:
 
   (with-eval-after-load \\='magit-remote
     (magit-define-popup-action \\='magit-push-popup ?P
-      'magit-push-implicitly--desc
-      'magit-push-implicitly ?p t))
+      \\='magit-push-implicitly--desc
+      \\='magit-push-implicitly ?p t))
 
 The function `magit-push-implicitly--desc' attempts to predict
-what this command will do, the value it returns is displayed in
+what this command will do.  The value it returns is displayed in
 the popup buffer.
 
 \(fn ARGS)" t nil)
@@ -1268,8 +1283,8 @@ To add this command to the push popup add this to your init file:
 
   (with-eval-after-load \\='magit-remote
     (magit-define-popup-action \\='magit-push-popup ?r
-      'magit-push-to-remote--desc
-      'magit-push-to-remote ?p t))
+      \\='magit-push-to-remote--desc
+      \\='magit-push-to-remote ?p t))
 
 \(fn REMOTE ARGS)" t nil)
  (autoload 'magit-patch-popup "magit-remote" nil t)
@@ -1295,8 +1310,8 @@ is asked to pull.  START has to be reachable from that commit.
 
 ;;;***
 
-;;;### (autoloads nil "magit-repos" "magit-repos.el" (22753 9096
-;;;;;;  336432 376000))
+;;;### (autoloads nil "magit-repos" "magit-repos.el" (22792 62855
+;;;;;;  381643 884000))
 ;;; Generated autoloads from magit-repos.el
 
 (autoload 'magit-list-repositories "magit-repos" "\
@@ -1310,8 +1325,8 @@ control which repositories are displayed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22753
-;;;;;;  9096 342432 286000))
+;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22792
+;;;;;;  62855 387643 768000))
 ;;; Generated autoloads from magit-sequence.el
 
 (autoload 'magit-sequencer-continue "magit-sequence" "\
@@ -1461,8 +1476,8 @@ Abort the current rebase operation, restoring the original branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-stash" "magit-stash.el" (22753 9096
-;;;;;;  331432 452000))
+;;;### (autoloads nil "magit-stash" "magit-stash.el" (22792 62855
+;;;;;;  376643 981000))
 ;;; Generated autoloads from magit-stash.el
  (autoload 'magit-stash-popup "magit-stash" nil t)
 
@@ -1561,8 +1576,8 @@ Show all diffs of a stash in a buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-status" "magit-status.el" (22753 9096
-;;;;;;  335432 391000))
+;;;### (autoloads nil "magit-status" "magit-status.el" (22792 62855
+;;;;;;  380643 903000))
 ;;; Generated autoloads from magit-status.el
 
 (autoload 'magit-init "magit-status" "\
@@ -1593,8 +1608,8 @@ then offer to initialize it as a new repository.
 
 ;;;***
 
-;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22753
-;;;;;;  9096 349432 181000))
+;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22792
+;;;;;;  62855 395643 614000))
 ;;; Generated autoloads from magit-submodule.el
  (autoload 'magit-submodule-popup "magit-submodule" nil t)
 
@@ -1610,7 +1625,7 @@ PATH also becomes the name.
 
 \(fn URL &optional PATH NAME)" t nil)
 
-(autoload 'magit-submodule-read-name "magit-submodule" "\
+(autoload 'magit-submodule-read-name-for-path "magit-submodule" "\
 
 
 \(fn PATH)" nil nil)
@@ -1684,8 +1699,8 @@ Display a list of the current repository's submodules.
 
 ;;;***
 
-;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22753 9096
-;;;;;;  325432 542000))
+;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22792 62855
+;;;;;;  369644 116000))
 ;;; Generated autoloads from magit-subtree.el
  (autoload 'magit-subtree-popup "magit-subtree" nil t)
 
@@ -1721,12 +1736,13 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-utils" "magit-utils.el" (22753 9096
-;;;;;;  313432 723000))
+;;;### (autoloads nil "magit-utils" "magit-utils.el" (22792 62855
+;;;;;;  356644 367000))
 ;;; Generated autoloads from magit-utils.el
 
 (autoload 'magit-emacs-Q-command "magit-utils" "\
-
+Show a shell command that runs an uncustomized Emacs with only Magit loaded.
+See info node `(magit)Debugging Tools' for more information.
 
 \(fn)" t nil)
 
@@ -1746,8 +1762,8 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-wip" "magit-wip.el" (22753 9096 319432
-;;;;;;  632000))
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (22792 62855 363644
+;;;;;;  232000))
 ;;; Generated autoloads from magit-wip.el
 
 (defvar magit-wip-after-save-mode nil "\
@@ -1815,8 +1831,8 @@ command which is about to be called are committed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22753
-;;;;;;  9096 346432 226000))
+;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22792
+;;;;;;  62855 392643 672000))
 ;;; Generated autoloads from magit-worktree.el
 
 (autoload 'magit-worktree-checkout "magit-worktree" "\
@@ -1833,7 +1849,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") (22753 9096 345432 241000))
+;;;;;;  "magit-section.el") (22792 62855 391643 691000))
 
 ;;;***

File renamed without changes

@@ -172,7 +172,7 @@ bisect run'."
       (magit-insert-heading "Bisect Rest:")
       (magit-git-wash (apply-partially 'magit-log-wash-log 'bisect-vis)
         "bisect" "visualize" "git" "log"
-        "--format=%h%d %s" "--decorate=full"
+        "--format=%h%d%x00%s" "--decorate=full"
         (and magit-bisect-show-graph "--graph")))))
 
 (defun magit-insert-bisect-log ()

Binary file

@@ -73,8 +73,6 @@ and then turned on again when turning off the latter."
   :group 'magit-blame
   :type '(repeat (symbol :tag "Mode")))
 
-(make-variable-buffer-local 'magit-blame-disabled-modes)
-
 (defcustom magit-blame-mode-lighter " Blame"
   "The mode-line lighter of the Magit-Blame mode."
   :group 'magit-blame
@@ -155,6 +153,7 @@ and then turned on again when turning off the latter."
 
 (defvar-local magit-blame-buffer-read-only nil)
 (defvar-local magit-blame-cache nil)
+(defvar-local magit-blame-disabled-modes nil)
 (defvar-local magit-blame-process nil)
 (defvar-local magit-blame-recursive-p nil)
 (defvar-local magit-blame-separator nil)

Binary file

File renamed without changes

@@ -1131,10 +1131,23 @@ treated as such.")
   (funcall magit-display-file-buffer-function buffer))
 
 (defun magit-display-file-buffer-traditional (buffer)
+  "Display BUFFER in the current window.
+With a prefix argument display it in another 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))
       (pop-to-buffer buffer)
     (switch-to-buffer buffer)))
 
+(defun magit-display-file-buffer-other-window (buffer)
+  "Display BUFFER in another window.
+With a prefix argument display it 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))
+      (switch-to-buffer buffer)
+    (pop-to-buffer buffer)))
+
 (defun magit-diff-visit-file-worktree (file &optional other-window)
   "From a diff, visit the corresponding file at the appropriate position.
 
@@ -1825,7 +1838,7 @@ or a ref which is not a branch, then it inserts nothing."
   (magit-insert-section (headers)
     ;; Before v2.2.0, "%D" was not supported.
     (--when-let (magit-rev-format "%d" rev "--decorate=full")
-      (insert (magit-format-ref-labels (substring it 2 -1)) ?\s))
+      (insert (magit-format-ref-labels it) ?\s))
     (insert (propertize (magit-rev-parse (concat rev "^{commit}"))
                         'face 'magit-hash))
     (magit-insert-heading)

Binary file

File renamed without changes

@@ -43,8 +43,6 @@
 
 (defvar magit-tramp-process-environment nil)
 
-(require 'crm)
-
 ;;; Options
 
 ;; For now this is shared between `magit-process' and `magit-git'.
@@ -56,6 +54,18 @@
   (list (format "INSIDE_EMACS=%s,magit" emacs-version))
   "Prepended to `process-environment' while running git.")
 
+(defcustom magit-git-output-coding-system
+  (and (eq system-type 'windows-nt) 'utf-8)
+  "Coding system for receiving output from Git.
+
+If non-nil, the Git config value `i18n.logOutputEncoding' should
+be set via `magit-git-global-arguments' to value consistent with
+this."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-process
+  :type '(choice (coding-system :tag "Coding system to decode Git output")
+                 (const :tag "Use system default" nil)))
+
 (defcustom magit-git-executable
   ;; Git might be installed in a different location on a remote, so
   ;; it is better not to use the full path to the executable, except
@@ -182,6 +192,31 @@ change the upstream and many which create new branches."
   :group 'magit-commands
   :type 'boolean)
 
+(defcustom magit-list-refs-sortby nil
+  "How to sort the ref collection in the prompt.
+
+This affects commands that read a ref.  More specifically, it
+controls the order of refs returned by `magit-list-refs', which
+is called by functions like `magit-list-branch-names' to generate
+the collection of refs.  By default, refs are sorted according to
+their full refname (i.e., 'refs/...').
+
+Any value accepted by the `--sort' flag of `git for-each-ref' can
+be used.  For example, \"-creatordate\" places refs with more
+recent committer or tagger dates earlier in the list.  A list of
+strings can also be given in order to pass multiple sort keys to
+`git for-each-ref'.
+
+Note that, depending on the completion framework you use, this
+may not be sufficient to change the order in which the refs are
+displayed.  It only controls the order of the collection passed
+to `magit-completing-read' or, for commands that support reading
+multiple strings, `read-from-minibuffer'.  The completion
+framework ultimately determines how the collection is displayed."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-miscellanous
+  :type '(choice string (repeat string)))
+
 ;;; Git
 
 (defvar magit--refresh-cache nil)
@@ -289,9 +324,12 @@ add a section in the respective process buffer."
                       (setq msg (with-temp-buffer
                                   (insert-file-contents log)
                                   (goto-char (point-max))
-                                  (and (re-search-backward
-                                        magit-process-error-message-re nil t)
-                                       (match-string 1))))
+                                  (cond
+                                   ((functionp magit-git-debug)
+                                    (funcall magit-git-debug (buffer-string)))
+                                   ((re-search-backward
+                                     magit-process-error-message-re nil t)
+                                    (match-string 1)))))
                       (let ((magit-git-debug nil))
                         (with-current-buffer (magit-process-buffer t)
                           (magit-process-insert-section default-directory
@@ -671,7 +709,10 @@ Sorted from longest to shortest CYGWIN name."
 
 (defun magit-decode-git-path (path)
   (if (eq (aref path 0) ?\")
-      (string-as-multibyte (read path))
+      (decode-coding-string (read path)
+                            (or magit-git-output-coding-system
+                                (car default-process-coding-system))
+                            t)
     path))
 
 (defun magit-file-at-point ()
@@ -849,7 +890,8 @@ string \"true\", otherwise return nil."
         (commit (let ((rev (magit-section-value it)))
                   (or (magit-get-shortname rev) rev)))
         (tag    (magit-section-value it)))
-      (and (derived-mode-p 'magit-revision-mode)
+      (and (derived-mode-p 'magit-revision-mode
+                           'magit-merge-preview-mode)
            (car magit-refresh-args))))
 
 (defun magit-tag-at-point ()
@@ -1002,12 +1044,27 @@ where COMMITS is the number of commits in TAG but not in REV."
 (defvar magit-list-refs-namespaces
   '("refs/heads" "refs/remotes" "refs/tags" "refs/pull"))
 
-(defun magit-list-refs (&rest args)
-  (magit-git-lines "for-each-ref" "--format=%(refname)"
-                   (or args magit-list-refs-namespaces)))
+(defun magit-list-refs (&optional namespaces format sortby)
+  "Return list of references.
+
+When NAMESPACES is non-nil, list refs from these namespaces
+rather than those from `magit-list-refs-namespaces'.
+
+FORMAT is passed to the `--format' flag of `git for-each-ref' and
+defaults to \"%(refname)\".
+
+SORTBY is a key or list of keys to pass to the `--sort' flag of
+`git for-each-ref'.  When nil, use `magit-list-refs-sortby'"
+  (magit-git-lines "for-each-ref"
+                   (concat "--format=" (or format "%(refname)"))
+                   (--map (concat "--sort=" it)
+                          (pcase (or sortby magit-list-refs-sortby)
+                            ((and val (pred stringp)) (list val))
+                            ((and val (pred listp)) val)))
+                   (or namespaces magit-list-refs-namespaces)))
 
 (defun magit-list-branches ()
-  (magit-list-refs "refs/heads" "refs/remotes"))
+  (magit-list-refs (list "refs/heads" "refs/remotes")))
 
 (defun magit-list-local-branches ()
   (magit-list-refs "refs/heads"))
@@ -1035,12 +1092,11 @@ where COMMITS is the number of commits in TAG but not in REV."
               (member it (magit-list-unmerged-branches upstream)))
             (magit-list-local-branch-names)))
 
-(defun magit-list-refnames (&rest args)
-  (magit-git-lines "for-each-ref" "--format=%(refname:short)"
-                   (or args magit-list-refs-namespaces)))
+(defun magit-list-refnames (&optional namespaces)
+  (magit-list-refs namespaces "%(refname:short)"))
 
 (defun magit-list-branch-names ()
-  (magit-list-refnames "refs/heads" "refs/remotes"))
+  (magit-list-refnames (list "refs/heads" "refs/remotes")))
 
 (defun magit-list-local-branch-names ()
   (magit-list-refnames "refs/heads"))
@@ -1090,6 +1146,18 @@ where COMMITS is the number of commits in TAG but not in REV."
                  (list (match-string 1 it)))
             (magit-git-items "ls-files" "-z" "--stage")))
 
+(defun magit-get-submodule-name (path)
+  "Return the name of the submodule at PATH.
+PATH has to be relative to the super-repository."
+  (cadr (split-string
+         (car (or (magit-git-items
+                   "config" "-z"
+                   "-f" (expand-file-name ".gitmodules" (magit-toplevel))
+                   "--get-regexp" "^submodule\\..*\\.path$"
+                   (concat "^" (regexp-quote (directory-file-name path)) "$"))
+                  (error "No such submodule `%s'" path)))
+         "\n")))
+
 (defun magit-list-worktrees ()
   (let (worktrees worktree)
     (dolist (line (let ((magit-git-global-arguments
@@ -1220,8 +1288,15 @@ Return a list of two integers: (A>B B>A)."
                   'face (if (equal ref head) 'magit-branch-current face)))))
 
 (defun magit-format-ref-labels (string)
+  ;; To support Git <2.2.0, we remove the surrounding parentheses here
+  ;; rather than specifying that STRING should be generated with Git's
+  ;; "%D" placeholder.
+  (setq string (->> string
+                    (replace-regexp-in-string "\\`\\s-*(" "")
+                    (replace-regexp-in-string ")\\s-*\\'" "")))
   (save-match-data
-    (let ((regexp "\\(, \\|tag: \\| -> \\|[()]\\)") head names)
+    (let ((regexp "\\(, \\|tag: \\| -> \\)")
+          head names)
       (if (and (derived-mode-p 'magit-log-mode)
                (member "--simplify-by-decoration" (cadr magit-refresh-args)))
           (let ((branches (magit-list-local-branch-names))
@@ -1282,7 +1357,9 @@ Return a list of two integers: (A>B B>A)."
 (defun magit-commit-tree (message &optional tree &rest parents)
   (magit-git-string "commit-tree" "--no-gpg-sign" "-m" message
                     (--mapcat (list "-p" it) (delq nil parents))
-                    (or tree (magit-git-string "write-tree"))))
+                    (or tree
+                        (magit-git-string "write-tree")
+                        (error "Cannot write tree"))))
 
 (defun magit-commit-worktree (message &optional arg &rest other-parents)
   (magit-with-temp-index "HEAD" arg
@@ -1355,21 +1432,10 @@ Return a list of two integers: (A>B B>A)."
        (magit-get-current-branch))))
 
 (defun magit-read-range (prompt &optional default)
-  (let* ((choose-completion-string-functions
-          '(crm--choose-completion-string))
-         (minibuffer-completion-table #'crm--collection-fn)
-         (minibuffer-completion-confirm t)
-         (crm-completion-table (magit-list-refnames))
-         (crm-separator "\\.\\.\\.?")
-         (input (read-from-minibuffer
-                 (concat prompt (and default (format " (%s)" default)) ": ")
-                 nil crm-local-completion-map
-                 nil 'magit-revision-history
-                 default)))
-    (when (string-equal input "")
-      (or (setq input default)
-          (user-error "Nothing selected")))
-    input))
+  (magit-completing-read-multiple prompt
+                                  (magit-list-refnames)
+                                  "\\.\\.\\.?"
+                                  default 'magit-revision-history))
 
 (defun magit-read-remote-branch
     (prompt &optional remote default local-branch require-match)

Binary file

@@ -559,27 +559,18 @@ buffer."
 
 (defun magit-log-read-revs (&optional use-current)
   (or (and use-current (--when-let (magit-get-current-branch) (list it)))
-      (let* ((choose-completion-string-functions
-              '(crm--choose-completion-string))
-             (minibuffer-completion-table #'crm--collection-fn)
-             (minibuffer-completion-confirm t)
-             (crm-completion-table
-              `(,@(and (file-exists-p (magit-git-dir "FETCH_HEAD"))
-                       (list "FETCH_HEAD"))
-                ,@(magit-list-refnames)))
-             (crm-separator "\\(\\.\\.\\.?\\|[, ]\\)")
-             (default (or (magit-branch-or-commit-at-point)
-                          (unless use-current
-                            (magit-get-previous-branch))))
-             (input (read-from-minibuffer
-                     (format "Log rev,s%s: "
-                             (if default (format " (%s)" default) ""))
-                     nil magit-log-read-revs-map
-                     nil 'magit-revision-history default)))
-        (when (string-equal input "")
-          (or (setq input default)
-              (user-error "Nothing selected")))
-        (split-string input "[, ]" t))))
+      (let ((collection `(,@(and (file-exists-p (magit-git-dir "FETCH_HEAD"))
+                                 (list "FETCH_HEAD"))
+                          ,@(magit-list-refnames))))
+        (split-string
+         (magit-completing-read-multiple "Log rev,s" collection
+                                         "\\(\\.\\.\\.?\\|[, ]\\)"
+                                         (or (magit-branch-or-commit-at-point)
+                                             (unless use-current
+                                               (magit-get-previous-branch)))
+                                         'magit-revision-history
+                                         magit-log-read-revs-map)
+         "[, ]" t))))
 
 ;;;###autoload
 (defun magit-log-current (revs &optional args files)
@@ -837,7 +828,7 @@ Do not add this to a hook variable."
          (remove "--literal-pathspecs" magit-git-global-arguments)))
     (magit-git-wash (apply-partially #'magit-log-wash-log 'log)
       "log"
-      (format "--format=%%h%s %s[%%aN][%%at]%%s%s"
+      (format "--format=%%h%s%%x00%s%%x00%%aN%%x00%%at%%x00%%s%s"
               (if (member "--decorate" args) "%d" "")
               (if (member "--show-signature" args)
                   (progn (setq args (remove "--show-signature" args)) "%G?")
@@ -872,11 +863,11 @@ Do not add this to a hook variable."
 (defconst magit-log-heading-re
   (concat "^"
           "\\(?4:[-_/|\\*o. ]*\\)"                 ; graph
-          "\\(?1:[0-9a-fA-F]+\\) "                 ; sha1
-          "\\(?:\\(?3:([^()]+)\\) \\)?"            ; refs
-          "\\(?7:[BGUXYREN]\\)?"                   ; gpg
-          "\\[\\(?5:[^]]*\\)\\]"                   ; author
-          "\\[\\(?6:[^]]*\\)\\]"                   ; date
+          "\\(?1:[0-9a-fA-F]+\\)"                  ; sha1
+          "\\(?3:[^\0]+)\\)?\0"                    ; refs
+          "\\(?7:[BGUXYREN]\\)?\0"                 ; gpg
+          "\\(?5:[^\0]*\\)\0"                      ; author
+          "\\(?6:[^\0]+\\)\0"                      ; date
           "\\(?2:.*\\)$"))                         ; msg
 
 (defconst magit-log-cherry-re
@@ -894,8 +885,8 @@ Do not add this to a hook variable."
 (defconst magit-log-bisect-vis-re
   (concat "^"
           "\\(?4:[-_/|\\*o. ]*\\)"                 ; graph
-          "\\(?1:[0-9a-fA-F]+\\) "                 ; sha1
-          "\\(?:\\(?3:([^()]+)\\) \\)?"            ; refs
+          "\\(?1:[0-9a-fA-F]+\\)"                  ; sha1
+          "\\(?3:[^\0]+)\\)?\0"                    ; refs
           "\\(?2:.*\\)$"))                         ; msg
 
 (defconst magit-log-bisect-log-re

Binary file

File renamed without changes

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

@@ -48,18 +48,6 @@
 
 ;;; Options
 
-(defcustom magit-git-output-coding-system
-  (and (eq system-type 'windows-nt) 'utf-8)
-  "Coding system for receiving output from Git.
-
-If non-nil, the Git config value `i18n.logOutputEncoding' should
-be set via `magit-git-global-arguments' to value consistent with
-this."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-process
-  :type '(choice (coding-system :tag "Coding system to decode Git output")
-                 (const :tag "Use system default" nil)))
-
 (defcustom magit-process-connection-type (not (eq system-type 'cygwin))
   "Connection type used for the Git process.
 
@@ -539,17 +527,22 @@ Magit status buffer."
       (unless (equal (expand-file-name pwd)
                      (expand-file-name default-directory))
         (insert (file-relative-name pwd default-directory) ?\s))
-      (insert (propertize program 'face 'magit-section-heading))
-      (insert " ")
-      (when (and args (equal program magit-git-executable))
+      (cond
+       ((and args (equal program magit-git-executable))
         (setq args (-split-at (length magit-git-global-arguments) args))
+        (insert (propertize program 'face 'magit-section-heading) " ")
         (insert (propertize (char-to-string magit-ellipsis)
                             'face 'magit-section-heading
                             'help-echo (mapconcat #'identity (car args) " ")))
         (insert " ")
-        (setq args (cadr args)))
-      (insert (propertize (mapconcat #'identity args " ")
-                          'face 'magit-section-heading))
+        (insert (propertize (mapconcat #'shell-quote-argument (cadr args) " ")
+                            'face 'magit-section-heading)))
+       ((and args (equal program shell-file-name))
+        (insert (propertize (cadr args) 'face 'magit-section-heading)))
+       (t
+        (insert (propertize program 'face 'magit-section-heading) " ")
+        (insert (propertize (mapconcat #'shell-quote-argument args " ")
+                            'face 'magit-section-heading))))
       (magit-insert-heading)
       (when errlog
         (insert-file-contents errlog)

Binary file

File renamed without changes

@@ -579,9 +579,10 @@ only available for the part before the colon, or when no colon
 is used."
   (interactive
    (list (magit-read-remote "Push to remote")
-         (completing-read-multiple
-          "Push refspec,s: "
-          (cons "HEAD" (magit-list-local-branch-names)))
+         (split-string (magit-completing-read-multiple
+                        "Push refspec,s"
+                        (cons "HEAD" (magit-list-local-branch-names)))
+                       crm-default-separator t)
          (magit-push-arguments)))
   (run-hooks 'magit-credential-hook)
   (magit-run-git-async "push" "-v" args remote refspecs))
@@ -632,11 +633,11 @@ To add this command to the push popup add this to your init file:
 
   (with-eval-after-load \\='magit-remote
     (magit-define-popup-action \\='magit-push-popup ?P
-      'magit-push-implicitly--desc
-      'magit-push-implicitly ?p t))
+      \\='magit-push-implicitly--desc
+      \\='magit-push-implicitly ?p t))
 
 The function `magit-push-implicitly--desc' attempts to predict
-what this command will do, the value it returns is displayed in
+what this command will do.  The value it returns is displayed in
 the popup buffer."
   (interactive (list (magit-push-arguments)))
   (run-hooks 'magit-credential-hook)
@@ -685,8 +686,8 @@ To add this command to the push popup add this to your init file:
 
   (with-eval-after-load \\='magit-remote
     (magit-define-popup-action \\='magit-push-popup ?r
-      'magit-push-to-remote--desc
-      'magit-push-to-remote ?p t))"
+      \\='magit-push-to-remote--desc
+      \\='magit-push-to-remote ?p t))"
   (interactive (list (magit-read-remote "Push to remote")
                      (magit-push-arguments)))
   (run-hooks 'magit-credential-hook)

Binary file

File renamed without changes

@@ -172,7 +172,8 @@ without prompting."
   :man-page "git-revert"
   :switches '((?s "Add Signed-off-by lines" "--signoff"))
   :options  '((?s "Strategy"       "--strategy=")
-              (?S "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key))
+              (?S "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)
+              (?m "Replay merge relative to parent" "--mainline="))
   :actions  '((?V "Revert commit(s)" magit-revert)
               (?v "Revert changes"   magit-revert-no-commit))
   :sequence-actions '((?V "Continue" magit-sequencer-continue)
@@ -192,7 +193,8 @@ Prompt for a commit, defaulting to the commit at point.  If
 the region selects multiple commits, then revert all of them,
 without prompting."
   (interactive (magit-revert-read-args "Revert commit"))
-  (magit-assert-one-parent commit "revert")
+  (unless (--any (string-prefix-p "--mainline" it) args)
+    (magit-assert-one-parent commit "revert"))
   (magit-run-git-sequencer "revert" args commit))
 
 ;;;###autoload
@@ -202,7 +204,8 @@ Prompt for a commit, defaulting to the commit at point.  If
 the region selects multiple commits, then revert all of them,
 without prompting."
   (interactive (magit-revert-read-args "Revert changes"))
-  (magit-assert-one-parent commit "revert")
+  (unless (--any (string-prefix-p "--mainline" it) args)
+    (magit-assert-one-parent commit "revert"))
   (magit-run-git-sequencer "revert" "--no-commit" args commit))
 
 (defun magit-revert-in-progress-p ()

Binary file

@@ -299,7 +299,8 @@ When the region is active offer to drop all contained stashes."
         (summary (magit-stash-summary))
         (head "HEAD"))
     (when (and worktree (not index))
-      (setq head (magit-commit-tree "pre-stash index" nil "HEAD")))
+      (setq head (or (magit-commit-tree "pre-stash index" nil "HEAD")
+                     (error "Cannot save the current index state"))))
     (or (setq index (magit-commit-tree (concat "index on " summary) nil head))
         (error "Cannot save the current index state"))
     (and untracked

Binary file

File renamed without changes

@@ -104,11 +104,11 @@ PATH also becomes the name."
                             (match-string 1 url))))))))
        (list url
              (directory-file-name path)
-             (magit-submodule-read-name path)))))
+             (magit-submodule-read-name-for-path path)))))
   (magit-run-git "submodule" "add" (and name (list "--name" name)) url path))
 
 ;;;###autoload
-(defun magit-submodule-read-name (path)
+(defun magit-submodule-read-name-for-path (path)
   (setq path (directory-file-name (file-relative-name path)))
   (push (file-name-nondirectory path) minibuffer-history)
   (magit-read-string-ns

Binary file

File renamed without changes

@@ -41,6 +41,8 @@
 (require 'cl-lib)
 (require 'dash)
 
+(require 'crm)
+
 (eval-when-compile (require 'ido))
 (declare-function ido-completing-read+ 'ido-completing-read+)
 (declare-function Info-get-token 'info)
@@ -326,12 +328,56 @@ results in additional differences."
           nil)
       reply)))
 
+(defun magit--completion-table (collection)
+  (lambda (string pred action)
+    (if (eq action 'metadata)
+        '(metadata (display-sort-function . identity))
+      (complete-with-action action collection string pred))))
+
 (defun magit-builtin-completing-read
   (prompt choices &optional predicate require-match initial-input hist def)
   "Magit wrapper for standard `completing-read' function."
-  (completing-read (magit-prompt-with-default prompt def)
-                   choices predicate require-match
-                   initial-input hist def))
+  (cl-letf (((symbol-function 'completion-pcm--all-completions)
+             #'magit-completion-pcm--all-completions))
+    (completing-read (magit-prompt-with-default prompt def)
+                     (magit--completion-table choices)
+                     predicate require-match
+                     initial-input hist def)))
+
+(defvar helm-completion-in-region-default-sort-fn)
+
+(defun magit-completing-read-multiple
+  (prompt choices &optional sep default hist keymap)
+  "Read multiple items from CHOICES, separated by SEP.
+
+Set up the `crm' variables needed to read multiple values with
+`read-from-minibuffer'.
+
+SEP is a regexp matching characters that can separate choices.
+When SEP is nil, it defaults to `crm-default-separator'.
+DEFAULT, HIST, and KEYMAP are passed to `read-from-minibuffer'.
+When KEYMAP is nil, it defaults to `crm-local-completion-map'.
+
+Unlike `completing-read-multiple', the return value is not split
+into a list."
+  (let* ((crm-separator (or sep crm-default-separator))
+         (crm-completion-table (magit--completion-table choices))
+         (choose-completion-string-functions
+          '(crm--choose-completion-string))
+         (minibuffer-completion-table #'crm--collection-fn)
+         (minibuffer-completion-confirm t)
+         (helm-completion-in-region-default-sort-fn nil)
+         (input
+          (cl-letf (((symbol-function 'completion-pcm--all-completions)
+                     #'magit-completion-pcm--all-completions))
+            (read-from-minibuffer
+             (concat prompt (and default (format " (%s)" default)) ": ")
+             nil (or keymap crm-local-completion-map)
+             nil hist default))))
+    (when (string-equal input "")
+      (or (setq input default)
+          (user-error "Nothing selected")))
+    input))
 
 (defun magit-ido-completing-read
   (prompt choices &optional predicate require-match initial-input hist def)
@@ -478,6 +524,8 @@ ACTION is a member of option `magit-slow-confirm'."
 
 ;;;###autoload
 (defun magit-emacs-Q-command ()
+  "Show a shell command that runs an uncustomized Emacs with only Magit loaded.
+See info node `(magit)Debugging Tools' for more information."
   (interactive)
   (let ((cmd (mapconcat
               #'shell-quote-argument
@@ -571,6 +619,65 @@ and https://github.com/magit/magit/issues/2295."
               (when (equal state "U")
                 (push (expand-file-name file directory) files)))))))))
 
+;; `completion-pcm--all-completions' reverses the completion list.  To
+;; preserve the order of our pre-sorted completions, we'll temporarily
+;; override it with the function below.  bug#24676
+(defun magit-completion-pcm--all-completions (prefix pattern table pred)
+  (if (completion-pcm--pattern-trivial-p pattern)
+      (all-completions (concat prefix (car pattern)) table pred)
+    (let* ((regex (completion-pcm--pattern->regex pattern))
+           (case-fold-search completion-ignore-case)
+           (completion-regexp-list (cons regex completion-regexp-list))
+           (compl (all-completions
+                   (concat prefix
+                           (if (stringp (car pattern)) (car pattern) ""))
+                   table pred)))
+      (if (not (functionp table))
+          compl
+        (let ((poss ()))
+          (dolist (c compl)
+            (when (string-match-p regex c) (push c poss)))
+          ;; This `nreverse' call is the only code change made to the
+          ;; `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

@@ -218,10 +218,7 @@ merge failed to give the user the opportunity to inspect the
 merge.
 
 \(git merge --no-edit|--no-commit [ARGS] REV)"
-  (interactive (list (magit-read-other-branch-or-commit
-                      "Merge" nil
-                      (and (derived-mode-p 'magit-merge-preview-mode)
-                           (car magit-refresh-args)))
+  (interactive (list (magit-read-other-branch-or-commit "Merge")
                      (magit-merge-arguments)
                      current-prefix-arg))
   (magit-merge-assert)
@@ -349,7 +346,8 @@ If no merge is in progress, do nothing."
   :actions '((?m "reset mixed  (HEAD and index)"         magit-reset-head)
              (?s "reset soft   (HEAD only)"              magit-reset-soft)
              (?h "reset hard   (HEAD, index, and files)" magit-reset-hard)
-             (?i "reset index  (index only)"             magit-reset-index))
+             (?i "reset index  (index only)"             magit-reset-index) nil
+             (?f "reset a file"                          magit-file-checkout))
   :max-action-columns 1)
 
 ;;;###autoload
@@ -559,6 +557,14 @@ defaulting to the tag at point.
 
 ;;;; Git Popup
 
+(defcustom magit-shell-command-verbose-prompt t
+  "Whether to show the working directory when reading a command.
+This affects `magit-git-command', `magit-git-command-topdir',
+`magit-shell-command', and `magit-shell-command-topdir'."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-commands
+  :type 'boolean)
+
 (defvar magit-git-command-history nil)
 
 ;;;###autoload (autoload 'magit-run-popup "magit" nil t)
@@ -576,59 +582,66 @@ defaulting to the tag at point.
   :max-action-columns 2)
 
 ;;;###autoload
-(defun magit-git-command (args directory)
-  "Execute a Git subcommand asynchronously, displaying the output.
-With a prefix argument run Git in the root of the current
-repository, otherwise in `default-directory'."
-  (interactive (magit-read-shell-command "Git subcommand (pwd: %s)"))
-  (require 'eshell)
-  (with-temp-buffer
-    (insert args)
-    (setq args (mapcar 'eval (eshell-parse-arguments (point-min)
-                                                     (point-max))))
-    (setq default-directory directory)
-    (let ((magit-git-global-arguments
-           ;; A human will want globbing by default.
-           (remove "--literal-pathspecs"
-                   magit-git-global-arguments)))
-     (magit-run-git-async args)))
-  (magit-process-buffer))
+(defun magit-git-command (command)
+  "Execute COMMAND asynchonously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer. \"git \" is
+used as initial input, but can be deleted to run another command.
+
+With a prefix argument COMMAND is run in the top-level directory
+of the current working tree, otherwise in `default-directory'."
+  (interactive (list (magit-read-shell-command nil "git ")))
+  (magit--shell-command command))
 
 ;;;###autoload
-(defun magit-git-command-topdir (args directory)
-  "Execute a Git subcommand asynchronously, displaying the output.
-Run Git in the top-level directory of the current repository.
-\n(fn)" ; arguments are for internal use
-  (interactive (magit-read-shell-command "Git subcommand (pwd: %s)" t))
-  (magit-git-command args directory))
+(defun magit-git-command-topdir (command)
+  "Execute COMMAND asynchonously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer. \"git \" is
+used as initial input, but can be deleted to run another command.
+
+COMMAND is run in the top-level directory of the current
+working tree."
+  (interactive (list (magit-read-shell-command t "git ")))
+  (magit--shell-command command (magit-toplevel)))
 
 ;;;###autoload
-(defun magit-shell-command (cmd directory)
-  "Execute a shell command asynchronously, displaying the output.
-With a prefix argument run the command in the root of the current
-repository, otherwise in `default-directory'."
-  (interactive (magit-read-shell-command "Shell command (pwd: %s)"))
-  (let ((default-directory directory))
+(defun magit-shell-command (command)
+  "Execute COMMAND asynchonously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer.  With a
+prefix argument COMMAND is run in the top-level directory of
+the current working tree, otherwise in `default-directory'."
+  (interactive (list (magit-read-shell-command)))
+  (magit--shell-command command))
+
+;;;###autoload
+(defun magit-shell-command-topdir (command)
+  "Execute COMMAND asynchonously; display output.
+
+Interactively, prompt for COMMAND in the minibuffer.  COMMAND
+is run in the top-level directory of the current working tree."
+  (interactive (list (magit-read-shell-command t)))
+  (magit--shell-command command (magit-toplevel)))
+
+(defun magit--shell-command (command &optional directory)
+  (let ((default-directory (or directory default-directory))
+        (process-environment process-environment))
+    (push "GIT_PAGER=cat" process-environment)
     (magit-start-process shell-file-name nil
-                         shell-command-switch cmd))
+                         shell-command-switch command))
   (magit-process-buffer))
 
-;;;###autoload
-(defun magit-shell-command-topdir (args directory)
-  "Execute a shell command asynchronously, displaying the output.
-Run the command in the top-level directory of the current repository.
-\n(fn)" ; arguments are for internal use
-  (interactive (magit-read-shell-command "Shell command (pwd: %s)" t))
-  (magit-shell-command args directory))
-
-(defun magit-read-shell-command (prompt &optional root)
-  (let ((dir (if (or root current-prefix-arg)
-                 (or (magit-toplevel)
-                     (user-error "Not inside a Git repository"))
-               default-directory)))
-    (list (magit-read-string (format prompt (abbreviate-file-name dir))
-                             nil 'magit-git-command-history)
-          dir)))
+(defun magit-read-shell-command (&optional toplevel initial-input)
+  (let ((dir (abbreviate-file-name
+              (if (or toplevel current-prefix-arg)
+                  (or (magit-toplevel)
+                      (user-error "Not inside a Git repository"))
+                default-directory))))
+    (read-shell-command (if magit-shell-command-verbose-prompt
+                            (format "Async shell command in %s: " dir)
+                          "Async shell command: ")
+                        initial-input 'magit-git-command-history)))
 
 ;;; Revision Stack
 
@@ -866,11 +879,13 @@ above."
 Use the function by the same name instead of this variable.")
 
 ;;;###autoload
-(defun magit-version ()
+(defun magit-version (&optional print-dest)
   "Return the version of Magit currently in use.
-When called interactive also show the used versions of Magit,
-Git, and Emacs in the echo area."
-  (interactive)
+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."
+  (interactive (list (if current-prefix-arg (current-buffer) t)))
   (let ((magit-git-global-arguments nil)
         (toplib (or load-file-name buffer-file-name))
         debug)
@@ -923,12 +938,18 @@ Git, and Emacs in the echo area."
                                     dirname)
                   (setq magit-version (match-string 1 dirname))))))))
     (if (stringp magit-version)
-        (when (called-interactively-p 'any)
-          (message "Magit %s, Git %s, Emacs %s, %s"
-                   (or magit-version "(unknown)")
-                   (or (magit-git-version t) "(unknown)")
-                   emacs-version
-                   system-type))
+        (when print-dest
+          (princ (format "Magit %s, Git %s, Emacs %s, %s"
+                         (or magit-version "(unknown)")
+                         (or (let ((magit-git-debug
+                                    (lambda (err)
+                                      (display-warning '(magit git)
+                                                       err :error))))
+                               (magit-git-version t))
+                             "(unknown)")
+                         emacs-version
+                         system-type)
+                 print-dest))
       (setq debug (reverse debug))
       (setq magit-version 'error)
       (when magit-version
@@ -938,6 +959,39 @@ Git, and Emacs in the echo area."
         (message "Cannot determine Magit's version %S" debug)))
     magit-version))
 
+(defun magit-debug-git-executable ()
+  "Display a buffer with information about `magit-git-executable'.
+See info node `(magit)Debugging Tools' for more information."
+  (interactive)
+  (with-current-buffer (get-buffer-create "*magit-git-debug*")
+    (pop-to-buffer (current-buffer))
+    (erase-buffer)
+    (insert (format "magit-git-executable: %S" magit-git-executable)
+            (unless (file-name-absolute-p magit-git-executable)
+              (format " [%S]" (executable-find magit-git-executable)))
+            (format " (%s)\n"
+                    (let* ((errmsg nil)
+                           (magit-git-debug (lambda (err) (setq errmsg err))))
+                      (or (magit-git-version t) errmsg))))
+    (insert (format "exec-path: %S\n" exec-path))
+    (--when-let (cl-set-difference
+                 (-filter #'file-exists-p (remq nil (parse-colon-path
+                                                     (getenv "PATH"))))
+                 (-filter #'file-exists-p (remq nil exec-path))
+                 :test #'file-equal-p)
+      (insert (format "  entries in PATH, but not in exec-path: %S\n" it)))
+    (dolist (execdir exec-path)
+      (insert (format "  %s (%s)\n" execdir (car (file-attributes execdir))))
+      (when (file-directory-p execdir)
+        (dolist (exec (directory-files
+                       execdir t (concat
+                                  "\\`git" (regexp-opt exec-suffixes) "\\'")))
+          (insert (format "    %s (%s)\n" exec
+                          (let* ((magit-git-executable exec)
+                                 (errmsg nil)
+                                 (magit-git-debug (lambda (err) (setq errmsg err))))
+                            (or (magit-git-version t) errmsg)))))))))
+
 ;;; (Asserts)
 
 (defun 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: 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:

@@ -63,6 +63,7 @@ itself deserve to be called porcelains.
 * Customizing::
 * Plumbing::
 * FAQ::
+* Debugging Tools::
 * Keystroke Index::
 * Command Index::
 * Function Index::
@@ -532,6 +533,9 @@ install the gitman info manual?.
    If you are completely new to Magit then see *note Getting Started:
 Getting Started.
 
+   If you run into problems, then please see the *note FAQ: FAQ.  Also
+see the *note Debugging Tools: Debugging Tools.
+
    And last but not least please consider making a donation, to ensure
 that I can keep working on Magit.  See <https://magit.vc/donations>.
 for various donation options.
@@ -1554,6 +1558,14 @@ supported.  More frameworks will be supported in the future.
      comes with a supposed drop-in replacement ‘ido-completing-read’,
      but that has too many deficits to serve our needs.
 
+ -- User Option: magit-list-refs-sortby
+
+     For many commands that read a ref or refs from the user, the value
+     of this option can be used to control the order of the refs.  Valid
+     values include any key accepted by the ‘--sort’ flag of ‘git
+     for-each-ref’.  By default, refs are sorted alphabetically by their
+     full name (e.g., "refs/heads/master").
+
    By default many commands that could potentially lead to data loss
 have to be confirmed.  This includes many very common commands, so this
 can become annoying quickly.  Many of these actions can be undone,
@@ -1641,35 +1653,41 @@ to a shell.
 
      Shows the popup buffer featuring the below suffix commands.
 
-   These suffix commands run a Git subcommand.  The user input has to
-begin with the subcommand, "git" is assumed.
-
 ‘! !’     (‘magit-git-command-topdir’)
 
-     This command reads a Git subcommand from the user and executes it
-     in the top-level directory of the current repository.
+     This command reads a command from the user and executes it in the
+     top-level directory of the current working tree.
+
+     The string "git " is used as initial input when prompting the user
+     for the command.  It can be removed to run another command.
 
 ‘! p’     (‘magit-git-command’)
 
-     This command reads a Git subcommand from the user and executes it
-     in ‘default-directory’.  With a prefix argument the command is
-     executed in the top-level directory of the current repository
+     This command reads a command from the user and executes it in
+     ‘default-directory’.  With a prefix argument the command is
+     executed in the top-level directory of the current working tree
      instead.
 
-   These suffix commands run arbitrary shell commands.
+     The string "git " is used as initial input when prompting the user
+     for the command.  It can be removed to run another command.
 
 ‘! s’     (‘magit-shell-command-topdir’)
 
-     This command reads a shell command from the user and executes it in
-     the top-level directory of the current repository.
+     This command reads a command from the user and executes it in the
+     top-level directory of the current working tree.
 
 ‘! S’     (‘magit-shell-command’)
 
-     This command reads a shell command from the user and executes it in
+     This command reads a command from the user and executes it in
      ‘default-directory’.  With a prefix argument the command is
-     executed in the top-level directory of the current repository
+     executed in the top-level directory of the current working tree
      instead.
 
+ -- User Option: magit-shell-command-verbose-prompt
+
+     Whether the prompt, used by the the above commands when reading a
+     shell command, shows the directory in which it will be run.
+
    These suffix commands start external gui tools.
 
 ‘! k’     (‘magit-run-gitk’)
@@ -1707,8 +1725,9 @@ one you think you are using.
 
 ‘M-x magit-version’     (‘magit-version’)
 
-     Shows the currently used versions of Magit, Git, and Emacs in the
-     echo area.  Non-interactively this just returns the Magit version.
+     This command shows the currently used versions of Magit, Git, and
+     Emacs in the echo area.  Non-interactively this just returns the
+     Magit version.
 
    When the ‘system-type’ is ‘windows-nt’, then ‘magit-git-executable’
 is set to an absolute path when Magit is first loaded.  This is
@@ -1721,8 +1740,10 @@ performance horribly.
 around that by setting ‘magit-git-executable’ to an absolute path.  But
 note that doing so is a kludge.  It is better to make sure the order in
 the environment variable ‘$PATH’ is correct, and that Emacs is started
-with that environment in effect.  If you have to connect from Windows to
-a non-Windows machine, then you must change the value to "git".
+with that environment in effect.  The command
+‘magit-debug-git-executable’ can be useful to find out where Emacs is
+searching for git.  If you have to connect from Windows to a non-Windows
+machine, then you must change the value to "git".
 
  -- User Option: magit-git-executable
 
@@ -1730,6 +1751,10 @@ a non-Windows machine, then you must change the value to "git".
      executable or the string "git" to let Emacs find the executable
      itself, using the standard mechanism for doing such things.
 
+‘M-x magit-debug-git-executable’     (‘magit-debug-git-executable’)
+
+     Display a buffer with information about ‘magit-git-executable’.
+
 
 File: magit.info,  Node: Global Git Arguments,  Prev: Git Executable,  Up: Running Git
 
@@ -5143,35 +5168,33 @@ Also see *note (gitman)git-reset::.
      defaulting to the commit at point.  The working tree is kept as-is.
      With a prefix argument also reset the working tree.
 
-‘M-x magit-reset-index’     (‘magit-reset-index’)
+‘X m’     (‘magit-reset-head’)
+
+     Reset the ‘HEAD’ and index to some commit read from the user and
+     defaulting to the commit at point.  The working tree is kept as-is.
+
+‘X s’     (‘magit-reset-soft’)
+
+     Reset the ‘HEAD’ to some commit read from the user and defaulting
+     to the commit at point.  The index and the working tree are kept
+     as-is.
+
+‘X h’     (‘magit-reset-hard’)
+
+     Reset the ‘HEAD’, index, and working tree to some commit read from
+     the user and defaulting to the commit at point.
+
+‘X i’     (‘magit-reset-index’)
 
      Reset the index to some commit read from the user and defaulting to
      the commit at point.  Keep the ‘HEAD’ and working tree as-is, so if
      the commit refers to the ‘HEAD’, then this effectively unstages all
      changes.
 
-‘M-x magit-reset-head’     (‘magit-reset-head’)
-
-     Reset the ‘HEAD’ and index to some commit read from the user and
-     defaulting to the commit at point.  The working tree is kept as-is.
-
-‘M-x magit-reset-soft’     (‘magit-reset-soft’)
-
-     Reset the ‘HEAD’ to some commit read from the user and defaulting
-     to the commit at point.  The index and the working tree are kept
-     as-is.
-
-‘M-x magit-reset-hard’     (‘magit-reset-hard’)
-
-     Reset the ‘HEAD’, index, and working tree to some commit read from
-     the user and defaulting to the commit at point.
-
-‘M-x magit-file-checkout’     (‘magit-file-checkout’)
+‘X f’     (‘magit-file-checkout’)
 
      Update file in the working tree and index to the contents from a
-     revision.
-
-     Both the revision and file are read from the user.
+     revision.  Both the revision and file are read from the user.
 
 
 File: magit.info,  Node: Stashing,  Prev: Resetting,  Up: Manipulating
@@ -6377,30 +6400,10 @@ repositories, then you might want to disable certain features on a
 per-repository or per-repository-class basis only.  See *note
 Per-Repository Configuration: Per-Repository Configuration.
 
-Microsoft Windows Performance
-.............................
+* Menu:
 
-In order to update the status buffer, ‘git’ has to be run a few dozen
-times.  That is only problematic on Microsoft Windows, because that
-operating system is exceptionally slow at starting processes.  Sadly
-this is an issue that can only be fixed by Microsoft itself, and they
-don’t appear to be particularly interested in doing so.
-
-   Beside the subprocess issue, there also exist other Window-specific
-performance issues, some of which can be worked around.  The maintainers
-of "Git for Windows" try to reduce their effect, and in order to benefit
-from the latest performance tweaks, should always use the latest
-release.  Magit too tries to work around some Windows-specific issues.
-
-   According to some sources setting the following Git variables can
-also help.
-
-     git config --global core.preloadindex true   # default since v2.1
-     git config --global core.fscache true        # default since v2.8
-     git config --global gc.auto 256
-
-   You should also check whether an anti-virus program is slowing things
-down.
+* Microsoft Windows Performance::
+* MacOS Performance::
 
 Log Performance
 ...............
@@ -6499,6 +6502,70 @@ using another version control system:
 
      (setq vc-handled-backends (delq 'Git vc-handled-backends))
 
+
+File: magit.info,  Node: Microsoft Windows Performance,  Next: MacOS Performance,  Up: Performance
+
+Microsoft Windows Performance
+.............................
+
+In order to update the status buffer, ‘git’ has to be run a few dozen
+times.  That is problematic on Microsoft Windows, because that operating
+system is exceptionally slow at starting processes.  Sadly this is an
+issue that can only be fixed by Microsoft itself, and they don’t appear
+to be particularly interested in doing so.
+
+   Beside the subprocess issue, there also exist other Window-specific
+performance issues, some of which can be worked around.  The maintainers
+of "Git for Windows" try to reduce their effect, and in order to benefit
+from the latest performance tweaks, should always use the latest
+release.  Magit too tries to work around some Windows-specific issues.
+
+   According to some sources setting the following Git variables can
+also help.
+
+     git config --global core.preloadindex true   # default since v2.1
+     git config --global core.fscache true        # default since v2.8
+     git config --global gc.auto 256
+
+   You should also check whether an anti-virus program is slowing things
+down.
+
+
+File: magit.info,  Node: MacOS Performance,  Prev: Microsoft Windows Performance,  Up: Performance
+
+MacOS Performance
+.................
+
+On macOS Emacs currently creates child processes using ‘fork’.  It
+appears that this also copies GUI resources.  The result is that forking
+takes about 30 times as long on Darwin than on Linux.  And because Magit
+starts many ‘git’ processes even when doing simple things, that makes
+quite a difference.
+
+   On the ‘master’ branch Emacs now uses ‘vfork’ when possible, like
+this was already done on Linux, and now child creation only takes about
+twice as long on Darwin.  See (1) for more information.
+
+   Nobody knows when the changes on the ‘master’ branch will be released
+as ‘26.1’, but it is still a long way off.  You might want to get your
+hands on this change before then.  The easiest way to get a patched
+Emacs is to install the ‘emacs-plus’ formula (2) using ‘homebrew’.  The
+change has been backported, so you get it not only when using ‘--HEAD’,
+but also when using ‘--devel’ or when installing the latest release (by
+not using a version argument).
+
+   Alternatively you can apply the backport (3) manually.
+
+   ---------- Footnotes ----------
+
+   (1) 
+<https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html>
+
+   (2) <https://github.com/d12frosted/homebrew-emacs-plus>
+
+   (3) 
+<https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch>
+
 
 File: magit.info,  Node: Plumbing,  Next: FAQ,  Prev: Customizing,  Up: Top
 
@@ -7304,7 +7371,7 @@ that if you do not get this right, this will in some cases look to users
 like bugs in Magit - so please do it right or not at all.
 
 
-File: magit.info,  Node: FAQ,  Next: Keystroke Index,  Prev: Plumbing,  Up: Top
+File: magit.info,  Node: FAQ,  Next: Debugging Tools,  Prev: Plumbing,  Up: Top
 
 Appendix A FAQ
 **************
@@ -7314,6 +7381,8 @@ frequently *and recently* asked questions, i.e.  questions that haven’t
 made it into the manual yet, see
 <https://github.com/magit/magit/wiki/FAQ>.
 
+   Please also use the *note Debugging Tools: Debugging Tools.
+
 * Menu:
 
 * FAQ - How to …?::
@@ -7602,9 +7671,55 @@ can work around the problem by setting
 Google’s ‘8.8.8.8’) may also be sufficient to work around the issue.
 
 
-File: magit.info,  Node: Keystroke Index,  Next: Command Index,  Prev: FAQ,  Up: Top
+File: magit.info,  Node: Debugging Tools,  Next: Keystroke Index,  Prev: FAQ,  Up: Top
 
-Appendix B Keystroke Index
+B Debugging Tools
+*****************
+
+Magit and its dependencies provide a few debugging tools, and we
+appreciate it very much if you use those tools before reporting an
+issue.  Please include all relevant output when reporting an issue.
+
+‘M-x magit-version’     (‘magit-version’)
+
+     This command shows the currently used versions of Magit, Git, and
+     Emacs in the echo area.  Non-interactively this just returns the
+     Magit version.
+
+‘M-x magit-emacs-Q-command’     (‘magit-emacs-Q-command’)
+
+     This command shows a debugging shell command in the echo area and
+     adds it to the kill ring.  Paste that command into a shell an run
+     it.
+
+     This shell command starts ‘emacs’ with only ‘magit’ and its
+     dependencies loaded.  Neither your configuration nor other
+     installed packages are loaded.  This makes it easier to determine
+     whether some issue lays with Magit or something else.
+
+‘M-x magit-debug-git-executable’     (‘magit-debug-git-executable’)
+
+     This command displays a buffer containing information about the
+     available and used ‘git’ executable(s), and can be useful when
+     investigating ‘exec-path’ issues.
+
+     Also see *note Git Executable: Git Executable.
+
+‘M-x with-editor-debug’     (‘with-editor-debug’)
+
+     This command displays a buffer containing information about the
+     available and used ‘git’ executable(s), and can be useful when
+     investigating why Magit (or rather ‘with-editor’) cannot find an
+     appropriate ‘emacsclient’ executable.
+
+     Also see *note (with-editor)Debugging::.
+
+   Please also see the *note FAQ: FAQ.
+
+
+File: magit.info,  Node: Keystroke Index,  Next: Command Index,  Prev: Debugging Tools,  Up: Top
+
+Appendix C Keystroke Index
 **************************
 
 [index]
@@ -7613,21 +7728,21 @@ Appendix B Keystroke Index
 * !:                                     Running Git Manually.
                                                               (line  12)
 * ! !:                                   Running Git Manually.
-                                                              (line  19)
+                                                              (line  16)
 * ! a:                                   Running Git Manually.
-                                                              (line  51)
+                                                              (line  57)
 * ! b:                                   Running Git Manually.
-                                                              (line  55)
+                                                              (line  61)
 * ! g:                                   Running Git Manually.
-                                                              (line  59)
+                                                              (line  65)
 * ! k:                                   Running Git Manually.
-                                                              (line  47)
+                                                              (line  53)
 * ! p:                                   Running Git Manually.
                                                               (line  24)
 * ! s:                                   Running Git Manually.
-                                                              (line  33)
+                                                              (line  34)
 * ! S:                                   Running Git Manually.
-                                                              (line  38)
+                                                              (line  39)
 * $:                                     Viewing Git Output.  (line  11)
 * +:                                     Log Buffer.          (line  59)
 * + <1>:                                 Refreshing Diffs.    (line  58)
@@ -7847,19 +7962,17 @@ Appendix B Keystroke Index
 * M-x magit-blame:                       Blaming.             (line   8)
 * M-x magit-blame-popup:                 Blaming.             (line  24)
 * M-x magit-clone:                       Repository Setup.    (line  16)
+* M-x magit-debug-git-executable:        Git Executable.      (line  45)
+* M-x magit-debug-git-executable <1>:    Debugging Tools.     (line  27)
 * M-x magit-describe-section:            Section Types and Values.
                                                               (line  13)
 * M-x magit-describe-section <1>:        Matching Sections.   (line   6)
-* M-x magit-file-checkout:               Resetting.           (line  37)
+* M-x magit-emacs-Q-command:             Debugging Tools.     (line  16)
 * M-x magit-find-file:                   Visiting Blobs.      (line   6)
 * M-x magit-find-file-other-window:      Visiting Blobs.      (line  11)
 * M-x magit-init:                        Repository Setup.    (line   6)
-* M-x magit-reset-hard:                  Resetting.           (line  32)
-* M-x magit-reset-head:                  Resetting.           (line  21)
 * M-x magit-reset-index:                 Staging and Unstaging.
                                                               (line  88)
-* M-x magit-reset-index <1>:             Resetting.           (line  14)
-* M-x magit-reset-soft:                  Resetting.           (line  26)
 * M-x magit-reverse-in-index:            Staging and Unstaging.
                                                               (line  63)
 * M-x magit-stage-file:                  Staging from File-Visiting Buffers.
@@ -7868,7 +7981,9 @@ Appendix B Keystroke Index
 * M-x magit-unstage-file:                Staging from File-Visiting Buffers.
                                                               (line  18)
 * M-x magit-version:                     Git Executable.      (line  17)
+* M-x magit-version <1>:                 Debugging Tools.     (line  10)
 * M-x magit-wip-commit:                  Wip Modes.           (line 129)
+* M-x with-editor-debug:                 Debugging Tools.     (line  35)
 * n:                                     Section Movement.    (line  16)
 * n <1>:                                 Blaming.             (line  54)
 * N:                                     Blaming.             (line  58)
@@ -7985,6 +8100,11 @@ Appendix B Keystroke Index
 * x:                                     Editing Rebase Sequences.
                                                               (line  76)
 * x <1>:                                 Resetting.           (line   8)
+* X f:                                   Resetting.           (line  37)
+* X h:                                   Resetting.           (line  25)
+* X i:                                   Resetting.           (line  30)
+* X m:                                   Resetting.           (line  14)
+* X s:                                   Resetting.           (line  19)
 * Y:                                     Cherries.            (line  17)
 * y:                                     References Buffer.   (line   6)
 * y <1>:                                 Editing Rebase Sequences.

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "magit-annex" "20170211.1601" "Control git-annex from Magit" '((cl-lib "0.3") (magit "2.3.0")) :url "https://github.com/kyleam/magit-annex" :keywords '("vc" "tools"))

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "magit-annex" "magit-annex.el" (22712 4650
-;;;;;;  151347 197000))
+;;;### (autoloads nil "magit-annex" "magit-annex.el" (22792 62847
+;;;;;;  481796 397000))
 ;;; Generated autoloads from magit-annex.el
 
 (eval-after-load 'magit '(progn (define-key magit-mode-map "@" 'magit-annex-popup-or-init) (magit-define-popup-action 'magit-dispatch-popup 64 "Annex" 'magit-annex-popup-or-init 33)))

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "magit-annex" "20170429.756" "Control git-annex from Magit" '((cl-lib "0.3") (magit "2.3.0")) :url "https://github.com/kyleam/magit-annex" :keywords '("vc" "tools"))

@@ -5,9 +5,9 @@
 ;; Author: Kyle Meyer <kyle@kyleam.com>
 ;;         Rémi Vanicat <vanicat@debian.org>
 ;; URL: https://github.com/kyleam/magit-annex
-;; Package-Version: 20170211.1601
+;; Package-Version: 20170429.756
 ;; Keywords: vc tools
-;; Version: 1.3.0
+;; Version: 1.3.1
 ;; Package-Requires: ((cl-lib "0.3") (magit "2.3.0"))
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -238,28 +238,19 @@ See `magit-annex-run' and `magit-run-git-async' for more
 information."
   (magit-run-git-async "annex" magit-annex-standard-options args))
 
-(defun magit-annex-command ()
-  "Execute a git-annex subcommand asynchronously, displaying the output.
-With a prefix argument, run git-annex from repository root."
-  (interactive)
-  (apply #'magit-git-command (magit-annex-command-read-args)))
+(defun magit-annex-command (command)
+  "Execute COMMAND asynchonously, displaying output.
+This is like `magit-git-command', but \"git annex \" rather than
+\"git \" is used as the initial input."
+  (interactive (list (magit-read-shell-command nil "git annex ")))
+  (magit-git-command command))
 
-(defun magit-annex-command-topdir ()
-  "Execute a git-annex subcommand asynchronously, displaying the output.
-Run git-annex in the root of the current repository."
-  (interactive)
-  (apply #'magit-git-command (magit-annex-command-read-args t)))
-
-(defun magit-annex-command-read-args (&optional root)
-  ;; Modified from `magit-git-command-read-args'.
-  (let ((dir (if (or root current-prefix-arg)
-                 (or (magit-toplevel)
-                     (user-error "Not inside a Git repository"))
-               default-directory)))
-    (list (concat "annex " (read-string (format "git-annex subcommand (in %s): "
-                                                (abbreviate-file-name dir))
-                                        nil 'magit-git-command-history))
-          dir)))
+(defun magit-annex-command-topdir (command)
+  "Execute COMMAND asynchronously from top directory, displaying output.
+This is like `magit-git-command-topdir', but \"git annex \"
+rather than \"git \" is used as the initial input."
+  (interactive (list (magit-read-shell-command t "git annex ")))
+  (magit-git-command-topdir command))
 
 
 ;;; Initialization
@@ -303,9 +294,11 @@ With a prefix argument, prompt for FILE.
     (--when-let (magit-current-section)
       (pcase (list (magit-diff-type) (magit-diff-scope))
         (`(untracked file)
-         (magit-annex-run "add" (magit-section-value it)))
+         (magit-annex-run "add" (directory-file-name
+                                 (magit-section-value it))))
         (`(untracked files)
-         (magit-annex-run "add" (magit-region-values)))
+         (magit-annex-run "add" (mapcar #'directory-file-name
+                                        (magit-region-values))))
         (`(untracked list)
          (magit-annex-run "add" (magit-untracked-files)))
         (`(unstaged file)

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")
-;;;;;;  (22725 53730 486002 869000))
+;;;;;;  (22792 62846 984805 989000))
 
 ;;;***

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

@@ -491,7 +491,9 @@ usually specified in that order):
   Controls when to display the popup buffer and when to invoke
   the default action (if any) directly.  This overrides the
   global default set using `magit-popup-use-prefix-argument'.
-  The value, if specified, should be one of `default' or `popup'.
+  The value, if specified, should be one of `default' or `popup',
+  or a function that is called with no arguments and returns one
+  of these symbols.
 
 `:max-action-columns'
   The maximum number of actions to display on a single line, a
@@ -763,6 +765,9 @@ TYPE is one of `:action', `:sequence-action', `:switch', or
          (val     (symbol-value (plist-get def :variable)))
          (default (plist-get def :default-action))
          (local   (plist-get def :use-prefix))
+         (local   (if (functionp local)
+                      (funcall local)
+                    local))
          (use-prefix (or local magit-popup-use-prefix-argument)))
     (cond
      ((or (and (eq use-prefix 'default) arg)

Binary file

@@ -110,7 +110,7 @@ for prefix arguments.
 prefix commands and prefix arguments, they are also quite different.
 This should illustrate the most basic differences:
 
-   • A regular prefix commands
+   • A regular prefix command
 
                   /- command1
           prefix --- command2
@@ -120,7 +120,7 @@ This should illustrate the most basic differences:
 
                    /- command1
           C-u ... --- command2
-                   \- well *any* command
+                   \- well any command
 
    • A Prefix-Infix-Suffix combo
 
@@ -131,7 +131,7 @@ This should illustrate the most basic differences:
                  '--------'
               (refresh buffer)
 
-   This library was written as a replacement for ‘magit-key-mode’ which
+   This library was written as a replacement for ‘magit-key-mode’, which
 was used in Magit releases before 2.1.0.  It is used to implement all
 "popups" in the current Magit release but a future release will switch
 to yet another implementation.
@@ -571,7 +571,8 @@ commands have to be defined separately using plain ‘defun’.
           the default action (if any) directly.  This overrides the
           global default set using ‘magit-popup-use-prefix-argument’.
           The value, if specified, should be one of ‘default’ or
-          ‘prefix’.
+          ‘prefix’, or a function that is called with no arguments and
+          returns one of these symbols.
 
         • ‘:max-action-columns’
 
@@ -693,12 +694,12 @@ directly.
 Tag Table:
 Node: Top994
 Node: Introduction2170
-Node: Usage4872
-Node: Customizing Existing Popups9596
-Node: Other Options15124
-Node: Defining Prefix and Suffix Commands16698
-Node: Defining Prefix Commands18850
-Node: Defining Suffix Commands25734
+Node: Usage4870
+Node: Customizing Existing Popups9594
+Node: Other Options15122
+Node: Defining Prefix and Suffix Commands16696
+Node: Defining Prefix Commands18848
+Node: Defining Suffix Commands25823
 
 End Tag Table

@@ -3,7 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "paredit" "paredit.el" (22712 4659 325286 269000))
+;;;### (autoloads nil "paredit" "paredit.el" (22792 62845 728830
+;;;;;;  228000))
 ;;; Generated autoloads from paredit.el
 
 (autoload 'paredit-mode "paredit" "\

@@ -1,2 +1,2 @@
 ;;; -*- no-byte-compile: t -*-
-(define-package "paredit" "20160615.1325" "minor mode for editing parentheses" 'nil :keywords '("lisp"))
+(define-package "paredit" "20170405.1149" "minor mode for editing parentheses" 'nil :keywords '("lisp"))

@@ -1,10 +1,10 @@
 ;;; paredit.el --- minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-
 
-;; Copyright (C) 2005--2016 Taylor R. Campbell
+;; Copyright (C) 2005--2017 Taylor R. Campbell
 
 ;; Author: Taylor R. Campbell <campbell+paredit@mumble.net>
 ;; Version: 25beta
-;; Package-Version: 20160615.1325
+;; Package-Version: 20170405.1149
 ;; Created: 2005-07-31
 ;; Keywords: lisp
 
@@ -2157,7 +2157,15 @@ If the point is on an S-expression, such as a string or a symbol, not
       (delete-region (point) (scan-sexps (point) 1))
       (let* ((indent-start (point))
              (indent-end (save-excursion (insert sexps) (point))))
-        (indent-region indent-start indent-end nil)))))
+        ;; If the expression spans multiple lines, its indentation is
+        ;; probably broken, so reindent it -- but don't reindent
+        ;; anything that we didn't touch outside the expression.
+        ;;
+        ;; XXX What if the *column* of the starting point was preserved
+        ;; too?  Should we avoid reindenting in that case?
+        (if (not (eq (save-excursion (goto-char indent-start) (point-at-eol))
+                     (save-excursion (goto-char indent-end) (point-at-eol))))
+            (indent-region indent-start indent-end nil))))))
 
 ;;; The effects of convolution on the surrounding whitespace are pretty
 ;;; random.  If you have better suggestions, please let me know.

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "s" "20160928.636" "The long lost Emacs string manipulation library." 'nil :keywords '("strings"))

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil nil ("s.el") (22712 4609 287618 569000))
+;;;### (autoloads nil nil ("s.el") (22792 62844 620851 609000))
 
 ;;;***

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "s" "20170428.1026" "The long lost Emacs string manipulation library." 'nil :keywords '("strings"))

@@ -4,7 +4,7 @@
 
 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Version: 1.10.0
-;; Package-Version: 20160928.636
+;; Package-Version: 20170428.1026
 ;; Keywords: strings
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,9 @@
 
 ;;; Code:
 
-(require 'ucs-normalize)
+;; Silence byte-compiler
+(defvar ucs-normalize-combining-chars)  ; Defined in `ucs-normalize'
+(autoload 'slot-value "eieio")
 
 (defun s-trim-left (s)
   "Remove whitespace at the beginning of S."
@@ -236,8 +238,6 @@ Alias: `s-suffix?'"
          (eq t (compare-strings suffix nil nil
                                 s start-pos nil ignore-case)))))
 
-(defalias 's-ends-with-p 's-ends-with?)
-
 (defun s-starts-with? (prefix s &optional ignore-case)
   "Does S start with PREFIX?
 
@@ -248,13 +248,6 @@ Alias: `s-prefix?'. This is a simple wrapper around the built-in
 `string-prefix-p'."
   (string-prefix-p prefix s ignore-case))
 
-(defalias 's-starts-with-p 's-starts-with?)
-
-(defalias 's-suffix? 's-ends-with?)
-(defalias 's-prefix? 's-starts-with?)
-(defalias 's-suffix-p 's-ends-with?)
-(defalias 's-prefix-p 's-starts-with?)
-
 (defun s--truthy? (val)
   (not (null val)))
 
@@ -266,24 +259,18 @@ attention to case differences."
   (let ((case-fold-search ignore-case))
     (s--truthy? (string-match-p (regexp-quote needle) s))))
 
-(defalias 's-contains-p 's-contains?)
-
 (defun s-equals? (s1 s2)
   "Is S1 equal to S2?
 
 This is a simple wrapper around the built-in `string-equal'."
   (string-equal s1 s2))
 
-(defalias 's-equals-p 's-equals?)
-
 (defun s-less? (s1 s2)
   "Is S1 less than S2?
 
 This is a simple wrapper around the built-in `string-lessp'."
   (string-lessp s1 s2))
 
-(defalias 's-less-p 's-less?)
-
 (defun s-matches? (regexp s &optional start)
   "Does REGEXP match S?
 If START is non-nil the search starts at that index.
@@ -291,8 +278,6 @@ If START is non-nil the search starts at that index.
 This is a simple wrapper around the built-in `string-match-p'."
   (s--truthy? (string-match-p regexp s start)))
 
-(defalias 's-matches-p 's-matches?)
-
 (defun s-blank? (s)
   "Is S nil or the empty string?"
   (or (null s) (string= "" s)))
@@ -398,7 +383,8 @@ attention to case differences."
   "Return the reverse of S."
   (if (multibyte-string-p s)
       (let ((input (string-to-list s))
-            (output ()))
+            output)
+        (require 'ucs-normalize)
         (while input
           ;; Handle entire grapheme cluster as a single unit
           (let ((grapheme (list (pop input))))
@@ -628,5 +614,28 @@ is appended, otherwise PREFIX is used as both prefix and
 suffix."
   (concat prefix s (or suffix prefix)))
 
+
+;;; Aliases
+
+(defalias 's-blank-p 's-blank?)
+(defalias 's-blank-str-p 's-blank-str?)
+(defalias 's-capitalized-p 's-capitalized?)
+(defalias 's-contains-p 's-contains?)
+(defalias 's-ends-with-p 's-ends-with?)
+(defalias 's-equals-p 's-equals?)
+(defalias 's-less-p 's-less?)
+(defalias 's-lowercase-p 's-lowercase?)
+(defalias 's-matches-p 's-matches?)
+(defalias 's-mixedcase-p 's-mixedcase?)
+(defalias 's-numeric-p 's-numeric?)
+(defalias 's-prefix-p 's-starts-with?)
+(defalias 's-prefix? 's-starts-with?)
+(defalias 's-present-p 's-present?)
+(defalias 's-starts-with-p 's-starts-with?)
+(defalias 's-suffix-p 's-ends-with?)
+(defalias 's-suffix? 's-ends-with?)
+(defalias 's-uppercase-p 's-uppercase?)
+
+
 (provide 's)
 ;;; s.el ends here

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "swiper" "20170328.737" "Isearch with an overview. Oh, man!" '((emacs "24.1") (ivy "0.8.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" (22753 9092 560489 208000))
+;;;### (autoloads nil "swiper" "swiper.el" (22792 62844 78862 67000))
 ;;; Generated autoloads from swiper.el
 
 (autoload 'swiper-avy "swiper" "\

@@ -0,0 +1,2 @@
+;;; -*- 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"))

@@ -1,12 +1,12 @@
 ;;; swiper.el --- Isearch with an overview. Oh, man! -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2016  Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170328.737
-;; Version: 0.8.0
-;; Package-Requires: ((emacs "24.1") (ivy "0.8.0"))
+;; Package-Version: 20170410.24
+;; Version: 0.9.1
+;; Package-Requires: ((emacs "24.1") (ivy "0.9.0"))
 ;; Keywords: matching
 
 ;; This file is part of GNU Emacs.
@@ -78,6 +78,11 @@
   :type 'boolean
   :group 'swiper)
 
+(defcustom swiper-goto-start-of-match nil
+  "When non-nil, go to the start of the match, not its end."
+  :type 'boolean
+  :group 'swiper)
+
 (defvar swiper-map
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "M-q") 'swiper-query-replace)
@@ -678,6 +683,7 @@ WND, when specified is the window."
 (defvar evil-search-module)
 (defvar evil-ex-search-pattern)
 (defvar evil-ex-search-persistent-highlight)
+(defvar evil-ex-search-direction)
 (declare-function evil-ex-search-activate-highlight "evil-ex")
 
 
@@ -698,7 +704,8 @@ WND, when specified is the window."
                      #'line-move
                    #'forward-line)
                  ln)
-        (re-search-forward re (line-end-position) t)
+        (when (and (re-search-forward re (line-end-position) t) swiper-goto-start-of-match)
+          (goto-char (match-beginning 0)))
         (swiper--ensure-visible)
         (cond (swiper-action-recenter
                (recenter))
@@ -717,6 +724,7 @@ WND, when specified is the window."
                    (eq evil-search-module 'evil-search))
           (add-to-history 'evil-ex-search-history re)
           (setq evil-ex-search-pattern (list re t t))
+          (setq evil-ex-search-direction 'forward)
           (when evil-ex-search-persistent-highlight
             (evil-ex-search-activate-highlight evil-ex-search-pattern)))))))

Binary file

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "which-key" "20170315.1055" "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" (22753 9092 88496
-;;;;;;  312000))
+;;;### (autoloads nil "which-key" "which-key.el" (22792 62843 312876
+;;;;;;  847000))
 ;;; Generated autoloads from which-key.el
 
 (defvar which-key-mode nil "\

@@ -0,0 +1,2 @@
+;;; -*- 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")

@@ -4,7 +4,7 @@
 
 ;; Author: Justin Burkett <justin@burkett.cc>
 ;; URL: https://github.com/justbur/emacs-which-key
-;; Package-Version: 20170315.1055
+;; Package-Version: 20170501.544
 ;; Version: 2.0
 ;; Keywords:
 ;; Package-Requires: ((emacs "24.3"))
@@ -184,8 +184,10 @@ Finally, you can multiple replacements to occur for a given key
 binding by setting `which-key-allow-multiple-replacements' to a
 non-nil value."
   :group 'which-key
-  :type '(alist :key-type (alist :key-type regexp :value-type regexp)
-                :value-type (alist :key-type regexp :value-type regexp)))
+  :type '(alist :key-type (cons (choice regexp nil)
+                                (choice regexp nil))
+                :value-type (cons (choice string nil)
+                                  (choice string nil))))
 
 (when (bound-and-true-p which-key-key-replacement-alist)
   (mapc
@@ -456,9 +458,20 @@ by `key-description'."
   :group 'which-key
   :type '(repeat regexp))
 
+(defcustom which-key-show-transient-maps nil
+  "Show keymaps created by `set-transient-map' when applicable.
+
+More specifically, detect when `overriding-terminal-local-map' is
+set (this is the keymap used by `set-transient-map') and display
+it."
+  :group 'which-key
+  :type 'boolean)
+
 ;; Hooks
-(defvar which-key-init-buffer-hook '()
-  "Hook run when which-key buffer is initialized.")
+(defcustom which-key-init-buffer-hook '()
+  "Hook run when which-key buffer is initialized."
+  :group 'which-key
+  :type 'hook)
 
 ;;;; Faces
 
@@ -2022,11 +2035,10 @@ prefix) if `which-key-use-C-h-commands' is non nil."
 
 (defun which-key--any-match-p (regexps string)
   "Non-nil if any of REGEXPS match STRING."
-  (let (match)
+  (catch 'match
     (dolist (regexp regexps)
       (when (string-match-p regexp string)
-        (setq match t)))
-    match))
+        (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."
@@ -2147,13 +2159,15 @@ is selected interactively by mode in `minor-mode-map-alist'."
                (which-key--hide-popup)
                (setq unread-command-events (listify-key-sequence key))))))))
 
-(defun which-key--create-buffer-and-show (&optional prefix-keys)
+(defun which-key--create-buffer-and-show (&optional prefix-keys from-keymap)
   "Fill `which-key--buffer' with key descriptions and reformat.
 Finally, show the buffer."
   (setq which-key--current-prefix prefix-keys
         which-key--last-try-2-loc nil)
   (let ((start-time (when which-key--debug (current-time)))
-        (formatted-keys (which-key--get-formatted-key-bindings))
+        (formatted-keys (which-key--get-formatted-key-bindings
+                         (when from-keymap
+                           (which-key--get-keymap-bindings from-keymap))))
         (prefix-keys (key-description which-key--current-prefix)))
     (cond ((= (length formatted-keys) 0)
            (message "%s-  which-key: There are no keys to show" prefix-keys))
@@ -2233,6 +2247,12 @@ Finally, show the buffer."
              (when (and which-key-idle-secondary-delay
                         (not which-key--secondary-timer-active))
                (which-key--start-timer which-key-idle-secondary-delay t))))
+          ((and which-key-show-transient-maps
+                (keymapp overriding-terminal-local-map)
+                ;; 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))
           ((and which-key-show-operator-state-maps
                 (bound-and-true-p evil-state)
                 (eq evil-state 'operator)

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")
-;;;;;;  (22712 4645 700376 758000))
+;;;;;;  (22792 62841 923903 646000))
 
 ;;;***

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

@@ -1,6 +1,6 @@
 ;;; with-editor.el --- Use the Emacsclient as $EDITOR -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2016  The Magit Project Contributors
+;; Copyright (C) 2014-2017  The Magit Project Contributors
 ;;
 ;; You should have received a copy of the AUTHORS.md file.  If not,
 ;; see https://github.com/magit/with-editor/blob/master/AUTHORS.md.
@@ -711,7 +711,7 @@ else like the former."
 
 (defun with-editor-debug ()
   "Debug configuration issues.
-See `with-editor.info' for instructions."
+See info node `(with-editor)Debugging' for instructions."
   (interactive)
   (with-current-buffer (get-buffer-create "*with-editor-debug*")
     (pop-to-buffer (current-buffer))

Binary file

File renamed without changes

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "yaml-mode" "20170213.1023" "Major mode for editing YAML files" '((emacs "24.1")) :keywords '("data" "yaml"))

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (22712 4658 381292
-;;;;;;  539000))
+;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (22792 62841 21921
+;;;;;;  48000))
 ;;; Generated autoloads from yaml-mode.el
 
 (let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads))))

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "yaml-mode" "20170406.241" "Major mode for editing YAML files" '((emacs "24.1")) :keywords '("data" "yaml"))

@@ -6,7 +6,7 @@
 ;;         Marshall T. Vandegrift <llasram@gmail.com>
 ;; Maintainer: Vasilij Schneidermann <v.schneidermann@gmail.com>
 ;; Package-Requires: ((emacs "24.1"))
-;; Package-Version: 20170213.1023
+;; Package-Version: 20170406.241
 ;; Keywords: data yaml
 ;; Version: 0.0.13
 
@@ -204,6 +204,8 @@ that key is pressed to begin a block literal."
     (modify-syntax-entry ?\\ "\\" syntax-table)
     (modify-syntax-entry ?- "_" syntax-table)
     (modify-syntax-entry ?_ "_" syntax-table)
+    (modify-syntax-entry ?& "." syntax-table)
+    (modify-syntax-entry ?* "." syntax-table)
     (modify-syntax-entry ?\( "." syntax-table)
     (modify-syntax-entry ?\) "." syntax-table)
     (modify-syntax-entry ?\{ "(}" syntax-table)

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" (22753 9091 101511
-;;;;;;  168000))
+;;;### (autoloads nil "yasnippet" "yasnippet.el" (22792 62820 406318
+;;;;;;  459000))
 ;;; 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") (22753 9089 955528
-;;;;;;  416000))
+;;;### (autoloads nil nil ("yasnippet-pkg.el") (22792 62819 160342
+;;;;;;  459000))
 
 ;;;***

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

@@ -152,10 +152,13 @@
   :prefix "yas-"
   :group 'editing)
 
+(defconst yas--loaddir
+  (file-name-directory (or load-file-name buffer-file-name))
+  "Directory that yasnippet was loaded from.")
+
 (defvar yas-installed-snippets-dir nil)
 (setq yas-installed-snippets-dir
-      (when load-file-name
-        (expand-file-name "snippets" (file-name-directory load-file-name))))
+      (expand-file-name "snippets" yas--loaddir))
 
 (defconst yas--default-user-snippets-dir
   (expand-file-name "snippets" user-emacs-directory))
@@ -577,7 +580,9 @@ conditions.
   "Holds the YASnippet menu.")
 
 (defun yas--maybe-expand-key-filter (cmd)
-  (if (yas--templates-for-key-at-point) cmd))
+  (when (let ((yas--condition-cache-timestamp (current-time)))
+          (yas--templates-for-key-at-point))
+    cmd))
 
 (defconst yas-maybe-expand
   '(menu-item "" yas-expand :filter yas--maybe-expand-key-filter)
@@ -1977,9 +1982,24 @@ This works by stubbing a few functions, then calling
 
 (defun yas-about ()
   (interactive)
-  (message (concat "yasnippet (version "
-                   yas--version
-                   ") -- pluskid/joaotavora/npostavs")))
+  (message "yasnippet (version %s) -- pluskid/joaotavora/npostavs"
+           (or (ignore-errors (car (let ((default-directory yas--loaddir))
+                                     (process-lines "git" "describe"
+                                                    "--tags" "--dirty"))))
+               (when (and (featurep 'package)
+                          (fboundp 'package-desc-version)
+                          (fboundp 'package-version-join))
+                 (defvar package-alist)
+                 (ignore-errors
+                   (let* ((yas-pkg (cdr (assq 'yasnippet package-alist)))
+                          (version (package-version-join
+                                    (package-desc-version (car yas-pkg)))))
+                     ;; Special case for MELPA's bogus version numbers.
+                     (if (string-match "\\`20..[01][0-9][0-3][0-9][.][0-9]\\{3,4\\}\\'"
+                                       version)
+                         (concat yas--version "-snapshot" version)
+                       version))))
+               yas--version)))
 
 
 ;;; Apropos snippet menu:
@@ -2212,7 +2232,8 @@ object satisfying `yas--field-p' to restrict the expansion to."
       (yas--fallback))))
 
 (defun yas--maybe-expand-from-keymap-filter (cmd)
-  (let* ((vec (cl-subseq (this-command-keys-vector)
+  (let* ((yas--condition-cache-timestamp (current-time))
+         (vec (cl-subseq (this-command-keys-vector)
                          (if current-prefix-arg
                              (length (this-command-keys))
                            0)))
@@ -3272,7 +3293,8 @@ This renders the snippet as ordinary text."
                (overlay-buffer control-overlay))
       (setq yas-snippet-beg (overlay-start control-overlay))
       (setq yas-snippet-end (overlay-end control-overlay))
-      (delete-overlay control-overlay))
+      (delete-overlay control-overlay)
+      (setf (yas--snippet-control-overlay snippet) nil))
 
     (let ((yas--inhibit-overlay-hooks t))
       (when yas--active-field-overlay
@@ -3427,8 +3449,9 @@ If so cleans up the whole snippet up."
 ;;
 ;; This was found useful for performance reasons, so that an excessive
 ;; number of live markers aren't kept around in the
-;; `buffer-undo-list'.  We reuse the original marker object, although
-;; that's probably not necessary.
+;; `buffer-undo-list'.  We don't reuse the original marker object
+;; because that leaves an unreadable object in the history list and
+;; undo-tree persistence has trouble with that.
 ;;
 ;; This shouldn't bring horrible problems with undo/redo, but you
 ;; never know.
@@ -3436,16 +3459,13 @@ If so cleans up the whole snippet up."
 (defun yas--markers-to-points (snippet)
   "Save all markers of SNIPPET as positions."
   (yas--snippet-map-markers (lambda (m)
-                              (prog1 (cons (marker-position m) m)
+                              (prog1 (marker-position m)
                                 (set-marker m nil)))
                             snippet))
 
 (defun yas--points-to-markers (snippet)
   "Restore SNIPPET's marker positions, saved by `yas--markers-to-points'."
-  (yas--snippet-map-markers (lambda (p-m)
-                              (set-marker (cdr p-m) (car p-m))
-                              (cdr p-m))
-                            snippet))
+  (yas--snippet-map-markers #'copy-marker snippet))
 
 (defun yas--maybe-move-to-active-field (snippet)
   "Try to move to SNIPPET's active (or first) field and return it if found."
@@ -3588,7 +3608,8 @@ field start.  This hook does nothing if an undo is in progress."
          (reoverlays nil))
     (dolist (snippet snippets)
       (dolist (m (yas--collect-snippet-markers snippet))
-        (push (yas--snapshot-marker-location m beg end) remarkers))
+        (when (and (<= beg m) (<= m end))
+          (push (yas--snapshot-marker-location m beg end) remarkers)))
       (push (yas--snapshot-overlay-location
              (yas--snippet-control-overlay snippet) beg end)
             reoverlays))
@@ -3790,6 +3811,7 @@ considered when expanding the snippet."
                (yas--letenv (yas--snippet-expand-env snippet)
                  (yas--move-to-field snippet first-field))))
            (yas--message 4 "snippet expanded.")
+           (setq deactivate-mark nil)
            t))))
 
 (defun yas--take-care-of-redo (_beg _end snippet)
@@ -4111,15 +4133,21 @@ The returned value is a list of the form (MARKER REGEXP WS-COUNT)."
                              (nconc before (list marker) after)
                              "[[:space:]\n]*"))
           (progn (goto-char marker)
-                 (skip-syntax-forward " " end)
+                 (skip-chars-forward "[:space:]\n" end)
                  (- (point) marker)))))
 
 (defun yas--snapshot-overlay-location (overlay beg end)
   "Like `yas--snapshot-marker-location' for overlays.
-The returned format is (OVERLAY (RE WS) (RE WS))."
-  (list overlay
-        (cdr (yas--snapshot-marker-location (overlay-start overlay) beg end))
-        (cdr (yas--snapshot-marker-location (overlay-end overlay) beg end))))
+The returned format is (OVERLAY (RE WS) (RE WS)).  Either of
+the (RE WS) lists may be nil if the start or end, respectively,
+of the overlay is outside the range BEG .. END."
+  (let ((obeg (overlay-start overlay))
+        (oend (overlay-end overlay)))
+    (list overlay
+          (when (and (<= beg obeg) (< obeg end))
+            (cdr (yas--snapshot-marker-location obeg beg end)))
+          (when (and (<= beg oend) (< oend end))
+            (cdr (yas--snapshot-marker-location oend beg end))))))
 
 (defun yas--snapshot-overlay-line-location (overlay)
   "Return info for restoring OVERLAY's line based location.
@@ -4142,8 +4170,8 @@ Buffer must be narrowed to BEG..END used to create the snapshot info."
       (lwarn '(yasnippet re-marker) :warning
              "Couldn't find: %S" regexp)
     (goto-char (match-beginning 1))
-    (skip-syntax-forward " ")
-    (skip-syntax-backward " " (- (point) ws-count))))
+    (skip-chars-forward "[:space:]\n")
+    (skip-chars-backward "[:space:]\n" (- (point) ws-count))))
 
 (defun yas--restore-marker-location (re-marker)
   "Restores marker based on info from `yas--snapshot-marker-location'.
@@ -4156,10 +4184,12 @@ Buffer must be narrowed to BEG..END used to create the snapshot info."
 Buffer must be narrowed to BEG..END used to create the snapshot info."
   (cl-destructuring-bind (overlay loc-beg loc-end) ov-locations
     (move-overlay overlay
-                  (progn (apply #'yas--goto-saved-location loc-beg)
-                         (point))
-                  (progn (apply #'yas--goto-saved-location loc-end)
-                         (point)))))
+                  (if (not loc-beg) (overlay-start overlay)
+                    (apply #'yas--goto-saved-location loc-beg)
+                    (point))
+                  (if (not loc-end) (overlay-end overlay)
+                    (apply #'yas--goto-saved-location loc-end)
+                    (point)))))
 
 
 (defun yas--restore-overlay-line-location (ov-locations)

Binary file

@@ -0,0 +1,10 @@
+This package offers an alternative to tabbing through links in
+buffers, for instance, in an Info buffer.  `avy' is used to turn
+opening a link from an O(N) operation into an O(1).
+
+Use `ace-link-setup-default' to set up the default bindings, which currently
+bind e.g. `ace-link-info' to "o", which was previously unbound and is
+close to "l" (which by default goes back).
+
+Supported modes: `Info-mode', `help-mode', `org-mode', `eww-mode',
+`gnus-article-mode', `Custom-mode', `woman-mode', `goto-address-mode'.

Commit 4fd2ddc0f0a0

Commit `4fd2ddc0f0a0`