Mercurial > emacs
changeset 83414:14a4eb789b45
Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 19 Dec 2005 19:57:22 +0000 |
| parents | e26e2265dcc6 (diff) 1c477099d3ac (current diff) |
| children | d2c799f58129 |
| files | admin/FOR-RELEASE etc/TODO lisp/ChangeLog lisp/bindings.el lisp/faces.el lisp/files.el lisp/font-lock.el lisp/frame.el lisp/international/mule.el lisp/isearch.el lisp/net/newsticker.el lisp/progmodes/gdb-ui.el lisp/recentf.el lisp/simple.el lisp/startup.el lisp/subr.el lisp/vc.el lispref/ChangeLog man/ChangeLog src/.gdbinit src/alloc.c src/coding.c src/fileio.c src/fns.c src/keyboard.c src/keymap.c src/lisp.h src/minibuf.c src/print.c src/xdisp.c src/xfns.c src/xmenu.c |
| diffstat | 116 files changed, 10071 insertions(+), 6329 deletions(-) [+] |
line wrap: on
line diff
--- a/README Sat Dec 17 21:41:34 2005 +0000 +++ b/README Mon Dec 19 19:57:22 2005 +0000 @@ -1,4 +1,4 @@ -This directory tree holds version 22.0.50 of GNU Emacs, the extensible, +This directory tree holds version 22.0.51 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. You may encounter bugs in this release. If you do, please report
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.multi-tty Mon Dec 19 19:57:22 2005 +0000 @@ -0,0 +1,1300 @@ + -*- coding: utf-8; mode: text; -*- +GOAL +---- + +This branch implements support for opening multiple, different tty +devices and simultaneous X and tty frames from a single Emacs session. + +Some use cases: +Emacs is notoriously slow at startup, so most people use another +editor or emacsclient for quick editing jobs from the console. +Unfortunately, emacsclient was very awkward to use, because it did not +support opening a new Emacs frame on the current virtual console. +Now, with multi-tty support, it can do that. (Emacsclient starts up +faster than vi!) + +Some Gnus users (including me) run Gnus in an X frame in its own Emacs +instance, which they typically leave running for weeks. It would be +nice if they could connect to this instance from a remote ssh session +and check their messages without opening a remote X frame or resorting +to gnus-slave. + +WHO IS DOING IT +--------------- + +I'm Károly Lőrentey. My address: lorentey@elte.hu. + +Comments, bug reports, suggestions and patches are welcome; send them +to multi-tty@lists.fnord.hu. + +The following is a (sadly incomplete) list of people who have +contributed to the project by testing, submitting patches, bug +reports, and suggestions. Thanks! + +Bernard Adrian <bernadrian@free.fr> +ARISAWA Akihiro <ari@mbf.ocn.ne.jp> +Vincent Bernat <bernat@luffy.cx> +Han Boetes <han@mijncomputer.nl> +Francisco Borges <borges@let.rug.nl> +Damien Cassou <damien.cassou@laposte.net> +Robert J. Chassell <bob@rattlesnake.com> +Romain Francoise <romain@orebokech.com> +Ami Fischman <ami@fischman.org> +Friedrich Delgado Friedrichs <friedel@nomaden.org> +IRIE Tetsuya <irie@t.email.ne.jp> +Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> +Bas Kok <nekkobassu@yahoo.com> +Jurej Kubelka <Juraj.Kubelka@email.cz> +David Lichteblau <david@lichteblau.com> +Xavier Mallard <zedek@gnu-rox.org> +Istvan Marko <mi-mtty@kismala.com> +Ted Morse <morse@ciholas.com> +Gergely Nagy <algernon@debian.org> +Dan Nicolaescu <dann@ics.uci.edu> +Kalle Olavi Niemitalo <kon@iki.fi> +Mark Plaksin <happy@mcplaksin.org> +Frank Ruell <stoerte@dreamwarrior.net> +Tom Schutzer-Weissmann <trmsw@yahoo.co.uk> +Dan Waber <dwaber@logolalia.com> +and many others. + +Richard Stallman was kind enough to review an earlier version of my +patches. + + +MAILING LISTS +------------- + +The multi-tty mailing list (discussion & bug reports): + + Address: multi-tty@lists.fnord.hu + Signup: http://lists.fnord.hu/mailman/listinfo/multi-tty + Archive: http://news.gmane.org/gmane.emacs.multi-tty/ + +Commit notifications (read-only): + + Address: multi-tty-commits@lists.fnord.hu + Signup: http://lists.fnord.hu/mailman/listinfo/multi-tty-commits + + +STATUS +------ + +The branch is now very stable and almost full-featured. All of the +major problems have been fixed, only a few minor issues remain. (It +still needs to be ported to Windows/Mac/DOS, though.) Both multiple +tty device support and simultaneous X and tty frame support works +fine. Emacsclient has been extended to support opening new tty and X +frames. It has been changed open new Emacs frames by default. + +The multi-tty branch has been scheduled for inclusion in the next +major release of Emacs (version 23). I expect the merge into the +development trunk to occur sometime during next year (2005), after the +merge of the Unicode branch. + +Tested on GNU/Linux, Solaris 8, FreeBSD and OpenBSD. Please let me +know if you succeed or fail to use it on other platforms---I'll have a +few tricky test cases for you. + +Known problems: + + * GTK support. If you compile your Emacs with the GTK + toolkit, some functionality of multi-tty will be lost. In + particular, you will not be able to work on multiple X + displays at once. Current releases of GTK have limitations + and bugs that prevent full-blown multi-display support in + Emacs. (GTK crashes when Emacs tries to disconnect from an + X server.) Use the Lucid toolkit if you want to see a + complete feature set. + + * The single-kboard mode. + + If your multi-tty Emacs session seems to be frozen, you + probably have a recursive editing session or a pending + minibuffer prompt (which is a kind of recursive editing) on + another display. To unfreeze your session, switch to that + display and complete the recursive edit, for example by + pressing C-] (`abort-recursive-edit'). + + I am sorry to say that currently there is no way to break + out of this "single-kboard mode" from a frozen display. If + you are unable to switch to the display that locks the + others (for example because it is on a remote computer), + then you can use emacsclient to break out of all recursive + editing sessions: + + emacsclient -e '(top-level)' + + Note that this (perhaps) unintuitive behaviour is by design. + Single-kboard mode is required because of an intrinsic Emacs + limitation that is very hard to eliminate. (This limitation + is related to the single-threaded nature of Emacs.) + + I plan to implement better user notification and support for + breaking out of single-kboard mode from locked displays. + + * Mac, Windows and DOS support is broken, doesn't even + compile. Multiple display support will probably not provide + new Emacs features on these systems, but the multi-tty + branch changed a few low-level interfaces, and the + system-dependent source files need to be adapted + accordingly. The changes are mostly trivial, so almost + anyone can help, if only by compiling the branch and + reporting the compiler errors. (It is not worth to do this + yet, though.) + + +HOW TO GET THE BRANCH +--------------------- + +The branch uses GNU Arch (http://www.gnuarch.org) for version control. + +Retrieving the latest version of the branch: + + tla register-archive -f http://lorentey.hu/arch/2004/ + tla get lorentey@elte.hu--2004/emacs--multi-tty <directory> + +This incantation uses my private archive mirror that is hosted on a +relatively low-bandwidth site; if you are outside Hungary, you will +probably want to you use my secondary mirror: (Note that the -f option +will overwrite the archive location if you have previously registered +the Hungarian one.) + + tla register-archive -f http://aszt.inf.elte.hu/~lorentey/mirror/arch/2004 + tla get lorentey@elte.hu--2004/emacs--multi-tty <directory> + + http://aszt.inf.elte.hu/~lorentey/mirror/arch/2004 + +The Arch supermirror provides mirroring services for all public Arch +repositories. We have a mirror there, too, if you prefer. + + tla register-archive -f http://mirrors.sourcecontrol.net/lorentey%40elte.hu--2004 + tla get lorentey@elte.hu--2004/emacs--multi-tty <directory> + +My GPG key id is 0FB27A3F; it is available from +hkp://wwwkeys.eu.pgp.net/, or from my homepage at +http://lorentey.hu/rolam/gpg.html) + +Don't worry if the above checkout takes a few minutes to complete; +once you have a source tree, updating it to the latest revision will +be _much_ faster. Use the following command for the update: + + tla replay + +You can find more information about Arch on http://wiki.gnuarch.org/. +It's a wonderful source control system, I highly recommend it. + +If you don't have tla, the branch has a homepage from which you can +download conventional patches against Emacs CVS HEAD: + + http://lorentey.hu/project/emacs.html + +DEBIAN PACKAGES +--------------- + +If you run Debian, or a distribution based on Debian, you are welcome +to use our binary packages; put these lines in your /etc/apt/sources.list: + + # Multi-tty Emacs + deb http://aszt.inf.elte.hu/~lorentey/mirror/apt unstable multi-tty + deb-src http://aszt.inf.elte.hu/~lorentey/mirror/apt unstable multi-tty + +Note that these packages are intended solely to provide an easy way to +test the new multi-tty features. They are not to be taken as Emacs +releases, and it's a mistake to expect robust operation or any kind of +timely support for them. Do not install them, unless you'd like to +have your editor crash on you. + + +COMPILATION +----------- + +The multi-tty branch is compiled the same way as Emacs itself: + + make maintainer-clean # (If you have compiled Emacs before) + + ./configure --without-gtk <your favourite options> + make bootstrap + make install + +If you have strange compilation errors, they may be caused by old +*.elc files that are left over from an earlier bootstrap. The `make +maintainer-clean' target deletes them, so it is a good idea to run +that before reporting a bug. (Emacs requires a clean recompilation +after certain kinds of source code changes.) + +TESTING +------- + +To test the multi-tty branch, start up the Emacs server with the +following commands: + + emacs + M-x server-start + +and then (from a shell prompt on another terminal) start emacsclient +with + emacsclient -t /optional/file/names... (for a tty frame) + emacsclient /optional/file/names... (for an X frame) + +(Make sure both emacs and emacsclient are multi-tty versions.) +You'll hopefully have two fully working, independent frames on +separate terminals. The new frame is closed automatically when you +finish editing the specified files (C-x #), but delete-frame (C-x 5 0) +also works. Of course, you can create frames on more than two tty +devices. + +Creating new frames on the same tty with C-x 5 2 works, and they +behave the same way as in previous Emacs versions. If you exit emacs, +all terminals should be restored to their previous states. + +This is work in progress, and probably full of bugs. It is a good +idea to run emacs from gdb, so that you'll have a live instance to +debug if something goes wrong. Please send me your bug reports on our +mailing list: multi-tty@lists.fnord.hu + +TIPS & TRICKS +------------- + +I think the best way to use the new Emacs is to have it running inside +a disconnected GNU screen session, and always use emacsclient for +normal work. One advantage of this is that not a single keystroke of +your work will be lost if the display device that you are using +crashes, or the network connection times out, or whatever. (I had an +extremely unstable X server for some time while I was developing these +patches, and running Emacs this way has saved me a number of M-x +recover-session invocations.) + +I use the following two bash scripts to handle my Emacs sessions: + +-------------------------------------------------------connect-emacs-- +#!/bin/bash +# Usage: connect-emacs <name> <args>... +# +# Connects to the Emacs instance called NAME. Starts up the instance +# if it is not already running. The rest of the arguments are passed +# to emacsclient. + +name="$1" +shift + +if [ -z "$name" ]; then + echo "Usage: connect_emacs <name> <args>..." >&2 + exit 1 +fi +preload-emacs "$name" wait +/usr/bin/emacsclient.emacs-multi-tty -s "$name" "$@" +---------------------------------------------------------------------- + +-------------------------------------------------------preload-emacs-- +#!/bin/bash +# Usage: preload-emacs <name> [<waitp>] +# +# Preloads the Emacs instance called NAME in a detached screen +# session. Does nothing if the instance is already running. If WAITP +# is non-empty, the function waits until the server starts up and +# creates its socket; otherwise it returns immediately. + +name="$1" +waitp="$2" +screendir="/var/run/screen/S-$USER" +serverdir="/tmp/emacs$UID" +emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs + +if [ -z "$name" ]; then + echo "Usage: preload_emacs <name> [<waitp>]" >&2 + exit 1 +fi + +if [ ! -e "$screendir"/*."$name" ]; then + if [ -e "$serverdir/$name" ]; then + # Delete leftover socket (for the wait option) + rm "$serverdir/$name" + fi + screen -dmS "$name" "$emacs" -nw --eval "(setq server-name \"$name\")" -f server-start +fi +if [ ! -z "$waitp" ]; then + while [ ! -e "$serverdir/$name" ]; do sleep 0.1; done +fi +---------------------------------------------------------------------- + +I have the following in my profile to have two instances automatically +preloaded for editing and email: + + preload-emacs editor + preload-emacs gnus + +It is useful to set up short aliases for connect-emacs. I use the +following: + + alias edit="connect-emacs editor" + alias e=edit + alias et="connect-emacs editor -t" + alias gnus="connect-emacs gnus" + + +CHANGELOG +--------- + +See arch logs. + + +NEWS +---- + +For the NEWS file: (Needs much, much work) + +** Support for multiple terminal devices has been added. + +*** You can specify a terminal device (`tty' parameter) and a terminal + type (`tty-type' parameter) to `make-terminal-frame'. + +*** You can test for the presence of multiple terminal support by + testing for the `multi-tty' feature. + +*** Emacsclient has been extended to support opening a new terminal + frame. Its behaviour has been changed to open a new Emacs frame by + default. Use the -c option to get the old behavior of opening + files in the currently selected Emacs frame. + +*** A make-frame-on-tty function has been added to make it easier to + create frames on new terminals. + +*** New functions: frame-tty-name, frame-tty-type, delete-tty, + terminal-local-value, set-terminal-local-value + + terminal-id, terminal-parameters, terminal-parameter, + set-terminal-parameter + +*** New variables: global-key-translation-map + +*** The keymaps key-translation-map and function-key-map are now + terminal-local. + +** Support for simultaneous graphical and terminal frames has been + added. + +*** The function `make-frame-on-display' now works during a terminal + session, and `make-frame-on-tty' works during a graphical session. + +*** The `window-system' variable has been made frame-local. + +*** The new `initial-window-system' variable contains the + `window-system' value for the first frame. + +*** talk.el has been extended for multiple tty support. + + +* * * + +(The rest of this file consists of my development notes and as such it +is probably not very interesting for anyone else.) + +THINGS TO DO +------------ + +** Emacs crashes when a tty frame is resized so that there is no space + for all its windows. (Tom Schutzer-Weissmann) + +** Report GTK multi-display problems to GTK maintainers. For extra + credit, fix them. + + Currently you can not connect to new X displays when you compile + Emacs with GTK support. If you want to play around with GTK + multidisplay (and don't mind core dumps), you can edit src/config.h + and define HAVE_GTK_MULTIDISPLAY there by hand. + +** Audit `face-valid-attribute-values' usage in customize and + elsewhere. Its return value depends on the current window system. + Replace static initializers using it with runtime functions. For + example, custom's buttons are broken on non-initial device types. + +** Possibly turn off the double C-g feature when there is an X frame. + C.f. (emacs)Emergency Escape. + +** frames-on-display-list should also accept frames. + +** I smell something funny around pop_kboard's "deleted kboard" case. + Determine what are the circumstances of this case, and fix any + bug that comes to light. + +** Consider the `tty-type' frame parameter and the `display-tty-type' + function. They serve the exact same purpose. I think it may be + a good idea to eliminate one of them, preferably `tty-type'. + +** The handling of lisp/term/*.el, and frame creation in general, is a + big, big mess. How come the terminal-specific file is loaded by + tty-create-frame-with-faces? I don't think it is necessary to load + these files for each frame; once per terminal should be enough. + Update: lisp/term/*.el is not loaded repeatedly anymore, but + faces.el still needs to be cleaned up. + +** Fix frame-set-background-mode in this branch. It was recently + changed in CVS, and frame.el in multi-tty has not yet been adapted + for the changes. (It needs to look at + default-frame-background-mode.) (Update: maybe it is fixed now; + needs testing.) + +** I think `(set-)terminal-local-value' and the terminal parameter + mechanism should be integrated into a single framework. + +** Add the following hooks: after-delete-frame-hook (for server.el, + instead of delete-frame-functions), + after-delete-terminal-functions, after-create-terminal-functions. + +** Fix set-input-mode for multi-tty. It's a truly horrible interface; + what if we'd blow it up into several separate functions (with a + compatibility definition)? + +** BULK RENAME: The `display-' prefix of new Lisp-level functions + conflicts with stuff like `display-time-mode'. Use `device-' + or `terminal-' instead. I think I prefer `terminal-'. + + It turns out that most of the offending Lisp functions were defined + in the trunk. Therefore, compatibility aliases should be defined + for the following names: + + display-color-cells terminal-color-cells + display-color-p terminal-color-p + display-graphic-p terminal-graphic-p + display-grayscale-p terminal-grayscale-p + display-images-p terminal-images-p + display-mm-height terminal-mm-height + display-mm-width terminal-mm-width + display-mouse-p terminal-mouse-p + display-multi-font-p terminal-multi-font-p + display-multi-frame-p terminal-multi-frame-p + display-pixel-height terminal-pixel-height + display-pixel-width terminal-pixel-width + display-pixels-per-inch terminal-pixels-per-inch + display-planes terminal-planes + display-popup-menus-p terminal-popup-menus-p + display-save-under terminal-save-under + display-screens terminal-screens + display-supports-face-attributes-p terminal-supports-face-attributes-p + display-visual-class terminal-visual-class + framep-on-display framep-on-terminal + frames-on-display-list frames-on-terminal-list + + The following functions were introduced in the multi-tty branch, and + can be renamed without aliases: + + display-controlling-tty-p terminal-controlling-tty-p + display-list terminal-list + display-live-p terminal-live-p + display-name terminal-name + display-tty-type terminal-tty-type + frame-display terminal-of-frame + delete-display delete-terminal + +** The single-keyboard mode of MULTI_KBOARD is extremely confusing + sometimes; Emacs does not respond to stimuli from other keyboards. + At least a beep or a message would be important, if the single-mode + is still required to prevent interference. (Reported by Dan + Nicolaescu.) + + Update: selecting a region with the mouse enables single_kboard + under X. This is very confusing. + + Update: After discussions with Richard Stallman, this will be + resolved by having locked displays warn the user to wait, and + introducing a complex protocol to remotely bail out of + single-kboard mode by pressing C-g. + + Update: Warning the user is not trivial to implement, as Emacs has + only one echo area, shared by all frames. Ideally the warning + should not be displayed on the display that is locking the others. + Perhaps the high probability of user confusion caused by + single_kboard mode deserves a special case in the display code. + Alternatively, it might be good enough to signal single_kboard mode + by changing the modelines or some other frame-local display element + on the locked out displays. + +** The session management module is prone to crashes when the X + connection is closed and then later I try to connect to a new X + session: + + #0 0xb7ebc806 in SmcGetIceConnection () from /usr/X11R6/lib/libSM.so.6 + #1 0x080e6641 in x_session_check_input (bufp=0xbf86c9c0) at xsmfns.c:144 + #2 0x080d3bbc in XTread_socket (device=0xa722ff8, expected=1, hold_quit=0xbf86ca90) at xterm.c:7037 + #3 0x080fa404 in read_avail_input (expected=1) at keyboard.c:6696 + #4 0x080fa4ca in handle_async_input () at keyboard.c:6900 + #5 0x080d51fa in x_term_init (display_name=162628899, xrm_option=0x0, resource_name=0x857068c "emacs") at xterm.c:10622 + #6 0x080d920e in x_display_info_for_name (name=162628899) at xfns.c:3975 + #7 0x080d92f9 in check_x_display_info (object=1) at xfns.c:274 + #8 0x080d97b8 in Fx_create_frame (parms=151221485) at xfns.c:3016 + #9 0x0815bf72 in Ffuncall (nargs=2, args=0xbf86ceec) at eval.c:2851 + + I installed a workaround to prevent this. The X session manager is + only contacted when the very first display in the Emacs session is + an X display. Also, x_delete_display() on this display aborts + session management, and XTread_socket only calls + x_session_check_input when it is called for the display that the + session was opened on. While this does not really fix the bug, it + makes it much less frequent, because session manager support will + not normally be enabled when Emacs can survive the shutdown of the + X server. + + See if xsmfns.c should be updated. + +** Hunt down display-related functions in frame.el and extend them all + to accept display ids. + +** rif->flush_display_optional (NULL) calls should be replaced by a + new global function. + +** The set-locale-environment hack (adding the DISPLAY option) should + be replaced with a clean design. + +** standard-display-table should be display-local. + standard-display-european should be display-local. + +** With iswitchb-default-method set to 'always-frame, only frames on + the current display should be considered. This might involve + extending `get-buffer-window'. + +** Have a look at Vlocale_coding_system. Seems like it would be a + tedious job to localize it, although most references use it for + interfacing with libc and are therefore OK with the global + definition. + + Exceptions found so far: x-select-text and + x-cut-buffer-or-selection-value. + +** Have a look at fatal_error_hook. + +** Have a look at set_frame_matrix_frame. + +** Check if we got term-setup-hook right. + +** I think tip_frame should be display-local. + +** Check display reference count handling in x_create_tip_frame. + +** make-frame does not correctly handle extra parameters in its + argument: + + (frame-parameter (make-frame (list (cons 'foobar 42))) 'foobar) + => nil + + (This is likely an error in the CVS trunk.) + +** Dan Nicolaescu suggests that -nw should be added as an alias for -t + in emacsclient. Good idea. (Alas, implementing this is not + trivial, getopt_long does not seem to support two-letter ``short'' + options. Patches are welcome.) + +** Mark Plaksin suggests that emacsclient should accept the same + X-related command-line arguments as Emacs. Most of the X-related + argument-handling is done in Lisp, so this should be quite easy to + implement. + +** Gergely Nagy suggests that C-x # should only kill the current + frame, not any other emacsclient frame that may have the same file + opened for editing. I think I agree with him. + +** Very strange bug: visible-bell does not work on secondary + terminals in xterm and konsole. The screen does flicker a bit, + but it's so quick it isn't noticable. + +** Move baud_rate to struct display. + +** Implement support for starting an interactive Emacs session without + an initial frame. (The user would connect to it and open frames + later, with emacsclient.) + +** Fix Mac support (I can't do this entirely myself). Note that the + current state of Mac-specific source files in the multi-tty tree + are not useful; before starting work on Mac support, revert to + pristine, pre-multi-tty versions. + +** Fix W32 support (I can't do this entirely myself). Note that the + current state of W32-specific source files in the multi-tty tree + are not useful; before starting work on W32 support, revert to + pristine, pre-multi-tty versions. + +** Fix DOS support (I can't do this entirely myself). Note that the + current state of DOS-specific source files in the multi-tty tree + are not useful; before starting work on DOS support, revert to + pristine, pre-multi-tty versions. + +** Do a grep on XXX and ?? for more issues. + +** Understand Emacs's low-level input system (it's black magic) :-) + What exactly does interrupt_input do? I tried to disable it for + raw secondary tty support, but it does not seem to do anything + useful. (Update: Look again. X unconditionally enables this, maybe + that's why raw terminal support is broken again. I really do need + to understand input.) + (Update: I am starting to understand the read_key_sequence->read-char + ->kbd_buffer_get_event->read_avail_input->read_socket_hook path. Yay!) + +** flow-ctrl.el must be updated. + +** Fix stuff_char for multi-tty. Doesn't seem to be of high priority. + +DIARY OF CHANGES +---------------- + +(ex-TODO items with explanations.) + +-- Introduce a new struct for terminal devices. + + (Done, see struct tty_output. The list of members is not yet + complete.) + +-- Change the bootstrap procedure to initialize tty_list. + + (Done, but needs review.) + +-- Change make-terminal-frame to support specifying another tty. + + (Done, new frame parameters: `tty' and `tty-type'.) + +-- Implement support for reading from multiple terminals. + + (Done, read_avail_input tries to read from each terminal, until one + succeeds. MULTI_KBOARD is not used. Secondary terminals don't send + SIGIO!) + + (Update: They do, now.) + + (Update2: After enabling X, they don't.) + +-- other-frame should cycle through the frames on the `current' + terminal only. + + (Done, by trivially modifiying next_frame and prev_frame.) + +-- Support different terminal sizes. + + (Done, no problem.) + +-- Make sure terminal resizes are handled gracefully. (Could be + problematic.) + + (Done. We don't get automatic SIGWINCH for additional ttys, + though.) + +-- Extend emacsclient to automatically open a new tty when it connects + to Emacs. + + (Done. It's an ugly hack, needs more work.) + +-- Redisplay must refresh the topmost frame on *all* terminals, not + just the initial terminal. + + (Done, but introduced an ugly redisplay problems. Ugh.) + +-- Fix redisplay problems. + + (Done; it turned out that the entire Wcm structure must be moved + inside tty_output. Why didn't I catch this earlier?) + +-- Provide a way for emacsclient to tell Emacs that the tty has been + resized. + + (Done, simply forward the SIGWINCH signal.) + +-- Each keypress should automatically select the frame corresponding + to the terminal that it was coming from. This means that Emacs + must know from which terminal the last keyboard event came from. + + (Done, it was quite simple, the input event system already + supported multiple frames.) + +-- Fix SIGIO issue with secondary terminals. + + (Done, emacsclient signals Emacs after writing to the proxy pseudo + terminal. Note that this means that multi-tty does not work with + raw ttys!) + + (Update: This is bullshit. There is a read_input_waiting function, + extend that somehow.) + + (Update of update: The first update was not right either, extending + read_input_waiting was not necessary. Secondary ttys do seem to + send signals on input.) + + (Update^3: Not any more.) + +-- Make make-terminal-frame look up the `tty' and `tty-type' frame + parameters from the currently selected terminal before the global + default. + + (Done.) + +-- Put all cached terminal escape sequences into struct tty_output. + Currently, they are still stored in global variables, so we don't + really support multiple terminal types. + + (Done. It was not fun.) + +-- Implement sane error handling after initialization. (Currently + emacs exits if you specify a bad terminal type.) The helpful error + messages must still be provided when Emacs starts. + + (Done.) + +-- Implement terminal deletion, i.e., deleting local frames, closing + the tty device and restoring its previous state without exiting + Emacs. + + (Done, but at the moment only called when an error happens during + initialization. There is a memory corruption error around this + somewhere.) (Update: now it is fully enabled.) + +-- Implement automatic deletion of terminals when the last frame on + that terminal is closed. + + (Done.) + +-- Restore tty screen after closing the terminal. + + (Done, we do the same as Emacs 21.2 for all terminals.) + +-- 'TERM=dumb src/emacs' does not restore the terminal state. + + (Done.) + +-- C-g should work on secondary terminals. + + (Done, but the binding is not configurable.) + +-- Deal with SIGHUP in Emacs and in emacsclient. (After this, the + server-frames may be removed from server.el.) + + (Done, nothing to do. It seems that Emacs does not receive SIGHUP + from secondary ttys, which is actually a good thing.) (Update: I + think it would be a bad idea to remove server-frames.) + +-- Change emacsclient/server.el to support the -t argument better, + i.e. automatically close the socket when the frame is closed. + + (Seems to be working OK.) + +-- Fix mysterious memory corruption error with tty deletion. To + trigger it, try the following shell command: + + while true; do TERM=no-such-terminal-definition emacsclient -h; done + + Emacs usually dumps core after a few dozen iterations. (The bug + seems to be related to the xfreeing or bzeroing of + tty_output.Wcm. Maybe there are outside references to struct Wcm? + Why were these vars collected into a struct before multi-tty + support?) + + (Done. Whew. It turned out that the problem had nothing to do + with hypothetical external references to Wcm, or any other + tty_output component; it was simply that delete_tty closed the + filehandles of secondary ttys twice, resulting in fclose doubly + freeing memory. Utterly trivial matter. I love the C's memory + management, it puts hair on your chest.) + +-- Support raw secondary terminals. (Note that SIGIO works only on + the controlling terminal.) Hint: extend read_input_waiting for + multiple ttys and hopefully this will be fixed. + + (Done, it seems to have been working already for some time. It + seems F_SETOWN does work, after all. Not sure what made it fail + earlier, but it seems to be fixed (there were several changes + around request_sigio, maybe one of them did it). + read_input_waiting is only used in sys_select, don't change + it.) (Update: After adding X support, it's broken again.) + (Update^2: No it isn't.) :-) + +-- Find out why does Emacs abort when it wants to close its + controlling tty. Hint: chan_process[] array. Hey, maybe + noninterrupt-IO would work, too? Update: no, there is no process + for stdin/out. + + (Done. Added add/delete_keyboard_wait_descriptor to + term_init/delete_tty. The hint was right, in a way.) + +-- Issue with SIGIO: it needs to be disabled during redisplay. See if + fcntl kernel behaviour could be emulated by emacsclient. + + (Done. Simply disabled the SIGIO emulation hack in emacsclient.) + (Update: it was added back.) (Update^2: and removed again.) + +-- server.el: There are issues with saving files in buffers of closed + clients. Try editing a file with emacsclient -f, and (without + saving it) do a delete-frame. The frame is closed without + question, and a surprising confirmation prompt appears in another + frame. + + (Done. delete-frame now asks for confirmation if it still has + pending buffers, and modified buffers don't seem to be deleted.) + +-- emacsclient.el, server.el: Handle eval or file open errors when + doing -t. + + (Done.) + +-- Make parts of struct tty_output accessible from Lisp. The device + name and the type is sufficient. + + (Done, see frame-tty-name and frame-tty-type.) + +-- Export delete_tty to the Lisp environment, for emacsclient. + + (Done, see delete-tty.) + +-- Get rid of the accessor macros in termchar.h, or define macros for + all members. + + (Done.) + +-- Move device-specific parameters (like costs) commonly used by + device backends to a common, device-dependent structure. + + (Done. See struct display_method in termhooks.h.) + +-- Fix X support. + + (Done. Well, it seems to be working.) + +-- Allow simultaneous X and tty frames. (Handling input could be + tricky. Or maybe not.) + + (Done. Allowed, that is. It is currently extremely unstable, to + the point of being unusable. The rif variable causes constant + core dumps. Handling input is indeed tricky.) + +-- Rewrite multi-tty input in terms of MULTI_KBOARD. + + (Done. In fact, there was no need to rewrite anything, I just + added a kboard member to tty_display_info, and initialized the + frame's kboard from there.) + +-- Fix rif issue with X-tty combo sessions. IMHO the best thing to do + is to get rid of that global variable (and use the value value in + display_method, which is guaranteed to be correct). + + (Done, did exactly that. Core dumps during combo sessions became + much rarer. In fact, I have not yet met a single one.) + +-- Add multi-tty support to talk.el. + + (Done.) + +-- Clean up the source of emacsclient. It is a mess. + + (Done, eliminated stupid proxy-pty kludge.) + +-- Fix faces on tty frames during X-tty combo sessions. There is an + init_frame_faces call in init_sys_modes, see if there is a problem + with it. + + (Done, there was a stupid mistake in + Ftty_supports_face_attributes_p. Colors are broken, though.) + +-- C-x 5 2, C-x 5 o, C-x 5 0 on an emacsclient frame unexpectedly + exits emacsclient. This is a result of trying to be clever with + delete-frame-functions. + + (Fixed, added delete-tty-after-functions, and changed server.el to + use it.) + +-- Something with (maybe) multi-keyboard support broke function keys + and arrows on ttys during X+tty combo sessions. Debug this. + + (I can't reproduce it, maybe the terminal type was wrong.) + +-- Fix input from raw ttys (again). + + (Now it seems to work all right.) + +-- During an X-tty combo session, a (message "Hello") from a tty frame + goes to the X frame. Fix this. + + (Done. There was a safeguard against writing to the initial + terminal frame during bootstrap which prevented echo_area_display + from working correctly on a tty frame during a combo session.) + +-- If there are no frames on its controlling terminal, Emacs should + exit if the user presses C-c there. + + (Done, as far as possible. See the SIGTERM comment in + interrupt_signal on why this seems to be impossible to solve this + in general.) + +-- During an X session, Emacs seems to read from stdin. Also, Emacs + fails to start without a controlling tty. + + (Fixed by replacing the troublesome termcap display with a dummy + bootstrap display during bootstrap. + +-- Do tty output through struct display, like graphical display + backends. + + (Done.) + +-- Define an output_initial value for output_method for the initial + frame that is dumped with Emacs. Checking for this frame (e.g. in + cmd_error_internal) is ugly. + + (Done, breaking interactive temacs.) + +-- The command `emacsclient -t -e '(delete-frame)'' fails to exit. + + (Fixed.) + +-- frame-creation-function should always create a frame that is on the + same display as the selected frame. Maybe frame-creation-function + should simply be removed and make-frame changed to do the right + thing. + + (Done, with a nice hack. frame-creation-function is now frame-local.) + +-- Fix C-g on raw ttys. + + (Done. I disabled the interrupt/quit keys on all secondary + terminals, so Emacs sees C-g as normal input. This looks like an + overkill, because emacsclient has extra code to pass SIGINT to + Emacs, so C-g should remain the interrupt/quit key on emacsclient + frames. See the next entry why implementing this distinction would + be a bad idea.) + +-- Make sure C-g goes to the right frame with ttys. This is hard, as + SIGINT doesn't have a tty parameter. :-( + + (Done, the previous change fixes this as a pleasant side effect.) + +-- I have seen a case when Emacs with multiple ttys fell into a loop + eating 100% of CPU time. Strace showed this loop: + + getpid() = 30284 + kill(30284, SIGIO) = 0 + --- SIGIO (I/O possible) @ 0 (0) --- + ioctl(6, FIONREAD, [0]) = -1 EIO (Input/output error) + ioctl(5, FIONREAD, [0]) = -1 EIO (Input/output error) + ioctl(0, FIONREAD, [0]) = 0 + sigreturn() = ? (mask now []) + gettimeofday({1072842297, 747760}, NULL) = 0 + gettimeofday({1072842297, 747806}, NULL) = 0 + select(9, [0 3 5 6], NULL, NULL, {0, 0}) = 2 (in [5 6], left {0, 0}) + select(9, [0 3 5 6], NULL, NULL, {0, 0}) = 2 (in [5 6], left {0, 0}) + gettimeofday({1072842297, 748245}, NULL) = 0 + + I have seen something similar with a single X frame, but have not + been able to reproduce it for debugging. + + Update: This may have been caused by checking for nread != 0 + instead of nread > 0 after calling read_socket_hook in + read_avail_input. + + (Fixed. This was caused by unconditionally including stdin in + input_wait_mask in init_process. The select call in + wait_reading_process_input always returned immediately, indicating + that there is pending input from stdin, which nobody read. + + Note that the above strace output seems to be an unrelated but + similar bug. I think that is now fixed.) + +-- Exiting Emacs while there are emacsclient frames doesn't restore the + ttys to their default states. + + (This seems to be fixed by some previous change.) + +-- Allow opening an X session after -nw. + + (Done.) + +-- Fix color handling during tty+X combo sessions. (It seems that tty + sessions automatically convert the face colors to terminal colors + when the face is loaded. This conversion must happen instead on + the fly in write_glyphs, which might be problematic, as color + approximation is currently done in lisp (term/tty-colors.el).) + (Update: hm, colors seem to work fine if I start emacs with -nw and + then create an X frame. Maybe it's just a small buglet somewhere.) + + (Seems to be fixed. The problem was in startup.el, it did not + initialize tty colors when the initial window system was + graphical.) + +-- emacs -nw --eval '(y-or-n-p "Foobar")' segfaults. (Reported by + Romain Francoise) + + (Fixed, there was a keyboard initialization problem.) + +-- Fix interactive use of temacs. There are face-related SEGVs, most + likely because of changes in realize_default_face, realize_face. + + (Fixed.) + +-- Don't exit Emacs when the last X connection fails during a + multi-display session. + + (Fixed.) + +-- Dan Nicolaescu noticed that starting emacsclient on the same + terminal device that is the controlling tty of the Emacs process + gives unexpected results. + + (Fixed.) + +-- Istvan Marko reported that Emacs hang on ttys if it was started + from a shell script. + + (Fixed. There was a bug in the multi-tty version of + narrow_foreground_group. tcsetpgrp blocks if it is called from a + process that is not in the same process group as the tty.) + +-- emacsclient -t from an Emacs term buffer does not work, complains + about face problems. This can even lock up Emacs (if the recursive + frame sets single_kboard). Update: the face problems are caused by + bugs in term.el, not in multi-tty. The lockup is caused by + single_kboard mode, and is not easily resolvable. The best thing to + do is to simply refuse to create a tty frame of type `eterm'. + + (Fixed, changed emacsclient to check for TERM=eterm. The face + complaints seem to be caused by bugs in term.el; they are not + related to multi-tty.) + +-- Find out the best way to support suspending Emacs with multiple + ttys. My guess: disable it on the controlling tty, but from other + ttys pass it on to emacsclient somehow. (It is (I hope) trivial to + extend emacsclient to handle suspend/resume. A `kill -STOP' almost + works right now.) + + (Done. I needed to play with signal handling and the server + protocol a bit to make emacsclient behave as a normal UNIX program + wrt foreground/background process groups.) + +-- There is a flicker during the startup of `emacs -nw'; it's as if + the terminal is initialized, reset and then initialialized again. + Debug this. (Hint: narrow_foreground_group is called twice during + startup.) + + (This is gone.) + +-- Robert Chassell has found serious copy-paste bugs with the + multi-tty branch. There seem to be redisplay bugs while copying + from X to a terminal frame. Copying accented characters do not + work for me. + + (Patch-124 should fix this, by changing the interprogram-*-function + variables to be frame-local, as suggested by Mark Plaksin + (thanks!). I think that the redisplay bugs are in fact not bugs, + but delays caused by single_kboard --> perhaps MULTI_KBOARD should + be removed.) + +-- frame-creation-function was removed, which might be a bad idea. + Think up a compatible solution. + + (It was an internal interface that may be changed when necessary.) + +-- Change Lisp code not to (getenv "TERM"); use the `tty-type' frame + parameter or the frame-tty-type function instead. (M-x tags-search + "TERM" helps with this.) Update: Actually, all getenv invocations + should be checked for multi-tty compatibility, and an interface + must be implemented to get the remote client's environment. + + (Done. Only getenv calls in lisp/term/*.el were changed; other + calls should be mostly left as they are.) + +-- Add an elaborate mechanism for display-local variables. (There are + already a few of these; search for `terminal-local' in the Elisp + manual.) + + (Not needed. Display-local variables could be emulated by + frame-local variables.) + +-- Emacs assumes that all terminal frames have the same locale + settings as Emacs itself. This may lead to bogus results in a + multi-locale setup. (E.g., while logging in from a remote client + with a different locale.) + (Update after new bugreport by Friedrich Delgado Friedrichs: + (at least) the structs terminal_coding and keyboard_coding in + coding.c must be moved to struct display, and the Lisp interface + [set-]keyboard-coding-system must be adapted for the change.) + + (Fixed. Emacs now uses the locale settings as seen by the + emacsclient process for server tty frames.) + (Update: Not really; Vlocale_coding_system is still global.) + +-- Make `struct display' accessible to Lisp programs. Accessor functions: + + (displayp OBJECT): Returns t if OBJECT is a display. + => Implemented as display-live-p. + + (display-list): Returns list of currently active displays. + => Implemented. + + (selected-display): Returns the display object of the selected frame. + => Not strictly necessary, but implemented anyway. + + (frame-display FRAME): Returns the display object of FRAME. + => Implemented. + + (display-frames DISPLAY): Returns a list of frames on DISPLAY. + => Already implemented, see frames-on-display-list. + + (display-type DISPLAY): Returns the type of DISPLAY, as a + symbol. (See `framep'.) + => Implemented as display-live-p. + + (display-device DISPLAY): Returns the name of the device that + DISPLAY uses, as a string. (E.g: "/dev/pts/16", or + ":0.0") + => Implemented as display-name. + + etc. + + See next issue why this is necessary. + + (Update: The consensus on emacs-devel seems to be to do this via + integer identifiers. That's fine by me.) + + (Done.) + +-- The following needs to be supported: + + $ emacsclient -t + C-z + $ emacsclient -t + (This fails now.) + + The cleanest way to solve this is to allow multiple displays on the + same terminal device; each new emacsclient process should create + its own display. As displays are currently identified by their + device names, this is not possible until struct display becomes + accessible as a Lisp-level object. + + (Done.) + +-- Miles Bader suggests that C-x C-c on an emacsclient frame should + only close the frame, not exit the entire Emacs session. Update: + see above for a function that does this. Maybe this should be the + new default? + + (Done. This is the new default. No complaints so far.) + +-- Clean up the frame-local variable system. I think it's ugly and + error-prone. But maybe I just haven't yet fully understood it. + + (Nothing to do. It doesn't seem ugly any more. It's rather clever.) + +-- Support multiple character locales. A version of + `set-locale-environment' needs to be written for setting up + display-local settings on ttys. I think calling + set-display-table-and-terminal-coding-system and + set-keyboard-coding-system would be enough. The language + environment itself should remain a global setting. + + (Done, by an ugly hack.) + +-- The terminal customization files in term/*.el tend to change global + parameters, which may confuse Emacs with multiple displays. Change + them to tweak only frame-local settings, if possible. (They tend + to call define-key to set function key sequences a lot.) + + (Done, by making `function-key-map' terminal-local (i.e., part of + struct kboard). This has probably covered all the remaining problems.) + +-- Make `function-key-map' and `key-translation-map' terminal-local. + + (Done.) + +-- Implement `terminal-local-value' and `set-terminal-local-value' to + allow deterministic access to terminal local bindings. The + encode-kb package can not set up `key-translation-map' without + these. The terminal-local bindings seem to be independent of what + frame is selected. + + (Done.) + +-- xt-mouse.el needs to be adapted for multi-tty. It currently + signals an error on kill-emacs under X, which prevents the user + from exiting Emacs. (Reported by Mnemonikk on freenode.) + + (Done, I hope.) + + +-- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow + keys on non-selected terminals under screen, and sometimes on other + terminal types as well. The other function keys continue to work + fine. Sometimes faces on these screens become garbled. + + This only seems to affect displays that are of the same terminfo + type as the selected one. Interestingly, in screen Emacs normally + reports the up arrow key as `M-o A', but after the above SNAFU, it + complains about `M-[ a'. UNIX ttys are a complete mystery to me, + but it seems the reset-reinitialize cycle somehow leaves the + non-selected terminals in a different state than usual. I have no + idea how this could happen. + + Currently set-input-mode resets only the currently selected + terminal, which seems to somehow work around the problem. + + Update: + + Dan Nicolaescu <dann@ics.uci.edu> writes: + > Some terminals have 2 modes for cursor keys: Application Mode where + > the cursor keys transmit the codes defined in the terminfo entry, and + > Cursor mode. Applications have to send the smkx and rmkx terminfo + > strings to switch between the 2 modes. So Emacs (and emacsclient) have + > to send smkx when initializing and rmkx when quitting (or on + > suspend). + + (I think patch-370 fixed this.) + +-- This long-standing bug (first reported by Han Boetes) seems to come + and go all the time. It is time to track it down and fix it. + + emacs + M-x server-start + + # From another xterm: + emacsclient -e '(y-or-n-p "Do you want me to crash? ")' + # Notice how the answer ends up in the *scratch* buffer + M-x garbage-collect + SIGSEGV + + (Fixed in patch-414 after detailed analysis by Kalle Olavi Niemitalo.) + +-- normal-erase-is-backspace-mode in simple.el needs to be updated for + multi-tty (rep. by Dan Waber). (The Delete key is broken on X + because of this.) + + (Fixed in patch-427.) + +-- I think keyboard-translate-table should be made terminal-local. + + (Done in patch-431.) + +-- The semantics of terminal-local variables are confusing; it is not + clear what binding is in effect in any given time. See if + current_kboard (or at least the terminal-local bindings exported to + Lisp) might be changed to be tied to the selected frame instead. + Currently, `function-key-map' and `key-translation-map' may be + accessed reliably only using the hackish + `(set-)terminal-local-value' functions. + + Perhaps there should be a difference between `last-command' &co. + and these more conventional configuration variables. + (E.g. `symbol-value' would use current_kboard to access + `last-command', but SELECTED_FRAME()->display->kboard to get the + value of `function-key-map'. + + (Fixed in patch-434.) + +-- If the first key pressed on a new tty terminal is a function key, + it is not recognized correctly. May be related to the bug below. + + (Seems to have been fixed as a side effect of patch-434. "The bug + below" was the set-input-mode madness.) + + (Update: this bug was fixed for good in patch-449. It was tracked + down to a bug in `read_key_sequence': it failed to reinitialize its + local function-key-map/key-translation-map references when it + switched keyboards. I don't understand why did this bug only + appear on brand new frames, though!) + +-- Disable connecting to a new X display when we use the GTK toolkit. + + (Disabled in patch-450.) + +;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d +
--- a/admin/notes/BRANCH Sat Dec 17 21:41:34 2005 +0000 +++ b/admin/notes/BRANCH Mon Dec 19 19:57:22 2005 +0000 @@ -1,18 +1,27 @@ -This file describes the CVS branch in which it is maintained. +This file describes the Arch branch in which it is maintained. Everything below the line is branch-specific. ________________________________________________________________________ -This is the "HEAD" branch, otherwise known as the "trunk". Its primary -purpose is to accumulate changes that are not yet partitioned into a -specific (versioned) release. When people say "use CVS emacs", this is -the branch they are talking about. Likewise, a "cvs checkout" without -the "-r" option results in this branch. +This is the "multi-tty" branch. It contains a version of Emacs that +is able to create frames on multiple display devices and display +types, including multiple tty devices and tty+X combined sessions. +The branch has an enhanced version of emacsclient that is capable of +opening a new Emacs frame on the terminal it runs on. + +Commit access to the multi-tty branch is only available to its +maintainer, Károly LÅ‘rentey (lorentey@elte.hu). The best way to +contribute to the project is to create your own public Arch branch, +and publish your changes there. (I will then be able to easily "pull" +your changes into the multi-tty branch.) -The plans for this branch are not specified; Emacs hackers add to it -relatively free of constraint (aside from proper legal / accounting -practices), although sometimes there is related discussion on the -emacs-devel mailing list. +The branch is scheduled for inclusion in the next major release of +Emacs, version 22. + +Please read the file README.multi-tty in the base directory for +details. -The closure process for this branch is undocumented; concepts such as -"freeze", "release", or "integration with the trunk" are not applicable -to this branch. + + +Local Variables: +coding: utf-8 +End:
--- a/configure Sat Dec 17 21:41:34 2005 +0000 +++ b/configure Mon Dec 19 19:57:22 2005 +0000 @@ -9964,115 +9964,8 @@ with_toolkit_scroll_bars=yes fi - HAVE_GTK_MULTIDISPLAY=no - -for ac_func in gdk_display_open -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - HAVE_GTK_MULTIDISPLAY=yes -fi -done - - if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GTK_MULTIDISPLAY 1 -_ACEOF - - fi + HAVE_GTK_MULTIDISPLAY=no + HAVE_GTK_FILE_SELECTION=no for ac_func in gtk_file_selection_new
--- a/configure.in Sat Dec 17 21:41:34 2005 +0000 +++ b/configure.in Mon Dec 19 19:57:22 2005 +0000 @@ -2011,12 +2011,15 @@ dnl Check if we can use multiple displays with this GTK version. dnl If gdk_display_open exists, assume all others are there also. + dnl XXX The multidisplay feature is severely broken in current GTK + dnl versions. --lorentey HAVE_GTK_MULTIDISPLAY=no - AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) - if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then - AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, - [Define to 1 if GTK can handle more than one display.]) - fi + dnl AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes) + dnl if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then + dnl AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1, + dnl [Define to 1 if GTK can handle more than one display.]) + dnl fi + dnl Check if we have the old file selection dialog. dnl If gdk_display_open exists, assume all others are there also. HAVE_GTK_FILE_SELECTION=no
--- a/etc/ONEWS Sat Dec 17 21:41:34 2005 +0000 +++ b/etc/ONEWS Mon Dec 19 19:57:22 2005 +0000 @@ -1029,7 +1029,7 @@ *** RCS customization. There is a new variable vc-consult-headers. If it is t (the default), -VC searches for RCS headers in working files (like `$Id: ONEWS,v 1.8 2003/02/04 14:30:40 lektu Exp $') and +VC searches for RCS headers in working files (like `$Id$') and determines the state of the file from them, not from the master file. This is fast and more reliable when you use branches. (The variable was already present in Emacs 19.29, but didn't get mentioned in the
--- a/etc/TODO Sat Dec 17 21:41:34 2005 +0000 +++ b/etc/TODO Mon Dec 19 19:57:22 2005 +0000 @@ -242,7 +242,10 @@ ** Highlight rectangles (`mouse-track-rectangle-p' in XEmacs). Already in CUA, but it's a valuable feature worth making more general. -** Support simultaneous tty and X frames. +** Support simultaneous tty and X frames. [For a partial + implementation, see tla branch + lorentey@elte.hu--2004/emacs--multi-tty--0 at + http://lorentey.hu/arch/2004] ** Provide MIME support for Rmail using the Gnus MIME library. [Maybe not now feasible, given Gnus maintenance decisions. fx looked at
--- a/info/COPYING Sat Dec 17 21:41:34 2005 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program 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 2 of the License, or - (at your option) any later version. - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License.
--- a/lib-src/emacsclient.c Sat Dec 17 21:41:34 2005 +0000 +++ b/lib-src/emacsclient.c Mon Dec 19 19:57:22 2005 +0000 @@ -41,6 +41,10 @@ # include <pwd.h> #endif /* not VMS */ +#include <signal.h> +#include <errno.h> + + char *getenv (), *getwd (); char *(getcwd) (); @@ -51,15 +55,30 @@ /* Name used to invoke this program. */ char *progname; +/* The first argument to main. */ +int main_argc; + +/* The second argument to main. */ +char **main_argv; + /* Nonzero means don't wait for a response from Emacs. --no-wait. */ int nowait = 0; /* Nonzero means args are expressions to be evaluated. --eval. */ int eval = 0; +/* Nonzero means don't open a new frame. --current-frame. */ +int current_frame = 0; + +/* Nonzero means open a new graphical frame. */ +int window_system = 0; + /* The display on which Emacs should work. --display. */ char *display = NULL; +/* Nonzero means open a new Emacs frame on the current terminal. */ +int tty = 0; + /* If non-NULL, the name of an editor to fallback to if the server is not running. --alternate-editor. */ const char * alternate_editor = NULL; @@ -75,6 +94,8 @@ { "eval", no_argument, NULL, 'e' }, { "help", no_argument, NULL, 'H' }, { "version", no_argument, NULL, 'V' }, + { "tty", no_argument, NULL, 't' }, + { "current-frame", no_argument, NULL, 'c' }, { "alternate-editor", required_argument, NULL, 'a' }, { "socket-name", required_argument, NULL, 's' }, { "display", required_argument, NULL, 'd' }, @@ -90,11 +111,14 @@ char **argv; { alternate_editor = getenv ("ALTERNATE_EDITOR"); + display = getenv ("DISPLAY"); + if (display && strlen (display) == 0) + display = NULL; while (1) { int opt = getopt_long (argc, argv, - "VHnea:s:d:", longopts, 0); + "VHnea:s:d:tc", longopts, 0); if (opt == EOF) break; @@ -131,6 +155,14 @@ exit (EXIT_SUCCESS); break; + case 't': + tty = 1; + break; + + case 'c': + current_frame = 1; + break; + case 'H': print_help_and_exit (); break; @@ -141,6 +173,25 @@ break; } } + + if (!tty && display) + window_system = 1; + else + tty = 1; + + /* --no-wait implies --current-frame on ttys when there are file + arguments or expressions given. */ + if (nowait && tty && argc - optind > 0) + current_frame = 1; + + if (current_frame) + { + tty = 0; + window_system = 0; + } + + if (tty) + window_system = 0; } void @@ -154,6 +205,8 @@ The following OPTIONS are accepted:\n\ -V, --version Just print a version info and return\n\ -H, --help Print this usage information message\n\ +-t, --tty Open a new Emacs frame on the current terminal\n\ +-c, --current-frame Do not create a new frame; use the current Emacs frame\n\ -n, --no-wait Don't wait for the server to return\n\ -e, --eval Evaluate the FILE arguments as ELisp expressions\n\ -d, --display=DISPLAY Visit the file in the given display\n\ @@ -166,19 +219,50 @@ exit (EXIT_SUCCESS); } -/* In NAME, insert a & before each &, each space, each newline, and +/* Like malloc but get fatal error if memory is exhausted. */ + +long * +xmalloc (size) + unsigned int size; +{ + long *result = (long *) malloc (size); + if (result == NULL) + { + perror ("malloc"); + exit (EXIT_FAILURE); + } + return result; +} + +/* Like strdup but get a fatal error if memory is exhausted. */ + +char * +xstrdup (const char *s) +{ + char *result = strdup (s); + if (result == NULL) + { + perror ("strdup"); + exit (EXIT_FAILURE); + } + return result; +} + +/* In STR, insert a & before each &, each space, each newline, and any initial -. Change spaces to underscores, too, so that the - return value never contains a space. */ + return value never contains a space. + + Does not change the string. Outputs the result to STREAM. */ void -quote_file_name (name, stream) - char *name; +quote_argument (str, stream) + char *str; FILE *stream; { - char *copy = (char *) malloc (strlen (name) * 2 + 1); + char *copy = (char *) xmalloc (strlen (str) * 2 + 1); char *p, *q; - p = name; + p = str; q = copy; while (*p) { @@ -196,7 +280,7 @@ } else { - if (*p == '&' || (*p == '-' && p == name)) + if (*p == '&' || (*p == '-' && p == str)) *q++ = '&'; *q++ = *p++; } @@ -208,34 +292,53 @@ free (copy); } -/* Like malloc but get fatal error if memory is exhausted. */ + +/* The inverse of quote_argument. Removes quoting in string STR by + modifying the string in place. Returns STR. */ -long * -xmalloc (size) - unsigned int size; +char * +unquote_argument (str) + char *str; { - long *result = (long *) malloc (size); - if (result == NULL) - { - perror ("malloc"); - exit (EXIT_FAILURE); - } - return result; + char *p, *q; + + if (! str) + return str; + + p = str; + q = str; + while (*p) + { + if (*p == '&') + { + p++; + if (*p == '&') + *p = '&'; + else if (*p == '_') + *p = ' '; + else if (*p == 'n') + *p = '\n'; + else if (*p == '-') + *p = '-'; + } + *q++ = *p++; + } + *q = 0; + return str; } + /* Try to run a different command, or --if no alternate editor is defined-- exit with an errorcode. */ void -fail (argc, argv) - int argc; - char **argv; +fail (void) { if (alternate_editor) { int i = optind - 1; - execvp (alternate_editor, argv + i); + execvp (alternate_editor, main_argv + i); return; } else @@ -244,6 +347,103 @@ } } +/* The process id of Emacs. */ +int emacs_pid; + +/* File handles for communicating with Emacs. */ +FILE *out, *in; + +/* A signal handler that passes the signal to the Emacs process. + Useful for SIGWINCH. */ + +SIGTYPE +pass_signal_to_emacs (int signalnum) +{ + int old_errno = errno; + + if (emacs_pid) + kill (emacs_pid, signalnum); + + signal (signalnum, pass_signal_to_emacs); + errno = old_errno; +} + +/* Signal handler for SIGCONT; notify the Emacs process that it can + now resume our tty frame. */ + +SIGTYPE +handle_sigcont (int signalnum) +{ + int old_errno = errno; + + if (tcgetpgrp (1) == getpgrp ()) + { + /* We are in the foreground. */ + fprintf (out, "-resume \n"); + fflush (out); + fsync (fileno (out)); + } + else + { + /* We are in the background; cancel the continue. */ + kill (getpid (), SIGSTOP); + } + + signal (signalnum, handle_sigcont); + errno = old_errno; +} + +/* Signal handler for SIGTSTP; notify the Emacs process that we are + going to sleep. Normally the suspend is initiated by Emacs via + server-handle-suspend-tty, but if the server gets out of sync with + reality, we may get a SIGTSTP on C-z. Handling this signal and + notifying Emacs about it should get things under control again. */ + +SIGTYPE +handle_sigtstp (int signalnum) +{ + int old_errno = errno; + sigset_t set; + + if (out) + { + fprintf (out, "-suspend \n"); + fflush (out); + fsync (fileno (out)); + } + + /* Unblock this signal and call the default handler by temprarily + changing the handler and resignalling. */ + sigprocmask (SIG_BLOCK, NULL, &set); + sigdelset (&set, signalnum); + signal (signalnum, SIG_DFL); + kill (getpid (), signalnum); + sigprocmask (SIG_SETMASK, &set, NULL); /* Let's the above signal through. */ + signal (signalnum, handle_sigtstp); + + errno = old_errno; +} + +/* Set up signal handlers before opening a frame on the current tty. */ + +void +init_signals (void) +{ + /* Set up signal handlers. */ + signal (SIGWINCH, pass_signal_to_emacs); + + /* Don't pass SIGINT and SIGQUIT to Emacs, because it has no way of + deciding which terminal the signal came from. C-g is now a + normal input event on secondary terminals. */ +#if 0 + signal (SIGINT, pass_signal_to_emacs); + signal (SIGQUIT, pass_signal_to_emacs); +#endif + + signal (SIGCONT, handle_sigcont); + signal (SIGTSTP, handle_sigtstp); + signal (SIGTTOU, handle_sigtstp); +} #if !defined (HAVE_SOCKETS) || defined (NO_SOCKETS_IN_FILE_SYSTEM) @@ -257,7 +457,7 @@ argv[0]); fprintf (stderr, "on systems with Berkeley sockets.\n"); - fail (argc, argv); + fail (); } #else /* HAVE_SOCKETS */ @@ -291,23 +491,41 @@ return 0; } +/* Returns 1 if PREFIX is a prefix of STRING. */ +static int +strprefix (char *prefix, char *string) +{ + int i; + if (! prefix) + return 1; + + if (!string) + return 0; + + for (i = 0; prefix[i]; i++) + if (!string[i] || string[i] != prefix[i]) + return 0; + return 1; +} + int main (argc, argv) int argc; char **argv; { int s, i, needlf = 0; - FILE *out, *in; struct sockaddr_un server; char *cwd, *str; char string[BUFSIZ]; + main_argc = argc; + main_argv = argv; progname = argv[0]; /* Process options. */ decode_options (argc, argv); - if ((argc - optind < 1) && !eval) + if ((argc - optind < 1) && !eval && !tty && !window_system) { fprintf (stderr, "%s: file name or argument required\n", progname); fprintf (stderr, "Try `%s --help' for more information\n", progname); @@ -322,7 +540,7 @@ { fprintf (stderr, "%s: ", argv[0]); perror ("socket"); - fail (argc, argv); + fail (); } server.sun_family = AF_UNIX; @@ -330,30 +548,31 @@ { int sock_status = 0; int default_sock = !socket_name; - int saved_errno; - char *server_name = "server"; + int saved_errno = 0; + + char *server_name = "server"; - if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\')) - { /* socket_name is a file name component. */ - server_name = socket_name; - socket_name = NULL; - default_sock = 1; /* Try both UIDs. */ - } + if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\')) + { /* socket_name is a file name component. */ + server_name = socket_name; + socket_name = NULL; + default_sock = 1; /* Try both UIDs. */ + } - if (default_sock) + if (default_sock) { - socket_name = alloca (100 + strlen (server_name)); - sprintf (socket_name, "/tmp/emacs%d/%s", - (int) geteuid (), server_name); + socket_name = alloca (100 + strlen (server_name)); + sprintf (socket_name, "/tmp/emacs%d/%s", + (int) geteuid (), server_name); } if (strlen (socket_name) < sizeof (server.sun_path)) strcpy (server.sun_path, socket_name); else { - fprintf (stderr, "%s: socket-name %s too long", - argv[0], socket_name); - exit (EXIT_FAILURE); + fprintf (stderr, "%s: socket-name %s too long", + argv[0], socket_name); + fail (); } /* See if the socket exists, and if it's owned by us. */ @@ -392,7 +611,7 @@ } sock_status = socket_status (server.sun_path); - saved_errno = errno; + saved_errno = errno; } else errno = saved_errno; @@ -407,7 +626,7 @@ if (0 != geteuid ()) { fprintf (stderr, "%s: Invalid socket owner\n", argv[0]); - fail (argc, argv); + fail (); } break; @@ -421,7 +640,7 @@ else fprintf (stderr, "%s: can't stat %s: %s\n", argv[0], server.sun_path, strerror (saved_errno)); - fail (argc, argv); + fail (); break; } } @@ -431,18 +650,18 @@ { fprintf (stderr, "%s: ", argv[0]); perror ("connect"); - fail (argc, argv); + fail (); } - /* We use the stream OUT to send our command to the server. */ + /* We use the stream OUT to send our commands to the server. */ if ((out = fdopen (s, "r+")) == NULL) { fprintf (stderr, "%s: ", argv[0]); perror ("fdopen"); - fail (argc, argv); + fail (); } - /* We use the stream IN to read the response. + /* We use the stream IN to read the responses. We used to use just one stream for both output and input on the socket, but reversing direction works nonportably: on some systems, the output appears as the first input; @@ -451,7 +670,7 @@ { fprintf (stderr, "%s: ", argv[0]); perror ("fdopen"); - fail (argc, argv); + fail (); } #ifdef HAVE_GETCWD @@ -465,87 +684,219 @@ #ifdef HAVE_GETCWD fprintf (stderr, "%s: %s (%s)\n", argv[0], - "Cannot get current working directory", strerror (errno)); + "cannot get current working directory", strerror (errno)); #else fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno)); #endif - fail (argc, argv); + fail (); } + /* First of all, send our version number for verification. */ + fprintf (out, "-version %s ", VERSION); + + /* Send over our environment. */ + if (!current_frame) + { + extern char **environ; + int i; + for (i = 0; environ[i]; i++) + { + char *name = xstrdup (environ[i]); + char *value = strchr (name, '='); + fprintf (out, "-env "); + quote_argument (environ[i], out); + fprintf (out, " "); + } + } + + retry: if (nowait) fprintf (out, "-nowait "); - if (eval) - fprintf (out, "-eval "); - + if (current_frame) + fprintf (out, "-current-frame "); + if (display) { fprintf (out, "-display "); - quote_file_name (display, out); + quote_argument (display, out); fprintf (out, " "); } + if (tty) + { + char *tty_name = ttyname (fileno (stdin)); + char *type = getenv ("TERM"); + + if (! tty_name) + { + fprintf (stderr, "%s: could not get terminal name\n", progname); + fail (); + } + + if (! type) + { + fprintf (stderr, "%s: please set the TERM variable to your terminal type\n", + progname); + fail (); + } + + if (! strcmp (type, "eterm")) + { + /* This causes nasty, MULTI_KBOARD-related input lockouts. */ + fprintf (stderr, "%s: opening a frame in an Emacs term buffer" + " is not supported\n", progname); + fail (); + } + + init_signals (); + + fprintf (out, "-tty "); + quote_argument (tty_name, out); + fprintf (out, " "); + quote_argument (type, out); + fprintf (out, " "); + } + + if (window_system) + fprintf (out, "-window-system "); + if ((argc - optind > 0)) { for (i = optind; i < argc; i++) { + int relative = 0; + if (eval) - ; /* Don't prepend any cwd or anything like that. */ - else if (*argv[i] == '+') - { + { + /* Don't prepend any cwd or anything like that. */ + fprintf (out, "-eval "); + quote_argument (argv[i], out); + fprintf (out, " "); + continue; + } + + if (*argv[i] == '+') + { char *p = argv[i] + 1; while (isdigit ((unsigned char) *p) || *p == ':') p++; - if (*p != 0) - { - quote_file_name (cwd, out); - fprintf (out, "/"); - } - } - else if (*argv[i] != '/') - { - quote_file_name (cwd, out); - fprintf (out, "/"); - } + if (*p == 0) + { + fprintf (out, "-position "); + quote_argument (argv[i], out); + fprintf (out, " "); + continue; + } + else + relative = 1; + } + else if (*argv[i] != '/') + relative = 1; - quote_file_name (argv[i], out); - fprintf (out, " "); - } + fprintf (out, "-file "); + if (relative) + { + quote_argument (cwd, out); + fprintf (out, "/"); + } + quote_argument (argv[i], out); + fprintf (out, " "); + } } else { - while ((str = fgets (string, BUFSIZ, stdin))) - { - quote_file_name (str, out); - } - fprintf (out, " "); + if (!tty && !window_system) + { + while ((str = fgets (string, BUFSIZ, stdin))) + { + if (eval) + fprintf (out, "-eval "); + else + fprintf (out, "-file "); + quote_argument (str, out); + } + fprintf (out, " "); + } } fprintf (out, "\n"); fflush (out); + fsync (fileno (out)); - /* Maybe wait for an answer. */ - if (nowait) - return EXIT_SUCCESS; - - if (!eval) + /* Wait for an answer. */ + if (!eval && !tty && !nowait) { printf ("Waiting for Emacs..."); needlf = 2; } fflush (stdout); + fsync (1); /* Now, wait for an answer and print any messages. */ while ((str = fgets (string, BUFSIZ, in))) { - if (needlf == 2) - printf ("\n"); - printf ("%s", str); - needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + char *p = str + strlen (str) - 1; + while (p > str && *p == '\n') + *p-- = 0; + + if (strprefix ("-good-version ", str)) + { + /* -good-version: The versions match. */ + } + else if (strprefix ("-emacs-pid ", str)) + { + /* -emacs-pid PID: The process id of the Emacs process. */ + emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10); + } + else if (strprefix ("-window-system-unsupported ", str)) + { + /* -window-system-unsupported: Emacs was compiled without X + support. Try again on the terminal. */ + window_system = 0; + nowait = 0; + tty = 1; + goto retry; + } + else if (strprefix ("-print ", str)) + { + /* -print STRING: Print STRING on the terminal. */ + str = unquote_argument (str + strlen ("-print ")); + if (needlf) + printf ("\n"); + printf ("%s", str); + needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + } + else if (strprefix ("-error ", str)) + { + /* -error DESCRIPTION: Signal an error on the terminal. */ + str = unquote_argument (str + strlen ("-error ")); + if (needlf) + printf ("\n"); + printf ("*ERROR*: %s", str); + needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + } + else if (strprefix ("-suspend ", str)) + { + /* -suspend: Suspend this terminal, i.e., stop the process. */ + if (needlf) + printf ("\n"); + needlf = 0; + kill (0, SIGSTOP); + } + else + { + /* Unknown command. */ + if (needlf) + printf ("\n"); + printf ("*ERROR*: Unknown message: %s", str); + needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + } } if (needlf) printf ("\n"); fflush (stdout); + fsync (1); return EXIT_SUCCESS; }
--- a/lisp/bindings.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/bindings.el Mon Dec 19 19:57:22 2005 +0000 @@ -217,7 +217,7 @@ (make-variable-buffer-local 'mode-line-buffer-identification) -(defvar mode-line-frame-identification '("-%F ") +(defvar mode-line-frame-identification '(window-system " " "-%F ") "Mode-line control to describe the current frame.") (defvar mode-line-process nil "\
--- a/lisp/cus-face.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/cus-face.el Mon Dec 19 19:57:22 2005 +0000 @@ -40,15 +40,18 @@ (when (fboundp 'facep) (unless (facep face) ;; If the user has already created the face, respect that. - (let ((value (or (get face 'saved-face) spec))) + (let ((value (or (get face 'saved-face) spec)) + (have-window-system (memq initial-window-system '(x w32)))) ;; Create global face. (make-empty-face face) ;; Create frame-local faces (dolist (frame (frame-list)) - (face-spec-set face value frame))) - ;; When making a face after frames already exist - (if (memq window-system '(x w32 mac)) - (make-face-x-resource-internal face)))) + (face-spec-set face value frame) + (when (memq (window-system frame) '(x w32 mac)) + (setq have-window-system t))) + ;; When making a face after frames already exist + (if have-window-system + (make-face-x-resource-internal face))))) ;; Don't record SPEC until we see it causes no errors. (put face 'face-defface-spec spec) (push (cons 'defface face) current-load-list)
--- a/lisp/cus-start.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/cus-start.el Mon Dec 19 19:57:22 2005 +0000 @@ -367,10 +367,7 @@ ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) - (or (boundp 'gtk) - (and window-system - (not (eq window-system 'pc)) - (not (eq system-type 'windows-nt))))) + (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) ((string-match "selection" (symbol-name symbol))
--- a/lisp/double.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/double.el Mon Dec 19 19:57:22 2005 +0000 @@ -145,11 +145,12 @@ (if enable-flag (progn ;; Set up key-translation-map as indicated by `double-map'. + ;; XXX I don't think key-translation-map should be made local here. -- Lorentey (kill-local-variable 'key-translation-map) (make-local-variable 'key-translation-map) (setq key-translation-map (if (keymapp key-translation-map) - (copy-keymap key-translation-map) - (make-sparse-keymap))) + (copy-keymap key-translation-map) + (make-sparse-keymap))) (mapcar (function (lambda (entry) (define-key key-translation-map (vector (nth 0 entry))
--- a/lisp/edmacro.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/edmacro.el Mon Dec 19 19:57:22 2005 +0000 @@ -489,9 +489,9 @@ (fkey nil) tlen tkey (bind (or (loop for map in maps for b = (lookup-key map key) thereis (and (not (integerp b)) b)) - (and (setq fkey (lookup-key function-key-map rest-mac)) + (and (setq fkey (lookup-key local-function-key-map rest-mac)) (setq tlen fkey tkey (edmacro-subseq rest-mac 0 tlen) - fkey (lookup-key function-key-map tkey)) + fkey (lookup-key local-function-key-map tkey)) (loop for map in maps for b = (lookup-key map fkey) when (and (not (integerp b)) b)
--- a/lisp/emulation/cua-base.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/emulation/cua-base.el Mon Dec 19 19:57:22 2005 +0000 @@ -1089,9 +1089,9 @@ (memq 'shift (event-modifiers (aref (this-single-command-keys) 0))) ;; See if raw escape sequence maps to a shifted event, e.g. S-up or C-S-home. - (and (boundp 'function-key-map) - function-key-map - (let ((ev (lookup-key function-key-map + (and (boundp 'local-function-key-map) + local-function-key-map + (let ((ev (lookup-key local-function-key-map (this-single-command-raw-keys)))) (and (vector ev) (symbolp (setq ev (aref ev 0)))
--- a/lisp/faces.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/faces.el Mon Dec 19 19:57:22 2005 +0000 @@ -934,7 +934,7 @@ (let ((valid (case attribute (:family - (if window-system + (if (window-system frame) (mapcar #'(lambda (x) (cons (car x) (car x))) (x-font-family-list)) ;; Only one font on TTYs. @@ -943,7 +943,7 @@ (mapcar #'(lambda (x) (cons (symbol-name x) x)) (internal-lisp-face-attribute-values attribute))) ((:underline :overline :strike-through :box) - (if window-system + (if (window-system frame) (nconc (mapcar #'(lambda (x) (cons (symbol-name x) x)) (internal-lisp-face-attribute-values attribute)) (mapcar #'(lambda (c) (cons c c)) @@ -956,7 +956,7 @@ ((:height) 'integerp) (:stipple - (and (memq window-system '(x w32 mac)) + (and (memq (window-system frame) '(x w32 mac)) (mapcar #'list (apply #'nconc (mapcar (lambda (dir) @@ -1074,7 +1074,7 @@ ;; explicitly in VALID, using color approximation code ;; in tty-colors.el. (when (and (memq attribute '(:foreground :background)) - (not (memq window-system '(x w32 mac))) + (not (memq (window-system frame) '(x w32 mac))) (not (member new-value '("unspecified" "unspecified-fg" "unspecified-bg")))) @@ -1369,14 +1369,14 @@ req (car conjunct) options (cdr conjunct) match (cond ((eq req 'type) - (or (memq window-system options) + (or (memq (window-system frame) options) ;; FIXME: This should be revisited to use ;; display-graphic-p, provided that the ;; color selection depends on the number ;; of supported colors, and all defface's ;; are changed to look at number of colors ;; instead of (type graphic) etc. - (and (null window-system) + (and (null (window-system frame)) (memq 'tty options)) (and (memq 'motif options) (featurep 'motif)) @@ -1589,35 +1589,38 @@ (const light) (const :tag "automatic" nil))) -(defvar default-frame-background-mode nil - "Internal variable for the default brightness of the background. -Emacs sets it automatically depending on the terminal type. -The value `nil' means `dark'. If Emacs runs in non-windowed -mode from `xterm' or a similar terminal emulator, the value is -`light'. On rxvt terminals, the value depends on the environment -variable COLORFGBG.") (defun frame-set-background-mode (frame) "Set up display-dependent faces on FRAME. Display-dependent faces are those which have different definitions according to the `background-mode' and `display-type' frame parameters." (let* ((bg-resource - (and window-system + (and (window-system frame) (x-get-resource "backgroundMode" "BackgroundMode"))) (bg-color (frame-parameter frame 'background-color)) + (tty-type (frame-parameter frame 'tty-type)) (bg-mode (cond (frame-background-mode) (bg-resource (intern (downcase bg-resource))) - ((and (null window-system) (null bg-color)) - ;; No way to determine this automatically (?). - (or default-frame-background-mode 'dark)) - ;; Unspecified frame background color can only happen - ;; on tty's. - ((member bg-color '(unspecified "unspecified-bg")) - (or default-frame-background-mode 'dark)) + ((and (null (window-system frame)) + ;; Unspecified frame background color can only + ;; happen on tty's. + (member bg-color '(nil unspecified "unspecified-bg"))) + ;; There is no way to determine the background mode + ;; automatically, so we make a guess based on the + ;; terminal type. + (if (and tty-type + (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" + tty-type)) + 'light + 'dark)) ((equal bg-color "unspecified-fg") ; inverted colors - (if (eq default-frame-background-mode 'light) 'dark 'light)) + (if (and tty-type + (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" + tty-type)) + 'dark + 'light)) ((>= (apply '+ (x-color-values bg-color frame)) ;; Just looking at the screen, colors whose ;; values add up to .6 of the white total @@ -1626,7 +1629,7 @@ 'light) (t 'dark))) (display-type - (cond ((null window-system) + (cond ((null (window-system frame)) (if (tty-display-color-p frame) 'color 'mono)) ((x-display-color-p frame) 'color) @@ -1723,16 +1726,22 @@ (setq parameters (x-handle-named-frame-geometry parameters)) (let ((visibility-spec (assq 'visibility parameters)) (frame-list (frame-list)) - (frame (x-create-frame (cons '(visibility . nil) parameters))) + (frame (x-create-frame `((visibility . nil) . ,parameters))) success) (unwind-protect (progn + (x-setup-function-keys frame) (x-handle-reverse-video frame parameters) (frame-set-background-mode frame) (face-set-after-frame-default frame) (if (or (null frame-list) (null visibility-spec)) (make-frame-visible frame) (modify-frame-parameters frame (list visibility-spec))) + ;; Arrange for the kill and yank functions to set and check the clipboard. + (modify-frame-parameters + frame '((interprogram-cut-function . x-select-text))) + (modify-frame-parameters + frame '((interprogram-paste-function . x-cut-buffer-or-selection-value))) (setq success t)) (unless success (delete-frame frame))) @@ -1761,7 +1770,7 @@ (when (not (equal face 'default)) (face-spec-set face (face-user-default-spec face) frame) (internal-merge-in-global-face face frame) - (when (and (memq window-system '(x w32 mac)) + (when (and (memq (window-system frame) '(x w32 mac)) (or (not (boundp 'inhibit-default-face-x-resources)) (not (eq face 'default)))) (make-face-x-resource-internal face frame))) @@ -1812,15 +1821,50 @@ (let ((frame (make-terminal-frame parameters)) success) (unwind-protect - (progn + (with-selected-frame frame (tty-handle-reverse-video frame (frame-parameters frame)) (frame-set-background-mode frame) (face-set-after-frame-default frame) + + ;; Make sure the kill and yank functions do not touch the X clipboard. + (modify-frame-parameters frame '((interprogram-cut-function . nil))) + (modify-frame-parameters frame '((interprogram-paste-function . nil))) + + (set-locale-environment nil frame) + (tty-run-terminal-initialization frame) (setq success t)) (unless success (delete-frame frame))) frame)) +(defun tty-run-terminal-initialization (frame) + "Run the special initialization code for the terminal type of FRAME." + ;; Load library for our terminal type. + ;; User init file can set term-file-prefix to nil to prevent this. + (with-selected-frame frame + (unless (null term-file-prefix) + (let* ((term (frame-parameter frame 'tty-type)) + (term2 term) + hyphend term-init-func) + (while (and term + (not (load (concat term-file-prefix term) t t))) + ;; Strip off last hyphen and what follows, then try again + (setq term + (if (setq hyphend (string-match "[-_][^-_]+$" term)) + (substring term 0 hyphend) + nil))) + ;; The terminal file has been loaded, now find and call the + ;; terminal specific initialization function. + (while (and term2 + (not (fboundp + (setq term-init-func (intern (concat "terminal-init-" term2)))))) + ;; Strip off last hyphen and what follows, then try again + (setq term2 + (if (setq hyphend (string-match "[-_][^-_]+$" term2)) + (substring term2 0 hyphend) + nil))) + (when (fboundp term-init-func) + (funcall term-init-func)))))) ;; Called from C function init_display to initialize faces of the ;; dumped terminal frame on startup.
--- a/lisp/files.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/files.el Mon Dec 19 19:57:22 2005 +0000 @@ -4877,6 +4877,22 @@ (or (null confirm-kill-emacs) (funcall confirm-kill-emacs "Really exit Emacs? ")) (kill-emacs))) + +(defun save-buffers-kill-display (&optional arg) + "Offer to save each buffer, then kill the current connection. +If the current frame has no client, kill Emacs itself. + +With prefix arg, silently save all file-visiting buffers, then kill. + +If emacsclient was started with a list of filenames to edit, then +only these files will be asked to be saved." + (interactive "P") + (let ((proc (frame-parameter (selected-frame) 'client)) + (frame (selected-frame))) + (if (null proc) + (save-buffers-kill-emacs) + (server-save-buffers-kill-display proc arg)))) + ;; We use /: as a prefix to "quote" a file name ;; so that magic file name handlers will not apply to it. @@ -4974,7 +4990,7 @@ (define-key ctl-x-map "i" 'insert-file) (define-key esc-map "~" 'not-modified) (define-key ctl-x-map "\C-d" 'list-directory) -(define-key ctl-x-map "\C-c" 'save-buffers-kill-emacs) +(define-key ctl-x-map "\C-c" 'save-buffers-kill-display) (define-key ctl-x-map "\C-q" 'toggle-read-only) (define-key ctl-x-4-map "f" 'find-file-other-window)
--- a/lisp/font-lock.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/font-lock.el Mon Dec 19 19:57:22 2005 +0000 @@ -2008,7 +2008,7 @@ "with-current-buffer" "with-electric-help" "with-local-quit" "with-no-warnings" "with-output-to-string" "with-output-to-temp-buffer" - "with-selected-window" "with-syntax-table" + "with-selected-window" "with-selected-frame" "with-syntax-table" "with-temp-buffer" "with-temp-file" "with-temp-message" "with-timeout" "with-timeout-handler") t) "\\>")
--- a/lisp/frame.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/frame.el Mon Dec 19 19:57:22 2005 +0000 @@ -27,10 +27,28 @@ ;;; Code: -(defvar frame-creation-function nil - "Window-system dependent function to call to create a new frame. -The window system startup file should set this to its frame creation -function, which should take an alist of parameters as its argument.") +(defvar frame-creation-function-alist + (list (cons nil + (if (fboundp 'tty-create-frame-with-faces) + 'tty-create-frame-with-faces + (function + (lambda (parameters) + (error "Can't create multiple frames without a window system")))))) + "Alist of window-system dependent functions to call to create a new frame. +The window system startup file should add its frame creation +function to this list, which should take an alist of parameters +as its argument.") + +(defvar window-system-default-frame-alist nil + "Alist of window-system dependent default frame parameters. +These may be set in your init file, like this: + + ;; Disable menubar and toolbar on the console, but enable them under X. + (setq window-system-default-frame-alist + '((x (menu-bar-lines . 1) (tool-bar-lines . 1)) + (nil (menu-bar-lines . 0) (tool-bar-lines . 0)))) + +Also see `default-frame-alist'.") ;; The initial value given here used to ask for a minibuffer. ;; But that's not necessary, because the default is to have one. @@ -189,7 +207,9 @@ (defun frame-initialize () "Create an initial frame if necessary." ;; Are we actually running under a window system at all? - (if (and window-system (not noninteractive) (not (eq window-system 'pc))) + (if (and initial-window-system + (not noninteractive) + (not (eq initial-window-system 'pc))) (progn ;; Turn on special-display processing only if there's a window system. (setq special-display-function 'special-display-popup-frame) @@ -206,6 +226,9 @@ (setq frame-initial-frame-alist (cons '(horizontal-scroll-bars . t) frame-initial-frame-alist))) + (setq frame-initial-frame-alist + (cons (cons 'window-system initial-window-system) + frame-initial-frame-alist)) (setq default-minibuffer-frame (setq frame-initial-frame (make-frame frame-initial-frame-alist))) @@ -218,18 +241,7 @@ ;; At this point, we know that we have a frame open, so we ;; can delete the terminal frame. (delete-frame terminal-frame) - (setq terminal-frame nil)) - - ;; No, we're not running a window system. Use make-terminal-frame if - ;; we support that feature, otherwise arrange to cause errors. - (or (eq window-system 'pc) - (setq frame-creation-function - (if (fboundp 'tty-create-frame-with-faces) - 'tty-create-frame-with-faces - (function - (lambda (parameters) - (error - "Can't create multiple frames without a window system")))))))) + (setq terminal-frame nil)))) (defvar frame-notice-user-settings t "Non-nil means function `frame-notice-user-settings' wasn't run yet.") @@ -239,7 +251,9 @@ ;; information to which we must react; do what needs to be done. (defun frame-notice-user-settings () "Act on user's init file settings of frame parameters. -React to settings of `default-frame-alist', `initial-frame-alist' there." +React to settings of `initial-frame-alist', +`window-system-default-frame-alist' and `default-frame-alist' +there (in decreasing order of priority)." ;; Make menu-bar-mode and default-frame-alist consistent. (when (boundp 'menu-bar-mode) (let ((default (assq 'menu-bar-lines default-frame-alist))) @@ -267,7 +281,9 @@ ;; want to use save-excursion here, because that may also try to set ;; the buffer of the selected window, which fails when the selected ;; window is the minibuffer. - (let ((old-buffer (current-buffer))) + (let ((old-buffer (current-buffer)) + (window-system-frame-alist (cdr (assq initial-window-system + window-system-default-frame-alist)))) (when (and frame-notice-user-settings (null frame-initial-frame)) @@ -279,8 +295,9 @@ ;; Can't modify the minibuffer parameter, so don't try. (setq parms (delq (assq 'minibuffer parms) parms)) (modify-frame-parameters nil - (if (null window-system) + (if (null initial-window-system) (append initial-frame-alist + window-system-frame-alist default-frame-alist parms nil) @@ -288,7 +305,7 @@ ;; default-frame-alist were already ;; applied in pc-win.el. parms)) - (if (null window-system) ;; MS-DOS does this differently in pc-win.el + (if (null initial-window-system) ;; MS-DOS does this differently in pc-win.el (let ((newparms (frame-parameters)) (frame (selected-frame))) (tty-handle-reverse-video frame newparms) @@ -310,6 +327,7 @@ ;; switch `tool-bar-mode' off. (when (display-graphic-p) (let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist) + (assq 'tool-bar-lines window-system-frame-alist) (assq 'tool-bar-lines default-frame-alist)))) (when (and tool-bar-originally-present (or (null tool-bar-lines) @@ -370,6 +388,7 @@ ;; create here, so that its new value, gleaned from the user's ;; .emacs file, will be applied to the existing screen. (if (not (eq (cdr (or (assq 'minibuffer initial-frame-alist) + (assq 'minibuffer window-system-frame-alist) (assq 'minibuffer default-frame-alist) '(minibuffer . t))) t)) @@ -389,6 +408,7 @@ (setq parms (delq (assq 'name parms) parms))) (setq parms (append initial-frame-alist + window-system-frame-alist default-frame-alist parms nil)) @@ -468,6 +488,7 @@ ;; the new parameters. (let (newparms allparms tail) (setq allparms (append initial-frame-alist + window-system-frame-alist default-frame-alist nil)) (if (assq 'height frame-initial-geometry-arguments) (setq allparms (assq-delete-all 'height allparms))) @@ -567,12 +588,25 @@ (select-frame-set-input-focus (selected-frame))) (defun make-frame-on-display (display &optional parameters) - "Make a frame on display DISPLAY. + "Make a frame on X display DISPLAY. The optional second argument PARAMETERS specifies additional frame parameters." (interactive "sMake frame on display: ") (or (string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display) (error "Invalid display, not HOST:SERVER or HOST:SERVER.SCREEN")) - (make-frame (cons (cons 'display display) parameters))) + (when (and (boundp 'x-initialized) (not x-initialized)) + (setq x-display-name display) + (x-initialize-window-system)) + (make-frame `((window-system . x) (display . ,display) . ,parameters))) + +(defun make-frame-on-tty (device type &optional parameters) + "Make a frame on terminal DEVICE which is of type TYPE (e.g., \"xterm\"). +The optional third argument PARAMETERS specifies additional frame parameters." + (interactive "fOpen frame on tty device: \nsTerminal type of %s: ") + (unless device + (error "Invalid terminal device")) + (unless type + (error "Invalid terminal type")) + (make-frame `((window-system . nil) (tty . ,device) (tty-type . ,type) . ,parameters))) (defun make-frame-command () "Make a new frame, and select it if the terminal displays only one frame." @@ -611,7 +645,12 @@ (minibuffer . only) The frame should contain only a minibuffer. (minibuffer . WINDOW) The frame should use WINDOW as its minibuffer window. -Before the frame is created (via `frame-creation-function'), functions on the + (window-system . nil) The frame should be displayed on a terminal device. + (window-system . x) The frame should be displayed in an X window. + + (device . ID) The frame should use the display device identified by ID. + +Before the frame is created (via `frame-creation-function-alist'), functions on the hook `before-make-frame-hook' are run. After the frame is created, functions on `after-make-frame-functions' are run with one arg, the newly created frame. @@ -621,8 +660,23 @@ instance if the frame appears under the mouse pointer and your setup is for focus to follow the pointer." (interactive) - (run-hooks 'before-make-frame-hook) - (let ((frame (funcall frame-creation-function parameters))) + (let* ((w (cond + ((assq 'device parameters) + (let ((type (display-live-p (cdr (assq 'device parameters))))) + (cond + ((eq type t) nil) + ((eq type nil) (error "Display %s does not exist" (cdr (assq 'device parameters)))) + (t type)))) + ((assq 'window-system parameters) + (cdr (assq 'window-system parameters))) + (t window-system))) + (frame-creation-function (cdr (assq w frame-creation-function-alist))) + frame) + (unless frame-creation-function + (error "Don't know how to create a frame on window system %s" w)) + (run-hooks 'before-make-frame-hook) + (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist))))) + (normal-erase-is-backspace-setup-frame frame) (run-hook-with-args 'after-make-frame-functions frame) frame)) @@ -642,22 +696,28 @@ (function (lambda (frame) (eq frame (window-frame (minibuffer-window frame))))))) -(defun frames-on-display-list (&optional display) - "Return a list of all frames on DISPLAY. -DISPLAY is a name of a display, a string of the form HOST:SERVER.SCREEN. -If DISPLAY is omitted or nil, it defaults to the selected frame's display." - (let* ((display (or display (frame-parameter nil 'display))) +(defun frames-on-display-list (&optional terminal) + "Return a list of all frames on TERMINAL. + +TERMINAL should be a terminal identifier (an integer), a frame, +or a name of an X display (a string of the form +HOST:SERVER.SCREEN). + +If TERMINAL is omitted or nil, it defaults to the selected +frame's terminal device." + (let* ((terminal (terminal-id terminal)) (func #'(lambda (frame) - (equal (frame-parameter frame 'display) display)))) + (eq (frame-display frame) terminal)))) (filtered-frame-list func))) (defun framep-on-display (&optional display) "Return the type of frames on DISPLAY. -DISPLAY may be a display name or a frame. If it is a frame, its type is -returned. +DISPLAY may be a display id, a display name or a frame. If it is +a frame, its type is returned. If DISPLAY is omitted or nil, it defaults to the selected frame's display. All frames on a given display are of the same type." - (or (framep display) + (or (display-live-p display) + (framep display) (framep (car (frames-on-display-list display))))) (defun frame-remove-geometry-params (param-list) @@ -695,9 +755,9 @@ (select-frame frame) (raise-frame frame) ;; Ensure, if possible, that frame gets input focus. - (cond ((eq window-system 'x) + (cond ((eq (window-system frame) 'x) (x-focus-frame frame)) - ((eq window-system 'w32) + ((eq (window-system frame) 'w32) (w32-focus-frame frame))) (cond (focus-follows-mouse (set-mouse-position (selected-frame) (1- (frame-width)) 0)))) @@ -734,6 +794,22 @@ (iconify-frame) (make-frame-visible))) +(defun suspend-frame () + "Do whatever is right to suspend the current frame. +Calls `suspend-emacs' if invoked from the controlling terminal, +`suspend-tty' from a secondary terminal, and +`iconify-or-deiconify-frame' from an X frame." + (interactive) + (let ((type (framep (selected-frame)))) + (cond + ((eq type 'x) (iconify-or-deiconify-frame)) + ((eq type t) + (if (display-controlling-tty-p) + (suspend-emacs) + (suspend-tty))) + (t (suspend-emacs))))) + + (defun make-frame-names-alist () (let* ((current-frame (selected-frame)) (falist @@ -767,9 +843,9 @@ (raise-frame frame) (select-frame frame) ;; Ensure, if possible, that frame gets input focus. - (cond ((eq window-system 'x) + (cond ((eq (window-system frame) 'x) (x-focus-frame frame)) - ((eq window-system 'w32) + ((eq (window-system frame) 'w32) (w32-focus-frame frame))) (when focus-follows-mouse (set-mouse-position frame (1- (frame-width frame)) 0)))) @@ -982,6 +1058,10 @@ (cons vert hor))) ;;;; Frame/display capabilities. +(defun selected-display () + "Return the display that is now selected." + (frame-display (selected-frame))) + (defun display-mouse-p (&optional display) "Return non-nil if DISPLAY has a mouse available. DISPLAY can be a display name, a frame, or nil (meaning the selected @@ -1133,7 +1213,7 @@ ((eq frame-type 'pc) 16) (t - (tty-display-color-cells))))) + (tty-display-color-cells display))))) (defun display-visual-class (&optional display) "Returns the visual class of DISPLAY. @@ -1263,7 +1343,7 @@ :init-value (not (or noninteractive no-blinking-cursor (eq system-type 'ms-dos) - (not (memq window-system '(x w32 mac))))) + (not (memq initial-window-system '(x w32 mac))))) :initialize 'custom-initialize-safe-default :group 'cursor :global t @@ -1345,6 +1425,146 @@ (define-key ctl-x-5-map "0" 'delete-frame) (define-key ctl-x-5-map "o" 'other-frame) +(substitute-key-definition 'suspend-emacs 'suspend-frame global-map) + + +(defun terminal-id (terminal) + "Return the numerical id of terminal TERMINAL. + +TERMINAL can be a terminal id (an integer), a frame, or +nil (meaning the selected frame's terminal). Alternatively, +TERMINAL may be the name of an X display +device (HOST.SERVER.SCREEN) or a tty device file." + (cond + ((integerp terminal) + (if (display-live-p terminal) + terminal + (signal 'wrong-type-argument (list 'display-live-p terminal)))) + ((or (null terminal) (framep terminal)) + (frame-display terminal)) + ((stringp terminal) + (let ((f (car (filtered-frame-list (lambda (frame) + (or (equal (frame-parameter frame 'display) terminal) + (equal (frame-parameter frame 'tty) terminal))))))) + (or f (error "Display %s does not exist" terminal)) + (frame-display f))) + (t + (error "Invalid argument %s in `terminal-id'" terminal)))) + +(defvar terminal-parameter-alist nil + "An alist of terminal parameter alists.") + +(defun terminal-parameters (&optional terminal) + "Return the paramater-alist of terminal TERMINAL. +It is a list of elements of the form (PARM . VALUE), where PARM is a symbol. + +TERMINAL can be a terminal id, a frame, or nil (meaning the +selected frame's terminal)." + (cdr (assq (terminal-id terminal) terminal-parameter-alist))) + +(defun terminal-parameter-p (terminal parameter) + "Return non-nil if PARAMETER is a terminal parameter on TERMINAL. + +The actual value returned in that case is a cell (PARAMETER . VALUE), +where VALUE is the current value of PARAMETER. + +TERMINAL can be a terminal id, a frame, or nil (meaning the +selected frame's terminal)." + (assq parameter (cdr (assq (terminal-id terminal) terminal-parameter-alist)))) + +(defun terminal-parameter (terminal parameter) + "Return TERMINAL's value for parameter PARAMETER. + +TERMINAL can be a terminal id, a frame, or nil (meaning the +selected frame's terminal)." + (cdr (terminal-parameter-p terminal parameter))) + +(defun set-terminal-parameter (terminal parameter value) + "Set TERMINAL's value for parameter PARAMETER to VALUE. +Returns the previous value of PARAMETER. + +TERMINAL can be a terminal id, a frame, or nil (meaning the +selected frame's terminal)." + (setq terminal (terminal-id terminal)) + (let* ((alist (assq terminal terminal-parameter-alist)) + (pair (assq parameter (cdr alist))) + (result (cdr pair))) + (cond + (pair (setcdr pair value)) + (alist (setcdr alist (cons (cons parameter value) (cdr alist)))) + (t (setq terminal-parameter-alist + (cons (cons terminal + (cons (cons parameter value) + nil)) + terminal-parameter-alist)))) + result)) + +(defun terminal-handle-delete-frame (frame) + "Clean up terminal parameters of FRAME, if it's the last frame on its terminal." + ;; XXX We assume that the display is closed immediately after the + ;; last frame is deleted on it. It would be better to create a hook + ;; called `delete-display-functions', and use it instead. + (when (and (frame-live-p frame) + (= 1 (length (frames-on-display-list (frame-display frame))))) + (setq terminal-parameter-alist + (assq-delete-all (frame-display frame) terminal-parameter-alist)))) + +(add-hook 'delete-frame-functions 'terminal-handle-delete-frame) + +(defun terminal-getenv (variable &optional terminal) + "Get the value of VARIABLE in the client environment of TERMINAL. +VARIABLE should be a string. Value is nil if VARIABLE is undefined in +the environment. Otherwise, value is a string. + +If TERMINAL was created by an emacsclient invocation, then the +variable is looked up in the environment of the emacsclient +process; otherwise the function consults the environment of the +Emacs process. + +TERMINAL can be a terminal id, a frame, or nil (meaning the +selected frame's terminal)." + (setq terminal (terminal-id terminal)) + (if (not (terminal-parameter-p terminal 'environment)) + (getenv variable) + (let ((env (terminal-parameter terminal 'environment)) + result entry) + (while (and env (null result)) + (setq entry (car env) + env (cdr env)) + (if (and (> (length entry) (length variable)) + (eq ?= (aref entry (length variable))) + (equal variable (substring entry 0 (length variable)))) + (setq result (substring entry (+ (length variable) 1))))) + (if (null result) + (getenv variable) + result)))) + +(defmacro with-terminal-environment (terminal vars &rest body) + "Evaluate BODY with environment variables VARS set to those of TERMINAL. +The environment variables are then restored to their previous values. + +VARS should be a list of strings. + +TERMINAL can be a terminal id, a frame, or nil (meaning the +selected frame's terminal). + +See also `terminal-getenv'." + (declare (indent 2)) + (let ((oldvalues (make-symbol "oldvalues")) + (var (make-symbol "var")) + (value (make-symbol "value")) + (pair (make-symbol "pair"))) + `(let (,oldvalues) + (dolist (,var ,vars) + (let ((,value (terminal-getenv ,var ,terminal))) + (setq ,oldvalues (cons (cons ,var (getenv ,var)) ,oldvalues)) + (setenv ,var ,value))) + (unwind-protect + (progn ,@body) + (dolist (,pair ,oldvalues) + (setenv (car ,pair) (cdr ,pair))))))) + + (provide 'frame) ;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56
--- a/lisp/help-fns.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/help-fns.el Mon Dec 19 19:57:22 2005 +0000 @@ -484,10 +484,11 @@ 0)) ;;;###autoload -(defun describe-variable (variable &optional buffer) +(defun describe-variable (variable &optional buffer frame) "Display the full documentation of VARIABLE (a symbol). Returns the documentation as a string, also. -If VARIABLE has a buffer-local value in BUFFER (default to the current buffer), +If VARIABLE has a buffer-local value in BUFFER or FRAME +\(default to the current buffer and current frame), it is displayed along with the global value." (interactive (let ((v (variable-at-point)) @@ -506,14 +507,19 @@ (list (if (equal val "") v (intern val))))) (unless (buffer-live-p buffer) (setq buffer (current-buffer))) + (unless (frame-live-p frame) (setq frame (selected-frame))) (if (not (symbolp variable)) (message "You did not specify a variable") (save-excursion - (let* ((valvoid (not (with-current-buffer buffer (boundp variable)))) - ;; Extract the value before setting up the output buffer, - ;; in case `buffer' *is* the output buffer. - (val (unless valvoid (buffer-local-value variable buffer))) - val-start-pos) + (let ((valvoid (not (with-current-buffer buffer (boundp variable)))) + val val-start-pos locus) + ;; Extract the value before setting up the output buffer, + ;; in case `buffer' *is* the output buffer. + (unless valvoid + (with-selected-frame frame + (with-current-buffer buffer + (setq val (symbol-value variable) + locus (variable-binding-locus variable))))) (help-setup-xref (list #'describe-variable variable buffer) (interactive-p)) (with-output-to-temp-buffer (help-buffer) @@ -574,11 +580,13 @@ (delete-region (1- from) from))))) (terpri) - (when (local-variable-p variable) - (princ (format "%socal in buffer %s; " - (if (get variable 'permanent-local) - "Permanently l" "L") - (buffer-name))) + (when locus + (if (bufferp locus) + (princ (format "%socal in buffer %s; " + (if (get variable 'permanent-local) + "Permanently l" "L") + (buffer-name))) + (princ (format "It is a frame-local variable; "))) (if (not (default-boundp variable)) (princ "globally void") (let ((val (default-value variable)))
--- a/lisp/international/encoded-kb.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/international/encoded-kb.el Mon Dec 19 19:57:22 2005 +0000 @@ -173,7 +173,7 @@ (setq str (format "%s%c" str (read-char-exclusive)))) (vector (aref result 0)))) -(defun encoded-kbd-setup-keymap (coding) +(defun encoded-kbd-setup-keymap (keymap coding) ;; At first, reset the keymap. (define-key encoded-kbd-mode-map "\e" nil) ;; Then setup the keymap according to the keyboard coding system. @@ -181,7 +181,7 @@ ((eq (coding-system-type coding) 1) ; SJIS (let ((i 128)) (while (< i 256) - (define-key key-translation-map + (define-key keymap (vector i) 'encoded-kbd-self-insert-sjis) (setq i (1+ i)))) 8) @@ -189,7 +189,7 @@ ((eq (coding-system-type coding) 3) ; Big5 (let ((i 161)) (while (< i 255) - (define-key key-translation-map + (define-key keymap (vector i) 'encoded-kbd-self-insert-big5) (setq i (1+ i)))) 8) @@ -215,20 +215,20 @@ (aset encoded-kbd-iso2022-invocations 1 1)) (when use-designation (define-key encoded-kbd-mode-map "\e" 'encoded-kbd-iso2022-esc-prefix) - (define-key key-translation-map "\e" 'encoded-kbd-iso2022-esc-prefix)) + (define-key keymap "\e" 'encoded-kbd-iso2022-esc-prefix)) (when (or (aref flags 2) (aref flags 3)) - (define-key key-translation-map + (define-key keymap [?\216] 'encoded-kbd-iso2022-single-shift) - (define-key key-translation-map + (define-key keymap [?\217] 'encoded-kbd-iso2022-single-shift)) (or (eq (aref flags 0) 'ascii) (dotimes (i 96) - (define-key key-translation-map + (define-key keymap (vector (+ 32 i)) 'encoded-kbd-self-insert-iso2022-7bit))) (if (aref flags 7) t (dotimes (i 96) - (define-key key-translation-map + (define-key keymap (vector (+ 160 i)) 'encoded-kbd-self-insert-iso2022-8bit)) 8)))) @@ -243,7 +243,7 @@ (setq from (setq to elt))) (while (<= from to) (if (>= from 128) - (define-key key-translation-map + (define-key keymap (vector from) 'encoded-kbd-self-insert-ccl)) (setq from (1+ from)))) 8)) @@ -251,59 +251,50 @@ (t nil))) -;; key-translation-map at the time Encoded-kbd mode is turned on is -;; saved here. -(defvar saved-key-translation-map nil) - -;; Input mode at the time Encoded-kbd mode is turned on is saved here. -(defvar saved-input-mode nil) +;;;###autoload +(defun encoded-kbd-setup-display (display) + "Set up a `key-translation-map' for `keyboard-coding-system' on DISPLAY. -(put 'encoded-kbd-mode 'permanent-local t) -;;;###autoload -(define-minor-mode encoded-kbd-mode - "Toggle Encoded-kbd minor mode. -With arg, turn Encoded-kbd mode on if and only if arg is positive. - -You should not turn this mode on manually, instead use the command -\\[set-keyboard-coding-system] which turns on or off this mode -automatically. - -In Encoded-kbd mode, a text sent from keyboard is accepted -as a multilingual text encoded in a coding system set by -\\[set-keyboard-coding-system]." - :global t :group 'keyboard :group 'mule +DISPLAY may be a display id, a frame, or nil for the selected frame's display." + (let ((frame (if (framep display) display (car (frames-on-display-list display))))) + (when frame + (with-selected-frame frame + ;; Remove any previous encoded-kb keymap from key-translation-map. + (let ((m local-key-translation-map)) + (if (equal (keymap-prompt m) "encoded-kb") + (setq local-key-translation-map (keymap-parent m)) + (while (keymap-parent m) + (if (equal (keymap-prompt (keymap-parent m)) "encoded-kb") + (set-keymap-parent m (keymap-parent (keymap-parent m)))) + (setq m (keymap-parent m))))) - (if encoded-kbd-mode - ;; We are turning on Encoded-kbd mode. - (let ((coding (keyboard-coding-system)) - result) - (or saved-key-translation-map - (if (keymapp key-translation-map) - (setq saved-key-translation-map - (copy-keymap key-translation-map)) - (setq key-translation-map (make-sparse-keymap)))) - (or saved-input-mode - (setq saved-input-mode - (current-input-mode))) - (setq result (and coding (encoded-kbd-setup-keymap coding))) - (if result - (if (eq result 8) - (set-input-mode - (nth 0 saved-input-mode) - (nth 1 saved-input-mode) - 'use-8th-bit - (nth 3 saved-input-mode))) - (setq encoded-kbd-mode nil - saved-key-translation-map nil - saved-input-mode nil) - (error "Unsupported coding system in Encoded-kbd mode: %S" - coding))) - - ;; We are turning off Encoded-kbd mode. - (setq key-translation-map saved-key-translation-map - saved-key-translation-map nil) - (apply 'set-input-mode saved-input-mode) - (setq saved-input-mode nil))) + (if (keyboard-coding-system) + ;; We are turning on Encoded-kbd mode. + (let ((coding (keyboard-coding-system)) + (keymap (make-sparse-keymap "encoded-kb")) + (cim (current-input-mode)) + result) + (set-keymap-parent keymap local-key-translation-map) + (setq local-key-translation-map keymap) + (unless (terminal-parameter nil 'encoded-kbd-saved-input-mode) + (set-terminal-parameter nil 'encoded-kbd-saved-input-mode cim)) + (setq result (and coding (encoded-kbd-setup-keymap keymap coding))) + (if result + (when (and (eq result 8) + (memq (nth 2 cim) '(t nil))) + (set-input-mode + (nth 0 cim) + (nth 1 cim) + 'use-8th-bit + (nth 3 cim))) + (set-terminal-parameter nil 'encoded-kbd-saved-input-mode nil) + (error "Unsupported coding system in Encoded-kbd mode: %S" + coding))) + ;; We are turning off Encoded-kbd mode. + (unless (equal (current-input-mode) + (terminal-parameter nil 'encoded-kbd-saved-input-mode)) + (apply 'set-input-mode (terminal-parameter nil 'encoded-kbd-saved-input-mode))) + (set-terminal-parameter nil 'saved-input-mode nil)))))) (provide 'encoded-kb)
--- a/lisp/international/mule-cmds.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/international/mule-cmds.el Mon Dec 19 19:57:22 2005 +0000 @@ -148,7 +148,7 @@ t) (define-key-after set-coding-system-map [set-terminal-coding-system] '(menu-item "For Terminal" set-terminal-coding-system - :enable (null (memq window-system '(x w32 mac))) + :enable (null (memq initial-window-system '(x w32 mac))) :help "How to encode terminal output") t) (define-key-after set-coding-system-map [separator-3] @@ -1795,7 +1795,7 @@ (reset-language-environment) -(defun set-display-table-and-terminal-coding-system (language-name &optional coding-system) +(defun set-display-table-and-terminal-coding-system (language-name &optional coding-system display) "Set up the display table and terminal coding system for LANGUAGE-NAME." (let ((coding (get-language-info language-name 'unibyte-display))) (if (and coding @@ -1811,7 +1811,7 @@ (dotimes (i 128) (aset standard-display-table (+ i 128) nil)))) (or (eq window-system 'pc) - (set-terminal-coding-system (or coding-system coding))))) + (set-terminal-coding-system (or coding-system coding) display)))) (defun set-language-environment (language-name) "Set up multi-lingual environment for using LANGUAGE-NAME. @@ -2406,7 +2406,7 @@ ;; too, for setting things such as calendar holidays, ps-print paper ;; size, spelling dictionary. -(defun set-locale-environment (&optional locale-name) +(defun set-locale-environment (&optional locale-name display) "Set up multi-lingual environment for using LOCALE-NAME. This sets the language environment, the coding system priority, the default input method and sometimes other things. @@ -2427,6 +2427,11 @@ will be translated according to the table specified by `locale-translation-file-name'. +If DISPLAY is non-nil, only set the keyboard coding system and +the terminal coding system for the given display, and don't touch +session-global parameters like the language environment. DISPLAY +may be a display id or a frame. + See also `locale-charset-language-names', `locale-language-names', `locale-preferred-coding-systems' and `locale-coding-system'." (interactive "sSet environment for locale: ") @@ -2455,7 +2460,7 @@ (let ((vars '("LC_ALL" "LC_CTYPE" "LANG"))) (while (and vars (= 0 (length locale))) ; nil or empty string - (setq locale (getenv (pop vars)))))) + (setq locale (terminal-getenv (pop vars)))))) (unless locale ;; The two tests are kept separate so the byte-compiler sees @@ -2518,28 +2523,34 @@ ;; Set up for this character set. This is now the right way ;; to do it for both unibyte and multibyte modes. - (set-language-environment language-name) + (unless display + (set-language-environment language-name)) ;; If default-enable-multibyte-characters is nil, ;; we are using single-byte characters, ;; so the display table and terminal coding system are irrelevant. (when default-enable-multibyte-characters (set-display-table-and-terminal-coding-system - language-name coding-system)) + language-name coding-system display)) ;; Set the `keyboard-coding-system' if appropriate (tty ;; only). At least X and MS Windows can generate ;; multilingual input. - (unless window-system - (let ((kcs (or coding-system - (car (get-language-info language-name - 'coding-system))))) - (if kcs (set-keyboard-coding-system kcs)))) + ;; XXX This was disabled unless `window-system', but that + ;; leads to buggy behaviour when a tty frame is opened + ;; later. Setting the keyboard coding system has no adverse + ;; effect on X, so let's do it anyway. -- Lorentey + (let ((kcs (or coding-system + (car (get-language-info language-name + 'coding-system))))) + (if kcs (set-keyboard-coding-system kcs display))) - (setq locale-coding-system - (car (get-language-info language-name 'coding-priority)))) + (unless display + (setq locale-coding-system + (car (get-language-info language-name 'coding-priority))))) - (when (and coding-system + (when (and (not display) + coding-system (not (coding-system-equal coding-system locale-coding-system))) (prefer-coding-system coding-system) @@ -2551,9 +2562,9 @@ (when (boundp 'w32-ansi-code-page) (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) (when (coding-system-p code-page-coding) - (setq locale-coding-system code-page-coding) - (set-keyboard-coding-system code-page-coding) - (set-terminal-coding-system code-page-coding)))) + (unless display (setq locale-coding-system code-page-coding)) + (set-keyboard-coding-system code-page-coding display) + (set-terminal-coding-system code-page-coding display)))) (when (eq system-type 'darwin) ;; On Darwin, file names are always encoded in utf-8, no matter @@ -2562,38 +2573,39 @@ ;; Mac OS X's Terminal.app by default uses utf-8 regardless of ;; the locale. (when (and (null window-system) - (equal (getenv "TERM_PROGRAM") "Apple_Terminal")) + (equal (terminal-getenv "TERM_PROGRAM") "Apple_Terminal")) (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8))) ;; Default to A4 paper if we're not in a C, POSIX or US locale. ;; (See comments in Flocale_info.) - (let ((locale locale) - (paper (locale-info 'paper))) - (if paper - ;; This will always be null at the time of writing. - (cond - ((equal paper '(216 279)) - (setq ps-paper-type 'letter)) - ((equal paper '(210 297)) - (setq ps-paper-type 'a4))) - (let ((vars '("LC_ALL" "LC_PAPER" "LANG"))) - (while (and vars (= 0 (length locale))) - (setq locale (getenv (pop vars))))) - (when locale - ;; As of glibc 2.2.5, these are the only US Letter locales, - ;; and the rest are A4. - (setq ps-paper-type - (or (locale-name-match locale '(("c$" . letter) - ("posix$" . letter) - (".._us" . letter) - (".._pr" . letter) - (".._ca" . letter) - ("enu$" . letter) ; Windows - ("esu$" . letter) - ("enc$" . letter) - ("frc$" . letter))) - 'a4)))))) + (unless display + (let ((locale locale) + (paper (locale-info 'paper))) + (if paper + ;; This will always be null at the time of writing. + (cond + ((equal paper '(216 279)) + (setq ps-paper-type 'letter)) + ((equal paper '(210 297)) + (setq ps-paper-type 'a4))) + (let ((vars '("LC_ALL" "LC_PAPER" "LANG"))) + (while (and vars (= 0 (length locale))) + (setq locale (terminal-getenv (pop vars))))) + (when locale + ;; As of glibc 2.2.5, these are the only US Letter locales, + ;; and the rest are A4. + (setq ps-paper-type + (or (locale-name-match locale '(("c$" . letter) + ("posix$" . letter) + (".._us" . letter) + (".._pr" . letter) + (".._ca" . letter) + ("enu$" . letter) ; Windows + ("esu$" . letter) + ("enc$" . letter) + ("frc$" . letter))) + 'a4))))))) nil) ;;; Charset property
--- a/lisp/international/mule.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/international/mule.el Mon Dec 19 19:57:22 2005 +0000 @@ -1211,13 +1211,17 @@ This is normally set according to the selected language environment. See also the command `set-terminal-coding-system'.") -(defun set-terminal-coding-system (coding-system) - "Set coding system of your terminal to CODING-SYSTEM. -All text output to the terminal will be encoded +(defun set-terminal-coding-system (coding-system &optional display) + "Set coding system of terminal output to CODING-SYSTEM. +All text output to DISPLAY will be encoded with the specified coding system. + For a list of possible values of CODING-SYSTEM, use \\[list-coding-systems]. The default is determined by the selected language environment -or by the previous use of this command." +or by the previous use of this command. + +DISPLAY may be a display id, a frame, or nil for the selected frame's display. +The setting has no effect on graphical displays." (interactive (list (let ((default (if (and (not (terminal-coding-system)) default-terminal-coding-system) @@ -1231,7 +1235,7 @@ (setq coding-system default-terminal-coding-system)) (if coding-system (setq default-terminal-coding-system coding-system)) - (set-terminal-coding-system-internal coding-system) + (set-terminal-coding-system-internal coding-system display) (redraw-frame (selected-frame))) (defvar default-keyboard-coding-system nil @@ -1239,14 +1243,17 @@ This is normally set according to the selected language environment. See also the command `set-keyboard-coding-system'.") -(defun set-keyboard-coding-system (coding-system) - "Set coding system for keyboard input to CODING-SYSTEM. -In addition, this command enables Encoded-kbd minor mode. -\(If CODING-SYSTEM is nil, Encoded-kbd mode is turned off -- see -`encoded-kbd-mode'.) +(defun set-keyboard-coding-system (coding-system &optional display) + "Set coding system for keyboard input on DISPLAY to CODING-SYSTEM. +In addition, this command calls `encoded-kbd-setup-display' to set up the +translation of keyboard input events to the specified coding system. + For a list of possible values of CODING-SYSTEM, use \\[list-coding-systems]. The default is determined by the selected language environment -or by the previous use of this command." +or by the previous use of this command. + +DISPLAY may be a display id, a frame, or nil for the selected frame's display. +The setting has no effect on graphical displays." (interactive (list (let ((default (if (and (not (keyboard-coding-system)) default-keyboard-coding-system) @@ -1263,9 +1270,9 @@ (if (and coding-system (coding-system-get coding-system 'ascii-incompatible)) (error "%s is not ASCII-compatible" coding-system)) - (set-keyboard-coding-system-internal coding-system) + (set-keyboard-coding-system-internal coding-system display) (setq keyboard-coding-system coding-system) - (encoded-kbd-mode (if coding-system 1 0))) + (encoded-kbd-setup-display display)) (defcustom keyboard-coding-system nil "Specify coding system for keyboard input. @@ -1281,8 +1288,8 @@ :link '(info-link "(emacs)Specify Coding") :link '(info-link "(emacs)Single-Byte Character Support") :set (lambda (symbol value) - ;; Don't load encoded-kbd-mode unnecessarily. - (if (or value (boundp 'encoded-kbd-mode)) + ;; Don't load encoded-kb unnecessarily. + (if (or value (boundp 'encoded-kbd-setup-display)) (set-keyboard-coding-system value) (set-default 'keyboard-coding-system nil))) ; must initialize :version "22.1"
--- a/lisp/isearch.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/isearch.el Mon Dec 19 19:57:22 2005 +0000 @@ -1655,7 +1655,7 @@ (keylist (listify-key-sequence key)) scroll-command isearch-point) (cond ((and (= (length key) 1) - (let ((lookup (lookup-key function-key-map key))) + (let ((lookup (lookup-key local-function-key-map key))) (not (or (null lookup) (integerp lookup) (keymapp lookup))))) ;; Handle a function key that translates into something else. @@ -1669,7 +1669,7 @@ (isearch-done) (apply 'isearch-unread keylist)) (setq keylist - (listify-key-sequence (lookup-key function-key-map key))) + (listify-key-sequence (lookup-key local-function-key-map key))) (while keylist (setq key (car keylist)) ;; If KEY is a printing char, we handle it here
--- a/lisp/ldefs-boot.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/ldefs-boot.el Mon Dec 19 19:57:22 2005 +0000 @@ -4,7 +4,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (17140 20945)) +;;;;;; "play/5x5.el" (17187 59902)) ;;; Generated autoloads from play/5x5.el (autoload (quote 5x5) "5x5" "\ @@ -64,7 +64,7 @@ ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (17205 6157)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload (quote ada-add-extensions) "ada-mode" "\ @@ -125,7 +125,7 @@ ;;;*** ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el" -;;;;;; (17140 20951)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload (quote ada-header) "ada-stmt" "\ @@ -136,7 +136,7 @@ ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (17205 6160)) +;;;;;; (17226 24577)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload (quote ada-find-file) "ada-xref" "\ @@ -151,7 +151,7 @@ ;;;;;; change-log-mode add-change-log-entry-other-window add-change-log-entry ;;;;;; find-change-log prompt-for-change-log-name add-log-mailing-address ;;;;;; add-log-full-name add-log-current-defun-function) "add-log" -;;;;;; "add-log.el" (17244 43726)) +;;;;;; "add-log.el" (17277 60153)) ;;; Generated autoloads from add-log.el (defvar add-log-current-defun-function nil "\ @@ -288,8 +288,8 @@ ;;;*** ;;;### (autoloads (defadvice ad-add-advice ad-default-compilation-action -;;;;;; ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17245 -;;;;;; 4869)) +;;;;;; ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17257 +;;;;;; 22482)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action (quote warn) "\ @@ -388,7 +388,7 @@ ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (17148 24935)) +;;;;;; align) "align" "align.el" (17187 59901)) ;;; Generated autoloads from align.el (autoload (quote align) "align" "\ @@ -478,7 +478,7 @@ ;;;*** ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el" -;;;;;; (17243 21661)) +;;;;;; (17257 22482)) ;;; Generated autoloads from allout.el (autoload (quote allout-mode) "allout" "\ @@ -694,7 +694,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (17244 43756)) +;;;;;; "net/ange-ftp.el" (17257 22483)) ;;; Generated autoloads from net/ange-ftp.el (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir)) @@ -716,7 +716,7 @@ ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (17239 32364)) +;;;;;; "animate" "play/animate.el" (17226 24576)) ;;; Generated autoloads from play/animate.el (autoload (quote animate-string) "animate" "\ @@ -744,7 +744,7 @@ ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (17185 27398)) +;;;;;; "ansi-color" "ansi-color.el" (17187 59901)) ;;; Generated autoloads from ansi-color.el (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\ @@ -770,7 +770,7 @@ ;;;*** ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules) -;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (17205 20021)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (17187 59902)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\ @@ -809,7 +809,7 @@ ;;;### (autoloads (appt-activate appt-make-list appt-delete appt-add ;;;;;; appt-display-diary appt-display-duration appt-display-mode-line ;;;;;; appt-msg-window appt-visible appt-audible appt-message-warning-time -;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17239 32265)) +;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17229 28052)) ;;; Generated autoloads from calendar/appt.el (defvar appt-issue-message t "\ @@ -896,28 +896,51 @@ ;;;*** ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property -;;;;;; apropos-command apropos-variable) "apropos" "apropos.el" -;;;;;; (17205 5977)) +;;;;;; apropos-command apropos-variable apropos-read-pattern) "apropos" +;;;;;; "apropos.el" (17277 59649)) ;;; Generated autoloads from apropos.el +(autoload (quote apropos-read-pattern) "apropos" "\ +Read an apropos pattern, either a word list or a regexp. +Returns the user pattern, either a list of words which are matched +literally, or a string which is used as a regexp to search for. + +SUBJECT is a string that is included in the prompt to identify what +kind of objects to search. + +\(fn SUBJECT)" nil nil) + (autoload (quote apropos-variable) "apropos" "\ -Show user variables that match REGEXP. -With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also show +Show user variables that match PATTERN. +PATTERN can be a word, a list of words (separated by spaces), +or a regexp (using some regexp special characters). If it is a word, +search for matches for that word as a substring. If it is a list of words, +search for matches for any two (or more) of those words. + +With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also show normal variables. -\(fn REGEXP &optional DO-ALL)" t nil) +\(fn PATTERN &optional DO-ALL)" t nil) (defalias (quote command-apropos) (quote apropos-command)) (autoload (quote apropos-command) "apropos" "\ -Show commands (interactively callable functions) that match APROPOS-REGEXP. -With optional prefix DO-ALL, or if `apropos-do-all' is non-nil, also show +Show commands (interactively callable functions) that match PATTERN. +PATTERN can be a word, a list of words (separated by spaces), +or a regexp (using some regexp special characters). If it is a word, +search for matches for that word as a substring. If it is a list of words, +search for matches for any two (or more) of those words. + +With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also show noninteractive functions. If VAR-PREDICATE is non-nil, show only variables, and only those that satisfy the predicate VAR-PREDICATE. -\(fn APROPOS-REGEXP &optional DO-ALL VAR-PREDICATE)" t nil) +When called from a Lisp program, a string PATTERN is used as a regexp, +while a list of strings is used as a word list. + +\(fn PATTERN &optional DO-ALL VAR-PREDICATE)" t nil) (autoload (quote apropos-documentation-property) "apropos" "\ Like (documentation-property SYMBOL PROPERTY RAW) but handle errors. @@ -925,34 +948,49 @@ \(fn SYMBOL PROPERTY RAW)" nil nil) (autoload (quote apropos) "apropos" "\ -Show all bound symbols whose names match APROPOS-REGEXP. -With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also +Show all bound symbols whose names match PATTERN. +PATTERN can be a word, a list of words (separated by spaces), +or a regexp (using some regexp special characters). If it is a word, +search for matches for that word as a substring. If it is a list of words, +search for matches for any two (or more) of those words. + +With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also show unbound symbols and key bindings, which is a little more time-consuming. Returns list of symbols and documentation found. -\(fn APROPOS-REGEXP &optional DO-ALL)" t nil) +\(fn PATTERN &optional DO-ALL)" t nil) (autoload (quote apropos-value) "apropos" "\ -Show all symbols whose value's printed image matches APROPOS-REGEXP. -With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also looks +Show all symbols whose value's printed image matches PATTERN. +PATTERN can be a word, a list of words (separated by spaces), +or a regexp (using some regexp special characters). If it is a word, +search for matches for that word as a substring. If it is a list of words, +search for matches for any two (or more) of those words. + +With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also looks at the function and at the names and values of properties. Returns list of symbols and values found. -\(fn APROPOS-REGEXP &optional DO-ALL)" t nil) +\(fn PATTERN &optional DO-ALL)" t nil) (autoload (quote apropos-documentation) "apropos" "\ -Show symbols whose documentation contain matches for APROPOS-REGEXP. -With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also use +Show symbols whose documentation contain matches for PATTERN. +PATTERN can be a word, a list of words (separated by spaces), +or a regexp (using some regexp special characters). If it is a word, +search for matches for that word as a substring. If it is a list of words, +search for matches for any two (or more) of those words. + +With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also use documentation that is not stored in the documentation file and show key bindings. Returns list of symbols and documentation found. -\(fn APROPOS-REGEXP &optional DO-ALL)" t nil) - -;;;*** - -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17239 -;;;;;; 32182)) +\(fn PATTERN &optional DO-ALL)" t nil) + +;;;*** + +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17238 +;;;;;; 21257)) ;;; Generated autoloads from arc-mode.el (autoload (quote archive-mode) "arc-mode" "\ @@ -972,7 +1010,7 @@ ;;;*** -;;;### (autoloads (array-mode) "array" "array.el" (17148 24939)) +;;;### (autoloads (array-mode) "array" "array.el" (17187 59901)) ;;; Generated autoloads from array.el (autoload (quote array-mode) "array" "\ @@ -1043,8 +1081,8 @@ ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17239 -;;;;;; 32406)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17229 +;;;;;; 28057)) ;;; Generated autoloads from textmodes/artist.el (autoload (quote artist-mode) "artist" "\ @@ -1249,8 +1287,8 @@ ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17140 -;;;;;; 20953)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload (quote asm-mode) "asm-mode" "\ @@ -1278,7 +1316,7 @@ ;;;*** ;;;### (autoloads (auto-show-mode auto-show-mode) "auto-show" "obsolete/auto-show.el" -;;;;;; (17075 55468)) +;;;;;; (17187 59881)) ;;; Generated autoloads from obsolete/auto-show.el (defvar auto-show-mode nil "\ @@ -1294,7 +1332,7 @@ ;;;*** ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el" -;;;;;; (17148 24940)) +;;;;;; (17187 59901)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1351,7 +1389,7 @@ ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (17185 27619)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/autoconf.el (autoload (quote autoconf-mode) "autoconf" "\ @@ -1362,7 +1400,7 @@ ;;;*** ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert) -;;;;;; "autoinsert" "autoinsert.el" (17148 24940)) +;;;;;; "autoinsert" "autoinsert.el" (17187 59901)) ;;; Generated autoloads from autoinsert.el (autoload (quote auto-insert) "autoinsert" "\ @@ -1402,7 +1440,7 @@ ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (17239 32274)) +;;;;;; (17277 59649)) ;;; Generated autoloads from emacs-lisp/autoload.el (autoload (quote update-file-autoloads) "autoload" "\ @@ -1437,7 +1475,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (17148 24940)) +;;;;;; "autorevert" "autorevert.el" (17187 59901)) ;;; Generated autoloads from autorevert.el (autoload (quote auto-revert-mode) "autorevert" "\ @@ -1507,7 +1545,7 @@ ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (17148 24940)) +;;;;;; "avoid.el" (17187 59901)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1548,7 +1586,7 @@ ;;;*** ;;;### (autoloads (backquote) "backquote" "emacs-lisp/backquote.el" -;;;;;; (17148 25082)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/backquote.el (autoload (quote backquote) "backquote" "\ @@ -1573,7 +1611,7 @@ ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (17148 24941)) +;;;;;; (17187 59901)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1606,7 +1644,7 @@ ;;;*** ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run) -;;;;;; "benchmark" "emacs-lisp/benchmark.el" (17148 25082)) +;;;;;; "benchmark" "emacs-lisp/benchmark.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload (quote benchmark-run) "benchmark" "\ @@ -1638,8 +1676,8 @@ ;;;*** -;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17239 -;;;;;; 32408)) +;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17238 +;;;;;; 21257)) ;;; Generated autoloads from textmodes/bibtex.el (autoload (quote bibtex-mode) "bibtex" "\ @@ -1701,7 +1739,7 @@ ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "gnus/binhex.el" -;;;;;; (17148 25105)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/binhex.el (defconst binhex-begin-line "^:...............................................................$") @@ -1724,8 +1762,8 @@ ;;;*** -;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17246 -;;;;;; 24773)) +;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17257 +;;;;;; 22483)) ;;; Generated autoloads from play/blackbox.el (autoload (quote blackbox) "blackbox" "\ @@ -1847,7 +1885,7 @@ ;;;### (autoloads (bookmark-bmenu-list bookmark-load bookmark-save ;;;;;; bookmark-write bookmark-delete bookmark-insert bookmark-rename ;;;;;; bookmark-insert-location bookmark-relocate bookmark-jump -;;;;;; bookmark-set) "bookmark" "bookmark.el" (17239 32184)) +;;;;;; bookmark-set) "bookmark" "bookmark.el" (17277 59649)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-map "rb" 'bookmark-jump) (define-key ctl-x-map "rm" 'bookmark-set) @@ -2037,7 +2075,7 @@ ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file ;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point ;;;;;; browse-url-galeon-program browse-url-firefox-program browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (17246 15074)) +;;;;;; "browse-url" "net/browse-url.el" (17257 22483)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function (cond ((memq system-type (quote (windows-nt ms-dos cygwin))) (quote browse-url-default-windows-browser)) ((memq system-type (quote (darwin))) (quote browse-url-default-macosx-browser)) (t (quote browse-url-default-browser))) "\ @@ -2368,8 +2406,8 @@ ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17140 -;;;;;; 20945)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from play/bruce.el (autoload (quote bruce) "bruce" "\ @@ -2385,7 +2423,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (17185 27401)) +;;;;;; "bs" "bs.el" (17187 59901)) ;;; Generated autoloads from bs.el (autoload (quote bs-cycle-next) "bs" "\ @@ -2426,8 +2464,8 @@ ;;;*** ;;;### (autoloads (insert-text-button make-text-button insert-button -;;;;;; make-button define-button-type) "button" "button.el" (17148 -;;;;;; 24943)) +;;;;;; make-button define-button-type) "button" "button.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from button.el (defvar button-map (let ((map (make-sparse-keymap))) (define-key map " " (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\ @@ -2515,7 +2553,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile) "bytecomp" "emacs-lisp/bytecomp.el" -;;;;;; (17243 21661)) +;;;;;; (17257 22482)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (autoload (quote byte-force-recompile) "bytecomp" "\ @@ -2607,7 +2645,7 @@ ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17102 18464)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17187 59880)) ;;; Generated autoloads from calendar/cal-dst.el (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t) @@ -2617,7 +2655,7 @@ ;;;*** ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el" -;;;;;; (17167 2790)) +;;;;;; (17187 59901)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\ @@ -2632,7 +2670,7 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc ;;;;;; full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el" -;;;;;; (17239 32263)) +;;;;;; (17277 59649)) ;;; Generated autoloads from calc/calc.el (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\ @@ -2710,8 +2748,8 @@ ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (17148 -;;;;;; 24944)) +;;;### (autoloads (calculator) "calculator" "calculator.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from calculator.el (autoload (quote calculator) "calculator" "\ @@ -2739,7 +2777,7 @@ ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" -;;;;;; "calendar/calendar.el" (17239 32268)) +;;;;;; "calendar/calendar.el" (17229 28052)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@ -3310,7 +3348,7 @@ ;;;*** ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock" -;;;;;; "gnus/canlock.el" (17148 25106)) +;;;;;; "gnus/canlock.el" (17187 59901)) ;;; Generated autoloads from gnus/canlock.el (autoload (quote canlock-insert-header) "canlock" "\ @@ -3328,7 +3366,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (17148 25186)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload (quote c-guess-basic-syntax) "cc-engine" "\ @@ -3341,7 +3379,7 @@ ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (17239 32368)) +;;;;;; (17226 24577)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -3499,7 +3537,7 @@ ;;;*** ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles" -;;;;;; "progmodes/cc-styles.el" (17239 32369)) +;;;;;; "progmodes/cc-styles.el" (17226 24577)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload (quote c-set-style) "cc-styles" "\ @@ -3556,7 +3594,7 @@ ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program ;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el" -;;;;;; (17102 18708)) +;;;;;; (17187 59880)) ;;; Generated autoloads from international/ccl.el (autoload (quote ccl-compile) "ccl" "\ @@ -3815,7 +3853,7 @@ ;;;*** ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el" -;;;;;; (17140 20960)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/cfengine.el (autoload (quote cfengine-mode) "cfengine" "\ @@ -3837,7 +3875,7 @@ ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc) "checkdoc" "emacs-lisp/checkdoc.el" -;;;;;; (17239 32275)) +;;;;;; (17226 24574)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (autoload (quote checkdoc) "checkdoc" "\ @@ -4020,8 +4058,8 @@ ;;;*** ;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer -;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17102 -;;;;;; 18766)) +;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17187 +;;;;;; 59881)) ;;; Generated autoloads from language/china-util.el (autoload (quote decode-hz-region) "china-util" "\ @@ -4049,7 +4087,7 @@ ;;;*** ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command) -;;;;;; "chistory" "chistory.el" (17148 24944)) +;;;;;; "chistory" "chistory.el" (17187 59901)) ;;; Generated autoloads from chistory.el (autoload (quote repeat-matching-complex-command) "chistory" "\ @@ -4088,7 +4126,7 @@ ;;;*** -;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17148 25089)) +;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/cl.el (defvar custom-print-functions nil "\ @@ -4104,7 +4142,7 @@ ;;;*** ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el" -;;;;;; (17148 25088)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload (quote common-lisp-indent-function) "cl-indent" "\ @@ -4115,7 +4153,7 @@ ;;;*** ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el" -;;;;;; (17205 6162)) +;;;;;; (17226 24577)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload (quote c-macro-expand) "cmacexp" "\ @@ -4135,8 +4173,8 @@ ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17148 -;;;;;; 24945)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from cmuscheme.el (autoload (quote run-scheme) "cmuscheme" "\ @@ -4157,7 +4195,7 @@ ;;;*** ;;;### (autoloads (cp-make-coding-system) "code-pages" "international/code-pages.el" -;;;;;; (17239 32320)) +;;;;;; (17226 24576)) ;;; Generated autoloads from international/code-pages.el (autoload (quote cp-make-coding-system) "code-pages" "\ @@ -4210,7 +4248,7 @@ ;;;### (autoloads (codepage-setup cp-supported-codepages cp-offset-for-codepage ;;;;;; cp-language-for-codepage cp-charset-for-codepage cp-make-coding-systems-for-codepage) -;;;;;; "codepage" "international/codepage.el" (17239 32321)) +;;;;;; "codepage" "international/codepage.el" (17226 24576)) ;;; Generated autoloads from international/codepage.el (autoload (quote cp-make-coding-systems-for-codepage) "codepage" "\ @@ -4269,7 +4307,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (17239 32187)) +;;;;;; (17277 60153)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\ @@ -4359,8 +4397,8 @@ ;;;*** -;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17159 -;;;;;; 1461)) +;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from compare-w.el (autoload (quote compare-windows) "compare-w" "\ @@ -4397,7 +4435,7 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook) -;;;;;; "compile" "progmodes/compile.el" (17239 32370)) +;;;;;; "compile" "progmodes/compile.el" (17263 27852)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4558,7 +4596,7 @@ ;;;*** ;;;### (autoloads (partial-completion-mode) "complete" "complete.el" -;;;;;; (17148 24947)) +;;;;;; (17187 59901)) ;;; Generated autoloads from complete.el (defvar partial-completion-mode nil "\ @@ -4595,7 +4633,7 @@ ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (17239 32188)) +;;;;;; (17226 24571)) ;;; Generated autoloads from completion.el (autoload (quote dynamic-completion-mode) "completion" "\ @@ -4608,7 +4646,7 @@ ;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after ;;;;;; find-composition compose-chars decompose-string compose-string ;;;;;; decompose-region compose-region encode-composition-rule) -;;;;;; "composite" "composite.el" (17120 44761)) +;;;;;; "composite" "composite.el" (17187 59901)) ;;; Generated autoloads from composite.el (defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\ @@ -4829,7 +4867,7 @@ ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode ;;;;;; conf-space-mode conf-javaprop-mode conf-windows-mode conf-unix-mode -;;;;;; conf-mode) "conf-mode" "textmodes/conf-mode.el" (17239 32409)) +;;;;;; conf-mode) "conf-mode" "textmodes/conf-mode.el" (17263 27852)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload (quote conf-mode) "conf-mode" "\ @@ -4863,7 +4901,7 @@ \\{conf-mode-map} -\(fn &optional COMMENT SYNTAX-TABLE NAME)" t nil) +\(fn)" t nil) (autoload (quote conf-unix-mode) "conf-mode" "\ Conf Mode starter for Unix style Conf files. @@ -4921,8 +4959,7 @@ recognized according to `conf-space-keywords'. Interactively with a prefix ARG of `0' no keywords will be recognized. With any other prefix arg you will be prompted for a regexp to match -the keywords. Programmatically you can pass such a regexp as -KEYWORDS, or any non-nil non-string for no keywords. +the keywords. For details see `conf-mode'. Example: @@ -4938,7 +4975,7 @@ add /dev/audio desktop add /dev/mixer desktop -\(fn &optional KEYWORDS)" t nil) +\(fn)" t nil) (autoload (quote conf-colon-mode) "conf-mode" "\ Conf Mode starter for Colon files. @@ -4950,7 +4987,7 @@ <Multi_key> <exclam> <exclam> : \"\\241\" exclamdown <Multi_key> <c> <slash> : \"\\242\" cent -\(fn &optional COMMENT SYNTAX-TABLE NAME)" t nil) +\(fn)" t nil) (autoload (quote conf-ppd-mode) "conf-mode" "\ Conf Mode starter for Adobe/CUPS PPD files. @@ -4979,7 +5016,7 @@ ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (17140 20945)) +;;;;;; "cookie1" "play/cookie1.el" (17187 59902)) ;;; Generated autoloads from play/cookie1.el (autoload (quote cookie) "cookie1" "\ @@ -5011,7 +5048,7 @@ ;;;*** ;;;### (autoloads (copyright copyright-fix-years copyright-update) -;;;;;; "copyright" "emacs-lisp/copyright.el" (17148 25089)) +;;;;;; "copyright" "emacs-lisp/copyright.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/copyright.el (autoload (quote copyright-update) "copyright" "\ @@ -5039,7 +5076,7 @@ ;;;*** ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el" -;;;;;; (17185 27634)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/cperl-mode.el (autoload (quote cperl-mode) "cperl-mode" "\ @@ -5212,7 +5249,7 @@ ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (17140 20963)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/cpp.el (autoload (quote cpp-highlight-buffer) "cpp" "\ @@ -5231,7 +5268,7 @@ ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (17140 20920)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5255,7 +5292,7 @@ ;;;*** ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el" -;;;;;; (17148 25089)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload (quote completing-read-multiple) "crm" "\ @@ -5291,7 +5328,7 @@ ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (17239 32278)) +;;;;;; (17251 25141)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5353,7 +5390,7 @@ ;;;;;; customize-face customize-changed-options customize-option-other-window ;;;;;; customize-option customize-group-other-window customize-group ;;;;;; customize-mode customize customize-save-variable customize-set-variable -;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17244 43728)) +;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17277 60153)) ;;; Generated autoloads from cus-edit.el (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'") @@ -5608,7 +5645,7 @@ ;;;*** ;;;### (autoloads (custom-reset-faces custom-theme-reset-faces custom-set-faces -;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17242 7305)) +;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17244 4913)) ;;; Generated autoloads from cus-face.el (autoload (quote custom-declare-face) "cus-face" "\ @@ -5678,7 +5715,7 @@ ;;;*** ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el" -;;;;;; (17185 27407)) +;;;;;; (17187 59914)) ;;; Generated autoloads from cus-theme.el (autoload (quote customize-create-theme) "cus-theme" "\ @@ -5689,7 +5726,7 @@ ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el" -;;;;;; (17148 24952)) +;;;;;; (17187 59901)) ;;; Generated autoloads from cvs-status.el (autoload (quote cvs-status-mode) "cvs-status" "\ @@ -5700,7 +5737,7 @@ ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (17140 20964)) +;;;;;; "cwarn" "progmodes/cwarn.el" (17187 59902)) ;;; Generated autoloads from progmodes/cwarn.el (autoload (quote cwarn-mode) "cwarn" "\ @@ -5744,7 +5781,7 @@ ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char ;;;;;; cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el" -;;;;;; (17102 18767)) +;;;;;; (17187 59881)) ;;; Generated autoloads from language/cyril-util.el (autoload (quote cyrillic-encode-koi8-r-char) "cyril-util" "\ @@ -5773,7 +5810,7 @@ ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (17239 32191)) +;;;;;; (17238 21257)) ;;; Generated autoloads from dabbrev.el (define-key esc-map "/" 'dabbrev-expand) (define-key esc-map [?\C-/] 'dabbrev-completion) @@ -5820,8 +5857,8 @@ ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17140 -;;;;;; 20964)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload (quote dcl-mode) "dcl-mode" "\ @@ -5948,7 +5985,7 @@ ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (17244 43742)) +;;;;;; "emacs-lisp/debug.el" (17257 22482)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger (quote debug)) @@ -5992,7 +6029,7 @@ ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (17205 6149)) +;;;;;; (17226 24576)) ;;; Generated autoloads from play/decipher.el (autoload (quote decipher) "decipher" "\ @@ -6021,8 +6058,8 @@ ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17148 -;;;;;; 24953)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from delim-col.el (autoload (quote delimit-columns-customize) "delim-col" "\ @@ -6046,8 +6083,8 @@ ;;;*** -;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17185 -;;;;;; 27637)) +;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17187 +;;;;;; 59914)) ;;; Generated autoloads from progmodes/delphi.el (autoload (quote delphi-mode) "delphi" "\ @@ -6097,8 +6134,8 @@ ;;;*** -;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17159 -;;;;;; 1461)) +;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from delsel.el (defalias (quote pending-delete-mode) (quote delete-selection-mode)) @@ -6128,7 +6165,7 @@ ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (17148 25090)) +;;;;;; "derived" "emacs-lisp/derived.el" (17277 59649)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload (quote define-derived-mode) "derived" "\ @@ -6193,7 +6230,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (17185 27409)) +;;;;;; "descr-text.el" (17187 59914)) ;;; Generated autoloads from descr-text.el (autoload (quote describe-text-properties) "descr-text" "\ @@ -6218,7 +6255,7 @@ ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-locals-to-save -;;;;;; desktop-save-mode) "desktop" "desktop.el" (17242 7306)) +;;;;;; desktop-save-mode) "desktop" "desktop.el" (17244 4913)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6383,7 +6420,7 @@ ;;;;;; gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines ;;;;;; gnus-outlook-display-hook gnus-outlook-deuglify-unwrap-max ;;;;;; gnus-outlook-deuglify-unwrap-min) "deuglify" "gnus/deuglify.el" -;;;;;; (17102 18579)) +;;;;;; (17187 59879)) ;;; Generated autoloads from gnus/deuglify.el (defvar gnus-outlook-deuglify-unwrap-min 45 "\ @@ -6432,7 +6469,7 @@ ;;;*** ;;;### (autoloads (devanagari-post-read-conversion devanagari-compose-region) -;;;;;; "devan-util" "language/devan-util.el" (17102 18768)) +;;;;;; "devan-util" "language/devan-util.el" (17187 59881)) ;;; Generated autoloads from language/devan-util.el (defconst devanagari-consonant "[\x51ad5-\x51af9\x51b38-\x51b3f]") @@ -6450,7 +6487,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (17245 63766)) +;;;;;; "calendar/diary-lib.el" (17277 59649)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@ -6496,7 +6533,7 @@ ;;;*** ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff" -;;;;;; "diff.el" (17239 32193)) +;;;;;; "diff.el" (17226 24572)) ;;; Generated autoloads from diff.el (defvar diff-switches "-c" "\ @@ -6530,7 +6567,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el" -;;;;;; (17239 32193)) +;;;;;; (17238 21257)) ;;; Generated autoloads from diff-mode.el (autoload (quote diff-mode) "diff-mode" "\ @@ -6559,7 +6596,7 @@ ;;;;;; dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink ;;;;;; dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename ;;;;;; dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches) -;;;;;; "dired" "dired.el" (17244 43730)) +;;;;;; "dired" "dired.el" (17257 22482)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches "-al" "\ @@ -6764,7 +6801,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-clean-directory ;;;;;; dired-do-print dired-do-touch dired-do-chown dired-do-chgrp ;;;;;; dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17239 32194)) +;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17226 24572)) ;;; Generated autoloads from dired-aux.el (autoload (quote dired-diff) "dired-aux" "\ @@ -7172,7 +7209,7 @@ ;;;*** -;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17248 29668)) +;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17277 59649)) ;;; Generated autoloads from dired-x.el (autoload (quote dired-jump) "dired-x" "\ @@ -7186,7 +7223,7 @@ ;;;*** -;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17148 24959)) +;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17187 59901)) ;;; Generated autoloads from dirtrack.el (autoload (quote dirtrack) "dirtrack" "\ @@ -7205,8 +7242,8 @@ ;;;*** -;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17148 -;;;;;; 25090)) +;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload (quote disassemble) "disass" "\ @@ -7224,7 +7261,7 @@ ;;;;;; standard-display-graphic standard-display-g1 standard-display-ascii ;;;;;; standard-display-default standard-display-8bit describe-current-display-table ;;;;;; describe-display-table set-display-table-slot display-table-slot -;;;;;; make-display-table) "disp-table" "disp-table.el" (17242 7306)) +;;;;;; make-display-table) "disp-table" "disp-table.el" (17277 59649)) ;;; Generated autoloads from disp-table.el (autoload (quote make-display-table) "disp-table" "\ @@ -7325,7 +7362,7 @@ ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" -;;;;;; (17140 20946)) +;;;;;; (17187 59902)) ;;; Generated autoloads from play/dissociate.el (autoload (quote dissociated-press) "dissociate" "\ @@ -7341,7 +7378,7 @@ ;;;*** -;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17205 5985)) +;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17226 24572)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file))) "\ @@ -7362,7 +7399,7 @@ ;;;*** ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode" -;;;;;; "textmodes/dns-mode.el" (17148 25205)) +;;;;;; "textmodes/dns-mode.el" (17187 59902)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload (quote dns-mode) "dns-mode" "\ @@ -7385,7 +7422,7 @@ ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17244 43757)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17257 22483)) ;;; Generated autoloads from play/doctor.el (autoload (quote doctor) "doctor" "\ @@ -7396,7 +7433,7 @@ ;;;*** ;;;### (autoloads (double-mode double-mode) "double" "double.el" -;;;;;; (17148 24959)) +;;;;;; (17187 59901)) ;;; Generated autoloads from double.el (defvar double-mode nil "\ @@ -7417,7 +7454,7 @@ ;;;*** -;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17140 20947)) +;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17187 59902)) ;;; Generated autoloads from play/dunnet.el (autoload (quote dunnet) "dunnet" "\ @@ -7428,7 +7465,7 @@ ;;;*** ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el" -;;;;;; (17148 25106)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/earcon.el (autoload (quote gnus-earcon-display) "earcon" "\ @@ -7440,7 +7477,7 @@ ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-global-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (17167 2793)) +;;;;;; "emacs-lisp/easy-mmode.el" (17263 27852)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode)) @@ -7491,8 +7528,14 @@ Make GLOBAL-MODE out of the buffer-local minor MODE. TURN-ON is a function that will be called with no args in every buffer and that should try to turn MODE on if applicable for that buffer. -KEYS is a list of CL-style keyword arguments: -:group to specify the custom group. +KEYS is a list of CL-style keyword arguments. As the minor mode + defined by this function is always global, any :global keyword is + ignored. Other keywords have the same meaning as in `define-minor-mode', + which see. In particular, :group specifies the custom group. + The most useful keywords are those that are passed on to the + `defcustom'. It normally makes no sense to pass the :lighter + or :keymap keywords to `define-global-minor-mode', since these + are usually passed to the buffer-local version of the minor mode. If MODE's set-up depends on the major mode in effect when it was enabled, then disabling and reenabling MODE should make MODE work @@ -7526,8 +7569,8 @@ ;;;*** ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define -;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17250 -;;;;;; 21105)) +;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17263 +;;;;;; 27852)) ;;; Generated autoloads from emacs-lisp/easymenu.el (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun)) @@ -7672,7 +7715,7 @@ ;;;;;; ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ebnf-spool-file ;;;;;; ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (17239 32372)) +;;;;;; "progmodes/ebnf2ps.el" (17226 24577)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload (quote ebnf-customize) "ebnf2ps" "\ @@ -7931,8 +7974,8 @@ ;;;;;; ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition ;;;;;; ebrowse-tags-view-definition ebrowse-tags-find-declaration ;;;;;; ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree -;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17239 -;;;;;; 32375)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17226 +;;;;;; 24577)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload (quote ebrowse-tree-mode) "ebrowse" "\ @@ -8083,7 +8126,7 @@ ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (17148 24959)) +;;;;;; (17187 59901)) ;;; Generated autoloads from ebuff-menu.el (autoload (quote electric-buffer-list) "ebuff-menu" "\ @@ -8108,7 +8151,7 @@ ;;;*** ;;;### (autoloads (Electric-command-history-redo-expression) "echistory" -;;;;;; "echistory.el" (17205 5985)) +;;;;;; "echistory.el" (17226 24572)) ;;; Generated autoloads from echistory.el (autoload (quote Electric-command-history-redo-expression) "echistory" "\ @@ -8120,7 +8163,7 @@ ;;;*** ;;;### (autoloads (edebug-eval-top-level-form def-edebug-spec edebug-all-forms -;;;;;; edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (17148 25093)) +;;;;;; edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -8183,7 +8226,7 @@ ;;;;;; ediff-merge-directory-revisions ediff-merge-directories-with-ancestor ;;;;;; ediff-merge-directories ediff-directories3 ediff-directory-revisions ;;;;;; ediff-directories ediff-buffers3 ediff-buffers ediff-backup -;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17239 32202)) +;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17229 28053)) ;;; Generated autoloads from ediff.el (autoload (quote ediff-files) "ediff" "\ @@ -8421,7 +8464,7 @@ ;;;*** ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el" -;;;;;; (17148 24960)) +;;;;;; (17187 59901)) ;;; Generated autoloads from ediff-help.el (autoload (quote ediff-customize) "ediff-help" "\ @@ -8431,7 +8474,7 @@ ;;;*** -;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17148 24960)) +;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17187 59901)) ;;; Generated autoloads from ediff-hook.el (defvar ediff-window-setup-function) @@ -8444,7 +8487,7 @@ ;;;*** ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el" -;;;;;; (17239 32198)) +;;;;;; (17229 28052)) ;;; Generated autoloads from ediff-mult.el (autoload (quote ediff-show-registry) "ediff-mult" "\ @@ -8457,7 +8500,7 @@ ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "ediff-util.el" (17239 32201)) +;;;;;; "ediff-util" "ediff-util.el" (17277 59649)) ;;; Generated autoloads from ediff-util.el (autoload (quote ediff-toggle-multiframe) "ediff-util" "\ @@ -8478,7 +8521,7 @@ ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (17148 24966)) +;;;;;; (17251 25141)) ;;; Generated autoloads from edmacro.el (defvar edmacro-eight-bits nil "\ @@ -8531,7 +8574,7 @@ ;;;*** ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt" -;;;;;; "emulation/edt.el" (17140 20922)) +;;;;;; "emulation/edt.el" (17187 59901)) ;;; Generated autoloads from emulation/edt.el (autoload (quote edt-set-scroll-margins) "edt" "\ @@ -8549,7 +8592,7 @@ ;;;*** ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el" -;;;;;; (17148 24966)) +;;;;;; (17187 59901)) ;;; Generated autoloads from ehelp.el (autoload (quote with-electric-help) "ehelp" "\ @@ -8587,7 +8630,7 @@ ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17239 32276)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17226 24574)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string " ElDoc" "\ @@ -8625,8 +8668,8 @@ ;;;*** -;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17148 -;;;;;; 24966)) +;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from elide-head.el (autoload (quote elide-head) "elide-head" "\ @@ -8642,7 +8685,7 @@ ;;;*** ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el" -;;;;;; (17148 25094)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload (quote elint-initialize) "elint" "\ @@ -8653,8 +8696,8 @@ ;;;*** ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list -;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17148 -;;;;;; 25094)) +;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload (quote elp-instrument-function) "elp" "\ @@ -8688,7 +8731,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (17148 25154)) +;;;;;; (17187 59901)) ;;; Generated autoloads from mail/emacsbug.el (autoload (quote report-emacs-bug) "emacsbug" "\ @@ -8703,7 +8746,7 @@ ;;;;;; emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote ;;;;;; emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor ;;;;;; emerge-buffers emerge-files-with-ancestor emerge-files) "emerge" -;;;;;; "emerge.el" (17167 2775)) +;;;;;; "emerge.el" (17187 59901)) ;;; Generated autoloads from emerge.el (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge")) @@ -8780,38 +8823,21 @@ ;;;*** -;;;### (autoloads (encoded-kbd-mode) "encoded-kb" "international/encoded-kb.el" -;;;;;; (17102 18713)) +;;;### (autoloads (encoded-kbd-setup-display) "encoded-kb" "international/encoded-kb.el" +;;;;;; (17251 25141)) ;;; Generated autoloads from international/encoded-kb.el -(defvar encoded-kbd-mode nil "\ -Non-nil if Encoded-Kbd mode is enabled. -See the command `encoded-kbd-mode' for a description of this minor-mode. -Setting this variable directly does not take effect; -use either \\[customize] or the function `encoded-kbd-mode'.") - -(custom-autoload (quote encoded-kbd-mode) "encoded-kb") - -(put (quote encoded-kbd-mode) (quote custom-set) (quote custom-set-minor-mode)) - -(autoload (quote encoded-kbd-mode) "encoded-kb" "\ -Toggle Encoded-kbd minor mode. -With arg, turn Encoded-kbd mode on if and only if arg is positive. - -You should not turn this mode on manually, instead use the command -\\[set-keyboard-coding-system] which turns on or off this mode -automatically. - -In Encoded-kbd mode, a text sent from keyboard is accepted -as a multilingual text encoded in a coding system set by -\\[set-keyboard-coding-system]. - -\(fn &optional ARG)" t nil) +(autoload (quote encoded-kbd-setup-display) "encoded-kb" "\ +Set up a `key-translation-map' for `keyboard-coding-system' on DISPLAY. + +DISPLAY may be a display id, a frame, or nil for the selected frame's display. + +\(fn DISPLAY)" nil nil) ;;;*** ;;;### (autoloads (enriched-decode enriched-encode enriched-mode) -;;;;;; "enriched" "textmodes/enriched.el" (17148 25205)) +;;;;;; "enriched" "textmodes/enriched.el" (17187 59902)) ;;; Generated autoloads from textmodes/enriched.el (autoload (quote enriched-mode) "enriched" "\ @@ -8841,8 +8867,8 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17140 -;;;;;; 20930)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from eshell/esh-mode.el (autoload (quote eshell-mode) "esh-mode" "\ @@ -8854,8 +8880,8 @@ ;;;*** -;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17140 -;;;;;; 20931)) +;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from eshell/esh-test.el (autoload (quote eshell-test) "esh-test" "\ @@ -8866,7 +8892,7 @@ ;;;*** ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command -;;;;;; eshell) "eshell" "eshell/eshell.el" (17148 25104)) +;;;;;; eshell) "eshell" "eshell/eshell.el" (17187 59901)) ;;; Generated autoloads from eshell/eshell.el (autoload (quote eshell) "eshell" "\ @@ -8912,7 +8938,7 @@ ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (17242 7321)) +;;;;;; (17244 4914)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9214,7 +9240,7 @@ ;;;;;; ethio-fidel-to-sera-buffer ethio-fidel-to-sera-region ethio-sera-to-fidel-marker ;;;;;; ethio-sera-to-fidel-mail ethio-sera-to-fidel-mail-or-marker ;;;;;; ethio-sera-to-fidel-buffer ethio-sera-to-fidel-region setup-ethiopic-environment-internal) -;;;;;; "ethio-util" "language/ethio-util.el" (17185 27568)) +;;;;;; "ethio-util" "language/ethio-util.el" (17187 59901)) ;;; Generated autoloads from language/ethio-util.el (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\ @@ -9409,7 +9435,7 @@ ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (17185 27585)) +;;;;;; (17263 27852)) ;;; Generated autoloads from net/eudc.el (autoload (quote eudc-set-server) "eudc" "\ @@ -9465,7 +9491,7 @@ ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline ;;;;;; eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary) -;;;;;; "eudc-bob" "net/eudc-bob.el" (17140 20940)) +;;;;;; "eudc-bob" "net/eudc-bob.el" (17187 59902)) ;;; Generated autoloads from net/eudc-bob.el (autoload (quote eudc-display-generic-binary) "eudc-bob" "\ @@ -9501,7 +9527,7 @@ ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (17140 20940)) +;;;;;; "eudc-export" "net/eudc-export.el" (17187 59902)) ;;; Generated autoloads from net/eudc-export.el (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\ @@ -9518,7 +9544,7 @@ ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (17140 20940)) +;;;;;; (17187 59902)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\ @@ -9531,7 +9557,7 @@ ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (17140 20967)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/executable.el (autoload (quote executable-command-find-posix-p) "executable" "\ @@ -9573,7 +9599,7 @@ ;;;*** ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot -;;;;;; expand-add-abbrevs) "expand" "expand.el" (17148 24967)) +;;;;;; expand-add-abbrevs) "expand" "expand.el" (17187 59901)) ;;; Generated autoloads from expand.el (autoload (quote expand-add-abbrevs) "expand" "\ @@ -9616,7 +9642,7 @@ ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17239 32377)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17277 60154)) ;;; Generated autoloads from progmodes/f90.el (autoload (quote f90-mode) "f90" "\ @@ -9683,7 +9709,7 @@ ;;;;;; facemenu-remove-all facemenu-remove-face-props facemenu-set-read-only ;;;;;; facemenu-set-intangible facemenu-set-invisible facemenu-set-face-from-menu ;;;;;; facemenu-set-background facemenu-set-foreground facemenu-set-face) -;;;;;; "facemenu" "facemenu.el" (17148 24967)) +;;;;;; "facemenu" "facemenu.el" (17187 59901)) ;;; Generated autoloads from facemenu.el (define-key global-map "\M-o" 'facemenu-keymap) (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap) @@ -9846,7 +9872,7 @@ ;;;*** ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock" -;;;;;; "obsolete/fast-lock.el" (17205 6148)) +;;;;;; "obsolete/fast-lock.el" (17226 24576)) ;;; Generated autoloads from obsolete/fast-lock.el (autoload (quote fast-lock-mode) "fast-lock" "\ @@ -9887,7 +9913,7 @@ ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17239 32329)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17263 27852)) ;;; Generated autoloads from mail/feedmail.el (autoload (quote feedmail-send-it) "feedmail" "\ @@ -9941,7 +9967,7 @@ ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17239 32205)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17238 21257)) ;;; Generated autoloads from ffap.el (autoload (quote ffap-next) "ffap" "\ @@ -9998,7 +10024,7 @@ ;;;*** ;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el" -;;;;;; (17239 32205)) +;;;;;; (17238 21257)) ;;; Generated autoloads from filecache.el (autoload (quote file-cache-minibuffer-complete) "filecache" "\ @@ -10016,8 +10042,8 @@ ;;;*** -;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17148 -;;;;;; 24974)) +;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from filesets.el (autoload (quote filesets-init) "filesets" "\ @@ -10030,7 +10056,7 @@ ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (17148 24974)) +;;;;;; (17187 59901)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type (quote berkeley-unix)) (quote ("-ls" . "-gilsb")) (quote ("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -10091,7 +10117,7 @@ ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file ;;;;;; ff-find-other-file ff-get-other-file) "find-file" "find-file.el" -;;;;;; (17148 24975)) +;;;;;; (17187 59901)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs (quote (("^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" lambda nil (setq fname (buffer-substring (match-beginning 2) (match-end 2)))))) "\ @@ -10183,7 +10209,7 @@ ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (17246 34220)) +;;;;;; "emacs-lisp/find-func.el" (17257 22482)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload (quote find-library) "find-func" "\ @@ -10332,7 +10358,7 @@ ;;;*** ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories -;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17185 27434)) +;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17277 59649)) ;;; Generated autoloads from find-lisp.el (autoload (quote find-lisp-find-dired) "find-lisp" "\ @@ -10353,7 +10379,7 @@ ;;;*** ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords) -;;;;;; "finder" "finder.el" (17245 51608)) +;;;;;; "finder" "finder.el" (17257 22482)) ;;; Generated autoloads from finder.el (autoload (quote finder-list-keywords) "finder" "\ @@ -10375,7 +10401,7 @@ ;;;*** ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl" -;;;;;; "flow-ctrl.el" (17148 24975)) +;;;;;; "flow-ctrl.el" (17187 59901)) ;;; Generated autoloads from flow-ctrl.el (autoload (quote enable-flow-control) "flow-ctrl" "\ @@ -10397,7 +10423,7 @@ ;;;*** ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el" -;;;;;; (17148 25106)) +;;;;;; (17263 27852)) ;;; Generated autoloads from gnus/flow-fill.el (autoload (quote fill-flowed-encode) "flow-fill" "\ @@ -10413,7 +10439,7 @@ ;;;*** ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode) -;;;;;; "flymake" "progmodes/flymake.el" (17205 6169)) +;;;;;; "flymake" "progmodes/flymake.el" (17226 24577)) ;;; Generated autoloads from progmodes/flymake.el (autoload (quote flymake-mode) "flymake" "\ @@ -10437,7 +10463,7 @@ ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; flyspell-mode flyspell-prog-mode) "flyspell" "textmodes/flyspell.el" -;;;;;; (17249 49356)) +;;;;;; (17277 59650)) ;;; Generated autoloads from textmodes/flyspell.el (autoload (quote flyspell-prog-mode) "flyspell" "\ @@ -10496,7 +10522,7 @@ ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (17194 38158)) +;;;;;; (17196 27217)) ;;; Generated autoloads from follow.el (autoload (quote turn-on-follow-mode) "follow" "\ @@ -10570,202 +10596,8 @@ ;;;*** -;;;### (autoloads (font-lock-fontify-buffer font-lock-remove-keywords -;;;;;; font-lock-add-keywords font-lock-mode-internal) "font-lock" -;;;;;; "font-lock.el" (17244 43734)) -;;; Generated autoloads from font-lock.el - -(defvar font-lock-keywords nil "\ -A list of the keywords to highlight. -There are two kinds of values: user-level, and compiled. - -A user-level keywords list is what a major mode or the user would -set up. Normally the list would come from `font-lock-defaults'. -through selection of a fontification level and evaluation of any -contained expressions. You can also alter it by calling -`font-lock-add-keywords' or `font-lock-remove-keywords' with MODE = nil. - -Each element in a user-level keywords list should have one of these forms: - - MATCHER - (MATCHER . SUBEXP) - (MATCHER . FACENAME) - (MATCHER . HIGHLIGHT) - (MATCHER HIGHLIGHT ...) - (eval . FORM) - -where MATCHER can be either the regexp to search for, or the function name to -call to make the search (called with one argument, the limit of the search; -it should return non-nil, move point, and set `match-data' appropriately iff -it succeeds; like `re-search-forward' would). -MATCHER regexps can be generated via the function `regexp-opt'. - -FORM is an expression, whose value should be a keyword element, evaluated when -the keyword is (first) used in a buffer. This feature can be used to provide a -keyword that can only be generated when Font Lock mode is actually turned on. - -HIGHLIGHT should be either MATCH-HIGHLIGHT or MATCH-ANCHORED. - -For highlighting single items, for example each instance of the word \"foo\", -typically only MATCH-HIGHLIGHT is required. -However, if an item or (typically) items are to be highlighted following the -instance of another item (the anchor), for example each instance of the -word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required. - -MATCH-HIGHLIGHT should be of the form: - - (SUBEXP FACENAME [OVERRIDE [LAXMATCH]]) - -SUBEXP is the number of the subexpression of MATCHER to be highlighted. - -FACENAME is an expression whose value is the face name to use. -Instead of a face, FACENAME can evaluate to a property list -of the form (face FACE PROP1 VAL1 PROP2 VAL2 ...) -in which case all the listed text-properties will be set rather than -just FACE. In such a case, you will most likely want to put those -properties in `font-lock-extra-managed-props' or to override -`font-lock-unfontify-region-function'. - -OVERRIDE and LAXMATCH are flags. If OVERRIDE is t, existing fontification can -be overwritten. If `keep', only parts not already fontified are highlighted. -If `prepend' or `append', existing fontification is merged with the new, in -which the new or existing fontification, respectively, takes precedence. -If LAXMATCH is non-nil, that means don't signal an error if there is -no match for SUBEXP in MATCHER. - -For example, an element of the form highlights (if not already highlighted): - - \"\\\\\\=<foo\\\\\\=>\" discrete occurrences of \"foo\" in the value of the - variable `font-lock-keyword-face'. - (\"fu\\\\(bar\\\\)\" . 1) substring \"bar\" within all occurrences of \"fubar\" in - the value of `font-lock-keyword-face'. - (\"fubar\" . fubar-face) Occurrences of \"fubar\" in the value of `fubar-face'. - (\"foo\\\\|bar\" 0 foo-bar-face t) - occurrences of either \"foo\" or \"bar\" in the value - of `foo-bar-face', even if already highlighted. - (fubar-match 1 fubar-face) - the first subexpression within all occurrences of - whatever the function `fubar-match' finds and matches - in the value of `fubar-face'. - -MATCH-ANCHORED should be of the form: - - (MATCHER PRE-MATCH-FORM POST-MATCH-FORM MATCH-HIGHLIGHT ...) - -where MATCHER is a regexp to search for or the function name to call to make -the search, as for MATCH-HIGHLIGHT above, but with one exception; see below. -PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after -the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be -used to initialize before, and cleanup after, MATCHER is used. Typically, -PRE-MATCH-FORM is used to move to some position relative to the original -MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might -be used to move back, before resuming with MATCH-ANCHORED's parent's MATCHER. - -For example, an element of the form highlights (if not already highlighted): - - (\"\\\\\\=<anchor\\\\\\=>\" (0 anchor-face) (\"\\\\\\=<item\\\\\\=>\" nil nil (0 item-face))) - - discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent - discrete occurrences of \"item\" (on the same line) in the value of `item-face'. - (Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is - initially searched for starting from the end of the match of \"anchor\", and - searching for subsequent instances of \"anchor\" resumes from where searching - for \"item\" concluded.) - -The above-mentioned exception is as follows. The limit of the MATCHER search -defaults to the end of the line after PRE-MATCH-FORM is evaluated. -However, if PRE-MATCH-FORM returns a position greater than the position after -PRE-MATCH-FORM is evaluated, that position is used as the limit of the search. -It is generally a bad idea to return a position greater than the end of the -line, i.e., cause the MATCHER search to span lines. - -These regular expressions can match text which spans lines, although -it is better to avoid it if possible since updating them while editing -text is slower, and it is not guaranteed to be always correct when using -support modes like jit-lock or lazy-lock. - -This variable is set by major modes via the variable `font-lock-defaults'. -Be careful when composing regexps for this list; a poorly written pattern can -dramatically slow things down! - -A compiled keywords list starts with t. It is produced internal -by `font-lock-compile-keywords' from a user-level keywords list. -Its second element is the user-level keywords list that was -compiled. The remaining elements have the same form as -user-level keywords, but normally their values have been -optimized.") - -(autoload (quote font-lock-mode-internal) "font-lock" "\ -Not documented - -\(fn ARG)" nil nil) - -(autoload (quote font-lock-add-keywords) "font-lock" "\ -Add highlighting KEYWORDS for MODE. - -MODE should be a symbol, the major mode command name, such as `c-mode' -or nil. If nil, highlighting keywords are added for the current buffer. -KEYWORDS should be a list; see the variable `font-lock-keywords'. -By default they are added at the beginning of the current highlighting list. -If optional argument APPEND is `set', they are used to replace the current -highlighting list. If APPEND is any other non-nil value, they are added at the -end of the current highlighting list. - -For example: - - (font-lock-add-keywords 'c-mode - '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend) - (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . font-lock-keyword-face))) - -adds two fontification patterns for C mode, to fontify `FIXME:' words, even in -comments, and to fontify `and', `or' and `not' words as keywords. - -The above procedure will only add the keywords for C mode, not -for modes derived from C mode. To add them for derived modes too, -pass nil for MODE and add the call to c-mode-hook. - -For example: - - (add-hook 'c-mode-hook - (lambda () - (font-lock-add-keywords nil - '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend) - (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . - font-lock-keyword-face))))) - -The above procedure may fail to add keywords to derived modes if -some involved major mode does not follow the standard conventions. -File a bug report if this happens, so the major mode can be corrected. - -Note that some modes have specialized support for additional patterns, e.g., -see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types', -`objc-font-lock-extra-types' and `java-font-lock-extra-types'. - -\(fn MODE KEYWORDS &optional APPEND)" nil nil) - -(autoload (quote font-lock-remove-keywords) "font-lock" "\ -Remove highlighting KEYWORDS for MODE. - -MODE should be a symbol, the major mode command name, such as `c-mode' -or nil. If nil, highlighting keywords are removed for the current buffer. - -To make the removal apply to modes derived from MODE as well, -pass nil for MODE and add the call to MODE-hook. This may fail -for some derived modes if some involved major mode does not -follow the standard conventions. File a bug report if this -happens, so the major mode can be corrected. - -\(fn MODE KEYWORDS)" nil nil) - -(autoload (quote font-lock-fontify-buffer) "font-lock" "\ -Fontify the current buffer the way the function `font-lock-mode' would. - -\(fn)" t nil) - -;;;*** - -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17148 -;;;;;; 25154)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from mail/footnote.el (autoload (quote footnote-mode) "footnote" "\ @@ -10786,7 +10618,7 @@ ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (17239 32209)) +;;;;;; "forms" "forms.el" (17226 24575)) ;;; Generated autoloads from forms.el (autoload (quote forms-mode) "forms" "\ @@ -10823,7 +10655,7 @@ ;;;*** ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran" -;;;;;; "progmodes/fortran.el" (17239 32378)) +;;;;;; "progmodes/fortran.el" (17277 60154)) ;;; Generated autoloads from progmodes/fortran.el (defvar fortran-tab-mode-default nil "\ @@ -10909,7 +10741,7 @@ ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (17140 20947)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (17187 59902)) ;;; Generated autoloads from play/fortune.el (autoload (quote fortune-add-fortune) "fortune" "\ @@ -10959,7 +10791,7 @@ ;;;*** ;;;### (autoloads (set-fringe-style fringe-mode fringe-mode) "fringe" -;;;;;; "fringe.el" (17148 24980)) +;;;;;; "fringe.el" (17187 59901)) ;;; Generated autoloads from fringe.el (defvar fringe-mode nil "\ @@ -11030,7 +10862,7 @@ ;;;*** ;;;### (autoloads (gdb-enable-debug-log gdba) "gdb-ui" "progmodes/gdb-ui.el" -;;;;;; (17247 12425)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload (quote gdba) "gdb-ui" "\ @@ -11093,8 +10925,8 @@ ;;;*** ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal -;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17148 -;;;;;; 25095)) +;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11169,7 +11001,7 @@ ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (17196 24556)) +;;;;;; (17226 24577)) ;;; Generated autoloads from progmodes/glasses.el (autoload (quote glasses-mode) "glasses" "\ @@ -11182,7 +11014,7 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17205 6099)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17277 59649)) ;;; Generated autoloads from gnus/gnus.el (autoload (quote gnus-slave-no-server) "gnus" "\ @@ -11233,7 +11065,7 @@ ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (17239 32296)) +;;;;;; "gnus/gnus-agent.el" (17226 24575)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload (quote gnus-unplugged) "gnus-agent" "\ @@ -11320,7 +11152,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (17242 24869)) +;;;;;; (17257 22483)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@ -11331,7 +11163,7 @@ ;;;*** ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el" -;;;;;; (17148 25111)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-audio.el (autoload (quote gnus-audio-play) "gnus-audio" "\ @@ -11343,8 +11175,8 @@ ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group ;;;;;; gnus-cache-generate-nov-databases gnus-cache-generate-active -;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17148 -;;;;;; 25111)) +;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload (quote gnus-jog-cache) "gnus-cache" "\ @@ -11382,7 +11214,7 @@ ;;;*** ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article) -;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17148 25112)) +;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17187 59901)) ;;; Generated autoloads from gnus/gnus-delay.el (defgroup gnus-delay nil "Arrange for sending postings later." :version "22.1" :group (quote gnus)) @@ -11420,7 +11252,7 @@ ;;;*** ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el" -;;;;;; (17148 25112)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\ @@ -11431,7 +11263,7 @@ ;;;*** ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el" -;;;;;; (17148 25113)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload (quote gnus-draft-reminder) "gnus-draft" "\ @@ -11443,8 +11275,8 @@ ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png ;;;;;; gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header -;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17185 -;;;;;; 27513)) +;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17187 +;;;;;; 59914)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload (quote gnus-random-x-face) "gnus-fun" "\ @@ -11483,7 +11315,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (17148 25115)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (17187 59901)) ;;; Generated autoloads from gnus/gnus-group.el (autoload (quote gnus-fetch-group) "gnus-group" "\ @@ -11500,7 +11332,7 @@ ;;;*** ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el" -;;;;;; (17148 25116)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias (quote gnus-batch-kill) (quote gnus-batch-score)) @@ -11515,7 +11347,7 @@ ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate ;;;;;; turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el" -;;;;;; (17148 25116)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\ @@ -11540,7 +11372,7 @@ ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update ;;;;;; gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el" -;;;;;; (17148 25116)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\ @@ -11641,7 +11473,7 @@ ;;;*** ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el" -;;;;;; (17148 25116)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-move.el (autoload (quote gnus-change-server) "gnus-move" "\ @@ -11653,7 +11485,7 @@ ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17185 27515)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17187 59914)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload (quote gnus-msg-mail) "gnus-msg" "\ @@ -11679,7 +11511,7 @@ ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon ;;;;;; gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el" -;;;;;; (17148 25117)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload (quote gnus-treat-from-picon) "gnus-picon" "\ @@ -11706,7 +11538,7 @@ ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (17148 25118)) +;;;;;; "gnus/gnus-range.el" (17187 59901)) ;;; Generated autoloads from gnus/gnus-range.el (autoload (quote gnus-sorted-difference) "gnus-range" "\ @@ -11774,7 +11606,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17148 25118)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17187 59901)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload (quote gnus-registry-initialize) "gnus-registry" "\ @@ -11790,8 +11622,8 @@ ;;;*** ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate -;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17148 -;;;;;; 25120)) +;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload (quote gnus-sieve-update) "gnus-sieve" "\ @@ -11819,7 +11651,7 @@ ;;;*** ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el" -;;;;;; (17148 25120)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-soup.el (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\ @@ -11839,7 +11671,7 @@ ;;;*** ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el" -;;;;;; (17185 27516)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload (quote gnus-update-format) "gnus-spec" "\ @@ -11850,8 +11682,8 @@ ;;;*** ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news -;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17239 -;;;;;; 32303)) +;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17226 +;;;;;; 24575)) ;;; Generated autoloads from gnus/gnus-start.el (autoload (quote gnus-declare-backend) "gnus-start" "\ @@ -11867,7 +11699,7 @@ ;;;*** ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el" -;;;;;; (17148 25131)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/gnus-win.el (autoload (quote gnus-add-configuration) "gnus-win" "\ @@ -11877,7 +11709,7 @@ ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17239 32364)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17226 24576)) ;;; Generated autoloads from play/gomoku.el (autoload (quote gomoku) "gomoku" "\ @@ -11904,7 +11736,7 @@ ;;;*** ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr" -;;;;;; "net/goto-addr.el" (17140 20941)) +;;;;;; "net/goto-addr.el" (17263 27852)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1") @@ -11932,7 +11764,7 @@ ;;;### (autoloads (grep-tree grep-find grep-mode grep grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17185 27647)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17187 59902)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12056,7 +11888,7 @@ ;;;*** -;;;### (autoloads (gs-load-image) "gs" "gs.el" (17148 24982)) +;;;### (autoloads (gs-load-image) "gs" "gs.el" (17187 59901)) ;;; Generated autoloads from gs.el (autoload (quote gs-load-image) "gs" "\ @@ -12070,7 +11902,7 @@ ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode bashdb jdb pdb -;;;;;; perldb xdb dbx sdb gdb) "gud" "progmodes/gud.el" (17247 12425)) +;;;;;; perldb xdb dbx sdb gdb) "gud" "progmodes/gud.el" (17277 60154)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@ -12166,8 +11998,8 @@ ;;;*** -;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17185 -;;;;;; 27606)) +;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from play/handwrite.el (autoload (quote handwrite) "handwrite" "\ @@ -12185,7 +12017,7 @@ ;;;*** ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el" -;;;;;; (17075 55477)) +;;;;;; (17187 59879)) ;;; Generated autoloads from play/hanoi.el (autoload (quote hanoi) "hanoi" "\ @@ -12215,7 +12047,7 @@ ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region ;;;;;; scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer ;;;;;; help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string -;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (17148 24982)) +;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (17187 59901)) ;;; Generated autoloads from help-at-pt.el (autoload (quote help-at-pt-string) "help-at-pt" "\ @@ -12343,8 +12175,9 @@ ;;;*** ;;;### (autoloads (describe-categories describe-syntax describe-variable -;;;;;; variable-at-point describe-function-1 help-C-file-name describe-function -;;;;;; help-with-tutorial) "help-fns" "help-fns.el" (17250 21610)) +;;;;;; variable-at-point describe-function-1 describe-simplify-lib-file-name +;;;;;; help-C-file-name describe-function help-with-tutorial) "help-fns" +;;;;;; "help-fns.el" (17277 59649)) ;;; Generated autoloads from help-fns.el (autoload (quote help-with-tutorial) "help-fns" "\ @@ -12370,6 +12203,11 @@ (defface help-argument-name (quote ((((supports :slant italic)) :inherit italic))) "\ Face to highlight argument names in *Help* buffers." :group (quote help)) +(autoload (quote describe-simplify-lib-file-name) "help-fns" "\ +Simplify a library name FILE to a relative name, and make it a source file. + +\(fn FILE)" nil nil) + (autoload (quote describe-function-1) "help-fns" "\ Not documented @@ -12385,10 +12223,11 @@ (autoload (quote describe-variable) "help-fns" "\ Display the full documentation of VARIABLE (a symbol). Returns the documentation as a string, also. -If VARIABLE has a buffer-local value in BUFFER (default to the current buffer), +If VARIABLE has a buffer-local value in BUFFER or FRAME +\(default to the current buffer and current frame), it is displayed along with the global value. -\(fn VARIABLE &optional BUFFER)" t nil) +\(fn VARIABLE &optional BUFFER FRAME)" t nil) (autoload (quote describe-syntax) "help-fns" "\ Describe the syntax specifications in the syntax table of BUFFER. @@ -12408,7 +12247,7 @@ ;;;*** ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el" -;;;;;; (17148 24982)) +;;;;;; (17187 59901)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -12424,7 +12263,7 @@ ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button ;;;;;; help-make-xrefs help-setup-xref help-mode-finish help-mode-setup -;;;;;; help-mode) "help-mode" "help-mode.el" (17148 24983)) +;;;;;; help-mode) "help-mode" "help-mode.el" (17277 59649)) ;;; Generated autoloads from help-mode.el (autoload (quote help-mode) "help-mode" "\ @@ -12507,7 +12346,7 @@ ;;;*** ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper" -;;;;;; "emacs-lisp/helper.el" (17148 25095)) +;;;;;; "emacs-lisp/helper.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload (quote Helper-describe-bindings) "helper" "\ @@ -12523,7 +12362,7 @@ ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (17167 2778)) +;;;;;; "hexl.el" (17187 59901)) ;;; Generated autoloads from hexl.el (autoload (quote hexl-mode) "hexl" "\ @@ -12618,8 +12457,8 @@ ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer ;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer -;;;;;; hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (17205 -;;;;;; 6005)) +;;;;;; hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from hi-lock.el (defvar hi-lock-mode nil "\ @@ -12730,7 +12569,7 @@ ;;;*** ;;;### (autoloads (hide-ifdef-lines hide-ifdef-read-only hide-ifdef-initially -;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17140 20971)) +;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17187 59902)) ;;; Generated autoloads from progmodes/hideif.el (autoload (quote hide-ifdef-mode) "hideif" "\ @@ -12785,7 +12624,7 @@ ;;;*** ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (17194 38303)) +;;;;;; (17196 27217)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\ @@ -12843,7 +12682,7 @@ ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-mode highlight-changes-remove-highlight) -;;;;;; "hilit-chg" "hilit-chg.el" (17148 24984)) +;;;;;; "hilit-chg" "hilit-chg.el" (17187 59901)) ;;; Generated autoloads from hilit-chg.el (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\ @@ -12973,7 +12812,7 @@ ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (17148 24985)) +;;;;;; "hippie-exp.el" (17187 59901)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol)) "\ @@ -13046,7 +12885,7 @@ ;;;*** ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el" -;;;;;; (17148 24985)) +;;;;;; (17187 59901)) ;;; Generated autoloads from hl-line.el (autoload (quote hl-line-mode) "hl-line" "\ @@ -13088,7 +12927,7 @@ ;;;*** ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el" -;;;;;; (17239 32269)) +;;;;;; (17229 28052)) ;;; Generated autoloads from calendar/holidays.el (autoload (quote holidays) "holidays" "\ @@ -13112,7 +12951,7 @@ ;;;*** ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll) -;;;;;; "hscroll" "obsolete/hscroll.el" (17148 25179)) +;;;;;; "hscroll" "obsolete/hscroll.el" (17187 59902)) ;;; Generated autoloads from obsolete/hscroll.el (autoload (quote turn-on-hscroll) "hscroll" "\ @@ -13138,8 +12977,8 @@ ;;;*** -;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17148 -;;;;;; 25133)) +;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from gnus/html2text.el (autoload (quote html2text) "html2text" "\ @@ -13170,7 +13009,7 @@ ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17239 32209)) +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17277 60154)) ;;; Generated autoloads from ibuf-ext.el (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\ @@ -13531,8 +13370,8 @@ ;;;*** ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter -;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17205 -;;;;;; 6006)) +;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17226 +;;;;;; 24576)) ;;; Generated autoloads from ibuf-macs.el (autoload (quote define-ibuffer-column) "ibuf-macs" "\ @@ -13618,7 +13457,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (17167 2779)) +;;;;;; "ibuffer" "ibuffer.el" (17263 27852)) ;;; Generated autoloads from ibuffer.el (autoload (quote ibuffer-list-buffers) "ibuffer" "\ @@ -13659,7 +13498,7 @@ ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (17244 46363)) +;;;;;; "calendar/icalendar.el" (17257 22482)) ;;; Generated autoloads from calendar/icalendar.el (autoload (quote icalendar-export-file) "icalendar" "\ @@ -13711,8 +13550,8 @@ ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17148 -;;;;;; 24987)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -13733,7 +13572,7 @@ ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17140 20972)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17277 60154)) ;;; Generated autoloads from progmodes/icon.el (autoload (quote icon-mode) "icon" "\ @@ -13774,7 +13613,7 @@ ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (17239 32385)) +;;;;;; (17226 24577)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload (quote idlwave-shell) "idlw-shell" "\ @@ -13800,7 +13639,7 @@ ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (17205 6190)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/idlwave.el (autoload (quote idlwave-mode) "idlwave" "\ @@ -13936,8 +13775,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17239 -;;;;;; 32211)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17244 +;;;;;; 4913)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14198,7 +14037,7 @@ ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (17148 24990)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (17187 59901)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names "*ielm*") @@ -14211,7 +14050,7 @@ ;;;*** ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el" -;;;;;; (17148 24990)) +;;;;;; (17187 59901)) ;;; Generated autoloads from iimage.el (autoload (quote turn-on-iimage-mode) "iimage" "\ @@ -14229,7 +14068,7 @@ ;;;### (autoloads (defimage find-image remove-images insert-sliced-image ;;;;;; insert-image put-image create-image image-type-available-p ;;;;;; image-type-from-file-name image-type-from-file-header image-type-from-buffer -;;;;;; image-type-from-data) "image" "image.el" (17245 4868)) +;;;;;; image-type-from-data) "image" "image.el" (17257 22483)) ;;; Generated autoloads from image.el (autoload (quote image-type-from-data) "image" "\ @@ -14380,7 +14219,7 @@ ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" -;;;;;; "image-file.el" (17148 24990)) +;;;;;; "image-file.el" (17187 59901)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\ @@ -14443,7 +14282,7 @@ ;;;*** ;;;### (autoloads (image-mode-maybe image-minor-mode image-mode) -;;;;;; "image-mode" "image-mode.el" (17205 6006)) +;;;;;; "image-mode" "image-mode.el" (17226 24576)) ;;; Generated autoloads from image-mode.el (push '("\\.jpe?g\\'" . image-mode) auto-mode-alist) (push '("\\.png\\'" . image-mode) auto-mode-alist) @@ -14481,7 +14320,7 @@ ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (17148 24991)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (17187 59901)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -14601,7 +14440,7 @@ ;;;### (autoloads (indian-char-glyph indian-glyph-char in-is13194-pre-write-conversion ;;;;;; in-is13194-post-read-conversion indian-compose-string indian-compose-region) -;;;;;; "ind-util" "language/ind-util.el" (17102 18773)) +;;;;;; "ind-util" "language/ind-util.el" (17187 59881)) ;;; Generated autoloads from language/ind-util.el (autoload (quote indian-compose-region) "ind-util" "\ @@ -14644,7 +14483,7 @@ ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command ;;;;;; inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp" -;;;;;; "progmodes/inf-lisp.el" (17140 20976)) +;;;;;; "progmodes/inf-lisp.el" (17187 59902)) ;;; Generated autoloads from progmodes/inf-lisp.el (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\ @@ -14711,7 +14550,7 @@ ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node ;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index ;;;;;; Info-directory info-standalone info-emacs-manual info info-other-window) -;;;;;; "info" "info.el" (17248 29269)) +;;;;;; "info" "info.el" (17263 27852)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@ -14870,7 +14709,7 @@ ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (17148 24992)) +;;;;;; (17187 59901)) ;;; Generated autoloads from info-look.el (autoload (quote info-lookup-reset) "info-look" "\ @@ -14918,7 +14757,7 @@ ;;;*** ;;;### (autoloads (info-xref-check-all-custom info-xref-check-all -;;;;;; info-xref-check) "info-xref" "info-xref.el" (17167 2781)) +;;;;;; info-xref-check) "info-xref" "info-xref.el" (17187 59901)) ;;; Generated autoloads from info-xref.el (autoload (quote info-xref-check) "info-xref" "\ @@ -14945,7 +14784,7 @@ ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify) -;;;;;; "informat" "informat.el" (17148 24995)) +;;;;;; "informat" "informat.el" (17187 59901)) ;;; Generated autoloads from informat.el (autoload (quote Info-tagify) "informat" "\ @@ -14986,7 +14825,7 @@ ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (17120 44797)) +;;;;;; (17187 59901)) ;;; Generated autoloads from international/isearch-x.el (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\ @@ -15006,8 +14845,8 @@ ;;;*** -;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17148 -;;;;;; 24996)) +;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from isearchb.el (autoload (quote isearchb-activate) "isearchb" "\ @@ -15021,7 +14860,7 @@ ;;;*** ;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el" -;;;;;; (17148 25179)) +;;;;;; (17187 59902)) ;;; Generated autoloads from obsolete/iso-acc.el (autoload (quote iso-accents-mode) "iso-acc" "\ @@ -15054,7 +14893,7 @@ ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only ;;;;;; iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso ;;;;;; iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt" -;;;;;; "international/iso-cvt.el" (17102 18714)) +;;;;;; "international/iso-cvt.el" (17187 59880)) ;;; Generated autoloads from international/iso-cvt.el (autoload (quote iso-spanish) "iso-cvt" "\ @@ -15138,7 +14977,7 @@ ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (17102 18715)) +;;;;;; (17187 59894)) ;;; Generated autoloads from international/iso-transl.el (or key-translation-map (setq key-translation-map (make-sparse-keymap))) (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) @@ -15151,7 +14990,7 @@ ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist ;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" -;;;;;; (17244 43761)) +;;;;;; (17263 27852)) ;;; Generated autoloads from textmodes/ispell.el (defvar ispell-personal-dictionary nil "\ @@ -15175,11 +15014,11 @@ (setq ispell-dictionary-alist-2 (quote (("czech" "[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "[^A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "" nil ("-B") nil iso-8859-2) ("dansk" "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" "[']" nil ("-C") nil iso-8859-1) ("deutsch" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("deutsch8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1) ("english" "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)))) -(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-1) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-']" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\"]" t nil "~tex" iso-8859-1)))) - -(setq ispell-dictionary-alist-4 (quote (("german" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("german8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) ("italiano" "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) ("nederlands" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1)))) - -(setq ispell-dictionary-alist-5 (quote (("norsk" "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[\"]" nil nil "~list" iso-8859-1) ("norsk7-tex" "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) ("polish" "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "" nil nil nil iso-8859-2) ("portugues" "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[']" t ("-C") "~latin1" iso-8859-1)))) +(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-1) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-'.@]" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\".@]" t nil "~tex" iso-8859-1)))) + +(setq ispell-dictionary-alist-4 (quote (("german" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("german8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) ("italiano" "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[-.]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) ("nederlands" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1)))) + +(setq ispell-dictionary-alist-5 (quote (("norsk" "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[\"]" nil nil "~list" iso-8859-1) ("norsk7-tex" "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) ("polish" "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "." nil nil nil iso-8859-2) ("portugues" "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[']" t ("-C") "~latin1" iso-8859-1)))) (setq ispell-dictionary-alist-6 (quote (("russian" "[\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" "" nil nil nil koi8-r) ("russianw" "[\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" "[^\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" "" nil nil nil windows-1251) ("slovak" "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "" nil ("-B") nil iso-8859-2) ("slovenian" "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "" nil ("-B" "-d" "slovenian") nil iso-8859-2) ("svenska" "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" "[']" nil ("-C") "~list" iso-8859-1)))) @@ -15437,8 +15276,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17239 -;;;;;; 32217)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17263 +;;;;;; 27852)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -15464,7 +15303,7 @@ ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region ;;;;;; japanese-hiragana-region japanese-katakana-region japanese-zenkaku ;;;;;; japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal) -;;;;;; "japan-util" "language/japan-util.el" (17102 18773)) +;;;;;; "japan-util" "language/japan-util.el" (17187 59881)) ;;; Generated autoloads from language/japan-util.el (autoload (quote setup-japanese-environment-internal) "japan-util" "\ @@ -15541,22 +15380,8 @@ ;;;*** -;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (17246 -;;;;;; 24773)) -;;; Generated autoloads from jit-lock.el - -(autoload (quote jit-lock-register) "jit-lock" "\ -Register FUN as a fontification function to be called in this buffer. -FUN will be called with two arguments START and END indicating the region -that needs to be (re)fontified. -If non-nil, CONTEXTUAL means that a contextual fontification would be useful. - -\(fn FUN &optional CONTEXTUAL)" nil nil) - -;;;*** - ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (17148 24997)) +;;;;;; "jka-compr.el" (17277 59649)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -15581,7 +15406,7 @@ ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup ;;;;;; keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el" -;;;;;; (17140 20922)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -15637,7 +15462,7 @@ ;;;*** ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el" -;;;;;; (17102 18716)) +;;;;;; (17187 59880)) ;;; Generated autoloads from international/kinsoku.el (autoload (quote kinsoku) "kinsoku" "\ @@ -15658,8 +15483,8 @@ ;;;*** -;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17102 -;;;;;; 18717)) +;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17187 +;;;;;; 59880)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -15684,7 +15509,7 @@ ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro) "kmacro" -;;;;;; "kmacro.el" (17148 24998)) +;;;;;; "kmacro.el" (17187 59901)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -15791,7 +15616,7 @@ ;;;### (autoloads (kannada-post-read-conversion kannada-compose-string ;;;;;; kannada-compose-region) "knd-util" "language/knd-util.el" -;;;;;; (17102 18774)) +;;;;;; (17187 59881)) ;;; Generated autoloads from language/knd-util.el (defconst kannada-consonant "[\x51f75-\x51fb9]") @@ -15814,7 +15639,7 @@ ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (17102 18775)) +;;;;;; "language/korea-util.el" (17187 59881)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "") "\ @@ -15829,7 +15654,7 @@ ;;;*** ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el" -;;;;;; (17239 32365)) +;;;;;; (17226 24576)) ;;; Generated autoloads from play/landmark.el (defalias (quote landmark-repeat) (quote lm-test-run)) @@ -15863,8 +15688,8 @@ ;;;### (autoloads (lao-compose-region lao-composition-function lao-post-read-conversion ;;;;;; lao-transcribe-roman-to-lao-string lao-transcribe-single-roman-syllable-to-lao -;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17102 -;;;;;; 18775)) +;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17187 +;;;;;; 59881)) ;;; Generated autoloads from language/lao-util.el (autoload (quote lao-compose-string) "lao-util" "\ @@ -15913,7 +15738,7 @@ ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc ;;;;;; latexenc-inputenc-to-coding-system latex-inputenc-coding-alist) -;;;;;; "latexenc" "international/latexenc.el" (17102 18717)) +;;;;;; "latexenc" "international/latexenc.el" (17187 59880)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (quote (("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -15944,7 +15769,7 @@ ;;;*** ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display) -;;;;;; "latin1-disp" "international/latin1-disp.el" (17102 18720)) +;;;;;; "latin1-disp" "international/latin1-disp.el" (17187 59880)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -15988,7 +15813,7 @@ ;;;*** ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock" -;;;;;; "obsolete/lazy-lock.el" (17185 27600)) +;;;;;; "obsolete/lazy-lock.el" (17187 59902)) ;;; Generated autoloads from obsolete/lazy-lock.el (autoload (quote lazy-lock-mode) "lazy-lock" "\ @@ -16056,10 +15881,10 @@ ;;;*** ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el" -;;;;;; (17159 1485)) +;;;;;; (17263 27852)) ;;; Generated autoloads from progmodes/ld-script.el -(add-to-list (quote auto-mode-alist) (quote ("\\.lds" . ld-script-mode))) +(add-to-list (quote auto-mode-alist) (quote ("\\.ld[s]?\\(\\.in\\)?$" . ld-script-mode))) (autoload (quote ld-script-mode) "ld-script" "\ A major mode to edit GNU ld script files @@ -16069,7 +15894,7 @@ ;;;*** ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el" -;;;;;; (17148 25013)) +;;;;;; (17187 59901)) ;;; Generated autoloads from ledit.el (defconst ledit-save-files t "\ @@ -16103,7 +15928,7 @@ ;;;*** -;;;### (autoloads (life) "life" "play/life.el" (17140 20949)) +;;;### (autoloads (life) "life" "play/life.el" (17187 59902)) ;;; Generated autoloads from play/life.el (autoload (quote life) "life" "\ @@ -16116,8 +15941,8 @@ ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17242 -;;;;;; 7308)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17244 +;;;;;; 4913)) ;;; Generated autoloads from loadhist.el (autoload (quote unload-feature) "loadhist" "\ @@ -16140,7 +15965,7 @@ ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (17244 43734)) +;;;;;; "locate" "locate.el" (17257 22483)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches "-al" "\ @@ -16165,7 +15990,7 @@ ;;;*** -;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17239 32218)) +;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17226 24576)) ;;; Generated autoloads from log-edit.el (autoload (quote log-edit) "log-edit" "\ @@ -16186,8 +16011,8 @@ ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17185 -;;;;;; 27447)) +;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from log-view.el (autoload (quote log-view-mode) "log-view" "\ @@ -16197,8 +16022,8 @@ ;;;*** -;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17248 -;;;;;; 29269)) +;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17257 +;;;;;; 22483)) ;;; Generated autoloads from longlines.el (autoload (quote longlines-mode) "longlines" "\ @@ -16219,8 +16044,8 @@ ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17148 -;;;;;; 25014)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt)))) @@ -16314,7 +16139,7 @@ ;;;*** ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el" -;;;;;; (17148 25015)) +;;;;;; (17187 59901)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16325,8 +16150,8 @@ ;;;*** -;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17167 -;;;;;; 2792)) +;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from calendar/lunar.el (autoload (quote phases-of-moon) "lunar" "\ @@ -16339,8 +16164,8 @@ ;;;*** -;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17140 -;;;;;; 20977)) +;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload (quote m4-mode) "m4-mode" "\ @@ -16352,7 +16177,7 @@ ;;;*** ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el" -;;;;;; (17148 25097)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/macroexp.el (autoload (quote macroexpand-all) "macroexp" "\ @@ -16366,7 +16191,7 @@ ;;;*** ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro -;;;;;; name-last-kbd-macro) "macros" "macros.el" (17148 25015)) +;;;;;; name-last-kbd-macro) "macros" "macros.el" (17187 59901)) ;;; Generated autoloads from macros.el (autoload (quote name-last-kbd-macro) "macros" "\ @@ -16455,7 +16280,7 @@ ;;;*** ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr" -;;;;;; "mail/mail-extr.el" (17148 25155)) +;;;;;; "mail/mail-extr.el" (17187 59901)) ;;; Generated autoloads from mail/mail-extr.el (autoload (quote mail-extract-address-components) "mail-extr" "\ @@ -16486,7 +16311,7 @@ ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history ;;;;;; mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el" -;;;;;; (17148 25156)) +;;;;;; (17187 59901)) ;;; Generated autoloads from mail/mail-hist.el (autoload (quote mail-hist-define-keys) "mail-hist" "\ @@ -16517,8 +16342,8 @@ ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region ;;;;;; mail-unquote-printable mail-quote-printable mail-file-babyl-p -;;;;;; mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17148 -;;;;;; 25156)) +;;;;;; mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -16570,7 +16395,7 @@ ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup) -;;;;;; "mailabbrev" "mail/mailabbrev.el" (17239 32330)) +;;;;;; "mailabbrev" "mail/mailabbrev.el" (17238 21257)) ;;; Generated autoloads from mail/mailabbrev.el (autoload (quote mail-abbrevs-setup) "mailabbrev" "\ @@ -16593,8 +16418,8 @@ ;;;*** ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases -;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17167 -;;;;;; 2797)) +;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style (quote angles) "\ @@ -16640,7 +16465,7 @@ ;;;*** ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el" -;;;;;; (17239 32330)) +;;;;;; (17226 24564)) ;;; Generated autoloads from mail/mailclient.el (autoload (quote mailclient-send-it) "mailclient" "\ @@ -16654,7 +16479,7 @@ ;;;### (autoloads (makefile-bsdmake-mode makefile-makepp-mode makefile-gmake-mode ;;;;;; makefile-automake-mode makefile-mode) "make-mode" "progmodes/make-mode.el" -;;;;;; (17239 32386)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/make-mode.el (autoload (quote makefile-mode) "make-mode" "\ @@ -16766,8 +16591,8 @@ ;;;*** -;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17148 -;;;;;; 25015)) +;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from makesum.el (autoload (quote make-command-summary) "makesum" "\ @@ -16778,7 +16603,7 @@ ;;;*** -;;;### (autoloads (man-follow man) "man" "man.el" (17239 32219)) +;;;### (autoloads (man-follow man) "man" "man.el" (17277 59650)) ;;; Generated autoloads from man.el (defalias (quote manual-entry) (quote man)) @@ -16805,7 +16630,7 @@ ;;;*** -;;;### (autoloads (master-mode) "master" "master.el" (17148 25016)) +;;;### (autoloads (master-mode) "master" "master.el" (17187 59902)) ;;; Generated autoloads from master.el (autoload (quote master-mode) "master" "\ @@ -16827,8 +16652,8 @@ ;;;*** -;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17246 -;;;;;; 34622)) +;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17277 +;;;;;; 59650)) ;;; Generated autoloads from menu-bar.el (put (quote menu-bar-mode) (quote standard-value) (quote (t))) @@ -16864,7 +16689,7 @@ ;;;;;; message-cite-function message-yank-prefix message-citation-line-function ;;;;;; message-send-mail-function message-user-organization-file ;;;;;; message-signature-separator message-from-style) "message" -;;;;;; "gnus/message.el" (17242 24871)) +;;;;;; "gnus/message.el" (17277 60154)) ;;; Generated autoloads from gnus/message.el (defvar message-from-style (quote default) "\ @@ -17118,7 +16943,7 @@ ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (17239 32386)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload (quote metafont-mode) "meta-mode" "\ @@ -17145,7 +16970,7 @@ ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (17185 27569)) +;;;;;; (17187 59902)) ;;; Generated autoloads from mail/metamail.el (autoload (quote metamail-interpret-header) "metamail" "\ @@ -17188,26 +17013,29 @@ ;;;*** -;;;### (autoloads (mh-letter-mode mh-smail-other-window mh-user-agent-compose -;;;;;; mh-smail-batch mh-smail) "mh-comp" "mh-e/mh-comp.el" (17249 -;;;;;; 49352)) +;;;### (autoloads (mh-letter-mode mh-user-agent-compose mh-smail-batch +;;;;;; mh-smail-other-window mh-smail) "mh-comp" "mh-e/mh-comp.el" +;;;;;; (17263 27852)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload (quote mh-smail) "mh-comp" "\ -Compose and send mail with the MH mail system. -This function is an entry point to MH-E, the Emacs interface to the MH mail -system. - +Compose a message with the MH mail system. +See `mh-send' for more details on composing mail. + +\(fn)" t nil) + +(autoload (quote mh-smail-other-window) "mh-comp" "\ +Compose a message with the MH mail system in other window. See `mh-send' for more details on composing mail. \(fn)" t nil) (autoload (quote mh-smail-batch) "mh-comp" "\ -Set up a mail composition draft with the MH mail system. -This function is an entry point to MH-E, the Emacs interface to the MH mail -system. This function does not prompt the user for any header fields, and thus +Compose a message with the MH mail system. + +This function does not prompt the user for any header fields, and thus is suitable for use by programs that want to create a mail buffer. Users -should use `mh-smail' to compose mail. +should use \\[mh-smail] to compose mail. Optional arguments for setting certain fields include TO, SUBJECT, and OTHER-HEADERS. Additional arguments are IGNORED. @@ -17229,15 +17057,6 @@ \(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS)" nil nil) -(autoload (quote mh-smail-other-window) "mh-comp" "\ -Compose and send mail in other window with the MH mail system. -This function is an entry point to MH-E, the Emacs interface to the MH mail -system. - -See `mh-send' for more details on composing mail. - -\(fn)" t nil) - (autoload (quote mh-letter-mode) "mh-comp" "\ Mode for composing letters in MH-E.\\<mh-letter-mode-map> @@ -17262,7 +17081,7 @@ ;;;*** ;;;### (autoloads (mh-folder-mode mh-version mh-nmail mh-rmail) "mh-e" -;;;;;; "mh-e/mh-e.el" (17249 49352)) +;;;;;; "mh-e/mh-e.el" (17263 27852)) ;;; Generated autoloads from mh-e/mh-e.el (autoload (quote mh-rmail) "mh-e" "\ @@ -17340,7 +17159,7 @@ ;;;*** -;;;### (autoloads nil "mh-init" "mh-e/mh-init.el" (17239 32348)) +;;;### (autoloads nil "mh-init" "mh-e/mh-init.el" (17263 27852)) ;;; Generated autoloads from mh-e/mh-init.el (put (quote mh-progs) (quote risky-local-variable) t) @@ -17352,7 +17171,7 @@ ;;;*** ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight" -;;;;;; "midnight.el" (17148 25017)) +;;;;;; "midnight.el" (17187 59902)) ;;; Generated autoloads from midnight.el (autoload (quote clean-buffer-list) "midnight" "\ @@ -17379,7 +17198,7 @@ ;;;*** ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" -;;;;;; "minibuf-eldef.el" (17148 25017)) +;;;;;; "minibuf-eldef.el" (17187 59902)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -17408,7 +17227,7 @@ ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (17239 32387)) +;;;;;; (17238 21095)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload (quote mixal-mode) "mixal-mode" "\ @@ -17423,7 +17242,7 @@ ;;;### (autoloads (malayalam-composition-function malayalam-post-read-conversion ;;;;;; malayalam-compose-region) "mlm-util" "language/mlm-util.el" -;;;;;; (17102 18776)) +;;;;;; (17187 59881)) ;;; Generated autoloads from language/mlm-util.el (autoload (quote malayalam-compose-region) "mlm-util" "\ @@ -17446,7 +17265,7 @@ ;;;*** ;;;### (autoloads (mm-inline-external-body) "mm-extern" "gnus/mm-extern.el" -;;;;;; (17185 27553)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/mm-extern.el (autoload (quote mm-inline-external-body) "mm-extern" "\ @@ -17460,7 +17279,7 @@ ;;;*** ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el" -;;;;;; (17148 25140)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/mm-partial.el (autoload (quote mm-inline-partial) "mm-partial" "\ @@ -17474,7 +17293,7 @@ ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (17239 32315)) +;;;;;; "mm-url" "gnus/mm-url.el" (17226 24575)) ;;; Generated autoloads from gnus/mm-url.el (autoload (quote mm-url-insert-file-contents) "mm-url" "\ @@ -17490,8 +17309,8 @@ ;;;*** -;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (17239 -;;;;;; 32316)) +;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (17226 +;;;;;; 24575)) ;;; Generated autoloads from gnus/mm-uu.el (autoload (quote mm-uu-dissect) "mm-uu" "\ @@ -17502,7 +17321,7 @@ ;;;*** ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el" -;;;;;; (17185 27556)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/mml1991.el (autoload (quote mml1991-encrypt) "mml1991" "\ @@ -17519,7 +17338,7 @@ ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (17185 27558)) +;;;;;; "mml2015" "gnus/mml2015.el" (17187 59901)) ;;; Generated autoloads from gnus/mml2015.el (autoload (quote mml2015-decrypt) "mml2015" "\ @@ -17560,7 +17379,7 @@ ;;;*** ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el" -;;;;;; (17075 55530)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/modula2.el (autoload (quote modula-2-mode) "modula2" "\ @@ -17592,7 +17411,7 @@ ;;;*** ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el" -;;;;;; (17140 20949)) +;;;;;; (17187 59902)) ;;; Generated autoloads from play/morse.el (autoload (quote morse-region) "morse" "\ @@ -17607,8 +17426,8 @@ ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17148 -;;;;;; 25018)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -17661,7 +17480,7 @@ ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17239 32365)) +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17226 24576)) ;;; Generated autoloads from play/mpuz.el (autoload (quote mpuz) "mpuz" "\ @@ -17671,7 +17490,7 @@ ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (17185 27455)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (17187 59914)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -17699,7 +17518,7 @@ ;;;;;; describe-current-coding-system describe-current-coding-system-briefly ;;;;;; describe-coding-system describe-character-set list-charset-chars ;;;;;; read-charset list-character-sets) "mule-diag" "international/mule-diag.el" -;;;;;; (17239 32324)) +;;;;;; (17226 24576)) ;;; Generated autoloads from international/mule-diag.el (defvar non-iso-charset-alist (\` ((mac-roman (ascii latin-iso8859-1 mule-unicode-2500-33ff mule-unicode-0100-24ff mule-unicode-e000-ffff) mac-roman-decoder ((0 255))) (viscii (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-viscii-nonascii-translation-table ((0 255))) (vietnamese-tcvn (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-tcvn-nonascii-translation-table ((0 255))) (koi8-r (ascii cyrillic-iso8859-5) cyrillic-koi8-r-nonascii-translation-table ((32 255))) (alternativnyj (ascii cyrillic-iso8859-5) cyrillic-alternativnyj-nonascii-translation-table ((32 255))) (koi8-u (ascii cyrillic-iso8859-5 mule-unicode-0100-24ff) cyrillic-koi8-u-nonascii-translation-table ((32 255))) (big5 (ascii chinese-big5-1 chinese-big5-2) decode-big5-char ((32 127) ((161 254) 64 126 161 254))) (sjis (ascii katakana-jisx0201 japanese-jisx0208) decode-sjis-char ((32 127 161 223) ((129 159 224 239) 64 126 128 252))))) "\ @@ -17872,7 +17691,7 @@ ;;;;;; coding-system-translation-table-for-decode coding-system-pre-write-conversion ;;;;;; coding-system-post-read-conversion lookup-nested-alist set-nested-alist ;;;;;; truncate-string-to-width store-substring string-to-sequence) -;;;;;; "mule-util" "international/mule-util.el" (17102 18726)) +;;;;;; "mule-util" "international/mule-util.el" (17187 59880)) ;;; Generated autoloads from international/mule-util.el (autoload (quote string-to-sequence) "mule-util" "\ @@ -18001,7 +17820,7 @@ ;;;*** ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el" -;;;;;; (17148 25020)) +;;;;;; (17263 27079)) ;;; Generated autoloads from mwheel.el (defvar mouse-wheel-mode nil "\ @@ -18031,7 +17850,7 @@ ;;;### (autoloads (network-connection network-connection-to-service ;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host ;;;;;; nslookup nslookup-host route arp netstat ipconfig ping traceroute) -;;;;;; "net-utils" "net/net-utils.el" (17148 25173)) +;;;;;; "net-utils" "net/net-utils.el" (17187 59902)) ;;; Generated autoloads from net/net-utils.el (autoload (quote traceroute) "net-utils" "\ @@ -18127,7 +17946,7 @@ ;;;;;; comment-kill comment-set-column comment-indent comment-indent-default ;;;;;; comment-normalize-vars comment-multi-line comment-padding ;;;;;; comment-style comment-column) "newcomment" "newcomment.el" -;;;;;; (17148 25021)) +;;;;;; (17263 27852)) ;;; Generated autoloads from newcomment.el (defalias (quote indent-for-comment) (quote comment-indent)) @@ -18308,8 +18127,9 @@ ;;;*** -;;;### (autoloads (newsticker-show-news newsticker-start) "newsticker" -;;;;;; "net/newsticker.el" (17239 32359)) +;;;### (autoloads (newsticker-ticker-running-p newsticker-running-p +;;;;;; newsticker-show-news newsticker-start-ticker newsticker-start) +;;;;;; "newsticker" "net/newsticker.el" (17263 27852)) ;;; Generated autoloads from net/newsticker.el (autoload (quote newsticker-start) "newsticker" "\ @@ -18321,15 +18141,37 @@ \(fn &optional DO-NOT-COMPLAIN-IF-RUNNING)" t nil) +(autoload (quote newsticker-start-ticker) "newsticker" "\ +Start newsticker's ticker (but not the news retrieval). +Start display timer for the actual ticker if wanted and not +running already. + +\(fn)" t nil) + (autoload (quote newsticker-show-news) "newsticker" "\ Switch to newsticker buffer. You may want to bind this to a key. \(fn)" t nil) +(autoload (quote newsticker-running-p) "newsticker" "\ +Check whether newsticker is running. +Return t if newsticker is running, nil otherwise. Newsticker is +considered to be running if the newsticker timer list is not empty. + +\(fn)" nil nil) + +(autoload (quote newsticker-ticker-running-p) "newsticker" "\ +Check whether newsticker's actual ticker is running. +Return t if ticker is running, nil otherwise. Newsticker is +considered to be running if the newsticker timer list is not +empty. + +\(fn)" nil nil) + ;;;*** ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el" -;;;;;; (17148 25143)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/nndiary.el (autoload (quote nndiary-generate-nov-databases) "nndiary" "\ @@ -18339,8 +18181,8 @@ ;;;*** -;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17148 -;;;;;; 25143)) +;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from gnus/nndoc.el (autoload (quote nndoc-add-type) "nndoc" "\ @@ -18355,7 +18197,7 @@ ;;;*** ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el" -;;;;;; (17148 25144)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/nnfolder.el (autoload (quote nnfolder-generate-active-file) "nnfolder" "\ @@ -18367,7 +18209,7 @@ ;;;*** ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el" -;;;;;; (17148 25145)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/nnkiboze.el (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\ @@ -18379,7 +18221,7 @@ ;;;*** ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el" -;;;;;; (17148 25147)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/nnml.el (autoload (quote nnml-generate-nov-databases) "nnml" "\ @@ -18390,7 +18232,7 @@ ;;;*** ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies) -;;;;;; "nnsoup" "gnus/nnsoup.el" (17148 25148)) +;;;;;; "nnsoup" "gnus/nnsoup.el" (17187 59901)) ;;; Generated autoloads from gnus/nnsoup.el (autoload (quote nnsoup-pack-replies) "nnsoup" "\ @@ -18411,7 +18253,7 @@ ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (17148 25021)) +;;;;;; "novice" "novice.el" (17187 59902)) ;;; Generated autoloads from novice.el (defvar disabled-command-function (quote disabled-command-function) "\ @@ -18444,7 +18286,7 @@ ;;;*** ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el" -;;;;;; (17148 25209)) +;;;;;; (17277 60154)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload (quote nroff-mode) "nroff-mode" "\ @@ -18459,7 +18301,7 @@ ;;;*** ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el" -;;;;;; (17167 7196)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/octave-hlp.el (autoload (quote octave-help) "octave-hlp" "\ @@ -18473,7 +18315,7 @@ ;;;*** ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el" -;;;;;; (17186 62981)) +;;;;;; (17187 59926)) ;;; Generated autoloads from progmodes/octave-inf.el (autoload (quote inferior-octave) "octave-inf" "\ @@ -18496,7 +18338,7 @@ ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (17239 32387)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload (quote octave-mode) "octave-mod" "\ @@ -18595,7 +18437,7 @@ ;;;*** ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el" -;;;;;; (17148 25181)) +;;;;;; (17187 59902)) ;;; Generated autoloads from obsolete/options.el (autoload (quote list-options) "options" "\ @@ -18619,7 +18461,7 @@ ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files ;;;;;; orgtbl-mode turn-on-orgtbl org-remember-handler org-remember-annotation ;;;;;; org-store-link org-diary org-agenda org-agenda-mode org-mode) -;;;;;; "org" "textmodes/org.el" (17245 51610)) +;;;;;; "org" "textmodes/org.el" (17277 59650)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ @@ -18790,7 +18632,7 @@ ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (17239 32223)) +;;;;;; (17226 24576)) ;;; Generated autoloads from outline.el (autoload (quote outline-mode) "outline" "\ @@ -18845,7 +18687,7 @@ ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17148 25021)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17187 59902)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -18871,7 +18713,7 @@ ;;;*** ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el" -;;;;;; (17102 18474)) +;;;;;; (17187 59880)) ;;; Generated autoloads from calendar/parse-time.el (autoload (quote parse-time-string) "parse-time" "\ @@ -18883,8 +18725,8 @@ ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17239 -;;;;;; 32388)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from progmodes/pascal.el (autoload (quote pascal-mode) "pascal" "\ @@ -18937,7 +18779,7 @@ ;;;*** ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el" -;;;;;; (17140 20922)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emulation/pc-mode.el (autoload (quote pc-bindings-mode) "pc-mode" "\ @@ -18955,7 +18797,7 @@ ;;;*** ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select" -;;;;;; "emulation/pc-select.el" (17140 20922)) +;;;;;; "emulation/pc-select.el" (17187 59901)) ;;; Generated autoloads from emulation/pc-select.el (defvar pc-selection-mode nil "\ @@ -19032,8 +18874,8 @@ ;;;*** -;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17148 -;;;;;; 25022)) +;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from pcmpl-cvs.el (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\ @@ -19044,7 +18886,7 @@ ;;;*** ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip) -;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17148 25022)) +;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17187 59902)) ;;; Generated autoloads from pcmpl-gnu.el (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\ @@ -19072,7 +18914,7 @@ ;;;*** ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill) -;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17148 25022)) +;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17187 59902)) ;;; Generated autoloads from pcmpl-linux.el (autoload (quote pcomplete/kill) "pcmpl-linux" "\ @@ -19092,8 +18934,8 @@ ;;;*** -;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17148 -;;;;;; 25022)) +;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from pcmpl-rpm.el (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\ @@ -19109,7 +18951,7 @@ ;;;### (autoloads (pcomplete/chgrp pcomplete/chown pcomplete/which ;;;;;; pcomplete/xargs pcomplete/rm pcomplete/rmdir pcomplete/cd) -;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17148 25022)) +;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17187 59902)) ;;; Generated autoloads from pcmpl-unix.el (autoload (quote pcomplete/cd) "pcmpl-unix" "\ @@ -19155,8 +18997,8 @@ ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17205 -;;;;;; 6017)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17226 +;;;;;; 24576)) ;;; Generated autoloads from pcomplete.el (autoload (quote pcomplete) "pcomplete" "\ @@ -19215,7 +19057,7 @@ ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "pcvs.el" (17239 32224)) +;;;;;; "pcvs.el" (17238 21257)) ;;; Generated autoloads from pcvs.el (autoload (quote cvs-checkout) "pcvs" "\ @@ -19292,7 +19134,7 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17194 38169)) +;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17196 27217)) ;;; Generated autoloads from pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] (quote (menu-item "Directory Status" cvs-status :help "A more verbose status of a workarea"))) (define-key m [checkout] (quote (menu-item "Checkout Module" cvs-checkout :help "Check out a module from the repository"))) (define-key m [update] (quote (menu-item "Update Directory" cvs-update :help "Fetch updates from the repository"))) (define-key m [examine] (quote (menu-item "Examine Directory" cvs-examine :help "Examine the current state of a workarea"))) (fset (quote cvs-global-menu) m))) @@ -19300,7 +19142,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (17185 27660)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/perl-mode.el (autoload (quote perl-mode) "perl-mode" "\ @@ -19357,55 +19199,101 @@ ;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key ;;;;;; pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt -;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-region) "pgg" -;;;;;; "pgg.el" (17244 47844)) +;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region +;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (17263 27852)) ;;; Generated autoloads from pgg.el (autoload (quote pgg-encrypt-region) "pgg" "\ Encrypt the current region between START and END for RCPTS. + If optional argument SIGN is non-nil, do a combined sign and encrypt. -\(fn START END RCPTS &optional SIGN)" t nil) +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn START END RCPTS &optional SIGN PASSPHRASE)" t nil) + +(autoload (quote pgg-encrypt-symmetric-region) "pgg" "\ +Encrypt the current region between START and END symmetric with passphrase. + +If optional PASSPHRASE is not specified, it will be obtained from the +cache or user. + +\(fn START END &optional PASSPHRASE)" t nil) + +(autoload (quote pgg-encrypt-symmetric) "pgg" "\ +Encrypt the current buffer using a symmetric, rather than key-pair, cipher. + +If optional arguments START and END are specified, only encrypt within +the region. + +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn &optional START END PASSPHRASE)" t nil) (autoload (quote pgg-encrypt) "pgg" "\ Encrypt the current buffer for RCPTS. + If optional argument SIGN is non-nil, do a combined sign and encrypt. + If optional arguments START and END are specified, only encrypt within the region. -\(fn RCPTS &optional SIGN START END)" t nil) +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn RCPTS &optional SIGN START END PASSPHRASE)" t nil) (autoload (quote pgg-decrypt-region) "pgg" "\ Decrypt the current region between START and END. -\(fn START END)" t nil) +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn START END &optional PASSPHRASE)" t nil) (autoload (quote pgg-decrypt) "pgg" "\ Decrypt the current buffer. + If optional arguments START and END are specified, only decrypt within the region. -\(fn &optional START END)" t nil) +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn &optional START END PASSPHRASE)" t nil) (autoload (quote pgg-sign-region) "pgg" "\ Make the signature from text between START and END. + If the optional 3rd argument CLEARTEXT is non-nil, it does not create a detached signature. + If this function is called interactively, CLEARTEXT is enabled and the the output is displayed. -\(fn START END &optional CLEARTEXT)" t nil) +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn START END &optional CLEARTEXT PASSPHRASE)" t nil) (autoload (quote pgg-sign) "pgg" "\ Sign the current buffer. + If the optional argument CLEARTEXT is non-nil, it does not create a detached signature. + If optional arguments START and END are specified, only sign data within the region. + If this function is called interactively, CLEARTEXT is enabled and the the output is displayed. -\(fn &optional CLEARTEXT START END)" t nil) +If optional PASSPHRASE is not specified, it will be obtained from the +passphrase cache or user. + +\(fn &optional CLEARTEXT START END PASSPHRASE)" t nil) (autoload (quote pgg-verify-region) "pgg" "\ Verify the current region between START and END. @@ -19445,8 +19333,19 @@ ;;;*** +;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el" +;;;;;; (17263 27852)) +;;; Generated autoloads from pgg-gpg.el + +(autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\ +True if decoded armor MESSAGE-KEYS has symmetric encryption indicator. + +\(fn MESSAGE-KEYS)" nil nil) + +;;;*** + ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el" -;;;;;; (17148 25215)) +;;;;;; (17187 59902)) ;;; Generated autoloads from textmodes/picture.el (autoload (quote picture-mode) "picture" "\ @@ -19518,7 +19417,7 @@ ;;;*** ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el" -;;;;;; (17148 25215)) +;;;;;; (17187 59902)) ;;; Generated autoloads from textmodes/po.el (autoload (quote po-find-file-coding-system) "po" "\ @@ -19529,7 +19428,7 @@ ;;;*** -;;;### (autoloads (pong) "pong" "play/pong.el" (17140 20949)) +;;;### (autoloads (pong) "pong" "play/pong.el" (17187 59902)) ;;; Generated autoloads from play/pong.el (autoload (quote pong) "pong" "\ @@ -19546,7 +19445,7 @@ ;;;*** ;;;### (autoloads (pp-eval-last-sexp pp-eval-expression pp pp-buffer -;;;;;; pp-to-string) "pp" "emacs-lisp/pp.el" (17185 27496)) +;;;;;; pp-to-string) "pp" "emacs-lisp/pp.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload (quote pp-to-string) "pp" "\ @@ -19604,7 +19503,7 @@ ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (17239 32228)) +;;;;;; (17277 59650)) ;;; Generated autoloads from printing.el (autoload (quote pr-interface) "printing" "\ @@ -20192,7 +20091,7 @@ ;;;*** ;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el" -;;;;;; (17185 27661)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/prolog.el (autoload (quote prolog-mode) "prolog" "\ @@ -20212,7 +20111,7 @@ ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17131 20680)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17187 59902)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\ @@ -20221,8 +20120,8 @@ ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17205 -;;;;;; 6191)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload (quote ps-mode) "ps-mode" "\ @@ -20271,7 +20170,7 @@ ;;;### (autoloads (ps-mule-begin-page ps-mule-begin-job ps-mule-encode-header-string ;;;;;; ps-mule-initialize ps-mule-plot-composition ps-mule-plot-string ;;;;;; ps-mule-set-ascii-font ps-mule-prepare-ascii-font ps-multibyte-buffer) -;;;;;; "ps-mule" "ps-mule.el" (17239 32229)) +;;;;;; "ps-mule" "ps-mule.el" (17226 24577)) ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ @@ -20392,8 +20291,8 @@ ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17239 -;;;;;; 32233)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17226 +;;;;;; 24577)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\ @@ -20590,7 +20489,7 @@ ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (17239 32390)) +;;;;;; (17238 21257)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@ -20654,7 +20553,7 @@ ;;;*** ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el" -;;;;;; (17148 25151)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/qp.el (autoload (quote quoted-printable-decode-region) "qp" "\ @@ -20677,7 +20576,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (17249 49351)) +;;;;;; "international/quail.el" (17257 22483)) ;;; Generated autoloads from international/quail.el (autoload (quote quail-title) "quail" "\ @@ -20908,8 +20807,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17140 -;;;;;; 20942)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -20980,7 +20879,7 @@ ;;;*** -;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17240 44365)) +;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17263 27852)) ;;; Generated autoloads from net/rcirc.el (autoload (quote rcirc) "rcirc" "\ @@ -20988,7 +20887,7 @@ If any of the the optional SERVER, PORT, NICK or CHANNELS are not supplied, they are taken from the variables `rcirc-server', -`rcirc-port', `rcirc-nick', and `rcirc-startup-channels', +`rcirc-port', `rcirc-nick', and `rcirc-startup-channels-alist', respectively. \(fn &optional SERVER PORT NICK CHANNELS)" t nil) @@ -20997,8 +20896,8 @@ ;;;*** -;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17239 -;;;;;; 32359)) +;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17226 +;;;;;; 24576)) ;;; Generated autoloads from net/rcompile.el (autoload (quote remote-compile) "rcompile" "\ @@ -21010,7 +20909,7 @@ ;;;*** ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (17148 25097)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias (quote regexp-builder) (quote re-builder)) @@ -21022,7 +20921,7 @@ ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17239 32234)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17238 21257)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -21052,8 +20951,8 @@ ;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle ;;;;;; delete-whitespace-rectangle open-rectangle insert-rectangle ;;;;;; yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle -;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (17239 -;;;;;; 32234)) +;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (17226 +;;;;;; 24577)) ;;; Generated autoloads from rect.el (autoload (quote move-to-column-force) "rect" "\ @@ -21175,8 +21074,8 @@ ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17148 -;;;;;; 25216)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from textmodes/refill.el (autoload (quote refill-mode) "refill" "\ @@ -21192,7 +21091,7 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17205 6264)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17277 59650)) ;;; Generated autoloads from textmodes/reftex.el (autoload (quote turn-on-reftex) "reftex" "\ @@ -21242,7 +21141,7 @@ ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (17205 6249)) +;;;;;; (17226 24577)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload (quote reftex-citation) "reftex-cite" "\ @@ -21272,7 +21171,7 @@ ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" -;;;;;; (17205 6250)) +;;;;;; (17226 24577)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\ @@ -21289,7 +21188,7 @@ ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (17239 32421)) +;;;;;; (17226 24577)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload (quote reftex-index-phrases-mode) "reftex-index" "\ @@ -21322,7 +21221,7 @@ ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (17205 6254)) +;;;;;; (17226 24578)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload (quote reftex-all-document-files) "reftex-parse" "\ @@ -21335,7 +21234,7 @@ ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (17148 25097)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload (quote regexp-opt) "regexp-opt" "\ @@ -21362,7 +21261,7 @@ ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (17148 25034)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (17187 59902)) ;;; Generated autoloads from repeat.el (autoload (quote repeat) "repeat" "\ @@ -21380,7 +21279,7 @@ ;;;*** ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el" -;;;;;; (17148 25157)) +;;;;;; (17187 59902)) ;;; Generated autoloads from mail/reporter.el (autoload (quote reporter-submit-bug-report) "reporter" "\ @@ -21412,7 +21311,7 @@ ;;;*** ;;;### (autoloads (reposition-window) "reposition" "reposition.el" -;;;;;; (17148 25035)) +;;;;;; (17187 59902)) ;;; Generated autoloads from reposition.el (autoload (quote reposition-window) "reposition" "\ @@ -21439,8 +21338,8 @@ ;;;*** -;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17148 -;;;;;; 25035)) +;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from resume.el (autoload (quote resume-suspend-hook) "resume" "\ @@ -21451,7 +21350,7 @@ ;;;*** ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el" -;;;;;; (17148 25035)) +;;;;;; (17277 59650)) ;;; Generated autoloads from reveal.el (autoload (quote reveal-mode) "reveal" "\ @@ -21486,54 +21385,8 @@ ;;;*** -;;;### (autoloads (file-name-shadow-mode file-name-shadow-tty-properties -;;;;;; file-name-shadow-properties) "rfn-eshadow" "rfn-eshadow.el" -;;;;;; (17148 25035)) -;;; Generated autoloads from rfn-eshadow.el - -(defvar file-name-shadow-properties (quote (face file-name-shadow field shadow)) "\ -Properties given to the `shadowed' part of a filename in the minibuffer. -Only used when `file-name-shadow-mode' is active. -If emacs is not running under a window system, -`file-name-shadow-tty-properties' is used instead.") - -(custom-autoload (quote file-name-shadow-properties) "rfn-eshadow") - -(defvar file-name-shadow-tty-properties (quote (before-string "{" after-string "} " field shadow)) "\ -Properties given to the `shadowed' part of a filename in the minibuffer. -Only used when `file-name-shadow-mode' is active and emacs -is not running under a window-system; if emacs is running under a window -system, `file-name-shadow-properties' is used instead.") - -(custom-autoload (quote file-name-shadow-tty-properties) "rfn-eshadow") - -(defvar file-name-shadow-mode nil "\ -Non-nil if File-Name-Shadow mode is enabled. -See the command `file-name-shadow-mode' for a description of this minor-mode. -Setting this variable directly does not take effect; -use either \\[customize] or the function `file-name-shadow-mode'.") - -(custom-autoload (quote file-name-shadow-mode) "rfn-eshadow") - -(put (quote file-name-shadow-mode) (quote custom-set) (quote custom-set-minor-mode)) - -(autoload (quote file-name-shadow-mode) "rfn-eshadow" "\ -Toggle File-Name Shadow mode. -When active, any part of a filename being read in the minibuffer -that would be ignored (because the result is passed through -`substitute-in-file-name') is given the properties in -`file-name-shadow-properties', which can be used to make -that portion dim, invisible, or otherwise less visually noticeable. - -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled. - -\(fn &optional ARG)" t nil) - -;;;*** - ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el" -;;;;;; (17148 25098)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload (quote ring-p) "ring" "\ @@ -21548,7 +21401,7 @@ ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17140 20942)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17187 59902)) ;;; Generated autoloads from net/rlogin.el (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)") @@ -21599,8 +21452,8 @@ ;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output ;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers ;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17239 -;;;;;; 32332)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17226 +;;;;;; 24576)) ;;; Generated autoloads from mail/rmail.el (autoload (quote rmail-movemail-variant-p) "rmail" "\ @@ -21858,7 +21711,7 @@ ;;;*** ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el" -;;;;;; (17148 25160)) +;;;;;; (17187 59902)) ;;; Generated autoloads from mail/rmailedit.el (autoload (quote rmail-edit-current-message) "rmailedit" "\ @@ -21870,7 +21723,7 @@ ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" -;;;;;; "mail/rmailkwd.el" (17185 27577)) +;;;;;; "mail/rmailkwd.el" (17187 59902)) ;;; Generated autoloads from mail/rmailkwd.el (autoload (quote rmail-add-label) "rmailkwd" "\ @@ -21909,7 +21762,7 @@ ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el" -;;;;;; (17185 27577)) +;;;;;; (17187 59902)) ;;; Generated autoloads from mail/rmailmsc.el (autoload (quote set-rmail-inbox-list) "rmailmsc" "\ @@ -21923,7 +21776,7 @@ ;;;### (autoloads (rmail-output-body-to-file rmail-output rmail-fields-not-to-output ;;;;;; rmail-output-to-rmail-file rmail-output-file-alist) "rmailout" -;;;;;; "mail/rmailout.el" (17239 32332)) +;;;;;; "mail/rmailout.el" (17263 27852)) ;;; Generated autoloads from mail/rmailout.el (defvar rmail-output-file-alist nil "\ @@ -21947,11 +21800,11 @@ The default file name comes from `rmail-default-rmail-file', which is updated to the name you use in this command. -A prefix argument N says to output N consecutive messages +A prefix argument COUNT says to output that many consecutive messages, starting with the current one. Deleted messages are skipped and don't count. -If optional argument STAY is non-nil, then leave the last filed -mesasge up instead of moving forward to the next non-deleted message. +If the optional argument STAY is non-nil, then leave the last filed +message up instead of moving forward to the next non-deleted message. \(fn FILE-NAME &optional COUNT STAY)" t nil) @@ -21962,9 +21815,9 @@ (autoload (quote rmail-output) "rmailout" "\ Append this message to system-inbox-format mail file named FILE-NAME. -A prefix argument N says to output N consecutive messages +A prefix argument COUNT says to output that many consecutive messages, starting with the current one. Deleted messages are skipped and don't count. -When called from lisp code, N may be omitted. +When called from lisp code, COUNT may be omitted and defaults to 1. If the pruned message header is shown on the current message, then messages will be appended with pruned headers; otherwise, messages @@ -21990,8 +21843,8 @@ ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent ;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject -;;;;;; rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17148 -;;;;;; 25160)) +;;;;;; rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from mail/rmailsort.el (autoload (quote rmail-sort-by-date) "rmailsort" "\ @@ -22043,7 +21896,7 @@ ;;;;;; rmail-summary-by-senders rmail-summary-by-topic rmail-summary-by-regexp ;;;;;; rmail-summary-by-recipients rmail-summary-by-labels rmail-summary ;;;;;; rmail-summary-line-count-flag rmail-summary-scroll-between-messages) -;;;;;; "rmailsum" "mail/rmailsum.el" (17239 32333)) +;;;;;; "rmailsum" "mail/rmailsum.el" (17226 24576)) ;;; Generated autoloads from mail/rmailsum.el (defvar rmail-summary-scroll-between-messages t "\ @@ -22125,7 +21978,7 @@ ;;;*** ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el" -;;;;;; (17185 27602)) +;;;;;; (17187 59902)) ;;; Generated autoloads from obsolete/rnewspost.el (autoload (quote news-post-news) "rnewspost" "\ @@ -22138,7 +21991,7 @@ ;;;*** ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region -;;;;;; rot13-string rot13) "rot13" "rot13.el" (17148 25035)) +;;;;;; rot13-string rot13) "rot13" "rot13.el" (17187 59902)) ;;; Generated autoloads from rot13.el (autoload (quote rot13) "rot13" "\ @@ -22179,7 +22032,7 @@ ;;;;;; resize-minibuffer-frame-max-height resize-minibuffer-frame ;;;;;; resize-minibuffer-window-exactly resize-minibuffer-window-max-height ;;;;;; resize-minibuffer-mode) "rsz-mini" "obsolete/rsz-mini.el" -;;;;;; (17148 25181)) +;;;;;; (17187 59902)) ;;; Generated autoloads from obsolete/rsz-mini.el (defvar resize-minibuffer-mode nil "\ @@ -22219,8 +22072,8 @@ ;;;*** -;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17159 -;;;;;; 1467)) +;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from ruler-mode.el (autoload (quote ruler-mode) "ruler-mode" "\ @@ -22230,8 +22083,8 @@ ;;;*** -;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17148 -;;;;;; 25098)) +;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload (quote rx-to-string) "rx" "\ @@ -22538,34 +22391,34 @@ ;;;*** -;;;### (autoloads (savehist-save savehist-load) "savehist" "savehist.el" -;;;;;; (17245 9380)) +;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el" +;;;;;; (17277 59650)) ;;; Generated autoloads from savehist.el -(autoload (quote savehist-load) "savehist" "\ -Load the minibuffer histories from `savehist-file'. -Unless NO-INSTALL is present and non-nil, the function will also install -`savehist-autosave' in `kill-emacs-hook' and on a timer, ensuring that -history is saved before leaving Emacs. - -This function should be normally used from your Emacs init file. Since -it removes your current minibuffer histories, it is unwise to call it at -any other time. - -\(fn &optional NO-INSTALL)" t nil) - -(autoload (quote savehist-save) "savehist" "\ -Save the values of minibuffer history variables. -Unbound symbols referenced in `savehist-additional-variables' are ignored. -If AUTO-SAVE is non-nil, compare the saved contents to the one last saved, - and don't save the buffer if they are the same. - -\(fn &optional AUTO-SAVE)" t nil) +(defvar savehist-mode nil "\ +Mode for automatic saving of minibuffer history. +Set this by calling the `savehist-mode' function or using the customize +interface.") + +(custom-autoload (quote savehist-mode) "savehist") + +(autoload (quote savehist-mode) "savehist" "\ +Toggle savehist-mode. +Positive ARG turns on `savehist-mode'. When on, savehist-mode causes +minibuffer history to be saved periodically and when exiting Emacs. +When turned on for the first time in an Emacs session, it causes the +previous minibuffer history to be loaded from `savehist-file'. + +This mode should normally be turned on from your Emacs init file. +Calling it at any other time replaces your current minibuffer histories, +which is probably undesirable. + +\(fn ARG)" t nil) ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (17239 32390)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/scheme.el (autoload (quote scheme-mode) "scheme" "\ @@ -22607,7 +22460,7 @@ ;;;*** ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el" -;;;;;; (17148 25151)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/score-mode.el (autoload (quote gnus-score-mode) "score-mode" "\ @@ -22620,8 +22473,8 @@ ;;;*** -;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17185 -;;;;;; 27603)) +;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from obsolete/scribe.el (autoload (quote scribe-mode) "scribe" "\ @@ -22646,7 +22499,7 @@ ;;;*** ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el" -;;;;;; (17148 25035)) +;;;;;; (17187 59902)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -22670,7 +22523,7 @@ ;;;*** ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el" -;;;;;; (17167 2786)) +;;;;;; (17187 59900)) ;;; Generated autoloads from scroll-lock.el (autoload (quote scroll-lock-mode) "scroll-lock" "\ @@ -22692,7 +22545,7 @@ ;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-yank-ignored-headers ;;;;;; mail-interactive mail-self-blind mail-specify-envelope-from -;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (17239 43866)) +;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (17277 60154)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style (quote angles) "\ @@ -22993,17 +22846,18 @@ ;;;*** ;;;### (autoloads (server-mode server-start) "server" "server.el" -;;;;;; (17244 48630)) +;;;;;; (17279 19612)) ;;; Generated autoloads from server.el (autoload (quote server-start) "server" "\ Allow this Emacs process to be a server for client processes. This starts a server communications subprocess through which -client \"editors\" can send your editing commands to this Emacs job. -To use the server, set up the program `emacsclient' in the +client \"editors\" can send your editing commands to this Emacs +job. To use the server, set up the program `emacsclient' in the Emacs distribution as your standard \"editor\". -Prefix arg means just kill any existing server communications subprocess. +Prefix arg LEAVE-DEAD means just kill any existing server +communications subprocess. \(fn &optional LEAVE-DEAD)" t nil) @@ -23027,7 +22881,7 @@ ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (17239 32237)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (17226 24577)) ;;; Generated autoloads from ses.el (autoload (quote ses-mode) "ses" "\ @@ -23046,7 +22900,7 @@ ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (17185 27753)) +;;;;;; (17277 60154)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload (quote sgml-mode) "sgml-mode" "\ @@ -23114,7 +22968,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (17242 7322)) +;;;;;; (17277 60154)) ;;; Generated autoloads from progmodes/sh-script.el (autoload (quote sh-mode) "sh-script" "\ @@ -23177,7 +23031,7 @@ ;;;*** -;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17148 25151)) +;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17187 59901)) ;;; Generated autoloads from gnus/sha1.el (autoload (quote sha1) "sha1" "\ @@ -23192,7 +23046,7 @@ ;;;*** ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el" -;;;;;; (17148 25098)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload (quote list-load-path-shadows) "shadow" "\ @@ -23239,8 +23093,8 @@ ;;;*** ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group -;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (17239 -;;;;;; 32238)) +;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (17226 +;;;;;; 24577)) ;;; Generated autoloads from shadowfile.el (autoload (quote shadow-define-cluster) "shadowfile" "\ @@ -23279,7 +23133,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (17196 30352)) +;;;;;; (17226 24577)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\ @@ -23326,7 +23180,7 @@ ;;;*** ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (17205 6100)) +;;;;;; "sieve" "gnus/sieve.el" (17226 24575)) ;;; Generated autoloads from gnus/sieve.el (autoload (quote sieve-manage) "sieve" "\ @@ -23347,7 +23201,7 @@ ;;;*** ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el" -;;;;;; (17148 25152)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload (quote sieve-mode) "sieve-mode" "\ @@ -23362,8 +23216,8 @@ ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17140 -;;;;;; 20980)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17277 +;;;;;; 60154)) ;;; Generated autoloads from progmodes/simula.el (autoload (quote simula-mode) "simula" "\ @@ -23412,7 +23266,7 @@ ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (17148 25043)) +;;;;;; define-skeleton) "skeleton" "skeleton.el" (17187 59902)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter (quote identity) "\ @@ -23522,7 +23376,7 @@ ;;;*** ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el" -;;;;;; (17247 15785)) +;;;;;; (17257 22483)) ;;; Generated autoloads from smerge-mode.el (autoload (quote smerge-ediff) "smerge-mode" "\ @@ -23541,7 +23395,7 @@ ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (17148 25152)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/smiley.el (autoload (quote smiley-region) "smiley" "\ @@ -23559,7 +23413,7 @@ ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (17120 44799)) +;;;;;; "mail/smtpmail.el" (17277 59650)) ;;; Generated autoloads from mail/smtpmail.el (autoload (quote smtpmail-send-it) "smtpmail" "\ @@ -23574,7 +23428,7 @@ ;;;*** -;;;### (autoloads (snake) "snake" "play/snake.el" (17140 20949)) +;;;### (autoloads (snake) "snake" "play/snake.el" (17187 59902)) ;;; Generated autoloads from play/snake.el (autoload (quote snake) "snake" "\ @@ -23598,7 +23452,7 @@ ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (17140 20942)) +;;;;;; (17187 59902)) ;;; Generated autoloads from net/snmp-mode.el (autoload (quote snmp-mode) "snmp-mode" "\ @@ -23629,7 +23483,7 @@ ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name ;;;;;; calendar-longitude calendar-latitude calendar-time-display-form) -;;;;;; "solar" "calendar/solar.el" (17239 32270)) +;;;;;; "solar" "calendar/solar.el" (17229 28052)) ;;; Generated autoloads from calendar/solar.el (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\ @@ -23700,8 +23554,8 @@ ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17140 -;;;;;; 20949)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from play/solitaire.el (autoload (quote solitaire) "solitaire" "\ @@ -23778,7 +23632,7 @@ ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields ;;;;;; sort-fields sort-numeric-fields sort-pages sort-paragraphs -;;;;;; sort-lines sort-subr) "sort" "sort.el" (17148 25043)) +;;;;;; sort-lines sort-subr) "sort" "sort.el" (17187 59902)) ;;; Generated autoloads from sort.el (autoload (quote sort-subr) "sort" "\ @@ -23920,8 +23774,8 @@ ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17148 -;;;;;; 25153)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from gnus/spam.el (autoload (quote spam-initialize) "spam" "\ @@ -23933,7 +23787,7 @@ ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file ;;;;;; spam-report-url-ping-mm-url spam-report-process-queue) "spam-report" -;;;;;; "gnus/spam-report.el" (17239 32320)) +;;;;;; "gnus/spam-report.el" (17226 24576)) ;;; Generated autoloads from gnus/spam-report.el (autoload (quote spam-report-process-queue) "spam-report" "\ @@ -23976,7 +23830,7 @@ ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (17239 32244)) +;;;;;; "speedbar.el" (17238 21257)) ;;; Generated autoloads from speedbar.el (defalias (quote speedbar) (quote speedbar-frame-mode)) @@ -24001,7 +23855,7 @@ ;;;*** ;;;### (autoloads (spell-string spell-region spell-word spell-buffer) -;;;;;; "spell" "textmodes/spell.el" (17148 25223)) +;;;;;; "spell" "textmodes/spell.el" (17187 59902)) ;;; Generated autoloads from textmodes/spell.el (put (quote spell-filter) (quote risky-local-variable) t) @@ -24037,8 +23891,8 @@ ;;;*** -;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17140 -;;;;;; 20949)) +;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from play/spook.el (autoload (quote spook) "spook" "\ @@ -24056,8 +23910,8 @@ ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-mode sql-help -;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17185 -;;;;;; 27674)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from progmodes/sql.el (autoload (quote sql-add-product-keywords) "sql" "\ @@ -24488,8 +24342,8 @@ ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17205 -;;;;;; 6045)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17226 +;;;;;; 24577)) ;;; Generated autoloads from strokes.el (autoload (quote strokes-global-set-stroke) "strokes" "\ @@ -24600,7 +24454,7 @@ ;;;*** ;;;### (autoloads (studlify-buffer studlify-word studlify-region) -;;;;;; "studly" "play/studly.el" (17075 55479)) +;;;;;; "studly" "play/studly.el" (17187 59879)) ;;; Generated autoloads from play/studly.el (autoload (quote studlify-region) "studly" "\ @@ -24620,7 +24474,7 @@ ;;;*** -;;;### (autoloads (locate-library) "subr" "subr.el" (17250 21630)) +;;;### (autoloads (locate-library) "subr" "subr.el" (17263 27852)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@ -24642,7 +24496,7 @@ ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (17239 32335)) +;;;;;; (17229 28053)) ;;; Generated autoloads from mail/supercite.el (autoload (quote sc-cite-original) "supercite" "\ @@ -24674,21 +24528,7 @@ ;;;*** -;;;### (autoloads (syntax-ppss) "syntax" "emacs-lisp/syntax.el" (17242 -;;;;;; 7313)) -;;; Generated autoloads from emacs-lisp/syntax.el - -(autoload (quote syntax-ppss) "syntax" "\ -Parse-Partial-Sexp State at POS. -The returned value is the same as `parse-partial-sexp' except that -the 2nd and 6th values of the returned state cannot be relied upon. -Point is at POS when this function returns. - -\(fn &optional POS)" nil nil) - -;;;*** - -;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17148 25050)) +;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17187 59902)) ;;; Generated autoloads from tabify.el (autoload (quote untabify) "tabify" "\ @@ -24723,7 +24563,7 @@ ;;;;;; table-recognize table-insert-row-column table-insert-column ;;;;;; table-insert-row table-insert table-point-left-cell-hook ;;;;;; table-point-entered-cell-hook table-load-hook table-cell-map-hook) -;;;;;; "table" "textmodes/table.el" (17159 1496)) +;;;;;; "table" "textmodes/table.el" (17187 59902)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -25311,7 +25151,7 @@ ;;;*** -;;;### (autoloads (talk-connect) "talk" "talk.el" (17148 25050)) +;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17187 59902)) ;;; Generated autoloads from talk.el (autoload (quote talk-connect) "talk" "\ @@ -25319,9 +25159,14 @@ \(fn DISPLAY)" t nil) -;;;*** - -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17242 7312)) +(autoload (quote talk) "talk" "\ +Connect to the Emacs talk group from the current X display or tty frame. + +\(fn)" t nil) + +;;;*** + +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17277 59650)) ;;; Generated autoloads from tar-mode.el (autoload (quote tar-mode) "tar-mode" "\ @@ -25333,7 +25178,7 @@ Type `c' to copy an entry from the tar file into another file on disk. If you edit a sub-file of this archive (as with the `e' command) and -save it with Control-x Control-s, the contents of that buffer will be +save it with \\[save-buffer], the contents of that buffer will be saved back into the tar-file buffer; in this way you can edit a file inside of a tar archive without extracting it and re-archiving it. @@ -25345,7 +25190,7 @@ ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (17102 19053)) +;;;;;; "progmodes/tcl.el" (17277 60154)) ;;; Generated autoloads from progmodes/tcl.el (autoload (quote tcl-mode) "tcl" "\ @@ -25396,7 +25241,7 @@ ;;;*** -;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17140 20942)) +;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17187 59902)) ;;; Generated autoloads from net/telnet.el (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)") @@ -25423,8 +25268,8 @@ ;;;*** -;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17248 -;;;;;; 29270)) +;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17277 +;;;;;; 59650)) ;;; Generated autoloads from term.el (autoload (quote make-term) "term" "\ @@ -25452,8 +25297,8 @@ ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17239 -;;;;;; 32246)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17226 +;;;;;; 24577)) ;;; Generated autoloads from terminal.el (autoload (quote terminal-emulator) "terminal" "\ @@ -25490,7 +25335,7 @@ ;;;*** ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el" -;;;;;; (17159 1472)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload (quote testcover-this-defun) "testcover" "\ @@ -25500,7 +25345,7 @@ ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17140 20949)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17187 59902)) ;;; Generated autoloads from play/tetris.el (autoload (quote tetris) "tetris" "\ @@ -25531,7 +25376,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (17239 32423)) +;;;;;; (17238 21257)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -25833,7 +25678,7 @@ ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (17148 25229)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (17187 59902)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload (quote texinfo-format-buffer) "texinfmt" "\ @@ -25873,7 +25718,7 @@ ;;;*** ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote) -;;;;;; "texinfo" "textmodes/texinfo.el" (17246 24773)) +;;;;;; "texinfo" "textmodes/texinfo.el" (17277 60154)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote "``" "\ @@ -25960,7 +25805,7 @@ ;;;### (autoloads (thai-auto-composition-mode thai-composition-function ;;;;;; thai-post-read-conversion thai-compose-buffer thai-compose-string ;;;;;; thai-compose-region) "thai-util" "language/thai-util.el" -;;;;;; (17185 27569)) +;;;;;; (17187 59901)) ;;; Generated autoloads from language/thai-util.el (autoload (quote thai-compose-region) "thai-util" "\ @@ -26004,7 +25849,7 @@ ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (17148 25056)) +;;;;;; "thingatpt" "thingatpt.el" (17187 59902)) ;;; Generated autoloads from thingatpt.el (autoload (quote forward-thing) "thingatpt" "\ @@ -26061,7 +25906,7 @@ ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show-all thumbs-dired-show-marked ;;;;;; thumbs-show-all-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (17245 51608)) +;;;;;; (17263 27852)) ;;; Generated autoloads from thumbs.el (autoload (quote thumbs-find-thumb) "thumbs" "\ @@ -26100,7 +25945,7 @@ ;;;;;; tibetan-composition-function tibetan-decompose-string tibetan-decompose-region ;;;;;; tibetan-compose-region tibetan-compose-string tibetan-transcription-to-tibetan ;;;;;; tibetan-tibetan-to-transcription tibetan-char-p) "tibet-util" -;;;;;; "language/tibet-util.el" (17102 18781)) +;;;;;; "language/tibet-util.el" (17187 59881)) ;;; Generated autoloads from language/tibet-util.el (autoload (quote tibetan-char-p) "tibet-util" "\ @@ -26179,7 +26024,7 @@ ;;;*** ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el" -;;;;;; (17205 6265)) +;;;;;; (17226 24578)) ;;; Generated autoloads from textmodes/tildify.el (autoload (quote tildify-region) "tildify" "\ @@ -26203,7 +26048,7 @@ ;;;*** ;;;### (autoloads (display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (17148 25057)) +;;;;;; "time" "time.el" (17187 59902)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -26246,8 +26091,8 @@ ;;;### (autoloads (safe-date-to-time time-to-days time-to-day-in-year ;;;;;; date-leap-year-p days-between date-to-day time-add time-subtract ;;;;;; time-since days-to-time time-less-p seconds-to-time time-to-seconds -;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17239 -;;;;;; 32270)) +;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17226 +;;;;;; 24571)) ;;; Generated autoloads from calendar/time-date.el (autoload (quote date-to-time) "time-date" "\ @@ -26333,7 +26178,7 @@ ;;;*** ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp" -;;;;;; "time-stamp.el" (17194 38185)) +;;;;;; "time-stamp.el" (17196 26624)) ;;; Generated autoloads from time-stamp.el (autoload (quote time-stamp) "time-stamp" "\ @@ -26369,7 +26214,7 @@ ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el" -;;;;;; (17239 32271)) +;;;;;; (17226 24571)) ;;; Generated autoloads from calendar/timeclock.el (autoload (quote timeclock-modeline-display) "timeclock" "\ @@ -26470,7 +26315,7 @@ ;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer ;;;;;; run-at-time cancel-function-timers cancel-timer) "timer" -;;;;;; "emacs-lisp/timer.el" (17148 25099)) +;;;;;; "emacs-lisp/timer.el" (17263 27852)) ;;; Generated autoloads from emacs-lisp/timer.el (defalias (quote disable-timeout) (quote cancel-timer)) @@ -26541,7 +26386,7 @@ ;;;*** ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv" -;;;;;; "international/titdic-cnv.el" (17102 18762)) +;;;;;; "international/titdic-cnv.el" (17187 59880)) ;;; Generated autoloads from international/titdic-cnv.el (autoload (quote titdic-convert) "titdic-cnv" "\ @@ -26564,8 +26409,8 @@ ;;;*** ;;;### (autoloads (tamil-composition-function tamil-post-read-conversion -;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17102 -;;;;;; 18782)) +;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17187 +;;;;;; 59881)) ;;; Generated autoloads from language/tml-util.el (autoload (quote tamil-compose-region) "tml-util" "\ @@ -26588,7 +26433,7 @@ ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (17148 25058)) +;;;;;; "tmm.el" (17187 59902)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [f10] 'tmm-menubar) @@ -26629,7 +26474,7 @@ ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities ;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category) -;;;;;; "todo-mode" "calendar/todo-mode.el" (17102 18477)) +;;;;;; "todo-mode" "calendar/todo-mode.el" (17187 59880)) ;;; Generated autoloads from calendar/todo-mode.el (autoload (quote todo-add-category) "todo-mode" "\ @@ -26690,7 +26535,7 @@ ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu ;;;;;; tool-bar-local-item tool-bar-add-item) "tool-bar" "tool-bar.el" -;;;;;; (17250 21105)) +;;;;;; (17263 27852)) ;;; Generated autoloads from tool-bar.el (put (quote tool-bar-mode) (quote standard-value) (quote (t))) @@ -26727,7 +26572,7 @@ \(fn ICON DEF KEY MAP &rest PROPS)" nil nil) (autoload (quote tool-bar-add-item-from-menu) "tool-bar" "\ -Define tool bar binding for COMMAND using the given ICON in keymap MAP. +Define tool bar binding for COMMAND in keymap MAP using the given ICON. This makes a binding for COMMAND in `tool-bar-map', copying its binding from the menu bar in MAP (which defaults to `global-map'), but modifies the binding by adding an image specification for ICON. It @@ -26737,26 +26582,27 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap. Use this function only to make bindings in the global value of `tool-bar-map'. -To define items in any other map, use `tool-bar-local-item'. +To define items in any other map, use `tool-bar-local-item-from-menu'. \(fn COMMAND ICON &optional MAP &rest PROPS)" nil nil) (autoload (quote tool-bar-local-item-from-menu) "tool-bar" "\ -Define tool bar binding for COMMAND using the given ICON in keymap MAP. +Define local tool bar binding for COMMAND using the given ICON. This makes a binding for COMMAND in IN-MAP, copying its binding from the menu bar in FROM-MAP (which defaults to `global-map'), but modifies the binding by adding an image specification for ICON. It finds ICON just like `tool-bar-add-item'. PROPS are additional properties to add to the binding. -MAP must contain appropriate binding for `[menu-bar]' which holds a keymap. +FROM-MAP must contain appropriate binding for `[menu-bar]' which +holds a keymap. \(fn COMMAND ICON IN-MAP &optional FROM-MAP &rest PROPS)" nil nil) ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (17140 20923)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -26784,7 +26630,7 @@ ;;;*** ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins) -;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17140 20923)) +;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17187 59901)) ;;; Generated autoloads from emulation/tpu-extras.el (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\ @@ -26804,7 +26650,7 @@ ;;;*** -;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17148 25099)) +;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload (quote tq-create) "tq" "\ @@ -26818,7 +26664,7 @@ ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (17148 25100)) +;;;;;; "trace" "emacs-lisp/trace.el" (17187 59901)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -26851,7 +26697,7 @@ ;;;### (autoloads (tramp-completion-file-name-handler tramp-file-name-handler ;;;;;; tramp-completion-file-name-regexp tramp-file-name-regexp) -;;;;;; "tramp" "net/tramp.el" (17250 21105)) +;;;;;; "tramp" "net/tramp.el" (17263 27852)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@ -26928,7 +26774,7 @@ ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (17148 25231)) +;;;;;; "textmodes/two-column.el" (17187 59902)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -26979,7 +26825,7 @@ ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (17148 25059)) +;;;;;; (17187 59902)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -27162,7 +27008,7 @@ ;;;*** ;;;### (autoloads (ununderline-region underline-region) "underline" -;;;;;; "textmodes/underline.el" (17148 25231)) +;;;;;; "textmodes/underline.el" (17187 59902)) ;;; Generated autoloads from textmodes/underline.el (autoload (quote underline-region) "underline" "\ @@ -27183,7 +27029,7 @@ ;;;*** ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) -;;;;;; "undigest" "mail/undigest.el" (17148 25163)) +;;;;;; "undigest" "mail/undigest.el" (17187 59902)) ;;; Generated autoloads from mail/undigest.el (autoload (quote undigestify-rmail-message) "undigest" "\ @@ -27202,7 +27048,7 @@ ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (17148 25163)) +;;;;;; (17187 59902)) ;;; Generated autoloads from mail/unrmail.el (autoload (quote batch-unrmail) "unrmail" "\ @@ -27221,8 +27067,8 @@ ;;;*** -;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17148 -;;;;;; 25100)) +;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17187 +;;;;;; 59901)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload (quote unsafep) "unsafep" "\ @@ -27234,7 +27080,7 @@ ;;;*** -;;;### (autoloads nil "url" "url/url.el" (17239 32426)) +;;;### (autoloads nil "url" "url/url.el" (17238 21257)) ;;; Generated autoloads from url/url.el (defvar url-configuration-directory "~/.url") @@ -27242,7 +27088,7 @@ ;;;*** ;;;### (autoloads (url-register-auth-scheme url-get-authentication) -;;;;;; "url-auth" "url/url-auth.el" (17141 252)) +;;;;;; "url-auth" "url/url-auth.el" (17187 59902)) ;;; Generated autoloads from url/url-auth.el (autoload (quote url-get-authentication) "url-auth" "\ @@ -27284,8 +27130,8 @@ ;;;*** ;;;### (autoloads (url-cache-expired url-cache-extract url-is-cached -;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17141 -;;;;;; 252)) +;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from url/url-cache.el (autoload (quote url-store-in-cache) "url-cache" "\ @@ -27310,7 +27156,7 @@ ;;;*** -;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17141 252)) +;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17187 59902)) ;;; Generated autoloads from url/url-cid.el (autoload (quote url-cid) "url-cid" "\ @@ -27322,8 +27168,8 @@ ;;;### (autoloads (url-cookie-setup-save-timer url-cookie-handle-set-cookie ;;;;;; url-cookie-generate-header-lines url-cookie-retrieve url-cookie-write-file -;;;;;; url-cookie-parse-file) "url-cookie" "url/url-cookie.el" (17141 -;;;;;; 252)) +;;;;;; url-cookie-parse-file) "url-cookie" "url/url-cookie.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from url/url-cookie.el (autoload (quote url-cookie-parse-file) "url-cookie" "\ @@ -27359,7 +27205,7 @@ ;;;*** ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (17141 254)) +;;;;;; "url/url-dav.el" (17187 59902)) ;;; Generated autoloads from url/url-dav.el (autoload (quote url-dav-supported-p) "url-dav" "\ @@ -27374,8 +27220,8 @@ ;;;*** -;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17239 -;;;;;; 43869)) +;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17244 +;;;;;; 4914)) ;;; Generated autoloads from url/url-file.el (autoload (quote url-file) "url-file" "\ @@ -27386,7 +27232,7 @@ ;;;*** ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw" -;;;;;; "url/url-gw.el" (17141 258)) +;;;;;; "url/url-gw.el" (17187 59902)) ;;; Generated autoloads from url/url-gw.el (autoload (quote url-gateway-nslookup-host) "url-gw" "\ @@ -27404,8 +27250,8 @@ ;;;*** ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file -;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17239 -;;;;;; 43869)) +;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17277 +;;;;;; 59650)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -27451,7 +27297,7 @@ ;;;### (autoloads (url-history-save-history url-history-parse-history ;;;;;; url-history-setup-save-timer) "url-history" "url/url-history.el" -;;;;;; (17141 258)) +;;;;;; (17187 59902)) ;;; Generated autoloads from url/url-history.el (autoload (quote url-history-setup-save-timer) "url-history" "\ @@ -27475,7 +27321,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (17239 43869)) +;;;;;; url-http) "url-http" "url/url-http.el" (17244 4914)) ;;; Generated autoloads from url/url-http.el (autoload (quote url-http) "url-http" "\ @@ -27528,7 +27374,7 @@ ;;;*** -;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17141 259)) +;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17187 59902)) ;;; Generated autoloads from url/url-irc.el (autoload (quote url-irc) "url-irc" "\ @@ -27538,8 +27384,8 @@ ;;;*** -;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17141 -;;;;;; 259)) +;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from url/url-ldap.el (autoload (quote url-ldap) "url-ldap" "\ @@ -27553,7 +27399,7 @@ ;;;*** ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el" -;;;;;; (17195 54695)) +;;;;;; (17226 24578)) ;;; Generated autoloads from url/url-mailto.el (autoload (quote url-mail) "url-mailto" "\ @@ -27569,7 +27415,7 @@ ;;;*** ;;;### (autoloads (url-data url-generic-emulator-loader url-info -;;;;;; url-man) "url-misc" "url/url-misc.el" (17141 260)) +;;;;;; url-man) "url-misc" "url/url-misc.el" (17187 59902)) ;;; Generated autoloads from url/url-misc.el (autoload (quote url-man) "url-misc" "\ @@ -27601,7 +27447,7 @@ ;;;*** ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el" -;;;;;; (17167 2802)) +;;;;;; (17187 59902)) ;;; Generated autoloads from url/url-news.el (autoload (quote url-news) "url-news" "\ @@ -27618,7 +27464,7 @@ ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable ;;;;;; dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el" -;;;;;; (17141 260)) +;;;;;; (17187 59902)) ;;; Generated autoloads from url/url-ns.el (autoload (quote isPlainHostName) "url-ns" "\ @@ -27659,7 +27505,7 @@ ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (17141 260)) +;;;;;; "url/url-parse.el" (17187 59902)) ;;; Generated autoloads from url/url-parse.el (autoload (quote url-recreate-url) "url-parse" "\ @@ -27677,7 +27523,7 @@ ;;;*** ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el" -;;;;;; (17141 263)) +;;;;;; (17187 59902)) ;;; Generated autoloads from url/url-privacy.el (autoload (quote url-setup-privacy-info) "url-privacy" "\ @@ -27693,7 +27539,7 @@ ;;;;;; url-strip-leading-spaces url-eat-trailing-space url-get-normalized-date ;;;;;; url-lazy-message url-normalize-url url-insert-entities-in-string ;;;;;; url-parse-args url-debug url-debug) "url-util" "url/url-util.el" -;;;;;; (17185 27762)) +;;;;;; (17187 59902)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -27818,7 +27664,7 @@ ;;;*** ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock) -;;;;;; "userlock" "userlock.el" (17148 25059)) +;;;;;; "userlock" "userlock.el" (17187 59902)) ;;; Generated autoloads from userlock.el (autoload (quote ask-user-about-lock) "userlock" "\ @@ -27846,7 +27692,7 @@ ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (17245 4870)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (17257 22483)) ;;; Generated autoloads from international/utf-7.el (autoload-coding-system 'utf-7 '(require 'utf-7)) @@ -27854,7 +27700,7 @@ ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal ;;;;;; uudecode-decode-region-external) "uudecode" "gnus/uudecode.el" -;;;;;; (17148 25154)) +;;;;;; (17187 59901)) ;;; Generated autoloads from gnus/uudecode.el (autoload (quote uudecode-decode-region-external) "uudecode" "\ @@ -27884,7 +27730,7 @@ ;;;;;; vc-directory vc-merge vc-insert-headers vc-version-other-window ;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file ;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17245 51609)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17263 27852)) ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ @@ -28171,7 +28017,7 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc-arch.el" (17148 25060)) +;;;### (autoloads nil "vc-arch" "vc-arch.el" (17187 59902)) ;;; Generated autoloads from vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -28181,7 +28027,7 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17148 25060)) +;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17263 27852)) ;;; Generated autoloads from vc-cvs.el (defun vc-cvs-registered (f) (when (file-readable-p (expand-file-name @@ -28191,7 +28037,7 @@ ;;;*** -;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17239 32248)) +;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17226 24578)) ;;; Generated autoloads from vc-mcvs.el (defun vc-mcvs-registered (file) (if (vc-find-root file "MCVS/CVS") @@ -28202,7 +28048,7 @@ ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el" -;;;;;; (17148 25062)) +;;;;;; (17187 59902)) ;;; Generated autoloads from vc-rcs.el (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -28215,7 +28061,7 @@ ;;;*** ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el" -;;;;;; (17148 25063)) +;;;;;; (17263 27852)) ;;; Generated autoloads from vc-sccs.el (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -28232,7 +28078,7 @@ ;;;*** -;;;### (autoloads nil "vc-svn" "vc-svn.el" (17148 25063)) +;;;### (autoloads nil "vc-svn" "vc-svn.el" (17277 59650)) ;;; Generated autoloads from vc-svn.el (defun vc-svn-registered (f) (when (file-readable-p (expand-file-name @@ -28245,7 +28091,7 @@ ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (17239 32401)) +;;;;;; (17229 28055)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload (quote vhdl-mode) "vhdl-mode" "\ @@ -28786,7 +28632,7 @@ ;;;*** -;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17102 18541)) +;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17187 59879)) ;;; Generated autoloads from emulation/vi.el (autoload (quote vi-mode) "vi" "\ @@ -28841,7 +28687,7 @@ ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion ;;;;;; viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer ;;;;;; viet-decode-viqr-region viet-encode-viscii-char) "viet-util" -;;;;;; "language/viet-util.el" (17102 18783)) +;;;;;; "language/viet-util.el" (17187 59881)) ;;; Generated autoloads from language/viet-util.el (autoload (quote viet-encode-viscii-char) "viet-util" "\ @@ -28887,8 +28733,8 @@ ;;;### (autoloads (View-exit-and-edit view-mode-enter view-mode view-buffer-other-frame ;;;;;; view-buffer-other-window view-buffer view-file-other-frame -;;;;;; view-file-other-window view-file) "view" "view.el" (17250 -;;;;;; 21105)) +;;;;;; view-file-other-window view-file) "view" "view.el" (17263 +;;;;;; 27852)) ;;; Generated autoloads from view.el (defvar view-mode nil "\ @@ -29095,8 +28941,8 @@ ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17239 -;;;;;; 32279)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17226 +;;;;;; 24575)) ;;; Generated autoloads from emulation/vip.el (autoload (quote vip-setup) "vip" "\ @@ -29112,7 +28958,7 @@ ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (17244 43743)) +;;;;;; (17277 59649)) ;;; Generated autoloads from emulation/viper.el (autoload (quote toggle-viper-mode) "viper" "\ @@ -29129,7 +28975,7 @@ ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" -;;;;;; (17148 25100)) +;;;;;; (17187 59901)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -29217,7 +29063,7 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (17205 6053)) +;;;;;; (17226 24579)) ;;; Generated autoloads from wdired.el (autoload (quote wdired-change-to-wdired-mode) "wdired" "\ @@ -29233,7 +29079,7 @@ ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17140 20945)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17187 59902)) ;;; Generated autoloads from net/webjump.el (autoload (quote webjump) "webjump" "\ @@ -29250,7 +29096,7 @@ ;;;*** ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el" -;;;;;; (17159 1491)) +;;;;;; (17187 59902)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -29284,7 +29130,7 @@ ;;;;;; whitespace-buffer whitespace-toggle-ateol-check whitespace-toggle-spacetab-check ;;;;;; whitespace-toggle-indent-check whitespace-toggle-trailing-check ;;;;;; whitespace-toggle-leading-check) "whitespace" "whitespace.el" -;;;;;; (17244 43740)) +;;;;;; (17257 22483)) ;;; Generated autoloads from whitespace.el (autoload (quote whitespace-toggle-leading-check) "whitespace" "\ @@ -29374,7 +29220,7 @@ ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17148 25069)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17187 59902)) ;;; Generated autoloads from wid-browse.el (autoload (quote widget-browse-at) "wid-browse" "\ @@ -29401,8 +29247,8 @@ ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17244 -;;;;;; 43741)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17277 +;;;;;; 59650)) ;;; Generated autoloads from wid-edit.el (autoload (quote widgetp) "wid-edit" "\ @@ -29444,8 +29290,8 @@ ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17159 -;;;;;; 1472)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17187 +;;;;;; 59902)) ;;; Generated autoloads from windmove.el (autoload (quote windmove-left) "windmove" "\ @@ -29498,7 +29344,7 @@ ;;;*** ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el" -;;;;;; (17148 25072)) +;;;;;; (17187 59902)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -29517,7 +29363,7 @@ ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" -;;;;;; "woman.el" (17239 32255)) +;;;;;; "woman.el" (17238 21257)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@ -29553,7 +29399,7 @@ ;;;*** ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el" -;;;;;; (17205 6084)) +;;;;;; (17226 24575)) ;;; Generated autoloads from emulation/ws-mode.el (autoload (quote wordstar-mode) "ws-mode" "\ @@ -29666,7 +29512,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (17148 25076)) +;;;;;; (17263 27852)) ;;; Generated autoloads from xml.el (autoload (quote xml-parse-file) "xml" "\ @@ -29691,8 +29537,8 @@ ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17148 -;;;;;; 25076)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17187 +;;;;;; 59919)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -29721,7 +29567,7 @@ ;;;*** ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc" -;;;;;; "gnus/yenc.el" (17148 25154)) +;;;;;; "gnus/yenc.el" (17187 59901)) ;;; Generated autoloads from gnus/yenc.el (autoload (quote yenc-decode-region) "yenc" "\ @@ -29737,7 +29583,7 @@ ;;;*** ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (17140 20949)) +;;;;;; yow) "yow" "play/yow.el" (17187 59902)) ;;; Generated autoloads from play/yow.el (autoload (quote yow) "yow" "\ @@ -29763,7 +29609,7 @@ ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (17239 32366)) +;;;### (autoloads (zone) "zone" "play/zone.el" (17229 28054)) ;;; Generated autoloads from play/zone.el (autoload (quote zone) "zone" "\ @@ -29774,7 +29620,7 @@ ;;;*** ;;;### (autoloads (zone-mode zone-mode-update-serial-hook) "zone-mode" -;;;;;; "net/zone-mode.el" (17140 20945)) +;;;;;; "net/zone-mode.el" (17187 59902)) ;;; Generated autoloads from net/zone-mode.el (autoload (quote zone-mode-update-serial-hook) "zone-mode" "\ @@ -29826,23 +29672,24 @@ ;;;;;; "emacs-lisp/gulp.el" "emacs-lisp/levents.el" "emacs-lisp/lisp-mnt.el" ;;;;;; "emacs-lisp/lisp-mode.el" "emacs-lisp/lisp.el" "emacs-lisp/lmenu.el" ;;;;;; "emacs-lisp/lselect.el" "emacs-lisp/lucid.el" "emacs-lisp/map-ynp.el" -;;;;;; "emacs-lisp/regi.el" "emacs-lisp/sregex.el" "emacs-lisp/tcover-ses.el" -;;;;;; "emacs-lisp/tcover-unsafep.el" "emacs-lock.el" "emulation/cua-gmrk.el" -;;;;;; "emulation/cua-rect.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" -;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-mapper.el" -;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" -;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" -;;;;;; "emulation/viper-util.el" "env.el" "eshell/em-alias.el" "eshell/em-banner.el" -;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" -;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" -;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" -;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" -;;;;;; "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el" -;;;;;; "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el" -;;;;;; "eshell/esh-io.el" "eshell/esh-maint.el" "eshell/esh-module.el" -;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" -;;;;;; "eshell/esh-var.el" "ezimage.el" "faces.el" "files.el" "finder-inf.el" -;;;;;; "foldout.el" "font-core.el" "format.el" "forms-d2.el" "forms-pass.el" +;;;;;; "emacs-lisp/regi.el" "emacs-lisp/sregex.el" "emacs-lisp/syntax.el" +;;;;;; "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" +;;;;;; "emacs-lock.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el" +;;;;;; "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el" +;;;;;; "emulation/edt-vt100.el" "emulation/tpu-mapper.el" "emulation/viper-cmd.el" +;;;;;; "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el" +;;;;;; "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el" +;;;;;; "env.el" "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el" +;;;;;; "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el" +;;;;;; "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el" +;;;;;; "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el" +;;;;;; "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el" +;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el" +;;;;;; "eshell/esh-maint.el" "eshell/esh-module.el" "eshell/esh-opt.el" +;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" +;;;;;; "ezimage.el" "faces.el" "files.el" "finder-inf.el" "foldout.el" +;;;;;; "font-core.el" "font-lock.el" "format.el" "forms-d2.el" "forms-pass.el" ;;;;;; "frame.el" "generic-x.el" "gnus/compface.el" "gnus/dig.el" ;;;;;; "gnus/dns.el" "gnus/format-spec.el" "gnus/gnus-async.el" ;;;;;; "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el" @@ -29877,27 +29724,28 @@ ;;;;;; "international/subst-gb2312.el" "international/subst-jis.el" ;;;;;; "international/subst-ksc.el" "international/ucs-tables.el" ;;;;;; "international/utf-16.el" "international/utf-8.el" "isearch.el" -;;;;;; "jka-cmpr-hook.el" "kermit.el" "language/chinese.el" "language/cyrillic.el" -;;;;;; "language/czech.el" "language/devanagari.el" "language/english.el" -;;;;;; "language/ethiopic.el" "language/european.el" "language/georgian.el" -;;;;;; "language/greek.el" "language/hebrew.el" "language/indian.el" -;;;;;; "language/japanese.el" "language/kannada.el" "language/korean.el" -;;;;;; "language/lao.el" "language/malayalam.el" "language/misc-lang.el" -;;;;;; "language/romanian.el" "language/slovak.el" "language/tamil.el" -;;;;;; "language/thai-word.el" "language/thai.el" "language/tibetan.el" -;;;;;; "language/utf-8-lang.el" "language/vietnamese.el" "ldefs-boot.el" -;;;;;; "loadup.el" "mail/blessmail.el" "mail/mailheader.el" "mail/mailpost.el" -;;;;;; "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el" -;;;;;; "mail/uce.el" "mail/vms-pmail.el" "mh-e/mh-acros.el" "mh-e/mh-alias.el" -;;;;;; "mh-e/mh-customize.el" "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" -;;;;;; "mh-e/mh-identity.el" "mh-e/mh-inc.el" "mh-e/mh-index.el" -;;;;;; "mh-e/mh-junk.el" "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el" -;;;;;; "mh-e/mh-pick.el" "mh-e/mh-print.el" "mh-e/mh-seq.el" "mh-e/mh-speed.el" -;;;;;; "mh-e/mh-utils.el" "misc.el" "mouse-copy.el" "mouse-drag.el" -;;;;;; "mouse.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" "net/eudcb-ldap.el" -;;;;;; "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el" "net/tls.el" -;;;;;; "net/tramp-ftp.el" "net/tramp-smb.el" "net/tramp-util.el" -;;;;;; "net/tramp-uu.el" "net/tramp-vc.el" "net/trampver.el" "obsolete/awk-mode.el" +;;;;;; "jit-lock.el" "jka-cmpr-hook.el" "kermit.el" "language/chinese.el" +;;;;;; "language/cyrillic.el" "language/czech.el" "language/devanagari.el" +;;;;;; "language/english.el" "language/ethiopic.el" "language/european.el" +;;;;;; "language/georgian.el" "language/greek.el" "language/hebrew.el" +;;;;;; "language/indian.el" "language/japanese.el" "language/kannada.el" +;;;;;; "language/korean.el" "language/lao.el" "language/malayalam.el" +;;;;;; "language/misc-lang.el" "language/romanian.el" "language/slovak.el" +;;;;;; "language/tamil.el" "language/thai-word.el" "language/thai.el" +;;;;;; "language/tibetan.el" "language/utf-8-lang.el" "language/vietnamese.el" +;;;;;; "ldefs-boot.el" "loadup.el" "mail/blessmail.el" "mail/mailheader.el" +;;;;;; "mail/mailpost.el" "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" +;;;;;; "mail/rmail-spam-filter.el" "mail/uce.el" "mail/vms-pmail.el" +;;;;;; "mh-e/mh-acros.el" "mh-e/mh-alias.el" "mh-e/mh-customize.el" +;;;;;; "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" "mh-e/mh-identity.el" +;;;;;; "mh-e/mh-inc.el" "mh-e/mh-index.el" "mh-e/mh-junk.el" "mh-e/mh-loaddefs.el" +;;;;;; "mh-e/mh-mime.el" "mh-e/mh-pick.el" "mh-e/mh-print.el" "mh-e/mh-seq.el" +;;;;;; "mh-e/mh-speed.el" "mh-e/mh-utils.el" "misc.el" "mouse-copy.el" +;;;;;; "mouse-drag.el" "mouse.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" +;;;;;; "net/eudcb-ldap.el" "net/eudcb-mab.el" "net/eudcb-ph.el" +;;;;;; "net/ldap.el" "net/netrc.el" "net/tls.el" "net/tramp-ftp.el" +;;;;;; "net/tramp-smb.el" "net/tramp-util.el" "net/tramp-uu.el" +;;;;;; "net/tramp-vc.el" "net/trampver.el" "obsolete/awk-mode.el" ;;;;;; "obsolete/bg-mouse.el" "obsolete/float.el" "obsolete/hilit19.el" ;;;;;; "obsolete/iso-insert.el" "obsolete/iso-swed.el" "obsolete/keyswap.el" ;;;;;; "obsolete/mlsupport.el" "obsolete/ooutline.el" "obsolete/profile.el" @@ -29905,8 +29753,8 @@ ;;;;;; "obsolete/sun-fns.el" "obsolete/swedish.el" "obsolete/uncompress.el" ;;;;;; "obsolete/x-apollo.el" "obsolete/x-menu.el" "patcomp.el" ;;;;;; "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el" -;;;;;; "pgg-def.el" "pgg-gpg.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" -;;;;;; "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el" +;;;;;; "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" +;;;;;; "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el" ;;;;;; "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" ;;;;;; "progmodes/cc-cmds.el" "progmodes/cc-compat.el" "progmodes/cc-defs.el" ;;;;;; "progmodes/cc-fonts.el" "progmodes/cc-langs.el" "progmodes/cc-menus.el" @@ -29915,29 +29763,29 @@ ;;;;;; "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el" ;;;;;; "progmodes/idlw-help.el" "progmodes/idlw-rinfo.el" "progmodes/idlw-toolbar.el" ;;;;;; "progmodes/mantemp.el" "progmodes/xscheme.el" "register.el" -;;;;;; "replace.el" "s-region.el" "saveplace.el" "sb-image.el" "scroll-bar.el" -;;;;;; "select.el" "simple.el" "soundex.el" "startup.el" "subdirs.el" -;;;;;; "tempo.el" "term/AT386.el" "term/apollo.el" "term/bobcat.el" -;;;;;; "term/cygwin.el" "term/internal.el" "term/iris-ansi.el" "term/linux.el" -;;;;;; "term/lk201.el" "term/mac-win.el" "term/news.el" "term/pc-win.el" -;;;;;; "term/rxvt.el" "term/sun-mouse.el" "term/sun.el" "term/sup-mouse.el" -;;;;;; "term/tty-colors.el" "term/tvi970.el" "term/vt100.el" "term/vt102.el" -;;;;;; "term/vt125.el" "term/vt200.el" "term/vt201.el" "term/vt220.el" -;;;;;; "term/vt240.el" "term/vt300.el" "term/vt320.el" "term/vt400.el" -;;;;;; "term/vt420.el" "term/w32-win.el" "term/wyse50.el" "term/x-win.el" -;;;;;; "term/xterm.el" "textmodes/bib-mode.el" "textmodes/fill.el" -;;;;;; "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/page.el" -;;;;;; "textmodes/paragraphs.el" "textmodes/refbib.el" "textmodes/refer.el" -;;;;;; "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el" -;;;;;; "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" "textmodes/reftex-vars.el" -;;;;;; "textmodes/texnfo-upd.el" "textmodes/text-mode.el" "timezone.el" -;;;;;; "tooltip.el" "tree-widget.el" "uniquify.el" "url/url-about.el" -;;;;;; "url/url-dired.el" "url/url-expand.el" "url/url-ftp.el" "url/url-https.el" -;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" -;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" -;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" -;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" -;;;;;; "x-dnd.el") (17250 22703 990875)) +;;;;;; "replace.el" "rfn-eshadow.el" "s-region.el" "saveplace.el" +;;;;;; "sb-image.el" "scroll-bar.el" "select.el" "simple.el" "soundex.el" +;;;;;; "startup.el" "subdirs.el" "tempo.el" "term/AT386.el" "term/apollo.el" +;;;;;; "term/bobcat.el" "term/cygwin.el" "term/internal.el" "term/iris-ansi.el" +;;;;;; "term/linux.el" "term/lk201.el" "term/mac-win.el" "term/news.el" +;;;;;; "term/pc-win.el" "term/rxvt.el" "term/sun-mouse.el" "term/sun.el" +;;;;;; "term/sup-mouse.el" "term/tty-colors.el" "term/tvi970.el" +;;;;;; "term/vt100.el" "term/vt102.el" "term/vt125.el" "term/vt200.el" +;;;;;; "term/vt201.el" "term/vt220.el" "term/vt240.el" "term/vt300.el" +;;;;;; "term/vt320.el" "term/vt400.el" "term/vt420.el" "term/w32-win.el" +;;;;;; "term/wyse50.el" "term/x-win.el" "term/xterm.el" "textmodes/bib-mode.el" +;;;;;; "textmodes/fill.el" "textmodes/makeinfo.el" "textmodes/page-ext.el" +;;;;;; "textmodes/page.el" "textmodes/paragraphs.el" "textmodes/refbib.el" +;;;;;; "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" +;;;;;; "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" +;;;;;; "textmodes/reftex-vars.el" "textmodes/texnfo-upd.el" "textmodes/text-mode.el" +;;;;;; "timezone.el" "tooltip.el" "tree-widget.el" "uniquify.el" +;;;;;; "url/url-about.el" "url/url-dired.el" "url/url-expand.el" +;;;;;; "url/url-ftp.el" "url/url-https.el" "url/url-imap.el" "url/url-methods.el" +;;;;;; "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "url/vc-dav.el" +;;;;;; "vc-hooks.el" "vcursor.el" "version.el" "vms-patch.el" "vmsproc.el" +;;;;;; "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el" +;;;;;; "widget.el" "window.el" "x-dnd.el") (17279 20072 750932)) ;;;***
--- a/lisp/loadup.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/loadup.el Mon Dec 19 19:57:22 2005 +0000 @@ -69,6 +69,8 @@ (setq load-source-file-function 'load-with-code-conversion) (load "files") +(load "startup") + (load "cus-face") (load "faces") ; after here, `defface' may be used. @@ -152,7 +154,6 @@ (message "%s" (garbage-collect)) (load "menu-bar") (load "paths.el") ;Don't get confused if someone compiled paths by mistake. -(load "startup") (load "emacs-lisp/lisp") (load "textmodes/page") (load "register") @@ -175,9 +176,9 @@ (load "international/fontset") (load "dnd") (load "mwheel") - (load "tool-bar"))) -(if (featurep 'x) - (load "x-dnd")) + (load "tool-bar") + (load "x-dnd") + (load "term/x-win"))) (message "%s" (garbage-collect)) (if (eq system-type 'vax-vms)
--- a/lisp/server.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/server.el Mon Dec 19 19:57:22 2005 +0000 @@ -8,6 +8,7 @@ ;; Keywords: processes ;; Changes by peck@sun.com and by rms. +;; Overhaul by Karoly Lorentey <lorentey@elte.hu> for multi-tty support. ;; This file is part of GNU Emacs. @@ -41,7 +42,7 @@ ;; This program transmits the file names to Emacs through ;; the server subprocess, and Emacs visits them and lets you edit them. -;; Note that any number of clients may dispatch files to emacs to be edited. +;; Note that any number of clients may dispatch files to Emacs to be edited. ;; When you finish editing a Server buffer, again call server-edit ;; to mark that buffer as done for the client and switch to the next @@ -102,9 +103,8 @@ (defvar server-clients nil "List of current server clients. -Each element is (CLIENTID BUFFERS...) where CLIENTID is a string -that can be given to the server process to identify a client. -When a buffer is marked as \"done\", it is removed from this list.") +Each element is (PROC PROPERTIES...) where PROC is a process object, +and PROPERTIES is an association list of client properties.") (defvar server-buffer-clients nil "List of client ids for clients requesting editing of current buffer.") @@ -161,62 +161,187 @@ (defvar server-name "server") -(defvar server-socket-dir - (format "/tmp/emacs%d" (user-uid))) +(defvar server-socket-dir nil + "The directory in which to place the server socket. +Initialized by `server-start'.") + +(defun server-client (proc) + "Return the Emacs client corresponding to PROC. +PROC must be a process object. +The car of the result is PROC; the cdr is an association list. +See `server-client-get' and `server-client-set'." + (assq proc server-clients)) + +(defun server-client-get (client property) + "Get the value of PROPERTY in CLIENT. +CLIENT may be a process object, or a client returned by `server-client'. +Return nil if CLIENT has no such property." + (or (listp client) (setq client (server-client client))) + (cdr (assq property (cdr client)))) + +(defun server-client-set (client property value) + "Set the PROPERTY to VALUE in CLIENT, and return VALUE. +CLIENT may be a process object, or a client returned by `server-client'." + (let (p proc) + (if (listp client) + (setq proc (car client)) + (setq proc client + client (server-client client))) + (setq p (assq property client)) + (cond + (p (setcdr p value)) + (client (setcdr client (cons (cons property value) (cdr client)))) + (t (setq server-clients + `((,proc (,property . ,value)) . ,server-clients)))) + value)) + +(defun server-clients-with (property value) + "Return a list of clients with PROPERTY set to VALUE." + (let (result) + (dolist (client server-clients result) + (when (equal value (server-client-get client property)) + (setq result (cons (car client) result)))))) + +(defun server-add-client (proc) + "Create a client for process PROC, if it doesn't already have one. +New clients have no properties." + (unless (server-client proc) + (setq server-clients (cons (cons proc nil) + server-clients)))) + +(defun server-getenv-from (env variable) + "Get the value of VARIABLE in ENV. +VARIABLE should be a string. Value is nil if VARIABLE is +undefined in ENV. Otherwise, value is a string. + +ENV should be in the same format as `process-environment'." + (let (entry result) + (while (and env (null result)) + (setq entry (car env) + env (cdr env)) + (if (and (> (length entry) (length variable)) + (eq ?= (aref entry (length variable))) + (equal variable (substring entry 0 (length variable)))) + (setq result (substring entry (+ (length variable) 1))))) + result)) + +(defmacro server-with-environment (env vars &rest body) + "Evaluate BODY with environment variables VARS set to those in ENV. +The environment variables are then restored to their previous values. + +VARS should be a list of strings. +ENV should be in the same format as `process-environment'." + (declare (indent 2)) + (let ((oldvalues (make-symbol "oldvalues")) + (var (make-symbol "var")) + (value (make-symbol "value")) + (pair (make-symbol "pair"))) + `(let (,oldvalues) + (dolist (,var ,vars) + (let ((,value (server-getenv-from ,env ,var))) + (setq ,oldvalues (cons (cons ,var (getenv ,var)) ,oldvalues)) + (setenv ,var ,value))) + (unwind-protect + (progn ,@body) + (dolist (,pair ,oldvalues) + (setenv (car ,pair) (cdr ,pair))))))) + +(defun server-delete-client (client &optional noframe) + "Delete CLIENT, including its buffers, devices and frames. +If NOFRAME is non-nil, let the frames live. (To be used from +`delete-frame-functions'." + ;; Force a new lookup of client (prevents infinite recursion). + (setq client (server-client + (if (listp client) (car client) client))) + (let ((proc (car client)) + (buffers (server-client-get client 'buffers))) + (when client + (setq server-clients (delq client server-clients)) + + (dolist (buf buffers) + (when (buffer-live-p buf) + (with-current-buffer buf + ;; Remove PROC from the clients of each buffer. + (setq server-buffer-clients (delq proc server-buffer-clients)) + ;; Kill the buffer if necessary. + (when (and (null server-buffer-clients) + (or (and server-kill-new-buffers + (not server-existing-buffer)) + (server-temp-file-p))) + (kill-buffer (current-buffer)))))) + + ;; Delete the client's tty. + (let ((device (server-client-get client 'device))) + (when (eq (display-live-p device) t) + (delete-display device))) + + ;; Delete the client's frames. + (unless noframe + (dolist (frame (frame-list)) + (if (and (frame-live-p frame) + (equal (car client) (frame-parameter frame 'client))) + (delete-frame frame)))) + + ;; Delete the client's process. + (if (eq (process-status (car client)) 'open) + (delete-process (car client))) + + (server-log "Deleted" proc)))) (defun server-log (string &optional client) - "If a *server* buffer exists, write STRING to it for logging purposes." + "If a *server* buffer exists, write STRING to it for logging purposes. +If CLIENT is non-nil, add a description of it to the logged +message." (if (get-buffer "*server*") (with-current-buffer "*server*" (goto-char (point-max)) (insert (current-time-string) - (if client (format " %s:" client) " ") + (cond + ((null client) " ") + ((listp client) (format " %s: " (car client))) + (t (format " %s: " client))) string) (or (bolp) (newline))))) (defun server-sentinel (proc msg) - (let ((client (assq proc server-clients))) - ;; Remove PROC from the list of clients. - (when client - (setq server-clients (delq client server-clients)) - (dolist (buf (cdr client)) - (with-current-buffer buf - ;; Remove PROC from the clients of each buffer. - (setq server-buffer-clients (delq proc server-buffer-clients)) - ;; Kill the buffer if necessary. - (when (and (null server-buffer-clients) - (or (and server-kill-new-buffers - (not server-existing-buffer)) - (server-temp-file-p))) - (kill-buffer (current-buffer))))))) + "The process sentinel for Emacs server connections." ;; If this is a new client process, set the query-on-exit flag to nil ;; for this process (it isn't inherited from the server process). (when (and (eq (process-status proc) 'open) (process-query-on-exit-flag proc)) (set-process-query-on-exit-flag proc nil)) - (server-log (format "Status changed to %s" (process-status proc)) proc)) + (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc) + (server-delete-client proc)) -(defun server-select-display (display) - ;; If the current frame is on `display' we're all set. - (unless (equal (frame-parameter (selected-frame) 'display) display) - ;; Otherwise, look for an existing frame there and select it. - (dolist (frame (frame-list)) - (when (equal (frame-parameter frame 'display) display) - (select-frame frame))) - ;; If there's no frame on that display yet, create a dummy one - ;; and select it. - (unless (equal (frame-parameter (selected-frame) 'display) display) - (select-frame - (make-frame-on-display - display - ;; This frame is only there in place of an actual "current display" - ;; setting, so we want it to be as unobtrusive as possible. That's - ;; what the invisibility is for. The minibuffer setting is so that - ;; we don't end up displaying a buffer in it (which noone would - ;; notice). - '((visibility . nil) (minibuffer . only))))))) +(defun server-handle-delete-frame (frame) + "Delete the client connection when the emacsclient frame is deleted." + (let ((proc (frame-parameter frame 'client))) + (when (and (frame-live-p frame) + proc + (or (window-system frame) + ;; A terminal device must not yet be deleted if + ;; there are other frames on it. + (< 0 (let ((frame-num 0)) + (mapc (lambda (f) + (when (eq (frame-display f) + (frame-display frame)) + (setq frame-num (1+ frame-num)))) + (frame-list)) + frame-num)))) + (server-log (format "server-handle-delete-frame, frame %s" frame) proc) + (server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later. + +(defun server-handle-suspend-tty (device) + "Notify the emacsclient process to suspend itself when its tty device is suspended." + (dolist (proc (server-clients-with 'device device)) + (server-log (format "server-handle-suspend-tty, device %s" device) proc) + (condition-case err + (server-send-string proc "-suspend \n") + (file-error (condition-case nil (server-delete-client proc) (error nil)))))) (defun server-unquote-arg (arg) + "Remove &-quotation from ARG. +See `server-quote-arg' and `server-process-filter'." (replace-regexp-in-string "&." (lambda (s) (case (aref s 1) @@ -226,6 +351,26 @@ (t " "))) arg t t)) +(defun server-quote-arg (arg) + "In ARG, insert a & before each &, each space, each newline, and -. +Change spaces to underscores, too, so that the return value never +contains a space. + +See `server-unquote-arg' and `server-process-filter'." + (replace-regexp-in-string + "[-&\n ]" (lambda (s) + (case (aref s 0) + (?& "&&") + (?- "&-") + (?\n "&n") + (?\s "&_"))) + arg t t)) + +(defun server-send-string (proc string) + "A wrapper around `proc-send-string' for logging." + (server-log (concat "Sent " string) proc) + (process-send-string proc string)) + (defun server-ensure-safe-dir (dir) "Make sure DIR is a directory with no race-condition issues. Creates the directory if necessary and makes sure: @@ -246,38 +391,53 @@ (defun server-start (&optional leave-dead) "Allow this Emacs process to be a server for client processes. This starts a server communications subprocess through which -client \"editors\" can send your editing commands to this Emacs job. -To use the server, set up the program `emacsclient' in the +client \"editors\" can send your editing commands to this Emacs +job. To use the server, set up the program `emacsclient' in the Emacs distribution as your standard \"editor\". -Prefix arg means just kill any existing server communications subprocess." +Prefix arg LEAVE-DEAD means just kill any existing server +communications subprocess." (interactive "P") - ;; Make sure there is a safe directory in which to place the socket. - (server-ensure-safe-dir server-socket-dir) - ;; kill it dead! - (if server-process - (condition-case () (delete-process server-process) (error nil))) - ;; Delete the socket files made by previous server invocations. - (condition-case () - (delete-file (expand-file-name server-name server-socket-dir)) - (error nil)) - ;; If this Emacs already had a server, clear out associated status. - (while server-clients - (let ((buffer (nth 1 (car server-clients)))) - (server-buffer-done buffer))) - (unless leave-dead + (when (or + (not server-clients) + (yes-or-no-p + "The current server still has clients; delete them? ")) + ;; It is safe to get the user id now. + (setq server-socket-dir (or server-socket-dir + (format "/tmp/emacs%d" (user-uid)))) + ;; Make sure there is a safe directory in which to place the socket. + (server-ensure-safe-dir server-socket-dir) + ;; kill it dead! (if server-process - (server-log (message "Restarting server"))) - (letf (((default-file-modes) ?\700)) - (setq server-process - (make-network-process - :name "server" :family 'local :server t :noquery t - :service (expand-file-name server-name server-socket-dir) - :sentinel 'server-sentinel :filter 'server-process-filter - ;; We must receive file names without being decoded. - ;; Those are decoded by server-process-filter according - ;; to file-name-coding-system. - :coding 'raw-text))))) + (condition-case () (delete-process server-process) (error nil))) + ;; Delete the socket files made by previous server invocations. + (condition-case () + (delete-file (expand-file-name server-name server-socket-dir)) + (error nil)) + ;; If this Emacs already had a server, clear out associated status. + (while server-clients + (server-delete-client (car server-clients))) + (if leave-dead + (progn + (server-log (message "Server stopped")) + (setq server-process nil)) + (if server-process + (server-log (message "Restarting server")) + (server-log (message "Starting server"))) + (letf (((default-file-modes) ?\700)) + (add-hook 'suspend-tty-functions 'server-handle-suspend-tty) + (add-hook 'delete-frame-functions 'server-handle-delete-frame) + (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) + (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) + (setq server-process + (make-network-process + :name "server" :family 'local :server t :noquery t + :service (expand-file-name server-name server-socket-dir) + :sentinel 'server-sentinel :filter 'server-process-filter + ;; We must receive file names without being decoded. + ;; Those are decoded by server-process-filter according + ;; to file-name-coding-system. + :coding 'raw-text)))))) ;;;###autoload (define-minor-mode server-mode @@ -294,105 +454,353 @@ (defun server-process-filter (proc string) "Process a request from the server to edit some files. -PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"." - (server-log string proc) +PROC is the server process. STRING consists of a sequence of +commands prefixed by a dash. Some commands have arguments; these +are &-quoted and need to be decoded by `server-unquote-arg'. The +filter parses and executes these commands. + +To illustrate the protocol, here is an example command that +emacsclient sends to create a new X frame (note that the whole +sequence is sent on a single line): + + -version 21.3.50 xterm + -env HOME /home/lorentey + -env DISPLAY :0.0 + ... lots of other -env commands + -display :0.0 + -window-system + +The server normally sends back the single command `-good-version' +as a response. + +The following commands are accepted by the server: + +`-version CLIENT-VERSION' + Check version numbers between server and client, and signal an + error if there is a mismatch. The server replies with + `-good-version' to confirm the match. + +`-env NAME=VALUE' + An environment variable on the client side. + +`-current-frame' + Forbid the creation of new frames. + +`-nowait' + Request that the next frame created should not be + associated with this client. + +`-display DISPLAY' + Set the display name to open X frames on. + +`-position LINE[:COLUMN]' + Go to the given line and column number + in the next file opened. + +`-file FILENAME' + Load the given file in the current frame. + +`-eval EXPR' + Evaluate EXPR as a Lisp expression and return the + result in -print commands. + +`-window-system' + Open a new X frame. + +`-tty DEVICENAME TYPE' + Open a new tty frame at the client. + +`-resume' + Resume this tty frame. The client sends this string when it + gets the SIGCONT signal and it is the foreground process on its + controlling tty. + +`-suspend' + Suspend this tty frame. The client sends this string in + response to SIGTSTP and SIGTTOU. The server must cease all I/O + on this tty until it gets a -resume command. + +`-ignore COMMENT' + Do nothing, but put the comment in the server + log. Useful for debugging. + + +The following commands are accepted by the client: + +`-good-version' + Signals a version match between the client and the server. + +`-emacs-pid PID' + Describes the process id of the Emacs process; + used to forward window change signals to it. + +`-window-system-unsupported' + Signals that the server does not + support creating X frames; the client must try again with a tty + frame. + +`-print STRING' + Print STRING on stdout. Used to send values + returned by -eval. + +`-error DESCRIPTION' + Signal an error (but continue processing). + +`-suspend' + Suspend this terminal, i.e., stop the client process. Sent + when the user presses C-z." + (server-log (concat "Received " string) proc) (let ((prev (process-get proc 'previous-string))) (when prev (setq string (concat prev string)) (process-put proc 'previous-string nil))) - ;; If the input is multiple lines, - ;; process each line individually. - (while (string-match "\n" string) - (let ((request (substring string 0 (match-beginning 0))) - (coding-system (and default-enable-multibyte-characters - (or file-name-coding-system - default-file-name-coding-system))) - client nowait eval - (files nil) - (lineno 1) - (tmp-frame nil) ; Sometimes used to embody the selected display. - (columnno 0)) - ;; Remove this line from STRING. - (setq string (substring string (match-end 0))) - (setq client (cons proc nil)) - (while (string-match "[^ ]* " request) - (let ((arg (substring request (match-beginning 0) (1- (match-end 0))))) - (setq request (substring request (match-end 0))) - (cond - ((equal "-nowait" arg) (setq nowait t)) - ((equal "-eval" arg) (setq eval t)) - ((and (equal "-display" arg) (string-match "\\([^ ]*\\) " request)) - (let ((display (server-unquote-arg (match-string 1 request)))) - (setq request (substring request (match-end 0))) - (condition-case err - (setq tmp-frame (server-select-display display)) - (error (process-send-string proc (nth 1 err)) - (setq request ""))))) - ;; ARG is a line number option. - ((string-match "\\`\\+[0-9]+\\'" arg) - (setq lineno (string-to-number (substring arg 1)))) - ;; ARG is line number:column option. - ((string-match "\\`+\\([0-9]+\\):\\([0-9]+\\)\\'" arg) - (setq lineno (string-to-number (match-string 1 arg)) - columnno (string-to-number (match-string 2 arg)))) - (t - ;; Undo the quoting that emacsclient does - ;; for certain special characters. - (setq arg (server-unquote-arg arg)) - ;; Now decode the file name if necessary. - (if coding-system - (setq arg (decode-coding-string arg coding-system))) - (if eval - (let ((v (eval (car (read-from-string arg))))) - (when v - (with-temp-buffer - (let ((standard-output (current-buffer))) - (pp v) - ;; Suppress the error rose when the pipe to PROC is closed. - (condition-case err - (process-send-region proc (point-min) (point-max)) - (file-error nil) - (error nil)) - )))) - ;; ARG is a file name. - ;; Collapse multiple slashes to single slashes. - (setq arg (command-line-normalize-file-name arg)) - (push (list arg lineno columnno) files)) - (setq lineno 1) - (setq columnno 0))))) - (when files - (run-hooks 'pre-command-hook) - (server-visit-files files client nowait) - (run-hooks 'post-command-hook)) - ;; CLIENT is now a list (CLIENTNUM BUFFERS...) - (if (null (cdr client)) - ;; This client is empty; get rid of it immediately. - (progn - (delete-process proc) - (server-log "Close empty client" proc)) - ;; We visited some buffer for this client. - (or nowait (push client server-clients)) - (unless (or isearch-mode (minibufferp)) - (server-switch-buffer (nth 1 client)) - (run-hooks 'server-switch-hook) - (unless nowait - (message "%s" (substitute-command-keys - "When done with a buffer, type \\[server-edit]"))))) - ;; Avoid preserving the connection after the last real frame is deleted. - (if tmp-frame (delete-frame tmp-frame)))) - ;; Save for later any partial line that remains. - (when (> (length string) 0) - (process-put proc 'previous-string string))) + (condition-case err + (progn + (server-add-client proc) + ;; If the input is multiple lines, + ;; process each line individually. + (while (string-match "\n" string) + (let ((request (substring string 0 (match-beginning 0))) + (coding-system (and default-enable-multibyte-characters + (or file-name-coding-system + default-file-name-coding-system))) + (client (server-client proc)) + current-frame + nowait ; t if emacsclient does not want to wait for us. + frame ; The frame that was opened for the client (if any). + display ; Open the frame on this display. + dontkill ; t if the client should not be killed. + env + (files nil) + (lineno 1) + (columnno 0)) + ;; Remove this line from STRING. + (setq string (substring string (match-end 0))) + (while (string-match " *[^ ]* " request) + (let ((arg (substring request (match-beginning 0) (1- (match-end 0))))) + (setq request (substring request (match-end 0))) + (cond + ;; -version CLIENT-VERSION: + ;; Check version numbers, signal an error if there is a mismatch. + ((and (equal "-version" arg) + (string-match "\\([0-9.]+\\) " request)) + (let* ((client-version (match-string 1 request)) + (truncated-emacs-version + (substring emacs-version 0 (length client-version)))) + (setq request (substring request (match-end 0))) + (if (equal client-version truncated-emacs-version) + (progn + (server-send-string proc "-good-version \n") + (server-client-set client 'version client-version)) + (error (concat "Version mismatch: Emacs is " + truncated-emacs-version + ", emacsclient is " client-version))))) + + ;; -nowait: Emacsclient won't wait for a result. + ((equal "-nowait" arg) (setq nowait t)) + + ;; -current-frame: Don't create frames. + ((equal "-current-frame" arg) (setq current-frame t)) + + ;; -display DISPLAY: + ;; Open X frames on the given display instead of the default. + ((and (equal "-display" arg) (string-match "\\([^ ]*\\) " request)) + (setq display (match-string 1 request) + request (substring request (match-end 0)))) + + ;; -window-system: Open a new X frame. + ((equal "-window-system" arg) + (unless (server-client-get client 'version) + (error "Protocol error; make sure to use the correct version of emacsclient")) + (unless current-frame + (if (fboundp 'x-create-frame) + (let ((params (if nowait + ;; Flag frame as client-created, but use a dummy client. + ;; This will prevent the frame from being deleted when + ;; emacsclient quits while also preventing + ;; `server-save-buffers-kill-display' from unexpectedly + ;; killing emacs on that frame. + (list (cons 'client 'nowait)) + (list (cons 'client proc))))) + (setq frame (make-frame-on-display + (or display + (frame-parameter nil 'device) + (getenv "DISPLAY") + (error "Please specify display")) + params)) + (server-log (format "%s created" frame) proc) + ;; XXX We need to ensure the parameters are + ;; really set because Emacs forgets unhandled + ;; initialization parameters for X frames at + ;; the moment. + (modify-frame-parameters frame params) + (select-frame frame) + (server-client-set client 'frame frame) + (server-client-set client 'device (frame-display frame)) + (set-terminal-parameter frame 'environment env) + (setq dontkill t)) + ;; This emacs does not support X. + (server-log "Window system unsupported" proc) + (server-send-string proc "-window-system-unsupported \n") + (setq dontkill t)))) + + ;; -resume: Resume a suspended tty frame. + ((equal "-resume" arg) + (let ((device (server-client-get client 'device))) + (setq dontkill t) + (when (eq (display-live-p device) t) + (resume-tty device)))) + + ;; -suspend: Suspend the client's frame. (In case we + ;; get out of sync, and a C-z sends a SIGTSTP to + ;; emacsclient.) + ((equal "-suspend" arg) + (let ((device (server-client-get client 'device))) + (setq dontkill t) + (when (eq (display-live-p device) t) + (suspend-tty device)))) + + ;; -ignore COMMENT: Noop; useful for debugging emacsclient. + ;; (The given comment appears in the server log.) + ((and (equal "-ignore" arg) (string-match "\\([^ ]*\\) " request)) + (setq dontkill t + request (substring request (match-end 0)))) + + ;; -tty DEVICE-NAME TYPE: Open a new tty frame at the client. + ((and (equal "-tty" arg) (string-match "\\([^ ]*\\) \\([^ ]*\\) " request)) + (let ((tty (server-unquote-arg (match-string 1 request))) + (type (server-unquote-arg (match-string 2 request)))) + (setq request (substring request (match-end 0))) + (unless (server-client-get client 'version) + (error "Protocol error; make sure you use the correct version of emacsclient")) + (unless current-frame + (server-with-environment env + '("LANG" "LC_CTYPE" "LC_ALL" + ;; For tgetent(3); list according to ncurses(3). + "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" + "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" + "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" + "TERMINFO_DIRS" "TERMPATH") + (setq frame (make-frame-on-tty tty type + ;; Ignore nowait here; we always need to clean + ;; up opened ttys when the client dies. + `((client . ,proc))))) + (select-frame frame) + (server-client-set client 'frame frame) + (server-client-set client 'tty (display-name frame)) + (server-client-set client 'device (frame-display frame)) + (set-terminal-parameter frame 'environment env) + + ;; Reply with our pid. + (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n")) + (setq dontkill t)))) + + ;; -position LINE: Go to the given line in the next file. + ((and (equal "-position" arg) (string-match "\\(\\+[0-9]+\\) " request)) + (setq lineno (string-to-number (substring (match-string 1 request) 1)) + request (substring request (match-end 0)))) + + ;; -position LINE:COLUMN: Set point to the given position in the next file. + ((and (equal "-position" arg) (string-match "\\+\\([0-9]+\\):\\([0-9]+\\) " request)) + (setq lineno (string-to-number (match-string 1 request)) + columnno (string-to-number (match-string 2 request)) + request (substring request (match-end 0)))) + + ;; -file FILENAME: Load the given file. + ((and (equal "-file" arg) (string-match "\\([^ ]+\\) " request)) + (let ((file (server-unquote-arg (match-string 1 request)))) + (setq request (substring request (match-end 0))) + (if coding-system + (setq file (decode-coding-string file coding-system))) + (setq file (command-line-normalize-file-name file)) + (push (list file lineno columnno) files) + (server-log (format "New file: %s (%d:%d)" file lineno columnno) proc)) + (setq lineno 1 + columnno 0)) + + ;; -eval EXPR: Evaluate a Lisp expression. + ((and (equal "-eval" arg) (string-match "\\([^ ]+\\) " request)) + (let ((expr (server-unquote-arg (match-string 1 request)))) + (setq request (substring request (match-end 0))) + (if coding-system + (setq expr (decode-coding-string expr coding-system))) + (let ((v (eval (car (read-from-string expr))))) + (when (and (not frame) v) + (with-temp-buffer + (let ((standard-output (current-buffer))) + (pp v) + (server-send-string + proc (format "-print %s\n" + (server-quote-arg + (buffer-substring-no-properties (point-min) + (point-max))))))))) + (setq lineno 1 + columnno 0))) + + ;; -env NAME=VALUE: An environment variable. + ((and (equal "-env" arg) (string-match "\\([^ ]+\\) " request)) + (let ((var (server-unquote-arg (match-string 1 request)))) + (when coding-system + (setq var (decode-coding-string var coding-system))) + (setq request (substring request (match-end 0))) + (setq env (cons var env)))) + + ;; Unknown command. + (t (error "Unknown command: %s" arg))))) + + (let (buffers) + (when files + (run-hooks 'pre-command-hook) + (setq buffers (server-visit-files files client nowait)) + (run-hooks 'post-command-hook)) + + ;; Delete the client if necessary. + (cond + (nowait + ;; Client requested nowait; return immediately. + (server-log "Close nowait client" proc) + (server-delete-client proc)) + ((and (not dontkill) (null buffers)) + ;; This client is empty; get rid of it immediately. + (server-log "Close empty client" proc) + (server-delete-client proc))) + (cond + ((or isearch-mode (minibufferp)) + nil) + ((and frame (null buffers)) + (message "%s" (substitute-command-keys + "When done with this frame, type \\[delete-frame]"))) + ((not (null buffers)) + (server-switch-buffer (car buffers)) + (run-hooks 'server-switch-hook) + (unless nowait + (message "%s" (substitute-command-keys + "When done with a buffer, type \\[server-edit]")))))))) + + ;; Save for later any partial line that remains. + (when (> (length string) 0) + (process-put proc 'previous-string string))) + ;; condition-case + (error (ignore-errors + (server-send-string + proc (concat "-error " (server-quote-arg (error-message-string err)))) + (setq string "") + (server-log (error-message-string err) proc) + (delete-process proc))))) (defun server-goto-line-column (file-line-col) + "Move point to the position indicated in FILE-LINE-COL. +FILE-LINE-COL should be a three-element list as described in +`server-visit-files'." (goto-line (nth 1 file-line-col)) (let ((column-number (nth 2 file-line-col))) (if (> column-number 0) (move-to-column (1- column-number))))) (defun server-visit-files (files client &optional nowait) - "Find FILES and return the list CLIENT with the buffers nconc'd. + "Find FILES and return a list of buffers created. FILES is an alist whose elements are (FILENAME LINENUMBER COLUMNNUMBER). +CLIENT is the client that requested this operation. NOWAIT non-nil means this client is not waiting for the results, so don't mark these buffers specially, just visit them normally." ;; Bind last-nonmenu-event to force use of keyboard, not mouse, for queries. @@ -415,8 +823,7 @@ (revert-buffer t nil))) (t (if (y-or-n-p - (concat "File no longer exists: " - filen + (concat "File no longer exists: " filen ", write buffer to file? ")) (write-file filen)))) (setq server-existing-buffer t) @@ -429,7 +836,11 @@ (add-hook 'kill-buffer-hook 'server-kill-buffer nil t) (push (car client) server-buffer-clients)) (push (current-buffer) client-record))) - (nconc client client-record))) + (unless nowait + (server-client-set + client 'buffers + (nconc (server-client-get client 'buffers) client-record))) + client-record)) (defun server-buffer-done (buffer &optional for-killing) "Mark BUFFER as \"done\" for its client(s). @@ -439,27 +850,24 @@ a temp file). FOR-KILLING if non-nil indicates that we are called from `kill-buffer'." (let ((next-buffer nil) - (killed nil) - (old-clients server-clients)) - (while old-clients - (let ((client (car old-clients))) + (killed nil)) + (dolist (client server-clients) + (let ((buffers (server-client-get client 'buffers))) (or next-buffer - (setq next-buffer (nth 1 (memq buffer client)))) - (delq buffer client) - ;; Delete all dead buffers from CLIENT. - (let ((tail client)) - (while tail - (and (bufferp (car tail)) - (null (buffer-name (car tail))) - (delq (car tail) client)) - (setq tail (cdr tail)))) - ;; If client now has no pending buffers, - ;; tell it that it is done, and forget it entirely. - (unless (cdr client) - (delete-process (car client)) - (server-log "Close" (car client)) - (setq server-clients (delq client server-clients)))) - (setq old-clients (cdr old-clients))) + (setq next-buffer (nth 1 (memq buffer buffers)))) + (when buffers ; Ignore bufferless clients. + (setq buffers (delq buffer buffers)) + ;; Delete all dead buffers from CLIENT. + (dolist (b buffers) + (and (bufferp b) + (not (buffer-live-p b)) + (setq buffers (delq b buffers)))) + (server-client-set client 'buffers buffers) + ;; If client now has no pending buffers, + ;; tell it that it is done, and forget it entirely. + (unless buffers + (server-log "Close" client) + (server-delete-client client))))) (if (and (bufferp buffer) (buffer-name buffer)) ;; We may or may not kill this buffer; ;; if we do, do not call server-buffer-done recursively @@ -524,30 +932,32 @@ ;; but I think that is dangerous--the client would proceed ;; using whatever is on disk in that file. -- rms. (defun server-kill-buffer-query-function () + "Ask before killing a server buffer." (or (not server-buffer-clients) + (let ((res t)) + (dolist (proc server-buffer-clients res) + (let ((client (server-client proc))) + (when (and client (eq (process-status proc) 'open)) + (setq res nil))))) (yes-or-no-p (format "Buffer `%s' still has clients; kill it? " (buffer-name (current-buffer)))))) -(add-hook 'kill-buffer-query-functions - 'server-kill-buffer-query-function) - (defun server-kill-emacs-query-function () - (let (live-client - (tail server-clients)) - ;; See if any clients have any buffers that are still alive. - (while tail - (if (memq t (mapcar 'stringp (mapcar 'buffer-name (cdr (car tail))))) - (setq live-client t)) - (setq tail (cdr tail))) - (or (not live-client) - (yes-or-no-p "Server buffers still have clients; exit anyway? ")))) - -(add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) + "Ask before exiting Emacs it has live clients." + (or (not server-clients) + (let (live-client) + (dolist (client server-clients live-client) + (if (memq t (mapcar 'buffer-live-p (server-client-get + client 'buffers))) + (setq live-client t)))) + (yes-or-no-p "This Emacs session has clients; exit anyway? "))) (defvar server-kill-buffer-running nil "Non-nil while `server-kill-buffer' or `server-buffer-done' is running.") (defun server-kill-buffer () + "Remove the current buffer from its clients' buffer list. +Designed to be added to `kill-buffer-hook'." ;; Prevent infinite recursion if user has made server-done-hook ;; call kill-buffer. (or server-kill-buffer-running @@ -579,18 +989,26 @@ (defun server-switch-buffer (&optional next-buffer killed-one) "Switch to another buffer, preferably one that has a client. -Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." - ;; KILLED-ONE is t in a recursive call - ;; if we have already killed one temp-file server buffer. - ;; This means we should avoid the final "switch to some other buffer" - ;; since we've already effectively done that. +Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it. + +KILLED-ONE is t in a recursive call if we have already killed one +temp-file server buffer. This means we should avoid the final +\"switch to some other buffer\" since we've already effectively +done that." (if (null next-buffer) - (if server-clients - (server-switch-buffer (nth 1 (car server-clients)) killed-one) - (unless (or killed-one (window-dedicated-p (selected-window))) - (switch-to-buffer (other-buffer)) + (progn + (let ((rest server-clients)) + (while (and rest (not next-buffer)) + (let ((client (car rest))) + ;; Only look at frameless clients. + (when (not (server-client-get client 'frame)) + (setq next-buffer (car (server-client-get client 'buffers)))) + (setq rest (cdr rest))))) + (and next-buffer (server-switch-buffer next-buffer killed-one)) + (unless (or next-buffer killed-one (window-dedicated-p (selected-window))) + ;; (switch-to-buffer (other-buffer)) (message "No server buffers remain to edit"))) - (if (not (buffer-name next-buffer)) + (if (not (buffer-live-p next-buffer)) ;; If NEXT-BUFFER is a dead buffer, remove the server records for it ;; and try the next surviving server buffer. (apply 'server-switch-buffer (server-buffer-done next-buffer)) @@ -621,8 +1039,8 @@ (get-window-with-predicate (lambda (w) (and (not (window-dedicated-p w)) - (equal (frame-parameter (window-frame w) 'display) - (frame-parameter (selected-frame) 'display)))) + (equal (frame-parameter (window-frame w) 'device) + (frame-parameter (selected-frame) 'device)))) 'nomini 'visible (selected-window)))) (condition-case nil (switch-to-buffer next-buffer) @@ -630,10 +1048,31 @@ ;; a minibuffer/dedicated-window (if there's no other). (error (pop-to-buffer next-buffer))))))))) +;;;###autoload +(defun server-save-buffers-kill-display (proc &optional arg) + "Offer to save each buffer, then kill PROC. + +With prefix arg, silently save all file-visiting buffers, then kill. + +If emacsclient was started with a list of filenames to edit, then +only these files will be asked to be saved." + (let ((buffers (server-client-get proc 'buffers))) + ;; If client is bufferless, emulate a normal Emacs session + ;; exit and offer to save all buffers. Otherwise, offer to + ;; save only the buffers belonging to the client. + (save-some-buffers arg + (if buffers + (lambda () (memq (current-buffer) buffers)) + t)) + (server-delete-client proc))) + (define-key ctl-x-map "#" 'server-edit) (defun server-unload-hook () + "Unload the server library." (server-start t) + (remove-hook 'suspend-tty-functions 'server-handle-suspend-tty) + (remove-hook 'delete-frame-functions 'server-handle-delete-frame) (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) (remove-hook 'kill-buffer-hook 'server-kill-buffer))
--- a/lisp/simple.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/simple.el Mon Dec 19 19:57:22 2005 +0000 @@ -2368,6 +2368,8 @@ The second, optional, argument PUSH, has the same meaning as the similar argument to `x-set-cut-buffer', which see.") +(make-variable-frame-local 'interprogram-cut-function) + (defvar interprogram-paste-function nil "Function to call to get text cut from other programs. @@ -2388,6 +2390,8 @@ difficult to tell whether Emacs or some other program provided the current string, it is probably good enough to return nil if the string is equal (according to `string=') to the last text Emacs provided.") + +(make-variable-frame-local 'interprogram-paste-function) @@ -5291,36 +5295,33 @@ ;;; Handling of Backspace and Delete keys. -(defcustom normal-erase-is-backspace - (and (not noninteractive) - (or (memq system-type '(ms-dos windows-nt)) - (eq window-system 'mac) - (and (memq window-system '(x)) - (fboundp 'x-backspace-delete-keys-p) - (x-backspace-delete-keys-p)) - ;; If the terminal Emacs is running on has erase char - ;; set to ^H, use the Backspace key for deleting - ;; backward and, and the Delete key for deleting forward. - (and (null window-system) - (eq tty-erase-char ?\^H)))) - "If non-nil, Delete key deletes forward and Backspace key deletes backward. - -On window systems, the default value of this option is chosen -according to the keyboard used. If the keyboard has both a Backspace -key and a Delete key, and both are mapped to their usual meanings, the -option's default value is set to t, so that Backspace can be used to -delete backward, and Delete can be used to delete forward. - -If not running under a window system, customizing this option accomplishes -a similar effect by mapping C-h, which is usually generated by the -Backspace key, to DEL, and by mapping DEL to C-d via -`keyboard-translate'. The former functionality of C-h is available on -the F1 key. You should probably not use this setting if you don't -have both Backspace, Delete and F1 keys. +(defcustom normal-erase-is-backspace 'maybe + "Set the default behaviour of the Delete and Backspace keys. + +If set to t, Delete key deletes forward and Backspace key deletes +backward. + +If set to nil, both Delete and Backspace keys delete backward. + +If set to 'maybe (which is the default), Emacs automatically +selects a behaviour. On window systems, the behaviour depends on +the keyboard used. If the keyboard has both a Backspace key and +a Delete key, and both are mapped to their usual meanings, the +option's default value is set to t, so that Backspace can be used +to delete backward, and Delete can be used to delete forward. + +If not running under a window system, customizing this option +accomplishes a similar effect by mapping C-h, which is usually +generated by the Backspace key, to DEL, and by mapping DEL to C-d +via `keyboard-translate'. The former functionality of C-h is +available on the F1 key. You should probably not use this +setting if you don't have both Backspace, Delete and F1 keys. Setting this variable with setq doesn't take effect. Programmatically, call `normal-erase-is-backspace-mode' (which see) instead." - :type 'boolean + :type '(choice (const :tag "Off" nil) + (const :tag "Maybe" maybe) + (other :tag "On" t)) :group 'editing-basics :version "21.1" :set (lambda (symbol value) @@ -5330,17 +5331,40 @@ (normal-erase-is-backspace-mode (or value 0)) (set-default symbol value)))) +(defun normal-erase-is-backspace-setup-frame (&optional frame) + "Set up `normal-erase-is-backspace-mode' on FRAME, if necessary." + (unless frame (setq frame (selected-frame))) + (with-selected-frame frame + (unless (terminal-parameter-p nil 'normal-erase-is-backspace) + (if (cond ((terminal-parameter-p nil 'normal-erase-is-backspace) + (terminal-parameter nil 'normal-erase-is-backspace)) + ((eq normal-erase-is-backspace 'maybe) + (and (not noninteractive) + (or (memq system-type '(ms-dos windows-nt)) + (eq window-system 'mac) + (and (memq window-system '(x)) + (fboundp 'x-backspace-delete-keys-p) + (x-backspace-delete-keys-p)) + ;; If the terminal Emacs is running on has erase char + ;; set to ^H, use the Backspace key for deleting + ;; backward and, and the Delete key for deleting forward. + (and (null window-system) + (eq tty-erase-char ?\^H))))) + (t + normal-erase-is-backspace)) + (normal-erase-is-backspace-mode 1) + (normal-erase-is-backspace-mode 0))))) (defun normal-erase-is-backspace-mode (&optional arg) "Toggle the Erase and Delete mode of the Backspace and Delete keys. With numeric arg, turn the mode on if and only if ARG is positive. -On window systems, when this mode is on, Delete is mapped to C-d and -Backspace is mapped to DEL; when this mode is off, both Delete and -Backspace are mapped to DEL. (The remapping goes via -`function-key-map', so binding Delete or Backspace in the global or -local keymap will override that.) +On window systems, when this mode is on, Delete is mapped to C-d +and Backspace is mapped to DEL; when this mode is off, both +Delete and Backspace are mapped to DEL. (The remapping goes via +`local-function-key-map', so binding Delete or Backspace in the +global or local keymap will override that.) In addition, on window systems, the bindings of C-Delete, M-Delete, C-M-Delete, C-Backspace, M-Backspace, and C-M-Backspace are changed in @@ -5362,32 +5386,33 @@ See also `normal-erase-is-backspace'." (interactive "P") - (setq normal-erase-is-backspace - (if arg - (> (prefix-numeric-value arg) 0) - (not normal-erase-is-backspace))) + (set-terminal-parameter + nil 'normal-erase-is-backspace + (if arg + (> (prefix-numeric-value arg) 0) + (not (terminal-parameter nil 'normal-erase-is-backspace)))) (cond ((or (memq window-system '(x w32 mac pc)) (memq system-type '(ms-dos windows-nt))) - (let ((bindings - `(([C-delete] [C-backspace]) - ([M-delete] [M-backspace]) - ([C-M-delete] [C-M-backspace]) - (,esc-map - [C-delete] [C-backspace]))) - (old-state (lookup-key function-key-map [delete]))) - - (if normal-erase-is-backspace + (let* ((bindings + `(([C-delete] [C-backspace]) + ([M-delete] [M-backspace]) + ([C-M-delete] [C-M-backspace]) + (,esc-map + [C-delete] [C-backspace]))) + (old-state (lookup-key local-function-key-map [delete]))) + + (if (terminal-parameter nil 'normal-erase-is-backspace) (progn - (define-key function-key-map [delete] [?\C-d]) - (define-key function-key-map [kp-delete] [?\C-d]) - (define-key function-key-map [backspace] [?\C-?])) - (define-key function-key-map [delete] [?\C-?]) - (define-key function-key-map [kp-delete] [?\C-?]) - (define-key function-key-map [backspace] [?\C-?])) + (define-key local-function-key-map [delete] [?\C-d]) + (define-key local-function-key-map [kp-delete] [?\C-d]) + (define-key local-function-key-map [backspace] [?\C-?])) + (define-key local-function-key-map [delete] [?\C-?]) + (define-key local-function-key-map [kp-delete] [?\C-?]) + (define-key local-function-key-map [backspace] [?\C-?])) ;; Maybe swap bindings of C-delete and C-backspace, etc. - (unless (equal old-state (lookup-key function-key-map [delete])) + (unless (equal old-state (lookup-key local-function-key-map [delete])) (dolist (binding bindings) (let ((map global-map)) (when (keymapp (car binding)) @@ -5399,7 +5424,7 @@ (define-key map key1 binding2) (define-key map key2 binding1))))))) (t - (if normal-erase-is-backspace + (if (terminal-parameter nil 'normal-erase-is-backspace) (progn (keyboard-translate ?\C-h ?\C-?) (keyboard-translate ?\C-? ?\C-d))
--- a/lisp/startup.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/startup.el Mon Dec 19 19:57:22 2005 +0000 @@ -36,6 +36,13 @@ (defvar command-line-processed nil "Non-nil once command line has been processed.") +(defvar window-system initial-window-system + "Name of window system the selected frame is displaying through. +The value is a symbol--for instance, `x' for X windows. +The value is nil if the selected frame is on a text-only-terminal.") + +(make-variable-frame-local 'window-system) + (defgroup initialization nil "Emacs start-up procedure." :group 'internal) @@ -433,36 +440,19 @@ ;; for instance due to a dense colormap. (when (or frame-initial-frame ;; If frame-initial-frame has no meaning, do this anyway. - (not (and window-system + (not (and initial-window-system (not noninteractive) - (not (eq window-system 'pc))))) + (not (eq initial-window-system 'pc))))) ;; Modify the initial frame based on what .emacs puts into ;; ...-frame-alist. (if (fboundp 'frame-notice-user-settings) (frame-notice-user-settings)) + ;; Set the faces for the initial background mode even if + ;; frame-notice-user-settings didn't (such as on a tty). + ;; frame-set-background-mode is idempotent, so it won't + ;; cause any harm if it's already been done. (if (fboundp 'frame-set-background-mode) - ;; Set the faces for the initial background mode even if - ;; frame-notice-user-settings didn't (such as on a tty). - ;; frame-set-background-mode is idempotent, so it won't - ;; cause any harm if it's already been done. - (let ((frame (selected-frame)) - term) - (when (and (null window-system) - ;; Don't override default set by files in lisp/term. - (null default-frame-background-mode) - (let ((bg (frame-parameter frame 'background-color))) - (or (null bg) - (member bg '(unspecified "unspecified-bg" - "unspecified-fg"))))) - - (setq term (getenv "TERM")) - ;; Some files in lisp/term do a better job with the - ;; background mode, but we leave this here anyway, in - ;; case they remove those files. - (if (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" - term) - (setq default-frame-background-mode 'light))) - (frame-set-background-mode (selected-frame))))) + (frame-set-background-mode (selected-frame)))) ;; Now we know the user's default font, so add it to the menu. (if (fboundp 'font-menu-add-default) @@ -503,6 +493,20 @@ (defvar tool-bar-originally-present nil "Non-nil if tool-bars are present before user and site init files are read.") +(defvar handle-args-function-alist '((nil . tty-handle-args)) + "Functions for processing window-system dependent command-line arguments. +Window system startup files should add their own function to this +alist, which should parse the command line arguments. Those +pertaining to the window system should be processed and removed +from the returned command line.") + +(defvar window-system-initialization-alist '((nil . ignore)) + "Alist of window-system initialization functions. +Window-system startup files should add their own initialization +function to this list. The function should take no arguments, +and initialize the window system environment to prepare for +opening the first frame (e.g. open a connection to an X server).") + ;; Handle the X-like command-line arguments "-fg", "-bg", "-name", etc. (defun tty-handle-args (args) (let (rest) @@ -607,16 +611,22 @@ (setq eol-mnemonic-dos "(DOS)" eol-mnemonic-mac "(Mac)"))) - ;; Read window system's init file if using a window system. + ;; Make sure window system's init file was loaded in loadup.el if using a window system. (condition-case error - (if (and window-system (not noninteractive)) - (load (concat term-file-prefix - (symbol-name window-system) - "-win") - ;; Every window system should have a startup file; - ;; barf if we can't find it. - nil t)) - ;; If we can't read it, print the error message and exit. + (unless noninteractive + (if (and initial-window-system + (not (featurep + (intern (concat (symbol-name initial-window-system) "-win"))))) + (error "Unsupported window system `%s'" initial-window-system)) + ;; Process window-system specific command line parameters. + (setq command-line-args + (funcall (or (cdr (assq initial-window-system handle-args-function-alist)) + (error "Unsupported window system `%s'" initial-window-system)) + command-line-args)) + ;; Initialize the window system. (Open connection, etc.) + (funcall (or (cdr (assq initial-window-system window-system-initialization-alist)) + (error "Unsupported window system `%s'" initial-window-system)))) + ;; If there was an error, print the error message and exit. (error (princ (if (eq (car error) 'error) @@ -632,13 +642,9 @@ (cdr error) ", ")))) 'external-debugging-output) (terpri 'external-debugging-output) - (setq window-system nil) + (setq initial-window-system nil) (kill-emacs))) - ;; Windowed displays do this inside their *-win.el. - (unless (or (display-graphic-p) noninteractive) - (setq command-line-args (tty-handle-args command-line-args))) - (set-locale-environment nil) ;; Convert preloaded file names to absolute. @@ -756,7 +762,7 @@ ;; If frame was created with a menu bar, set menu-bar-mode on. (unless (or noninteractive emacs-basic-display - (and (memq window-system '(x w32)) + (and (memq initial-window-system '(x w32)) (<= (frame-parameter nil 'menu-bar-lines) 0))) (menu-bar-mode 1)) @@ -770,20 +776,21 @@ ;; Can't do this init in defcustom because the relevant variables ;; are not set. (custom-reevaluate-setting 'blink-cursor-mode) - (custom-reevaluate-setting 'normal-erase-is-backspace) (custom-reevaluate-setting 'tooltip-mode) (custom-reevaluate-setting 'global-font-lock-mode) (custom-reevaluate-setting 'mouse-wheel-down-event) (custom-reevaluate-setting 'mouse-wheel-up-event) (custom-reevaluate-setting 'file-name-shadow-mode) + (normal-erase-is-backspace-setup-frame) + ;; Register default TTY colors for the case the terminal hasn't a - ;; terminal init file. - (unless (memq window-system '(x w32 mac)) - ;; We do this regardles of whether the terminal supports colors - ;; or not, since they can switch that support on or off in - ;; mid-session by setting the tty-color-mode frame parameter. - (tty-register-default-colors)) + ;; terminal init file. We do this regardles of whether the terminal + ;; supports colors or not and regardless the current display type, + ;; since users can connect to color-capable terminals and also + ;; switch color support on or off in mid-session by setting the + ;; tty-color-mode frame parameter. + (tty-register-default-colors) ;; Record whether the tool-bar is present before the user and site ;; init files are processed. frame-notice-user-settings uses this @@ -1035,31 +1042,8 @@ ;; Load library for our terminal type. ;; User init file can set term-file-prefix to nil to prevent this. (unless (or noninteractive - window-system - (null term-file-prefix)) - (let* ((TERM (getenv "TERM")) - (term TERM) - hyphend) - (while (and term - (not (load (concat term-file-prefix term) t t))) - ;; Strip off last hyphen and what follows, then try again - (setq term - (if (setq hyphend (string-match "[-_][^-_]+\\'" term)) - (substring term 0 hyphend) - nil))) - (setq term TERM) - ;; The terminal file has been loaded, now call the terminal specific - ;; initialization function. - (while term - (let ((term-init-func (intern-soft (concat "terminal-init-" term)))) - (if (not (fboundp term-init-func)) - ;; Strip off last hyphen and what follows, then try again - (setq term - (if (setq hyphend (string-match "[-_][^-_]+\\'" term)) - (substring term 0 hyphend) - nil)) - (setq term nil) - (funcall term-init-func)))))) + initial-window-system) + (tty-run-terminal-initialization (selected-frame))) ;; Update the out-of-memory error message based on user's key bindings ;; for save-some-buffers.
--- a/lisp/subr.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/subr.el Mon Dec 19 19:57:22 2005 +0000 @@ -1481,7 +1481,7 @@ ;; or C-q C-x might not return immediately since ESC or C-x might be ;; bound to some prefix in function-key-map or key-translation-map. (setq translated char) - (let ((translation (lookup-key function-key-map (vector char)))) + (let ((translation (lookup-key local-function-key-map (vector char)))) (if (arrayp translation) (setq translated (aref translation 0)))) (cond ((null translated)) @@ -2119,6 +2119,18 @@ (if (window-live-p save-selected-window-window) (select-window save-selected-window-window 'norecord)))))) +(defmacro with-selected-frame (frame &rest body) + "Execute the forms in BODY with FRAME as the selected frame. +The value returned is the value of the last form in BODY. +See also `with-temp-buffer'." + (declare (indent 1) (debug t)) + `(let ((save-selected-frame (selected-frame))) + (unwind-protect + (progn (select-frame ,frame) + ,@body) + (if (frame-live-p save-selected-frame) + (select-frame save-selected-frame))))) + (defmacro with-temp-file (file &rest body) "Create a new buffer, evaluate BODY there, and write the buffer to FILE. The value returned is the value of the last form in BODY.
--- a/lisp/talk.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/talk.el Mon Dec 19 19:57:22 2005 +0000 @@ -45,17 +45,44 @@ ;; Add the new buffers to all talk frames. (talk-update-buffers)) -(defun talk-add-display (display) - (let* ((elt (assoc display talk-display-alist)) - (name (concat "*talk-" display "*")) - buffer frame) - (if (not (and elt (frame-live-p (setq frame (nth 1 elt))))) - (setq frame (make-frame-on-display display (list (cons 'name name))))) +;;;###autoload +(defun talk () + "Connect to the Emacs talk group from the current X display or tty frame." + (interactive) + (let ((type (frame-live-p (selected-frame))) + (display (frame-display (selected-frame)))) + (cond + ((eq type t) + (talk-add-display (selected-frame))) + ((eq type 'x) + (talk-add-display (frame-display (selected-frame)))) + (t + (error "Unknown frame type")))) + (talk-update-buffers)) + +(defun talk-add-display (frame) + (let* ((display (if (frame-live-p frame) + (frame-display frame) + frame)) + (elt (assoc display talk-display-alist)) + (name (concat "*talk-" (display-name display) "*")) + buffer) + (unless (frame-live-p frame) + (setq frame (make-frame-on-display display (list (cons 'name name))))) + (if (and elt (frame-live-p (nth 1 elt))) + (setq frame (nth 1 elt))) (if (not (and elt (buffer-name (get-buffer (setq buffer (nth 2 elt)))))) (setq buffer (get-buffer-create name))) + (add-to-list 'delete-frame-functions 'talk-handle-delete-frame) (setq talk-display-alist (cons (list display frame buffer) (delq elt talk-display-alist))))) +(defun talk-handle-delete-frame (frame) + (dolist (d talk-display-alist) + (when (eq (nth 1 d) frame) + (setq talk-display-alist (delq d talk-display-alist)) + (talk-update-buffers)))) + (defun talk-disconnect () "Disconnect this display from the Emacs talk group." (interactive)
--- a/lisp/term/AT386.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/AT386.el Mon Dec 19 19:57:22 2005 +0000 @@ -28,34 +28,36 @@ ;;; Code: -(if (boundp 'AT386-keypad-map) - nil - ;; The terminal initialization should already have set up some keys - (setq AT386-keypad-map (lookup-key function-key-map "\e[")) - (if (not (keymapp AT386-keypad-map)) - (error "What? Your AT386 termcap/terminfo has no keycaps in it")) +(defun terminal-init-AT386 () + "Terminal initialization function for AT386." + (if (boundp 'AT386-keypad-map) + nil + ;; The terminal initialization should already have set up some keys + (setq AT386-keypad-map (lookup-key local-function-key-map "\e[")) + (if (not (keymapp AT386-keypad-map)) + (error "What? Your AT386 termcap/terminfo has no keycaps in it")) - ;; Equivalents of these are set up automatically by termcap/terminfo - ;; (define-key AT386-keypad-map "A" [up]) - ;; (define-key AT386-keypad-map "B" [down]) - ;; (define-key AT386-keypad-map "C" [right]) - ;; (define-key AT386-keypad-map "D" [left]) + ;; Equivalents of these are set up automatically by termcap/terminfo + ;; (define-key AT386-keypad-map "A" [up]) + ;; (define-key AT386-keypad-map "B" [down]) + ;; (define-key AT386-keypad-map "C" [right]) + ;; (define-key AT386-keypad-map "D" [left]) - ;; These would be set up by terminfo, but not termcap - (define-key AT386-keypad-map "H" [home]) - (define-key AT386-keypad-map "Y" [end]) - (define-key AT386-keypad-map "U" [next]) ;; PgDn - (define-key AT386-keypad-map "V" [prior]) ;; PgUp - (define-key AT386-keypad-map "@" [insert]) ;; Ins key + ;; These would be set up by terminfo, but not termcap + (define-key AT386-keypad-map "H" [home]) + (define-key AT386-keypad-map "Y" [end]) + (define-key AT386-keypad-map "U" [next]) ;; PgDn + (define-key AT386-keypad-map "V" [prior]) ;; PgUp + (define-key AT386-keypad-map "@" [insert]) ;; Ins key - ;; These are not normally set up by either - (define-key AT386-keypad-map "G" [kp-5]) ;; Unlabeled center key - (define-key AT386-keypad-map "S" [kp-subtract]) - (define-key AT386-keypad-map "T" [kp-add]) + ;; These are not normally set up by either + (define-key AT386-keypad-map "G" [kp-5]) ;; Unlabeled center key + (define-key AT386-keypad-map "S" [kp-subtract]) + (define-key AT386-keypad-map "T" [kp-add]) - ;; Arrange for the ALT key to be equivalent to ESC - (define-key function-key-map "\eN" [27]) ; ALT map - ) + ;; Arrange for the ALT key to be equivalent to ESC + (define-key local-function-key-map "\eN" [27]) ; ALT map + )) ;;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7 ;;; AT386.el ends here
--- a/lisp/term/apollo.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/apollo.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t -*- (defun terminal-init-apollo () - "Terminal initialization function for apollo." - (load "term/vt100" nil t)) + "Terminal initialization function for apollo." + (terminal-init-vt100)) ;;; arch-tag: c72f446f-e6b7-4749-90a4-bd68632adacf ;;; apollo.el ends here
--- a/lisp/term/internal.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/internal.el Mon Dec 19 19:57:22 2005 +0000 @@ -29,20 +29,20 @@ ;; --------------------------------------------------------------------------- ;; keyboard setup -- that's simple! (set-input-mode nil nil 0) -(define-key function-key-map [backspace] "\177") ; Normal behaviour for BS -(define-key function-key-map [delete] "\C-d") ; ... and Delete -(define-key function-key-map [tab] [?\t]) -(define-key function-key-map [linefeed] [?\n]) -(define-key function-key-map [clear] [11]) -(define-key function-key-map [return] [13]) -(define-key function-key-map [escape] [?\e]) -(define-key function-key-map [M-backspace] [?\M-\d]) -(define-key function-key-map [M-delete] [?\M-d]) -(define-key function-key-map [M-tab] [?\M-\t]) -(define-key function-key-map [M-linefeed] [?\M-\n]) -(define-key function-key-map [M-clear] [?\M-\013]) -(define-key function-key-map [M-return] [?\M-\015]) -(define-key function-key-map [M-escape] [?\M-\e]) +(define-key local-function-key-map [backspace] "\177") ; Normal behaviour for BS +(define-key local-function-key-map [delete] "\C-d") ; ... and Delete +(define-key local-function-key-map [tab] [?\t]) +(define-key local-function-key-map [linefeed] [?\n]) +(define-key local-function-key-map [clear] [11]) +(define-key local-function-key-map [return] [13]) +(define-key local-function-key-map [escape] [?\e]) +(define-key local-function-key-map [M-backspace] [?\M-\d]) +(define-key local-function-key-map [M-delete] [?\M-d]) +(define-key local-function-key-map [M-tab] [?\M-\t]) +(define-key local-function-key-map [M-linefeed] [?\M-\n]) +(define-key local-function-key-map [M-clear] [?\M-\013]) +(define-key local-function-key-map [M-return] [?\M-\015]) +(define-key local-function-key-map [M-escape] [?\M-\e])) (put 'backspace 'ascii-character 127) (put 'delete 'ascii-character 127) (put 'tab 'ascii-character ?\t)
--- a/lisp/term/iris-ansi.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/iris-ansi.el Mon Dec 19 19:57:22 2005 +0000 @@ -25,306 +25,321 @@ ;;; Code: -(defun iris-ansi-initialize-terminal () - "Terminal initialization function for iris-ansi." - (define-key function-key-map "\e[120q" [S-escape]) - (define-key function-key-map "\e[121q" [C-escape]) +(defvar iris-function-map nil + "Function key definitions for SGI xwsh and winterm apps.") + +;; Make reloads faster. +(unless iris-function-map + (setq iris-function-map (make-sparse-keymap)) - (define-key function-key-map "\e[001q" [f1]) - (define-key function-key-map "\e[013q" [S-f1]) - (define-key function-key-map "\e[025q" [C-f1]) + (define-key iris-function-map "\e[120q" [S-escape]) + (define-key iris-function-map "\e[121q" [C-escape]) + + (define-key iris-function-map "\e[001q" [f1]) + (define-key iris-function-map "\e[013q" [S-f1]) + (define-key iris-function-map "\e[025q" [C-f1]) - (define-key function-key-map "\e[002q" [f2]) - (define-key function-key-map "\e[014q" [S-f2]) - (define-key function-key-map "\e[026q" [C-f2]) - (define-key function-key-map "\e[038q" [M-f2]) + (define-key iris-function-map "\e[002q" [f2]) + (define-key iris-function-map "\e[014q" [S-f2]) + (define-key iris-function-map "\e[026q" [C-f2]) + (define-key iris-function-map "\e[038q" [M-f2]) - (define-key function-key-map "\e[003q" [f3]) - (define-key function-key-map "\e[015q" [S-f3]) - (define-key function-key-map "\e[027q" [C-f3]) - - - (define-key function-key-map "\e[004q" [f4]) - (define-key function-key-map "\e[016q" [S-f4]) - (define-key function-key-map "\e[028q" [C-f4]) + (define-key iris-function-map "\e[003q" [f3]) + (define-key iris-function-map "\e[015q" [S-f3]) + (define-key iris-function-map "\e[027q" [C-f3]) - (define-key function-key-map "\e[005q" [f5]) - (define-key function-key-map "\e[017q" [S-f5]) - (define-key function-key-map "\e[029q" [C-f5]) + (define-key iris-function-map "\e[004q" [f4]) + (define-key iris-function-map "\e[016q" [S-f4]) + (define-key iris-function-map "\e[028q" [C-f4]) - (define-key function-key-map "\e[006q" [f6]) - (define-key function-key-map "\e[018q" [S-f6]) - (define-key function-key-map "\e[030q" [C-f6]) + (define-key iris-function-map "\e[005q" [f5]) + (define-key iris-function-map "\e[017q" [S-f5]) + (define-key iris-function-map "\e[029q" [C-f5]) - (define-key function-key-map "\e[007q" [f7]) - (define-key function-key-map "\e[019q" [S-f7]) - (define-key function-key-map "\e[031q" [C-f7]) + (define-key iris-function-map "\e[006q" [f6]) + (define-key iris-function-map "\e[018q" [S-f6]) + (define-key iris-function-map "\e[030q" [C-f6]) - (define-key function-key-map "\e[008q" [f8]) - (define-key function-key-map "\e[020q" [S-f8]) - (define-key function-key-map "\e[032q" [C-f8]) + (define-key iris-function-map "\e[007q" [f7]) + (define-key iris-function-map "\e[019q" [S-f7]) + (define-key iris-function-map "\e[031q" [C-f7]) - (define-key function-key-map "\e[009q" [f9]) - (define-key function-key-map "\e[021q" [S-f9]) - (define-key function-key-map "\e[033q" [C-f9]) + (define-key iris-function-map "\e[008q" [f8]) + (define-key iris-function-map "\e[020q" [S-f8]) + (define-key iris-function-map "\e[032q" [C-f8]) - (define-key function-key-map "\e[010q" [f10]) - (define-key function-key-map "\e[022q" [S-f10]) - (define-key function-key-map "\e[034q" [C-f10]) + (define-key iris-function-map "\e[009q" [f9]) + (define-key iris-function-map "\e[021q" [S-f9]) + (define-key iris-function-map "\e[033q" [C-f9]) - (define-key function-key-map "\e[011q" [f11]) - (define-key function-key-map "\e[023q" [S-f11]) - (define-key function-key-map "\e[035q" [C-f11]) - (define-key function-key-map "\e[047q" [M-f11]) - - (define-key function-key-map "\e[012q" [f12]) - (define-key function-key-map "\e[024q" [S-f12]) - (define-key function-key-map "\e[036q" [C-f12]) - (define-key function-key-map "\e[048q" [M-f12]) + (define-key iris-function-map "\e[010q" [f10]) + (define-key iris-function-map "\e[022q" [S-f10]) + (define-key iris-function-map "\e[034q" [C-f10]) - (define-key function-key-map "\e[057q" [?\C-`]) - (define-key function-key-map "\e[115q" [?\M-`]) + (define-key iris-function-map "\e[011q" [f11]) + (define-key iris-function-map "\e[023q" [S-f11]) + (define-key iris-function-map "\e[035q" [C-f11]) + (define-key iris-function-map "\e[047q" [M-f11]) - (define-key function-key-map "\e[049q" [?\C-1]) - (define-key function-key-map "\e[058q" [?\M-1]) + (define-key iris-function-map "\e[012q" [f12]) + (define-key iris-function-map "\e[024q" [S-f12]) + (define-key iris-function-map "\e[036q" [C-f12]) + (define-key iris-function-map "\e[048q" [M-f12]) + + + (define-key iris-function-map "\e[057q" [C-`]) + (define-key iris-function-map "\e[115q" [M-`]) + + (define-key iris-function-map "\e[049q" [?\C-1]) + (define-key iris-function-map "\e[058q" [?\M-1]) - (define-key function-key-map "\e[059q" [?\M-2]) + (define-key iris-function-map "\e[059q" [?\M-2]) - (define-key function-key-map "\e[050q" [?\C-3]) - (define-key function-key-map "\e[060q" [?\M-3]) + (define-key iris-function-map "\e[050q" [?\C-3]) + (define-key iris-function-map "\e[060q" [?\M-3]) - (define-key function-key-map "\e[051q" [?\C-4]) - (define-key function-key-map "\e[061q" [?\M-4]) + (define-key iris-function-map "\e[051q" [?\C-4]) + (define-key iris-function-map "\e[061q" [?\M-4]) - (define-key function-key-map "\e[052q" [?\C-5]) - (define-key function-key-map "\e[062q" [?\M-5]) + (define-key iris-function-map "\e[052q" [?\C-5]) + (define-key iris-function-map "\e[062q" [?\M-5]) - (define-key function-key-map "\e[063q" [?\M-6]) + (define-key iris-function-map "\e[063q" [?\M-6]) - (define-key function-key-map "\e[053q" [?\C-7]) - (define-key function-key-map "\e[064q" [?\M-7]) + (define-key iris-function-map "\e[053q" [?\C-7]) + (define-key iris-function-map "\e[064q" [?\M-7]) - (define-key function-key-map "\e[054q" [?\C-8]) - (define-key function-key-map "\e[065q" [?\M-8]) + (define-key iris-function-map "\e[054q" [?\C-8]) + (define-key iris-function-map "\e[065q" [?\M-8]) - (define-key function-key-map "\e[055q" [?\C-9]) - (define-key function-key-map "\e[066q" [?\M-9]) + (define-key iris-function-map "\e[055q" [?\C-9]) + (define-key iris-function-map "\e[066q" [?\M-9]) - (define-key function-key-map "\e[056q" [?\C-0]) - (define-key function-key-map "\e[067q" [?\M-0]) + (define-key iris-function-map "\e[056q" [?\C-0]) + (define-key iris-function-map "\e[067q" [?\M-0]) - (define-key function-key-map "\e[068q" [?\M--]) + (define-key iris-function-map "\e[068q" [?\M--]) - (define-key function-key-map "\e[069q" [?\C-=]) - (define-key function-key-map "\e[070q" [?\M-=]) + (define-key iris-function-map "\e[069q" [?\C-=]) + (define-key iris-function-map "\e[070q" [?\M-=]) ;; I don't know what to do with those. - ;;(define-key function-key-map "^H" [<del>]) - ;;(define-key function-key-map "^H" [S-<del>]) - ;;(define-key function-key-map "\177" [C-<del>]) - ;;(define-key function-key-map "\e[071q" [M-<del>]) + ;;(define-key iris-function-map "^H" [<del>]) + ;;(define-key iris-function-map "^H" [S-<del>]) + ;;(define-key iris-function-map "\177" [C-<del>]) + ;;(define-key iris-function-map "\e[071q" [M-<del>]) - (define-key function-key-map "\e[Z" [?\S-\t]) - (define-key function-key-map "\e[072q" [?\C-\t]) + (define-key iris-function-map "\e[Z" [?\S-\t]) + (define-key iris-function-map "\e[072q" [?\C-\t]) ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager. - (define-key function-key-map "\e[073q" [?\M-\t]) + (define-key iris-function-map "\e[073q" [?\M-\t]) - (define-key function-key-map "\e[074q" [?\M-q]) + (define-key iris-function-map "\e[074q" [?\M-q]) - (define-key function-key-map "\e[075q" [?\M-w]) + (define-key iris-function-map "\e[075q" [?\M-w]) - (define-key function-key-map "\e[076q" [?\M-e]) + (define-key iris-function-map "\e[076q" [?\M-e]) - (define-key function-key-map "\e[077q" [?\M-r]) + (define-key iris-function-map "\e[077q" [?\M-r]) - (define-key function-key-map "\e[078q" [?\M-t]) + (define-key iris-function-map "\e[078q" [?\M-t]) - (define-key function-key-map "\e[079q" [?\M-y]) + (define-key iris-function-map "\e[079q" [?\M-y]) - (define-key function-key-map "\e[080q" [?\M-u]) + (define-key iris-function-map "\e[080q" [?\M-u]) - (define-key function-key-map "\e[081q" [?\M-i]) + (define-key iris-function-map "\e[081q" [?\M-i]) - (define-key function-key-map "\e[082q" [?\M-o]) + (define-key iris-function-map "\e[082q" [?\M-o]) - (define-key function-key-map "\e[083q" [?\M-p]) + (define-key iris-function-map "\e[083q" [?\M-p]) - (define-key function-key-map "\e[084q" [?\M-\[]) + (define-key iris-function-map "\e[084q" [?\M-\[]) - (define-key function-key-map "\e[085q" [?\M-\]]) + (define-key iris-function-map "\e[085q" [?\M-\]]) - (define-key function-key-map "\e[086q" [?\M-\\]) + (define-key iris-function-map "\e[086q" [?\M-\\]) - (define-key function-key-map "\e[087q" [?\M-a]) + (define-key iris-function-map "\e[087q" [?\M-a]) - (define-key function-key-map "\e[088q" [?\M-s]) + (define-key iris-function-map "\e[088q" [?\M-s]) - (define-key function-key-map "\e[089q" [?\M-d]) + (define-key iris-function-map "\e[089q" [?\M-d]) - (define-key function-key-map "\e[090q" [?\M-f]) + (define-key iris-function-map "\e[090q" [?\M-f]) - (define-key function-key-map "\e[091q" [?\M-g]) + (define-key iris-function-map "\e[091q" [?\M-g]) - (define-key function-key-map "\e[092q" [?\M-h]) + (define-key iris-function-map "\e[092q" [?\M-h]) - (define-key function-key-map "\e[093q" [?\M-j]) + (define-key iris-function-map "\e[093q" [?\M-j]) - (define-key function-key-map "\e[094q" [?\M-k]) + (define-key iris-function-map "\e[094q" [?\M-k]) - (define-key function-key-map "\e[095q" [?\M-l]) + (define-key iris-function-map "\e[095q" [?\M-l]) - (define-key function-key-map "\e[096q" [?\C-\;]) - (define-key function-key-map "\e[097q" [?\M-:]) ;; we are cheating - ;; here, this is - ;; realy M-;, but - ;; M-: generates the - ;; same string and - ;; is more usefull. + (define-key iris-function-map "\e[096q" [?\C-\;]) + (define-key iris-function-map "\e[097q" [?\M-:]) ;; we are cheating + ;; here, this is realy + ;; M-;, but M-: + ;; generates the same + ;; string and is more + ;; usefull. - (define-key function-key-map "\e[098q" [?\C-']) - (define-key function-key-map "\e[099q" [?\M-']) + (define-key iris-function-map "\e[098q" [?\C-']) + (define-key iris-function-map "\e[099q" [?\M-']) - (define-key function-key-map "\e[100q" [?\M-\n]) + (define-key iris-function-map "\e[100q" [?\M-\n]) - (define-key function-key-map "\e[101q" [?\M-z]) + (define-key iris-function-map "\e[101q" [?\M-z]) - (define-key function-key-map "\e[102q" [?\M-x]) + (define-key iris-function-map "\e[102q" [?\M-x]) - (define-key function-key-map "\e[103q" [?\M-c]) + (define-key iris-function-map "\e[103q" [?\M-c]) - (define-key function-key-map "\e[104q" [?\M-v]) + (define-key iris-function-map "\e[104q" [?\M-v]) - (define-key function-key-map "\e[105q" [?\M-b]) + (define-key iris-function-map "\e[105q" [?\M-b]) - (define-key function-key-map "\e[106q" [M-n]) + (define-key iris-function-map "\e[106q" [M-n]) - (define-key function-key-map "\e[107q" [M-m]) + (define-key iris-function-map "\e[107q" [M-m]) - (define-key function-key-map "\e[108q" [?\C-,]) - (define-key function-key-map "\e[109q" [?\M-,]) + (define-key iris-function-map "\e[108q" [?\C-,]) + (define-key iris-function-map "\e[109q" [?\M-,]) - (define-key function-key-map "\e[110q" [?\C-.]) - (define-key function-key-map "\e[111q" [?\M-.]) + (define-key iris-function-map "\e[110q" [?\C-.]) + (define-key iris-function-map "\e[111q" [?\M-.]) - (define-key function-key-map "\e[112q" [?\C-/]) - (define-key function-key-map "\e[113q" [?\M-/]) + (define-key iris-function-map "\e[112q" [?\C-/]) + (define-key iris-function-map "\e[113q" [?\M-/]) - (define-key function-key-map "\e[139q" [insert]) - (define-key function-key-map "\e[139q" [S-insert]) - (define-key function-key-map "\e[140q" [C-insert]) - (define-key function-key-map "\e[141q" [M-insert]) + (define-key iris-function-map "\e[139q" [insert]) + (define-key iris-function-map "\e[139q" [S-insert]) + (define-key iris-function-map "\e[140q" [C-insert]) + (define-key iris-function-map "\e[141q" [M-insert]) - (define-key function-key-map "\e[H" [home]) - (define-key function-key-map "\e[143q" [S-home]) - (define-key function-key-map "\e[144q" [C-home]) + (define-key iris-function-map "\e[H" [home]) + (define-key iris-function-map "\e[143q" [S-home]) + (define-key iris-function-map "\e[144q" [C-home]) - (define-key function-key-map "\e[150q" [prior]) - (define-key function-key-map "\e[151q" [S-prior]) ;; those don't - ;; seem to - ;; generate + (define-key iris-function-map "\e[150q" [prior]) + (define-key iris-function-map "\e[151q" [S-prior]) ;; those don't seem + ;; to generate ;; anything - (define-key function-key-map "\e[152q" [C-prior]) + (define-key iris-function-map "\e[152q" [C-prior]) - ;; (define-key function-key-map "^?" [delete]) - (define-key function-key-map "\e[P" [S-delete]) - (define-key function-key-map "\e[142q" [C-delete]) - (define-key function-key-map "\e[M" [M-delete]) + ;; (define-key iris-function-map "^?" [delete]) ?? something else seems to take care of this. + (define-key iris-function-map "\e[P" [S-delete]) + (define-key iris-function-map "\e[142q" [C-delete]) + (define-key iris-function-map "\e[M" [M-delete]) - (define-key function-key-map "\e[146q" [end]) - (define-key function-key-map "\e[147q" [S-end]) ;; those don't seem - ;; to generate - ;; anything - (define-key function-key-map "\e[148q" [C-end]) + (define-key iris-function-map "\e[146q" [end]) + (define-key iris-function-map "\e[147q" [S-end]) ;; those don't seem to + ;; generate anything + (define-key iris-function-map "\e[148q" [C-end]) - (define-key function-key-map "\e[154q" [next]) - (define-key function-key-map "\e[155q" [S-next]) - (define-key function-key-map "\e[156q" [C-next]) + (define-key iris-function-map "\e[154q" [next]) + (define-key iris-function-map "\e[155q" [S-next]) + (define-key iris-function-map "\e[156q" [C-next]) - (define-key function-key-map "\e[161q" [S-up]) - (define-key function-key-map "\e[162q" [C-up]) - (define-key function-key-map "\e[163q" [M-up]) + (define-key iris-function-map "\e[161q" [S-up]) + (define-key iris-function-map "\e[162q" [C-up]) + (define-key iris-function-map "\e[163q" [M-up]) - (define-key function-key-map "\e[158q" [S-left]) - (define-key function-key-map "\e[159q" [C-left]) - (define-key function-key-map "\e[160q" [M-left]) + (define-key iris-function-map "\e[158q" [S-left]) + (define-key iris-function-map "\e[159q" [C-left]) + (define-key iris-function-map "\e[160q" [M-left]) - (define-key function-key-map "\e[164q" [S-down]) - (define-key function-key-map "\e[165q" [C-down]) - (define-key function-key-map "\e[166q" [M-down]) + (define-key iris-function-map "\e[164q" [S-down]) + (define-key iris-function-map "\e[165q" [C-down]) + (define-key iris-function-map "\e[166q" [M-down]) - (define-key function-key-map "\e[167q" [S-right]) - (define-key function-key-map "\e[168q" [C-right]) - (define-key function-key-map "\e[169q" [M-right]) + (define-key iris-function-map "\e[167q" [S-right]) + (define-key iris-function-map "\e[168q" [C-right]) + (define-key iris-function-map "\e[169q" [M-right]) ;; Keypad functions, most of those are untested. - (define-key function-key-map "\e[179q" [?\C-/]) - (define-key function-key-map "\e[180q" [?\M-/]) + (define-key iris-function-map "\e[179q" [?\C-/]) + (define-key iris-function-map "\e[180q" [?\M-/]) - (define-key function-key-map "\e[187q" [?\C-*]) - (define-key function-key-map "\e[188q" [?\M-*]) + (define-key iris-function-map "\e[187q" [?\C-*]) + (define-key iris-function-map "\e[188q" [?\M-*]) - (define-key function-key-map "\e[198q" [?\C--]) - (define-key function-key-map "\e[199q" [?\M--]) + (define-key iris-function-map "\e[198q" [?\C--]) + (define-key iris-function-map "\e[199q" [?\M--]) ;; Something else takes care of home, up, prior, down, left, right, next - ;;(define-key function-key-map "\e[H" [home]) - (define-key function-key-map "\e[172q" [C-home]) + ;(define-key iris-function-map "\e[H" [home]) + (define-key iris-function-map "\e[172q" [C-home]) - ;;(define-key function-key-map "\e[A" [up]) - (define-key function-key-map "\e[182q" [C-up]) + ;(define-key iris-function-map "\e[A" [up]) + (define-key iris-function-map "\e[182q" [C-up]) - ;;(define-key function-key-map "\e[150q" [prior]) - (define-key function-key-map "\e[190q" [C-prior]) + ;(define-key iris-function-map "\e[150q" [prior]) + (define-key iris-function-map "\e[190q" [C-prior]) + + + (define-key iris-function-map "\e[200q" [?\C-+]) + (define-key iris-function-map "\e[201q" [?\M-+]) + + ;(define-key iris-function-map "\e[D" [left]) + (define-key iris-function-map "\e[174q" [C-left]) + + + (define-key iris-function-map "\e[000q" [begin]) + (define-key iris-function-map "\e[184q" [C-begin]) - (define-key function-key-map "\e[200q" [?\C-+]) - (define-key function-key-map "\e[201q" [?\M-+]) + ;(define-key iris-function-map "\e[C" [right]) + (define-key iris-function-map "\e[192q" [C-right]) + + ;(define-key iris-function-map "\e[146q" [end]) + (define-key iris-function-map "\e[176q" [C-end]) - ;;(define-key function-key-map "\e[D" [left]) - (define-key function-key-map "\e[174q" [C-left]) + ;(define-key iris-function-map "\e[B" [down]) + (define-key iris-function-map "\e[186q" [C-down]) - - (define-key function-key-map "\e[000q" [begin]) - (define-key function-key-map "\e[184q" [C-begin]) + ;(define-key iris-function-map "\e[154q" [next]) + (define-key iris-function-map "\e[194q" [C-next]) - ;;(define-key function-key-map "\e[C" [right]) - (define-key function-key-map "\e[192q" [C-right]) + (define-key iris-function-map "\e[100q" [M-enter]) - ;;(define-key function-key-map "\e[146q" [end]) - (define-key function-key-map "\e[176q" [C-end]) + (define-key iris-function-map "\e[139q" [insert]) + (define-key iris-function-map "\e[178q" [C-inset]) - ;;(define-key function-key-map "\e[B" [down]) - (define-key function-key-map "\e[186q" [C-down]) + (define-key iris-function-map "\e[P" [delete]) + (define-key iris-function-map "\e[196q" [C-delete]) + (define-key iris-function-map "\e[197q" [M-delete])) - ;;(define-key function-key-map "\e[154q" [next]) - (define-key function-key-map "\e[194q" [C-next]) - - - (define-key function-key-map "\e[100q" [M-enter]) - - (define-key function-key-map "\e[139q" [insert]) - (define-key function-key-map "\e[178q" [C-inset]) - - (define-key function-key-map "\e[P" [delete]) - (define-key function-key-map "\e[196q" [C-delete]) - (define-key function-key-map "\e[197q" [M-delete])) +(defun terminal-init-iris-ansi () + "Terminal initialization function for iris-ansi." + ;; The terminal-local stuff only need to be set up on the first + ;; frame on that device. + (when (eq 1 (length (frames-on-display-list))) + ;; Use inheritance to let the main keymap override these defaults. + ;; This way we don't override terminfo-derived settings or settings + ;; made in the .emacs file. + (let ((m (copy-keymap iris-function-map))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m)))) ;;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b ;;; iris-ansi.el ends here
--- a/lisp/term/lk201.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/lk201.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,72 +1,91 @@ ;; -*- no-byte-compile: t -*- ;; Define function key sequences for DEC terminals. -;; Termcap or terminfo should set these. -;; (define-key function-key-map "\e[A" [up]) -;; (define-key function-key-map "\e[B" [down]) -;; (define-key function-key-map "\e[C" [right]) -;; (define-key function-key-map "\e[D" [left]) +(defvar lk201-function-map nil + "Function key definitions for DEC terminals.") + +;; Make reloads faster. +(unless lk201-function-map + (setq lk201-function-map (make-sparse-keymap)) + + ;; Termcap or terminfo should set these. + ;; (define-key lk201-function-map "\e[A" [up]) + ;; (define-key lk201-function-map "\e[B" [down]) + ;; (define-key lk201-function-map "\e[C" [right]) + ;; (define-key lk201-function-map "\e[D" [left]) + + (define-key lk201-function-map "\e[1~" [find]) + (define-key lk201-function-map "\e[2~" [insert]) + (define-key lk201-function-map "\e[3~" [delete]) + (define-key lk201-function-map "\e[4~" [select]) + (define-key lk201-function-map "\e[5~" [prior]) + (define-key lk201-function-map "\e[6~" [next]) + (define-key lk201-function-map "\e[11~" [f1]) + (define-key lk201-function-map "\e[12~" [f2]) + (define-key lk201-function-map "\e[13~" [f3]) + (define-key lk201-function-map "\e[14~" [f4]) + (define-key lk201-function-map "\e[15~" [f5]) + (define-key lk201-function-map "\e[17~" [f6]) + (define-key lk201-function-map "\e[18~" [f7]) + (define-key lk201-function-map "\e[19~" [f8]) + (define-key lk201-function-map "\e[20~" [f9]) + (define-key lk201-function-map "\e[21~" [f10]) + ;; Customarily F11 is used as the ESC key. + ;; The file that includes this one, takes care of that. + (define-key lk201-function-map "\e[23~" [f11]) + (define-key lk201-function-map "\e[24~" [f12]) + (define-key lk201-function-map "\e[25~" [f13]) + (define-key lk201-function-map "\e[26~" [f14]) + (define-key lk201-function-map "\e[28~" [help]) + (define-key lk201-function-map "\e[29~" [menu]) + (define-key lk201-function-map "\e[31~" [f17]) + (define-key lk201-function-map "\e[32~" [f18]) + (define-key lk201-function-map "\e[33~" [f19]) + (define-key lk201-function-map "\e[34~" [f20]) -(define-key function-key-map "\e[1~" [find]) -(define-key function-key-map "\e[2~" [insert]) -(define-key function-key-map "\e[3~" [delete]) -(define-key function-key-map "\e[4~" [select]) -(define-key function-key-map "\e[5~" [prior]) -(define-key function-key-map "\e[6~" [next]) -(define-key function-key-map "\e[11~" [f1]) -(define-key function-key-map "\e[12~" [f2]) -(define-key function-key-map "\e[13~" [f3]) -(define-key function-key-map "\e[14~" [f4]) -(define-key function-key-map "\e[15~" [f5]) -(define-key function-key-map "\e[17~" [f6]) -(define-key function-key-map "\e[18~" [f7]) -(define-key function-key-map "\e[19~" [f8]) -(define-key function-key-map "\e[20~" [f9]) -(define-key function-key-map "\e[21~" [f10]) -;; Customarily F11 is used as the ESC key. -;; The file that includes this one, takes care of that. -(define-key function-key-map "\e[23~" [f11]) -(define-key function-key-map "\e[24~" [f12]) -(define-key function-key-map "\e[25~" [f13]) -(define-key function-key-map "\e[26~" [f14]) -(define-key function-key-map "\e[28~" [help]) -(define-key function-key-map "\e[29~" [menu]) -(define-key function-key-map "\e[31~" [f17]) -(define-key function-key-map "\e[32~" [f18]) -(define-key function-key-map "\e[33~" [f19]) -(define-key function-key-map "\e[34~" [f20]) + ;; Termcap or terminfo should set these. + ;; (define-key lk201-function-map "\eOA" [up]) + ;; (define-key lk201-function-map "\eOB" [down]) + ;; (define-key lk201-function-map "\eOC" [right]) + ;; (define-key lk201-function-map "\eOD" [left]) + + ;; Termcap or terminfo should set these, but doesn't properly. + ;; Termcap sets these to k1-k4, which get mapped to f1-f4 in term.c + (define-key lk201-function-map "\eOP" [kp-f1]) + (define-key lk201-function-map "\eOQ" [kp-f2]) + (define-key lk201-function-map "\eOR" [kp-f3]) + (define-key lk201-function-map "\eOS" [kp-f4]) -;; Termcap or terminfo should set these. -;; (define-key function-key-map "\eOA" [up]) -;; (define-key function-key-map "\eOB" [down]) -;; (define-key function-key-map "\eOC" [right]) -;; (define-key function-key-map "\eOD" [left]) - -;; Termcap or terminfo should set these, but doesn't properly. -;; Termcap sets these to k1-k4, which get mapped to f1-f4 in term.c -(define-key function-key-map "\eOP" [kp-f1]) -(define-key function-key-map "\eOQ" [kp-f2]) -(define-key function-key-map "\eOR" [kp-f3]) -(define-key function-key-map "\eOS" [kp-f4]) + (define-key lk201-function-map "\eOI" [kp-tab]) + (define-key lk201-function-map "\eOj" [kp-multiply]) + (define-key lk201-function-map "\eOk" [kp-add]) + (define-key lk201-function-map "\eOl" [kp-separator]) + (define-key lk201-function-map "\eOM" [kp-enter]) + (define-key lk201-function-map "\eOm" [kp-subtract]) + (define-key lk201-function-map "\eOn" [kp-decimal]) + (define-key lk201-function-map "\eOo" [kp-divide]) + (define-key lk201-function-map "\eOp" [kp-0]) + (define-key lk201-function-map "\eOq" [kp-1]) + (define-key lk201-function-map "\eOr" [kp-2]) + (define-key lk201-function-map "\eOs" [kp-3]) + (define-key lk201-function-map "\eOt" [kp-4]) + (define-key lk201-function-map "\eOu" [kp-5]) + (define-key lk201-function-map "\eOv" [kp-6]) + (define-key lk201-function-map "\eOw" [kp-7]) + (define-key lk201-function-map "\eOx" [kp-8]) + (define-key lk201-function-map "\eOy" [kp-9])) -(define-key function-key-map "\eOI" [kp-tab]) -(define-key function-key-map "\eOj" [kp-multiply]) -(define-key function-key-map "\eOk" [kp-add]) -(define-key function-key-map "\eOl" [kp-separator]) -(define-key function-key-map "\eOM" [kp-enter]) -(define-key function-key-map "\eOm" [kp-subtract]) -(define-key function-key-map "\eOn" [kp-decimal]) -(define-key function-key-map "\eOo" [kp-divide]) -(define-key function-key-map "\eOp" [kp-0]) -(define-key function-key-map "\eOq" [kp-1]) -(define-key function-key-map "\eOr" [kp-2]) -(define-key function-key-map "\eOs" [kp-3]) -(define-key function-key-map "\eOt" [kp-4]) -(define-key function-key-map "\eOu" [kp-5]) -(define-key function-key-map "\eOv" [kp-6]) -(define-key function-key-map "\eOw" [kp-7]) -(define-key function-key-map "\eOx" [kp-8]) -(define-key function-key-map "\eOy" [kp-9]) +(defun terminal-init-lk201 () + ;; The terminal-local stuff only need to be set up on the first + ;; frame on that device. + (when (eq 1 (length (frames-on-display-list))) + + ;; Use inheritance to let the main keymap override these defaults. + ;; This way we don't override terminfo-derived settings or settings + ;; made in the .emacs file. + (let ((m (copy-keymap lk201-function-map))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m)))) ;;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d ;;; lk201.el ends here
--- a/lisp/term/mac-win.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/mac-win.el Mon Dec 19 19:57:22 2005 +0000 @@ -1062,20 +1062,20 @@ ;; Map certain keypad keys into ASCII characters ;; that people usually expect. -(define-key function-key-map [backspace] [?\d]) -(define-key function-key-map [delete] [?\d]) -(define-key function-key-map [tab] [?\t]) -(define-key function-key-map [linefeed] [?\n]) -(define-key function-key-map [clear] [?\C-l]) -(define-key function-key-map [return] [?\C-m]) -(define-key function-key-map [escape] [?\e]) -(define-key function-key-map [M-backspace] [?\M-\d]) -(define-key function-key-map [M-delete] [?\M-\d]) -(define-key function-key-map [M-tab] [?\M-\t]) -(define-key function-key-map [M-linefeed] [?\M-\n]) -(define-key function-key-map [M-clear] [?\M-\C-l]) -(define-key function-key-map [M-return] [?\M-\C-m]) -(define-key function-key-map [M-escape] [?\M-\e]) +(define-key local-function-key-map [backspace] [?\d]) +(define-key local-function-key-map [delete] [?\d]) +(define-key local-function-key-map [tab] [?\t]) +(define-key local-function-key-map [linefeed] [?\n]) +(define-key local-function-key-map [clear] [?\C-l]) +(define-key local-function-key-map [return] [?\C-m]) +(define-key local-function-key-map [escape] [?\e]) +(define-key local-function-key-map [M-backspace] [?\M-\d]) +(define-key local-function-key-map [M-delete] [?\M-\d]) +(define-key local-function-key-map [M-tab] [?\M-\t]) +(define-key local-function-key-map [M-linefeed] [?\M-\n]) +(define-key local-function-key-map [M-clear] [?\M-\C-l]) +(define-key local-function-key-map [M-return] [?\M-\C-m]) +(define-key local-function-key-map [M-escape] [?\M-\e]) ;; These tell read-char how to convert ;; these special chars to ASCII.
--- a/lisp/term/news.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/news.el Mon Dec 19 19:57:22 2005 +0000 @@ -34,7 +34,7 @@ (if (boundp 'news-fkey-prefix) nil ;; The terminal initialization should already have set up some keys - (setq news-fkey-prefix (lookup-key function-key-map "\eO")) + (setq news-fkey-prefix (lookup-key local-function-key-map "\eO")) (if (not (keymapp news-fkey-prefix)) (error "What? Your news termcap/terminfo has no keycaps in it"))
--- a/lisp/term/rxvt.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/rxvt.el Mon Dec 19 19:57:22 2005 +0000 @@ -26,138 +26,149 @@ ;;; Code: -(defun terminal-init-rxvt () - "Terminal initialization function for rxvt." - ;; The terminal intialization C code file might have initialized - ;; function keys F11->F42 from the termcap/terminfo information. On - ;; a PC-style keyboard these keys correspond to - ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The - ;; code here subsitutes the corresponding defintions in - ;; function-key-map. This substitution is needed because if a key - ;; definition if found in function-key-map, there are no further - ;; lookups in other keymaps. - (substitute-key-definition [f11] [S-f1] function-key-map) - (substitute-key-definition [f12] [S-f2] function-key-map) - (substitute-key-definition [f13] [S-f3] function-key-map) - (substitute-key-definition [f14] [S-f4] function-key-map) - (substitute-key-definition [f15] [S-f5] function-key-map) - (substitute-key-definition [f16] [S-f6] function-key-map) - (substitute-key-definition [f17] [S-f7] function-key-map) - (substitute-key-definition [f18] [S-f8] function-key-map) - (substitute-key-definition [f19] [S-f9] function-key-map) - (substitute-key-definition [f20] [S-f10] function-key-map) +(defvar rxvt-function-map nil + "Function key overrides for rxvt.") - (substitute-key-definition [f23] [C-f1] function-key-map) - (substitute-key-definition [f24] [C-f2] function-key-map) - (substitute-key-definition [f25] [C-f3] function-key-map) - (substitute-key-definition [f26] [C-f4] function-key-map) - (substitute-key-definition [f27] [C-f5] function-key-map) - (substitute-key-definition [f28] [C-f6] function-key-map) - (substitute-key-definition [f29] [C-f7] function-key-map) - (substitute-key-definition [f30] [C-f8] function-key-map) - (substitute-key-definition [f31] [C-f9] function-key-map) - (substitute-key-definition [f32] [C-f10] function-key-map) - - (substitute-key-definition [f33] [C-S-f1] function-key-map) - (substitute-key-definition [f34] [C-S-f2] function-key-map) - (substitute-key-definition [f35] [C-S-f3] function-key-map) - (substitute-key-definition [f36] [C-S-f4] function-key-map) - (substitute-key-definition [f37] [C-S-f5] function-key-map) - (substitute-key-definition [f38] [C-S-f6] function-key-map) - (substitute-key-definition [f39] [C-S-f7] function-key-map) - (substitute-key-definition [f40] [C-S-f8] function-key-map) - (substitute-key-definition [f41] [C-S-f9] function-key-map) - (substitute-key-definition [f42] [C-S-f10] function-key-map) +;; Protect against reloads. +(unless rxvt-function-map + (setq rxvt-function-map (make-sparse-keymap)) ;; Set up function-key-map entries that termcap and terminfo don't know. - (let ((map (make-sparse-keymap))) - (define-key map "\e[A" [up]) - (define-key map "\e[B" [down]) - (define-key map "\e[C" [right]) - (define-key map "\e[D" [left]) - (define-key map "\e[2~" [insert]) - (define-key map "\e[3~" [delete]) - (define-key map "\e[4~" [select]) - (define-key map "\e[5~" [prior]) - (define-key map "\e[6~" [next]) - (define-key map "\e[7~" [home]) - (define-key map "\e[8~" [end]) - (define-key map "\e[11~" [f1]) - (define-key map "\e[12~" [f2]) - (define-key map "\e[13~" [f3]) - (define-key map "\e[14~" [f4]) - (define-key map "\e[15~" [f5]) - (define-key map "\e[17~" [f6]) - (define-key map "\e[18~" [f7]) - (define-key map "\e[19~" [f8]) - (define-key map "\e[20~" [f9]) - (define-key map "\e[21~" [f10]) - ;; The strings emitted by f11 and f12 are the same as the strings - ;; emitted by S-f1 and S-f2, so don't define f11 and f12. - ;; (define-key map "\e[23~" [f11]) - ;; (define-key map "\e[24~" [f12]) - (define-key map "\e[29~" [print]) + (define-key rxvt-function-map "\e[A" [up]) + (define-key rxvt-function-map "\e[B" [down]) + (define-key rxvt-function-map "\e[C" [right]) + (define-key rxvt-function-map "\e[D" [left]) + (define-key rxvt-function-map "\e[2~" [insert]) + (define-key rxvt-function-map "\e[3~" [delete]) + (define-key rxvt-function-map "\e[4~" [select]) + (define-key rxvt-function-map "\e[5~" [prior]) + (define-key rxvt-function-map "\e[6~" [next]) + (define-key rxvt-function-map "\e[7~" [home]) + (define-key rxvt-function-map "\e[8~" [end]) + (define-key rxvt-function-map "\e[11~" [f1]) + (define-key rxvt-function-map "\e[12~" [f2]) + (define-key rxvt-function-map "\e[13~" [f3]) + (define-key rxvt-function-map "\e[14~" [f4]) + (define-key rxvt-function-map "\e[15~" [f5]) + (define-key rxvt-function-map "\e[17~" [f6]) + (define-key rxvt-function-map "\e[18~" [f7]) + (define-key rxvt-function-map "\e[19~" [f8]) + (define-key rxvt-function-map "\e[20~" [f9]) + (define-key rxvt-function-map "\e[21~" [f10]) + ;; The strings emitted by f11 and f12 are the same as the strings + ;; emitted by S-f1 and S-f2, so don't define f11 and f12. + ;; (define-key rxvt-function-map "\e[23~" [f11]) + ;; (define-key rxvt-function-map "\e[24~" [f12]) + (define-key rxvt-function-map "\e[29~" [print]) - (define-key map "\e[11^" [C-f1]) - (define-key map "\e[12^" [C-f2]) - (define-key map "\e[13^" [C-f3]) - (define-key map "\e[14^" [C-f4]) - (define-key map "\e[15^" [C-f5]) - (define-key map "\e[17^" [C-f6]) - (define-key map "\e[18^" [C-f7]) - (define-key map "\e[19^" [C-f8]) - (define-key map "\e[20^" [C-f9]) - (define-key map "\e[21^" [C-f10]) + (define-key rxvt-function-map "\e[11^" [C-f1]) + (define-key rxvt-function-map "\e[12^" [C-f2]) + (define-key rxvt-function-map "\e[13^" [C-f3]) + (define-key rxvt-function-map "\e[14^" [C-f4]) + (define-key rxvt-function-map "\e[15^" [C-f5]) + (define-key rxvt-function-map "\e[17^" [C-f6]) + (define-key rxvt-function-map "\e[18^" [C-f7]) + (define-key rxvt-function-map "\e[19^" [C-f8]) + (define-key rxvt-function-map "\e[20^" [C-f9]) + (define-key rxvt-function-map "\e[21^" [C-f10]) + + (define-key rxvt-function-map "\e[23~" [S-f1]) + (define-key rxvt-function-map "\e[24~" [S-f2]) + (define-key rxvt-function-map "\e[25~" [S-f3]) + (define-key rxvt-function-map "\e[26~" [S-f4]) + (define-key rxvt-function-map "\e[28~" [S-f5]) + (define-key rxvt-function-map "\e[29~" [S-f6]) + (define-key rxvt-function-map "\e[31~" [S-f7]) + (define-key rxvt-function-map "\e[32~" [S-f8]) + (define-key rxvt-function-map "\e[33~" [S-f9]) + (define-key rxvt-function-map "\e[34~" [S-f10]) + + (define-key rxvt-function-map "\e[23^" [C-S-f1]) + (define-key rxvt-function-map "\e[24^" [C-S-f2]) + (define-key rxvt-function-map "\e[25^" [C-S-f3]) + (define-key rxvt-function-map "\e[26^" [C-S-f4]) + (define-key rxvt-function-map "\e[28^" [C-S-f5]) + (define-key rxvt-function-map "\e[29^" [C-S-f6]) + (define-key rxvt-function-map "\e[31^" [C-S-f7]) + (define-key rxvt-function-map "\e[32^" [C-S-f8]) + (define-key rxvt-function-map "\e[33^" [C-S-f9]) + (define-key rxvt-function-map "\e[34^" [C-S-f10]) - (define-key map "\e[23~" [S-f1]) - (define-key map "\e[24~" [S-f2]) - (define-key map "\e[25~" [S-f3]) - (define-key map "\e[26~" [S-f4]) - (define-key map "\e[28~" [S-f5]) - (define-key map "\e[29~" [S-f6]) - (define-key map "\e[31~" [S-f7]) - (define-key map "\e[32~" [S-f8]) - (define-key map "\e[33~" [S-f9]) - (define-key map "\e[34~" [S-f10]) + (define-key rxvt-function-map "\e[2^" [C-insert]) + (define-key rxvt-function-map "\e[3^" [C-delete]) + (define-key rxvt-function-map "\e[5^" [C-prior]) + (define-key rxvt-function-map "\e[6^" [C-next]) + (define-key rxvt-function-map "\e[7^" [C-home]) + (define-key rxvt-function-map "\e[8^" [C-end]) + (define-key rxvt-function-map "\eOd" [C-left]) + (define-key rxvt-function-map "\eOc" [C-right]) + (define-key rxvt-function-map "\eOa" [C-up]) + (define-key rxvt-function-map "\eOb" [C-down]) - (define-key map "\e[23^" [C-S-f1]) - (define-key map "\e[24^" [C-S-f2]) - (define-key map "\e[25^" [C-S-f3]) - (define-key map "\e[26^" [C-S-f4]) - (define-key map "\e[28^" [C-S-f5]) - (define-key map "\e[29^" [C-S-f6]) - (define-key map "\e[31^" [C-S-f7]) - (define-key map "\e[32^" [C-S-f8]) - (define-key map "\e[33^" [C-S-f9]) - (define-key map "\e[34^" [C-S-f10]) + (define-key rxvt-function-map "\e[2;2~" [S-insert]) + (define-key rxvt-function-map "\e[3$" [S-delete]) + (define-key rxvt-function-map "\e[5$" [S-prior]) + (define-key rxvt-function-map "\e[6$" [S-next]) + (define-key rxvt-function-map "\e[7$" [S-home]) + (define-key rxvt-function-map "\e[8$" [S-end]) + (define-key rxvt-function-map "\e[d" [S-left]) + (define-key rxvt-function-map "\e[c" [S-right]) + (define-key rxvt-function-map "\e[a" [S-up]) + (define-key rxvt-function-map "\e[b" [S-down])) + +(defun terminal-init-rxvt () + "Terminal initialization function for rxvt." - (define-key map "\e[2^" [C-insert]) - (define-key map "\e[3^" [C-delete]) - (define-key map "\e[5^" [C-prior]) - (define-key map "\e[6^" [C-next]) - (define-key map "\e[7^" [C-home]) - (define-key map "\e[8^" [C-end]) - (define-key map "\eOd" [C-left]) - (define-key map "\eOc" [C-right]) - (define-key map "\eOa" [C-up]) - (define-key map "\eOb" [C-down]) + ;; The terminal-local stuff only need to be set up on the first + ;; frame on that device. + (when (eq 1 (length (frames-on-display-list))) + ;; The terminal intialization C code file might have initialized + ;; function keys F11->F42 from the termcap/terminfo information. On + ;; a PC-style keyboard these keys correspond to + ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The + ;; code here subsitutes the corresponding defintions in + ;; function-key-map. This substitution is needed because if a key + ;; definition if found in function-key-map, there are no further + ;; lookups in other keymaps. + (substitute-key-definition [f11] [S-f1] local-function-key-map) + (substitute-key-definition [f12] [S-f2] local-function-key-map) + (substitute-key-definition [f13] [S-f3] local-function-key-map) + (substitute-key-definition [f14] [S-f4] local-function-key-map) + (substitute-key-definition [f15] [S-f5] local-function-key-map) + (substitute-key-definition [f16] [S-f6] local-function-key-map) + (substitute-key-definition [f17] [S-f7] local-function-key-map) + (substitute-key-definition [f18] [S-f8] local-function-key-map) + (substitute-key-definition [f19] [S-f9] local-function-key-map) + (substitute-key-definition [f20] [S-f10] local-function-key-map) - (define-key map "\e[2;2~" [S-insert]) - (define-key map "\e[3$" [S-delete]) - (define-key map "\e[5$" [S-prior]) - (define-key map "\e[6$" [S-next]) - (define-key map "\e[7$" [S-home]) - (define-key map "\e[8$" [S-end]) - (define-key map "\e[d" [S-left]) - (define-key map "\e[c" [S-right]) - (define-key map "\e[a" [S-up]) - (define-key map "\e[b" [S-down]) + (substitute-key-definition [f23] [C-f1] local-function-key-map) + (substitute-key-definition [f24] [C-f2] local-function-key-map) + (substitute-key-definition [f25] [C-f3] local-function-key-map) + (substitute-key-definition [f26] [C-f4] local-function-key-map) + (substitute-key-definition [f27] [C-f5] local-function-key-map) + (substitute-key-definition [f28] [C-f6] local-function-key-map) + (substitute-key-definition [f29] [C-f7] local-function-key-map) + (substitute-key-definition [f30] [C-f8] local-function-key-map) + (substitute-key-definition [f31] [C-f9] local-function-key-map) + (substitute-key-definition [f32] [C-f10] local-function-key-map) + + (substitute-key-definition [f33] [C-S-f1] local-function-key-map) + (substitute-key-definition [f34] [C-S-f2] local-function-key-map) + (substitute-key-definition [f35] [C-S-f3] local-function-key-map) + (substitute-key-definition [f36] [C-S-f4] local-function-key-map) + (substitute-key-definition [f37] [C-S-f5] local-function-key-map) + (substitute-key-definition [f38] [C-S-f6] local-function-key-map) + (substitute-key-definition [f39] [C-S-f7] local-function-key-map) + (substitute-key-definition [f40] [C-S-f8] local-function-key-map) + (substitute-key-definition [f41] [C-S-f9] local-function-key-map) + (substitute-key-definition [f42] [C-S-f10] local-function-key-map) ;; Use inheritance to let the main keymap override those defaults. ;; This way we don't override terminfo-derived settings or settings ;; made in the .emacs file. - (set-keymap-parent map (keymap-parent function-key-map)) - (set-keymap-parent function-key-map map)) + (let ((m (copy-keymap rxvt-function-map))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m))) ;; Initialize colors and background mode. (rxvt-register-default-colors) @@ -280,7 +291,7 @@ ;; intelligent way than the default guesswork in startup.el. (defun rxvt-set-background-mode () "Set background mode as appropriate for the default rxvt colors." - (let ((fgbg (getenv "COLORFGBG")) + (let ((fgbg (terminal-getenv "COLORFGBG")) bg rgb) (setq default-frame-background-mode 'light) (when (and fgbg
--- a/lisp/term/sun.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/sun.el Mon Dec 19 19:57:22 2005 +0000 @@ -150,7 +150,7 @@ (defun terminal-init-sun () "Terminal initialization function for sun." - (define-key function-key-map "\e[" sun-raw-prefix) + (define-key local-function-key-map "\e[" sun-raw-prefix) (define-key sun-raw-prefix "210z" [r3]) (define-key sun-raw-prefix "213z" [r6])
--- a/lisp/term/tvi970.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/tvi970.el Mon Dec 19 19:57:22 2005 +0000 @@ -30,14 +30,14 @@ (defun terminal-init-tvi970 () "Terminal initialization function for tvi970." - (or (lookup-key function-key-map "\e[") - (define-key function-key-map "\e[" (make-keymap))) - ;; (or (lookup-key function-key-map "\eO") - ;; (define-key function-key-map "\eO" (make-keymap))) + (or (lookup-key local-function-key-map "\e[") + (define-key local-function-key-map "\e[" (make-keymap))) + ;; (or (lookup-key local-function-key-map "\eO") + ;; (define-key local-function-key-map "\eO" (make-keymap))) ;; Miscellaneous keys (mapcar (function (lambda (key-binding) - (define-key function-key-map + (define-key local-function-key-map (car key-binding) (nth 1 key-binding)))) '( ;; These are set up by termcap or terminfo @@ -53,7 +53,7 @@ ("\e[@" [insert]) ("\e[L" [insertline]) ("\e[M" [deleteline]) - ("\e[U" [next]) ;; actually the `page' key + ("\e[U" [next]) ;; actually the `page' key ;; These won't be set up by either ("\eOm" [kp-subtract]) @@ -86,22 +86,23 @@ ;; The numeric keypad keys. (let ((i 0)) (while (< i 10) - (define-key function-key-map + (define-key local-function-key-map (format "\eO%c" (+ i ?p)) (vector (intern (format "kp-%d" i)))) (setq i (1+ i)))) ;; The numbered function keys. (let ((i 0)) (while (< i 16) - (define-key function-key-map + (define-key local-function-key-map (format "\e?%c" (+ i ?a)) (vector (intern (format "f%d" (1+ i))))) - (define-key function-key-map + (define-key local-function-key-map (format "\e?%c" (+ i ?A)) (vector (intern (format "S-f%d" (1+ i))))) (setq i (1+ i)))) (tvi970-set-keypad-mode 1)) + ;;; Should keypad numbers send ordinary digits or distinct escape sequences? (defvar tvi970-keypad-numeric nil
--- a/lisp/term/vt100.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt100.el Mon Dec 19 19:57:22 2005 +0000 @@ -38,10 +38,9 @@ ;; Set up function-key-map entries that termcap and terminfo don't know. - (defun terminal-init-vt100 () "Terminal initialization function for vt100." - (load "term/lk201" nil t)) + (terminal-init-lk201)) ;;; Controlling the screen width. (defvar vt100-wide-mode (= (frame-width) 132)
--- a/lisp/term/vt102.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt102.el Mon Dec 19 19:57:22 2005 +0000 @@ -2,7 +2,7 @@ (defun terminal-init-vt102 () "Terminal initialization function for vt102." - (load "term/vt100" nil t)) + (terminal-init-vt100)) ;;; arch-tag: 6e839cfc-125a-4574-82f1-c23a51f7c50f ;;; vt102.el ends here
--- a/lisp/term/vt125.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt125.el Mon Dec 19 19:57:22 2005 +0000 @@ -2,7 +2,7 @@ (defun terminal-init-vt125 () "Terminal initialization function for vt125." - (load "term/vt100" nil t)) + (terminal-init-vt100)) ;;; arch-tag: 1d92d70f-dd55-4a1d-9088-e215a4883801 ;;; vt125.el ends here
--- a/lisp/term/vt200.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt200.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,12 +1,11 @@ ;; -*- no-byte-compile: t -*- ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. - (defun terminal-init-vt200 () - "Terminal initialization function for vt200." - (load "term/vt100" nil t) + "Terminal initialization function for vt200." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: 0f78f583-9f32-4237-b106-28bcfff21d89 ;;; vt200.el ends here
--- a/lisp/term/vt201.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt201.el Mon Dec 19 19:57:22 2005 +0000 @@ -2,10 +2,10 @@ ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt201 () - "Terminal initialization function for vt201." - (load "term/vt100" nil t) + "Terminal initialization function for vt201." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: a6abb38f-60ea-449e-a9e9-3fb8572c52ae ;;; vt201.el ends here
--- a/lisp/term/vt220.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt220.el Mon Dec 19 19:57:22 2005 +0000 @@ -2,10 +2,10 @@ ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt220 () - "Terminal initialization function for vt220." - (load "term/vt100" nil t) + "Terminal initialization function for vt220." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871 ;;; vt220.el ends here
--- a/lisp/term/vt240.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt240.el Mon Dec 19 19:57:22 2005 +0000 @@ -2,10 +2,10 @@ ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt240 () - "Terminal initialization function for vt240." - (load "term/vt100" nil t) + "Terminal initialization function for vt240." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: d9f88e9c-02dc-49ff-871c-a415f08e4eb7 ;;; vt240.el ends here
--- a/lisp/term/vt300.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt300.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t -*- (defun terminal-init-vt300 () - "Terminal initialization function for vt300." - (load "term/vt100" nil t) + "Terminal initialization function for vt300." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f ;;; vt300.el ends here
--- a/lisp/term/vt320.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt320.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t -*- (defun terminal-init-vt320 () - "Terminal initialization function for vt320." - (load "term/vt100" nil t) + "Terminal initialization function for vt320." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: f9f4c954-0b9e-45f9-b450-a320d32abd9c ;;; vt320.el ends here
--- a/lisp/term/vt400.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt400.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t -*- (defun terminal-init-vt400 () - "Terminal initialization function for vt400." - (load "term/vt100" nil t) + "Terminal initialization function for vt400." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: a70809c5-6b21-42cc-ba20-536683e5e7d5 ;;; vt400.el ends here
--- a/lisp/term/vt420.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/vt420.el Mon Dec 19 19:57:22 2005 +0000 @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t -*- -(defun terminal-init-vt420 () - "Terminal initialization function for vt420." - (load "term/vt100" nil t) +(defun terminal-init-vt420 + "Terminal initialization function for vt420." + (terminal-init-vt100) ;; Make F11 an escape key. - (define-key function-key-map "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: df2f897c-3a12-4b3c-9259-df089f96c160 ;;; vt420.el ends here
--- a/lisp/term/wyse50.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/wyse50.el Mon Dec 19 19:57:22 2005 +0000 @@ -40,9 +40,9 @@ (defun terminal-init-wyse50 () "Terminal initialization function for wyse50." - (define-key function-key-map "\C-a" (make-keymap)) + (define-key local-function-key-map "\C-a" (make-keymap)) (mapcar (function (lambda (key-definition) - (define-key function-key-map + (define-key local-function-key-map (car key-definition) (nth 1 key-definition)))) '( ;; These might be set up by termcap and terminfo @@ -100,11 +100,11 @@ ("\eY" [key-clear]) ;; Not an X keysym ;; These are totally strange :-) - ("\eW" [?\C-?]) ;; Not an X keysym - ("\^a\^k\^m" [funct-up]) ;; Not an X keysym - ("\^a\^j\^m" [funct-down]) ;; Not an X keysym - ("\^a\^l\^m" [funct-right]) ;; Not an X keysym - ("\^a\^h\^m" [funct-left]) ;; Not an X keysym + ("\eW" [?\C-?]) ;; Not an X keysym + ("\^a\^k\^m" [funct-up]) ;; Not an X keysym + ("\^a\^j\^m" [funct-down]) ;; Not an X keysym + ("\^a\^l\^m" [funct-right]) ;; Not an X keysym + ("\^a\^h\^m" [funct-left]) ;; Not an X keysym ("\^a\^m\^m" [funct-return]) ;; Not an X keysym ("\^a\^i\^m" [funct-tab]) ;; Not an X keysym ))
--- a/lisp/term/x-win.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/x-win.el Mon Dec 19 19:57:22 2005 +0000 @@ -25,10 +25,16 @@ ;;; Commentary: -;; X-win.el: this file is loaded from ../lisp/startup.el when it recognizes -;; that X windows are to be used. Command line switches are parsed and those -;; pertaining to X are processed and removed from the command line. The -;; X display is opened and hooks are set for popping up the initial window. +;; X-win.el: this file defines functions to initialize the X window +;; system and process X-specific command line parameters before +;; creating the first X frame. + +;; Note that contrary to previous Emacs versions, the act of loading +;; this file should not have the side effect of initializing the +;; window system or processing command line arguments (this file is +;; now loaded in loadup.el). See the variables +;; `handle-args-function-alist' and +;; `window-system-initialization-alist' for more details. ;; startup.el will then examine startup files, and eventually call the hooks ;; which create the first window(s). @@ -65,7 +71,7 @@ ;; An alist of X options and the function which handles them. See ;; ../startup.el. -(if (not (eq window-system 'x)) +(if (not (fboundp 'x-create-frame)) (error "%s: Loading x-win.el but not compiled for X" (invocation-name))) (require 'frame) @@ -1163,27 +1169,26 @@ ;;;; Function keys -(substitute-key-definition 'suspend-emacs 'iconify-or-deiconify-frame - global-map) - -;; Map certain keypad keys into ASCII characters -;; that people usually expect. -(define-key function-key-map [backspace] [127]) -(define-key function-key-map [delete] [127]) -(define-key function-key-map [tab] [?\t]) -(define-key function-key-map [linefeed] [?\n]) -(define-key function-key-map [clear] [?\C-l]) -(define-key function-key-map [return] [?\C-m]) -(define-key function-key-map [escape] [?\e]) -(define-key function-key-map [M-backspace] [?\M-\d]) -(define-key function-key-map [M-delete] [?\M-\d]) -(define-key function-key-map [M-tab] [?\M-\t]) -(define-key function-key-map [M-linefeed] [?\M-\n]) -(define-key function-key-map [M-clear] [?\M-\C-l]) -(define-key function-key-map [M-return] [?\M-\C-m]) -(define-key function-key-map [M-escape] [?\M-\e]) -(define-key function-key-map [iso-lefttab] [backtab]) -(define-key function-key-map [S-iso-lefttab] [backtab]) +(defun x-setup-function-keys (frame) + "Set up `function-key-map' on FRAME for the X window system." + ;; Map certain keypad keys into ASCII characters that people usually expect. + (with-selected-frame frame + (define-key local-function-key-map [backspace] [127]) + (define-key local-function-key-map [delete] [127]) + (define-key local-function-key-map [tab] [?\t]) + (define-key local-function-key-map [linefeed] [?\n]) + (define-key local-function-key-map [clear] [?\C-l]) + (define-key local-function-key-map [return] [?\C-m]) + (define-key local-function-key-map [escape] [?\e]) + (define-key local-function-key-map [M-backspace] [?\M-\d]) + (define-key local-function-key-map [M-delete] [?\M-\d]) + (define-key local-function-key-map [M-tab] [?\M-\t]) + (define-key local-function-key-map [M-linefeed] [?\M-\n]) + (define-key local-function-key-map [M-clear] [?\M-\C-l]) + (define-key local-function-key-map [M-return] [?\M-\C-m]) + (define-key local-function-key-map [M-escape] [?\M-\e]) + (define-key local-function-key-map [iso-lefttab] [backtab]) + (define-key local-function-key-map [S-iso-lefttab] [backtab]))) ;; These tell read-char how to convert ;; these special chars to ASCII. @@ -2371,134 +2376,6 @@ (or clip-text primary-text cut-text) )) - -;; Do the actual X Windows setup here; the above code just defines -;; functions and variables that we use now. - -(setq command-line-args (x-handle-args command-line-args)) - -;; Make sure we have a valid resource name. -(or (stringp x-resource-name) - (let (i) - (setq x-resource-name (invocation-name)) - - ;; Change any . or * characters in x-resource-name to hyphens, - ;; so as not to choke when we use it in X resource queries. - (while (setq i (string-match "[.*]" x-resource-name)) - (aset x-resource-name i ?-)))) - -(x-open-connection (or x-display-name - (setq x-display-name (getenv "DISPLAY"))) - x-command-line-resources - ;; Exit Emacs with fatal error if this fails. - t) - -(setq frame-creation-function 'x-create-frame-with-faces) - -(setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) - x-cut-buffer-max)) - -;; Setup the default fontset. -(setup-default-fontset) - -;; Create the standard fontset. -(create-fontset-from-fontset-spec standard-fontset-spec t) - -;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). -(create-fontset-from-x-resource) - -;; Try to create a fontset from a font specification which comes -;; from initial-frame-alist, default-frame-alist, or X resource. -;; A font specification in command line argument (i.e. -fn XXXX) -;; should be already in default-frame-alist as a `font' -;; parameter. However, any font specifications in site-start -;; library, user's init file (.emacs), and default.el are not -;; yet handled here. - -(let ((font (or (cdr (assq 'font initial-frame-alist)) - (cdr (assq 'font default-frame-alist)) - (x-get-resource "font" "Font"))) - xlfd-fields resolved-name) - (if (and font - (not (query-fontset font)) - (setq resolved-name (x-resolve-font-name font)) - (setq xlfd-fields (x-decompose-font-name font))) - (if (string= "fontset" (aref xlfd-fields xlfd-regexp-registry-subnum)) - (new-fontset font (x-complement-fontset-spec xlfd-fields nil)) - ;; Create a fontset from FONT. The fontset name is - ;; generated from FONT. - (create-fontset-from-ascii-font font resolved-name "startup")))) - -;; Apply a geometry resource to the initial frame. Put it at the end -;; of the alist, so that anything specified on the command line takes -;; precedence. -(let* ((res-geometry (x-get-resource "geometry" "Geometry")) - parsed) - (if res-geometry - (progn - (setq parsed (x-parse-geometry res-geometry)) - ;; If the resource specifies a position, - ;; call the position and size "user-specified". - (if (or (assq 'top parsed) (assq 'left parsed)) - (setq parsed (cons '(user-position . t) - (cons '(user-size . t) parsed)))) - ;; All geometry parms apply to the initial frame. - (setq initial-frame-alist (append initial-frame-alist parsed)) - ;; The size parms apply to all frames. - (if (assq 'height parsed) - (setq default-frame-alist - (cons (cons 'height (cdr (assq 'height parsed))) - default-frame-alist))) - (if (assq 'width parsed) - (setq default-frame-alist - (cons (cons 'width (cdr (assq 'width parsed))) - default-frame-alist)))))) - -;; Check the reverseVideo resource. -(let ((case-fold-search t)) - (let ((rv (x-get-resource "reverseVideo" "ReverseVideo"))) - (if (and rv - (string-match "^\\(true\\|yes\\|on\\)$" rv)) - (setq default-frame-alist - (cons '(reverse . t) default-frame-alist))))) - -;; Set x-selection-timeout, measured in milliseconds. -(let ((res-selection-timeout - (x-get-resource "selectionTimeout" "SelectionTimeout"))) - (setq x-selection-timeout 20000) - (if res-selection-timeout - (setq x-selection-timeout (string-to-number res-selection-timeout)))) - -(defun x-win-suspend-error () - (error "Suspending an Emacs running under X makes no sense")) -(add-hook 'suspend-hook 'x-win-suspend-error) - -;; Arrange for the kill and yank functions to set and check the clipboard. -(setq interprogram-cut-function 'x-select-text) -(setq interprogram-paste-function 'x-cut-buffer-or-selection-value) - -;; Turn off window-splitting optimization; X is usually fast enough -;; that this is only annoying. -(setq split-window-keep-point t) - -;; Don't show the frame name; that's redundant with X. -(setq-default mode-line-frame-identification " ") - -;; Motif direct handling of f10 wasn't working right, -;; So temporarily we've turned it off in lwlib-Xm.c -;; and turned the Emacs f10 back on. -;; ;; Motif normally handles f10 itself, so don't try to handle it a second time. -;; (if (featurep 'motif) -;; (global-set-key [f10] 'ignore)) - -;; Turn on support for mouse wheels. -(mouse-wheel-mode 1) - - -;; Enable CLIPBOARD copy/paste through menu bar commands. -(menu-bar-enable-clipboard) - -;; Override Paste so it looks at CLIPBOARD first. (defun x-clipboard-yank () "Insert the clipboard contents, or the last stretch of killed text." (interactive) @@ -2508,9 +2385,140 @@ (kill-new clipboard-text)) (yank))) -(define-key menu-bar-edit-menu [paste] - (cons "Paste" (cons "Paste text from clipboard or kill ring" - 'x-clipboard-yank))) + +;;; Window system initialization. + +(defun x-win-suspend-error () + (error "Suspending an Emacs running under X makes no sense")) + +(defvar x-initialized nil + "Non-nil if the X window system has been initialized.") + +(defun x-initialize-window-system () + "Initialize Emacs for X frames and open the first connection to an X server." + ;; Make sure we have a valid resource name. + (or (stringp x-resource-name) + (let (i) + (setq x-resource-name (invocation-name)) + + ;; Change any . or * characters in x-resource-name to hyphens, + ;; so as not to choke when we use it in X resource queries. + (while (setq i (string-match "[.*]" x-resource-name)) + (aset x-resource-name i ?-)))) + + (x-open-connection (or x-display-name + (setq x-display-name (terminal-getenv "DISPLAY"))) + x-command-line-resources + ;; Exit Emacs with fatal error if this fails and we + ;; are the initial display. + (eq initial-window-system 'x)) + + (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) + x-cut-buffer-max)) + + ;; Setup the default fontset. + (setup-default-fontset) + + ;; Create the standard fontset. + (create-fontset-from-fontset-spec standard-fontset-spec t) + + ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). + (create-fontset-from-x-resource) + + ;; Try to create a fontset from a font specification which comes + ;; from initial-frame-alist, default-frame-alist, or X resource. + ;; A font specification in command line argument (i.e. -fn XXXX) + ;; should be already in default-frame-alist as a `font' + ;; parameter. However, any font specifications in site-start + ;; library, user's init file (.emacs), and default.el are not + ;; yet handled here. + + (let ((font (or (cdr (assq 'font initial-frame-alist)) + (cdr (assq 'font default-frame-alist)) + (x-get-resource "font" "Font"))) + xlfd-fields resolved-name) + (if (and font + (not (query-fontset font)) + (setq resolved-name (x-resolve-font-name font)) + (setq xlfd-fields (x-decompose-font-name font))) + (if (string= "fontset" (aref xlfd-fields xlfd-regexp-registry-subnum)) + (new-fontset font (x-complement-fontset-spec xlfd-fields nil)) + ;; Create a fontset from FONT. The fontset name is + ;; generated from FONT. + (create-fontset-from-ascii-font font resolved-name "startup")))) + + ;; Apply a geometry resource to the initial frame. Put it at the end + ;; of the alist, so that anything specified on the command line takes + ;; precedence. + (let* ((res-geometry (x-get-resource "geometry" "Geometry")) + parsed) + (if res-geometry + (progn + (setq parsed (x-parse-geometry res-geometry)) + ;; If the resource specifies a position, + ;; call the position and size "user-specified". + (if (or (assq 'top parsed) (assq 'left parsed)) + (setq parsed (cons '(user-position . t) + (cons '(user-size . t) parsed)))) + ;; All geometry parms apply to the initial frame. + (setq initial-frame-alist (append initial-frame-alist parsed)) + ;; The size parms apply to all frames. + (if (assq 'height parsed) + (setq default-frame-alist + (cons (cons 'height (cdr (assq 'height parsed))) + default-frame-alist))) + (if (assq 'width parsed) + (setq default-frame-alist + (cons (cons 'width (cdr (assq 'width parsed))) + default-frame-alist)))))) + + ;; Check the reverseVideo resource. + (let ((case-fold-search t)) + (let ((rv (x-get-resource "reverseVideo" "ReverseVideo"))) + (if (and rv + (string-match "^\\(true\\|yes\\|on\\)$" rv)) + (setq default-frame-alist + (cons '(reverse . t) default-frame-alist))))) + + ;; Set x-selection-timeout, measured in milliseconds. + (let ((res-selection-timeout + (x-get-resource "selectionTimeout" "SelectionTimeout"))) + (setq x-selection-timeout 20000) + (if res-selection-timeout + (setq x-selection-timeout (string-to-number res-selection-timeout)))) + + ;; Don't let Emacs suspend under X. + (add-hook 'suspend-hook 'x-win-suspend-error) + + ;; Turn off window-splitting optimization; X is usually fast enough + ;; that this is only annoying. + (setq split-window-keep-point t) + + ;; Motif direct handling of f10 wasn't working right, + ;; So temporarily we've turned it off in lwlib-Xm.c + ;; and turned the Emacs f10 back on. + ;; ;; Motif normally handles f10 itself, so don't try to handle it a second time. + ;; (if (featurep 'motif) + ;; (global-set-key [f10] 'ignore)) + + ;; Turn on support for mouse wheels. + (mouse-wheel-mode 1) + + ;; Enable CLIPBOARD copy/paste through menu bar commands. + (menu-bar-enable-clipboard) + + ;; Override Paste so it looks at CLIPBOARD first. + (define-key menu-bar-edit-menu [paste] + (cons "Paste" (cons "Paste text from clipboard or kill ring" + 'x-clipboard-yank))) + + (setq x-initialized t)) + +(add-to-list 'handle-args-function-alist '(x . x-handle-args)) +(add-to-list 'frame-creation-function-alist '(x . x-create-frame-with-faces)) +(add-to-list 'window-system-initialization-alist '(x . x-initialize-window-system)) + +(provide 'x-win) ;; Initiate drag and drop (add-hook 'after-make-frame-functions 'x-dnd-init-frame)
--- a/lisp/term/xterm.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/term/xterm.el Mon Dec 19 19:57:22 2005 +0000 @@ -26,243 +26,252 @@ ;;; Code: +(defvar xterm-function-map nil + "Function key map overrides for xterm.") + +;; Make reloads faster. +(unless xterm-function-map + (setq xterm-function-map (make-sparse-keymap)) + ;; xterm from X.org 6.8.2 uses these key definitions. + (define-key xterm-function-map "\eOP" [f1]) + (define-key xterm-function-map "\eOQ" [f2]) + (define-key xterm-function-map "\eOR" [f3]) + (define-key xterm-function-map "\eOS" [f4]) + (define-key xterm-function-map "\e[15~" [f5]) + (define-key xterm-function-map "\e[17~" [f6]) + (define-key xterm-function-map "\e[18~" [f7]) + (define-key xterm-function-map "\e[19~" [f8]) + (define-key xterm-function-map "\e[20~" [f9]) + (define-key xterm-function-map "\e[21~" [f10]) + (define-key xterm-function-map "\e[23~" [f11]) + (define-key xterm-function-map "\e[24~" [f12]) + + (define-key xterm-function-map "\eO2P" [S-f1]) + (define-key xterm-function-map "\eO2Q" [S-f2]) + (define-key xterm-function-map "\eO2R" [S-f3]) + (define-key xterm-function-map "\eO2S" [S-f4]) + (define-key xterm-function-map "\e[15;2~" [S-f5]) + (define-key xterm-function-map "\e[17;2~" [S-f6]) + (define-key xterm-function-map "\e[18;2~" [S-f7]) + (define-key xterm-function-map "\e[19;2~" [S-f8]) + (define-key xterm-function-map "\e[20;2~" [S-f9]) + (define-key xterm-function-map "\e[21;2~" [S-f10]) + (define-key xterm-function-map "\e[23;2~" [S-f11]) + (define-key xterm-function-map "\e[24;2~" [S-f12]) + + (define-key xterm-function-map "\eO5P" [C-f1]) + (define-key xterm-function-map "\eO5Q" [C-f2]) + (define-key xterm-function-map "\eO5R" [C-f3]) + (define-key xterm-function-map "\eO5S" [C-f4]) + (define-key xterm-function-map "\e[15;5~" [C-f5]) + (define-key xterm-function-map "\e[17;5~" [C-f6]) + (define-key xterm-function-map "\e[18;5~" [C-f7]) + (define-key xterm-function-map "\e[19;5~" [C-f8]) + (define-key xterm-function-map "\e[20;5~" [C-f9]) + (define-key xterm-function-map "\e[21;5~" [C-f10]) + (define-key xterm-function-map "\e[23;5~" [C-f11]) + (define-key xterm-function-map "\e[24;5~" [C-f12]) + + (define-key xterm-function-map "\eO6P" [C-S-f1]) + (define-key xterm-function-map "\eO6Q" [C-S-f2]) + (define-key xterm-function-map "\eO6R" [C-S-f3]) + (define-key xterm-function-map "\eO6S" [C-S-f4]) + (define-key xterm-function-map "\e[15;6~" [C-S-f5]) + (define-key xterm-function-map "\e[17;6~" [C-S-f6]) + (define-key xterm-function-map "\e[18;6~" [C-S-f7]) + (define-key xterm-function-map "\e[19;6~" [C-S-f8]) + (define-key xterm-function-map "\e[20;6~" [C-S-f9]) + (define-key xterm-function-map "\e[21;6~" [C-S-f10]) + (define-key xterm-function-map "\e[23;6~" [C-S-f11]) + (define-key xterm-function-map "\e[24;6~" [C-S-f12]) + + (define-key xterm-function-map "\eO3P" [A-f1]) + (define-key xterm-function-map "\eO3Q" [A-f2]) + (define-key xterm-function-map "\eO3R" [A-f3]) + (define-key xterm-function-map "\eO3S" [A-f4]) + (define-key xterm-function-map "\e[15;3~" [A-f5]) + (define-key xterm-function-map "\e[17;3~" [A-f6]) + (define-key xterm-function-map "\e[18;3~" [A-f7]) + (define-key xterm-function-map "\e[19;3~" [A-f8]) + (define-key xterm-function-map "\e[20;3~" [A-f9]) + (define-key xterm-function-map "\e[21;3~" [A-f10]) + (define-key xterm-function-map "\e[23;3~" [A-f11]) + (define-key xterm-function-map "\e[24;3~" [A-f12]) + + (define-key xterm-function-map "\eOA" [up]) + (define-key xterm-function-map "\eOB" [down]) + (define-key xterm-function-map "\eOC" [right]) + (define-key xterm-function-map "\eOD" [left]) + (define-key xterm-function-map "\eOF" [end]) + (define-key xterm-function-map "\eOH" [home]) + + (define-key xterm-function-map "\e[1;2A" [S-up]) + (define-key xterm-function-map "\e[1;2B" [S-down]) + (define-key xterm-function-map "\e[1;2C" [S-right]) + (define-key xterm-function-map "\e[1;2D" [S-left]) + (define-key xterm-function-map "\e[1;2F" [S-end]) + (define-key xterm-function-map "\e[1;2H" [S-home]) + + (define-key xterm-function-map "\e[1;5A" [C-up]) + (define-key xterm-function-map "\e[1;5B" [C-down]) + (define-key xterm-function-map "\e[1;5C" [C-right]) + (define-key xterm-function-map "\e[1;5D" [C-left]) + (define-key xterm-function-map "\e[1;5F" [C-end]) + (define-key xterm-function-map "\e[1;5H" [C-home]) + + (define-key xterm-function-map "\e[1;6A" [C-S-up]) + (define-key xterm-function-map "\e[1;6B" [C-S-down]) + (define-key xterm-function-map "\e[1;6C" [C-S-right]) + (define-key xterm-function-map "\e[1;6D" [C-S-left]) + (define-key xterm-function-map "\e[1;6F" [C-S-end]) + (define-key xterm-function-map "\e[1;6H" [C-S-home]) + + (define-key xterm-function-map "\e[1;3A" [A-up]) + (define-key xterm-function-map "\e[1;3B" [A-down]) + (define-key xterm-function-map "\e[1;3C" [A-right]) + (define-key xterm-function-map "\e[1;3D" [A-left]) + (define-key xterm-function-map "\e[1;3F" [A-end]) + (define-key xterm-function-map "\e[1;3H" [A-home]) + + (define-key xterm-function-map "\e[2~" [insert]) + (define-key xterm-function-map "\e[3~" [delete]) + (define-key xterm-function-map "\e[5~" [prior]) + (define-key xterm-function-map "\e[6~" [next]) + + (define-key xterm-function-map "\e[2;2~" [S-insert]) + (define-key xterm-function-map "\e[3;2~" [S-delete]) + (define-key xterm-function-map "\e[5;2~" [S-prior]) + (define-key xterm-function-map "\e[6;2~" [S-next]) + + (define-key xterm-function-map "\e[2;5~" [C-insert]) + (define-key xterm-function-map "\e[3;5~" [C-delete]) + (define-key xterm-function-map "\e[5;5~" [C-prior]) + (define-key xterm-function-map "\e[6;5~" [C-next]) + + (define-key xterm-function-map "\e[2;6~" [C-S-insert]) + (define-key xterm-function-map "\e[3;6~" [C-S-delete]) + (define-key xterm-function-map "\e[5;6~" [C-S-prior]) + (define-key xterm-function-map "\e[6;6~" [C-S-next]) + + (define-key xterm-function-map "\e[2;3~" [A-insert]) + (define-key xterm-function-map "\e[3;3~" [A-delete]) + (define-key xterm-function-map "\e[5;3~" [A-prior]) + (define-key xterm-function-map "\e[6;3~" [A-next]) + + (define-key xterm-function-map "\e[4~" [select]) + (define-key xterm-function-map "\e[29~" [print]) + + ;; Other versions of xterm might emit these. + (define-key xterm-function-map "\e[A" [up]) + (define-key xterm-function-map "\e[B" [down]) + (define-key xterm-function-map "\e[C" [right]) + (define-key xterm-function-map "\e[D" [left]) + (define-key xterm-function-map "\e[1~" [home]) + + (define-key xterm-function-map "\e[1;2A" [S-up]) + (define-key xterm-function-map "\e[1;2B" [S-down]) + (define-key xterm-function-map "\e[1;2C" [S-right]) + (define-key xterm-function-map "\e[1;2D" [S-left]) + (define-key xterm-function-map "\e[1;2F" [S-end]) + (define-key xterm-function-map "\e[1;2H" [S-home]) + + (define-key xterm-function-map "\e[1;5A" [C-up]) + (define-key xterm-function-map "\e[1;5B" [C-down]) + (define-key xterm-function-map "\e[1;5C" [C-right]) + (define-key xterm-function-map "\e[1;5D" [C-left]) + (define-key xterm-function-map "\e[1;5F" [C-end]) + (define-key xterm-function-map "\e[1;5H" [C-home]) + + (define-key xterm-function-map "\e[11~" [f1]) + (define-key xterm-function-map "\e[12~" [f2]) + (define-key xterm-function-map "\e[13~" [f3]) + (define-key xterm-function-map "\e[14~" [f4])) + (defun terminal-init-xterm () "Terminal initialization function for xterm." ;; rxvt terminals sometimes set the TERM variable to "xterm", but ;; rxvt's keybindings that are incompatible with xterm's. It is ;; better in that case to use rxvt's initializion function. - (if (and (getenv "COLORTERM") - (string-match "\\`rxvt" (getenv "COLORTERM"))) - (progn + (if (and (terminal-getenv "COLORTERM") + (string-match "\\`rxvt" (terminal-getenv "COLORTERM"))) + (progn (eval-and-compile (load "term/rxvt")) (terminal-init-rxvt)) - ;; The terminal intialization C code file might have initialized - ;; function keys F13->F60 from the termcap/terminfo information. On - ;; a PC-style keyboard these keys correspond to - ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The - ;; code here subsitutes the corresponding defintions in - ;; function-key-map. This substitution is needed because if a key - ;; definition if found in function-key-map, there are no further - ;; lookups in other keymaps. - (substitute-key-definition [f13] [S-f1] function-key-map) - (substitute-key-definition [f14] [S-f2] function-key-map) - (substitute-key-definition [f15] [S-f3] function-key-map) - (substitute-key-definition [f16] [S-f4] function-key-map) - (substitute-key-definition [f17] [S-f5] function-key-map) - (substitute-key-definition [f18] [S-f6] function-key-map) - (substitute-key-definition [f19] [S-f7] function-key-map) - (substitute-key-definition [f20] [S-f8] function-key-map) - (substitute-key-definition [f21] [S-f9] function-key-map) - (substitute-key-definition [f22] [S-f10] function-key-map) - (substitute-key-definition [f23] [S-f11] function-key-map) - (substitute-key-definition [f24] [S-f12] function-key-map) - - (substitute-key-definition [f25] [C-f1] function-key-map) - (substitute-key-definition [f26] [C-f2] function-key-map) - (substitute-key-definition [f27] [C-f3] function-key-map) - (substitute-key-definition [f28] [C-f4] function-key-map) - (substitute-key-definition [f29] [C-f5] function-key-map) - (substitute-key-definition [f30] [C-f6] function-key-map) - (substitute-key-definition [f31] [C-f7] function-key-map) - (substitute-key-definition [f32] [C-f8] function-key-map) - (substitute-key-definition [f33] [C-f9] function-key-map) - (substitute-key-definition [f34] [C-f10] function-key-map) - (substitute-key-definition [f35] [C-f11] function-key-map) - (substitute-key-definition [f36] [C-f12] function-key-map) - - (substitute-key-definition [f37] [C-S-f1] function-key-map) - (substitute-key-definition [f38] [C-S-f2] function-key-map) - (substitute-key-definition [f39] [C-S-f3] function-key-map) - (substitute-key-definition [f40] [C-S-f4] function-key-map) - (substitute-key-definition [f41] [C-S-f5] function-key-map) - (substitute-key-definition [f42] [C-S-f6] function-key-map) - (substitute-key-definition [f43] [C-S-f7] function-key-map) - (substitute-key-definition [f44] [C-S-f8] function-key-map) - (substitute-key-definition [f45] [C-S-f9] function-key-map) - (substitute-key-definition [f46] [C-S-f10] function-key-map) - (substitute-key-definition [f47] [C-S-f11] function-key-map) - (substitute-key-definition [f48] [C-S-f12] function-key-map) - - (substitute-key-definition [f49] [A-f1] function-key-map) - (substitute-key-definition [f50] [A-f2] function-key-map) - (substitute-key-definition [f51] [A-f3] function-key-map) - (substitute-key-definition [f52] [A-f4] function-key-map) - (substitute-key-definition [f53] [A-f5] function-key-map) - (substitute-key-definition [f54] [A-f6] function-key-map) - (substitute-key-definition [f55] [A-f7] function-key-map) - (substitute-key-definition [f56] [A-f8] function-key-map) - (substitute-key-definition [f57] [A-f9] function-key-map) - (substitute-key-definition [f58] [A-f10] function-key-map) - (substitute-key-definition [f59] [A-f11] function-key-map) - (substitute-key-definition [f60] [A-f12] function-key-map) - - (let ((map (make-sparse-keymap))) - ;; xterm from X.org 6.8.2 uses these key definitions. - (define-key map "\eOP" [f1]) - (define-key map "\eOQ" [f2]) - (define-key map "\eOR" [f3]) - (define-key map "\eOS" [f4]) - (define-key map "\e[15~" [f5]) - (define-key map "\e[17~" [f6]) - (define-key map "\e[18~" [f7]) - (define-key map "\e[19~" [f8]) - (define-key map "\e[20~" [f9]) - (define-key map "\e[21~" [f10]) - (define-key map "\e[23~" [f11]) - (define-key map "\e[24~" [f12]) - - (define-key map "\eO2P" [S-f1]) - (define-key map "\eO2Q" [S-f2]) - (define-key map "\eO2R" [S-f3]) - (define-key map "\eO2S" [S-f4]) - (define-key map "\e[15;2~" [S-f5]) - (define-key map "\e[17;2~" [S-f6]) - (define-key map "\e[18;2~" [S-f7]) - (define-key map "\e[19;2~" [S-f8]) - (define-key map "\e[20;2~" [S-f9]) - (define-key map "\e[21;2~" [S-f10]) - (define-key map "\e[23;2~" [S-f11]) - (define-key map "\e[24;2~" [S-f12]) - - (define-key map "\eO5P" [C-f1]) - (define-key map "\eO5Q" [C-f2]) - (define-key map "\eO5R" [C-f3]) - (define-key map "\eO5S" [C-f4]) - (define-key map "\e[15;5~" [C-f5]) - (define-key map "\e[17;5~" [C-f6]) - (define-key map "\e[18;5~" [C-f7]) - (define-key map "\e[19;5~" [C-f8]) - (define-key map "\e[20;5~" [C-f9]) - (define-key map "\e[21;5~" [C-f10]) - (define-key map "\e[23;5~" [C-f11]) - (define-key map "\e[24;5~" [C-f12]) + ;; The terminal-local stuff only need to be set up on the first + ;; frame on that device. + (when (eq 1 (length (frames-on-display-list))) + ;; The terminal intialization C code file might have initialized + ;; function keys F13->F60 from the termcap/terminfo information. On + ;; a PC-style keyboard these keys correspond to + ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The + ;; code here subsitutes the corresponding defintions in + ;; function-key-map. This substitution is needed because if a key + ;; definition if found in function-key-map, there are no further + ;; lookups in other keymaps. + (substitute-key-definition [f13] [S-f1] local-function-key-map) + (substitute-key-definition [f14] [S-f2] local-function-key-map) + (substitute-key-definition [f15] [S-f3] local-function-key-map) + (substitute-key-definition [f16] [S-f4] local-function-key-map) + (substitute-key-definition [f17] [S-f5] local-function-key-map) + (substitute-key-definition [f18] [S-f6] local-function-key-map) + (substitute-key-definition [f19] [S-f7] local-function-key-map) + (substitute-key-definition [f20] [S-f8] local-function-key-map) + (substitute-key-definition [f21] [S-f9] local-function-key-map) + (substitute-key-definition [f22] [S-f10] local-function-key-map) + (substitute-key-definition [f23] [S-f11] local-function-key-map) + (substitute-key-definition [f24] [S-f12] local-function-key-map) - (define-key map "\eO6P" [C-S-f1]) - (define-key map "\eO6Q" [C-S-f2]) - (define-key map "\eO6R" [C-S-f3]) - (define-key map "\eO6S" [C-S-f4]) - (define-key map "\e[15;6~" [C-S-f5]) - (define-key map "\e[17;6~" [C-S-f6]) - (define-key map "\e[18;6~" [C-S-f7]) - (define-key map "\e[19;6~" [C-S-f8]) - (define-key map "\e[20;6~" [C-S-f9]) - (define-key map "\e[21;6~" [C-S-f10]) - (define-key map "\e[23;6~" [C-S-f11]) - (define-key map "\e[24;6~" [C-S-f12]) - - (define-key map "\eO3P" [A-f1]) - (define-key map "\eO3Q" [A-f2]) - (define-key map "\eO3R" [A-f3]) - (define-key map "\eO3S" [A-f4]) - (define-key map "\e[15;3~" [A-f5]) - (define-key map "\e[17;3~" [A-f6]) - (define-key map "\e[18;3~" [A-f7]) - (define-key map "\e[19;3~" [A-f8]) - (define-key map "\e[20;3~" [A-f9]) - (define-key map "\e[21;3~" [A-f10]) - (define-key map "\e[23;3~" [A-f11]) - (define-key map "\e[24;3~" [A-f12]) - - (define-key map "\eOA" [up]) - (define-key map "\eOB" [down]) - (define-key map "\eOC" [right]) - (define-key map "\eOD" [left]) - (define-key map "\eOF" [end]) - (define-key map "\eOH" [home]) - - (define-key map "\e[1;2A" [S-up]) - (define-key map "\e[1;2B" [S-down]) - (define-key map "\e[1;2C" [S-right]) - (define-key map "\e[1;2D" [S-left]) - (define-key map "\e[1;2F" [S-end]) - (define-key map "\e[1;2H" [S-home]) - - (define-key map "\e[1;5A" [C-up]) - (define-key map "\e[1;5B" [C-down]) - (define-key map "\e[1;5C" [C-right]) - (define-key map "\e[1;5D" [C-left]) - (define-key map "\e[1;5F" [C-end]) - (define-key map "\e[1;5H" [C-home]) - - (define-key map "\e[1;6A" [C-S-up]) - (define-key map "\e[1;6B" [C-S-down]) - (define-key map "\e[1;6C" [C-S-right]) - (define-key map "\e[1;6D" [C-S-left]) - (define-key map "\e[1;6F" [C-S-end]) - (define-key map "\e[1;6H" [C-S-home]) + (substitute-key-definition [f25] [C-f1] local-function-key-map) + (substitute-key-definition [f26] [C-f2] local-function-key-map) + (substitute-key-definition [f27] [C-f3] local-function-key-map) + (substitute-key-definition [f28] [C-f4] local-function-key-map) + (substitute-key-definition [f29] [C-f5] local-function-key-map) + (substitute-key-definition [f30] [C-f6] local-function-key-map) + (substitute-key-definition [f31] [C-f7] local-function-key-map) + (substitute-key-definition [f32] [C-f8] local-function-key-map) + (substitute-key-definition [f33] [C-f9] local-function-key-map) + (substitute-key-definition [f34] [C-f10] local-function-key-map) + (substitute-key-definition [f35] [C-f11] local-function-key-map) + (substitute-key-definition [f36] [C-f12] local-function-key-map) - (define-key map "\e[1;3A" [A-up]) - (define-key map "\e[1;3B" [A-down]) - (define-key map "\e[1;3C" [A-right]) - (define-key map "\e[1;3D" [A-left]) - (define-key map "\e[1;3F" [A-end]) - (define-key map "\e[1;3H" [A-home]) - - (define-key map "\e[2~" [insert]) - (define-key map "\e[3~" [delete]) - (define-key map "\e[5~" [prior]) - (define-key map "\e[6~" [next]) - - (define-key map "\e[2;2~" [S-insert]) - (define-key map "\e[3;2~" [S-delete]) - (define-key map "\e[5;2~" [S-prior]) - (define-key map "\e[6;2~" [S-next]) - - (define-key map "\e[2;5~" [C-insert]) - (define-key map "\e[3;5~" [C-delete]) - (define-key map "\e[5;5~" [C-prior]) - (define-key map "\e[6;5~" [C-next]) - - (define-key map "\e[2;6~" [C-S-insert]) - (define-key map "\e[3;6~" [C-S-delete]) - (define-key map "\e[5;6~" [C-S-prior]) - (define-key map "\e[6;6~" [C-S-next]) + (substitute-key-definition [f37] [C-S-f1] local-function-key-map) + (substitute-key-definition [f38] [C-S-f2] local-function-key-map) + (substitute-key-definition [f39] [C-S-f3] local-function-key-map) + (substitute-key-definition [f40] [C-S-f4] local-function-key-map) + (substitute-key-definition [f41] [C-S-f5] local-function-key-map) + (substitute-key-definition [f42] [C-S-f6] local-function-key-map) + (substitute-key-definition [f43] [C-S-f7] local-function-key-map) + (substitute-key-definition [f44] [C-S-f8] local-function-key-map) + (substitute-key-definition [f45] [C-S-f9] local-function-key-map) + (substitute-key-definition [f46] [C-S-f10] local-function-key-map) + (substitute-key-definition [f47] [C-S-f11] local-function-key-map) + (substitute-key-definition [f48] [C-S-f12] local-function-key-map) - (define-key map "\e[2;3~" [A-insert]) - (define-key map "\e[3;3~" [A-delete]) - (define-key map "\e[5;3~" [A-prior]) - (define-key map "\e[6;3~" [A-next]) - - (define-key map "\e[4~" [select]) - (define-key map "\e[29~" [print]) - - ;; Other versions of xterm might emit these. - (define-key map "\e[A" [up]) - (define-key map "\e[B" [down]) - (define-key map "\e[C" [right]) - (define-key map "\e[D" [left]) - (define-key map "\e[1~" [home]) - - (define-key map "\eO2A" [S-up]) - (define-key map "\eO2B" [S-down]) - (define-key map "\eO2C" [S-right]) - (define-key map "\eO2D" [S-left]) - (define-key map "\eO2F" [S-end]) - (define-key map "\eO2H" [S-home]) - - (define-key map "\eO5A" [C-up]) - (define-key map "\eO5B" [C-down]) - (define-key map "\eO5C" [C-right]) - (define-key map "\eO5D" [C-left]) - (define-key map "\eO5F" [C-end]) - (define-key map "\eO5H" [C-home]) - - (define-key map "\e[11~" [f1]) - (define-key map "\e[12~" [f2]) - (define-key map "\e[13~" [f3]) - (define-key map "\e[14~" [f4]) + (substitute-key-definition [f49] [A-f1] local-function-key-map) + (substitute-key-definition [f50] [A-f2] local-function-key-map) + (substitute-key-definition [f51] [A-f3] local-function-key-map) + (substitute-key-definition [f52] [A-f4] local-function-key-map) + (substitute-key-definition [f53] [A-f5] local-function-key-map) + (substitute-key-definition [f54] [A-f6] local-function-key-map) + (substitute-key-definition [f55] [A-f7] local-function-key-map) + (substitute-key-definition [f56] [A-f8] local-function-key-map) + (substitute-key-definition [f57] [A-f9] local-function-key-map) + (substitute-key-definition [f58] [A-f10] local-function-key-map) + (substitute-key-definition [f59] [A-f11] local-function-key-map) + (substitute-key-definition [f60] [A-f12] local-function-key-map)) ;; Use inheritance to let the main keymap override those defaults. ;; This way we don't override terminfo-derived settings or settings ;; made in the .emacs file. - (set-keymap-parent map (keymap-parent function-key-map)) - (set-keymap-parent function-key-map map)) + (let ((m (copy-keymap xterm-function-map))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m))) ;; Do it! (xterm-register-default-colors) ;; This recomputes all the default faces given the colors we've just set up. - (tty-set-up-initial-frame-faces))) + (tty-set-up-initial-frame-faces)) ;; Set up colors, for those versions of xterm that support it. (defvar xterm-standard-colors @@ -299,7 +308,7 @@ `xterm-standard-colors', which see, while the rest are computed assuming either the 88- or 256-color standard color scheme supported by latest versions of xterm." - (let* ((ncolors (display-color-cells)) + (let* ((ncolors (display-color-cells (selected-frame))) (colors xterm-standard-colors) (color (car colors))) (if (> ncolors 0)
--- a/lisp/version.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/version.el Mon Dec 19 19:57:22 2005 +0000 @@ -27,7 +27,7 @@ ;;; Code: -(defconst emacs-version "22.0.50" "\ +(defconst emacs-version "22.0.51" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version @@ -55,8 +55,8 @@ (interactive "P") (let ((version-string (format (if (not (interactive-p)) - "GNU Emacs %s (%s%s%s)\n of %s on %s" - "GNU Emacs %s (%s%s%s) of %s on %s") + "GNU Emacs %s (%s%s%s%s)\n of %s on %s" + "GNU Emacs %s (%s%s%s%s) of %s on %s") emacs-version system-configuration (cond ((featurep 'motif) @@ -70,6 +70,7 @@ (format ", %s scroll bars" (capitalize (symbol-name x-toolkit-scroll-bars))) "") + (if (featurep 'multi-tty) ", multi-tty" "") (format-time-string "%Y-%m-%d" emacs-build-time) emacs-build-system))) (if here
--- a/lisp/x-dnd.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/x-dnd.el Mon Dec 19 19:57:22 2005 +0000 @@ -121,8 +121,9 @@ (defun x-dnd-init-frame (&optional frame) "Setup drag and drop for FRAME (i.e. create appropriate properties)." - (x-dnd-init-xdnd-for-frame frame) - (x-dnd-init-motif-for-frame frame)) + (when (eq 'x (window-system frame)) + (x-dnd-init-xdnd-for-frame frame) + (x-dnd-init-motif-for-frame frame))) (defun x-dnd-get-state-cons-for-frame (frame-or-window) "Return the entry in x-dnd-current-state for a frame or window."
--- a/lisp/xt-mouse.el Sat Dec 17 21:41:34 2005 +0000 +++ b/lisp/xt-mouse.el Mon Dec 19 19:57:22 2005 +0000 @@ -46,6 +46,7 @@ ;;; Code: +;; XXX Perhaps this should be terminal-local instead. --lorentey (define-key function-key-map "\e[M" 'xterm-mouse-translate) (defvar xterm-mouse-last) @@ -102,17 +103,21 @@ (vector (list down-where down-data) down) (vector down)))))))) -(defvar xterm-mouse-x 0 - "Position of last xterm mouse event relative to the frame.") - -(defvar xterm-mouse-y 0 - "Position of last xterm mouse event relative to the frame.") +;; These two variables have been converted to terminal parameters. +;; +;;(defvar xterm-mouse-x 0 +;; "Position of last xterm mouse event relative to the frame.") +;; +;;(defvar xterm-mouse-y 0 +;; "Position of last xterm mouse event relative to the frame.") ;; Indicator for the xterm-mouse mode. (defun xterm-mouse-position-function (pos) "Bound to `mouse-position-function' in XTerm mouse mode." - (setcdr pos (cons xterm-mouse-x xterm-mouse-y)) + (when (terminal-parameter nil 'xterm-mouse-x) + (setcdr pos (cons (terminal-parameter nil 'xterm-mouse-x) + (terminal-parameter nil 'xterm-mouse-y)))) pos) ;; read xterm sequences above ascii 127 (#x7f) @@ -144,8 +149,8 @@ (left (nth 0 ltrb)) (top (nth 1 ltrb))) - (setq xterm-mouse-x x - xterm-mouse-y y) + (set-terminal-parameter nil 'xterm-mouse-x x) + (set-terminal-parameter nil 'xterm-mouse-y y) (setq last-input-event (if w @@ -167,7 +172,7 @@ :global t :group 'mouse (if xterm-mouse-mode ;; Turn it on - (unless window-system + (progn (setq mouse-position-function #'xterm-mouse-position-function) (turn-on-xterm-mouse-tracking)) ;; Turn it off @@ -176,15 +181,43 @@ (defun turn-on-xterm-mouse-tracking () "Enable Emacs mouse tracking in xterm." - (if xterm-mouse-mode - (send-string-to-terminal "\e[?1000h"))) + (dolist (f (frame-list)) + (when (eq t (frame-live-p f)) + (with-selected-frame f + (when xterm-mouse-mode + (send-string-to-terminal "\e[?1000h")))))) (defun turn-off-xterm-mouse-tracking (&optional force) "Disable Emacs mouse tracking in xterm." - (if (or force xterm-mouse-mode) - (send-string-to-terminal "\e[?1000l"))) + (dolist (f (frame-list)) + (when (eq t (frame-live-p f)) + (with-selected-frame f + (when (or force xterm-mouse-mode) + (send-string-to-terminal "\e[?1000l")))))) + +(defun turn-on-xterm-mouse-tracking-on-terminal (terminal) + "Enable xterm mouse tracking on TERMINAL." + (when (and xterm-mouse-mode (eq t (display-live-p terminal))) + (send-string-to-terminal "\e[?1000h" terminal))) + +(defun turn-off-xterm-mouse-tracking-on-terminal (terminal) + "Disable xterm mouse tracking on TERMINAL." + (when (and xterm-mouse-mode (eq t (display-live-p terminal))) + (send-string-to-terminal "\e[?1000l" terminal))) + +(defun xterm-mouse-handle-delete-frame (frame) + "Turn off xterm mouse tracking if FRAME is the last frame on its device." + (when (and (eq t (frame-live-p frame)) + (<= 1 (length (frames-on-display-list (frame-display frame))))) + (turn-off-xterm-mouse-tracking-on-terminal frame))) + +;; Frame creation and deletion. +(add-hook 'after-make-frame-functions 'turn-on-xterm-mouse-tracking-on-terminal) +(add-hook 'delete-frame-functions 'xterm-mouse-handle-delete-frame) ;; Restore normal mouse behaviour outside Emacs. +(add-hook 'suspend-tty-functions 'turn-off-xterm-mouse-tracking-on-terminal) +(add-hook 'resume-tty-functions 'turn-on-xterm-mouse-tracking-on-terminal) (add-hook 'suspend-hook 'turn-off-xterm-mouse-tracking) (add-hook 'suspend-resume-hook 'turn-on-xterm-mouse-tracking) (add-hook 'kill-emacs-hook 'turn-off-xterm-mouse-tracking)
--- a/lispref/elisp-covers.texi Sat Dec 17 21:41:34 2005 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ -\input texinfo @c -*-texinfo-*- -@comment %**start of header -@setfilename covers.info -@settitle GNU Emacs Lisp Reference Manual -@comment %**end of header - -@titlepage -@c ================ Volume 1 ================ -@w{ } -@sp 2 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 1} -@sp 2 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - -@page -@c ================ Volume 2 ================ -@w{ } -@sp 5 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 2} -@sp 2 -@center by Bil Lewis, -@center Dan LaLiberte, and -@center the GNU Manual Group - -@page -@c ================ Volume 1 with baseline skip 16pt ================ - -@tex -\global\baselineskip = 16pt -@end tex - -16 pts baseline skip: - -@w{ } -@sp 2 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 1} -@sp 2 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - -@page -@c ================ Volume 1 with baseline skip 18pt ================ - -@tex -\global\baselineskip = 18pt -@end tex - -18 pts baseline skip, with 15pts between sections - -@w{ } -@sp 2 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@tex -\global\baselineskip = 15pt -@end tex - -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 1} -@sp 2 -@center by Bil Lewis, -@center Dan LaLiberte, and -@center the GNU Manual Group - -@page -@c ================ Volume 1 with more baseline skip 24 pts ================ - -@tex -\global\baselineskip = 24pt -@end tex - -24 pts baseline skip: - -@w{ } -@sp 2 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 1} -@sp 2 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - -@page -@c ================ Volume 2 with more baseline skip 18 pts ================ - -@tex -\global\baselineskip = 18pt -@end tex - -18 pts baseline skip: - -@w{ } -@sp 5 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 2} -@sp 2 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - -@page -@c ================ Volume 2 with more baseline skip 24 pts ================ - -@tex -\global\baselineskip = 24pt -@end tex - -24 pts baseline skip: - -@w{ } -@sp 5 -@center @titlefont{The} -@sp 1 -@center @titlefont{GNU} -@sp 1 -@center @titlefont{Emacs Lisp} -@sp 1 -@center @titlefont{Reference} -@sp 1 -@center @titlefont{Manual} -@sp 2 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 2 -@center @titlefont{Volume 2} -@sp 2 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - - -@page -@c ================ Spine 1 ================ - -@w{@titlefont{The GNU Emacs Lisp Reference Manual --- Vol. 1}} -@sp 4 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 4 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - -@sp 4 -@author The GNU Emacs Lisp Reference Manual --- Vol. 1 -@sp 3 -@author FSF - -@author - -@page -@c ================ Spine 2 ================ - -@w{@titlefont{The GNU Emacs Lisp Reference Manual --- Vol. 2}} -@sp 4 -@center GNU Emacs Version 19 -@center for Unix Users -@center Edition 2.3, June 1994 -@sp 4 -@center by Bil Lewis, Dan LaLiberte, -@center and the GNU Manual Group - - -@sp 4 -@author The GNU Emacs Lisp Reference Manual --- Vol. 2 -@sp 3 -@author FSF - -@end titlepage -@bye - -@ignore - arch-tag: 02d65d63-3b64-49bc-a5c0-bfd5eabb6c98 -@end ignore
--- a/lispref/elisp.texi Sat Dec 17 21:41:34 2005 +0000 +++ b/lispref/elisp.texi Mon Dec 19 19:57:22 2005 +0000 @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.50 +@set EMACSVER 22.0.51 @dircategory Emacs @direntry
--- a/mac/makefile.MPW Sat Dec 17 21:41:34 2005 +0000 +++ b/mac/makefile.MPW Mon Dec 19 19:57:22 2005 +0000 @@ -1007,6 +1007,7 @@ {Lisp}abbrev.elc ¶ {Lisp}buff-menu.elc ¶ {Lisp}button.elc ¶ + {Lisp}server.elc ¶ {Lisp}emacs-lisp:byte-run.elc ¶ {Lisp}cus-face.elc ¶ {Lisp}cus-start.elc ¶
--- a/man/cc-mode.texi Sat Dec 17 21:41:34 2005 +0000 +++ b/man/cc-mode.texi Mon Dec 19 19:57:22 2005 +0000 @@ -208,7 +208,7 @@ @vskip 0pt plus 1filll @insertcopying -This manual was generated from $Revision: 5.241 $ of $RCSfile: cc-mode.texi,v $, which can be +This manual was generated from $Revision: 1.32 $ of $RCSfile: cc-mode.texi,v $, which can be downloaded from @url{http://cvs.sf.net/viewcvs.py/cc-mode/cc-mode/cc-mode.texi}. @end titlepage
--- a/man/emacs.texi Sat Dec 17 21:41:34 2005 +0000 +++ b/man/emacs.texi Mon Dec 19 19:57:22 2005 +0000 @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Fourteenth -@set EMACSVER 22.0.50 +@set EMACSVER 22.0.51 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
--- a/src/.arch-inventory Sat Dec 17 21:41:34 2005 +0000 +++ b/src/.arch-inventory Mon Dec 19 19:57:22 2005 +0000 @@ -2,8 +2,10 @@ source ^\.(gdbinit|dbxinit)$ # Auto-generated files, which ignore -precious ^(config\.stamp|config\.h|epaths\.h)$ +precious ^(config\.stamp|config\.h|epaths\.h|TAGS-LISP)$ +precious ^(buildobj\.lst)$ backup ^(stamp-oldxmenu|prefix-args|temacs|emacs|emacs-[0-9.]*)$ +backup ^(bootstrap-emacs)$ # arch-tag: 277cc7ae-b3f5-44af-abf1-84c073164543
--- a/src/.gdbinit Sat Dec 17 21:41:34 2005 +0000 +++ b/src/.gdbinit Mon Dec 19 19:57:22 2005 +0000 @@ -762,7 +762,7 @@ show environment DISPLAY show environment TERM -set args -geometry 80x40+0+0 +#set args -geometry 80x40+0+0 # Don't let abort actually run, as it will make # stdio stop working and therefore the `pr' command above as well.
--- a/src/Makefile.in Sat Dec 17 21:41:34 2005 +0000 +++ b/src/Makefile.in Mon Dec 19 19:57:22 2005 +0000 @@ -705,6 +705,7 @@ lisp= \ ${lispsource}abbrev.elc \ ${lispsource}buff-menu.elc \ + ${lispsource}server.elc \ ${lispsource}button.elc \ ${lispsource}emacs-lisp/byte-run.elc \ ${lispsource}cus-face.elc \ @@ -803,6 +804,7 @@ shortlisp= \ ../lisp/abbrev.elc \ ../lisp/buff-menu.elc \ + ../lisp/server.elc \ ../lisp/button.elc \ ../lisp/emacs-lisp/byte-run.elc \ ../lisp/cus-face.elc \ @@ -902,7 +904,10 @@ ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \ ${dotdot}/lisp/tooltip.elc \ ${dotdot}/lisp/international/ccl.elc \ - ${dotdot}/lisp/international/codepage.elc + ${dotdot}/lisp/international/codepage.elc \ + ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \ + ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/x-dnd.elc \ + ${dotdot}/lisp/term/x-win.elc /* Construct full set of libraries to be linked. Note that SunOS needs -lm to come before -lc; otherwise, you get @@ -948,7 +953,7 @@ for the first time, this prevents any variation between configurations in the contents of the DOC file. Likewise for ${SOME_MACHINE_LISP}. */ -${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${shortlisp} ${SOME_MACHINE_LISP} +${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${SOME_MACHINE_LISP} -rm -f ${etc}DOC ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} @@ -1080,8 +1085,8 @@ charset.o: charset.c charset.h buffer.h coding.h composite.h disptab.h \ $(config_h) coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h \ - window.h dispextern.h $(config_h) -cm.o: cm.c cm.h termhooks.h $(config_h) + window.h dispextern.h frame.h termhooks.h $(config_h) +cm.o: cm.c frame.h cm.h termhooks.h termchar.h $(config_h) cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \ msdos.h dispextern.h keyboard.h keymap.h pre-crt0.o: pre-crt0.c @@ -1089,7 +1094,7 @@ CRT0_COMPILE ${srcdir}/ecrt0.c dired.o: dired.c commands.h buffer.h $(config_h) charset.h coding.h regex.h \ systime.h -dispnew.o: dispnew.c systty.h systime.h commands.h process.h frame.h \ +dispnew.o: dispnew.c systime.h commands.h process.h frame.h \ window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \ disptab.h indent.h intervals.h \ xterm.h blockinput.h atimer.h charset.h msdos.h composite.h keyboard.h \ @@ -1104,15 +1109,15 @@ termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \ window.h dispextern.h keyboard.h keymap.h fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h msdos.h dispextern.h $(config_h) + coding.h ccl.h msdos.h dispextern.h $(config_h) filelock.o: filelock.c buffer.h charset.h coding.h systime.h epaths.h $(config_h) filemode.o: filemode.c $(config_h) frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ blockinput.h atimer.h systime.h buffer.h charset.h fontset.h \ - msdos.h dosfns.h dispextern.h w32term.h macterm.h $(config_h) -fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) + msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h) +fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ - keyboard.h $(config_h) + keyboard.h termhooks.h $(config_h) getloadavg.o: getloadavg.c $(config_h) image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h) @@ -1123,7 +1128,7 @@ dispextern.h atimer.h systime.h region-cache.h $(config_h) keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \ commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ - systty.h systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \ + systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \ atimer.h xterm.h puresize.h msdos.h keymap.h w32term.h macterm.h $(config_h) keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ atimer.h systime.h puresize.h charset.h intervals.h $(config_h) @@ -1137,7 +1142,8 @@ marker.o: marker.c buffer.h charset.h $(config_h) md5.o: md5.c md5.h $(config_h) minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \ - buffer.h commands.h charset.h msdos.h $(INTERVAL_SRC) keymap.h $(config_h) + buffer.h commands.h charset.h msdos.h $(INTERVAL_SRC) keymap.h \ + termhooks.h $(config_h) mktime.o: mktime.c $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \ @@ -1149,7 +1155,7 @@ regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h charset.h region-cache.o: region-cache.c buffer.h region-cache.h $(config_h) scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \ - $(config_h) + termhooks.h $(config_h) search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \ blockinput.h atimer.h systime.h category.h charset.h composite.h \ $(INTERVAL_SRC) $(config_h) @@ -1158,7 +1164,7 @@ composite.h keymap.h regex.h $(INTERVAL_SRC) $(config_h) sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \ process.h dispextern.h termhooks.h termchar.h termopts.h \ - frame.h atimer.h window.h msdos.h dosfns.h keyboard.h $(config_h) + frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.h $(config_h) term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \ disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h \ window.h keymap.h @@ -1175,7 +1181,7 @@ widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \ $(srcdir)/../lwlib/lwlib.h $(config_h) window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ - termhooks.h disptab.h keyboard.h dispextern.h msdos.h composite.h \ + disptab.h keyboard.h dispextern.h msdos.h composite.h \ keymap.h blockinput.h $(INTERVAL_SRC) xterm.h w32term.h macterm.h $(config_h) xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h coding.h \ termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \ @@ -1183,10 +1189,11 @@ msdos.h composite.h fontset.h blockinput.h atimer.h systime.h keymap.h xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ window.h charset.h msdos.h dosfns.h composite.h atimer.h systime.h \ - keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) $(config_h) + keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) termchar.h \ + termhooks.h $(config_h) xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \ - charset.h gtkutil.h $(config_h) + charset.h gtkutil.h termchar.h termhooks.h $(config_h) xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h \ gtkutil.h msdos.h coding.h $(config_h) @@ -1195,7 +1202,7 @@ keyboard.h gnu.h charset.h ccl.h fontset.h composite.h \ coding.h process.h gtkutil.h $(config_h) xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ - buffer.h atimer.h systime.h $(config_h) + buffer.h atimer.h systime.h termhooks.h $(config_h) xrdb.o: xrdb.c $(config_h) epaths.h xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ lisp.h termopts.h @@ -1212,15 +1219,16 @@ blockinput.h atimer.h systime.h charset.h dispextern.h $(config_h) $(INTERVAL_SRC) bytecode.o: bytecode.c buffer.h syntax.h charset.h window.h dispextern.h \ frame.h xterm.h $(config_h) -data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h frame.h $(config_h) +data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h frame.h termhooks.h $(config_h) eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \ dispextern.h $(config_h) floatfns.o: floatfns.c $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \ keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ - blockinput.h xterm.h + blockinput.h xterm.h termhooks.h print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \ - $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h + $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ + termchar.h lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h \ $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h @@ -1235,7 +1243,7 @@ OTHER_FILES and OBJECTS_MACHINE select which of these should be compiled. */ -sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h) +sunfns.o: sunfns.c buffer.h window.h dispextern.h termhooks.h $(config_h) #ifdef HAVE_CARBON abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
--- a/src/alloc.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/alloc.c Mon Dec 19 19:57:22 2005 +0000 @@ -325,6 +325,7 @@ static void mark_buffer P_ ((Lisp_Object)); extern void mark_kboards P_ ((void)); +extern void mark_ttys P_ ((void)); extern void mark_backtrace P_ ((void)); static void gc_sweep P_ ((void)); static void mark_glyph_matrix P_ ((struct glyph_matrix *)); @@ -4937,6 +4938,7 @@ mark_object (bind->old_value); } mark_kboards (); + mark_ttys (); #ifdef USE_GTK {
--- a/src/callint.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/callint.c Mon Dec 19 19:57:22 2005 +0000 @@ -408,8 +408,8 @@ real_this_command= save_real_this_command; current_kboard->Vlast_command = save_last_command; - single_kboard_state (); - return apply1 (function, specs); + temporarily_switch_to_single_kboard (NULL); + return unbind_to (speccount, apply1 (function, specs)); } /* Here if function specifies a string to control parsing the defaults */ @@ -875,7 +875,7 @@ real_this_command= save_real_this_command; current_kboard->Vlast_command = save_last_command; - single_kboard_state (); + temporarily_switch_to_single_kboard (NULL); { Lisp_Object val;
--- a/src/cm.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/cm.c Mon Dec 19 19:57:22 2005 +0000 @@ -23,8 +23,13 @@ #include <config.h> #include <stdio.h> + +#include "lisp.h" +#include "frame.h" #include "cm.h" #include "termhooks.h" +#include "termchar.h" + /* For now, don't try to include termcap.h. On some systems, configure finds a non-standard termcap.h that the main build @@ -53,13 +58,16 @@ return c; } +/* The terminal to use for low-level output. */ +struct tty_display_info *current_tty; + int cmputc (c) char c; { - if (termscript) - fputc (c & 0177, termscript); - putchar (c & 0177); + if (current_tty->termscript) + putc (c & 0177, current_tty->termscript); + putc (c & 0177, current_tty->output); return c; } @@ -72,9 +80,9 @@ */ static -at (row, col) { - curY = row; - curX = col; +at (tty, row, col) { + curY (tty) = row; + curX (tty) = col; } /* @@ -82,8 +90,8 @@ */ static -addcol (n) { - curX += n; +addcol (tty, n) { + curX (tty) += n; /* * If cursor hit edge of screen, what happened? @@ -93,21 +101,21 @@ * of the last line. */ - if (curX == Wcm.cm_cols) { + if (curX (tty) == tty->Wcm->cm_cols) { /* * Well, if magicwrap, still there, past the edge of the * screen (!). If autowrap, on the col 0 of the next line. * Otherwise on last column. */ - if (Wcm.cm_magicwrap) + if (tty->Wcm->cm_magicwrap) ; /* "limbo" */ - else if (Wcm.cm_autowrap) { - curX = 0; - curY++; /* Beware end of screen! */ + else if (tty->Wcm->cm_autowrap) { + curX (tty) = 0; + curY (tty) ++; /* Beware end of screen! */ } else - curX--; + curX (tty)--; } } #endif @@ -123,20 +131,20 @@ * after we reach the last column; this takes us to a known state. */ void -cmcheckmagic () +cmcheckmagic (struct tty_display_info *tty) { - if (curX == FrameCols) + if (curX (tty) == FrameCols (tty)) { - if (!MagicWrap || curY >= FrameRows - 1) + if (!MagicWrap (tty) || curY (tty) >= FrameRows (tty) - 1) abort (); - if (termscript) - putc ('\r', termscript); - putchar ('\r'); - if (termscript) - putc ('\n', termscript); - putchar ('\n'); - curX = 0; - curY++; + if (tty->termscript) + putc ('\r', tty->termscript); + putc ('\r', tty->output); + if (tty->termscript) + putc ('\n', tty->termscript); + putc ('\n', tty->output); + curX (tty) = 0; + curY (tty)++; } } @@ -148,21 +156,21 @@ */ void -cmcostinit () +cmcostinit (struct tty_display_info *tty) { char *p; #define COST(x,e) (x ? (cost = 0, tputs (x, 1, e), cost) : BIG) #define CMCOST(x,e) ((x == 0) ? BIG : (p = tgoto(x, 0, 0), COST(p ,e))) - Wcm.cc_up = COST (Wcm.cm_up, evalcost); - Wcm.cc_down = COST (Wcm.cm_down, evalcost); - Wcm.cc_left = COST (Wcm.cm_left, evalcost); - Wcm.cc_right = COST (Wcm.cm_right, evalcost); - Wcm.cc_home = COST (Wcm.cm_home, evalcost); - Wcm.cc_cr = COST (Wcm.cm_cr, evalcost); - Wcm.cc_ll = COST (Wcm.cm_ll, evalcost); - Wcm.cc_tab = Wcm.cm_tabwidth ? COST (Wcm.cm_tab, evalcost) : BIG; + tty->Wcm->cc_up = COST (tty->Wcm->cm_up, evalcost); + tty->Wcm->cc_down = COST (tty->Wcm->cm_down, evalcost); + tty->Wcm->cc_left = COST (tty->Wcm->cm_left, evalcost); + tty->Wcm->cc_right = COST (tty->Wcm->cm_right, evalcost); + tty->Wcm->cc_home = COST (tty->Wcm->cm_home, evalcost); + tty->Wcm->cc_cr = COST (tty->Wcm->cm_cr, evalcost); + tty->Wcm->cc_ll = COST (tty->Wcm->cm_ll, evalcost); + tty->Wcm->cc_tab = tty->Wcm->cm_tabwidth ? COST (tty->Wcm->cm_tab, evalcost) : BIG; /* * These last three are actually minimum costs. When (if) they are @@ -173,9 +181,9 @@ * cursor motion seem to take straight numeric values. --ACT) */ - Wcm.cc_abs = CMCOST (Wcm.cm_abs, evalcost); - Wcm.cc_habs = CMCOST (Wcm.cm_habs, evalcost); - Wcm.cc_vabs = CMCOST (Wcm.cm_vabs, evalcost); + tty->Wcm->cc_abs = CMCOST (tty->Wcm->cm_abs, evalcost); + tty->Wcm->cc_habs = CMCOST (tty->Wcm->cm_habs, evalcost); + tty->Wcm->cc_vabs = CMCOST (tty->Wcm->cm_vabs, evalcost); #undef CMCOST #undef COST @@ -188,8 +196,8 @@ */ static int -calccost (srcy, srcx, dsty, dstx, doit) - int srcy, srcx, dsty, dstx, doit; +calccost (struct tty_display_info *tty, + int srcy, int srcx, int dsty, int dstx, int doit) { register int deltay, deltax, @@ -206,16 +214,16 @@ don't believe the cursor position: give up here and force use of absolute positioning. */ - if (curX == Wcm.cm_cols) + if (curX (tty) == tty->Wcm->cm_cols) goto fail; totalcost = 0; if ((deltay = dsty - srcy) == 0) goto x; if (deltay < 0) - p = Wcm.cm_up, c = Wcm.cc_up, deltay = -deltay; + p = tty->Wcm->cm_up, c = tty->Wcm->cc_up, deltay = -deltay; else - p = Wcm.cm_down, c = Wcm.cc_down; + p = tty->Wcm->cm_down, c = tty->Wcm->cc_down; if (c == BIG) { /* caint get thar from here */ if (doit) printf ("OOPS"); @@ -224,16 +232,16 @@ totalcost = c * deltay; if (doit) while (--deltay >= 0) - tputs (p, 1, cmputc); + emacs_tputs (tty, p, 1, cmputc); x: if ((deltax = dstx - srcx) == 0) goto done; if (deltax < 0) { - p = Wcm.cm_left, c = Wcm.cc_left, deltax = -deltax; + p = tty->Wcm->cm_left, c = tty->Wcm->cc_left, deltax = -deltax; goto dodelta; /* skip all the tab junk */ } /* Tabs (the toughie) */ - if (Wcm.cc_tab >= BIG || !Wcm.cm_usetabs) + if (tty->Wcm->cc_tab >= BIG || !tty->Wcm->cm_usetabs) goto olddelta; /* forget it! */ /* @@ -244,12 +252,12 @@ * we will put into tabx (for ntabs) and tab2x (for n2tabs)). */ - ntabs = (deltax + srcx % Wcm.cm_tabwidth) / Wcm.cm_tabwidth; + ntabs = (deltax + srcx % tty->Wcm->cm_tabwidth) / tty->Wcm->cm_tabwidth; n2tabs = ntabs + 1; - tabx = (srcx / Wcm.cm_tabwidth + ntabs) * Wcm.cm_tabwidth; - tab2x = tabx + Wcm.cm_tabwidth; + tabx = (srcx / tty->Wcm->cm_tabwidth + ntabs) * tty->Wcm->cm_tabwidth; + tab2x = tabx + tty->Wcm->cm_tabwidth; - if (tab2x >= Wcm.cm_cols) /* too far (past edge) */ + if (tab2x >= tty->Wcm->cm_cols) /* too far (past edge) */ n2tabs = 0; /* @@ -257,12 +265,12 @@ * for using n2tabs, then pick the minimum. */ - /* cost for ntabs + cost for right motion */ - tabcost = ntabs ? ntabs * Wcm.cc_tab + (dstx - tabx) * Wcm.cc_right + /* cost for ntabs + cost for right motion */ + tabcost = ntabs ? ntabs * tty->Wcm->cc_tab + (dstx - tabx) * tty->Wcm->cc_right : BIG; - /* cost for n2tabs + cost for left motion */ - c = n2tabs ? n2tabs * Wcm.cc_tab + (tab2x - dstx) * Wcm.cc_left + /* cost for n2tabs + cost for left motion */ + c = n2tabs ? n2tabs * tty->Wcm->cc_tab + (tab2x - dstx) * tty->Wcm->cc_left : BIG; if (c < tabcost) /* then cheaper to overshoot & back up */ @@ -275,11 +283,11 @@ * See if tabcost is less than just moving right */ - if (tabcost < (deltax * Wcm.cc_right)) { + if (tabcost < (deltax * tty->Wcm->cc_right)) { totalcost += tabcost; /* use the tabs */ if (doit) while (--ntabs >= 0) - tputs (Wcm.cm_tab, 1, cmputc); + emacs_tputs (tty, tty->Wcm->cm_tab, 1, cmputc); srcx = tabx; } @@ -292,9 +300,9 @@ goto done; olddelta: if (deltax > 0) - p = Wcm.cm_right, c = Wcm.cc_right; + p = tty->Wcm->cm_right, c = tty->Wcm->cc_right; else - p = Wcm.cm_left, c = Wcm.cc_left, deltax = -deltax; + p = tty->Wcm->cm_left, c = tty->Wcm->cc_left, deltax = -deltax; dodelta: if (c == BIG) { /* caint get thar from here */ @@ -306,7 +314,7 @@ totalcost += c * deltax; if (doit) while (--deltax >= 0) - tputs (p, 1, cmputc); + emacs_tputs (tty, p, 1, cmputc); done: return totalcost; } @@ -324,7 +332,8 @@ #define USECR 3 void -cmgoto (row, col) +cmgoto (tty, row, col) + struct tty_display_info *tty; int row, col; { int homecost, @@ -337,47 +346,47 @@ *dcm; /* First the degenerate case */ - if (row == curY && col == curX) /* already there */ + if (row == curY (tty) && col == curX (tty)) /* already there */ return; - if (curY >= 0 && curX >= 0) + if (curY (tty) >= 0 && curX (tty) >= 0) { /* We may have quick ways to go to the upper-left, bottom-left, * start-of-line, or start-of-next-line. Or it might be best to * start where we are. Examine the options, and pick the cheapest. */ - relcost = calccost (curY, curX, row, col, 0); + relcost = calccost (tty, curY (tty), curX (tty), row, col, 0); use = USEREL; - if ((homecost = Wcm.cc_home) < BIG) - homecost += calccost (0, 0, row, col, 0); + if ((homecost = tty->Wcm->cc_home) < BIG) + homecost += calccost (tty, 0, 0, row, col, 0); if (homecost < relcost) - relcost = homecost, use = USEHOME; - if ((llcost = Wcm.cc_ll) < BIG) - llcost += calccost (Wcm.cm_rows - 1, 0, row, col, 0); + relcost = homecost, use = USEHOME; + if ((llcost = tty->Wcm->cc_ll) < BIG) + llcost += calccost (tty, tty->Wcm->cm_rows - 1, 0, row, col, 0); if (llcost < relcost) - relcost = llcost, use = USELL; - if ((crcost = Wcm.cc_cr) < BIG) { - if (Wcm.cm_autolf) - if (curY + 1 >= Wcm.cm_rows) - crcost = BIG; + relcost = llcost, use = USELL; + if ((crcost = tty->Wcm->cc_cr) < BIG) { + if (tty->Wcm->cm_autolf) + if (curY (tty) + 1 >= tty->Wcm->cm_rows) + crcost = BIG; else - crcost += calccost (curY + 1, 0, row, col, 0); + crcost += calccost (tty, curY (tty) + 1, 0, row, col, 0); else - crcost += calccost (curY, 0, row, col, 0); + crcost += calccost (tty, curY (tty), 0, row, col, 0); } if (crcost < relcost) relcost = crcost, use = USECR; - directcost = Wcm.cc_abs, dcm = Wcm.cm_abs; - if (row == curY && Wcm.cc_habs < BIG) - directcost = Wcm.cc_habs, dcm = Wcm.cm_habs; - else if (col == curX && Wcm.cc_vabs < BIG) - directcost = Wcm.cc_vabs, dcm = Wcm.cm_vabs; + directcost = tty->Wcm->cc_abs, dcm = tty->Wcm->cm_abs; + if (row == curY (tty) && tty->Wcm->cc_habs < BIG) + directcost = tty->Wcm->cc_habs, dcm = tty->Wcm->cm_habs; + else if (col == curX (tty) && tty->Wcm->cc_vabs < BIG) + directcost = tty->Wcm->cc_vabs, dcm = tty->Wcm->cm_vabs; } else { directcost = 0, relcost = 100000; - dcm = Wcm.cm_abs; + dcm = tty->Wcm->cm_abs; } /* @@ -388,13 +397,14 @@ { /* compute REAL direct cost */ cost = 0; - p = dcm == Wcm.cm_habs ? tgoto (dcm, row, col) : - tgoto (dcm, col, row); - tputs (p, 1, evalcost); + p = (dcm == tty->Wcm->cm_habs + ? tgoto (dcm, row, col) + : tgoto (dcm, col, row)); + emacs_tputs (tty, p, 1, evalcost); if (cost <= relcost) { /* really is cheaper */ - tputs (p, 1, cmputc); - curY = row, curX = col; + emacs_tputs (tty, p, 1, cmputc); + curY (tty) = row, curX (tty) = col; return; } } @@ -402,25 +412,25 @@ switch (use) { case USEHOME: - tputs (Wcm.cm_home, 1, cmputc); - curY = 0, curX = 0; + emacs_tputs (tty, tty->Wcm->cm_home, 1, cmputc); + curY (tty) = 0, curX (tty) = 0; break; case USELL: - tputs (Wcm.cm_ll, 1, cmputc); - curY = Wcm.cm_rows - 1, curX = 0; + emacs_tputs (tty, tty->Wcm->cm_ll, 1, cmputc); + curY (tty) = tty->Wcm->cm_rows - 1, curX (tty) = 0; break; case USECR: - tputs (Wcm.cm_cr, 1, cmputc); - if (Wcm.cm_autolf) - curY++; - curX = 0; + emacs_tputs (tty, tty->Wcm->cm_cr, 1, cmputc); + if (tty->Wcm->cm_autolf) + curY (tty)++; + curX (tty) = 0; break; } - (void) calccost (curY, curX, row, col, 1); - curY = row, curX = col; + (void) calccost (tty, curY (tty), curX (tty), row, col, 1); + curY (tty) = row, curX (tty) = col; } /* Clear out all terminal info. @@ -428,9 +438,9 @@ */ void -Wcm_clear () +Wcm_clear (struct tty_display_info *tty) { - bzero (&Wcm, sizeof Wcm); + bzero (tty->Wcm, sizeof (struct cm)); UP = 0; BC = 0; } @@ -443,21 +453,21 @@ */ int -Wcm_init () +Wcm_init (struct tty_display_info *tty) { #if 0 - if (Wcm.cm_abs && !Wcm.cm_ds) + if (tty->Wcm->cm_abs && !tty->Wcm->cm_ds) return 0; #endif - if (Wcm.cm_abs) + if (tty->Wcm->cm_abs) return 0; /* Require up and left, and, if no absolute, down and right */ - if (!Wcm.cm_up || !Wcm.cm_left) + if (!tty->Wcm->cm_up || !tty->Wcm->cm_left) return - 1; - if (!Wcm.cm_abs && (!Wcm.cm_down || !Wcm.cm_right)) + if (!tty->Wcm->cm_abs && (!tty->Wcm->cm_down || !tty->Wcm->cm_right)) return - 1; /* Check that we know the size of the screen.... */ - if (Wcm.cm_rows <= 0 || Wcm.cm_cols <= 0) + if (tty->Wcm->cm_rows <= 0 || tty->Wcm->cm_cols <= 0) return - 2; return 0; }
--- a/src/cm.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/cm.h Mon Dec 19 19:57:22 2005 +0000 @@ -99,76 +99,78 @@ int cc_vabs; }; -extern struct cm Wcm; /* Terminal capabilities */ extern char PC; /* Pad character */ /* Shorthand */ #ifndef NoCMShortHand -#define curY Wcm.cm_curY -#define curX Wcm.cm_curX -#define Up Wcm.cm_up -#define Down Wcm.cm_down -#define Left Wcm.cm_left -#define Right Wcm.cm_right -#define Tab Wcm.cm_tab -#define BackTab Wcm.cm_backtab -#define TabWidth Wcm.cm_tabwidth -#define CR Wcm.cm_cr -#define Home Wcm.cm_home -#define LastLine Wcm.cm_ll -#define AbsPosition Wcm.cm_abs -#define ColPosition Wcm.cm_habs -#define RowPosition Wcm.cm_vabs -#define MultiUp Wcm.cm_multiup -#define MultiDown Wcm.cm_multidown -#define MultiLeft Wcm.cm_multileft -#define MultiRight Wcm.cm_multiright -#define AutoWrap Wcm.cm_autowrap -#define MagicWrap Wcm.cm_magicwrap -#define UseTabs Wcm.cm_usetabs -#define FrameRows Wcm.cm_rows -#define FrameCols Wcm.cm_cols +#define curY(tty) (tty)->Wcm->cm_curY +#define curX(tty) (tty)->Wcm->cm_curX +#define Up(tty) (tty)->Wcm->cm_up +#define Down(tty) (tty)->Wcm->cm_down +#define Left(tty) (tty)->Wcm->cm_left +#define Right(tty) (tty)->Wcm->cm_right +#define Tab(tty) (tty)->Wcm->cm_tab +#define BackTab(tty) (tty)->Wcm->cm_backtab +#define TabWidth(tty) (tty)->Wcm->cm_tabwidth +#define CR(tty) (tty)->Wcm->cm_cr +#define Home(tty) (tty)->Wcm->cm_home +#define LastLine(tty) (tty)->Wcm->cm_ll +#define AbsPosition(tty) (tty)->Wcm->cm_abs +#define ColPosition(tty) (tty)->Wcm->cm_habs +#define RowPosition(tty) (tty)->Wcm->cm_vabs +#define MultiUp(tty) (tty)->Wcm->cm_multiup +#define MultiDown(tty) (tty)->Wcm->cm_multidown +#define MultiLeft(tty) (tty)->Wcm->cm_multileft +#define MultiRight(tty) (tty)->Wcm->cm_multiright +#define AutoWrap(tty) (tty)->Wcm->cm_autowrap +#define MagicWrap(tty) (tty)->Wcm->cm_magicwrap +#define UseTabs(tty) (tty)->Wcm->cm_usetabs +#define FrameRows(tty) (tty)->Wcm->cm_rows +#define FrameCols(tty) (tty)->Wcm->cm_cols -#define UpCost Wcm.cc_up -#define DownCost Wcm.cc_down -#define LeftCost Wcm.cc_left -#define RightCost Wcm.cc_right -#define HomeCost Wcm.cc_home -#define CRCost Wcm.cc_cr -#define LastLineCost Wcm.cc_ll -#define TabCost Wcm.cc_tab -#define BackTabCost Wcm.cc_backtab -#define AbsPositionCost Wcm.cc_abs -#define ColPositionCost Wcm.cc_habs -#define RowPositionCost Wcm.cc_vabs -#define MultiUpCost Wcm.cc_multiup -#define MultiDownCost Wcm.cc_multidown -#define MultiLeftCost Wcm.cc_multileft -#define MultiRightCost Wcm.cc_multiright +#define UpCost(tty) (tty)->Wcm->cc_up +#define DownCost(tty) (tty)->Wcm->cc_down +#define LeftCost(tty) (tty)->Wcm->cc_left +#define RightCost(tty) (tty)->Wcm->cc_right +#define HomeCost(tty) (tty)->Wcm->cc_home +#define CRCost(tty) (tty)->Wcm->cc_cr +#define LastLineCost(tty) (tty)->Wcm->cc_ll +#define TabCost(tty) (tty)->Wcm->cc_tab +#define BackTabCost(tty) (tty)->Wcm->cc_backtab +#define AbsPositionCost(tty) (tty)->Wcm->cc_abs +#define ColPositionCost(tty) (tty)->Wcm->cc_habs +#define RowPositionCost(tty) (tty)->Wcm->cc_vabs +#define MultiUpCost(tty) (tty)->Wcm->cc_multiup +#define MultiDownCost(tty) (tty)->Wcm->cc_multidown +#define MultiLeftCost(tty) (tty)->Wcm->cc_multileft +#define MultiRightCost(tty) (tty)->Wcm->cc_multiright #endif -#define cmat(row,col) (curY = (row), curX = (col)) -#define cmplus(n) \ - { \ - if ((curX += (n)) >= FrameCols && !MagicWrap) \ - { \ - if (Wcm.cm_losewrap) losecursor (); \ - else if (AutoWrap) curX = 0, curY++; \ - else curX--; \ - } \ +#define cmat(tty,row,col) (curY(tty) = (row), curX(tty) = (col)) +#define cmplus(tty,n) \ + { \ + if ((curX (tty) += (n)) >= FrameCols (tty) && !MagicWrap (tty)) \ + { \ + if ((tty)->Wcm->cm_losewrap) losecursor (tty); \ + else if (AutoWrap (tty)) curX (tty) = 0, curY (tty)++; \ + else curX (tty)--; \ + } \ } -#define losecursor() (curX = -1, curY = -1) +#define losecursor(tty) (curX(tty) = -1, curY(tty) = -1) extern int cost; extern int evalcost (); -extern void cmcheckmagic (); -extern int cmputc (); -extern void cmcostinit (); -extern void cmgoto (); -extern void Wcm_clear (); -extern int Wcm_init (); +#define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc)) + +extern struct tty_display_info *current_tty; +extern void cmcheckmagic P_ ((struct tty_display_info *)); +extern int cmputc P_ ((int)); +extern void cmcostinit P_ ((struct tty_display_info *)); +extern void cmgoto P_ ((struct tty_display_info *, int, int)); +extern void Wcm_clear P_ ((struct tty_display_info *)); +extern int Wcm_init P_ ((struct tty_display_info *)); /* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b (do not change this comment) */
--- a/src/coding.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/coding.c Mon Dec 19 19:57:22 2005 +0000 @@ -347,6 +347,8 @@ #include "coding.h" #include "window.h" #include "intervals.h" +#include "frame.h" +#include "termhooks.h" #else /* not emacs */ @@ -429,16 +431,10 @@ /* Flag to make buffer-file-coding-system inherit from process-coding. */ int inherit_process_coding_system; -/* Coding system to be used to encode text for terminal display. */ -struct coding_system terminal_coding; - /* Coding system to be used to encode text for terminal display when terminal coding system is nil. */ struct coding_system safe_terminal_coding; -/* Coding system of what is sent from terminal keyboard. */ -struct coding_system keyboard_coding; - /* Default coding system to be used to write a file. */ struct coding_system default_buffer_file_coding; @@ -7352,21 +7348,23 @@ } DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_internal, - Sset_terminal_coding_system_internal, 1, 1, 0, + Sset_terminal_coding_system_internal, 1, 2, 0, doc: /* Internal use only. */) - (coding_system) + (coding_system, device) Lisp_Object coding_system; + Lisp_Object device; { + struct coding_system *terminal_coding = DEVICE_TERMINAL_CODING (get_device (device, 1)); CHECK_SYMBOL (coding_system); - setup_coding_system (Fcheck_coding_system (coding_system), &terminal_coding); + setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding); /* We had better not send unsafe characters to terminal. */ - terminal_coding.mode |= CODING_MODE_INHIBIT_UNENCODABLE_CHAR; + terminal_coding->mode |= CODING_MODE_INHIBIT_UNENCODABLE_CHAR; /* Character composition should be disabled. */ - terminal_coding.composing = COMPOSITION_DISABLED; + terminal_coding->composing = COMPOSITION_DISABLED; /* Error notification should be suppressed. */ - terminal_coding.suppress_error = 1; - terminal_coding.src_multibyte = 1; - terminal_coding.dst_multibyte = 0; + terminal_coding->suppress_error = 1; + terminal_coding->src_multibyte = 1; + terminal_coding->dst_multibyte = 0; return Qnil; } @@ -7389,32 +7387,42 @@ } DEFUN ("terminal-coding-system", Fterminal_coding_system, - Sterminal_coding_system, 0, 0, 0, - doc: /* Return coding system specified for terminal output. */) - () + Sterminal_coding_system, 0, 1, 0, + doc: /* Return coding system specified for terminal output on the given device. +DEVICE may be a display device id, a frame, or nil for the selected +frame's display device. */) + (device) + Lisp_Object device; { - return terminal_coding.symbol; + return DEVICE_TERMINAL_CODING (get_device (device, 1))->symbol; } DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_internal, - Sset_keyboard_coding_system_internal, 1, 1, 0, + Sset_keyboard_coding_system_internal, 1, 2, 0, doc: /* Internal use only. */) - (coding_system) + (coding_system, device) Lisp_Object coding_system; + Lisp_Object device; { + struct device *d = get_device (device, 1); CHECK_SYMBOL (coding_system); - setup_coding_system (Fcheck_coding_system (coding_system), &keyboard_coding); + + setup_coding_system (Fcheck_coding_system (coding_system), + DEVICE_KEYBOARD_CODING (d)); /* Character composition should be disabled. */ - keyboard_coding.composing = COMPOSITION_DISABLED; + DEVICE_KEYBOARD_CODING (d)->composing = COMPOSITION_DISABLED; return Qnil; } DEFUN ("keyboard-coding-system", Fkeyboard_coding_system, - Skeyboard_coding_system, 0, 0, 0, - doc: /* Return coding system specified for decoding keyboard input. */) - () + Skeyboard_coding_system, 0, 1, 0, + doc: /* Return coding system for decoding keyboard input on DEVICE. +DEVICE may be a display device id, a frame, or nil for the selected +frame's display device. */) + (device) + Lisp_Object device; { - return keyboard_coding.symbol; + return DEVICE_KEYBOARD_CODING (get_device (device, 1))->symbol; } @@ -7661,8 +7669,6 @@ iso_code_class[ISO_CODE_SS3] = ISO_single_shift_3; iso_code_class[ISO_CODE_CSI] = ISO_control_sequence_introducer; - setup_coding_system (Qnil, &keyboard_coding); - setup_coding_system (Qnil, &terminal_coding); setup_coding_system (Qnil, &safe_terminal_coding); setup_coding_system (Qnil, &default_buffer_file_coding);
--- a/src/coding.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/coding.h Mon Dec 19 19:57:22 2005 +0000 @@ -685,20 +685,10 @@ the subprocess output. */ extern int inherit_process_coding_system; -/* Coding-system to be used for encoding terminal output. This - structure contains information of a coding-system specified by the - function `set-terminal-coding-system'. */ -extern struct coding_system terminal_coding; - /* Coding system to be used to encode text for terminal display when terminal coding system is nil. */ extern struct coding_system safe_terminal_coding; -/* Coding-system of what is sent from terminal keyboard. This - structure contains information of a coding-system specified by the - function `set-keyboard-coding-system'. */ -extern struct coding_system keyboard_coding; - /* Default coding system to be used to write a file. */ extern struct coding_system default_buffer_file_coding;
--- a/src/config.in Sat Dec 17 21:41:34 2005 +0000 +++ b/src/config.in Mon Dec 19 19:57:22 2005 +0000 @@ -910,6 +910,12 @@ #define HAVE_MOUSE #endif +/* Multi-tty support relies on MULTI_KBOARD. It seems safe to turn it + on unconditionally. */ +#ifndef MULTI_KBOARD +#define MULTI_KBOARD +#endif + /* Define USER_FULL_NAME to return a string that is the user's full name. It can assume that the variable `pw'
--- a/src/data.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/data.c Mon Dec 19 19:57:22 2005 +0000 @@ -30,6 +30,7 @@ #include "keyboard.h" #include "frame.h" #include "syssignal.h" +#include "termhooks.h" /* For FRAME_KBOARD reference in y-or-n-p. */ #ifdef STDC_HEADERS #include <float.h> @@ -890,7 +891,18 @@ case Lisp_Misc_Kboard_Objfwd: offset = XKBOARD_OBJFWD (valcontents)->offset; - return *(Lisp_Object *)(offset + (char *)current_kboard); + /* We used to simply use current_kboard here, but from Lisp + code, it's value is often unexpected. It seems nicer to + allow constructions like this to work as intuitively expected: + + (with-selected-frame frame + (define-key local-function-map "\eOP" [f1])) + + On the other hand, this affects the semantics of + last-command and real-last-command, and people may rely on + that. I took a quick look at the Lisp codebase, and I + don't think anything will break. --lorentey */ + return *(Lisp_Object *)(offset + (char *)FRAME_KBOARD (SELECTED_FRAME ())); } return valcontents; } @@ -978,7 +990,7 @@ case Lisp_Misc_Kboard_Objfwd: { - char *base = (char *) current_kboard; + char *base = (char *) FRAME_KBOARD (SELECTED_FRAME ()); char *p = base + XKBOARD_OBJFWD (valcontents)->offset; *(Lisp_Object *) p = newval; } @@ -1124,7 +1136,7 @@ case Lisp_Misc_Kboard_Objfwd: return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset - + (char *)current_kboard); + + (char *)FRAME_KBOARD (SELECTED_FRAME ())); } } @@ -1884,6 +1896,51 @@ return Qnil; } + +/* This code is disabled now that we use the selected frame to return + keyboard-local-values. */ +#if 0 +extern struct device *get_device P_ ((Lisp_Object display, int)); + +DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, + doc: /* Return the terminal-local value of SYMBOL on DEVICE. +If SYMBOL is not a terminal-local variable, then return its normal +value, like `symbol-value'. + +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). */) + (symbol, device) + Lisp_Object symbol; + Lisp_Object device; +{ + Lisp_Object result; + struct device *d = get_device (device, 1); + push_kboard (d->kboard); + result = Fsymbol_value (symbol); + pop_kboard (); + return result; +} + +DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0, + doc: /* Set the terminal-local binding of SYMBOL on DEVICE to VALUE. +If VARIABLE is not a terminal-local variable, then set its normal +binding, like `set'. + +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). */) + (symbol, device, value) + Lisp_Object symbol; + Lisp_Object device; + Lisp_Object value; +{ + Lisp_Object result; + struct device *d = get_device (device, 1); + push_kboard (d->kboard); + result = Fset (symbol, value); + pop_kboard (); + return result; +} +#endif /* Find the function at the end of a chain of symbol function indirections. */ @@ -3335,6 +3392,10 @@ defsubr (&Slocal_variable_p); defsubr (&Slocal_variable_if_set_p); defsubr (&Svariable_binding_locus); +#if 0 /* XXX Remove this. --lorentey */ + defsubr (&Sterminal_local_value); + defsubr (&Sset_terminal_local_value); +#endif defsubr (&Saref); defsubr (&Saset); defsubr (&Snumber_to_string);
--- a/src/dispextern.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/dispextern.h Mon Dec 19 19:57:22 2005 +0000 @@ -1029,13 +1029,8 @@ extern struct glyph space_glyph; -/* Frame being updated by update_window/update_frame. */ - -extern struct frame *updating_frame; - /* Window being updated by update_window. This is non-null as long as - update_window has not finished, and null otherwise. It's role is - analogous to updating_frame. */ + update_window has not finished, and null otherwise. */ extern struct window *updated_window; @@ -1355,7 +1350,7 @@ DESCENT = FONT->descent HEIGHT = FONT_HEIGHT (FONT) F_DESCENT = (FRAME_FONT (F)->descent - - F->output_data.x->baseline_offset) + - F->device->output_data.x->baseline_offset) F_HEIGHT = FRAME_LINE_HEIGHT (F) */ @@ -2157,16 +2152,16 @@ /* Call produce_glyphs or produce_glyphs_hook, if set. Shortcut to avoid the function call overhead. */ -#define PRODUCE_GLYPHS(IT) \ - do { \ - extern int inhibit_free_realized_faces; \ - if (rif != NULL) \ - rif->produce_glyphs ((IT)); \ - else \ - produce_glyphs ((IT)); \ - if ((IT)->glyph_row != NULL) \ - inhibit_free_realized_faces = 1; \ - } while (0) +#define PRODUCE_GLYPHS(IT) \ + do { \ + extern int inhibit_free_realized_faces; \ + if (FRAME_RIF ((IT)->f) != NULL) \ + FRAME_RIF ((IT)->f)->produce_glyphs ((IT)); \ + else \ + produce_glyphs ((IT)); \ + if ((IT)->glyph_row != NULL) \ + inhibit_free_realized_faces = 1; \ + } while (0) /* Bit-flags indicating what operation move_it_to should perform. */ @@ -2340,10 +2335,6 @@ #endif /* HAVE_WINDOW_SYSTEM */ }; -/* The current interface for window-based redisplay. */ - -extern struct redisplay_interface *rif; - /*********************************************************************** Images @@ -2771,11 +2762,11 @@ /* Defined in sysdep.c */ -void get_frame_size P_ ((int *, int *)); +void get_tty_size P_ ((int, int *, int *)); void request_sigio P_ ((void)); void unrequest_sigio P_ ((void)); -int tabs_safe_p P_ ((void)); -void init_baud_rate P_ ((void)); +int tabs_safe_p P_ ((int)); +void init_baud_rate P_ ((int)); void init_sigio P_ ((int)); /* Defined in xfaces.c */ @@ -2914,8 +2905,8 @@ void prepare_desired_row P_ ((struct glyph_row *)); int line_hash_code P_ ((struct glyph_row *)); void set_window_update_flags P_ ((struct window *, int)); -void write_glyphs P_ ((struct glyph *, int)); -void insert_glyphs P_ ((struct glyph *, int)); +void write_glyphs P_ ((struct frame *, struct glyph *, int)); +void insert_glyphs P_ ((struct frame *, struct glyph *, int)); void redraw_frame P_ ((struct frame *)); void redraw_garbaged_frames P_ ((void)); int scroll_cost P_ ((struct frame *, int, int, int)); @@ -2935,29 +2926,38 @@ /* Defined in term.c */ -extern void ring_bell P_ ((void)); -extern void set_terminal_modes P_ ((void)); -extern void reset_terminal_modes P_ ((void)); +extern void ring_bell P_ ((struct frame *)); extern void update_begin P_ ((struct frame *)); extern void update_end P_ ((struct frame *)); -extern void set_terminal_window P_ ((int)); -extern void set_scroll_region P_ ((int, int)); -extern void turn_off_insert P_ ((void)); -extern void turn_off_highlight P_ ((void)); -extern void background_highlight P_ ((void)); -extern void clear_frame P_ ((void)); -extern void clear_end_of_line P_ ((int)); -extern void clear_end_of_line_raw P_ ((int)); -extern void delete_glyphs P_ ((int)); -extern void ins_del_lines P_ ((int, int)); +extern void set_terminal_window P_ ((struct frame *, int)); +extern void set_scroll_region P_ ((struct frame *, int, int)); +extern void turn_off_insert P_ ((struct tty_display_info *)); +extern void turn_off_highlight P_ ((struct tty_display_info *)); +extern void background_highlight P_ ((struct tty_display_info *)); +extern void clear_frame P_ ((struct frame *)); +extern void clear_end_of_line P_ ((struct frame *, int)); +extern void clear_end_of_line_raw P_ ((struct frame *, int)); +extern void tty_clear_end_of_line P_ ((struct frame *, int)); +extern void delete_glyphs P_ ((struct frame *, int)); +extern void ins_del_lines P_ ((struct frame *, int, int)); extern int string_cost P_ ((char *)); extern int per_line_cost P_ ((char *)); extern void calculate_costs P_ ((struct frame *)); extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object)); -extern void tty_setup_colors P_ ((int)); -extern void term_init P_ ((char *)); -void cursor_to P_ ((int, int)); -extern int tty_capable_p P_ ((struct frame *, unsigned, unsigned long, unsigned long)); +extern void tty_setup_colors P_ ((struct tty_display_info *, int)); +extern struct device *get_device P_ ((Lisp_Object display, int)); +extern struct device *get_tty_device P_ ((Lisp_Object terminal)); +extern struct device *get_named_tty P_ ((char *)); +EXFUN (Fdisplay_tty_type, 1); +extern struct device *init_initial_device P_ ((void)); +extern struct device *init_tty P_ ((char *, char *, int)); +extern void delete_tty P_ ((struct device *)); +extern void cursor_to P_ ((struct frame *, int, int)); +extern int tty_capable_p P_ ((struct tty_display_info *, unsigned, unsigned long, unsigned long)); +extern void tty_set_terminal_modes P_ ((struct device *)); +extern void tty_reset_terminal_modes P_ ((struct device *)); +extern void create_tty_output P_ ((struct frame *)); + /* Defined in scroll.c */
--- a/src/dispnew.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/dispnew.c Mon Dec 19 19:57:22 2005 +0000 @@ -32,7 +32,6 @@ #include "lisp.h" #include "termchar.h" #include "termopts.h" -#include "termhooks.h" /* cm.h must come after dispextern.h on Windows. */ #include "dispextern.h" #include "cm.h" @@ -40,6 +39,7 @@ #include "charset.h" #include "keyboard.h" #include "frame.h" +#include "termhooks.h" #include "window.h" #include "commands.h" #include "disptab.h" @@ -215,9 +215,9 @@ EMACS_INT baud_rate; /* Either nil or a symbol naming the window system under which Emacs - is running. */ - -Lisp_Object Vwindow_system; + creates the first frame. */ + +Lisp_Object Vinitial_window_system; /* Version number of X windows: 10, 11 or nil. */ @@ -259,14 +259,6 @@ struct frame *last_nonminibuf_frame; -/* Stdio stream being used for copy of all output. */ - -FILE *termscript; - -/* Structure for info on cursor positioning. */ - -struct cm Wcm; - /* 1 means SIGWINCH happened when not safe. */ int delayed_size_change; @@ -305,11 +297,6 @@ static struct frame *frame_matrix_frame; -/* Current interface for window-based redisplay. Set from init_xterm. - A null value means we are not using window-based redisplay. */ - -struct redisplay_interface *rif; - /* Non-zero means that fonts have been loaded since the last glyph matrix adjustments. Redisplay must stop, and glyph matrices must be adjusted when this flag becomes non-zero during display. The @@ -1401,7 +1388,7 @@ { int c = glyph->u.ch; int face_id = glyph->face_id; - if (must_write_spaces) + if (FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ c -= SPACEGLYPH; hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c; hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + face_id; @@ -1433,7 +1420,7 @@ int glyph_table_len = GLYPH_TABLE_LENGTH; /* Ignore trailing and leading spaces if we can. */ - if (!must_write_spaces) + if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ { /* Skip from the end over trailing spaces. */ while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) @@ -1649,8 +1636,10 @@ #if GLYPH_DEBUG -/* Flush standard output. This is sometimes useful to call from - the debugger. */ +/* Flush standard output. This is sometimes useful to call from the debugger. + XXX Maybe this should be changed to flush the current terminal instead of + stdout. +*/ void flush_stdout () @@ -3354,12 +3343,15 @@ return Qnil; update_begin (f); +#ifdef MSDOS if (FRAME_MSDOS_P (f)) - set_terminal_modes (); - clear_frame (); + set_terminal_modes (FRAME_DEVICE (f)); +#endif + clear_frame (f); clear_current_matrices (f); update_end (f); - fflush (stdout); + if (FRAME_TERMCAP_P (f)) + fflush (FRAME_TTY (f)->output); windows_or_buffers_changed++; /* Mark all windows as inaccurate, so that every window will have its redisplay done. */ @@ -3500,7 +3492,7 @@ /* If we can't insert glyphs, we can use this method only at the end of a line. */ - if (!char_ins_del_ok) + if (!FRAME_CHAR_INS_DEL_OK (f)) if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n') return 0; @@ -3650,24 +3642,24 @@ updated_row = glyph_row; updated_area = TEXT_AREA; update_begin (f); - if (rif) + if (FRAME_RIF (f)) { - rif->update_window_begin_hook (w); + FRAME_RIF (f)->update_window_begin_hook (w); if (glyphs == end - n /* In front of a space added by append_space. */ || (glyphs == end - n - 1 && (end - n)->charpos <= 0)) - rif->write_glyphs (glyphs, n); + FRAME_RIF (f)->write_glyphs (glyphs, n); else - rif->insert_glyphs (glyphs, n); + FRAME_RIF (f)->insert_glyphs (glyphs, n); } else { if (glyphs == end - n) - write_glyphs (glyphs, n); + write_glyphs (f, glyphs, n); else - insert_glyphs (glyphs, n); + insert_glyphs (f, glyphs, n); } w->cursor.hpos += n; @@ -3680,8 +3672,8 @@ a frame matrix is used, cursor_to expects frame coordinates, and the X and Y parameters are not used. */ if (window_redisplay_p) - rif->cursor_to (w->cursor.vpos, w->cursor.hpos, - w->cursor.y, w->cursor.x); + FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, + w->cursor.y, w->cursor.x); else { int x, y; @@ -3690,18 +3682,19 @@ ? XFASTINT (w->left_margin_cols) : 0)); y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); - cursor_to (y, x); + cursor_to (f, y, x); } #ifdef HAVE_WINDOW_SYSTEM update_window_fringes (w, 0); #endif - if (rif) - rif->update_window_end_hook (w, 1, 0); + if (FRAME_RIF (f)) + FRAME_RIF (f)->update_window_end_hook (w, 1, 0); update_end (f); updated_row = NULL; - fflush (stdout); + if (FRAME_TERMCAP_P (f)) + fflush (FRAME_TTY (f)->output); TRACE ((stderr, "direct output for insert\n")); mark_window_display_accurate (it.window, 1); @@ -3779,8 +3772,8 @@ && w->cursor.hpos < w->desired_matrix->matrix_w); if (FRAME_WINDOW_P (f)) - rif->cursor_to (w->cursor.vpos, w->cursor.hpos, - w->cursor.y, w->cursor.x); + FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, + w->cursor.y, w->cursor.x); else { int x, y; @@ -3789,10 +3782,11 @@ ? XFASTINT (w->left_margin_cols) : 0)); y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); - cursor_to (y, x); + cursor_to (f, y, x); } - fflush (stdout); + if (FRAME_TERMCAP_P (f)) + fflush (FRAME_TTY (f)->output); redisplay_performed_directly_p = 1; return 1; } @@ -3865,14 +3859,14 @@ update_end (f); /* This flush is a performance bottleneck under X, - and it doesn't seem to be necessary anyway (in general). + and it doesn't seem to be necessary anyway (in general). It is necessary when resizing the window with the mouse, or - at least the fringes are not redrawn in a timely manner. ++kfs */ + at least the fringes are not redrawn in a timely manner. ++kfs */ if (f->force_flush_display_p) - { - rif->flush_display (f); - f->force_flush_display_p = 0; - } + { + FRAME_RIF (f)->flush_display (f); + f->force_flush_display_p = 0; + } } else { @@ -3888,9 +3882,12 @@ paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); update_end (f); - if (termscript) - fflush (termscript); - fflush (stdout); + if (FRAME_TERMCAP_P (f)) + { + if (FRAME_TTY (f)->termscript) + fflush (FRAME_TTY (f)->termscript); + fflush (FRAME_TTY (f)->output); + } /* Check window matrices for lost pointers. */ #if GLYPH_DEBUG @@ -3974,7 +3971,8 @@ int yb; { int i; - + struct frame *f = XFRAME (WINDOW_FRAME (w)); + /* If rows overlapping others have been changed, the rows being overlapped have to be redrawn. This won't draw lines that have already been drawn in update_window_line because overlapped_p in @@ -3997,10 +3995,12 @@ { updated_row = row; updated_area = area; - rif->cursor_to (i, 0, row->y, area == TEXT_AREA ? row->x : 0); + FRAME_RIF (f)->cursor_to (i, 0, row->y, + area == TEXT_AREA ? row->x : 0); if (row->used[area]) - rif->write_glyphs (row->glyphs[area], row->used[area]); - rif->clear_end_of_line (-1); + FRAME_RIF (f)->write_glyphs (row->glyphs[area], + row->used[area]); + FRAME_RIF (f)->clear_end_of_line (-1); } row->overlapped_p = 0; @@ -4022,7 +4022,8 @@ { int i, bottom_y; struct glyph_row *row; - + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); + for (i = 0; i < w->current_matrix->nrows; ++i) { row = w->current_matrix->rows + i; @@ -4111,10 +4112,10 @@ int preempt_count = baud_rate / 2400 + 1; extern int input_pending; extern Lisp_Object do_mouse_tracking; + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); #if GLYPH_DEBUG /* Check that W's frame doesn't have glyph matrices. */ xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w)))); - xassert (updating_frame != NULL); #endif /* Check pending input the first time so that we can quickly return. */ @@ -4287,6 +4288,7 @@ int area, vpos; { struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); /* Let functions in xterm.c know what area subsequent X positions will be relative to. */ @@ -4312,6 +4314,7 @@ { struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); int changed_p = 0; /* Let functions in xterm.c know what area subsequent X positions @@ -4533,6 +4536,7 @@ { struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); int changed_p = 0; /* Set the row being updated. This is important to let xterm.c @@ -4601,6 +4605,7 @@ struct window *w; { struct frame *f = XFRAME (w->frame); + struct redisplay_interface *rif = FRAME_RIF (f); int cx, cy, vpos, hpos; /* Not intended for frame matrix updates. */ @@ -4824,6 +4829,7 @@ int i, j, first_old, first_new, last_old, last_new; int nruns, nbytes, n, run_idx; struct row_entry *entry; + struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); /* Skip over rows equal at the start. */ for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) @@ -5148,7 +5154,7 @@ } /* If we cannot insert/delete lines, it's no use trying it. */ - if (!line_ins_del_ok) + if (!FRAME_LINE_INS_DEL_OK (f)) inhibit_id_p = 1; /* See if any of the desired lines are enabled; don't compute for @@ -5176,18 +5182,18 @@ Also flush out if likely to have more than 1k buffered otherwise. I'm told that some telnet connections get really screwed by more than 1k output at once. */ - int outq = PENDING_OUTPUT_COUNT (stdout); + int outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f)->output); if (outq > 900 || (outq > 20 && ((i - 1) % preempt_count == 0))) { - fflush (stdout); + fflush (FRAME_TTY (f)->output); if (preempt_count == 1) { #ifdef EMACS_OUTQSIZE if (EMACS_OUTQSIZE (0, &outq) < 0) /* Probably not a tty. Ignore the error and reset the outq count. */ - outq = PENDING_OUTPUT_COUNT (stdout); + outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output)); #endif outq *= 10; if (baud_rate <= outq && baud_rate > 0) @@ -5275,7 +5281,7 @@ } } - cursor_to (row, col); + cursor_to (f, row, col); } else { @@ -5297,7 +5303,7 @@ x += XFASTINT (w->left_margin_cols); /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ - cursor_to (y, x); + cursor_to (f, y, x); } } } @@ -5366,21 +5372,23 @@ } /* If changed lines are few, don't allow preemption, don't scroll. */ - if ((!scroll_region_ok && changed_lines < baud_rate / 2400) + if ((!FRAME_SCROLL_REGION_OK (frame) + && changed_lines < baud_rate / 2400) || unchanged_at_bottom == FRAME_LINES (frame)) return 1; window_size = (FRAME_LINES (frame) - unchanged_at_top - unchanged_at_bottom); - if (scroll_region_ok) + if (FRAME_SCROLL_REGION_OK (frame)) free_at_end_vpos -= unchanged_at_bottom; - else if (memory_below_frame) + else if (FRAME_MEMORY_BELOW_FRAME (frame)) free_at_end_vpos = -1; /* If large window, fast terminal and few lines in common between current frame and desired frame, don't bother with i/d calc. */ - if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400 + if (!FRAME_SCROLL_REGION_OK (frame) + && window_size >= 18 && baud_rate > 2400 && (window_size >= 10 * scrolling_max_lines_saved (unchanged_at_top, FRAME_LINES (frame) - unchanged_at_bottom, @@ -5460,7 +5468,7 @@ struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); int must_write_whole_line_p; - int write_spaces_p = must_write_spaces; + int write_spaces_p = FRAME_MUST_WRITE_SPACES (f); int colored_spaces_p = (FACE_FROM_ID (f, DEFAULT_FACE_ID)->background != FACE_TTY_DEFAULT_BG_COLOR); @@ -5511,8 +5519,8 @@ /* Write the contents of the desired line. */ if (nlen) { - cursor_to (vpos, 0); - write_glyphs (nbody, nlen); + cursor_to (f, vpos, 0); + write_glyphs (f, nbody, nlen); } /* Don't call clear_end_of_line if we already wrote the whole @@ -5520,13 +5528,13 @@ case but in the line below. */ if (nlen < FRAME_TOTAL_COLS (f)) { - cursor_to (vpos, nlen); - clear_end_of_line (FRAME_TOTAL_COLS (f)); + cursor_to (f, vpos, nlen); + clear_end_of_line (f, FRAME_TOTAL_COLS (f)); } else /* Make sure we are in the right row, otherwise cursor movement with cmgoto might use `ch' in the wrong row. */ - cursor_to (vpos, 0); + cursor_to (f, vpos, 0); make_current (desired_matrix, current_matrix, vpos); return; @@ -5539,7 +5547,7 @@ nlen--; /* If there's no i/d char, quickly do the best we can without it. */ - if (!char_ins_del_ok) + if (!FRAME_CHAR_INS_DEL_OK (f)) { int i, j; @@ -5558,8 +5566,8 @@ ++j; /* Output this run of non-matching chars. */ - cursor_to (vpos, i); - write_glyphs (nbody + i, j - i); + cursor_to (f, vpos, i); + write_glyphs (f, nbody + i, j - i); i = j - 1; /* Now find the next non-match. */ @@ -5569,8 +5577,8 @@ /* Clear the rest of the line, or the non-clear part of it. */ if (olen > nlen) { - cursor_to (vpos, nlen); - clear_end_of_line (olen); + cursor_to (f, vpos, nlen); + clear_end_of_line (f, olen); } /* Make current row = desired row. */ @@ -5592,8 +5600,8 @@ if (nlen > nsp) { - cursor_to (vpos, nsp); - write_glyphs (nbody + nsp, nlen - nsp); + cursor_to (f, vpos, nsp); + write_glyphs (f, nbody + nsp, nlen - nsp); } /* Exchange contents between current_frame and new_frame. */ @@ -5642,7 +5650,8 @@ tem = (nlen - nsp) - (olen - osp); if (endmatch && tem - && (!char_ins_del_ok || endmatch <= char_ins_del_cost (f)[tem])) + && (!FRAME_CHAR_INS_DEL_OK (f) + || endmatch <= char_ins_del_cost (f)[tem])) endmatch = 0; /* nsp - osp is the distance to insert or delete. @@ -5651,7 +5660,7 @@ Is it worth it? */ if (nsp != osp - && (!char_ins_del_ok + && (!FRAME_CHAR_INS_DEL_OK (f) || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) { begmatch = 0; @@ -5664,8 +5673,8 @@ if (osp > nsp) { - cursor_to (vpos, nsp); - delete_glyphs (osp - nsp); + cursor_to (f, vpos, nsp); + delete_glyphs (f, osp - nsp); } else if (nsp > osp) { @@ -5674,12 +5683,12 @@ must delete first to avoid losing data in the insert */ if (endmatch && nlen < olen + nsp - osp) { - cursor_to (vpos, nlen - endmatch + osp - nsp); - delete_glyphs (olen + nsp - osp - nlen); + cursor_to (f, vpos, nlen - endmatch + osp - nsp); + delete_glyphs (f, olen + nsp - osp - nlen); olen = nlen - (nsp - osp); } - cursor_to (vpos, osp); - insert_glyphs (0, nsp - osp); + cursor_to (f, vpos, osp); + insert_glyphs (f, 0, nsp - osp); } olen += nsp - osp; @@ -5700,8 +5709,8 @@ unnecessary cursor movement. */ if (nlen - tem > 0) { - cursor_to (vpos, nsp + begmatch); - write_glyphs (nbody + nsp + begmatch, nlen - tem); + cursor_to (f, vpos, nsp + begmatch); + write_glyphs (f, nbody + nsp + begmatch, nlen - tem); } } else if (nlen > olen) @@ -5716,27 +5725,27 @@ int out = olen - tem; /* Columns to be overwritten originally. */ int del; - cursor_to (vpos, nsp + begmatch); + cursor_to (f, vpos, nsp + begmatch); /* Calculate columns we can actually overwrite. */ while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out])) out--; - write_glyphs (nbody + nsp + begmatch, out); + write_glyphs (f, nbody + nsp + begmatch, out); /* If we left columns to be overwritten, we must delete them. */ del = olen - tem - out; if (del > 0) - delete_glyphs (del); + delete_glyphs (f, del); /* At last, we insert columns not yet written out. */ - insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); + insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del); olen = nlen; } else if (olen > nlen) { - cursor_to (vpos, nsp + begmatch); - write_glyphs (nbody + nsp + begmatch, nlen - tem); - delete_glyphs (olen - nlen); + cursor_to (f, vpos, nsp + begmatch); + write_glyphs (f, nbody + nsp + begmatch, nlen - tem); + delete_glyphs (f, olen - nlen); olen = nlen; } } @@ -5745,8 +5754,8 @@ /* If any unerased characters remain after the new line, erase them. */ if (olen > nlen) { - cursor_to (vpos, nlen); - clear_end_of_line (olen); + cursor_to (f, vpos, nlen); + clear_end_of_line (f, olen); } /* Exchange contents between current_frame and new_frame. */ @@ -6043,31 +6052,34 @@ #endif int old_errno = errno; + struct tty_display_info *tty; + signal (SIGWINCH, window_change_signal); SIGNAL_THREAD_CHECK (signalnum); - get_frame_size (&width, &height); - - /* The frame size change obviously applies to a termcap-controlled - frame. Find such a frame in the list, and assume it's the only - one (since the redisplay code always writes to stdout, not a - FILE * specified in the frame structure). Record the new size, - but don't reallocate the data structures now. Let that be done - later outside of the signal handler. */ - - { - Lisp_Object tail, frame; - - FOR_EACH_FRAME (tail, frame) - { - if (FRAME_TERMCAP_P (XFRAME (frame))) - { - change_frame_size (XFRAME (frame), height, width, 0, 1, 0); - break; - } - } + /* The frame size change obviously applies to a single + termcap-controlled terminal, but we can't decide which. + Therefore, we resize the frames corresponding to each tty. + */ + for (tty = tty_list; tty; tty = tty->next) { + + if (! tty->term_initted) + continue; + + get_tty_size (fileno (tty->input), &width, &height); + + if (width > 5 && height > 2) { + Lisp_Object tail, frame; + + FOR_EACH_FRAME (tail, frame) + if (FRAME_TERMCAP_P (XFRAME (frame)) && FRAME_TTY (XFRAME (frame)) == tty) + /* Record the new sizes, but don't reallocate the data + structures now. Let that be done later outside of the + signal handler. */ + change_frame_size (XFRAME (frame), height, width, 0, 1, 0); + } } - + errno = old_errno; } #endif /* SIGWINCH */ @@ -6121,10 +6133,11 @@ { Lisp_Object tail, frame; - if (! FRAME_WINDOW_P (f)) + if (FRAME_MSDOS_P (f)) { - /* When using termcap, or on MS-DOS, all frames use - the same screen, so a change in size affects all frames. */ + /* On MS-DOS, all frames use the same screen, so a change in + size affects all frames. Termcap now supports multiple + ttys. */ FOR_EACH_FRAME (tail, frame) if (! FRAME_WINDOW_P (XFRAME (frame))) change_frame_size_1 (XFRAME (frame), newheight, newwidth, @@ -6204,7 +6217,7 @@ newheight - FRAME_TOP_MARGIN (f), 0); if (FRAME_TERMCAP_P (f) && !pretend) - FrameRows = newheight; + FrameRows (FRAME_TTY (f)) = newheight; } if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) @@ -6214,7 +6227,7 @@ set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); if (FRAME_TERMCAP_P (f) && !pretend) - FrameCols = newwidth; + FrameCols (FRAME_TTY (f)) = newwidth; if (WINDOWP (f->tool_bar_window)) XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); @@ -6264,14 +6277,22 @@ (file) Lisp_Object file; { - if (termscript != 0) fclose (termscript); - termscript = 0; + struct tty_display_info *tty; + + if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) + error ("Current frame is not on a tty device"); + + tty = CURTTY (); + + if (tty->termscript != 0) + fclose (tty->termscript); + tty->termscript = 0; if (! NILP (file)) { file = Fexpand_file_name (file, Qnil); - termscript = fopen (SDATA (file), "w"); - if (termscript == 0) + tty->termscript = fopen (SDATA (file), "w"); + if (tty->termscript == 0) report_file_error ("Opening termscript", Fcons (file, Qnil)); } return Qnil; @@ -6279,22 +6300,35 @@ DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, - Ssend_string_to_terminal, 1, 1, 0, + Ssend_string_to_terminal, 1, 2, 0, doc: /* Send STRING to the terminal without alteration. -Control characters in STRING will have terminal-dependent effects. */) - (string) +Control characters in STRING will have terminal-dependent effects. + +Optional parameter TERMINAL specifies the tty display device to use. +It may be a terminal id, a frame, or nil for the terminal used by the +currently selected frame. */) + (string, display) Lisp_Object string; + Lisp_Object display; { + struct device *d = get_tty_device (display); + struct tty_display_info *tty; + /* ??? Perhaps we should do something special for multibyte strings here. */ CHECK_STRING (string); - fwrite (SDATA (string), 1, SBYTES (string), stdout); - fflush (stdout); - if (termscript) + + if (!d) + error ("Unknown display device"); + + tty = d->display_info.tty; + + if (tty->termscript) { - fwrite (SDATA (string), 1, SBYTES (string), - termscript); - fflush (termscript); + fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); + fflush (tty->termscript); } + fwrite (SDATA (string), 1, SBYTES (string), tty->output); + fflush (tty->output); return Qnil; } @@ -6311,8 +6345,7 @@ if (noninteractive) putchar (07); else - ring_bell (); - fflush (stdout); + ring_bell (XFRAME (selected_frame)); } else bitch_at_user (); @@ -6328,8 +6361,7 @@ else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ error ("Keyboard macro terminated by a command ringing the bell"); else - ring_bell (); - fflush (stdout); + ring_bell (XFRAME (selected_frame)); } @@ -6611,8 +6643,6 @@ Initialization ***********************************************************************/ -char *terminal_type; - /* Initialization done when Emacs fork is started, before doing stty. Determine terminal type and set terminal_driver. Then invoke its decoding routine to set up variables in the terminal package. */ @@ -6620,6 +6650,8 @@ void init_display () { + char *terminal_type; + #ifdef HAVE_X_WINDOWS extern int display_arg; #endif @@ -6629,14 +6661,23 @@ SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); space_glyph.charpos = -1; - meta_key = 0; inverse_video = 0; cursor_in_echo_area = 0; terminal_type = (char *) 0; /* Now is the time to initialize this; it's used by init_sys_modes during startup. */ - Vwindow_system = Qnil; + Vinitial_window_system = Qnil; + + /* SIGWINCH needs to be handled no matter what display we start + with. Otherwise newly opened tty frames will not resize + automatically. */ +#ifdef SIGWINCH +#ifndef CANNOT_DUMP + if (initialized) +#endif /* CANNOT_DUMP */ + signal (SIGWINCH, window_change_signal); +#endif /* SIGWINCH */ /* If the user wants to use a window system, we shouldn't bother initializing the terminal. This is especially important when the @@ -6665,7 +6706,7 @@ #endif ) { - Vwindow_system = intern ("x"); + Vinitial_window_system = intern ("x"); #ifdef HAVE_X11 Vwindow_system_version = make_number (11); #else @@ -6685,7 +6726,7 @@ #ifdef HAVE_NTGUI if (!inhibit_window_system) { - Vwindow_system = intern ("w32"); + Vinitial_window_system = intern ("w32"); Vwindow_system_version = make_number (1); adjust_frame_glyphs_initially (); return; @@ -6695,7 +6736,7 @@ #ifdef MAC_OS if (!inhibit_window_system) { - Vwindow_system = intern ("mac"); + Vinitial_window_system = intern ("mac"); Vwindow_system_version = make_number (1); adjust_frame_glyphs_initially (); return; @@ -6741,8 +6782,38 @@ } #endif /* VMS */ - term_init (terminal_type); - + { + struct device *d; + struct frame *f = XFRAME (selected_frame); + + /* Open a display on the controlling tty. */ + d = init_tty (0, terminal_type, 1); /* Errors are fatal. */ + + /* Convert the initial frame to use the new display. */ + if (f->output_method != output_initial) + abort (); + f->output_method = d->type; + f->device = d; + + d->reference_count++; + d->display_info.tty->top_frame = selected_frame; + change_frame_size (XFRAME (selected_frame), + FrameRows (d->display_info.tty), + FrameCols (d->display_info.tty), 0, 0, 1); + + /* Delete the initial display. */ + if (--initial_device->reference_count == 0 + && initial_device->delete_device_hook) + (*initial_device->delete_device_hook) (initial_device); + + /* Update frame parameters to reflect the new type. */ + Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); + Fmodify_frame_parameters + (selected_frame, Fcons (Fcons (Qtty_type, + Fdisplay_tty_type (selected_frame)), Qnil)); + Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil)); + } + { struct frame *sf = SELECTED_FRAME (); int width = FRAME_TOTAL_COLS (sf); @@ -6759,13 +6830,6 @@ adjust_frame_glyphs_initially (); calculate_costs (XFRAME (selected_frame)); -#ifdef SIGWINCH -#ifndef CANNOT_DUMP - if (initialized) -#endif /* CANNOT_DUMP */ - signal (SIGWINCH, window_change_signal); -#endif /* SIGWINCH */ - /* Set up faces of the initial terminal frame of a dumped Emacs. */ if (initialized && !noninteractive @@ -6776,7 +6840,7 @@ and internal_terminal_init. */ && (strcmp (terminal_type, "internal") != 0 || inhibit_window_system) #endif - && NILP (Vwindow_system)) + && NILP (Vinitial_window_system)) { /* For the initial frame, we don't have any way of knowing what are the foreground and background colors of the terminal. */ @@ -6888,8 +6952,8 @@ Emacs's frame display when you reenter Emacs. It is up to you to set this variable if your terminal can do that. */); - DEFVAR_LISP ("window-system", &Vwindow_system, - doc: /* Name of window system that Emacs is displaying through. + DEFVAR_LISP ("initial-window-system", &Vinitial_window_system, + doc: /* Name of the window system that Emacs uses for the first frame. The value is a symbol--for instance, `x' for X windows. The value is nil if Emacs is using a text-only terminal. */); @@ -6925,7 +6989,7 @@ if (noninteractive) #endif { - Vwindow_system = Qnil; + Vinitial_window_system = Qnil; Vwindow_system_version = Qnil; } }
--- a/src/emacs.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/emacs.c Mon Dec 19 19:57:22 2005 +0000 @@ -57,6 +57,7 @@ #include "blockinput.h" #include "syssignal.h" #include "process.h" +#include "frame.h" #include "termhooks.h" #include "keyboard.h" #include "keymap.h" @@ -211,7 +212,7 @@ #ifdef HAVE_WINDOW_SYSTEM -extern Lisp_Object Vwindow_system; +extern Lisp_Object Vinitial_window_system; #endif /* HAVE_WINDOW_SYSTEM */ extern Lisp_Object Vauto_save_list_file_name; @@ -785,7 +786,7 @@ #define REPORT_EMACS_BUG_ADDRESS "bug-gnu-emacs@gnu.org" -#define REPORT_EMACS_BUG_PRETEST_ADDRESS "emacs-pretest-bug@gnu.org" +#define REPORT_EMACS_BUG_PRETEST_ADDRESS "multi-tty@lists.fnord.hu" /* This function is used to determine an address to which bug report should be sent. */ @@ -1314,6 +1315,9 @@ faces, and the face implementation uses some symbols as face names. */ syms_of_xfaces (); + /* XXX syms_of_keyboard uses some symbols in keymap.c. It would + be better to arrange things not to have this dependency. */ + syms_of_keymap (); /* Call syms_of_keyboard before init_window_once because keyboard sets up symbols that include some face names that the X support will want to use. This can happen when @@ -1585,7 +1589,7 @@ #endif /* CLASH_DETECTION */ syms_of_indent (); syms_of_insdel (); - syms_of_keymap (); + /* syms_of_keymap (); */ syms_of_macros (); syms_of_marker (); syms_of_minibuf (); @@ -1680,13 +1684,7 @@ #endif /* HAVE_NTGUI */ } - if (!noninteractive) - { -#ifdef VMS - init_vms_input ();/* init_display calls get_frame_size, that needs this. */ -#endif /* VMS */ - init_display (); /* Determine terminal type. init_sys_modes uses results. */ - } + init_process (); /* init_display uses add_keyboard_wait_descriptor. */ #ifndef MAC_OS8 /* Called before init_window_once for Mac OS Classic. */ init_keyboard (); /* This too must precede init_sys_modes. */ @@ -1694,7 +1692,13 @@ #ifdef VMS init_vmsproc (); /* And this too. */ #endif /* VMS */ - init_sys_modes (); /* Init system terminal modes (RAW or CBREAK, etc.). */ + if (!noninteractive) + { +#ifdef VMS + init_vms_input ();/* init_display calls get_tty_size, that needs this. */ +#endif /* VMS */ + init_display (); /* Determine terminal type. Calls init_sys_modes. */ + } init_fns (); init_xdisp (); #ifdef HAVE_WINDOW_SYSTEM @@ -1707,7 +1711,6 @@ #ifdef VMS init_vmsfns (); #endif /* VMS */ - init_process (); #ifdef HAVE_SOUND init_sound (); #endif @@ -2114,15 +2117,14 @@ if (EMACS_GET_TTY_PGRP (0, &tpgrp) != -1 && tpgrp == pgrp) { - fflush (stdout); - reset_sys_modes (); + reset_all_sys_modes (); if (sig && sig != SIGTERM) fprintf (stderr, "Fatal error (%d)", sig); } } #else fflush (stdout); - reset_sys_modes (); + reset_all_sys_modes (); #endif stuff_buffered_input (stuff); @@ -2141,9 +2143,9 @@ #if 0 /* This triggers a bug in XCloseDisplay and is not needed. */ #ifdef HAVE_X_WINDOWS /* It's not safe to call intern here. Maybe we are crashing. */ - if (!noninteractive && SYMBOLP (Vwindow_system) - && SCHARS (SYMBOL_NAME (Vwindow_system)) == 1 - && SREF (SYMBOL_NAME (Vwindow_system), 0) == 'x' + if (!noninteractive && SYMBOLP (Vinitial_window_system) + && SCHARS (SYMBOL_NAME (Vinitial_window_system)) == 1 + && SREF (SYMBOL_NAME (Vinitial_window_system), 0) == 'x' && ! no_x) Fx_close_current_connection (); #endif /* HAVE_X_WINDOWS */
--- a/src/fileio.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/fileio.c Mon Dec 19 19:57:22 2005 +0000 @@ -77,6 +77,8 @@ #include "charset.h" #include "coding.h" #include "window.h" +#include "frame.h" +#include "dispextern.h" #ifdef WINDOWSNT #define NOMINMAX 1 @@ -5781,7 +5783,7 @@ char *msgbuf; USE_SAFE_ALLOCA; - ring_bell (); + ring_bell (XFRAME (selected_frame)); args[0] = build_string ("Auto-saving %s: %s"); args[1] = current_buffer->name;
--- a/src/fns.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/fns.c Mon Dec 19 19:57:22 2005 +0000 @@ -48,6 +48,7 @@ #include "frame.h" #include "window.h" #include "blockinput.h" +#include "termhooks.h" /* For display->kboard reference in terminal-local-value. */ #if defined (HAVE_MENUS) && defined (HAVE_X_WINDOWS) #include "xterm.h" #endif @@ -3267,7 +3268,8 @@ { #ifdef HAVE_MENUS - if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) + if (FRAME_WINDOW_P (SELECTED_FRAME ()) + && (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) && use_dialog_box && have_menus_p ()) { @@ -3306,7 +3308,9 @@ Fraise_frame (mini_frame); } + temporarily_switch_to_single_kboard (FRAME_KBOARD (SELECTED_FRAME ())); obj = read_filtered_event (1, 0, 0, 0); + cursor_in_echo_area = 0; /* If we need to quit, quit with cursor_in_echo_area = 0. */ QUIT; @@ -3398,7 +3402,8 @@ CHECK_STRING (prompt); #ifdef HAVE_MENUS - if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) + if (FRAME_WINDOW_P (SELECTED_FRAME ()) + && (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) && use_dialog_box && have_menus_p ()) {
--- a/src/fontset.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/fontset.c Mon Dec 19 19:57:22 2005 +0000 @@ -46,6 +46,7 @@ #ifdef MAC_OS #include "macterm.h" #endif +#include "termhooks.h" #ifdef FONTSET_DEBUG #undef xassert @@ -1344,7 +1345,7 @@ STORE_XCHAR2B (&char2b, c1, c2); else STORE_XCHAR2B (&char2b, 0, c1); - rif->encode_char (c, &char2b, fontp, NULL); + FRAME_RIF (f)->encode_char (c, &char2b, fontp, NULL); code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b); } return Fcons (build_string (face->font_name), make_number (code));
--- a/src/frame.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/frame.c Mon Dec 19 19:57:22 2005 +0000 @@ -42,6 +42,7 @@ #include "fontset.h" #endif #include "blockinput.h" +#include "termchar.h" #include "termhooks.h" #include "dispextern.h" #include "window.h" @@ -75,6 +76,8 @@ Lisp_Object Qx_frame_parameter; Lisp_Object Qx_resource_name; +Lisp_Object Qdevice; +Lisp_Object Qdisplay_live_p; /* Frame parameters (set or reported). */ @@ -106,12 +109,13 @@ Lisp_Object Qleft_fringe, Qright_fringe; Lisp_Object Qbuffer_predicate, Qbuffer_list; Lisp_Object Qtty_color_mode; +Lisp_Object Qtty, Qtty_type; +Lisp_Object Qwindow_system; Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth; Lisp_Object Qface_set_after_frame_default; - Lisp_Object Vterminal_frame; Lisp_Object Vdefault_frame_alist; Lisp_Object Vdefault_frame_scroll_bars; @@ -121,8 +125,8 @@ static void set_menu_bar_lines_1 (window, n) - Lisp_Object window; - int n; + Lisp_Object window; + int n; { struct window *w = XWINDOW (window); @@ -180,8 +184,6 @@ Lisp_Object Vemacs_iconified; Lisp_Object Vframe_list; -struct x_output tty_display; - extern Lisp_Object Vminibuffer_list; extern Lisp_Object get_minibuffer (); extern Lisp_Object Fhandle_switch_frame (); @@ -203,6 +205,7 @@ return Qnil; switch (XFRAME (object)->output_method) { + case output_initial: /* The initial frame is like a termcap frame. */ case output_termcap: return Qt; case output_x_window: @@ -233,6 +236,30 @@ : Qnil); } +DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0, + doc: /* The name of the window system that FRAME is displaying through. +The value is a symbol---for instance, 'x' for X windows. +The value is nil if Emacs is using a text-only terminal. + +FRAME defaults to the currently selected frame. */) + (frame) + Lisp_Object frame; +{ + Lisp_Object type; + if (NILP (frame)) + frame = selected_frame; + + type = Fframep (frame); + + if (NILP (type)) + wrong_type_argument (Qframep, frame); + + if (EQ (type, Qt)) + return Qnil; + else + return type; +} + struct frame * make_frame (mini_p) int mini_p; @@ -276,9 +303,6 @@ f->menu_bar_items_used = 0; f->buffer_predicate = Qnil; f->buffer_list = Qnil; -#ifdef MULTI_KBOARD - f->kboard = initial_kboard; -#endif f->namebuf = 0; f->title = Qnil; f->menu_bar_window = Qnil; @@ -398,7 +422,7 @@ #ifdef MULTI_KBOARD if (!NILP (mini_window) - && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) + && XFRAME (XWINDOW (mini_window)->frame)->device->kboard != kb) error ("Frame and minibuffer must be on the same display"); #endif @@ -475,18 +499,19 @@ } #endif /* HAVE_WINDOW_SYSTEM */ -/* Construct a frame that refers to the terminal (stdin and stdout). */ +/* Construct a frame that refers to a terminal. */ static int terminal_frame_count; struct frame * -make_terminal_frame () +make_initial_frame (void) { - register struct frame *f; + struct frame *f; + struct device *device; Lisp_Object frame; - char name[20]; #ifdef MULTI_KBOARD + /* Create the initial keyboard. */ if (!initial_kboard) { initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); @@ -500,6 +525,41 @@ if (! (NILP (Vframe_list) || CONSP (Vframe_list))) Vframe_list = Qnil; + device = init_initial_device (); + + f = make_frame (1); + XSETFRAME (frame, f); + + Vframe_list = Fcons (frame, Vframe_list); + + terminal_frame_count = 1; + f->name = build_string ("F1"); + + f->visible = 1; + f->async_visible = 1; + + f->output_method = device->type; + f->device = device; + f->device->reference_count++; + f->output_data.nothing = 0; + + FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; + FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; + + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; + FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; + + return f; +} + + +struct frame * +make_terminal_frame (struct device *device) +{ + register struct frame *f; + Lisp_Object frame; + char name[20]; + f = make_frame (1); XSETFRAME (frame, f); @@ -538,12 +598,31 @@ #else #ifdef WINDOWSNT f->output_method = output_termcap; - f->output_data.x = &tty_display; + f->output_data.x = &tty_display; /* XXX ??? */ #else #ifdef MAC_OS8 make_mac_terminal_frame (f); #else - f->output_data.x = &tty_display; + { + f->output_method = output_termcap; + f->device = device; + f->device->reference_count++; + create_tty_output (f); + + FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; + FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; + + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; + FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; + + /* Set the top frame to the newly created frame. */ + if (FRAME_TTY (f)->top_frame + && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame))) + XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */ + + FRAME_TTY (f)->top_frame = frame; + } + #ifdef CANNOT_DUMP FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR; FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR; @@ -560,18 +639,30 @@ DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame, 1, 1, 0, - doc: /* Create an additional terminal frame. -You can create multiple frames on a text-only terminal in this way. -Only the selected terminal frame is actually displayed. + doc: /* Create an additional terminal frame, possibly on another terminal. This function takes one argument, an alist specifying frame parameters. -In practice, generally you don't need to specify any parameters. -Note that changing the size of one terminal frame automatically affects all. */) + +You can create multiple frames on a single text-only terminal, but +only one of them (the selected terminal frame) is actually displayed. + +In practice, generally you don't need to specify any parameters, +except when you want to create a new frame on another terminal. +In that case, the `tty' parameter specifies the device file to open, +and the `tty-type' parameter specifies the terminal type. Example: + + (make-terminal-frame '((tty . "/dev/pts/5") (tty-type . "xterm"))) + +Note that changing the size of one terminal frame automatically +affects all frames on the same terminal device. */) (parms) Lisp_Object parms; { struct frame *f; + struct device *d = NULL; Lisp_Object frame, tem; struct frame *sf = SELECTED_FRAME (); + Lisp_Object tty, tty_type; + struct gcpro gcpro1, gcpro2; #ifdef MSDOS if (sf->output_method != output_msdos_raw @@ -583,21 +674,91 @@ if (sf->output_method != output_mac) error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); #else +#if 0 /* This should work now! */ if (sf->output_method != output_termcap) error ("Not using an ASCII terminal now; cannot make a new ASCII frame"); #endif +#endif #endif /* not MSDOS */ - - f = make_terminal_frame (); - - change_frame_size (f, FRAME_LINES (sf), - FRAME_COLS (sf), 0, 0, 0); + + { + Lisp_Object display_device; + + display_device = Fassq (Qdevice, parms); + if (!NILP (display_device)) + { + display_device = XCDR (display_device); + CHECK_NUMBER (display_device); + d = get_device (XINT (display_device), 1); + } + } + + if (!d) + { + char *name = 0, *type = 0; + + tty = Fassq (Qtty, parms); + if (EQ (tty, Qnil)) + tty = Fassq (Qtty, XFRAME (selected_frame)->param_alist); + if (EQ (tty, Qnil) && FRAME_TERMCAP_P (XFRAME (selected_frame)) + && FRAME_TTY (XFRAME (selected_frame))->name) + tty = build_string (FRAME_TTY (XFRAME (selected_frame))->name); + if (EQ (tty, Qnil)) + tty = Fassq (Qtty, Vdefault_frame_alist); + if (! EQ (tty, Qnil) && ! STRINGP (tty)) + tty = XCDR (tty); + if (EQ (tty, Qnil) || !STRINGP (tty)) + tty = Qnil; + + tty_type = Fassq (Qtty_type, parms); + if (EQ (tty_type, Qnil)) + tty_type = Fassq (Qtty_type, XFRAME (selected_frame)->param_alist); + if (EQ (tty_type, Qnil) && FRAME_TERMCAP_P (XFRAME (selected_frame)) + && FRAME_TTY (XFRAME (selected_frame))->type) + tty_type = build_string (FRAME_TTY (XFRAME (selected_frame))->type); + if (EQ (tty_type, Qnil)) + tty_type = Fassq (Qtty_type, Vdefault_frame_alist); + if (! EQ (tty_type, Qnil) && ! STRINGP (tty_type)) + tty_type = XCDR (tty_type); + if (EQ (tty_type, Qnil) || !STRINGP (tty_type)) + tty_type = Qnil; + + if (! EQ (tty, Qnil)) + { + name = (char *) alloca (SBYTES (tty) + 1); + strncpy (name, SDATA (tty), SBYTES (tty)); + name[SBYTES (tty)] = 0; + } + + if (! EQ (tty_type, Qnil)) + { + type = (char *) alloca (SBYTES (tty_type) + 1); + strncpy (type, SDATA (tty_type), SBYTES (tty_type)); + type[SBYTES (tty_type)] = 0; + } + + d = init_tty (name, type, 0); /* Errors are not fatal. */ + } + + f = make_terminal_frame (d); + + { + int width, height; + get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height); + change_frame_size (f, height, width, 0, 0, 0); + } + adjust_glyphs (f); calculate_costs (f); XSETFRAME (frame, f); + GCPRO2 (tty_type, tty); Fmodify_frame_parameters (frame, Vdefault_frame_alist); Fmodify_frame_parameters (frame, parms); - + Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); + Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, tty_type), Qnil)); + Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, tty), Qnil)); + UNGCPRO; + /* Make the frame face alist be frame-specific, so that each frame could change its face definitions independently. */ f->face_alist = Fcopy_alist (sf->face_alist); @@ -695,6 +856,15 @@ if (!for_deletion && FRAME_HAS_MINIBUF_P (sf)) resize_mini_window (XWINDOW (FRAME_MINIBUF_WINDOW (sf)), 1); + if (FRAME_TERMCAP_P (XFRAME (selected_frame)) + && FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_TTY (XFRAME (selected_frame)) == FRAME_TTY (XFRAME (frame))) + { + XFRAME (selected_frame)->async_visible = 2; /* obscured */ + XFRAME (frame)->async_visible = 1; + FRAME_TTY (XFRAME (frame))->top_frame = frame; + } + selected_frame = frame; if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) last_nonminibuf_frame = XFRAME (selected_frame); @@ -879,6 +1049,31 @@ return XFRAME (frame)->selected_window = window; } + +DEFUN ("frame-display", Fframe_display, Sframe_display, 0, 1, 0, + doc: /* Return the display device that FRAME is displayed on. +If FRAME is nil, the selected frame is used. + +The display device is represented by its integer identifier. */) + (frame) + Lisp_Object frame; +{ + struct device *d; + + if (NILP (frame)) + frame = selected_frame; + + CHECK_LIVE_FRAME (frame); + + d = get_device (frame, 0); + + if (!d) + return Qnil; + else + return make_number (d->id); +} + + DEFUN ("frame-list", Fframe_list, Sframe_list, 0, 0, 0, doc: /* Return a list of all frames. */) @@ -925,7 +1120,10 @@ f = XCAR (tail); if (passed - && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) + && ((!FRAME_TERMCAP_P (XFRAME (f)) && !FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) + || (FRAME_TERMCAP_P (XFRAME (f)) && FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_TTY (XFRAME (f)) == FRAME_TTY (XFRAME (frame))))) { /* Decide whether this frame is eligible to be returned. */ @@ -1002,7 +1200,10 @@ if (EQ (frame, f) && !NILP (prev)) return prev; - if (FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) + if ((!FRAME_TERMCAP_P (XFRAME (f)) && !FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) + || (FRAME_TERMCAP_P (XFRAME (f)) && FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_TTY (XFRAME (f)) == FRAME_TTY (XFRAME (frame)))) { /* Decide whether this frame is eligible to be returned, according to minibuf. */ @@ -1151,6 +1352,8 @@ { struct frame *f; struct frame *sf = SELECTED_FRAME (); + struct kboard *kb; + int minibuffer_selected; if (EQ (frame, Qnil)) @@ -1214,6 +1417,10 @@ Frun_hook_with_args (2, args); } + /* The hook may sometimes (indirectly) cause the frame to be deleted. */ + if (! FRAME_LIVE_P (f)) + return Qnil; + minibuffer_selected = EQ (minibuf_window, selected_window); /* Don't let the frame remain selected. */ @@ -1229,7 +1436,7 @@ { FOR_EACH_FRAME (tail, frame1) { - if (! EQ (frame, frame1)) + if (! EQ (frame, frame1) && FRAME_LIVE_P (XFRAME (frame1))) break; } } @@ -1300,13 +1507,28 @@ promise that the display of the frame must be valid until we have called the window-system-dependent frame destruction routine. */ - /* I think this should be done with a hook. */ -#ifdef HAVE_WINDOW_SYSTEM - if (FRAME_WINDOW_P (f)) - x_destroy_window (f); -#endif - - f->output_data.nothing = 0; + if (FRAME_DEVICE (f)->delete_frame_hook) + (*FRAME_DEVICE (f)->delete_frame_hook) (f); + + { + struct device *device = FRAME_DEVICE (f); + f->output_data.nothing = 0; + f->device = 0; /* Now the frame is dead. */ + + /* If needed, delete the device that this frame was on. + (This must be done after the frame is killed.) */ + device->reference_count--; + if (device->reference_count == 0) + { + kb = NULL; + if (device->delete_device_hook) + (*device->delete_device_hook) (device); + else + delete_device (device); + } + else + kb = device->kboard; + } /* If we've deleted the last_nonminibuf_frame, then try to find another one. */ @@ -1331,38 +1553,39 @@ /* If there's no other frame on the same kboard, get out of single-kboard state if we're in it for this kboard. */ - { - Lisp_Object frames; - /* Some frame we found on the same kboard, or nil if there are none. */ - Lisp_Object frame_on_same_kboard; - - frame_on_same_kboard = Qnil; - - for (frames = Vframe_list; - CONSP (frames); - frames = XCDR (frames)) - { - Lisp_Object this; - struct frame *f1; - - this = XCAR (frames); - if (!FRAMEP (this)) - abort (); - f1 = XFRAME (this); - - if (FRAME_KBOARD (f) == FRAME_KBOARD (f1)) - frame_on_same_kboard = this; - } - - if (NILP (frame_on_same_kboard)) - not_single_kboard_state (FRAME_KBOARD (f)); - } + if (kb != NULL) + { + Lisp_Object frames; + /* Some frame we found on the same kboard, or nil if there are none. */ + Lisp_Object frame_on_same_kboard; + + frame_on_same_kboard = Qnil; + + for (frames = Vframe_list; + CONSP (frames); + frames = XCDR (frames)) + { + Lisp_Object this; + struct frame *f1; + + this = XCAR (frames); + if (!FRAMEP (this)) + abort (); + f1 = XFRAME (this); + + if (kb == FRAME_KBOARD (f1)) + frame_on_same_kboard = this; + } + + if (NILP (frame_on_same_kboard)) + not_single_kboard_state (kb); + } /* If we've deleted this keyboard's default_minibuffer_frame, try to find another one. Prefer minibuffer-only frames, but also notice frames with other windows. */ - if (EQ (frame, FRAME_KBOARD (f)->Vdefault_minibuffer_frame)) + if (kb != NULL && EQ (frame, kb->Vdefault_minibuffer_frame)) { Lisp_Object frames; @@ -1388,7 +1611,7 @@ /* Consider only frames on the same kboard and only those with minibuffers. */ - if (FRAME_KBOARD (f) == FRAME_KBOARD (f1) + if (kb == FRAME_KBOARD (f1) && FRAME_HAS_MINIBUF_P (f1)) { frame_with_minibuf = this; @@ -1396,7 +1619,7 @@ break; } - if (FRAME_KBOARD (f) == FRAME_KBOARD (f1)) + if (kb == FRAME_KBOARD (f1)) frame_on_same_kboard = this; } @@ -1411,11 +1634,11 @@ if (NILP (frame_with_minibuf)) abort (); - FRAME_KBOARD (f)->Vdefault_minibuffer_frame = frame_with_minibuf; + kb->Vdefault_minibuffer_frame = frame_with_minibuf; } else /* No frames left on this kboard--say no minibuffer either. */ - FRAME_KBOARD (f)->Vdefault_minibuffer_frame = Qnil; + kb->Vdefault_minibuffer_frame = Qnil; } /* Cause frame titles to update--necessary if we now have just one frame. */ @@ -1451,11 +1674,11 @@ #ifdef HAVE_MOUSE /* It's okay for the hook to refrain from storing anything. */ - if (mouse_position_hook) - (*mouse_position_hook) (&f, -1, - &lispy_dummy, &party_dummy, - &x, &y, - &long_dummy); + if (FRAME_DEVICE (f)->mouse_position_hook) + (*FRAME_DEVICE (f)->mouse_position_hook) (&f, -1, + &lispy_dummy, &party_dummy, + &x, &y, + &long_dummy); if (! NILP (x)) { col = XINT (x); @@ -1494,11 +1717,11 @@ #ifdef HAVE_MOUSE /* It's okay for the hook to refrain from storing anything. */ - if (mouse_position_hook) - (*mouse_position_hook) (&f, -1, - &lispy_dummy, &party_dummy, - &x, &y, - &long_dummy); + if (FRAME_DEVICE (f)->mouse_position_hook) + (*FRAME_DEVICE (f)->mouse_position_hook) (&f, -1, + &lispy_dummy, &party_dummy, + &x, &y, + &long_dummy); #endif XSETFRAME (lispy_dummy, f); return Fcons (lispy_dummy, Fcons (x, y)); @@ -1764,16 +1987,19 @@ (frame) Lisp_Object frame; { + struct frame *f; if (NILP (frame)) frame = selected_frame; CHECK_LIVE_FRAME (frame); + f = XFRAME (frame); + /* Do like the documentation says. */ Fmake_frame_visible (frame); - if (frame_raise_lower_hook) - (*frame_raise_lower_hook) (XFRAME (frame), 1); + if (FRAME_DEVICE (f)->frame_raise_lower_hook) + (*FRAME_DEVICE (f)->frame_raise_lower_hook) (f, 1); return Qnil; } @@ -1787,13 +2013,17 @@ (frame) Lisp_Object frame; { + struct frame *f; + if (NILP (frame)) frame = selected_frame; CHECK_LIVE_FRAME (frame); - if (frame_raise_lower_hook) - (*frame_raise_lower_hook) (XFRAME (frame), 0); + f = XFRAME (frame); + + if (FRAME_DEVICE (f)->frame_raise_lower_hook) + (*FRAME_DEVICE (f)->frame_raise_lower_hook) (f, 0); return Qnil; } @@ -1827,6 +2057,8 @@ (frame, focus_frame) Lisp_Object frame, focus_frame; { + struct frame *f; + /* Note that we don't check for a live frame here. It's reasonable to redirect the focus of a frame you're about to delete, if you know what other frame should receive those keystrokes. */ @@ -1835,10 +2067,12 @@ if (! NILP (focus_frame)) CHECK_LIVE_FRAME (focus_frame); - XFRAME (frame)->focus_frame = focus_frame; - - if (frame_rehighlight_hook) - (*frame_rehighlight_hook) (XFRAME (frame)); + f = XFRAME (frame); + + f->focus_frame = focus_frame; + + if (FRAME_DEVICE (f)->frame_rehighlight_hook) + (*FRAME_DEVICE (f)->frame_rehighlight_hook) (f); return Qnil; } @@ -2732,8 +2966,8 @@ if (NATNUMP (param_index) && (XFASTINT (param_index) < sizeof (frame_parms)/sizeof (frame_parms[0])) - && rif->frame_parm_handlers[XINT (param_index)]) - (*(rif->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); + && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)]) + (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); } } } @@ -2776,8 +3010,8 @@ if (NATNUMP (param_index) && (XFASTINT (param_index) < sizeof (frame_parms)/sizeof (frame_parms[0])) - && rif->frame_parm_handlers[XINT (param_index)]) - (*(rif->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); + && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)]) + (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); } } @@ -3971,7 +4205,13 @@ staticpro (&Qbackground_mode); Qtty_color_mode = intern ("tty-color-mode"); staticpro (&Qtty_color_mode); - + Qtty = intern ("tty"); + staticpro (&Qtty); + Qtty_type = intern ("tty-type"); + staticpro (&Qtty_type); + Qwindow_system = intern ("window-system"); + staticpro (&Qwindow_system); + Qface_set_after_frame_default = intern ("face-set-after-frame-default"); staticpro (&Qface_set_after_frame_default); @@ -3987,6 +4227,11 @@ Qx_frame_parameter = intern ("x-frame-parameter"); staticpro (&Qx_frame_parameter); + Qdevice = intern ("device"); + staticpro (&Qdevice); + Qdisplay_live_p = intern ("display-live-p"); + staticpro (&Qdisplay_live_p); + { int i; @@ -4060,7 +4305,7 @@ staticpro (&Qinhibit_default_face_x_resources); DEFVAR_LISP ("terminal-frame", &Vterminal_frame, - doc: /* The initial frame-object, which represents Emacs's stdout. */); + doc: /* The initial frame-object, which represents Emacs's stdout. */); DEFVAR_LISP ("emacs-iconified", &Vemacs_iconified, doc: /* Non-nil if all of emacs is iconified and frame updates are not needed. */); @@ -4085,7 +4330,14 @@ DEFVAR_LISP ("delete-frame-functions", &Vdelete_frame_functions, doc: /* Functions to be run before deleting a frame. The functions are run with one arg, the frame to be deleted. -See `delete-frame'. */); +See `delete-frame'. + +Note that functions in this list may be called twice on the same +frame. In the second invocation, the frame is already deleted, and +the function should do nothing. (You can use `frame-live-p' to check +for this.) This wrinkle happens when an earlier function in +`delete-frame-functions' (indirectly) calls delete-frame +recursively. */); Vdelete_frame_functions = Qnil; DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, @@ -4108,6 +4360,7 @@ defsubr (&Sactive_minibuffer_window); defsubr (&Sframep); defsubr (&Sframe_live_p); + defsubr (&Swindow_system); defsubr (&Smake_terminal_frame); defsubr (&Shandle_switch_frame); defsubr (&Sselect_frame); @@ -4117,6 +4370,7 @@ defsubr (&Sframe_first_window); defsubr (&Sframe_selected_window); defsubr (&Sset_frame_selected_window); + defsubr (&Sframe_display); defsubr (&Sframe_list); defsubr (&Snext_frame); defsubr (&Sprevious_frame);
--- a/src/frame.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/frame.h Mon Dec 19 19:57:22 2005 +0000 @@ -29,9 +29,7 @@ /* Miscellanea. */ -/* Nonzero means don't assume anything about current contents of - actual terminal frame */ - +/* Nonzero means there is at least one garbaged frame. */ extern int frame_garbaged; /* Nonzero means FRAME_MESSAGE_BUF (selected_frame) is being used by @@ -44,6 +42,7 @@ enum output_method { + output_initial, output_termcap, output_x_window, output_msdos_raw, @@ -68,30 +67,10 @@ HBAR_CURSOR }; -#if !defined(MSDOS) && !defined(WINDOWSNT) && !defined(MAC_OS) - -#if !defined(HAVE_X_WINDOWS) - -#define PIX_TYPE int +#define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel) +#define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel) -/* A (mostly empty) x_output structure definition for building Emacs - on Unix and GNU/Linux without X support. */ -struct x_output -{ - PIX_TYPE background_pixel; - PIX_TYPE foreground_pixel; -}; - -#endif /* ! HAVE_X_WINDOWS */ - - -#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) -#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) - -/* A structure describing a termcap frame display. */ -extern struct x_output tty_display; - -#endif /* ! MSDOS && ! WINDOWSNT && ! MAC_OS */ +struct device; struct frame { @@ -153,7 +132,7 @@ Actually, we don't specify exactly what is stored here at all; the scroll bar implementation code can use it to store anything it likes. This field is marked by the garbage collector. It is here - instead of in the `display' structure so that the garbage + instead of in the `device' structure so that the garbage collector doesn't need to look inside the window-system-dependent structure. */ Lisp_Object scroll_bars; @@ -282,20 +261,24 @@ /* Canonical Y unit. Height of a line, in pixels. */ int line_height; - /* The output method says how the contents of this frame - are displayed. It could be using termcap, or using an X window. */ + /* The output method says how the contents of this frame are + displayed. It could be using termcap, or using an X window. + This must be the same as the device->type. */ enum output_method output_method; - /* A structure of auxiliary data used for displaying the contents. - struct x_output is used for X window frames; - it is defined in xterm.h. - struct w32_output is used for W32 window frames; - it is defined in w32term.h. */ + /* The display device that this frame uses. If this is NULL, then + the frame has been deleted. */ + struct device *device; + + /* Device-dependent, frame-local auxiliary data used for displaying + the contents. When the frame is deleted, this data is deleted as + well. */ union output_data { - struct x_output *x; - struct w32_output *w32; - struct mac_output *mac; + struct tty_output *tty; /* termchar.h */ + struct x_output *x; /* xterm.h */ + struct w32_output *w32; /* w32term.h */ + struct mac_output *mac; /* macterm.h */ EMACS_INT nothing; } output_data; @@ -310,13 +293,6 @@ /* The extra width (in pixels) currently allotted for fringes. */ int left_fringe_width, right_fringe_width; -#ifdef MULTI_KBOARD - /* A pointer to the kboard structure associated with this frame. - For termcap frames, this points to initial_kboard. For X frames, - it will be the same as display.x->display_info->kboard. */ - struct kboard *kboard; -#endif - /* See FULLSCREEN_ enum below */ int want_fullscreen; @@ -340,13 +316,13 @@ frame becomes visible again, it must be marked as garbaged. The FRAME_SAMPLE_VISIBILITY macro takes care of this. - On Windows NT/9X, to avoid wasting effort updating visible frames - that are actually completely obscured by other windows on the - display, we bend the meaning of visible slightly: if greater than - 1, then the frame is obscured - we still consider it to be - "visible" as seen from lisp, but we don't bother updating it. We - must take care to garbage the frame when it ceaces to be obscured - though. Note that these semantics are only used on NT/9X. + On ttys and on Windows NT/9X, to avoid wasting effort updating + visible frames that are actually completely obscured by other + windows on the display, we bend the meaning of visible slightly: + if greater than 1, then the frame is obscured - we still consider + it to be "visible" as seen from lisp, but we don't bother + updating it. We must take care to garbage the frame when it + ceaces to be obscured though. iconified is nonzero if the frame is currently iconified. @@ -440,7 +416,7 @@ /* The baud rate that was used to calculate costs for this frame. */ int cost_calculation_baud_rate; - /* Nonzero if the mouse has moved on this display + /* Nonzero if the mouse has moved on this display device since the last time we checked. */ char mouse_moved; @@ -459,7 +435,11 @@ /* Set to non-zero in when we want for force a flush_display in update_frame, usually after resizing the frame. */ unsigned force_flush_display_p : 1; - + + /* All display backends seem to need these two pixel values. */ + unsigned long background_pixel; + unsigned long foreground_pixel; + /* Set to non-zero if the default face for the frame has been realized. Reset to zero whenever the default face changes. Used to see the difference between a font change and face change. */ @@ -474,7 +454,7 @@ }; #ifdef MULTI_KBOARD -#define FRAME_KBOARD(f) ((f)->kboard) +#define FRAME_KBOARD(f) ((f)->device->kboard) #else #define FRAME_KBOARD(f) (&the_only_kboard) #endif @@ -488,6 +468,7 @@ #define WINDOW_FRAME(w) (w)->frame /* Test a frame for particular kinds of display methods. */ +#define FRAME_INITIAL_P(f) ((f)->output_method == output_initial) #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap) #define FRAME_X_P(f) ((f)->output_method == output_x_window) #define FRAME_W32_P(f) ((f)->output_method == output_w32) @@ -511,7 +492,7 @@ #endif /* Nonzero if frame F is still alive (not deleted). */ -#define FRAME_LIVE_P(f) ((f)->output_data.nothing != 0) +#define FRAME_LIVE_P(f) ((f)->device != 0) /* Nonzero if frame F is a minibuffer-only frame. */ #define FRAME_MINIBUF_ONLY_P(f) \ @@ -751,7 +732,10 @@ Also, if a frame used to be invisible, but has just become visible, it must be marked as garbaged, since redisplay hasn't been keeping - up its contents. */ + up its contents. + + Note that a tty frame is visible if and only if it is the topmost + frame. */ #define FRAME_SAMPLE_VISIBILITY(f) \ (((f)->async_visible && (f)->visible != (f)->async_visible) ? \ @@ -791,10 +775,13 @@ extern Lisp_Object Qframep, Qframe_live_p; +extern Lisp_Object Qtty, Qtty_type; +extern Lisp_Object Qdevice, Qdisplay_live_p; extern struct frame *last_nonminibuf_frame; -extern struct frame *make_terminal_frame P_ ((void)); +extern struct frame *make_initial_frame P_ ((void)); +extern struct frame *make_terminal_frame P_ ((struct device *)); extern struct frame *make_frame P_ ((int)); #ifdef HAVE_WINDOW_SYSTEM extern struct frame *make_minibuffer_frame P_ ((void)); @@ -1026,6 +1013,8 @@ extern Lisp_Object Qleft, Qright, Qtop, Qbox; extern Lisp_Object Qdisplay; +extern Lisp_Object Qwindow_system; + #ifdef HAVE_WINDOW_SYSTEM /* The class of this X application. */
--- a/src/fringe.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/fringe.c Mon Dec 19 19:57:22 2005 +0000 @@ -29,6 +29,7 @@ #include "dispextern.h" #include "buffer.h" #include "blockinput.h" +#include "termhooks.h" #ifdef HAVE_WINDOW_SYSTEM @@ -653,7 +654,7 @@ break; } - rif->draw_fringe_bitmap (w, row, &p); + FRAME_RIF (f)->draw_fringe_bitmap (w, row, &p); } void @@ -1099,6 +1100,8 @@ fbp = &fringe_bitmaps[n]; if (*fbp && (*fbp)->dynamic) { + /* XXX Is SELECTED_FRAME OK here? */ + struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ()); if (rif && rif->destroy_fringe_bitmap) rif->destroy_fringe_bitmap (n); xfree (*fbp); @@ -1204,6 +1207,9 @@ if (!once_p) { + /* XXX Is SELECTED_FRAME OK here? */ + struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ()); + destroy_fringe_bitmap (which); if (rif && rif->define_fringe_bitmap)
--- a/src/indent.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/indent.c Mon Dec 19 19:57:22 2005 +0000 @@ -20,6 +20,8 @@ Boston, MA 02110-1301, USA. */ #include <config.h> +#include <stdio.h> + #include "lisp.h" #include "buffer.h" #include "charset.h"
--- a/src/intervals.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/intervals.h Mon Dec 19 19:57:22 2005 +0000 @@ -88,7 +88,7 @@ #ifdef ENABLE_CHECKING #define NULL_INTERVAL_P(i) \ - (CHECK (!INT_LISPLIKE (i), "non-interval"), (i) == NULL_INTERVAL) + ((void)CHECK (!INT_LISPLIKE (i), "non-interval"), (i) == NULL_INTERVAL) /* old #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL || INT_LISPLIKE (i)) */ #else #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL)
--- a/src/keyboard.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/keyboard.c Mon Dec 19 19:57:22 2005 +0000 @@ -23,13 +23,13 @@ #include <config.h> #include <signal.h> #include <stdio.h> +#include "lisp.h" #include "termchar.h" #include "termopts.h" -#include "lisp.h" +#include "frame.h" #include "termhooks.h" #include "macros.h" #include "keyboard.h" -#include "frame.h" #include "window.h" #include "commands.h" #include "buffer.h" @@ -59,7 +59,6 @@ #endif /* not MSDOS */ #include "syssignal.h" -#include "systty.h" #include <sys/types.h> #ifdef HAVE_UNISTD_H @@ -97,9 +96,6 @@ int interrupt_input_pending; -/* File descriptor to use for input. */ -extern int input_fd; - #ifdef HAVE_WINDOW_SYSTEM /* Make all keyboard buffers much bigger when using X windows. */ #ifdef MAC_OS8 @@ -419,16 +415,6 @@ /* Form to evaluate (if non-nil) when Emacs is started. */ Lisp_Object Vtop_level; -/* User-supplied table to translate input characters. */ -Lisp_Object Vkeyboard_translate_table; - -/* Keymap mapping ASCII function key sequences onto their preferred forms. */ -extern Lisp_Object Vfunction_key_map; - -/* Another keymap that maps key sequences into key sequences. - This one takes precedence over ordinary definitions. */ -extern Lisp_Object Vkey_translation_map; - /* If non-nil, this implements the current input method. */ Lisp_Object Vinput_method_function; Lisp_Object Qinput_method_function; @@ -452,6 +438,12 @@ Lisp_Object Qpost_command_hook, Vpost_command_hook; Lisp_Object Qcommand_hook_internal, Vcommand_hook_internal; +/* Parent keymap of terminal-local function-key-map instances. */ +Lisp_Object Vfunction_key_map; + +/* Parent keymap of terminal-local key-translation-map instances. */ +Lisp_Object Vkey_translation_map; + /* List of deferred actions to be performed at a later time. The precise format isn't relevant here; we just check whether it is nil. */ Lisp_Object Vdeferred_action_list; @@ -469,11 +461,6 @@ /* Nonzero if input is available. */ int input_pending; -/* 1 if should obey 0200 bit in input chars as "Meta", 2 if should - keep 0200 bit in input chars. 0 to ignore the 0200 bit. */ - -int meta_key; - extern char *pending_malloc_warning; /* Circular buffer for pre-read keyboard input. */ @@ -603,9 +590,6 @@ /* Nonzero while interrupts are temporarily deferred during redisplay. */ int interrupts_deferred; -/* Nonzero means use ^S/^Q for flow control. */ -int flow_control; - /* Allow m- file to inhibit use of FIONREAD. */ #ifdef BROKEN_FIONREAD #undef FIONREAD @@ -684,7 +668,9 @@ static Lisp_Object apply_modifiers P_ ((int, Lisp_Object)); static void clear_event P_ ((struct input_event *)); static void any_kboard_state P_ ((void)); +static Lisp_Object restore_kboard_configuration P_ ((Lisp_Object)); static SIGTYPE interrupt_signal P_ ((int signalnum)); +static void handle_interrupt P_ ((void)); static void timer_start_idle P_ ((void)); static void timer_stop_idle P_ ((void)); static void timer_resume_idle P_ ((void)); @@ -1045,24 +1031,19 @@ like it is done in the splash screen display, we have to make sure that we restore single_kboard as command_loop_1 would have done if it were left normally. */ - record_unwind_protect (recursive_edit_unwind, - Fcons (buffer, single_kboard ? Qt : Qnil)); + temporarily_switch_to_single_kboard (FRAME_KBOARD (SELECTED_FRAME ())); + record_unwind_protect (recursive_edit_unwind, buffer); recursive_edit_1 (); return unbind_to (count, Qnil); } Lisp_Object -recursive_edit_unwind (info) - Lisp_Object info; -{ - if (BUFFERP (XCAR (info))) - Fset_buffer (XCAR (info)); - - if (NILP (XCDR (info))) - any_kboard_state (); - else - single_kboard_state (); +recursive_edit_unwind (buffer) + Lisp_Object buffer; +{ + if (BUFFERP (buffer)) + Fset_buffer (buffer); command_loop_level--; update_mode_lines = 1; @@ -1127,8 +1108,8 @@ static struct kboard_stack *kboard_stack; void -push_frame_kboard (f) - FRAME_PTR f; +push_kboard (k) + struct kboard *k; { #ifdef MULTI_KBOARD struct kboard_stack *p @@ -1138,20 +1119,82 @@ p->kboard = current_kboard; kboard_stack = p; - current_kboard = FRAME_KBOARD (f); + current_kboard = k; #endif } void -pop_frame_kboard () +push_frame_kboard (f) + FRAME_PTR f; +{ + push_kboard (f->device->kboard); +} + +void +pop_kboard () { #ifdef MULTI_KBOARD + struct device *d; struct kboard_stack *p = kboard_stack; - current_kboard = p->kboard; + int ok = 0; + current_kboard = NULL; + for (d = device_list; d; d = d->next_device) + { + if (d->kboard == p->kboard) + { + current_kboard = p->kboard; + break; + } + } + if (current_kboard == NULL) + { + /* The display we remembered has been deleted. */ + current_kboard = FRAME_KBOARD (SELECTED_FRAME ()); + } kboard_stack = p->next; xfree (p); #endif } + +/* Switch to single_kboard mode. If K is non-nil, set it as the + current keyboard. Use record_unwind_protect to return to the + previous state later. */ + +void +temporarily_switch_to_single_kboard (k) + struct kboard *k; +{ +#ifdef MULTI_KBOARD + int was_locked = single_kboard; + if (k != NULL) + push_kboard (k); + else + push_kboard (current_kboard); + single_kboard_state (); + record_unwind_protect (restore_kboard_configuration, + (was_locked ? Qt : Qnil)); +#endif +} + +void +record_single_kboard_state () +{ + push_kboard (current_kboard); + record_unwind_protect (restore_kboard_configuration, + (single_kboard ? Qt : Qnil)); +} + +static Lisp_Object +restore_kboard_configuration (was_locked) + Lisp_Object was_locked; +{ + if (NILP (was_locked)) + any_kboard_state (); + else + single_kboard_state (); + pop_kboard (); + return Qnil; +} /* Handle errors that are not handled at inner levels by printing an error message and returning to the editor command loop. */ @@ -1232,11 +1275,7 @@ yet, or we're not interactive, it's best to dump this message out to stderr and exit. */ if (!sf->glyphs_initialized_p - /* This is the case of the frame dumped with Emacs, when we're - running under a window system. */ - || (!NILP (Vwindow_system) - && !inhibit_window_system - && FRAME_TERMCAP_P (sf)) + || FRAME_INITIAL_P (sf) || noninteractive) { stream = Qexternal_debugging_output; @@ -1290,10 +1329,10 @@ while (1) { internal_catch (Qtop_level, top_level_1, Qnil); - /* Reset single_kboard in case top-level set it while - evaluating an -f option, or we are stuck there for some - other reason. */ - any_kboard_state (); + /* Reset single_kboard in case top-level set it while + evaluating an -f option, or we are stuck there for some + other reason. */ + any_kboard_state (); internal_catch (Qtop_level, command_loop_2, Qnil); executing_kbd_macro = Qnil; @@ -1408,12 +1447,12 @@ Lisp_Object keybuf[30]; int i; int no_direct; - int prev_modiff; + int prev_modiff = 0; struct buffer *prev_buffer = NULL; #ifdef MULTI_KBOARD int was_locked = single_kboard; #endif - int already_adjusted; + int already_adjusted = 0; current_kboard->Vprefix_arg = Qnil; current_kboard->Vlast_prefix_arg = Qnil; @@ -2108,7 +2147,10 @@ start_polling () { #ifdef POLL_FOR_INPUT - if (read_socket_hook && !interrupt_input) + /* XXX This condition was (read_socket_hook && !interrupt_input), + but read_socket_hook is not global anymore. Let's pretend that + it's always set. */ + if (!interrupt_input) { /* Turn alarm handling on unconditionally. It might have been turned off in process.c. */ @@ -2142,7 +2184,10 @@ input_polling_used () { #ifdef POLL_FOR_INPUT - return read_socket_hook && !interrupt_input; + /* XXX This condition was (read_socket_hook && !interrupt_input), + but read_socket_hook is not global anymore. Let's pretend that + it's always set. */ + return !interrupt_input; #else return 0; #endif @@ -2154,7 +2199,10 @@ stop_polling () { #ifdef POLL_FOR_INPUT - if (read_socket_hook && !interrupt_input) + /* XXX This condition was (read_socket_hook && !interrupt_input), + but read_socket_hook is not global anymore. Let's pretend that + it's always set. */ + if (!interrupt_input) ++poll_suppress_count; #endif } @@ -2614,6 +2662,7 @@ if (_setjmp (local_getcjmp)) { + /* Handle quits while reading the keyboard. */ /* We must have saved the outer value of getcjmp here, so restore it now. */ restore_getcjmp (save_jump); @@ -2959,15 +3008,15 @@ if (XINT (c) == -1) goto exit; - if ((STRINGP (Vkeyboard_translate_table) - && SCHARS (Vkeyboard_translate_table) > (unsigned) XFASTINT (c)) - || (VECTORP (Vkeyboard_translate_table) - && XVECTOR (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c)) - || (CHAR_TABLE_P (Vkeyboard_translate_table) + if ((STRINGP (current_kboard->Vkeyboard_translate_table) + && SCHARS (current_kboard->Vkeyboard_translate_table) > (unsigned) XFASTINT (c)) + || (VECTORP (current_kboard->Vkeyboard_translate_table) + && XVECTOR (current_kboard->Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c)) + || (CHAR_TABLE_P (current_kboard->Vkeyboard_translate_table) && CHAR_VALID_P (XINT (c), 0))) { Lisp_Object d; - d = Faref (Vkeyboard_translate_table, c); + d = Faref (current_kboard->Vkeyboard_translate_table, c); /* nil in keyboard-translate-table means no translation. */ if (!NILP (d)) c = d; @@ -3642,12 +3691,10 @@ if (c == quit_char) { #ifdef MULTI_KBOARD - KBOARD *kb; + KBOARD *kb = FRAME_KBOARD (XFRAME (event->frame_or_window)); struct input_event *sp; - if (single_kboard - && (kb = FRAME_KBOARD (XFRAME (event->frame_or_window)), - kb != current_kboard)) + if (single_kboard && kb != current_kboard) { kb->kbd_queue = Fcons (make_lispy_switch_frame (event->frame_or_window), @@ -3690,7 +3737,7 @@ } last_event_timestamp = event->timestamp; - interrupt_signal (0 /* dummy */); + handle_interrupt (); return; } @@ -4159,7 +4206,11 @@ If there is no valid info, it does not store anything so x remains nil. */ x = Qnil; - (*mouse_position_hook) (&f, 0, &bar_window, &part, &x, &y, &time); + + /* XXX Can f or mouse_position_hook be NULL here? */ + if (f && FRAME_DEVICE (f)->mouse_position_hook) + (*FRAME_DEVICE (f)->mouse_position_hook) (&f, 0, &bar_window, + &part, &x, &y, &time); obj = Qnil; @@ -4456,10 +4507,13 @@ { if (NILP (vector[0])) { - int was_locked = single_kboard; int count = SPECPDL_INDEX (); Lisp_Object old_deactivate_mark = Vdeactivate_mark; + /* On unbind_to, resume allowing input from any kboard, if that + was true before. */ + record_single_kboard_state (); + /* Mark the timer as triggered to prevent problems if the lisp code fails to reschedule it right. */ vector[0] = Qt; @@ -4471,10 +4525,6 @@ timers_run++; unbind_to (count, Qnil); - /* Resume allowing input from any kboard, if that was true before. */ - if (!was_locked) - any_kboard_state (); - /* Since we have handled the event, we don't need to tell the caller to wake up and do it. */ } @@ -6354,8 +6404,8 @@ { int len = SBYTES (name_alist_or_stem); char *buf = (char *) alloca (len + 50); - sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem), - (long) XINT (symbol_int) + 1); + sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem), + (long) XINT (symbol_int) + 1); value = intern (buf); } else if (name_table != 0 && name_table[symbol_num]) @@ -6620,7 +6670,10 @@ } else #ifdef POLL_FOR_INPUT - if (read_socket_hook && !interrupt_input && poll_suppress_count == 0) + /* XXX This condition was (read_socket_hook && !interrupt_input), + but read_socket_hook is not global anymore. Let's pretend that + it's always set. */ + if (!interrupt_input && poll_suppress_count == 0) { SIGMASKTYPE mask; mask = sigblock (sigmask (SIGALRM)); @@ -6697,146 +6750,214 @@ read_avail_input (expected) int expected; { - register int i; int nread = 0; - - if (read_socket_hook) - { - int nr; - struct input_event hold_quit; - - EVENT_INIT (hold_quit); - hold_quit.kind = NO_EVENT; - - /* No need for FIONREAD or fcntl; just say don't wait. */ - while (nr = (*read_socket_hook) (input_fd, expected, &hold_quit), nr > 0) - { - nread += nr; - expected = 0; - } - if (hold_quit.kind != NO_EVENT) - kbd_buffer_store_event (&hold_quit); - } - else - { - /* Using KBD_BUFFER_SIZE - 1 here avoids reading more than - the kbd_buffer can really hold. That may prevent loss - of characters on some systems when input is stuffed at us. */ - unsigned char cbuf[KBD_BUFFER_SIZE - 1]; - int n_to_read; - - /* Determine how many characters we should *try* to read. */ + int err = 0; + struct device *d; + + /* Loop through the available devices, and call their input hooks. */ + d = device_list; + while (d) + { + struct device *next = d->next_device; + + if (d->read_socket_hook) + { + int nr; + struct input_event hold_quit; + + EVENT_INIT (hold_quit); + hold_quit.kind = NO_EVENT; + + /* No need for FIONREAD or fcntl; just say don't wait. */ + while (nr = (*d->read_socket_hook) (d, expected, &hold_quit), nr > 0) + { + nread += nr; + expected = 0; + } + + if (nr == -1) /* Not OK to read input now. */ + { + err = 1; + } + else if (nr == -2) /* Non-transient error. */ + { + /* The display device terminated; it should be closed. */ + + /* Kill Emacs if this was our last display. */ + if (! device_list->next_device) + /* Formerly simply reported no input, but that + sometimes led to a failure of Emacs to terminate. + SIGHUP seems appropriate if we can't reach the + terminal. */ + /* ??? Is it really right to send the signal just to + this process rather than to the whole process + group? Perhaps on systems with FIONREAD Emacs is + alone in its group. */ + kill (getpid (), SIGHUP); + + /* XXX Is calling delete_device safe here? It calls Fdelete_frame. */ + if (d->delete_device_hook) + (*d->delete_device_hook) (d); + else + delete_device (d); + } + + if (hold_quit.kind != NO_EVENT) + kbd_buffer_store_event (&hold_quit); + } + + d = next; + } + + if (err && !nread) + nread = -1; + + return nread; +} + +/* This is the tty way of reading available input. + + Note that each terminal device has its own `struct device' object, + and so this function is called once for each individual termcap + display. The first parameter indicates which device to read from. */ + +int +tty_read_avail_input (struct device *device, + int expected, + struct input_event *hold_quit) +{ + /* Using KBD_BUFFER_SIZE - 1 here avoids reading more than + the kbd_buffer can really hold. That may prevent loss + of characters on some systems when input is stuffed at us. */ + unsigned char cbuf[KBD_BUFFER_SIZE - 1]; + int n_to_read, i; + struct tty_display_info *tty = device->display_info.tty; + int nread = 0; + + if (device->type != output_termcap) + abort (); + + /* XXX I think the following code should be moved to separate hook + functions in system-dependent files. */ #ifdef WINDOWSNT - return 0; + return 0; #else /* not WINDOWSNT */ #ifdef MSDOS - n_to_read = dos_keysns (); - if (n_to_read == 0) - return 0; + n_to_read = dos_keysns (); + if (n_to_read == 0) + return 0; + + cbuf[0] = dos_keyread (); + nread = 1; + #else /* not MSDOS */ + + if (! tty->term_initted) /* In case we get called during bootstrap. */ + return 0; + + if (! tty->input) + return 0; /* The terminal is suspended. */ + + /* Determine how many characters we should *try* to read. */ #ifdef FIONREAD - /* Find out how much input is available. */ - if (ioctl (input_fd, FIONREAD, &n_to_read) < 0) - /* Formerly simply reported no input, but that sometimes led to - a failure of Emacs to terminate. - SIGHUP seems appropriate if we can't reach the terminal. */ - /* ??? Is it really right to send the signal just to this process - rather than to the whole process group? - Perhaps on systems with FIONREAD Emacs is alone in its group. */ - { - if (! noninteractive) - kill (getpid (), SIGHUP); - else - n_to_read = 0; - } - if (n_to_read == 0) - return 0; - if (n_to_read > sizeof cbuf) - n_to_read = sizeof cbuf; + /* Find out how much input is available. */ + if (ioctl (fileno (tty->input), FIONREAD, &n_to_read) < 0) + { + if (! noninteractive) + return -2; /* Close this device. */ + else + n_to_read = 0; + } + if (n_to_read == 0) + return 0; + if (n_to_read > sizeof cbuf) + n_to_read = sizeof cbuf; #else /* no FIONREAD */ #if defined (USG) || defined (DGUX) || defined(CYGWIN) - /* Read some input if available, but don't wait. */ - n_to_read = sizeof cbuf; - fcntl (input_fd, F_SETFL, O_NDELAY); -#else - you lose; -#endif -#endif -#endif /* not MSDOS */ -#endif /* not WINDOWSNT */ - - /* Now read; for one reason or another, this will not block. - NREAD is set to the number of chars read. */ - do - { -#ifdef MSDOS - cbuf[0] = dos_keyread (); - nread = 1; + /* Read some input if available, but don't wait. */ + n_to_read = sizeof cbuf; + fcntl (fileno (tty->input), F_SETFL, O_NDELAY); #else - nread = emacs_read (input_fd, cbuf, n_to_read); -#endif - /* POSIX infers that processes which are not in the session leader's - process group won't get SIGHUP's at logout time. BSDI adheres to - this part standard and returns -1 from read (0) with errno==EIO - when the control tty is taken away. - Jeffrey Honig <jch@bsdi.com> says this is generally safe. */ - if (nread == -1 && errno == EIO) - kill (0, SIGHUP); + you lose; +#endif +#endif + + /* Now read; for one reason or another, this will not block. + NREAD is set to the number of chars read. */ + do + { + nread = emacs_read (fileno (tty->input), cbuf, n_to_read); + /* POSIX infers that processes which are not in the session leader's + process group won't get SIGHUP's at logout time. BSDI adheres to + this part standard and returns -1 from read (0) with errno==EIO + when the control tty is taken away. + Jeffrey Honig <jch@bsdi.com> says this is generally safe. */ + if (nread == -1 && errno == EIO) + return -2; /* Close this device. */ #if defined (AIX) && (! defined (aix386) && defined (_BSD)) - /* The kernel sometimes fails to deliver SIGHUP for ptys. - This looks incorrect, but it isn't, because _BSD causes - O_NDELAY to be defined in fcntl.h as O_NONBLOCK, - and that causes a value other than 0 when there is no input. */ - if (nread == 0) - kill (0, SIGHUP); -#endif - } - while ( - /* We used to retry the read if it was interrupted. - But this does the wrong thing when O_NDELAY causes - an EAGAIN error. Does anybody know of a situation - where a retry is actually needed? */ + /* The kernel sometimes fails to deliver SIGHUP for ptys. + This looks incorrect, but it isn't, because _BSD causes + O_NDELAY to be defined in fcntl.h as O_NONBLOCK, + and that causes a value other than 0 when there is no input. */ + if (nread == 0) + return -2; /* Close this device. */ +#endif + } + while ( + /* We used to retry the read if it was interrupted. + But this does the wrong thing when O_NDELAY causes + an EAGAIN error. Does anybody know of a situation + where a retry is actually needed? */ #if 0 - nread < 0 && (errno == EAGAIN + nread < 0 && (errno == EAGAIN #ifdef EFAULT - || errno == EFAULT + || errno == EFAULT #endif #ifdef EBADSLT - || errno == EBADSLT -#endif - ) + || errno == EBADSLT +#endif + ) #else - 0 -#endif - ); + 0 +#endif + ); #ifndef FIONREAD #if defined (USG) || defined (DGUX) || defined (CYGWIN) - fcntl (input_fd, F_SETFL, 0); + fcntl (fileno (tty->input), F_SETFL, 0); #endif /* USG or DGUX or CYGWIN */ #endif /* no FIONREAD */ - for (i = 0; i < nread; i++) - { - struct input_event buf; - EVENT_INIT (buf); - buf.kind = ASCII_KEYSTROKE_EVENT; - buf.modifiers = 0; - if (meta_key == 1 && (cbuf[i] & 0x80)) - buf.modifiers = meta_modifier; - if (meta_key != 2) - cbuf[i] &= ~0x80; - - buf.code = cbuf[i]; - buf.frame_or_window = selected_frame; - buf.arg = Qnil; - - kbd_buffer_store_event (&buf); - /* Don't look at input that follows a C-g too closely. - This reduces lossage due to autorepeat on C-g. */ - if (buf.kind == ASCII_KEYSTROKE_EVENT - && buf.code == quit_char) - break; - } + + if (nread <= 0) + return nread; + +#endif /* not MSDOS */ +#endif /* not WINDOWSNT */ + + for (i = 0; i < nread; i++) + { + struct input_event buf; + EVENT_INIT (buf); + buf.kind = ASCII_KEYSTROKE_EVENT; + buf.modifiers = 0; + if (tty->meta_key == 1 && (cbuf[i] & 0x80)) + buf.modifiers = meta_modifier; + if (tty->meta_key != 2) + cbuf[i] &= ~0x80; + + buf.code = cbuf[i]; + /* Set the frame corresponding to the active tty. Note that the + value of selected_frame is not reliable here, redisplay tends + to temporarily change it. */ + buf.frame_or_window = tty->top_frame; + buf.arg = Qnil; + + kbd_buffer_store_event (&buf); + /* Don't look at input that follows a C-g too closely. + This reduces lossage due to autorepeat on C-g. */ + if (buf.kind == ASCII_KEYSTROKE_EVENT + && buf.code == quit_char) + break; } return nread; @@ -8620,12 +8741,7 @@ last_nonmenu_event = Qnil; delayed_switch_frame = Qnil; - fkey.map = fkey.parent = Vfunction_key_map; - keytran.map = keytran.parent = Vkey_translation_map; - /* If there is no translation-map, turn off scanning. */ - fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1; - keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1; - + if (INTERACTIVE) { if (!NILP (prompt)) @@ -8665,6 +8781,14 @@ keybuf[0..mock_input] holds the sequence we should reread. */ replay_sequence: + /* We may switch keyboards between rescans, so we need to + reinitialize fkey and keytran before each replay. */ + fkey.map = fkey.parent = current_kboard->Vlocal_function_key_map; + keytran.map = keytran.parent = current_kboard->Vlocal_key_translation_map; + /* If there is no translation map, turn off scanning. */ + fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1; + keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1; + starting_buffer = current_buffer; first_unbound = bufsize + 1; @@ -9954,8 +10078,12 @@ from an idle timer function. The symptom of the bug is that the cursor sometimes doesn't become visible until the next X event is processed. --gerd. */ - if (rif) - rif->flush_display (NULL); + { + Lisp_Object tail, frame; + FOR_EACH_FRAME (tail, frame) + if (FRAME_RIF (XFRAME (frame))) + FRAME_RIF (XFRAME (frame))->flush_display (XFRAME (frame)); + } } return input_pending; @@ -10199,6 +10327,9 @@ int width, height; struct gcpro gcpro1; + if (tty_list && tty_list->next) + error ("There are other tty frames open; close them before suspending Emacs"); + if (!NILP (stuffstring)) CHECK_STRING (stuffstring); @@ -10207,11 +10338,11 @@ call1 (Vrun_hooks, intern ("suspend-hook")); GCPRO1 (stuffstring); - get_frame_size (&old_width, &old_height); - reset_sys_modes (); + get_tty_size (fileno (CURTTY ()->input), &old_width, &old_height); + reset_all_sys_modes (); /* sys_suspend can get an error if it tries to fork a subshell and the system resources aren't available for that. */ - record_unwind_protect ((Lisp_Object (*) P_ ((Lisp_Object))) init_sys_modes, + record_unwind_protect ((Lisp_Object (*) P_ ((Lisp_Object))) init_all_sys_modes, Qnil); stuff_buffered_input (stuffstring); if (cannot_suspend) @@ -10223,7 +10354,7 @@ /* Check if terminal/window size has changed. Note that this is not useful when we are running directly with a window system; but suspend should be disabled in that case. */ - get_frame_size (&width, &height); + get_tty_size (fileno (CURTTY ()->input), &width, &height); if (width != old_width || height != old_height) change_frame_size (SELECTED_FRAME (), height, width, 0, 0, 0); @@ -10283,10 +10414,10 @@ { input_available_clear_time = time_to_clear; - /* Tell interrupt_signal to throw back to read_char, */ + /* Tell handle_interrupt to throw back to read_char, */ waiting_for_input = 1; - /* If interrupt_signal was called before and buffered a C-g, + /* If handle_interrupt was called before and buffered a C-g, make it run again now, to avoid timing error. */ if (!NILP (Vquit_flag)) quit_throw_to_read_char (); @@ -10295,48 +10426,82 @@ void clear_waiting_for_input () { - /* Tell interrupt_signal not to throw back to read_char, */ + /* Tell handle_interrupt not to throw back to read_char, */ waiting_for_input = 0; input_available_clear_time = 0; } +/* The SIGINT handler. + + If we have a frame on the controlling tty, we assume that the + SIGINT was generated by C-g, so we call handle_interrupt. + Otherwise, the handler kills Emacs. */ + +static SIGTYPE +interrupt_signal (signalnum) /* If we don't have an argument, */ + int signalnum; /* some compilers complain in signal calls. */ +{ + /* Must preserve main program's value of errno. */ + int old_errno = errno; + struct device *device; + +#if defined (USG) && !defined (POSIX_SIGNALS) + /* USG systems forget handlers when they are used; + must reestablish each time */ + signal (SIGINT, interrupt_signal); + signal (SIGQUIT, interrupt_signal); +#endif /* USG */ + + SIGNAL_THREAD_CHECK (signalnum); + + /* See if we have an active display on our controlling terminal. */ + device = get_named_tty (NULL); + if (!device) + { + /* If there are no frames there, let's pretend that we are a + well-behaving UN*X program and quit. */ + fatal_error_signal (SIGTERM); + } + else + { + /* Otherwise, the SIGINT was probably generated by C-g. */ + + /* Set internal_last_event_frame to the top frame of the + controlling tty, if we have a frame there. We disable the + interrupt key on secondary ttys, so the SIGINT must have come + from the controlling tty. */ + internal_last_event_frame = device->display_info.tty->top_frame; + + handle_interrupt (); + } + + errno = old_errno; +} + /* This routine is called at interrupt level in response to C-g. - If interrupt_input, this is the handler for SIGINT. Otherwise, it - is called from kbd_buffer_store_event, in handling SIGIO or - SIGTINT. + It is called from the SIGINT handler or kbd_buffer_store_event. If `waiting_for_input' is non zero, then unless `echoing' is nonzero, immediately throw back to read_char. Otherwise it sets the Lisp variable quit-flag not-nil. This causes eval to throw, when it gets a chance. If quit-flag is already - non-nil, it stops the job right away. */ - -static SIGTYPE -interrupt_signal (signalnum) /* If we don't have an argument, */ - int signalnum; /* some compilers complain in signal calls. */ + non-nil, it stops the job right away. */ + +static void +handle_interrupt () { char c; - /* Must preserve main program's value of errno. */ - int old_errno = errno; - struct frame *sf = SELECTED_FRAME (); - -#if defined (USG) && !defined (POSIX_SIGNALS) - if (!read_socket_hook && NILP (Vwindow_system)) - { - /* USG systems forget handlers when they are used; - must reestablish each time */ - signal (SIGINT, interrupt_signal); - signal (SIGQUIT, interrupt_signal); - } -#endif /* USG */ - - SIGNAL_THREAD_CHECK (signalnum); + cancel_echoing (); + /* XXX This code needs to be revised for multi-tty support. */ if (!NILP (Vquit_flag) - && (FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))) +#ifndef MSDOS + && get_named_tty (NULL) +#endif + ) { /* If SIGINT isn't blocked, don't let us be interrupted by another SIGINT, it might be harmful due to non-reentrancy @@ -10344,7 +10509,7 @@ sigblock (sigmask (SIGINT)); fflush (stdout); - reset_sys_modes (); + reset_all_sys_modes (); #ifdef SIGTSTP /* Support possible in later USG versions */ /* @@ -10423,7 +10588,7 @@ printf ("Continuing...\n"); #endif /* not MSDOS */ fflush (stdout); - init_sys_modes (); + init_all_sys_modes (); sigfree (); } else @@ -10451,9 +10616,7 @@ } if (waiting_for_input && !echoing) - quit_throw_to_read_char (); - - errno = old_errno; + quit_throw_to_read_char (); } /* Handle a C-g by making read_char return C-g. */ @@ -10500,6 +10663,11 @@ (interrupt, flow, meta, quit) Lisp_Object interrupt, flow, meta, quit; { + /* XXX This function needs to be revised for multi-device support. + Currently it compiles fine, but its semantics are wrong. It sets + global parameters (e.g. interrupt_input) based on only the + current frame's device. */ + if (!NILP (quit) && (!INTEGERP (quit) || XINT (quit) < 0 || XINT (quit) > 0400)) error ("set-input-mode: QUIT must be an ASCII character"); @@ -10509,13 +10677,14 @@ #endif #ifndef DOS_NT - /* this causes startup screen to be restored and messes with the mouse */ - reset_sys_modes (); + if (FRAME_TERMCAP_P (XFRAME (selected_frame))) + /* this causes startup screen to be restored and messes with the mouse */ + reset_sys_modes (CURTTY ()); #endif #ifdef SIGIO /* Note SIGIO has been undef'd if FIONREAD is missing. */ - if (read_socket_hook) + if (FRAME_DEVICE (SELECTED_FRAME ())->read_socket_hook) { /* When using X, don't give the user a real choice, because we haven't implemented the mechanisms to support it. */ @@ -10536,19 +10705,25 @@ interrupt_input = 1; #endif - flow_control = !NILP (flow); - if (NILP (meta)) - meta_key = 0; - else if (EQ (meta, Qt)) - meta_key = 1; - else - meta_key = 2; + if (FRAME_TERMCAP_P (XFRAME (selected_frame))) + { + struct tty_display_info *tty = CURTTY (); + tty->flow_control = !NILP (flow); + if (NILP (meta)) + tty->meta_key = 0; + else if (EQ (meta, Qt)) + tty->meta_key = 1; + else + tty->meta_key = 2; + } + if (!NILP (quit)) /* Don't let this value be out of range. */ - quit_char = XINT (quit) & (meta_key ? 0377 : 0177); + quit_char = XINT (quit) & (NILP (meta) ? 0177 : 0377); #ifndef DOS_NT - init_sys_modes (); + if (FRAME_TERMCAP_P (XFRAME (selected_frame))) + init_sys_modes (CURTTY ()); #endif #ifdef POLL_FOR_INPUT @@ -10575,10 +10750,21 @@ () { Lisp_Object val[4]; + struct frame *sf = XFRAME (selected_frame); val[0] = interrupt_input ? Qt : Qnil; - val[1] = flow_control ? Qt : Qnil; - val[2] = meta_key == 2 ? make_number (0) : meta_key == 1 ? Qt : Qnil; + if (FRAME_TERMCAP_P (sf)) + { + val[1] = FRAME_TTY (sf)->flow_control ? Qt : Qnil; + val[2] = (FRAME_TTY (sf)->meta_key == 2 + ? make_number (0) + : (CURTTY ()->meta_key == 1 ? Qt : Qnil)); + } + else + { + val[1] = Qnil; + val[2] = Qt; + } XSETFASTINT (val[3], quit_char); return Flist (sizeof (val) / sizeof (val[0]), val); @@ -10670,6 +10856,7 @@ kb->Voverriding_terminal_local_map = Qnil; kb->Vlast_command = Qnil; kb->Vreal_last_command = Qnil; + kb->Vkeyboard_translate_table = Qnil; kb->Vprefix_arg = Qnil; kb->Vlast_prefix_arg = Qnil; kb->kbd_queue = Qnil; @@ -10684,6 +10871,10 @@ kb->reference_count = 0; kb->Vsystem_key_alist = Qnil; kb->system_key_syms = Qnil; + kb->Vlocal_function_key_map = Fmake_sparse_keymap (Qnil); + Fset_keymap_parent (kb->Vlocal_function_key_map, Vfunction_key_map); + kb->Vlocal_key_translation_map = Fmake_sparse_keymap (Qnil); + Fset_keymap_parent (kb->Vlocal_key_translation_map, Vkey_translation_map); kb->Vdefault_minibuffer_frame = Qnil; } @@ -10720,7 +10911,7 @@ && FRAMEP (selected_frame) && FRAME_LIVE_P (XFRAME (selected_frame))) { - current_kboard = XFRAME (selected_frame)->kboard; + current_kboard = XFRAME (selected_frame)->device->kboard; if (current_kboard == kb) abort (); } @@ -10761,8 +10952,14 @@ wipe_kboard (current_kboard); init_kboard (current_kboard); - if (!noninteractive && !read_socket_hook && NILP (Vwindow_system)) - { + if (!noninteractive) + { + /* Before multi-tty support, these handlers used to be installed + only if the current session was a tty session. Now an Emacs + session may have multiple display types, so we always handle + SIGINT. There is special code in interrupt_signal to exit + Emacs on SIGINT when there are no termcap frames on the + controlling terminal. */ signal (SIGINT, interrupt_signal); #if defined (HAVE_TERMIO) || defined (HAVE_TERMIOS) /* For systems with SysV TERMIO, C-g is set up for both SIGINT and @@ -11145,7 +11342,10 @@ command exit. The value `kill-region' is special; it means that the previous command -was a kill command. */); +was a kill command. + +`last-command' has a separate binding for each display device. +See Info node `(elisp)Multiple displays'. */); DEFVAR_KBOARD ("real-last-command", Vreal_last_command, doc: /* Same as `last-command', but never altered by Lisp code. */); @@ -11257,8 +11457,8 @@ Useful to set before you dump a modified Emacs. */); Vtop_level = Qnil; - DEFVAR_LISP ("keyboard-translate-table", &Vkeyboard_translate_table, - doc: /* Translate table for keyboard input, or nil. + DEFVAR_KBOARD ("keyboard-translate-table", Vkeyboard_translate_table, + doc: /* Translate table for local keyboard input, or nil. If non-nil, the value should be a char-table. Each character read from the keyboard is looked up in this char-table. If the value found there is non-nil, then it is used instead of the actual input character. @@ -11268,8 +11468,10 @@ untranslated. In a vector, an element which is nil means "no translation". This is applied to the characters supplied to input methods, not their -output. See also `translation-table-for-input'. */); - Vkeyboard_translate_table = Qnil; +output. See also `translation-table-for-input'. + +`local-keyboard-translate-table' has a separate binding for each +terminal. See Info node `(elisp)Multiple displays'. */); DEFVAR_BOOL ("cannot-suspend", &cannot_suspend, doc: /* Non-nil means to always spawn a subshell instead of suspending. @@ -11354,7 +11556,10 @@ It also replaces `overriding-local-map'. This variable is intended to let commands such as `universal-argument' -set up a different keymap for reading the next command. */); +set up a different keymap for reading the next command. + +`overriding-terminal-local-map' has a separate binding for each display device. +See Info node `(elisp)Multiple displays'. */); DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, doc: /* Keymap that overrides all other local keymaps. @@ -11379,7 +11584,58 @@ doc: /* Alist of system-specific X windows key symbols. Each element should have the form (N . SYMBOL) where N is the numeric keysym code (sans the \"system-specific\" bit 1<<28) -and SYMBOL is its name. */); +and SYMBOL is its name. + +`system-key-alist' has a separate binding for each display device. +See Info node `(elisp)Multiple displays'. */); + + DEFVAR_KBOARD ("local-function-key-map", Vlocal_function_key_map, + doc: /* Keymap that translates key sequences to key sequences during input. +This is used mainly for mapping ASCII function key sequences into +real Emacs function key events (symbols). + +The `read-key-sequence' function replaces any subsequence bound by +`local-function-key-map' with its binding. More precisely, when the +active keymaps have no binding for the current key sequence but +`local-function-key-map' binds a suffix of the sequence to a vector or +string, `read-key-sequence' replaces the matching suffix with its +binding, and continues with the new sequence. + +The events that come from bindings in `local-function-key-map' are not +themselves looked up in `local-function-key-map'. + +For example, suppose `local-function-key-map' binds `ESC O P' to [f1]. +Typing `ESC O P' to `read-key-sequence' would return [f1]. Typing +`C-x ESC O P' would return [?\\C-x f1]. If [f1] were a prefix key, +typing `ESC O P x' would return [f1 x]. + +`local-function-key-map' has a separate binding for each display +device. See Info node `(elisp)Multiple displays'. If you need to +define a binding on all display devices, change `function-key-map' +instead. Initially, `local-function-key-map' is an empty keymap that +has `function-key-map' as its parent on all display devices. */); + + DEFVAR_LISP ("function-key-map", &Vfunction_key_map, + doc: /* The parent keymap of all `local-function-key-map' instances. +Function key definitions that apply to all display devices should go +here. If a mapping is defined in both the current +`local-function-key-map' binding and this variable, then the local +definition will take precendence. */); + Vfunction_key_map = Fmake_sparse_keymap (Qnil); + + DEFVAR_KBOARD ("local-key-translation-map", Vlocal_key_translation_map, + doc: /* Keymap of key translations that can override keymaps. +This keymap works like `function-key-map', but comes after that, +and its non-prefix bindings override ordinary bindings. + +`key-translation-map' has a separate binding for each display device. +(See Info node `(elisp)Multiple displays'.) If you need to set a key +translation on all devices, change `global-key-translation-map' instead. */); + + DEFVAR_LISP ("key-translation-map", &Vkey_translation_map, + doc: /* The parent keymap of all `local-key-translation-map' instances. +Key translations that apply to all display devices should go here. */); + Vkey_translation_map = Fmake_sparse_keymap (Qnil); DEFVAR_LISP ("deferred-action-list", &Vdeferred_action_list, doc: /* List of deferred actions to be performed at a later time. @@ -11531,6 +11787,7 @@ mark_object (kb->Voverriding_terminal_local_map); mark_object (kb->Vlast_command); mark_object (kb->Vreal_last_command); + mark_object (kb->Vkeyboard_translate_table); mark_object (kb->Vprefix_arg); mark_object (kb->Vlast_prefix_arg); mark_object (kb->kbd_queue); @@ -11538,6 +11795,8 @@ mark_object (kb->Vlast_kbd_macro); mark_object (kb->Vsystem_key_alist); mark_object (kb->system_key_syms); + mark_object (kb->Vlocal_function_key_map); + mark_object (kb->Vlocal_key_translation_map); mark_object (kb->Vdefault_minibuffer_frame); mark_object (kb->echo_string); }
--- a/src/keyboard.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/keyboard.h Mon Dec 19 19:57:22 2005 +0000 @@ -22,7 +22,7 @@ /* Length of echobuf field in each KBOARD. */ /* Each KBOARD represents one logical input stream from which Emacs gets input. - If we are using an ordinary terminal, it has one KBOARD object. + If we are using ordinary terminals, it has one KBOARD object for each terminal device. Usually each X display screen has its own KBOARD, but when two of them are on the same X server, we assume they share a keyboard and give them one KBOARD in common. @@ -81,6 +81,9 @@ other commands. */ Lisp_Object Vreal_last_command; + /* User-supplied table to translate input characters through. */ + Lisp_Object Vkeyboard_translate_table; + /* The prefix argument for the next command, in raw form. */ Lisp_Object Vprefix_arg; @@ -121,6 +124,14 @@ /* Cache for modify_event_symbol. */ Lisp_Object system_key_syms; + /* Keymap mapping ASCII function key sequences onto their + preferred forms. Initialized by the terminal-specific lisp + files. See the DEFVAR for more documentation. */ + Lisp_Object Vlocal_function_key_map; + + /* Keymap of key translations that can override keymaps. */ + Lisp_Object Vlocal_key_translation_map; + /* Minibufferless frames on this display use this frame's minibuffer. */ Lisp_Object Vdefault_minibuffer_frame; @@ -153,7 +164,7 @@ }; #ifdef MULTI_KBOARD -/* Temporarily used before a frame has been opened, and for termcap frames */ +/* Temporarily used before a frame has been opened. */ extern KBOARD *initial_kboard; /* In the single-kboard state, this is the kboard @@ -188,10 +199,6 @@ /* Nonzero means polling for input is temporarily suppressed. */ extern int poll_suppress_count; -/* Keymap mapping ASCII function key sequences onto their preferred forms. - Initialized by the terminal-specific lisp files. */ -extern Lisp_Object Vfunction_key_map; - /* Vector holding the key sequence that invoked the current command. It is reused for each command, and it may be longer than the current sequence; this_command_key_count indicates how many elements @@ -298,8 +305,12 @@ extern Lisp_Object parse_modifiers P_ ((Lisp_Object)); extern Lisp_Object reorder_modifiers P_ ((Lisp_Object)); extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, int *)); -/* User-supplied string to translate input characters through. */ -extern Lisp_Object Vkeyboard_translate_table; + +/* Parent keymap of terminal-local function-key-map instances. */ +extern Lisp_Object Vfunction_key_map; + +/* Parent keymap of terminal-local key-translation-map instances. */ +extern Lisp_Object Vkey_translation_map; extern int parse_menu_item P_ ((Lisp_Object, int, int)); @@ -309,8 +320,11 @@ extern void delete_kboard P_ ((KBOARD *)); extern void single_kboard_state P_ ((void)); extern void not_single_kboard_state P_ ((KBOARD *)); +extern void push_kboard P_ ((struct kboard *)); extern void push_frame_kboard P_ ((struct frame *)); -extern void pop_frame_kboard P_ ((void)); +extern void pop_kboard P_ ((void)); +extern void temporarily_switch_to_single_kboard P_ ((struct kboard *)); +extern void record_single_kboard_state P_ ((void)); extern void record_asynch_buffer_change P_ ((void)); extern SIGTYPE input_poll_signal P_ ((int)); extern void start_polling P_ ((void)); @@ -343,5 +357,8 @@ extern Lisp_Object menu_item_eval_property P_ ((Lisp_Object)); extern int kbd_buffer_events_waiting P_ ((int)); +extern int tty_read_avail_input P_ ((struct device *, int, + struct input_event *)); + /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 (do not change this comment) */
--- a/src/keymap.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/keymap.c Mon Dec 19 19:57:22 2005 +0000 @@ -28,6 +28,7 @@ #include "buffer.h" #include "charset.h" #include "keyboard.h" +#include "frame.h" #include "termhooks.h" #include "blockinput.h" #include "puresize.h" @@ -86,14 +87,6 @@ /* List of emulation mode keymap alists. */ Lisp_Object Vemulation_mode_map_alists; -/* Keymap mapping ASCII function key sequences onto their preferred forms. - Initialized by the terminal-specific lisp files. See DEFVAR for more - documentation. */ -Lisp_Object Vfunction_key_map; - -/* Keymap mapping ASCII function key sequences onto their preferred forms. */ -Lisp_Object Vkey_translation_map; - /* A list of all commands given new bindings since a certain time when nil was stored here. This is used to speed up recomputation of menu key equivalents @@ -2837,11 +2830,11 @@ outbuf = Fcurrent_buffer (); /* Report on alternates for keys. */ - if (STRINGP (Vkeyboard_translate_table) && !NILP (prefix)) + if (STRINGP (current_kboard->Vkeyboard_translate_table) && !NILP (prefix)) { int c; - const unsigned char *translate = SDATA (Vkeyboard_translate_table); - int translate_len = SCHARS (Vkeyboard_translate_table); + const unsigned char *translate = SDATA (current_kboard->Vkeyboard_translate_table); + int translate_len = SCHARS (current_kboard->Vkeyboard_translate_table); for (c = 0; c < translate_len; c++) if (translate[c] != c) @@ -2864,14 +2857,14 @@ insert ("\n", 1); /* Insert calls signal_after_change which may GC. */ - translate = SDATA (Vkeyboard_translate_table); + translate = SDATA (current_kboard->Vkeyboard_translate_table); } insert ("\n", 1); } - if (!NILP (Vkey_translation_map)) - describe_map_tree (Vkey_translation_map, 0, Qnil, prefix, + if (!NILP (current_kboard->Vlocal_key_translation_map)) + describe_map_tree (current_kboard->Vlocal_key_translation_map, 0, Qnil, prefix, "Key translations", nomenu, 1, 0, 0); @@ -2960,8 +2953,8 @@ "\f\nGlobal Bindings", nomenu, 0, 1, 0); /* Print the function-key-map translations under this prefix. */ - if (!NILP (Vfunction_key_map)) - describe_map_tree (Vfunction_key_map, 0, Qnil, prefix, + if (!NILP (current_kboard->Vlocal_function_key_map)) + describe_map_tree (current_kboard->Vlocal_function_key_map, 0, Qnil, prefix, "\f\nFunction key map translations", nomenu, 1, 0, 0); UNGCPRO; @@ -3838,34 +3831,6 @@ `minor-mode-map-alist' and `minor-mode-overriding-map-alist'. */); Vemulation_mode_map_alists = Qnil; - - DEFVAR_LISP ("function-key-map", &Vfunction_key_map, - doc: /* Keymap that translates key sequences to key sequences during input. -This is used mainly for mapping ASCII function key sequences into -real Emacs function key events (symbols). - -The `read-key-sequence' function replaces any subsequence bound by -`function-key-map' with its binding. More precisely, when the active -keymaps have no binding for the current key sequence but -`function-key-map' binds a suffix of the sequence to a vector or string, -`read-key-sequence' replaces the matching suffix with its binding, and -continues with the new sequence. - -The events that come from bindings in `function-key-map' are not -themselves looked up in `function-key-map'. - -For example, suppose `function-key-map' binds `ESC O P' to [f1]. -Typing `ESC O P' to `read-key-sequence' would return [f1]. Typing -`C-x ESC O P' would return [?\\C-x f1]. If [f1] were a prefix -key, typing `ESC O P x' would return [f1 x]. */); - Vfunction_key_map = Fmake_sparse_keymap (Qnil); - - DEFVAR_LISP ("key-translation-map", &Vkey_translation_map, - doc: /* Keymap of key translations that can override keymaps. -This keymap works like `function-key-map', but comes after that, -and its non-prefix bindings override ordinary bindings. */); - Vkey_translation_map = Qnil; - staticpro (&Vmouse_events); Vmouse_events = Fcons (intern ("menu-bar"), Fcons (intern ("tool-bar"),
--- a/src/lisp.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/lisp.h Mon Dec 19 19:57:22 2005 +0000 @@ -84,14 +84,14 @@ #ifdef ENABLE_CHECKING -#define CHECK(check,msg) (((check) || suppress_checking \ - ? (void) 0 \ - : die ((msg), __FILE__, __LINE__)), \ +#define CHECK(check,msg) ((void)((check) || suppress_checking \ + ? (void) 0 \ + : die ((msg), __FILE__, __LINE__)), \ 0) #else /* Produce same side effects and result, but don't complain. */ -#define CHECK(check,msg) ((check),0) +#define CHECK(check,msg) ((void)(check),0) #endif @@ -3121,29 +3121,31 @@ EXFUN (Fx_popup_dialog, 3); extern void syms_of_xmenu P_ ((void)); +/* defined in termchar.h */ +struct tty_display_info; + +/* defined in termhooks.h */ +struct device; + /* defined in sysdep.c */ #ifndef HAVE_GET_CURRENT_DIR_NAME extern char *get_current_dir_name P_ ((void)); #endif extern void stuff_char P_ ((char c)); extern void init_sigio P_ ((int)); -extern void request_sigio P_ ((void)); -extern void unrequest_sigio P_ ((void)); -extern void reset_sys_modes P_ ((void)); extern void sys_subshell P_ ((void)); extern void sys_suspend P_ ((void)); extern void discard_tty_input P_ ((void)); -extern void init_sys_modes P_ ((void)); -extern void reset_sys_modes P_ ((void)); -extern void get_frame_size P_ ((int *, int *)); +extern void init_sys_modes P_ ((struct tty_display_info *)); +extern void reset_sys_modes P_ ((struct tty_display_info *)); +extern void init_all_sys_modes P_ ((void)); +extern void reset_all_sys_modes P_ ((void)); extern void wait_for_termination P_ ((int)); extern void flush_pending_output P_ ((int)); extern void child_setup_tty P_ ((int)); extern void setup_pty P_ ((int)); extern int set_window_size P_ ((int, int, int)); extern void create_process P_ ((Lisp_Object, char **, Lisp_Object)); -extern int tabs_safe_p P_ ((void)); -extern void init_baud_rate P_ ((void)); extern int emacs_open P_ ((const char *, int, int)); extern int emacs_close P_ ((int)); extern int emacs_read P_ ((int, char *, unsigned int));
--- a/src/lread.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/lread.c Mon Dec 19 19:57:22 2005 +0000 @@ -34,6 +34,7 @@ #include <epaths.h> #include "commands.h" #include "keyboard.h" +#include "frame.h" #include "termhooks.h" #include "coding.h"
--- a/src/macterm.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/macterm.c Mon Dec 19 19:57:22 2005 +0000 @@ -10617,12 +10617,13 @@ redeem_scroll_bar_hook = XTredeem_scroll_bar; judge_scroll_bars_hook = XTjudge_scroll_bars; - scroll_region_ok = 1; /* we'll scroll partial frames */ - char_ins_del_ok = 1; - line_ins_del_ok = 1; /* we'll just blt 'em */ - fast_clear_end_of_line = 1; /* X does this well */ - memory_below_frame = 0; /* we don't remember what scrolls - off the bottom */ + TTY_SCROLL_REGION_OK (CURTTY ()) = 1; /* we'll scroll partial frames */ + TTY_CHAR_INS_DEL_OK (CURTTY ()) = 1; + TTY_LINE_INS_DEL_OK (CURTTY ()) = 1; /* we'll just blt 'em */ + TTY_FAST_CLEAR_END_OF_LINE (CURTTY ()) = 1; /* X does this well */ + TTY_MEMORY_BELOW_FRAME (CURTTY ()) = 0; /* we don't remember what + scrolls off the + bottom */ baud_rate = 19200; last_tool_bar_item = -1;
--- a/src/macterm.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/macterm.h Mon Dec 19 19:57:22 2005 +0000 @@ -351,9 +351,6 @@ #define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->window_desc) #define FRAME_X_WINDOW(f) ((f)->output_data.mac->window_desc) -#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) -#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) - #define FRAME_FONT(f) ((f)->output_data.mac->font) #define FRAME_FONTSET(f) ((f)->output_data.mac->fontset)
--- a/src/minibuf.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/minibuf.c Mon Dec 19 19:57:22 2005 +0000 @@ -34,6 +34,7 @@ #include "syntax.h" #include "intervals.h" #include "keymap.h" +#include "termhooks.h" extern int quit_char; @@ -468,7 +469,6 @@ specbind (Qminibuffer_default, defalt); - single_kboard_state (); #ifdef HAVE_X_WINDOWS if (display_hourglass_p) cancel_hourglass (); @@ -552,6 +552,8 @@ if (minibuffer_auto_raise) Fraise_frame (mini_frame); + temporarily_switch_to_single_kboard (XFRAME (mini_frame)->device->kboard); + /* We have to do this after saving the window configuration since that is what restores the current buffer. */ @@ -710,8 +712,12 @@ XWINDOW (minibuf_window)->cursor.x = 0; XWINDOW (minibuf_window)->must_be_updated_p = 1; update_frame (XFRAME (selected_frame), 1, 1); - if (rif && rif->flush_display) - rif->flush_display (XFRAME (XWINDOW (minibuf_window)->frame)); + { + struct frame *f = XFRAME (XWINDOW (minibuf_window)->frame); + struct redisplay_interface *rif = FRAME_RIF (f); + if (rif && rif->flush_display) + rif->flush_display (f); + } } /* Make minibuffer contents into a string. */
--- a/src/msdos.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/msdos.c Mon Dec 19 19:57:22 2005 +0000 @@ -2583,7 +2583,7 @@ set_terminal_modes_hook = IT_set_terminal_modes; reset_terminal_modes_hook = IT_reset_terminal_modes; set_terminal_window_hook = IT_set_terminal_window; - char_ins_del_ok = 0; + TTY_CHAR_INS_DEL_OK (CURTTY ()) = 0; #endif } @@ -4880,7 +4880,7 @@ char *badfunc; { fprintf (stderr, "%s not yet implemented\r\n", badfunc); - reset_sys_modes (); + reset_all_sys_modes (); exit (1); }
--- a/src/prefix-args.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/prefix-args.c Mon Dec 19 19:57:22 2005 +0000 @@ -44,6 +44,7 @@ I'm quitting and taking up gardening. */ #include <stdio.h> +#include <stdlib.h> int main (argc, argv)
--- a/src/process.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/process.c Mon Dec 19 19:57:22 2005 +0000 @@ -127,11 +127,11 @@ #include "charset.h" #include "coding.h" #include "process.h" +#include "frame.h" #include "termhooks.h" #include "termopts.h" #include "commands.h" #include "keyboard.h" -#include "frame.h" #include "blockinput.h" #include "dispextern.h" #include "composite.h" @@ -308,11 +308,11 @@ static SELECT_TYPE input_wait_mask; -/* Mask that excludes keyboard input descriptor (s). */ +/* Mask that excludes keyboard input descriptor(s). */ static SELECT_TYPE non_keyboard_wait_mask; -/* Mask that excludes process input descriptor (s). */ +/* Mask that excludes process input descriptor(s). */ static SELECT_TYPE non_process_wait_mask; @@ -6610,20 +6610,12 @@ -/* The first time this is called, assume keyboard input comes from DESC - instead of from where we used to expect it. - Subsequent calls mean assume input keyboard can come from DESC - in addition to other places. */ - -static int add_keyboard_wait_descriptor_called_flag; +/* Add DESC to the set of keyboard input descriptors. */ void add_keyboard_wait_descriptor (desc) int desc; { - if (! add_keyboard_wait_descriptor_called_flag) - FD_CLR (0, &input_wait_mask); - add_keyboard_wait_descriptor_called_flag = 1; FD_SET (desc, &input_wait_mask); FD_SET (desc, &non_process_wait_mask); if (desc > max_keyboard_desc) @@ -6693,7 +6685,12 @@ process_output_skip = 0; #endif + /* Don't do this, it caused infinite select loops. The display + method should call add_keyboard_wait_descriptor on stdin if it + needs that. */ +#if 0 FD_SET (0, &input_wait_mask); +#endif Vprocess_alist = Qnil; for (i = 0; i < MAXDESC; i++)
--- a/src/puresize.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/puresize.h Mon Dec 19 19:57:22 2005 +0000 @@ -42,7 +42,7 @@ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1180000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1220000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
--- a/src/scroll.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/scroll.c Mon Dec 19 19:57:22 2005 +0000 @@ -23,12 +23,13 @@ #include <config.h> #include <stdio.h> #include <string.h> +#include "lisp.h" #include "termchar.h" -#include "lisp.h" #include "dispextern.h" #include "keyboard.h" #include "frame.h" #include "window.h" +#include "termhooks.h" /* All costs measured in characters. So no cost can exceed the area of a frame, measured in characters. @@ -58,10 +59,12 @@ unsigned char writecount; }; -static void do_direct_scrolling P_ ((struct glyph_matrix *, +static void do_direct_scrolling P_ ((struct frame *, + struct glyph_matrix *, struct matrix_elt *, int, int)); -static void do_scrolling P_ ((struct glyph_matrix *, +static void do_scrolling P_ ((struct frame *, + struct glyph_matrix *, struct matrix_elt *, int, int)); @@ -101,7 +104,8 @@ register struct matrix_elt *p, *p1; register int cost, cost1; - int lines_moved = window_size + (scroll_region_ok ? 0 : lines_below); + int lines_moved = window_size + + (FRAME_SCROLL_REGION_OK (frame) ? 0 : lines_below); /* first_insert_cost[I] is the cost of doing the first insert-line at the i'th line of the lines we are considering, where I is origin 1 (as it is below). */ @@ -241,7 +245,8 @@ of lines. */ static void -do_scrolling (current_matrix, matrix, window_size, unchanged_at_top) +do_scrolling (frame, current_matrix, matrix, window_size, unchanged_at_top) + struct frame *frame; struct glyph_matrix *current_matrix; struct matrix_elt *matrix; int window_size; @@ -308,12 +313,12 @@ /* Set the terminal window, if not done already. */ if (! terminal_window_p) { - set_terminal_window (window_size + unchanged_at_top); + set_terminal_window (frame, window_size + unchanged_at_top); terminal_window_p = 1; } /* Delete lines on the terminal. */ - ins_del_lines (j + unchanged_at_top, - p->deletecount); + ins_del_lines (frame, j + unchanged_at_top, - p->deletecount); } else { @@ -338,7 +343,7 @@ /* Set the terminal window if not yet done. */ if (!terminal_window_p) { - set_terminal_window (window_size + unchanged_at_top); + set_terminal_window (frame, window_size + unchanged_at_top); terminal_window_p = 1; } @@ -347,7 +352,7 @@ --queue; /* Do the deletion on the terminal. */ - ins_del_lines (queue->pos, queue->count); + ins_del_lines (frame, queue->pos, queue->count); /* All lines in the range deleted become empty in the glyph matrix. Assign to them glyph rows that are not retained. @@ -380,7 +385,7 @@ CHECK_MATRIX (current_matrix); if (terminal_window_p) - set_terminal_window (0); + set_terminal_window (frame, 0); } @@ -467,7 +472,8 @@ /* Overhead of setting the scroll window, plus the extra cost cost of scrolling by a distance of one. The extra cost is added once for consistency with the cost vectors */ - scroll_overhead = scroll_region_cost + extra_cost; + scroll_overhead + = FRAME_SCROLL_REGION_COST (frame) + extra_cost; /* initialize the top left corner of the matrix */ matrix->writecost = 0; @@ -650,8 +656,9 @@ the cost matrix for this approach is constructed. */ static void -do_direct_scrolling (current_matrix, cost_matrix, window_size, - unchanged_at_top) +do_direct_scrolling (frame, current_matrix, cost_matrix, + window_size, unchanged_at_top) + struct frame *frame; struct glyph_matrix *current_matrix; struct matrix_elt *cost_matrix; int window_size; @@ -742,9 +749,9 @@ if (i > j) { /* Immediately insert lines */ - set_terminal_window (i + unchanged_at_top); + set_terminal_window (frame, i + unchanged_at_top); terminal_window_p = 1; - ins_del_lines (j - n_to_write + unchanged_at_top, i - j); + ins_del_lines (frame, j - n_to_write + unchanged_at_top, i - j); } else if (i < j) { @@ -774,9 +781,9 @@ --queue; if (queue->count) { - set_terminal_window (queue->window); + set_terminal_window (frame, queue->window); terminal_window_p = 1; - ins_del_lines (queue->pos, queue->count); + ins_del_lines (frame, queue->pos, queue->count); } else { @@ -799,7 +806,7 @@ copy_from, retained_p); if (terminal_window_p) - set_terminal_window (0); + set_terminal_window (frame, 0); } @@ -819,13 +826,13 @@ matrix = ((struct matrix_elt *) alloca ((window_size + 1) * (window_size + 1) * sizeof *matrix)); - if (scroll_region_ok) + if (FRAME_SCROLL_REGION_OK (frame)) { calculate_direct_scrolling (frame, matrix, window_size, unchanged_at_bottom, draw_cost, old_draw_cost, old_hash, new_hash, free_at_end); - do_direct_scrolling (frame->current_matrix, + do_direct_scrolling (frame, frame->current_matrix, matrix, window_size, unchanged_at_top); } else @@ -833,7 +840,8 @@ calculate_scrolling (frame, matrix, window_size, unchanged_at_bottom, draw_cost, old_hash, new_hash, free_at_end); - do_scrolling (frame->current_matrix, matrix, window_size, + do_scrolling (frame, + frame->current_matrix, matrix, window_size, unchanged_at_top); } } @@ -915,7 +923,7 @@ if (amount == 0) return 0; - if (! scroll_region_ok) + if (! FRAME_SCROLL_REGION_OK (frame)) limit = height; else if (amount > 0) limit += amount;
--- a/src/sysdep.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/sysdep.c Mon Dec 19 19:57:22 2005 +0000 @@ -46,6 +46,8 @@ #endif #endif +#include "sysselect.h" + #include "blockinput.h" #ifdef MAC_OS8 @@ -176,6 +178,7 @@ #include "termopts.h" #include "dispextern.h" #include "process.h" +#include "cm.h" /* for reset_sys_modes */ #ifdef WINDOWSNT #include <direct.h> @@ -239,16 +242,11 @@ int emacs_ospeed; -/* The file descriptor for Emacs's input terminal. - Under Unix, this is normally zero except when using X; - under VMS, we place the input channel number here. */ -int input_fd; - void croak P_ ((char *)); #ifdef AIXHFT -void hft_init (); -void hft_reset (); +void hft_init P_ ((struct tty_display_info *)); +void hft_reset P_ ((struct tty_display_info *)); #endif /* Temporary used by `sigblock' when defined in terms of signprocmask. */ @@ -331,16 +329,7 @@ #endif -/* Specify a different file descriptor for further input operations. */ - -void -change_input_fd (fd) - int fd; -{ - input_fd = fd; -} - -/* Discard pending input on descriptor input_fd. */ +/* Discard pending input on all input descriptors. */ void discard_tty_input () @@ -351,54 +340,61 @@ if (noninteractive) return; - /* Discarding input is not safe when the input could contain - replies from the X server. So don't do it. */ - if (read_socket_hook) - return; - #ifdef VMS end_kbd_input (); - SYS$QIOW (0, input_fd, IO$_READVBLK|IO$M_PURGE, input_iosb, 0, 0, + SYS$QIOW (0, fileno (CURTTY()->input), IO$_READVBLK|IO$M_PURGE, input_iosb, 0, 0, &buf.main, 0, 0, terminator_mask, 0, 0); queue_kbd_input (); #else /* not VMS */ #ifdef APOLLO { - int zero = 0; - ioctl (input_fd, TIOCFLUSH, &zero); + struct tty_display_info *tty; + for (tty = tty_list; tty; tty = tty->next) + { + int zero = 0; + if (tty->input) + ioctl (fileno (tty->input), TIOCFLUSH, &zero); + } } #else /* not Apollo */ #ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */ while (dos_keyread () != -1) ; #else /* not MSDOS */ - EMACS_GET_TTY (input_fd, &buf); - EMACS_SET_TTY (input_fd, &buf, 0); + { + struct tty_display_info *tty; + for (tty = tty_list; tty; tty = tty->next) + { + if (tty->input) /* Is the device suspended? */ + { + EMACS_GET_TTY (fileno (tty->input), &buf); + EMACS_SET_TTY (fileno (tty->input), &buf, 0); + } + } + } #endif /* not MSDOS */ #endif /* not Apollo */ #endif /* not VMS */ #endif /* not WINDOWSNT */ } + #ifdef SIGTSTP /* Arrange for character C to be read as the next input from - the terminal. */ + the terminal. + XXX What if we have multiple ttys? +*/ void -#ifdef PROTOTYPES stuff_char (char c) -#else -stuff_char (c) - char c; -#endif { - if (read_socket_hook) + if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) return; /* Should perhaps error if in batch mode */ #ifdef TIOCSTI - ioctl (input_fd, TIOCSTI, &c); + ioctl (fileno (CURTTY()->input), TIOCSTI, &c); #else /* no TIOCSTI */ error ("Cannot stuff terminal input characters in this version of Unix"); #endif /* no TIOCSTI */ @@ -407,7 +403,7 @@ #endif /* SIGTSTP */ void -init_baud_rate () +init_baud_rate (int fd) { if (noninteractive) emacs_ospeed = 0; @@ -422,7 +418,7 @@ #ifdef VMS struct sensemode sg; - SYS$QIOW (0, input_fd, IO$_SENSEMODE, &sg, 0, 0, + SYS$QIOW (0, fd, IO$_SENSEMODE, &sg, 0, 0, &sg.class, 12, 0, 0, 0, 0 ); emacs_ospeed = sg.xmit_baud; #else /* not VMS */ @@ -430,7 +426,7 @@ struct termios sg; sg.c_cflag = B9600; - tcgetattr (input_fd, &sg); + tcgetattr (fd, &sg); emacs_ospeed = cfgetospeed (&sg); #if defined (USE_GETOBAUD) && defined (getobaud) /* m88k-motorola-sysv3 needs this (ghazi@noc.rutgers.edu) 9/1/94. */ @@ -443,16 +439,16 @@ sg.c_cflag = B9600; #ifdef HAVE_TCATTR - tcgetattr (input_fd, &sg); + tcgetattr (fd, &sg); #else - ioctl (input_fd, TCGETA, &sg); + ioctl (fd, TCGETA, &sg); #endif emacs_ospeed = sg.c_cflag & CBAUD; #else /* neither VMS nor TERMIOS nor TERMIO */ struct sgttyb sg; sg.sg_ospeed = B9600; - if (ioctl (input_fd, TIOCGETP, &sg) < 0) + if (ioctl (fd, TIOCGETP, &sg) < 0) abort (); emacs_ospeed = sg.sg_ospeed; #endif /* not HAVE_TERMIO */ @@ -468,6 +464,7 @@ baud_rate = 1200; } + /*ARGSUSED*/ void set_exclusive_use (fd) @@ -729,7 +726,7 @@ #ifdef BSD4_1 if (interrupt_input) - reset_sigio (); + reset_sigio (0); #endif /* BSD4_1 */ #ifdef RTU { @@ -986,53 +983,89 @@ } } +#ifndef SIGIO +/* If SIGIO is broken, don't do anything. */ +void +init_sigio (int fd) +{ +} + +void +reset_sigio (int fd) +{ +} + +void +request_sigio (void) +{ +} + +void +unrequest_sigio (void) +{ +} + +#else #ifdef F_SETFL -int old_fcntl_flags; +int old_fcntl_flags[MAXDESC]; void init_sigio (fd) int fd; { #ifdef FASYNC - old_fcntl_flags = fcntl (fd, F_GETFL, 0) & ~FASYNC; - fcntl (fd, F_SETFL, old_fcntl_flags | FASYNC); + old_fcntl_flags[fd] = fcntl (fd, F_GETFL, 0) & ~FASYNC; + fcntl (fd, F_SETFL, old_fcntl_flags[fd] | FASYNC); #endif interrupts_deferred = 0; } void -reset_sigio () +reset_sigio (fd) + int fd; { - unrequest_sigio (); +#ifdef FASYNC + fcntl (fd, F_SETFL, old_fcntl_flags[fd]); +#endif } #ifdef FASYNC /* F_SETFL does not imply existence of FASYNC */ +/* XXX Uhm, FASYNC is not used anymore here. */ +/* XXX Yeah, but you need it for SIGIO, don't you? */ void request_sigio () { + /* XXX read_socket_hook is not global anymore. Is blocking SIGIO + bad under X? */ +#if 0 if (noninteractive || read_socket_hook) return; +#endif #ifdef SIGWINCH sigunblock (sigmask (SIGWINCH)); #endif - fcntl (input_fd, F_SETFL, old_fcntl_flags | FASYNC); + sigunblock (sigmask (SIGIO)); interrupts_deferred = 0; } void -unrequest_sigio () -{ +unrequest_sigio (void) +{ + /* XXX read_socket_hook is not global anymore. Is blocking SIGIO + bad under X? */ +#if 0 if (noninteractive || read_socket_hook) return; - +#endif + #ifdef SIGWINCH sigblock (sigmask (SIGWINCH)); #endif - fcntl (input_fd, F_SETFL, old_fcntl_flags); + sigblock (sigmask (SIGIO)); interrupts_deferred = 1; } @@ -1047,7 +1080,8 @@ if (noninteractive || read_socket_hook) return; - ioctl (input_fd, FIOASYNC, &on); + /* XXX CURTTY() is bogus here. */ + ioctl (fileno (CURTTY ()->input), FIOASYNC, &on); interrupts_deferred = 0; } @@ -1059,7 +1093,8 @@ if (noninteractive || read_socket_hook) return; - ioctl (input_fd, FIOASYNC, &off); + /* XXX CURTTY() is bogus here. */ + ioctl (fileno (CURTTY ()->input), FIOASYNC, &off); interrupts_deferred = 1; } @@ -1080,7 +1115,7 @@ sigemptyset (&st); sigaddset (&st, SIGIO); - ioctl (input_fd, FIOASYNC, &on); + ioctl (0, FIOASYNC, &on); /* XXX This fails for multiple ttys. */ interrupts_deferred = 0; sigprocmask (SIG_UNBLOCK, &st, (sigset_t *)0); } @@ -1093,7 +1128,7 @@ if (noninteractive || read_socket_hook) return; - ioctl (input_fd, FIOASYNC, &off); + ioctl (0, FIOASYNC, &off); /* XXX This fails for multiple ttys. */ interrupts_deferred = 1; } @@ -1123,6 +1158,7 @@ #endif /* STRIDE */ #endif /* FASYNC */ #endif /* F_SETFL */ +#endif /* SIGIO */ /* Saving and restoring the process group of Emacs's terminal. */ @@ -1145,30 +1181,39 @@ the tty's pgroup just like any other terminal setting. If inherited_group was not the tty's pgroup, then we'll get a SIGTTmumble when we try to change the tty's pgroup, and a CONT if - it goes foreground in the future, which is what should happen. */ + it goes foreground in the future, which is what should happen. + + This variable is initialized in emacs.c. */ int inherited_pgroup; -/* Split off the foreground process group to Emacs alone. - When we are in the foreground, but not started in our own process - group, redirect the TTY to point to our own process group. We need - to be in our own process group to receive SIGIO properly. */ +/* Split off the foreground process group to Emacs alone. When we are + in the foreground, but not started in our own process group, + redirect the tty device handle FD to point to our own process + group. We need to be in our own process group to receive SIGIO + properly. */ void -narrow_foreground_group () +narrow_foreground_group (int fd) { int me = getpid (); setpgrp (0, inherited_pgroup); +#if 0 + /* XXX inherited_pgroup should not be zero here, but GTK seems to + mess this up. */ + if (! inherited_pgroup) + abort (); /* Should not happen. */ +#endif if (inherited_pgroup != me) - EMACS_SET_TTY_PGRP (input_fd, &me); + EMACS_SET_TTY_PGRP (fd, &me); /* XXX This only works on the controlling tty. */ setpgrp (0, me); } /* Set the tty to our original foreground group. */ void -widen_foreground_group () +widen_foreground_group (int fd) { if (inherited_pgroup != getpid ()) - EMACS_SET_TTY_PGRP (input_fd, &inherited_pgroup); + EMACS_SET_TTY_PGRP (fd, &inherited_pgroup); setpgrp (0, inherited_pgroup); } @@ -1326,14 +1371,6 @@ } -/* The initial tty mode bits */ -struct emacs_tty old_tty; - -/* 1 if we have been through init_sys_modes. */ -int term_initted; - -/* 1 if outer tty status has been recorded. */ -int old_tty_valid; #ifdef BSD4_1 /* BSD 4.1 needs to keep track of the lmode bits in order to start @@ -1343,7 +1380,7 @@ #ifndef F_SETOWN_BUG #ifdef F_SETOWN -int old_fcntl_owner; +int old_fcntl_owner[MAXDESC]; #endif /* F_SETOWN */ #endif /* F_SETOWN_BUG */ @@ -1368,8 +1405,22 @@ static struct tchars new_tchars = {-1,-1,-1,-1,-1,-1}; #endif +/* Initialize the terminal mode on all tty devices that are currently + open. */ + void -init_sys_modes () +init_all_sys_modes (void) +{ + struct tty_display_info *tty; + for (tty = tty_list; tty; tty = tty->next) + init_sys_modes (tty); +} + +/* Initialize the terminal mode on the given tty device. */ + +void +init_sys_modes (tty_out) + struct tty_display_info *tty_out; { struct emacs_tty tty; @@ -1395,6 +1446,9 @@ if (noninteractive) return; + if (!tty_out->output) + return; /* The tty is suspended. */ + #ifdef VMS if (!input_ef) input_ef = get_kbd_event_flag (); @@ -1425,266 +1479,287 @@ #ifndef VMS4_4 sys_access_reinit (); #endif -#endif /* not VMS */ +#endif /* VMS */ #ifdef BSD_PGRPS - if (! read_socket_hook && EQ (Vwindow_system, Qnil)) - narrow_foreground_group (); +#if 0 + /* read_socket_hook is not global anymore. I think doing this + unconditionally will not cause any problems. */ + if (! read_socket_hook && EQ (Vinitial_window_system, Qnil)) +#endif + narrow_foreground_group (fileno (tty_out->input)); #endif -#ifdef HAVE_WINDOW_SYSTEM - /* Emacs' window system on MSDOG uses the `internal terminal' and therefore - needs the initialization code below. */ - if (!read_socket_hook && EQ (Vwindow_system, Qnil)) -#endif - { - EMACS_GET_TTY (input_fd, &old_tty); - - old_tty_valid = 1; - - tty = old_tty; + if (! tty_out->old_tty) + tty_out->old_tty = (struct emacs_tty *) xmalloc (sizeof (struct emacs_tty)); + + EMACS_GET_TTY (fileno (tty_out->input), tty_out->old_tty); + + tty = *tty_out->old_tty; #if defined (HAVE_TERMIO) || defined (HAVE_TERMIOS) - XSETINT (Vtty_erase_char, old_tty.main.c_cc[VERASE]); + XSETINT (Vtty_erase_char, tty.main.c_cc[VERASE]); #ifdef DGUX - /* This allows meta to be sent on 8th bit. */ - tty.main.c_iflag &= ~INPCK; /* don't check input for parity */ + /* This allows meta to be sent on 8th bit. */ + tty.main.c_iflag &= ~INPCK; /* don't check input for parity */ #endif - tty.main.c_iflag |= (IGNBRK); /* Ignore break condition */ - tty.main.c_iflag &= ~ICRNL; /* Disable map of CR to NL on input */ + tty.main.c_iflag |= (IGNBRK); /* Ignore break condition */ + tty.main.c_iflag &= ~ICRNL; /* Disable map of CR to NL on input */ #ifdef INLCR /* I'm just being cautious, since I can't check how widespread INLCR is--rms. */ - tty.main.c_iflag &= ~INLCR; /* Disable map of NL to CR on input */ + tty.main.c_iflag &= ~INLCR; /* Disable map of NL to CR on input */ #endif #ifdef ISTRIP - tty.main.c_iflag &= ~ISTRIP; /* don't strip 8th bit on input */ + tty.main.c_iflag &= ~ISTRIP; /* don't strip 8th bit on input */ #endif - tty.main.c_lflag &= ~ECHO; /* Disable echo */ - tty.main.c_lflag &= ~ICANON; /* Disable erase/kill processing */ + tty.main.c_lflag &= ~ECHO; /* Disable echo */ + tty.main.c_lflag &= ~ICANON; /* Disable erase/kill processing */ #ifdef IEXTEN - tty.main.c_lflag &= ~IEXTEN; /* Disable other editing characters. */ + tty.main.c_lflag &= ~IEXTEN; /* Disable other editing characters. */ #endif - tty.main.c_lflag |= ISIG; /* Enable signals */ - if (flow_control) - { - tty.main.c_iflag |= IXON; /* Enable start/stop output control */ + tty.main.c_lflag |= ISIG; /* Enable signals */ + if (tty_out->flow_control) + { + tty.main.c_iflag |= IXON; /* Enable start/stop output control */ #ifdef IXANY - tty.main.c_iflag &= ~IXANY; + tty.main.c_iflag &= ~IXANY; #endif /* IXANY */ - } - else - tty.main.c_iflag &= ~IXON; /* Disable start/stop output control */ - tty.main.c_oflag &= ~ONLCR; /* Disable map of NL to CR-NL - on output */ - tty.main.c_oflag &= ~TAB3; /* Disable tab expansion */ + } + else + tty.main.c_iflag &= ~IXON; /* Disable start/stop output control */ + tty.main.c_oflag &= ~ONLCR; /* Disable map of NL to CR-NL + on output */ + tty.main.c_oflag &= ~TAB3; /* Disable tab expansion */ #ifdef CS8 - if (meta_key) - { - tty.main.c_cflag |= CS8; /* allow 8th bit on input */ - tty.main.c_cflag &= ~PARENB;/* Don't check parity */ - } + if (tty_out->meta_key) + { + tty.main.c_cflag |= CS8; /* allow 8th bit on input */ + tty.main.c_cflag &= ~PARENB;/* Don't check parity */ + } #endif + if (tty_out->input == stdin) + { tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */ /* Set up C-g for both SIGQUIT and SIGINT. - We don't know which we will get, but we handle both alike - so which one it really gives us does not matter. */ + We don't know which we will get, but we handle both alike + so which one it really gives us does not matter. */ tty.main.c_cc[VQUIT] = quit_char; - tty.main.c_cc[VMIN] = 1; /* Input should wait for at least 1 char */ - tty.main.c_cc[VTIME] = 0; /* no matter how long that takes. */ + } + else + { + /* We normally don't get interrupt or quit signals from tty + devices other than our controlling terminal; therefore, + we must handle C-g as normal input. Unfortunately, this + means that the interrupt and quit feature must be + disabled on secondary ttys, or we would not even see the + keypress. + + Note that even though emacsclient could have special code + to pass SIGINT to Emacs, we should _not_ enable + interrupt/quit keys for emacsclient frames. This means + that we can't break out of loops in C code from a + secondary tty frame, but we can always decide what + display the C-g came from, which is more important from a + usability point of view. (Consider the case when two + people work together using the same Emacs instance.) */ + tty.main.c_cc[VINTR] = CDISABLE; + tty.main.c_cc[VQUIT] = CDISABLE; + } + tty.main.c_cc[VMIN] = 1; /* Input should wait for at least 1 char */ + tty.main.c_cc[VTIME] = 0; /* no matter how long that takes. */ #ifdef VSWTCH - tty.main.c_cc[VSWTCH] = CDISABLE; /* Turn off shell layering use + tty.main.c_cc[VSWTCH] = CDISABLE; /* Turn off shell layering use of C-z */ #endif /* VSWTCH */ - + #if defined (mips) || defined (HAVE_TCATTR) #ifdef VSUSP - tty.main.c_cc[VSUSP] = CDISABLE; /* Turn off mips handling of C-z. */ + tty.main.c_cc[VSUSP] = CDISABLE; /* Turn off mips handling of C-z. */ #endif /* VSUSP */ #ifdef V_DSUSP - tty.main.c_cc[V_DSUSP] = CDISABLE; /* Turn off mips handling of C-y. */ + tty.main.c_cc[V_DSUSP] = CDISABLE; /* Turn off mips handling of C-y. */ #endif /* V_DSUSP */ #ifdef VDSUSP /* Some systems have VDSUSP, some have V_DSUSP. */ - tty.main.c_cc[VDSUSP] = CDISABLE; + tty.main.c_cc[VDSUSP] = CDISABLE; #endif /* VDSUSP */ #ifdef VLNEXT - tty.main.c_cc[VLNEXT] = CDISABLE; + tty.main.c_cc[VLNEXT] = CDISABLE; #endif /* VLNEXT */ #ifdef VREPRINT - tty.main.c_cc[VREPRINT] = CDISABLE; + tty.main.c_cc[VREPRINT] = CDISABLE; #endif /* VREPRINT */ #ifdef VWERASE - tty.main.c_cc[VWERASE] = CDISABLE; + tty.main.c_cc[VWERASE] = CDISABLE; #endif /* VWERASE */ #ifdef VDISCARD - tty.main.c_cc[VDISCARD] = CDISABLE; + tty.main.c_cc[VDISCARD] = CDISABLE; #endif /* VDISCARD */ - if (flow_control) - { + if (tty_out->flow_control) + { #ifdef VSTART - tty.main.c_cc[VSTART] = '\021'; + tty.main.c_cc[VSTART] = '\021'; #endif /* VSTART */ #ifdef VSTOP - tty.main.c_cc[VSTOP] = '\023'; + tty.main.c_cc[VSTOP] = '\023'; #endif /* VSTOP */ - } - else - { + } + else + { #ifdef VSTART - tty.main.c_cc[VSTART] = CDISABLE; + tty.main.c_cc[VSTART] = CDISABLE; #endif /* VSTART */ #ifdef VSTOP - tty.main.c_cc[VSTOP] = CDISABLE; + tty.main.c_cc[VSTOP] = CDISABLE; #endif /* VSTOP */ - } + } #endif /* mips or HAVE_TCATTR */ #ifdef SET_LINE_DISCIPLINE - /* Need to explicitly request TERMIODISC line discipline or - Ultrix's termios does not work correctly. */ - tty.main.c_line = SET_LINE_DISCIPLINE; + /* Need to explicitly request TERMIODISC line discipline or + Ultrix's termios does not work correctly. */ + tty.main.c_line = SET_LINE_DISCIPLINE; #endif #ifdef AIX #ifndef IBMR2AIX - /* AIX enhanced edit loses NULs, so disable it. */ - tty.main.c_line = 0; - tty.main.c_iflag &= ~ASCEDIT; + /* AIX enhanced edit loses NULs, so disable it. */ + tty.main.c_line = 0; + tty.main.c_iflag &= ~ASCEDIT; #else - tty.main.c_cc[VSTRT] = CDISABLE; - tty.main.c_cc[VSTOP] = CDISABLE; - tty.main.c_cc[VSUSP] = CDISABLE; - tty.main.c_cc[VDSUSP] = CDISABLE; + tty.main.c_cc[VSTRT] = CDISABLE; + tty.main.c_cc[VSTOP] = CDISABLE; + tty.main.c_cc[VSUSP] = CDISABLE; + tty.main.c_cc[VDSUSP] = CDISABLE; #endif /* IBMR2AIX */ - if (flow_control) - { + if (tty_out->flow_control) + { #ifdef VSTART - tty.main.c_cc[VSTART] = '\021'; + tty.main.c_cc[VSTART] = '\021'; #endif /* VSTART */ #ifdef VSTOP - tty.main.c_cc[VSTOP] = '\023'; + tty.main.c_cc[VSTOP] = '\023'; #endif /* VSTOP */ - } - /* Also, PTY overloads NUL and BREAK. - don't ignore break, but don't signal either, so it looks like NUL. - This really serves a purpose only if running in an XTERM window - or via TELNET or the like, but does no harm elsewhere. */ - tty.main.c_iflag &= ~IGNBRK; - tty.main.c_iflag &= ~BRKINT; + } + /* Also, PTY overloads NUL and BREAK. + don't ignore break, but don't signal either, so it looks like NUL. + This really serves a purpose only if running in an XTERM window + or via TELNET or the like, but does no harm elsewhere. */ + tty.main.c_iflag &= ~IGNBRK; + tty.main.c_iflag &= ~BRKINT; #endif #else /* if not HAVE_TERMIO */ #ifdef VMS - tty.main.tt_char |= TT$M_NOECHO; - if (meta_key) - tty.main.tt_char |= TT$M_EIGHTBIT; - if (flow_control) - tty.main.tt_char |= TT$M_TTSYNC; - else - tty.main.tt_char &= ~TT$M_TTSYNC; - tty.main.tt2_char |= TT2$M_PASTHRU | TT2$M_XON; + tty.main.tt_char |= TT$M_NOECHO; + if (meta_key) + tty.main.tt_char |= TT$M_EIGHTBIT; + if (tty_out->flow_control) + tty.main.tt_char |= TT$M_TTSYNC; + else + tty.main.tt_char &= ~TT$M_TTSYNC; + tty.main.tt2_char |= TT2$M_PASTHRU | TT2$M_XON; #else /* not VMS (BSD, that is) */ #ifndef DOS_NT - XSETINT (Vtty_erase_char, tty.main.sg_erase); - tty.main.sg_flags &= ~(ECHO | CRMOD | XTABS); - if (meta_key) - tty.main.sg_flags |= ANYP; - tty.main.sg_flags |= interrupt_input ? RAW : CBREAK; + XSETINT (Vtty_erase_char, tty.main.sg_erase); + tty.main.sg_flags &= ~(ECHO | CRMOD | XTABS); + if (meta_key) + tty.main.sg_flags |= ANYP; + tty.main.sg_flags |= interrupt_input ? RAW : CBREAK; #endif /* not DOS_NT */ #endif /* not VMS (BSD, that is) */ #endif /* not HAVE_TERMIO */ - /* If going to use CBREAK mode, we must request C-g to interrupt - and turn off start and stop chars, etc. If not going to use - CBREAK mode, do this anyway so as to turn off local flow - control for user coming over network on 4.2; in this case, - only t_stopc and t_startc really matter. */ + /* If going to use CBREAK mode, we must request C-g to interrupt + and turn off start and stop chars, etc. If not going to use + CBREAK mode, do this anyway so as to turn off local flow + control for user coming over network on 4.2; in this case, + only t_stopc and t_startc really matter. */ #ifndef HAVE_TERMIO #ifdef HAVE_TCHARS - /* Note: if not using CBREAK mode, it makes no difference how we - set this */ - tty.tchars = new_tchars; - tty.tchars.t_intrc = quit_char; - if (flow_control) - { - tty.tchars.t_startc = '\021'; - tty.tchars.t_stopc = '\023'; - } - - tty.lmode = LDECCTQ | LLITOUT | LPASS8 | LNOFLSH | old_tty.lmode; + /* Note: if not using CBREAK mode, it makes no difference how we + set this */ + tty.tchars = new_tchars; + tty.tchars.t_intrc = quit_char; + if (tty_out->flow_control) + { + tty.tchars.t_startc = '\021'; + tty.tchars.t_stopc = '\023'; + } + + tty.lmode = LDECCTQ | LLITOUT | LPASS8 | LNOFLSH | tty_out->old_tty.lmode; #ifdef ultrix - /* Under Ultrix 4.2a, leaving this out doesn't seem to hurt - anything, and leaving it in breaks the meta key. Go figure. */ - tty.lmode &= ~LLITOUT; + /* Under Ultrix 4.2a, leaving this out doesn't seem to hurt + anything, and leaving it in breaks the meta key. Go figure. */ + tty.lmode &= ~LLITOUT; #endif - + #ifdef BSD4_1 - lmode = tty.lmode; + lmode = tty.lmode; #endif #endif /* HAVE_TCHARS */ #endif /* not HAVE_TERMIO */ #ifdef HAVE_LTCHARS - tty.ltchars = new_ltchars; + tty.ltchars = new_ltchars; #endif /* HAVE_LTCHARS */ #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida, MW Aug 1993 */ - if (!term_initted) - internal_terminal_init (); - dos_ttraw (); + if (!tty_out->term_initted) + internal_terminal_init (); + dos_ttraw (); #endif - EMACS_SET_TTY (input_fd, &tty, 0); - - /* This code added to insure that, if flow-control is not to be used, - we have an unlocked terminal at the start. */ + EMACS_SET_TTY (fileno (tty_out->input), &tty, 0); + + /* This code added to insure that, if flow-control is not to be used, + we have an unlocked terminal at the start. */ #ifdef TCXONC - if (!flow_control) ioctl (input_fd, TCXONC, 1); + if (!tty_out->flow_control) ioctl (fileno (tty_out->input), TCXONC, 1); #endif #ifndef APOLLO #ifdef TIOCSTART - if (!flow_control) ioctl (input_fd, TIOCSTART, 0); + if (!tty_out->flow_control) ioctl (fileno (tty_out->input), TIOCSTART, 0); #endif #endif #if defined (HAVE_TERMIOS) || defined (HPUX9) #ifdef TCOON - if (!flow_control) tcflow (input_fd, TCOON); + if (!tty_out->flow_control) tcflow (fileno (tty_out->input), TCOON); #endif #endif #ifdef AIXHFT - hft_init (); + hft_init (tty_out); #ifdef IBMR2AIX - { - /* IBM's HFT device usually thinks a ^J should be LF/CR. We need it - to be only LF. This is the way that is done. */ - struct termio tty; - - if (ioctl (1, HFTGETID, &tty) != -1) - write (1, "\033[20l", 5); - } + { + /* IBM's HFT device usually thinks a ^J should be LF/CR. We need it + to be only LF. This is the way that is done. */ + struct termio tty; + + if (ioctl (1, HFTGETID, &tty) != -1) + write (1, "\033[20l", 5); + } #endif #endif /* AIXHFT */ #ifdef VMS /* Appears to do nothing when in PASTHRU mode. - SYS$QIOW (0, input_fd, IO$_SETMODE|IO$M_OUTBAND, 0, 0, 0, + SYS$QIOW (0, fileno (tty_out->input), IO$_SETMODE|IO$M_OUTBAND, 0, 0, 0, interrupt_signal, oob_chars, 0, 0, 0, 0); */ - queue_kbd_input (0); + queue_kbd_input (0); #endif /* VMS */ - } #ifdef F_SETFL #ifndef F_SETOWN_BUG #ifdef F_GETOWN /* F_SETFL does not imply existence of F_GETOWN */ - if (interrupt_input - && ! read_socket_hook && EQ (Vwindow_system, Qnil)) + if (interrupt_input) { - old_fcntl_owner = fcntl (input_fd, F_GETOWN, 0); - fcntl (input_fd, F_SETOWN, getpid ()); - init_sigio (input_fd); + old_fcntl_owner[fileno (tty_out->input)] = + fcntl (fileno (tty_out->input), F_GETOWN, 0); + fcntl (fileno (tty_out->input), F_SETOWN, getpid ()); + init_sigio (fileno (tty_out->input)); } #endif /* F_GETOWN */ #endif /* F_SETOWN_BUG */ @@ -1692,7 +1767,7 @@ #ifdef BSD4_1 if (interrupt_input) - init_sigio (input_fd); + init_sigio (fileno (tty_out->input)); #endif #ifdef VMS /* VMS sometimes has this symbol but lacks setvbuf. */ @@ -1702,53 +1777,56 @@ /* This symbol is defined on recent USG systems. Someone says without this call USG won't really buffer the file even with a call to setbuf. */ - setvbuf (stdout, (char *) _sobuf, _IOFBF, sizeof _sobuf); + setvbuf (tty_out->output, (char *) _sobuf, _IOFBF, sizeof _sobuf); #else - setbuf (stdout, (char *) _sobuf); + setbuf (tty_out->output, (char *) _sobuf); #endif -#ifdef HAVE_WINDOW_SYSTEM - /* Emacs' window system on MSDOG uses the `internal terminal' and therefore - needs the initialization code below. */ - if (EQ (Vwindow_system, Qnil) -#ifndef WINDOWSNT - /* When running in tty mode on NT/Win95, we have a read_socket - hook, but still need the rest of the initialization code below. */ - && (! read_socket_hook) -#endif - ) -#endif - set_terminal_modes (); - - if (!term_initted - && FRAMEP (Vterminal_frame) - && FRAME_TERMCAP_P (XFRAME (Vterminal_frame))) - init_frame_faces (XFRAME (Vterminal_frame)); - - if (term_initted && no_redraw_on_reenter) + + tty_set_terminal_modes (tty_out->device); + + if (!tty_out->term_initted) { + Lisp_Object tail, frame; + FOR_EACH_FRAME (tail, frame) + { + /* XXX This needs to be revised. */ + if (FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_TTY (XFRAME (frame)) == tty_out) + init_frame_faces (XFRAME (frame)); + } + } + + if (tty_out->term_initted && no_redraw_on_reenter) + { + /* XXX This seems wrong on multi-tty. */ if (display_completed) direct_output_forward_char (0); } else { + Lisp_Object tail, frame; frame_garbaged = 1; - if (FRAMEP (Vterminal_frame)) - FRAME_GARBAGED_P (XFRAME (Vterminal_frame)) = 1; + FOR_EACH_FRAME (tail, frame) + { + if (FRAME_TERMCAP_P (XFRAME (frame)) + && FRAME_TTY (XFRAME (frame)) == tty_out) + FRAME_GARBAGED_P (XFRAME (frame)) = 1; + } } - term_initted = 1; + tty_out->term_initted = 1; } /* Return nonzero if safe to use tabs in output. At the time this is called, init_sys_modes has not been done yet. */ int -tabs_safe_p () +tabs_safe_p (int fd) { - struct emacs_tty tty; - - EMACS_GET_TTY (input_fd, &tty); - return EMACS_TTY_TABS_OK (&tty); + struct emacs_tty etty; + + EMACS_GET_TTY (fd, &etty); + return EMACS_TTY_TABS_OK (&etty); } /* Get terminal size from system. @@ -1756,8 +1834,7 @@ We store 0 if there's no valid information. */ void -get_frame_size (widthp, heightp) - int *widthp, *heightp; +get_tty_size (int fd, int *widthp, int *heightp) { #ifdef TIOCGWINSZ @@ -1765,7 +1842,7 @@ /* BSD-style. */ struct winsize size; - if (ioctl (input_fd, TIOCGWINSZ, &size) == -1) + if (ioctl (fd, TIOCGWINSZ, &size) == -1) *widthp = *heightp = 0; else { @@ -1779,7 +1856,7 @@ /* SunOS - style. */ struct ttysize size; - if (ioctl (input_fd, TIOCGSIZE, &size) == -1) + if (ioctl (fd, TIOCGSIZE, &size) == -1) *widthp = *heightp = 0; else { @@ -1811,7 +1888,6 @@ *widthp = 0; *heightp = 0; #endif - #endif /* not VMS */ #endif /* not SunOS-style */ #endif /* not BSD-style */ @@ -1855,37 +1931,58 @@ } -/* Prepare the terminal for exiting Emacs; move the cursor to the - bottom of the frame, turn off interrupt-driven I/O, etc. */ + +/* Prepare all terminal devices for exiting Emacs. */ + void -reset_sys_modes () +reset_all_sys_modes (void) { - struct frame *sf; - + struct tty_display_info *tty; + for (tty = tty_list; tty; tty = tty->next) + reset_sys_modes (tty); +} + +/* Prepare the terminal for closing it; move the cursor to the + bottom of the frame, turn off interrupt-driven I/O, etc. */ + +void +reset_sys_modes (tty_out) + struct tty_display_info *tty_out; +{ if (noninteractive) { fflush (stdout); return; } - if (!term_initted) + if (!tty_out->term_initted) return; -#ifdef HAVE_WINDOW_SYSTEM - /* Emacs' window system on MSDOG uses the `internal terminal' and therefore - needs the clean-up code below. */ - if (!EQ (Vwindow_system, Qnil) -#ifndef WINDOWSNT - /* When running in tty mode on NT/Win95, we have a read_socket - hook, but still need the rest of the clean-up code below. */ - || read_socket_hook -#endif - ) - return; -#endif - sf = SELECTED_FRAME (); - cursor_to (FRAME_LINES (sf) - 1, 0); - clear_end_of_line (FRAME_COLS (sf)); - /* clear_end_of_line may move the cursor */ - cursor_to (FRAME_LINES (sf) - 1, 0); + + if (!tty_out->output) + return; /* The tty is suspended. */ + + /* Go to and clear the last line of the terminal. */ + + cmgoto (tty_out, FrameRows (tty_out) - 1, 0); + + /* Code adapted from tty_clear_end_of_line. */ + if (tty_out->TS_clr_line) + { + emacs_tputs (tty_out, tty_out->TS_clr_line, 1, cmputc); + } + else + { /* have to do it the hard way */ + int i; + turn_off_insert (tty_out); + + for (i = curX (tty_out); i < FrameCols (tty_out) - 1; i++) + { + fputc (' ', tty_out->output); + } + } + + cmgoto (tty_out, FrameRows (tty_out) - 1, 0); + fflush (tty_out->output); + #if defined (IBMR2AIX) && defined (AIXHFT) { /* HFT devices normally use ^J as a LF/CR. We forced it to @@ -1897,12 +1994,12 @@ } #endif - reset_terminal_modes (); - fflush (stdout); + tty_reset_terminal_modes (tty_out->device); + #ifdef BSD_SYSTEM #ifndef BSD4_1 /* Avoid possible loss of output when changing terminal modes. */ - fsync (fileno (stdout)); + fsync (fileno (tty_out->output)); #endif #endif @@ -1911,22 +2008,25 @@ #ifdef F_SETOWN /* F_SETFL does not imply existence of F_SETOWN */ if (interrupt_input) { - reset_sigio (); - fcntl (input_fd, F_SETOWN, old_fcntl_owner); + reset_sigio (fileno (tty_out->input)); + fcntl (fileno (tty_out->input), F_SETOWN, + old_fcntl_owner[fileno (tty_out->input)]); } #endif /* F_SETOWN */ #endif /* F_SETOWN_BUG */ #ifdef O_NDELAY - fcntl (input_fd, F_SETFL, fcntl (input_fd, F_GETFL, 0) & ~O_NDELAY); + fcntl (fileno (tty_out->input), F_SETFL, + fcntl (fileno (tty_out->input), F_GETFL, 0) & ~O_NDELAY); #endif #endif /* F_SETFL */ #ifdef BSD4_1 if (interrupt_input) - reset_sigio (); + reset_sigio (fileno (tty_out->input)); #endif /* BSD4_1 */ - if (old_tty_valid) - while (EMACS_SET_TTY (input_fd, &old_tty, 0) < 0 && errno == EINTR) + if (tty_out->old_tty) + while (EMACS_SET_TTY (fileno (tty_out->input), + tty_out->old_tty, 0) < 0 && errno == EINTR) ; #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida */ @@ -1937,7 +2037,7 @@ /* Ultrix's termios *ignores* any line discipline except TERMIODISC. A different old line discipline is therefore not restored, yet. Restore the old line discipline by hand. */ - ioctl (0, TIOCSETD, &old_tty.main.c_line); + ioctl (0, TIOCSETD, &tty_out->old_tty.main.c_line); #endif #ifdef AIXHFT @@ -1945,7 +2045,7 @@ #endif #ifdef BSD_PGRPS - widen_foreground_group (); + widen_foreground_group (fileno (tty_out->input)); #endif } @@ -2010,9 +2110,9 @@ { int status; - if (input_fd == 0) + if (fileno (CURTTY ()->input)) == 0) { - status = SYS$ASSIGN (&input_dsc, &input_fd, 0, 0); + status = SYS$ASSIGN (&input_dsc, &fileno (CURTTY ()->input)), 0, 0); if (! (status & 1)) LIB$STOP (status); } @@ -2023,7 +2123,7 @@ void stop_vms_input () { - return SYS$DASSGN (input_fd); + return SYS$DASSGN (fileno (CURTTY ()->input))); } short input_buffer; @@ -2039,7 +2139,7 @@ waiting_for_ast = 0; stop_input = 0; - status = SYS$QIO (0, input_fd, IO$_READVBLK, + status = SYS$QIO (0, fileno (CURTTY()->input), IO$_READVBLK, &input_iosb, kbd_input_ast, 1, &input_buffer, 1, 0, terminator_mask, 0, 0); } @@ -2156,7 +2256,7 @@ #endif if (LIB$AST_IN_PROG ()) /* Don't wait if suspending from kbd_buffer_store_event! */ { - SYS$CANCEL (input_fd); + SYS$CANCEL (fileno (CURTTY()->input)); return; } @@ -2165,7 +2265,7 @@ SYS$CLREF (input_ef); waiting_for_ast = 1; stop_input = 1; - SYS$CANCEL (input_fd); + SYS$CANCEL (fileno (CURTTY()->input)); SYS$SETAST (1); SYS$WAITFR (input_ef); waiting_for_ast = 0; @@ -2227,7 +2327,8 @@ request_sigio (); } -reset_sigio () +reset_sigio (fd) + int fd; { unrequest_sigio (); } @@ -2567,7 +2668,9 @@ SELECT_TYPE *rfds, *wfds, *efds; EMACS_TIME *timeout; { - int ravail = 0; + /* XXX This needs to be updated for multi-tty support. Is there + anybody who needs to emulate select these days? */ + int ravail = 0; SELECT_TYPE orfds; int timeoutval; int *local_timeout; @@ -2582,7 +2685,7 @@ #if defined (HAVE_SELECT) && defined (HAVE_X_WINDOWS) /* If we're using X, then the native select will work; we only need the emulation for non-X usage. */ - if (!NILP (Vwindow_system)) + if (!NILP (Vinitial_window_system)) return select (nfds, rfds, wfds, efds, timeout); #endif timeoutval = timeout ? EMACS_SECS (*timeout) : 100000; @@ -2691,7 +2794,7 @@ } return ravail; } -#endif /* not WINDOWSNT */ +#endif not WINDOWSNT /* Read keyboard input into the standard buffer, waiting for at least one character. */ @@ -2699,6 +2802,8 @@ void read_input_waiting () { + /* XXX This needs to be updated for multi-tty support. Is there + anybody who needs to emulate select these days? */ int nread, i; extern int quit_char; @@ -2752,6 +2857,10 @@ } } +#if !defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X) +#define select sys_select +#endif + #endif /* not HAVE_SELECT */ #endif /* not VMS */ #endif /* not MSDOS */ @@ -2768,12 +2877,13 @@ } void -reset_sigio () +reset_sigio (fd) + int fd; { if (noninteractive) return; lmode = ~LINTRUP & lmode; - ioctl (0, TIOCLSET, &lmode); + ioctl (fd, TIOCLSET, &lmode); } void @@ -3229,7 +3339,7 @@ #undef abort sys_abort () { - reset_sys_modes (); + reset_all_sys_modes (); LIB$SIGNAL (SS$_DEBUG); } #endif /* abort */ @@ -3556,7 +3666,7 @@ char *badfunc; { printf ("%s not yet implemented\r\n", badfunc); - reset_sys_modes (); + reset_all_sys_modes (); exit (1); } @@ -5143,7 +5253,7 @@ char *badfunc; { printf ("%s not yet implemented\r\n", badfunc); - reset_sys_modes (); + reset_all_sys_modes (); exit (1); } @@ -5165,7 +5275,7 @@ /* Called from init_sys_modes. */ void -hft_init () +hft_init (struct tty_display_info *tty_out) { int junk; @@ -5211,15 +5321,12 @@ keymap.hfkey[1].hf_char = 127; hftctl (0, HFSKBD, &buf); } - /* The HFT system on AIX doesn't optimize for scrolling, so it's really ugly - at times. */ - line_ins_del_ok = char_ins_del_ok = 0; } /* Reset the rubout key to backspace. */ void -hft_reset () +hft_reset (struct tty_display_info *tty_out) { struct hfbuf buf; struct hfkeymap keymap;
--- a/src/syssignal.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/syssignal.h Mon Dec 19 19:57:22 2005 +0000 @@ -33,6 +33,7 @@ indicate that SIGIO doesn't work by #undef-ing SIGIO. If this file #includes <signal.h>, then that will re-#define SIGIO and confuse things. */ +/* XXX This is not correct anymore, there is a BROKEN_SIGIO macro. */ #define SIGMASKTYPE sigset_t
--- a/src/term.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/term.c Mon Dec 19 19:57:22 2005 +0000 @@ -26,9 +26,19 @@ #include <ctype.h> #include <string.h> +#include <sys/file.h> + +#include <unistd.h> /* For isatty. */ + +#if HAVE_TERMIOS_H +#include <termios.h> /* For TIOCNOTTY. */ +#endif + +#include <signal.h> + +#include "lisp.h" #include "termchar.h" #include "termopts.h" -#include "lisp.h" #include "charset.h" #include "coding.h" #include "keyboard.h" @@ -38,6 +48,8 @@ #include "dispextern.h" #include "window.h" #include "keymap.h" +#include "syssignal.h" +#include "systty.h" /* For now, don't try to include termcap.h. On some systems, configure finds a non-standard termcap.h that the main build @@ -60,24 +72,42 @@ #include "macterm.h" #endif +#ifndef O_RDWR +#define O_RDWR 2 +#endif + +#ifndef O_NOCTTY +#define O_NOCTTY 0 +#endif + static void turn_on_face P_ ((struct frame *, int face_id)); static void turn_off_face P_ ((struct frame *, int face_id)); -static void tty_show_cursor P_ ((void)); -static void tty_hide_cursor P_ ((void)); - -#define OUTPUT(a) \ - tputs (a, (int) (FRAME_LINES (XFRAME (selected_frame)) - curY), cmputc) -#define OUTPUT1(a) tputs (a, 1, cmputc) -#define OUTPUTL(a, lines) tputs (a, lines, cmputc) - -#define OUTPUT_IF(a) \ - do { \ - if (a) \ - tputs (a, (int) (FRAME_LINES (XFRAME (selected_frame)) \ - - curY), cmputc); \ - } while (0) - -#define OUTPUT1_IF(a) do { if (a) tputs (a, 1, cmputc); } while (0) +static void tty_show_cursor P_ ((struct tty_display_info *)); +static void tty_hide_cursor P_ ((struct tty_display_info *)); + +void delete_initial_device P_ ((struct device *)); +void create_tty_output P_ ((struct frame *)); +void delete_tty_output P_ ((struct frame *)); + +#define OUTPUT(tty, a) \ + emacs_tputs ((tty), a, \ + (int) (FRAME_LINES (XFRAME (selected_frame)) \ + - curY (tty)), \ + cmputc) + +#define OUTPUT1(tty, a) emacs_tputs ((tty), a, 1, cmputc) +#define OUTPUTL(tty, a, lines) emacs_tputs ((tty), a, lines, cmputc) + +#define OUTPUT_IF(tty, a) \ + do { \ + if (a) \ + emacs_tputs ((tty), a, \ + (int) (FRAME_LINES (XFRAME (selected_frame)) \ + - curY (tty) ), \ + cmputc); \ + } while (0) + +#define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0) /* Display space properties */ @@ -87,203 +117,27 @@ Lisp_Object Vring_bell_function; -/* Terminal characteristics that higher levels want to look at. - These are all extern'd in termchar.h */ - -int must_write_spaces; /* Nonzero means spaces in the text - must actually be output; can't just skip - over some columns to leave them blank. */ -int min_padding_speed; /* Speed below which no padding necessary */ - -int line_ins_del_ok; /* Terminal can insert and delete lines */ -int char_ins_del_ok; /* Terminal can insert and delete chars */ -int scroll_region_ok; /* Terminal supports setting the - scroll window */ -int scroll_region_cost; /* Cost of setting a scroll window, - measured in characters */ -int memory_below_frame; /* Terminal remembers lines - scrolled off bottom */ -int fast_clear_end_of_line; /* Terminal has a `ce' string */ - -/* Nonzero means no need to redraw the entire frame on resuming - a suspended Emacs. This is useful on terminals with multiple pages, - where one page is used for Emacs and another for all else. */ - +/* Functions to call after suspending a tty. */ +Lisp_Object Vsuspend_tty_functions; + +/* Functions to call after resuming a tty. */ +Lisp_Object Vresume_tty_functions; + +/* Chain of all displays currently in use. */ +struct device *device_list; + +/* The initial display device, created by initial_term_init. */ +struct device *initial_device; + +/* Chain of all tty device parameters. */ +struct tty_display_info *tty_list; + +/* Nonzero means no need to redraw the entire frame on resuming a + suspended Emacs. This is useful on terminals with multiple + pages, where one page is used for Emacs and another for all + else. */ int no_redraw_on_reenter; -/* Hook functions that you can set to snap out the functions in this file. - These are all extern'd in termhooks.h */ - -void (*cursor_to_hook) P_ ((int, int)); -void (*raw_cursor_to_hook) P_ ((int, int)); -void (*clear_to_end_hook) P_ ((void)); -void (*clear_frame_hook) P_ ((void)); -void (*clear_end_of_line_hook) P_ ((int)); - -void (*ins_del_lines_hook) P_ ((int, int)); - -void (*delete_glyphs_hook) P_ ((int)); - -void (*ring_bell_hook) P_ ((void)); - -void (*reset_terminal_modes_hook) P_ ((void)); -void (*set_terminal_modes_hook) P_ ((void)); -void (*update_begin_hook) P_ ((struct frame *)); -void (*update_end_hook) P_ ((struct frame *)); -void (*set_terminal_window_hook) P_ ((int)); -void (*insert_glyphs_hook) P_ ((struct glyph *, int)); -void (*write_glyphs_hook) P_ ((struct glyph *, int)); -void (*delete_glyphs_hook) P_ ((int)); - -int (*read_socket_hook) P_ ((int, int, struct input_event *)); - -void (*frame_up_to_date_hook) P_ ((struct frame *)); - -/* Return the current position of the mouse. - - Set *f to the frame the mouse is in, or zero if the mouse is in no - Emacs frame. If it is set to zero, all the other arguments are - garbage. - - If the motion started in a scroll bar, set *bar_window to the - scroll bar's window, *part to the part the mouse is currently over, - *x to the position of the mouse along the scroll bar, and *y to the - overall length of the scroll bar. - - Otherwise, set *bar_window to Qnil, and *x and *y to the column and - row of the character cell the mouse is over. - - Set *time to the time the mouse was at the returned position. - - This should clear mouse_moved until the next motion - event arrives. */ - -void (*mouse_position_hook) P_ ((FRAME_PTR *f, int insist, - Lisp_Object *bar_window, - enum scroll_bar_part *part, - Lisp_Object *x, - Lisp_Object *y, - unsigned long *time)); - -/* When reading from a minibuffer in a different frame, Emacs wants - to shift the highlight from the selected frame to the mini-buffer's - frame; under X, this means it lies about where the focus is. - This hook tells the window system code to re-decide where to put - the highlight. */ - -void (*frame_rehighlight_hook) P_ ((FRAME_PTR f)); - -/* If we're displaying frames using a window system that can stack - frames on top of each other, this hook allows you to bring a frame - to the front, or bury it behind all the other windows. If this - hook is zero, that means the device we're displaying on doesn't - support overlapping frames, so there's no need to raise or lower - anything. - - If RAISE is non-zero, F is brought to the front, before all other - windows. If RAISE is zero, F is sent to the back, behind all other - windows. */ - -void (*frame_raise_lower_hook) P_ ((FRAME_PTR f, int raise)); - -/* Set the vertical scroll bar for WINDOW to have its upper left corner - at (TOP, LEFT), and be LENGTH rows high. Set its handle to - indicate that we are displaying PORTION characters out of a total - of WHOLE characters, starting at POSITION. If WINDOW doesn't yet - have a scroll bar, create one for it. */ - -void (*set_vertical_scroll_bar_hook) - P_ ((struct window *window, - int portion, int whole, int position)); - - -/* The following three hooks are used when we're doing a thorough - redisplay of the frame. We don't explicitly know which scroll bars - are going to be deleted, because keeping track of when windows go - away is a real pain - can you say set-window-configuration? - Instead, we just assert at the beginning of redisplay that *all* - scroll bars are to be removed, and then save scroll bars from the - fiery pit when we actually redisplay their window. */ - -/* Arrange for all scroll bars on FRAME to be removed at the next call - to `*judge_scroll_bars_hook'. A scroll bar may be spared if - `*redeem_scroll_bar_hook' is applied to its window before the judgment. - - This should be applied to each frame each time its window tree is - redisplayed, even if it is not displaying scroll bars at the moment; - if the HAS_SCROLL_BARS flag has just been turned off, only calling - this and the judge_scroll_bars_hook will get rid of them. - - If non-zero, this hook should be safe to apply to any frame, - whether or not it can support scroll bars, and whether or not it is - currently displaying them. */ - -void (*condemn_scroll_bars_hook) P_ ((FRAME_PTR frame)); - -/* Unmark WINDOW's scroll bar for deletion in this judgement cycle. - Note that it's okay to redeem a scroll bar that is not condemned. */ - -void (*redeem_scroll_bar_hook) P_ ((struct window *window)); - -/* Remove all scroll bars on FRAME that haven't been saved since the - last call to `*condemn_scroll_bars_hook'. - - This should be applied to each frame after each time its window - tree is redisplayed, even if it is not displaying scroll bars at the - moment; if the HAS_SCROLL_BARS flag has just been turned off, only - calling this and condemn_scroll_bars_hook will get rid of them. - - If non-zero, this hook should be safe to apply to any frame, - whether or not it can support scroll bars, and whether or not it is - currently displaying them. */ - -void (*judge_scroll_bars_hook) P_ ((FRAME_PTR FRAME)); - -/* Strings, numbers and flags taken from the termcap entry. */ - -char *TS_ins_line; /* "al" */ -char *TS_ins_multi_lines; /* "AL" (one parameter, # lines to insert) */ -char *TS_bell; /* "bl" */ -char *TS_clr_to_bottom; /* "cd" */ -char *TS_clr_line; /* "ce", clear to end of line */ -char *TS_clr_frame; /* "cl" */ -char *TS_set_scroll_region; /* "cs" (2 params, first line and last line) */ -char *TS_set_scroll_region_1; /* "cS" (4 params: total lines, - lines above scroll region, lines below it, - total lines again) */ -char *TS_del_char; /* "dc" */ -char *TS_del_multi_chars; /* "DC" (one parameter, # chars to delete) */ -char *TS_del_line; /* "dl" */ -char *TS_del_multi_lines; /* "DL" (one parameter, # lines to delete) */ -char *TS_delete_mode; /* "dm", enter character-delete mode */ -char *TS_end_delete_mode; /* "ed", leave character-delete mode */ -char *TS_end_insert_mode; /* "ei", leave character-insert mode */ -char *TS_ins_char; /* "ic" */ -char *TS_ins_multi_chars; /* "IC" (one parameter, # chars to insert) */ -char *TS_insert_mode; /* "im", enter character-insert mode */ -char *TS_pad_inserted_char; /* "ip". Just padding, no commands. */ -char *TS_end_keypad_mode; /* "ke" */ -char *TS_keypad_mode; /* "ks" */ -char *TS_pad_char; /* "pc", char to use as padding */ -char *TS_repeat; /* "rp" (2 params, # times to repeat - and character to be repeated) */ -char *TS_end_standout_mode; /* "se" */ -char *TS_fwd_scroll; /* "sf" */ -char *TS_standout_mode; /* "so" */ -char *TS_rev_scroll; /* "sr" */ -char *TS_end_termcap_modes; /* "te" */ -char *TS_termcap_modes; /* "ti" */ -char *TS_visible_bell; /* "vb" */ -char *TS_cursor_normal; /* "ve" */ -char *TS_cursor_visible; /* "vs" */ -char *TS_cursor_invisible; /* "vi" */ -char *TS_set_window; /* "wi" (4 params, start and end of window, - each as vpos and hpos) */ - -/* Value of the "NC" (no_color_video) capability, or 0 if not - present. */ - -static int TN_no_color_video; /* Meaning of bits in no_color_video. Each bit set means that the corresponding attribute cannot be combined with colors. */ @@ -301,68 +155,6 @@ NC_ALT_CHARSET = 1 << 8 }; -/* "md" -- turn on bold (extra bright mode). */ - -char *TS_enter_bold_mode; - -/* "mh" -- turn on half-bright mode. */ - -char *TS_enter_dim_mode; - -/* "mb" -- enter blinking mode. */ - -char *TS_enter_blink_mode; - -/* "mr" -- enter reverse video mode. */ - -char *TS_enter_reverse_mode; - -/* "us"/"ue" -- start/end underlining. */ - -char *TS_exit_underline_mode, *TS_enter_underline_mode; - -/* "as"/"ae" -- start/end alternate character set. Not really - supported, yet. */ - -char *TS_enter_alt_charset_mode, *TS_exit_alt_charset_mode; - -/* "me" -- switch appearances off. */ - -char *TS_exit_attribute_mode; - -/* "Co" -- number of colors. */ - -int TN_max_colors; - -/* "pa" -- max. number of color pairs on screen. Not handled yet. - Could be a problem if not equal to TN_max_colors * TN_max_colors. */ - -int TN_max_pairs; - -/* "op" -- SVr4 set default pair to its original value. */ - -char *TS_orig_pair; - -/* "AF"/"AB" or "Sf"/"Sb"-- set ANSI or SVr4 foreground/background color. - 1 param, the color index. */ - -char *TS_set_foreground, *TS_set_background; - -int TF_hazeltine; /* termcap hz flag. */ -int TF_insmode_motion; /* termcap mi flag: can move while in insert mode. */ -int TF_standout_motion; /* termcap mi flag: can move while in standout mode. */ -int TF_underscore; /* termcap ul flag: _ underlines if over-struck on - non-blank position. Must clear before writing _. */ -int TF_teleray; /* termcap xt flag: many weird consequences. - For t1061. */ - -static int RPov; /* # chars to start a TS_repeat */ - -static int delete_in_insert_mode; /* delete mode == insert mode */ - -static int se_is_so; /* 1 if same string both enters and leaves - standout mode */ - /* internal state */ /* The largest frame width in any call to calculate_costs. */ @@ -373,33 +165,17 @@ int max_frame_lines; -static int costs_set; /* Nonzero if costs have been calculated. */ - -int insert_mode; /* Nonzero when in insert mode. */ -int standout_mode; /* Nonzero when in standout mode. */ - -/* Size of window specified by higher levels. - This is the number of lines, from the top of frame downwards, - which can participate in insert-line/delete-line operations. - - Effectively it excludes the bottom frame_lines - specified_window_size - lines from those operations. */ - -int specified_window; - -/* Frame currently being redisplayed; 0 if not currently redisplaying. - (Direct output does not count). */ - -FRAME_PTR updating_frame; +/* Non-zero if we have dropped our controlling tty and therefore + should not open a frame on stdout. */ +static int no_controlling_tty; + +/* The first unallocated display id. */ +static int next_device_id; /* Provided for lisp packages. */ static int system_uses_terminfo; -/* Flag used in tty_show/hide_cursor. */ - -static int tty_cursor_hidden; - char *tparam (); extern char *tgetstr (); @@ -417,7 +193,7 @@ #endif /* WINDOWSNT */ void -ring_bell () +ring_bell (struct frame *f) { if (!NILP (Vring_bell_function)) { @@ -438,170 +214,203 @@ Vring_bell_function = function; } - else if (!FRAME_TERMCAP_P (XFRAME (selected_frame))) - (*ring_bell_hook) (); - else - OUTPUT (TS_visible_bell && visible_bell ? TS_visible_bell : TS_bell); + else if (FRAME_DEVICE (f)->ring_bell_hook) + (*FRAME_DEVICE (f)->ring_bell_hook) (f); } +/* Ring the bell on a tty. */ + +void +tty_ring_bell (struct frame *f) +{ + struct tty_display_info *tty = FRAME_TTY (f); + + if (tty->output) + { + OUTPUT (tty, (tty->TS_visible_bell && visible_bell + ? tty->TS_visible_bell + : tty->TS_bell)); + fflush (tty->output); + } +} + +/* Set up termcap modes for Emacs. */ + void -set_terminal_modes () +tty_set_terminal_modes (struct device *display) { - if (FRAME_TERMCAP_P (XFRAME (selected_frame))) + struct tty_display_info *tty = display->display_info.tty; + + if (tty->output) { - if (TS_termcap_modes) - OUTPUT (TS_termcap_modes); + if (tty->TS_termcap_modes) + OUTPUT (tty, tty->TS_termcap_modes); else - { - /* Output enough newlines to scroll all the old screen contents - off the screen, so it won't be overwritten and lost. */ - int i; - for (i = 0; i < FRAME_LINES (XFRAME (selected_frame)); i++) - putchar ('\n'); - } - - OUTPUT_IF (TS_cursor_visible); - OUTPUT_IF (TS_keypad_mode); - losecursor (); + { + /* Output enough newlines to scroll all the old screen contents + off the screen, so it won't be overwritten and lost. */ + int i; + current_tty = tty; + for (i = 0; i < FRAME_LINES (XFRAME (selected_frame)); i++) + cmputc ('\n'); + } + + OUTPUT_IF (tty, tty->TS_termcap_modes); + OUTPUT_IF (tty, tty->TS_cursor_visible); + OUTPUT_IF (tty, tty->TS_keypad_mode); + losecursor (tty); + fflush (tty->output); } - else - (*set_terminal_modes_hook) (); } +/* Reset termcap modes before exiting Emacs. */ + void -reset_terminal_modes () +tty_reset_terminal_modes (struct device *display) { - if (FRAME_TERMCAP_P (XFRAME (selected_frame))) + struct tty_display_info *tty = display->display_info.tty; + + if (tty->output) { - turn_off_highlight (); - turn_off_insert (); - OUTPUT_IF (TS_end_keypad_mode); - OUTPUT_IF (TS_cursor_normal); - OUTPUT_IF (TS_end_termcap_modes); - OUTPUT_IF (TS_orig_pair); + turn_off_highlight (tty); + turn_off_insert (tty); + OUTPUT_IF (tty, tty->TS_end_keypad_mode); + OUTPUT_IF (tty, tty->TS_cursor_normal); + OUTPUT_IF (tty, tty->TS_end_termcap_modes); + OUTPUT_IF (tty, tty->TS_orig_pair); /* Output raw CR so kernel can track the cursor hpos. */ + current_tty = tty; cmputc ('\r'); + fflush (tty->output); } - else if (reset_terminal_modes_hook) - (*reset_terminal_modes_hook) (); } void -update_begin (f) - struct frame *f; -{ - updating_frame = f; - if (!FRAME_TERMCAP_P (f)) - update_begin_hook (f); -} - -void -update_end (f) - struct frame *f; +update_begin (struct frame *f) { - if (FRAME_TERMCAP_P (f)) - { - if (!XWINDOW (selected_window)->cursor_off_p) - tty_show_cursor (); - turn_off_insert (); - background_highlight (); - } - else - update_end_hook (f); - - updating_frame = NULL; + if (FRAME_DEVICE (f)->update_begin_hook) + (*FRAME_DEVICE (f)->update_begin_hook) (f); } void -set_terminal_window (size) - int size; +update_end (struct frame *f) +{ + if (FRAME_DEVICE (f)->update_end_hook) + (*FRAME_DEVICE (f)->update_end_hook) (f); +} + +/* Flag the end of a display update on a termcap display. */ + +void +tty_update_end (struct frame *f) { - if (FRAME_TERMCAP_P (updating_frame)) - { - specified_window = size ? size : FRAME_LINES (updating_frame); - if (scroll_region_ok) - set_scroll_region (0, specified_window); - } - else - set_terminal_window_hook (size); + struct tty_display_info *tty = FRAME_TTY (f); + + if (!XWINDOW (selected_window)->cursor_off_p) + tty_show_cursor (tty); + turn_off_insert (tty); + background_highlight (tty); +} + +/* Specify how many text lines, from the top of the window, + should be affected by insert-lines and delete-lines operations. + This, and those operations, are used only within an update + that is bounded by calls to update_begin and update_end. */ + +void +set_terminal_window (struct frame *f, int size) +{ + if (FRAME_DEVICE (f)->set_terminal_window_hook) + (*FRAME_DEVICE (f)->set_terminal_window_hook) (f, size); +} + +/* The implementation of set_terminal_window for termcap frames. */ + +void +tty_set_terminal_window (struct frame *f, int size) +{ + struct tty_display_info *tty = FRAME_TTY (f); + + tty->specified_window = size ? size : FRAME_LINES (f); + if (FRAME_SCROLL_REGION_OK (f)) + set_scroll_region (f, 0, tty->specified_window); } void -set_scroll_region (start, stop) - int start, stop; +set_scroll_region (struct frame *f, int start, int stop) { char *buf; - struct frame *sf = XFRAME (selected_frame); - - if (TS_set_scroll_region) - buf = tparam (TS_set_scroll_region, 0, 0, start, stop - 1); - else if (TS_set_scroll_region_1) - buf = tparam (TS_set_scroll_region_1, 0, 0, - FRAME_LINES (sf), start, - FRAME_LINES (sf) - stop, - FRAME_LINES (sf)); + struct tty_display_info *tty = FRAME_TTY (f); + + if (tty->TS_set_scroll_region) + buf = tparam (tty->TS_set_scroll_region, 0, 0, start, stop - 1); + else if (tty->TS_set_scroll_region_1) + buf = tparam (tty->TS_set_scroll_region_1, 0, 0, + FRAME_LINES (f), start, + FRAME_LINES (f) - stop, + FRAME_LINES (f)); else - buf = tparam (TS_set_window, 0, 0, start, 0, stop, FRAME_COLS (sf)); - - OUTPUT (buf); + buf = tparam (tty->TS_set_window, 0, 0, start, 0, stop, FRAME_COLS (f)); + + OUTPUT (tty, buf); xfree (buf); - losecursor (); + losecursor (tty); } static void -turn_on_insert () +turn_on_insert (struct tty_display_info *tty) { - if (!insert_mode) - OUTPUT (TS_insert_mode); - insert_mode = 1; + if (!tty->insert_mode) + OUTPUT (tty, tty->TS_insert_mode); + tty->insert_mode = 1; } void -turn_off_insert () +turn_off_insert (struct tty_display_info *tty) { - if (insert_mode) - OUTPUT (TS_end_insert_mode); - insert_mode = 0; + if (tty->insert_mode) + OUTPUT (tty, tty->TS_end_insert_mode); + tty->insert_mode = 0; } /* Handle highlighting. */ void -turn_off_highlight () +turn_off_highlight (struct tty_display_info *tty) { - if (standout_mode) - OUTPUT_IF (TS_end_standout_mode); - standout_mode = 0; + if (tty->standout_mode) + OUTPUT_IF (tty, tty->TS_end_standout_mode); + tty->standout_mode = 0; } static void -turn_on_highlight () +turn_on_highlight (struct tty_display_info *tty) { - if (!standout_mode) - OUTPUT_IF (TS_standout_mode); - standout_mode = 1; + if (!tty->standout_mode) + OUTPUT_IF (tty, tty->TS_standout_mode); + tty->standout_mode = 1; } static void -toggle_highlight () +toggle_highlight (struct tty_display_info *tty) { - if (standout_mode) - turn_off_highlight (); + if (tty->standout_mode) + turn_off_highlight (tty); else - turn_on_highlight (); + turn_on_highlight (tty); } /* Make cursor invisible. */ static void -tty_hide_cursor () +tty_hide_cursor (struct tty_display_info *tty) { - if (tty_cursor_hidden == 0) + if (tty->cursor_hidden == 0) { - tty_cursor_hidden = 1; - OUTPUT_IF (TS_cursor_invisible); + tty->cursor_hidden = 1; + OUTPUT_IF (tty, tty->TS_cursor_invisible); } } @@ -609,13 +418,13 @@ /* Ensure that cursor is visible. */ static void -tty_show_cursor () +tty_show_cursor (struct tty_display_info *tty) { - if (tty_cursor_hidden) + if (tty->cursor_hidden) { - tty_cursor_hidden = 0; - OUTPUT_IF (TS_cursor_normal); - OUTPUT_IF (TS_cursor_visible); + tty->cursor_hidden = 0; + OUTPUT_IF (tty, tty->TS_cursor_normal); + OUTPUT_IF (tty, tty->TS_cursor_visible); } } @@ -625,23 +434,23 @@ depends on the user option inverse-video. */ void -background_highlight () +background_highlight (struct tty_display_info *tty) { if (inverse_video) - turn_on_highlight (); + turn_on_highlight (tty); else - turn_off_highlight (); + turn_off_highlight (tty); } /* Set standout mode to the mode specified for the text to be output. */ static void -highlight_if_desired () +highlight_if_desired (struct tty_display_info *tty) { if (inverse_video) - turn_on_highlight (); + turn_on_highlight (tty); else - turn_off_highlight (); + turn_off_highlight (tty); } @@ -649,76 +458,85 @@ frame-relative coordinates. */ void -cursor_to (vpos, hpos) - int vpos, hpos; +cursor_to (struct frame *f, int vpos, int hpos) { - struct frame *f = updating_frame ? updating_frame : XFRAME (selected_frame); - - if (! FRAME_TERMCAP_P (f) && cursor_to_hook) - { - (*cursor_to_hook) (vpos, hpos); - return; - } + if (FRAME_DEVICE (f)->cursor_to_hook) + (*FRAME_DEVICE (f)->cursor_to_hook) (f, vpos, hpos); +} + +void +tty_cursor_to (struct frame *f, int vpos, int hpos) +{ + struct tty_display_info *tty = FRAME_TTY (f); /* Detect the case where we are called from reset_sys_modes and the costs have never been calculated. Do nothing. */ - if (! costs_set) + if (! tty->costs_set) return; - if (curY == vpos && curX == hpos) + if (curY (tty) == vpos + && curX (tty) == hpos) return; - if (!TF_standout_motion) - background_highlight (); - if (!TF_insmode_motion) - turn_off_insert (); - cmgoto (vpos, hpos); + if (!tty->TF_standout_motion) + background_highlight (tty); + if (!tty->TF_insmode_motion) + turn_off_insert (tty); + cmgoto (tty, vpos, hpos); } /* Similar but don't take any account of the wasted characters. */ void -raw_cursor_to (row, col) - int row, col; +raw_cursor_to (struct frame *f, int row, int col) +{ + if (FRAME_DEVICE (f)->raw_cursor_to_hook) + (*FRAME_DEVICE (f)->raw_cursor_to_hook) (f, row, col); +} + +void +tty_raw_cursor_to (struct frame *f, int row, int col) { - struct frame *f = updating_frame ? updating_frame : XFRAME (selected_frame); - if (! FRAME_TERMCAP_P (f)) - { - (*raw_cursor_to_hook) (row, col); - return; - } - if (curY == row && curX == col) + struct tty_display_info *tty = FRAME_TTY (f); + + if (curY (tty) == row + && curX (tty) == col) return; - if (!TF_standout_motion) - background_highlight (); - if (!TF_insmode_motion) - turn_off_insert (); - cmgoto (row, col); + if (!tty->TF_standout_motion) + background_highlight (tty); + if (!tty->TF_insmode_motion) + turn_off_insert (tty); + cmgoto (tty, row, col); } /* Erase operations */ -/* clear from cursor to end of frame */ +/* Clear from cursor to end of frame. */ void -clear_to_end () +clear_to_end (struct frame *f) +{ + if (FRAME_DEVICE (f)->clear_to_end_hook) + (*FRAME_DEVICE (f)->clear_to_end_hook) (f); +} + +/* Clear from cursor to end of frame on a termcap device. */ + +void +tty_clear_to_end (struct frame *f) { register int i; - - if (clear_to_end_hook && ! FRAME_TERMCAP_P (updating_frame)) + struct tty_display_info *tty = FRAME_TTY (f); + + if (tty->TS_clr_to_bottom) { - (*clear_to_end_hook) (); - return; - } - if (TS_clr_to_bottom) - { - background_highlight (); - OUTPUT (TS_clr_to_bottom); + background_highlight (tty); + OUTPUT (tty, tty->TS_clr_to_bottom); } else { - for (i = curY; i < FRAME_LINES (XFRAME (selected_frame)); i++) + for (i = curY (tty); i < FRAME_LINES (f); i++) { - cursor_to (i, 0); - clear_end_of_line (FRAME_COLS (XFRAME (selected_frame))); + cursor_to (f, i, 0); + clear_end_of_line (f, FRAME_COLS (f)); } } } @@ -726,26 +544,29 @@ /* Clear entire frame */ void -clear_frame () +clear_frame (struct frame *f) { - struct frame *sf = XFRAME (selected_frame); - - if (clear_frame_hook - && ! FRAME_TERMCAP_P ((updating_frame ? updating_frame : sf))) + if (FRAME_DEVICE (f)->clear_frame_hook) + (*FRAME_DEVICE (f)->clear_frame_hook) (f); +} + +/* Clear an entire termcap frame. */ + +void +tty_clear_frame (struct frame *f) +{ + struct tty_display_info *tty = FRAME_TTY (f); + + if (tty->TS_clr_frame) { - (*clear_frame_hook) (); - return; - } - if (TS_clr_frame) - { - background_highlight (); - OUTPUT (TS_clr_frame); - cmat (0, 0); + background_highlight (tty); + OUTPUT (tty, tty->TS_clr_frame); + cmat (tty, 0, 0); } else { - cursor_to (0, 0); - clear_to_end (); + cursor_to (f, 0, 0); + clear_to_end (f); } } @@ -755,49 +576,51 @@ Note that the cursor may be moved, on terminals lacking a `ce' string. */ void -clear_end_of_line (first_unused_hpos) - int first_unused_hpos; +clear_end_of_line (struct frame *f, int first_unused_hpos) +{ + if (FRAME_DEVICE (f)->clear_end_of_line_hook) + (*FRAME_DEVICE (f)->clear_end_of_line_hook) (f, first_unused_hpos); +} + +/* An implementation of clear_end_of_line for termcap frames. + + Note that the cursor may be moved, on terminals lacking a `ce' string. */ + +void +tty_clear_end_of_line (struct frame *f, int first_unused_hpos) { register int i; - - if (clear_end_of_line_hook - && ! FRAME_TERMCAP_P ((updating_frame - ? updating_frame - : XFRAME (selected_frame)))) - { - (*clear_end_of_line_hook) (first_unused_hpos); - return; - } + struct tty_display_info *tty = FRAME_TTY (f); /* Detect the case where we are called from reset_sys_modes and the costs have never been calculated. Do nothing. */ - if (! costs_set) + if (! tty->costs_set) return; - if (curX >= first_unused_hpos) + if (curX (tty) >= first_unused_hpos) return; - background_highlight (); - if (TS_clr_line) + background_highlight (tty); + if (tty->TS_clr_line) { - OUTPUT1 (TS_clr_line); + OUTPUT1 (tty, tty->TS_clr_line); } else { /* have to do it the hard way */ - struct frame *sf = XFRAME (selected_frame); - turn_off_insert (); + turn_off_insert (tty); /* Do not write in last row last col with Auto-wrap on. */ - if (AutoWrap && curY == FRAME_LINES (sf) - 1 - && first_unused_hpos == FRAME_COLS (sf)) + if (AutoWrap (tty) + && curY (tty) == FrameRows (tty) - 1 + && first_unused_hpos == FrameCols (tty)) first_unused_hpos--; - for (i = curX; i < first_unused_hpos; i++) + for (i = curX (tty); i < first_unused_hpos; i++) { - if (termscript) - fputc (' ', termscript); - putchar (' '); + if (tty->termscript) + fputc (' ', tty->termscript); + fputc (' ', tty->output); } - cmplus (first_unused_hpos - curX); + cmplus (tty, first_unused_hpos - curX (tty)); } } @@ -919,43 +742,47 @@ return encode_terminal_buf + nbytes; } + +/* Output LEN glyphs starting at STRING at the nominal cursor position. + Advance the nominal cursor over the text. */ + void -write_glyphs (string, len) - register struct glyph *string; - register int len; +write_glyphs (struct frame *f, struct glyph *string, int len) { - struct frame *sf = XFRAME (selected_frame); - struct frame *f = updating_frame ? updating_frame : sf; + if (FRAME_DEVICE (f)->write_glyphs_hook) + (*FRAME_DEVICE (f)->write_glyphs_hook) (f, string, len); +} + +/* An implementation of write_glyphs for termcap frames. */ + +void +tty_write_glyphs (struct frame *f, struct glyph *string, int len) +{ unsigned char *conversion_buffer; struct coding_system *coding; - if (write_glyphs_hook - && ! FRAME_TERMCAP_P (f)) - { - (*write_glyphs_hook) (string, len); - return; - } - - turn_off_insert (); - tty_hide_cursor (); + struct tty_display_info *tty = FRAME_TTY (f); + + turn_off_insert (tty); + tty_hide_cursor (tty); /* Don't dare write in last column of bottom line, if Auto-Wrap, since that would scroll the whole frame on some terminals. */ - if (AutoWrap - && curY + 1 == FRAME_LINES (sf) - && (curX + len) == FRAME_COLS (sf)) + if (AutoWrap (tty) + && curY (tty) + 1 == FRAME_LINES (f) + && (curX (tty) + len) == FRAME_COLS (f)) len --; if (len <= 0) return; - cmplus (len); + cmplus (tty, len); /* If terminal_coding does any conversion, use it, otherwise use safe_terminal_coding. We can't use CODING_REQUIRE_ENCODING here because it always return 1 if the member src_multibyte is 1. */ - coding = (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK - ? &terminal_coding : &safe_terminal_coding); + coding = (FRAME_TERMINAL_CODING (f)->common_flags & CODING_REQUIRE_ENCODING_MASK + ? FRAME_TERMINAL_CODING (f) : &safe_terminal_coding); /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at the tail. */ coding->mode &= ~CODING_MODE_LAST_BLOCK; @@ -971,7 +798,7 @@ break; /* Turn appearance modes of the face of the run on. */ - highlight_if_desired (); + highlight_if_desired (tty); turn_on_face (f, face_id); if (n == len) @@ -980,61 +807,62 @@ conversion_buffer = encode_terminal_code (string, n, coding); if (coding->produced > 0) { - fwrite (conversion_buffer, 1, coding->produced, stdout); - if (ferror (stdout)) - clearerr (stdout); - if (termscript) - fwrite (conversion_buffer, 1, coding->produced, termscript); + fwrite (conversion_buffer, 1, coding->produced, tty->output); + if (ferror (tty->output)) + clearerr (tty->output); + if (tty->termscript) + fwrite (conversion_buffer, 1, coding->produced, tty->termscript); } len -= n; string += n; /* Turn appearance modes off. */ turn_off_face (f, face_id); - turn_off_highlight (); + turn_off_highlight (tty); } - cmcheckmagic (); + cmcheckmagic (tty); } -/* If start is zero, insert blanks instead of a string at start */ +/* Insert LEN glyphs from START at the nominal cursor position. + + If start is zero, insert blanks instead of a string at start */ void -insert_glyphs (start, len) - register struct glyph *start; - register int len; +insert_glyphs (struct frame *f, struct glyph *start, int len) +{ + if (len <= 0) + return; + + if (FRAME_DEVICE (f)->insert_glyphs_hook) + (*FRAME_DEVICE (f)->insert_glyphs_hook) (f, start, len); +} + +/* An implementation of insert_glyphs for termcap frames. */ + +void +tty_insert_glyphs (struct frame *f, struct glyph *start, int len) { char *buf; struct glyph *glyph = NULL; - struct frame *f, *sf; unsigned char *conversion_buffer; unsigned char space[1]; struct coding_system *coding; - if (len <= 0) - return; - - if (insert_glyphs_hook) + struct tty_display_info *tty = FRAME_TTY (f); + + if (tty->TS_ins_multi_chars) { - (*insert_glyphs_hook) (start, len); + buf = tparam (tty->TS_ins_multi_chars, 0, 0, len); + OUTPUT1 (tty, buf); + xfree (buf); + if (start) + write_glyphs (f, start, len); return; } - sf = XFRAME (selected_frame); - f = updating_frame ? updating_frame : sf; - - if (TS_ins_multi_chars) - { - buf = tparam (TS_ins_multi_chars, 0, 0, len); - OUTPUT1 (buf); - xfree (buf); - if (start) - write_glyphs (start, len); - return; - } - - turn_on_insert (); - cmplus (len); + turn_on_insert (tty); + cmplus (tty, len); if (! start) space[0] = SPACEGLYPH; @@ -1042,15 +870,15 @@ /* If terminal_coding does any conversion, use it, otherwise use safe_terminal_coding. We can't use CODING_REQUIRE_ENCODING here because it always return 1 if the member src_multibyte is 1. */ - coding = (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK - ? &terminal_coding : &safe_terminal_coding); + coding = (FRAME_TERMINAL_CODING (f)->common_flags & CODING_REQUIRE_ENCODING_MASK + ? FRAME_TERMINAL_CODING (f) : &safe_terminal_coding); /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at the tail. */ coding->mode &= ~CODING_MODE_LAST_BLOCK; while (len-- > 0) { - OUTPUT1_IF (TS_ins_char); + OUTPUT1_IF (tty, tty->TS_ins_char); if (!start) { conversion_buffer = space; @@ -1058,7 +886,7 @@ } else { - highlight_if_desired (); + highlight_if_desired (tty); turn_on_face (f, start->face_id); glyph = start; ++start; @@ -1066,7 +894,7 @@ occupies more than one column. */ while (len && CHAR_GLYPH_PADDING_P (*start)) { - OUTPUT1_IF (TS_ins_char); + OUTPUT1_IF (tty, tty->TS_ins_char); start++, len--; } @@ -1074,87 +902,93 @@ /* This is the last glyph. */ coding->mode |= CODING_MODE_LAST_BLOCK; - conversion_buffer = encode_terminal_code (glyph, 1, coding); + conversion_buffer = encode_terminal_code (glyph, 1, coding); } if (coding->produced > 0) { - fwrite (conversion_buffer, 1, coding->produced, stdout); - if (ferror (stdout)) - clearerr (stdout); - if (termscript) - fwrite (conversion_buffer, 1, coding->produced, termscript); + fwrite (conversion_buffer, 1, coding->produced, tty->output); + if (ferror (tty->output)) + clearerr (tty->output); + if (tty->termscript) + fwrite (conversion_buffer, 1, coding->produced, tty->termscript); } - OUTPUT1_IF (TS_pad_inserted_char); + OUTPUT1_IF (tty, tty->TS_pad_inserted_char); if (start) { turn_off_face (f, glyph->face_id); - turn_off_highlight (); + turn_off_highlight (tty); } } - cmcheckmagic (); + cmcheckmagic (tty); } +/* Delete N glyphs at the nominal cursor position. */ + void -delete_glyphs (n) - register int n; +delete_glyphs (struct frame *f, int n) +{ + if (FRAME_DEVICE (f)->delete_glyphs_hook) + (*FRAME_DEVICE (f)->delete_glyphs_hook) (f, n); +} + +/* An implementation of delete_glyphs for termcap frames. */ + +void +tty_delete_glyphs (struct frame *f, int n) { char *buf; register int i; - if (delete_glyphs_hook && ! FRAME_TERMCAP_P (updating_frame)) + struct tty_display_info *tty = FRAME_TTY (f); + + if (tty->delete_in_insert_mode) { - (*delete_glyphs_hook) (n); - return; - } - - if (delete_in_insert_mode) - { - turn_on_insert (); + turn_on_insert (tty); } else { - turn_off_insert (); - OUTPUT_IF (TS_delete_mode); + turn_off_insert (tty); + OUTPUT_IF (tty, tty->TS_delete_mode); } - if (TS_del_multi_chars) + if (tty->TS_del_multi_chars) { - buf = tparam (TS_del_multi_chars, 0, 0, n); - OUTPUT1 (buf); + buf = tparam (tty->TS_del_multi_chars, 0, 0, n); + OUTPUT1 (tty, buf); xfree (buf); } else for (i = 0; i < n; i++) - OUTPUT1 (TS_del_char); - if (!delete_in_insert_mode) - OUTPUT_IF (TS_end_delete_mode); + OUTPUT1 (tty, tty->TS_del_char); + if (!tty->delete_in_insert_mode) + OUTPUT_IF (tty, tty->TS_end_delete_mode); } /* Insert N lines at vpos VPOS. If N is negative, delete -N lines. */ void -ins_del_lines (vpos, n) - int vpos, n; +ins_del_lines (struct frame *f, int vpos, int n) { - char *multi = n > 0 ? TS_ins_multi_lines : TS_del_multi_lines; - char *single = n > 0 ? TS_ins_line : TS_del_line; - char *scroll = n > 0 ? TS_rev_scroll : TS_fwd_scroll; - struct frame *sf; + if (FRAME_DEVICE (f)->ins_del_lines_hook) + (*FRAME_DEVICE (f)->ins_del_lines_hook) (f, vpos, n); +} + +/* An implementation of ins_del_lines for termcap frames. */ + +void +tty_ins_del_lines (struct frame *f, int vpos, int n) +{ + struct tty_display_info *tty = FRAME_TTY (f); + char *multi = n > 0 ? tty->TS_ins_multi_lines : tty->TS_del_multi_lines; + char *single = n > 0 ? tty->TS_ins_line : tty->TS_del_line; + char *scroll = n > 0 ? tty->TS_rev_scroll : tty->TS_fwd_scroll; register int i = n > 0 ? n : -n; register char *buf; - if (ins_del_lines_hook && ! FRAME_TERMCAP_P (updating_frame)) - { - (*ins_del_lines_hook) (vpos, n); - return; - } - - sf = XFRAME (selected_frame); - /* If the lines below the insertion are being pushed into the end of the window, this is the same as clearing; and we know the lines are already clear, since the matching @@ -1162,45 +996,49 @@ /* If the lines below the deletion are blank lines coming out of the end of the window, don't bother, as there will be a matching inslines later that will flush them. */ - if (scroll_region_ok && vpos + i >= specified_window) + if (FRAME_SCROLL_REGION_OK (f) + && vpos + i >= tty->specified_window) return; - if (!memory_below_frame && vpos + i >= FRAME_LINES (sf)) + if (!FRAME_MEMORY_BELOW_FRAME (f) + && vpos + i >= FRAME_LINES (f)) return; - + if (multi) { - raw_cursor_to (vpos, 0); - background_highlight (); + raw_cursor_to (f, vpos, 0); + background_highlight (tty); buf = tparam (multi, 0, 0, i); - OUTPUT (buf); + OUTPUT (tty, buf); xfree (buf); } else if (single) { - raw_cursor_to (vpos, 0); - background_highlight (); + raw_cursor_to (f, vpos, 0); + background_highlight (tty); while (--i >= 0) - OUTPUT (single); - if (TF_teleray) - curX = 0; + OUTPUT (tty, single); + if (tty->TF_teleray) + curX (tty) = 0; } else { - set_scroll_region (vpos, specified_window); + set_scroll_region (f, vpos, tty->specified_window); if (n < 0) - raw_cursor_to (specified_window - 1, 0); + raw_cursor_to (f, tty->specified_window - 1, 0); else - raw_cursor_to (vpos, 0); - background_highlight (); + raw_cursor_to (f, vpos, 0); + background_highlight (tty); while (--i >= 0) - OUTPUTL (scroll, specified_window - vpos); - set_scroll_region (0, specified_window); + OUTPUTL (tty, scroll, tty->specified_window - vpos); + set_scroll_region (f, 0, tty->specified_window); } - - if (!scroll_region_ok && memory_below_frame && n < 0) + + if (!FRAME_SCROLL_REGION_OK (f) + && FRAME_MEMORY_BELOW_FRAME (f) + && n < 0) { - cursor_to (FRAME_LINES (sf) + n, 0); - clear_to_end (); + cursor_to (f, FRAME_LINES (f) + n, 0); + clear_to_end (f); } } @@ -1208,8 +1046,7 @@ not counting any line-dependent padding. */ int -string_cost (str) - char *str; +string_cost (char *str) { cost = 0; if (str) @@ -1221,8 +1058,7 @@ counting any line-dependent padding at one line. */ static int -string_cost_one_line (str) - char *str; +string_cost_one_line (char *str) { cost = 0; if (str) @@ -1234,8 +1070,7 @@ in tenths of characters. */ int -per_line_cost (str) - register char *str; +per_line_cost (char *str) { cost = 0; if (str) @@ -1258,26 +1093,26 @@ /* ARGSUSED */ static void -calculate_ins_del_char_costs (frame) - FRAME_PTR frame; +calculate_ins_del_char_costs (struct frame *f) { + struct tty_display_info *tty = FRAME_TTY (f); int ins_startup_cost, del_startup_cost; int ins_cost_per_char, del_cost_per_char; register int i; register int *p; - if (TS_ins_multi_chars) + if (tty->TS_ins_multi_chars) { ins_cost_per_char = 0; - ins_startup_cost = string_cost_one_line (TS_ins_multi_chars); + ins_startup_cost = string_cost_one_line (tty->TS_ins_multi_chars); } - else if (TS_ins_char || TS_pad_inserted_char - || (TS_insert_mode && TS_end_insert_mode)) + else if (tty->TS_ins_char || tty->TS_pad_inserted_char + || (tty->TS_insert_mode && tty->TS_end_insert_mode)) { - ins_startup_cost = (30 * (string_cost (TS_insert_mode) - + string_cost (TS_end_insert_mode))) / 100; - ins_cost_per_char = (string_cost_one_line (TS_ins_char) - + string_cost_one_line (TS_pad_inserted_char)); + ins_startup_cost = (30 * (string_cost (tty->TS_insert_mode) + + string_cost (tty->TS_end_insert_mode))) / 100; + ins_cost_per_char = (string_cost_one_line (tty->TS_ins_char) + + string_cost_one_line (tty->TS_pad_inserted_char)); } else { @@ -1285,18 +1120,18 @@ ins_cost_per_char = 0; } - if (TS_del_multi_chars) + if (tty->TS_del_multi_chars) { del_cost_per_char = 0; - del_startup_cost = string_cost_one_line (TS_del_multi_chars); + del_startup_cost = string_cost_one_line (tty->TS_del_multi_chars); } - else if (TS_del_char) + else if (tty->TS_del_char) { - del_startup_cost = (string_cost (TS_delete_mode) - + string_cost (TS_end_delete_mode)); - if (delete_in_insert_mode) + del_startup_cost = (string_cost (tty->TS_delete_mode) + + string_cost (tty->TS_end_delete_mode)); + if (tty->delete_in_insert_mode) del_startup_cost /= 2; - del_cost_per_char = string_cost_one_line (TS_del_char); + del_cost_per_char = string_cost_one_line (tty->TS_del_char); } else { @@ -1305,75 +1140,80 @@ } /* Delete costs are at negative offsets */ - p = &char_ins_del_cost (frame)[0]; - for (i = FRAME_COLS (frame); --i >= 0;) + p = &char_ins_del_cost (f)[0]; + for (i = FRAME_COLS (f); --i >= 0;) *--p = (del_startup_cost += del_cost_per_char); /* Doing nothing is free */ - p = &char_ins_del_cost (frame)[0]; + p = &char_ins_del_cost (f)[0]; *p++ = 0; /* Insert costs are at positive offsets */ - for (i = FRAME_COLS (frame); --i >= 0;) + for (i = FRAME_COLS (f); --i >= 0;) *p++ = (ins_startup_cost += ins_cost_per_char); } void -calculate_costs (frame) - FRAME_PTR frame; +calculate_costs (struct frame *frame) { - register char *f = (TS_set_scroll_region - ? TS_set_scroll_region - : TS_set_scroll_region_1); - FRAME_COST_BAUD_RATE (frame) = baud_rate; - scroll_region_cost = string_cost (f); - - /* These variables are only used for terminal stuff. They are allocated - once for the terminal frame of X-windows emacs, but not used afterwards. - - char_ins_del_vector (i.e., char_ins_del_cost) isn't used because - X turns off char_ins_del_ok. */ - - max_frame_lines = max (max_frame_lines, FRAME_LINES (frame)); - max_frame_cols = max (max_frame_cols, FRAME_COLS (frame)); - - costs_set = 1; - - if (char_ins_del_vector != 0) - char_ins_del_vector - = (int *) xrealloc (char_ins_del_vector, - (sizeof (int) - + 2 * max_frame_cols * sizeof (int))); - else - char_ins_del_vector - = (int *) xmalloc (sizeof (int) - + 2 * max_frame_cols * sizeof (int)); - - bzero (char_ins_del_vector, (sizeof (int) - + 2 * max_frame_cols * sizeof (int))); - - if (f && (!TS_ins_line && !TS_del_line)) - do_line_insertion_deletion_costs (frame, - TS_rev_scroll, TS_ins_multi_lines, - TS_fwd_scroll, TS_del_multi_lines, - f, f, 1); - else - do_line_insertion_deletion_costs (frame, - TS_ins_line, TS_ins_multi_lines, - TS_del_line, TS_del_multi_lines, - 0, 0, 1); - - calculate_ins_del_char_costs (frame); - - /* Don't use TS_repeat if its padding is worse than sending the chars */ - if (TS_repeat && per_line_cost (TS_repeat) * baud_rate < 9000) - RPov = string_cost (TS_repeat); - else - RPov = FRAME_COLS (frame) * 2; - - cmcostinit (); /* set up cursor motion costs */ + if (FRAME_TERMCAP_P (frame)) + { + struct tty_display_info *tty = FRAME_TTY (frame); + register char *f = (tty->TS_set_scroll_region + ? tty->TS_set_scroll_region + : tty->TS_set_scroll_region_1); + + FRAME_SCROLL_REGION_COST (frame) = string_cost (f); + + tty->costs_set = 1; + + /* These variables are only used for terminal stuff. They are + allocated once for the terminal frame of X-windows emacs, but not + used afterwards. + + char_ins_del_vector (i.e., char_ins_del_cost) isn't used because + X turns off char_ins_del_ok. */ + + max_frame_lines = max (max_frame_lines, FRAME_LINES (frame)); + max_frame_cols = max (max_frame_cols, FRAME_COLS (frame)); + + if (char_ins_del_vector != 0) + char_ins_del_vector + = (int *) xrealloc (char_ins_del_vector, + (sizeof (int) + + 2 * max_frame_cols * sizeof (int))); + else + char_ins_del_vector + = (int *) xmalloc (sizeof (int) + + 2 * max_frame_cols * sizeof (int)); + + bzero (char_ins_del_vector, (sizeof (int) + + 2 * max_frame_cols * sizeof (int))); + + + if (f && (!tty->TS_ins_line && !tty->TS_del_line)) + do_line_insertion_deletion_costs (frame, + tty->TS_rev_scroll, tty->TS_ins_multi_lines, + tty->TS_fwd_scroll, tty->TS_del_multi_lines, + f, f, 1); + else + do_line_insertion_deletion_costs (frame, + tty->TS_ins_line, tty->TS_ins_multi_lines, + tty->TS_del_line, tty->TS_del_multi_lines, + 0, 0, 1); + + calculate_ins_del_char_costs (frame); + + /* Don't use TS_repeat if its padding is worse than sending the chars */ + if (tty->TS_repeat && per_line_cost (tty->TS_repeat) * baud_rate < 9000) + tty->RPov = string_cost (tty->TS_repeat); + else + tty->RPov = FRAME_COLS (frame) * 2; + + cmcostinit (FRAME_TTY (frame)); /* set up cursor motion costs */ + } } struct fkey_table { @@ -1483,7 +1323,8 @@ {"!3", "S-undo"} /*shifted undo key*/ }; -static char **term_get_fkeys_arg; +static char **term_get_fkeys_address; +static KBOARD *term_get_fkeys_kboard; static Lisp_Object term_get_fkeys_1 (); /* Find the escape codes sent by the function keys for Vfunction_key_map. @@ -1491,8 +1332,9 @@ adds entries to Vfunction_key_map for each function key it finds. */ void -term_get_fkeys (address) +term_get_fkeys (address, kboard) char **address; + KBOARD *kboard; { /* We run the body of the function (term_get_fkeys_1) and ignore all Lisp errors during the call. The only errors should be from Fdefine_key @@ -1503,7 +1345,8 @@ refusing to run at all on such a terminal. */ extern Lisp_Object Fidentity (); - term_get_fkeys_arg = address; + term_get_fkeys_address = address; + term_get_fkeys_kboard = kboard; internal_condition_case (term_get_fkeys_1, Qerror, Fidentity); } @@ -1512,17 +1355,18 @@ { int i; - char **address = term_get_fkeys_arg; - + char **address = term_get_fkeys_address; + KBOARD *kboard = term_get_fkeys_kboard; + /* This can happen if CANNOT_DUMP or with strange options. */ if (!initialized) - Vfunction_key_map = Fmake_sparse_keymap (Qnil); + kboard->Vlocal_function_key_map = Fmake_sparse_keymap (Qnil); for (i = 0; i < (sizeof (keys)/sizeof (keys[0])); i++) { char *sequence = tgetstr (keys[i].cap, address); if (sequence) - Fdefine_key (Vfunction_key_map, build_string (sequence), + Fdefine_key (kboard->Vlocal_function_key_map, build_string (sequence), Fmake_vector (make_number (1), intern (keys[i].name))); } @@ -1542,13 +1386,13 @@ if (k0) /* Define f0 first, so that f10 takes precedence in case the key sequences happens to be the same. */ - Fdefine_key (Vfunction_key_map, build_string (k0), + Fdefine_key (kboard->Vlocal_function_key_map, build_string (k0), Fmake_vector (make_number (1), intern ("f0"))); - Fdefine_key (Vfunction_key_map, build_string (k_semi), + Fdefine_key (kboard->Vlocal_function_key_map, build_string (k_semi), Fmake_vector (make_number (1), intern ("f10"))); } else if (k0) - Fdefine_key (Vfunction_key_map, build_string (k0), + Fdefine_key (kboard->Vlocal_function_key_map, build_string (k0), Fmake_vector (make_number (1), intern (k0_name))); } @@ -1571,7 +1415,7 @@ if (sequence) { sprintf (fkey, "f%d", i); - Fdefine_key (Vfunction_key_map, build_string (sequence), + Fdefine_key (kboard->Vlocal_function_key_map, build_string (sequence), Fmake_vector (make_number (1), intern (fkey))); } @@ -1587,10 +1431,10 @@ if (!tgetstr (cap1, address)) \ { \ char *sequence = tgetstr (cap2, address); \ - if (sequence) \ - Fdefine_key (Vfunction_key_map, build_string (sequence), \ - Fmake_vector (make_number (1), \ - intern (sym))); \ + if (sequence) \ + Fdefine_key (kboard->Vlocal_function_key_map, build_string (sequence), \ + Fmake_vector (make_number (1), \ + intern (sym))); \ } /* if there's no key_next keycap, map key_npage to `next' keysym */ @@ -1925,10 +1769,10 @@ from them. Some display attributes may not be used together with color; the termcap capability `NC' specifies which ones. */ -#define MAY_USE_WITH_COLORS_P(ATTR) \ - (TN_max_colors > 0 \ - ? (TN_no_color_video & (ATTR)) == 0 \ - : 1) +#define MAY_USE_WITH_COLORS_P(tty, ATTR) \ + (tty->TN_max_colors > 0 \ + ? (tty->TN_no_color_video & (ATTR)) == 0 \ + : 1) /* Turn appearances of face FACE_ID on tty frame F on. FACE_ID is a realized face ID number, in the face cache. */ @@ -1941,12 +1785,13 @@ struct face *face = FACE_FROM_ID (f, face_id); long fg = face->foreground; long bg = face->background; + struct tty_display_info *tty = FRAME_TTY (f); /* Do this first because TS_end_standout_mode may be the same as TS_exit_attribute_mode, which turns all appearances off. */ - if (MAY_USE_WITH_COLORS_P (NC_REVERSE)) + if (MAY_USE_WITH_COLORS_P (tty, NC_REVERSE)) { - if (TN_max_colors > 0) + if (tty->TN_max_colors > 0) { if (fg >= 0 && bg >= 0) { @@ -1960,13 +1805,13 @@ { if (fg == FACE_TTY_DEFAULT_FG_COLOR || bg == FACE_TTY_DEFAULT_BG_COLOR) - toggle_highlight (); + toggle_highlight (tty); } else { if (fg == FACE_TTY_DEFAULT_BG_COLOR || bg == FACE_TTY_DEFAULT_FG_COLOR) - toggle_highlight (); + toggle_highlight (tty); } } else @@ -1977,55 +1822,55 @@ { if (fg == FACE_TTY_DEFAULT_FG_COLOR || bg == FACE_TTY_DEFAULT_BG_COLOR) - toggle_highlight (); + toggle_highlight (tty); } else { if (fg == FACE_TTY_DEFAULT_BG_COLOR || bg == FACE_TTY_DEFAULT_FG_COLOR) - toggle_highlight (); + toggle_highlight (tty); } } } if (face->tty_bold_p) { - if (MAY_USE_WITH_COLORS_P (NC_BOLD)) - OUTPUT1_IF (TS_enter_bold_mode); + if (MAY_USE_WITH_COLORS_P (tty, NC_BOLD)) + OUTPUT1_IF (tty, tty->TS_enter_bold_mode); } else if (face->tty_dim_p) - if (MAY_USE_WITH_COLORS_P (NC_DIM)) - OUTPUT1_IF (TS_enter_dim_mode); + if (MAY_USE_WITH_COLORS_P (tty, NC_DIM)) + OUTPUT1_IF (tty, tty->TS_enter_dim_mode); /* Alternate charset and blinking not yet used. */ if (face->tty_alt_charset_p - && MAY_USE_WITH_COLORS_P (NC_ALT_CHARSET)) - OUTPUT1_IF (TS_enter_alt_charset_mode); + && MAY_USE_WITH_COLORS_P (tty, NC_ALT_CHARSET)) + OUTPUT1_IF (tty, tty->TS_enter_alt_charset_mode); if (face->tty_blinking_p - && MAY_USE_WITH_COLORS_P (NC_BLINK)) - OUTPUT1_IF (TS_enter_blink_mode); - - if (face->tty_underline_p && MAY_USE_WITH_COLORS_P (NC_UNDERLINE)) - OUTPUT1_IF (TS_enter_underline_mode); - - if (TN_max_colors > 0) + && MAY_USE_WITH_COLORS_P (tty, NC_BLINK)) + OUTPUT1_IF (tty, tty->TS_enter_blink_mode); + + if (face->tty_underline_p && MAY_USE_WITH_COLORS_P (tty, NC_UNDERLINE)) + OUTPUT1_IF (tty, tty->TS_enter_underline_mode); + + if (tty->TN_max_colors > 0) { char *ts, *p; - ts = standout_mode ? TS_set_background : TS_set_foreground; + ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground; if (fg >= 0 && ts) { - p = tparam (ts, NULL, 0, (int) fg); - OUTPUT (p); + p = tparam (ts, NULL, 0, (int) fg); + OUTPUT (tty, p); xfree (p); } - ts = standout_mode ? TS_set_foreground : TS_set_background; + ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background; if (bg >= 0 && ts) { - p = tparam (ts, NULL, 0, (int) bg); - OUTPUT (p); + p = tparam (ts, NULL, 0, (int) bg); + OUTPUT (tty, p); xfree (p); } } @@ -2040,10 +1885,11 @@ int face_id; { struct face *face = FACE_FROM_ID (f, face_id); + struct tty_display_info *tty = FRAME_TTY (f); xassert (face != NULL); - if (TS_exit_attribute_mode) + if (tty->TS_exit_attribute_mode) { /* Capability "me" will turn off appearance modes double-bright, half-bright, reverse-video, standout, underline. It may or @@ -2055,32 +1901,32 @@ || face->tty_blinking_p || face->tty_underline_p) { - OUTPUT1_IF (TS_exit_attribute_mode); - if (strcmp (TS_exit_attribute_mode, TS_end_standout_mode) == 0) - standout_mode = 0; + OUTPUT1_IF (tty, tty->TS_exit_attribute_mode); + if (strcmp (tty->TS_exit_attribute_mode, tty->TS_end_standout_mode) == 0) + tty->standout_mode = 0; } if (face->tty_alt_charset_p) - OUTPUT_IF (TS_exit_alt_charset_mode); + OUTPUT_IF (tty, tty->TS_exit_alt_charset_mode); } else { /* If we don't have "me" we can only have those appearances that have exit sequences defined. */ if (face->tty_alt_charset_p) - OUTPUT_IF (TS_exit_alt_charset_mode); + OUTPUT_IF (tty, tty->TS_exit_alt_charset_mode); if (face->tty_underline_p) - OUTPUT_IF (TS_exit_underline_mode); + OUTPUT_IF (tty, tty->TS_exit_underline_mode); } /* Switch back to default colors. */ - if (TN_max_colors > 0 + if (tty->TN_max_colors > 0 && ((face->foreground != FACE_TTY_DEFAULT_COLOR && face->foreground != FACE_TTY_DEFAULT_FG_COLOR) || (face->background != FACE_TTY_DEFAULT_COLOR && face->background != FACE_TTY_DEFAULT_BG_COLOR))) - OUTPUT1_IF (TS_orig_pair); + OUTPUT1_IF (tty, tty->TS_orig_pair); } @@ -2089,46 +1935,54 @@ colors FG and BG. */ int -tty_capable_p (f, caps, fg, bg) - struct frame *f; +tty_capable_p (tty, caps, fg, bg) + struct tty_display_info *tty; unsigned caps; unsigned long fg, bg; { -#define TTY_CAPABLE_P_TRY(cap, TS, NC_bit) \ - if ((caps & (cap)) && (!(TS) || !MAY_USE_WITH_COLORS_P(NC_bit))) \ +#define TTY_CAPABLE_P_TRY(tty, cap, TS, NC_bit) \ + if ((caps & (cap)) && (!(TS) || !MAY_USE_WITH_COLORS_P(tty, NC_bit))) \ return 0; - TTY_CAPABLE_P_TRY (TTY_CAP_INVERSE, TS_standout_mode, NC_REVERSE); - TTY_CAPABLE_P_TRY (TTY_CAP_UNDERLINE, TS_enter_underline_mode, NC_UNDERLINE); - TTY_CAPABLE_P_TRY (TTY_CAP_BOLD, TS_enter_bold_mode, NC_BOLD); - TTY_CAPABLE_P_TRY (TTY_CAP_DIM, TS_enter_dim_mode, NC_DIM); - TTY_CAPABLE_P_TRY (TTY_CAP_BLINK, TS_enter_blink_mode, NC_BLINK); - TTY_CAPABLE_P_TRY (TTY_CAP_ALT_CHARSET, TS_enter_alt_charset_mode, NC_ALT_CHARSET); + TTY_CAPABLE_P_TRY (tty, TTY_CAP_INVERSE, tty->TS_standout_mode, NC_REVERSE); + TTY_CAPABLE_P_TRY (tty, TTY_CAP_UNDERLINE, tty->TS_enter_underline_mode, NC_UNDERLINE); + TTY_CAPABLE_P_TRY (tty, TTY_CAP_BOLD, tty->TS_enter_bold_mode, NC_BOLD); + TTY_CAPABLE_P_TRY (tty, TTY_CAP_DIM, tty->TS_enter_dim_mode, NC_DIM); + TTY_CAPABLE_P_TRY (tty, TTY_CAP_BLINK, tty->TS_enter_blink_mode, NC_BLINK); + TTY_CAPABLE_P_TRY (tty, TTY_CAP_ALT_CHARSET, tty->TS_enter_alt_charset_mode, NC_ALT_CHARSET); /* We can do it! */ return 1; } - /* Return non-zero if the terminal is capable to display colors. */ DEFUN ("tty-display-color-p", Ftty_display_color_p, Stty_display_color_p, 0, 1, 0, - doc: /* Return non-nil if TTY can display colors on DISPLAY. */) - (display) - Lisp_Object display; + doc: /* Return non-nil if the display device DEVICE can display colors. +DEVICE must be a tty device. */) + (device) + Lisp_Object device; { - return TN_max_colors > 0 ? Qt : Qnil; + struct device *d = get_tty_device (device); + if (!d) + return Qnil; + else + return d->display_info.tty->TN_max_colors > 0 ? Qt : Qnil; } /* Return the number of supported colors. */ DEFUN ("tty-display-color-cells", Ftty_display_color_cells, Stty_display_color_cells, 0, 1, 0, - doc: /* Return the number of colors supported by TTY on DISPLAY. */) - (display) - Lisp_Object display; + doc: /* Return the number of colors supported by the tty device DEVICE. */) + (device) + Lisp_Object device; { - return make_number (TN_max_colors); + struct device *d = get_tty_device (device); + if (!d) + return make_number (0); + else + return make_number (d->display_info.tty->TN_max_colors); } #ifndef WINDOWSNT @@ -2136,8 +1990,7 @@ /* Save or restore the default color-related capabilities of this terminal. */ static void -tty_default_color_capabilities (save) - int save; +tty_default_color_capabilities (struct tty_display_info *tty, int save) { static char *default_orig_pair, *default_set_foreground, *default_set_background; @@ -2147,40 +2000,39 @@ { if (default_orig_pair) xfree (default_orig_pair); - default_orig_pair = TS_orig_pair ? xstrdup (TS_orig_pair) : NULL; + default_orig_pair = tty->TS_orig_pair ? xstrdup (tty->TS_orig_pair) : NULL; if (default_set_foreground) xfree (default_set_foreground); - default_set_foreground = TS_set_foreground ? xstrdup (TS_set_foreground) + default_set_foreground = tty->TS_set_foreground ? xstrdup (tty->TS_set_foreground) : NULL; if (default_set_background) xfree (default_set_background); - default_set_background = TS_set_background ? xstrdup (TS_set_background) + default_set_background = tty->TS_set_background ? xstrdup (tty->TS_set_background) : NULL; - default_max_colors = TN_max_colors; - default_max_pairs = TN_max_pairs; - default_no_color_video = TN_no_color_video; + default_max_colors = tty->TN_max_colors; + default_max_pairs = tty->TN_max_pairs; + default_no_color_video = tty->TN_no_color_video; } else { - TS_orig_pair = default_orig_pair; - TS_set_foreground = default_set_foreground; - TS_set_background = default_set_background; - TN_max_colors = default_max_colors; - TN_max_pairs = default_max_pairs; - TN_no_color_video = default_no_color_video; + tty->TS_orig_pair = default_orig_pair; + tty->TS_set_foreground = default_set_foreground; + tty->TS_set_background = default_set_background; + tty->TN_max_colors = default_max_colors; + tty->TN_max_pairs = default_max_pairs; + tty->TN_no_color_video = default_no_color_video; } } /* Setup one of the standard tty color schemes according to MODE. MODE's value is generally the number of colors which we want to support; zero means set up for the default capabilities, the ones - we saw at term_init time; -1 means turn off color support. */ + we saw at init_tty time; -1 means turn off color support. */ void -tty_setup_colors (mode) - int mode; +tty_setup_colors (struct tty_display_info *tty, int mode) { /* Canonicalize all negative values of MODE. */ if (mode < -1) @@ -2189,27 +2041,27 @@ switch (mode) { case -1: /* no colors at all */ - TN_max_colors = 0; - TN_max_pairs = 0; - TN_no_color_video = 0; - TS_set_foreground = TS_set_background = TS_orig_pair = NULL; + tty->TN_max_colors = 0; + tty->TN_max_pairs = 0; + tty->TN_no_color_video = 0; + tty->TS_set_foreground = tty->TS_set_background = tty->TS_orig_pair = NULL; break; case 0: /* default colors, if any */ default: - tty_default_color_capabilities (0); + tty_default_color_capabilities (tty, 0); break; case 8: /* 8 standard ANSI colors */ - TS_orig_pair = "\033[0m"; + tty->TS_orig_pair = "\033[0m"; #ifdef TERMINFO - TS_set_foreground = "\033[3%p1%dm"; - TS_set_background = "\033[4%p1%dm"; + tty->TS_set_foreground = "\033[3%p1%dm"; + tty->TS_set_background = "\033[4%p1%dm"; #else - TS_set_foreground = "\033[3%dm"; - TS_set_background = "\033[4%dm"; + tty->TS_set_foreground = "\033[3%dm"; + tty->TS_set_background = "\033[4%dm"; #endif - TN_max_colors = 8; - TN_max_pairs = 64; - TN_no_color_video = 0; + tty->TN_max_colors = 8; + tty->TN_max_pairs = 64; + tty->TN_no_color_video = 0; break; } } @@ -2260,7 +2112,7 @@ if (mode != old_mode) { - tty_setup_colors (mode); + tty_setup_colors (FRAME_TTY (f), mode); /* This recomputes all the faces given the new color definitions. */ call0 (intern ("tty-set-up-initial-frame-faces")); @@ -2271,13 +2123,242 @@ #endif /* !WINDOWSNT */ + +/* Return the display object specified by DEVICE. DEVICE may be a + display id, a frame, or nil for the display device of the current + frame. If THROW is zero, return NULL for failure, otherwise throw + an error. */ + +struct device * +get_device (Lisp_Object device, int throw) +{ + struct device *result = NULL; + + if (NILP (device)) + device = selected_frame; + + if (INTEGERP (device)) + { + struct device *d; + + for (d = device_list; d; d = d->next_device) + { + if (d->id == XINT (device)) + { + result = d; + break; + } + } + } + else if (FRAMEP (device)) + { + result = FRAME_DEVICE (XFRAME (device)); + } + + if (result == NULL && throw) + wrong_type_argument (Qdisplay_live_p, device); + + return result; +} + +/* Return the tty display object specified by DEVICE. */ + +struct device * +get_tty_device (Lisp_Object terminal) +{ + struct device *d = get_device (terminal, 0); + + if (d && d->type == output_initial) + d = NULL; + + if (d && d->type != output_termcap) + error ("Device %d is not a termcap display device", d->id); + + return d; +} + +/* Return the active termcap device that uses the tty device with the + given name. If NAME is NULL, return the device corresponding to + our controlling terminal. + + This function ignores suspended devices. + + Returns NULL if the named terminal device is not opened. */ + +struct device * +get_named_tty (name) + char *name; +{ + struct device *d; + + for (d = device_list; d; d = d->next_device) { + if (d->type == output_termcap + && ((d->display_info.tty->name == 0 && name == 0) + || (name && d->display_info.tty->name + && !strcmp (d->display_info.tty->name, name))) + && DEVICE_ACTIVE_P (d)) + return d; + }; + + return 0; +} + + + +DEFUN ("display-name", Fdisplay_name, Sdisplay_name, 0, 1, 0, + doc: /* Return the name of the display device DEVICE. +It is not guaranteed that the returned value is unique among opened devices. + +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). */) + (device) + Lisp_Object device; +{ + struct device *d = get_device (device, 1); + + if (d->name) + return build_string (d->name); + else + return Qnil; +} + +DEFUN ("display-tty-type", Fdisplay_tty_type, Sdisplay_tty_type, 0, 1, 0, + doc: /* Return the type of the tty device that DEVICE uses. + +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). */) + (device) + Lisp_Object device; +{ + struct device *d = get_device (device, 1); + + if (d->type != output_termcap) + error ("Display %d is not a termcap display", d->id); + + if (d->display_info.tty->type) + return build_string (d->display_info.tty->type); + else + return Qnil; +} + +DEFUN ("display-controlling-tty-p", Fdisplay_controlling_tty_p, Sdisplay_controlling_tty_p, 0, 1, 0, + doc: /* Return non-nil if DEVICE is on the controlling tty of the Emacs process. + +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). */) + (device) + Lisp_Object device; +{ + struct device *d = get_device (device, 1); + + if (d->type != output_termcap || d->display_info.tty->name) + return Qnil; + else + return Qt; +} + +DEFUN ("tty-no-underline", Ftty_no_underline, Stty_no_underline, 0, 1, 0, + doc: /* Declare that the tty used by DEVICE does not handle underlining. +This is used to override the terminfo data, for certain terminals that +do not really do underlining, but say that they do. This function has +no effect if used on a non-tty display. + +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). */) + (device) + Lisp_Object device; +{ + struct device *d = get_device (device, 1); + + if (d->type == output_termcap) + d->display_info.tty->TS_enter_underline_mode = 0; + return Qnil; +} + + + /*********************************************************************** Initialization ***********************************************************************/ +/* Create the bootstrap display device for the initial frame. + Returns a device of type output_initial. */ + +struct device * +init_initial_device (void) +{ + if (initialized || device_list || tty_list) + abort (); + + initial_device = create_device (); + initial_device->type = output_initial; + initial_device->name = xstrdup ("initial_device"); + initial_device->kboard = initial_kboard; + + initial_device->delete_device_hook = &delete_initial_device; + /* All other hooks are NULL. */ + + return initial_device; +} + +/* Deletes the bootstrap display device. + Called through delete_device_hook. */ + void -term_init (terminal_type) - char *terminal_type; +delete_initial_device (struct device *device) +{ + if (device != initial_device) + abort (); + + delete_device (device); + initial_device = NULL; +} + +/* Drop the controlling terminal if fd is the same device. */ +void +dissociate_if_controlling_tty (int fd) +{ + int pgid; + EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */ + if (pgid != -1) + { +#if defined (USG) && !defined (BSD_PGRPS) + setpgrp (); + no_controlling_tty = 1; +#else +#ifdef TIOCNOTTY /* Try BSD ioctls. */ + sigblock (sigmask (SIGTTOU)); + fd = emacs_open ("/dev/tty", O_RDWR, 0); + if (fd != -1 && ioctl (fd, TIOCNOTTY, 0) != -1) + { + no_controlling_tty = 1; + } + if (fd != -1) + emacs_close (fd); + sigunblock (sigmask (SIGTTOU)); +#else + /* Unknown system. */ + croak (); +#endif /* ! TIOCNOTTY */ +#endif /* ! USG */ + } +} + +static void maybe_fatal(); + +/* Create a termcap display on the tty device with the given name and + type. + + If NAME is NULL, then use the controlling tty, i.e., stdin/stdout. + Otherwise NAME should be a path to the tty device file, + e.g. "/dev/pts/7". + + TERMINAL_TYPE is the termcap type of the device, e.g. "vt100". + + If MUST_SUCCEED is true, then all errors are fatal. */ + +struct device * +init_tty (char *name, char *terminal_type, int must_succeed) { char *area; char **address = &area; @@ -2285,71 +2366,206 @@ int buffer_size = 4096; register char *p; int status; - struct frame *sf = XFRAME (selected_frame); + struct tty_display_info *tty; + struct device *device; + + if (!terminal_type) + maybe_fatal (must_succeed, 0, 0, + "Unknown terminal type", + "Unknown terminal type"); + + /* If we already have a display on the given device, use that. If + all such displays are suspended, create a new one instead. */ + /* XXX Perhaps this should be made explicit by having init_tty + always create a new display and separating device and frame + creation on Lisp level. */ + device = get_named_tty (name); + if (device) + return device; + + device = create_device (); + tty = (struct tty_display_info *) xmalloc (sizeof (struct tty_display_info)); + bzero (tty, sizeof (struct tty_display_info)); + tty->next = tty_list; + tty_list = tty; + + device->type = output_termcap; + device->display_info.tty = tty; + tty->device = device; + + tty->Wcm = (struct cm *) xmalloc (sizeof (struct cm)); + Wcm_clear (tty); + + device->rif = 0; /* ttys don't support window-based redisplay. */ + + device->cursor_to_hook = &tty_cursor_to; + device->raw_cursor_to_hook = &tty_raw_cursor_to; + + device->clear_to_end_hook = &tty_clear_to_end; + device->clear_frame_hook = &tty_clear_frame; + device->clear_end_of_line_hook = &tty_clear_end_of_line; + + device->ins_del_lines_hook = &tty_ins_del_lines; + + device->insert_glyphs_hook = &tty_insert_glyphs; + device->write_glyphs_hook = &tty_write_glyphs; + device->delete_glyphs_hook = &tty_delete_glyphs; + + device->ring_bell_hook = &tty_ring_bell; + + device->reset_terminal_modes_hook = &tty_reset_terminal_modes; + device->set_terminal_modes_hook = &tty_set_terminal_modes; + device->update_begin_hook = 0; /* Not needed. */ + device->update_end_hook = &tty_update_end; + device->set_terminal_window_hook = &tty_set_terminal_window; + + device->mouse_position_hook = 0; /* Not needed. */ + device->frame_rehighlight_hook = 0; /* Not needed. */ + device->frame_raise_lower_hook = 0; /* Not needed. */ + + device->set_vertical_scroll_bar_hook = 0; /* Not needed. */ + device->condemn_scroll_bars_hook = 0; /* Not needed. */ + device->redeem_scroll_bar_hook = 0; /* Not needed. */ + device->judge_scroll_bars_hook = 0; /* Not needed. */ + + device->read_socket_hook = &tty_read_avail_input; /* keyboard.c */ + device->frame_up_to_date_hook = 0; /* Not needed. */ + + device->delete_frame_hook = &delete_tty_output; + device->delete_device_hook = &delete_tty; + + if (name) + { + int fd; + FILE *file; + +#ifdef O_IGNORE_CTTY + /* Open the terminal device. Don't recognize it as our + controlling terminal, and don't make it the controlling tty + if we don't have one at the moment. */ + fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0); +#else + /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only + defined on Hurd. On other systems, we need to dissociate + ourselves from the controlling tty when we want to open a + frame on the same terminal. */ + + fd = emacs_open (name, O_RDWR | O_NOCTTY, 0); + +#endif /* O_IGNORE_CTTY */ + + if (fd < 0) + { + delete_tty (device); + error ("Could not open file: %s", name); + } + if (!isatty (fd)) + { + close (fd); + error ("Not a tty device: %s", name); + } + + dissociate_if_controlling_tty (fd); + + file = fdopen (fd, "w+"); + tty->name = xstrdup (name); + device->name = xstrdup (name); + tty->input = file; + tty->output = file; + } + else + { + if (no_controlling_tty) + { + /* Opening a frame on stdout is unsafe if we have + disconnected our controlling terminal. */ + error ("There is no controlling terminal any more"); + } + tty->name = 0; + device->name = xstrdup (ttyname (0)); + tty->input = stdin; + tty->output = stdout; + } + + tty->type = xstrdup (terminal_type); + + add_keyboard_wait_descriptor (fileno (tty->input)); encode_terminal_bufsize = 0; #ifdef WINDOWSNT initialize_w32_display (); - Wcm_clear (); + Wcm_clear (tty); area = (char *) xmalloc (2044); - FrameRows = FRAME_LINES (sf); - FrameCols = FRAME_COLS (sf); - specified_window = FRAME_LINES (sf); - - delete_in_insert_mode = 1; - - UseTabs = 0; - scroll_region_ok = 0; - - /* Seems to insert lines when it's not supposed to, messing - up the display. In doing a trace, it didn't seem to be - called much, so I don't think we're losing anything by - turning it off. */ - - line_ins_del_ok = 0; - char_ins_del_ok = 1; + FrameRows (tty) = FRAME_LINES (f); /* XXX */ + FrameCols (tty) = FRAME_COLS (f); /* XXX */ + tty->specified_window = FRAME_LINES (f); /* XXX */ + + tty->device->delete_in_insert_mode = 1; + + UseTabs (tty) = 0; + device->scroll_region_ok = 0; + + /* Seems to insert lines when it's not supposed to, messing up the + device. In doing a trace, it didn't seem to be called much, so I + don't think we're losing anything by turning it off. */ + device->line_ins_del_ok = 0; + device->char_ins_del_ok = 1; baud_rate = 19200; - FRAME_CAN_HAVE_SCROLL_BARS (sf) = 0; - FRAME_VERTICAL_SCROLL_BAR_TYPE (sf) = vertical_scroll_bar_none; + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; /* XXX */ + FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; /* XXX */ TN_max_colors = 16; /* Required to be non-zero for tty-display-color-p */ - return; + return device; #else /* not WINDOWSNT */ - Wcm_clear (); + Wcm_clear (tty); buffer = (char *) xmalloc (buffer_size); + + /* On some systems, tgetent tries to access the controlling + terminal. */ + sigblock (sigmask (SIGTTOU)); status = tgetent (buffer, terminal_type); + sigunblock (sigmask (SIGTTOU)); + if (status < 0) { #ifdef TERMINFO - fatal ("Cannot open terminfo database file"); + maybe_fatal (must_succeed, buffer, device, + "Cannot open terminfo database file", + "Cannot open terminfo database file"); #else - fatal ("Cannot open termcap database file"); + maybe_fatal (must_succeed, buffer, device, + "Cannot open termcap database file", + "Cannot open termcap database file"); #endif } if (status == 0) { #ifdef TERMINFO - fatal ("Terminal type %s is not defined.\n\ + maybe_fatal (must_succeed, buffer, device, + "Terminal type %s is not defined", + "Terminal type %s is not defined.\n\ If that is not the actual type of terminal you have,\n\ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ `setenv TERM ...') to specify the correct type. It may be necessary\n\ to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", - terminal_type); + terminal_type); #else - fatal ("Terminal type %s is not defined.\n\ + maybe_fatal (must_succeed, buffer, device, + "Terminal type %s is not defined", + "Terminal type %s is not defined.\n\ If that is not the actual type of terminal you have,\n\ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ `setenv TERM ...') to specify the correct type. It may be necessary\n\ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", - terminal_type); + terminal_type); #endif } @@ -2360,219 +2576,234 @@ #endif area = (char *) xmalloc (buffer_size); - TS_ins_line = tgetstr ("al", address); - TS_ins_multi_lines = tgetstr ("AL", address); - TS_bell = tgetstr ("bl", address); - BackTab = tgetstr ("bt", address); - TS_clr_to_bottom = tgetstr ("cd", address); - TS_clr_line = tgetstr ("ce", address); - TS_clr_frame = tgetstr ("cl", address); - ColPosition = NULL; /* tgetstr ("ch", address); */ - AbsPosition = tgetstr ("cm", address); - CR = tgetstr ("cr", address); - TS_set_scroll_region = tgetstr ("cs", address); - TS_set_scroll_region_1 = tgetstr ("cS", address); - RowPosition = tgetstr ("cv", address); - TS_del_char = tgetstr ("dc", address); - TS_del_multi_chars = tgetstr ("DC", address); - TS_del_line = tgetstr ("dl", address); - TS_del_multi_lines = tgetstr ("DL", address); - TS_delete_mode = tgetstr ("dm", address); - TS_end_delete_mode = tgetstr ("ed", address); - TS_end_insert_mode = tgetstr ("ei", address); - Home = tgetstr ("ho", address); - TS_ins_char = tgetstr ("ic", address); - TS_ins_multi_chars = tgetstr ("IC", address); - TS_insert_mode = tgetstr ("im", address); - TS_pad_inserted_char = tgetstr ("ip", address); - TS_end_keypad_mode = tgetstr ("ke", address); - TS_keypad_mode = tgetstr ("ks", address); - LastLine = tgetstr ("ll", address); - Right = tgetstr ("nd", address); - Down = tgetstr ("do", address); - if (!Down) - Down = tgetstr ("nl", address); /* Obsolete name for "do" */ + tty->TS_ins_line = tgetstr ("al", address); + tty->TS_ins_multi_lines = tgetstr ("AL", address); + tty->TS_bell = tgetstr ("bl", address); + BackTab (tty) = tgetstr ("bt", address); + tty->TS_clr_to_bottom = tgetstr ("cd", address); + tty->TS_clr_line = tgetstr ("ce", address); + tty->TS_clr_frame = tgetstr ("cl", address); + ColPosition (tty) = NULL; /* tgetstr ("ch", address); */ + AbsPosition (tty) = tgetstr ("cm", address); + CR (tty) = tgetstr ("cr", address); + tty->TS_set_scroll_region = tgetstr ("cs", address); + tty->TS_set_scroll_region_1 = tgetstr ("cS", address); + RowPosition (tty) = tgetstr ("cv", address); + tty->TS_del_char = tgetstr ("dc", address); + tty->TS_del_multi_chars = tgetstr ("DC", address); + tty->TS_del_line = tgetstr ("dl", address); + tty->TS_del_multi_lines = tgetstr ("DL", address); + tty->TS_delete_mode = tgetstr ("dm", address); + tty->TS_end_delete_mode = tgetstr ("ed", address); + tty->TS_end_insert_mode = tgetstr ("ei", address); + Home (tty) = tgetstr ("ho", address); + tty->TS_ins_char = tgetstr ("ic", address); + tty->TS_ins_multi_chars = tgetstr ("IC", address); + tty->TS_insert_mode = tgetstr ("im", address); + tty->TS_pad_inserted_char = tgetstr ("ip", address); + tty->TS_end_keypad_mode = tgetstr ("ke", address); + tty->TS_keypad_mode = tgetstr ("ks", address); + LastLine (tty) = tgetstr ("ll", address); + Right (tty) = tgetstr ("nd", address); + Down (tty) = tgetstr ("do", address); + if (!Down (tty)) + Down (tty) = tgetstr ("nl", address); /* Obsolete name for "do" */ #ifdef VMS /* VMS puts a carriage return before each linefeed, so it is not safe to use linefeeds. */ - if (Down && Down[0] == '\n' && Down[1] == '\0') - Down = 0; + if (Down (tty) && Down (tty)[0] == '\n' && Down (tty)[1] == '\0') + Down (tty) = 0; #endif /* VMS */ if (tgetflag ("bs")) - Left = "\b"; /* can't possibly be longer! */ + Left (tty) = "\b"; /* can't possibly be longer! */ else /* (Actually, "bs" is obsolete...) */ - Left = tgetstr ("le", address); - if (!Left) - Left = tgetstr ("bc", address); /* Obsolete name for "le" */ - TS_pad_char = tgetstr ("pc", address); - TS_repeat = tgetstr ("rp", address); - TS_end_standout_mode = tgetstr ("se", address); - TS_fwd_scroll = tgetstr ("sf", address); - TS_standout_mode = tgetstr ("so", address); - TS_rev_scroll = tgetstr ("sr", address); - Wcm.cm_tab = tgetstr ("ta", address); - TS_end_termcap_modes = tgetstr ("te", address); - TS_termcap_modes = tgetstr ("ti", address); - Up = tgetstr ("up", address); - TS_visible_bell = tgetstr ("vb", address); - TS_cursor_normal = tgetstr ("ve", address); - TS_cursor_visible = tgetstr ("vs", address); - TS_cursor_invisible = tgetstr ("vi", address); - TS_set_window = tgetstr ("wi", address); - - TS_enter_underline_mode = tgetstr ("us", address); - TS_exit_underline_mode = tgetstr ("ue", address); - TS_enter_bold_mode = tgetstr ("md", address); - TS_enter_dim_mode = tgetstr ("mh", address); - TS_enter_blink_mode = tgetstr ("mb", address); - TS_enter_reverse_mode = tgetstr ("mr", address); - TS_enter_alt_charset_mode = tgetstr ("as", address); - TS_exit_alt_charset_mode = tgetstr ("ae", address); - TS_exit_attribute_mode = tgetstr ("me", address); - - MultiUp = tgetstr ("UP", address); - MultiDown = tgetstr ("DO", address); - MultiLeft = tgetstr ("LE", address); - MultiRight = tgetstr ("RI", address); + Left (tty) = tgetstr ("le", address); + if (!Left (tty)) + Left (tty) = tgetstr ("bc", address); /* Obsolete name for "le" */ + tty->TS_pad_char = tgetstr ("pc", address); + tty->TS_repeat = tgetstr ("rp", address); + tty->TS_end_standout_mode = tgetstr ("se", address); + tty->TS_fwd_scroll = tgetstr ("sf", address); + tty->TS_standout_mode = tgetstr ("so", address); + tty->TS_rev_scroll = tgetstr ("sr", address); + tty->Wcm->cm_tab = tgetstr ("ta", address); + tty->TS_end_termcap_modes = tgetstr ("te", address); + tty->TS_termcap_modes = tgetstr ("ti", address); + Up (tty) = tgetstr ("up", address); + tty->TS_visible_bell = tgetstr ("vb", address); + tty->TS_cursor_normal = tgetstr ("ve", address); + tty->TS_cursor_visible = tgetstr ("vs", address); + tty->TS_cursor_invisible = tgetstr ("vi", address); + tty->TS_set_window = tgetstr ("wi", address); + + tty->TS_enter_underline_mode = tgetstr ("us", address); + tty->TS_exit_underline_mode = tgetstr ("ue", address); + tty->TS_enter_bold_mode = tgetstr ("md", address); + tty->TS_enter_dim_mode = tgetstr ("mh", address); + tty->TS_enter_blink_mode = tgetstr ("mb", address); + tty->TS_enter_reverse_mode = tgetstr ("mr", address); + tty->TS_enter_alt_charset_mode = tgetstr ("as", address); + tty->TS_exit_alt_charset_mode = tgetstr ("ae", address); + tty->TS_exit_attribute_mode = tgetstr ("me", address); + + MultiUp (tty) = tgetstr ("UP", address); + MultiDown (tty) = tgetstr ("DO", address); + MultiLeft (tty) = tgetstr ("LE", address); + MultiRight (tty) = tgetstr ("RI", address); /* SVr4/ANSI color suppert. If "op" isn't available, don't support color because we can't switch back to the default foreground and background. */ - TS_orig_pair = tgetstr ("op", address); - if (TS_orig_pair) + tty->TS_orig_pair = tgetstr ("op", address); + if (tty->TS_orig_pair) { - TS_set_foreground = tgetstr ("AF", address); - TS_set_background = tgetstr ("AB", address); - if (!TS_set_foreground) + tty->TS_set_foreground = tgetstr ("AF", address); + tty->TS_set_background = tgetstr ("AB", address); + if (!tty->TS_set_foreground) { /* SVr4. */ - TS_set_foreground = tgetstr ("Sf", address); - TS_set_background = tgetstr ("Sb", address); + tty->TS_set_foreground = tgetstr ("Sf", address); + tty->TS_set_background = tgetstr ("Sb", address); } - TN_max_colors = tgetnum ("Co"); - TN_max_pairs = tgetnum ("pa"); - - TN_no_color_video = tgetnum ("NC"); - if (TN_no_color_video == -1) - TN_no_color_video = 0; + tty->TN_max_colors = tgetnum ("Co"); + tty->TN_max_pairs = tgetnum ("pa"); + + tty->TN_no_color_video = tgetnum ("NC"); + if (tty->TN_no_color_video == -1) + tty->TN_no_color_video = 0; } - tty_default_color_capabilities (1); - - MagicWrap = tgetflag ("xn"); + tty_default_color_capabilities (tty, 1); + + MagicWrap (tty) = tgetflag ("xn"); /* Since we make MagicWrap terminals look like AutoWrap, we need to have the former flag imply the latter. */ - AutoWrap = MagicWrap || tgetflag ("am"); - memory_below_frame = tgetflag ("db"); - TF_hazeltine = tgetflag ("hz"); - must_write_spaces = tgetflag ("in"); - meta_key = tgetflag ("km") || tgetflag ("MT"); - TF_insmode_motion = tgetflag ("mi"); - TF_standout_motion = tgetflag ("ms"); - TF_underscore = tgetflag ("ul"); - TF_teleray = tgetflag ("xt"); - - term_get_fkeys (address); + AutoWrap (tty) = MagicWrap (tty) || tgetflag ("am"); + device->memory_below_frame = tgetflag ("db"); + tty->TF_hazeltine = tgetflag ("hz"); + device->must_write_spaces = tgetflag ("in"); + tty->meta_key = tgetflag ("km") || tgetflag ("MT"); + tty->TF_insmode_motion = tgetflag ("mi"); + tty->TF_standout_motion = tgetflag ("ms"); + tty->TF_underscore = tgetflag ("ul"); + tty->TF_teleray = tgetflag ("xt"); + +#ifdef MULTI_KBOARD + device->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); + init_kboard (device->kboard); + device->kboard->next_kboard = all_kboards; + all_kboards = device->kboard; + device->kboard->reference_count++; + /* Don't let the initial kboard remain current longer than necessary. + That would cause problems if a file loaded on startup tries to + prompt in the mini-buffer. */ + if (current_kboard == initial_kboard) + current_kboard = device->kboard; +#endif + + term_get_fkeys (address, device->kboard); /* Get frame size from system, or else from termcap. */ { int height, width; - get_frame_size (&width, &height); - FRAME_COLS (sf) = width; - FRAME_LINES (sf) = height; + get_tty_size (fileno (tty->input), &width, &height); + FrameCols (tty) = width; + FrameRows (tty) = height; } - if (FRAME_COLS (sf) <= 0) - SET_FRAME_COLS (sf, tgetnum ("co")); - else - /* Keep width and external_width consistent */ - SET_FRAME_COLS (sf, FRAME_COLS (sf)); - if (FRAME_LINES (sf) <= 0) - FRAME_LINES (sf) = tgetnum ("li"); - - if (FRAME_LINES (sf) < 3 || FRAME_COLS (sf) < 3) - fatal ("Screen size %dx%d is too small", - FRAME_LINES (sf), FRAME_COLS (sf)); - - min_padding_speed = tgetnum ("pb"); - TabWidth = tgetnum ("tw"); + if (FrameCols (tty) <= 0) + FrameCols (tty) = tgetnum ("co"); + if (FrameRows (tty) <= 0) + FrameRows (tty) = tgetnum ("li"); + + if (FrameRows (tty) < 3 || FrameCols (tty) < 3) + maybe_fatal (must_succeed, NULL, device, + "Screen size %dx%d is too small" + "Screen size %dx%d is too small", + FrameCols (tty), FrameRows (tty)); + +#if 0 /* This is not used anywhere. */ + tty->device->min_padding_speed = tgetnum ("pb"); +#endif + + TabWidth (tty) = tgetnum ("tw"); #ifdef VMS /* These capabilities commonly use ^J. I don't know why, but sending them on VMS does not work; it causes following spaces to be lost, sometimes. For now, the simplest fix is to avoid using these capabilities ever. */ - if (Down && Down[0] == '\n') - Down = 0; + if (Down (tty) && Down (tty)[0] == '\n') + Down (tty) = 0; #endif /* VMS */ - if (!TS_bell) - TS_bell = "\07"; - - if (!TS_fwd_scroll) - TS_fwd_scroll = Down; - - PC = TS_pad_char ? *TS_pad_char : 0; - - if (TabWidth < 0) - TabWidth = 8; + if (!tty->TS_bell) + tty->TS_bell = "\07"; + + if (!tty->TS_fwd_scroll) + tty->TS_fwd_scroll = Down (tty); + + PC = tty->TS_pad_char ? *tty->TS_pad_char : 0; + + if (TabWidth (tty) < 0) + TabWidth (tty) = 8; /* Turned off since /etc/termcap seems to have :ta= for most terminals and newer termcap doc does not seem to say there is a default. - if (!Wcm.cm_tab) - Wcm.cm_tab = "\t"; + if (!tty->Wcm->cm_tab) + tty->Wcm->cm_tab = "\t"; */ /* We don't support standout modes that use `magic cookies', so turn off any that do. */ - if (TS_standout_mode && tgetnum ("sg") >= 0) + if (tty->TS_standout_mode && tgetnum ("sg") >= 0) { - TS_standout_mode = 0; - TS_end_standout_mode = 0; + tty->TS_standout_mode = 0; + tty->TS_end_standout_mode = 0; } - if (TS_enter_underline_mode && tgetnum ("ug") >= 0) + if (tty->TS_enter_underline_mode && tgetnum ("ug") >= 0) { - TS_enter_underline_mode = 0; - TS_exit_underline_mode = 0; + tty->TS_enter_underline_mode = 0; + tty->TS_exit_underline_mode = 0; } /* If there's no standout mode, try to use underlining instead. */ - if (TS_standout_mode == 0) + if (tty->TS_standout_mode == 0) { - TS_standout_mode = TS_enter_underline_mode; - TS_end_standout_mode = TS_exit_underline_mode; + tty->TS_standout_mode = tty->TS_enter_underline_mode; + tty->TS_end_standout_mode = tty->TS_exit_underline_mode; } /* If no `se' string, try using a `me' string instead. If that fails, we can't use standout mode at all. */ - if (TS_end_standout_mode == 0) + if (tty->TS_end_standout_mode == 0) { char *s = tgetstr ("me", address); if (s != 0) - TS_end_standout_mode = s; + tty->TS_end_standout_mode = s; else - TS_standout_mode = 0; + tty->TS_standout_mode = 0; } - if (TF_teleray) + if (tty->TF_teleray) { - Wcm.cm_tab = 0; + tty->Wcm->cm_tab = 0; /* We can't support standout mode, because it uses magic cookies. */ - TS_standout_mode = 0; + tty->TS_standout_mode = 0; /* But that means we cannot rely on ^M to go to column zero! */ - CR = 0; + CR (tty) = 0; /* LF can't be trusted either -- can alter hpos */ /* if move at column 0 thru a line with TS_standout_mode */ - Down = 0; + Down (tty) = 0; } /* Special handling for certain terminal types known to need it */ if (!strcmp (terminal_type, "supdup")) { - memory_below_frame = 1; - Wcm.cm_losewrap = 1; + device->memory_below_frame = 1; + tty->Wcm->cm_losewrap = 1; } if (!strncmp (terminal_type, "c10", 3) || !strcmp (terminal_type, "perq")) @@ -2589,102 +2820,139 @@ It would be simpler if the :wi string could go in the termcap entry, but it can't because it is not fully valid. If it were in the termcap entry, it would confuse other programs. */ - if (!TS_set_window) + if (!tty->TS_set_window) { - p = TS_termcap_modes; + p = tty->TS_termcap_modes; while (*p && strcmp (p, "\033v ")) p++; if (*p) - TS_set_window = "\033v%C %C %C %C "; + tty->TS_set_window = "\033v%C %C %C %C "; } /* Termcap entry often fails to have :in: flag */ - must_write_spaces = 1; + device->must_write_spaces = 1; /* :ti string typically fails to have \E^G! in it */ /* This limits scope of insert-char to one line. */ - strcpy (area, TS_termcap_modes); + strcpy (area, tty->TS_termcap_modes); strcat (area, "\033\007!"); - TS_termcap_modes = area; + tty->TS_termcap_modes = area; area += strlen (area) + 1; - p = AbsPosition; + p = AbsPosition (tty); /* Change all %+ parameters to %C, to handle - values above 96 correctly for the C100. */ + values above 96 correctly for the C100. */ while (*p) - { - if (p[0] == '%' && p[1] == '+') - p[1] = 'C'; - p++; - } + { + if (p[0] == '%' && p[1] == '+') + p[1] = 'C'; + p++; + } } - FrameRows = FRAME_LINES (sf); - FrameCols = FRAME_COLS (sf); - specified_window = FRAME_LINES (sf); - - if (Wcm_init () == -1) /* can't do cursor motion */ + tty->specified_window = FrameRows (tty); + + if (Wcm_init (tty) == -1) /* can't do cursor motion */ + { + maybe_fatal (must_succeed, NULL, device, + "Terminal type \"%s\" is not powerful enough to run Emacs", #ifdef VMS - fatal ("Terminal type \"%s\" is not powerful enough to run Emacs.\n\ + "Terminal type \"%s\" is not powerful enough to run Emacs.\n\ It lacks the ability to position the cursor.\n\ If that is not the actual type of terminal you have, use either the\n\ DCL command `SET TERMINAL/DEVICE= ...' for DEC-compatible terminals,\n\ or `define EMACS_TERM \"terminal type\"' for non-DEC terminals.", - terminal_type); #else /* not VMS */ # ifdef TERMINFO - fatal ("Terminal type \"%s\" is not powerful enough to run Emacs.\n\ + "Terminal type \"%s\" is not powerful enough to run Emacs.\n\ It lacks the ability to position the cursor.\n\ If that is not the actual type of terminal you have,\n\ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ `setenv TERM ...') to specify the correct type. It may be necessary\n\ to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", - terminal_type); # else /* TERMCAP */ - fatal ("Terminal type \"%s\" is not powerful enough to run Emacs.\n\ + "Terminal type \"%s\" is not powerful enough to run Emacs.\n\ It lacks the ability to position the cursor.\n\ If that is not the actual type of terminal you have,\n\ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ `setenv TERM ...') to specify the correct type. It may be necessary\n\ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", - terminal_type); # endif /* TERMINFO */ #endif /*VMS */ - if (FRAME_LINES (sf) <= 0 - || FRAME_COLS (sf) <= 0) - fatal ("The frame size has not been specified"); - - delete_in_insert_mode - = TS_delete_mode && TS_insert_mode - && !strcmp (TS_delete_mode, TS_insert_mode); - - se_is_so = (TS_standout_mode - && TS_end_standout_mode - && !strcmp (TS_standout_mode, TS_end_standout_mode)); - - UseTabs = tabs_safe_p () && TabWidth == 8; - - scroll_region_ok - = (Wcm.cm_abs - && (TS_set_window || TS_set_scroll_region || TS_set_scroll_region_1)); - - line_ins_del_ok = (((TS_ins_line || TS_ins_multi_lines) - && (TS_del_line || TS_del_multi_lines)) - || (scroll_region_ok && TS_fwd_scroll && TS_rev_scroll)); - - char_ins_del_ok = ((TS_ins_char || TS_insert_mode - || TS_pad_inserted_char || TS_ins_multi_chars) - && (TS_del_char || TS_del_multi_chars)); - - fast_clear_end_of_line = TS_clr_line != 0; - - init_baud_rate (); - if (read_socket_hook) /* Baudrate is somewhat */ - /* meaningless in this case */ - baud_rate = 9600; - - FRAME_CAN_HAVE_SCROLL_BARS (sf) = 0; - FRAME_VERTICAL_SCROLL_BAR_TYPE (sf) = vertical_scroll_bar_none; -#endif /* WINDOWSNT */ - - xfree (buffer); + terminal_type); + } + + if (FrameRows (tty) <= 0 || FrameCols (tty) <= 0) + maybe_fatal (must_succeed, NULL, device, + "Could not determine the frame size", + "Could not determine the frame size"); + + tty->delete_in_insert_mode + = tty->TS_delete_mode && tty->TS_insert_mode + && !strcmp (tty->TS_delete_mode, tty->TS_insert_mode); + + tty->se_is_so = (tty->TS_standout_mode + && tty->TS_end_standout_mode + && !strcmp (tty->TS_standout_mode, tty->TS_end_standout_mode)); + + UseTabs (tty) = tabs_safe_p (fileno (tty->input)) && TabWidth (tty) == 8; + + device->scroll_region_ok + = (tty->Wcm->cm_abs + && (tty->TS_set_window || tty->TS_set_scroll_region || tty->TS_set_scroll_region_1)); + + device->line_ins_del_ok + = (((tty->TS_ins_line || tty->TS_ins_multi_lines) + && (tty->TS_del_line || tty->TS_del_multi_lines)) + || (device->scroll_region_ok + && tty->TS_fwd_scroll && tty->TS_rev_scroll)); + + device->char_ins_del_ok + = ((tty->TS_ins_char || tty->TS_insert_mode + || tty->TS_pad_inserted_char || tty->TS_ins_multi_chars) + && (tty->TS_del_char || tty->TS_del_multi_chars)); + + device->fast_clear_end_of_line = tty->TS_clr_line != 0; + + init_baud_rate (fileno (tty->input)); + +#ifdef AIXHFT + /* The HFT system on AIX doesn't optimize for scrolling, so it's + really ugly at times. */ + device->line_ins_del_ok = 0; + device->char_ins_del_ok = 0; +#endif + + /* Don't do this. I think termcap may still need the buffer. */ + /* xfree (buffer); */ + + /* Init system terminal modes (RAW or CBREAK, etc.). */ + init_sys_modes (tty); + + return device; +#endif /* not WINDOWSNT */ +} + +/* Auxiliary error-handling function for init_tty. + Free BUFFER and delete DEVICE, then call error or fatal + with str1 or str2, respectively, according to MUST_SUCCEED. */ + +static void +maybe_fatal (must_succeed, buffer, device, str1, str2, arg1, arg2) + int must_succeed; + char *buffer; + struct device *device; + char *str1, *str2, *arg1, *arg2; +{ + if (buffer) + xfree (buffer); + + if (device) + delete_tty (device); + + if (must_succeed) + fatal (str2, arg1, arg2); + else + error (str1, arg1, arg2); + + abort (); } /* VARARGS 1 */ @@ -2699,16 +2967,428 @@ exit (1); } -DEFUN ("tty-no-underline", Ftty_no_underline, Stty_no_underline, 0, 0, 0, - doc: /* Declare that this terminal does not handle underlining. -This is used to override the terminfo data, for certain terminals that -do not really do underlining, but say that they do. */) + + +static int deleting_tty = 0; + + +/* Delete the given terminal device, closing all frames on it. */ + +void +delete_tty (struct device *device) +{ + struct tty_display_info *tty; + Lisp_Object tail, frame; + char *tty_name; + int last_device; + + if (deleting_tty) + /* We get a recursive call when we delete the last frame on this + device. */ + return; + + if (device->type != output_termcap) + abort (); + + tty = device->display_info.tty; + + last_device = 1; + FOR_EACH_FRAME (tail, frame) + { + struct frame *f = XFRAME (frame); + if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) + { + last_device = 0; + break; + } + } + if (last_device) + error ("Attempt to delete the sole display device with live frames"); + + if (tty == tty_list) + tty_list = tty->next; + else + { + struct tty_display_info *p; + for (p = tty_list; p && p->next != tty; p = p->next) + ; + + if (! p) + /* This should not happen. */ + abort (); + + p->next = tty->next; + tty->next = 0; + } + + deleting_tty = 1; + + FOR_EACH_FRAME (tail, frame) + { + struct frame *f = XFRAME (frame); + if (FRAME_TERMCAP_P (f) && FRAME_LIVE_P (f) && FRAME_TTY (f) == tty) + { + Fdelete_frame (frame, Qt); + } + } + + /* reset_sys_modes needs a valid device, so this call needs to be + before delete_device. */ + reset_sys_modes (tty); + + delete_device (device); + + tty_name = tty->name; + if (tty->type) + xfree (tty->type); + + if (tty->input) + { + delete_keyboard_wait_descriptor (fileno (tty->input)); + if (tty->input != stdin) + fclose (tty->input); + } + if (tty->output && tty->output != stdout && tty->output != tty->input) + fclose (tty->output); + if (tty->termscript) + fclose (tty->termscript); + + if (tty->old_tty) + xfree (tty->old_tty); + + if (tty->Wcm) + xfree (tty->Wcm); + + bzero (tty, sizeof (struct tty_display_info)); + xfree (tty); + deleting_tty = 0; +} + + + +/* Initialize the tty-dependent part of frame F. The frame must + already have its device initialized. */ + +void +create_tty_output (struct frame *f) +{ + struct tty_output *t; + + if (! FRAME_TERMCAP_P (f)) + abort (); + + t = xmalloc (sizeof (struct tty_output)); + bzero (t, sizeof (struct tty_output)); + + t->display_info = FRAME_DEVICE (f)->display_info.tty; + + f->output_data.tty = t; +} + +/* Delete the tty-dependent part of frame F. */ + +void +delete_tty_output (struct frame *f) +{ + if (! FRAME_TERMCAP_P (f)) + abort (); + + xfree (f->output_data.tty); +} + + + + +/* Mark the pointers in the tty_display_info objects. + Called by the Fgarbage_collector. */ + +void +mark_ttys () +{ + struct tty_display_info *tty; + + for (tty = tty_list; tty; tty = tty->next) + { + if (tty->top_frame) + mark_object (tty->top_frame); + } +} + + + +/* Create a new device object and add it to the device list. */ + +struct device * +create_device (void) +{ + struct device *device = (struct device *) xmalloc (sizeof (struct device)); + + bzero (device, sizeof (struct device)); + device->next_device = device_list; + device_list = device; + + device->id = next_device_id++; + + device->keyboard_coding = + (struct coding_system *) xmalloc (sizeof (struct coding_system)); + device->terminal_coding = + (struct coding_system *) xmalloc (sizeof (struct coding_system)); + + setup_coding_system (Qnil, device->keyboard_coding); + setup_coding_system (Qnil, device->terminal_coding); + + return device; +} + +/* Remove a device from the device list and free its memory. */ + +void +delete_device (struct device *device) +{ + struct device **dp; + Lisp_Object tail, frame; + + /* Check for and close live frames that are still on this + device. */ + FOR_EACH_FRAME (tail, frame) + { + struct frame *f = XFRAME (frame); + if (FRAME_LIVE_P (f) && f->device == device) + { + Fdelete_frame (frame, Qt); + } + } + + for (dp = &device_list; *dp != device; dp = &(*dp)->next_device) + if (! *dp) + abort (); + *dp = device->next_device; + + if (device->keyboard_coding) + xfree (device->keyboard_coding); + if (device->terminal_coding) + xfree (device->terminal_coding); + if (device->name) + xfree (device->name); + +#ifdef MULTI_KBOARD + if (device->kboard && --device->kboard->reference_count == 0) + delete_kboard (device->kboard); +#endif + + bzero (device, sizeof (struct device)); + xfree (device); +} + +DEFUN ("delete-display", Fdelete_display, Sdelete_display, 0, 2, 0, + doc: /* Delete DEVICE by deleting all frames on it and closing the device. +DEVICE may be a display device id, a frame, or nil (meaning the +selected frame's display device). + +Normally, you may not delete a display if all other displays are suspended, +but if the second argument FORCE is non-nil, you may do so. */) + (device, force) + Lisp_Object device, force; +{ + struct device *d, *p; + + d = get_device (device, 0); + + if (!d) + return Qnil; + + p = device_list; + while (p && (p == d || !DEVICE_ACTIVE_P (p))) + p = p->next_device; + + if (NILP (force) && !p) + error ("Attempt to delete the sole active display device"); + + if (d->delete_device_hook) + (*d->delete_device_hook) (d); + else + delete_device (d); + + return Qnil; +} + +DEFUN ("display-live-p", Fdisplay_live_p, Sdisplay_live_p, 1, 1, 0, + doc: /* Return non-nil if OBJECT is a device which has not been deleted. +Value is nil if OBJECT is not a live display device. +If object is a live display device, the return value indicates what +sort of output device it uses. See the documentation of `framep' for +possible return values. + +Display devices are represented by their integer identifiers. */) + (object) + Lisp_Object object; +{ + struct device *d; + + if (!INTEGERP (object)) + return Qnil; + + d = get_device (object, 0); + + if (!d) + return Qnil; + + switch (d->type) + { + case output_initial: /* The initial frame is like a termcap frame. */ + case output_termcap: + return Qt; + case output_x_window: + return Qx; + case output_w32: + return Qw32; + case output_msdos_raw: + return Qpc; + case output_mac: + return Qmac; + default: + abort (); + } +} + +DEFUN ("display-list", Fdisplay_list, Sdisplay_list, 0, 0, 0, + doc: /* Return a list of all display devices. +Display devices are represented by their integer identifiers. */) () { - TS_enter_underline_mode = 0; + Lisp_Object devices = Qnil; + struct device *d; + + for (d = device_list; d; d = d->next_device) + devices = Fcons (make_number (d->id), devices); + + return devices; +} + + + + +DEFUN ("suspend-tty", Fsuspend_tty, Ssuspend_tty, 0, 1, 0, + doc: /* Suspend the terminal device TTY. +The terminal is restored to its default state, and Emacs ceases all +access to the terminal device. Frames that use the device are not +deleted, but input is not read from them and if they change, their +display is not updated. + +TTY may be a display id, a frame, or nil for the display device of the +currently selected frame. + +This function runs `suspend-tty-functions' after suspending the +device. The functions are run with one arg, the id of the suspended +display device. + +`suspend-tty' does nothing if it is called on an already suspended +device. + +A suspended terminal device may be resumed by calling `resume-tty' on +it. */) + (tty) + Lisp_Object tty; +{ + struct device *d = get_tty_device (tty); + FILE *f; + + if (!d) + error ("Unknown tty device"); + + f = d->display_info.tty->input; + + if (f) + { + reset_sys_modes (d->display_info.tty); + + delete_keyboard_wait_descriptor (fileno (f)); + + fclose (f); + if (f != d->display_info.tty->output) + fclose (d->display_info.tty->output); + + d->display_info.tty->input = 0; + d->display_info.tty->output = 0; + + if (FRAMEP (d->display_info.tty->top_frame)) + FRAME_SET_VISIBLE (XFRAME (d->display_info.tty->top_frame), 0); + + /* Run `suspend-tty-functions'. */ + if (!NILP (Vrun_hooks)) + { + Lisp_Object args[2]; + args[0] = intern ("suspend-tty-functions"); + args[1] = make_number (d->id); + Frun_hook_with_args (2, args); + } + } + return Qnil; } + +DEFUN ("resume-tty", Fresume_tty, Sresume_tty, 0, 1, 0, + doc: /* Resume the previously suspended terminal device TTY. +The terminal is opened and reinitialized. Frames that are on the +suspended display are revived. + +It is an error to resume a display while another display is active on +the same device. + +This function runs `resume-tty-functions' after resuming the device. +The functions are run with one arg, the id of the resumed display +device. + +`resume-tty' does nothing if it is called on a device that is not +suspended. + +TTY may be a display device id, a frame, or nil for the display device +of the currently selected frame. */) + (tty) + Lisp_Object tty; +{ + struct device *d = get_tty_device (tty); + int fd; + + if (!d) + error ("Unknown tty device"); + + if (!d->display_info.tty->input) + { + if (get_named_tty (d->display_info.tty->name)) + error ("Cannot resume display while another display is active on the same device"); + + fd = emacs_open (d->display_info.tty->name, O_RDWR | O_NOCTTY, 0); + + /* XXX What if open fails? */ + + dissociate_if_controlling_tty (fd); + + d->display_info.tty->output = fdopen (fd, "w+"); + d->display_info.tty->input = d->display_info.tty->output; + + add_keyboard_wait_descriptor (fd); + + if (FRAMEP (d->display_info.tty->top_frame)) + FRAME_SET_VISIBLE (XFRAME (d->display_info.tty->top_frame), 1); + + init_sys_modes (d->display_info.tty); + + /* Run `suspend-tty-functions'. */ + if (!NILP (Vrun_hooks)) + { + Lisp_Object args[2]; + args[0] = intern ("resume-tty-functions"); + args[1] = make_number (d->id); + Frun_hook_with_args (2, args); + } + } + + return Qnil; +} + + void syms_of_term () { @@ -2726,10 +3406,36 @@ The function should accept no arguments. */); Vring_bell_function = Qnil; + DEFVAR_LISP ("suspend-tty-functions", &Vsuspend_tty_functions, + doc: /* Functions to be run after suspending a tty. +The functions are run with one argument, the name of the tty to be suspended. +See `suspend-tty'. */); + Vsuspend_tty_functions = Qnil; + + + DEFVAR_LISP ("resume-tty-functions", &Vresume_tty_functions, + doc: /* Functions to be run after resuming a tty. +The functions are run with one argument, the name of the tty that was revived. +See `resume-tty'. */); + Vresume_tty_functions = Qnil; + defsubr (&Stty_display_color_p); defsubr (&Stty_display_color_cells); defsubr (&Stty_no_underline); + defsubr (&Sdisplay_name); + defsubr (&Sdisplay_tty_type); + defsubr (&Sdisplay_controlling_tty_p); + defsubr (&Sdelete_display); + defsubr (&Sdisplay_live_p); + defsubr (&Sdisplay_list); + defsubr (&Ssuspend_tty); + defsubr (&Sresume_tty); + + Fprovide (intern ("multi-tty"), Qnil); + } + + /* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193 (do not change this comment) */
--- a/src/termchar.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/termchar.h Mon Dec 19 19:57:22 2005 +0000 @@ -19,32 +19,185 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +/* Each termcap frame points to its own struct tty_output object in + the output_data.tty field. The tty_output structure contains the + information that is specific to termcap frames. */ -/* extern EMACS_INT baud_rate; */ /* Output speed in baud */ -extern int must_write_spaces; /* Nonzero means spaces in the text - must actually be output; can't just skip - over some columns to leave them blank. */ -extern int min_padding_speed; /* Speed below which no padding necessary */ -extern int fast_clear_end_of_line; /* Nonzero means terminal has - command for this */ +struct tty_output +{ + /* The Emacs structure for the tty device this frame is on. */ + struct tty_display_info *display_info; + + /* There is nothing else here at the moment... */ +}; + +/* Parameters that are shared between frames on the same tty device. */ + +struct tty_display_info +{ + struct tty_display_info *next; /* Chain of all tty devices. */ + + char *name; /* The name of the device file or 0 if + stdin/stdout. */ + char *type; /* The type of the tty. */ + + /* Input/output */ + + FILE *input; /* The stream to be used for terminal input. + NULL if the terminal is suspended. */ + FILE *output; /* The stream to be used for terminal output. + NULL if the terminal is suspended. */ + + FILE *termscript; /* If nonzero, send all terminal output + characters to this stream also. */ + + struct emacs_tty *old_tty; /* The initial tty mode bits */ + + int term_initted; /* 1 if we have been through init_sys_modes. */ + + + int reference_count; /* Number of frames that are on this display. */ + + struct device *device; /* Points back to the generic display device + structure. This is sometimes handy. */ + + /* Info on cursor positioning. */ + struct cm *Wcm; + + /* Redisplay. */ + + Lisp_Object top_frame; /* The topmost frame on this tty. */ + + /* The previous terminal frame we displayed on this tty. */ + struct frame *previous_terminal_frame; + + /* Strings, numbers and flags taken from the termcap entry. */ -extern int line_ins_del_ok; /* Terminal can insert and delete lines */ -extern int char_ins_del_ok; /* Terminal can insert and delete chars */ -extern int scroll_region_ok; /* Terminal supports setting the scroll - window */ -extern int scroll_region_cost; /* Cost of setting the scroll window, - measured in characters */ -extern int memory_below_frame; /* Terminal remembers lines scrolled - off bottom */ -extern int fast_clear_end_of_line; /* Terminal has a `ce' string */ + char *TS_ins_line; /* "al" */ + char *TS_ins_multi_lines; /* "AL" (one parameter, # lines to insert) */ + char *TS_bell; /* "bl" */ + char *TS_clr_to_bottom; /* "cd" */ + char *TS_clr_line; /* "ce", clear to end of line */ + char *TS_clr_frame; /* "cl" */ + char *TS_set_scroll_region; /* "cs" (2 params, first line and last line) */ + char *TS_set_scroll_region_1; /* "cS" (4 params: total lines, + lines above scroll region, lines below it, + total lines again) */ + char *TS_del_char; /* "dc" */ + char *TS_del_multi_chars; /* "DC" (one parameter, # chars to delete) */ + char *TS_del_line; /* "dl" */ + char *TS_del_multi_lines; /* "DL" (one parameter, # lines to delete) */ + char *TS_delete_mode; /* "dm", enter character-delete mode */ + char *TS_end_delete_mode; /* "ed", leave character-delete mode */ + char *TS_end_insert_mode; /* "ei", leave character-insert mode */ + char *TS_ins_char; /* "ic" */ + char *TS_ins_multi_chars; /* "IC" (one parameter, # chars to insert) */ + char *TS_insert_mode; /* "im", enter character-insert mode */ + char *TS_pad_inserted_char; /* "ip". Just padding, no commands. */ + char *TS_end_keypad_mode; /* "ke" */ + char *TS_keypad_mode; /* "ks" */ + char *TS_pad_char; /* "pc", char to use as padding */ + char *TS_repeat; /* "rp" (2 params, # times to repeat + and character to be repeated) */ + char *TS_end_standout_mode; /* "se" */ + char *TS_fwd_scroll; /* "sf" */ + char *TS_standout_mode; /* "so" */ + char *TS_rev_scroll; /* "sr" */ + char *TS_end_termcap_modes; /* "te" */ + char *TS_termcap_modes; /* "ti" */ + char *TS_visible_bell; /* "vb" */ + char *TS_cursor_normal; /* "ve" */ + char *TS_cursor_visible; /* "vs" */ + char *TS_cursor_invisible; /* "vi" */ + char *TS_set_window; /* "wi" (4 params, start and end of window, + each as vpos and hpos) */ + + char *TS_enter_bold_mode; /* "md" -- turn on bold (extra bright mode). */ + char *TS_enter_dim_mode; /* "mh" -- turn on half-bright mode. */ + char *TS_enter_blink_mode; /* "mb" -- enter blinking mode. */ + char *TS_enter_reverse_mode; /* "mr" -- enter reverse video mode. */ + char *TS_exit_underline_mode; /* "us" -- start underlining. */ + char *TS_enter_underline_mode; /* "ue" -- end underlining. */ + + /* "as"/"ae" -- start/end alternate character set. Not really + supported, yet. */ + char *TS_enter_alt_charset_mode; + char *TS_exit_alt_charset_mode; + + char *TS_exit_attribute_mode; /* "me" -- switch appearances off. */ + + /* Value of the "NC" (no_color_video) capability, or 0 if not present. */ + int TN_no_color_video; + + int TN_max_colors; /* "Co" -- number of colors. */ + + /* "pa" -- max. number of color pairs on screen. Not handled yet. + Could be a problem if not equal to TN_max_colors * TN_max_colors. */ + int TN_max_pairs; -extern int dont_calculate_costs; /* Nonzero means don't bother computing - various cost tables; we won't use them. */ + /* "op" -- SVr4 set default pair to its original value. */ + char *TS_orig_pair; + + /* "AF"/"AB" or "Sf"/"Sb"-- set ANSI or SVr4 foreground/background color. + 1 param, the color index. */ + char *TS_set_foreground; + char *TS_set_background; + + int TF_hazeltine; /* termcap hz flag. */ + int TF_insmode_motion; /* termcap mi flag: can move while in insert mode. */ + int TF_standout_motion; /* termcap mi flag: can move while in standout mode. */ + int TF_underscore; /* termcap ul flag: _ underlines if over-struck on + non-blank position. Must clear before writing _. */ + int TF_teleray; /* termcap xt flag: many weird consequences. + For t1061. */ + + int RPov; /* # chars to start a TS_repeat */ + + int delete_in_insert_mode; /* delete mode == insert mode */ + + int se_is_so; /* 1 if same string both enters and leaves + standout mode */ + + int costs_set; /* Nonzero if costs have been calculated. */ + + int insert_mode; /* Nonzero when in insert mode. */ + int standout_mode; /* Nonzero when in standout mode. */ + + -/* Nonzero means no need to redraw the entire frame on resuming - a suspended Emacs. This is useful on terminals with multiple pages, - where one page is used for Emacs and another for all else. */ -extern int no_redraw_on_reenter; + /* 1 if should obey 0200 bit in input chars as "Meta", 2 if should + keep 0200 bit in input chars. 0 to ignore the 0200 bit. */ + + int meta_key; + + /* Size of window specified by higher levels. + This is the number of lines, from the top of frame downwards, + which can participate in insert-line/delete-line operations. + + Effectively it excludes the bottom frame_lines - specified_window_size + lines from those operations. */ + + int specified_window; + + /* Flag used in tty_show/hide_cursor. */ + + int cursor_hidden; + + /* Nonzero means use ^S/^Q for flow control. */ + int flow_control; + +}; + +/* A chain of structures for all tty devices currently in use. */ +extern struct tty_display_info *tty_list; + + +#define FRAME_TTY(f) \ + ((f)->output_method == output_termcap \ + ? (f)->device->display_info.tty \ + : (abort(), (struct tty_display_info *) 0)) + +#define CURTTY() FRAME_TTY (SELECTED_FRAME()) /* arch-tag: bf9f0d49-842b-42fb-9348-ec8759b27193 (do not change this comment) */
--- a/src/termhooks.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/termhooks.h Mon Dec 19 19:57:22 2005 +0000 @@ -1,5 +1,4 @@ -/* Hooks by which low level terminal operations - can be made to call other routines. +/* Parameters and display hooks for output devices. Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -26,40 +25,11 @@ struct glyph; struct frame; -/* If nonzero, send all terminal output characters to this stream also. */ -extern FILE *termscript; - /* Only use prototypes when lisp.h has been included. */ #ifndef P_ #define P_(X) () #endif -/* Text display hooks. */ - -extern void (*cursor_to_hook) P_ ((int vpos, int hpos)); -extern void (*raw_cursor_to_hook) P_ ((int, int)); - -extern void (*clear_to_end_hook) P_ ((void)); -extern void (*clear_frame_hook) P_ ((void)); -extern void (*clear_end_of_line_hook) P_ ((int)); - -extern void (*ins_del_lines_hook) P_ ((int, int)); - -extern void (*insert_glyphs_hook) P_ ((struct glyph *s, int n)); -extern void (*write_glyphs_hook) P_ ((struct glyph *s, int n)); -extern void (*delete_glyphs_hook) P_ ((int)); - -extern void (*ring_bell_hook) P_ ((void)); - -extern void (*reset_terminal_modes_hook) P_ ((void)); -extern void (*set_terminal_modes_hook) P_ ((void)); -extern void (*update_begin_hook) P_ ((struct frame *)); -extern void (*update_end_hook) P_ ((struct frame *)); -extern void (*set_terminal_window_hook) P_ ((int)); - - - -/* Multi-frame and mouse support hooks. */ enum scroll_bar_part { scroll_bar_above_handle, @@ -73,125 +43,6 @@ scroll_bar_move_ratio }; -/* Return the current position of the mouse. - - Set *f to the frame the mouse is in, or zero if the mouse is in no - Emacs frame. If it is set to zero, all the other arguments are - garbage. - - If the motion started in a scroll bar, set *bar_window to the - scroll bar's window, *part to the part the mouse is currently over, - *x to the position of the mouse along the scroll bar, and *y to the - overall length of the scroll bar. - - Otherwise, set *bar_window to Qnil, and *x and *y to the column and - row of the character cell the mouse is over. - - Set *time to the time the mouse was at the returned position. - - This should clear mouse_moved until the next motion - event arrives. */ -extern void (*mouse_position_hook) P_ ((struct frame **f, int, - Lisp_Object *bar_window, - enum scroll_bar_part *part, - Lisp_Object *x, - Lisp_Object *y, - unsigned long *time)); - -/* The window system handling code should set this if the mouse has - moved since the last call to the mouse_position_hook. Calling that - hook should clear this. */ -extern int mouse_moved; - -/* When a frame's focus redirection is changed, this hook tells the - window system code to re-decide where to put the highlight. Under - X, this means that Emacs lies about where the focus is. */ -extern void (*frame_rehighlight_hook) P_ ((struct frame *)); - -/* If we're displaying frames using a window system that can stack - frames on top of each other, this hook allows you to bring a frame - to the front, or bury it behind all the other windows. If this - hook is zero, that means the device we're displaying on doesn't - support overlapping frames, so there's no need to raise or lower - anything. - - If RAISE is non-zero, F is brought to the front, before all other - windows. If RAISE is zero, F is sent to the back, behind all other - windows. */ -extern void (*frame_raise_lower_hook) P_ ((struct frame *f, int raise)); - - -/* Scroll bar hooks. */ - -/* The representation of scroll bars is determined by the code which - implements them, except for one thing: they must be represented by - lisp objects. This allows us to place references to them in - Lisp_Windows without worrying about those references becoming - dangling references when the scroll bar is destroyed. - - The window-system-independent portion of Emacs just refers to - scroll bars via their windows, and never looks inside the scroll bar - representation; it always uses hook functions to do all the - scroll bar manipulation it needs. - - The `vertical_scroll_bar' field of a Lisp_Window refers to that - window's scroll bar, or is nil if the window doesn't have a - scroll bar. - - The `scroll_bars' and `condemned_scroll_bars' fields of a Lisp_Frame - are free for use by the scroll bar implementation in any way it sees - fit. They are marked by the garbage collector. */ - - -/* Set the vertical scroll bar for WINDOW to have its upper left corner - at (TOP, LEFT), and be LENGTH rows high. Set its handle to - indicate that we are displaying PORTION characters out of a total - of WHOLE characters, starting at POSITION. If WINDOW doesn't yet - have a scroll bar, create one for it. */ -extern void (*set_vertical_scroll_bar_hook) - P_ ((struct window *window, - int portion, int whole, int position)); - - -/* The following three hooks are used when we're doing a thorough - redisplay of the frame. We don't explicitly know which scroll bars - are going to be deleted, because keeping track of when windows go - away is a real pain - can you say set-window-configuration? - Instead, we just assert at the beginning of redisplay that *all* - scroll bars are to be removed, and then save scroll bars from the - fiery pit when we actually redisplay their window. */ - -/* Arrange for all scroll bars on FRAME to be removed at the next call - to `*judge_scroll_bars_hook'. A scroll bar may be spared if - `*redeem_scroll_bar_hook' is applied to its window before the judgement. - - This should be applied to each frame each time its window tree is - redisplayed, even if it is not displaying scroll bars at the moment; - if the HAS_SCROLL_BARS flag has just been turned off, only calling - this and the judge_scroll_bars_hook will get rid of them. - - If non-zero, this hook should be safe to apply to any frame, - whether or not it can support scroll bars, and whether or not it is - currently displaying them. */ -extern void (*condemn_scroll_bars_hook) P_ ((struct frame *frame)); - -/* Unmark WINDOW's scroll bar for deletion in this judgement cycle. - Note that it's okay to redeem a scroll bar that is not condemned. */ -extern void (*redeem_scroll_bar_hook) P_ ((struct window *window)); - -/* Remove all scroll bars on FRAME that haven't been saved since the - last call to `*condemn_scroll_bars_hook'. - - This should be applied to each frame after each time its window - tree is redisplayed, even if it is not displaying scroll bars at the - moment; if the HAS_SCROLL_BARS flag has just been turned off, only - calling this and condemn_scroll_bars_hook will get rid of them. - - If non-zero, this hook should be safe to apply to any frame, - whether or not it can support scroll bars, and whether or not it is - currently displaying them. */ -extern void (*judge_scroll_bars_hook) P_ ((struct frame *FRAME)); - /* Input queue declarations and hooks. */ @@ -385,13 +236,6 @@ #define EVENT_INIT(event) bzero (&(event), sizeof (struct input_event)) -/* Called to read input events. */ -extern int (*read_socket_hook) P_ ((int, int, struct input_event *)); - -/* Called when a frame's display becomes entirely up to date. */ -extern void (*frame_up_to_date_hook) P_ ((struct frame *)); - - /* Bits in the modifiers member of the input_event structure. Note that reorder_modifiers assumes that the bits are in canonical order. @@ -441,7 +285,318 @@ meta_modifier = CHAR_META /* Under X, the XK_Meta_[LR] keysyms. */ }; +#endif /* CONSP */ + + +/* Device-local parameters. */ +struct device +{ + /* Chain of all display devices. */ + struct device *next_device; + + /* Unique id for this display device. */ + int id; + + /* The number of frames that are on this device. */ + int reference_count; + + /* The type of the display device. */ + enum output_method type; + + /* The name of the display device. Do not use this to identify the device. */ + char *name; + +#ifdef MULTI_KBOARD + /* The device's keyboard object. */ + struct kboard *kboard; #endif + /* Device-type dependent data shared amongst all frames on this display. */ + union display_info + { + struct tty_display_info *tty; /* termchar.h */ + struct x_display_info *x; /* xterm.h */ + } display_info; + + + /* Coding-system to be used for encoding terminal output. This + structure contains information of a coding-system specified by + the function `set-terminal-coding-system'. Also see + `safe_terminal_coding' in coding.h. */ + struct coding_system *terminal_coding; + + /* Coding-system of what is sent from terminal keyboard. This + structure contains information of a coding-system specified by + the function `set-keyboard-coding-system'. */ + struct coding_system *keyboard_coding; + + /* Terminal characteristics. */ + /* XXX Are these really used on non-termcap displays? */ + + int must_write_spaces; /* Nonzero means spaces in the text must + actually be output; can't just skip over + some columns to leave them blank. */ + int fast_clear_end_of_line; /* Nonzero means terminal has a `ce' string */ + + int line_ins_del_ok; /* Terminal can insert and delete lines */ + int char_ins_del_ok; /* Terminal can insert and delete chars */ + int scroll_region_ok; /* Terminal supports setting the scroll + window */ + int scroll_region_cost; /* Cost of setting the scroll window, + measured in characters. */ + int memory_below_frame; /* Terminal remembers lines scrolled + off bottom */ + +#if 0 /* These are not used anywhere. */ + /* EMACS_INT baud_rate; */ /* Output speed in baud */ + int min_padding_speed; /* Speed below which no padding necessary. */ + int dont_calculate_costs; /* Nonzero means don't bother computing + various cost tables; we won't use them. */ +#endif + + + /* Window-based redisplay interface for this device (0 for tty + devices). */ + struct redisplay_interface *rif; + + /* Frame-based redisplay interface. */ + + /* Text display hooks. */ + + void (*cursor_to_hook) P_ ((struct frame *f, int vpos, int hpos)); + void (*raw_cursor_to_hook) P_ ((struct frame *, int, int)); + + void (*clear_to_end_hook) P_ ((struct frame *)); + void (*clear_frame_hook) P_ ((struct frame *)); + void (*clear_end_of_line_hook) P_ ((struct frame *, int)); + + void (*ins_del_lines_hook) P_ ((struct frame *f, int, int)); + + void (*insert_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n)); + void (*write_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n)); + void (*delete_glyphs_hook) P_ ((struct frame *, int)); + + void (*ring_bell_hook) P_ ((struct frame *f)); + + void (*reset_terminal_modes_hook) P_ ((struct device *)); + void (*set_terminal_modes_hook) P_ ((struct device *)); + + void (*update_begin_hook) P_ ((struct frame *)); + void (*update_end_hook) P_ ((struct frame *)); + void (*set_terminal_window_hook) P_ ((struct frame *, int)); + + /* Multi-frame and mouse support hooks. */ + + /* Return the current position of the mouse. + + Set *f to the frame the mouse is in, or zero if the mouse is in no + Emacs frame. If it is set to zero, all the other arguments are + garbage. + + If the motion started in a scroll bar, set *bar_window to the + scroll bar's window, *part to the part the mouse is currently over, + *x to the position of the mouse along the scroll bar, and *y to the + overall length of the scroll bar. + + Otherwise, set *bar_window to Qnil, and *x and *y to the column and + row of the character cell the mouse is over. + + Set *time to the time the mouse was at the returned position. + + This should clear mouse_moved until the next motion + event arrives. */ + void (*mouse_position_hook) P_ ((struct frame **f, int, + Lisp_Object *bar_window, + enum scroll_bar_part *part, + Lisp_Object *x, + Lisp_Object *y, + unsigned long *time)); + + /* The window system handling code should set this if the mouse has + moved since the last call to the mouse_position_hook. Calling that + hook should clear this. */ + int mouse_moved; + + /* When a frame's focus redirection is changed, this hook tells the + window system code to re-decide where to put the highlight. Under + X, this means that Emacs lies about where the focus is. */ + void (*frame_rehighlight_hook) P_ ((struct frame *)); + + /* If we're displaying frames using a window system that can stack + frames on top of each other, this hook allows you to bring a frame + to the front, or bury it behind all the other windows. If this + hook is zero, that means the device we're displaying on doesn't + support overlapping frames, so there's no need to raise or lower + anything. + + If RAISE is non-zero, F is brought to the front, before all other + windows. If RAISE is zero, F is sent to the back, behind all other + windows. */ + void (*frame_raise_lower_hook) P_ ((struct frame *f, int raise)); + + + /* Scroll bar hooks. */ + + /* The representation of scroll bars is determined by the code which + implements them, except for one thing: they must be represented by + lisp objects. This allows us to place references to them in + Lisp_Windows without worrying about those references becoming + dangling references when the scroll bar is destroyed. + + The window-system-independent portion of Emacs just refers to + scroll bars via their windows, and never looks inside the scroll bar + representation; it always uses hook functions to do all the + scroll bar manipulation it needs. + + The `vertical_scroll_bar' field of a Lisp_Window refers to that + window's scroll bar, or is nil if the window doesn't have a + scroll bar. + + The `scroll_bars' and `condemned_scroll_bars' fields of a Lisp_Frame + are free for use by the scroll bar implementation in any way it sees + fit. They are marked by the garbage collector. */ + + + /* Set the vertical scroll bar for WINDOW to have its upper left corner + at (TOP, LEFT), and be LENGTH rows high. Set its handle to + indicate that we are displaying PORTION characters out of a total + of WHOLE characters, starting at POSITION. If WINDOW doesn't yet + have a scroll bar, create one for it. */ + void (*set_vertical_scroll_bar_hook) P_ ((struct window *window, + int portion, int whole, + int position)); + + + /* The following three hooks are used when we're doing a thorough + redisplay of the frame. We don't explicitly know which scroll bars + are going to be deleted, because keeping track of when windows go + away is a real pain - can you say set-window-configuration? + Instead, we just assert at the beginning of redisplay that *all* + scroll bars are to be removed, and then save scroll bars from the + fiery pit when we actually redisplay their window. */ + + /* Arrange for all scroll bars on FRAME to be removed at the next call + to `*judge_scroll_bars_hook'. A scroll bar may be spared if + `*redeem_scroll_bar_hook' is applied to its window before the judgement. + + This should be applied to each frame each time its window tree is + redisplayed, even if it is not displaying scroll bars at the moment; + if the HAS_SCROLL_BARS flag has just been turned off, only calling + this and the judge_scroll_bars_hook will get rid of them. + + If non-zero, this hook should be safe to apply to any frame, + whether or not it can support scroll bars, and whether or not it is + currently displaying them. */ + void (*condemn_scroll_bars_hook) P_ ((struct frame *frame)); + + /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. + Note that it's okay to redeem a scroll bar that is not condemned. */ + void (*redeem_scroll_bar_hook) P_ ((struct window *window)); + + /* Remove all scroll bars on FRAME that haven't been saved since the + last call to `*condemn_scroll_bars_hook'. + + This should be applied to each frame after each time its window + tree is redisplayed, even if it is not displaying scroll bars at the + moment; if the HAS_SCROLL_BARS flag has just been turned off, only + calling this and condemn_scroll_bars_hook will get rid of them. + + If non-zero, this hook should be safe to apply to any frame, + whether or not it can support scroll bars, and whether or not it is + currently displaying them. */ + void (*judge_scroll_bars_hook) P_ ((struct frame *FRAME)); + + + /* Called to read input events. + + DEVICE indicates which display device to read from. Input events + should be read into BUF, the size of which is given in SIZE. + EXPECTED is non-zero if the caller suspects that new input is + available. + + A positive return value indicates that that many input events + where read into BUF. + Zero means no events were immediately available. + A value of -1 means a transient read error, while -2 indicates + that the device was closed (hangup), and it should be deleted. + + XXX Please note that a non-zero value of EXPECTED only means that + there is available input on at least one of the currently opened + display devices -- but not necessarily on this device. + Therefore, in most cases EXPECTED should be simply ignored. + + XXX This documentation needs to be updated. */ + int (*read_socket_hook) P_ ((struct device *device, + int expected, + struct input_event *hold_quit)); + + /* Called when a frame's display becomes entirely up to date. */ + void (*frame_up_to_date_hook) P_ ((struct frame *)); + + + /* Called to delete the device-specific portions of a frame that is + on this display device. */ + void (*delete_frame_hook) P_ ((struct frame *)); + + /* Called after the last frame on this device is deleted, or when + the display device was closed (hangup). + + If this is NULL, then the generic delete_device is called + instead. Otherwise the hook must call delete_device itself. + + The hook must check for and close any live frames that are still + on the device. Fdelete_frame ensures that there are no live + frames on the device when it calls this hook, so infinite + recursion is prevented. */ + void (*delete_device_hook) P_ ((struct device *)); +}; + + +/* Chain of all display devices currently in use. */ +extern struct device *device_list; + +#define FRAME_MUST_WRITE_SPACES(f) ((f)->device->must_write_spaces) +#define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->device->fast_clear_end_of_line) +#define FRAME_LINE_INS_DEL_OK(f) ((f)->device->line_ins_del_ok) +#define FRAME_CHAR_INS_DEL_OK(f) ((f)->device->char_ins_del_ok) +#define FRAME_SCROLL_REGION_OK(f) ((f)->device->scroll_region_ok) +#define FRAME_SCROLL_REGION_COST(f) ((f)->device->scroll_region_cost) +#define FRAME_MEMORY_BELOW_FRAME(f) ((f)->device->memory_below_frame) + +#define FRAME_TERMINAL_CODING(f) ((f)->device->terminal_coding) +#define FRAME_KEYBOARD_CODING(f) ((f)->device->keyboard_coding) + +#define DEVICE_TERMINAL_CODING(d) ((d)->terminal_coding) +#define DEVICE_KEYBOARD_CODING(d) ((d)->keyboard_coding) + +#define FRAME_RIF(f) ((f)->device->rif) + +#define FRAME_DEVICE(f) ((f)->device) + +/* FRAME_WINDOW_P tests whether the frame is a window, and is + defined to be the predicate for the window system being used. */ + +#ifdef HAVE_X_WINDOWS +#define FRAME_WINDOW_P(f) FRAME_X_P (f) +#endif +#ifdef HAVE_NTGUI +#define FRAME_WINDOW_P(f) FRAME_W32_P (f) +#endif +#ifdef MAC_OS +#define FRAME_WINDOW_P(f) FRAME_MAC_P (f) +#endif +#ifndef FRAME_WINDOW_P +#define FRAME_WINDOW_P(f) (0) +#endif + +/* Return true if the display device is not suspended. */ +#define DEVICE_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input) + +extern struct device *create_device P_ ((void)); +extern void delete_device P_ ((struct device *)); + +/* The initial display device, created by initial_term_init. */ +extern struct device *initial_device; + /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d (do not change this comment) */
--- a/src/termopts.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/termopts.h Mon Dec 19 19:57:22 2005 +0000 @@ -41,5 +41,10 @@ /* Nonzero means truncate lines in all windows less wide than the frame */ extern int truncate_partial_width_windows; +/* Nonzero means no need to redraw the entire frame on resuming a suspended + Emacs. This is useful on terminals with multiple pages, where one page is + used for Emacs and another for all else. */ +extern int no_redraw_on_reenter; + /* arch-tag: 35d4d284-dc1a-4fff-97fa-0154a21aebdb (do not change this comment) */
--- a/src/w32term.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/w32term.c Mon Dec 19 19:57:22 2005 +0000 @@ -6329,12 +6329,13 @@ redeem_scroll_bar_hook = w32_redeem_scroll_bar; judge_scroll_bars_hook = w32_judge_scroll_bars; - scroll_region_ok = 1; /* we'll scroll partial frames */ - char_ins_del_ok = 1; - line_ins_del_ok = 1; /* we'll just blt 'em */ - fast_clear_end_of_line = 1; /* X does this well */ - memory_below_frame = 0; /* we don't remember what scrolls - off the bottom */ + TTY_SCROLL_REGION_OK (CURTTY ()) = 1; /* we'll scroll partial frames */ + TTY_CHAR_INS_DEL_OK (CURTTY ()) = 1; + TTY_LINE_INS_DEL_OK (CURTTY ()) = 1; /* we'll just blt 'em */ + TTY_FAST_CLEAR_END_OF_LINE (CURTTY ()) = 1; /* X does this well */ + TTY_MEMORY_BELOW_FRAME (CURTTY ()) = 0; /* we don't remember what + scrolls off the + bottom */ baud_rate = 19200; w32_system_caret_hwnd = NULL;
--- a/src/w32term.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/w32term.h Mon Dec 19 19:57:22 2005 +0000 @@ -411,8 +411,6 @@ #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc) #define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc) -#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) -#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) #define FRAME_FONT(f) ((f)->output_data.w32->font) #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset) #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset)
--- a/src/window.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/window.c Mon Dec 19 19:57:22 2005 +0000 @@ -21,6 +21,8 @@ Boston, MA 02110-1301, USA. */ #include <config.h> +#include <stdio.h> + #include "lisp.h" #include "buffer.h" #include "keyboard.h" @@ -6956,7 +6958,7 @@ void init_window_once () { - struct frame *f = make_terminal_frame (); + struct frame *f = make_initial_frame (); XSETFRAME (selected_frame, f); Vterminal_frame = selected_frame; minibuf_window = f->minibuffer_window;
--- a/src/window.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/window.h Mon Dec 19 19:57:22 2005 +0000 @@ -744,7 +744,7 @@ /* Nil or a symbol naming the window system under which emacs is running ('x is the only current possibility) */ -extern Lisp_Object Vwindow_system; +extern Lisp_Object Vinitial_window_system; /* Version number of X windows: 10, 11 or nil. */
--- a/src/xdisp.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xdisp.c Mon Dec 19 19:57:22 2005 +0000 @@ -572,21 +572,12 @@ static Lisp_Object Vmessages_buffer_name; -/* Index 0 is the buffer that holds the current (desired) echo area message, - or nil if none is desired right now. - - Index 1 is the buffer that holds the previously displayed echo area message, - or nil to indicate no message. This is normally what's on the screen now. - - These two can point to the same buffer. That happens when the last - message output by the user (or made by echoing) has been displayed. */ +/* Current, index 0, and last displayed echo area message. Either + buffers from echo_buffers, or nil to indicate no message. */ Lisp_Object echo_area_buffer[2]; -/* Permanent pointers to the two buffers that are used for echo area - purposes. Once the two buffers are made, and their pointers are - placed here, these two slots remain unchanged unless those buffers - need to be created afresh. */ +/* The buffers referenced from echo_area_buffer. */ static Lisp_Object echo_buffer[2]; @@ -796,10 +787,6 @@ static int clear_image_cache_count; #endif -/* Record the previous terminal frame we displayed. */ - -static struct frame *previous_terminal_frame; - /* Non-zero while redisplay_internal is in progress. */ int redisplaying_p; @@ -2461,7 +2448,7 @@ XSETWINDOW (it->window, w); it->w = w; it->f = XFRAME (w->frame); - + /* Extra space between lines (on window systems only). */ if (base_face_id == DEFAULT_FACE_ID && FRAME_WINDOW_P (it->f)) @@ -2478,9 +2465,9 @@ /* If realized faces have been removed, e.g. because of face attribute changes of named faces, recompute them. When running - in batch mode, the face cache of Vterminal_frame is null. If + in batch mode, the face cache of the initial frame is null. If we happen to get called, make a dummy face cache. */ - if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL) + if (FRAME_FACE_CACHE (it->f) == NULL) init_frame_faces (it->f); if (FRAME_FACE_CACHE (it->f)->used == 0) recompute_basic_faces (it->f); @@ -3867,7 +3854,7 @@ && EQ (XCAR (spec), Qheight) && CONSP (XCDR (spec))) { - if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) + if (!FRAME_WINDOW_P (it->f)) return 0; it->font_height = XCAR (XCDR (spec)); @@ -3933,7 +3920,7 @@ && EQ (XCAR (spec), Qspace_width) && CONSP (XCDR (spec))) { - if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) + if (!FRAME_WINDOW_P (it->f)) return 0; value = XCAR (XCDR (spec)); @@ -3949,7 +3936,7 @@ { Lisp_Object tem; - if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) + if (!FRAME_WINDOW_P (it->f)) return 0; if (tem = XCDR (spec), CONSP (tem)) @@ -3975,7 +3962,7 @@ && EQ (XCAR (spec), Qraise) && CONSP (XCDR (spec))) { - if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) + if (!FRAME_WINDOW_P (it->f)) return 0; #ifdef HAVE_WINDOW_SYSTEM @@ -4016,7 +4003,7 @@ int face_id = DEFAULT_FACE_ID; int fringe_bitmap; - if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) + if (!FRAME_WINDOW_P (it->f)) /* If we return here, POSITION has been advanced across the text with this property. */ return 0; @@ -4062,7 +4049,7 @@ it->left_user_fringe_face_id = face_id; } else - { + { it->right_user_fringe_bitmap = fringe_bitmap; it->right_user_fringe_face_id = face_id; } @@ -4107,16 +4094,15 @@ valid_p = (STRINGP (value) #ifdef HAVE_WINDOW_SYSTEM - || (!FRAME_TERMCAP_P (it->f) && valid_image_p (value)) + || (FRAME_WINDOW_P (it->f) && valid_image_p (value)) #endif /* not HAVE_WINDOW_SYSTEM */ - || (CONSP (value) && EQ (XCAR (value), Qspace))); + || (CONSP (value) && EQ (XCAR (value), Qspace))); if (valid_p && !display_replaced_before_p) { /* Save current settings of IT so that we can restore them when we are finished with the glyph property value. */ push_it (it); - if (NILP (location)) it->area = TEXT_AREA; else if (EQ (location, Qleft_margin)) @@ -4149,6 +4135,7 @@ it->method = GET_FROM_STRETCH; it->object = value; it->current.pos = it->position = start_pos; + } #ifdef HAVE_WINDOW_SYSTEM else @@ -4176,7 +4163,7 @@ } -/* Check if SPEC is a display specification value whose text should be +/* Check if SPEC is a display sub-property value whose text should be treated as intangible. */ static int @@ -7317,8 +7304,8 @@ do_pending_window_change (0); echo_area_display (1); do_pending_window_change (0); - if (frame_up_to_date_hook != 0 && ! gc_in_progress) - (*frame_up_to_date_hook) (f); + if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress) + (*FRAME_DEVICE (f)->frame_up_to_date_hook) (f); } } @@ -7421,8 +7408,8 @@ do_pending_window_change (0); echo_area_display (1); do_pending_window_change (0); - if (frame_up_to_date_hook != 0 && ! gc_in_progress) - (*frame_up_to_date_hook) (f); + if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress) + (*FRAME_DEVICE (f)->frame_up_to_date_hook) (f); } } @@ -7660,6 +7647,10 @@ WHICH > 0 means use echo_area_buffer[1]. If that is nil, choose a suitable buffer from echo_buffer[] and clear it. + If WHICH < 0, set echo_area_buffer[1] to echo_area_buffer[0], so + that the current message becomes the last displayed one, make + choose a suitable buffer for echo_area_buffer[0], and clear it. + Value is what FN returns. */ static int @@ -7684,6 +7675,17 @@ this_one = 0, the_other = 1; else if (which > 0) this_one = 1, the_other = 0; + else + { + this_one = 0, the_other = 1; + clear_buffer_p = 1; + + /* We need a fresh one in case the current echo buffer equals + the one containing the last displayed echo area message. */ + if (!NILP (echo_area_buffer[this_one]) + && EQ (echo_area_buffer[this_one], echo_area_buffer[the_other])) + echo_area_buffer[this_one] = Qnil; + } /* Choose a suitable buffer from echo_buffer[] is we don't have one. */ @@ -8321,7 +8323,7 @@ = ((s && multibyte_p) || (STRINGP (string) && STRING_MULTIBYTE (string))); - with_echo_area_buffer (0, 0, set_message_1, + with_echo_area_buffer (0, -1, set_message_1, (EMACS_INT) s, string, nbytes, multibyte_p); message_buf_print = 0; help_echo_showing_p = 0; @@ -8351,7 +8353,6 @@ /* Insert new message at BEG. */ TEMP_SET_PT_BOTH (BEG, BEG_BYTE); - Ferase_buffer (); if (STRINGP (string)) { @@ -8447,11 +8448,11 @@ { Lisp_Object tail, frame; int changed_count = 0; - + FOR_EACH_FRAME (tail, frame) { struct frame *f = XFRAME (frame); - + if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) { if (f->resized_p) @@ -8465,7 +8466,7 @@ f->resized_p = 0; } } - + frame_garbaged = 0; if (changed_count) ++windows_or_buffers_changed; @@ -8498,11 +8499,10 @@ /* The terminal frame is used as the first Emacs frame on the Mac OS. */ #ifndef MAC_OS8 #ifdef HAVE_WINDOW_SYSTEM - /* When Emacs starts, selected_frame may be a visible terminal - frame, even if we run under a window system. If we let this - through, a message would be displayed on the terminal. */ - if (EQ (selected_frame, Vterminal_frame) - && !NILP (Vwindow_system)) + /* When Emacs starts, selected_frame may be the initial terminal + frame. If we let this through, a message would be displayed on + the terminal. */ + if (FRAME_INITIAL_P (XFRAME (selected_frame))) return 0; #endif /* HAVE_WINDOW_SYSTEM */ #endif @@ -8553,7 +8553,7 @@ Can do with a display update of the echo area, unless we displayed some mode lines. */ update_single_window (w, 1); - rif->flush_display (f); + FRAME_RIF (f)->flush_display (f); } else update_frame (f, 1, 1); @@ -8568,8 +8568,10 @@ else if (!EQ (mini_window, selected_window)) windows_or_buffers_changed++; - /* The current message is now also the last one displayed. */ + /* Last displayed message is now the current message. */ echo_area_buffer[1] = echo_area_buffer[0]; + /* Inform read_char that we're not echoing. */ + echo_message_buffer = Qnil; /* Prevent redisplay optimization in redisplay_internal by resetting this_line_start_pos. This is done because the mini-buffer now @@ -9098,8 +9100,8 @@ { BLOCK_INPUT; display_and_set_cursor (w, 1, hpos, vpos, x, y); - if (rif->flush_display_optional) - rif->flush_display_optional (SELECTED_FRAME ()); + if (FRAME_RIF (SELECTED_FRAME ())->flush_display_optional) + FRAME_RIF (SELECTED_FRAME ())->flush_display_optional (SELECTED_FRAME ()); UNBLOCK_INPUT; } } @@ -10413,6 +10415,8 @@ Lisp_Object tail, sym, val; Lisp_Object old = selected_frame; + xassert (FRAMEP (frame) && FRAME_LIVE_P (XFRAME (frame))); + selected_frame = frame; for (tail = XFRAME (frame)->param_alist; CONSP (tail); tail = XCDR (tail)) @@ -10540,17 +10544,16 @@ if (face_change_count) ++windows_or_buffers_changed; - if (! FRAME_WINDOW_P (sf) - && previous_terminal_frame != sf) - { - /* Since frames on an ASCII terminal share the same display - area, displaying a different frame means redisplay the whole - thing. */ + if (FRAME_TERMCAP_P (sf) + && FRAME_TTY (sf)->previous_terminal_frame != sf) + { + /* Since frames on a single ASCII terminal share the same + display area, displaying a different frame means redisplay + the whole thing. */ windows_or_buffers_changed++; SET_FRAME_GARBAGED (sf); - XSETFRAME (Vterminal_frame, sf); - } - previous_terminal_frame = sf; + FRAME_TTY (sf)->previous_terminal_frame = sf; + } /* Set the visible flags for all frames. Do this before checking for resized or garbaged frames; they want to know if their frames @@ -10572,6 +10575,7 @@ } } + /* Notice any pending interrupt request to change frame size. */ do_pending_window_change (1); @@ -10927,7 +10931,7 @@ { struct frame *f = XFRAME (frame); - if (FRAME_WINDOW_P (f) || f == sf) + if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf) { if (! EQ (frame, selected_frame)) /* Select the frame, for the sake of frame-local @@ -10936,16 +10940,16 @@ /* Mark all the scroll bars to be removed; we'll redeem the ones we want when we redisplay their windows. */ - if (condemn_scroll_bars_hook) - condemn_scroll_bars_hook (f); + if (FRAME_DEVICE (f)->condemn_scroll_bars_hook) + FRAME_DEVICE (f)->condemn_scroll_bars_hook (f); if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) redisplay_windows (FRAME_ROOT_WINDOW (f)); /* Any scroll bars which redisplay_windows should have nuked should now go away. */ - if (judge_scroll_bars_hook) - judge_scroll_bars_hook (f); + if (FRAME_DEVICE (f)->judge_scroll_bars_hook) + FRAME_DEVICE (f)->judge_scroll_bars_hook (f); /* If fonts changed, display again. */ /* ??? rms: I suspect it is a mistake to jump all the way @@ -10992,12 +10996,12 @@ FOR_EACH_FRAME (tail, frame) { struct frame *f = XFRAME (frame); - if (f->updated_p) - { - mark_window_display_accurate (f->root_window, 1); - if (frame_up_to_date_hook) - frame_up_to_date_hook (f); - } + if (f->updated_p) + { + mark_window_display_accurate (f->root_window, 1); + if (FRAME_DEVICE (f)->frame_up_to_date_hook) + FRAME_DEVICE (f)->frame_up_to_date_hook (f); + } } } } @@ -11082,8 +11086,8 @@ /* Say overlay arrows are up to date. */ update_overlay_arrows (1); - if (frame_up_to_date_hook != 0) - frame_up_to_date_hook (sf); + if (FRAME_DEVICE (sf)->frame_up_to_date_hook != 0) + FRAME_DEVICE (sf)->frame_up_to_date_hook (sf); } update_mode_lines = 0; @@ -11193,8 +11197,9 @@ else redisplay_internal (1); - if (rif != NULL && rif->flush_display_optional) - rif->flush_display_optional (NULL); + if (FRAME_RIF (SELECTED_FRAME ()) != NULL + && FRAME_RIF (SELECTED_FRAME ())->flush_display_optional) + FRAME_RIF (SELECTED_FRAME ())->flush_display_optional (NULL); } @@ -11202,7 +11207,8 @@ redisplay_internal. Reset redisplaying_p to the value it had before redisplay_internal was called, and clear prevent_freeing_realized_faces_p. It also selects the previously - selected frame. */ + selected frame, unless it has been deleted (by an X connection + failure during redisplay, for example). */ static Lisp_Object unwind_redisplay (val) @@ -11213,7 +11219,8 @@ old_redisplaying_p = XCAR (val); redisplaying_p = XFASTINT (old_redisplaying_p); old_frame = XCDR (val); - if (! EQ (old_frame, selected_frame)) + if (! EQ (old_frame, selected_frame) + && FRAME_LIVE_P (XFRAME (old_frame))) select_frame_for_redisplay (old_frame); return Qnil; } @@ -12336,7 +12343,9 @@ start = end = whole = 0; /* Indicate what this scroll bar ought to be displaying now. */ - set_vertical_scroll_bar_hook (w, end - start, whole, start); + if (FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook) + (*FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook) + (w, end - start, whole, start); } @@ -13028,17 +13037,19 @@ display_menu_bar (w); #ifdef HAVE_WINDOW_SYSTEM + if (FRAME_WINDOW_P (f)) + { #ifdef USE_GTK - redisplay_tool_bar_p = FRAME_EXTERNAL_TOOL_BAR (f); + redisplay_tool_bar_p = FRAME_EXTERNAL_TOOL_BAR (f); #else - redisplay_tool_bar_p = WINDOWP (f->tool_bar_window) - && (FRAME_TOOL_BAR_LINES (f) > 0 - || auto_resize_tool_bars_p); - -#endif - - if (redisplay_tool_bar_p) - redisplay_tool_bar (f); + redisplay_tool_bar_p = WINDOWP (f->tool_bar_window) + && (FRAME_TOOL_BAR_LINES (f) > 0 + || auto_resize_tool_bars_p); +#endif + + if (redisplay_tool_bar_p) + redisplay_tool_bar (f); + } #endif } @@ -13072,7 +13083,8 @@ /* Note that we actually used the scroll bar attached to this window, so it shouldn't be deleted at the end of redisplay. */ - redeem_scroll_bar_hook (w); + if (FRAME_DEVICE (f)->redeem_scroll_bar_hook) + (*FRAME_DEVICE (f)->redeem_scroll_bar_hook) (w); } /* Restore current_buffer and value of point in it. */ @@ -13336,10 +13348,10 @@ if (run.height > 0 && run.current_y != run.desired_y) { update_begin (f); - rif->update_window_begin_hook (w); - rif->clear_window_mouse_face (w); - rif->scroll_run_hook (w, &run); - rif->update_window_end_hook (w, 0, 0); + FRAME_RIF (f)->update_window_begin_hook (w); + FRAME_RIF (f)->clear_window_mouse_face (w); + FRAME_RIF (f)->scroll_run_hook (w, &run); + FRAME_RIF (f)->update_window_end_hook (w, 0, 0); update_end (f); } @@ -13508,10 +13520,10 @@ if (run.height) { update_begin (f); - rif->update_window_begin_hook (w); - rif->clear_window_mouse_face (w); - rif->scroll_run_hook (w, &run); - rif->update_window_end_hook (w, 0, 0); + FRAME_RIF (f)->update_window_begin_hook (w); + FRAME_RIF (f)->clear_window_mouse_face (w); + FRAME_RIF (f)->scroll_run_hook (w, &run); + FRAME_RIF (f)->update_window_end_hook (w, 0, 0); update_end (f); } @@ -13961,7 +13973,7 @@ /* Window must either use window-based redisplay or be full width. */ if (!FRAME_WINDOW_P (f) - && (!line_ins_del_ok + && (!FRAME_LINE_INS_DEL_OK (f) || !WINDOW_FULL_WIDTH_P (w))) GIVE_UP (4); @@ -14370,10 +14382,10 @@ if (FRAME_WINDOW_P (f)) { - rif->update_window_begin_hook (w); - rif->clear_window_mouse_face (w); - rif->scroll_run_hook (w, &run); - rif->update_window_end_hook (w, 0, 0); + FRAME_RIF (f)->update_window_begin_hook (w); + FRAME_RIF (f)->clear_window_mouse_face (w); + FRAME_RIF (f)->scroll_run_hook (w, &run); + FRAME_RIF (f)->update_window_end_hook (w, 0, 0); } else { @@ -14391,36 +14403,36 @@ { /* Scroll last_unchanged_at_beg_row to the end of the window down dvpos lines. */ - set_terminal_window (end); + set_terminal_window (f, end); /* On dumb terminals delete dvpos lines at the end before inserting dvpos empty lines. */ - if (!scroll_region_ok) - ins_del_lines (end - dvpos, -dvpos); + if (!FRAME_SCROLL_REGION_OK (f)) + ins_del_lines (f, end - dvpos, -dvpos); /* Insert dvpos empty lines in front of last_unchanged_at_beg_row. */ - ins_del_lines (from, dvpos); + ins_del_lines (f, from, dvpos); } else if (dvpos < 0) { /* Scroll up last_unchanged_at_beg_vpos to the end of the window to last_unchanged_at_beg_vpos - |dvpos|. */ - set_terminal_window (end); + set_terminal_window (f, end); /* Delete dvpos lines in front of last_unchanged_at_beg_vpos. ins_del_lines will set the cursor to the given vpos and emit |dvpos| delete line sequences. */ - ins_del_lines (from + dvpos, dvpos); + ins_del_lines (f, from + dvpos, dvpos); /* On a dumb terminal insert dvpos empty lines at the end. */ - if (!scroll_region_ok) - ins_del_lines (end + dvpos, -dvpos); - } - - set_terminal_window (0); + if (!FRAME_SCROLL_REGION_OK (f)) + ins_del_lines (f, end + dvpos, -dvpos); + } + + set_terminal_window (f, 0); } update_end (f); @@ -16180,7 +16192,7 @@ values. */ push_frame_kboard (it.f); display_mode_element (&it, 0, 0, 0, format, Qnil, 0); - pop_frame_kboard (); + pop_kboard (); unbind_to (count, Qnil); @@ -16894,7 +16906,7 @@ push_frame_kboard (it.f); display_mode_element (&it, 0, 0, 0, format, Qnil, 0); - pop_frame_kboard (); + pop_kboard (); if (no_props) { @@ -17505,8 +17517,8 @@ { /* No need to mention EOL here--the terminal never needs to do EOL conversion. */ - p = decode_mode_spec_coding (keyboard_coding.symbol, p, 0); - p = decode_mode_spec_coding (terminal_coding.symbol, p, 0); + p = decode_mode_spec_coding (FRAME_KEYBOARD_CODING (f)->symbol, p, 0); + p = decode_mode_spec_coding (FRAME_TERMINAL_CODING (f)->symbol, p, 0); } p = decode_mode_spec_coding (b->buffer_file_coding_system, p, eol_flag); @@ -18356,7 +18368,7 @@ = FONT_INFO_FROM_ID (f, face->font_info_id); if (font_info) glyph->font_type - = rif->encode_char (glyph->u.ch, char2b, font_info, two_byte_p); + = FRAME_RIF (f)->encode_char (glyph->u.ch, char2b, font_info, two_byte_p); } } @@ -18588,7 +18600,7 @@ font = face->font; font_info = FONT_INFO_FROM_ID (f, face->font_info_id); if (font /* ++KFS: Should this be font_info ? */ - && (pcm = rif->per_char_metric (font, &char2b, glyph->font_type))) + && (pcm = FRAME_RIF (f)->per_char_metric (font, &char2b, glyph->font_type))) { if (pcm->rbearing > pcm->width) *right = pcm->rbearing - pcm->width; @@ -18756,7 +18768,7 @@ struct font_info *font_info = FONT_INFO_FROM_ID (f, face->font_info_id); if (font_info) - rif->encode_char (c, char2b, font_info, 0); + FRAME_RIF (f)->encode_char (c, char2b, font_info, 0); } } @@ -18819,8 +18831,8 @@ { while (s) { - if (rif->compute_glyph_string_overhangs) - rif->compute_glyph_string_overhangs (s); + if (FRAME_RIF (s->f)->compute_glyph_string_overhangs) + FRAME_RIF (s->f)->compute_glyph_string_overhangs (s); x -= s->width; s->x = x; s = s->prev; @@ -18830,8 +18842,8 @@ { while (s) { - if (rif->compute_glyph_string_overhangs) - rif->compute_glyph_string_overhangs (s); + if (FRAME_RIF (s->f)->compute_glyph_string_overhangs) + FRAME_RIF (s->f)->compute_glyph_string_overhangs (s); s->x = x; x += s->width; s = s->next; @@ -19119,9 +19131,9 @@ struct glyph_string *h, *t; /* Compute overhangs for all glyph strings. */ - if (rif->compute_glyph_string_overhangs) + if (FRAME_RIF (f)->compute_glyph_string_overhangs) for (s = head; s; s = s->next) - rif->compute_glyph_string_overhangs (s); + FRAME_RIF (f)->compute_glyph_string_overhangs (s); /* Prepend glyph strings for glyphs in front of the first glyph string that are overwritten because of the first glyph @@ -19199,7 +19211,7 @@ /* Draw all strings. */ for (s = head; s; s = s->next) - rif->draw_glyph_string (s); + FRAME_RIF (f)->draw_glyph_string (s); if (area == TEXT_AREA && !row->full_width_p @@ -19895,20 +19907,20 @@ it->nglyphs = 1; - pcm = rif->per_char_metric (font, &char2b, - FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display)); - - if (it->override_ascent >= 0) - { - it->ascent = it->override_ascent; - it->descent = it->override_descent; - boff = it->override_boff; - } - else - { - it->ascent = FONT_BASE (font) + boff; - it->descent = FONT_DESCENT (font) - boff; - } + pcm = FRAME_RIF (it->f)->per_char_metric + (font, &char2b, FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display)); + + if (it->override_ascent >= 0) + { + it->ascent = it->override_ascent; + it->descent = it->override_descent; + boff = it->override_boff; + } + else + { + it->ascent = FONT_BASE (font) + boff; + it->descent = FONT_DESCENT (font) - boff; + } if (pcm) { @@ -20126,8 +20138,8 @@ from the charset width; this is what old redisplay code did. */ - pcm = rif->per_char_metric (font, &char2b, - FONT_TYPE_FOR_MULTIBYTE (font, it->c)); + pcm = FRAME_RIF (it->f)->per_char_metric (font, &char2b, + FONT_TYPE_FOR_MULTIBYTE (font, it->c)); if (font_not_found_p || !pcm) { @@ -20258,8 +20270,8 @@ /* Initialize the bounding box. */ if (font_info - && (pcm = rif->per_char_metric (font, &char2b, - FONT_TYPE_FOR_MULTIBYTE (font, it->c)))) + && (pcm = FRAME_RIF (it->f)->per_char_metric (font, &char2b, + FONT_TYPE_FOR_MULTIBYTE (font, it->c)))) { width = pcm->width; ascent = pcm->ascent; @@ -20317,8 +20329,8 @@ } if (font_info - && (pcm = rif->per_char_metric (font, &char2b, - FONT_TYPE_FOR_MULTIBYTE (font, ch)))) + && (pcm = FRAME_RIF (it->f)->per_char_metric (font, &char2b, + FONT_TYPE_FOR_MULTIBYTE (font, ch)))) { width = pcm->width; ascent = pcm->ascent; @@ -20558,8 +20570,8 @@ frame_x = window_box_left (w, updated_area) + output_cursor.x; frame_y = WINDOW_TO_FRAME_PIXEL_Y (w, output_cursor.y); - rif->shift_glyphs_for_insert (f, frame_x, frame_y, shifted_region_width, - line_height, shift_by_width); + FRAME_RIF (f)->shift_glyphs_for_insert (f, frame_x, frame_y, shifted_region_width, + line_height, shift_by_width); /* Write the glyphs. */ hpos = start - row->glyphs[updated_area]; @@ -20641,8 +20653,8 @@ if (to_x > from_x && to_y > from_y) { BLOCK_INPUT; - rif->clear_frame_area (f, from_x, from_y, - to_x - from_x, to_y - from_y); + FRAME_RIF (f)->clear_frame_area (f, from_x, from_y, + to_x - from_x, to_y - from_y); UNBLOCK_INPUT; } } @@ -21118,9 +21130,9 @@ x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); y = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, cursor_row->y)); width = min (cursor_glyph->pixel_width, - window_box_width (w, TEXT_AREA) - w->phys_cursor.x); - - rif->clear_frame_area (f, x, y, width, cursor_row->visible_height); + window_box_width (w, TEXT_AREA) - w->phys_cursor.x); + + FRAME_RIF (f)->clear_frame_area (f, x, y, width, cursor_row->visible_height); } /* Erase the cursor by redrawing the character underneath it. */ @@ -21217,9 +21229,9 @@ w->phys_cursor.vpos = vpos; } - rif->draw_window_cursor (w, glyph_row, x, y, - new_cursor_type, new_cursor_width, - on, active_cursor); + FRAME_RIF (f)->draw_window_cursor (w, glyph_row, x, y, + new_cursor_type, new_cursor_width, + on, active_cursor); } @@ -21368,11 +21380,11 @@ /* Change the mouse cursor. */ if (draw == DRAW_NORMAL_TEXT) - rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->text_cursor); + FRAME_RIF (f)->define_frame_cursor (f, FRAME_X_OUTPUT (f)->text_cursor); else if (draw == DRAW_MOUSE_FACE) - rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->hand_cursor); - else - rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->nontext_cursor); + FRAME_RIF (f)->define_frame_cursor (f, FRAME_X_OUTPUT (f)->hand_cursor); + else + FRAME_RIF (f)->define_frame_cursor (f, FRAME_X_OUTPUT (f)->nontext_cursor); } /* EXPORT: @@ -21811,7 +21823,6 @@ return inside; } } - /* If we don't understand the format, pretend we're not in the hot-spot. */ return 0; } @@ -21891,7 +21902,7 @@ } if (cursor != No_Cursor) - rif->define_frame_cursor (f, cursor); + FRAME_RIF (f)->define_frame_cursor (f, cursor); } /* Take proper action when mouse has moved to the mode or header line @@ -22851,8 +22862,8 @@ I assume the effect is the same -- and this is portable. */ return x_intersect_rectangles (&cr, r, &result); } - else - return 0; + /* If we don't understand the format, pretend we're not in the hot-spot. */ + return 0; } @@ -22864,6 +22875,8 @@ x_draw_vertical_border (w) struct window *w; { + struct frame *f = XFRAME (WINDOW_FRAME (w)); + /* We could do better, if we knew what type of scroll-bar the adjacent windows (on either side) have... But we don't :-( However, I think this works ok. ++KFS 2003-04-25 */ @@ -22884,9 +22897,9 @@ y1 -= 1; if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0) - x1 -= 1; - - rif->draw_vertical_window_border (w, x1, y0, y1); + x1 -= 1; + + FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1); } else if (!WINDOW_LEFTMOST_P (w) && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)) @@ -22897,9 +22910,9 @@ y1 -= 1; if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0) - x0 -= 1; - - rif->draw_vertical_window_border (w, x0, y0, y1); + x0 -= 1; + + FRAME_RIF (f)->draw_vertical_window_border (w, x0, y0, y1); } }
--- a/src/xfaces.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xfaces.c Mon Dec 19 19:57:22 2005 +0000 @@ -195,11 +195,13 @@ #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> +#include <stdio.h> /* This needs to be before termchar.h */ #include "lisp.h" #include "charset.h" #include "keyboard.h" #include "frame.h" +#include "termhooks.h" #ifdef HAVE_WINDOW_SYSTEM #include "fontset.h" @@ -242,6 +244,7 @@ #include "blockinput.h" #include "window.h" #include "intervals.h" +#include "termchar.h" #ifdef HAVE_X_WINDOWS @@ -3236,6 +3239,20 @@ +static Lisp_Object +internal_resolve_face_name (nargs, args) + int nargs; + Lisp_Object *args; +{ + Fget (args[0], args[1]); +} + +static Lisp_Object +resolve_face_name_error (ignore) + Lisp_Object ignore; +{ + return Qnil; +} /* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it to make it a symbol. If FACE_NAME is an alias for another face, @@ -6151,7 +6168,7 @@ /* See if the capabilities we selected above are supported, with the given colors. */ if (test_caps != 0 && - ! tty_capable_p (f, test_caps, fg_tty_color.pixel, bg_tty_color.pixel)) + ! tty_capable_p (FRAME_TTY (f), test_caps, fg_tty_color.pixel, bg_tty_color.pixel)) return 0; @@ -6952,7 +6969,8 @@ { FRAME_FACE_CACHE (f)->menu_face_changed_p = 0; #ifdef USE_X_TOOLKIT - x_update_menu_appearance (f); + if (FRAME_WINDOW_P (f)) + x_update_menu_appearance (f); #endif } @@ -7039,7 +7057,7 @@ LFACE_FOREGROUND (lface) = XCDR (color); else if (FRAME_WINDOW_P (f)) return 0; - else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) + else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) LFACE_FOREGROUND (lface) = build_string (unspecified_fg); else abort (); @@ -7054,7 +7072,7 @@ LFACE_BACKGROUND (lface) = XCDR (color); else if (FRAME_WINDOW_P (f)) return 0; - else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) + else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) LFACE_BACKGROUND (lface) = build_string (unspecified_bg); else abort (); @@ -7143,6 +7161,11 @@ face = realize_x_face (cache, attrs, c, base_face); else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) face = realize_tty_face (cache, attrs, c); + else if (FRAME_INITIAL_P (cache->f)) + { + /* Create a dummy face. */ + face = make_realized_face (attrs); + } else abort ();
--- a/src/xfns.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xfns.c Mon Dec 19 19:57:22 2005 +0000 @@ -47,6 +47,7 @@ #include "systime.h" #include "termhooks.h" #include "atimer.h" +#include "termchar.h" #ifdef HAVE_X_WINDOWS @@ -238,17 +239,18 @@ return f; } -/* Let the user specify an X display with a frame. +/* Let the user specify an X display with a Lisp object. + OBJECT may be nil, a frame or a device id. nil stands for the selected frame--or, if that is not an X frame, the first X display on the list. */ struct x_display_info * -check_x_display_info (frame) - Lisp_Object frame; +check_x_display_info (object) + Lisp_Object object; { struct x_display_info *dpyinfo = NULL; - if (NILP (frame)) + if (NILP (object)) { struct frame *sf = XFRAME (selected_frame); @@ -259,11 +261,20 @@ else error ("X windows are not in use or not initialized"); } - else if (STRINGP (frame)) - dpyinfo = x_display_info_for_name (frame); + else if (INTEGERP (object)) + { + struct device *d = get_device (XINT (object), 1); + + if (d->type != output_x_window) + error ("Display %d is not an X display", XINT (object)); + + dpyinfo = d->display_info.x; + } + else if (STRINGP (object)) + dpyinfo = x_display_info_for_name (object); else { - FRAME_PTR f = check_x_frame (frame); + FRAME_PTR f = check_x_frame (object); dpyinfo = FRAME_X_DISPLAY_INFO (f); } @@ -1396,10 +1407,8 @@ below the menu bar. */ if (FRAME_X_WINDOW (f) && FRAME_TOOL_BAR_LINES (f) == 0) { - updating_frame = f; - clear_frame (); + clear_frame (f); clear_current_matrices (f); - updating_frame = NULL; } /* If the tool bar gets smaller, the internal border below it @@ -1450,10 +1459,10 @@ if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { /* Remove all scroll bars because they have wrong colors. */ - if (condemn_scroll_bars_hook) - (*condemn_scroll_bars_hook) (f); - if (judge_scroll_bars_hook) - (*judge_scroll_bars_hook) (f); + if (FRAME_DEVICE (f)->condemn_scroll_bars_hook) + (*FRAME_DEVICE (f)->condemn_scroll_bars_hook) (f); + if (FRAME_DEVICE (f)->judge_scroll_bars_hook) + (*FRAME_DEVICE (f)->judge_scroll_bars_hook) (f); update_face_from_frame_parameter (f, Qscroll_bar_foreground, value); redraw_frame (f); @@ -1499,10 +1508,10 @@ if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { /* Remove all scroll bars because they have wrong colors. */ - if (condemn_scroll_bars_hook) - (*condemn_scroll_bars_hook) (f); - if (judge_scroll_bars_hook) - (*judge_scroll_bars_hook) (f); + if (FRAME_DEVICE (f)->condemn_scroll_bars_hook) + (*FRAME_DEVICE (f)->condemn_scroll_bars_hook) (f); + if (FRAME_DEVICE (f)->judge_scroll_bars_hook) + (*FRAME_DEVICE (f)->judge_scroll_bars_hook) (f); update_face_from_frame_parameter (f, Qscroll_bar_background, value); redraw_frame (f); @@ -2954,6 +2963,12 @@ { struct frame *f = XFRAME (frame); + /* If frame is already dead, nothing to do. This can happen if the + display is disconnected after the frame has become official, but + before x_create_frame removes the unwind protect. */ + if (!FRAME_LIVE_P (f)) + return Qnil; + /* If frame is ``official'', nothing to do. */ if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) { @@ -3002,18 +3017,18 @@ Lisp_Object parent; struct kboard *kb; - check_x (); - /* Use this general default value to start with until we know if this frame has a specified name. */ Vx_resource_name = Vinvocation_name; - display = x_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); + display = x_get_arg (dpyinfo, parms, Qdevice, 0, 0, RES_TYPE_NUMBER); + if (EQ (display, Qunbound)) + display = x_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); if (EQ (display, Qunbound)) display = Qnil; dpyinfo = check_x_display_info (display); #ifdef MULTI_KBOARD - kb = dpyinfo->kboard; + kb = dpyinfo->device->kboard; #else kb = &the_only_kboard; #endif @@ -3058,6 +3073,9 @@ /* Note that X Windows does support scroll bars. */ FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; + f->device = dpyinfo->device; + f->device->reference_count++; + f->output_method = output_x_window; f->output_data.x = (struct x_output *) xmalloc (sizeof (struct x_output)); bzero (f->output_data.x, sizeof (struct x_output)); @@ -3082,9 +3100,6 @@ image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ -#ifdef MULTI_KBOARD - FRAME_KBOARD (f) = kb; -#endif /* These colors will be set anyway later, but it's important to get the color reference counts right, so initialize them! */ @@ -3147,6 +3162,8 @@ specbind (Qx_resource_name, name); } + Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qx), Qnil)); + /* Extract the window parameters from the supplied values that are needed to determine window geometry. */ { @@ -3479,10 +3496,10 @@ DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, doc: /* Internal function called by `display-color-p', which see. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); if (dpyinfo->n_planes <= 2) return Qnil; @@ -3504,13 +3521,13 @@ 0, 1, 0, doc: /* Return t if the X display supports shades of gray. Note that color displays do support shades of gray. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). +If omitted or nil, that stands for the selected frame's display device. */) + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); if (dpyinfo->n_planes <= 1) return Qnil; @@ -3532,56 +3549,56 @@ DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, 0, 1, 0, - doc: /* Returns the width in pixels of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Returns the width in pixels of the X display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (dpyinfo->width); } DEFUN ("x-display-pixel-height", Fx_display_pixel_height, Sx_display_pixel_height, 0, 1, 0, - doc: /* Returns the height in pixels of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Returns the height in pixels of the X display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (dpyinfo->height); } DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, 0, 1, 0, - doc: /* Returns the number of bitplanes of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Returns the number of bitplanes of the X display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (dpyinfo->n_planes); } DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, 0, 1, 0, - doc: /* Returns the number of color cells of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Returns the number of color cells of the X display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); int nr_planes = DisplayPlanes (dpyinfo->display, XScreenNumberOfScreen (dpyinfo->screen)); @@ -3599,29 +3616,29 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_request_size, 0, 1, 0, - doc: /* Returns the maximum request size of the X server of display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Returns the maximum request size of the X server of display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (MAXREQUEST (dpyinfo->display)); } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the "vendor ID" string of the X server of display DISPLAY. + doc: /* Returns the "vendor ID" string of the X server of display DEVICE. \(Labelling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); char *vendor = ServerVendor (dpyinfo->display); if (! vendor) vendor = ""; @@ -3629,18 +3646,18 @@ } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Returns the version numbers of the X server of display DISPLAY. + doc: /* Returns the version numbers of the X server of display DEVICE. The value is a list of three integers: the major and minor version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); Display *dpy = dpyinfo->display; return Fcons (make_number (ProtocolVersion (dpy)), @@ -3649,55 +3666,55 @@ } DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, - doc: /* Return the number of screens on the X server of display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the number of screens on the X server of display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (ScreenCount (dpyinfo->display)); } DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0, - doc: /* Return the height in millimeters of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the height in millimeters of the X display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (HeightMMOfScreen (dpyinfo->screen)); } DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, - doc: /* Return the width in millimeters of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the width in millimeters of the X display DEVICE. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); return make_number (WidthMMOfScreen (dpyinfo->screen)); } DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Returns an indication of whether X display DISPLAY does backing store. + doc: /* Returns an indication of whether X display DEVICE does backing store. The value may be `always', `when-mapped', or `not-useful'. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); Lisp_Object result; switch (DoesBackingStore (dpyinfo->screen)) @@ -3724,17 +3741,17 @@ DEFUN ("x-display-visual-class", Fx_display_visual_class, Sx_display_visual_class, 0, 1, 0, - doc: /* Return the visual class of the X display DISPLAY. + doc: /* Return the visual class of the X display DEVICE. The value is one of the symbols `static-gray', `gray-scale', `static-color', `pseudo-color', `true-color', or `direct-color'. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument DEVICE specifies which display to ask about. +DEVICE should a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); Lisp_Object result; switch (dpyinfo->visual->class) @@ -3767,14 +3784,14 @@ DEFUN ("x-display-save-under", Fx_display_save_under, Sx_display_save_under, 0, 1, 0, - doc: /* Returns t if the X display DISPLAY supports the save-under feature. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Returns t if the X display DEVICE supports the save-under feature. +The optional argument DEVICE specifies which display to ask about. +DEVICE should be a device id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (device); if (DoesSaveUnders (dpyinfo->screen) == True) return Qt; @@ -3955,8 +3972,10 @@ CHECK_STRING (name); - if (! EQ (Vwindow_system, intern ("x"))) - error ("Not using X Windows"); +#if 0 + if (! EQ (Vinitial_window_system, intern ("x"))) + error ("Not using X Windows"); /* That doesn't stop us anymore. */ +#endif for (dpyinfo = x_display_list, names = x_display_name_list; dpyinfo; @@ -4003,8 +4022,10 @@ if (! NILP (xrm_string)) CHECK_STRING (xrm_string); - if (! EQ (Vwindow_system, intern ("x"))) - error ("Not using X Windows"); +#if 0 + if (! EQ (Vinitial_window_system, intern ("x"))) + error ("Not using X Windows"); /* That doesn't stop us anymore. */ +#endif if (! NILP (xrm_string)) xrm_option = (unsigned char *) SDATA (xrm_string); @@ -4046,30 +4067,11 @@ Lisp_Object display; { struct x_display_info *dpyinfo = check_x_display_info (display); - int i; if (dpyinfo->reference_count > 0) error ("Display still has frames on it"); - BLOCK_INPUT; - /* Free the fonts in the font table. */ - for (i = 0; i < dpyinfo->n_fonts; i++) - if (dpyinfo->font_table[i].name) - { - XFreeFont (dpyinfo->display, dpyinfo->font_table[i].font); - } - - x_destroy_all_bitmaps (dpyinfo); - XSetCloseDownMode (dpyinfo->display, DestroyAll); - -#ifdef USE_X_TOOLKIT - XtCloseDisplay (dpyinfo->display); -#else - XCloseDisplay (dpyinfo->display); -#endif - - x_delete_display (dpyinfo); - UNBLOCK_INPUT; + x_delete_device (dpyinfo->device); return Qnil; } @@ -4403,10 +4405,6 @@ EMACS_TIME delay; int secs, usecs = 0; - /* Don't bother for ttys. */ - if (NILP (Vwindow_system)) - return; - cancel_hourglass (); if (INTEGERP (Vhourglass_delay) @@ -4618,20 +4616,12 @@ int width, height; int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3; - struct kboard *kb; int face_change_count_before = face_change_count; Lisp_Object buffer; struct buffer *old_buffer; check_x (); - -#ifdef MULTI_KBOARD - kb = dpyinfo->kboard; -#else - kb = &the_only_kboard; -#endif - /* Get the name of the frame to use for resource lookup. */ name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); if (!STRINGP (name) @@ -4658,6 +4648,9 @@ FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; record_unwind_protect (unwind_create_tip_frame, frame); + f->device = dpyinfo->device; + f->device->reference_count++; + /* By setting the output method, we're essentially saying that the frame is live, as per FRAME_LIVE_P. If we get a signal from this point on, x_destroy_window might screw up reference @@ -4679,9 +4672,6 @@ image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ -#ifdef MULTI_KBOARD - FRAME_KBOARD (f) = kb; -#endif f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; f->output_data.x->explicit_parent = 0; @@ -4691,6 +4681,16 @@ Lisp_Object black; struct gcpro gcpro1; + /* Function x_decode_color can signal an error. Make + sure to initialize color slots so that we won't try + to free colors we haven't allocated. */ + f->output_data.x->foreground_pixel = -1; + f->output_data.x->background_pixel = -1; + f->output_data.x->cursor_pixel = -1; + f->output_data.x->cursor_foreground_pixel = -1; + f->output_data.x->border_pixel = -1; + f->output_data.x->mouse_pixel = -1; + black = build_string ("black"); GCPRO1 (black); f->output_data.x->foreground_pixel @@ -4881,6 +4881,8 @@ Qnil)); } + Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qx), Qnil)); + f->no_split = 1; UNGCPRO;
--- a/src/xmenu.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xmenu.c Mon Dec 19 19:57:22 2005 +0000 @@ -41,10 +41,10 @@ #include <stdio.h> #include "lisp.h" -#include "termhooks.h" #include "keyboard.h" #include "keymap.h" #include "frame.h" +#include "termhooks.h" #include "window.h" #include "blockinput.h" #include "buffer.h" @@ -705,6 +705,9 @@ Window root, dummy_window; int dummy; + if (! FRAME_X_P (f)) + abort (); + BLOCK_INPUT; XQueryPointer (FRAME_X_DISPLAY (f), @@ -899,6 +902,9 @@ xpos += XINT (x); ypos += XINT (y); + + if (! FRAME_X_P (f)) + error ("Can not put X menu on non-X terminal"); } Vmenu_updating_frame = Qnil; #endif /* HAVE_MENUS */ @@ -1085,6 +1091,9 @@ but I don't want to make one now. */ CHECK_WINDOW (window); + if (! FRAME_X_P (f)) + error ("Can not put X dialog on non-X terminal"); + #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) /* Display a menu with these alternatives in the middle of frame F. */ @@ -1302,6 +1311,9 @@ x_activate_menubar (f) FRAME_PTR f; { + if (! FRAME_X_P (f)) + abort (); + if (!f->output_data.x->saved_menu_event->type) return; @@ -1931,9 +1943,14 @@ #ifdef USE_GTK return xg_update_frame_menubar (f); #else - struct x_output *x = f->output_data.x; + struct x_output *x; int columns, rows; + if (! FRAME_X_P (f)) + abort (); + + x = f->output_data.x; + if (!x->menubar_widget || XtIsManaged (x->menubar_widget)) return 0; @@ -1979,7 +1996,7 @@ int first_time; int deep_p; { - xt_or_gtk_widget menubar_widget = f->output_data.x->menubar_widget; + xt_or_gtk_widget menubar_widget; #ifdef USE_X_TOOLKIT LWLIB_ID id; #endif @@ -1989,6 +2006,10 @@ int *submenu_start, *submenu_end; int *submenu_top_level_items, *submenu_n_panes; + if (! FRAME_X_P (f)) + abort (); + + menubar_widget = f->output_data.x->menubar_widget; XSETFRAME (Vmenu_updating_frame, f); @@ -2333,6 +2354,9 @@ { Widget menubar_widget; + if (! FRAME_X_P (f)) + abort (); + menubar_widget = f->output_data.x->menubar_widget; f->output_data.x->menubar_height = 0; @@ -2485,6 +2509,9 @@ struct next_popup_x_y popup_x_y; int specpdl_count = SPECPDL_INDEX (); + if (! FRAME_X_P (f)) + abort (); + xg_crazy_callback_abort = 1; menu = xg_create_widget ("popup", first_wv->name, f, first_wv, G_CALLBACK (popup_selection_callback), @@ -2593,6 +2620,9 @@ LWLIB_ID menu_id; Widget menu; + if (! FRAME_X_P (f)) + abort (); + menu_id = widget_id_tick++; menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv, f->output_data.x->widget, 1, 0, @@ -2668,6 +2698,9 @@ int first_pane; + if (! FRAME_X_P (f)) + abort (); + *error = NULL; if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) @@ -2950,6 +2983,9 @@ { GtkWidget *menu; + if (! FRAME_X_P (f)) + abort (); + menu = xg_create_widget ("dialog", first_wv->name, f, first_wv, G_CALLBACK (dialog_selection_callback), G_CALLBACK (popup_deactivate_callback), @@ -2999,6 +3035,9 @@ { LWLIB_ID dialog_id; + if (!FRAME_X_P (f)) + abort(); + dialog_id = widget_id_tick++; lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv, f->output_data.x->widget, 1, 0, @@ -3050,6 +3089,9 @@ /* 1 means we've seen the boundary between left-hand elts and right-hand. */ int boundary_seen = 0; + if (! FRAME_X_P (f)) + abort (); + *error_name = NULL; if (menu_items_n_panes > 1) @@ -3317,6 +3359,9 @@ unsigned int dummy_uint; int specpdl_count = SPECPDL_INDEX (); + if (! FRAME_X_P (f)) + abort (); + *error = 0; if (menu_items_n_panes == 0) return Qnil;
--- a/src/xselect.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xselect.c Mon Dec 19 19:57:22 2005 +0000 @@ -397,13 +397,20 @@ Lisp_Object selection_name, selection_value; { struct frame *sf = SELECTED_FRAME (); - Window selecting_window = FRAME_X_WINDOW (sf); - Display *display = FRAME_X_DISPLAY (sf); + Window selecting_window; + Display *display; Time time = last_event_timestamp; Atom selection_atom; - struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (sf); + struct x_display_info *dpyinfo; int count; + if (! FRAME_X_P (sf)) + return; + + selecting_window = FRAME_X_WINDOW (sf); + display = FRAME_X_DISPLAY (sf); + dpyinfo = FRAME_X_DISPLAY_INFO (sf); + CHECK_SYMBOL (selection_name); selection_atom = symbol_to_x_atom (dpyinfo, display, selection_name); @@ -664,7 +671,8 @@ FOR_EACH_FRAME (list, frame) { - if (FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) + if (FRAME_X_P (XFRAME (frame)) + && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) return frame; } @@ -1002,7 +1010,7 @@ to see if this Emacs job now owns the selection through that display. */ for (t_dpyinfo = x_display_list; t_dpyinfo; t_dpyinfo = t_dpyinfo->next) - if (t_dpyinfo->kboard == dpyinfo->kboard) + if (t_dpyinfo->device->kboard == dpyinfo->device->kboard) { Window owner_window = XGetSelectionOwner (t_dpyinfo->display, selection); @@ -1362,17 +1370,26 @@ Lisp_Object selection_symbol, target_type, time_stamp; { struct frame *sf = SELECTED_FRAME (); - Window requestor_window = FRAME_X_WINDOW (sf); - Display *display = FRAME_X_DISPLAY (sf); - struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (sf); + Window requestor_window; + Display *display; + struct x_display_info *dpyinfo; Time requestor_time = last_event_timestamp; - Atom target_property = dpyinfo->Xatom_EMACS_TMP; - Atom selection_atom = symbol_to_x_atom (dpyinfo, display, selection_symbol); + Atom target_property; + Atom selection_atom; Atom type_atom; int secs, usecs; int count; Lisp_Object frame; + if (! FRAME_X_P (sf)) + return Qnil; + + requestor_window = FRAME_X_WINDOW (sf); + display = FRAME_X_DISPLAY (sf); + dpyinfo = FRAME_X_DISPLAY_INFO (sf); + target_property = dpyinfo->Xatom_EMACS_TMP; + selection_atom = symbol_to_x_atom (dpyinfo, display, selection_symbol); + if (CONSP (target_type)) type_atom = symbol_to_x_atom (dpyinfo, display, XCAR (target_type)); else @@ -2198,6 +2215,9 @@ struct frame *sf = SELECTED_FRAME (); check_x (); + if (! FRAME_X_P (sf)) + return Qnil; + display = FRAME_X_DISPLAY (sf); dpyinfo = FRAME_X_DISPLAY_INFO (sf); CHECK_SYMBOL (selection); @@ -2361,6 +2381,10 @@ struct frame *sf = SELECTED_FRAME (); check_x (); + + if (! FRAME_X_P (sf)) + return Qnil; + display = FRAME_X_DISPLAY (sf); dpyinfo = FRAME_X_DISPLAY_INFO (sf); window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ @@ -2402,6 +2426,10 @@ struct frame *sf = SELECTED_FRAME (); check_x (); + + if (! FRAME_X_P (sf)) + return Qnil; + display = FRAME_X_DISPLAY (sf); window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ @@ -2458,8 +2486,12 @@ Atom props[8]; Display *display; struct frame *sf = SELECTED_FRAME (); - + check_x (); + + if (! FRAME_X_P (sf)) + return Qnil; + display = FRAME_X_DISPLAY (sf); window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ CHECK_NUMBER (n);
--- a/src/xsmfns.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xsmfns.c Mon Dec 19 19:57:22 2005 +0000 @@ -48,6 +48,7 @@ #include "lisp.h" #include "systime.h" #include "sysselect.h" +#include "frame.h" #include "termhooks.h" #include "termopts.h" #include "xterm.h" @@ -510,6 +511,14 @@ } } +/* Ensure that the session manager is not contacted again. */ + +void +x_session_close () +{ + ice_fd = -1; +} + DEFUN ("handle-save-session", Fhandle_save_session, Shandle_save_session, 1, 1, "e",
--- a/src/xterm.c Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xterm.c Mon Dec 19 19:57:22 2005 +0000 @@ -54,7 +54,6 @@ #include <sys/ioctl.h> #endif /* ! defined (BSD_SYSTEM) */ -#include "systty.h" #include "systime.h" #ifndef INCLUDED_FCNTL @@ -314,6 +313,10 @@ static Lisp_Object Qvendor_specific_keysyms; static Lisp_Object Qlatin_1; +/* Used in x_flush. */ + +extern Lisp_Object Vinhibit_redisplay; + extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); extern int x_bitmap_mask P_ ((FRAME_PTR, int)); @@ -335,14 +338,16 @@ void x_set_window_size P_ ((struct frame *, int, int, int)); void x_wm_set_window_state P_ ((struct frame *, int)); void x_wm_set_icon_pixmap P_ ((struct frame *, int)); +struct device *x_create_device P_ ((struct x_display_info *)); +void x_delete_device P_ ((struct device *)); void x_initialize P_ ((void)); static void x_font_min_bounds P_ ((XFontStruct *, int *, int *)); static int x_compute_min_glyph_bounds P_ ((struct frame *)); static void x_update_end P_ ((struct frame *)); static void XTframe_up_to_date P_ ((struct frame *)); -static void XTset_terminal_modes P_ ((void)); -static void XTreset_terminal_modes P_ ((void)); -static void x_clear_frame P_ ((void)); +static void XTset_terminal_modes P_ ((struct device *)); +static void XTreset_terminal_modes P_ ((struct device *)); +static void x_clear_frame P_ ((struct frame *)); static void frame_highlight P_ ((struct frame *)); static void frame_unhighlight P_ ((struct frame *)); static void x_new_focus_frame P_ ((struct x_display_info *, struct frame *)); @@ -378,12 +383,18 @@ x_flush (f) struct frame *f; { + /* Don't call XFlush when it is not safe to redisplay; the X + connection may be broken. */ + if (!NILP (Vinhibit_redisplay)) + return; + BLOCK_INPUT; if (f == NULL) { Lisp_Object rest, frame; FOR_EACH_FRAME (rest, frame) - x_flush (XFRAME (frame)); + if (FRAME_X_P (XFRAME (frame))) + x_flush (XFRAME (frame)); } else if (FRAME_X_P (f)) XFlush (FRAME_X_DISPLAY (f)); @@ -795,7 +806,7 @@ rarely happens). */ static void -XTset_terminal_modes () +XTset_terminal_modes (struct device *device) { } @@ -803,7 +814,7 @@ the X-windows go away, and suspending requires no action. */ static void -XTreset_terminal_modes () +XTreset_terminal_modes (struct device *device) { } @@ -1416,7 +1427,8 @@ for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) if (GC_FRAMEP (XCAR (tail)) && (f = XFRAME (XCAR (tail)), - (f->output_data.nothing != 1 + (FRAME_X_P (f) + && f->output_data.nothing != 1 && FRAME_X_DISPLAY_INFO (f) == dpyinfo)) && f->output_data.x->widget == widget) return f; @@ -2770,7 +2782,8 @@ for X frames. */ static void -x_delete_glyphs (n) +x_delete_glyphs (f, n) + struct frame *f; register int n; { abort (); @@ -2793,19 +2806,11 @@ } -/* Clear entire frame. If updating_frame is non-null, clear that - frame. Otherwise clear the selected frame. */ +/* Clear an entire frame. */ static void -x_clear_frame () -{ - struct frame *f; - - if (updating_frame) - f = updating_frame; - else - f = SELECTED_FRAME (); - +x_clear_frame (struct frame *f) +{ /* Clearing the frame will erase any cursor, so mark them all as no longer visible. */ mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f))); @@ -3051,7 +3056,8 @@ lines or deleting -N lines at vertical position VPOS. */ static void -x_ins_del_lines (vpos, n) +x_ins_del_lines (f, vpos, n) + struct frame *f; int vpos, n; { abort (); @@ -3685,7 +3691,8 @@ /* Clear the mouse-moved flag for every frame on this display. */ FOR_EACH_FRAME (tail, frame) - if (FRAME_X_DISPLAY (XFRAME (frame)) == FRAME_X_DISPLAY (*fp)) + if (FRAME_X_P (XFRAME (frame)) + && FRAME_X_DISPLAY (XFRAME (frame)) == FRAME_X_DISPLAY (*fp)) XFRAME (frame)->mouse_moved = 0; last_mouse_scroll_bar = Qnil; @@ -3875,6 +3882,9 @@ if (! GC_FRAMEP (frame)) abort (); + if (! FRAME_X_P (XFRAME (frame))) + continue; + /* Scan this frame's scroll bar list for a scroll bar with the right window ID. */ condemned = FRAME_CONDEMNED_SCROLL_BARS (XFRAME (frame)); @@ -3909,11 +3919,14 @@ XGCTYPE (tail) == Lisp_Cons; tail = XCDR (tail)) { - Lisp_Object frame = XCAR (tail); - Widget menu_bar = XFRAME (frame)->output_data.x->menubar_widget; - - if (menu_bar && xlwmenu_window_p (menu_bar, window)) - return menu_bar; + if (FRAME_X_P (XFRAME (XCAR (tail)))) + { + Lisp_Object frame = XCAR (tail); + Widget menu_bar = XFRAME (frame)->output_data.x->menubar_widget; + + if (menu_bar && xlwmenu_window_p (menu_bar, window)) + return menu_bar; + } } return NULL; @@ -6225,19 +6238,19 @@ bzero (&compose_status, sizeof (compose_status)); orig_keysym = keysym; - /* Common for all keysym input events. */ - XSETFRAME (inev.ie.frame_or_window, f); - inev.ie.modifiers - = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), modifiers); - inev.ie.timestamp = event.xkey.time; - - /* First deal with keysyms which have defined - translations to characters. */ - if (keysym >= 32 && keysym < 128) - /* Avoid explicitly decoding each ASCII character. */ - { - inev.ie.kind = ASCII_KEYSTROKE_EVENT; - inev.ie.code = keysym; + /* Common for all keysym input events. */ + XSETFRAME (inev.ie.frame_or_window, f); + inev.ie.modifiers + = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), modifiers); + inev.ie.timestamp = event.xkey.time; + + /* First deal with keysyms which have defined + translations to characters. */ + if (keysym >= 32 && keysym < 128) + /* Avoid explicitly decoding each ASCII character. */ + { + inev.ie.kind = ASCII_KEYSTROKE_EVENT; + inev.ie.code = keysym; goto done_keysym; } @@ -6265,18 +6278,18 @@ /* Now non-ASCII. */ if (HASH_TABLE_P (Vx_keysym_table) && (NATNUMP (c = Fgethash (make_number (keysym), - Vx_keysym_table, - Qnil)))) - { - inev.ie.kind = (SINGLE_BYTE_CHAR_P (XFASTINT (c)) - ? ASCII_KEYSTROKE_EVENT - : MULTIBYTE_CHAR_KEYSTROKE_EVENT); - inev.ie.code = XFASTINT (c); - goto done_keysym; - } - - /* Random non-modifier sorts of keysyms. */ - if (((keysym >= XK_BackSpace && keysym <= XK_Escape) + Vx_keysym_table, + Qnil)))) + { + inev.ie.kind = (SINGLE_BYTE_CHAR_P (XFASTINT (c)) + ? ASCII_KEYSTROKE_EVENT + : MULTIBYTE_CHAR_KEYSTROKE_EVENT); + inev.ie.code = XFASTINT (c); + goto done_keysym; + } + + /* Random non-modifier sorts of keysyms. */ + if (((keysym >= XK_BackSpace && keysym <= XK_Escape) || keysym == XK_Delete #ifdef XK_ISO_Left_Tab || (keysym >= XK_ISO_Left_Tab @@ -6910,8 +6923,8 @@ EXPECTED is nonzero if the caller knows input is available. */ static int -XTread_socket (sd, expected, hold_quit) - register int sd; +XTread_socket (device, expected, hold_quit) + struct device *device; int expected; struct input_event *hold_quit; { @@ -6973,18 +6986,20 @@ } #ifdef HAVE_X_SM - { - struct input_event inev; - BLOCK_INPUT; - /* We don't need to EVENT_INIT (inev) here, as - x_session_check_input copies an entire input_event. */ - if (x_session_check_input (&inev)) - { - kbd_buffer_store_event_hold (&inev, hold_quit); - count++; - } - UNBLOCK_INPUT; - } + /* Only check session manager input for the primary display. */ + if (device->id == 1 && x_session_have_connection ()) + { + struct input_event inev; + BLOCK_INPUT; + /* We don't need to EVENT_INIT (inev) here, as + x_session_check_input copies an entire input_event. */ + if (x_session_check_input (&inev)) + { + kbd_buffer_store_event_hold (&inev, hold_quit); + count++; + } + UNBLOCK_INPUT; + } #endif #ifndef USE_GTK @@ -7321,8 +7336,7 @@ } #ifndef XFlush - if (updating_frame != f) - XFlush (FRAME_X_DISPLAY (f)); + XFlush (FRAME_X_DISPLAY (f)); #endif } @@ -7622,6 +7636,7 @@ struct x_display_info *dpyinfo = x_display_info_for_display (dpy); Lisp_Object frame, tail; int count; + int index = SPECPDL_INDEX (); error_msg = (char *) alloca (strlen (error_message) + 1); strcpy (error_msg, error_message); @@ -7633,6 +7648,44 @@ the original message here. */ count = x_catch_errors (dpy); + /* Inhibit redisplay while frames are being deleted. */ + specbind (Qinhibit_redisplay, Qt); + + if (dpyinfo) + { + /* Protect display from being closed when we delete the last + frame on it. */ + dpyinfo->reference_count++; + dpyinfo->device->reference_count++; + } + + /* First delete frames whose mini-buffers are on frames + that are on the dead display. */ + FOR_EACH_FRAME (tail, frame) + { + Lisp_Object minibuf_frame; + minibuf_frame + = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame)))); + if (FRAME_X_P (XFRAME (frame)) + && FRAME_X_P (XFRAME (minibuf_frame)) + && ! EQ (frame, minibuf_frame) + && FRAME_X_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo) + Fdelete_frame (frame, Qt); + } + + /* Now delete all remaining frames on the dead display. + We are now sure none of these is used as the mini-buffer + for another frame that we need to delete. */ + FOR_EACH_FRAME (tail, frame) + if (FRAME_X_P (XFRAME (frame)) + && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) + { + /* Set this to t so that Fdelete_frame won't get confused + trying to find a replacement. */ + FRAME_KBOARD (XFRAME (frame))->Vdefault_minibuffer_frame = Qt; + Fdelete_frame (frame, Qt); + } + /* We have to close the display to inform Xt that it doesn't exist anymore. If we don't, Xt will continue to wait for events from the display. As a consequence, a sequence of @@ -7665,43 +7718,23 @@ xg_display_close (dpyinfo->display); #endif - /* Indicate that this display is dead. */ if (dpyinfo) - dpyinfo->display = 0; - - /* First delete frames whose mini-buffers are on frames - that are on the dead display. */ - FOR_EACH_FRAME (tail, frame) - { - Lisp_Object minibuf_frame; - minibuf_frame - = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame)))); - if (FRAME_X_P (XFRAME (frame)) - && FRAME_X_P (XFRAME (minibuf_frame)) - && ! EQ (frame, minibuf_frame) - && FRAME_X_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo) - Fdelete_frame (frame, Qt); - } - - /* Now delete all remaining frames on the dead display. - We are now sure none of these is used as the mini-buffer - for another frame that we need to delete. */ - FOR_EACH_FRAME (tail, frame) - if (FRAME_X_P (XFRAME (frame)) - && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) - { - /* Set this to t so that Fdelete_frame won't get confused - trying to find a replacement. */ - FRAME_KBOARD (XFRAME (frame))->Vdefault_minibuffer_frame = Qt; - Fdelete_frame (frame, Qt); - } - - if (dpyinfo) - x_delete_display (dpyinfo); + { + /* Indicate that this display is dead. */ + dpyinfo->display = 0; + + dpyinfo->reference_count--; + dpyinfo->device->reference_count--; + if (dpyinfo->reference_count != 0) + /* We have just closed all frames on this display. */ + abort (); + + x_delete_display (dpyinfo); + } x_uncatch_errors (dpy, count); - if (x_display_list == 0) + if (device_list == 0) { fprintf (stderr, "%s\n", error_msg); shut_down_emacs (0, 0, Qnil); @@ -7715,6 +7748,7 @@ sigunblock (sigmask (SIGALRM)); TOTALLY_UNBLOCK_INPUT; + unbind_to (index, Qnil); clear_waiting_for_input (); error ("%s", error_msg); } @@ -7919,7 +7953,7 @@ FOR_EACH_FRAME (tail, frame) { struct frame *f = XFRAME (frame); - if (FRAME_X_DISPLAY_INFO (f) == dpyinfo) + if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo) { FRAME_XIC (f) = NULL; xic_free_xfontset (f); @@ -8018,7 +8052,8 @@ { struct frame *f = XFRAME (frame); - if (FRAME_X_DISPLAY_INFO (f) == xim_inst->dpyinfo) + if (FRAME_X_P (f) + && FRAME_X_DISPLAY_INFO (f) == xim_inst->dpyinfo) if (FRAME_XIC (f) == NULL) { create_frame_xic (f); @@ -10086,6 +10121,7 @@ { int connection; Display *dpy; + struct device *device; struct x_display_info *dpyinfo; XrmDatabase xrdb; @@ -10105,14 +10141,26 @@ char **argv2 = argv; GdkAtom atom; +#ifndef HAVE_GTK_MULTIDISPLAY + if (!EQ (Vinitial_window_system, intern ("x"))) + error ("Sorry, you cannot connect to X servers with the GTK toolkit"); +#endif + if (x_initialized++ > 1) { +#ifdef HAVE_GTK_MULTIDISPLAY /* Opening another display. If xg_display_open returns less than zero, we are probably on GTK 2.0, which can only handle one display. GTK 2.2 or later can handle more than one. */ if (xg_display_open (SDATA (display_name), &dpy) < 0) error ("Sorry, this version of GTK can only handle one display"); - } +#else + /* XXX Unfortunately, multiple display support is severely broken + in recent GTK versions, so HAVE_GTK_MULTIDISPLAY is + unconditionally disabled in configure.in. */ + error ("Sorry, multiple display support is broken in current GTK versions"); +#endif + } else { for (argc = 0; argc < NUM_ARGV; ++argc) @@ -10220,6 +10268,8 @@ dpyinfo = (struct x_display_info *) xmalloc (sizeof (struct x_display_info)); bzero (dpyinfo, sizeof *dpyinfo); + device = x_create_device (dpyinfo); + #ifdef MULTI_KBOARD { struct x_display_info *share; @@ -10231,30 +10281,30 @@ SDATA (display_name))) break; if (share) - dpyinfo->kboard = share->kboard; + device->kboard = share->device->kboard; else { - dpyinfo->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); - init_kboard (dpyinfo->kboard); + device->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); + init_kboard (device->kboard); if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) { char *vendor = ServerVendor (dpy); UNBLOCK_INPUT; - dpyinfo->kboard->Vsystem_key_alist + device->kboard->Vsystem_key_alist = call1 (Qvendor_specific_keysyms, build_string (vendor ? vendor : "")); BLOCK_INPUT; } - dpyinfo->kboard->next_kboard = all_kboards; - all_kboards = dpyinfo->kboard; + device->kboard->next_kboard = all_kboards; + all_kboards = device->kboard; /* Don't let the initial kboard remain current longer than necessary. That would cause problems if a file loaded on startup tries to prompt in the mini-buffer. */ if (current_kboard == initial_kboard) - current_kboard = dpyinfo->kboard; + current_kboard = device->kboard; } - dpyinfo->kboard->reference_count++; + device->kboard->reference_count++; } #endif @@ -10269,6 +10319,11 @@ dpyinfo->display = dpy; + /* Set the name of the device. */ + device->name = (char *) xmalloc (SBYTES (display_name) + 1); + strncpy (device->name, SDATA (display_name), SBYTES (display_name)); + device->name[SBYTES (display_name)] = 0; + #if 0 XSetAfterFunction (x_current_display, x_trace_wire); #endif /* ! 0 */ @@ -10556,8 +10611,10 @@ } #ifdef HAVE_X_SM - /* Only do this for the first display. */ - if (x_initialized == 1) + /* Only do this for the very first display in the Emacs session. + Ignore X session management when Emacs was first started on a + tty. */ + if (device->id == 1) x_session_initialize (dpyinfo); #endif @@ -10574,6 +10631,19 @@ struct x_display_info *dpyinfo; { int i; + struct device *d; + + /* Delete the generic struct device for this X display. */ + for (d = device_list; d; d = d->next_device) + if (d->type == output_x_window && d->display_info.x == dpyinfo) + { + /* Close X session management when we close its display. */ + if (d->id == 1 && x_session_have_connection ()) + x_session_close(); + + delete_device (d); + break; + } delete_keyboard_wait_descriptor (dpyinfo->connection); @@ -10617,10 +10687,6 @@ XrmDestroyDatabase (dpyinfo->xrdb); #endif #endif -#ifdef MULTI_KBOARD - if (--dpyinfo->kboard->reference_count == 0) - delete_kboard (dpyinfo->kboard); -#endif #ifdef HAVE_X_I18N if (dpyinfo->xim) xim_close_dpy (dpyinfo); @@ -10635,10 +10701,11 @@ xfree (dpyinfo->font_table[i].name); } - if (dpyinfo->font_table->font_encoder) + if (dpyinfo->font_table && dpyinfo->font_table->font_encoder) xfree (dpyinfo->font_table->font_encoder); - xfree (dpyinfo->font_table); + if (dpyinfo->font_table) + xfree (dpyinfo->font_table); xfree (dpyinfo->x_id_name); xfree (dpyinfo->color_cells); xfree (dpyinfo); @@ -10672,70 +10739,123 @@ extern frame_parm_handler x_frame_parm_handlers[]; static struct redisplay_interface x_redisplay_interface = -{ - x_frame_parm_handlers, - x_produce_glyphs, - x_write_glyphs, - x_insert_glyphs, - x_clear_end_of_line, - x_scroll_run, - x_after_update_window_line, - x_update_window_begin, - x_update_window_end, - x_cursor_to, - x_flush, + { + x_frame_parm_handlers, + x_produce_glyphs, + x_write_glyphs, + x_insert_glyphs, + x_clear_end_of_line, + x_scroll_run, + x_after_update_window_line, + x_update_window_begin, + x_update_window_end, + x_cursor_to, + x_flush, #ifdef XFlush - x_flush, + x_flush, +#else + 0, /* flush_display_optional */ +#endif + x_clear_window_mouse_face, + x_get_glyph_overhangs, + x_fix_overlapping_area, + x_draw_fringe_bitmap, + 0, /* define_fringe_bitmap */ + 0, /* destroy_fringe_bitmap */ + x_per_char_metric, + x_encode_char, + x_compute_glyph_string_overhangs, + x_draw_glyph_string, + x_define_frame_cursor, + x_clear_frame_area, + x_draw_window_cursor, + x_draw_vertical_window_border, + x_shift_glyphs_for_insert + }; + + +/* This function is called when the last frame on a display is deleted. */ +void +x_delete_device (struct device *device) +{ + struct x_display_info *dpyinfo = device->display_info.x; + int i; + + BLOCK_INPUT; + /* Free the fonts in the font table. */ + for (i = 0; i < dpyinfo->n_fonts; i++) + if (dpyinfo->font_table[i].name) + { + XFreeFont (dpyinfo->display, dpyinfo->font_table[i].font); + } + + x_destroy_all_bitmaps (dpyinfo); + XSetCloseDownMode (dpyinfo->display, DestroyAll); + +#ifdef USE_X_TOOLKIT + XtCloseDisplay (dpyinfo->display); #else - 0, /* flush_display_optional */ -#endif - x_clear_window_mouse_face, - x_get_glyph_overhangs, - x_fix_overlapping_area, - x_draw_fringe_bitmap, - 0, /* define_fringe_bitmap */ - 0, /* destroy_fringe_bitmap */ - x_per_char_metric, - x_encode_char, - x_compute_glyph_string_overhangs, - x_draw_glyph_string, - x_define_frame_cursor, - x_clear_frame_area, - x_draw_window_cursor, - x_draw_vertical_window_border, - x_shift_glyphs_for_insert -}; +#ifdef USE_GTK + xg_display_close (dpyinfo->display); +#else + XCloseDisplay (dpyinfo->display); +#endif +#endif + + x_delete_display (dpyinfo); + UNBLOCK_INPUT; +} + + +struct device * +x_create_device (struct x_display_info *dpyinfo) +{ + struct device *device; + + device = create_device (); + + device->type = output_x_window; + device->display_info.x = dpyinfo; + dpyinfo->device = device; + + /* kboard is initialized in x_term_init. */ + + device->clear_frame_hook = x_clear_frame; + device->ins_del_lines_hook = x_ins_del_lines; + device->delete_glyphs_hook = x_delete_glyphs; + device->ring_bell_hook = XTring_bell; + device->reset_terminal_modes_hook = XTreset_terminal_modes; + device->set_terminal_modes_hook = XTset_terminal_modes; + device->update_begin_hook = x_update_begin; + device->update_end_hook = x_update_end; + device->set_terminal_window_hook = XTset_terminal_window; + device->read_socket_hook = XTread_socket; + device->frame_up_to_date_hook = XTframe_up_to_date; + device->mouse_position_hook = XTmouse_position; + device->frame_rehighlight_hook = XTframe_rehighlight; + device->frame_raise_lower_hook = XTframe_raise_lower; + device->set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar; + device->condemn_scroll_bars_hook = XTcondemn_scroll_bars; + device->redeem_scroll_bar_hook = XTredeem_scroll_bar; + device->judge_scroll_bars_hook = XTjudge_scroll_bars; + + device->delete_frame_hook = x_destroy_window; + device->delete_device_hook = x_delete_device; + + device->rif = &x_redisplay_interface; + device->scroll_region_ok = 1; /* We'll scroll partial frames. */ + device->char_ins_del_ok = 1; + device->line_ins_del_ok = 1; /* We'll just blt 'em. */ + device->fast_clear_end_of_line = 1; /* X does this well. */ + device->memory_below_frame = 0; /* We don't remember what scrolls + off the bottom. */ + + return device; +} void x_initialize () { - rif = &x_redisplay_interface; - - clear_frame_hook = x_clear_frame; - ins_del_lines_hook = x_ins_del_lines; - delete_glyphs_hook = x_delete_glyphs; - ring_bell_hook = XTring_bell; - reset_terminal_modes_hook = XTreset_terminal_modes; - set_terminal_modes_hook = XTset_terminal_modes; - update_begin_hook = x_update_begin; - update_end_hook = x_update_end; - set_terminal_window_hook = XTset_terminal_window; - read_socket_hook = XTread_socket; - frame_up_to_date_hook = XTframe_up_to_date; - mouse_position_hook = XTmouse_position; - frame_rehighlight_hook = XTframe_rehighlight; - frame_raise_lower_hook = XTframe_raise_lower; - set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar; - condemn_scroll_bars_hook = XTcondemn_scroll_bars; - redeem_scroll_bar_hook = XTredeem_scroll_bar; - judge_scroll_bars_hook = XTjudge_scroll_bars; - - scroll_region_ok = 1; /* we'll scroll partial frames */ - char_ins_del_ok = 1; - line_ins_del_ok = 1; /* we'll just blt 'em */ - fast_clear_end_of_line = 1; /* X does this well */ - memory_below_frame = 0; /* we don't remember what scrolls - off the bottom */ baud_rate = 19200; x_noop_count = 0; @@ -10790,9 +10910,11 @@ XSetIOErrorHandler (x_io_error_quitter); /* Disable Window Change signals; they are handled by X events. */ +#if 0 /* Don't. We may want to open tty frames later. */ #ifdef SIGWINCH signal (SIGWINCH, SIG_DFL); #endif /* SIGWINCH */ +#endif signal (SIGPIPE, x_connection_signal); }
--- a/src/xterm.h Sat Dec 17 21:41:34 2005 +0000 +++ b/src/xterm.h Mon Dec 19 19:57:22 2005 +0000 @@ -327,9 +327,6 @@ /* Atom used in toolkit scroll bar client messages. */ Atom Xatom_Scrollbar; -#ifdef MULTI_KBOARD - struct kboard *kboard; -#endif int cut_buffers_initialized; /* Whether we're sure they all exist */ /* The frame (if any) which has the X window that has keyboard focus. @@ -389,6 +386,9 @@ X_WMTYPE_A, X_WMTYPE_B } wm_type; + + /* The generic display parameters corresponding to this X display. */ + struct device *device; }; #ifdef HAVE_X_I18N @@ -1089,6 +1089,7 @@ extern void x_session_initialize P_ ((struct x_display_info *dpyinfo)); extern int x_session_check_input P_ ((struct input_event *bufp)); extern int x_session_have_connection P_ ((void)); +extern void x_session_close P_ ((void)); #endif #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0