[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117939: * lisp/find-cmd.el (find-cmd): Use grep's `
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117939: * lisp/find-cmd.el (find-cmd): Use grep's `find-program'. |
Date: |
Wed, 24 Sep 2014 19:23:24 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117939
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18518
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-24 15:23:13 -0400
message:
* lisp/find-cmd.el (find-cmd): Use grep's `find-program'.
Suggested by <address@hidden>.
modified:
etc/NEWS news-20100311060928-aoit31wvzf25yr1z-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/ChangeLog.14
changelog.14-20091113204419-o5vbwnq5f7feedwu-10901
lisp/ChangeLog.16 changelog.16-20130618111706-x8cck4o4rjixg8cl-1
lisp/find-cmd.el findcmd.el-20091113204419-o5vbwnq5f7feedwu-8660
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2014-09-22 15:04:12 +0000
+++ b/etc/NEWS 2014-09-24 19:23:13 +0000
@@ -231,6 +231,9 @@
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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-09-24 17:33:54 +0000
+++ b/lisp/ChangeLog 2014-09-24 19:23:13 +0000
@@ -1,3 +1,8 @@
+2014-09-24 Stefan Monnier <address@hidden>
+
+ * find-cmd.el (find-cmd): Use grep's `find-program' (bug#18518).
+ Suggested by <address@hidden>.
+
2014-09-24 Ulf Jasper <address@hidden>
* 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 <address@hidden> (tiny change)
+2014-09-15 Ivan Shmakov <address@hidden>
* 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 <address@hidden> (tiny change)
+2014-07-04 Phil Sainty <address@hidden>
* 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 <address@hidden> (tiny change)
+2013-11-23 Ivan Shmakov <address@hidden>
* vc/diff-mode.el (diff-mode): Only allow diff-default-read-only
to set buffer-read-only to t, never to nil. (Bug#15938)
=== modified file 'lisp/ChangeLog.14'
--- a/lisp/ChangeLog.14 2014-01-11 03:55:50 +0000
+++ b/lisp/ChangeLog.14 2014-09-24 19:23:13 +0000
@@ -5178,7 +5178,7 @@
* kmacro.el (kmacro-insert-counter): Doc fix.
-2008-11-21 Ivan Shmakov <address@hidden> (tiny change)
+2008-11-21 Ivan Shmakov <address@hidden>
* progmodes/tcl.el (tcl-filter): Don't forcibly move point.
=== modified file 'lisp/ChangeLog.16'
--- a/lisp/ChangeLog.16 2014-09-11 19:44:25 +0000
+++ b/lisp/ChangeLog.16 2014-09-24 19:23:13 +0000
@@ -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 <address@hidden> (tiny change)
+2012-08-16 Phil Sainty <address@hidden>
* progmodes/subword.el (subword-forward-function)
(subword-backward-function, subword-forward-regexp)
=== modified file 'lisp/find-cmd.el'
--- a/lisp/find-cmd.el 2014-01-01 07:43:34 +0000
+++ b/lisp/find-cmd.el 2014-09-24 19:23:13 +0000
@@ -39,6 +39,8 @@
;;; Code:
+(require 'grep)
+
(defconst find-constituents
'((and . find-and)
(not . find-not)
@@ -145,13 +147,15 @@
`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 @@
(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 @@
(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 @@
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 @@
-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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117939: * lisp/find-cmd.el (find-cmd): Use grep's `find-program'.,
Stefan Monnier <=