Mercurial > emacs
changeset 1110:f165d900e06e
*** empty log message ***
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 13 Sep 1992 06:01:19 +0000 |
| parents | c9feb3e64805 |
| children | 95f094fdd81e |
| files | lisp/diff.el lisp/dired-aux.el |
| diffstat | 2 files changed, 71 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/diff.el Sun Sep 13 04:35:22 1992 +0000 +++ b/lisp/diff.el Sun Sep 13 06:01:19 1992 +0000 @@ -166,21 +166,48 @@ (message "Comparing files %s %s..." new old) (setq new (expand-file-name new) old (expand-file-name old)) - (let ((buf (compile-internal (mapconcat 'identity - (append '("diff") - (if (consp diff-switches) - diff-switches - (list diff-switches)) - (list old) - (list new)) - " ") - "No more differences" "Diff" - 'diff-parse-differences))) - (save-excursion - (set-buffer buf) - (set (make-local-variable 'diff-old-file) old) - (set (make-local-variable 'diff-new-file) new)) - buf)) + (let ((old-alt (diff-prepare old new)) + (new-alt (diff-prepare new old)) + buf) + (unwind-protect + (let ((command + (mapconcat 'identity + (append '("diff") + (if (consp diff-switches) + diff-switches + (list diff-switches)) + (if (or old-alt new-alt) + (list "-L" old "-L" new)) + (list (or old-alt old)) + (list (or new-alt new))) + " "))) + (setq buf + (compile-internal command + "No more differences" "Diff" + 'diff-parse-differences))) + (save-excursion + (set-buffer buf) + (set (make-local-variable 'diff-old-file) old) + (set (make-local-variable 'diff-new-file) new)) + buf) + (if old-alt (delete-file old-alt)) + (if new-alt (delete-file new-alt))))) + +;; Copy the file FILE into a temporary file if that is necessary +;; for comparison. (This is only necessary if the file name has a handler.) +;; OTHER is the other file to be compared. +(defun diff-prepare (file other) + (let (handler handlers) + (setq handlers file-name-handler-alist) + (while (and (consp handlers) (null handler)) + (if (and (consp (car handlers)) + (stringp (car (car handlers))) + (string-match (car (car handlers)) file)) + (setq handler (cdr (car handlers)))) + (setq handlers (cdr handlers))) + (if handler + (funcall handler 'diff-prepare file other) + nil))) ;;;###autoload (defun diff-backup (file &optional switches)
--- a/lisp/dired-aux.el Sun Sep 13 04:35:22 1992 +0000 +++ b/lisp/dired-aux.el Sun Sep 13 06:01:19 1992 +0000 @@ -466,24 +466,36 @@ ;; Compress or uncompress the current file. ;; Return nil for success, offending filename else. (let* (buffer-read-only - (from-file (dired-get-filename))) - (cond ((save-excursion (beginning-of-line) - (looking-at dired-re-sym)) - (dired-log (concat "Attempt to compress a symbolic link:\n" - from-file)) - (dired-make-relative from-file)) - ((string-match "\\.Z$" from-file) + (from-file (dired-get-filename)) + (new-file (dired-compress-file from-file))) + (if new-file + (progn (dired-update-file-line new-file) nil) + (dired-log (concat "Failed to compress" from-file)) + from-file))) + +(defun dired-compress-file (file) + ;; Compress or uncompress FILE. + ;; Return the name of the compressed or uncompressed file. + ;; Rerurn nil if no change in files. + (let (handler (handlers file-name-handler-alist)) + (while (and (consp handlers) (null handler)) + (if (and (consp (car handlers)) + (stringp (car (car handlers))) + (string-match (car (car handlers)) file)) + (setq handler (cdr (car handlers)))) + (setq handlers (cdr handlers))) + (cond (handler + (funcall handler 'dired-compress-file file)) + ((file-symlink-p file) + nil) + ((string-match "\\.Z$" file) (if (dired-check-process (concat "Uncompressing " from-file) "uncompress" from-file) - (dired-make-relative from-file) - (dired-update-file-line (substring from-file 0 -2)))) + (substring file 0 -2))) (t (if (dired-check-process (concat "Compressing " from-file) "compress" "-f" from-file) - ;; Errors from the process are already logged. - (dired-make-relative from-file) - (dired-update-file-line (concat from-file ".Z"))))) - nil)) + (concat name ".Z")))))) (defun dired-mark-confirm (op-symbol arg) ;; Request confirmation from the user that the operation described @@ -720,8 +732,9 @@ (let (buffer-read-only) (beginning-of-line) (dired-add-entry-do-indentation marker-char) - (dired-ls (dired-make-absolute filename directory);; don't expand `.' ! - (concat dired-actual-switches "d")) + ;; don't expand `.' ! + (insert-directory (dired-make-absolute filename directory) + (concat dired-actual-switches "d")) (forward-line -1) ;; We want to have the non-directory part, only: (let* ((beg (dired-move-to-filename t)) ; error for strange output @@ -1536,7 +1549,7 @@ (if (equal dirname (car (car (reverse dired-subdir-alist)))) ;; top level directory may contain wildcards: (dired-readin-insert dired-directory) - (dired-ls dirname dired-actual-switches nil t))) + (insert-directory dirname dired-actual-switches nil t))) (message "Reading directory %s...done" dirname) (setq end (point-marker)) (indent-rigidly begin end 2) @@ -1635,38 +1648,6 @@ ;;; moving by subdirectories -(defun dired-subdir-index (dir) - ;; Return an index into alist for use with nth - ;; for the sake of subdir moving commands. - (let (found (index 0) (alist dired-subdir-alist)) - (while alist - (if (string= dir (car (car alist))) - (setq alist nil found t) - (setq alist (cdr alist) index (1+ index)))) - (if found index nil))) - -;;;###autoload -(defun dired-next-subdir (arg &optional no-error-if-not-found no-skip) - "Go to next subdirectory, regardless of level." - ;; Use 0 arg to go to this directory's header line. - ;; NO-SKIP prevents moving to end of header line, returning whatever - ;; position was found in dired-subdir-alist. - (interactive "p") - (let ((this-dir (dired-current-directory)) - pos index) - ;; nth with negative arg does not return nil but the first element - (setq index (- (dired-subdir-index this-dir) arg)) - (setq pos (if (>= index 0) - (dired-get-subdir-min (nth index dired-subdir-alist)))) - (if pos - (progn - (goto-char pos) - (or no-skip (skip-chars-forward "^\n\r")) - (point)) - (if no-error-if-not-found - nil ; return nil if not found - (error "%s directory" (if (> arg 0) "Last" "First")))))) - ;;;###autoload (defun dired-prev-subdir (arg &optional no-error-if-not-found no-skip) "Go to previous subdirectory, regardless of level.