Mercurial > hg > xemacs-beta
view lisp/mule/mule-x-init.el @ 5751:2b8edd304c2b
Avoid throwing an error with misc-user events in isearch-pre-command-hook.
lisp/ChangeLog addition:
2013-08-05 Aidan Kehoe <kehoea@parhasard.net>
* isearch-mode.el (isearch-pre-command-hook):
If this function is called and (this-command-keys) contains
misc-user events, #'key-binding throws an error.
Eddie Corns and Alex Belits describe this happening in tracker
issue 336, and we can avoid this by catching the error and
handling the misc-user event in the same way that #'dispatch-event
does.
I haven't reproduced the actual error they describe, and welcome
testing to make sure it's gone.
Thank you Eddie, thank you Alex!
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 05 Aug 2013 13:34:27 +0100 |
parents | 071b810ceb18 |
children |
line wrap: on
line source
;;; mule-x-init.el --- initialization code for X Windows under MULE -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 1996, 2002 Ben Wing <ben@xemacs.org> ;; Author: various ;; Keywords: mule X11 ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: ;;; Work around what is arguably a Sun CDE bug. ;; #### This is unused, apparently. (defun x-use-halfwidth-roman-font (fullwidth-charset roman-registry) "Maybe set charset registry of the 'ascii charset to ROMAN-REGISTRY. Do this only if: - the current display is an X device - the displayed width of FULLWIDTH-CHARSET is twice the displayed width of the 'ascii charset, but only when using ROMAN-REGISTRY. Traditionally, Asian characters have been displayed so that they occupy exactly twice the screen space of ASCII (`halfwidth') characters. On many systems, e.g. Sun CDE systems, this can only be achieved by using a national variant roman font to display ASCII." (labels ((charset-font-width (charset) (font-instance-width (face-font-instance 'default (selected-device) charset))) (twice-as-wide (cs1 cs2) (let ((width1 (charset-font-width cs1)) (width2 (charset-font-width cs2))) (and width1 width2 (eq (+ width1 width1) width2))))) (declare (inline charset-font-width)) (when (eq 'x (device-type)) (let ((original-registries (charset-registries 'ascii))) (condition-case nil (unless (twice-as-wide 'ascii fullwidth-charset) (set-charset-registries 'ascii (vector roman-registry)) (unless (twice-as-wide 'ascii fullwidth-charset) ;; Restore if roman-registry didn't help (set-charset-registries 'ascii original-registries))) (error (set-charset-registries 'ascii original-registries))))))) ;;;;