Mercurial > hg > xemacs-beta
view lisp/site-load.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 | b9167d522a9a |
children |
line wrap: on
line source
;;; site-load.el --- Template file for site-wide XEmacs customization ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Steven L. Baur <steve@xemacs.org> ;; Keywords: internal ;; 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: ;; This is a prototype site-load.el file. ;; The site-load.el mechanism is provided so XEmacs installers can easily ;; dump lisp packages with XEmacs that do not get dumped standardly. ;; The file `site-packages' if it exists should look something like: ;; (setq site-load-packages '( ;; "../lisp/modes/cc-mode.elc" ;; "../lisp/utils/redo.elc" ;; "../lisp/packages/scroll-in-place.elc" ;; ) ;; ) ;; The first line and the last line must be exact. Each of the packages ;; listed must be double quoted, have either an absolute path, or a relative ;; to the build src directory path *and* be bytecompiled prior to the attempt ;; to dump. They also must explicitly have the .elc extension. ;; Because this is a trial implementation and the file is shared with ;; make-docfiles, syntax is strict and unforgiving. So sue me. It ;; is still better than the way it used to be. ;; Also note that site-packages belongs in the top level directory not the ;; lisp directory for use with --srcdir configurations. ;;; Code: (defvar site-load-package-file "../site-packages" "File name containing the list of extra packages to dump with XEmacs.") (defvar site-load-packages nil "A list of .elc files that should be dumped with XEmacs. This variable should be set by `site-load-package-file'.") ;; Load site specific packages for dumping with the XEmacs binary. (when (file-exists-p site-load-package-file) (let ((file)) (load site-load-package-file t t t) ;; The `pureload' macro is provided as a clue that a package is ;; being loaded in preparation of being dumped into XEmacs. (defmacro pureload (file) (list 'prog1 (list 'load file) '(garbage-collect))) (message "Loading site-wide packages for dumping...") (while site-load-packages (setq file (car site-load-packages)) (pureload file) (setq site-load-packages (cdr site-load-packages))) (message "Loading site-wide packages for dumping...done") (fmakunbound 'pureload))) ;; This file is intended for end user additions. ;; Put other initialization here, like setting of language-environment, etc. ;; Perhaps this should really be in the site-init.el. ;;; site-load.el ends here