Merge from mainline.

2 files changed, 34 insertions, 22 deletions

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index a4c9b7fccba..58f2ee98f3c 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -440,10 +440,11 @@ This variable's value takes effect when `grep-compute-defaults' is called.")
 
 ;;;###autoload
 (defvar grep-find-use-xargs nil
-  "Non-nil means that `grep-find' uses the `xargs' utility by default.
-If `exec', use `find -exec'.
+  "How to invoke find and grep.
+If `exec', use `find -exec {} ;'.
+If `exec-plus' use `find -exec {} +'.
 If `gnu', use `find -print0' and `xargs -0'.
-Any other non-nil value means to use `find -print' and `xargs'.
+Any other value means to use `find -print' and `xargs'.
 
 This variable's value takes effect when `grep-compute-defaults' is called.")
 
@@ -561,6 +562,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
         (unless grep-find-use-xargs
           (setq grep-find-use-xargs
                 (cond
+                 ((grep-probe find-program
+                              `(nil nil nil ,null-device "-exec" "echo"
+                                    "{}" "+"))
+                  'exec-plus)
                  ((and
                    (grep-probe find-program `(nil nil nil ,null-device "-print0"))
                    (grep-probe xargs-program `(nil nil nil "-0" "-e" "echo")))
@@ -575,13 +580,17 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
                        ;; forward slashes as directory separators.
                        (format "%s . -type f -print0 | \"%s\" -0 -e %s"
                                find-program xargs-program grep-command))
-                      ((eq grep-find-use-xargs 'exec)
+                      ((memq grep-find-use-xargs '(exec exec-plus))
                        (let ((cmd0 (format "%s . -type f -exec %s"
-                                           find-program grep-command)))
+                                           find-program grep-command))
+                             (null (if grep-use-null-device
+                                       (format "%s " null-device)
+                                     "")))
                          (cons
-                          (format "%s {} %s %s"
-                                  cmd0 null-device
-                                  (shell-quote-argument ";"))
+                          (if (eq grep-find-use-xargs 'exec-plus)
+                              (format "%s %s{} +" cmd0 null)
+                            (format "%s {} %s%s" cmd0 null
+                                    (shell-quote-argument ";")))
                           (1+ (length cmd0)))))
                       (t
                        (format "%s . -type f -print | \"%s\" %s"
@@ -589,14 +598,20 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
         (unless grep-find-template
           (setq grep-find-template
                 (let ((gcmd (format "%s <C> %s <R>"
-                                    grep-program grep-options)))
+                                    grep-program grep-options))
+                      (null (if grep-use-null-device
+                                (format "%s " null-device)
+                              "")))
                   (cond ((eq grep-find-use-xargs 'gnu)
                          (format "%s . <X> -type f <F> -print0 | \"%s\" -0 -e %s"
                                  find-program xargs-program gcmd))
                         ((eq grep-find-use-xargs 'exec)
-                         (format "%s . <X> -type f <F> -exec %s {} %s %s"
-                                 find-program gcmd null-device
+                         (format "%s . <X> -type f <F> -exec %s {} %s%s"
+                                 find-program gcmd null
                                  (shell-quote-argument ";")))
+                        ((eq grep-find-use-xargs 'exec-plus)
+                         (format "%s . <X> -type f <F> -exec %s %s{} +"
+                                 find-program gcmd null))
                         (t
                          (format "%s . <X> -type f <F> -print | \"%s\" %s"
                                  find-program xargs-program gcmd))))))))
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 5b7e07a5aad..8066e1c3a7f 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -7068,10 +7068,9 @@ If these don't exist, a letter in the string is automatically selected."
         ;; No quick reply: Show help
         (save-window-excursion
           (with-output-to-temp-buffer "*Completions*"
-            (mapcar (lambda(x)
-                      (princ (nth 1 x))
-                      (princ "\n"))
-                    keys-alist))
+            (dolist (x keys-alist)
+              (princ (nth 1 x))
+              (princ "\n")))
           (setq char (read-char)))
       (setq char (read-char)))
     (message nil)
@@ -9313,13 +9312,11 @@ This function was written since `list-abbrevs' looks terrible for IDLWAVE mode."
         (princ "================================================\n\n")
         (princ (format fmt "KEY" "ACTION" ""))
         (princ (format fmt "---" "------" "")))
-      (mapcar
-       (lambda (list)
-         (setq str (car list)
-               rpl (nth 1 list)
-               func (nth 2 list))
-         (princ (format fmt str rpl func)))
-       abbrevs)))
+      (dolist (list abbrevs)
+        (setq str (car list)
+              rpl (nth 1 list)
+              func (nth 2 list))
+        (princ (format fmt str rpl func)))))
   ;; Make sure each abbreviation uses only one display line
   (with-current-buffer "*Help*"
     (setq truncate-lines t)))