[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/dired.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/dired.el [lexbind] |
Date: |
Tue, 06 Jul 2004 07:05:36 -0400 |
Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.230.2.14 emacs/lisp/dired.el:1.230.2.15
*** emacs/lisp/dired.el:1.230.2.14 Tue Jul 6 10:00:03 2004
--- emacs/lisp/dired.el Tue Jul 6 10:10:47 2004
***************
*** 880,886 ****
Should not fail even on completely garbaged buffers.
Preserves old cursor, marks/flags, hidden-p."
(widen) ; just in case user narrowed
! (let ((opoint (point))
(ofile (dired-get-filename nil t))
(mark-alist nil) ; save marked files
(hidden-subdirs (dired-remember-hidden))
--- 880,887 ----
Should not fail even on completely garbaged buffers.
Preserves old cursor, marks/flags, hidden-p."
(widen) ; just in case user narrowed
! (let ((modflag (buffer-modified-p))
! (opoint (point))
(ofile (dired-get-filename nil t))
(mark-alist nil) ; save marked files
(hidden-subdirs (dired-remember-hidden))
***************
*** 907,915 ****
(save-excursion ; hide subdirs that were hidden
(dolist (dir hidden-subdirs)
(if (dired-goto-subdir dir)
! (dired-hide-subdir 1)))))
;; outside of the let scope
! ;;; Might as well not override the user if the user changed this.
;;; (setq buffer-read-only t)
)
--- 908,917 ----
(save-excursion ; hide subdirs that were hidden
(dolist (dir hidden-subdirs)
(if (dired-goto-subdir dir)
! (dired-hide-subdir 1))))
! (unless modflag (restore-buffer-modified-p nil)))
;; outside of the let scope
! ;;; Might as well not override the user if the user changed this.
;;; (setq buffer-read-only t)
)
***************
*** 1707,1713 ****
(setq dir (expand-file-name dir)))
(if (string-match (concat "^" (regexp-quote dir)) file)
(substring file (match-end 0))
! ;;; (or no-error
;;; (error "%s: not in directory tree growing at %s" file dir))
file))
--- 1709,1715 ----
(setq dir (expand-file-name dir)))
(if (string-match (concat "^" (regexp-quote dir)) file)
(substring file (match-end 0))
! ;;; (or no-error
;;; (error "%s: not in directory tree growing at %s" file dir))
file))