From 3c95da0e4b218cc3d4d2272230e2c407bd8460d9 Mon Sep 17 00:00:00 2001 From: kazuhiko Date: Tue, 12 Sep 2000 01:18:20 +0000 Subject: [PATCH] import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35 --- info/internals.info-7 | 4 +- info/lispref.info-11 | 2 +- info/lispref.info-20 | 4 +- info/lispref.info-36 | 2 +- info/lispref.info-42 | 29 ++++++------ info/lispref.info-44 | 2 +- info/new-users-guide.info-1 | 2 +- info/new-users-guide.info-2 | 6 +-- info/standards.info-3 | 2 +- info/xemacs-faq.info-5 | 74 +++++++++++++++++++++++------ info/xemacs.info-10 | 2 +- info/xemacs.info-12 | 4 +- info/xemacs.info-13 | 12 +++-- info/xemacs.info-14 | 12 ++--- info/xemacs.info-15 | 45 ++++-------------- info/xemacs.info-16 | 86 ++++++++++++++++------------------ info/xemacs.info-17 | 109 ++++++++++++++++++++++++++++--------------- info/xemacs.info-18 | 24 +++++----- info/xemacs.info-19 | 2 +- info/xemacs.info-20 | 2 +- info/xemacs.info-22 | 4 +- info/xemacs.info-6 | 2 +- info/xemacs.info-8 | 8 ++-- 23 files changed, 247 insertions(+), 192 deletions(-) diff --git a/info/internals.info-7 b/info/internals.info-7 index 90d5872..8f3633d 100644 --- a/info/internals.info-7 +++ b/info/internals.info-7 @@ -242,7 +242,7 @@ elsewhere. buffer positions in them as integers, and every time text is inserted or deleted, these positions must be updated. In order to minimize the amount of shuffling that needs to be done, the positions in markers and -extents (there's one per marker, two per extent) and stored in Meminds. +extents (there's one per marker, two per extent) are stored in Meminds. This means that they only need to be moved when the text is physically moved in memory; since the gap structure tries to minimize this, it also minimizes the number of marker and extent indices that need to be @@ -733,7 +733,7 @@ CCL other encoded/decoded data has been written out. This is not used for charset CCL programs. - REGISTER: 0..7 -- refered by RRR or rrr + REGISTER: 0..7 -- referred by RRR or rrr OPERATOR BIT FIELD (27-bit): XXXXXXXXXXXXXXX RRR TTTTT TTTTT (5-bit): operator type diff --git a/info/lispref.info-11 b/info/lispref.info-11 index 318c530..1780b0a 100644 --- a/info/lispref.info-11 +++ b/info/lispref.info-11 @@ -1201,7 +1201,7 @@ these facilities call the `load' function to do the work. function to search through `load-path'.) It searches for FILENAME through PATH-LIST, expanded by one of the optional SUFFIXES (string of suffixes separated by `:'s), checking for access MODE - (0|1|2|4 = exists|executable|writeable|readable), default readable. + (0|1|2|4 = exists|executable|writable|readable), default readable. `locate-file' keeps hash tables of the directories it searches through, in order to speed things up. It tries valiantly to not diff --git a/info/lispref.info-20 b/info/lispref.info-20 index 240c4a3..4f618d5 100644 --- a/info/lispref.info-20 +++ b/info/lispref.info-20 @@ -792,7 +792,7 @@ Creating Gutter Valid gutter-size instantiators are either integers or the special symbol `autodetect'. If a gutter-size is set to `autodetect' them - the size of the gutter will be adjusted to just accomodate the + the size of the gutter will be adjusted to just accommodate the gutters contents. `autodetect' only works for top and bottom gutters. @@ -811,7 +811,7 @@ Creating Gutter Valid gutter-visible instantiators are t, nil or a list of symbols. If a gutter-visible instantiator is set to a list of - symbols, and the correspondong gutter specification is a + symbols, and the corresponding gutter specification is a property-list strings, then elements of the gutter specification will only be visible if the corresponding symbol occurs in the gutter-visible instantiator. diff --git a/info/lispref.info-36 b/info/lispref.info-36 index c9d855f..e7c1c13 100644 --- a/info/lispref.info-36 +++ b/info/lispref.info-36 @@ -429,7 +429,7 @@ Creating Glyphs pointer used over the modeline, etc. Do an apropos over `*-pointer-glyph' to find all of them. (Note also that you can temporarily set the mouse pointer to some specific shape - by using `set-frame-pointer', which takes an image instace, + by using `set-frame-pointer', which takes an image instance, as obtained from calling `glyph-image-instance' on a glyph of type `pointer' - either one of the above-mentioned variables or one you created yourself. (See below for what it means to diff --git a/info/lispref.info-42 b/info/lispref.info-42 index d2188b4..8185761 100644 --- a/info/lispref.info-42 +++ b/info/lispref.info-42 @@ -478,20 +478,23 @@ File: lispref.info, Node: Building XEmacs with PostgreSQL support, Next: XEmac Building XEmacs with PostgreSQL support ======================================= - XEmacs PostgreSQL support requires linking to the PostgreSQL libpq.so + XEmacs PostgreSQL support requires linking to the PostgreSQL libpq library. Describing how to build and install PostgreSQL is beyond the -scope of this document, see the PostgreSQL manual for details. +scope of this document. See the PostgreSQL manual for details. If you have installed XEmacs from one of the binary kits on (), or are using an XEmacs binary from a CD ROM, -you should have XEmacs PostgreSQL support by default. If you are -building XEmacs from source on a Linux system with PostgreSQL installed -into the default location, it should be autodetected when you run -configure. If you have installed PostgreSQL into its non-Linux default -location, `/usr/local/pgsql', you must specify -`--site-prefixes=/usr/local/pgsql' when you run configure. If you -installed PostgreSQL into another location, use that instead of -`/usr/local/pgsql' when specifying `--site-prefixes'. +you may have XEmacs PostgreSQL support by default. `M-x +describe-installation' will tell you if you do. + + If you are building XEmacs from source, you need to install +PostgreSQL first. On some systems, PostgreSQL will come pre-installed +in /usr. In this case, it should be autodetected when you run +configure. If PostgreSQL is installed into its default location, +`/usr/local/pgsql', you must specify `--site-prefixes=/usr/local/pgsql' +when you run configure. If PostgreSQL is installed into another +location, use that instead of `/usr/local/pgsql' when specifying +`--site-prefixes'. As of XEmacs 21.2, PostgreSQL versions 6.5.3 and 7.0 are supported. XEmacs Lisp support for V7.0 is somewhat more extensive than support for @@ -503,7 +506,7 @@ File: lispref.info, Node: XEmacs PostgreSQL libpq API, Next: XEmacs PostgreSQL XEmacs PostgreSQL libpq API =========================== - XEmacs PostgreSQL API is intended to be a policy-free, low-level + The XEmacs PostgreSQL API is intended to be a policy-free, low-level binding to libpq. The intent is to provide all the basic functionality and then let high level Lisp code decide its own policies. @@ -1184,8 +1187,8 @@ complete calling sequences. Compatibility note: this function is only available with libpq-7.0. - Function: PQsetenvPoll conn - Check an asynchronous enviroment variables transfer for completion. - CONN A database connection object. + Check an asynchronous environment variables transfer for + completion. CONN A database connection object. Compatibility note: this function is only available with libpq-7.0. diff --git a/info/lispref.info-44 b/info/lispref.info-44 index d539962..b3a5f6a 100644 --- a/info/lispref.info-44 +++ b/info/lispref.info-44 @@ -246,7 +246,7 @@ the registers G0-G3 by use of an "escape sequence" of the form: where I is an intermediate character or characters in the range 0x20 - 0x3F, and F, from the range 0x30-0x7Fm is the final character identifying this charset. (Final characters in the range 0x30-0x3F are -reserved for private use and will never have a publically registered +reserved for private use and will never have a publicly registered meaning.) Then that register is "invoked" to either GL or GR, either diff --git a/info/new-users-guide.info-1 b/info/new-users-guide.info-1 index 399b63e..a3e72a5 100644 --- a/info/new-users-guide.info-1 +++ b/info/new-users-guide.info-1 @@ -900,7 +900,7 @@ given in parenthesis. You can also invoke these commands by typing `M-x Move the cursor forward one word (`forward-word'). `M-b' - Move the cursor backword one word (`backward-word'). + Move the cursor backward one word (`backward-word'). `M-<' Move the cursor to the top of the buffer (`beginning-of-buffer'). diff --git a/info/new-users-guide.info-2 b/info/new-users-guide.info-2 index b3f386b..858df8e 100644 --- a/info/new-users-guide.info-2 +++ b/info/new-users-guide.info-2 @@ -368,7 +368,7 @@ auto-save-mode line-number-mode After you enable this mode, the line number at which your cursor is - present will be displayed continously in the mode line. + present will be displayed continuously in the mode line. blink-paren To enable this command, just type @@ -1063,8 +1063,8 @@ many buffers: `M-x insert-buffer' Insert contents of specified buffer into current buffer at point. - This command will prompt you for a buffername which you want to be - copied into the current buffer at the location of the cursor. + This command will prompt you for a buffer name which you want to + be copied into the current buffer at the location of the cursor. `M-x append-to-file' This command will prompt you for a filename and append the region diff --git a/info/standards.info-3 b/info/standards.info-3 index bac2c56..5a6af11 100644 --- a/info/standards.info-3 +++ b/info/standards.info-3 @@ -377,7 +377,7 @@ directories: `srcdir' The directory for the sources being compiled. The value of this variable is normally inserted by the `configure' shell script. - (If you are using Autconf, use `srcdir = @srcdir@'.) + (If you are using Autoconf, use `srcdir = @srcdir@'.) For example: diff --git a/info/xemacs-faq.info-5 b/info/xemacs-faq.info-5 index 9007a77..86f5ec9 100644 --- a/info/xemacs-faq.info-5 +++ b/info/xemacs-faq.info-5 @@ -877,8 +877,10 @@ File: xemacs-faq.info, Node: Q6.1.2, Next: Q6.1.3, Prev: Q6.1.1, Up: MS Wind Q6.1.2: What compiler do I need to compile XEmacs? -------------------------------------------------- - You need Visual C++ 4.2 or 5.0, with the exception of the Cygwin -port, which uses Gcc. + You need Visual C++ 4.2, 5.0, or 6.0, with the exception of the +Cygwin port, which uses Gcc. There is also a MINGW32 port of XEmacs +(using Gcc, but using native libraries rather than the Cygwin +libraries). #### More information about this should be provided.  File: xemacs-faq.info, Node: Q6.1.3, Next: Q6.1.4, Prev: Q6.1.2, Up: MS Windows @@ -911,8 +913,8 @@ Some problems to watch out for: * make sure HOME is set. This controls where you `.emacs' file comes from; - * CYGWIN32 needs to be set to tty for process support work. e.g. - CYGWIN32=tty; + * CYGWIN needs to be set to tty for process support work. e.g. + CYGWIN=tty; (use CYGWIN32=tty under b19 and older.) * picking up some other grep or other unix like tools can kill configure; @@ -935,14 +937,52 @@ Q6.1.6: What do I need for Cygwin? `http://sourceware.cygnus.com/cygwin/' - You will need version b19 or later. + You will need version b19 or later. The latest current version is +1.1.1. Other common versions you will see are b20.1. - You will also need the X libraries. There are libraries at -`http://dao.gsfc.nasa.gov/software/grads/win32/X11R6.3/', but these are -not b19 compatible. You can get b19 X11R6.3 binaries, as well as -pre-built ncurses and graphic libraries, from: + Another location, one of the mirror sites of the site just mentioned, +is usually a last faster: + + `ftp://ftp.freesoftware.com/pub/sourceware/cygwin/' + + You can obtain the latest version (currently 1.1.1) from the +`latest/' subdirectory of either of the above two just-mentioned URL's. + + *WARNING: The version of GCC supplied under `latest/', as of June +6th, 2000, does not appear to work. It generates loads of spurious +preprocessor warnings and errors, which makes it impossible to compile +XEmacs with it.* + + You will also need the X libraries. You can get them on the XEmacs +FTP site at + + `ftp://ftp.xemacs.org/pub/xemacs/aux/cygwin/' + + You will find b19 and b20 versions of the X libraries, plus b19 and +b20 versions of stuff that should go into `/usr/local/', donated by +Andy Piper. This includes pre-built versions of various graphics +libraries, such as PNG, JPEG, TIFF, and XPM. (Remember, GIF support is +built-in to XEmacs.) - `ftp://ftp.parallax.co.uk/pub/andyp/'. + (X libraries for v1 and beyond of Cygwin can be found on the Cygwin +site itself - look in the `xfree/' subdirectory.) + + _NOTE:_ There are two versions of the XPM library provided in Andy's +packets. Once is for building with X support, and the other for +building without. The X version should work if you're building with +both X and Windows support. The two files are called `libXpm-X.a' and +`libXpm-noX.a' respectively, and you must symlink the appropriate one +to `libXpm.a'. *CAREFUL:* By default, the non-X version is symlinked +in. If you then configure XEmacs with X, you won't run into problems +until you start compiling `events.c', at which point you'll get strange +and decidedly non-obvious errors. + + Please see `http://www.xemacs.freeserve.co.uk/' (Andy Piper's home +page) for more information. + + BTW There are also libraries at +`http://dao.gsfc.nasa.gov/software/grads/win32/X11R6.3/', but these are +not b19 compatible, and may in fact be native-compiled.  File: xemacs-faq.info, Node: Q6.2.1, Next: Q6.2.2, Prev: Q6.1.6, Up: MS Windows @@ -1114,12 +1154,18 @@ memory addresses that can conflict with those needed by the dumped XEmacs executable. In this instance XEmacs will fail to start without any explanation. Note that this is extremely machine specific. - Work is being done on fixes for 21.1.* that will make more -intelligent guesses about which memory addresses will be free and so -this should cure the problem for most people. + 21.1.10 includes a fix for this that makes more intelligent guesses +about which memory addresses will be free, and this should cure the +problem for most people. Unfortunately, no binary is yet available for +this version. Check back periodically at + + `ftp://ftp.xemacs.org/pub/xemacs/binaries/'. 21.2 implements "portable dumping" which will eliminate the problem -altogether. +altogether. You might have better luck with the 21.2 beta binary, +available at + + `ftp://ftp.xemacs.org/pub/xemacs/beta/binaries/'.  File: xemacs-faq.info, Node: Current Events, Prev: MS Windows, Up: Top diff --git a/info/xemacs.info-10 b/info/xemacs.info-10 index 8ee5310..40b8bfb 100644 --- a/info/xemacs.info-10 +++ b/info/xemacs.info-10 @@ -838,7 +838,7 @@ appear on the screen. There are editing commands to operate on them. * Grinding:: Adjusting indentation to show the nesting. * Matching:: Insertion of a close-delimiter flashes matching open. -* Comments:: Inserting, illing and aligning comments. +* Comments:: Inserting, filling and aligning comments. * Balanced Editing:: Inserting two matching parentheses at once, etc. * Lisp Completion:: Completion on symbol names in Lisp code. * Documentation:: Getting documentation of functions you plan to call. diff --git a/info/xemacs.info-12 b/info/xemacs.info-12 index 7fb18f7..752f67d 100644 --- a/info/xemacs.info-12 +++ b/info/xemacs.info-12 @@ -794,8 +794,8 @@ examine the buffer that was being edited at the time of the error, and you can switch buffers, visit files, and perform any other editing operations. However, the debugger is a recursive editing level (*note Recursive Edit::); it is a good idea to return to the backtrace buffer -and explictly exit the debugger when you don't want to use it any more. -Exiting the debugger kills the backtrace buffer. +and explicitly exit the debugger when you don't want to use it any +more. Exiting the debugger kills the backtrace buffer. The contents of the backtrace buffer show you the functions that are executing and the arguments that were given to them. It also allows you diff --git a/info/xemacs.info-13 b/info/xemacs.info-13 index 2430a9e..7e83eef 100644 --- a/info/xemacs.info-13 +++ b/info/xemacs.info-13 @@ -96,11 +96,13 @@ XEmacs and Installing Packages have some or all of the packages on a local disk, such as a CDROM. If you want to install from a local disk, you must first tell XEmacs where to find the package binaries. This is done by adding a line like the -following to your `.emacs' file: +following to your init file: (setq package-get-remote (cons (list nil "/my/path/to/package/binaries") package-get-remote)) + *Note Init File::. + Here, you'd change `/my/path/to/package/binaries' to be the path to your local package binaries. Next, restart XEmacs, and you're ready to go (advanced users can just re-evaluate the sexp). @@ -580,9 +582,9 @@ specified file. The text stored in the file looks like the output of and reads the specified file, defining abbrevs according to its contents. `M-x quietly-read-abbrev-file' is the same but does not display a message in the echo area; it is actually useful primarily in -the `.emacs' file. If you give an empty argument to either of these -functions, the file name Emacs uses is the value of the variable -`abbrev-file-name', which is by default `"~/.abbrev_defs"'. +the init file. *Note Init File::. If you give an empty argument to +either of these functions, the file name Emacs uses is the value of the +variable `abbrev-file-name', which is by default `"~/.abbrev_defs"'. Emacs offers to save abbrevs automatically if you have changed any of them, whenever it offers to save all files (for `C-x s' or `C-x C-c'). @@ -1062,7 +1064,7 @@ use the command `M-x merge-mail-aliases'. The `rebuild-mail-aliases' command is similar, but deletes existing aliases first. If you want multiple addresses separated by a string other than `,' -(a comma), then set the variable `mail-alias-seperator-string' to it. +(a comma), then set the variable `mail-alias-separator-string' to it. This has to be a comma bracketed by whitespace if you want any kind of reasonable behavior. diff --git a/info/xemacs.info-14 b/info/xemacs.info-14 index 447d49b..d071965 100644 --- a/info/xemacs.info-14 +++ b/info/xemacs.info-14 @@ -519,8 +519,8 @@ for daylight savings time_. *Note Daylight Savings::, for how daylight savings time is determined. As a user, you might find it convenient to set the calendar location -variables for your usual physical location in your `.emacs' file. And -when you install Emacs on a machine, you can create a `default.el' file +variables for your usual physical location in your init file. And when +you install Emacs on a machine, you can create a `default.el' file which sets them properly for the typical location of most users of that machine. *Note Init File::. @@ -975,10 +975,10 @@ date, independently of the calendar display, and optionally for the next few days as well; the variable `number-of-diary-entries' specifies how many days to include (*note Customization::). - If you put `(diary)' in your `.emacs' file, this automatically -displays a window with the day's diary entries, when you enter Emacs. -The mode line of the displayed window shows the date and any holidays -that fall on that date. + If you put `(diary)' in your init file, this automatically displays +a window with the day's diary entries, when you enter Emacs. *Note +Init File::. The mode line of the displayed window shows the date and +any holidays that fall on that date. Many users like to receive notice of events in their diary as email. To send such mail to yourself, use the command `M-x diff --git a/info/xemacs.info-15 b/info/xemacs.info-15 index d9656f6..08b6d30 100644 --- a/info/xemacs.info-15 +++ b/info/xemacs.info-15 @@ -61,14 +61,14 @@ Customizing the Calendar If you set the variable `view-diary-entries-initially' to `t', calling up the calendar automatically displays the diary entries for the current date as well. The diary dates appear only if the current -date is visible. If you add both of the following lines to your -`.emacs' file: +date is visible. If you add both of the following lines to your init +file: (setq view-diary-entries-initially t) (calendar) this displays both the calendar and diary windows whenever you start -Emacs. +Emacs. *Note Init File::. Similarly, if you set the variable `view-calendar-holidays-initially' to `t', entering the calendar @@ -207,10 +207,12 @@ a string. For example, suppose you want to add Bastille Day, celebrated in France on July 14. You can do this by adding the following line to -your `.emacs' file: +your init file: (setq other-holidays '((holiday-fixed 7 14 "Bastille Day"))) + *Note Init File::. + The holiday form `(holiday-fixed 7 14 "Bastille Day")' specifies the fourteenth day of the seventh month (July). @@ -603,10 +605,12 @@ such days to be shown in the fancy diary buffer, set the variable If you use the fancy diary display, you can use the normal hook `list-diary-entries-hook' to sort each day's diary entries by their -time of day. Add this line to your `.emacs' file: +time of day. Add this line to your init file: (add-hook 'list-diary-entries-hook 'sort-diary-entries t) + *Note Init File::. + For each day, this sorts diary entries that begin with a recognizable time of day according to their times. Diary entries without times come first within each day. @@ -978,7 +982,7 @@ variable when you start XEmacs. If the file name does not specify a directory, the directories in the list `exec-path' are searched; this list is initialized based on the `PATH' environment variable when you start XEmacs. You can override either or both of these default -initializations in your `.emacs' file. +initializations in your init file. *Note Init File::. When you use `M-!' and `M-|', XEmacs has to wait until the shell command completes. You can quit with `C-g'; that terminates the shell @@ -1175,32 +1179,3 @@ examining your input. Instead, if you use a programmable shell, you can have it tell Term what the current directory is. This is done automatically by bash for version 1.15 and later. - -File: xemacs.info, Node: Term Mode, Next: Paging in Term, Prev: Terminal emulator, Up: Shell - -Term Mode ---------- - - Term uses Term mode, which has two input modes: In line mode, Term -basically acts like Shell mode. *Note Shell Mode::. In Char mode, -each character is sent directly to the inferior subshell, except for -the Term escape character, normally `C-c'. - - To switch between line and char mode, use these commands: - findex term-char-mode - -`C-c C-k' - Switch to line mode. Do nothing if already in line mode. - -`C-c C-j' - Switch to char mode. Do nothing if already in char mode. - - The following commands are only available in Char mode: -`C-c C-c' - Send a literal to the sub-shell. - -`C-c C-x' - A prefix command to conveniently access the global commands. - For example, `C-c C-x o' invokes the global binding of `C-x o', - which is normally `other-window'. - diff --git a/info/xemacs.info-16 b/info/xemacs.info-16 index 65c07fe..8058de2 100644 --- a/info/xemacs.info-16 +++ b/info/xemacs.info-16 @@ -30,6 +30,35 @@ versions, except that the sections entitled "The GNU Manifesto", translation approved by the author instead of in the original English.  +File: xemacs.info, Node: Term Mode, Next: Paging in Term, Prev: Terminal emulator, Up: Shell + +Term Mode +--------- + + Term uses Term mode, which has two input modes: In line mode, Term +basically acts like Shell mode. *Note Shell Mode::. In Char mode, +each character is sent directly to the inferior subshell, except for +the Term escape character, normally `C-c'. + + To switch between line and char mode, use these commands: + findex term-char-mode + +`C-c C-k' + Switch to line mode. Do nothing if already in line mode. + +`C-c C-j' + Switch to char mode. Do nothing if already in char mode. + + The following commands are only available in Char mode: +`C-c C-c' + Send a literal to the sub-shell. + +`C-c C-x' + A prefix command to conveniently access the global commands. + For example, `C-c C-x o' invokes the global binding of `C-x o', + which is normally `other-window'. + + File: xemacs.info, Node: Paging in Term, Prev: Term Mode, Up: Shell Paging in the terminal emulator @@ -303,7 +332,7 @@ Viper (a vi emulator) (viper-mode) - in your `.emacs' file. + in your init file. *Note Init File::. Viper comes with a separate manual that is provided standard with the XEmacs distribution. @@ -342,9 +371,8 @@ you do them in. They are completely lost when you kill the Emacs job, and have no effect on other Emacs jobs you may run at the same time or later. The only way an Emacs job can affect anything outside of it is by writing a file; in particular, the only way to make a customization -`permanent' is to put something in your `.emacs' file or other -appropriate file to do the customization in each session. *Note Init -File::. +`permanent' is to put something in your init file or other appropriate +file to do the customization in each session. *Note Init File::. * Menu: @@ -359,8 +387,7 @@ File::. By changing them, you can "redefine keys". * Syntax:: The syntax table controls how words and expressions are parsed. -* Init File:: How to write common customizations in the `.emacs' - file. +* Init File:: How to write common customizations in the init file. * Audible Bell:: Changing how Emacs sounds the bell. * Faces:: Changing the fonts and colors of a region of text. * Frame Components:: Controlling the presence and positions of the @@ -682,9 +709,10 @@ insert a newline in an editable field, use `C-o' or `C-q C-j', Setting the option changes its value in the current Emacs session; "saving" the value changes it for future sessions as well. This works -by writing code into your `~/.emacs' file so as to set the option -variable again each time you start Emacs. To save the option, invoke -`[State]' and select the `Save for Future Sessions' operation. +by writing code into your init file so as to set the option variable +again each time you start Emacs. *Note Init File::. To save the +option, invoke `[State]' and select the `Save for Future Sessions' +operation. You can also restore the option to its standard value by invoking `[State]' and selecting the `Reset' operation. There are actually @@ -1013,9 +1041,9 @@ long file that contains no page markers and has no local variables list. list. That is inappropriate. Whether you use Auto Fill mode or not is a matter of personal taste, not a matter of the contents of particular files. If you want to use Auto Fill, set up major mode hooks with your -`.emacs' file to turn it on (when appropriate) for you alone (*note -Init File::). Don't try to use a local variable list that would impose -your taste on everyone working with the file. +file file to turn it on (when appropriate) for you alone (*note Init +File::). Don't try to use a local variable list that would impose your +taste on everyone working with the file. XEmacs allows you to specify local variables in the first line of a file, in addition to specifying them in the `Local Variables' section @@ -1143,37 +1171,3 @@ equivalent to plain `C-x (' followed by retyping the whole definition so far. As a consequence it re-executes the macro as previously defined. - -File: xemacs.info, Node: Save Kbd Macro, Next: Kbd Macro Query, Prev: Basic Kbd Macro, Up: Keyboard Macros - -Naming and Saving Keyboard Macros ---------------------------------- - - To save a keyboard macro for longer than until you define the next -one, you must give it a name using `M-x name-last-kbd-macro'. This -reads a name as an argument using the minibuffer and defines that name -to execute the macro. The macro name is a Lisp symbol, and defining it -in this way makes it a valid command name for calling with `M-x' or for -binding a key to with `global-set-key' (*note Keymaps::). If you -specify a name that has a prior definition other than another keyboard -macro, Emacs prints an error message and nothing is changed. - - Once a macro has a command name, you can save its definition in a -file. You can then use it in another editing session. First visit the -file you want to save the definition in. Then use the command: - - M-x insert-kbd-macro MACRONAME - -This inserts some Lisp code that, when executed later, will define the -same macro with the same definition it has now. You need not -understand Lisp code to do this, because `insert-kbd-macro' writes the -Lisp code for you. Then save the file. You can load the file with -`load-file' (*note Lisp Libraries::). If the file you save in is your -initialization file `~/.emacs' (*note Init File::), then the macro will -be defined each time you run Emacs. - - If you give `insert-kbd-macro' a prefix argument, it creates -additional Lisp code to record the keys (if any) that you have bound to -the keyboard macro, so that the macro is reassigned the same keys when -you load the file. - diff --git a/info/xemacs.info-17 b/info/xemacs.info-17 index f4c723b..8326642 100644 --- a/info/xemacs.info-17 +++ b/info/xemacs.info-17 @@ -30,6 +30,40 @@ versions, except that the sections entitled "The GNU Manifesto", translation approved by the author instead of in the original English.  +File: xemacs.info, Node: Save Kbd Macro, Next: Kbd Macro Query, Prev: Basic Kbd Macro, Up: Keyboard Macros + +Naming and Saving Keyboard Macros +--------------------------------- + + To save a keyboard macro for longer than until you define the next +one, you must give it a name using `M-x name-last-kbd-macro'. This +reads a name as an argument using the minibuffer and defines that name +to execute the macro. The macro name is a Lisp symbol, and defining it +in this way makes it a valid command name for calling with `M-x' or for +binding a key to with `global-set-key' (*note Keymaps::). If you +specify a name that has a prior definition other than another keyboard +macro, Emacs prints an error message and nothing is changed. + + Once a macro has a command name, you can save its definition in a +file. You can then use it in another editing session. First visit the +file you want to save the definition in. Then use the command: + + M-x insert-kbd-macro MACRONAME + +This inserts some Lisp code that, when executed later, will define the +same macro with the same definition it has now. You need not +understand Lisp code to do this, because `insert-kbd-macro' writes the +Lisp code for you. Then save the file. You can load the file with +`load-file' (*note Lisp Libraries::). If the file you save in is your +initialization file (*note Init File::), then the macro will be defined +each time you run Emacs. + + If you give `insert-kbd-macro' a prefix argument, it creates +additional Lisp code to record the keys (if any) that you have bound to +the keyboard macro, so that the macro is reassigned the same keys when +you load the file. + + File: xemacs.info, Node: Kbd Macro Query, Prev: Save Kbd Macro, Up: Keyboard Macros Executing Macros With Variations @@ -234,9 +268,9 @@ redefines `C-x 4 $' to run the (fictitious) command `spell-other-window'. The most general way to modify a keymap is the function -`define-key', used in Lisp code (such as your `.emacs' file). -`define-key' takes three arguments: the keymap, the key to modify in -it, and the new definition. *Note Init File::, for an example. +`define-key', used in Lisp code (such as your init file). `define-key' +takes three arguments: the keymap, the key to modify in it, and the new +definition. *Note Init File::, for an example. `substitute-key-definition' is used similarly; it takes three arguments, an old definition, a new definition, and a keymap, and redefines in that keymap all keys that were previously defined with the @@ -382,20 +416,22 @@ beginning users from executing it by accident and being confused. The direct mechanism for disabling a command is to have a non-`nil' `disabled' property on the Lisp symbol for the command. These -properties are normally set by the user's `.emacs' file with Lisp +properties are normally set by the user's init file with Lisp expressions such as: (put 'delete-region 'disabled t) + *Note Init File::. + If the value of the `disabled' property is a string, that string is included in the message printed when the command is used: (put 'delete-region 'disabled "Text deleted this way cannot be yanked back!\n") - You can disable a command either by editing the `.emacs' file -directly or with the command `M-x disable-command', which edits the -`.emacs' file for you. *Note Init File::. + You can disable a command either by editing the init file directly +or with the command `M-x disable-command', which edits the init file +for you. *Note Init File::. When you attempt to invoke a disabled command interactively in Emacs, a window is displayed containing the command's name, its documentation, @@ -403,7 +439,7 @@ and some instructions on what to do next; then Emacs asks for input saying whether to execute the command as requested, enable it and execute, or cancel it. If you decide to enable the command, you are asked whether to do this permanently or just for the current session. -Enabling permanently works by automatically editing your `.emacs' file. +Enabling permanently works by automatically editing your init file. You can use `M-x enable-command' at any time to enable any command permanently. @@ -596,19 +632,20 @@ some English to explain that string if necessary.  File: xemacs.info, Node: Init File, Next: Audible Bell, Prev: Syntax, Up: Customization -The Init File, .emacs -===================== +The Init File +============= - When you start Emacs, it normally loads the file `.emacs' in your -home directory. This file, if it exists, should contain Lisp code. It -is called your initialization file or "init file". Use the command -line switch `-q' to tell Emacs whether to load an init file (*note -Entering Emacs::). Use the command line switch `-user-init-file' -(*note Command Switches::) to tell Emacs to load a different file -instead of `~/.emacs'. + When you start Emacs, it normally loads either `.xemacs/init.el' or +the file `.emacs' (whichever comes first) in your home directory. This +file, if it exists, should contain Lisp code. It is called your +initialization file or "init file". Use the command line switch `-q' +to tell Emacs whether to load an init file (*note Entering Emacs::). +Use the command line switch `-user-init-file' (*note Command +Switches::) to tell Emacs to load a different file instead of +`~/.xemacs/init.el'/`~/.emacs'. - When the `.emacs' file is read, the variable `user-init-file' says -which init file was loaded. + When the init file is read, the variable `user-init-file' says which +init file was loaded. At some sites there is a "default init file", which is the library named `default.el', found via the standard search path for libraries. @@ -618,10 +655,8 @@ whenever you start Emacs. But your init file, if any, is loaded first; if it sets `inhibit-default-init' non-`nil', then `default' is not loaded. - If you have a large amount of code in your `.emacs' file, you should -move it into another file named `SOMETHING.el', byte-compile it (*note -Lisp Libraries::), and load that file from your `.emacs' file using -`load'. + If you have a large amount of code in your init file, you should +byte-compile it to `~/.xemacs/init.elc' or `~/.emacs.elc'. * Menu: @@ -635,16 +670,16 @@ File: xemacs.info, Node: Init Syntax, Next: Init Examples, Up: Init File Init File Syntax ---------------- - The `.emacs' file contains one or more Lisp function call -expressions. Each consists of a function name followed by arguments, -all surrounded by parentheses. For example, `(setq fill-column 60)' -represents a call to the function `setq' which is used to set the -variable `fill-column' (*note Filling::) to 60. + The init file contains one or more Lisp function call expressions. +Each consists of a function name followed by arguments, all surrounded +by parentheses. For example, `(setq fill-column 60)' represents a call +to the function `setq' which is used to set the variable `fill-column' +(*note Filling::) to 60. The second argument to `setq' is an expression for the new value of the variable. This can be a constant, a variable, or a function call -expression. In `.emacs', constants are used most of the time. They -can be: +expression. In the init file, constants are used most of the time. +They can be: Numbers Integers are written in decimal, with an optional initial minus @@ -836,16 +871,16 @@ Thus, terminal types `aaa-48' and `aaa-30-rv' both use the library the full terminal type name. The library's name is constructed by concatenating the value of the -variable `term-file-prefix' and the terminal type. Your `.emacs' file -can prevent the loading of the terminal-specific library by setting -`term-file-prefix' to `nil'. +variable `term-file-prefix' and the terminal type. Your init file can +prevent the loading of the terminal-specific library by setting +`term-file-prefix' to `nil'. *Note Init File::. The value of the variable `term-setup-hook', if not `nil', is called as a function of no arguments at the end of Emacs initialization, after -both your `.emacs' file and any terminal-specific library have been -read. You can set the value in the `.emacs' file to override part of -any of the terminal-specific libraries and to define initializations -for terminals that do not have a library. +both your init file and any terminal-specific library have been read. +*Note Init File::. You can set the value in the init file to override +part of any of the terminal-specific libraries and to define +initializations for terminals that do not have a library.  File: xemacs.info, Node: Audible Bell, Next: Faces, Prev: Init File, Up: Customization diff --git a/info/xemacs.info-18 b/info/xemacs.info-18 index 5be7d83..af83e95 100644 --- a/info/xemacs.info-18 +++ b/info/xemacs.info-18 @@ -671,13 +671,13 @@ the error message the first time the bug happens, so if you can't make it happen again, you can report at least that. Check whether any programs you have loaded into the Lisp world, -including your `.emacs' file, set any variables that may affect the -functioning of Emacs. Also, see whether the problem happens in a -freshly started Emacs without loading your `.emacs' file (start Emacs -with the `-q' switch to prevent loading the init file). If the problem -does NOT occur then, it is essential that we know the contents of any -programs that you must load into the Lisp world in order to cause the -problem to occur. +including your init file, set any variables that may affect the +functioning of Emacs. *Note Init File::. Also, see whether the +problem happens in a freshly started Emacs without loading your init +file (start Emacs with the `-q' switch to prevent loading the init +file). If the problem does NOT occur then, it is essential that we +know the contents of any programs that you must load into the Lisp +world in order to cause the problem to occur. If the problem does depend on an init file or other Lisp programs that are not part of the standard Emacs system, then you should make @@ -714,11 +714,11 @@ using `Meta-' or from the `*scratch*' buffer just after starting Emacs. From then on, all output from Emacs to the terminal will be written in the specified termscript file as well, until the Emacs process is killed. If the problem happens when Emacs starts up, put -this expression into your `.emacs' file so that the termscript file will -be open when Emacs displays the screen for the first time. Be warned: -it is often difficult, and sometimes impossible, to fix a -terminal-dependent bug without access to a terminal of the type that -stimulates the bug. +this expression into your init file so that the termscript file will be +open when Emacs displays the screen for the first time. *Note Init +File::. Be warned: it is often difficult, and sometimes impossible, to +fix a terminal-dependent bug without access to a terminal of the type +that stimulates the bug. The newsgroup `comp.emacs.xemacs' may be used for bug reports, other discussions and requests for assistance. diff --git a/info/xemacs.info-19 b/info/xemacs.info-19 index a4fa596..7140c0f 100644 --- a/info/xemacs.info-19 +++ b/info/xemacs.info-19 @@ -615,7 +615,7 @@ Quoting Read-only Buffer A read-only buffer is one whose text you are not allowed to change. Normally Emacs makes buffers read-only when they contain text which - has a special significance to Emacs, such asDired buffers. + has a special significance to Emacs, such as Dired buffers. Visiting a file that is write-protected also makes a read-only buffer. *Note Buffers::. diff --git a/info/xemacs.info-20 b/info/xemacs.info-20 index 3a4d9ea..aec371f 100644 --- a/info/xemacs.info-20 +++ b/info/xemacs.info-20 @@ -236,7 +236,7 @@ available person to fix your problem; you are not at the mercy of any individual. With Unix, the price of sources puts this out of consideration for most businesses. With GNU this will be easy. It is still possible for there to be no available competent person, but this -problem cannot be blamed on distibution arrangements. GNU does not +problem cannot be blamed on distribution arrangements. GNU does not eliminate all the world's problems, only some of them. Meanwhile, the users who know nothing about computers need diff --git a/info/xemacs.info-22 b/info/xemacs.info-22 index 7b22577..9e53490 100644 --- a/info/xemacs.info-22 +++ b/info/xemacs.info-22 @@ -222,7 +222,7 @@ Variable Index * lpr-switches: Hardcopy. * mail-abbrev-mailrc-file: Mail Headers. * mail-abbrev-mode-regexp: Mail Headers. -* mail-alias-seperator-string: Mail Headers. +* mail-alias-separator-string: Mail Headers. * mail-archive-file-name: Mail Headers. * mail-header-separator: Mail Format. * mail-mode-hook: Mail Mode. @@ -734,7 +734,7 @@ Concept Index * sexp diary entries: Sexp Diary Entries. * shell commands: Shell. * Shell mode: Shell Mode. -* shift modifer: Representing Keystrokes. +* shift modifier: Representing Keystrokes. * shrinking XEmacs frame: Exiting. * simultaneous editing: Interlocking. * single-file packages: Package Terminology. diff --git a/info/xemacs.info-6 b/info/xemacs.info-6 index dbf16a3..8d7f9e5 100644 --- a/info/xemacs.info-6 +++ b/info/xemacs.info-6 @@ -308,7 +308,7 @@ character, , , or another control character that is special within searches (`C-q', `C-w', `C-r', `C-s', or `C-y'). Sometimes you search for `FOO' and find it, but were actually -looking for a different occurance of it. To move to the next occurrence +looking for a different occurence of it. To move to the next occurrence of the search string, type another `C-s'. Do this as often as necessary. If you overshoot, you can cancel some `C-s' characters with . diff --git a/info/xemacs.info-8 b/info/xemacs.info-8 index 2f1618a..b7e55e2 100644 --- a/info/xemacs.info-8 +++ b/info/xemacs.info-8 @@ -917,10 +917,10 @@ buffer, the following special commands apply to that buffer: Like `d' but move up afterwards instead of down. `s' - Request to save the buffer. An `S' befor the buffer name on a line - indicates the request. Requested saves actually take place when - you use the `x' command. You can request both saving and deletion - for the same buffer. + Request to save the buffer. An `S' before the buffer name on a + line indicates the request. Requested saves actually take place + when you use the `x' command. You can request both saving and + deletion for the same buffer. `~' Mark buffer "unmodified". The command `~' does this immediately -- 1.7.10.4