[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103851: New variable `revert-buffer-
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103851: New variable `revert-buffer-in-progress-p'. |
Date: |
Wed, 06 Apr 2011 21:38:46 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103851
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-04-06 21:38:46 +0200
message:
New variable `revert-buffer-in-progress-p'.
* lisp/files.el (after-find-file-from-revert-buffer): Remove variable.
(after-find-file): Dont' bind it.
(revert-buffer-in-progress-p): New variable.
(revert-buffer): Bind it.
Pass nil for `after-find-file-from-revert-buffer'.
* lisp/saveplace.el (save-place-find-file-hook): Use new variable
`rever-buffer-in-progress-p', not `after-find-file-from-revert-buffer'.
* etc/NEWS: New variable `revert-buffer-in-progress-p'.
modified:
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/files.el
lisp/saveplace.el
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2011-04-06 12:18:10 +0000
+++ b/etc/ChangeLog 2011-04-06 19:38:46 +0000
@@ -1,3 +1,7 @@
+2011-04-06 Juanma Barranquero <address@hidden>
+
+ * NEWS: New variable `revert-buffer-in-progress-p'.
+
2011-03-22 Sebastian Hermida <address@hidden>
* themes/misterioso-theme.el: New file.
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2011-04-03 00:40:35 +0000
+++ b/etc/NEWS 2011-04-06 19:38:46 +0000
@@ -886,6 +886,9 @@
with a nil or omitted VALUE argument, the reporter message is
displayed with a "spinning bar".
+** New variable `revert-buffer-in-progress-p' is true while a buffer is
+being reverted, even if the buffer has a local `revert-buffer-function'.
+
* Changes in Emacs 24.1 on non-free operating systems
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-04-06 12:18:10 +0000
+++ b/lisp/ChangeLog 2011-04-06 19:38:46 +0000
@@ -1,3 +1,14 @@
+2011-04-06 Juanma Barranquero <address@hidden>
+
+ * files.el (after-find-file-from-revert-buffer): Remove variable.
+ (after-find-file): Dont' bind it.
+ (revert-buffer-in-progress-p): New variable.
+ (revert-buffer): Bind it.
+ Pass nil for `after-find-file-from-revert-buffer'.
+
+ * saveplace.el (save-place-find-file-hook): Use new variable
+ `rever-buffer-in-progress-p', not `after-find-file-from-revert-buffer'.
+
2011-04-06 Glenn Morris <address@hidden>
* Makefile.in (AUTOGEN_VCS): New variable.
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2011-04-02 18:12:21 +0000
+++ b/lisp/files.el 2011-04-06 19:38:46 +0000
@@ -2100,10 +2100,8 @@
(confirm-nonexistent-file-or-buffer))))
(switch-to-buffer (find-file-noselect filename nil t)))
-(defvar after-find-file-from-revert-buffer nil)
-
(defun after-find-file (&optional error warn noauto
- after-find-file-from-revert-buffer
+ _after-find-file-from-revert-buffer
nomodes)
"Called after finding a file and by the default revert function.
Sets buffer mode, parses local variables.
@@ -2111,8 +2109,8 @@
error in reading the file. WARN non-nil means warn if there
exists an auto-save file more recent than the visited file.
NOAUTO means don't mess with auto-save mode.
-Fourth arg AFTER-FIND-FILE-FROM-REVERT-BUFFER non-nil
- means this call was from `revert-buffer'.
+Fourth arg AFTER-FIND-FILE-FROM-REVERT-BUFFER is ignored
+\(see `revert-buffer-in-progress-p' for similar functionality).
Fifth arg NOMODES non-nil means don't alter the file's modes.
Finishes by calling the functions in `find-file-hook'
unless NOMODES is non-nil."
@@ -5004,6 +5002,10 @@
If `revert-buffer-function' is used to override the normal revert
mechanism, this hook is not used.")
+(defvar revert-buffer-in-progress-p nil
+ "Non-nil if a `revert-buffer' operation is in progress, nil otherwise.
+This is true even if a `revert-buffer-function' is being used.")
+
(defvar revert-buffer-internal-hook)
(defun revert-buffer (&optional ignore-auto noconfirm preserve-modes)
@@ -5046,10 +5048,12 @@
;; interface, but leaving the programmatic interface the same.
(interactive (list (not current-prefix-arg)))
(if revert-buffer-function
- (funcall revert-buffer-function ignore-auto noconfirm)
+ (let ((revert-buffer-in-progress-p t))
+ (funcall revert-buffer-function ignore-auto noconfirm))
(with-current-buffer (or (buffer-base-buffer (current-buffer))
(current-buffer))
- (let* ((auto-save-p (and (not ignore-auto)
+ (let* ((revert-buffer-in-progress-p t)
+ (auto-save-p (and (not ignore-auto)
(recent-auto-save-p)
buffer-auto-save-file-name
(file-readable-p buffer-auto-save-file-name)
@@ -5140,7 +5144,7 @@
;; have changed the truename.
(setq buffer-file-truename
(abbreviate-file-name (file-truename buffer-file-name)))
- (after-find-file nil nil t t preserve-modes)
+ (after-find-file nil nil t nil preserve-modes)
;; Run after-revert-hook as it was before we reverted.
(setq-default revert-buffer-internal-hook global-hook)
(if local-hook
=== modified file 'lisp/saveplace.el'
--- a/lisp/saveplace.el 2011-03-06 00:30:16 +0000
+++ b/lisp/saveplace.el 2011-04-06 19:38:46 +0000
@@ -285,7 +285,7 @@
(let ((cell (assoc buffer-file-name save-place-alist)))
(if cell
(progn
- (or after-find-file-from-revert-buffer
+ (or revert-buffer-in-progress-p
(goto-char (cdr cell)))
;; and make sure it will be saved again for later
(setq save-place t)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103851: New variable `revert-buffer-in-progress-p'.,
Juanma Barranquero <=