From: "moheb missaghi" <moheb1333@comcast.net>
Subject: Re: Popup when buffer file is changed on disk
Date: Tue, 15 Feb 2005 19:59:42 -0700 [thread overview]
Message-ID: <002901c513d3$90cfc590$6601a8c0@y8h26> (raw)
In-Reply-To: 01c5131b$Blat.v2.4$36d1efe0@zahav.net.il
Hi,
I posted the following yesterday but I am not sure if it made it to the
list.
Sorry if it did post but noone chose to comment.
Thanks for all the responses to my proposed patch. Autorevert doesn't quite
do
what Lennart and I want because it is not deterministic, i.e., depends on
some
frequency value to be set. Also it has to be turned on/off for each buffer
unless you set it globally. Problem with global setting is that you might
forget that buffers are automatically reverted unless some message or symbol
appears on the modeline.
Following Lennart's idea, I added a flag to the buffer struct
(leaveBufferAlone) which persists the state of whether the user chose to
ignore
that the buffer file was changed on disk or not. When working with an IDE,
the
popup provides a symmetric editing experience in that emacs and the IDE
notify
the user whenever the file is changed on disk (by the other) and give
him/her
the chance to ignore or revert. In the case of emacs, this works fine with
ask-user-about-supersession-threat, if user chooses not to revert. When
he/she
finally saves the buffer, the leaveBufferAlone flag is reset. It is also a
bit
more efficient than the current emacs functionality in that it involves one
less key stroke. Currently, if the file is changed on disk you have to do an
edit action in order to get to choose to revert or not via
ask-user-about-supersession-threat (which is a bit annoying to my taste!)
whereas with the popup, you'll get the message as soon as you switch to the
buffer or as soon as the emacs frame gets the focus if the buffer is
currently
visited. The new code follows.
Regards,
Moheb
cvs diff: Diffing nt
Index: nt/nmake.defs
===================================================================
RCS file: /cvsroot/emacs/emacs/nt/nmake.defs,v
retrieving revision 1.20
diff -w -r1.20 nmake.defs
132a133,136
>
>
> USER_CFLAGS = -DUSING_WITH_IDE
>
cvs diff: Diffing src
Index: src/buffer.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/buffer.c,v
retrieving revision 1.473
diff -w -r1.473 buffer.c
55a56,59
> #if USING_WITH_IDE
> #include "w32term.h"
> #endif
>
684a689,693
>
> #if USING_WITH_IDE
> b->leaveBufferAlone = 0;
> #endif
>
1662a1672,1676
> #if USING_WITH_IDE
> Lisp_Object buf;
> HWND hwnd = FRAME_W32_WINDOW (SELECTED_FRAME ());
> #endif
>
1670a1685,1720
> #if USING_WITH_IDE
> buf = switch_to_buffer_1 (buffer, norecord);
>
> // see if file is changed
> if ((!NILP (current_buffer->filename)
> && SAVE_MODIFF >= MODIFF
> && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
> && !NILP (Ffile_exists_p (current_buffer->filename))) &&
> current_buffer->leaveBufferAlone == 0)
> {
> int fileChangedDialogAnswer = MessageBox (NULL, "Buffer file changed
> on disk, revert?", "Emacs",
> MB_YESNO|MB_ICONQUESTION|MB_APPLMODAL|MB_SETFOREGROUND);
> char msg[80];
>
> if (fileChangedDialogAnswer == IDYES)
> {
> /* reset the don't change flag */
> current_buffer->leaveBufferAlone = 0;
> call3 (intern ("revert-buffer"), Qt, Qt, Qt);
> strcpy(msg, "File reverted: ");
> strcat(msg, XSTRING(current_buffer->filename)->data);
> message (msg);
> SetFocus(hwnd);
> }
> else
> {
> /* persist that the question was asked and the answer was no */
> current_buffer->leaveBufferAlone = 1;
> strcpy(msg, "File changed on disk: ");
> strcat(msg, XSTRING(current_buffer->filename)->data);
> message (msg);
> SetFocus(hwnd);
> }
> }
>
> return buf;
> #else
1671a1722
> #endif
Index: src/buffer.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/buffer.h,v
retrieving revision 1.100
diff -w -r1.100 buffer.h
510a511,515
> #if USING_WITH_IDE
> /* for persistance when buffer file changes on disk */
> int leaveBufferAlone;
> #endif
>
Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.526
diff -w -r1.526 fileio.c
5276a5277,5281
> #if USING_WITH_IDE
> /* reset leaveBufferAlone flag */
> current_buffer->leaveBufferAlone = 0;
> #endif
>
Index: src/w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.246
diff -w -r1.246 w32fns.c
3558a3559,3590
> #if USING_WITH_IDE
> // see if file is changed
> if ((!NILP (current_buffer->filename)
> && SAVE_MODIFF >= MODIFF
> && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
> && !NILP (Ffile_exists_p (current_buffer->filename))) &&
> current_buffer->leaveBufferAlone == 0)
> {
> int fileChangedDialogAnswer = MessageBox (NULL, "Buffer file changed
> on disk, revert?", "Emacs",
> MB_YESNO|MB_ICONQUESTION|MB_APPLMODAL|MB_SETFOREGROUND);
> char msg[80];
>
> if (fileChangedDialogAnswer == IDYES)
> {
> /* reset the flag */
> current_buffer->leaveBufferAlone = 0;
> call3 (intern ("revert-buffer"), Qt, Qt, Qt);
> strcpy(msg, "File reverted: ");
> strcat(msg, XSTRING(current_buffer->filename)->data);
> message (msg);
> SetFocus(hwnd);
> }
> else
> {
> /* don't let the dialog to be annoying */
> current_buffer->leaveBufferAlone = 1;
> strcpy(msg, "File changed on disk: ");
> strcat(msg, XSTRING(current_buffer->filename)->data);
> message (msg);
> SetFocus(hwnd);
> }
> }
> #endif
next prev parent reply other threads:[~2005-02-16 2:59 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-04 0:36 find-file-hook as illustration of Custom problems Luc Teirlinck
2005-02-04 7:16 ` Lennart Borgman
2005-02-05 17:38 ` Richard Stallman
2005-02-05 18:54 ` Luc Teirlinck
2005-02-06 21:01 ` Richard Stallman
2005-02-06 22:19 ` Lennart Borgman
2005-02-05 19:43 ` Lennart Borgman
2005-02-05 20:56 ` Popup when buffer file is changed on disk moheb missaghi
2005-02-05 22:57 ` Eli Zaretskii
2005-02-06 0:51 ` Lennart Borgman
2005-02-06 7:20 ` Eli Zaretskii
2005-02-06 9:02 ` Lennart Borgman
2005-02-06 9:53 ` Eli Zaretskii
2005-02-06 10:41 ` Lennart Borgman
2005-02-06 16:34 ` Luc Teirlinck
2005-02-06 17:52 ` Lennart Borgman
2005-02-06 17:04 ` Luc Teirlinck
2005-02-11 0:33 ` Luc Teirlinck
2005-02-11 15:40 ` Eli Zaretskii
2005-02-11 16:51 ` David Kastrup
2005-02-11 19:38 ` Luc Teirlinck
2005-02-12 11:03 ` Eli Zaretskii
2005-02-12 8:37 ` Richard Stallman
2005-02-13 1:41 ` Luc Teirlinck
2005-02-13 4:36 ` Eli Zaretskii
2005-02-15 3:05 ` Luc Teirlinck
2005-02-15 4:59 ` Eli Zaretskii
2005-02-16 2:59 ` moheb missaghi [this message]
2005-02-16 9:31 ` Richard Stallman
2005-02-16 10:37 ` David Kastrup
2005-02-16 15:06 ` Luc Teirlinck
2005-02-16 15:21 ` David Kastrup
2005-02-17 1:08 ` Luc Teirlinck
2005-02-06 12:42 ` Richard Stallman
2005-02-06 18:00 ` Lennart Borgman
2005-02-06 18:17 ` Jan D.
2005-02-06 19:59 ` Lennart Borgman
2005-02-06 20:40 ` Jan D.
2005-02-07 4:34 ` Eli Zaretskii
2005-02-07 4:04 ` Luc Teirlinck
2005-02-06 18:11 ` Luc Teirlinck
2005-02-06 18:45 ` Luc Teirlinck
2005-02-06 13:24 ` Jason Rumney
2005-02-06 13:54 ` Lennart Borgman
2005-02-06 7:23 ` Eli Zaretskii
2005-02-06 21:01 ` find-file-hook as illustration of Custom problems Richard Stallman
2005-02-06 1:50 ` Luc Teirlinck
2005-02-06 3:26 ` Luc Teirlinck
2005-02-06 4:02 ` Luc Teirlinck
2005-02-06 21:02 ` Richard Stallman
2005-02-08 1:50 ` Luc Teirlinck
2005-02-09 8:10 ` Richard Stallman
2005-02-09 10:42 ` Kim F. Storm
2005-02-10 18:39 ` Richard Stallman
2005-02-10 21:42 ` Kim F. Storm
2005-02-12 8:37 ` Richard Stallman
2005-02-10 5:12 ` Luc Teirlinck
2005-02-10 18:40 ` Richard Stallman
2005-02-11 0:09 ` Luc Teirlinck
2005-02-12 8:37 ` Richard Stallman
2005-02-11 0:21 ` Luc Teirlinck
2005-02-11 14:59 ` Luc Teirlinck
2005-02-10 5:26 ` Luc Teirlinck
2005-02-06 2:07 ` Luc Teirlinck
2005-02-06 3:16 ` Luc Teirlinck
-- strict thread matches above, loose matches on Subject: below --
2005-02-14 20:18 Popup when buffer file is changed on disk moheb1333
2006-01-01 16:10 ` Richard M. Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='002901c513d3$90cfc590$6601a8c0@y8h26' \
--to=moheb1333@comcast.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).