1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
emacs/etc
Stefan Monnier 3349e122e2 Add multiple inheritance to keymaps.
* src/keymap.c (Fmake_composed_keymap): New function.
(Fset_keymap_parent): Simplify.
(fix_submap_inheritance): Remove.
(access_keymap_1): New function extracted from access_keymap to handle
embedded parents and handle lists of maps.
(access_keymap): Use it.
(Fkeymap_prompt, map_keymap_internal, map_keymap, store_in_keymap)
(Fcopy_keymap): Handle embedded parents.
(Fcommand_remapping, define_as_prefix): Simplify.
(Fkey_binding): Simplify.
(syms_of_keymap): Move minibuffer-local-completion-map,
minibuffer-local-filename-completion-map,
minibuffer-local-must-match-map, and
minibuffer-local-filename-must-match-map to Elisp.
(syms_of_keymap): Defsubr make-composed-keymap.
* src/keyboard.c (menu_bar_items): Use map_keymap_canonical.
(parse_menu_item): Trivial simplification.
* lisp/subr.el (remq): Don't allocate if it's not needed.
(keymap--menu-item-binding, keymap--menu-item-with-binding)
(keymap--merge-bindings): New functions.
(keymap-canonicalize): Use them to refine the canonicalization.
* lisp/minibuffer.el (minibuffer-local-completion-map)
(minibuffer-local-must-match-map): Move initialization from C.
(minibuffer-local-filename-completion-map): Move initialization from C;
don't inherit from anything here.
(minibuffer-local-filename-must-match-map): Make obsolete.
(completing-read-default): Use make-composed-keymap to combine
minibuffer-local-filename-completion-map with either
minibuffer-local-must-match-map or
minibuffer-local-filename-completion-map.
2011-07-02 00:27:41 -04:00
..
charsets Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
e * term.el (term-handle-ansi-escape): Add comments with the 2009-08-07 07:04:02 +00:00
gnus Remove arch-tags from all files, since these are no longer needed. 2010-09-02 00:55:51 +00:00
images newsticker: Added README to etc/newsticker/images 2011-05-14 20:39:26 +02:00
nxml Nuke arch-tags. 2011-01-15 15:16:57 -08:00
refcards Redo spelling of Makefile variables to conform to POSIX. 2011-01-27 17:51:41 -08:00
schema Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
srecode Fix typos. 2011-03-06 03:43:19 +01:00
themes Print theme summaries in *Custom Themes* buffer. 2011-06-14 01:06:26 -04:00
tutorials Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
.gitignore Nuke arch-tags. 2011-01-15 15:16:57 -08:00
AUTHORS Release logs for 23.3 release. 2011-02-28 22:29:00 -05:00
celibacy.1
CENSORSHIP
ChangeLog CC Mode: New "guessing" of style. 2011-07-01 09:54:39 +00:00
compilation.txt Fix last change. 2011-05-08 21:25:35 -04:00
condom.1
CONTRIBUTE * etc/CONTRIBUTE: Recommend bug-gnu-emacs for patches. 2011-04-16 19:30:56 -07:00
COOKIES
COPYING Change to GPLv3. 2007-07-25 07:00:38 +00:00
copying.paper
DEBUG Implement debug-on-event 2011-04-26 04:26:05 -07:00
DEVEL.HUMOR Fix typo. 2008-01-22 15:28:56 +00:00
DISTRIB Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
echo.msg
edt-user.el Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
emacs2.py Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
emacs3.py Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
emacs-buffer.gdb Revert incorrect change to copyright years. 2011-04-22 19:15:03 -07:00
emacs.desktop * emacs.desktop (Icon): Update icon name. 2008-01-03 07:35:42 +00:00
emacs.icon
emacs.py Nuke arch-tags. 2011-01-15 15:16:57 -08:00
enriched.doc Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
ERC-NEWS Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
ETAGS.EBNF Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
ETAGS.README Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
forms-d2.dat Move here from ../lisp 2008-04-26 02:39:10 +00:00
FTP
future-bug
GNU Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
GNUS-NEWS Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
gnus-tut.txt Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
grep.txt Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
HELLO Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
INTERVIEW
JOKES
LINUX-GNU
MACHINES Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
MAILINGLISTS Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
MH-E-NEWS fix many doubled-word typos 2011-05-10 15:57:12 +02:00
MORE.STUFF Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
MOTIVATION
NEWS Add multiple inheritance to keymaps. 2011-07-02 00:27:41 -04:00
NEWS.1-17 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
NEWS.18 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
NEWS.19 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
NEWS.20 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
NEWS.21 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
NEWS.22 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
NEWS.23 Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org. 2011-05-04 21:00:38 -07:00
NEXTSTEP Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
NXML-NEWS American English spelling fix. 2008-06-27 07:34:53 +00:00
ORDERS Update some URLs. 2009-12-15 03:12:44 +00:00
PROBLEMS fix many doubled-word typos 2011-05-10 15:57:12 +02:00
ps-prin0.ps Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
ps-prin1.ps Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
README Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
rgb.txt
SERVICE Nuke arch-tags. 2011-01-15 15:16:57 -08:00
ses-example.ses Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
sex.6
spook.lines
TERMS Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
THE-GNU-PROJECT Fix typo. 2007-09-21 22:50:37 +00:00
TODO * etc/TODO: Remove some things that got to-done. 2011-06-29 19:56:12 -07:00
WHY-FREE
yow.lines

This directory contains the architecture-independent files used by or
with Emacs.  This includes some text files of documentation for GNU
Emacs or of interest to Emacs users, and the file of dumped docstrings
for Emacs functions and variables.

`forms-d2.dat' is an example data file used by forms-d2.el.

COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES

File: emacs.icon
  Author: Sun Microsystems, Inc
  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)