From 0e176389a723f7eec072af62cde12314de7f70e2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 24 Sep 2014 15:23:13 -0400 Subject: [PATCH] * lisp/find-cmd.el (find-cmd): Use grep's `find-program'. Suggested by . Fixes: debbugs:18518 --- etc/NEWS | 3 +++ lisp/ChangeLog | 11 ++++++++--- lisp/ChangeLog.14 | 2 +- lisp/ChangeLog.16 | 2 +- lisp/find-cmd.el | 26 +++++++++++++++----------- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 397b8866f6..b40fb78953 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -231,6 +231,9 @@ active region handling. any reference to a buffer position. The 6th member of the mouse position list returned for such events is now nil. +** Menu items in keymaps do not support the "key shortcut cache" any more. +These slots used to hold key-shortcut data, but have been obsolete since +Emacs-21. * Lisp Changes in Emacs 24.5 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 937d0a40b3..3ab2152406 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-09-24 Stefan Monnier + + * find-cmd.el (find-cmd): Use grep's `find-program' (bug#18518). + Suggested by . + 2014-09-24 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-do-get-node-by-id): @@ -204,7 +209,7 @@ * window.el (fit-window-to-buffer): Doc fix. -2014-09-15 Ivan Shmakov (tiny change) +2014-09-15 Ivan Shmakov * desktop.el (desktop-create-buffer): Check that buffers are still live before burying them (bug#18373). @@ -1585,7 +1590,7 @@ (dbus-register-service): Register it. (Bug#17858) (dbus-managed-objects-handler): Fix docstring. -2014-07-04 Phil Sainty (tiny change) +2014-07-04 Phil Sainty * emacs-lisp/lisp.el (narrow-to-defun-include-comments): New var. (narrow-to-defun): New arg include-comments, defaulting to it @@ -8898,7 +8903,7 @@ Add option to delete file when done. (Bug#15647) (python-shell-send-string, python-shell-send-region): Use it. -2013-11-23 Ivan Shmakov (tiny change) +2013-11-23 Ivan Shmakov * vc/diff-mode.el (diff-mode): Only allow diff-default-read-only to set buffer-read-only to t, never to nil. (Bug#15938) diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 52612a7a72..3c2a7ff7ee 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -5178,7 +5178,7 @@ * kmacro.el (kmacro-insert-counter): Doc fix. -2008-11-21 Ivan Shmakov (tiny change) +2008-11-21 Ivan Shmakov * progmodes/tcl.el (tcl-filter): Don't forcibly move point. diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index d46337244f..b4c475aff1 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -7534,7 +7534,7 @@ In doc-strings state whether the argument window has to denote a live, valid or any window. -2012-08-16 Phil Sainty (tiny change) +2012-08-16 Phil Sainty * progmodes/subword.el (subword-forward-function) (subword-backward-function, subword-forward-regexp) diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el index acd820a31c..276aeed120 100644 --- a/lisp/find-cmd.el +++ b/lisp/find-cmd.el @@ -39,6 +39,8 @@ ;;; Code: +(require 'grep) + (defconst find-constituents '((and . find-and) (not . find-not) @@ -145,13 +147,15 @@ For example: `default-directory' is used as the initial search path. The result is a string that should be ready for the command line." - (concat - "find " (shell-quote-argument (expand-file-name default-directory)) " " - (cond - ((cdr subfinds) - (mapconcat 'find-to-string subfinds "")) - (t - (find-to-string (car subfinds)))))) + ;; FIXME: Provide a version that returns a list of strings (ready to pass to + ;; call-process). + (concat find-program " " + (shell-quote-argument (expand-file-name default-directory)) " " + (cond + ((cdr subfinds) + (mapconcat #'find-to-string subfinds "")) + (t + (find-to-string (car subfinds)))))) (defun find-and (form) "And FORMs together, so: @@ -161,7 +165,7 @@ will produce: (if (< (length form) 2) (find-to-string (car form)) (concat "\\( " - (mapconcat 'find-to-string form "-and ") + (mapconcat #'find-to-string form "-and ") "\\) "))) (defun find-or (form) @@ -172,7 +176,7 @@ will produce: (if (< (length form) 2) (find-to-string (car form)) (concat "\\( " - (mapconcat 'find-to-string form "-or ") + (mapconcat #'find-to-string form "-or ") "\\) "))) (defun find-not (form) @@ -183,7 +187,7 @@ will produce: If you wanted the FORMs -and(ed) together instead then this would suffice: \(not \(and \(mtime \"+1\"\) \(name \"something\"\)\)\)" - (concat "-not " (find-or (mapcar 'find-to-string form)))) + (concat "-not " (find-or (mapcar #'find-to-string form)))) (defun find-prune (form) "-or together FORMs postfix '-prune' and then -or that with a @@ -194,7 +198,7 @@ will produce (unwrapped): -prune -or -true \\\) -and -name '*.pm' \\\)" (find-or (list - (concat (find-or (mapcar 'find-to-string form)) (find-generic "prune")) + (concat (find-or (mapcar #'find-to-string form)) (find-generic "prune")) (find-generic "true")))) (defun find-generic (option &optional oper argcount args dont-quote) -- 2.39.2