aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-02-07 12:50:38 +0000
committerJan Djärv2005-02-07 12:50:38 +0000
commit3a4415260fb5aaac2b188f35479d99d8002c4dba (patch)
tree0ca3c31f8f482800dc318706c271a565f0d75c8f /src
parente4907bbe3bc5fa4a32eeaa753304981d868c7cb5 (diff)
downloademacs-3a4415260fb5aaac2b188f35479d99d8002c4dba.tar.gz
emacs-3a4415260fb5aaac2b188f35479d99d8002c4dba.zip
* xfns.c (Fx_backspace_delete_keys_p): Added comment about the
reason for the approach in the code.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c16
2 files changed, 21 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4ca3ed7b56b..2f42beb74c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-02-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xfns.c (Fx_backspace_delete_keys_p): Added comment about the
4 reason for the approach in the code.
5
12005-02-07 Kim F. Storm <storm@cua.dk> 62005-02-07 Kim F. Storm <storm@cua.dk>
2 7
3 * undo.c (Fprimitive_undo): Record max one dummmy apply element. 8 * undo.c (Fprimitive_undo): Record max one dummmy apply element.
diff --git a/src/xfns.c b/src/xfns.c
index c0461d8c7a9..bc9b4a5c993 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5403,6 +5403,22 @@ usual X keysyms. */)
5403 return Qnil; 5403 return Qnil;
5404 } 5404 }
5405 5405
5406 /* In this code we check that the keyboard has physical keys with names
5407 that start with BKSP (Backspace) and DELE (Delete), and that they
5408 generate keysym XK_BackSpace and XK_Delete respectively.
5409 This function is used to test if normal-erase-is-backspace should be
5410 turned on.
5411 An alternative approach would be to just check if XK_BackSpace and
5412 XK_Delete are mapped to any key. But if any of those are mapped to
5413 some non-intuitive key combination (Meta-Shift-Ctrl-whatever) and the
5414 user doesn't know about it, it is better to return false here.
5415 It is more obvious to the user what to do if she/he has two keys
5416 clearly marked with names/symbols and one key does something not
5417 expected (i.e. she/he then tries the other).
5418 The cases where Backspace/Delete is mapped to some other key combination
5419 are rare, and in those cases, normal-erase-is-backspace can be turned on
5420 manually. */
5421
5406 have_keys = Qnil; 5422 have_keys = Qnil;
5407 kb = XkbGetMap (dpy, XkbAllMapComponentsMask, XkbUseCoreKbd); 5423 kb = XkbGetMap (dpy, XkbAllMapComponentsMask, XkbUseCoreKbd);
5408 if (kb) 5424 if (kb)