APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Mats Lidell <mats.lidell(a)cag.se>
# Date 1371329352 -7200
# Sat Jun 15 22:49:12 2013 +0200
# Node ID c0655c55d04ecd402b1e5fc2e8d0895faa755423
# Parent 33bcc14b0f8f3a756426b8e090efe931ad6a2283
Added find-lisp.el from GNU.
2013-06-15 Mats Lidell <matsl(a)xemacs.org>
* find-lisp.el: New file. Find in lisp from GNU.
* Makefile (ELCS): Ditto.
diff -r 33bcc14b0f8f -r c0655c55d04e ChangeLog
--- a/ChangeLog Tue Mar 19 13:36:54 2013 +0100
+++ b/ChangeLog Sat Jun 15 22:49:12 2013 +0200
@@ -1,3 +1,8 @@
+2013-06-15 Mats Lidell <matsl(a)xemacs.org>
+
+ * find-lisp.el: New file. Find in lisp from GNU.
+ * Makefile (ELCS): Ditto.
+
2013-03-19 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.50 released.
diff -r 33bcc14b0f8f -r c0655c55d04e Makefile
--- a/Makefile Tue Mar 19 13:36:54 2013 +0100
+++ b/Makefile Sat Jun 15 22:49:12 2013 +0200
@@ -43,7 +43,7 @@
winring.elc vertical-mode.elc power-macros.elc icon-themes.elc \
search-buffers.elc setnu.elc align.elc autorevert.elc allout.elc \
narrow-stack.elc highline.elc crm.elc wide-edit.elc buffer-colors.elc \
- list-register.elc which-func.elc
+ list-register.elc which-func.elc find-lisp.elc
EXPLICIT_DOCS = $(PACKAGE).texi tempo.texi
diff -r 33bcc14b0f8f -r c0655c55d04e find-lisp.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/find-lisp.el Sat Jun 15 22:49:12 2013 +0200
@@ -0,0 +1,365 @@
+;;; find-lisp.el --- emulation of find in Emacs Lisp
+
+;; Author: Peter Breton
+;; Created: Fri Mar 26 1999
+;; Keywords: unix
+
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Synched up with: Emacs 24.2
+
+;;; Commentary:
+;;
+;; This is a very generalized form of find; it basically implements a
+;; recursive directory descent. The conditions which bound the search
+;; are expressed as predicates, and I have not addressed the question
+;; of how to wrap up the common chores that find does in a simpler
+;; format than writing code for all the various predicates.
+;;
+;; Some random thoughts are to express simple queries directly with
+;; user-level functions, and perhaps use some kind of forms interface
+;; for medium-level queries. Really complicated queries can be
+;; expressed in Lisp.
+;;
+
+;;; Todo
+;;
+;; It would be nice if we could sort the results without running the find
+;; again. Maybe that could work by storing the original file attributes?
+
+;;; Code:
+
+(require 'dired)
+
+(defvar dired-buffers)
+(defvar dired-subdir-alist)
+
+;; Internal variables
+
+(defvar find-lisp-regexp nil
+ "Internal variable.")
+
+(defconst find-lisp-line-indent " "
+ "Indentation for dired file lines.")
+
+(defvar find-lisp-file-predicate nil
+ "Predicate for choosing to include files.")
+
+(defvar find-lisp-directory-predicate nil
+ "Predicate for choosing to descend into directories.")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Debugging Code
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar find-lisp-debug-buffer "*Find Lisp Debug*"
+ "Buffer for debugging information.")
+
+(defvar find-lisp-debug nil
+ "Whether debugging is enabled.")
+
+(defun find-lisp-debug-message (message)
+ "Print a debug message MESSAGE in `find-lisp-debug-buffer'."
+ (set-buffer (get-buffer-create find-lisp-debug-buffer))
+ (goto-char (point-max))
+ (insert message "\n"))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Directory and File predicates
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun find-lisp-default-directory-predicate (dir parent)
+ "True if DIR is not a dot file, and not a symlink.
+PARENT is the parent directory of DIR."
+ (and find-lisp-debug
+ (find-lisp-debug-message
+ (format "Processing directory %s in %s" dir parent)))
+ ;; Skip current and parent directories
+ (not (or (string= dir ".")
+ (string= dir "..")
+ ;; Skip directories which are symlinks
+ ;; Easy way to circumvent recursive loops
+ (file-symlink-p (expand-file-name dir parent)))))
+
+(defun find-lisp-default-file-predicate (file dir)
+ "True if FILE matches `find-lisp-regexp'.
+DIR is the directory containing FILE."
+ (and find-lisp-debug
+ (find-lisp-debug-message
+ (format "Processing file %s in %s" file dir)))
+ (and (not (file-directory-p (expand-file-name file dir)))
+ (string-match find-lisp-regexp file)))
+
+(defun find-lisp-file-predicate-is-directory (file dir)
+ "True if FILE is a directory.
+Argument DIR is the directory containing FILE."
+ (and find-lisp-debug
+ (find-lisp-debug-message
+ (format "Processing file %s in %s" file dir)))
+ (and (file-directory-p (expand-file-name file dir))
+ (not (or (string= file ".")
+ (string= file "..")))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Find functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun find-lisp-find-files (directory regexp)
+ "Find files in DIRECTORY which match REGEXP."
+ (let ((file-predicate 'find-lisp-default-file-predicate)
+ (directory-predicate 'find-lisp-default-directory-predicate)
+ (find-lisp-regexp regexp))
+ (find-lisp-find-files-internal
+ directory
+ file-predicate
+ directory-predicate)))
+
+;; Workhorse function
+(defun find-lisp-find-files-internal (directory file-predicate
+ directory-predicate)
+ "Find files under DIRECTORY which satisfy FILE-PREDICATE.
+FILE-PREDICATE is a function which takes two arguments: the file and its
+directory.
+
+DIRECTORY-PREDICATE is used to decide whether to descend into directories.
+It is a function which takes two arguments, the directory and its parent."
+ (setq directory (file-name-as-directory directory))
+ (let (results sub-results)
+ (dolist (file (directory-files directory nil nil t))
+ (let ((fullname (expand-file-name file directory)))
+ (when (file-readable-p (expand-file-name file directory))
+ ;; If a directory, check it we should descend into it
+ (and (file-directory-p fullname)
+ (funcall directory-predicate file directory)
+ (progn
+ (setq sub-results
+ (find-lisp-find-files-internal
+ fullname
+ file-predicate
+ directory-predicate))
+ (if results
+ (nconc results sub-results)
+ (setq results sub-results))))
+ ;; For all files and directories, call the file predicate
+ (and (funcall file-predicate file directory)
+ (if results
+ (nconc results (list fullname))
+ (setq results (list fullname)))))))
+ results))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Find-dired all in Lisp
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defun find-lisp-find-dired (dir regexp)
+ "Find files in DIR, matching REGEXP."
+ (interactive "DFind files in directory: \nsMatching regexp: ")
+ (let ((find-lisp-regexp regexp))
+ (find-lisp-find-dired-internal
+ dir
+ 'find-lisp-default-file-predicate
+ 'find-lisp-default-directory-predicate
+ "*Find Lisp Dired*")))
+
+;; Just the subdirectories
+;;;###autoload
+(defun find-lisp-find-dired-subdirectories (dir)
+ "Find all subdirectories of DIR."
+ (interactive "DFind subdirectories of directory: ")
+ (find-lisp-find-dired-internal
+ dir
+ 'find-lisp-file-predicate-is-directory
+ 'find-lisp-default-directory-predicate
+ "*Find Lisp Dired Subdirectories*"))
+
+;; Most of this is lifted from find-dired.el
+;;
+(defun find-lisp-find-dired-internal (dir file-predicate
+ directory-predicate buffer-name)
+ "Run find (Lisp version) and go into Dired mode on a buffer of the output."
+ (let ((dired-buffers dired-buffers)
+ (regexp find-lisp-regexp))
+ ;; Expand DIR ("" means default-directory), and make sure it has a
+ ;; trailing slash.
+ (setq dir (file-name-as-directory (expand-file-name dir)))
+ ;; Check that it's really a directory.
+ (or (file-directory-p dir)
+ (error "find-dired needs a directory: %s" dir))
+ (or
+ (and (buffer-name)
+ (string= buffer-name (buffer-name)))
+ (switch-to-buffer (get-buffer-create buffer-name)))
+ (widen)
+ (kill-all-local-variables)
+ (setq buffer-read-only nil)
+ (erase-buffer)
+ (setq default-directory dir)
+ (dired-mode dir)
+
+ (use-local-map (let ((map (make-sparse-keymap)))
+ (set-keymap-parent map (current-local-map))
+ map))
+
+ (make-local-variable 'find-lisp-file-predicate)
+ (setq find-lisp-file-predicate file-predicate)
+ (make-local-variable 'find-lisp-directory-predicate)
+ (setq find-lisp-directory-predicate directory-predicate)
+ (make-local-variable 'find-lisp-regexp)
+ (setq find-lisp-regexp regexp)
+
+ (make-local-variable 'revert-buffer-function)
+ (setq revert-buffer-function
+ (function
+ (lambda (_ignore1 _ignore2)
+ (find-lisp-insert-directory
+ default-directory
+ find-lisp-file-predicate
+ find-lisp-directory-predicate
+ 'ignore)
+ )
+ ))
+
+ ;; Set subdir-alist so that Tree Dired will work:
+ (if (fboundp 'dired-simple-subdir-alist)
+ ;; will work even with nested dired format (dired-nstd.el,v 1.15
+ ;; and later)
+ (dired-simple-subdir-alist)
+ ;; else we have an ancient tree dired (or classic dired, where
+ ;; this does no harm)
+ (set (make-local-variable 'dired-subdir-alist)
+ (list (cons default-directory (point-min-marker)))))
+ (find-lisp-insert-directory
+ dir file-predicate directory-predicate 'ignore)
+ (goto-char (point-min))
+
+ ;; XEmacs
+ (dired-insert-set-properties (point-min) (point-max))
+
+ (dired-goto-next-file)))
+
+(defun find-lisp-insert-directory (dir
+ file-predicate
+ directory-predicate
+ _sort-function)
+ "Insert the results of `find-lisp-find-files' in the current buffer."
+ (let ((buffer-read-only nil)
+ (files (find-lisp-find-files-internal
+ dir
+ file-predicate
+ directory-predicate))
+ (len (length dir)))
+ (erase-buffer)
+ ;; Subdir headlerline must come first because the first marker in
+ ;; subdir-alist points there.
+ (insert find-lisp-line-indent dir ":\n")
+ ;; Make second line a ``find'' line in analogy to the ``total'' or
+ ;; ``wildcard'' line.
+ ;;
+ ;; No analog for find-lisp?
+ (insert find-lisp-line-indent "\n")
+ ;; Run the find function
+ (mapc
+ (function
+ (lambda (file)
+ (find-lisp-find-dired-insert-file
+ (substring file len)
+ (current-buffer))))
+ (sort files 'string-lessp))
+ ;; FIXME: Sort function is ignored for now
+ ;; (funcall sort-function files))
+ (goto-char (point-min))
+ (dired-goto-next-file)))
+
+;;;###autoload
+(defun find-lisp-find-dired-filter (regexp)
+ "Change the filter on a find-lisp-find-dired buffer to REGEXP."
+ (interactive "sSet filter to regexp: ")
+ (setq find-lisp-regexp regexp)
+ (revert-buffer))
+
+(defun find-lisp-find-dired-insert-file (file buffer)
+ (set-buffer buffer)
+ (insert find-lisp-line-indent
+ (find-lisp-format file (file-attributes file 'string) (list "")
+ (current-time))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Lifted from ls-lisp. We don't want to require it, because that
+;; would alter the insert-directory function.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun find-lisp-format (file-name file-attr switches now)
+ (let ((file-type (nth 0 file-attr)))
+ (concat (if (memq ?i switches) ; inode number
+ (format "%6d " (nth 10 file-attr)))
+ ;; nil is treated like "" in concat
+ (if (memq ?s switches) ; size in K
+ (format "%4d " (1+ (/ (nth 7 file-attr) 1024))))
+ (nth 8 file-attr) ; permission bits
+ (format " %3d %-8s %-8s %8d "
+ (nth 1 file-attr) ; no. of links
+ (if (numberp (nth 2 file-attr))
+ (int-to-string (nth 2 file-attr))
+ (nth 2 file-attr)) ; uid
+ (if (eq system-type 'ms-dos)
+ "root" ; everything is root on MSDOS.
+ (if (numberp (nth 3 file-attr))
+ (int-to-string (nth 3 file-attr))
+ (nth 3 file-attr))) ; gid
+ (nth 7 file-attr) ; size in bytes
+ )
+ (find-lisp-format-time file-attr switches now)
+ " "
+ file-name
+ (if (stringp file-type) ; is a symbolic link
+ (concat " -> " file-type)
+ "")
+ "\n")))
+
+(defun find-lisp-time-index (switches)
+ ;; Return index into file-attributes according to ls SWITCHES.
+ (cond
+ ((memq ?c switches) 6) ; last mode change
+ ((memq ?u switches) 4) ; last access
+ ;; default is last modtime
+ (t 5)))
+
+(defun find-lisp-format-time (file-attr switches now)
+ ;; Format time string for file with attributes FILE-ATTR according
+ ;; to SWITCHES (a list of ls option letters of which c and u are recognized).
+ ;; Use the same method as `ls' to decide whether to show time-of-day or year,
+ ;; depending on distance between file date and NOW.
+ (let* ((time (nth (find-lisp-time-index switches) file-attr))
+ (diff16 (- (car time) (car now)))
+ (diff (+ (ash diff16 16) (- (car (cdr time)) (car (cdr now)))))
+ (past-cutoff (- (* 6 30 24 60 60))) ; 6 30-day months
+ (future-cutoff (* 60 60))) ; 1 hour
+ (format-time-string
+ (if (and
+ (<= past-cutoff diff) (<= diff future-cutoff)
+ ;; Sanity check in case `diff' computation overflowed.
+ (<= (1- (ash past-cutoff -16)) diff16)
+ (<= diff16 (1+ (ash future-cutoff -16))))
+ "%b %e %H:%M"
+ "%b %e %Y")
+ time)))
+
+(provide 'find-lisp)
+
+;;; find-lisp.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
1 new commit in edit-utils:
https://bitbucket.org/xemacs/edit-utils/commits/c0655c55d04e/
Changeset: c0655c55d04e
User: matsl
Date: 2013-06-15 22:49:12
Summary: Added find-lisp.el from GNU.
2013-06-15 Mats Lidell <matsl(a)xemacs.org>
* find-lisp.el: New file. Find in lisp from GNU.
* Makefile (ELCS): Ditto.
Affected #: 3 files
diff -r 33bcc14b0f8f3a756426b8e090efe931ad6a2283 -r c0655c55d04ecd402b1e5fc2e8d0895faa755423 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-15 Mats Lidell <matsl(a)xemacs.org>
+
+ * find-lisp.el: New file. Find in lisp from GNU.
+ * Makefile (ELCS): Ditto.
+
2013-03-19 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.50 released.
diff -r 33bcc14b0f8f3a756426b8e090efe931ad6a2283 -r c0655c55d04ecd402b1e5fc2e8d0895faa755423 Makefile
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@
winring.elc vertical-mode.elc power-macros.elc icon-themes.elc \
search-buffers.elc setnu.elc align.elc autorevert.elc allout.elc \
narrow-stack.elc highline.elc crm.elc wide-edit.elc buffer-colors.elc \
- list-register.elc which-func.elc
+ list-register.elc which-func.elc find-lisp.elc
EXPLICIT_DOCS = $(PACKAGE).texi tempo.texi
diff -r 33bcc14b0f8f3a756426b8e090efe931ad6a2283 -r c0655c55d04ecd402b1e5fc2e8d0895faa755423 find-lisp.el
--- /dev/null
+++ b/find-lisp.el
@@ -0,0 +1,365 @@
+;;; find-lisp.el --- emulation of find in Emacs Lisp
+
+;; Author: Peter Breton
+;; Created: Fri Mar 26 1999
+;; Keywords: unix
+
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Synched up with: Emacs 24.2
+
+;;; Commentary:
+;;
+;; This is a very generalized form of find; it basically implements a
+;; recursive directory descent. The conditions which bound the search
+;; are expressed as predicates, and I have not addressed the question
+;; of how to wrap up the common chores that find does in a simpler
+;; format than writing code for all the various predicates.
+;;
+;; Some random thoughts are to express simple queries directly with
+;; user-level functions, and perhaps use some kind of forms interface
+;; for medium-level queries. Really complicated queries can be
+;; expressed in Lisp.
+;;
+
+;;; Todo
+;;
+;; It would be nice if we could sort the results without running the find
+;; again. Maybe that could work by storing the original file attributes?
+
+;;; Code:
+
+(require 'dired)
+
+(defvar dired-buffers)
+(defvar dired-subdir-alist)
+
+;; Internal variables
+
+(defvar find-lisp-regexp nil
+ "Internal variable.")
+
+(defconst find-lisp-line-indent " "
+ "Indentation for dired file lines.")
+
+(defvar find-lisp-file-predicate nil
+ "Predicate for choosing to include files.")
+
+(defvar find-lisp-directory-predicate nil
+ "Predicate for choosing to descend into directories.")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Debugging Code
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar find-lisp-debug-buffer "*Find Lisp Debug*"
+ "Buffer for debugging information.")
+
+(defvar find-lisp-debug nil
+ "Whether debugging is enabled.")
+
+(defun find-lisp-debug-message (message)
+ "Print a debug message MESSAGE in `find-lisp-debug-buffer'."
+ (set-buffer (get-buffer-create find-lisp-debug-buffer))
+ (goto-char (point-max))
+ (insert message "\n"))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Directory and File predicates
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun find-lisp-default-directory-predicate (dir parent)
+ "True if DIR is not a dot file, and not a symlink.
+PARENT is the parent directory of DIR."
+ (and find-lisp-debug
+ (find-lisp-debug-message
+ (format "Processing directory %s in %s" dir parent)))
+ ;; Skip current and parent directories
+ (not (or (string= dir ".")
+ (string= dir "..")
+ ;; Skip directories which are symlinks
+ ;; Easy way to circumvent recursive loops
+ (file-symlink-p (expand-file-name dir parent)))))
+
+(defun find-lisp-default-file-predicate (file dir)
+ "True if FILE matches `find-lisp-regexp'.
+DIR is the directory containing FILE."
+ (and find-lisp-debug
+ (find-lisp-debug-message
+ (format "Processing file %s in %s" file dir)))
+ (and (not (file-directory-p (expand-file-name file dir)))
+ (string-match find-lisp-regexp file)))
+
+(defun find-lisp-file-predicate-is-directory (file dir)
+ "True if FILE is a directory.
+Argument DIR is the directory containing FILE."
+ (and find-lisp-debug
+ (find-lisp-debug-message
+ (format "Processing file %s in %s" file dir)))
+ (and (file-directory-p (expand-file-name file dir))
+ (not (or (string= file ".")
+ (string= file "..")))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Find functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun find-lisp-find-files (directory regexp)
+ "Find files in DIRECTORY which match REGEXP."
+ (let ((file-predicate 'find-lisp-default-file-predicate)
+ (directory-predicate 'find-lisp-default-directory-predicate)
+ (find-lisp-regexp regexp))
+ (find-lisp-find-files-internal
+ directory
+ file-predicate
+ directory-predicate)))
+
+;; Workhorse function
+(defun find-lisp-find-files-internal (directory file-predicate
+ directory-predicate)
+ "Find files under DIRECTORY which satisfy FILE-PREDICATE.
+FILE-PREDICATE is a function which takes two arguments: the file and its
+directory.
+
+DIRECTORY-PREDICATE is used to decide whether to descend into directories.
+It is a function which takes two arguments, the directory and its parent."
+ (setq directory (file-name-as-directory directory))
+ (let (results sub-results)
+ (dolist (file (directory-files directory nil nil t))
+ (let ((fullname (expand-file-name file directory)))
+ (when (file-readable-p (expand-file-name file directory))
+ ;; If a directory, check it we should descend into it
+ (and (file-directory-p fullname)
+ (funcall directory-predicate file directory)
+ (progn
+ (setq sub-results
+ (find-lisp-find-files-internal
+ fullname
+ file-predicate
+ directory-predicate))
+ (if results
+ (nconc results sub-results)
+ (setq results sub-results))))
+ ;; For all files and directories, call the file predicate
+ (and (funcall file-predicate file directory)
+ (if results
+ (nconc results (list fullname))
+ (setq results (list fullname)))))))
+ results))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Find-dired all in Lisp
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defun find-lisp-find-dired (dir regexp)
+ "Find files in DIR, matching REGEXP."
+ (interactive "DFind files in directory: \nsMatching regexp: ")
+ (let ((find-lisp-regexp regexp))
+ (find-lisp-find-dired-internal
+ dir
+ 'find-lisp-default-file-predicate
+ 'find-lisp-default-directory-predicate
+ "*Find Lisp Dired*")))
+
+;; Just the subdirectories
+;;;###autoload
+(defun find-lisp-find-dired-subdirectories (dir)
+ "Find all subdirectories of DIR."
+ (interactive "DFind subdirectories of directory: ")
+ (find-lisp-find-dired-internal
+ dir
+ 'find-lisp-file-predicate-is-directory
+ 'find-lisp-default-directory-predicate
+ "*Find Lisp Dired Subdirectories*"))
+
+;; Most of this is lifted from find-dired.el
+;;
+(defun find-lisp-find-dired-internal (dir file-predicate
+ directory-predicate buffer-name)
+ "Run find (Lisp version) and go into Dired mode on a buffer of the output."
+ (let ((dired-buffers dired-buffers)
+ (regexp find-lisp-regexp))
+ ;; Expand DIR ("" means default-directory), and make sure it has a
+ ;; trailing slash.
+ (setq dir (file-name-as-directory (expand-file-name dir)))
+ ;; Check that it's really a directory.
+ (or (file-directory-p dir)
+ (error "find-dired needs a directory: %s" dir))
+ (or
+ (and (buffer-name)
+ (string= buffer-name (buffer-name)))
+ (switch-to-buffer (get-buffer-create buffer-name)))
+ (widen)
+ (kill-all-local-variables)
+ (setq buffer-read-only nil)
+ (erase-buffer)
+ (setq default-directory dir)
+ (dired-mode dir)
+
+ (use-local-map (let ((map (make-sparse-keymap)))
+ (set-keymap-parent map (current-local-map))
+ map))
+
+ (make-local-variable 'find-lisp-file-predicate)
+ (setq find-lisp-file-predicate file-predicate)
+ (make-local-variable 'find-lisp-directory-predicate)
+ (setq find-lisp-directory-predicate directory-predicate)
+ (make-local-variable 'find-lisp-regexp)
+ (setq find-lisp-regexp regexp)
+
+ (make-local-variable 'revert-buffer-function)
+ (setq revert-buffer-function
+ (function
+ (lambda (_ignore1 _ignore2)
+ (find-lisp-insert-directory
+ default-directory
+ find-lisp-file-predicate
+ find-lisp-directory-predicate
+ 'ignore)
+ )
+ ))
+
+ ;; Set subdir-alist so that Tree Dired will work:
+ (if (fboundp 'dired-simple-subdir-alist)
+ ;; will work even with nested dired format (dired-nstd.el,v 1.15
+ ;; and later)
+ (dired-simple-subdir-alist)
+ ;; else we have an ancient tree dired (or classic dired, where
+ ;; this does no harm)
+ (set (make-local-variable 'dired-subdir-alist)
+ (list (cons default-directory (point-min-marker)))))
+ (find-lisp-insert-directory
+ dir file-predicate directory-predicate 'ignore)
+ (goto-char (point-min))
+
+ ;; XEmacs
+ (dired-insert-set-properties (point-min) (point-max))
+
+ (dired-goto-next-file)))
+
+(defun find-lisp-insert-directory (dir
+ file-predicate
+ directory-predicate
+ _sort-function)
+ "Insert the results of `find-lisp-find-files' in the current buffer."
+ (let ((buffer-read-only nil)
+ (files (find-lisp-find-files-internal
+ dir
+ file-predicate
+ directory-predicate))
+ (len (length dir)))
+ (erase-buffer)
+ ;; Subdir headlerline must come first because the first marker in
+ ;; subdir-alist points there.
+ (insert find-lisp-line-indent dir ":\n")
+ ;; Make second line a ``find'' line in analogy to the ``total'' or
+ ;; ``wildcard'' line.
+ ;;
+ ;; No analog for find-lisp?
+ (insert find-lisp-line-indent "\n")
+ ;; Run the find function
+ (mapc
+ (function
+ (lambda (file)
+ (find-lisp-find-dired-insert-file
+ (substring file len)
+ (current-buffer))))
+ (sort files 'string-lessp))
+ ;; FIXME: Sort function is ignored for now
+ ;; (funcall sort-function files))
+ (goto-char (point-min))
+ (dired-goto-next-file)))
+
+;;;###autoload
+(defun find-lisp-find-dired-filter (regexp)
+ "Change the filter on a find-lisp-find-dired buffer to REGEXP."
+ (interactive "sSet filter to regexp: ")
+ (setq find-lisp-regexp regexp)
+ (revert-buffer))
+
+(defun find-lisp-find-dired-insert-file (file buffer)
+ (set-buffer buffer)
+ (insert find-lisp-line-indent
+ (find-lisp-format file (file-attributes file 'string) (list "")
+ (current-time))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Lifted from ls-lisp. We don't want to require it, because that
+;; would alter the insert-directory function.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun find-lisp-format (file-name file-attr switches now)
+ (let ((file-type (nth 0 file-attr)))
+ (concat (if (memq ?i switches) ; inode number
+ (format "%6d " (nth 10 file-attr)))
+ ;; nil is treated like "" in concat
+ (if (memq ?s switches) ; size in K
+ (format "%4d " (1+ (/ (nth 7 file-attr) 1024))))
+ (nth 8 file-attr) ; permission bits
+ (format " %3d %-8s %-8s %8d "
+ (nth 1 file-attr) ; no. of links
+ (if (numberp (nth 2 file-attr))
+ (int-to-string (nth 2 file-attr))
+ (nth 2 file-attr)) ; uid
+ (if (eq system-type 'ms-dos)
+ "root" ; everything is root on MSDOS.
+ (if (numberp (nth 3 file-attr))
+ (int-to-string (nth 3 file-attr))
+ (nth 3 file-attr))) ; gid
+ (nth 7 file-attr) ; size in bytes
+ )
+ (find-lisp-format-time file-attr switches now)
+ " "
+ file-name
+ (if (stringp file-type) ; is a symbolic link
+ (concat " -> " file-type)
+ "")
+ "\n")))
+
+(defun find-lisp-time-index (switches)
+ ;; Return index into file-attributes according to ls SWITCHES.
+ (cond
+ ((memq ?c switches) 6) ; last mode change
+ ((memq ?u switches) 4) ; last access
+ ;; default is last modtime
+ (t 5)))
+
+(defun find-lisp-format-time (file-attr switches now)
+ ;; Format time string for file with attributes FILE-ATTR according
+ ;; to SWITCHES (a list of ls option letters of which c and u are recognized).
+ ;; Use the same method as `ls' to decide whether to show time-of-day or year,
+ ;; depending on distance between file date and NOW.
+ (let* ((time (nth (find-lisp-time-index switches) file-attr))
+ (diff16 (- (car time) (car now)))
+ (diff (+ (ash diff16 16) (- (car (cdr time)) (car (cdr now)))))
+ (past-cutoff (- (* 6 30 24 60 60))) ; 6 30-day months
+ (future-cutoff (* 60 60))) ; 1 hour
+ (format-time-string
+ (if (and
+ (<= past-cutoff diff) (<= diff future-cutoff)
+ ;; Sanity check in case `diff' computation overflowed.
+ (<= (1- (ash past-cutoff -16)) diff16)
+ (<= diff16 (1+ (ash future-cutoff -16))))
+ "%b %e %H:%M"
+ "%b %e %Y")
+ time)))
+
+(provide 'find-lisp)
+
+;;; find-lisp.el ends here
Repository URL: https://bitbucket.org/xemacs/edit-utils/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
1 new commit in xemacs-base:
https://bitbucket.org/xemacs/xemacs-base/commits/7cc926091857/
Changeset: 7cc926091857
User: didierverna
Date: 2013-06-03 17:14:10
Summary: Add rcfiles.el.
Affected #: 2 files
diff -r dda31700123efa9f2e7f057309434ce4ee173e31 -r 7cc926091857e8d87a0dc6422fb36e1057719cec ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-03 Didier Verna <didier(a)xemacs.org>
+
+ * rcfiles.el: New file.
+
2013-03-19 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.35 released.
diff -r dda31700123efa9f2e7f057309434ce4ee173e31 -r 7cc926091857e8d87a0dc6422fb36e1057719cec rcfiles.el
--- /dev/null
+++ b/rcfiles.el
@@ -0,0 +1,134 @@
+;;; rcfiles.el --- Unix-like rc files for Emacs Lisp libraries
+
+;; Copyright (C) 2006, 2007, 2012, 2013 Didier Verna
+
+;; Author: Didier Verna <didier(a)didierverna.net>
+;; Version: 1.0
+;; Keywords: extensions, lisp
+
+;; This file is part of el-rcfiles.
+
+;; el-rcfiles is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License version 3, as
+;; published by the Free Software Foundation.
+
+;; el-rcfiles 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, write to the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+;;; Commentary:
+
+;; The purpose of el-rcfiles is to provide the equivalent of traditional
+;; Unix rc files (i.e. configuration files) for Emacs Lisp
+;; libraries. The advantages of using configuration files are the
+;; following:
+;; - your initialization file is less bloated,
+;; - since configuration files are lazily loaded, your Emacs session
+;; is (or begins) lighter. That is unless you already use lots of
+;; EVAL-AFTER-LOAD forms...
+
+;; Usage:
+
+;; 1. Load the library, go to the rcfiles Custom group and tweak (or not).
+;; 2. Put a call to (rcfiles-register-rc-files) in your initialization
+;; file. This function can also be called interactively anytime you
+;; add, remove or modify a configuration file.
+;; 3. Put your configuration code for a library `foo' in a file called
+;; `<rcfiles-directory>/foo<rcfiles-pseudo-extension>.el'.
+
+
+;;; Code:
+
+(require 'cl)
+
+
+(defvar rcfiles-version "1.0"
+ "Current version number of el-rcfiles.")
+
+(defun rcfiles-version ()
+ "Show the current version number of el-rcfiles."
+ (interactive)
+ (message "%s" rcfiles-version))
+
+
+(defgroup rcfiles nil
+ "Configuration files for Emacs Lisp libraries."
+:group 'emacs)
+
+(defcustom rcfiles-directory
+ (if (featurep 'xemacs) "~/.xemacs/rc" "~/.emacs.d/rc")
+ "Directory where el-rcfiles looks for configuration files."
+:group 'rcfiles
+:type 'string)
+
+(defcustom rcfiles-pseudo-extension "-rc"
+ "Pseudo extension for configuration files.
+It is added between the name of the library and the .el
+extension."
+:group 'rcfiles
+:type 'string)
+
+(defun rcfiles-rc-files ()
+ "Return the list of configuration files currently available.
+File names are expanded but their extension is removed."
+ (let ((ext-regexp
+ (concat (regexp-quote rcfiles-pseudo-extension) "\\.el[c]?$")))
+ (mapcar #'file-name-sans-extension
+ ;; #### NOTE: potential duplicates (such as when there is
+ ;; both a .el and a .elc file) are not a problem because
+ ;; EVAL-AFTER-LOAD takes care of that.
+ (directory-files rcfiles-directory t ext-regexp))))
+
+(defun rcfiles-prune (rcfiles)
+ "Unregister configuration files not in RCFILES."
+ (let ((dir
+ (concat "^" (regexp-quote (expand-file-name rcfiles-directory)))))
+ (setq after-load-alist
+ (remove-if (lambda (file)
+ (and (stringp file)
+ (string-match dir file)
+ (not (member file rcfiles))))
+ after-load-alist
+ :key (lambda (form)
+ (ignore-errors
+ (let ((load-form
+ ;; are we having fun yet?
+ (caddr (cadr (cadr (cadr form))))))
+ (when (eq (car load-form) 'rcfiles-try-load)
+ (cadr load-form)))))))))
+
+(defun rcfiles-try-load (rcfile)
+ "Attempt to load RCFILE. If loading fails, throw a warning."
+ (condition-case ignore (load rcfile)
+ (error (warn (format "Unable to load %s.
+Maybe you need to call RCFILES-REGISTER-RC-FILES again?"
+ rcfile)))))
+
+(defun rcfiles-register (rcfiles)
+ "Register the configuration files in the RCFILES list."
+ (let ((len (length rcfiles-pseudo-extension)))
+ (dolist (rcfile rcfiles)
+ (eval-after-load (file-name-nondirectory (substring rcfile 0 (- len)))
+ `(rcfiles-try-load ,rcfile)))))
+
+;;;###autoload
+(defun rcfiles-register-rc-files ()
+ "Register the configuration files currently available.
+This function can be called at startup and every time the
+registration changes. Obsolete entries are removed and new ones
+are added."
+ (interactive)
+ (let ((rcfiles (rcfiles-rc-files)))
+ (rcfiles-prune rcfiles)
+ (rcfiles-register rcfiles)))
+
+
+(provide 'rcfiles)
+
+;;; rcfiles.el ends here
Repository URL: https://bitbucket.org/xemacs/xemacs-base/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
1 new commit in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/9a4ba8fa4854/
Changeset: 9a4ba8fa4854
User: acm
Date: 2013-06-03 14:36:23
Summary: Remove faulty optimisation from indentation calculation.
cc-engine.el (c-guess-basic-syntax): Don't calculate search limit
based on 2000 characters back from indent-point.
Affected #: 1 file
diff -r 6cbdda66ff42594538a72cfacf7c34dcb6e63c54 -r 9a4ba8fa4854b417c2626b57317f08981dbba181 cc-engine.el
--- a/cc-engine.el
+++ b/cc-engine.el
@@ -9396,10 +9396,6 @@
containing-sexp nil)))
(setq lim (1+ containing-sexp))))
(setq lim (point-min)))
- (when (c-beginning-of-macro)
- (goto-char indent-point)
- (let ((lim1 (c-determine-limit 2000)))
- (setq lim (max lim lim1))))
;; If we're in a parenthesis list then ',' delimits the
;; "statements" rather than being an operator (with the
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches