xemacs-beta: lisp/efs/dired.el comparison

comparison lisp/efs/dired.el @ 183:e121b013d1f0 r20-3b18

Import from CVS: tag r20-3b18

author	cvs
date	Mon, 13 Aug 2007 09:54:23 +0200
parents	bfd6434d15b3
children	b405438285a2

comparison

equal deleted inserted replaced

-:f07455f06202
+:e121b013d1f0
 (defvar dired-refresh-automatically t
 "*If non-nil, refresh dired buffers automatically after file operations.")
 ;;; File name regular expressions and extensions.
-(defvar dired-trivial-filenames "^\\.\\.?$\\|^#"
+(defvar dired-trivial-filenames "\\`\\.\\.?\\'\\|\\`#"
 "*Regexp of files to skip when finding first file of a directory listing.
 A value of nil means move to the subdir line.
 A value of t means move to first file.")
 (defvar dired-cleanup-alist
 This only has effect when the subdirectory is in omission mode.
 To make omission mode the default, set `dired-omit-files' to t.
 See also `dired-omit-extensions'.")
 (make-variable-buffer-local 'dired-omit-extensions)
-(defvar dired-omit-regexps '("^#" "^\\.")
+(defvar dired-omit-regexps '("\\`#" "\\`\\.")
 "*File names matching these regexp may be omitted (buffer-local).
 This only has effect when the subdirectory is in omission mode.
 To make omission mode the default, set `dired-omit-files' to t.
 This only has effect when `dired-omit-files' is t.
 See also `dired-omit-extensions'.")
 (make-variable-buffer-local 'dired-omit-regexps)
-(defvar dired-filename-re-ext "\\..+$"   ; start from the first dot. last dot?
+(defvar dired-filename-re-ext "\\..+\\'"  ; start from the first dot. last dot?
 "*Defines what is the extension of a file name.
 \(match-beginning 0\) for this regexp in the file name without directory will
 be taken to be the start of the extension.")
 ;;; Hook variables
 ;;;; --------------------------------------------------------
 (defun dired-find-file ()
 "In dired, visit the file or directory named on this line."
 (interactive)
-(find-file (dired-get-filename)))
+(let ((find-file-run-dired t))
+(find-file (dired-get-filename))))
 (defun dired-view-file ()
 "In dired, examine a file in view mode, returning to dired when done.
 When file is a directory, show it in this buffer if it is inserted;
 otherwise, display it in another buffer."
 "In dired, visit this file or directory in another window.
 With a prefix, the file is displayed, but the window is not selected."
 (interactive "P")
 (if displayp
 (dired-display-file)
-(find-file-other-window (dired-get-filename))))
+(let ((find-file-run-dired t))
+(find-file-other-window (dired-get-filename)))))
 ;; Only for Emacs 19
 (defun dired-find-file-other-frame ()
 "In dired, visit this file or directory in another frame."
 (interactive)
-(find-file-other-frame (dired-get-filename)))
+(let ((find-file-run-dired t))
+(find-file-other-frame (dired-get-filename))))
 (defun dired-display-file ()
 "In dired, displays this file or directory in the other window."
 (interactive)
-(display-buffer (find-file-noselect (dired-get-filename))))
+(let ((find-file-run-dired t))
+(display-buffer (find-file-noselect (dired-get-filename)))))
 ;; After an idea by wurgler@zippysun.math.uakron.edu (Tom Wurgler).
 (defun dired-do-find-file (&optional arg)
 "Visit all marked files at once, and display them simultaneously.
 See also function `simultaneous-find-file'.
 (while file-list
 ;; Split off vertically a window of the desired size
 ;; The upper window will have SIZE lines.  We select the lower
 ;; (larger) window because we want to split that again.
 (select-window (split-window nil size))
-(find-file (car file-list))
+(let ((find-file-run-dired t))
+(find-file (car file-list)))
 (setq file-list (cdr file-list)))))
 (defun dired-create-directory (directory)
 "Create a directory called DIRECTORY."
 (interactive
 ""))
 (defun dired-file-name-sans-rcs-extension (fn)
 "Returns the file name FN without its RCS extension \",v\"."
 (setq fn (file-name-nondirectory fn))
-(if (string-match ",v$" fn 1)
+(if (string-match ",v\\'" fn 1)
 (substring fn 0 (match-beginning 0))
 fn))
 (defun dired-file-name-sans-compress-extension (fn)
 "Returns the file name FN without the extension from compress or gzip."
 (setq fn (file-name-nondirectory fn))
-(if (string-match "\\.\\([zZ]\\|gz\\)$" fn 1)
+(if (string-match "\\.\\([zZ]\\|gz\\)\\'" fn 1)
 (substring fn (match-beginning 0))
 fn))
 ;;;; ---------------------------------------------------------------------
 (lambda (dir)
 	(or (equal (file-name-nondirectory (directory-file-name dir))
 		   "RCS")
 	    ;; skip inserted RCS subdirs
 	    (setq rcs-files
-		  (append (directory-files dir t ",v$") ; *,v and RCS/*,v
+		  (append (directory-files dir t ",v\\'") ; *,v and RCS/*,v
 			  (let ((rcs-dir (expand-file-name "RCS" dir)))
 			    (if (file-directory-p rcs-dir)
 				(mapcar	; working files from ./RCS are in ./
 				 (function
 				  (lambda (x)
 				    (expand-file-name x dir)))
 				 (directory-files
 				  (file-name-as-directory rcs-dir)
-				  nil ",v$"))))
+				  nil ",v\\'"))))
 			  rcs-files)))))
 (mapcar (function car) dired-subdir-alist))
 (setq total (length rcs-files))
 (while rcs-files
 (setq wf (substring (car rcs-files) 0 -2)
 (let (rgxp)
 (if dired-omit-extensions
 	(setq rgxp (concat
 		    ".\\("
 		    (mapconcat 'regexp-quote dired-omit-extensions "\\|")
-		    "\\)$")))
+		    "\\)\\'")))
 (if dired-omit-regexps
 	(setq rgxp
 	      (concat
 	       rgxp
 	       (and rgxp "\\|")

Mercurial > hg > xemacs-beta

comparison lisp/efs/dired.el @ 183:e121b013d1f0 r20-3b18