Update some packages · home@b9de694c5e3f

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

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "counsel" "counsel.el" (22859 63760 140223
-;;;;;;  945000))
+;;;### (autoloads nil "counsel" "counsel.el" (22863 59996 283812
+;;;;;;  344000))
 ;;; Generated autoloads from counsel.el
 
 (autoload 'counsel-el "counsel" "\
@@ -109,6 +109,7 @@ BUFFER defaults to the current one.
 
 (autoload 'counsel-git "counsel" "\
 Find file in the current Git repository.
+INITIAL-INPUT can be given as the initial minibuffer input.
 
 \(fn &optional INITIAL-INPUT)" t nil)
 
@@ -197,6 +198,7 @@ This uses `counsel-ag' with `counsel-pt-base-command' instead of
 
 (autoload 'counsel-ack "counsel" "\
 Grep for a string in the current directory using ack.
+INITIAL-INPUT can be given as the initial minibuffer input.
 This uses `counsel-ag' with `counsel-ack-base-command' replacing
 `counsel-ag-base-command'.

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

@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Package-Version: 20170622.758
+;; Package-Version: 20170623.1112
 ;; Version: 0.9.1
 ;; Package-Requires: ((emacs "24.3") (swiper "0.9.0"))
 ;; Keywords: completion, matching
@@ -87,6 +87,13 @@
      str)
     str))
 
+(defun counsel-require-program (program)
+  "Check system for PROGRAM, printing error if unfound."
+  (when (and (stringp program)
+             (not (string= program ""))
+             (not (executable-find program)))
+    (user-error "Required program \"%s\" not found in your path" program)))
+
 ;;* Async Utility
 (defvar counsel--async-time nil
   "Store the time when a new process was started.
@@ -990,8 +997,10 @@ BUFFER defaults to the current one."
 
 ;;;###autoload
 (defun counsel-git (&optional initial-input)
-  "Find file in the current Git repository."
+  "Find file in the current Git repository.
+INITIAL-INPUT can be given as the initial minibuffer input."
   (interactive)
+  (counsel-require-program (car (split-string counsel-git-cmd)))
   (setq counsel--git-dir (locate-dominating-file
                           default-directory ".git"))
   (ivy-set-prompt 'counsel-git counsel-prompt-function)
@@ -1169,6 +1178,7 @@ INITIAL-INPUT can be given as the initial minibuffer input."
                (delete-dups counsel-git-grep-cmd-history))))
       (t
        (setq counsel-git-grep-cmd counsel-git-grep-cmd-default)))
+    (counsel-require-program (car (split-string counsel-git-grep-cmd)))
     (setq counsel--git-grep-dir
           (if proj
               (car proj)
@@ -1485,6 +1495,7 @@ TREE is the selected candidate."
 
 (defun counsel-find-file-as-root (x)
   "Find file X with root privileges."
+  (counsel-require-program counsel-root-command)
   (let* ((host (file-remote-p x 'host))
          (file-name (format "/%s:%s:%s"
                             counsel-root-command
@@ -1597,6 +1608,7 @@ When INITIAL-INPUT is non-nil, use it in the minibuffer during completion."
 
 (defun counsel-github-url-p ()
   "Return a Github issue URL at point."
+  (counsel-require-program "git")
   (let ((url (counsel-at-git-issue-p)))
     (when url
       (let ((origin (shell-command-to-string
@@ -1616,6 +1628,7 @@ When INITIAL-INPUT is non-nil, use it in the minibuffer during completion."
 
 (defun counsel-emacs-url-p ()
   "Return a Debbugs issue URL at point."
+  (counsel-require-program "git")
   (let ((url (counsel-at-git-issue-p)))
     (when url
       (let ((origin (shell-command-to-string
@@ -1698,20 +1711,24 @@ string - the full shell command to run."
 
 (defun counsel-locate-cmd-default (input)
   "Return a shell command based on INPUT."
+  (counsel-require-program "locate")
   (format "locate -i --regex '%s'"
           (counsel-unquote-regex-parens
            (ivy--regex input))))
 
 (defun counsel-locate-cmd-noregex (input)
   "Return a shell command based on INPUT."
+  (counsel-require-program "locate")
   (format "locate -i '%s'" input))
 
 (defun counsel-locate-cmd-mdfind (input)
   "Return a shell command based on INPUT."
+  (counsel-require-program "mdfind")
   (format "mdfind -name '%s'" input))
 
 (defun counsel-locate-cmd-es (input)
   "Return a shell command based on INPUT."
+  (counsel-require-program "es.exe")
   (format "es.exe -i -r %s"
           (counsel-unquote-regex-parens
            (ivy--regex input t))))
@@ -1745,6 +1762,7 @@ INITIAL-INPUT can be given as the initial minibuffer input."
 (defun counsel-dpkg ()
   "Call the \"dpkg\" shell command."
   (interactive)
+  (counsel-require-program "dpkg")
   (let ((cands (mapcar
                 (lambda (x)
                   (let ((y (split-string x "  +")))
@@ -1765,6 +1783,7 @@ INITIAL-INPUT can be given as the initial minibuffer input."
 (defun counsel-rpm ()
   "Call the \"rpm\" shell command."
   (interactive)
+  (counsel-require-program "rpm")
   (let ((cands (mapcar
                 (lambda (x)
                   (let ((y (split-string x "|")))
@@ -1792,6 +1811,7 @@ INITIAL-DIRECTORY, if non-nil, is used as the root directory for search."
    (list nil
          (when current-prefix-arg
            (read-directory-name "From directory: "))))
+  (counsel-require-program "find")
   (let* ((default-directory (or initial-directory default-directory)))
     (ivy-read "Find file: "
               (split-string
@@ -1821,6 +1841,7 @@ INITIAL-DIRECTORY, if non-nil, is used as the root directory for search."
    (list nil
          (when current-prefix-arg
            (read-directory-name "From directory: "))))
+  (counsel-require-program "find")
   (let* ((default-directory (or initial-directory default-directory)))
     (ivy-read "Directory: "
               (split-string
@@ -1909,6 +1930,7 @@ INITIAL-DIRECTORY, if non-nil, is used as the root directory for search.
 EXTRA-AG-ARGS string, if non-nil, is appended to `counsel-ag-base-command'.
 AG-PROMPT, if non-nil, is passed as `ivy-read' prompt argument."
   (interactive)
+  (counsel-require-program (car (split-string counsel-ag-base-command)))
   (when current-prefix-arg
     (setq initial-directory
           (or initial-directory
@@ -1970,6 +1992,7 @@ This uses `counsel-ag' with `counsel-pt-base-command' instead of
 ;;;###autoload
 (defun counsel-ack (&optional initial-input)
   "Grep for a string in the current directory using ack.
+INITIAL-INPUT can be given as the initial minibuffer input.
 This uses `counsel-ag' with `counsel-ack-base-command' replacing
 `counsel-ag-base-command'."
   (interactive)
@@ -2000,6 +2023,7 @@ RG-PROMPT, if non-nil, is passed as `ivy-read' prompt argument."
            (read-directory-name (concat
                                  (car (split-string counsel-rg-base-command))
                                  " in directory: ")))))
+  (counsel-require-program (car (split-string counsel-rg-base-command)))
   (ivy-set-prompt 'counsel-rg counsel-prompt-function)
   (setq counsel--git-grep-dir (or initial-directory default-directory))
   (ivy-read (or rg-prompt (car (split-string counsel-rg-base-command)))
@@ -2083,6 +2107,7 @@ RG-PROMPT, if non-nil, is passed as `ivy-read' prompt argument."
 (defun counsel-grep ()
   "Grep for a string in the current file."
   (interactive)
+  (counsel-require-program (car (split-string counsel-grep-base-command)))
   (setq counsel-grep-last-line nil)
   (setq counsel--git-grep-dir (buffer-file-name))
   (let ((init-point (point))
@@ -2166,6 +2191,7 @@ You'll be given a list of files that match.
 Selecting a file will launch `swiper' for that file.
 INITIAL-INPUT can be given as the initial minibuffer input."
   (interactive)
+  (counsel-require-program "recoll")
   (ivy-read "recoll: " 'counsel-recoll-function
             :initial-input initial-input
             :dynamic-collection t

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" (22839 4068 719956 860000))
+;;;### (autoloads nil "dired+" "dired+.el" (22863 59993 36889 848000))
 ;;; Generated autoloads from dired+.el
 
 (defvar diff-switches "-c" "\
@@ -689,6 +689,10 @@ subdirectories are handled recursively in the same way.
 Mark all files matching REGEXP, including those in marked subdirs.
 Like `dired-mark-files-regexp' but act recursively on marked subdirs.
 
+The files included are those that are marked in the current Dired
+buffer, or all files in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
 The file names to be matched by this command are always absolute -
 they include the full directory.  Note that this does NOT correspond
 to the default behavior for `dired-mark-files-regexp'.  The other
@@ -713,6 +717,58 @@ then only the first such is used.
 
 \(fn REGEXP &optional MARKER-CHAR IGNORE-MARKS-P)" t nil)
 
+(autoload 'diredp-mark-autofiles-recursive "dired+" "\
+Mark all autofiles, that is, files that have an autofile bookmark.
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'diredp-mark-executables-recursive "dired+" "\
+Mark all executable files, including in marked subdirs.
+The files included are those that are marked in the current Dired
+buffer, or all files in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'diredp-mark-directories-recursive "dired+" "\
+Mark all directories except `.' and `..', including in marked subdirs.
+The directories included are those that are marked in the current
+Dired buffer, or all subdirs in the directory if none are marked.
+Marked subdirectories are handled recursively in the same way.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'diredp-mark-symlinks-recursive "dired+" "\
+Mark all symbolic links, including in marked subdirs.
+The symlinks included are those that are marked in the current Dired
+buffer, or all symlinks in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories.
+
+\(fn &optional ARG)" t nil)
+
 (autoload 'diredp-capitalize-recursive "dired+" "\
 Rename marked files, including in marked subdirs, by capitalizing them.
 Like `diredp-capitalize', but act recursively on subdirs.
@@ -882,6 +938,10 @@ Mark all files with a certain EXTENSION for use in later commands.
 A `.' is not automatically prepended to the string entered.
 Non-nil prefix argument UNMARK-P means unmark instead of mark.
 
+Non-interactively, EXTENSION is the extension (a string).  It can also
+  be a list of extension strings.
+Optional argument UNMARK-P is the prefix arg.
+
 \(fn EXTENSION &optional UNMARK-P)" t nil)
 
 (autoload 'diredp-mark-files-tagged-all "dired+" "\
@@ -1593,6 +1653,11 @@ for object files--just `.o' might mark more than you might expect.
 
 REGEXP is added to `regexp-search-ring', for regexp search.
 
+Non-interactively:
+ MARKER-CHAR is the marker character - used for `dired-marker-char'.
+ LOCALP is passed to `dired-get-filename'.  It determines the form of
+   filename that is matched against REGEXP.
+
 \(fn REGEXP &optional MARKER-CHAR LOCALP)" t nil)
 
 (autoload 'diredp-capitalize "dired+" "\

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

@@ -7,11 +7,11 @@
 ;; Copyright (C) 1999-2017, Drew Adams, all rights reserved.
 ;; Created: Fri Mar 19 15:58:58 1999
 ;; Version: 2017.04.09
-;; Package-Version: 20170530.1023
+;; Package-Version: 20170623.1621
 ;; Package-Requires: ()
-;; Last-Updated: Tue May 30 10:22:48 2017 (-0700)
+;; Last-Updated: Fri Jun 23 16:20:45 2017 (-0700)
 ;;           By: dradams
-;;     Update #: 10144
+;;     Update #: 10274
 ;; URL: https://www.emacswiki.org/emacs/download/dired%2b.el
 ;; Doc URL: http://www.emacswiki.org/DiredPlus
 ;; Keywords: unix, mouse, directories, diredp, dired
@@ -425,6 +425,7 @@
 ;;    `diredp-marked', `diredp-marked-other-window',
 ;;    `diredp-marked-recursive',
 ;;    `diredp-marked-recursive-other-window',
+;;    `diredp-mark-extension-recursive',
 ;;    `diredp-mark-files-regexp-recursive',
 ;;    `diredp-mark-files-tagged-all', `diredp-mark-files-tagged-none',
 ;;    `diredp-mark-files-tagged-not-all',
@@ -526,10 +527,11 @@
 ;;    `diredp-nonempty-region-p', `diredp-parent-dir',
 ;;    `diredp-paste-add-tags', `diredp-paste-replace-tags',
 ;;    `diredp-read-bookmark-file-args', `diredp-read-include/exclude',
-;;    `diredp-recent-dirs', `diredp-refontify-buffer',
-;;    `diredp-remove-if', `diredp-remove-if-not',
-;;    `diredp-root-directory-p', `diredp-set-header-line-breadcrumbs'
-;;    (Emacs 22+), `diredp-set-tag-value', `diredp-set-union',
+;;    `diredp-read-regexp', `diredp-recent-dirs',
+;;    `diredp-refontify-buffer', `diredp-remove-if',
+;;    `diredp-remove-if-not', `diredp-root-directory-p',
+;;    `diredp-set-header-line-breadcrumbs' (Emacs 22+),
+;;    `diredp-set-tag-value', `diredp-set-union',
 ;;    `diredp--set-up-font-locking', `diredp-string-match-p',
 ;;    `diredp-tag', `diredp-this-file-marked-p',
 ;;    `diredp-this-file-unmarked-p', `diredp-this-subdir',
@@ -543,11 +545,11 @@
 ;;    `diredp-hide-details-toggled' (Emacs 24.4+),
 ;;    `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-marks-recursive-menu', `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',
@@ -660,6 +662,19 @@
 ;;
 ;;; Change Log:
 ;;
+;; 2017/06/23 dadams
+;;     Added: diredp-read-regexp (removed alias to read-regexp), diredp-marks-recursive-menu,
+;;       diredp-mark-executables-recursive (bound to M-+ * *),
+;;       diredp-mark-directories-recursive (bound to M-+ * /),
+;;       diredp-mark-extension-recursive (bound to M-+ * .),
+;;       diredp-mark-autofiles-recursive (bound to M-+ * B),
+;;       diredp-mark-executables-recursive (bound to M-+ * *),
+;;       diredp-mark-directories-recursive (bound to M-+ * /),
+;;       diredp-mark-symlinks-recursive (bound to M-+ * @),
+;;     Bind diredp-mark-autofiles to * B.
+;;     diredp-marked-here: Bind dired-marker-char to ?*.
+;;     diredp-mark-files-regexp-recursive: Better msgs - show total count.
+;;     Everywhere: Use diredp-looking-at, not looking-at.  Use diredp-read-regexp, not dired-read-regexp.
 ;; 2017/05/30 dadams
 ;;     Fixed typo: direp--set-up-font-locking -> diredp--set-up-font-locking.
 ;; 2017/05/22 dadams
@@ -1917,7 +1932,7 @@ Return value is the number of files marked, or nil if none were marked."
       (goto-char (point-min))
       (while (not (eobp))
         (when ,predicate
-          (unless (looking-at (char-to-string dired-marker-char))
+          (unless (diredp-looking-at-p (char-to-string dired-marker-char))
             (delete-char 1) (insert dired-marker-char) (setq count  (1+ count))))
         (forward-line 1))
       (when ,msg (message "%s %s%s %s%s" count ,msg
@@ -2055,6 +2070,15 @@ If DISTINGUISH-ONE-MARKED is non-nil, then return (t FILENAME) instead
     "Like `looking-at', but this saves and restores the match data."
     (save-match-data (looking-at regexp))))
 
+;; `dired-read-regexp' does not accept DEFAULT and HISTORY for older Emacsen, so use this.
+(defun diredp-read-regexp (prompt &optional default history)
+  "Read a regexp.
+HISTORY defaults to `dired-regexp-history'."
+  (setq history  (or history 'dired-regexp-history))
+  (if (fboundp 'read-regexp)
+      (read-regexp prompt default history)
+    (read-from-minibuffer prompt nil nil nil history default)))
+
 (if (fboundp 'delete-dups)
     (defalias 'diredp-delete-dups (symbol-function 'delete-dups))
   (defun diredp-delete-dups (list)
@@ -2130,9 +2154,6 @@ Uses the `derived-mode-parent' property of the symbol to trace backwards."
     "Return non-nil if FILE is not a directory."
     (not (file-directory-p file))))
 
-(when (and (fboundp 'read-regexp)  (not (fboundp 'dired-read-regexp))) ; Only deprecated, for now.
-  (defalias 'dired-read-regexp 'read-regexp))
-
 
 ;;; Some of the redefinitions that follow are essentially unaltered vanilla Emacs code to be
 ;;; reloaded, to use the new definition of `dired-map-over-marks' here.
@@ -2673,7 +2694,7 @@ If HDR is non-nil, insert a header line with the directory name."
         (setq dir  (replace-regexp-in-string "\\\\" "\\\\" dir nil t)
               dir  (replace-regexp-in-string "\n" "\\n" dir nil t)))
       ;; If we used `--dired' and it worked, the lines are already indented.  Else indent them.
-      (unless (save-excursion (goto-char opoint) (looking-at "  "))
+      (unless (save-excursion (goto-char opoint) (diredp-looking-at-p "  "))
         (let ((indent-tabs-mode  nil)) (indent-rigidly opoint (point) 2)))
       ;; Insert text at the beginning to standardize things.
       (let ((content-point opoint))
@@ -3630,7 +3651,8 @@ See `diredp-dired-union' for the other argument descriptions."
                       (save-excursion   ; This bit is more or less from `dired-toggle-marks'.
                         (goto-char (point-min))
                         (while (not (eobp))
-                          (or (looking-at dired-re-dot)  (push (dired-get-filename nil 'NO-ERROR-P) files-here))
+                          (or (diredp-looking-at-p dired-re-dot)
+                              (push (dired-get-filename nil 'NO-ERROR-P) files-here))
                           (forward-line 1)))
                       (setq files-here  (delq nil files-here)))
                     (dolist (hid-here  hid-here) (push hid-here hidden-dirs))
@@ -3942,9 +3964,10 @@ Non-nil optional arg ONLY-MARKED-P means return nil if none are
 marked."
   ;; If no file is marked, exclude `(FILENAME)': the unmarked file at cursor.
   ;; If there are no marked files as a result, return all files and subdirs in the dir.
-  (let ((ff  (condition-case nil ; Ignore error if on `.' or `..' and no file is marked.
-                 (dired-get-marked-files nil nil nil 'DISTINGUISH-ONE-MARKED)
-               (error nil))))
+  (let* ((dired-marker-char  ?*)
+         (ff                 (condition-case nil ; Ignore error if on `.' or `..' and no file is marked.
+                                 (dired-get-marked-files nil nil nil 'DISTINGUISH-ONE-MARKED)
+                               (error nil))))
     (cond ((eq t (car ff))  (cdr ff))   ; Single marked
           ((cadr ff)        ff)         ; Multiple marked
           (t                (and (not only-marked-p) ; None marked
@@ -4949,6 +4972,10 @@ subdirectories are handled recursively in the same way."
   "Mark all files matching REGEXP, including those in marked subdirs.
 Like `dired-mark-files-regexp' but act recursively on marked subdirs.
 
+The files included are those that are marked in the current Dired
+buffer, or all files in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
 The file names to be matched by this command are always absolute -
 they include the full directory.  Note that this does NOT correspond
 to the default behavior for `dired-mark-files-regexp'.  The other
@@ -4973,23 +5000,120 @@ then only the first such is used."
   (interactive (let* ((numarg   (and current-prefix-arg  (prefix-numeric-value current-prefix-arg)))
                       (unmark   (and numarg  (>= numarg 0)))
                       (ignorep  (and numarg  (<= numarg 0))))
-                 (list (dired-read-regexp (concat (if unmark "UNmark" "Mark") " files (regexp): "))
+                 (list (diredp-read-regexp (concat (if unmark "UNmark" "Mark") " files (regexp): "))
                        (and unmark  ?\040)
                        ignorep)))
   (add-to-list 'regexp-search-ring regexp) ; Add REGEXP to `regexp-search-ring'.
   (let ((dired-marker-char  (or marker-char  dired-marker-char))
         (sdirs              (diredp-get-subdirs ignore-marks-p))
         (total-count        0))
+    (message "%s matching files..." (if (eq ?\040 dired-marker-char) "UNmarking" "Marking"))
     (dolist (dir  (cons default-directory sdirs))
       (when (dired-buffers-for-dir (expand-file-name dir)) ; Dirs with Dired buffers only.
         (with-current-buffer (car (dired-buffers-for-dir (expand-file-name dir)))
-          (setq total-count  
-                (dired-mark-if (and (not (looking-at dired-re-dot))
-                                    (not (eolp)) ; Empty line
-                                    (let ((fn  (dired-get-filename nil 'NO-ERROR)))
-                                      (and fn  (diredp-string-match-p regexp fn))))
-                               "matching file")))))
-    (message "%s %ss..." (if (eq ?\040 dired-marker-char) "UNmarking" "Marking") "matching file")))
+          (setq total-count
+                (+ total-count (or (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))
+                                                       (not (eolp)) ; Empty line
+                                                       (let ((fn  (dired-get-filename nil 'NO-ERROR)))
+                                                         (and fn  (diredp-string-match-p regexp fn))))
+                                                  "matching file")
+                                   0))))))
+    (message "%s %d matching files" (if (eq ?\040 dired-marker-char) "UNmarked" "Marked") total-count)))
+
+(defun diredp-mark-extension-recursive (extension &optional arg) ; Bound to `M-+ * .'
+  "Mark all files with a certain EXTENSION, including in marked subdirs.
+A `.' is not automatically prepended to the string entered.
+
+The files included are those that are marked in the current Dired
+buffer, or all files in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
+This is like `diredp-mark/unmark-extension', but this acts recursively
+on marked subdirs, and a non-positive prefix arg acts differently.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories.
+
+Non-interactively, EXTENSION is the extension (a string).  It can also
+be a list of extension strings.
+Optional argument ARG is the prefix arg."
+  (interactive (let* ((numarg  (and current-prefix-arg  (prefix-numeric-value current-prefix-arg)))
+                      (unmark  (and numarg  (>= numarg 0))))
+                 (list (diredp-read-regexp (concat (if unmark "UNmark" "Mark") " extension: "))
+                       current-prefix-arg)))
+  (let* ((numarg   (and arg  (prefix-numeric-value arg)))
+         (unmark   (and numarg  (>= numarg 0)))
+         (ignorep  (and numarg  (<= numarg 0))))
+    (or (listp extension)  (setq extension  (list extension)))
+    (diredp-mark-files-regexp-recursive (concat ".+[.]\\("
+                                                (mapconcat #'regexp-quote extension "\\|")
+                                                "\\)$")
+                                        (if unmark ?\040 dired-marker-char)
+                                        ignorep)))
+
+;;;###autoload
+(defun diredp-mark-autofiles-recursive (&optional arg) ; Bound to `M-+ * B'
+  "Mark all autofiles, that is, files that have an autofile bookmark.
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories."
+  (interactive "P")
+  (diredp-ensure-bookmark+)
+  (diredp-ensure-mode)
+  (diredp-mark-recursive-1 arg "autofiles" "autofile"
+                           '(and (not (diredp-looking-at-p dired-re-dot))  (not (eolp))
+                             (let ((fname  (dired-get-filename nil t)))
+                               (and fname  (bmkp-get-autofile-bookmark fname))))))
+
+;;;###autoload
+(defun diredp-mark-executables-recursive (&optional arg) ; Bound to `M-+ * *'
+  "Mark all executable files, including in marked subdirs.
+The files included are those that are marked in the current Dired
+buffer, or all files in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories."
+  (interactive "P")
+  (diredp-mark-recursive-1 arg "executable files" "executable file" '(diredp-looking-at-p dired-re-exe)))
+
+;;;###autoload
+(defun diredp-mark-directories-recursive (&optional arg) ; Bound to `M-+ * /'
+  "Mark all directories except `.' and `..', including in marked subdirs.
+The directories included are those that are marked in the current
+Dired buffer, or all subdirs in the directory if none are marked.
+Marked subdirectories are handled recursively in the same way.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories."
+  (interactive "P")
+  (diredp-mark-recursive-1 arg "directories" "directory file" '(and (diredp-looking-at-p dired-re-dir)
+                                                                (not (diredp-looking-at-p dired-re-dot)))))
+;;;###autoload
+(defun diredp-mark-symlinks-recursive (&optional arg) ; Bound to `M-+ * @'
+  "Mark all symbolic links, including in marked subdirs.
+The symlinks included are those that are marked in the current Dired
+buffer, or all symlinks in the directory if none are marked.  Marked
+subdirectories are handled recursively in the same way.
+
+A non-negative prefix arg means to unmark them instead.
+
+A non-positive prefix arg means to ignore subdir markings and act
+instead on ALL subdirs.  That is, mark all in this directory and all
+descendant directories."
+  (interactive "P")
+  (diredp-mark-recursive-1 arg "symlinks" "symbolic link" '(diredp-looking-at-p dired-re-sym)))
 
 ;;;###autoload
 (defun diredp-capitalize-recursive (&optional ignore-marks-p) ; Bound to `M-+ % c'
@@ -5418,10 +5542,12 @@ from multiple directories in the same tree."
 (defun diredp-mark/unmark-extension (extension &optional unmark-p) ; Bound to `* .'
   "Mark all files with a certain EXTENSION for use in later commands.
 A `.' is not automatically prepended to the string entered.
-Non-nil prefix argument UNMARK-P means unmark instead of mark."
-  ;; EXTENSION may also be a list of extensions instead of a single one.
-  ;; Optional MARKER-CHAR is marker to use.
-  (interactive (list (dired-read-regexp (concat (if current-prefix-arg "UNmark" "Mark") "ing extension: "))
+Non-nil prefix argument UNMARK-P means unmark instead of mark.
+
+Non-interactively, EXTENSION is the extension (a string).  It can also
+  be a list of extension strings.
+Optional argument UNMARK-P is the prefix arg."
+  (interactive (list (diredp-read-regexp (concat (if current-prefix-arg "UNmark" "Mark") "ing extension: "))
                      current-prefix-arg))
   (or (listp extension)  (setq extension  (list extension)))
   (dired-mark-files-regexp (concat ".";; Do not match names with nothing but an extension
@@ -5441,7 +5567,7 @@ As a special case, if TAGS is empty, then mark or unmark the files
 that have any tags at all, or if NONEP is non-nil then mark or unmark
 those that have no tags at all."
   (let ((dired-marker-char  (if unmarkp ?\040 dired-marker-char)))
-    (dired-mark-if (and (not (looking-at dired-re-dot))  (not (eolp))
+    (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))  (not (eolp))
                         (let* ((fname     (dired-get-filename nil t))
                                (bmk       (and fname  (bmkp-get-autofile-bookmark fname nil prefix)))
                                (btgs      (and bmk  (bmkp-get-tags bmk)))
@@ -5468,7 +5594,7 @@ As a special case, if TAGS is empty, then mark or unmark the files
 that have any tags at all, or if NOTALLP is non-nil then mark or
 unmark those that have no tags at all."
   (let ((dired-marker-char  (if unmarkp ?\040 dired-marker-char)))
-    (dired-mark-if (and (not (looking-at dired-re-dot))  (not (eolp))
+    (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))  (not (eolp))
                         (let* ((fname     (dired-get-filename nil t))
                                (bmk       (and fname
                                                (bmkp-get-autofile-bookmark fname nil prefix)))
@@ -5554,7 +5680,7 @@ You need library `bookmark+.el' to use this command."
                           (read-string "Prefix for autofile bookmark names: "))))
   (diredp-ensure-bookmark+)
   (diredp-ensure-mode)
-  (dired-mark-if (and (not (looking-at dired-re-dot))  (not (eolp))
+  (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))  (not (eolp))
                       (lexical-let* ((fname  (dired-get-filename nil t))
                                      (bmk    (and fname
                                                   (bmkp-get-autofile-bookmark fname nil prefix)))
@@ -5579,7 +5705,7 @@ You need library `bookmark+.el' to use this command."
   (diredp-ensure-bookmark+)
   (diredp-ensure-mode)
   (let ((dired-marker-char  ?\040))
-    (dired-mark-if (and (not (looking-at dired-re-dot))  (not (eolp))
+    (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))  (not (eolp))
                         (lexical-let* ((fname  (dired-get-filename nil t))
                                        (bmk    (and fname  (bmkp-get-autofile-bookmark fname nil prefix)))
                                        (btgs   (and bmk  (bmkp-get-tags bmk)))
@@ -6015,7 +6141,7 @@ You need library `bookmark+.el' to use this command."
 
 ;; Define these even if `Bookmark+' is not loaded.
 ;;;###autoload
-(defun diredp-mark-autofiles ()
+(defun diredp-mark-autofiles ()         ; Bound to `* B'
   "Mark all autofiles, that is, files that have an autofile bookmark."
   (interactive)
   (diredp-ensure-bookmark+)
@@ -6034,7 +6160,7 @@ You need library `bookmark+.el' to use this command."
 (defun diredp-mark/unmark-autofiles (&optional unmarkp)
   "Mark all autofiles, or unmark if UNMARKP is non-nil."
   (let ((dired-marker-char  (if unmarkp ?\040 dired-marker-char)))
-    (dired-mark-if (and (not (looking-at dired-re-dot))  (not (eolp))
+    (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))  (not (eolp))
                         (let ((fname  (dired-get-filename nil t)))
                           (and fname  (bmkp-get-autofile-bookmark fname))))
                    "autofile")))
@@ -6051,8 +6177,7 @@ Highlighting uses face `diredp-autofile-name'."
       (while (re-search-forward dired-move-to-filename-regexp nil t)
         ;; If Dired details are hidden the match data gets changed.
         (let* ((bmk    (save-match-data
-                         (bmkp-get-autofile-bookmark (buffer-substring
-                                                      (match-end 0) (line-end-position)))))
+                         (bmkp-get-autofile-bookmark (buffer-substring (match-end 0) (line-end-position)))))
                (tags  (and bmk  (bmkp-get-tags bmk))))
           (when bmk
             (hlt-highlight-region (match-end 0) (line-end-position)
@@ -6707,7 +6832,7 @@ A prefix arg behaves as follows:
   (interactive (let* ((arg  current-prefix-arg)
                       (C-u  (and (consp arg)  arg)))
                  (when (and C-u  (> (prefix-numeric-value arg) 16)) (setq arg  '(16)))
-                 (list (dired-read-regexp "Search marked files (regexp): ")
+                 (list (diredp-read-regexp "Search marked files (regexp): ")
                        arg)))
   (tags-search regexp `(dired-get-marked-files nil ',arg 'dired-nondirectory-p)))
 
@@ -7099,12 +7224,12 @@ With prefix argument, unflag all those files.
 Non-interactively:
  Returns t if any work was done, nil otherwise.
  Optional fourth argument LOCALP is as in `dired-get-filename'."
-    (interactive (list (dired-read-regexp "Mark unmarked files matching regexp (default all): ")
+    (interactive (list (diredp-read-regexp "Mark unmarked files matching regexp (default all): ")
                        nil
                        current-prefix-arg
                        nil))
     (let ((dired-marker-char  (if unflag-p ?\   dired-marker-char)))
-      (dired-mark-if (and (looking-at " ") ; Not already marked
+      (dired-mark-if (and (diredp-looking-at-p " ") ; Not already marked
                           (let ((fn  (dired-get-filename localp 'NO-ERROR))) ; Uninteresting
                             (and fn  (diredp-string-match-p regexp fn))))
                      msg))))
@@ -8016,12 +8141,17 @@ absolute names gives you more flexibility.
 REGEXP is an Emacs regexp, not a shell wildcard.  Thus, use `\\.o$'
 for object files--just `.o' might mark more than you might expect.
 
-REGEXP is added to `regexp-search-ring', for regexp search."
+REGEXP is added to `regexp-search-ring', for regexp search.
+
+Non-interactively:
+ MARKER-CHAR is the marker character - used for `dired-marker-char'.
+ LOCALP is passed to `dired-get-filename'.  It determines the form of
+   filename that is matched against REGEXP."
   (interactive (let* ((raw      current-prefix-arg)
                       (C-u      (and (consp raw)  (= 4 (car raw))))
                       (C-u-C-u  (and (consp raw)  (= 16 (car raw))))
                       (num      (and raw  (prefix-numeric-value raw))))
-                 (list (dired-read-regexp (concat (if (or (consp raw)  (and num  (zerop num)))
+                 (list (diredp-read-regexp (concat (if (or (consp raw)  (and num  (zerop num)))
                                                       "UNmark"
                                                     "Mark")
                                                   " files (regexp): "))
@@ -8031,7 +8161,7 @@ REGEXP is added to `regexp-search-ring', for regexp search."
                              (t                    'no-dir))))) ; `M--', `M-0'
   (add-to-list 'regexp-search-ring regexp) ; Add REGEXP to `regexp-search-ring'.
   (let ((dired-marker-char  (or marker-char  dired-marker-char)))
-    (dired-mark-if (and (not (looking-at dired-re-dot))
+    (dired-mark-if (and (not (diredp-looking-at-p dired-re-dot))
                         (not (eolp))    ; Empty line
                         (let ((fn  (dired-get-filename localp t)))
                           (and fn  (diredp-string-match-p regexp fn))))
@@ -8505,7 +8635,7 @@ refer at all to the underlying file system.  Contrast this with
                                                 (string-to-number (match-string 2)))))
           (setq mode  (buffer-substring (point) (+ mode-len (point))))
           (forward-char mode-len)
-          (unless (looking-at " ") (forward-char 1)) ; Skip any extended attributes marker ("." or "+").
+          (unless (diredp-looking-at-p " ") (forward-char 1)) ; Skip any extended attributes marker ("." or "+").
           (setq nlink  (read (current-buffer)))
           ;; Karsten Wenger <kw@cis.uni-muenchen.de> fixed uid.
 
@@ -8538,7 +8668,7 @@ refer at all to the underlying file system.  Contrast this with
                          (buffer-substring (progn (skip-chars-backward " \t") (point))
                                            (progn (skip-chars-backward "^ \t") (point)))))
                  (setq name  (buffer-substring (point) (or (dired-move-to-end-of-filename t)  (point)))
-                       sym   (if (looking-at " -> ")
+                       sym   (if (diredp-looking-at-p " -> ")
                                  (buffer-substring (progn (forward-char 4) (point)) (line-end-position))
                                "")))
                 (t
@@ -8558,7 +8688,7 @@ refer at all to the underlying file system.  Contrast this with
                  (setq gid   (buffer-substring (save-excursion (forward-word 1) (point)) (point))
                        time  (buffer-substring (match-beginning 1) (1- (dired-move-to-filename)))
                        name  (buffer-substring (point) (or (dired-move-to-end-of-filename t)  (point)))
-                       sym   (if (looking-at " -> ")
+                       sym   (if (diredp-looking-at-p " -> ")
                                  (buffer-substring (progn (forward-char 4) (point)) (line-end-position))
                                "")))))
         ;; Vanilla Emacs uses `lexical-binding' = t, and it passes bindings to `eval' as a second arg.
@@ -8570,10 +8700,11 @@ refer at all to the underlying file system.  Contrast this with
   "Return non-nil if the file on this line is marked.
 Optional arg MARK-CHAR is the type of mark to check.
  If nil, then if the file has any mark, including `D', it is marked."
-  (and (dired-get-filename t t)  (save-excursion (beginning-of-line)
-                                                 (if mark-char
-                                                     (looking-at (concat "^" (char-to-string mark-char)))
-                                                   (not (looking-at "^ "))))))
+  (and (dired-get-filename t t)  (save-excursion
+                                   (beginning-of-line)
+                                   (if mark-char
+                                       (diredp-looking-at-p (concat "^" (char-to-string mark-char)))
+                                     (not (diredp-looking-at-p "^ "))))))
 
 (defun diredp-this-file-unmarked-p (&optional mark-char)
   "Return non-nil if the file on this line is unmarked.
@@ -8581,10 +8712,11 @@ Optional arg MARK-CHAR is the type of mark to check.
  If nil, then if the file has no mark, including `D', it is unmarked.
  If non-nil, then it is unmarked for MARK-CHAR if it has no mark or
  it has any mark except MARK-CHAR."
-  (and (dired-get-filename t t)  (save-excursion (beginning-of-line)
-                                                 (if mark-char
-                                                     (not (looking-at (concat "^" (char-to-string mark-char))))
-                                                   (looking-at "^ ")))))
+  (and (dired-get-filename t t)  (save-excursion
+                                   (beginning-of-line)
+                                   (if mark-char
+                                       (not (diredp-looking-at-p (concat "^" (char-to-string mark-char))))
+                                     (diredp-looking-at-p "^ ")))))
 
 ;;;###autoload
 (defun diredp-mark-region-files (&optional unmark-p) ; Not bound
@@ -8720,7 +8852,7 @@ With non-nil prefix arg, mark them instead."
                                                  (require 'help+20 nil t))
                                                'diredp-describe-file
                                                'diredp-describe-autofile)] ; Requires `bookmark+.el'
-                             ;; Stuff from `Mark' menu.
+                             ;; Stuff from `Marks' menu.
                              ["Mark"  dired-mark
                               :visible (not (eql (dired-file-marker file/dir-name)
                                              dired-marker-char))]
@@ -9728,7 +9860,7 @@ Also abbreviate `mode-name', using \"Dired/\" instead of \"Dired by\"."
                               (format " %s%d%c"
                                       (save-excursion
                                         (forward-line 0)
-                                        (if (looking-at (concat marked-regexp ".*"))
+                                        (if (diredp-looking-at-p (concat marked-regexp ".*"))
                                             (format "%d/" (1+ (count-matches
                                                                marked-regexp
                                                                (point-min) (point))))
@@ -9745,7 +9877,7 @@ Also abbreviate `mode-name', using \"Dired/\" instead of \"Dired by\"."
                               (format " %s%dD"
                                       (save-excursion
                                         (forward-line 0)
-                                        (if (looking-at (concat flagged-regexp ".*"))
+                                        (if (diredp-looking-at-p (concat flagged-regexp ".*"))
                                             (format "%d/" (1+ (count-matches
                                                                flagged-regexp
                                                                (point-min) (point))))
@@ -10755,7 +10887,7 @@ If no one is selected, symmetric encryption will be performed.  "
       :help "Mark unmarked files, unmark marked ones")))
 
 
-;; `Mark' > `Tagged' menu.
+;; `Marks' > `Tagged' menu.
 ;;
 (when (require 'bookmark+ nil t)
   (defvar diredp-marks-tags-menu (make-sparse-keymap "Tagged (Autofiles)")
@@ -10837,13 +10969,6 @@ If no one is selected, symmetric encryption will be performed.  "
   '(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.
@@ -10853,7 +10978,7 @@ If no one is selected, symmetric encryption will be performed.  "
 (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
+  '(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]
@@ -10897,13 +11022,13 @@ If no one is selected, symmetric encryption will be performed.  "
   (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-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-symlinks]
   '(menu-item "Mark Symlinks" dired-mark-symlinks
     :visible (fboundp 'make-symbolic-link) :help "Mark all symbolic links"))
@@ -10927,6 +11052,32 @@ If no one is selected, symmetric encryption will be performed.  "
     :help "Mark current line's file for future operations"))
 
 
+;; `Marks' > `Here and Below' menu.
+;;
+(defvar diredp-marks-recursive-menu (make-sparse-keymap "Here and Below"))
+(define-key diredp-menu-bar-marks-menu [mark-recursive]
+  (cons "Here and Below" diredp-marks-recursive-menu))
+(define-key diredp-marks-recursive-menu [diredp-mark-files-regexp-recursive]
+  '(menu-item "Regexp..." diredp-mark-files-regexp-recursive
+    :help "Mark all files matching a regexp, including those in marked subdirs"))
+(define-key diredp-marks-recursive-menu [diredp-mark-extension-recursive]
+  '(menu-item "Extension..." diredp-mark-extension-recursive
+    :help "Mark all files with a given extension, including those in marked subdirs"))
+(define-key diredp-marks-recursive-menu [diredp-mark-autofiles-recursive]
+  '(menu-item "Autofiles" diredp-mark-autofiles-recursive
+    :help "Mark all files with a given extension, including those in marked subdirs"
+    :enable (featurep 'bookmark+)))
+(define-key diredp-marks-recursive-menu [diredp-mark-symlinks-recursive]
+  '(menu-item "Symbolic Links" diredp-mark-symlinks-recursive
+    :help "Mark all symbolic links, including those in marked subdirs"))
+(define-key diredp-marks-recursive-menu [diredp-mark-directories-recursive]
+  '(menu-item "Directories" diredp-mark-directories-recursive
+    :help "Mark all directories, including those in marked subdirs"))
+(define-key diredp-marks-recursive-menu [diredp-mark-executables-recursive]
+  '(menu-item "Executables" diredp-mark-executables-recursive
+    :help "Mark all executable files, including those in marked subdirs"))
+
+
 ;; "Dir" menu.
 ;;
 ;; REPLACE ORIGINAL `Subdir' menu in `dired.el'.
@@ -11148,6 +11299,7 @@ If no one is selected, symmetric encryption will be performed.  "
 (define-key dired-mode-map "="       'diredp-ediff)                                 ; `='
 ;; This replaces the `dired-x.el' binding of `dired-mark-extension'.
 (define-key dired-mode-map "*."      'diredp-mark/unmark-extension)                 ; `* .'
+(define-key dired-mode-map "*B"      'diredp-mark-autofiles)                        ; `* B'
 (define-key dired-mode-map [(control meta ?*)] 'diredp-marked-other-window)         ; `C-M-*'
 (define-key dired-mode-map "\M-a"    'dired-do-search)                              ; `M-a'
 (define-key dired-mode-map "\M-b"    'diredp-do-bookmark)                           ; `M-b'
@@ -11256,6 +11408,12 @@ If no one is selected, symmetric encryption will be performed.  "
 (define-key dired-mode-map "\M-+"  diredp-recursive-map) ; `M-+'
 
 (define-key diredp-recursive-map "@"           'diredp-do-apply-function-recursive)     ; `@'
+(define-key diredp-recursive-map "*@"          'diredp-mark-symlinks-recursive)         ; `* @'
+(define-key diredp-recursive-map "**"          'diredp-mark-executables-recursive)      ; `* *'
+(define-key diredp-recursive-map "*/"          'diredp-mark-directories-recursive)      ; `* /'
+(define-key diredp-recursive-map "*."          'diredp-mark-extension-recursive)        ; `* .'
+(define-key diredp-recursive-map "*B"          'diredp-mark-autofiles-recursive)        ; `* B'
+(define-key diredp-recursive-map "*%"          'diredp-mark-files-regexp-recursive)     ; `* %'
 (when (> emacs-major-version 22)
   (define-key diredp-recursive-map ":d"        'diredp-do-decrypt-recursive)            ; `: d'
   (define-key diredp-recursive-map ":e"        'diredp-do-encrypt-recursive)            ; `: e'

Binary file

@@ -0,0 +1,51 @@
+;;; dired-quick-sort-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
+
+;;;### (autoloads nil "dired-quick-sort" "dired-quick-sort.el" (22863
+;;;;;;  60401 960267 728000))
+;;; Generated autoloads from dired-quick-sort.el
+
+(autoload 'dired-quick-sort "dired-quick-sort" "\
+Sort dired by the given criteria.
+
+The possible values of SORT-BY, REVERSE, GROUP-DIRECTORIES and TIME are
+explained in the variable `dired-quick-sort-reverse-last',
+`dired-quick-sort-reverse-last', `dired-quick-sort-group-directories-last' and
+`dired-quick-sort-time-last' respectively.  Besides, passing nil to any of these
+arguments to use the value used last time (that is, the values of the four
+variables mentioned before), even after restarting Emacs if `savehist-mode' is
+enabled.  When invoked interactively, nil's are passed to all arguments.
+
+\(fn &optional SORT-BY REVERSE GROUP-DIRECTORIES TIME)" t nil)
+
+(autoload 'dired-quick-sort-setup "dired-quick-sort" "\
+Run the default setup.
+
+This will bind the key S in `dired-mode' to run
+`hydra-dired-quick-sort/body', and automatically run the sorting
+criteria after entering `dired-mode'.  You can choose to not call
+this setup function and run a modified version of this function
+to use your own preferred setup:
+
+  ;; Replace \"S\" with other keys to invoke the dired-quick-sort hydra.
+  (define-key dired-mode-map \"S\" 'hydra-dired-quick-sort/body)
+  ;; Automatically use the sorting defined here to sort.
+  (add-hook 'dired-mode-hook 'dired-quick-sort)
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("dired-quick-sort-pkg.el") (22863 60352
+;;;;;;  117636 68000))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; dired-quick-sort-autoloads.el ends here

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "dired-quick-sort" "20161208.1312" "Persistent quick sorting of dired buffers in various ways." '((hydra "0.13.0")) :commit "1845f978d313f750a5b70b832457ed803c4ffbdb" :url "https://gitlab.com/xuhdev/dired-quick-sort#dired-quick-sort" :keywords '("convenience" "files"))

@@ -0,0 +1,198 @@
+;;; dired-quick-sort.el --- Persistent quick sorting of dired buffers in various ways. -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2016  Hong Xu <hong@topbug.net>
+
+;; Author: Hong Xu <hong@topbug.net>
+;; URL: https://gitlab.com/xuhdev/dired-quick-sort#dired-quick-sort
+;; Package-Version: 20161208.1312
+;; Version: 0.1+
+;; Package-Requires: ((hydra "0.13.0"))
+;; Keywords: convenience, files
+
+;; This file is not part of GNU Emacs
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This package provides ways to quickly sort dired buffers in various ways.
+;; With `savehist-mode' enabled (strongly recommended), the last used sorting
+;; criteria are automatically used when sorting, even after restarting Emacs.  A
+;; hydra is defined to conveniently change sorting criteria.
+;;
+;; For a quick setup, Add the following configuration to your "~/.emacs" or
+;; "~/.emacs.d/init.el":
+;;
+;;     (require 'dired-quick-sort)
+;;     (dired-quick-sort-setup)
+;;
+;; This will bind "S" in dired-mode to invoke the quick sort hydra and new Dired
+;; buffers are automatically sorted according to the setup in this package.  See
+;; the document of `dired-quick-sort-setup` if you need a different setup.  It
+;; is recommended that at least "-l" should be put into
+;; `dired-listing-switches'.  If used with dired+, you may want to set
+;; `diredp-hide-details-initially-flag' to nil.
+;;
+;; To make full use of this extensions, please make sure that the variable
+;; `insert-directory-program' points to the GNU version of ls.
+;;
+;; To report bugs and make feature requests, please open a new ticket at the
+;; issue tracker <https://gitlab.com/xuhdev/dired-quick-sort/issues>. To
+;; contribute, please create a merge request at
+;; <https://gitlab.com/xuhdev/dired-quick-sort/merge_requests>.
+;;
+;; For any other questions and comments, please send them to
+;; <https://www.topbug.net/blog/2016/08/17/dired-quick-sort-sort-dired-buffers-quickly-in-emacs/>.
+
+;;; Code:
+
+(require 'dired)
+(require 'ls-lisp)
+(require 'savehist)
+(require 'hydra)
+
+(defvar dired-quick-sort-sort-by-last "version"
+  "The main sort criteria used last time.
+
+The value should be one of none, time, size, version (natural, an improved
+version of name and extension.
+
+See the documentation of the \"--sort\" option of GNU ls for details.")
+(add-to-list 'savehist-additional-variables 'dired-quick-sort-sort-by-last)
+(defvar dired-quick-sort-reverse-last ?n
+  "Whether reversing was enabled when sorting was used last time.
+
+The value should be either ?y or ?n.")
+(add-to-list 'savehist-additional-variables 'dired-quick-sort-reverse-last)
+(defvar dired-quick-sort-group-directories-last ?n
+  "Whether directories are grouped together when sorting was used last time.
+
+The value should either be ?y or ?n.")
+(add-to-list 'savehist-additional-variables
+             'dired-quick-sort-group-directories-last)
+(defvar dired-quick-sort-time-last "default"
+  "The time option used last time.
+
+The value should be one of default (modified time), atime, access, use, ctime or
+status.  If the sort-by option is set as \"time\", the specified time will be
+used as the key for sorting.
+
+See the documentation of the \"--time\" option of GNU ls for details.")
+(add-to-list 'savehist-additional-variables 'dired-quick-sort-time-last)
+
+;;;###autoload
+(defun dired-quick-sort (&optional sort-by reverse group-directories time)
+  "Sort dired by the given criteria.
+
+The possible values of SORT-BY, REVERSE, GROUP-DIRECTORIES and TIME are
+explained in the variable `dired-quick-sort-reverse-last',
+`dired-quick-sort-reverse-last', `dired-quick-sort-group-directories-last' and
+`dired-quick-sort-time-last' respectively.  Besides, passing nil to any of these
+arguments to use the value used last time (that is, the values of the four
+variables mentioned before), even after restarting Emacs if `savehist-mode' is
+enabled.  When invoked interactively, nil's are passed to all arguments."
+  (interactive)
+  (setq dired-quick-sort-sort-by-last (or sort-by dired-quick-sort-sort-by-last)
+        dired-quick-sort-reverse-last (or reverse dired-quick-sort-reverse-last)
+        dired-quick-sort-group-directories-last
+        (or group-directories dired-quick-sort-group-directories-last)
+        dired-quick-sort-time-last (or time dired-quick-sort-time-last))
+  (dired-sort-other
+   (format "%s --sort=%s %s %s %s" dired-listing-switches
+           dired-quick-sort-sort-by-last
+           (if (char-equal dired-quick-sort-reverse-last ?y)
+               "-r" "")
+           (if (char-equal dired-quick-sort-group-directories-last ?y)
+               "--group-directories-first" "")
+           (if (not (string= dired-quick-sort-time-last "default"))
+               (concat "--time=" dired-quick-sort-time-last) ""))))
+
+(defun dired-quick-sort--sort-by-last (field)
+  (if (string= dired-quick-sort-sort-by-last field) "[X]" "[ ]"))
+
+(defhydra hydra-dired-quick-sort (:hint none :color pink)
+  "
+^Sort by^                   ^Reverse^               ^Group Directories^            ^Time
+^^^^^^^^^----------------------------------------------------------------------------------------------------------------
+_n_: ?n? none               _r_: ?r? yes            _g_: ?g? yes                   _d_: ?d? default (last modified time)
+_t_: ?t? time               _R_: ?R? no             _G_: ?G? no                    _A_: ?A? atime
+_s_: ?s? size               ^ ^                     ^ ^                            _a_: ?a? access
+_v_: ?v? version (natural)  ^ ^                     ^ ^                            _u_: ?u? use
+_e_: ?e? extension          ^ ^                     ^ ^                            _c_: ?c? ctime
+_q_: quit                   ^ ^                     ^ ^                            _S_: ?S? status
+"
+  ("n" (dired-quick-sort "none" nil nil nil)
+       (dired-quick-sort--sort-by-last "none"))
+  ("t" (dired-quick-sort "time" nil nil nil)
+       (dired-quick-sort--sort-by-last "time"))
+  ("s" (dired-quick-sort "size" nil nil nil)
+       (dired-quick-sort--sort-by-last "size"))
+  ("v" (dired-quick-sort "version" nil nil nil)
+       (dired-quick-sort--sort-by-last "version"))
+  ("e" (dired-quick-sort "extension" nil nil nil)
+       (if (string= dired-quick-sort-sort-by-last "extension") "[X]" "[ ]"))
+  ("r" (dired-quick-sort nil ?y nil nil)
+       (if (char-equal dired-quick-sort-reverse-last ?y) "[X]" "[ ]"))
+  ("R" (dired-quick-sort nil ?n nil nil)
+       (if (char-equal dired-quick-sort-reverse-last ?n) "[X]" "[ ]"))
+  ("g" (dired-quick-sort nil nil ?y nil)
+       (if (char-equal dired-quick-sort-group-directories-last ?y) "[X]" "[ ]"))
+  ("G" (dired-quick-sort nil nil ?n nil)
+       (if (char-equal dired-quick-sort-group-directories-last ?n) "[X]" "[ ]"))
+  ("d" (dired-quick-sort nil nil nil "default")
+       (if (string= dired-quick-sort-time-last "default") "[X]" "[ ]"))
+  ("A" (dired-quick-sort nil nil nil "atime")
+       (if (string= dired-quick-sort-time-last "atime") "[X]" "[ ]"))
+  ("a" (dired-quick-sort nil nil nil "access")
+       (if (string= dired-quick-sort-time-last "access") "[X]" "[ ]"))
+  ("u" (dired-quick-sort nil nil nil "use")
+       (if (string= dired-quick-sort-time-last "use") "[X]" "[ ]"))
+  ("c" (dired-quick-sort nil nil nil "ctime")
+       (if (string= dired-quick-sort-time-last "ctime") "[X]" "[ ]"))
+  ("S" (dired-quick-sort nil nil nil "status")
+       (if (string= dired-quick-sort-time-last "status") "[X]" "[ ]"))
+  ("q" nil "quit" :hint t :color blue))
+
+;;;###autoload
+(defun dired-quick-sort-setup ()
+  "Run the default setup.
+
+This will bind the key S in `dired-mode' to run
+`hydra-dired-quick-sort/body', and automatically run the sorting
+criteria after entering `dired-mode'.  You can choose to not call
+this setup function and run a modified version of this function
+to use your own preferred setup:
+
+  ;; Replace \"S\" with other keys to invoke the dired-quick-sort hydra.
+  (define-key dired-mode-map \"S\" 'hydra-dired-quick-sort/body)
+  ;; Automatically use the sorting defined here to sort.
+  (add-hook 'dired-mode-hook 'dired-quick-sort)"
+
+  (if (not ls-lisp-use-insert-directory-program)
+      (display-warning 'dired-quick-sort "`ls-lisp-use-insert-directory-program'
+is nil. The package `dired-quick-sort' will not work and thus is not set up by
+`dired-quick-sort-setup'." :warning)
+    (define-key dired-mode-map "S" 'hydra-dired-quick-sort/body)
+    (add-hook 'dired-mode-hook 'dired-quick-sort)))
+
+(provide 'dired-quick-sort)
+
+;;; dired-quick-sort.el ends here
+
+;; Local Variables:
+;; coding: utf-8
+;; fill-column: 80
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: t
+;; End:

Binary file

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "direnv" "direnv.el" (22859 63758 735267 475000))
+;;;### (autoloads nil "direnv" "direnv.el" (22863 59980 395190 252000))
 ;;; Generated autoloads from direnv.el
 
 (autoload 'direnv-update-environment "direnv" "\

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "direnv" "20170622.1128" "direnv support for emacs" '((emacs "24.4") (dash "2.13.0") (with-editor "2.5.10")) :commit "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa" :url "https://github.com/wbolster/emacs-direnv" :keywords '("direnv" "environment"))

@@ -1,8 +1,8 @@
 ;;; direnv.el --- direnv support for emacs
 
 ;; Author: Wouter Bolsterlee <wouter@bolsterl.ee>
-;; Version: 1.2.0
-;; Package-Version: 20170622.446
+;; Version: 1.2.1
+;; Package-Version: 20170622.1128
 ;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.10"))
 ;; Keywords: direnv, environment
 ;; URL: https://github.com/wbolster/emacs-direnv

File renamed without changes

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "direnv" "20170622.446" "direnv support for emacs" '((emacs "24.4") (dash "2.13.0") (with-editor "2.5.10")) :commit "53a98dbb3213cba7527948a0373fc240b383bfb9" :url "https://github.com/wbolster/emacs-direnv" :keywords '("direnv" "environment"))

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" (22859 63756 36351 96000))
+;;;### (autoloads nil "ivy" "ivy.el" (22863 59979 132220 146000))
 ;;; Generated autoloads from ivy.el
 
 (autoload 'ivy-resume "ivy" "\
@@ -118,7 +118,7 @@ Switch to another buffer in another window.
 ;;;***
 
 ;;;### (autoloads nil nil ("colir.el" "ivy-overlay.el" "ivy-pkg.el")
-;;;;;;  (22859 63756 21351 560000))
+;;;;;;  (22863 59979 118220 477000))
 
 ;;;***

File renamed without changes

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

@@ -1656,6 +1656,7 @@ This is useful for recursive `ivy-read'."
     (setq ivy--old-text "")
     (setq ivy--full-length nil)
     (setq ivy-text "")
+    (setq ivy--index 0)
     (setq ivy-calling nil)
     (setq ivy-use-ignore ivy-use-ignore-default)
     (let (reb)

Binary file

File renamed without changes

@@ -467,7 +467,7 @@ running 'man git-rebase' at the command line) for details."
   (setq comment-start (or (magit-get "core.commentChar") "#"))
   (setq git-rebase-comment-re (concat "^" (regexp-quote comment-start)))
   (setq git-rebase-line
-        (concat "^\\(" (regexp-quote comment-start) "?"
+        (concat "^\\(" (regexp-quote comment-start) "? *"
                 "\\(?:[fprse]\\|pick\\|reword\\|edit\\|squash\\|fixup\\|exec\\|noop\\)\\) "
                 "\\(?:\\([^ \n]+\\) \\(.*\\)\\)?"))
   (setq font-lock-defaults (list (git-rebase-mode-font-lock-keywords) t t))

Binary file

File renamed without changes

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "git-rebase" "git-rebase.el" (22859 63750 639518
-;;;;;;  312000))
+;;;### (autoloads nil "git-rebase" "git-rebase.el" (22863 59971 724395
+;;;;;;  36000))
 ;;; 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" (22859 63750 778514 6000))
+;;;### (autoloads nil "magit" "magit.el" (22863 59971 820392 775000))
 ;;; Generated autoloads from magit.el
  (autoload 'magit-merge-popup "magit" nil t)
 
@@ -180,8 +180,8 @@ and Emacs to it.
 
 ;;;***
 
-;;;### (autoloads nil "magit-apply" "magit-apply.el" (22859 63750
-;;;;;;  687516 825000))
+;;;### (autoloads nil "magit-apply" "magit-apply.el" (22863 59971
+;;;;;;  753394 353000))
 ;;; Generated autoloads from magit-apply.el
 
 (autoload 'magit-stage-file "magit-apply" "\
@@ -217,8 +217,8 @@ Remove all changes from the staging area.
 
 ;;;***
 
-;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22859
-;;;;;;  63750 587519 924000))
+;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22863
+;;;;;;  59971 677396 143000))
 ;;; Generated autoloads from magit-autorevert.el
 
 (defvar magit-revert-buffers t)
@@ -247,8 +247,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
 
 ;;;***
 
-;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22859 63750
-;;;;;;  681517 11000))
+;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22863 59971
+;;;;;;  749394 447000))
 ;;; Generated autoloads from magit-bisect.el
  (autoload 'magit-bisect-popup "magit-bisect" nil t)
 
@@ -299,8 +299,8 @@ bisect run'.
 
 ;;;***
 
-;;;### (autoloads nil "magit-blame" "magit-blame.el" (22859 63750
-;;;;;;  754514 749000))
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (22863 59971
+;;;;;;  810393 10000))
 ;;; Generated autoloads from magit-blame.el
  (autoload 'magit-blame-popup "magit-blame" nil t)
 
@@ -324,8 +324,8 @@ only arguments available from `magit-blame-popup' should be used.
 
 ;;;***
 
-;;;### (autoloads nil "magit-branch" "magit-branch.el" (22859 63750
-;;;;;;  674517 228000))
+;;;### (autoloads nil "magit-branch" "magit-branch.el" (22863 59971
+;;;;;;  745394 541000))
 ;;; Generated autoloads from magit-branch.el
  (autoload 'magit-branch-popup "magit" nil t)
 
@@ -553,8 +553,8 @@ When `never' (the default) then the variable is never set.
 
 ;;;***
 
-;;;### (autoloads nil "magit-commit" "magit-commit.el" (22859 63750
-;;;;;;  592519 769000))
+;;;### (autoloads nil "magit-commit" "magit-commit.el" (22863 59971
+;;;;;;  682396 25000))
 ;;; Generated autoloads from magit-commit.el
 
 (autoload 'magit-commit "magit-commit" "\
@@ -636,8 +636,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
 
 ;;;***
 
-;;;### (autoloads nil "magit-diff" "magit-diff.el" (22859 63750 748514
-;;;;;;  935000))
+;;;### (autoloads nil "magit-diff" "magit-diff.el" (22863 59971 804393
+;;;;;;  151000))
 ;;; Generated autoloads from magit-diff.el
 
 (autoload 'magit-diff-popup "magit-diff" "\
@@ -721,8 +721,8 @@ for a revision.
 
 ;;;***
 
-;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22859 63750
-;;;;;;  723515 710000))
+;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22863 59971
+;;;;;;  783393 646000))
 ;;; Generated autoloads from magit-ediff.el
  (autoload 'magit-ediff-popup "magit-ediff" nil t)
 
@@ -810,8 +810,8 @@ stash that were staged.
 
 ;;;***
 
-;;;### (autoloads nil "magit-extras" "magit-extras.el" (22859 63750
-;;;;;;  602519 459000))
+;;;### (autoloads nil "magit-extras" "magit-extras.el" (22863 59971
+;;;;;;  686395 931000))
 ;;; Generated autoloads from magit-extras.el
 
 (autoload 'magit-run-git-gui "magit-extras" "\
@@ -920,8 +920,8 @@ patch application, a cherry-pick, a revert, or a bisect.
 
 ;;;***
 
-;;;### (autoloads nil "magit-files" "magit-files.el" (22859 63750
-;;;;;;  644518 157000))
+;;;### (autoloads nil "magit-files" "magit-files.el" (22863 59971
+;;;;;;  729394 918000))
 ;;; Generated autoloads from magit-files.el
 
 (autoload 'magit-find-file "magit-files" "\
@@ -968,8 +968,8 @@ Checkout FILE from REV.
 
 ;;;***
 
-;;;### (autoloads nil "magit-imenu" "magit-imenu.el" (22859 63750
-;;;;;;  717515 896000))
+;;;### (autoloads nil "magit-imenu" "magit-imenu.el" (22863 59971
+;;;;;;  779393 740000))
 ;;; Generated autoloads from magit-imenu.el
 
 (autoload 'magit-imenu--log-prev-index-position-function "magit-imenu" "\
@@ -1085,8 +1085,8 @@ beginning of the line.
 
 ;;;***
 
-;;;### (autoloads nil "magit-log" "magit-log.el" (22859 63750 729515
-;;;;;;  524000))
+;;;### (autoloads nil "magit-log" "magit-log.el" (22863 59971 789393
+;;;;;;  505000))
 ;;; Generated autoloads from magit-log.el
 
 (autoload 'magit-log-buffer-file-popup "magit-log" "\
@@ -1168,15 +1168,15 @@ Show commits in a branch that are not merged in the upstream branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-notes" "magit-notes.el" (22859 63750
-;;;;;;  821512 673000))
+;;;### (autoloads nil "magit-notes" "magit-notes.el" (22863 59971
+;;;;;;  859391 856000))
 ;;; Generated autoloads from magit-notes.el
  (autoload 'magit-notes-popup "magit" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "magit-refs" "magit-refs.el" (22859 63750 608519
-;;;;;;  273000))
+;;;### (autoloads nil "magit-refs" "magit-refs.el" (22863 59971 692395
+;;;;;;  790000))
 ;;; Generated autoloads from magit-refs.el
  (autoload 'magit-show-refs-popup "magit" nil t)
 
@@ -1201,8 +1201,8 @@ Refs are compared with a branch read from the user.
 
 ;;;***
 
-;;;### (autoloads nil "magit-remote" "magit-remote.el" (22859 63750
-;;;;;;  799513 355000))
+;;;### (autoloads nil "magit-remote" "magit-remote.el" (22863 59971
+;;;;;;  841392 280000))
 ;;; Generated autoloads from magit-remote.el
 
 (autoload 'magit-clone "magit-remote" "\
@@ -1434,8 +1434,8 @@ is asked to pull.  START has to be reachable from that commit.
 
 ;;;***
 
-;;;### (autoloads nil "magit-repos" "magit-repos.el" (22859 63750
-;;;;;;  742515 121000))
+;;;### (autoloads nil "magit-repos" "magit-repos.el" (22863 59971
+;;;;;;  799393 269000))
 ;;; Generated autoloads from magit-repos.el
 
 (autoload 'magit-list-repositories "magit-repos" "\
@@ -1449,8 +1449,8 @@ control which repositories are displayed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22859
-;;;;;;  63750 788513 696000))
+;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22863
+;;;;;;  59971 830392 539000))
 ;;; Generated autoloads from magit-sequence.el
 
 (autoload 'magit-sequencer-continue "magit-sequence" "\
@@ -1600,8 +1600,8 @@ Abort the current rebase operation, restoring the original branch.
 
 ;;;***
 
-;;;### (autoloads nil "magit-stash" "magit-stash.el" (22859 63750
-;;;;;;  703516 329000))
+;;;### (autoloads nil "magit-stash" "magit-stash.el" (22863 59971
+;;;;;;  767394 23000))
 ;;; Generated autoloads from magit-stash.el
  (autoload 'magit-stash-popup "magit-stash" nil t)
 
@@ -1700,8 +1700,8 @@ Show all diffs of a stash in a buffer.
 
 ;;;***
 
-;;;### (autoloads nil "magit-status" "magit-status.el" (22859 63750
-;;;;;;  737515 276000))
+;;;### (autoloads nil "magit-status" "magit-status.el" (22863 59971
+;;;;;;  795393 364000))
 ;;; Generated autoloads from magit-status.el
 
 (autoload 'magit-init "magit-status" "\
@@ -1732,8 +1732,8 @@ then offer to initialize it as a new repository.
 
 ;;;***
 
-;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22859
-;;;;;;  63750 827512 487000))
+;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22863
+;;;;;;  59971 865391 715000))
 ;;; Generated autoloads from magit-submodule.el
  (autoload 'magit-submodule-popup "magit-submodule" nil t)
 
@@ -1823,8 +1823,8 @@ Display a list of the current repository's submodules.
 
 ;;;***
 
-;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22859 63750
-;;;;;;  662517 600000))
+;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22863 59971
+;;;;;;  734394 800000))
 ;;; Generated autoloads from magit-subtree.el
  (autoload 'magit-subtree-popup "magit-subtree" nil t)
 
@@ -1860,8 +1860,8 @@ Extract the history of the subtree PREFIX.
 
 ;;;***
 
-;;;### (autoloads nil "magit-utils" "magit-utils.el" (22859 63750
-;;;;;;  568520 512000))
+;;;### (autoloads nil "magit-utils" "magit-utils.el" (22863 59971
+;;;;;;  657396 614000))
 ;;; Generated autoloads from magit-utils.el
 
 (autoload 'magit-emacs-Q-command "magit-utils" "\
@@ -1886,8 +1886,8 @@ See info node `(magit)Debugging Tools' for more information.
 
 ;;;***
 
-;;;### (autoloads nil "magit-wip" "magit-wip.el" (22859 63750 618518
-;;;;;;  963000))
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (22863 59971 702395
+;;;;;;  554000))
 ;;; Generated autoloads from magit-wip.el
 
 (defvar magit-wip-after-save-mode nil "\
@@ -1955,8 +1955,8 @@ command which is about to be called are committed.
 
 ;;;***
 
-;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22859
-;;;;;;  63750 811512 983000))
+;;;### (autoloads nil "magit-worktree" "magit-worktree.el" (22863
+;;;;;;  59971 850392 68000))
 ;;; Generated autoloads from magit-worktree.el
 
 (autoload 'magit-worktree-checkout "magit-worktree" "\
@@ -1973,7 +1973,7 @@ Create a new BRANCH and check it out in a new worktree at PATH.
 
 ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-margin.el"
 ;;;;;;  "magit-mode.el" "magit-obsolete.el" "magit-pkg.el" "magit-process.el"
-;;;;;;  "magit-section.el") (22859 63750 805513 169000))
+;;;;;;  "magit-section.el") (22863 59971 846392 162000))
 
 ;;;***

File renamed without changes

Binary file

File renamed without changes

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

File renamed without changes

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

@@ -3,8 +3,8 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22859 63744
-;;;;;;  283715 252000))
+;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22863 59935
+;;;;;;  896229 913000))
 ;;; Generated autoloads from markdown-mode.el
 
 (autoload 'markdown-mode "markdown-mode" "\

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

@@ -7,7 +7,7 @@
 ;; Maintainer: Jason R. Blevins <jrblevin@sdf.org>
 ;; Created: May 24, 2007
 ;; Version: 2.3-dev
-;; Package-Version: 20170620.2048
+;; Package-Version: 20170625.451
 ;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
 ;; Keywords: Markdown, GitHub Flavored Markdown, itex
 ;; URL: http://jblevins.org/projects/markdown-mode/
@@ -193,14 +193,17 @@
 ;; commands are described below.  You can obtain a list of all
 ;; keybindings by pressing `C-c C-h`.
 ;;
-;;   * Hyperlinks: `C-c C-l`
+;;   * Links and Images: `C-c C-l` and `C-c C-i`
 ;;
 ;;     `C-c C-l` (`markdown-insert-link`) is a general command for
-;;     inserting standard Markdown links of any form: either inline
-;;     links, reference links, or plain URLs in angle brackets.  The
-;;     URL or `[reference]` label, link text, and optional title are
-;;     entered through a series of interactive prompts.  The type of
-;;     link is determined by which values are provided:
+;;     inserting new link markup or editing existing link markup. This
+;;     is especially useful when markup or URL hiding is enabled, so
+;;     that URLs can't easily be edited directly.  This command can be
+;;     used to insert links of any form: either inline links,
+;;     reference links, or plain URLs in angle brackets.  The URL or
+;;     `[reference]` label, link text, and optional title are entered
+;;     through a series of interactive prompts.  The type of link is
+;;     determined by which values are provided:
 ;;
 ;;     *   If both a URL and link text are given, insert an inline link:
 ;;         `[text](url)`.
@@ -211,15 +214,27 @@
 ;;     *   If only a URL is given, insert a plain URL link:
 ;;         `<url>`.
 ;;
-;;     If there is an active region, this command uses the region as
-;;     either the default URL (if it seems to be a URL) or link text
-;;     value otherwise.  The region will be deleted and replaced by the
-;;     link.
+;;     Similarly, `C-c C-i` (`markdown-insert-image`) is a general
+;;     command for inserting or editing image markup.  As with the link
+;;     insertion command, through a series interactive prompts you can
+;;     insert either an inline or reference image:
 ;;
-;;     Note that this function can be used to convert a link from one
-;;     type to another (inline, reference, or plain URL) by
-;;     selectively adding or removing properties via the interactive
-;;     prompts.
+;;     *   If both a URL and alt text are given, insert an inline
+;;         image: `![alt text](url)`.
+;;     *   If both a `[reference]` label and alt text are given,
+;;         insert a reference link: `![alt text][reference]`.
+;;
+;;     If there is an existing link or image at the point, these
+;;     command will edit the existing markup rather than inserting new
+;;     markup.  Otherwise, if there is an active region, these commands
+;;     use the region as either the default URL (if it seems to be a
+;;     URL) or link text value otherwise.  In that case, the region
+;;     will be deleted and replaced by the link.
+;;
+;;     Note that these functions can be used to convert links and
+;;     images from one type to another (inline, reference, or plain
+;;     URL) by selectively adding or removing properties via the
+;;     interactive prompts.
 ;;
 ;;     If a reference label is given that is not yet defined, you
 ;;     will be prompted for the URL and optional title and the
@@ -228,13 +243,6 @@
 ;;     added to the end of the reference definition and will be used
 ;;     to populate the title attribute when converted to HTML.
 ;;
-;;   * Images: `C-c C-i`
-;;
-;;     `C-c C-i i` inserts markup for an inline image, using the
-;;     active region or the word at point, if any, as the alt text.
-;;     `C-c C-i I` behaves similarly and inserts a reference-style
-;;     image.
-;;
 ;;     Local images associated with image links may be displayed
 ;;     inline in the buffer by pressing `C-c C-x C-i`
 ;;     (`markdown-toggle-inline-images'). This is a toggle command, so
@@ -4187,6 +4195,15 @@ Optionally, the user can provide a TITLE."
     (cond ((not text) (goto-char (+ 1 cur)))
           ((not url) (goto-char (+ 3 (length text) cur))))))
 
+(defun markdown-insert-inline-image (text url &optional title)
+  "Insert an inline link with alt TEXT pointing to URL.
+Optionally, also provide a TITLE."
+  (let ((cur (point)))
+    (setq title (and title (concat " \"" title "\"")))
+    (insert (concat "![" text "](" url title ")"))
+    (cond ((not text) (goto-char (+ 2 cur)))
+          ((not url) (goto-char (+ 4 (length text) cur))))))
+
 (defun markdown-insert-reference-link (text label &optional url title)
   "Insert a reference link and, optionally, a reference definition.
 The link TEXT will be inserted followed by the optional LABEL.
@@ -4202,6 +4219,21 @@ example, when a reference label is already defined)."
      (if (string-equal label "") text label)
      url title)))
 
+(defun markdown-insert-reference-image (text label &optional url title)
+  "Insert a reference image and, optionally, a reference definition.
+The alt TEXT will be inserted followed by the optional LABEL.
+If a URL is given, also insert a definition for the reference
+LABEL according to `markdown-reference-location'.  If a TITLE is
+given, it will be added to the end of the reference definition
+and will be used to populate the title attribute when converted
+to XHTML.  If URL is nil, insert only the link portion (for
+example, when a reference label is already defined)."
+  (insert (concat "![" text "][" label "]"))
+  (when url
+    (markdown-insert-reference-definition
+     (if (string-equal label "") text label)
+     url title)))
+
 (defun markdown-insert-reference-definition (label &optional url title)
   "Add definition for reference LABEL with URL and TITLE.
 LABEL is a Markdown reference label without square brackets.
@@ -4229,7 +4261,7 @@ be used to populate the title attribute when converted to XHTML."
     (goto-char end)
     (when url
       (message
-       (substitute-command-keys
+       (markdown--substitute-command-keys
         "Reference [%s] was defined, press \\[markdown-do] to jump there")
        label))))
 
@@ -4238,6 +4270,73 @@ be used to populate the title attribute when converted to XHTML."
 (define-obsolete-function-alias
   'markdown-insert-reference-link-dwim 'markdown-insert-link "v2.3")
 
+(defun markdown--insert-link-or-image (image)
+  "Interactively insert new or update an existing link or image.
+When IMAGE is non-nil, insert an image.  Otherwise, insert a link.
+This is an internal function called by
+`markdown-insert-link' and `markdown-insert-image'."
+  (cl-multiple-value-bind (begin end text uri ref title)
+      (if (markdown-use-region-p)
+          ;; Use region as either link text or URL as appropriate.
+          (let ((region (buffer-substring-no-properties
+                         (region-beginning) (region-end))))
+            (if (string-match markdown-regex-uri region)
+                ;; Region contains a URL; use it as such.
+                (list (region-beginning) (region-end)
+                      nil (match-string 0 region) nil nil)
+              ;; Region doesn't contain a URL, so use it as text.
+              (list (region-beginning) (region-end)
+                    region nil nil nil)))
+        ;; Extract and use properties of existing link, if any.
+        (markdown-link-at-pos (point)))
+    (let* ((ref (when ref (concat "[" ref "]")))
+           (defined-refs (append
+                          (mapcar (lambda (ref) (concat "[" ref "]"))
+                                  (markdown-get-defined-references))))
+           (used-uris (markdown-get-used-uris))
+           (uri-or-ref (completing-read
+                        "URL or [reference]: "
+                        (append defined-refs used-uris)
+                        nil nil (or uri ref)))
+           (ref (cond ((string-match "\\`\\[\\(.*\\)\\]\\'" uri-or-ref)
+                       (match-string 1 uri-or-ref))
+                      ((string-equal "" uri-or-ref)
+                       "")))
+           (uri (unless ref uri-or-ref))
+           (text-prompt (if image
+                            "Alt text: "
+                          (if ref
+                              "Link text: "
+                            "Link text (blank for plain URL): ")))
+           (text (read-string text-prompt text))
+           (text (if (= (length text) 0) nil text))
+           (plainp (and uri (not text)))
+           (implicitp (string-equal ref ""))
+           (ref (if implicitp text ref))
+           (definedp (and ref (markdown-reference-definition ref)))
+           (ref-url (unless (or uri definedp)
+                      (completing-read "Reference URL: " used-uris)))
+           (title (unless (or plainp definedp)
+                    (read-string "Title (tooltip text, optional): " title)))
+           (title (if (= (length title) 0) nil title)))
+      (when (and image implicitp)
+        (error "Reference required: implicit image references are invalid"))
+      (when (and begin end)
+        (delete-region begin end))
+      (cond
+       ((and (not image) uri text)
+        (markdown-insert-inline-link text uri title))
+       ((and image uri text)
+        (markdown-insert-inline-image text uri title))
+       ((and ref text)
+        (if image
+            (markdown-insert-reference-image text (unless implicitp ref) nil title)
+          (markdown-insert-reference-link text (unless implicitp ref) nil title))
+        (unless definedp
+          (markdown-insert-reference-definition ref ref-url title)))
+       ((and (not image) uri)
+        (markdown-insert-uri uri))))))
+
 (defun markdown-insert-link ()
   "Insert new or update an existing link, with interactive prompts.
 If the point is at an existing link or URL, update the link text,
@@ -4266,59 +4365,33 @@ Through updating the link, this function can be used to convert a
 link of one type (inline, reference, or plain) to another type by
 selectively adding or removing information via the prompts."
   (interactive)
-  (cl-multiple-value-bind (begin end text uri ref title)
-      (if (markdown-use-region-p)
-          ;; Use region as either link text or URL as appropriate.
-          (let ((region (buffer-substring-no-properties
-                         (region-beginning) (region-end))))
-            (if (string-match markdown-regex-uri region)
-                ;; Region contains a URL; use it as such.
-                (list (region-beginning) (region-end)
-                      nil (match-string 0 region) nil nil)
-              ;; Region doesn't contain a URL, so use it as text.
-              (list (region-beginning) (region-end)
-                    region nil nil nil)))
-        ;; Extract and use properties of existing link, if any.
-        (markdown-link-at-pos (point)))
-    (let* ((ref (when ref (concat "[" ref "]")))
-           (defined-refs (append
-                          (mapcar (lambda (ref) (concat "[" ref "]"))
-                                  (markdown-get-defined-references))))
-           (used-uris (markdown-get-used-uris))
-           (uri-or-ref (completing-read
-                        "URL or [reference]: "
-                        (append defined-refs used-uris)
-                        nil nil (or uri ref)))
-           (ref (cond ((string-match "\\`\\[\\(.*\\)\\]\\'" uri-or-ref)
-                       (match-string 1 uri-or-ref))
-                      ((string-equal "" uri-or-ref)
-                       "")))
-           (uri (unless ref uri-or-ref))
-           (text-prompt (if ref
-                            "Link text: "
-                          "Link text (blank for plain URL): "))
-           (text (read-string text-prompt text))
-           (text (if (= (length text) 0) nil text))
-           (plainp (and uri (not text)))
-           (implicitp (string-equal ref ""))
-           (ref (if implicitp text ref))
-           (definedp (and ref (markdown-reference-definition ref)))
-           (ref-url (unless (or uri definedp)
-                      (completing-read "Reference URL: " used-uris)))
-           (title (unless (or plainp definedp)
-                    (read-string "Title or alt text (optional): " title)))
-           (title (if (= (length title) 0) nil title)))
-      (when (and begin end)
-        (delete-region begin end))
-      (cond
-       ((and uri text)
-        (markdown-insert-inline-link text uri title))
-       ((and ref text)
-        (markdown-insert-reference-link text (unless implicitp ref) nil title)
-        (unless definedp
-          (markdown-insert-reference-definition ref ref-url title)))
-       (uri
-        (markdown-insert-uri uri))))))
+  (markdown--insert-link-or-image nil))
+
+(defun markdown-insert-image ()
+  "Insert new or update an existing image, with interactive prompts.
+If the point is at an existing image, update the alt text, URL,
+reference label, and/or title. Otherwise, insert a new image.
+The type of image inserted (inline or reference) depends on which
+values are provided:
+
+*   If a URL and ALT-TEXT are given, insert an inline image:
+    ![ALT-TEXT](URL).
+*   If [REF] and ALT-TEXT are given, insert a reference image:
+    ![ALT-TEXT][REF].
+
+If there is an active region, use the text as the default URL, if
+it seems to be a URL, or alt text value otherwise.
+
+If a given reference is not defined, this function will
+additionally prompt for the URL and optional title.  In this case,
+the reference definition is placed at the location determined by
+`markdown-reference-location'.
+
+Through updating the image, this function can be used to convert an
+image of one type (inline or reference) to another type by
+selectively adding or removing information via the prompts."
+  (interactive)
+  (markdown--insert-link-or-image t))
 
 (defun markdown-insert-uri (&optional uri)
   "Insert markup for an inline URI.
@@ -4358,27 +4431,6 @@ insert link markup."
           (markdown-unwrap-thing-at-point nil 1 5))
       (markdown-wrap-or-insert "[[" "]]"))))
 
-(defun markdown-insert-image (&optional arg)
-  "Insert image markup using region or word as alt text if possible.
-If there is an active region, use the region as the alt text.  If the
-point is at a word, use the word as the alt text.  In these cases, the
-point will be left at the position for inserting a URL.  If there is no
-active region and the point is not at word, simply insert image markup and
-place the point in the position to enter alt text.  If ARG is nil, insert
-inline image markup.  Otherwise, insert reference image markup."
-  (interactive "*P")
-  (let ((bounds (if arg
-                    (markdown-wrap-or-insert "![" "][]")
-                  (markdown-wrap-or-insert "![" "]()"))))
-    (when bounds
-      (goto-char (- (cdr bounds) 1)))))
-
-(defun markdown-insert-reference-image ()
-  "Insert reference-style image markup using region or word as alt text.
-Calls `markdown-insert-image' with prefix argument."
-  (interactive)
-  (markdown-insert-image t))
-
 (defun markdown-remove-header ()
   "Remove header markup if point is at a header.
 Return bounds of remaining header text if a header was removed
@@ -5556,12 +5608,12 @@ Assumes match data is available for `markdown-regex-italic'."
     (define-key map (kbd "C-c C-o") 'markdown-follow-thing-at-point)
     (define-key map (kbd "C-c C-d") 'markdown-do)
     ;; Indentation
-    (define-key map (kbd "<return>") 'markdown-enter-key)
-    (define-key map (kbd "<backspace>") 'markdown-outdent-or-delete)
+    (define-key map (kbd "C-m") 'markdown-enter-key)
+    (define-key map (kbd "DEL") 'markdown-outdent-or-delete)
     (define-key map (kbd "C-c >") 'markdown-indent-region)
     (define-key map (kbd "C-c <") 'markdown-outdent-region)
     ;; Visibility cycling
-    (define-key map (kbd "<tab>") 'markdown-cycle)
+    (define-key map (kbd "TAB") 'markdown-cycle)
     (define-key map (kbd "<S-iso-lefttab>") 'markdown-shifttab)
     (define-key map (kbd "<S-tab>")  'markdown-shifttab)
     (define-key map (kbd "<backtab>") 'markdown-shifttab)
@@ -5639,9 +5691,7 @@ Assumes match data is available for `markdown-regex-italic'."
     (define-key map (kbd "C-c C-t H") 'markdown-insert-header-setext-dwim)
     (define-key map (kbd "C-c C-t s") 'markdown-insert-header-setext-2)
     (define-key map (kbd "C-c C-t t") 'markdown-insert-header-setext-1)
-    (define-key map (kbd "C-c C-i i") 'markdown-insert-image)
-    (define-key map (kbd "C-c C-i I") 'markdown-insert-reference-image)
-    (define-key map (kbd "C-c C-i C-t") 'markdown-toggle-inline-images)
+    (define-key map (kbd "C-c C-i") 'markdown-insert-image)
     (define-key map (kbd "C-c C-x m") 'markdown-insert-list-item) ;; C-c C-j
     (define-key map (kbd "C-c C-x C-x") 'markdown-toggle-gfm-checkbox) ;; C-c C-d
     (define-key map (kbd "C-c -") 'markdown-insert-hr)
@@ -5737,8 +5787,7 @@ See also `markdown-mode-map'.")
      ["Toggle Task List Item" markdown-toggle-gfm-checkbox :keys "C-c C-d"])
     ("Links & Images"
      ["Insert Link" markdown-insert-link]
-     ["Insert Inline Image" markdown-insert-image]
-     ["Insert Reference Image" markdown-insert-reference-image]
+     ["Insert Image" markdown-insert-image]
      ["Insert Footnote" markdown-insert-footnote :keys "C-c C-s f"]
      ["Insert Wiki Link" markdown-insert-wiki-link :keys "C-c C-s w"]
      "---"
@@ -7453,33 +7502,33 @@ See `markdown-wiki-link-p' for more information."
 (make-obsolete 'markdown-link-link 'markdown-link-url "v2.3")
 
 (defun markdown-link-at-pos (pos)
-  "Return properties of link at position POS.
+  "Return properties of link or image at position POS.
 Value is a list of elements describing the link:
  0. beginning position
  1. end position
  2. link text
  3. URL
  4. reference label
- 5. title text"
+ 5. title text
+ 6. bang (nil or \"!\")"
   (save-excursion
     (goto-char pos)
-    (let (begin end text url reference title)
+    (let (begin end text url reference title bang)
       (cond
        ;; Inline or reference image or link at point.
        ((or (thing-at-point-looking-at markdown-regex-link-inline)
             (thing-at-point-looking-at markdown-regex-link-reference))
-        (when (null (match-beginning 1))
-          ;; No exclamation point, so not an image.
-          (setq begin (match-beginning 0)
-                end (match-end 0)
-                text (match-string-no-properties 3))
-          (if (char-equal (char-after (match-beginning 5)) ?\[)
-              ;; Reference link
-              (setq reference (match-string-no-properties 6))
-            ;; Inline link
-            (setq url (match-string-no-properties 6))
-            (when (match-end 7)
-              (setq title (substring (match-string-no-properties 7) 1 -1))))))
+        (setq bang (match-string-no-properties 1)
+              begin (match-beginning 0)
+              end (match-end 0)
+              text (match-string-no-properties 3))
+        (if (char-equal (char-after (match-beginning 5)) ?\[)
+            ;; Reference link
+            (setq reference (match-string-no-properties 6))
+          ;; Inline link
+          (setq url (match-string-no-properties 6))
+          (when (match-end 7)
+            (setq title (substring (match-string-no-properties 7) 1 -1)))))
        ;; Angle bracket URI at point.
        ((thing-at-point-looking-at markdown-regex-angle-uri)
         (setq begin (match-beginning 0)
@@ -7490,12 +7539,13 @@ Value is a list of elements describing the link:
         (setq begin (match-beginning 0)
               end (match-end 0)
               url (match-string-no-properties 1))))
-      (list begin end text url reference title))))
+      (list begin end text url reference title bang))))
 
 (defun markdown-link-url ()
   "Return the URL part of the regular (non-wiki) link at point.
-Works with both inline and reference style links.  If point is
-not at a link or the link reference is not defined returns nil."
+Works with both inline and reference style links, and with images.
+If point is not at a link or the link reference is not defined
+returns nil."
   (let* ((values (markdown-link-at-pos (point)))
          (text (nth 2 values))
          (url (nth 3 values))
@@ -7895,6 +7945,15 @@ spaces, tabs, and newlines are replaced with single spaces."
   (markdown-replace-regexp-in-string "\\(^[ \t\n]+\\|[ \t\n]+$\\)" ""
                             (markdown-replace-regexp-in-string "[ \t\n]+" " " str)))
 
+(defun markdown--substitute-command-keys (string)
+  "Like `substitute-command-keys' but, but prefers control characters.
+First pass STRING to `substitute-command-keys' and then
+substitute `C-i` for `TAB` and `C-m` for `RET`."
+  (replace-regexp-in-string
+   "\\<TAB\\>" "C-i"
+   (replace-regexp-in-string
+    "\\<RET\\>" "C-m" (substitute-command-keys string) t) t))
+
 (defun markdown-line-number-at-pos (&optional pos)
   "Return (narrowed) buffer line number at position POS.
 If POS is nil, use current buffer location.
@@ -7999,7 +8058,7 @@ return the number of paragraphs left to move."
 (defun markdown-reload-extensions ()
   "Check settings, update font-lock keywords and hooks, and re-fontify buffer."
   (interactive)
-  (when (eq major-mode 'markdown-mode)
+  (when (member major-mode '(markdown-mode gfm-mode))
     ;; Update font lock keywords with extensions
     (setq markdown-mode-font-lock-keywords
           (append
@@ -8382,25 +8441,40 @@ position."
 
 (defun markdown-eldoc-function ()
   "Return a helpful string when appropriate based on context.
-* Report URL when point is at a hidden URL."
+* Report URL when point is at a hidden URL.
+* Report language name when point is a code block with hidden markup."
   (cond
    ;; Hidden URL or reference for inline link
    ((and (or (thing-at-point-looking-at markdown-regex-link-inline)
              (thing-at-point-looking-at markdown-regex-link-reference))
          (or markdown-hide-urls markdown-hide-markup))
-    (let* ((edit-keys (substitute-command-keys "\\[markdown-insert-link]"))
+    (let* ((imagep (string-equal (match-string 1) "!"))
+           (edit-keys (markdown--substitute-command-keys
+                       (if imagep
+                           "\\[markdown-insert-image]"
+                         "\\[markdown-insert-link]")))
            (edit-str (propertize edit-keys 'face 'font-lock-constant-face))
-           (reference-p (string-equal (match-string 5) "["))
-           (object (if reference-p "reference" "URL")))
+           (referencep (string-equal (match-string 5) "["))
+           (object (if referencep "reference" "URL")))
       (format "Hidden %s (%s to edit): %s" object edit-str
-              (if reference-p
+              (if referencep
                   (concat
                    (propertize "[" 'face 'markdown-markup-face)
                    (propertize (match-string-no-properties 6)
                                'face 'markdown-reference-face)
                    (propertize "]" 'face 'markdown-markup-face))
                 (propertize (match-string-no-properties 6)
-                            'face 'markdown-url-face)))))))
+                            'face 'markdown-url-face)))))
+   ;; Hidden language name for fenced code blocks
+   ((and (markdown-code-block-at-point-p)
+         (not (get-text-property (point) 'markdown-pre))
+         markdown-hide-markup)
+    (let ((lang (save-excursion (markdown-code-block-lang))))
+      (unless lang (setq lang "[unspecified]"))
+      (format "Hidden code block language: %s (%s to toggle markup)"
+              (propertize lang 'face 'markdown-language-keyword-face)
+              (markdown--substitute-command-keys
+               "\\[markdown-toggle-markup-hiding]"))))))
 
 
 ;;; Mode Definition  ==========================================================

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" (22859 63739 593860
-;;;;;;  576000))
+;;;### (autoloads nil "yasnippet" "yasnippet.el" (22863 59922 220543
+;;;;;;  603000))
 ;;; 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") (22859 63732 883068
-;;;;;;  534000))
+;;;### (autoloads nil nil ("yasnippet-pkg.el") (22863 59915 905687
+;;;;;;  490000))
 
 ;;;***

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

@@ -526,6 +526,12 @@ conditions.
     (const :tag "Disable all snippet expansion" nil)
     sexp))
 
+(defcustom yas-overlay-priority 100
+  "Priority to use for yasnippets overlays.
+This is useful to control whether snippet navigation bindings
+override bindings from other packages (e.g., `company-mode')."
+  :type 'integer)
+
 
 ;;; Internal variables
 
@@ -3500,7 +3506,7 @@ holds the keymap."
                                nil
                                t)))
     (overlay-put overlay 'keymap yas-keymap)
-    (overlay-put overlay 'priority 100)
+    (overlay-put overlay 'priority yas-overlay-priority)
     (overlay-put overlay 'yas--snippet snippet)
     overlay))
 
@@ -3556,7 +3562,7 @@ Move the overlay, or create it if it does not exit."
           (make-overlay (yas--field-start field)
                         (yas--field-end field)
                         nil nil t))
-    (overlay-put yas--active-field-overlay 'priority 100)
+    (overlay-put yas--active-field-overlay 'priority yas-overlay-priority)
     (overlay-put yas--active-field-overlay 'face 'yas-field-highlight-face)
     (overlay-put yas--active-field-overlay 'yas--snippet snippet)
     (overlay-put yas--active-field-overlay 'modification-hooks '(yas--on-field-overlay-modification))

Binary file

Commit b9de694c5e3f

Commit `b9de694c5e3f`