mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(wdired-old-point): New internal variable.

Browse source 
(wdired-change-to-wdired-mode): Set it buffer-locally.
(wdired-abort-changes): Restore point after aborting changes.
This commit is contained in:
Juri Linkov 2005-12-14 07:46:11 +00:00
parent 5fff026521
commit ad25ebbbbc
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/ChangeLog
View file

@ -1,3 +1,21 @@
2005-12-14 Juri Linkov <juri@jurta.org>
* help-macro.el (make-help-screen): Bind `inhibit-read-only' to t
around `erase-buffer' and `insert'.
* descr-text.el (describe-text-properties): Replace buffer name
"*Help-2*" with "*Help*<2>".
(describe-char): Add functions print-help-return-message,
toggle-read-only. Use help-setup-xref with nil to not store
describe-char in help-xref-stack. Use help-make-xrefs to
make [back] button.
* desktop.el (desktop-minor-mode-table): Add vc-dired-mode with nil.
* wdired.el (wdired-old-point): New internal variable.
(wdired-change-to-wdired-mode): Set it buffer-locally.
(wdired-abort-changes): Restore point after aborting changes.
2005-12-13 Stefan Monnier <monnier@iro.umontreal.ca>
* vc.el (vc-do-command): Add a new value t for okstatus.

8
lisp/wdired.el
View file

@ -211,6 +211,7 @@ program `dired-chmod-program', which must exist."
;; Local variables (put here to avoid compilation gripes)
(defvar wdired-col-perm) ;; Column where the permission bits start
(defvar wdired-old-content)
(defvar wdired-old-point)
(defun wdired-mode ()
@ -242,6 +243,7 @@ See `wdired-mode'."
(interactive)
(set (make-local-variable 'wdired-old-content)
(buffer-substring (point-min) (point-max)))
(set (make-local-variable 'wdired-old-point) (point))
(set (make-local-variable 'query-replace-skip-read-only) t)
(use-local-map wdired-mode-map)
(force-mode-line-update)
@ -264,7 +266,8 @@ See `wdired-mode'."
(set-buffer-modified-p nil)
(setq buffer-undo-list nil)
(run-mode-hooks 'wdired-mode-hook)
(message "%s" (substitute-command-keys "Press \\[wdired-finish-edit] when finished \
(message "%s" (substitute-command-keys
"Press \\[wdired-finish-edit] when finished \
or \\[wdired-abort-changes] to abort changes")))
@ -348,7 +351,8 @@ non-nil means return old filename."
(interactive)
(let ((inhibit-read-only t))
(erase-buffer)
(insert wdired-old-content))
(insert wdired-old-content)
(goto-char wdired-old-point))
(wdired-change-to-dired-mode)
(set-buffer-modified-p nil)
(setq buffer-undo-list nil)