APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1513946918 0 # Fri Dec 22 12:48:38 2017 +0000 # Node ID 46efc7173defd0f4f41bd8f3819970c4876c551a # Parent 3de111a0da7b7880bb1473598b14a4cd84a97200 Remove the last of the X11-specific code, compose.el 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; * compose.el: [...] (decide-on-bindings): Remove the last of the X11-specific code, don't use the UABCD keysyms for some exotic composed base characters. diff -r 3de111a0da7b -r 46efc7173def lisp/ChangeLog --- a/lisp/ChangeLog Fri Dec 22 12:37:44 2017 +0000 +++ b/lisp/ChangeLog Fri Dec 22 12:48:38 2017 +0000 ＠＠ -2,6 +2,9 ＠＠ * compose.el: Rename from x-compose.el, it's not platform-specific. + (decide-on-bindings): + Remove the last of the X11-specific code, don't use the UABCD + keysyms for some exotic composed base characters. * gtk-compose.el (gtk-compose): Require the new feature. * isearch-mode.el (isearch-pre-command-hook): * keymap.el (for): diff -r 3de111a0da7b -r 46efc7173def lisp/compose.el --- a/lisp/compose.el Fri Dec 22 12:37:44 2017 +0000 +++ b/lisp/compose.el Fri Dec 22 12:48:38 2017 +0000 ＠＠ -406,9 +406,9 ＠＠ (compose-caron-map [?A] #x01CD) ;; CAPITAL A WITH CARON (compose-caron-map [?C] #x010C) ;; CAPITAL C WITH CARON (compose-caron-map [?D] #x010E) ;; CAPITAL D WITH CARON - (compose-caron-map [U01F1] #x01C4) ;; CAPITAL DZ WITH CARON + (compose-caron-map (decode-char 'ucs #x01f1) #x01C4) ;; CAPITAL DZ WITH CARON (compose-caron-map [?E] #x011A) ;; CAPITAL E WITH CARON - (compose-caron-map [U01B7] #x01EE) ;; CAPITAL EZH WITH CARON + (compose-caron-map (decode-char 'ucs #x01b7) #x01EE) ;; CAPITAL EZH WITH CARON (compose-caron-map [?G] #x01E6) ;; CAPITAL G WITH CARON (compose-caron-map [?H] #x021E) ;; CAPITAL H WITH CARON (compose-caron-map [?I] #x01CF) ;; CAPITAL I WITH CARON ＠＠ -424,9 +424,9 ＠＠ (compose-caron-map [?a] #x01CE) ;; SMALL A WITH CARON (compose-caron-map [?c] #x010D) ;; SMALL C WITH CARON (compose-caron-map [?d] #x010F) ;; SMALL D WITH CARON - (compose-caron-map [U01F3] #x01C6) ;; SMALL DZ WITH CARON + (compose-caron-map (decode-char 'ucs #x01F3) #x01C6) ;; SMALL DZ WITH CARON (compose-caron-map [?e] #x011B) ;; SMALL E WITH CARON - (compose-caron-map [U0292] #x01EF) ;; SMALL EZH WITH CARON + (compose-caron-map (decode-char 'ucs #x0292) #x01EF) ;; SMALL EZH WITH CARON (compose-caron-map [?g] #x01E7) ;; SMALL G WITH CARON (compose-caron-map [?h] #x021F) ;; SMALL H WITH CARON (compose-caron-map [?i] #x01D0) ;; SMALL I WITH CARON ＠＠ -515,7 +515,7 ＠＠ (compose-dot-map [?f] #x1E1F) ;; SMALL F WITH DOT ABOVE (compose-dot-map [?g] #x0121) ;; SMALL G WITH DOT ABOVE (compose-dot-map [?h] #x1E23) ;; SMALL H WITH DOT ABOVE - (compose-dot-map [U017F] #x1E9B) ;; SMALL LONG S WITH DOT ABOVE + (compose-dot-map (decode-char 'ucs #x017F) #x1E9B) ;; SMALL LONG S WITH DOT ABOVE (compose-dot-map [?m] #x1E41) ;; SMALL M WITH DOT ABOVE (compose-dot-map [?n] #x1E45) ;; SMALL N WITH DOT ABOVE (compose-dot-map [?o] #x022F) ;; SMALL O WITH DOT ABOVE ＠＠ -543,23 +543,23 ＠＠ (compose-hook-map [?V] #x01B2) ;; CAPITAL V WITH HOOK (compose-hook-map [?Y] #x01B3) ;; CAPITAL Y WITH HOOK (compose-hook-map [?Z] #x0224) ;; CAPITAL Z WITH HOOK - (compose-hook-map [U0262] #x029B) ;; SMALL CAPITAL G WITH HOOK + (compose-hook-map (decode-char 'ucs #x0262) #x029B) ;; SMALL CAPITAL G WITH HOOK (compose-hook-map [?b] #x0253) ;; SMALL B WITH HOOK (compose-hook-map [?c] #x0188) ;; SMALL C WITH HOOK (compose-hook-map [?d] #x0257) ;; SMALL D WITH HOOK (compose-hook-map [?f] #x0192) ;; SMALL F WITH HOOK (compose-hook-map [?g] #x0260) ;; SMALL G WITH HOOK (compose-hook-map [?h] #x0266) ;; SMALL H WITH HOOK - (compose-hook-map [U0266] #x0267) ;; SMALL HENG WITH HOOK + (compose-hook-map (decode-char 'ucs #x0266) #x0267) ;; SMALL HENG WITH HOOK (compose-hook-map [?k] #x0199) ;; SMALL K WITH HOOK (compose-hook-map [?m] #x0271) ;; SMALL M WITH HOOK (compose-hook-map [?p] #x01A5) ;; SMALL P WITH HOOK (compose-hook-map [?q] #x02A0) ;; SMALL Q WITH HOOK - (compose-hook-map [U025C] #x025D) ;; SMALL REVERSED OPEN E WITH HOOK + (compose-hook-map (decode-char 'ucs #x025C) #x025D) ;; SMALL REVERSED OPEN E WITH HOOK (compose-hook-map [?s] #x0282) ;; SMALL S WITH HOOK - (compose-hook-map [U0259] #x025A) ;; SMALL SCHWA WITH HOOK + (compose-hook-map (decode-char 'ucs #x0259) #x025A) ;; SMALL SCHWA WITH HOOK (compose-hook-map [?t] #x01AD) ;; SMALL T WITH HOOK - (compose-hook-map [U0279] #x027B) ;; SMALL TURNED R WITH HOOK + (compose-hook-map (decode-char 'ucs #x0279) #x027B) ;; SMALL TURNED R WITH HOOK (compose-hook-map [?v] #x028B) ;; SMALL V WITH HOOK (compose-hook-map [?y] #x01B4) ;; SMALL Y WITH HOOK (compose-hook-map [?z] #x0225) ;; SMALL Z WITH HOOK -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)