xemacs-beta: lisp/files.el comparison

comparison lisp/files.el @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	a300bb07d72d
children	7d59cb494b73

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 		       :value ("\\`" . "")
 		       (regexp :tag "From")
 		       (regexp :tag "To")))
 :group 'find-file)
-;;; Turn off backup files on VMS since it has version numbers.
+(defcustom make-backup-files t
-(defcustom make-backup-files (not (eq system-type 'vax-vms))
 "*Non-nil means make a backup of a file the first time it is saved.
 This can be done by renaming the file or by copying.
 Renaming means that XEmacs renames the existing file so that it is a
 backup file, then writes the buffer into a new file.  Any other names
 (defun cd-absolute (dir)
 "Change current directory to given absolute file name DIR."
 ;; Put the name into directory syntax now,
 ;; because otherwise expand-file-name may give some bad results.
-(if (not (eq system-type 'vax-vms))
+(setq dir (file-name-as-directory dir))
-(setq dir (file-name-as-directory dir)))
 ;; XEmacs change: stig@hackvan.com
 (if find-file-use-truenames
 (setq dir (file-truename dir)))
 (setq dir (abbreviate-file-name (expand-file-name dir)))
 (cond ((not (file-directory-p dir))
 	    ;; make it start with `~' instead.
 	    (if (and (string-match abbreviated-home-dir filename)
 		     ;; If the home dir is just /, don't change it.
 		     (not (and (= (match-end 0) 1) ;#### unix-specific
 			       (= (aref filename 0) ?/)))
-		     (not (and (or (eq system-type 'ms-dos)
+		     (not (and (memq system-type '(ms-dos windows-nt))
-				   (eq system-type 'windows-nt))
 			       (save-match-data
 				 (string-match "^[a-zA-Z]:/$" filename)))))
 		(setq filename
 		      (concat "~"
 			      (substring filename
 					 (match-beginning 1) (match-end 1))
 			      (substring filename (match-end 0)))))))
 filename)))
 (defcustom find-file-not-true-dirname-list nil
-"*List of logical names for which visiting shouldn't save the true dirname.
+"*List of logical names for which visiting shouldn't save the true dirname."
-On VMS, when you visit a file using a logical name that searches a path,
-you may or may not want the visited file name to record the specific
-directory where the file was found.  If you *do not* want that, add the logical
-name to this list as a string."
 :type '(repeat (string :tag "Name"))
 :group 'find-file)
 ;; This function is needed by FSF vc.el.  I hope somebody can make it
 ;; work for XEmacs.  -sb.
 		;; Find the file's truename, and maybe use that as visited name.
 		;; automatically computed in XEmacs, unless jka-compr was used!
 		(unless buffer-file-truename
 		  (setq buffer-file-truename truename))
 		(setq buffer-file-number number)
-		;; On VMS, we may want to remember which directory in
-		;; a search list the file was found in.
-		(and (eq system-type 'vax-vms)
-		     (let (logical)
-		       (if (string-match ":" (file-name-directory filename))
-			   (setq logical (substring (file-name-directory filename)
-						    0 (match-beginning 0))))
-		       (not (member logical find-file-not-true-dirname-list)))
-		     (setq buffer-file-name buffer-file-truename))
 		(and find-file-use-truenames
 		     ;; This should be in C.  Put pathname
 		     ;; abbreviations that have been explicitly
 		     ;; requested back into the pathname.  Most
 		     ;; importantly, strip out automounter /tmp_mnt
 (defvar auto-mode-alist
 '(("\\.te?xt\\'" . text-mode)
 ("\\.[ch]\\'" . c-mode)
 ("\\.el\\'" . emacs-lisp-mode)
-("\\.\\([CH]\\|cc\\|hh\\)\\'" . c++-mode)
+("\\.\\(?:[CH]\\|cc\\|hh\\)\\'" . c++-mode)
 ("\\.[ch]\\(pp\\|xx\\|\\+\\+\\)\\'" . c++-mode)
 ("\\.java\\'" . java-mode)
 ("\\.idl\\'" . idl-mode)
-("\\.f\\(or\\)?\\'" . fortran-mode)
+("\\.f\\(?:or\\)?\\'" . fortran-mode)
-("\\.F\\(OR\\)?\\'" . fortran-mode)
+("\\.F\\(?:OR\\)?\\'" . fortran-mode)
 ("\\.[fF]90\\'" . f90-mode)
 ;;; Less common extensions come here
 ;;; so more common ones above are found faster.
 ("\\.\\([pP][Llm]\\|al\\)\\'" . perl-mode)
 ("\\.py\\'" . python-mode)
-("\\.texi\\(nfo\\)?\\'" . texinfo-mode)
+("\\.texi\\(?:nfo\\)?\\'" . texinfo-mode)
 ("\\.ad[abs]\\'" . ada-mode)
-("\\.c?l\\(i?sp\\)?\\'" . lisp-mode)
+("\\.c?l\\(?:i?sp\\)?\\'" . lisp-mode)
-("\\.p\\(as\\)?\\'" . pascal-mode)
+("\\.p\\(?:as\\)?\\'" . pascal-mode)
 ("\\.ltx\\'" . latex-mode)
 ("\\.[sS]\\'" . asm-mode)
-("[Cc]hange.?[Ll]og?\\(.[0-9]+\\)?\\'" . change-log-mode)
+("[Cc]hange.?[Ll]og?\\(?:.[0-9]+\\)?\\'" . change-log-mode)
 ("\\$CHANGE_LOG\\$\\.TXT" . change-log-mode)
 ("\\.scm?\\(?:\\.[0-9]*\\)?\\'" . scheme-mode)
 ("\\.e\\'" . eiffel-mode)
 ("\\.mss\\'" . scribe-mode)
-("\\.m\\([mes]\\|an\\)\\'" . nroff-mode)
+("\\.m\\(?:[mes]\\|an\\)\\'" . nroff-mode)
 ("\\.icn\\'" . icon-mode)
-("\\.\\([ckz]?sh\\|shar\\)\\'" . sh-mode)
+("\\.\\(?:[ckz]?sh\\|shar\\)\\'" . sh-mode)
 ;; #### Unix-specific!
-("/\\.\\(bash_\\|z\\)?\\(profile\\|login\||logout\\)\\'" . sh-mode)
+("/\\.\\(?:bash_\\|z\\)?\\(profile\\|login\||logout\\)\\'" . sh-mode)
-("/\\.\\([ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode)
+("/\\.\\(?:[ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode)
-("/\\.\\([kz]shenv\\|xsession\\)\\'" . sh-mode)
+("/\\.\\(?:[kz]shenv\\|xsession\\)\\'" . sh-mode)
 ;; The following come after the ChangeLog pattern for the sake of
 ;; ChangeLog.1, etc. and after the .scm.[0-9] pattern too.
 ("\\.[12345678]\\'" . nroff-mode)
 ("\\.[tT]e[xX]\\'" . tex-mode)
-("\\.\\(sty\\|cls\\|bbl\\)\\'" . latex-mode)
+("\\.\\(?:sty\\|cls\\|bbl\\)\\'" . latex-mode)
 ("\\.bib\\'" . bibtex-mode)
 ("\\.article\\'" . text-mode)
 ("\\.letter\\'" . text-mode)
-("\\.\\(tcl\\|exp\\)\\'" . tcl-mode)
+("\\.\\(?:tcl\\|exp\\)\\'" . tcl-mode)
 ("\\.wrl\\'" . vrml-mode)
 ("\\.awk\\'" . awk-mode)
 ("\\.prolog\\'" . prolog-mode)
-("\\.tar\\'" . tar-mode)
+("\\.\\(?:arc\\|zip\\|lzh\\|zoo\\)\\'" . archive-mode)
-("\\.\\(arc\\|zip\\|lzh\\|zoo\\)\\'" . archive-mode)
 ;; Mailer puts message to be edited in /tmp/Re.... or Message
 ;; #### Unix-specific!
 ("\\`/tmp/Re" . text-mode)
 ("/Message[0-9]*\\'" . text-mode)
 ("/drafts/[0-9]+\\'" . mh-letter-mode)
 ("\\.lex\\'" . c-mode)
 ("\\.m\\'" . objc-mode)
 ("\\.oak\\'" . scheme-mode)
 ("\\.s?html?\\'" . html-mode)
 ("\\.htm?l?3\\'" . html3-mode)
-("\\.\\(sgml?\\|dtd\\)\\'" . sgml-mode)
+("\\.\\(?:sgml?\\|dtd\\)\\'" . sgml-mode)
 ("\\.c?ps\\'" . postscript-mode)
 ;; .emacs following a directory delimiter in either Unix or
 ;; Windows syntax.
 ("[/\\][._].*emacs\\'" . emacs-lisp-mode)
 ("\\.m4\\'" . autoconf-mode)
 ("\\.ma?k\\'" . makefile-mode)
 ("[Mm]akefile\\(\\.\\|\\'\\)" . makefile-mode)
 ("\\.X\\(defaults\\|environment\\|resources\\|modmap\\)\\'" . xrdb-mode)
 ;; #### The following three are Unix-specific (but do we care?)
 ("/app-defaults/" . xrdb-mode)
-("\\.[^/]*wm\\'" . winmgr-mode)
+("\\.[^/]*wm2?\\(?:rc\\)?\\'" . winmgr-mode)
-("\\.[^/]*wm2?rc" . winmgr-mode)
+("\\.\\(?:jpe?g\\|JPE?G\\|png\\|PNG\\|gif\\|GIF\\|tiff?\\|TIFF?\\)\\'" . image-mode)
-("\\.[Jj][Pp][Ee]?[Gg]\\'" . image-mode)
-("\\.[Pp][Nn][Gg]\\'" . image-mode)
-("\\.[Gg][Ii][Ff]\\'" . image-mode)
 )
 "Alist of filename patterns vs. corresponding major mode functions.
 Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).
 \(NON-NIL stands for anything that is not nil; the value does not matter.)
 Visiting a file whose name matches REGEXP specifies FUNCTION as the
 Each alist element looks like (INTERPRETER . MODE).
 The car of each element is a regular expression which is compared
 with the name of the interpreter specified in the first line.
 If it matches, mode MODE is selected.")
-(defvar inhibit-first-line-modes-regexps (purecopy '("\\.tar\\'" "\\.tgz\\'"
+(defvar binary-file-regexps
-						     "\\.tar\\.gz\\'"))
+(purecopy
+'("\\.\\(?:bz2\\|elc\\|g\\(if\\|z\\)\\|jp\\(eg\\|g\\)\\|png\\|t\\(ar\\|gz\\|iff\\)\\|[Zo]\\)\\'"))
+"List of regexps of filenames containing binary (non-text) data.")
+;   (eval-when-compile
+;     (require 'regexp-opt)
+;     (list
+;      (format "\\.\\(?:%s\\)\\'"
+;	      (regexp-opt
+;	       '("tar"
+;		 "tgz"
+;		 "gz"
+;		 "bz2"
+;		 "Z"
+;		 "o"
+;		 "elc"
+;		 "png"
+;		 "gif"
+;		 "tiff"
+;		 "jpg"
+;		 "jpeg"))))))
+(defvar inhibit-first-line-modes-regexps
+(purecopy binary-file-regexps)
 "List of regexps; if one matches a file name, don't look for `-*-'.")
 (defvar inhibit-first-line-modes-suffixes nil
 "List of regexps for what to ignore, for `inhibit-first-line-modes-regexps'.
 When checking `inhibit-first-line-modes-regexps', we first discard
 (setq keep-going nil)
 (let ((alist auto-mode-alist)
 (mode nil))
 ;; Find first matching alist entry.
 	      (let ((case-fold-search
-		     (memq system-type '(vax-vms windows-nt))))
+		     (memq system-type '(windows-nt))))
 		(while (and (not mode) alist)
 		  (if (string-match (car (car alist)) name)
 		      (if (and (consp (cdr (car alist)))
 			       (nth 2 (car alist)))
 			  (progn
 (setq buffer-file-name filename)
 (if filename			; make buffer name reflect filename.
 	(let ((new-name (file-name-nondirectory buffer-file-name)))
 	  (if (string= new-name "")
 	      (error "Empty file name"))
-	  (if (eq system-type 'vax-vms)
-	      (setq new-name (downcase new-name)))
 	  (setq default-directory (file-name-directory buffer-file-name))
 	  (or (string= new-name (buffer-name))
 	      (rename-buffer new-name t))))
 (setq buffer-backed-up nil)
 (or along-with-file
 				(copy-file real-file-name backupname t t)))))
 			  (setq buffer-backed-up t)
 			  ;; Now delete the old versions, if desired.
 			  (if delete-old-versions
 			      (while targets
-				(condition-case ()
+				(ignore-file-errors (delete-file (car targets)))
-				    (delete-file (car targets))
-				  (file-error nil))
 				(setq targets (cdr targets))))
 			  setmodes)
 		      (file-error nil)))))))))
 (defun file-name-sans-versions (name &optional keep-backup-version)
 we do not remove backup version numbers, only true file version numbers."
 (let ((handler (find-file-name-handler name 'file-name-sans-versions)))
 (if handler
 	(funcall handler 'file-name-sans-versions name keep-backup-version)
 (substring name 0
-		 (if (eq system-type 'vax-vms)
+		 (if keep-backup-version
-		     ;; VMS version number is (a) semicolon, optional
+		     (length name)
-		     ;; sign, zero or more digits or (b) period, option
+		   (or (string-match "\\.~[0-9.]+~\\'" name)
-		     ;; sign, zero or more digits, provided this is the
+		       ;; XEmacs - VC uses extensions like ".~tagname~" or ".~1.1.5.2~"
-		     ;; second period encountered outside of the
+		       (let ((pos (string-match "\\.~\\([^.~ \t]+\\|[0-9.]+\\)~\\'" name)))
-		     ;; device/directory part of the file name.
+			 (and pos
-		     (or (string-match ";[-+]?[0-9]*\\'" name)
+			      ;; #### - is this filesystem check too paranoid?
-			 (if (string-match "\\.[^]>:]*\\(\\.[-+]?[0-9]*\\)\\'"
+			      (file-exists-p (substring name 0 pos))
-					   name)
+			      pos))
-			     (match-beginning 1))
+		       (string-match "~\\'" name)
-			 (length name))
+		       (length name)))))))
-		   (if keep-backup-version
-		       (length name)
-		     (or (string-match "\\.~[0-9.]+~\\'" name)
-			 ;; XEmacs - VC uses extensions like ".~tagname~" or ".~1.1.5.2~"
-			 (let ((pos (string-match "\\.~\\([^.~ \t]+\\|[0-9.]+\\)~\\'" name)))
-			   (and pos
-				;; #### - is this filesystem check too paranoid?
-				(file-exists-p (substring name 0 pos))
-				pos))
-			 (string-match "~\\'" name)
-			 (length name))))))))
 (defun file-ownership-preserved-p (file)
 "Return t if deleting FILE and rewriting it would preserve the owner."
 (let ((handler (find-file-name-handler file 'file-ownership-preserved-p)))
 (if handler
 (if (and (string-match "[0-9]+~\\'" fn bv-length)
 	   (= (match-beginning 0) bv-length))
 (string-to-int (substring fn bv-length -1))
 0))
-;; I believe there is no need to alter this behavior for VMS;
-;; since backup files are not made on VMS, it should not get called.
 (defun find-backup-file-name (fn)
 "Find a file name for a backup file, and suggestions for deletions.
 Value is a list whose car is the name for the backup file
 and whose cdr is a list of old versions to consider deleting now.
 If the value is nil, don't make a backup."
 (let ((fname (expand-file-name filename)))
 (setq directory (file-name-as-directory
 		       (expand-file-name (or directory default-directory))))
 ;; On Microsoft OSes, if FILENAME and DIRECTORY have different
 ;; drive names, they can't be relative, so return the absolute name.
-(if (and (or (eq system-type 'ms-dos)
+(if (and (memq system-type '(ms-dos windows-nt))
-		   (eq system-type 'windows-nt))
 	       (not (string-equal (substring fname  0 2)
 				  (substring directory 0 2))))
 	  filename
 	(let ((ancestor ".")
 	      (fname-dir (file-name-as-directory fname)))
 since the last real save, but optional arg FORCE non-nil means delete anyway."
 (and buffer-auto-save-file-name delete-auto-save-files
 (not (string= buffer-file-name buffer-auto-save-file-name))
 (or force (recent-auto-save-p))
 (progn
-	 (condition-case ()
+	 (ignore-file-errors (delete-file buffer-auto-save-file-name))
-	     (delete-file buffer-auto-save-file-name)
-	   (file-error nil))
 	 (set-buffer-auto-saved))))
 ;; XEmacs change (from Sun)
 ;; used to communicate with continue-save-buffer:
 (defvar continue-save-buffer-hooks-tail nil)
 ;; In an indirect buffer, save its base buffer instead.
 (if (buffer-base-buffer)
 	(set-buffer (buffer-base-buffer)))
 (if (buffer-modified-p)
 	(let ((recent-save (recent-auto-save-p)))
-	  ;; On VMS, rename file and buffer to get rid of version number.
-	  (if (and (eq system-type 'vax-vms)
-		   (not (string= buffer-file-name
-				 (file-name-sans-versions buffer-file-name))))
-	      (let (buffer-new-name)
-		;; Strip VMS version number before save.
-		(setq buffer-file-name
-		      (file-name-sans-versions buffer-file-name))
-		;; Construct a (unique) buffer name to correspond.
-		(let ((buf (create-file-buffer (downcase buffer-file-name))))
-		  (setq buffer-new-name (buffer-name buf))
-		  (kill-buffer buf))
-		(rename-buffer buffer-new-name)))
 	  ;; If buffer has no file name, ask user for one.
 	  (or buffer-file-name
 	      (let ((filename
 		     (expand-file-name
 		      (read-file-name "File to save in: ") nil)))
 	(cond ((if (file-exists-p file)
 		   (not (file-newer-than-file-p file-name file))
 		 (not (file-exists-p file-name)))
 	       (error "Auto-save file %s not current" file-name))
 	      ((save-window-excursion
-		 (if (not (eq system-type 'vax-vms))
+		 (with-output-to-temp-buffer "*Directory*"
-		     (with-output-to-temp-buffer "*Directory*"
+		   (buffer-disable-undo standard-output)
-		       (buffer-disable-undo standard-output)
+		   (call-process "ls" nil standard-output nil
-		       (call-process "ls" nil standard-output nil
+				 (if (file-symlink-p file) "-lL" "-l")
-				     (if (file-symlink-p file) "-lL" "-l")
+				 file file-name))
-				     file file-name)))
 		 (yes-or-no-p (format "Recover auto save file %s? " file-name)))
 	       (switch-to-buffer (find-file-noselect file t))
 	       (let ((buffer-read-only nil))
 		 (erase-buffer)
 		 (insert-file-contents file-name nil))
 	    (setq i (1+ i)))))
 ;; Shell wildcards should match the entire filename,
 ;; not its part.  Make the regexp say so.
 (concat "\\`" result "\\'")))
-(defcustom list-directory-brief-switches
+(defcustom list-directory-brief-switches "-CF"
-(if (eq system-type 'vax-vms) "" "-CF")
 "*Switches for list-directory to pass to `ls' for brief listing."
 :type 'string
 :group 'dired)
-(defcustom list-directory-verbose-switches
+(defcustom list-directory-verbose-switches "-l"
-(if (eq system-type 'vax-vms)
-"/PROTECTION/SIZE/DATE/OWNER/WIDTH=(OWNER:10)"
-"-l")
 "*Switches for list-directory to pass to `ls' for verbose listing,"
 :type 'string
 :group 'dired)
 (defun list-directory (dirname &optional verbose)
 					 'insert-directory)))
 (if handler
 	(funcall handler 'insert-directory file switches
 		 wildcard full-directory-p)
 (cond
-((eq system-type 'vax-vms)
-	(vms-read-directory file switches (current-buffer)))
 ((and (fboundp 'mswindows-insert-directory)
 	     (eq system-type 'windows-nt))
 	(mswindows-insert-directory file switches wildcard full-directory-p))
 (t
 	(if wildcard

Mercurial > hg > xemacs-beta

comparison lisp/files.el @ 380:8626e4521993 r21-2-5