From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Samuel Wales <samologist@gmail.com>
Cc: Bastien <bzg@gnu.org>,
11774-done@debbugs.gnu.org,
Martin Pohlack <mp26@os.inf.tu-dresden.de>,
Toby Cubitt <tsc25@cantab.net>
Subject: bug#11774: bug#11774: bug#11774: org-mode causes undo boundaries to be lost
Date: Wed, 18 Jul 2012 09:21:42 -0400 [thread overview]
Message-ID: <jwvpq7t1a4t.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <CAJcAo8ujDHZU2xiPh8hnaXgO1m_-cf2tcA6B_LWj-3YczJRzAA@mail.gmail.com> (Samuel Wales's message of "Tue, 3 Jul 2012 17:18:50 -0700")
>>> self-insert-command. Even just turning that magic 20 number into a
>>> variable would help.
>> Providing it as a variable would be very easy, indeed.
> Maybe the user should be able to set undo boundaries and
> have them work after self-insert-command? Dunno, I'm
> not familiar with internals enough to opine.
I installed the patch below which makes self-insert-command more careful
to only remove undo boundaries that were auto-added.
So (add-hook 'post-self-insert-hook #'undo-boundary 'append) should give you
pretty much the behavior you were looking for.
Stefan
=== modified file 'src/ChangeLog'
--- src/ChangeLog 2012-07-18 05:44:36 +0000
+++ src/ChangeLog 2012-07-18 13:17:22 +0000
@@ -1,3 +1,10 @@
+2012-07-18 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * lisp.h (last_undo_boundary): Declare new var.
+ * keyboard.c (command_loop_1): Set it.
+ * cmds.c (Fself_insert_command): Use it to only remove boundaries that
+ were auto-added by the command loop (bug#11774).
+
2012-07-18 Dmitry Antipov <dmantipov@yandex.ru>
Return more descriptive data from Fgarbage_collect.
=== modified file 'src/cmds.c'
--- src/cmds.c 2012-06-16 12:24:15 +0000
+++ src/cmds.c 2012-07-18 13:08:43 +0000
@@ -296,7 +296,10 @@
if (remove_boundary
&& CONSP (BVAR (current_buffer, undo_list))
- && NILP (XCAR (BVAR (current_buffer, undo_list))))
+ && NILP (XCAR (BVAR (current_buffer, undo_list)))
+ /* Only remove auto-added boundaries, not boundaries
+ added be explicit calls to undo-boundary. */
+ && EQ (BVAR (current_buffer, undo_list), last_undo_boundary))
/* Remove the undo_boundary that was just pushed. */
BVAR (current_buffer, undo_list) = XCDR (BVAR (current_buffer, undo_list));
=== modified file 'src/keyboard.c'
--- src/keyboard.c 2012-07-12 03:45:46 +0000
+++ src/keyboard.c 2012-07-18 13:13:31 +0000
@@ -1318,6 +1318,9 @@
}
#endif
+/* The last boundary auto-added to buffer-undo-list. */
+Lisp_Object last_undo_boundary;
+
/* FIXME: This is wrong rather than test window-system, we should call
a new set-selection, which will then dispatch to x-set-selection, or
tty-set-selection, or w32-set-selection, ... */
@@ -1565,7 +1568,13 @@
#endif
if (NILP (KVAR (current_kboard, Vprefix_arg))) /* FIXME: Why? --Stef */
+ {
+ Lisp_Object undo = BVAR (current_buffer, undo_list);
Fundo_boundary ();
+ last_undo_boundary
+ = (EQ (undo, BVAR (current_buffer, undo_list))
+ ? Qnil : BVAR (current_buffer, undo_list));
+ }
Fcommand_execute (Vthis_command, Qnil, Qnil, Qnil);
#ifdef HAVE_WINDOW_SYSTEM
=== modified file 'src/lisp.h'
--- src/lisp.h 2012-07-18 05:44:36 +0000
+++ src/lisp.h 2012-07-18 13:05:33 +0000
@@ -2921,7 +2921,7 @@
extern void syms_of_search (void);
extern void clear_regexp_cache (void);
-/* Defined in minibuf.c */
+/* Defined in minibuf.c. */
extern Lisp_Object Qcompletion_ignore_case;
extern Lisp_Object Vminibuffer_list;
@@ -2930,25 +2930,25 @@
extern void init_minibuf_once (void);
extern void syms_of_minibuf (void);
-/* Defined in callint.c */
+/* Defined in callint.c. */
extern Lisp_Object Qminus, Qplus;
extern Lisp_Object Qwhen;
extern Lisp_Object Qcall_interactively, Qmouse_leave_buffer_hook;
extern void syms_of_callint (void);
-/* Defined in casefiddle.c */
+/* Defined in casefiddle.c. */
extern Lisp_Object Qidentity;
extern void syms_of_casefiddle (void);
extern void keys_of_casefiddle (void);
-/* Defined in casetab.c */
+/* Defined in casetab.c. */
extern void init_casetab_once (void);
extern void syms_of_casetab (void);
-/* Defined in keyboard.c */
+/* Defined in keyboard.c. */
extern Lisp_Object echo_message_buffer;
extern struct kboard *echo_kboard;
@@ -2956,6 +2956,7 @@
extern Lisp_Object Qdisabled, QCfilter;
extern Lisp_Object Qup, Qdown, Qbottom;
extern Lisp_Object Qtop;
+extern Lisp_Object last_undo_boundary;
extern int input_pending;
extern Lisp_Object menu_bar_items (Lisp_Object);
extern Lisp_Object tool_bar_items (Lisp_Object, int *);
@@ -2976,13 +2977,13 @@
extern void syms_of_keyboard (void);
extern void keys_of_keyboard (void);
-/* Defined in indent.c */
+/* Defined in indent.c. */
extern ptrdiff_t current_column (void);
extern void invalidate_current_column (void);
extern int indented_beyond_p (ptrdiff_t, ptrdiff_t, EMACS_INT);
extern void syms_of_indent (void);
-/* Defined in frame.c */
+/* Defined in frame.c. */
extern Lisp_Object Qonly;
extern Lisp_Object Qvisible;
extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);
@@ -2995,7 +2996,7 @@
extern void frames_discard_buffer (Lisp_Object);
extern void syms_of_frame (void);
-/* Defined in emacs.c */
+/* Defined in emacs.c. */
extern char **initial_argv;
extern int initial_argc;
#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
next prev parent reply other threads:[~2012-07-18 13:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120703095729.GA6651@c3po>
2012-07-03 15:18 ` bug#11774: bug#11774: org-mode causes undo boundaries to be lost Martin Pohlack
[not found] ` <4FF30D50.8010009@os.inf.tu-dresden.de>
2012-07-03 17:29 ` Stefan Monnier
2012-07-03 18:13 ` bug#11774: " Samuel Wales
[not found] ` <CAJcAo8t4wj-8mje2=QEKY275QXyxwkotBCftZmOVQZAsMAt7Hg@mail.gmail.com>
2012-07-03 22:57 ` Stefan Monnier
[not found] ` <jwvfw984ftk.fsf-monnier+emacs@gnu.org>
2012-07-04 0:18 ` Samuel Wales
[not found] ` <CAJcAo8ujDHZU2xiPh8hnaXgO1m_-cf2tcA6B_LWj-3YczJRzAA@mail.gmail.com>
2012-07-04 0:24 ` bug#11774: " Samuel Wales
2012-07-04 9:40 ` Toby Cubitt
2012-07-18 13:21 ` Stefan Monnier [this message]
2012-08-01 14:26 ` Bastien
[not found] ` <CAJcAo8ux9Dw5Nu6x0jm59mWFaLWFG6SSeMs9dju-Jgy5nWkUcA@mail.gmail.com>
2014-11-03 14:35 ` Stefan Monnier
[not found] <20120624212755.GA14501@c3po.home>
[not found] ` <20120624215241.GA6205@c3po.home>
2012-06-25 11:35 ` Toby Cubitt
[not found] ` <4FF14504.10609@os.inf.tu-dresden.de>
2012-07-03 9:57 ` bug#11774: " Toby Cubitt
[not found] ` <20120625113529.GA15913@c3po.home>
2012-07-02 6:51 ` Martin Pohlack
2012-07-03 18:33 ` Martin Pohlack
2014-11-03 19:25 ` bug#11774: Emacs 24.3: newline-and-indent has two undo boundaries Samuel Wales
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvpq7t1a4t.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=11774-done@debbugs.gnu.org \
--cc=bzg@gnu.org \
--cc=mp26@os.inf.tu-dresden.de \
--cc=samologist@gmail.com \
--cc=tsc25@cantab.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/org-mode.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).