diff options
85 files changed, 14812 insertions, 2465 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 92667a1aff..5632e1aaf1 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,11 @@ +2005-03-23 David Ponce <[email protected]> + + * NEWS: Mention recentf-keep. + +2005-03-17 Lute Kamstra <[email protected]> + + * TODO: Remove define-generic-mode entry (DONE). + 2005-03-10 Michael Albinus <[email protected]> * NEWS: Explain how to default Tramp to FTP. @@ -29,6 +29,7 @@ setting the variable `image-library-alist'. choose one of them in case your language setup doesn't automatically select the right one. +--- ** You can build Emacs with Gtk+ widgets by specifying `--with-x-toolkit=gtk' when you run configure. This requires Gtk+ 2.0 or newer. This port provides a way to display multilingual text in menus (with some caveats). @@ -36,6 +37,7 @@ provides a way to display multilingual text in menus (with some caveats). --- ** Emacs can now be built without sound support. +--- ** The `emacsserver' program has been removed, replaced with elisp code. --- @@ -74,6 +76,7 @@ together with the Emacs User Manual, into the Info directory. A menu item was added to the menu bar that makes it easy accessible (Help->More Manuals->Introduction to Emacs Lisp). +--- ** Support for Cygwin was added. --- @@ -89,6 +92,7 @@ See the files mac/README and mac/INSTALL for build instructions. --- ** Support for GNU/Linux systems on X86-64 machines was added. +--- ** Mac OS 9 port now uses the Carbon API by default. You can also create non-Carbon build by specifying `NonCarbon' as a target. See the files mac/README and mac/INSTALL for build instructions. @@ -103,6 +107,7 @@ types any more. Add -DUSE_LISP_UNION_TYPE if you want union types. * Changes in Emacs 22.1 ++++ ** The commands copy-file, rename-file, make-symbolic-link and add-name-to-file, when given a directory as the "new name" argument, convert it to a file name by merging in the within-directory part of @@ -110,27 +115,34 @@ the existing file's name. (This is the same convention that shell commands cp, mv, and ln follow.) Thus, M-x copy-file RET ~/foo RET /tmp RET copies ~/foo to /tmp/foo. ++++ ** M-o now is the prefix key for setting text properties; M-o M-o requests refontification. ++++ ** M-g is now a prefix key. M-g g and M-g M-g run goto-line. ++++ ** font-lock-lines-before specifies a number of lines before the current line that should be refontified when you change the buffer. The default value is 1. ++++ ** C-u M-x goto-line now switches to the most recent previous buffer, and goes to the specified line in that buffer. When goto-line starts to execute, if there's a number in the buffer at point then it acts as the default argument for the minibuffer. -** Emacs now responds to mouse-clicks on the mode-line, header-line -and display margin, when run in an xterm. +--- +** Emacs now responds to mouse-clicks on the mode-line, header-line and +display margin, when run in an xterm. ++++ ** M-SPC (just-one-space) when given a numeric argument N converts whitespace around point to N spaces. ++++ ** Control characters and escape glyphs are now shown in the new escape-glyph face. @@ -144,8 +156,10 @@ and if so, doesn't store any data across sessions. This is handy if you don't want the .type-break file in your home directory or are annoyed by the need for interaction when you kill Emacs. +--- ** display-battery has been replaced by display-battery-mode. +--- ** calculator.el now has radix grouping mode, which is available when `calculator-output-radix' is non-nil. In this mode a separator character is used every few digits, making it easier to see byte @@ -205,6 +219,7 @@ modes do. (beyond the value of `undo-outer-limit'), Emacs discards it and warns you about it. ++++ ** line-move-ignore-invisible now defaults to t. ** In Outline mode, hide-body no longer hides lines at the top @@ -240,6 +255,7 @@ existing values. For example: will start up Emacs on an initial frame of 100x20 with red background, irrespective of geometry or background setting on the Windows registry. +--- ** The terminal emulation code in term.el has been improved, it can run most curses applications now. @@ -249,21 +265,26 @@ run most curses applications now. *** The function `eval-defun' (C-M-x) called on defface reinitializes the face to the value specified in the defface expression. ++++ *** Typing C-x C-e twice prints the value of the integer result in additional formats (octal, hexadecimal, character) specified by the new function `eval-expression-print-format'. The same function also defines the result format for `eval-expression' (M-:), `eval-print-last-sexp' (C-j) and some edebug evaluation functions. +--- ** New input method chinese-sisheng for inputting Chinese Pinyin characters. ++++ ** New command quail-show-key shows what key (or key sequence) to type in the current input method to input a character at point. ++++ ** Convenient commands to switch buffers in a cyclic order are C-x <left> (prev-buffer) and C-x <right> (next-buffer). +--- ** Commands winner-redo and winner-undo, from winner.el, are now bound to C-c <left> and C-c <right>, respectively. This is an incompatible change. @@ -310,13 +331,16 @@ cursor, and the fancy startup screen. ** New command line option -nbc or --no-blinking-cursor disables the blinking cursor on graphical terminals. ++++ ** C-h v and C-h f commands now include a hyperlink to the C source for variables and functions defined in C (if the C source is available). +--- ** When used interactively, `format-write-file' now asks for confirmation before overwriting an existing file, unless a prefix argument is supplied. This behavior is analogous to `write-file'. ++++ ** You can now use Auto Revert mode to `tail' a file. If point is at the end of a file buffer before reverting, Auto Revert mode keeps it at the end after reverting. Similarly if point is @@ -331,6 +355,7 @@ then you can tail the file more efficiently by using the new minor mode Auto Revert Tail mode. The function `auto-revert-tail-mode' toggles this mode. ++++ ** Auto Revert mode is now more careful to avoid excessive reverts and other potential problems when deciding which non-file buffers to revert. This matters especially if Global Auto Revert mode is enabled @@ -347,10 +372,12 @@ control number in the mode line), in all version controlled buffers in which it is active. If the option is nil, the default, then this info only gets updated whenever the buffer gets reverted. ++++ ** New command `Buffer-menu-toggle-files-only' toggles display of file buffers only in the Buffer Menu. It is bound to `T' in Buffer Menu mode. +--- ** M-x compile has become more robust and reliable Quite a few more kinds of messages are recognized. Messages that are @@ -380,23 +407,28 @@ subprocesses inherit. ** Grep has been decoupled from compilation mode setup. +--- *** There's a new separate package grep.el. +--- *** M-x grep has been adapted to new compile Hits are fontified in green, and hits in binary files in orange. Grep buffers can be saved and automatically revisited with the new Grep mode. +--- *** Grep commands now have their own submenu and customization group. +++ *** `grep-find' is now also available under the name `find-grep' where people knowing `find-grep-dired' would probably expect it. +--- *** The new variables `grep-window-height', `grep-auto-highlight', and `grep-scroll-output' can be used to override the corresponding compilation mode settings for grep commands. ++++ *** New option `grep-highlight-matches' highlightes matches in *grep* buffer. It uses a special feature of some grep programs which accept --color option to output markers around matches. When going to the next @@ -404,6 +436,7 @@ match with `next-error' the exact match is highlighted in the source buffer. Otherwise, if `grep-highlight-matches' is nil, the whole source line is highlighted. ++++ *** New key bindings in grep output window: SPC and DEL scrolls window up and down. C-n and C-p moves to next and previous match in the grep window. RET jumps to the source line of @@ -412,10 +445,12 @@ other window, but does not switch buffer. `{' and `}' jumps to the previous or next file in the grep output. TAB also jumps to the next file. ++++ ** New options `next-error-highlight' and `next-error-highlight-no-select' specify the method of highlighting of the corresponding source line in new face `next-error'. ++++ ** A new minor mode `next-error-follow-minor-mode' can be used in compilation-mode, grep-mode, occur-mode, and diff-mode (i.e. all the modes that can use `next-error'). In this mode, cursor motion in the @@ -423,8 +458,10 @@ buffer causes automatic display in another window of the corresponding matches, compilation errors, etc. This minor mode can be toggled with C-c C-f. ++++ ** M-x diff uses diff-mode instead of compilation-mode. ++++ ** M-x compare-windows now can automatically skip non-matching text to resync points in both windows. @@ -445,13 +482,16 @@ See the file GNUS-NEWS or the node "Oort Gnus" in the Gnus manual for details. +++ ** Desktop package ++++ *** Desktop saving is now a minor mode, desktop-save-mode. Variable desktop-enable is obsolete. Customize desktop-save-mode to enable desktop saving. +--- *** Buffers are saved in the desktop file in the same order as that in the buffer list. ++++ *** The desktop package can be customized to restore only some buffers immediately, remaining buffers are restored lazily (when Emacs is idle). @@ -477,6 +517,7 @@ remaining buffers are restored lazily (when Emacs is idle). - desktop-lazy-verbose. Verbose reporting of lazily created buffers. - desktop-lazy-idle-delay. Idle delay before starting to create buffers. ++++ *** New command line option --no-desktop *** New hooks: @@ -556,6 +597,7 @@ hyperlinks to Info anchors (or nodes) if the anchor (or node) name is enclosed in single quotes and preceded by `info anchor' or `Info anchor' (in addition to earlier `info node' and `Info node'). ++++ ** The max size of buffers and integers has been doubled. On 32bit machines, it is now 256M (i.e. 268435455). @@ -641,6 +683,7 @@ with special modes such as Tar mode. ** Enhancements to apropos commands: ++++ *** The apropos commands now accept a list of words to match. When more than one word is specified, at least two of those words must be present for an item to match. Regular expression matching is still @@ -662,17 +705,20 @@ the operating system or your X server. When enabled, it makes all invisible text visible. When disabled, it restores the previous value of `buffer-invisibility-spec'. +--- ** New command `kill-whole-line' kills an entire line at once. By default, it is bound to C-S-<backspace>. ** New commands to operate on pairs of open and close characters: `insert-pair', `delete-pair', `raise-sexp'. ++++ ** A prefix argument of C-M-q in Emacs Lisp mode pretty-printifies the list starting after point. ** Dired mode: +--- *** New faces dired-header, dired-mark, dired-marked, dired-flagged, dired-ignored, dired-directory, dired-symlink, dired-warning introduced for Dired mode instead of font-lock faces. @@ -692,6 +738,7 @@ too. If you want to use just plain `*' as a wildcard, type `*""'; the doublequotes make no difference in the shell, but they prevent special treatment in `dired-do-shell-command'. ++++ *** In Dired, the w command now copies the current line's file name into the kill ring. With a zero prefix arg, copies absolute file names. @@ -726,9 +773,11 @@ multiple files, and C-x d passes it to `dired'. ** Info mode: ++++ *** A numeric prefix argument of `info' selects an Info buffer with the number appended to the *info* buffer name (e.g. "*info*<2>"). +--- *** isearch in Info uses Info-search and searches through multiple nodes. Before leaving the initial Info node isearch fails once with the error message [initial node], and with subsequent C-s/C-r continues through @@ -781,6 +830,7 @@ version 4.7 or newer, compiles to Info pages with embedded images. --- *** Info-index offers completion. +--- ** Support for the SQLite interpreter has been added to sql.el by calling 'sql-sqlite'. @@ -828,10 +878,12 @@ in multiple BibTeX files. *** The new command bibtex-copy-summary-as-kill pushes summary of BibTeX entry to kill ring (bound to C-c C-t). ++++ ** When display margins are present in a window, the fringes are now displayed between the margins and the buffer's text area, rather than at the edges of the window. ++++ ** A window may now have individual fringe and scroll-bar settings, in addition to the individual display margin settings. @@ -844,11 +896,12 @@ or when the frame is resized. These functions return the current locations of the vertical and horizontal scroll bars in a frame or window. ---- ++++ ** Emacs now supports drag and drop for X. Dropping a file on a window opens it, dropping text inserts the text. Dropping a file on a dired buffer copies or moves the file to that directory. ++++ ** Under X, mouse-wheel-mode is turned on by default. ** The X resource useXIM can be used to turn off use of XIM, which may @@ -857,16 +910,20 @@ speed up Emacs with slow networking to the X server. If the configure option `--without-xim' was used to turn off use of XIM by default, the X resource useXIM can be used to turn it on. ++++ ** `undo-only' does an undo which does not redo any previous undo. ** `uniquify-strip-common-suffix' tells uniquify to prefer `file|dir1' and `file|dir2' to `file|dir1/subdir' and `file|dir2/subdir'. ++++ ** If the user visits a file larger than `large-file-warning-threshold', Emacs prompts her for confirmation. +--- ** A UTF-7 coding system is available in the library `utf-7'. +--- ** GUD mode has its own tool bar for controlling execution of the inferior and other common debugger commands. @@ -876,25 +933,30 @@ The recent file list is now automatically cleanup when recentf mode is enabled. The new option `recentf-auto-cleanup' controls when to do automatic cleanup. +The `recentf-keep' option replaces `recentf-keep-non-readable-files-p' +and provides a more general mechanism to customize which file names to +keep in the recent list. + With the more advanced option: `recentf-filename-handler', you can specify a function that transforms filenames handled by recentf. For example, if set to `file-truename', the same file will not be in the recent list with different symbolic links. -To follow naming convention, `recentf-keep-non-readable-files-flag' -and `recentf-menu-append-commands-flag' respectively replace the -misnamed options `recentf-keep-non-readable-files-p' and -`recentf-menu-append-commands-p'. The old names remain available as -aliases, but have been marked obsolete. +To follow naming convention, `recentf-menu-append-commands-flag' +replaces the misnamed option `recentf-menu-append-commands-p'. The +old name remains available as alias, but has been marked obsolete. ++++ ** The default for the paper size (variable ps-paper-type) is taken from the locale. ++++ ** Init file changes You can now put the init files .emacs and .emacs_SHELL under ~/.emacs.d or directly under ~. Emacs will find them in either place. +--- ** partial-completion-mode now does partial completion on directory names. ** skeleton.el now supports using - to mark the skeleton-point without @@ -914,6 +976,7 @@ version 5.0.2; see MH-E-NEWS for details. `--display' which tell Emacs respectively to evaluate the given elisp expression and to use the given display when visiting files. ++++ ** User option `server-mode' can be used to start a server process. +++ @@ -921,6 +984,7 @@ expression and to use the given display when visiting files. When the file is maintained under version control, that information appears between the position information and the major mode. ++++ ** C-x s (save-some-buffers) now offers an option `d' to diff a buffer against its file, so you can see what changes you would be saving. @@ -943,6 +1007,7 @@ read-only, the Emacs buffer is now read-only too. Type C-x C-q if you want to make the buffer writable. (As root, you can in fact alter the file.) ++++ ** The new command `revert-buffer-with-coding-system' (C-x RET r) revisits the current file using a coding system that you specify. @@ -980,12 +1045,14 @@ now look at the character after point. If a face or faces are specified for that character, the commands by default customize those faces. +--- ** New language environments: French, Ukrainian, Tajik, Bulgarian, Belarusian, Ukrainian, UTF-8, Windows-1255, Welsh, Latin-6, Latin-7, Lithuanian, Latvian, Swedish, Slovenian, Croatian, Georgian, Italian, Russian, Malayalam, Tamil, Russian, Chinese-EUC-TW. (Set up automatically according to the locale.) +--- ** Indian support has been updated. The in-is13194 coding system is now Unicode-based. CDAC fonts are assumed. There is a framework for supporting various @@ -1013,6 +1080,7 @@ obsolete and is used only in the MS-DOS port of Emacs. windows-1252 and windows-1251 are preloaded since the former is so common and the latter is used by GNU locales. +--- ** The utf-8/16 coding systems have been enhanced. By default, untranslatable utf-8 sequences are simply composed into single quasi-characters. User option `utf-translate-cjk-mode' (it is @@ -1026,13 +1094,16 @@ coding system now also encodes characters from most of Emacs's one-dimensional internal charsets, specifically the ISO-8859 ones. The utf-16 coding system is affected similarly. +--- ** New variable `utf-translate-cjk-unicode-range' controls which Unicode characters to translate in `utf-translate-cjk-mode'. +--- ** iso-10646-1 (`Unicode') fonts can be used to display any range of characters encodable by the utf-8 coding system. Just specify the fontset appropriately. +--- ** New command `ucs-insert' inserts a character specified by its unicode. @@ -1056,6 +1127,7 @@ into Unicode characters (from the latin-iso8859-1 and mule-unicode-0100-24ff charsets) on decoding. Note that this mode will often effectively clobber data with an iso-2022 encoding. +--- ** There is support for decoding Greek and Cyrillic characters into either Unicode (the mule-unicode charsets) or the iso-8859 charsets, when possible. The latter are more space-efficient. This is @@ -1147,12 +1219,15 @@ The variable `automatic-hscrolling' was renamed to `auto-hscroll-mode'. The old name is still available as an alias. ** TeX modes: + *** C-c C-c prompts for a command to run, and tries to offer a good default. + +++ *** The user option `tex-start-options-string' has been replaced by two new user options: `tex-start-options', which should hold command-line options to feed to TeX, and `tex-start-commands' which should hold TeX commands to use at startup. + *** verbatim environments are now highlighted in courier by font-lock and super/sub-scripts are made into super/sub-scripts. @@ -1195,6 +1270,7 @@ in Indented-Text mode. `query-replace' and related functions simply ignore a match if part of it has a read-only property. ++++ ** When used interactively, the commands `query-replace-regexp' and `replace-regexp' allow \,expr to be used in a replacement string, where expr is an arbitrary Lisp expression evaluated at replacement @@ -1205,9 +1281,11 @@ All regular expression replacement commands now allow `\?' in the replacement string to specify a position where the replacement string can be edited for each replacement. ++++ ** query-replace uses isearch lazy highlighting when the new user option `query-replace-lazy-highlight' is non-nil. +--- ** The current match in query-replace is highlighted in new face `query-replace' which by default inherits from isearch face. @@ -1433,6 +1511,7 @@ the previous value becomes the "backup value" of the variable. You can go back to that backup value by selecting "Use Backup Value" under the "[State]" button. +--- ** The new customization type `float' specifies numbers with floating point (no integers are allowed). @@ -1543,6 +1622,7 @@ C-g. previous mark, i.e. C-u C-SPC C-SPC C-SPC ... cycles through the mark ring. Use C-u C-u C-SPC to set the mark immediately after a jump. ++++ ** Movement commands `beginning-of-buffer', `end-of-buffer', `beginning-of-defun', `end-of-defun' do not set the mark if the mark is already active in Transient Mark mode. @@ -1573,6 +1653,7 @@ directory listing into a buffer. ** mouse-wheels can now scroll a specific fraction of the window (rather than a fixed number of lines) and the scrolling is `progressive'. +--- ** Unexpected yanking of text due to accidental clicking on the mouse wheel button (typically mouse-2) during wheel scrolling is now avoided. This behavior can be customized via the mouse-wheel-click-event and @@ -1600,6 +1681,7 @@ according to the value of `save-abbrevs'. of `cursor-in-non-selected-windows' in the buffer that the cursor appears in. ++++ ** The variable `cursor-in-non-selected-windows' can now be set to any of the recognized cursor types. @@ -1652,6 +1734,7 @@ the new function `appt-activate'. The new variable `appt-display-format' controls how reminders are displayed, replacing appt-issue-message, appt-visible, and appt-msg-window. ++++ ** The new functions `diary-from-outlook', `diary-from-outlook-gnus', and `diary-from-outlook-rmail' can be used to import diary entries from Outlook-format appointments in mail messages. The variable @@ -1679,6 +1762,7 @@ means they are inserted before the command name. For example, this allows you to specify a compression level using the "-z#" option for CVS. ++++ *** New backends for Subversion and Meta-CVS. ** EDiff changes. @@ -2066,6 +2150,7 @@ line is left untouched. The function c-toggle-syntactic-indentation can be used to toggle syntactic indentation. ++++ ** The command line option --no-windows has been changed to --no-window-system. The old one still works, but is deprecated. @@ -2113,10 +2198,11 @@ from the file name or buffer contents. Adapt this to match the format of any compiler directives you use. Lines that match are never indented, and are given distinctive font-locking. ---- ++++ ** F90 mode has new navigation commands `f90-end-of-block', `f90-beginning-of-block', `f90-next-block', `f90-previous-block'. +--- ** F90 mode now has support for hs-minor-mode (hideshow). It cannot deal with every code format, but ought to handle a sizeable majority. @@ -2152,6 +2238,7 @@ candidate is a directory. to the text before point. If there is text in the buffer after point, it remains unchanged. +--- ** Enhanced visual feedback in *Completions* buffer. Completions lists use faces to highlight what all completions @@ -2529,6 +2616,10 @@ configuration files. * Incompatible Lisp Changes in Emacs 22.1 +** The new interactive-specification `G' reads a file name +much like `F', but if the input is a directory name (even defaulted), +it returns just the directory name. + +++ ** `suppress-keymap' now works by remapping `self-insert-command' to the command `undefined'. (In earlier Emacs versions, it used @@ -2543,11 +2634,6 @@ the command `undefined'. (In earlier Emacs versions, it used * Lisp Changes in Emacs 22.1 +++ -** The new interactive-specification `G' reads a file name -much like `F', but if the input is a directory name (even defaulted), -it returns just the directory name. - -+++ ** An element of buffer-undo-list can now have the form (apply FUNNAME . ARGS), where FUNNAME is a symbol other than t or nil. That stands for a high-level change that should be undone by evaluating (apply @@ -2692,12 +2778,14 @@ example, (kbd "C-x C-f") => "\^x\^f" ++++ ** The sentinel is now called when a network process is deleted with delete-process. The status message passed to the sentinel for a deleted network process is "deleted". The message passed to the sentinel when the connection is closed by the remote peer has been changed to "connection broken by remote peer". ++++ ** If the buffer's undo list for the current command gets longer than undo-outer-limit, garbage collection empties it. This is to prevent it from using up the available memory and choking Emacs. @@ -2711,14 +2799,17 @@ current input method to input a character. click-event-style position information for a given visible buffer position or for a given window pixel coordinate. ++++ ** skip-chars-forward and skip-chars-backward now handle character classes such as [:alpha:], along with individual characters and ranges. ++++ ** Function pos-visible-in-window-p now returns the pixel coordinates and partial visiblity state of the corresponding row, if the PARTIALLY arg is non-nil. ++++ ** The function `eql' is now available without requiring the CL package. +++ @@ -2783,6 +2874,7 @@ the line-spacing variable. If the line-spacing property may be a float or cons, the line spacing is calculated as specified above for the line-height property. ++++ ** The buffer local line-spacing variable may now have a float value, which is used as a height relative to the default frame line height. @@ -2849,6 +2941,7 @@ text property string that may be present at the current window position. The cursor may now be placed on any character of such strings by giving that character a non-nil `cursor' text property. ++++ ** New macro with-local-quit temporarily sets inhibit-quit to nil for use around potentially blocking or long-running code in timers and post-command-hooks. @@ -2895,6 +2988,7 @@ for displaying the bitmap. *** New function `fringe-bitmaps-at-pos' returns the current fringe bitmaps in the display line at a given buffer position. ++++ ** Multiple overlay arrows can now be defined and managed via the new variable `overlay-arrow-variable-list'. It contains a list of varibles which contain overlay arrow position markers, including @@ -2943,6 +3037,7 @@ the first one is kept. ** `declare' is now a macro. This change was made mostly for documentation purposes and should have no real effect on Lisp code. ++++ ** The new hook `before-save-hook' is invoked by `basic-save-buffer' before saving buffers. This allows packages to perform various final tasks, for example; it can be used by the copyright package to make @@ -3001,13 +3096,16 @@ mouse event, e.g. [area4 mouse-1] if the hot-spot's ID is `area4'. ** Mouse event enhancements: ++++ *** Mouse clicks on fringes now generates left-fringe or right-fringes events, rather than a text area click event. ++++ *** Mouse clicks in the left and right marginal areas now includes a sensible buffer position corresponding to the first character in the corresponding text row. ++++ *** Function `mouse-set-point' now works for events outside text area. +++ @@ -3043,6 +3141,7 @@ the top left corner of the object (image or character) clicked on. click, the x and y pixel coordinates relative to the top left corner of that object, and the total width and height of that object. ++++ ** New function `force-window-update' can initiate a full redisplay of one or all windows. Normally, this is not needed as changes in window contents are detected automatically. However, certain implicit @@ -3340,6 +3439,7 @@ can start with this line: #!/usr/bin/emacs --script ++++ ** The option --directory DIR now modifies `load-path' immediately. Directories are added to the front of `load-path' in the order they appear on the command line. For example, with this command line: @@ -3723,10 +3823,12 @@ by `yank-pop' to undo the insertion of the current object. It is called with two arguments, the start and end of the current region. FUNCTION may set `yank-undo-function' to override the UNDO value. ++++ *** The functions kill-new, kill-append, and kill-region now have an optional argument to specify the yank-handler text property to put on the killed text. ++++ *** The function yank-pop will now use a non-nil value of the variable `yank-undo-function' (instead of delete-region) to undo the previous yank or yank-pop command (or a call to insert-for-yank). The function @@ -3790,6 +3892,7 @@ integer, also inhibit running timers. This feature is generally not recommended, but may be necessary for specific applications, such as speech synthesis. +--- *** Adaptive read buffering of subprocess output. On some systems, when emacs reads the output from a subprocess, the @@ -3885,6 +3988,7 @@ status, and other information about a specific network interface. +++ ** New function `call-process-shell-command'. ++++ ** New function `process-file'. This is similar to `call-process', but obeys file handlers. The file @@ -4094,6 +4198,7 @@ refontification of `bar' whenever the `e' is added/removed. ** describe-vector now takes a second argument `describer' which is called to print the entries' values. It defaults to `princ'. ++++ ** defcustom and other custom declarations now use a default group (the last prior group defined in the same file) when no :group was given. @@ -4236,6 +4341,7 @@ hold the largest and smallest possible integer values. The Windows specific variable w32-system-coding-system, which was formerly used for that purpose is now an alias for locale-coding-system. +--- ** Functions y-or-n-p, read-char, read-key-sequence and the like, that display a prompt but don't use the minibuffer, now display the prompt using the text properties (esp. the face) of the prompt string. @@ -4243,6 +4349,7 @@ using the text properties (esp. the face) of the prompt string. ** New function x-send-client-message sends a client message when running under X. ++++ ** Arguments for remove-overlays are now optional, so that you can remove all overlays in the buffer by just calling (remove-overlay). @@ -15,9 +15,6 @@ to the FSF. ought to be possible to omit text which is invisible (due to a text-property, overlay, or selective display) from the kill-ring. -** Redefine define-generic-mode as a macro, so the compiler - sees the definitions it generates. - ** Change the way define-minor-mode handles autoloading. It should not generate :require. Or :require in defcustom should not be recorded in the user's custom-set-variables call. diff --git a/info/.arch-inventory b/info/.arch-inventory index 31f45f8648..4efa6ef48f 100644 --- a/info/.arch-inventory +++ b/info/.arch-inventory @@ -1,19 +1,20 @@ -# Only two real source files: "dir", and this file, ".arch-inventory" -source ^(dir|\.arch-inventory)$ +# There are only three real source files in this directory: +# +# "dir", ".cvsignore", and this file, ".arch-inventory" # Everything else is generated at compile time. Unfortunately, the "backup" # category overrides the "source" category, so we have to have horrible # regexp that matches everything _except_ "dir"... # 1 or 2 characters long -backup ^[-_.a-zA-Z0-9][-_.a-zA-Z0-9]?$ +backup ^[a-zA-Z0-9][-_.a-zA-Z0-9]?$ # 4 or more characters long -backup ^[-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]+$ +backup ^[a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]+$ # 3 chars long, but 1st char not "d" -backup ^[-_.abce-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]$ +backup ^[abce-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]$ # 3 chars long, but 2nd char not "i" -backup ^[-_.a-zA-Z0-9][-_.a-hj-zA-Z0-9][-_.a-zA-Z0-9]$ +backup ^[a-zA-Z0-9][-_.a-hj-zA-Z0-9][-_.a-zA-Z0-9]$ # 3 chars long, but 3rd char not "r" -backup ^[-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-qs-zA-Z0-9]$ +backup ^[a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-qs-zA-Z0-9]$ # arch-tag: 60144ab9-cdc1-45b6-8193-b9683c80ec86 diff --git a/info/.gitignore b/info/.gitignore new file mode 100644 index 0000000000..72e8ffc0db --- /dev/null +++ b/info/.gitignore @@ -0,0 +1 @@ +* diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43dc9d7bfb..4e2472e70f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,230 @@ +2005-03-23 David Ponce <[email protected]> + + * recentf.el: (recentf-keep): New option. + (recentf-menu-action): Default to `find-file'. + (recentf-keep-non-readable-files-flag) + (recentf-keep-non-readable-files-p) + (recentf-file-readable-p, recentf-find-file) + (recentf-cleanup-remote): Remove. + (recentf-include-p): More robust. + (recentf-keep-p): New function. + (recentf-remove-if-non-kept): Rename from + `recentf-remove-if-non-readable'. Use `recentf-keep-p'. All + callers updated. + (recentf-menu-items-for-commands): Fix help string. + (recentf-track-closed-file): Update. Doc fix. + (recentf-cleanup): Update. Count removed files. Doc fix. + +2005-03-23 Kim F. Storm <[email protected]> + + * progmodes/gdb-ui.el (breakpoint-enabled, breakpoint-disabled): + Don't inherit from fringe face (now happens automatically). + +2005-03-22 Kim F. Storm <[email protected]> + + * tooltip.el (tooltip-show-help-function): Ignore negative mouse + position values. + +2005-03-22 Stefan Monnier <[email protected]> + + * menu-bar.el (showhide-date-time): Remove. + (menu-bar-showhide-menu): Use menu-bar-make-mm-toggle. + (menu-bar-make-mm-toggle): Simplify. + +2005-03-22 JUAN-LEON Lahoz Garcia <[email protected]> + + * progmodes/perl-mode.el (perl-font-lock-keywords-2): + Accept qualified variable and function names. + +2005-03-22 Thien-Thi Nguyen <[email protected]> + + * bindings.el (completion-ignored-extensions): + Remove ".lis" for `vax-vms'. + +2005-03-22 Andreas Schwab <[email protected]> + + * generic-x.el: Revert last change. + * ldefs-boot.el: Update. + +2005-03-22 Jay Belanger <[email protected]> + + * calc/calc-embed (calc-embedded-original-modes): New variable. + (calc-embedded-save-original-modes) + (calc-embedded-restore-original-modes): New functions. + (calc-do-embedded): Save original modes when entering embedded mode + and restore when leaving embedded mode. + (calc-embedded-modes-change): Change the value of + calc-embedded-original-modes to reflect permanent changes. + +2005-03-22 Lute Kamstra <[email protected]> + + * generic-x.el: Require generic again. + +2005-03-22 Miles Bader <[email protected]> + + * progmodes/gdb-ui.el (breakpoint-enabled, breakpoint-disabled): + Tweak details to look good on both ttys and bitmap displays, light + or dark background, etc. + +2005-03-21 Kim F. Storm <[email protected]> + + * tooltip.el (tooltip-show-help-function): Check car and cdr of + mouse position. + +2005-03-21 Stefan Monnier <[email protected]> + + * icomplete.el: Don't forcibly turn on the mode upon load. + (icomplete-mode): Use define-minor-mode. + (icomplete-eoinput): Default to nil. + (icomplete-minibuffer-setup): Remove autoload. + (icomplete-tidy): Simplify. + (icomplete-exhibit): Use buffer-undo-list to determine if we're still + in the initial state or if the user has modified the field. + Fix handling of icomplete-max-delay-chars. + Remove code that handles the oddball case where + minibuffer-completion-table is an integer. + Wrap icomplete-completions in while-no-input in case building + completions takes more time than expected. + (icomplete-completions): Simplify. + +2005-03-21 Richard M. Stallman <[email protected]> + + * jka-compr.el (jka-compr-really-do-compress): + Make variable buffer-local. + + * image-mode.el: Handle .xpm files too. + (image-toggle-display): Preserve modification flag. + + * help.el (where-is): Don't mention aliases with no key bindings. + +2005-03-21 Lute Kamstra <[email protected]> + + * generic.el: Fix commentary section. Don't require cl for + compilation. + (generic-mode-list): Add autoload cookie. + (generic-use-find-file-hook, generic-lines-to-scan) + (generic-find-file-regexp, generic-ignore-files-regexp) + (generic-mode, generic-mode-find-file-hook) + (generic-mode-ini-file-find-file-hook): Fix docstrings. + (define-generic-mode): Make it a defmacro. Fix docstring. + (generic-mode-internal): Code cleanup. Add autoload cookie. + (generic-mode-set-comments): Code cleanup. + * generic-x.el: Don't prevent compilation. Don't require generic. + Follow coding conventions. Minor code cleanup. + (etc-fstab-generic-mode): Add some keywords. + * font-lock.el (lisp-font-lock-keywords-1): Font lock a call to + define-generic-mode like a function declaration. + +2005-03-21 Jay Belanger <[email protected]> + + * calc/calc-embed.el (calc-do-embedded): Put data on stack before + changing modes. + +2005-03-21 Sam Steingold <[email protected]> + + * add-log.el (add-log-current-defun): Support more C DEFUN forms. + +2005-03-21 Thien-Thi Nguyen <[email protected]> + + * progmodes/dcl-mode.el (dcl-font-lock-keywords): + Add underscore to "f$ lexicals" regexp. + +2005-03-20 Juri Linkov <[email protected]> + + * subr.el (progress-reporter-do-update): When `min-value' is equal + to `max-value', set `percentage' to 0 and prevent division by zero. + +2005-03-20 Michael Albinus <[email protected]> + + Sync with Tramp 2.0.48. + + * tramp.el (all): Change all addresses to .gnu.org. + (tramp-append-tramp-buffers): New defun. + (tramp-bug): Apply `tramp-append-tramp-buffers' as post-hook. + Catch `dont-send' signal. + (tramp-set-auto-save-file-modes): Set always permissions, because + there might be an old auto-saved file belonging to another + original file. This could be a security threat. Reported by + Kjetil Kjernsmo <[email protected]>. + Check for Emacs 21.3.50 removed. + + * tramp-smb.el (all): Remove debug construct for + `with-parsed-tramp-file-name'. + (tramp-smb-prompt): Prompt can contain spaces inside directory + names. + (tramp-smb-handle-delete-directory, tramp-smb-handle-delete-file): + No error message if DIRECTORY or FILENAME doesn't exist. + (tramp-smb-open-connection): Check existence of + `tramp-smb-program'. + +2005-03-20 Miles Bader <[email protected]> + + * progmodes/gdb-ui.el (gdb-put-breakpoint-icon): Use breakpoint faces + in text-mode too. Change to new face names. + (breakpoint-enabled): Renamed from `breakpoint-enabled-bitmap-face'. + Add `:weight bold' attribute. + (breakpoint-disabled): Renamed from `breakpoint-disabled-bitmap-face'. + +2005-03-19 Juri Linkov <[email protected]> + + * files.el (auto-mode-alist): Add comment. Optimize jar/ear/war. + + * international/mule.el (auto-coding-alist): Sync with + `auto-mode-alist' by adding upper case archive file extensions + and adding ear/war to jar extension. + +2005-03-19 David Casperson <[email protected]> (tiny change) + + * textmodes/tex-mode.el (tex-view): If tex-shell process is not + running, restart it. + +2005-03-19 Yoichi NAKAYAMA <[email protected]> (tiny changes) + + * finder.el (finder-current-item): Throw an error on an empty + line. + + * man.el (Man-follow-manual-reference): If current-word returns + nil, use "". + +2005-03-19 Matt Hodges <[email protected]> + + * simple.el (goto-line): Doc fix. + +2005-03-19 Aaron Hawley <[email protected]> (tiny change) + + * files.el (save-buffer): Doc fix. + +2005-03-19 Michael R. Mauger <[email protected]> + + * recentf.el (recentf-cleanup-remote): New variable. + (recentf-cleanup): Use it to conditionally check availablity of + remote files. + +2005-03-19 Joe Edmonds <[email protected]> (tiny change) + + * emacs-lisp/lisp-mode.el (lisp-mode-variables): Recognize `@' in + function names. + +2005-03-19 Eli Zaretskii <[email protected]> + + * language/thai-word.el: New file. + +2005-03-19 JUAN-LEON Lahoz Garcia <[email protected]> + + * files.el (backup-buffer): If the file's directory is not + writable, use copy instead of move to backup the file. + +2005-03-19 Eli Zaretskii <[email protected]> + + * obsolete/keyswap.el: Moved to obsolete/ from term/. + +2005-03-19 Vinicius Jose Latorre <[email protected]> + + * ps-print.el (ps-generate-string-list, ps-generate-header-line): Use + functionp instead of symbolp and fboundp. Reported by Drkm + <[email protected]>. + (ps-print-version): New version 6.6.6. + 2005-03-18 Tak Ota <[email protected]> * textmodes/table.el (table--line-column-position): New idiom. diff --git a/lisp/add-log.el b/lisp/add-log.el index ce98760222..7706a69775 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -812,7 +812,7 @@ Has a preference of looking backwards." (looking-at "[ \t\n]")) (forward-line -1)) ;; See if this is using the DEFUN macro used in Emacs, - ;; or the DEFUN macro used by the C library. + ;; or the DEFUN macro used by the C library: (if (condition-case nil (and (save-excursion (end-of-line) @@ -824,16 +824,20 @@ Has a preference of looking backwards." (looking-at "DEFUN\\b")) (>= location tem)) (error nil)) + ;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory + ;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK (progn (goto-char tem) (down-list 1) - (if (= (char-after (point)) ?\") - (progn - (forward-sexp 1) - (skip-chars-forward " ,"))) + (when (= (char-after (point)) ?\") + (forward-sexp 1) + (search-forward ",")) + (skip-syntax-forward " ") (buffer-substring-no-properties (point) - (progn (forward-sexp 1) + (progn (search-forward ",") + (forward-char -1) + (skip-syntax-backward " ") (point)))) (if (looking-at "^[+-]") (change-log-get-method-definition) diff --git a/lisp/bindings.el b/lisp/bindings.el index b283824d73..52a9137827 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -503,7 +503,7 @@ is okay. See `mode-line-format'.") ".a" ".ln" ".blg" ".bbl" ".dll" ".drv" ".vxd" ".386")) ((eq system-type 'vax-vms) '(".obj" ".exe" ".bin" ".lbin" ".sbin" - ".brn" ".rnt" ".lni" ".lis" + ".brn" ".rnt" ".lni" ".olb" ".tlb" ".mlb" ".hlb")) (t '(".o" "~" ".bin" ".lbin" ".so" diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f1a273f7cf..8a48b78e37 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -149,6 +149,59 @@ This is not required to be present for user-written mode annotations.") ;;; rather than using buffer-local variables because the latter are ;;; thrown away when a buffer changes major modes. +(defvar calc-embedded-original-modes nil + "The mode settings for Calc buffer when put in embedded mode.") + +(defun calc-embedded-save-original-modes () + "Save the current Calc modes when entereding embedded mode." + (let ((calcbuf (save-excursion + (calc-create-buffer) + (current-buffer))) + lang modes) + (if calcbuf + (with-current-buffer calcbuf + (setq lang + (cons calc-language calc-language-option)) + (setq modes + (list (cons 'calc-display-just + calc-display-just) + (cons 'calc-display-origin + calc-display-origin))) + (let ((v calc-embedded-mode-vars)) + (while v + (let ((var (cdr (car v)))) + (unless (memq var '(the-language the-display-just)) + (setq modes + (cons (cons var (symbol-value var)) + modes)))) + (setq v (cdr v)))) + (setq calc-embedded-original-modes (cons lang modes))) + (setq calc-embedded-original-modes nil)))) + +(defun calc-embedded-restore-original-modes () + "Restore the original Calc modes when leaving embedded mode." + (let ((calcbuf (get-buffer "*Calculator*")) + (changed nil) + (lang (car calc-embedded-original-modes)) + (modes (cdr calc-embedded-original-modes))) + (if (and calcbuf calc-embedded-original-modes) + (with-current-buffer calcbuf + (unless (and + (equal calc-language (car lang)) + (equal calc-language-option (cdr lang))) + (calc-set-language (car lang) (cdr lang)) + (setq changed t)) + (while modes + (let ((mode (car modes))) + (unless (equal (symbol-value (car mode)) (cdr mode)) + (set (car mode) (cdr mode)) + (setq changed t))) + (setq modes (cdr modes))) + (when changed + (calc-refresh) + (calc-set-mode-line)))) + (setq calc-embedded-original-modes nil))) + ;; The variables calc-embed-outer-top, calc-embed-outer-bot, ;; calc-embed-top and calc-embed-bot are ;; local to calc-do-embedded, calc-embedded-mark-formula, @@ -193,6 +246,7 @@ This is not required to be present for user-written mode annotations.") buffer-read-only nil) (use-local-map (nth 1 mode)) (set-buffer-modified-p (buffer-modified-p)) + (calc-embedded-restore-original-modes) (or calc-embedded-quiet (message "Back to %s mode" mode-name)))) @@ -214,11 +268,13 @@ This is not required to be present for user-written mode annotations.") calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot info chg ident) (barf-if-buffer-read-only) + (calc-embedded-save-original-modes) (or calc-embedded-globals (calc-find-globals)) (setq info (calc-embedded-make-info (point) nil t arg end obeg oend)) (if (eq (car-safe (aref info 8)) 'error) (progn + (setq calc-embedded-original-modes nil) (goto-char (nth 1 (aref info 8))) (error (nth 2 (aref info 8))))) (let ((mode-line-buffer-identification mode-line-buffer-identification) @@ -227,10 +283,13 @@ This is not required to be present for user-written mode annotations.") (calc-wrapper (let* ((okay nil) (calc-no-refresh-evaltos t)) - (setq chg (calc-embedded-set-modes - (aref info 15) (aref info 12) (aref info 13))) (if (aref info 8) - (calc-push (calc-normalize (aref info 8))) + (progn + (calc-push (calc-normalize (aref info 8))) + (setq chg (calc-embedded-set-modes + (aref info 15) (aref info 12) (aref info 13)))) + (setq chg (calc-embedded-set-modes + (aref info 15) (aref info 12) (aref info 13))) (calc-alg-entry))) (setq calc-undo-list nil calc-redo-list nil @@ -1197,7 +1256,27 @@ The command \\[yank] can retrieve it from there." (prin1-to-string (car values)) "]" calc-embedded-close-mode)))) (setq vars (cdr vars) - values (cdr values)))))))) + values (cdr values)))))) + (when (and vars calc-embedded-original-modes (eq calc-mode-save-mode 'save)) + (cond ((equal vars '(the-language)) + (setcar calc-embedded-original-modes + (cons calc-language calc-language-option))) + ((equal vars '(the-display-just)) + (let* ((modes (cdr calc-embedded-original-modes)) + (just (assq 'calc-display-just modes)) + (origin (assq 'calc-display-origin modes))) + (if just + (setcdr just calc-display-just)) + (if origin + (setcdr origin calc-display-origin)))) + (t + (let ((modes (cdr calc-embedded-original-modes))) + (while vars + (let* ((var (car vars)) + (cell (assq var modes))) + (if cell + (setcdr cell (symbol-value var)))) + (setq vars (cdr vars))))))))) (defun calc-embedded-var-change (var &optional buf) (if (symbolp var) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 1a7da113c1..2e829080c9 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -205,7 +205,7 @@ (setq font-lock-defaults '((lisp-font-lock-keywords lisp-font-lock-keywords-1 lisp-font-lock-keywords-2) - nil nil (("+-*/.<>=!?$%_&~^:" . "w")) nil + nil nil (("+-*/.<>=!?$%_&~^:@" . "w")) nil (font-lock-mark-block-function . mark-defun) (font-lock-syntactic-face-function . lisp-font-lock-syntactic-face-function)))) diff --git a/lisp/files.el b/lisp/files.el index 63a712be0e..2941f288cb 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1775,8 +1775,10 @@ in that case, this function acts as if `enable-local-variables' were t." ("\\.pro\\'" . idlwave-mode) ("\\.prolog\\'" . prolog-mode) ("\\.tar\\'" . tar-mode) - ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|ear\\|jar\\|war\\)\\'" . archive-mode) - ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|EAR\\|JAR\\|WAR\\)\\'" . archive-mode) + ;; The list of archive file extensions should be in sync with + ;; `auto-coding-alist' with `no-conversion' coding system. + ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\)\\'" . archive-mode) + ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\)\\'" . archive-mode) ("\\.sx[dmicw]\\'" . archive-mode) ; OpenOffice.org ;; Mailer puts message to be edited in ;; /tmp/Re.... or Message @@ -2687,6 +2689,7 @@ BACKUPNAME is the backup file name, which is the old file renamed." backup-by-copying ;; Don't rename a suid or sgid file. (and modes (< 0 (logand modes #o6000))) + (not (file-writable-p (file-name-directory real-file-name))) (and backup-by-copying-when-linked (> (file-nlinks real-file-name) 1)) (and (or backup-by-copying-when-mismatch @@ -3103,18 +3106,19 @@ on a DOS/Windows machine, it returns FILENAME on expanded form." ancestor)))))) (defun save-buffer (&optional args) - "Save current buffer in visited file if modified. Versions described below. + "Save current buffer in visited file if modified. Variations are described below. By default, makes the previous version into a backup file if previously requested or if this is the first save. -With 1 \\[universal-argument], marks this version +Prefixed with one \\[universal-argument], marks this version to become a backup when the next save is done. -With 2 \\[universal-argument]'s, +Prefixed with two \\[universal-argument]'s, unconditionally makes the previous version into a backup file. -With 3 \\[universal-argument]'s, marks this version +Prefixed with three \\[universal-argument]'s, marks this version to become a backup when the next save is done, and unconditionally makes the previous version into a backup file. -With argument of 0, never make the previous version into a backup file. +With a numeric argument of 0, never make the previous version +into a backup file. If a file's name is FOO, the names of its numbered backup versions are FOO.~i~ for various integers i. A non-numbered backup file is called FOO~. diff --git a/lisp/finder.el b/lisp/finder.el index dc7343b9fb..7a886e5480 100644 --- a/lisp/finder.el +++ b/lisp/finder.el @@ -301,11 +301,13 @@ FILE should be in a form suitable for passing to `locate-library'." (finder-summary))) (defun finder-current-item () - (if (and finder-headmark (< (point) finder-headmark)) - (error "No keyword or filename on this line") - (save-excursion - (beginning-of-line) - (current-word)))) + (let ((key (save-excursion + (beginning-of-line) + (current-word)))) + (if (or (and finder-headmark (< (point) finder-headmark)) + (= (length key) 0)) + (error "No keyword or filename on this line") + key))) (defun finder-select () "Select item on current line in a finder buffer." diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 715d418816..2cdda32109 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1909,7 +1909,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item." ;; Function declarations. "\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|" "setf\\|subst\\*?\\|un\\*?\\|" - "ine-\\(condition\\|\\(?:derived\\|minor\\)-mode\\|" + "ine-\\(condition\\|\\(?:derived\\|minor\\|generic\\)-mode\\|" "method-combination\\|setf-expander\\|skeleton\\|widget\\|" "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|" ;; Variable declarations. diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 88703af799..94f41c96e2 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1,6 +1,6 @@ -;;; generic-x.el --- Extra Modes for generic-mode -*- no-byte-compile: t -*- +;;; generic-x.el --- Extra Modes for generic-mode -;; Copyright (C) 1997, 1998, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2003, 2005 Free Software Foundation, Inc. ;; Author: Peter Breton <[email protected]> ;; Created: Tue Oct 08 1996 @@ -34,7 +34,7 @@ ;; (require 'generic-x) ;; ;; You can decide which modes to load by setting the variable -;; `generic-extras-enable-list'. Some platform-specific modes are +;; `generic-extras-enable-list'. Some platform-specific modes are ;; affected by the variables `generic-define-mswindows-modes' and ;; `generic-define-unix-modes' (which see). ;; @@ -92,7 +92,6 @@ ;;; Code: -(require 'generic) (require 'font-lock) (defgroup generic-x nil @@ -103,53 +102,52 @@ (defcustom generic-extras-enable-list nil "*List of generic modes to enable by default. -Each entry in the list should be a symbol. -The variables `generic-define-mswindows-modes' and `generic-define-unix-modes' -also affect which generic modes are defined. -Please note that if you set this variable after generic-x is loaded, -you must reload generic-x to enable the specified modes." +Each entry in the list should be a symbol. The variables +`generic-define-mswindows-modes' and `generic-define-unix-modes' +also affect which generic modes are defined. Please note that if +you set this variable after generic-x is loaded, you must reload +generic-x to enable the specified modes." :group 'generic-x - :type '(repeat sexp) - ) + :type '(repeat sexp)) (defcustom generic-define-mswindows-modes - (memq system-type (list 'windows-nt 'ms-dos)) + (memq system-type '(windows-nt ms-dos)) "*If non-nil, some MS-Windows specific generic modes will be defined." :group 'generic-x - :type 'boolean - ) + :type 'boolean) (defcustom generic-define-unix-modes - (not (memq system-type (list 'windows-nt 'ms-dos))) + (not (memq system-type '(windows-nt ms-dos))) "*If non-nil, some Unix specific generic modes will be defined." :group 'generic-x - :type 'boolean - ) + :type 'boolean) (and generic-define-mswindows-modes - (setq generic-extras-enable-list - (append (list 'bat-generic-mode 'ini-generic-mode - 'inf-generic-mode 'rc-generic-mode - 'reg-generic-mode 'rul-generic-mode - 'hosts-generic-mode - 'apache-conf-generic-mode - 'apache-log-generic-mode - ) - generic-extras-enable-list))) + (setq generic-extras-enable-list + (append (list 'bat-generic-mode + 'ini-generic-mode + 'inf-generic-mode + 'rc-generic-mode + 'reg-generic-mode + 'rul-generic-mode + 'hosts-generic-mode + 'apache-conf-generic-mode + 'apache-log-generic-mode) + generic-extras-enable-list))) (and generic-define-unix-modes (setq generic-extras-enable-list (append (list 'apache-conf-generic-mode 'apache-log-generic-mode 'samba-generic-mode - 'hosts-generic-mode 'fvwm-generic-mode + 'hosts-generic-mode + 'fvwm-generic-mode 'x-resource-generic-mode 'alias-generic-mode 'inetd-conf-generic-mode 'etc-services-generic-mode 'etc-passwd-generic-mode - 'etc-fstab-generic-mode - ) + 'etc-fstab-generic-mode) generic-extras-enable-list))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -157,382 +155,345 @@ you must reload generic-x to enable the specified modes." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Apache -(and - (memq 'apache-conf-generic-mode generic-extras-enable-list) - -(define-generic-mode 'apache-conf-generic-mode - (list ?#) - nil - '(("^\\s-*\\(<.*>\\)" 1 'font-lock-constant-face) - ("^\\s-*\\(\\sw+\\)\\s-" 1 'font-lock-variable-name-face)) - (list "srm\\.conf\\'" "httpd\\.conf\\'" "access\\.conf\\'") - (list - (function - (lambda () +(when (memq 'apache-conf-generic-mode generic-extras-enable-list) + +(define-generic-mode apache-conf-generic-mode + (list ?#) + nil + '(("^\\s-*\\(<.*>\\)" 1 'font-lock-constant-face) + ("^\\s-*\\(\\sw+\\)\\s-" 1 'font-lock-variable-name-face)) + (list "srm\\.conf\\'" "httpd\\.conf\\'" "access\\.conf\\'") + (list + (function + (lambda () (setq imenu-generic-expression '((nil "^\\([-A-Za-z0-9_]+\\)" 1) ("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1) - ("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1) - )) - ))) - "Generic mode for Apache or HTTPD configuration files.")) + ("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1)))))) + "Generic mode for Apache or HTTPD configuration files.")) -(and - (memq 'apache-log-generic-mode generic-extras-enable-list) +(when (memq 'apache-log-generic-mode generic-extras-enable-list) -(define-generic-mode 'apache-log-generic-mode +(define-generic-mode apache-log-generic-mode nil nil ;; Hostname ? user date request return-code number-of-bytes '(("^\\([-a-zA-z0-9.]+\\) - [-A-Za-z]+ \\(\\[.*\\]\\)" (1 font-lock-constant-face) - (2 font-lock-variable-name-face)) - ) + (2 font-lock-variable-name-face))) (list "access_log\\'") nil "Mode for Apache log files")) ;;; Samba -(and - (memq 'samba-generic-mode generic-extras-enable-list) - -(define-generic-mode 'samba-generic-mode - (list ?\; ?#) - nil - '( - ("^\\(\\[.*\\]\\)" 1 'font-lock-constant-face) - ("^\\s-*\\(.+\\)=\\([^\r\n]*\\)" - (1 'font-lock-variable-name-face) - (2 'font-lock-type-face)) - ) - (list "smb\\.conf\\'") - (list 'generic-bracket-support) - "Generic mode for Samba configuration files.")) +(when (memq 'samba-generic-mode generic-extras-enable-list) + +(define-generic-mode samba-generic-mode + (list ?\; ?#) + nil + '(("^\\(\\[.*\\]\\)" 1 'font-lock-constant-face) + ("^\\s-*\\(.+\\)=\\([^\r\n]*\\)" + (1 'font-lock-variable-name-face) + (2 'font-lock-type-face))) + (list "smb\\.conf\\'") + (list 'generic-bracket-support) + "Generic mode for Samba configuration files.")) ;;; Fvwm ;; This is pretty basic. Also, modes for other window managers could ;; be defined as well. -(and -(memq 'fvwm-generic-mode generic-extras-enable-list) +(when (memq 'fvwm-generic-mode generic-extras-enable-list) -(define-generic-mode 'fvwm-generic-mode - (list ?#) - (list - "AddToMenu" - "AddToFunc" - "ButtonStyle" - "EndFunction" - "EndPopup" - "Function" - "IconPath" - "Key" - "ModulePath" - "Mouse" - "PixmapPath" - "Popup" - "Style" - ) - nil - (list "\\.fvwmrc\\'" "\\.fvwm2rc\\'") - nil - "Generic mode for FVWM configuration files.")) +(define-generic-mode fvwm-generic-mode + (list ?#) + (list + "AddToMenu" + "AddToFunc" + "ButtonStyle" + "EndFunction" + "EndPopup" + "Function" + "IconPath" + "Key" + "ModulePath" + "Mouse" + "PixmapPath" + "Popup" + "Style") + nil + (list "\\.fvwmrc\\'" "\\.fvwm2rc\\'") + nil + "Generic mode for FVWM configuration files.")) ;;; X Resource ;; I'm pretty sure I've seen an actual mode to do this, but I don't ;; think it's standard with Emacs -(and - (memq 'x-resource-generic-mode generic-extras-enable-list) +(when (memq 'x-resource-generic-mode generic-extras-enable-list) -(define-generic-mode 'x-resource-generic-mode - (list ?!) - nil - '(("^\\([^:\n]+:\\)" 1 'font-lock-variable-name-face)) - (list "\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'") - nil - "Generic mode for X Resource configuration files.")) +(define-generic-mode x-resource-generic-mode + (list ?!) + nil + '(("^\\([^:\n]+:\\)" 1 'font-lock-variable-name-face)) + (list "\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'") + nil + "Generic mode for X Resource configuration files.")) ;;; Hosts -(and - (memq 'hosts-generic-mode generic-extras-enable-list) +(when (memq 'hosts-generic-mode generic-extras-enable-list) -(define-generic-mode 'hosts-generic-mode - (list ?#) - (list "localhost") - '(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 'font-lock-constant-face)) - (list "[hH][oO][sS][tT][sS]\\'") - nil - "Generic mode for HOSTS files.")) +(define-generic-mode hosts-generic-mode + (list ?#) + (list "localhost") + '(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 'font-lock-constant-face)) + (list "[hH][oO][sS][tT][sS]\\'") + nil + "Generic mode for HOSTS files.")) ;;; Windows INF files -(and - (memq 'inf-generic-mode generic-extras-enable-list) +(when (memq 'inf-generic-mode generic-extras-enable-list) -(define-generic-mode 'inf-generic-mode - (list ?\;) - nil - '(("^\\(\\[.*\\]\\)" 1 'font-lock-constant-face)) - (list "\\.[iI][nN][fF]\\'") - (list 'generic-bracket-support) - "Generic mode for MS-Windows INF files.")) +(define-generic-mode inf-generic-mode + (list ?\;) + nil + '(("^\\(\\[.*\\]\\)" 1 'font-lock-constant-face)) + (list "\\.[iI][nN][fF]\\'") + (list 'generic-bracket-support) + "Generic mode for MS-Windows INF files.")) ;;; Windows INI files ;; Should define escape character as well! -(and - (memq 'ini-generic-mode generic-extras-enable-list) - -(define-generic-mode 'ini-generic-mode - (list ?\;) - nil - '(("^\\(\\[.*\\]\\)" 1 'font-lock-constant-face) - ("^\\([^=\n\r]*\\)=\\([^\n\r]*\\)$" - (1 font-lock-function-name-face) - (2 font-lock-variable-name-face))) - (list "\\.[iI][nN][iI]\\'") - (list - (function - (lambda () - (setq imenu-generic-expression - '((nil "^\\[\\(.*\\)\\]" 1) - ("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))) - ))) - "Generic mode for MS-Windows INI files.")) +(when (memq 'ini-generic-mode generic-extras-enable-list) + +(define-generic-mode ini-generic-mode + (list ?\;) + nil + '(("^\\(\\[.*\\]\\)" 1 'font-lock-constant-face) + ("^\\([^=\n\r]*\\)=\\([^\n\r]*\\)$" + (1 font-lock-function-name-face) + (2 font-lock-variable-name-face))) + (list "\\.[iI][nN][iI]\\'") + (list + (function + (lambda () + (setq imenu-generic-expression + '((nil "^\\[\\(.*\\)\\]" 1) + ("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1)))))) + "Generic mode for MS-Windows INI files.")) ;;; Windows REG files ;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax! -(and - (memq 'reg-generic-mode generic-extras-enable-list) - -(define-generic-mode 'reg-generic-mode - '(?\;) - '("key" "classes_root" "REGEDIT" "REGEDIT4") - '(("\\(\\[.*]\\)" 1 'font-lock-constant-face) - ("^\\([^\n\r]*\\)\\s-*=" 1 'font-lock-variable-name-face)) - '("\\.[rR][eE][gG]\\'") - (list - (function - (lambda () - (setq imenu-generic-expression - '((nil "^\\s-*\\(.*\\)\\s-*=" 1)))))) - "Generic mode for MS-Windows Registry files.")) +(when (memq 'reg-generic-mode generic-extras-enable-list) + +(define-generic-mode reg-generic-mode + '(?\;) + '("key" "classes_root" "REGEDIT" "REGEDIT4") + '(("\\(\\[.*]\\)" 1 'font-lock-constant-face) + ("^\\([^\n\r]*\\)\\s-*=" 1 'font-lock-variable-name-face)) + '("\\.[rR][eE][gG]\\'") + (list + (function + (lambda () + (setq imenu-generic-expression + '((nil "^\\s-*\\(.*\\)\\s-*=" 1)))))) + "Generic mode for MS-Windows Registry files.")) ;;; DOS/Windows BAT files -(if (not (memq 'bat-generic-mode generic-extras-enable-list)) - nil -(define-generic-mode 'bat-generic-mode - nil - nil +(when (memq 'bat-generic-mode generic-extras-enable-list) + +(define-generic-mode bat-generic-mode + nil + nil + (list + ;; Make this one first in the list, otherwise comments will + ;; be over-written by other variables + (list "^[@ \t]*\\([rR][eE][mM][^\n\r]*\\)" 1 'font-lock-comment-face t) + (list "^[ \t]*\\(::.*\\)" 1 'font-lock-comment-face t) + (list + "^[@ \t]*\\([bB][rR][eE][aA][kK]\\|[vV][eE][rR][iI][fF][yY]\\)[ \t]+\\([oO]\\([nN]\\|[fF][fF]\\)\\)" + '(1 font-lock-builtin-face) + '(2 font-lock-constant-face t t)) + ;; Any text (except ON/OFF) following ECHO is a string. + (list + "^[@ \t]*\\([eE][cC][hH][oO]\\)[ \t]+\\(\\([oO]\\([nN]\\|[fF][fF]\\)\\)\\|\\([^>|\r\n]+\\)\\)" + '(1 font-lock-builtin-face) + '(3 font-lock-constant-face t t) + '(5 font-lock-string-face t t)) + ;; These keywords appear as the first word on a line. (Actually, they + ;; can also appear after "if ..." or "for ..." clause, but since they + ;; are frequently used in simple text, we punt.) + ;; In `generic-bat-mode-setup-function' we make the keywords + ;; case-insensitive + (generic-make-keywords-list (list - ;; Make this one first in the list, otherwise comments will - ;; be over-written by other variables - (list "^[@ \t]*\\([rR][eE][mM][^\n\r]*\\)" 1 'font-lock-comment-face t) - (list "^[ \t]*\\(::.*\\)" 1 'font-lock-comment-face t) - (list - "^[@ \t]*\\([bB][rR][eE][aA][kK]\\|[vV][eE][rR][iI][fF][yY]\\)[ \t]+\\([oO]\\([nN]\\|[fF][fF]\\)\\)" - '(1 font-lock-builtin-face) - '(2 font-lock-constant-face t t)) - ;; Any text (except ON/OFF) following ECHO is a string. - (list - "^[@ \t]*\\([eE][cC][hH][oO]\\)[ \t]+\\(\\([oO]\\([nN]\\|[fF][fF]\\)\\)\\|\\([^>|\r\n]+\\)\\)" - '(1 font-lock-builtin-face) - '(3 font-lock-constant-face t t) - '(5 font-lock-string-face t t)) - ;; These keywords appear as the first word on a line. (Actually, they - ;; can also appear after "if ..." or "for ..." clause, but since they - ;; are frequently used in simple text, we punt.) - ;; In `generic-bat-mode-setup-function' we make the keywords - ;; case-insensitive - (generic-make-keywords-list - (list - "for" - "if" - ) - 'font-lock-keyword-face "^[@ \t]*") - ;; These keywords can be anywhere on a line - ;; In `generic-bat-mode-setup-function' we make the keywords - ;; case-insensitive - (generic-make-keywords-list - (list - "do" - "exist" - "errorlevel" - "goto" - "not" - ) 'font-lock-keyword-face) - ;; These are built-in commands. Only frequently-used ones are listed. - (generic-make-keywords-list - (list - "CALL" "call" "Call" - "CD" "cd" "Cd" - "CLS" "cls" "Cls" - "COPY" "copy" "Copy" - "DEL" "del" "Del" - "ECHO" "echo" "Echo" - "MD" "md" "Md" - "PATH" "path" "Path" - "PAUSE" "pause" "Pause" - "PROMPT" "prompt" "Prompt" - "RD" "rd" "Rd" - "REN" "ren" "Ren" - "SET" "set" "Set" - "START" "start" "Start" - "SHIFT" "shift" "Shift" - ) 'font-lock-builtin-face "[ \t|\n]") - (list "^[ \t]*\\(:\\sw+\\)" 1 'font-lock-function-name-face t) - (list "\\(%\\sw+%\\)" 1 'font-lock-variable-name-face t) - (list "\\(%[0-9]\\)" 1 'font-lock-variable-name-face t) - (list "\\(/[^/ \"\t\n]+\\)" 1 'font-lock-type-face) - (list "[\t ]+\\([+-][^\t\n\" ]+\\)" 1 'font-lock-type-face) - (list "[ \t\n|]\\<\\([gG][oO][tT][oO]\\)\\>[ \t]*\\(\\sw+\\)?" - '(1 font-lock-keyword-face) - '(2 font-lock-function-name-face nil t)) - (list "[ \t\n|]\\<\\([sS][eE][tT]\\)\\>[ \t]*\\(\\sw+\\)?[ \t]*=?" - '(1 font-lock-builtin-face) - '(2 font-lock-variable-name-face t t)) - - ) + "for" + "if") + 'font-lock-keyword-face "^[@ \t]*") + ;; These keywords can be anywhere on a line + ;; In `generic-bat-mode-setup-function' we make the keywords + ;; case-insensitive + (generic-make-keywords-list (list - "\\.[bB][aA][tT]\\'" - "\\`[cC][oO][nN][fF][iI][gG]\\." - "\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\." ) - (list 'generic-bat-mode-setup-function) - "Generic mode for MS-Windows BAT files.") - - (defvar bat-generic-mode-syntax-table nil - "Syntax table in use in bat-generic-mode buffers.") - - (defvar bat-generic-mode-keymap (make-sparse-keymap) - "Keymap for bet-generic-mode.") - - (defun bat-generic-mode-compile () - "Run the current BAT file in a compilation buffer." - (interactive) - (let ((compilation-buffer-name-function - (function - (lambda(ign) - (concat "*" (buffer-file-name) "*"))) - ) - ) - (compile - (concat (w32-shell-name) " -c " (buffer-file-name))))) - - (defun bat-generic-mode-run-as-comint () - "Run the current BAT file in a comint buffer." - (interactive) - (require 'comint) - (let* ((file (buffer-file-name)) - (buf-name (concat "*" file "*"))) - (save-excursion - (set-buffer - (get-buffer-create buf-name)) - (erase-buffer) - (comint-mode) - (comint-exec - buf-name - file - (w32-shell-name) - nil - (list - "-c" - file - ) - ) - (display-buffer buf-name)))) - - (define-key bat-generic-mode-keymap "\C-c\C-c" 'bat-generic-mode-compile) - - ;; Make underscores count as words - (if bat-generic-mode-syntax-table - nil - (setq bat-generic-mode-syntax-table (make-syntax-table)) - (modify-syntax-entry ?_ "w" bat-generic-mode-syntax-table)) - - ;; bat-generic-mode doesn't use the comment functionality of generic-mode - ;; because it has a three-letter comment-string, so we do it - ;; here manually instead - (defun generic-bat-mode-setup-function () - (make-local-variable 'parse-sexp-ignore-comments) - (make-local-variable 'comment-start) - (make-local-variable 'comment-start-skip) - (make-local-variable 'comment-end) - (setq imenu-generic-expression '((nil "^:\\(\\sw+\\)" 1)) - parse-sexp-ignore-comments t - comment-end "" - comment-start "REM " - comment-start-skip "[Rr][Ee][Mm] *" - ) - (set-syntax-table bat-generic-mode-syntax-table) - ;; Make keywords case-insensitive - (setq font-lock-defaults (list 'generic-font-lock-defaults nil t)) - (use-local-map bat-generic-mode-keymap) - ) - ) + "do" + "exist" + "errorlevel" + "goto" + "not") + 'font-lock-keyword-face) + ;; These are built-in commands. Only frequently-used ones are listed. + (generic-make-keywords-list + (list + "CALL" "call" "Call" + "CD" "cd" "Cd" + "CLS" "cls" "Cls" + "COPY" "copy" "Copy" + "DEL" "del" "Del" + "ECHO" "echo" "Echo" + "MD" "md" "Md" + "PATH" "path" "Path" + "PAUSE" "pause" "Pause" + "PROMPT" "prompt" "Prompt" + "RD" "rd" "Rd" + "REN" "ren" "Ren" + "SET" "set" "Set" + "START" "start" "Start" + "SHIFT" "shift" "Shift") + 'font-lock-builtin-face "[ \t|\n]") + (list "^[ \t]*\\(:\\sw+\\)" 1 'font-lock-function-name-face t) + (list "\\(%\\sw+%\\)" 1 'font-lock-variable-name-face t) + (list "\\(%[0-9]\\)" 1 'font-lock-variable-name-face t) + (list "\\(/[^/ \"\t\n]+\\)" 1 'font-lock-type-face) + (list "[\t ]+\\([+-][^\t\n\" ]+\\)" 1 'font-lock-type-face) + (list "[ \t\n|]\\<\\([gG][oO][tT][oO]\\)\\>[ \t]*\\(\\sw+\\)?" + '(1 font-lock-keyword-face) + '(2 font-lock-function-name-face nil t)) + (list "[ \t\n|]\\<\\([sS][eE][tT]\\)\\>[ \t]*\\(\\sw+\\)?[ \t]*=?" + '(1 font-lock-builtin-face) + '(2 font-lock-variable-name-face t t))) + (list + "\\.[bB][aA][tT]\\'" + "\\`[cC][oO][nN][fF][iI][gG]\\." + "\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\." ) + (list 'generic-bat-mode-setup-function) + "Generic mode for MS-Windows BAT files.") + +(defvar bat-generic-mode-syntax-table nil + "Syntax table in use in bat-generic-mode buffers.") + +(defvar bat-generic-mode-keymap (make-sparse-keymap) + "Keymap for bet-generic-mode.") + +(defun bat-generic-mode-compile () + "Run the current BAT file in a compilation buffer." + (interactive) + (let ((compilation-buffer-name-function + (function + (lambda(ign) + (concat "*" (buffer-file-name) "*"))))) + (compile + (concat (w32-shell-name) " -c " (buffer-file-name))))) + +(defun bat-generic-mode-run-as-comint () + "Run the current BAT file in a comint buffer." + (interactive) + (require 'comint) + (let* ((file (buffer-file-name)) + (buf-name (concat "*" file "*"))) + (save-excursion + (set-buffer + (get-buffer-create buf-name)) + (erase-buffer) + (comint-mode) + (comint-exec + buf-name + file + (w32-shell-name) + nil + (list "-c" file)) + (display-buffer buf-name)))) + +(define-key bat-generic-mode-keymap "\C-c\C-c" 'bat-generic-mode-compile) + +;; Make underscores count as words +(unless bat-generic-mode-syntax-table + (setq bat-generic-mode-syntax-table (make-syntax-table)) + (modify-syntax-entry ?_ "w" bat-generic-mode-syntax-table)) + +;; bat-generic-mode doesn't use the comment functionality of generic-mode +;; because it has a three-letter comment-string, so we do it +;; here manually instead +(defun generic-bat-mode-setup-function () + (make-local-variable 'parse-sexp-ignore-comments) + (make-local-variable 'comment-start) + (make-local-variable 'comment-start-skip) + (make-local-variable 'comment-end) + (setq imenu-generic-expression '((nil "^:\\(\\sw+\\)" 1)) + parse-sexp-ignore-comments t + comment-end "" + comment-start "REM " + comment-start-skip "[Rr][Ee][Mm] *") + (set-syntax-table bat-generic-mode-syntax-table) + ;; Make keywords case-insensitive + (setq font-lock-defaults (list 'generic-font-lock-defaults nil t)) + (use-local-map bat-generic-mode-keymap))) ;;; Mailagent ;; Mailagent is a Unix mail filtering program. Anyone wanna do a generic mode ;; for procmail? -(and - (memq 'mailagent-rules-generic-mode generic-extras-enable-list) - -(define-generic-mode 'mailagent-rules-generic-mode - (list ?#) - (list "SAVE" "DELETE" "PIPE" "ANNOTATE" "REJECT") - '(("^\\(\\sw+\\)\\s-*=" 1 'font-lock-variable-name-face) - ("\\s-/\\([^/]+\\)/[i, \t\n]" 1 'font-lock-constant-face)) - (list "\\.rules\\'") - (list 'mailagent-rules-setup-function) - "Mode for Mailagent rules files.") +(when (memq 'mailagent-rules-generic-mode generic-extras-enable-list) + +(define-generic-mode mailagent-rules-generic-mode + (list ?#) + (list "SAVE" "DELETE" "PIPE" "ANNOTATE" "REJECT") + '(("^\\(\\sw+\\)\\s-*=" 1 'font-lock-variable-name-face) + ("\\s-/\\([^/]+\\)/[i, \t\n]" 1 'font-lock-constant-face)) + (list "\\.rules\\'") + (list 'mailagent-rules-setup-function) + "Mode for Mailagent rules files.") (defun mailagent-rules-setup-function () - (make-local-variable 'imenu-generic-expression) - (setq imenu-generic-expression - '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1)))) - ) + (make-local-variable 'imenu-generic-expression) + (setq imenu-generic-expression + '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))) ;; Solaris/Sys V prototype files -(and - (memq 'prototype-generic-mode generic-extras-enable-list) - -(define-generic-mode 'prototype-generic-mode - (list ?#) - nil - '( - ("^\\([0-9]\\)?\\s-*\\([a-z]\\)\\s-+\\([A-Za-z_]+\\)\\s-+\\([^\n\r]*\\)$" - (2 font-lock-constant-face) - (3 font-lock-keyword-face)) - ("^\\([a-z]\\) \\([A-Za-z_]+\\)=\\([^\n\r]*\\)$" - (1 font-lock-constant-face) - (2 font-lock-keyword-face) - (3 font-lock-variable-name-face)) - ("^\\(!\\s-*\\(search\\|include\\|default\\)\\)\\s-*\\([^\n\r]*\\)$" - (1 font-lock-keyword-face) - (3 font-lock-variable-name-face)) - ("^\\(!\\s-*\\sw+\\)=\\([^\n\r]*\\)$" - (1 font-lock-keyword-face) - (2 font-lock-variable-name-face)) - ) - (list "prototype\\'") - nil - "Mode for Sys V prototype files.")) +(when (memq 'prototype-generic-mode generic-extras-enable-list) + +(define-generic-mode prototype-generic-mode + (list ?#) + nil + '(("^\\([0-9]\\)?\\s-*\\([a-z]\\)\\s-+\\([A-Za-z_]+\\)\\s-+\\([^\n\r]*\\)$" + (2 font-lock-constant-face) + (3 font-lock-keyword-face)) + ("^\\([a-z]\\) \\([A-Za-z_]+\\)=\\([^\n\r]*\\)$" + (1 font-lock-constant-face) + (2 font-lock-keyword-face) + (3 font-lock-variable-name-face)) + ("^\\(!\\s-*\\(search\\|include\\|default\\)\\)\\s-*\\([^\n\r]*\\)$" + (1 font-lock-keyword-face) + (3 font-lock-variable-name-face)) + ("^\\(!\\s-*\\sw+\\)=\\([^\n\r]*\\)$" + (1 font-lock-keyword-face) + (2 font-lock-variable-name-face))) + (list "prototype\\'") + nil + "Mode for Sys V prototype files.")) ;; Solaris/Sys V pkginfo files -(and - (memq 'pkginfo-generic-mode generic-extras-enable-list) - -(define-generic-mode 'pkginfo-generic-mode - (list ?#) - nil - '( - ("^\\([A-Za-z_]+\\)=\\([^\n\r]*\\)$" - (1 font-lock-keyword-face) - (2 font-lock-variable-name-face)) - ) - (list "pkginfo\\'") - nil - "Mode for Sys V pkginfo files.")) +(when (memq 'pkginfo-generic-mode generic-extras-enable-list) + +(define-generic-mode pkginfo-generic-mode + (list ?#) + nil + '(("^\\([A-Za-z_]+\\)=\\([^\n\r]*\\)$" + (1 font-lock-keyword-face) + (2 font-lock-variable-name-face))) + (list "pkginfo\\'") + nil + "Mode for Sys V pkginfo files.")) ;; Javascript mode ;; Includes extra keywords from Armando Singer [[email protected]] -(define-generic-mode 'javascript-generic-mode +(define-generic-mode javascript-generic-mode (list "//" '("/*" . "*/")) (list "break" @@ -594,27 +555,23 @@ you must reload generic-x to enable the specified modes." "synchronized" "throws" "transient" - "true" - ) + "true") (list (list "^\\s-*function\\s-+\\([A-Za-z0-9_]+\\)" - '(1 font-lock-function-name-face)) - (list "^\\s-*var\\s-+\\([A-Za-z0-9_]+\\)" - '(1 font-lock-variable-name-face)) - ) + '(1 font-lock-function-name-face)) + (list "^\\s-*var\\s-+\\([A-Za-z0-9_]+\\)" + '(1 font-lock-variable-name-face))) (list "\\.js\\'") (list (function (lambda () (setq imenu-generic-expression '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1) - ("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1) - )) - ))) + ("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1)))))) "Mode for JavaScript files.") ;; VRML files -(define-generic-mode 'vrml-generic-mode +(define-generic-mode vrml-generic-mode (list ?#) (list "DEF" @@ -644,8 +601,7 @@ you must reload generic-x to enable the specified modes." "textureTransform" "title" "transparency" - "type" - ) + "type") (list (list "USE\\s-+\\([-A-Za-z0-9_]+\\)" '(1 font-lock-constant-face)) @@ -656,8 +612,7 @@ you must reload generic-x to enable the specified modes." '(1 font-lock-function-name-face)) (list "^\\s-*\\(geometry\\|appearance\\|material\\)\\s-+\\([-A-Za-z0-9_]+\\)" - '(2 font-lock-variable-name-face)) - ) + '(2 font-lock-variable-name-face))) (list "\\.wrl\\'") (list (function @@ -666,12 +621,11 @@ you must reload generic-x to enable the specified modes." '((nil "^\\([A-Za-z0-9_]+\\)\\s-*{" 1) ("*Definitions*" "DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{" - 1))) - ))) + 1)))))) "Generic Mode for VRML files.") ;; Java Manifests -(define-generic-mode 'java-manifest-generic-mode +(define-generic-mode java-manifest-generic-mode (list ?#) (list "Name" @@ -681,26 +635,23 @@ you must reload generic-x to enable the specified modes." "Signature-Version" "Magic" "Java-Bean" - "Depends-On" - ) + "Depends-On") '(("^Name:\\s-+\\([^\n\r]*\\)$" (1 font-lock-variable-name-face)) ("^\\(Manifest\\|Required\\|Signature\\)-Version:\\s-+\\([^\n\r]*\\)$" - (2 font-lock-constant-face)) - ) + (2 font-lock-constant-face))) (list "[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'") nil "Mode for Java Manifest files") ;; Java properties files -(define-generic-mode 'java-properties-generic-mode +(define-generic-mode java-properties-generic-mode (list ?! ?#) nil (let ((java-properties-key "\\(\\([-A-Za-z0-9_\\./]\\|\\(\\\\[ =:]\\)\\)+\\)") (java-properties-value - "\\([^\r\n]*\\)") - ) + "\\([^\r\n]*\\)")) ;; Property and value can be separated in a number of different ways: ;; * whitespace ;; * an equal sign @@ -711,143 +662,133 @@ you must reload generic-x to enable the specified modes." (list (concat "^" java-properties-key elt java-properties-value "$") '(1 font-lock-constant-face) - '(4 font-lock-variable-name-face) - ))) + '(4 font-lock-variable-name-face)))) ;; These are the separators - (list ":\\s-*" "\\s-+" "\\s-*=\\s-*") - ) - ) + (list ":\\s-*" "\\s-+" "\\s-*=\\s-*"))) nil (list (function (lambda () (setq imenu-generic-expression - '((nil "^\\([^#! \t\n\r=:]+\\)" 1))) - ))) + '((nil "^\\([^#! \t\n\r=:]+\\)" 1)))))) "Mode for Java properties files.") ;; C shell alias definitions -(and - (memq 'alias-generic-mode generic-extras-enable-list) +(when (memq 'alias-generic-mode generic-extras-enable-list) -(define-generic-mode 'alias-generic-mode +(define-generic-mode alias-generic-mode (list ?#) (list "alias" "unalias") '(("^alias\\s-+\\([-A-Za-z0-9_]+\\)\\s-+" (1 font-lock-variable-name-face)) ("^unalias\\s-+\\([-A-Za-z0-9_]+\\)\\s-*$" - (1 font-lock-variable-name-face)) - ) + (1 font-lock-variable-name-face))) (list "alias\\'") (list (function (lambda () (setq imenu-generic-expression - '((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))) - ))) - "Mode for C Shell alias files.") -) + '((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2)))))) + "Mode for C Shell alias files.")) ;;; Windows RC files ;; Contributed by [email protected] (Alfred Correira) -(and - (memq 'rc-generic-mode generic-extras-enable-list) - -(define-generic-mode 'rc-generic-mode -;; (list ?\/) - (list "//") - '("ACCELERATORS" - "AUTO3STATE" - "AUTOCHECKBOX" - "AUTORADIOBUTTON" - "BITMAP" - "BOTTOMMARGIN" - "BUTTON" - "CAPTION" - "CHARACTERISTICS" - "CHECKBOX" - "CLASS" - "COMBOBOX" - "CONTROL" - "CTEXT" - "CURSOR" - "DEFPUSHBUTTON" - "DESIGNINFO" - "DIALOG" - "DISCARDABLE" - "EDITTEXT" - "EXSTYLE" - "FONT" - "GROUPBOX" - "GUIDELINES" - "ICON" - "LANGUAGE" - "LEFTMARGIN" - "LISTBOX" - "LTEXT" - "MENUITEM SEPARATOR" - "MENUITEM" - "MENU" - "MOVEABLE" - "POPUP" - "PRELOAD" - "PURE" - "PUSHBOX" - "PUSHBUTTON" - "RADIOBUTTON" - "RCDATA" - "RIGHTMARGIN" - "RTEXT" - "SCROLLBAR" - "SEPARATOR" - "STATE3" - "STRINGTABLE" - "STYLE" - "TEXTINCLUDE" - "TOOLBAR" - "TOPMARGIN" - "VERSIONINFO" - "VERSION" - ) - ;; the choice of what tokens go where is somewhat arbitrary, - ;; as is the choice of which value tokens are included, as - ;; the choice of face for each token group - (list - (eval-when-compile - (generic-make-keywords-list - (list - "FILEFLAGSMASK" - "FILEFLAGS" - "FILEOS" - "FILESUBTYPE" - "FILETYPE" - "FILEVERSION" - "PRODUCTVERSION" - ) 'font-lock-type-face)) - (eval-when-compile - (generic-make-keywords-list - (list - "BEGIN" - "BLOCK" - "END" - "VALUE" - ) 'font-lock-function-name-face)) - '("^#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)" 1 font-lock-string-face) - '("^#[ \t]*define[ \t]+\\(\\sw+\\)(" 1 font-lock-function-name-face) - '("^#[ \t]*\\(elif\\|if\\)\\>" - ("\\<\\(defined\\)\\>[ \t]*(?\\(\\sw+\\)?" nil nil - (1 font-lock-constant-face) (2 font-lock-variable-name-face nil t))) - '("^#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?" +(when (memq 'rc-generic-mode generic-extras-enable-list) + +(define-generic-mode rc-generic-mode + ;; (list ?\/) + (list "//") + '("ACCELERATORS" + "AUTO3STATE" + "AUTOCHECKBOX" + "AUTORADIOBUTTON" + "BITMAP" + "BOTTOMMARGIN" + "BUTTON" + "CAPTION" + "CHARACTERISTICS" + "CHECKBOX" + "CLASS" + "COMBOBOX" + "CONTROL" + "CTEXT" + "CURSOR" + "DEFPUSHBUTTON" + "DESIGNINFO" + "DIALOG" + "DISCARDABLE" + "EDITTEXT" + "EXSTYLE" + "FONT" + "GROUPBOX" + "GUIDELINES" + "ICON" + "LANGUAGE" + "LEFTMARGIN" + "LISTBOX" + "LTEXT" + "MENUITEM SEPARATOR" + "MENUITEM" + "MENU" + "MOVEABLE" + "POPUP" + "PRELOAD" + "PURE" + "PUSHBOX" + "PUSHBUTTON" + "RADIOBUTTON" + "RCDATA" + "RIGHTMARGIN" + "RTEXT" + "SCROLLBAR" + "SEPARATOR" + "STATE3" + "STRINGTABLE" + "STYLE" + "TEXTINCLUDE" + "TOOLBAR" + "TOPMARGIN" + "VERSIONINFO" + "VERSION") + ;; the choice of what tokens go where is somewhat arbitrary, + ;; as is the choice of which value tokens are included, as + ;; the choice of face for each token group + (list + (eval-when-compile + (generic-make-keywords-list + (list + "FILEFLAGSMASK" + "FILEFLAGS" + "FILEOS" + "FILESUBTYPE" + "FILETYPE" + "FILEVERSION" + "PRODUCTVERSION") + 'font-lock-type-face)) + (eval-when-compile + (generic-make-keywords-list + (list + "BEGIN" + "BLOCK" + "END" + "VALUE") + 'font-lock-function-name-face)) + '("^#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)" 1 font-lock-string-face) + '("^#[ \t]*define[ \t]+\\(\\sw+\\)(" 1 font-lock-function-name-face) + '("^#[ \t]*\\(elif\\|if\\)\\>" + ("\\<\\(defined\\)\\>[ \t]*(?\\(\\sw+\\)?" nil nil (1 font-lock-constant-face) (2 font-lock-variable-name-face nil t))) - (list "\\.[rR][cC]$") - nil - "Generic mode for MS-Windows Resource files.")) + '("^#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?" + (1 font-lock-constant-face) (2 font-lock-variable-name-face nil t))) + (list "\\.[rR][cC]$") + nil + "Generic mode for MS-Windows Resource files.")) ;; InstallShield RUL files ;; Contributed by [email protected] ;; Bugfixes by "Rolf Sandau" <[email protected]> -(and -(memq 'rul-generic-mode generic-extras-enable-list) +(when (memq 'rul-generic-mode generic-extras-enable-list) + ;;; build the regexp strings using regexp-opt (defvar installshield-statement-keyword-list (list @@ -882,8 +823,7 @@ you must reload generic-x to enable the specified modes." "typedef" "until" "void" - "while" - ) + "while") "Statement keywords used in InstallShield 3 and 5.") (defvar installshield-system-functions-list @@ -907,39 +847,39 @@ you must reload generic-x to enable the specified modes." "ChangeDirectory" "CloseFile" "CmdGetHwndDlg" - "ComponentAddItem" ; differs between IS3 and IS5 - "ComponentCompareSizeRequired" ; IS5 only + "ComponentAddItem" ; differs between IS3 and IS5 + "ComponentCompareSizeRequired" ; IS5 only "ComponentDialog" - "ComponentError" ; IS5 only - "ComponentFileEnum" ; IS5 only - "ComponentFileInfo" ; IS5 only - "ComponentFilterLanguage" ; IS5 only - "ComponentFilterOS" ; IS5 only - "ComponentGetData" ; IS5 only - "ComponentGetItemInfo" ; IS3 only - "ComponentGetItemSize" ; differs between IS3 and IS5 - "ComponentIsItemSelected" ; differs between IS3 and IS5 + "ComponentError" ; IS5 only + "ComponentFileEnum" ; IS5 only + "ComponentFileInfo" ; IS5 only + "ComponentFilterLanguage" ; IS5 only + "ComponentFilterOS" ; IS5 only + "ComponentGetData" ; IS5 only + "ComponentGetItemInfo" ; IS3 only + "ComponentGetItemSize" ; differs between IS3 and IS5 + "ComponentIsItemSelected" ; differs between IS3 and IS5 "ComponentListItems" - "ComponentMoveData" ; IS5 only - "ComponentSelectItem" ; differs between IS3 and IS5 - "ComponentSetData" ; IS5 only - "ComponentSetItemInfo" ; IS3 only - "ComponentSetTarget" ; IS5 only - "ComponentSetupTypeEnum" ; IS5 only - "ComponentSetupTypeGetData" ; IS5 only - "ComponentSetupTypeSet" ; IS5 only + "ComponentMoveData" ; IS5 only + "ComponentSelectItem" ; differs between IS3 and IS5 + "ComponentSetData" ; IS5 only + "ComponentSetItemInfo" ; IS3 only + "ComponentSetTarget" ; IS5 only + "ComponentSetupTypeEnum" ; IS5 only + "ComponentSetupTypeGetData" ; IS5 only + "ComponentSetupTypeSet" ; IS5 only "ComponentTotalSize" - "ComponentValidate" ; IS5 only - "CompressAdd" ; IS3 only - "CompressDel" ; IS3 only - "CompressEnum" ; IS3 only - "CompressGet" ; IS3 only - "CompressInfo" ; IS3 only + "ComponentValidate" ; IS5 only + "CompressAdd" ; IS3 only + "CompressDel" ; IS3 only + "CompressEnum" ; IS3 only + "CompressGet" ; IS3 only + "CompressInfo" ; IS3 only "CopyFile" "CreateDir" "CreateFile" "CreateProgramFolder" - "DeinstallSetReference" ; IS5 only + "DeinstallSetReference" ; IS5 only "DeinstallStart" "Delay" "DeleteDir" @@ -965,12 +905,12 @@ you must reload generic-x to enable the specified modes." "FileDeleteLine" "FileGrep" "FileInsertLine" - "FileSetBeginDefine" ; IS3 only - "FileSetEndDefine" ; IS3 only - "FileSetPerformEz" ; IS3 only - "FileSetPerform" ; IS3 only - "FileSetReset" ; IS3 only - "FileSetRoot" ; IS3 only + "FileSetBeginDefine" ; IS3 only + "FileSetEndDefine" ; IS3 only + "FileSetPerformEz" ; IS3 only + "FileSetPerform" ; IS3 only + "FileSetReset" ; IS3 only + "FileSetRoot" ; IS3 only "FindAllDirs" "FindAllFiles" "FindFile" @@ -1024,7 +964,7 @@ you must reload generic-x to enable the specified modes." "Path" "PlaceBitmap" "PlaceWindow" - "PlayMMedia" ; IS5 only + "PlayMMedia" ; IS5 only "ProgDefGroupType" "RegDBCreateKeyEx" "RegDBDeleteValue" @@ -1084,7 +1024,7 @@ you must reload generic-x to enable the specified modes." "SdSelectFolder" "SdSetSequentialItems" "SdSetStatic" - "SdSetupTypeEx" ; IS5 only + "SdSetupTypeEx" ; IS5 only "SdSetupType" "SdShowAnyDialog" "SdShowDlgEdit1" @@ -1101,14 +1041,14 @@ you must reload generic-x to enable the specified modes." "SetColor" "SetFont" "SetDialogTitle" - "SetDisplayEffect" ; IS5 only + "SetDisplayEffect" ; IS5 only "SetFileInfo" "SetForegroundWindow" "SetStatusWindow" "SetTitle" "SetupType" "ShowProgramFolder" - "Split" ; IS3 only + "Split" ; IS3 only "SprintfBox" "Sprintf" "StatusUpdate" @@ -1129,8 +1069,7 @@ you must reload generic-x to enable the specified modes." "Welcome" "WriteLine" "WriteProfString" - "XCopyFile" - ) + "XCopyFile") "System functions defined in InstallShield 3 and 5.") (defvar installshield-system-variables-list @@ -1163,8 +1102,7 @@ you must reload generic-x to enable the specified modes." "WINDISK" "WINMAJOR" "WINSYSDIR" - "WINSYSDISK" - ) + "WINSYSDISK") "System variables used in InstallShield 3 and 5.") (defvar installshield-types-list @@ -1186,8 +1124,7 @@ you must reload generic-x to enable the specified modes." "RGB" "SHORT" "STRINGLIST" - "STRING" - ) + "STRING") "Type keywords used in InstallShield 3 and 5.") ;;; some might want to skip highlighting these to improve performance @@ -1397,111 +1334,104 @@ you must reload generic-x to enable the specified modes." "WINMINOR" "WIN32SINSTALLED" "WIN32SMAJOR" - "WIN32SMINOR" - ) + "WIN32SMINOR") "Function argument constants used in InstallShield 3 and 5.") -(progn - (defvar rul-generic-mode-syntax-table nil - "Syntax table to use in rul-generic-mode buffers.") - - (setq rul-generic-mode-syntax-table - (make-syntax-table c++-mode-syntax-table)) - - (modify-syntax-entry ?\r "> b" rul-generic-mode-syntax-table) - (modify-syntax-entry ?\n "> b" rul-generic-mode-syntax-table) - - (modify-syntax-entry ?/ ". 124b" rul-generic-mode-syntax-table) - (modify-syntax-entry ?* ". 23" rul-generic-mode-syntax-table) - - ;; here manually instead - (defun generic-rul-mode-setup-function () - (make-local-variable 'parse-sexp-ignore-comments) - (make-local-variable 'comment-start) - (make-local-variable 'comment-start-skip) - (make-local-variable 'comment-end) - (setq imenu-generic-expression - '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)) - parse-sexp-ignore-comments t - comment-end "*/" - comment-start "/*" -;; comment-end "" -;; comment-start "//" -;; comment-start-skip "" - ) -;; (set-syntax-table rul-generic-mode-syntax-table) - (setq font-lock-syntax-table rul-generic-mode-syntax-table) - ) - - ;; moved mode-definition behind defun-definition to be warning-free - 15.11.02/RSan - (define-generic-mode 'rul-generic-mode - ;; Using "/*" and "*/" doesn't seem to be working right - (list "//" '("/*" . "*/" )) - installshield-statement-keyword-list - (list - ;; preprocessor constructs - '("#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)" - 1 font-lock-string-face) - '("#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?" - (1 font-lock-reference-face) - (2 font-lock-variable-name-face nil t)) - ;; indirect string constants - '("\\(@[A-Za-z][A-Za-z0-9_]+\\)" 1 font-lock-builtin-face) - ;; gotos - '("[ \t]*\\(\\sw+:\\)" 1 font-lock-reference-face) - '("\\<\\(goto\\)\\>[ \t]*\\(\\sw+\\)?" - (1 font-lock-keyword-face) - (2 font-lock-reference-face nil t)) - ;; system variables - (generic-make-keywords-list - installshield-system-variables-list - 'font-lock-variable-name-face "[^_]" "[^_]") - ;; system functions - (generic-make-keywords-list - installshield-system-functions-list - 'font-lock-function-name-face "[^_]" "[^_]") - ;; type keywords - (generic-make-keywords-list - installshield-types-list - 'font-lock-type-face "[^_]" "[^_]") - ;; function argument constants - (generic-make-keywords-list - installshield-funarg-constants-list - 'font-lock-variable-name-face "[^_]" "[^_]") ; is this face the best choice? - ) - (list "\\.[rR][uU][lL]$") - (list 'generic-rul-mode-setup-function) - "Generic mode for InstallShield RUL files.") -) +(defvar rul-generic-mode-syntax-table nil + "Syntax table to use in rul-generic-mode buffers.") + +(setq rul-generic-mode-syntax-table + (make-syntax-table c++-mode-syntax-table)) + +(modify-syntax-entry ?\r "> b" rul-generic-mode-syntax-table) +(modify-syntax-entry ?\n "> b" rul-generic-mode-syntax-table) + +(modify-syntax-entry ?/ ". 124b" rul-generic-mode-syntax-table) +(modify-syntax-entry ?* ". 23" rul-generic-mode-syntax-table) + +;; here manually instead +(defun generic-rul-mode-setup-function () + (make-local-variable 'parse-sexp-ignore-comments) + (make-local-variable 'comment-start) + (make-local-variable 'comment-start-skip) + (make-local-variable 'comment-end) + (setq imenu-generic-expression + '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)) + parse-sexp-ignore-comments t + comment-end "*/" + comment-start "/*" +;;; comment-end "" +;;; comment-start "//" +;;; comment-start-skip "" + ) + ;; (set-syntax-table rul-generic-mode-syntax-table) + (setq font-lock-syntax-table rul-generic-mode-syntax-table)) + +;; moved mode-definition behind defun-definition to be warning-free - 15.11.02/RSan +(define-generic-mode rul-generic-mode + ;; Using "/*" and "*/" doesn't seem to be working right + (list "//" '("/*" . "*/" )) + installshield-statement-keyword-list + (list + ;; preprocessor constructs + '("#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)" + 1 font-lock-string-face) + '("#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?" + (1 font-lock-reference-face) + (2 font-lock-variable-name-face nil t)) + ;; indirect string constants + '("\\(@[A-Za-z][A-Za-z0-9_]+\\)" 1 font-lock-builtin-face) + ;; gotos + '("[ \t]*\\(\\sw+:\\)" 1 font-lock-reference-face) + '("\\<\\(goto\\)\\>[ \t]*\\(\\sw+\\)?" + (1 font-lock-keyword-face) + (2 font-lock-reference-face nil t)) + ;; system variables + (generic-make-keywords-list + installshield-system-variables-list + 'font-lock-variable-name-face "[^_]" "[^_]") + ;; system functions + (generic-make-keywords-list + installshield-system-functions-list + 'font-lock-function-name-face "[^_]" "[^_]") + ;; type keywords + (generic-make-keywords-list + installshield-types-list + 'font-lock-type-face "[^_]" "[^_]") + ;; function argument constants + (generic-make-keywords-list + installshield-funarg-constants-list + 'font-lock-variable-name-face "[^_]" "[^_]")) ; is this face the best choice? + (list "\\.[rR][uU][lL]$") + (list 'generic-rul-mode-setup-function) + "Generic mode for InstallShield RUL files.") + (define-skeleton rul-if - "Insert an if statement." - "condition: " - "if(" str ") then" \n - > _ \n - ( "other condition, %s: " - > "elseif(" str ") then" \n - > \n) - > "else" \n - > \n - resume: - > "endif;" - ) + "Insert an if statement." + "condition: " + "if(" str ") then" \n + > _ \n + ( "other condition, %s: " + > "elseif(" str ") then" \n + > \n) + > "else" \n + > \n + resume: + > "endif;") (define-skeleton rul-function "Insert a function statement." "function: " "function " str " ()" \n ( "local variables, %s: " - > " " str ";" \n) + > " " str ";" \n) > "begin" \n > _ \n resume: - > "end;") - -) + > "end;")) ;; Additions by [email protected] (Alfred Correira) -(define-generic-mode 'mailrc-generic-mode +(define-generic-mode mailrc-generic-mode (list ?#) (list "alias" @@ -1512,8 +1442,7 @@ you must reload generic-x to enable the specified modes." "ignore" "set" "source" - "unset" - ) + "unset") '(("^\\s-*\\(alias\\|group\\)\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([^\n\r#]*\\)\\(#.*\\)?$" (2 font-lock-constant-face) (3 font-lock-variable-name-face)) ("^\\s-*\\(unset\\|set\\|ignore\\)\\s-+\\([-A-Za-z0-9_]+\\)=?\\([^\n\r#]*\\)\\(#.*\\)?$" @@ -1525,10 +1454,9 @@ you must reload generic-x to enable the specified modes." "Mode for mailrc files.") ;; Inetd.conf -(and - (memq 'inetd-conf-generic-mode generic-extras-enable-list) +(when (memq 'inetd-conf-generic-mode generic-extras-enable-list) -(define-generic-mode 'inetd-conf-generic-mode +(define-generic-mode inetd-conf-generic-mode (list ?#) (list "stream" @@ -1537,142 +1465,139 @@ you must reload generic-x to enable the specified modes." "udp" "wait" "nowait" - "internal" - ) - '( - ("^\\([-A-Za-z0-9_]+\\)" - 1 'font-lock-type-face) - ) + "internal") + '(("^\\([-A-Za-z0-9_]+\\)" + 1 'font-lock-type-face)) '("/etc/inetd.conf\\'") (list (function (lambda () (setq imenu-generic-expression - '((nil "^\\([-A-Za-z0-9_]+\\)" 1))) - ))) - ) -) + '((nil "^\\([-A-Za-z0-9_]+\\)" 1)))))))) ;; Services -(and - (memq 'etc-services-generic-mode generic-extras-enable-list) +(when (memq 'etc-services-generic-mode generic-extras-enable-list) -(define-generic-mode 'etc-services-generic-mode +(define-generic-mode etc-services-generic-mode (list ?#) (list "tcp" "udp" - "ddp" - ) - '( - ("^\\([-A-Za-z0-9_]+\\)\\s-+\\([0-9]+\\)/" + "ddp") + '(("^\\([-A-Za-z0-9_]+\\)\\s-+\\([0-9]+\\)/" (1 'font-lock-type-face) - (2 'font-lock-variable-name-face) - ) - ) + (2 'font-lock-variable-name-face))) '("/etc/services\\'") (list (function (lambda () (setq imenu-generic-expression - '((nil "^\\([-A-Za-z0-9_]+\\)" 1))) - ))) - ) -) + '((nil "^\\([-A-Za-z0-9_]+\\)" 1)))))))) ;; Password and Group files -(and - (memq 'etc-passwd-generic-mode generic-extras-enable-list) +(when (memq 'etc-passwd-generic-mode generic-extras-enable-list) -(define-generic-mode 'etc-passwd-generic-mode +(define-generic-mode etc-passwd-generic-mode nil ;; No comment characters (list "root") ;; Only one keyword (list - (list - (concat - "^" - ;; User name -- Never blank! - "\\([^:]+\\)" - ":" - ;; Password, UID and GID - (mapconcat - 'identity - (make-list 3 "\\([^:]+\\)") - ":" - ) - ":" - ;; GECOS/Name -- might be blank - "\\([^:]*\\)" - ":" - ;; Home directory and shell - "\\([^:]+\\)" - ":?" - "\\([^:]*\\)" - "$" - ) - '(1 'font-lock-type-face) - '(5 'font-lock-variable-name-face) - '(6 'font-lock-constant-face) - '(7 'font-lock-warning-face) - ) - '("^\\([^:]+\\):\\([^:]*\\):\\([0-9]+\\):\\(.*\\)$" - (1 'font-lock-type-face) - (4 'font-lock-variable-name-face) - ) - ) + (list + (concat + "^" + ;; User name -- Never blank! + "\\([^:]+\\)" + ":" + ;; Password, UID and GID + (mapconcat + 'identity + (make-list 3 "\\([^:]+\\)") + ":") + ":" + ;; GECOS/Name -- might be blank + "\\([^:]*\\)" + ":" + ;; Home directory and shell + "\\([^:]+\\)" + ":?" + "\\([^:]*\\)" + "$") + '(1 'font-lock-type-face) + '(5 'font-lock-variable-name-face) + '(6 'font-lock-constant-face) + '(7 'font-lock-warning-face)) + '("^\\([^:]+\\):\\([^:]*\\):\\([0-9]+\\):\\(.*\\)$" + (1 'font-lock-type-face) + (4 'font-lock-variable-name-face))) '("/etc/passwd\\'" "/etc/group\\'") (list (function (lambda () (setq imenu-generic-expression - '((nil "^\\([-A-Za-z0-9_]+\\):" 1))) - ))) - ) -) + '((nil "^\\([-A-Za-z0-9_]+\\):" 1)))))))) ;; Fstab -(and - (memq 'etc-fstab-generic-mode generic-extras-enable-list) +(when (memq 'etc-fstab-generic-mode generic-extras-enable-list) -(define-generic-mode 'etc-fstab-generic-mode +(define-generic-mode etc-fstab-generic-mode (list ?#) (list + "adfs" + "affs" + "autofs" + "coda" + "coherent" + "cramfs" + "devpts" + "efs" "ext2" - "fd" + "ext3" + "hfs" + "hpfs" "iso9660" + "jfs" + "minix" + "msdos" + "ncpfs" "nfs" + "ntfs" "proc" - "swap" + "qnx4" + "reiserfs" + "romfs" + "smbfs" + "sysv" + "tmpfs" + "udf" "ufs" - ) - '( - ("^\\([/-A-Za-z0-9_]+\\)\\s-+\\([/-A-Za-z0-9_]+\\)" + "umsdos" + "vfat" + "xenix" + "xfs" + "swap" + "auto" + "ignore") + '(("^\\([/-A-Za-z0-9_]+\\)\\s-+\\([/-A-Za-z0-9_]+\\)" (1 'font-lock-type-face) - (2 'font-lock-variable-name-face) - ) - ) + (2 'font-lock-variable-name-face))) '("/etc/[v]*fstab\\'") (list (function (lambda () (setq imenu-generic-expression - '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))) - ))) - ) -) + '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1)))))))) ;; From Jacques Duthen <[email protected]> (defvar show-tabs-generic-mode-font-lock-defaults-1 - '( ;; trailing spaces must come before... - ("[ \t]+$" . 'show-tabs-space-face) - ;; ...embedded tabs - ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab-face)))) + '( ;; trailing spaces must come before... + ("[ \t]+$" . 'show-tabs-space-face) + ;; ...embedded tabs + ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab-face)))) (defvar show-tabs-generic-mode-font-lock-defaults-2 - '( ;; trailing spaces must come before... - ("[ \t]+$" . 'show-tabs-space-face) - ;; ...tabs - ("\t+" . 'show-tabs-tab-face))) + '( ;; trailing spaces must come before... + ("[ \t]+$" . 'show-tabs-space-face) + ;; ...tabs + ("\t+" . 'show-tabs-tab-face))) (defface show-tabs-tab-face '((((class grayscale) (background light)) (:foreground "LightGray" :weight bold)) @@ -1692,10 +1617,10 @@ you must reload generic-x to enable the specified modes." "Font Lock mode face used to highlight spaces." :group 'show-tabs) -(define-generic-mode 'show-tabs-generic-mode +(define-generic-mode show-tabs-generic-mode () ;; no comment char () ;; no keywords - show-tabs-generic-mode-font-lock-defaults-1 + show-tabs-generic-mode-font-lock-defaults-1 () ;; no auto-mode-alist ;; (list 'show-tabs-generic-mode-hook-fun) nil @@ -1705,41 +1630,37 @@ you must reload generic-x to enable the specified modes." ;; DNS modes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define-generic-mode 'named-boot-generic-mode - ;;List of comment characters - (list ?\;) - ;;List of keywords +(define-generic-mode named-boot-generic-mode + ;; List of comment characters + (list ?\;) + ;; List of keywords (list "cache" "primary" "secondary" "forwarders" "limit" "options" "directory" "check-names") - ;;List of additional font-lock-expressions + ;; List of additional font-lock-expressions (list (list "\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 'font-lock-constant-face) (list "^directory\\s-+\\(.*\\)" 1 'font-lock-variable-name-face) (list "^\\(primary\\|cache\\)\\s-+\\([.A-Za-z]+\\)\\s-+\\(.*\\)" (list 2 'font-lock-variable-name-face) - (list 3 'font-lock-constant-face)) - ) - ;;List of additional automode-alist expressions + (list 3 'font-lock-constant-face))) + ;; List of additional automode-alist expressions (list "/etc/named.boot\\'") - ;;List of set up functions to call - nil - ) + ;; List of set up functions to call + nil) -(define-generic-mode 'named-database-generic-mode - ;;List of comment characters +(define-generic-mode named-database-generic-mode + ;; List of comment characters (list ?\;) - ;;List of keywords + ;; List of keywords (list "IN" "NS" "CNAME" "SOA" "PTR" "MX" "A") - ;;List of additional font-lock-expressions + ;; List of additional font-lock-expressions (list (list "\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 'font-lock-constant-face) - (list "^\\([.A-Za-z0-9]+\\)" 1 'font-lock-variable-name-face) - ) - ;;List of additional automode-alist expressions - nil - ;;List of set up functions to call + (list "^\\([.A-Za-z0-9]+\\)" 1 'font-lock-variable-name-face)) + ;; List of additional automode-alist expressions nil - ) + ;; List of set up functions to call + nil) (defvar named-database-time-string "%Y%m%d%H" "Timestring for named serial numbers.") @@ -1747,27 +1668,25 @@ you must reload generic-x to enable the specified modes." (defun named-database-print-serial () "Print a serial number based on the current date." (interactive) - (insert (format-time-string named-database-time-string (current-time))) - ) + (insert (format-time-string named-database-time-string (current-time)))) -(define-generic-mode 'resolve-conf-generic-mode - ;;List of comment characters +(define-generic-mode resolve-conf-generic-mode + ;; List of comment characters (list ?#) - ;;List of keywords + ;; List of keywords (list "nameserver" "domain" "search" "sortlist" "options") - ;;List of additional font-lock-expressions + ;; List of additional font-lock-expressions nil - ;;List of additional automode-alist expressions + ;; List of additional automode-alist expressions (list "/etc/resolv[e]?.conf\\'") - ;;List of set up functions to call - nil - ) + ;; List of set up functions to call + nil) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Modes for spice and common electrical engineering circuit netlist formats ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define-generic-mode 'spice-generic-mode +(define-generic-mode spice-generic-mode nil (list "and" @@ -1784,8 +1703,7 @@ you must reload generic-x to enable the specified modes." "vccap" "vccs" "vcr" - "vcvs" - ) + "vcvs") '( ("^\\s-*\\([*].*\\)" 1 'font-lock-comment-face) (" \\(\\$ .*\\)$" 1 'font-lock-comment-face) @@ -1795,8 +1713,7 @@ you must reload generic-x to enable the specified modes." ("^\\s-*\\([.]\\w+\\>\\)" 1 'font-lock-keyword-face) ("\\(\\([.]\\|_\\|\\w\\)+\\)\\s-*=" 1 'font-lock-variable-name-face) ("\\('[^']+'\\)" 1 'font-lock-string-face) - ("\\(\"[^\"]+\"\\)" 1 'font-lock-string-face) - ) + ("\\(\"[^\"]+\"\\)" 1 'font-lock-string-face)) (list "\\.[sS][pP]\\'" "\\.[sS][pP][iI]\\'" "\\.[sS][pP][iI][cC][eE]\\'" @@ -1806,24 +1723,20 @@ you must reload generic-x to enable the specified modes." ;; Make keywords case-insensitive (function (lambda() - (setq font-lock-defaults (list 'generic-font-lock-defaults nil t)))) - ) - "Generic mode for SPICE circuit netlist files." - ) + (setq font-lock-defaults (list 'generic-font-lock-defaults nil t))))) + "Generic mode for SPICE circuit netlist files.") -(define-generic-mode 'ibis-generic-mode +(define-generic-mode ibis-generic-mode (list ?|) nil '( ("[[]\\([^]]*\\)[]]" 1 'font-lock-keyword-face) - ("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 'font-lock-variable-name-face) - ) + ("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 'font-lock-variable-name-face)) (list "\\.[iI][bB][sS]\\'") (list 'generic-bracket-support) - "Generic mode for IBIS circuit netlist files." - ) + "Generic mode for IBIS circuit netlist files.") -(define-generic-mode 'astap-generic-mode +(define-generic-mode astap-generic-mode nil (list "analyze" @@ -1838,16 +1751,13 @@ you must reload generic-x to enable the specified modes." "print" "run" "controls" - "table" - ) - '( - ("^\\s-*\\([*].*\\)" 1 'font-lock-comment-face) + "table") + '(("^\\s-*\\([*].*\\)" 1 'font-lock-comment-face) (";\\s-*\\([*].*\\)" 1 'font-lock-comment-face) ("^\\s-*\\([.]\\w+\\>\\)" 1 'font-lock-keyword-face) ("\\('[^']+'\\)" 1 'font-lock-string-face) ("\\(\"[^\"]+\"\\)" 1 'font-lock-string-face) - ("[(,]\\s-*\\(\\([.]\\|_\\|\\w\\)+\\)\\s-*=" 1 'font-lock-variable-name-face) - ) + ("[(,]\\s-*\\(\\([.]\\|_\\|\\w\\)+\\)\\s-*=" 1 'font-lock-variable-name-face)) (list "\\.[aA][pP]\\'" "\\.[aA][sS][xX]\\'" "\\.[aA][sS][tT][aA][pP]\\'" @@ -1859,15 +1769,13 @@ you must reload generic-x to enable the specified modes." ;; Make keywords case-insensitive (function (lambda() - (setq font-lock-defaults (list 'generic-font-lock-defaults nil t)))) - ) - "Generic mode for ASTAP circuit netlist files." - ) + (setq font-lock-defaults (list 'generic-font-lock-defaults nil t))))) + "Generic mode for ASTAP circuit netlist files.") -(define-generic-mode 'etc-modules-conf-generic-mode - ;;List of comment characters +(define-generic-mode etc-modules-conf-generic-mode + ;; List of comment characters (list ?#) - ;;List of keywords + ;; List of keywords (list "above" "alias" @@ -1900,13 +1808,12 @@ you must reload generic-x to enable the specified modes." "pre-remove" "remove" "persistdir") - ;;List of additional font-lock-expressions + ;; List of additional font-lock-expressions nil - ;;List of additional automode-alist expressions + ;; List of additional automode-alist expressions (list "/etc/modules.conf" "/etc/conf.modules") - ;;List of set up functions to call - nil - ) + ;; List of set up functions to call + nil) (provide 'generic-x) diff --git a/lisp/generic.el b/lisp/generic.el index 9545b0970a..e257f7bac5 100644 --- a/lisp/generic.el +++ b/lisp/generic.el @@ -34,27 +34,31 @@ ;; Generic-mode is a meta-mode which can be used to define small modes ;; which provide basic comment and font-lock support. These modes are -;; intended for the many configuration files and such which are too small -;; for a "real" mode, but still have a regular syntax, comment characters -;; and the like. +;; intended for the many configuration files and such which are too +;; small for a "real" mode, but still have a regular syntax, comment +;; characters and the like. ;; ;; Each generic mode can define the following: ;; ;; * List of comment-characters. The entries in this list should be ;; either a character, a one or two character string or a cons pair. -;; If the entry is a character or a one-character string -;; LIMITATIONS: Emacs does not support comment strings of more than +;; If the entry is a character or a string, it is added to the +;; mode's syntax table with `comment-start' syntax. If the entry is +;; a cons pair, the elements of the pair are considered to be +;; `comment-start' and `comment-end' respectively. (The latter +;; should be nil if you want comments to end at end of line.) +;; LIMITATIONS: Emacs does not support comment strings of more than ;; two characters in length. ;; ;; * List of keywords to font-lock. Each keyword should be a string. -;; If you have additional keywords which should be highlighted in a face -;; different from `font-lock-keyword-face', you can use the convenience -;; function `generic-make-keywords-list' (which see), and add the -;; result to the following list: +;; If you have additional keywords which should be highlighted in a +;; face different from `font-lock-keyword-face', you can use the +;; convenience function `generic-make-keywords-list' (which see), +;; and add the result to the following list: ;; ;; * Additional expressions to font-lock. This should be a list of -;; expressions, each of which should be of the same form -;; as those in `font-lock-keywords'. +;; expressions, each of which should be of the same form as those in +;; `font-lock-keywords'. ;; ;; * List of regular expressions to be placed in auto-mode-alist. ;; @@ -79,35 +83,35 @@ ;; Use the `define-generic-mode' function to define new modes. ;; For example: ;; -;; (require 'generic) ;; (define-generic-mode 'foo-generic-mode -;; (list ?% ) -;; (list "keyword") -;; nil -;; (list "\\.FOO\\'") -;; (list 'foo-setup-function)) +;; (list ?%) +;; (list "keyword") +;; nil +;; (list "\\.FOO\\'") +;; (list 'foo-setup-function)) ;; ;; defines a new generic-mode `foo-generic-mode', which has '%' as a -;; comment character, and "keyword" as a keyword. When files which end in -;; '.FOO' are loaded, Emacs will go into foo-generic-mode and call -;; foo-setup-function. You can also use the function `foo-generic-mode' -;; (which is interactive) to put a buffer into foo-generic-mode. +;; comment character, and "keyword" as a keyword. When files which +;; end in '.FOO' are loaded, Emacs will go into foo-generic-mode and +;; call foo-setup-function. You can also use the function +;; `foo-generic-mode' (which is interactive) to put a buffer into +;; foo-generic-mode. ;; ;; AUTOMATICALLY ENTERING GENERIC MODE: ;; -;; Generic-mode provides a hook which automatically puts a -;; file into default-generic-mode if the first few lines of a file in -;; fundamental mode start with a hash comment character. To disable +;; Generic-mode provides a hook which automatically puts a file into +;; default-generic-mode if the first few lines of a file in +;; fundamental mode start with a hash comment character. To disable ;; this functionality, set the variable `generic-use-find-file-hook' -;; to nil BEFORE loading generic-mode. See the variables -;; `generic-lines-to-scan' and `generic-find-file-regexp' for customization -;; options. +;; to nil BEFORE loading generic-mode. See the variables +;; `generic-lines-to-scan' and `generic-find-file-regexp' for +;; customization options. ;; ;; GOTCHAS: ;; -;; Be careful that your font-lock definitions are correct. Getting them -;; wrong can cause emacs to continually attempt to fontify! This problem -;; is not specific to generic-mode. +;; Be careful that your font-lock definitions are correct. Getting +;; them wrong can cause Emacs to continually attempt to fontify! This +;; problem is not specific to generic-mode. ;; ;; Credit for suggestions, brainstorming, help with debugging: @@ -117,9 +121,6 @@ ;; ;;; Code: -(eval-when-compile - (require 'cl)) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Internal Variables ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -128,6 +129,7 @@ "Global defaults for font-lock in a generic mode.") (make-variable-buffer-local 'generic-font-lock-defaults) +;;;###autoload (defvar generic-mode-list nil "A list of mode names for `generic-mode'. Do not add entries to this list directly; use `define-generic-mode' @@ -143,139 +145,140 @@ instead (which see).") :group 'extensions) (defcustom generic-use-find-file-hook t - "*If non-nil, add a hook to enter default-generic-mode automatically. -This is done if the first few lines of a file in fundamental mode start -with a hash comment character." + "*If non-nil, add a hook to enter `default-generic-mode' automatically. +This is done if the first few lines of a file in fundamental mode +start with a hash comment character." :group 'generic - :type 'boolean - ) + :type 'boolean) (defcustom generic-lines-to-scan 3 "*Number of lines that `generic-mode-find-file-hook' looks at. -Relevant when deciding whether to enter `generic-mode' automatically. +Relevant when deciding whether to enter Default-Generic mode automatically. This variable should be set to a small positive number." :group 'generic - :type 'integer - ) + :type 'integer) (defcustom generic-find-file-regexp "^#" "*Regular expression used by `generic-mode-find-file-hook'. -Files in fundamental mode whose first few lines contain a match for -this regexp, should be put into `default-generic-mode' instead. -The number of lines tested for the matches is specified by the value -of the variable `generic-lines-to-scan', which see." +Files in fundamental mode whose first few lines contain a match +for this regexp, should be put into Default-Generic mode instead. +The number of lines tested for the matches is specified by the +value of the variable `generic-lines-to-scan', which see." :group 'generic - :type 'regexp - ) + :type 'regexp) (defcustom generic-ignore-files-regexp "[Tt][Aa][Gg][Ss]\\'" "*Regular expression used by `generic-mode-find-file-hook'. Files whose names match this regular expression should not be put -into `default-generic-mode', even if they have lines which match the -regexp in `generic-find-file-regexp'. If the value is nil, +into Default-Generic mode, even if they have lines which match +the regexp in `generic-find-file-regexp'. If the value is nil, `generic-mode-find-file-hook' does not check the file names." :group 'generic - :type '(choice (const :tag "Don't check file names" nil) regexp) - ) + :type '(choice (const :tag "Don't check file names" nil) regexp)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;###autoload -(defun define-generic-mode (name comment-list keyword-list font-lock-list - auto-mode-list function-list - &optional description) - "Create a new generic mode with NAME. - -NAME should be a symbol; its string representation is used as the function -name. If DESCRIPTION is provided, it is used as the docstring for the new -function. - -COMMENT-LIST is a list, whose entries are either a single character, -a one or two character string or a cons pair. If the entry is a character -or a one-character string, it is added to the mode's syntax table with -`comment-start' syntax. If the entry is a cons pair, the elements of the -pair are considered to be `comment-start' and `comment-end' respectively. -\(The latter should be nil if you want comments to end at end of line.) -Note that Emacs has limitations regarding comment characters. - -KEYWORD-LIST is a list of keywords to highlight with `font-lock-keyword-face'. -Each keyword should be a string. - -FONT-LOCK-LIST is a list of additional expressions to highlight. Each entry -in the list should have the same form as an entry in `font-lock-keywords'. - -AUTO-MODE-LIST is a list of regular expressions to add to `auto-mode-alist'. -These regexps are added to `auto-mode-alist' as soon as `define-generic-mode' -is called; any old regexps with the same name are removed. - -FUNCTION-LIST is a list of functions to call to do some additional setup. +(defmacro define-generic-mode (mode comment-list keyword-list + font-lock-list auto-mode-list + function-list &optional docstring) + "Create a new generic mode MODE. + +MODE is the name of the command for the generic mode; it need not +be quoted. The optional DOCSTRING is the documentation for the +mode command. If you do not supply it, a default documentation +string will be used instead. + +COMMENT-LIST is a list, whose entries are either a single +character, a one or two character string or a cons pair. If the +entry is a character or a string, it is added to the mode's +syntax table with `comment-start' syntax. If the entry is a cons +pair, the elements of the pair are considered to be +`comment-start' and `comment-end' respectively. (The latter +should be nil if you want comments to end at end of line.) Note +that Emacs has limitations regarding comment characters. + +KEYWORD-LIST is a list of keywords to highlight with +`font-lock-keyword-face'. Each keyword should be a string. + +FONT-LOCK-LIST is a list of additional expressions to highlight. +Each entry in the list should have the same form as an entry in +`font-lock-keywords'. + +AUTO-MODE-LIST is a list of regular expressions to add to +`auto-mode-alist'. These regexps are added to `auto-mode-alist' +as soon as `define-generic-mode' is called. + +FUNCTION-LIST is a list of functions to call to do some +additional setup. See the file generic-x.el for some examples of `define-generic-mode'." + (let* ((name-unquoted (if (eq (car-safe mode) 'quote) ; Backward compatibility. + (eval mode) + mode)) + (name-string (symbol-name name-unquoted)) + (pretty-name (capitalize (replace-regexp-in-string + "-mode\\'" "" name-string)))) + + `(progn + ;; Add a new entry. + (add-to-list 'generic-mode-list ,name-string) + + ;; Add it to auto-mode-alist + (dolist (re ,auto-mode-list) + (add-to-list 'auto-mode-alist (cons re ',name-unquoted))) + + (defun ,name-unquoted () + ,(or docstring + (concat pretty-name " mode.\n" + "This a generic mode defined with `define-generic-mode'.")) + (interactive) + (generic-mode-internal ',name-unquoted ,comment-list ,keyword-list + ,font-lock-list ,function-list))))) - ;; Add a new entry - (add-to-list 'generic-mode-list (symbol-name name)) - - ;; Add it to auto-mode-alist - (dolist (re auto-mode-list) - (add-to-list 'auto-mode-alist (cons re name))) - - ;; Define a function for it using `defalias' (not `fset') to make - ;; the mode appear on load-history. - (defalias name - `(lambda nil - ,(or description (concat "Generic mode for type " (symbol-name name))) - (interactive) - (generic-mode-internal ',name ',comment-list ',keyword-list - ',font-lock-list ',function-list))) - ) - +;;;###autoload (defun generic-mode-internal (mode comments keywords font-lock-list funs) - "Go into the generic-mode MODE." - (let* ((generic-mode-hooks (intern (concat (symbol-name mode) "-hook"))) - (modename (symbol-name mode)) - (name (if (string-match "-mode\\'" modename) - (substring modename 0 (match-beginning 0)) - modename)) - ) - - ;; Put this after the point where we read generic-mode-name! + "Go into the generic mode MODE." + (let* ((modename (symbol-name mode)) + (generic-mode-hooks (intern (concat modename "-hook"))) + (pretty-name (capitalize (replace-regexp-in-string + "-mode\\'" "" modename)))) + (kill-all-local-variables) - (setq - major-mode mode - mode-name (capitalize name) - ) + (setq major-mode mode + mode-name pretty-name) - (generic-mode-set-comments comments) + (generic-mode-set-comments comments) ;; Font-lock functionality ;; Font-lock-defaults are always set even if there are no keywords ;; or font-lock expressions, so comments can be highlighted. (setq generic-font-lock-defaults nil) - (generic-mode-set-font-lock keywords font-lock-list) - (make-local-variable 'font-lock-defaults) + (generic-mode-set-font-lock keywords font-lock-list) + (make-local-variable 'font-lock-defaults) (setq font-lock-defaults (list 'generic-font-lock-defaults nil)) ;; Call a list of functions (mapcar 'funcall funs) - (run-hooks generic-mode-hooks) - ) - ) + (run-hooks generic-mode-hooks))) ;;;###autoload -(defun generic-mode (type) - "Basic comment and font-lock functionality for `generic' files. -\(Files which are too small to warrant their own mode, but have -comment characters, keywords, and the like.) +(defun generic-mode (mode) + "Enter generic mode MODE. + +Generic modes provide basic comment and font-lock functionality +for \"generic\" files. (Files which are too small to warrant their +own mode, but have comment characters, keywords, and the like.) To define a generic-mode, use the function `define-generic-mode'. Some generic modes are defined in `generic-x.el'." (interactive - (list (completing-read "Generic Type: " generic-mode-list nil t))) - (funcall (intern type))) + (list (completing-read "Generic mode: " generic-mode-list nil t))) + (funcall (intern mode))) ;;; Comment Functionality (defun generic-mode-set-comments (comment-list) @@ -283,16 +286,16 @@ Some generic modes are defined in `generic-x.el'." (let ((st (make-syntax-table)) (chars nil) (comstyles)) - (make-local-variable 'comment-start) - (make-local-variable 'comment-start-skip) - (make-local-variable 'comment-end) + (make-local-variable 'comment-start) + (make-local-variable 'comment-start-skip) + (make-local-variable 'comment-end) ;; Go through all the comments (dolist (start comment-list) - (let ((end nil) (comstyle "")) + (let (end (comstyle "")) ;; Normalize (when (consp start) - (setq end (or (cdr start) end)) + (setq end (cdr start)) (setq start (car start))) (when (char-valid-p start) (setq start (char-to-string start))) (cond @@ -360,18 +363,20 @@ Some generic modes are defined in `generic-x.el'." imenu-case-fold-search t)) ;; This generic mode is always defined -(define-generic-mode 'default-generic-mode (list ?#) nil nil nil nil) +(define-generic-mode default-generic-mode (list ?#) nil nil nil nil) ;; A more general solution would allow us to enter generic-mode for ;; *any* comment character, but would require us to synthesize a new ;; generic-mode on the fly. I think this gives us most of what we ;; want. (defun generic-mode-find-file-hook () - "Hook function to enter `default-generic-mode' automatically. -Done if the first few lines of a file in `fundamental-mode' start with -a match for the regexp in `generic-find-file-regexp', unless the -file's name matches the regexp which is the value of the variable -`generic-ignore-files-regexp'. + "Hook function to enter Default-Generic mode automatically. + +Done if the first few lines of a file in Fundamental mode start +with a match for the regexp in `generic-find-file-regexp', unless +the file's name matches the regexp which is the value of the +variable `generic-ignore-files-regexp'. + This hook will be installed if the variable `generic-use-find-file-hook' is non-nil. The variable `generic-lines-to-scan' determines the number of lines to look at." @@ -390,8 +395,8 @@ This hook will be installed if the variable (default-generic-mode))))) (defun generic-mode-ini-file-find-file-hook () - "Hook function to enter default-generic-mode automatically for INI files. -Done if the first few lines of a file in `fundamental-mode' look like an + "Hook function to enter Default-Generic mode automatically for INI files. +Done if the first few lines of a file in Fundamental mode look like an INI file. This hook is NOT installed by default." (and (eq major-mode 'fundamental-mode) (save-excursion diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b997b86b0c..d581274b80 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2005-03-22 Stefan Monnier <[email protected]> + + * gnus-start.el (gnus-display-time-event-handler): + Check display-time-timer at runtime rather than only at load time + in case display-time-mode is turned off in the mean time. + 2005-03-16 Reiner Steib <[email protected]> * nnimap.el (nnimap-open-connection): Print which authinfo file is @@ -11,8 +17,8 @@ 2005-03-15 Reiner Steib <[email protected]> - * nnmaildir.el (nnmaildir-request-accept-article): Use - `nnheader-cancel-timer' for compatibility with current XEmacs. + * nnmaildir.el (nnmaildir-request-accept-article): + Use `nnheader-cancel-timer' for compatibility with current XEmacs. 2005-03-13 Steve Youngs <[email protected]> @@ -26,12 +32,12 @@ for `with-timeout'. * mail-source.el: Require timer-funcs at compile time when in - XEmacs for `run-with-idle-timer'. + XEmacs for `run-with-idle-timer'. * gnus-async.el: Ditto. * dgnushack.el: No need to ignore `run-with-idle-timer', XEmacs - has this function now. + has this function now. 2005-03-16 Lute Kamstra <[email protected]> @@ -43,8 +49,7 @@ 2005-03-10 Arne J,Ax(Brgensen <[email protected]> (tiny change) - * nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one - flaw. + * nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one flaw. 2005-03-08 Bjorn Solberg <[email protected]> (tiny change) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index f011341651..6eec4f4e84 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1,5 +1,5 @@ ;;; gnus-start.el --- startup functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <[email protected]> @@ -3083,12 +3083,10 @@ If this variable is nil, don't do anything." (file-name-as-directory (expand-file-name gnus-default-directory)) default-directory))) -(eval-and-compile -(defalias 'gnus-display-time-event-handler - (if (gnus-boundp 'display-time-timer) - 'display-time-event-handler - (lambda () "Does nothing as `display-time-timer' is not bound. -Would otherwise be an alias for `display-time-event-handler'." nil)))) +(defun gnus-display-time-event-handler () + (if (and (fboundp 'display-time-event-handler) + (gnus-boundp 'display-time-timer)) + (display-time-event-handler))) ;;;###autoload (defun gnus-fixup-nnimap-unread-after-getting-new-news () @@ -3107,7 +3105,7 @@ Would otherwise be an alias for `display-time-event-handler'." nil)))) (provide 'gnus-start) -;;; arch-tag: f4584a22-b7b7-4853-abfc-a637329af5d2 +;; arch-tag: f4584a22-b7b7-4853-abfc-a637329af5d2 ;;; gnus-start.el ends here diff --git a/lisp/help.el b/lisp/help.el index a544af59c8..aeffaf732a 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -486,6 +486,7 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer." (let ((func (indirect-function definition)) (defs nil) (standard-output (if insert (current-buffer) t))) + ;; In DEFS, find all symbols that are aliases for DEFINITION. (mapatoms (lambda (symbol) (and (fboundp symbol) (not (eq symbol definition)) @@ -493,27 +494,37 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer." (indirect-function symbol) (error symbol))) (push symbol defs)))) - (princ (mapconcat - #'(lambda (symbol) - (let* ((remapped (command-remapping symbol)) - (keys (where-is-internal - symbol overriding-local-map nil nil remapped)) - (keys (mapconcat 'key-description keys ", "))) - (if insert - (if (> (length keys) 0) - (if remapped - (format "%s (%s) (remapped from %s)" - keys remapped symbol) - (format "%s (%s)" keys symbol)) - (format "M-x %s RET" symbol)) - (if (> (length keys) 0) - (if remapped - (format "%s is remapped to %s which is on %s" - definition symbol keys) - (format "%s is on %s" symbol keys)) - (format "%s is not on any key" symbol))))) - (cons definition defs) - ";\nand "))) + ;; Look at all the symbols--first DEFINITION, + ;; then its aliases. + (dolist (symbol (cons definition defs)) + (let* ((remapped (command-remapping symbol)) + (keys (where-is-internal + symbol overriding-local-map nil nil remapped)) + (keys (mapconcat 'key-description keys ", ")) + string) + (setq string + (if insert + (if (> (length keys) 0) + (if remapped + (format "%s (%s) (remapped from %s)" + keys remapped symbol) + (format "%s (%s)" keys symbol)) + (format "M-x %s RET" symbol)) + (if (> (length keys) 0) + (if remapped + (format "%s is remapped to %s which is on %s" + definition symbol keys) + (format "%s is on %s" symbol keys)) + ;; If this is the command the user asked about, + ;; and it is not on any key, say so. + ;; For other symbols, its aliases, say nothing + ;; about them unless they are on keys. + (if (eq symbol definition) + (format "%s is not on any key" symbol))))) + (when string + (unless (eq symbol definition) + (princ ";\n its alias ")) + (princ string))))) nil) (defun string-key-binding (key) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 6317662d39..49977276aa 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -1,7 +1,7 @@ ;;; icomplete.el --- minibuffer completion incremental feedback -;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001 -;;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2005 +;; Free Software Foundation, Inc. ;; Author: Ken Manheimer <[email protected]> ;; Maintainer: Ken Manheimer <[email protected]> @@ -69,19 +69,6 @@ :prefix "icomplete-" :group 'minibuffer) -(defcustom icomplete-mode nil - "*Toggle incremental minibuffer completion. -As text is typed into the minibuffer, prospective completions are indicated -in the minibuffer. -Setting this variable directly does not take effect; -use either \\[customize] or the function `icomplete-mode'." - :set (lambda (symbol value) - (icomplete-mode (if value 1 -1))) - :initialize 'custom-initialize-default - :type 'boolean - :group 'icomplete - :require 'icomplete) - ;;;_* User Customization variables (defcustom icomplete-prospects-length 80 "*Length of string displaying the prospects." @@ -131,8 +118,8 @@ icompletion is occurring." ;;;_* Initialization ;;;_ + Internal Variables -;;;_ = icomplete-eoinput 1 -(defvar icomplete-eoinput 1 +;;;_ = icomplete-eoinput nil +(defvar icomplete-eoinput nil "Point where minibuffer input ends and completion info begins.") (make-variable-buffer-local 'icomplete-eoinput) ;;;_ = icomplete-pre-command-hook @@ -173,18 +160,15 @@ is minibuffer." ;;;_ > icomplete-mode (&optional prefix) ;;;###autoload -(defun icomplete-mode (&optional arg) +(define-minor-mode icomplete-mode "Toggle incremental minibuffer completion for this Emacs session. With a numeric argument, turn Icomplete mode on iff ARG is positive." - (interactive "P") - (let ((on-p (if (null arg) - (not icomplete-mode) - (> (prefix-numeric-value arg) 0)))) - (setq icomplete-mode on-p) - (when on-p + :global t :group 'icomplete + (if icomplete-mode ;; The following is not really necessary after first time - ;; no great loss. - (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)))) + (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup) + (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))) ;;;_ > icomplete-simple-completing-p () (defun icomplete-simple-completing-p () @@ -193,29 +177,27 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive." Conditions are: the selected window is a minibuffer, and not in the middle of macro execution, - and minibuffer-completion-table is not a symbol (which would + and `minibuffer-completion-table' is not a symbol (which would indicate some non-standard, non-simple completion mechanism, like file-name and other custom-func completions)." (and (window-minibuffer-p (selected-window)) (not executing-kbd-macro) - (not (symbolp minibuffer-completion-table)))) + ;; (or minibuffer-completing-file-name + (not (functionp minibuffer-completion-table)))) ;; ) ;;;_ > icomplete-minibuffer-setup () -;;;###autoload (defun icomplete-minibuffer-setup () "Run in minibuffer on activation to establish incremental completion. Usually run by inclusion in `minibuffer-setup-hook'." - (cond ((and icomplete-mode (icomplete-simple-completing-p)) - (add-hook 'pre-command-hook - (function (lambda () - (run-hooks 'icomplete-pre-command-hook))) - nil t) - (add-hook 'post-command-hook - (function (lambda () - (run-hooks 'icomplete-post-command-hook))) - nil t) - (run-hooks 'icomplete-minibuffer-setup-hook)))) + (when (and icomplete-mode (icomplete-simple-completing-p)) + (add-hook 'pre-command-hook + (lambda () (run-hooks 'icomplete-pre-command-hook)) + nil t) + (add-hook 'post-command-hook + (lambda () (run-hooks 'icomplete-post-command-hook)) + nil t) + (run-hooks 'icomplete-minibuffer-setup-hook))) ; @@ -226,60 +208,47 @@ Usually run by inclusion in `minibuffer-setup-hook'." "Remove completions display \(if any) prior to new user input. Should be run in on the minibuffer `pre-command-hook'. See `icomplete-mode' and `minibuffer-setup-hook'." - (if (icomplete-simple-completing-p) - (if (and (boundp 'icomplete-eoinput) - icomplete-eoinput) + (when icomplete-eoinput - (if (> icomplete-eoinput (point-max)) - ;; Oops, got rug pulled out from under us - reinit: - (setq icomplete-eoinput (point-max)) - (let ((buffer-undo-list buffer-undo-list )) ; prevent entry - (delete-region icomplete-eoinput (point-max)))) + (unless (>= icomplete-eoinput (point-max)) + (let ((buffer-undo-list t)) ; prevent entry + (delete-region icomplete-eoinput (point-max)))) - ;; Reestablish the local variable 'cause minibuffer-setup is weird: - (make-local-variable 'icomplete-eoinput) - (setq icomplete-eoinput 1)))) + ;; Reestablish the safe value. + (setq icomplete-eoinput nil))) ;;;_ > icomplete-exhibit () (defun icomplete-exhibit () "Insert icomplete completions display. Should be run via minibuffer `post-command-hook'. See `icomplete-mode' and `minibuffer-setup-hook'." - (if (icomplete-simple-completing-p) - (let ((contents (buffer-substring (minibuffer-prompt-end)(point-max))) - (buffer-undo-list t)) - (save-excursion - (goto-char (point-max)) - ; Register the end of input, so we - ; know where the extra stuff - ; (match-status info) begins: - (if (not (boundp 'icomplete-eoinput)) - ;; In case it got wiped out by major mode business: - (make-local-variable 'icomplete-eoinput)) - (setq icomplete-eoinput (point)) + (when (icomplete-simple-completing-p) + (save-excursion + (goto-char (point-max)) + ;; Register the end of input, so we know where the extra stuff + ;; (match-status info) begins: + (setq icomplete-eoinput (point)) ; Insert the match-status information: - (if (and (> (point-max) (minibuffer-prompt-end)) - (or - ;; Don't bother with delay after certain number of chars: - (> (point-max) icomplete-max-delay-chars) - ;; Don't delay if alternatives number is small enough: - (if minibuffer-completion-table - (cond ((numberp minibuffer-completion-table) - (< minibuffer-completion-table - icomplete-delay-completions-threshold)) - ((sequencep minibuffer-completion-table) - (< (length minibuffer-completion-table) - icomplete-delay-completions-threshold)) - )) - ;; Delay - give some grace time for next keystroke, before - ;; embarking on computing completions: - (sit-for icomplete-compute-delay))) - (insert - (icomplete-completions contents - minibuffer-completion-table - minibuffer-completion-predicate - (not - minibuffer-completion-confirm)))))))) + (if (and (> (point-max) (minibuffer-prompt-end)) + buffer-undo-list ; Wait for some user input. + (or + ;; Don't bother with delay after certain number of chars: + (> (- (point) (field-beginning)) icomplete-max-delay-chars) + ;; Don't delay if alternatives number is small enough: + (and (sequencep minibuffer-completion-table) + (< (length minibuffer-completion-table) + icomplete-delay-completions-threshold)) + ;; Delay - give some grace time for next keystroke, before + ;; embarking on computing completions: + (sit-for icomplete-compute-delay))) + (let ((text (while-no-input + (icomplete-completions + (field-string) + minibuffer-completion-table + minibuffer-completion-predicate + (not minibuffer-completion-confirm)))) + (buffer-undo-list t)) + (if text (insert text))))))) ;;;_ > icomplete-completions (name candidates predicate require-match) (defun icomplete-completions (name candidates predicate require-match) @@ -322,9 +291,7 @@ are exhibited within the square braces.)" (concat open-bracket-determined (substring most (length name)) close-bracket-determined))) - (open-bracket-prospects "{") - (close-bracket-prospects "}") - ;"-prospects" - more than one candidate + ;;"-prospects" - more than one candidate (prospects-len 0) prospects most-is-exact comp) (if (eq most-try t) @@ -338,30 +305,25 @@ are exhibited within the square braces.)" prospects-len (+ (length comp) 1 prospects-len)))))) (if prospects (concat determ - open-bracket-prospects + "{" (and most-is-exact ",") (mapconcat 'identity (sort prospects (function string-lessp)) ",") (and comps ",...") - close-bracket-prospects) + "}") (concat determ " [Matched" (let ((keys (and icomplete-show-key-bindings (commandp (intern-soft most)) (icomplete-get-keys most)))) - (if keys - (concat "; " keys) - "")) + (if keys (concat "; " keys) "")) "]")))))) -(if icomplete-mode - (icomplete-mode 1)) - ;;;_* Local emacs vars. ;;;Local variables: ;;;outline-layout: (-2 :) ;;;End: -;;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f +;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f ;;; icomplete.el ends here diff --git a/lisp/image-mode.el b/lisp/image-mode.el index b5b0f7731d..0d2b221ee8 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -43,6 +43,7 @@ ;;;###autoload (push '("\\.tiff\\'" . image-mode) auto-mode-alist) ;;;###autoload (push '("\\.tif\\'" . image-mode) auto-mode-alist) ;;;###autoload (push '("\\.xbm\\'" . image-mode) auto-mode-alist) +;;;###autoload (push '("\\.xpm\\'" . image-mode) auto-mode-alist) ;;;###autoload (push '("\\.pbm\\'" . image-mode) auto-mode-alist) ;;;###autoload (push '("\\.pgm\\'" . image-mode) auto-mode-alist) ;;;###autoload (push '("\\.ppm\\'" . image-mode) auto-mode-alist) @@ -75,10 +76,12 @@ and showing the image as an image." (interactive) (if (get-text-property (point-min) 'display) (let ((inhibit-read-only t) - (buffer-undo-list t)) + (buffer-undo-list t) + (modified (buffer-modified-p))) (remove-list-of-text-properties (point-min) (point-max) '(display intangible read-nonsticky read-only front-sticky)) + (set-buffer-modified-p modified) (kill-local-variable 'cursor-type) (kill-local-variable 'truncate-lines) (message "Repeat this command to go back to displaying the image")) @@ -97,8 +100,10 @@ and showing the image as an image." ;; read-only when we're visiting the file (as ;; opposed to just inserting it). read-only t front-sticky (read-only))) - (buffer-undo-list t)) + (buffer-undo-list t) + (modified (buffer-modified-p))) (add-text-properties (point-min) (point-max) props) + (set-buffer-modified-p modified) ;; Inhibit the cursor when the buffer contains only an image, ;; because cursors look very strange on top of images. (setq cursor-type nil) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 1b1d77ff46..ad8d6d62a2 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1542,7 +1542,9 @@ text, and convert it in the temporary buffer. Otherwise, convert in-place." ;;; FILE I/O (defcustom auto-coding-alist - '(("\\.\\(arc\\|zip\\|lzh\\|zoo\\|jar\\|sx[dmicw]\\|tar\\|tgz\\)\\'" . no-conversion) + '(("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\)\\'" . no-conversion) + ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\)\\'" . no-conversion) + ("\\.\\(sx[dmicw]\\|tar\\|tgz\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion) ("/#[^/]+#\\'" . emacs-mule)) "Alist of filename patterns vs corresponding coding systems. diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index fa852bd19b..59c6de846c 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -229,7 +229,10 @@ invoked." "The entry in `file-name-handler-alist' used by the jka-compr I/O functions.") (defvar jka-compr-really-do-compress nil - "Non-nil in a buffer whose visited file was uncompressed on visiting it.") + "Non-nil in a buffer whose visited file was uncompressed on visiting it. +This means compress the data on writing the file, even if the +data appears to be compressed already.") +(make-variable-buffer-local 'jka-compr-really-do-compress) (put 'jka-compr-really-do-compress 'permanent-local t) ;;; Functions for accessing the return value of jka-compr-get-compression-info diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el new file mode 100644 index 0000000000..82f6fcdea6 --- /dev/null +++ b/lisp/language/thai-word.el @@ -0,0 +1,11054 @@ +;;; thai-word.el -- find Thai word boundaries + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004 +;; Electrotechnical Laboratory, JAPAN. + +;; Author: Kenichi HANDA <[email protected]> + +;; Keywords: thai, word break, emacs + +;; 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, 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 GNU Emacs; see the file COPYING. If not, write to +;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +;; The used Thai word list has been taken from IBM's ICU4J project +;; (file `thai6.ucs', version 1.4, converted to TIS encoding, with +;; removal of three incorrect entries) to which the following license +;; applies: +;; +;; COPYRIGHT AND PERMISSION NOTICE +;; +;; +;; Copyright (c) 1995-2001 International Business Machines +;; Corporation and others +;; +;; All rights reserved. +;; +;; +;; Permission is hereby granted, free of charge, to any person +;; obtaining a copy of this software and associated documentation +;; files (the "Software"), to deal in the Software without +;; restriction, including without limitation the rights to use, +;; copy, modify, merge, publish, distribute, and/or sell copies of +;; the Software, and to permit persons to whom the Software is +;; furnished to do so, provided that the above copyright notice(s) +;; and this permission notice appear in all copies of the Software +;; and that both the above copyright notice(s) and this permission +;; notice appear in supporting documentation. +;; +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +;; OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +;; NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE +;; COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE +;; FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +;; OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +;; PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +;; PERFORMANCE OF THIS SOFTWARE. +;; +;; Except as contained in this notice, the name of a copyright +;; holder shall not be used in advertising or otherwise to promote +;; the sale, use or other dealings in this Software without prior +;; written authorization of the copyright holder. + + +;; This file implements an algorithm to find Thai word breaks using a +;; dictionary. It is based on the C program `cttex' written by +;; Vuthichai Ampornaramveth <[email protected]>. + + +;; Table of Thai words. It is a nested alist (see `nested-alist-p'), +;; which means that you can easily index the list character by +;; character. + +(defconst thai-word-table nil) + + +;; Set up `thai-word-table'. + +(let + ((l + '("��" + "���" + "��ظ�ѳ��" + "��" + "�����" + "�����" + "����" + "��" + "������" + "��Թ" + "��" + "��ѭ���" + "��ѭ�ص�" + "��ѭ��" + "��Ҹԡ��" + "����Թ����" + "��ԡ�" + "���ǷԵ�" + "���Ƿ�" + "���" + "���" + "����" + "��" + "���" + "���ɰ�" + "��" + "���" + "���ҹ" + "����" + "����" + "��Թ���" + "����" + "����" + "���" + "��" + "�á�" + "�á�Ҥ�" + "�á�" + "�ç" + "�ó��" + "�ó�" + "�ó�¡Ԩ" + "�ó���" + "�ô" + "�ù" + "�ú" + "�ú��" + "���" + "������" + "��������" + "���" + "��êԧ" + "��ó" + "��óԡ���" + "��þ��" + "����" + "������" + "�������" + "������ҵ" + "����Ҫ�" + "����Ҫվ" + "����Ҹԡ��" + "�����¡" + "�����§" + "����á" + "���⪡" + "�����" + "��Ǵ" + "��Ǻ" + "����" + "���" + "��͡" + "��͡�á" + "��ͧ" + "��ͧ����" + "��ʹ" + "��ͺ" + "����" + "���" + "��Ч�������" + "��Ч�ͧ�����" + "��Ч������" + "��Ш�" + "��Ш͡" + "��Шͧ��" + "��Шѧ" + "��ШѺ" + "��ШҴ" + "��ШҺ" + "��Ш��" + "��ШԴ" + "��ШԺ" + "��Ш��Դ" + "��Шء" + "��Шغ��ШԺ" + "��Ш��" + "��Ш�맡�Ш��" + "��Ш�����Ш���" + "��Ш���Ш��" + "��Ш�ҧ" + "��Ш�" + "��Щ͡" + "��ЩѺ���੧" + "��Щٴ" + "��Щ�" + "��Ъ" + "��ЪѺ" + "��Ъ��" + "��Ъҡ" + "��Ъ�" + "��Ыԡ" + "��ЫԺ" + "��Ю����" + "��д�" + "��дͧ" + "��д" + "��дѧ��" + "��дҡ" + "��дҧ�ҧ" + "��дҹ" + "��д��" + "��дԡ" + "��д��" + "��д��" + "��д" + "��д��" + "��д١" + "��д�" + "��д�ҧ" + "��еԡ" + "��еԺ" + "��е��" + "��е�������" + "��еء" + "��е�駡�е��" + "��е��" + "��е�ͧ�����" + "��е���" + "��е�����������" + "��е�ͺ" + "��жԹ" + "��з�" + "��з�" + "��з�ǧ" + "��з�" + "��з��" + "��зԧ" + "��з" + "��зا" + "��з��" + "��з���" + "��з�" + "��з���������" + "��й��" + "��кǹ" + "��к��" + "��к͡" + "��кͧ" + "��к�" + "��к�" + "��к��" + "��к��" + "��кا" + "��л���������" + "��л��ǡ������" + "��л��" + "��л�͡����" + "��л�ͧ" + "��м�ա�м���" + "��мա" + "��о��" + "��о��" + "��о��" + "��пѴ�����´" + "��п����п��" + "������������" + "����ѧ" + "�����˧ѹ" + "����֡������" + "�����" + "����͡" + "������" + "��������" + "����Թ" + "����ա���Ҵ" + "������" + "����һ��" + "����ͺ" + "����ѧ" + "����ѹ" + "�����" + "������" + "����ا����ԧ" + "����ع" + "���˹�" + "���˹Һ" + "���˹��" + "�����Ժ" + "��������" + "��������" + "������" + "������" + "�������" + "����ͺ" + "����ѡ" + "����ѡ�����ǹ" + "�����ҡ�Чʹ" + "�����" + "����ԧ" + "����Դ����ԧ" + "������º" + "������" + "�����" + "����ԧ" + "�����" + "������" + "����Դ" + "�����´" + "�����͡" + "������ͧ" + "�����" + "������" + "���൧" + "������" + "������ͧ" + "�����" + "����Ժ" + "�������" + "�����" + "���ູ" + "�����´" + "������ͧ" + "������" + "������" + "������" + "��������" + "������͡������" + "������¹" + "������¹" + "��������" + "�����繡�����" + "�������" + "������紡������" + "�����" + "�����" + "�����" + "������" + "����" + "���ᷡ" + "�����" + "������" + "���⨹" + "�����" + "���⩡���" + "���ⴡ" + "���ⴡ���ഡ" + "���ⴧ" + "���ⴴ" + "���ⶹ" + "�����" + "����ç" + "������" + "��ѡ" + "��ѧ" + "��ѹ" + "��Ѻ" + "����" + "��ҡ" + "��ҧ" + "��Ҵ" + "��ҹ" + "��Һ" + "��ҿ" + "��ҿ�ԡ" + "��ҿԡ" + "����" + "����" + "����" + "���" + "��ԡ" + "��ԧ����" + "��Ԫ" + "��Ժ" + "����" + "�����" + "����" + "����" + "�����" + "�����" + "����" + "����" + "���" + "��ա" + "��ձ�" + "��մ" + "��ո�" + "����" + "���" + "��ء" + "��ا" + "��ا" + "��س�" + "��سҸԤس" + "��ع" + "��غ" + "����" + "����" + "�����" + "����������" + "����" + "���" + "��ٴ" + "���͡�����" + "���" + "�����" + "���ҧ" + "�����" + "����" + "�����" + "����" + "���ҹ" + "�����" + "��ɮա�" + "��ɳ�" + "��" + "�Ŵ" + "�ź" + "���" + "���ط��" + "��ǧ" + "��͡" + "��ͧ" + "��" + "����" + "��ѡ" + "��Ѵ" + "��Ѻ" + "����" + "����" + "����" + "�����" + "��ҡ" + "��ҧ" + "��Ҵ" + "����" + "������" + "����" + "����" + "����" + "�����" + "���" + "��պ" + "����" + "��֧" + "��" + "�����" + "�����" + "�����" + "�����" + "���" + "���ͧ" + "���" + "�����" + "�����" + "����" + "�����" + "��������" + "����" + "���ͧ" + "���" + "���������" + "����" + "�����" + "����" + "�Ǵ" + "�ǹ" + "���" + "���" + "��¨��" + "��¨��" + "��ѡ" + "��Ѵ" + "��ҧ" + "��ҧ���" + "��Ҵ" + "��������" + "���" + "����" + "���ҧ" + "���ҹ" + "���ҹ" + "��ѵ����" + "����" + "��һ��" + "���" + "��ԡ�" + "��ԡ���" + "��Գ" + "��" + "�͡" + "�ͧ" + "�ͫ" + "�ʹ" + "�ͺ" + "�ͻ�" + "���" + "�������" + "����" + "��������" + "��" + "�Ъ�衡Ъ��" + "�Ыǡ" + "�д��" + "�е��" + "�е�ҡ" + "�з�á" + "�зѴ�Ѵ" + "�зѹ�ѹ" + "�з�" + "�з��" + "�кѧ��" + "�к��" + "�л�Դ�л���" + "�лǡ����¡" + "�л�" + "�л�" + "�о�" + "�о�Ժ" + "�о��ͧ�����" + "�о��" + "���ѵ" + "����觡����" + "�����" + "����" + "���лѧ��" + "�����ѧ" + "������" + "����" + "������" + "��������������" + "����" + "������������" + "�����¡���Ժ" + "��������" + "��˹ا��˹ԧ" + "��˹�ͧ���˹�" + "����ʹ" + "������" + "��������������" + "�����ͧ" + "������" + "����ء����ԡ" + "������" + "��ഡ" + "��൧" + "����" + "�����" + "����꺡л�Һ" + "���š" + "������¡��Ҵ" + "����Դ" + "�����͡����" + "�������§" + "����������" + "����" + "��ⵧ��൧" + "�������" + "����" + "���ç" + "�����" + "���š���š" + "����š" + "�ѡ" + "�ѡ���" + "�ѧ" + "�ѧ���" + "�ѧ��" + "�ѧ�Թ" + "�ѧ��" + "�ѧ��" + "�ѧ�ҹ" + "�ѧʴ��" + "�ѧ�ѹ" + "�ѧ��" + "�ѭ��" + "�ѭ��" + "�ѳ��" + "�Ѵ" + "�ѹ" + "�ѹ���" + "�ѹ��" + "�ѹ��¹" + "�ѹ��" + "�Ѻ" + "�ѻ" + "�ѻ�ѹ" + "�����ҷ" + "�������" + "����٪�" + "����ѹ��Ҿ�ѧ��" + "����ѹ��ѧ��" + "��ź�" + "��Ż�ġ��" + "��Żѧ��" + "��Ż���ҹ" + "��Ż�" + "�����" + "����ҳ" + "����ҳ�Ե�" + "����ҳ�" + "����" + "���" + "���" + "���" + "�������" + "���" + "��" + "�ҡ" + "�ҡ�" + "�ҧ" + "�ҧࡧ" + "�ҧࢹ" + "�ҫ��ͧ" + "�ҭ������" + "�ҭ���" + "�Ҵ" + "�ҹ" + "�ҹ��" + "�ҹ���" + "�Һ" + "�ҽҡ" + "�Ҿ��" + "���" + "��������" + "���" + "��¡���" + "����Ҿ" + "������Ҥ" + "����Է���" + "���Ҿ¾" + "���" + "��ó�" + "��ú��" + "����ࡴ" + "���ѳ��" + "���ѹ��" + "���ح" + "���س��" + "����ǡ" + "����" + "����" + "����ٹ" + "���" + "��šԳ�" + "����" + "������" + "���" + "���" + "���" + "����" + "�����" + "���ŧ" + "���" + "�������" + "���" + "����硫�" + "��" + "�ӡ��" + "�ӡѴ" + "�ӡѺ" + "�Ө�" + "�ӨѴ" + "�Ө��" + "�ӪѺ" + "�ӫҺ" + "�ӴѴ" + "�Ӹ�" + "�ӹѹ" + "�ӹ��" + "�Ӻѧ" + "�ӻ��" + "�Ӿ���" + "�Ӿ״" + "���жѹ" + "������" + "��������" + "���ҹ" + "����" + "���Һ" + "���ѧ" + "������" + "��˹�" + "��˹Ѵ" + "����" + "���Դ" + "����Ժ" + "���˹�" + "��ᾧ" + "���˧" + "����" + "����" + "�ԡ" + "�ԡ�" + "�Ԩ" + "�Ԩ����" + "�Ԩ���" + "�Ԩ���ѡɳ�" + "�Ԩ��" + "�Ե��" + "�Ե�Ԥس" + "�Ե����ѡ���" + "�Ե���Ѿ��" + "�Թ" + "�Թ��" + "�Թ��" + "���Գ�" + "������" + "���Ź" + "�����" + "�����" + "���µչ" + "����" + "���š���" + "�����Ե�" + "��������" + "�������õ��" + "���" + "����" + "��駡��" + "��駡��" + "���" + "���" + "����" + "�կ�Է��" + "�մ" + "�յ���" + "�պ" + "����" + "���" + "���" + "���" + "�֡" + "�֡��ͧ" + "���" + "���" + "��" + "�ء" + "�ء�ѡ" + "�ح��" + "�ح�" + "�خ����" + "�د�ѧ" + "�د�" + "�س��" + "�ش" + "�شѧ" + "�ش��" + "�ع" + "�ع���" + "�ع��§" + "�غ" + "���" + "�����" + "�����" + "�����" + "������" + "������" + "���" + "��ª���" + "����Χ" + "���" + "��ŸԴ�" + "��źص�" + "���ʵ��" + "����" + "����" + "���աب�" + "����" + "����ź��" + "����Һ" + "����" + "���" + "���" + "���" + "����" + "����" + "��" + "�ٳ��" + "�ٴ" + "�ٺ" + "���" + "���" + "�����ҡ" + "��" + "��" + "��" + "���" + "��ͧ" + "��" + "����" + "���" + "����" + "��" + "���" + "���" + "��ͧ" + "��" + "����" + "����" + "�����͡�͵ԡ" + "��ҧ" + "��ҹ" + "����" + "����" + "���" + "��ӡ��" + "����Թ" + "��" + "��" + "��͡" + "��ͺ���" + "��ͻ���" + "��ҫ" + "��Ҵ" + "��" + "���������" + "����" + "���" + "������" + "���" + "��Ѵ" + "����" + "���" + "����" + "���" + "��" + "��" + "���" + "���" + "���" + "���" + "���" + "���ͺ" + "��Ѵ" + "��ѹ" + "��ҡ" + "��ҧ" + "��Ҵ" + "��ҹ" + "��Һ" + "����" + "���ɰ�" + "��ع" + "��" + "���" + "��ǹ" + "��" + "��Ǵ" + "��ͧ" + "����" + "��ѧ" + "��Ѻ" + "���" + "��Ժ" + "����" + "��բ�ѹ" + "��֧" + "��ء����" + "��ء����" + "��غ" + "��غ��Ժ" + "�����" + "����" + "��͡" + "��ͧ" + "���" + "��ѡ" + "��ѹ" + "��Ѻ" + "����" + "��Ҵ" + "��Һ" + "����" + "���" + "��ԡ" + "��Ժ" + "�����" + "����" + "��ء��ԡ" + "��ء����" + "��غ" + "��غ��Ժ" + "����" + "����" + "�����" + "����" + "���" + "���" + "����" + "���" + "��ä�" + "����" + "��Ժ" + "����" + "��آ��" + "��ѧ" + "��Ѻ" + "���" + "��Ҵ" + "��Ժ" + "��ء" + "��ء��ѡ" + "��ء��ԡ" + "��غ" + "����" + "�����" + "�ǧ" + "�Ǵ" + "�ǹ����" + "�Ǻ" + "���" + "��ѡ���" + "��ѭ" + "��Ѵ" + "��Ѻ" + "��Ѻ�����" + "����" + "���" + "��ҡ" + "��ҧ" + "��Ҵ" + "��ҹ" + "���¢ǹ" + "��Դ" + "���ҧ" + "��" + "�͡" + "�ͧ" + "�ʹ" + "�" + "�ͺ" + "�ͺ�س" + "�ͺ�" + "���" + "����������" + "���ѡ���" + "���ء�����" + "���ԡ" + "���ء" + "���������" + "�����" + "�ѧ" + "�ѳ�ʡ�" + "�ѳ�����" + "�Ѵ" + "�ѵ����ҹ�" + "�ѹ" + "�ѹ�����" + "�ѹ��" + "�ѹ��" + "�ѹ��" + "�ѹ��ҡ" + "�ѹⵡ" + "�Ѻ" + "���" + "���" + "����" + "��" + "�ҡ" + "�ҡ���" + "�ҧ" + "�Ҵ" + "�ҹ" + "�Һ" + "���" + "���" + "���" + "���" + "��" + "�ԡ" + "�ԧ" + "���" + "���" + "�մ" + "�ջ���ظ" + "���" + "���" + "�������" + "�֧" + "���" + "���" + "��鹩���" + "�" + "���" + "����" + "�ء" + "�ش" + "�ع" + "�ع�ͧ" + "�عἹ" + "���" + "���" + "���" + "�ٴ" + "���" + "����" + "���" + "��ǹ" + "���" + "��" + "����" + "���" + "��ҧ" + "����" + "����" + "�������" + "��" + "���" + "��ͧ" + "��" + "������" + "����" + "���" + "��ҧ" + "��Ҿ���" + "����" + "����" + "�������" + "��������" + "����⾴" + "����֡" + "�����ǧ" + "�������" + "���ҧ��" + "���ҹ��" + "��" + "����" + "���Ҫ" + "�����" + "��Ҫҵ�" + "��Ҫվ" + "��Ҹ��" + "����ó�" + "����" + "�����" + "���" + "��Ҩ����" + "��Ҹԡ��" + "��ҸԻ��" + "��ҹѺ" + "��ԡ�" + "��Ե" + "��Ե��ʵ��" + "��" + "���" + "���" + "��Ը���" + "��Ծ���" + "���" + "��" + "����þ�" + "���" + "��" + "��" + "���ҡ��" + "���Ҥ�" + "�á" + "�ú" + "��êԵ" + "����" + "�����" + "����ͧ" + "����ŧ" + "�����" + "��ǭ" + "���ѡ" + "����" + "����" + "��͡" + "��ͧ" + "��ͧ�ç" + "��ͺ" + "��ͺ����" + "���" + "��Ѵ���" + "��ѹ" + "��Ѻ" + "����" + "����" + "����" + "����" + "����" + "���" + "��ҡ" + "��ҧ" + "��ҭ" + "��Ҵ" + "��Һ" + "����" + "����" + "����" + "���" + "���ʵ���" + "���ʵѧ" + "���ʵ�" + "���ʵ����" + "������¹" + "��պ" + "����" + "���" + "��֡����" + "��֡���" + "��ֹ" + "����" + "����" + "�����" + "��״" + "��" + "����" + "����" + "���鹤�֡" + "���" + "��ر" + "��������" + "����" + "����" + "���" + "��ٴ" + "����" + "���" + "�����" + "����" + "�����" + "����" + "���ҹ" + "�����" + "���" + "����ʶ�" + "����ʹ�" + "���" + "��͡" + "��ͧ" + "��ʹ" + "��" + "����չ" + "����ÿ����" + "����ÿ����" + "���" + "��ѡ" + "��ѧ" + "��ѵ��" + "��Ѻ" + "����" + "����" + "���" + "��ҧ�ŧ" + "��Ҵ" + "��ҹ" + "����" + "����" + "�����Ԥ" + "���" + "��Թԡ" + "����" + "���" + "��չԤ" + "����" + "��֧" + "����" + "�������¹" + "�������" + "��ء" + "����" + "�����" + "����" + "�����" + "���ͧ" + "���ͧ����" + "����" + "���ͧ" + "�����" + "�����" + "����" + "�ǧ" + "�Ǻ" + "���" + "��ѡ" + "��ѹ" + "����" + "��ҡ" + "��ҭ" + "��ҹ" + "����" + "����" + "��ԹԹ" + "��չ" + "����" + "����" + "���ҧ" + "���ҹ" + "�ˡ���" + "�ˡ�����ʵ��" + "�˺��" + "�˻�ҹ�" + "��" + "�͡" + "�ʹ" + "�" + "���յ" + "��ԡ" + "�ഹ����" + "������" + "������" + "��ǹ��" + "���" + "����������" + "����ҹ�" + "�����ǹ�ʵ�" + "���ᾤ" + "������" + "���" + "�����" + "���ѻ���" + "����ԡ�" + "����" + "������ê��" + "�������" + "��ʵ��ԡ�" + "��फ�´�" + "����������" + "��" + "�йͧ" + "�й֧" + "�й��" + "����" + "����鹤���" + "���" + "�����" + "��ṹ" + "�ѡ" + "�Ѥ�����" + "�Ѥ�ҧ��" + "�Ѥ�ҹ��" + "�ѳ��ٵ�" + "�Ѵ" + "�ѷ����" + "�ѹ" + "�ѹ���" + "�ѹ�ç" + "�Ѻ" + "�������Ҿ" + "�������" + "���" + "���" + "���" + "����" + "���" + "��" + "�ҧ" + "�ҧ��" + "�Ҵ" + "�Ҷ�" + "�ҷ��ԡ" + "�ҹ" + "�Һ" + "���" + "�������" + "���" + "����" + "�����" + "�����ҹ" + "������" + "��������" + "����" + "����" + "�����͡䫴�" + "������͡䫴�" + "������ԡ" + "�����" + "�����������" + "�����" + "��������õ" + "���" + "����" + "�����" + "����" + "��" + "�ӹdz" + "�ӹѺ" + "�ӹ֧" + "��ù" + "��ú" + "�����" + "���˧" + "����" + "�ԡ" + "�ԧ" + "�Դ" + "����ѹ��" + "���" + "����" + "�յ" + "�չ��" + "�պ" + "���" + "����" + "�������" + "����" + "���" + "�֡" + "�֡�ѡ" + "���" + "�" + "�" + "���" + "��" + "�ء" + "�ء���" + "�س" + "�س����" + "�س�Ҿ" + "�س�ز�" + "�س�Ѿ��" + "�س���ѵ�" + "�سҡ�" + "�سٻ���" + "�ش" + "�ش���Ҵ" + "���" + "���" + "����" + "��⳻���" + "����" + "���" + "���" + "����" + "����" + "��" + "�ٳ" + "�ٹ" + "�ٻͧ" + "����" + "���" + "���" + "��" + "��͡��" + "��" + "����" + "����" + "���" + "���" + "��ҧ" + "����" + "���" + "��" + "��" + "����" + "���" + "��ҧ" + "��ҧ���" + "��ҧ���" + "��ҹ" + "���" + "������" + "�ҵ" + "�ҵ��" + "�ҵ����" + "���" + "��ͧ" + "��" + "��" + "�����" + "��" + "��" + "��" + "�ǧ" + "�Ǵ" + "��§�" + "��" + "�͡" + "�͡᧡" + "�ʹ" + "�ʹ᧴" + "�" + "�˧��" + "�ͺ" + "���" + "���" + "���" + "��" + "�ѡ" + "�Ѵ" + "�ѹ" + "�Ѻ" + "���" + "������" + "���" + "���" + "����" + "��" + "�ҹ" + "�Һ" + "���" + "���" + "��" + "����" + "�պ" + "�֡" + "���" + "�����" + "�ش" + "�ع��" + "�غ" + "�غ�Ժ" + "���" + "��蹧�ҹ" + "��������" + "����" + "��" + "����Ѵ" + "��ǧ" + "��ǹ" + "��ͧ" + "��" + "����" + "���" + "��ҹ" + "����" + "����" + "���" + "��ǹ" + "���" + "����" + "��ҧ" + "����" + "���" + "��" + "��" + "���Ź�" + "���ҧ" + "��" + "���" + "���ç��" + "���þԸ" + "���ʴ���" + "��" + "��" + "��" + "��١" + "��" + "�èѴ" + "�ô" + "�����" + "����ŧ" + "����" + "��Ǵ" + "�����" + "����" + "����" + "��Ҩ�" + "��ԧ" + "��Ե" + "���¸���" + "������ʵ��" + "�����֡��" + "�����" + "��ا" + "��٭" + "��" + "�Ź����ʵ��" + "�Ź��ʵ��" + "��Ҩ�" + "�ǡ" + "�ǧ" + "�ǹ" + "�Ǻ" + "��ѡ" + "��" + "�͡" + "�ͧ" + "�ͧ�ͧ" + "�ʹ" + "�" + "�ͺ" + "���" + "����ᴹ" + "���" + "��" + "�С��" + "�С���" + "��������" + "�������" + "����" + "�ѡ" + "�ѡ��" + "�ѡ���" + "�ѡ�" + "�ѡþ�ô�" + "�ѡ���" + "�ѡ��ҹ" + "�ѡ���ô�" + "�ѡ����" + "�ѡ��" + "�ѡ��" + "�ѡ����" + "�ѧ" + "�ѧ�ͺ" + "�ѧ���" + "�ѧ�ѧ" + "�ѧ���" + "�ѧ��Ѵ" + "�ѧ�ѹ" + "�ѧ��" + "�ѭ��" + "�ѳ���" + "�ѳ��" + "�Ѵ" + "�Ѵ���" + "�ѵ��" + "�ѵ����" + "�ѹ" + "�ѹ���" + "�ѹ�����" + "�ѹ��" + "�ѹ�ä��" + "�ѹ�ä���" + "�ѹ��ػ�Ҥ�" + "�ѹ���" + "�Ѻ" + "�Ѻ�ѧ" + "�Ѻ����" + "���" + "����" + "���" + "��ꡨ��" + "�������" + "�����" + "�ҡ" + "�ҧ" + "�Ҵ" + "�ҵ�ç��ѹ�Ժҵ" + "�ҹ" + "�Һ" + "�Һ��" + "�Һ����" + "���" + "�������" + "����" + "�����" + "���" + "���к�" + "�����" + "���ԡ" + "����" + "���յ" + "���֡" + "���" + "����" + "������" + "��" + "�ӡѴ" + "�ӹ�" + "�ӹ�" + "�ӹ�è�" + "�ӹ�è�" + "�ӹǹ" + "�ӹͧ" + "�ӹ�" + "�ӻ�" + "�ӻ�" + "�Ӿǡ" + "�����" + "���٭" + "���ͧ" + "��˹���" + "���Ǵ" + "�����" + "����ԭ" + "�����§" + "�����" + "��ṡ" + "�ԡ" + "�ԧ��" + "�Ե" + "�Ե�" + "�Եá�" + "�Եá���" + "�Ե�Ŵ�" + "�Ե�Է��" + "�Ե�Ǫ" + "�Եᾷ��" + "�Թ��" + "�Թ����" + "�Թ���" + "�Թ��ҡ��" + "�Թ��Ҿ" + "�Ժ" + "�ԻҶ�" + "����" + "��駨�" + "��駨͡" + "�����մ" + "�����Ź" + "����" + "����" + "�չ" + "�չ��" + "�պ" + "����" + "���" + "���" + "���" + "���" + "���" + "�֧" + "���" + "���" + "�״" + "��" + "�ء" + "�ش" + "�ص�" + "�ع" + "�غ" + "�غ�Ժ" + "�����" + "����Ե" + "��Ũ��" + "��Ūվ" + "��Ū��ѹ" + "��Ū��Թ" + "��ŷ��ȹ�" + "����Ҥ" + "�����ä" + "����ѡ�Ҫ" + "������" + "���Թ�����" + "����" + "����ŧ�ó�" + "���" + "���" + "����" + "���" + "��鹨��" + "����" + "����" + "��ꡡ���" + "���" + "���ᨧ" + "��맨��" + "��������" + "��" + "�٧" + "�ٺ" + "���" + "���" + "���" + "���" + "���" + "���" + "����" + "���" + "��ҧ" + "����" + "��" + "��ǧ" + "���" + "��͡" + "��͡��" + "��ͧ" + "��" + "����" + "���" + "���" + "��ҧ" + "��ҹ" + "���������" + "����" + "���" + "��Ө��" + "������" + "��͡" + "���" + "���" + "��ͧ" + "����" + "���" + "���" + "��" + "���è�" + "���ѵ����" + "��Ҩ" + "����Ҿ��" + "���" + "����" + "��ǹ" + "��ѧ" + "��ҡ" + "���" + "��ѧ" + "��Ѻ" + "��" + "��ǡ" + "��ѧ" + "���" + "���" + "��" + "����" + "��ͧ" + "����" + "��ѡ" + "��ҡ" + "��Ҵ" + "����" + "����" + "����" + "���" + "��ء����" + "���" + "���" + "��Ѵ���¹" + "��ҧ" + "���" + "�ȡ" + "�͡" + "�ʹ" + "������" + "��" + "�Щҹ" + "�й��" + "�й��" + "����" + "�ѵ�" + "�ѹ" + "�ѹ��ѡɳ�" + "�ѹ��" + "�ѹ��" + "�ѹ�ҹ��ѵ�" + "�ѹ��" + "�Ѻ" + "�ҡ" + "�ҧ" + "�Ҵ" + "�ҹ" + "�Һ" + "���" + "����" + "���" + "�ө�" + "�Թ" + "�Ժ" + "������" + "���" + "���" + "�ա" + "�մ" + "���" + "��" + "�ء" + "�ء�Թ" + "�ش" + "�ع" + "���" + "�ٴ" + "���" + "��ͧ" + "����" + "���" + "��ҧ" + "���" + "���" + "��" + "��" + "���" + "���" + "��" + "��" + "���" + "����" + "��������" + "����" + "��ǹ" + "���" + "��ѡ" + "��Դ" + "���" + "��" + "��������" + "����" + "���ٹ�" + "���ٹط" + "�����" + "����" + "���" + "�����" + "�����" + "��" + "��" + "���" + "����" + "���" + "��" + "�Ÿ��" + "�Ÿ�" + "�Ź�" + "�Ż�зҹ" + "������" + "������" + "��" + "�Ǵ" + "�ǹ" + "���" + "���Ե" + "���" + "����" + "�͡" + "�͡���" + "�ͧ" + "�" + "�ͺ" + "�ͻ���" + "���" + "����" + "�����" + "�����" + "����" + "��" + "�Чѡ" + "�ЧѴ" + "�Ч���" + "�Ч�" + "�Ч��" + "�е�" + "�й�" + "����" + "���Ѵ" + "�����" + "����" + "�����" + "���ٴ" + "�����" + "�����" + "�����" + "����" + "���ŧ" + "��⧡" + "���" + "�ѡ" + "�ѧ" + "�Ѫ���" + "�ѯ" + "�Ѵ" + "�ѹ" + "�ѹ�е�" + "�ѹ��" + "�ѹ�ٵ�" + "���" + "��¾ġ��" + "�������" + "���" + "����" + "�������" + "���" + "����" + "��" + "�ҭ" + "�Ҵ" + "�Ҵ�" + "�ҵ��" + "�ҵ�" + "�ҵ�" + "�ҹ" + "�ҹ�" + "���" + "���" + "����" + "����" + "���" + "�����" + "��" + "�ӹѭ" + "�ӹҭ" + "�ӹ�" + "����" + "���ش" + "������" + "����¹" + "������" + "�����" + "�����ͧ" + "������" + "��" + "�Ԥ��" + "�ԧ" + "�ԧ���" + "�Դ" + "�Թ" + "�Ի" + "�Ծ" + "���" + "���ỹ��" + "�����" + "���" + "���" + "��" + "�ջТ��" + "�վ" + "�վԵѡ���" + "��ǻ���ѵ�" + "����Է��" + "���ҵ��" + "�������" + "���Ե" + "���Եѡ���" + "���Թ" + "����" + "������" + "���" + "�״" + "���" + "������" + "����" + "���" + "����" + "�ء" + "�ش" + "�ع" + "�غ" + "���" + "������" + "�����" + "����ع" + "����" + "����" + "����" + "���" + "��" + "���" + "���" + "��ŷ�" + "����" + "���" + "��͡��ŵ" + "��͡��ŵ" + "��ǧ" + "����" + "���" + "��ͧ" + "��" + "��ҧ" + "���" + "��Ӫͧ" + "��ͧ" + "��" + "����" + "���" + "��ҧ" + "���" + "��" + "��" + "��" + "��" + "��" + "�Ǵ�" + "�ǹ" + "���" + "��" + "�͡" + "�ͧ" + "�" + "�Ϳ������" + "�Ϳ��" + "�Ϳ������" + "������" + "���" + "���" + "�ѡ" + "�ѧ" + "�Ѵ" + "�ѹ" + "�ѹ�Ҥ���" + "�Ѻ" + "�Ѿ����" + "��ſ�" + "��" + "�ҡ" + "�ҡ���" + "�ҧ" + "�ҹ" + "�Һ���" + "�Һ��ҹ" + "������" + "������" + "���" + "��Ǵ�" + "��" + "�ԡ" + "�ԡ���" + "�ԡ��" + "�Թ��" + "�Ժ" + "�Ի" + "�Կ����" + "���Ԥ" + "���" + "���" + "��" + "�ա" + "�մ" + "�մ�" + "�չ" + "���͡��" + "������" + "�������" + "������" + "���" + "���" + "�֧" + "���" + "���" + "���" + "����" + "����" + "�ء" + "�ا" + "�ع" + "�غ" + "�ػ" + "���" + "����" + "��������" + "����" + "�٪�" + "�ٴ�Ҵ" + "�ٴҹ" + "�ٺ" + "����������" + "�����" + "���" + "��" + "��ͧ" + "��" + "����" + "���" + "��ҹ" + "��������" + "��" + "��ͧ" + "��" + "����" + "����" + "���" + "�ҹ" + "�һ��Ԩ" + "�һ�ʶҹ" + "�ǹ" + "�ѵ��" + "�ҳ" + "�ҵ�" + "�����" + "�ҹ" + "�ҹ�" + "�ҹѹ��" + "�һ��" + "��" + "��" + "�����" + "����" + "��" + "��ê��" + "��ҿ��" + "��س" + "��س�" + "��" + "�ǧ" + "�Ǵ" + "���" + "�͡" + "�͡����" + "�͡���" + "�ͧ" + "�ʹ" + "�" + "���" + "���" + "�������" + "���" + "��" + "�ѡ" + "�ѡ�ҹ" + "�ѡ��" + "�ѧ" + "�Ѫ��" + "�Ѵ" + "�ѵ��" + "�ѹ" + "�Ѻ" + "�Ѻ����" + "�����" + "��ʡ�" + "���" + "���" + "���" + "��" + "�ҡ" + "�Ҵ" + "�ҵ��" + "�ҹ" + "�Һ" + "�Һ�" + "���" + "�����" + "���" + "��ó�" + "��ô��" + "����" + "����" + "���" + "���Ѵ" + "���" + "��Ǵ֧��" + "��ǹ���Ŵ" + "���⨹��" + "���" + "��ɴ�" + "��" + "��ç" + "�����" + "����" + "���ɳ�" + "���ԧ" + "���Թ" + "��ᤧ" + "��" + "�ԡ" + "�ԨԵ��" + "�ԩѹ" + "�Զ�" + "�Թ" + "�Ժ" + "���Ѩ�ҹ" + "��š" + "���Ԫ��" + "��ʹ���" + "���ࡵ" + "���" + "����" + "���" + "����" + "��" + "�ա��" + "�մ" + "�մշ�" + "�պء" + "���մ�" + "����" + "����ʪ��" + "��䫹�" + "�������" + "�֡" + "�֡�Ӻ�þ�" + "�֧" + "�֧��" + "���" + "����" + "���" + "���" + "����" + "����" + "��" + "�ء" + "�ب" + "�ش" + "�ع" + "�غ" + "���" + "��ç��" + "�����ҧ���ʵ��" + "�����ҧ���Ż�" + "�����ҧ��" + "���" + "��žԹԨ" + "����Ҥ" + "���¾ԹԨ" + "�����Ҿ" + "��ɮ�" + "��ɳ�" + "���Ե" + "���Ե" + "�������" + "����" + "����" + "���" + "��駴��" + "���" + "��" + "�١�" + "�ٴ" + "����" + "��ǹ" + "��" + "����" + "���" + "��ҧ" + "��ҹ" + "����" + "���" + "��" + "��" + "��ǧ" + "��ǹ" + "����" + "����" + "����" + "��ҹ" + "����" + "����" + "����" + "���" + "��" + "��ŧ" + "��" + "���Թ" + "��Դ" + "��" + "��Ҥ�" + "��" + "��" + "���" + "��" + "�ç" + "���" + "�������" + "��á�Է��" + "��á��ʵ��" + "��á�" + "��Ǩ" + "��ǹ" + "��͡" + "��ͧ" + "�������" + "�����" + "���" + "��С��" + "���˧�ҹ" + "���˹�" + "���˹ѡ" + "���˹��" + "����ǹ" + "��ѧ" + "��Ѻ" + "����" + "����" + "���" + "��ҡ���" + "��Һ" + "����ѧ" + "���" + "���" + "���" + "����������" + "���⡳" + "��֡" + "��֧" + "���" + "����" + "���" + "����" + "�ij" + "�š" + "�ź" + "��ʹ" + "��Ѻ" + "��Ҵ" + "����" + "�ǧ" + "��Ѵ" + "��Ҵ" + "��" + "�͡" + "�ͧ" + "�ʹ" + "�" + "�ͺ" + "���" + "����" + "������" + "����" + "�����" + "��" + "�С�ѹ" + "�С�ش" + "�С���" + "�С���" + "�С���" + "�С��" + "�С���" + "�С" + "�Сѧ" + "�С���" + "�Сء�Сѡ" + "�Т�" + "�ТҺ" + "�ТԴ�Тǧ" + "�Ф���" + "�Ф�غ" + "�Ф͡" + "�й��" + "�кͧ" + "�к��" + "�кѹ" + "�л����л��" + "�оҺ" + "�оִ" + "�оִ�о��" + "�о��" + "���յ��ҹ" + "���֧" + "���ا" + "������" + "������ء" + "������" + "���ѹ" + "������" + "����¡�С��" + "����§" + "����º" + "����" + "����¹" + "����" + "����" + "���Դ" + "�����" + "����¹" + "�����" + "���ŧ" + "���ç" + "��ᤧ" + "��ầ" + "���" + "��⡡" + "��⡹" + "����" + "��⢧" + "����" + "��⾡" + "���˧�" + "����" + "�����" + "�����" + "���" + "����" + "�ѡ" + "�ѡ���" + "�ѧ" + "�ѧ����" + "�ѧ�" + "�ѧ��" + "�ѧ���" + "�ѳ��" + "�Ѵ" + "�Ѵ�Թ" + "�ѹ" + "�ѹ�§" + "�Ѻ" + "���" + "���" + "���" + "�����" + "�����" + "���ᵹ" + "����" + "��" + "�ҡ" + "�Ҵ" + "�ҹ" + "�ҹ�" + "�Һ" + "���" + "���" + "���" + "��Żѵ�" + "��" + "�ӹҹ" + "�Ӻ�" + "���Ǩ" + "���Ѻ" + "����" + "���֧" + "��˹ѡ" + "��˹�" + "����" + "���˹�" + "��" + "�ԡ���ѧ" + "�ԧ" + "�Գ" + "�Դ" + "���Ѩ�ҹ" + "��š" + "���" + "����" + "���" + "���" + "��" + "�չ" + "�պ" + "���" + "���" + "��" + "�֡" + "�֧" + "�ִ����" + "���" + "��页��" + "��괵���" + "�״" + "����ǹ" + "���" + "���" + "����" + "����" + "����" + "��" + "�ء�ԡ" + "�ا" + "�ع" + "�ع�˧ѹ" + "�غ" + "��á�" + "����" + "���ҡ��" + "���Ҥ�" + "����Ѵ������" + "���" + "����" + "����" + "��駡��" + "��駵��" + "���" + "����" + "����" + "���" + "���" + "��꡵�" + "����" + "���" + "�����" + "��꺻�ͧ" + "����" + "���" + "����" + "���µ���" + "��" + "�١" + "�ٴ" + "�ٺ" + "���" + "���" + "���" + "��ǹ" + "���" + "��ͧ��" + "����" + "����" + "��ҧ" + "���" + "��" + "���" + "���������" + "���" + "��ͧ" + "��ͧ�" + "��" + "����" + "���µ��" + "���µ��Դ" + "��ҹ" + "��͡" + "��͡����" + "��" + "����" + "��" + "��" + "���" + "����" + "��Ѵ" + "��Ѵ����" + "����" + "��" + "��֧�֧" + "�š" + "�Ź" + "��͡" + "��ѹ" + "���" + "��ҡ" + "���" + "��ն��" + "��֧��" + "��ا" + "��ع" + "����" + "������" + "����" + "����" + "�͡" + "�ͧ" + "�ʹ" + "�" + "���" + "��" + "�ѡ" + "�ѧ" + "�Ѵ" + "�ѹ" + "���" + "����" + "��" + "�ҡ" + "�ҧ" + "�Ҵ" + "�ҹ" + "���" + "����" + "���" + "�պ" + "���" + "�֡" + "�֧" + "���" + "�ا" + "�ع" + "���" + "��" + "�١" + "���" + "��ǧ" + "���" + "��ͧ" + "����" + "����" + "��ҧ" + "��ҹ" + "����" + "��ǹ" + "����" + "����" + "���" + "���" + "��" + "�����" + "��" + "��" + "����" + "����" + "����" + "��" + "���ǹ" + "��ǧ" + "����" + "����" + "�á���" + "�ç" + "�ê�" + "�êҵ�" + "�þ��" + "�þ�" + "���ҹ" + "����" + "���ؤ" + "��û" + "���ȹ�" + "���Ҫ" + "���ѡɳ�" + "��ǧ" + "��Ǵ�ç" + "��˴" + "��Ѿ�ҡ�" + "��Ѿ��" + "��Ѿ���Թ" + "������" + "��ҹ�������" + "��Һ" + "����" + "����" + "��ش" + "��ɮ�" + "����" + "�ǧ" + "�Ǵ" + "�ǹ" + "���" + "��ҷ�" + "����" + "����" + "���" + "���" + "��ո����ɡ" + "��ջ" + "����" + "��" + "�ȹ���" + "����" + "��" + "�͡" + "�ͧ" + "�ͧ����" + "�ͧ��ҧ" + "�ʹ" + "�" + "����" + "�Ϳ���" + "���" + "����" + "�й�" + "�йҹ" + "�й�" + "���Ѵ�����" + "���ֹ" + "�����" + "���ҹ" + "���ǧ" + "���ѡ" + "�����" + "�����" + "����" + "�����" + "����¹" + "����ͷ��ҹ" + "����" + "������" + "�����ͷ����" + "�����" + "�����" + "�ѡ" + "�ѡ�ԭ" + "�ѡ�Գ�" + "�ѡ�Գ��ѯ" + "�ѡ��" + "�ѡ��" + "�ѡ�Գ" + "�ѡ�Գ�" + "�ѡ�Գ���õ" + "�ѡ���" + "�ѧ�൹" + "�ѳ�����" + "�ѳ��ҵ" + "�ѳ�ʶҹ" + "�ѳ��" + "�Ѵ" + "�ѹ" + "�ѹ�ᾷ��" + "�ѹ��" + "�ѹ��" + "�Ѻ" + "�Ѻ��ԧ���" + "�Ѿ" + "�Ѿ��" + "��ȹ���" + "��ȹ�����" + "��ȹ�֡��" + "��ȹ�" + "��ȹ�" + "��ȹҨ�" + "��ȹ���Ҿ" + "��ȹ���" + "��ȹٻ�ó�" + "��ȹ�" + "�����" + "���" + "����" + "���" + "��" + "�ҡ" + "�ҧ" + "�ҹ" + "�Һ" + "���" + "���" + "���Ҵ" + "���ҷ" + "��á" + "���ԡ�" + "���س" + "����ҹ" + "���" + "��" + "�ӹ�" + "�ӹͧ" + "�ӹ��" + "�ӹ�" + "�����" + "����" + "����º" + "����" + "����" + "�Ԥ����" + "�Ԧ����" + "�ԧ����" + "��" + "�Դ" + "�Ծ¨ѡ��" + "�Ծҳ" + "�Ծ���" + "�Ծ��" + "�Ծ��" + "�Ծҡ�" + "���" + "���" + "��ǧ��" + "��Ƿ�ȹ�" + "����" + "���" + "����" + "���ҹط��" + "��ີ" + "����" + "���" + "��" + "�զ�ҵ�" + "���" + "�����" + "���" + "���Թ" + "�֡" + "�ֹ�֡" + "�ֺ" + "���" + "���" + "����" + "���" + "����" + "��" + "�ء" + "�ء����" + "�ء������" + "�ء��Ƿ��" + "�ء��" + "�ءá�����" + "�ؤ��" + "�ب�Ե" + "�ش" + "�ع" + "�غ" + "�ؾ��" + "�ؾ�ԡ����" + "���" + "��áѹ���" + "��ê�" + "��êҵ�" + "��ù�����" + "��þ�" + "���ѡ����" + "�����" + "�����" + "�����¹" + "�����" + "���" + "���" + "����" + "���" + "����" + "����" + "��" + "�ٵ" + "�ٵҹطٵ" + "�ٹ" + "�ٺ" + "���" + "���" + "���" + "���" + "�����" + "��§" + "����" + "��ǧ�ӹͧ" + "��ǧ��" + "��ǧ���" + "����" + "���" + "��ͧ" + "��" + "����" + "���" + "��ҹ" + "������ҧ" + "��" + "��ǧ" + "��ǹ" + "����" + "���" + "��ͧ" + "���" + "����" + "����" + "��" + "��" + "���ѵ�" + "������" + "�����ѵ�" + "�����" + "��Ҥ��" + "��ҳѵ�" + "����ѡ��" + "���" + "��" + "��" + "�ó�" + "����" + "�������" + "�����ҵ�" + "������" + "������ʵ��" + "�����" + "����и����" + "����ҷԵ��" + "����Ҹ���" + "����ҸԻ��" + "����Ҹ�ɰҹ" + "����ҹ��ҹ" + "��������آ" + "�����������" + "�����µ��" + "���������" + "�����ʹ�" + "����ԡ" + "��Ҹ�" + "��Ҹ��" + "��ҸԺ��" + "��ҸԻ" + "�ѭ" + "�ѭ�����" + "�ѭ�ת" + "�ѹ�Ҥ�" + "�����" + "�ҵ�" + "�ҹ�" + "���" + "����" + "���ç��" + "��ç" + "�Դ�" + "��ີ" + "�ش���" + "��á���" + "��á��" + "��áԨ" + "����" + "����" + "��Ǵ���" + "����Ҥ" + "�������" + "�ٻ" + "��" + "���" + "����Ҫ����" + "���Թ���" + "�����" + "����ҭ" + "���ت" + "���Ч�" + "�����" + "�����" + "���ѡɳ�" + "�������" + "���" + "�������" + "�����" + "�����" + "��" + "��" + "�����" + "��ȡ" + "�����" + "���" + "������" + "��" + "���ʡ��" + "�á" + "���ԧ��" + "����Ǫ" + "���ᾷ��" + "�Ĥ�Ե" + "�Ĺҷ" + "����" + "���Ե" + "��ү" + "��Թ�" + "�Ǵ" + "�ǹ����" + "���" + "���" + "���" + "������" + "������ͧ" + "��" + "�͡" + "�ͧ" + "�͵" + "�" + "�ͺ" + "���" + "��������" + "��" + "�ѡ" + "�ѡ�ѵ" + "�ѡ�֡��" + "�ѡ�ѵ�" + "�ѡ���¹" + "�ѧ���" + "�Ѵ" + "�Ѵ��" + "�ѵ���" + "�ѹ��ҡ��" + "�Ѻ" + "���" + "��¹�" + "���" + "���" + "���" + "���" + "��" + "�ҡ" + "�Ҥ" + "�Ҥ�" + "�Ҥ�Ҫ" + "�Ҥ�" + "�ҧ" + "�ҧ���" + "�ҧ���" + "�ҫ�" + "�ү" + "�Ҵ" + "�Ҷ" + "�ҷ" + "�ҷ�" + "�ҹ" + "�ҹѻ���" + "�ҹ�" + "�Һ" + "����" + "���" + "�����" + "���ʡ��" + "���ҹء��" + "��������" + "���" + "��¡" + "����³�" + "����" + "����" + "���ԡ" + "���Թ" + "����" + "���ԡ" + "���ԡ�" + "�����" + "���" + "��" + "��" + "�ԡ�" + "�ԡ��´�" + "�ԡ��" + "�ԡ���" + "�Ԥ�" + "�Ԥù��" + "�Ԥ�Ե" + "�Ԩ" + "�Դ" + "�Ե����" + "�Ե��" + "�Ե�" + "�Է���" + "�Է��" + "�Է�ȹ�" + "�Էҹ" + "�Թ��" + "�Ժҵ" + "�Ծ���" + "�Ծ�ҹ" + "������" + "����ҹ" + "����ҹô�" + "���Ե" + "����" + "�����" + "�����" + "��÷ء��" + "��ù��" + "������" + "�����" + "����Ե" + "���ѹ��" + "�����" + "�����" + "���" + "���غ�" + "��ǡԹ�" + "��Ǥ���ԡ" + "��ǫ��Ź��" + "��ǵ�" + "�������" + "���ó�" + "���ѵ" + "���ѵ��" + "���ҵ" + "�����" + "���������" + "��������" + "�����" + "���Ե" + "����" + "�����" + "����ȹ�" + "��⤵Թ" + "���ø" + "���ź�" + "���" + "����" + "����" + "����" + "��" + "���" + "���ʹ������" + "���" + "���" + "�֡" + "���" + "�ا" + "�ت" + "���" + "���" + "����" + "����" + "�ٹ" + "���" + "���" + "������" + "��º��" + "��ô�" + "����" + "��ͧ" + "���" + "��ҹ" + "��ͧ" + "����" + "����" + "����˹��" + "�����˹�" + "���" + "����" + "���" + "����ѹ" + "����Թ" + "��" + "�����ͧ" + "��" + "����" + "��" + "��Թ��പ�" + "��Թ���" + "���" + "��" + "��" + "��Ե�" + "��Ը" + "���" + "���ѵ��" + "���" + "��è�" + "��è�ó�" + "��è�" + "��èǺ" + "��è�" + "��ó" + "��óҡ��" + "��óҤ�" + "��óҸԡ��" + "��óҹء��" + "��ó��ѡ���ʵ��" + "��ó��ѡ��" + "��ô�" + "��÷�" + "��÷Ѵ" + "��÷ء" + "��þ" + "��þ��" + "��þ�Ե" + "��þ�" + "��þ�����" + "���§" + "���§��" + "����ҡ��" + "������" + "������" + "�����" + "����ѷ" + "������" + "����Դ" + "�����" + "����ŧ" + "������" + "���蹴�" + "��������" + "���" + "��ԡ���" + "��ԡ��" + "��Ԣ��" + "��Ԥ���" + "��ԨҤ" + "��Ԩ�á" + "��Ԩ��ԡ�" + "��Ժ��" + "��Ժ�ó�" + "��Ծѵ�" + "��Ծ��" + "����ѳ��" + "������" + "����ѡ��" + "����Ҫ" + "������" + "����ѷ" + "����ط���" + "������" + "���" + "���൹" + "����dz" + "������" + "���͡" + "�ǡ" + "�ǧ" + "�Ǫ" + "�ǹ" + "�Ǻ" + "���" + "���" + "��" + "�͡" + "�ʹ" + "�ʹ��" + "�" + "�ͺ" + "����" + "����" + "��������" + "���" + "����ٹ" + "������" + "�ѡ" + "�Ѥ���" + "�ѧ" + "�ѧ����" + "�ѧ��" + "�ѧ��" + "�ѧ�Ѻ" + "�ѧ�ء��" + "�ѧ��" + "�ѧ�Ҩ" + "�ѧ�Դ" + "�ѧ���¹" + "�ѧ��ԭ" + "�ѭ��" + "�ѭ��" + "�ѭ��" + "�ѭ�ѵ�" + "�ѳ�Ե" + "�ѳ�Ե��" + "�ѳ��" + "�ѳ���" + "�ѳ���" + "�ѳ��" + "�ѳ���" + "�ѳ��С�" + "�ѳ�����" + "�Ѵ" + "�Ѵ���" + "�Ѵ��" + "�Ѵ��" + "�ѵ�" + "�ѹ" + "�ѹ���" + "�ѹ�֡" + "�ѹ�кѹ�ѧ" + "�ѹ���" + "�ѹ�ԧ" + "�ѹ�" + "�ѻ����" + "�Ѿ" + "��š�����" + "����ѧ��" + "����ٹ" + "���" + "���" + "���" + "���" + "���" + "���" + "��" + "�ҡ" + "�ҧ" + "�Ҵ" + "�Ҵ���ѡ" + "�Ҵ��" + "�ҵ" + "�ҵ�" + "�ҷ" + "�ҷ�����" + "�ҷ��ǧ" + "�ҷҸ֡" + "�ҷء�" + "�ҹ" + "�ҹ���" + "�ҹ����" + "�ҹ���" + "�ҹ���" + "�ҹ���" + "�һ" + "���" + "�����" + "����������" + "����" + "�������" + "���" + "����" + "���" + "��ȡ�" + "���ࡵ���" + "�����" + "�ӹҭ" + "�ӺѴ" + "���Һ" + "�����" + "���ا" + "����" + "����" + "�����" + "���˹�" + "��" + "�" + "�Գ��ҵ" + "�Դ" + "�Դ�����" + "�Դ�" + "�Դ�" + "�Ե" + "�Թ" + "���" + "������´" + "���" + "�ձ�" + "�չ" + "�պ" + "���" + "�֡" + "�֡�ֹ" + "�֧" + "���" + "���" + "��" + "�ء" + "�ء�ء" + "�ءɡ" + "�ؤ��" + "�ؤ�ҡ�" + "�ؤ�Ҹ�ɰҹ" + "�ؤ�ԡ" + "�ؤ�ԡ�Ҿ" + "�ح" + "�ح�ҹ��Ҿ" + "�ح���Թ����" + "�س��ԡ" + "�س��" + "�ص�" + "�ص��" + "�ص��" + "�غ" + "�ػ��ҵ�" + "�ؾ����" + "�ؾ����" + "�ؾ�Ԩ" + "�ؾ�ҵ�" + "�ؾ�ѡ�Գ" + "�ؾ���Ե" + "�ؾ��" + "�ؾ�Ҩ����" + "�ؾ��ѹ�����" + "�ؿ���" + "��þ���" + "��þ��" + "��þҨ����" + "���ҳ" + "��������" + "����������" + "������Է��" + "����" + "�����" + "��ɡ�" + "��ɺ�" + "��ɺ�" + "�������" + "����Ҥ��" + "��˧ѹ" + "��˧�" + "���ç" + "������" + "����ѹ" + "���÷��" + "��������" + "���" + "����" + "����" + "�٪�" + "�٪��ѭ" + "�ٴ" + "�ٵ" + "��ó�Ҿ" + "��ó�" + "��þ�" + "��þҨ����" + "���" + "���" + "��" + "��" + "��" + "���" + "��ǧ" + "���" + "��ͧ" + "��" + "����" + "���" + "��ҧ" + "����" + "����" + "��ǹ" + "��ͧ" + "��ͧ���" + "����" + "���" + "��ҧ" + "��ҹ" + "��������" + "����" + "����" + "��ͧ" + "���" + "����" + "����" + "���" + "��" + "����ͧ" + "����" + "��ó�" + "����" + "��Գ��" + "��ѡ" + "��ԡó�" + "��ԡ���" + "��ԡ�����" + "��ԡ��" + "��Ԥ�" + "��Ԫ�ǹ�" + "��ԭ��" + "��ԭҳ" + "��ԷԹ" + "��Ժ�" + "��Ժѵ�" + "��Ի��" + "��Իѡ��" + "��Ծѷ��" + "��Ծҡ��" + "����Ҥ" + "����ҳ" + "�����" + "����ҡ�" + "����ط��" + "����ٻ" + "����ѵ�" + "����ҵ" + "����ҷ" + "���ʹ��" + "����ѧ�ó�" + "����ѹ���" + "�������ѹ��" + "����Ǹ" + "����ʸ" + "������" + "����" + "���" + "�����ȹ�" + "�������" + "�����Һ��" + "���ġ��" + "������" + "����ȹ�" + "���" + "��Ըҹ" + "��" + "����" + "��ҹء��" + "����" + "�����ҹ�" + "��" + "��Ѵ��" + "���" + "��" + "��" + "�á" + "�á��" + "�ç" + "�ù" + "�ù�Ժѵ�" + "�ù��" + "�ú" + "�ûѡ��" + "���ѵ��" + "���Ҩ����" + "���ҳ�" + "�������ɡ" + "��������" + "��Ǵ" + "��ǹ��" + "���ҷ�" + "���Ե" + "��ͧ�ͧ" + "��ʹ" + "��ͷ" + "����" + "���" + "��С�" + "��СǴ" + "��Сͺ" + "��Сѹ" + "��СѺ" + "��С��" + "��С��" + "��С��" + "��С�ȹ�ºѵ�" + "��С��Ե" + "��СԴ" + "��Ф�" + "��Ф����˧�" + "��Фͧ" + "��Ф�" + "��Ш�" + "��ШǺ" + "��Шѡ��" + "��Шѭ" + "��Шѹ" + "��ШҤ" + "��Шҹ" + "��Ш�" + "��Ш��" + "��Ш�" + "��Ш�ͻ����" + "��Ъ�" + "��Ъ��" + "��Ъѹ" + "��Ъ�" + "��ЪҪ�" + "��ЪҸԻѵ��" + "��ЪҸԻ��" + "��Ъ��Ժ��" + "��ЪԴ" + "��Ъ��" + "��г�" + "��г�" + "��г��" + "��гԸҹ" + "��гԸ�" + "��гյ" + "��д�" + "��дǹ" + "��д" + "��дѡ����Դ" + "��дѧ" + "��дѺ" + "��д�" + "��дһ" + "��д��" + "��дԴ��д��" + "��дԷԹ" + "��д�ɰҹ" + "��д�ɰ�" + "��дا" + "��дب" + "��д��" + "��е�" + "��ж�" + "��зǹ" + "��зѡ��" + "��зѧ" + "��зѴ" + "��зѺ" + "��зҹ" + "��зԹ" + "��з��" + "��зջ" + "��зع" + "��з��" + "��з������" + "��з�ǧ" + "��иҹ" + "��иҹҸԺ��" + "��й�" + "��й��" + "��йջ�й��" + "��л���" + "��л�" + "��оĵ�" + "��оĸ��" + "��оѷ��" + "��оѹ��" + "��оҵ" + "��о��" + "��о��" + "��оԳ" + "��оط��" + "��������" + "�����" + "����Ҥ��" + "����Ҿ" + "������" + "�����" + "����ǭ" + "������" + "����ҳ" + "����ҷ" + "����آ" + "����ط" + "������" + "����ء��" + "����ط��" + "������" + "�������" + "����ͧ" + "������" + "����ҵ" + "�����õ" + "�����õ��" + "����ѵ�" + "����ѵԡ�ó�" + "����ѵ���ʵ��" + "����ҵ" + "������" + "������" + "����ԧ" + "����Ԫ" + "����Ե�" + "����ճ" + "�����" + "�����ʹ�" + "���ʡ" + "���ʧ��" + "���ʺ" + "���ʺ��ó�" + "���ʾ" + "�����" + "����ҷ" + "����ҹ" + "����Է�Լ�" + "����Է���Ҿ" + "����Է���" + "����ٵ�" + "�������" + "�����Ѵ" + "�����Ҵ" + "�������" + "������" + "������" + "���ह" + "���ਡ" + "����Դ������" + "�����´" + "����" + "������" + "�����§" + "��������" + "�������ǻ�д���" + "�����" + "�����" + "������Ҫ" + "�������" + "�����ͧ" + "���ླ�" + "������" + "�����Թ" + "����dz�" + "������" + "�����ȹ�" + "������" + "���ᡡ" + "����" + "�����" + "����¤" + "����ª��" + "������" + "��ѡ" + "��ѧ" + "��Ѫ��" + "��ѵ�ص�ѹ" + "��ѵ�غѹ" + "��ѹ" + "��Ѻ" + "�������" + "���ȹ�" + "������" + "��ҡ�" + "��ҡ��" + "��ҡ��" + "��Ҥ���" + "��ҧ" + "��ҧ��" + "��Ҩչ" + "��Ҫ��" + "��Ҫ��" + "��Ҫ��" + "��ҪԵ" + "��ҳ" + "��ҳ�" + "��Ҵ" + "��ҹ�" + "��Һ" + "��Һ�����ɡ" + "��һ��" + "�����" + "����" + "������" + "����" + "���ö��" + "�����" + "�������" + "����" + "�������" + "������" + "���ɳ�" + "����ҳ" + "����ҷ" + "������" + "��������" + "���" + "���" + "��ԡ" + "��Ԥ���" + "��ԨҤ" + "��Ԩ��ԡ�" + "��ԫ��" + "��ԭ��" + "��Գ��" + "��Գ�¡" + "��Ե" + "��Ե��" + "��Ե�" + "��Է��ȹ�" + "��Է�ȹ�" + "��Թ" + "��Թ��" + "��ԹԾ�ҹ" + "��Ժ" + "�������" + "����ѷ" + "����ҳ" + "����ҵ�" + "����ѵ�" + "������" + "�����õ" + "������" + "���ȹ�" + "���" + "�����" + "��ժ�" + "��մ�" + "��մ��" + "�����" + "����" + "����" + "��֡��" + "����" + "�����" + "���" + "��ا" + "��ٴ" + "���괻��Ҵ" + "����" + "��������" + "���š" + "����" + "����" + "�Ĩ��" + "��ɮҧ��" + "�š" + "�ŧ" + "�Ŵ" + "��ǡ" + "��͡" + "��ʹ" + "��ʹ���" + "��ͺ" + "����" + "���" + "��ѡ" + "��Ѵ" + "����" + "����" + "�����Թ" + "���" + "��ҵ" + "��Һ" + "����" + "������" + "���ʹҡ��" + "��������" + "��ԧ" + "��Դ" + "����" + "���⾸" + "�����" + "����" + "���" + "��ա" + "�����" + "��ء" + "��١" + "���" + "���ͧ" + "�����" + "���" + "���ͧ" + "���" + "����" + "�ǡ��¡" + "�ǧ" + "�Ǵ" + "���ó�" + "���" + "��" + "�͡" + "�ͧ" + "�ʹ" + "�" + "���" + "�ͺ" + "���" + "����" + "�������" + "��" + "�С�" + "�С��ѧ" + "�Т��" + "�з�" + "�з�" + "��˧Ѻ" + "�������" + "������" + "���ŧ" + "�ѡ" + "�ѡ���" + "�ѡ��" + "�ѡ����ҹ" + "�ѡ�Գ" + "�ѡ�Թ" + "�ѡ��" + "�ѡ��" + "�ѡ���" + "�ѧ" + "�ѧ�ء��" + "�Ѩ�ѹ����" + "�Ѩ�ѹ�����" + "�Ѩ�ѹ������" + "�Ѩ�ѹ��" + "�Ѩ���" + "�Ѩ���Ե�" + "�Ѩ�غѹ" + "�Ѩ������" + "�Ѩ��" + "�Ѩ���" + "�Ѩਡ" + "�ѭ��Ѥ����" + "�ѭ��" + "�ѭ��" + "�Ѵ" + "�ѵ�ҹ�" + "�ѵ������" + "�ѷ��" + "�ѹ" + "�Ѻ" + "�ѻ����" + "�������" + "�������" + "���" + "���" + "���" + "����" + "���" + "��" + "�ҡ" + "�ҡ��" + "�ҡ�ʶҹ" + "�ҧ" + "�ү�������" + "�Ұ�" + "�Ұ���" + "�ҳҵԺҵ" + "�Ҵ" + "�ҵ������" + "�ҷѧ��" + "�ҷ�ͧ��" + "�ҹ" + "�һ��" + "���" + "�����" + "���Ҫԡ" + "���ԩѵ�" + "���Ԫҵ" + "�����" + "����ࡵ�" + "����" + "�����" + "���" + "��˹ѹ" + "�����" + "�������" + "��" + "�ԡ�ԡ" + "�ԧ�ͧ" + "�Ԯ�" + "�Դ" + "�Ե�" + "�Ե�" + "�Ե�" + "�Եئҵ" + "�Ե�����" + "�Ե���" + "����Ե�" + "����" + "���Ҩ" + "���������" + "������" + "���" + "����" + "����" + "���" + "����" + "����" + "��" + "�ա" + "�չ" + "�պ" + "�������" + "���Ҩ" + "���" + "���" + "���" + "���" + "���" + "�֡" + "�֧" + "���" + "���" + "���" + "�" + "���" + "����" + "��" + "�ء" + "�ب��" + "�ش" + "�ضت�" + "�غ" + "���" + "�����Ե" + "����" + "��駡��" + "����" + "���" + "���" + "����" + "����" + "��" + "�٪��ºؤ��" + "�٪����ѵ��" + "�ٴ" + "�ٹ" + "���" + "���" + "����������" + "��dz�" + "��" + "��ǧ" + "��ǹ" + "����" + "��ͧ" + "���" + "��ҹ" + "����" + "����" + "��ǹ" + "��ǹ���¹" + "���" + "��ͧ" + "��ͧ�ѹ" + "��" + "����" + "����" + "�����" + "���" + "��ҧ" + "��ҹ" + "��Һ" + "����" + "���" + "��͡���" + "��Һ" + "���" + "����" + "���" + "��" + "���" + "����" + "��" + "���" + "���" + "��Ҵ" + "���" + "���" + "��" + "��ا" + "��ǡ" + "��Ǫ" + "��ѧ" + "��֡" + "��" + "����ͺ" + "��ͧ" + "�����ҷ" + "��" + "���" + "��ѡ" + "��Ѵ" + "�����" + "��ҭ" + "��ҹ�ʧ��" + "��Ҽ�" + "������" + "���" + "��Ե" + "��Ե�ѳ��" + "��ռ���" + "��֡" + "����" + "���" + "��ا" + "��ش" + "��ع" + "��غ" + "����" + "���" + "�����" + "�ǹ" + "���" + "���" + "���" + "��ҹ" + "����" + "�͡" + "�ͧ" + "�ʹ" + "�ͺ" + "���" + "��Ǵ" + "��ٹ" + "��" + "�ѡ" + "�ѧ" + "�Ѵ" + "�ѹ" + "�ѹ�ǹ" + "�Ѻ" + "���" + "����" + "��" + "�ҡ" + "�ҧ" + "�ҳԵ" + "�Ҵ" + "���" + "��" + "�ԧ" + "�Դ" + "�Թ" + "���" + "��" + "�֧" + "���" + "���" + "�" + "���" + "��" + "�ش" + "��¼�" + "�١" + "���" + "����" + "��ͧ" + "��" + "����" + "���" + "��ҹ" + "���¼��" + "����" + "���" + "��" + "����" + "�������" + "���" + "�ѡ" + "�ѧ" + "�Ѵ" + "�ѹ" + "���" + "��" + "�ҡ" + "�ҧ" + "�Ҵ" + "�ҹ" + "���" + "���" + "��" + "�֡" + "�״" + "�" + "���" + "�٧" + "���" + "���" + "����" + "���" + "����" + "��" + "��" + "����Ǵ��" + "����" + "����" + "���ҹء��" + "����ö" + "������" + "����" + "���ҹ" + "���" + "���" + "�����" + "��Ԫ" + "��Ԫ��" + "��" + "���" + "���" + "��ѡ" + "��ѡ�ҹ" + "��ѧ" + "��ѹ" + "����" + "���" + "��Ҵ�" + "������" + "������" + "��Դ�" + "��" + "����" + "�¹��" + "���" + "��ѡ" + "��ѡ���Դ" + "��Ѥ��" + "��Ѥ�Թ" + "��Ѥ��" + "��Ѥ��" + "��ѭ���" + "��ѵ" + "��Ѻ" + "��ҡó�" + "��ҧ��" + "��Ҹ�" + "��ҹ" + "��Һҷ" + "��Һ��" + "������" + "���" + "��ا" + "�����ҵ��" + "�����" + "�����ʹ�" + "��" + "�õ" + "���" + "���" + "��ä" + "��ä�" + "��ó" + "��ó��" + "����" + "�����" + "��Ǵ" + "��ǹ" + "����" + "���������" + "�������Գ�" + "��������" + "��ʹ" + "���" + "����Ҫ�ѧ" + "���ͧ��" + "�������������" + "��ѡ�����" + "��Ѵ" + "����" + "����" + "��ҡ" + "��ҧ" + "��Ҵ" + "��ҹ" + "����" + "����" + "�������" + "���" + "��ԡ" + "��Թ����" + "��Ժ" + "����" + "�����" + "��������" + "���������" + "��֧" + "��ֹ" + "��ֺ" + "��״" + "���" + "��ء" + "��ع" + "����" + "���" + "��ٴ" + "���ͧ" + "���������" + "�����" + "����" + "���ҧ" + "����" + "���ͧ" + "�����" + "�������ѡ" + "�����" + "����" + "����" + "�ġɪҵ�" + "�ġɷ�" + "�ġ��Ҫ" + "�ġ���ʵ��" + "�ġ��" + "�ġ��Ǵ�" + "�ġ��" + "�IJ" + "�IJ�" + "�IJҨ����" + "�IJ�" + "�ĵ" + "�ĵ�" + "�ĵԡ���" + "�ĵԡ�ó�" + "�ĵԹ��" + "�ķ���" + "�ķ��" + "�Ĺ��" + "�Ĺ��" + "��Ȩ�" + "��Ȩԡ�¹" + "����" + "����Ҥ�" + "�����" + "����ʺ��" + "��" + "�š��" + "�Ť���" + "�ź" + "��ǧ" + "���ѵ" + "���֡��" + "��ͧ" + "��ʹ" + "�������" + "����" + "���" + "��ѧ" + "��ѧ�ҹ" + "��Ѵ" + "��ѹ" + "��Ѻ" + "��Ѻ���" + "��Ѻ��֧" + "����" + "����" + "�����" + "����" + "��ҡ�" + "��ҧ" + "��Ҵ" + "��Ҹԡ��" + "��ҹ����" + "����" + "����" + "���ʵԡ" + "������" + "���ˡ" + "��ԡ" + "�����" + "���" + "���" + "��ء" + "����" + "����" + "�����" + "���" + "�����ͧ" + "�����" + "���š" + "�����" + "����" + "���ҹ" + "�����" + "����" + "�ǡ" + "�ǧ" + "�ǹ" + "���" + "�ʡ" + "��ظ�" + "���" + "����¸Թ" + "���" + "���" + "��پ���" + "����ٵ" + "��" + "�͡" + "�ͧ" + "�ͷ��" + "����" + "��" + "�оԧ" + "���ٹ" + "���ا���ѧ" + "��ǧ" + "���ѡ��ǹ" + "����Ҿ��ѧ" + "��ͧ" + "���״����" + "����§" + "����Ҿй�" + "����Ժ" + "����Ժ���Һ" + "��ṧ" + "�����" + "�ѡ" + "�ѡ���" + "�ѧ" + "�ѧ��" + "�ѧ�״" + "�ѧ���" + "�ѧ�" + "�ѧ�Һ" + "�ѧ��" + "�Ѫ�" + "�Ѳ��" + "�Ѳ��" + "�Ѵ" + "�ѵ�" + "�ѷ�����" + "�ѷ��" + "�ѷ�ا" + "�ѹ" + "�ѹ�ҧ" + "�ѹ��ó�" + "�ѹ��Ծ��" + "�ѹ��ҡ��" + "�ѹ��ѵ�" + "�ѹ��Ե�" + "�ѹ��" + "�ѹ��" + "�ѹ���" + "�ѹ��" + "�Ѻ" + "�����" + "����ѹ" + "���" + "����" + "��ȴ�" + "��ʴ�" + "��ʵ��" + "��ʶҹ" + "��" + "�ҡ" + "�ҡ��" + "�ҧ" + "�ҳ" + "�ҳԪ" + "�ҳԪ��" + "�ҳ�" + "�ҳչ�" + "�Ҵ" + "�ҵ" + "�ҷ" + "�ҷ��" + "�Ҹ" + "�Ҹ�" + "�ҹ" + "�ҹ�" + "���" + "���" + "���Ѿ" + "����" + "��ó" + "����" + "���ҿԹ" + "����" + "���" + "����" + "���" + "��ʹ�" + "��ʹ�" + "���ء��" + "��������" + "��˹�" + "����" + "����" + "����" + "�����Ѵ" + "�����" + "����" + "����ô" + "�������" + "����" + "��" + "�ӹѡ" + "�ԡ�" + "�ԡѴ" + "�ԡѵ�" + "�ԡ��" + "�ԡ��" + "�Ԧҵ" + "�Ԧ��" + "�ԧ" + "�Ԩ�ó�" + "�Ԩ�ó�" + "�ԨԵ�" + "�Ԫ��" + "�Ԫҹ" + "�ԪԵ" + "�ԫ���" + "�Գ" + "�ԶվԶѹ" + "�Է��" + "�Էѡ��" + "�Ըҹ" + "�Ը�" + "�Թ��" + "�Թͺ����" + "�Թ��" + "�Թ��" + "�ԹԨ" + "�ԹԵ" + "�Թ��" + "�Ժѵ�" + "�Ժ��" + "�Ծ��" + "�Ծѡ�Ծ�ǹ" + "�ԾѲ��" + "�Ծҡ��" + "�Ծҡ��" + "�Ծҷ" + "�ԾԸ" + "�ԾԸ�ѳ�ʶҹ" + "�ԾԸ�ѳ��" + "����" + "�����" + "����" + "���ҹ" + "���آ" + "����ʹ" + "���ʹ" + "���Һ" + "�������" + "��������" + "���س" + "���ظ" + "���һ" + "�����" + "���֡" + "���֡�֡���" + "���֡�����" + "���" + "���ǧ" + "������" + "�����" + "���ط���" + "���ط��" + "���" + "��ɳ��š" + "���ʧ" + "��ʴ��" + "������" + "�����" + "���" + "���ط���" + "���٨��" + "�����" + "�����" + "��������" + "�����" + "���¡��ࡹ" + "���¤" + "���ø" + "����" + "����" + "��" + "�ժ��Ե" + "�ի�" + "�����Դ" + "���" + "���" + "�֧" + "���" + "�����" + "���" + "���" + "�ת" + "�״" + "���" + "��鹷��" + "��" + "�ء" + "�ا" + "�ز" + "�ز�" + "�ش" + "�ط�" + "�ط��" + "�ط�����" + "�ط��" + "�ط��" + "�ط��" + "�ظ" + "���" + "����" + "����" + "��" + "�ٴ" + "�ٹ" + "���" + "���" + "��" + "��" + "��ǧ" + "���" + "��ҧ" + "��ҹ" + "����" + "�����" + "��" + "���" + "��ͧ" + "����" + "��" + "���´�" + "���" + "����ù��" + "������չ" + "�͡" + "�ͧ" + "�ʹ" + "�" + "���" + "�����" + "������Ŵ��δ�" + "�������Թ" + "�������" + "��ʫ��" + "��ʿ����" + "���" + "�ѡ" + "�ѧ" + "�ѧ��ѹ" + "�ѧ����" + "�Ѵ" + "�ѹ" + "���" + "���" + "�ҡ" + "�ҧ" + "�Ҵ" + "�ҷ��" + "�ҹ" + "���" + "�����" + "��ʫ�ʵ�" + "�ԡ" + "�Դ" + "�Թ�Ź��" + "�Ժ" + "��Ŵ�" + "���Ի�Թ��" + "�����" + "�����" + "���ԡ��" + "�տ��" + "���" + "���" + "�" + "���" + "���" + "��" + "�ص" + "�ص���" + "�ع" + "�غ" + "�ؿ�" + "������" + "���" + "��������" + "���" + "��" + "�١" + "�٨�" + "�ٴ" + "���" + "������" + "���" + "���" + "��ͧ" + "��" + "��ҧ" + "����" + "���" + "��ͧ" + "��" + "���" + "����" + "��" + "���" + "��ѹ����" + "�õ" + "���" + "�����" + "��Ҵ�" + "�����" + "�ǵѳ��" + "��ѧ��" + "�ѡ��" + "�ѡ��" + "�ѡ�����" + "�ѳ��" + "�ѵ�Ҥ��" + "�ѵ�����" + "�ѷ�" + "�Ѿ" + "���" + "��ʴ�" + "��ʵ��" + "�Ҥ" + "�Ҥ�" + "�Ҫ��" + "�ҳ�" + "�Ҿ" + "�Ҿ¹���" + "���" + "���" + "��áԨ" + "��ô�" + "��õ" + "����" + "����" + "����ç" + "��ǹ�" + "����" + "���" + "��ɡ" + "��ɳ�" + "����" + "���Ե" + "����" + "��ʡ�" + "��ʹ�" + "�����" + "�ԡ��" + "�ԡ�Ҩ��" + "�ԡ��" + "�ԡ�ع�" + "�ԡ��" + "�ԡ��" + "�ԡ�س�" + "�ԧ���" + "�ԭ�" + "�Թ��ҡ��" + "�Թ��" + "������" + "�ت" + "�ت���" + "�����" + "����Թ" + "�����" + "��" + "�ٵ" + "�ٵ�" + "����" + "���Ի����" + "�����Ҥ" + "��������" + "������ʵ��" + "����" + "����" + "����" + "��Ǵ�" + "��ǹҶ" + "����" + "�����" + "����" + "���Ե" + "����" + "���" + "��" + "���" + "���Ҥ�" + "��خ" + "����" + "���خ" + "����" + "����" + "����" + "����" + "���" + "������" + "��" + "���" + "���" + "��" + "�����" + "�����" + "����" + "���ԡ��" + "����" + "������" + "�����" + "����ªҵ�" + "����¸���" + "�������ʵ��" + "���������ѹ��" + "�����" + "������š" + "������" + "������" + "�����" + "�����" + "������" + "����" + "��" + "�á�" + "�ó�" + "�ó�" + "�ô�" + "��ä" + "��ä��¡" + "��ä�" + "�����" + "����ҷ" + "�����" + "�Ĥ" + "�ĵ��" + "��" + "�ŷԹ" + "����" + "�����" + "���ҧ" + "�ǹ" + "���" + "���" + "�ˡ���" + "��ó�" + "���ó�" + "���ʾ" + "��ѹ���" + "��ѹ��" + "���Ȩ����" + "���" + "��Ҫ�" + "��Ҵ���" + "��Ҵ��" + "��ҵ��" + "����ҹ" + "����Ҫ" + "����Է�����" + "������" + "�����ط�" + "����ԧ���" + "��ԧ��" + "��Դ�" + "�����" + "�����" + "��" + "�ͧ" + "�ͧ���´�" + "�ͭ" + "�ʹ" + "������" + "�ͺ" + "���" + "������" + "���ͤ�" + "����չ" + "�����" + "������" + "������" + "��" + "�С�ٴ" + "�С͡" + "�С��ù�" + "�Т�Դ" + "�Т��" + "�Т�ǧ" + "�Ф��" + "�Ч���" + "�Ч���Ч����" + "�Ыҧ" + "�дѹ" + "�ек�" + "�е��" + "�е��" + "�е�ͧ" + "�й��" + "�л�ҧ" + "�о����" + "�о�Ѻ" + "�оٴ" + "����ǧ" + "����" + "����" + "���" + "���С�" + "����" + "������Ѵ" + "���͡�ҹ�" + "������" + "�����" + "������" + "����ͧ" + "�����" + "�����" + "����" + "���ç" + "���" + "�ѡ" + "�ѡ���ѹ" + "�Ѥ���ȡ�" + "�Ѥ��¡" + "�Ѧ�ҹ" + "�ѧ��" + "�ѧ�ش" + "�ѧ���" + "�Ѩ��" + "�Ѩ��" + "�Ѫ������" + "�Ѫ������" + "�Ѫ����" + "�ѳ����Ż�" + "�ѳ���" + "�Ѵ" + "�ѵ���" + "�ѷ��" + "�ѷ����" + "�ѷ��" + "�Ѹ°ҹ" + "�Ѹ��" + "�Ѹ��ʶ�" + "�ѹ" + "�Ѻ" + "������" + "���" + "��ŵ�" + "����ԡ�" + "���" + "�����" + "��ʵ���" + "������" + "����Դ" + "����Թ" + "���" + "���" + "����" + "��" + "�ҡ" + "�ҡ����" + "�Ҧ�٪�" + "�Ҧ�" + "�ҳ�" + "�ҳ�ԡ�" + "�Ҵ" + "�ҵ�" + "�ҵá��" + "�ҵðҹ" + "�ҵ��" + "�ҵ�" + "�ҵ���" + "�ҹ" + "�ҹ�" + "�ҹ�" + "�ҹԵ" + "�ҹ�" + "�ҹ��" + "�ҹ����Է��" + "�Һ�Ҿش" + "���" + "����" + "������" + "���" + "��ä" + "��ô�" + "��ô�" + "�����" + "����ҷ" + "������" + "���ص" + "�����" + "��������" + "����" + "���" + "���" + "�������" + "�������" + "����" + "����" + "�����ͧ" + "��" + "�Ԥ�ѭ��" + "�Ԩ��" + "�Դ" + "�Ե�" + "�Ե�" + "�Զع�¹" + "���ѹ���" + "����ԡ���" + "����Ժ���" + "������Ե�" + "���������" + "���ҵ" + "����Ԥ" + "���" + "��ʫ�" + "�������" + "������" + "���" + "����" + "��" + "�մ" + "�չ" + "�չҤ�" + "��" + "���" + "�������" + "�֧" + "�ֹ" + "�״" + "�" + "���" + "���" + "����" + "��" + "�ء" + "�ء��" + "�ء�����" + "�آ" + "�ا" + "�ب�Թ��" + "�ش" + "�ص�Դ" + "�طԵ�" + "�ط�" + "�عԹ���" + "�ع�" + "�غ" + "�غ�Ժ" + "���" + "������" + "����" + "���" + "���" + "����" + "���" + "�١" + "�ٵ�" + "�ٹ" + "������" + "���" + "��Ť��" + "��Űҹ" + "��ŹԸ�" + "����" + "�����" + "������" + "������" + "�����" + "�������" + "��" + "������" + "�������" + "����ʾ" + "����з֡" + "�����" + "������" + "��ǧ" + "��ǹ" + "��͵��" + "����" + "�������" + "��ҹ" + "����" + "��ǹ" + "����" + "���" + "��ҹ" + "����" + "¡" + "¡��ͧ" + "§" + "§���" + "µ�" + "¶ҡ���" + "¹���" + "¹��" + "��" + "���" + "���§" + "��" + "�ǧ" + "�Ǵ" + "�ǹ" + "�Ǻ" + "��" + "��" + "�͡" + "�ͧ" + "�ʹ" + "�" + "�ͺ" + "���" + "��" + "�ѡ" + "�ѡ�Թ�" + "�ѡ��" + "�ѡ�͡" + "�ѡ�Գ�" + "�ѡ��" + "�ѡ��" + "�ѧ" + "�Ѵ" + "�Ѵ���´" + "�ѹ" + "�ѹ�á���" + "�ѹ���" + "�ѹ��" + "�Ѻ" + "����" + "���" + "����" + "���" + "����" + "���������" + "��" + "�ҡ" + "�ҧ" + "�Ҩ�" + "�Ҵ" + "�Ҵ�" + "�ҵ�" + "�ҵ��" + "�ҹ" + "�ҹ�" + "�Һ" + "�Һ��" + "���" + "���" + "���" + "��" + "�ԡ" + "�ԧ" + "�Թ" + "�Ժ" + "�Ի���" + "�Ի��" + "�����ʵԡ" + "���" + "�����" + "���" + "����" + "��" + "�չ" + "���ҿ" + "���" + "���ʡ" + "���ʧ" + "������" + "�����ҹ" + "������" + "�������" + "������" + "�֡���" + "�ִ" + "�״" + "�" + "���" + "���" + "����" + "��" + "�ء��" + "�ؤ" + "�ؤ�" + "�ا" + "�ش" + "�ص�" + "�صԸ���" + "�ط�" + "�ط����" + "�ط���" + "�ط��" + "�ط⸻�ó�" + "�غ" + "�ؾ��" + "�ؾ§" + "�ؾ�Ҫ" + "�ؾ�����" + "�ؾ���" + "����ҵ�" + "��Ǫ�" + "���û" + "���" + "��������" + "����" + "���" + "����" + "�٧" + "�ٹԡ��" + "����ҵ�" + "���ԡ" + "�������" + "���ù��" + "��������" + "����������" + "���" + "����" + "���" + "���" + "��" + "���" + "��ͧ" + "����" + "����" + "���" + "���" + "��ҧ" + "��ҹ" + "����" + "���" + "����" + "��" + "����" + "����" + "����" + "���" + "á" + "ç" + "ç��ѵ��" + "ç��" + "è��" + "èԵ" + "è�è" + "è�Ţ" + "ó" + "óѰ" + "ô" + "ô�" + "õ�" + "õ�" + "ö" + "ö����" + "ù" + "ú" + "þ" + "þ�" + "��" + "����" + "������" + "����" + "��ҧ��" + "�ǡ" + "�ǧ" + "�Ǵ" + "�ǹ" + "�ǹ��" + "�Ǻ" + "���" + "���" + "���" + "���" + "�ȹ�" + "��" + "�ʹ�" + "���¹�Ƿ" + "��ԡ" + "����" + "��Ե" + "��" + "�͡" + "�ͧ" + "�ͧ��" + "�ʹ" + "�" + "�ͺ" + "�ͺ�ͺ" + "���" + "���" + "��" + "�С�" + "�Ф�" + "�Ф��" + "�Цѧ" + "�Ч�" + "�ЧѺ" + "�д�" + "�дѺ" + "�д�" + "�з�" + "�з�" + "�з��" + "�з֡" + "�йҴ" + "�йҺ" + "�й��" + "�к�" + "�к�" + "�кͺ" + "�кѺ" + "�кҭ" + "�кҴ" + "�к��" + "�к�" + "�к��" + "�к��" + "�к�" + "����" + "���Ѻ" + "����" + "���Ժ" + "�����" + "���ԡ" + "���͡" + "���֡" + "���ѧ" + "���ҧ" + "�����ҧ" + "�����" + "����" + "����" + "��" + "����йҴ" + "����´" + "���Դ" + "����§" + "����¹" + "����º" + "����" + "�������" + "�����" + "����Դ" + "�����" + "����" + "����" + "��ṧ" + "���ǧ" + "�ѡ" + "�ѡ��" + "�ѡ���" + "�ѡ��" + "�ѡ��" + "�ѡ���" + "�ѧ" + "�ѧ�Ե" + "�ѧ��" + "�ѧ�" + "�ѧ�" + "�Ѩ��" + "�Ѫ" + "�Ѫ�����ɡ" + "�Ѫ�����ɡ" + "�Ѫ��" + "�ѭ�ǹ" + "�Ѱ" + "�Ѱ���" + "�Ѱ�����" + "�Ѱ�����ʹ��ʵ��" + "�Ѱ������" + "�Ѱ�����" + "�Ѱ����ˡԨ" + "�Ѱ��ʵ��" + "�Ѱ���" + "�Ѵ" + "�ѵ" + "�ѵ��" + "�ѵ�" + "�ѵ�����" + "�ѵ�����ѧ��" + "�ѵ��" + "�ѵ��" + "�ѵ���Թ���" + "�ѵ��" + "�Ѷ��" + "�ѹ" + "�ѹ��" + "�Ѻ" + "�Ѻ�ͧ" + "�����" + "������" + "���" + "������ѵ" + "������ҹ" + "�����" + "��ɮҡ�" + "������" + "����" + "���" + "���" + "����" + "��" + "�ҡ" + "�ҡ��" + "�Ҥ�" + "�Ҥ�" + "�ҤԹ" + "�Ҥ�" + "�ҧ" + "�ҧ�ҧ" + "�ҧ���" + "�Ҫ" + "�Ҫ���" + "�Ҫ�ԡ��" + "�Ҫ�ѳ�Ե�ʶҹ" + "�Ҫ��" + "�Ҫǧ��" + "�Ҫ��ç���" + "�Ҫ����" + "�Ҫ����" + "�Ҫѹ��" + "�Ҫ�" + "�ҪҸ��Ҫ" + "�Ҫ����ɡ" + "�Ҫ�Ǵ�" + "�ҪԹԡ��" + "�ҪԹ�" + "�ҪԹٻ�����" + "�Ҫٻ�����" + "�Ҫٻ���" + "�ҭ" + "�Ҵ" + "�ҵ" + "�ҵ�" + "�ҵ��" + "�ҹ" + "�Һ" + "�Ҿ�����" + "���" + "������˧" + "������" + "���ѭ" + "����" + "���ҸԺ��" + "������õ��" + "���" + "��¡��" + "��§ҹ" + "���" + "����" + "����" + "��ɮ�" + "��ɮ��" + "����" + "��હ���" + "��⪺��" + "����ҷ" + "��" + "�Ӥҭ" + "�Өǹ" + "�Ӿѹ" + "�Ӿ֧" + "���й�" + "���֡" + "����" + "��" + "�ԡ" + "�Դ�մǧ" + "�Թ" + "�Ժ" + "�Ժ���" + "���" + "�����" + "���" + "����" + "��" + "�ը�ʷ��" + "�մ" + "�յ" + "�պ" + "���" + "�����" + "�������" + "�������" + "�����" + "���" + "���" + "�֧" + "���" + "���" + "����" + "��" + "�ء" + "�ء���" + "�ء��ҵ�" + "�ء����" + "�ء��Ǵ�" + "�ء��" + "�ا�ѧ" + "�ب�" + "�ب�" + "�ش" + "�ص" + "�ط��" + "�ط�" + "�ع" + "�ع�ç" + "�غ���" + "���" + "��ɯ�" + "����" + "���" + "���" + "����" + "��������" + "����" + "���" + "��" + "�ٴ" + "�ٻ" + "�������" + "������" + "�������" + "����絵�" + "���" + "���" + "���ѡ" + "���" + "��" + "���" + "��ǧ" + "��ǹ" + "����" + "���" + "��ͧ" + "��" + "����" + "���" + "��ҧ" + "��ҹ" + "����" + "���" + "������" + "��" + "��ͧ" + "��" + "����" + "���" + "��ҧ" + "��ҹ" + "����" + "����" + "ġ��" + "Ī�" + "Ī�" + "ij" + "Ĵ�" + "Ĵ�" + "ĵ" + "ķ��" + "ķ���" + "ķ��" + "���" + "���" + "��" + "ŧ" + "Ŵ" + "Ŵ�" + "Ŵ������" + "Ź" + "ź" + "ž����" + "��" + "�Ź�" + "��ү" + "��Ե" + "�ǡ" + "�ǧ" + "�Ǵ" + "�ǹ���" + "�ǹ�" + "���" + "���" + "�͡" + "�͡��Է��" + "�ͧ" + "�ͧ�ͧ" + "�ͧ�Ԩٴ" + "�ʹ" + "�͵�����" + "�" + "��" + "�ͺ" + "���" + "���" + "���" + "��" + "�Ф�" + "�еԨٴ" + "�еԹ" + "�кѴ" + "�����" + "���ع" + "������" + "������" + "�����" + "����Ҵ" + "���ҹ" + "�����" + "���ͧ" + "�����" + "�����" + "������" + "����Դ" + "�����´" + "���ŧ" + "����ԧ" + "�����´" + "���ǧ" + "�������" + "�����´" + "���ǡ" + "�����" + "�����" + "����" + "�ѡ" + "�ѡ���" + "�ѡɳ�" + "�ѡ���" + "�Ѥ��" + "�Ѥ��" + "�Ѥ��" + "�ѧ" + "�ѧ��" + "�Ѫ��" + "�Ѫ��" + "�ѭ���" + "�ѭ���" + "�ѭ�" + "�ѭ���" + "�ѭ���" + "�Ѵ" + "�Ѵ�" + "�ѷ��" + "�ѷ��" + "�ѹ" + "�Ѻ" + "�Ѿ��" + "���" + "���" + "��蹷�" + "��" + "�ҡ" + "�ҧ" + "�ҭ" + "�Ҵ" + "�ҹ" + "�Һ" + "�һ" + "���" + "���" + "����" + "���" + "������" + "��Ź�" + "����" + "���" + "��ǡ" + "���ѳ��" + "����" + "��ʹ�" + "��" + "�Ӵǹ" + "�ӴѺ" + "�Ӻҡ" + "�Ӿǹ" + "�Ӿͧ" + "�Ӿѧ" + "���آѹ" + "���ͧ" + "����" + "����¡" + "����" + "����" + "����ԡ" + "�����§" + "��⾧" + "����" + "��" + "�ԡ乵�" + "�Ԣ�Է���" + "�ԢԵ" + "�ԧ" + "�ԧ��" + "�ԧ��" + "�Դ" + "�Ե" + "�Ե���" + "�Ե�" + "�ԹԹ" + "�Ժ" + "�Ի��" + "�Ի��" + "�Իʵԡ" + "�Ի�" + "�Կ��" + "���Ե" + "���" + "��ʧ" + "���" + "�����" + "���������" + "����" + "����" + "���" + "��鹨��" + "����" + "��" + "�ա" + "�չء��" + "�պ" + "����" + "�����" + "���" + "���" + "�֡" + "�֧��" + "�״" + "�" + "���" + "���" + "���" + "����" + "���" + "����" + "��" + "�ء" + "�ا" + "���" + "���" + "����" + "����" + "���" + "����" + "�١" + "�١���" + "�١��ȡ�" + "�ٺ" + "���" + "��͡ࡵ" + "��" + "���" + "��ǧ" + "����" + "���" + "��ͧ" + "��" + "����" + "������" + "���" + "���" + "��ҧ" + "��ҹ" + "����" + "���" + "�����" + "��" + "���" + "��ǧ" + "��ǹ" + "���" + "����" + "���" + "��ҧ" + "��ҵ��" + "��ҹ" + "���" + "ǡ" + "ǡ�" + "ǧ" + "ǧ��" + "ǧ��" + "ǧ��" + "ǧȡ�" + "ǧ��" + "ǧ��" + "Ǩ��" + "Ǩ�" + "Ǩ�" + "Ǫ�" + "Ǫ���" + "Ǫ����ظ" + "dz�ѵ�" + "dz�ѹ���" + "dz�" + "dzԪ" + "dzԪ��" + "dzԪ��" + "dzԪ��" + "dzԾ�" + "Ǵ�" + "ǵ�" + "Ƿ�" + "Ƿѭ�ص�" + "Ǹء�" + "Ǹ�" + "ǹ" + "ǹ��" + "ǹ�" + "ǹҹ��" + "ǹԴ�" + "ǹԾ�" + "������" + "�ç��" + "�ó�" + "����������" + "��ä" + "��ä��" + "��ê" + "��ê��" + "��ó����" + "��ó���" + "��ó��" + "��ó�ĵ�" + "��ó�ء��" + "��ó�ص" + "��ó��Ż�" + "��ó�" + "��ó֡" + "��ø�" + "��ø��" + "����" + "�����" + "�������" + "��ѭ��" + "��ҧ���" + "�����" + "�����" + "��س" + "��ѭ���" + "����" + "���ˡ" + "���" + "���" + "����" + "����" + "���" + "��ѹ���š" + "��ѹ��" + "���" + "���" + "���" + "��ظ�" + "��ع���" + "������" + "���" + "���" + "��" + "�͡" + "�͡�ǡ" + "�ʹ" + "�" + "�����ù��" + "�����ʵ�շ" + "�������" + "���������" + "����" + "��" + "�ѡ" + "�ѡ��" + "�Ѥ" + "�Ѥ����" + "�Ѥ��" + "�Ѥ�չ" + "�ѧ" + "�ѧ��" + "�ѧ�ǧ" + "�Ѩ��" + "�Ѫ" + "�Ѫ��" + "�Ѫ��" + "�Ѫ�Թ���" + "�Ѫ��" + "�ѯ�ѡ�" + "�ѯ��" + "�ѯʧ���" + "�Ѳ��" + "�Ѳ��" + "�Ѳ�����" + "�Ѳ��" + "�Ѳ��" + "�ѳ" + "�ѳ��" + "�ѳ��" + "�Ѵ" + "�ѵ" + "�ѵ��" + "�ѵ��" + "�ѵ��" + "�ѵ��" + "�ѵ��" + "�ѵ�" + "�ѵ�" + "�ѹ" + "�ѹ���" + "�ѹ�����" + "�ѹ���ѵ��" + "�ѹ����ظ" + "�ѹ��" + "�Ѻ" + "�ѻ��" + "����ԡ" + "���" + "�����" + "�����" + "�����" + "���" + "��ʴ�" + "�����" + "����ҹ�" + "����ʷ�" + "��" + "�ҡ" + "�ҡ�����ѹ��" + "�ҡ��" + "�ҧ" + "�Ҩ�" + "�Ҩ�" + "�ҳԪ" + "�ҳԪ��" + "�ҳ�" + "�Ҵ" + "�ҵ���" + "�ҵ�" + "�ҷ" + "�ҷ�" + "�ҷ¡�" + "�ҷ��" + "�ҷԵ" + "�ҷԹ" + "�ҷ�" + "�ҹ" + "�ҹ�" + "�ҹ�Թ���" + "�Һ" + "�һ�" + "�һԵ�" + "�һ�" + "���" + "����" + "���" + "��·��" + "�����" + "���" + "������" + "����" + "����" + "���س" + "���س�" + "���" + "�����" + "���" + "��ʹ�" + "��ʹ�" + "��ʾ" + "����" + "���Թ�" + "���" + "�ԡ��" + "�ԡĵ" + "�ԡĵ��ó�" + "�ԡĵ�" + "�ԡ�" + "�ԡ�Ե" + "�ԡѻ" + "�ԡ��" + "�Ԥ��" + "�ԧ" + "�ԧ�" + "�Ԩ�ص" + "�Ԩó�" + "�Ԩ�" + "�Ԩѡ���" + "�Ԩѡɳ�" + "�Ԩ��" + "�Ԩ��" + "�Ԩ�ó�ҳ" + "�Ԩ�ó�" + "�Ԩ�" + "�ԨԡԨ��" + "�ԨԵ" + "�ԨԵ�" + "�ԨԹ" + "�Ԩس" + "�Ԩ�ó" + "�Ԫ��" + "�Ԫ��" + "�Ԫ��Ŵ�" + "�Ԫ��" + "�Ԫ��" + "�Ԫ�" + "�Ԫҹ��" + "�ԪԵ" + "�ԭ�ѵ�" + "�ԭ�ҳ" + "�ԭ��" + "�Ա����" + "�Դ" + "�Դ���" + "�Ե�" + "�Ե���" + "�Ե��Թ" + "�Զ�" + "�Է°ҹ�" + "�Է��" + "�Է�����" + "�Է��" + "�Է�ص" + "�Է���" + "�Է�ó�" + "�Է�Ź�" + "�ԷԵ" + "�Է�" + "�Է��" + "�Ը" + "�Ը��" + "�Ը�" + "�Ըҹ" + "�Ը�" + "�Ըٻ��" + "�Թѹ��" + "�Թ��" + "�Թҷ�" + "�Թ��" + "�ԹԨ" + "�ԹԨ���" + "�ԹԵ" + "�ԹԺҵ" + "�ԹԻҵԡ" + "�Թ����" + "�Թ���" + "�Ժѵ�" + "�Ժҡ" + "�Ժ��" + "�Ժ����" + "�Ժ��" + "�Ժ����" + "�Ի���" + "�Ի�����" + "�Ի�С��" + "�Ի�е����" + "�Ի���һ" + "�Ի�����" + "�Ի�Ե" + "�Ի�һ" + "�Ի���" + "�Ի���" + "�Իѡ��" + "�Ի��ʡ" + "�Ի��ʹ�" + "�Ի�¤" + "�Ծҡ��" + "�ԾԸ��ȹ�" + "���ǵѳ��" + "���ѧ��" + "���Ѫ" + "���ѵ��" + "����" + "����Ǵ�" + "���ѵ�" + "���ص" + "���ص��" + "��õ�" + "������" + "����ø��" + "�����" + "���Ѫ" + "���ѵ" + "���ѵ�" + "������Ҿ" + "������" + "���ظ" + "�����ˡ" + "�������" + "���ѹ��" + "���Ҵ" + "���һ" + "�����ѳ��" + "�����" + "�����" + "�����Թ�" + "���" + "���ó�" + "�����" + "���ѯ" + "���Ѳ�ҡ��" + "���Ѳ��" + "���ҷ" + "���������" + "������" + "������" + "���Ԩ" + "���Ե" + "���Ը" + "����ص" + "���ǡ�" + "���ǡ���" + "�������" + "���Ң�" + "���Ң�" + "���ҧ��" + "�����" + "����ɰ�" + "���ط���" + "���ط��" + "��ɳ�" + "��ɸ�" + "���ѡ��" + "�����" + "���ҳ" + "�����ѵ" + "��ʡ��" + "����ê����" + "���ĵ" + "����ء���" + "���Ѫ��" + "���ѭ��" + "�����" + "���Ң�٪�" + "���Ң�" + "�����ѭ" + "������" + "����ˡԨ" + "���" + "���ا�������" + "���ط���" + "���ط��" + "���ٵ�" + "��ˤ" + "��˧��" + "������" + "�������" + "�����" + "���ԧ��" + "���ԧ��" + "���ѧ��" + "�����" + "������" + "��������" + "������" + "�����" + "����" + "����Ⱥ��" + "��" + "���¹" + "���ù���" + "���Ż" + "���ǡ" + "�����" + "����ɳ�" + "���ʷ" + "������" + "���" + "�������" + "���¤" + "���è" + "���è��" + "���ò" + "���ø" + "���ø��" + "���Ũ��" + "����" + "���" + "��������" + "���" + "��" + "�ը�" + "�ժ��" + "�ի��" + "�ճ�" + "��á���" + "��ê�" + "��ú����" + "���ʵ��" + "����ѹ" + "������" + "���" + "�ذ�" + "�ز" + "�ز�" + "�ش" + "�غ" + "���" + "���" + "���" + "����" + "�ٴ�Ҵ" + "�ٸ�" + "�ٺ" + "������" + "���" + "��" + "��ҹ" + "���" + "��á��" + "��ô�" + "��ͧ" + "��" + "���" + "��ҧ" + "��ҹ" + "����" + "����" + "���" + "��ҧ" + "����" + "ȡ" + "ȵ" + "ȵ����" + "Ⱦ" + "��" + "��ѷ��" + "����" + "���" + "�������ķ���" + "�������" + "�ħ���" + "���" + "��" + "�͡" + "�ѡ��" + "�ѡ�Թ�" + "�ѡ���" + "�ѡ��Ҿ" + "�ѡ��" + "�ѡ��" + "�ѡ�Ҫ" + "�ѵ��" + "�Ѿ��" + "���¡���" + "������ʵ��" + "����ᾷ��" + "�����" + "�ҡ¾ط�" + "�ҡ��ع�" + "�ҡ��" + "�ҵ�Ҩ����" + "�ҹ��" + "�ҹ��" + "��÷" + "��÷��" + "���" + "����" + "��ʡ" + "��ʴ�" + "��ʵ��" + "��ʵ�Ҩ����" + "��ʵ��" + "��ʹ�ѡ�" + "��ʹ�" + "��ʹٻ�����" + "��ʹ�" + "�Ԣ�Թ" + "�����Ҫ" + "��Ż��" + "��Ż����" + "��Ż���" + "��Ż�Ԩ" + "��Ż�Է��" + "��Ż��ʵ��" + "��Ż�" + "��Żҡ�" + "��ŻԹ" + "��Ż�" + "��Ż�" + "����" + "����֧��" + "����" + "����Ƿ" + "��������" + "�����" + "�����Һ" + "�����" + "���" + "�֡" + "�֡��" + "�֡�Ҹԡ��" + "�֡�ҹ��ȡ�" + "�ء��" + "�����" + "������Ե" + "�����ʴ�" + "����ҵ��" + "������" + "����ѡ��" + "���ҧ��" + "���������" + "��šҡ�" + "��š��ѡ��" + "����" + "�ٷ�" + "�ٹ��" + "ʡ" + "ʡ���" + "ʡ�á" + "ʡ�" + "ʡ�ҷ�" + "ʡ͵�Ź��" + "ʡѴ" + "ʡ�" + "ʡ��" + "ʡ�" + "ʡس" + "ʡس�" + "ʡس�" + "ʡع��" + "ʡ��" + "ʡ�͵�Ź��" + "ʧ" + "ʧ��ҹ��" + "ʧ��" + "ʧ���" + "ʧ����" + "ʧ��" + "ʧ�" + "ʧǹ" + "ʧ���" + "ʧ���" + "ʧ����ѯ" + "ʧѴ" + "ʧ������" + "ʧ��" + "ʳ��" + "ʴ" + "ʴ���" + "ʴѺ" + "ʴش�" + "ʵ��" + "ʵ͡" + "ʵѿ��" + "ʵҧ��" + "ʵ���" + "ʵ�" + "ʵ������" + "ʵ�" + "ʵ�͡" + "ʶ�" + "ʶҹ" + "ʶҹ��ó�" + "ʶҹ�" + "ʶҹ�" + "ʶҺѹ" + "ʶһ��" + "ʶһ�ԡ" + "ʶһѵ¡���" + "ʶҾ�" + "ʶ���" + "ʶԵ" + "ʶԵ�" + "ʶԵ���ʵ��" + "ʶԵ��" + "ʶԵ�" + "ʶ��" + "ʶٻ" + "ʷ;" + "ʹ" + "ʹ���" + "ʹ���" + "ʹ��" + "ʹ��Ҥ�" + "ʹ�" + "ʹͧ" + "ʹѺ" + "ʹѺʹع" + "ʹ��" + "ʹҹ" + "ʹ��" + "ʹԷ" + "ʹ��" + "ʹء" + "ʹ��" + "ʹ��" + "ʹ����" + "ʹ�" + "ʺ" + "ʺ�" + "ʺ�" + "ʺ��" + "ʺ��" + "ʻ�ԧ" + "ʻ��" + "ʻ�ࡵ��" + "ʻ��Ե" + "���" + "��Ҿ" + "��ҾѲ��" + "�����" + "��" + "�����" + "�����" + "����" + "����ѡ���" + "����" + "�����" + "����" + "���Ҥس" + "���ѵ�" + "����óҭ��Է���Ҫ��" + "����ó�" + "����д�" + "���Ĵ�" + "����" + "�����" + "����" + "�����" + "���ҵ�" + "���ص�" + "���" + "���ö" + "���ö��" + "����" + "���" + "��ͧ" + "��Ѥ�" + "��Ѫ��" + "��ѹ" + "����" + "���" + "��Ҥ�" + "��Ҩ��" + "��Ҫԡ" + "��Ҹ�" + "��ҹ" + "��Һѵ�" + "����" + "��ԧ" + "��Ե" + "���" + "��د�ҹ" + "��ش" + "��ط�" + "��ط��" + "��ع" + "��ع��" + "�����" + "����" + "��ྪ" + "������" + "��⾸�" + "�����" + "�����" + "��������" + "�´" + "�º" + "�����" + "��ͧ" + "����" + "����" + "����" + "������" + "������" + "�ç" + "�ó�" + "�óҤ���" + "�õ�" + "���" + "��ä�" + "��þ" + "��þҡ�" + "��þҧ��" + "���ྪ�" + "������ԭ" + "��ǧ" + "����" + "����" + "���" + "��ҭ" + "���áԨ" + "���øҵ�" + "�����Է��" + "������ʵ��" + "�����" + "��ػ" + "���" + "���ҧ" + "�����" + "���ҧ" + "����������" + "�ĵ" + "��ɯ�" + "��" + "�Ŵ" + "�ź" + "��ǹ" + "����" + "��ʹ" + "��" + "����" + "���" + "��ѡ" + "��ѡ��" + "��Ѵ" + "��Ѵ�" + "��Ѻ" + "����" + "����" + "���" + "��ҡ" + "��Ҵ" + "��ҵѹ" + "��Һ" + "����" + "��Դ" + "����" + "��֡" + "��֧" + "��ص" + "��غ" + "������" + "���͵" + "���ҧ" + "�ǡ" + "�Ǵ" + "�ǹ" + "�ǹ�" + "�ǹҡ��" + "�Ǻ" + "���" + "���" + "���" + "���ä�" + "���ä����" + "���ä�" + "������" + "��ͻ" + "���" + "���ʴԡ��" + "���ʴ��Ҿ" + "���ʴ��" + "���ʴ�" + "���ʵԡ�" + "���" + "��ҧ" + "��Ҵ" + "��ҷ" + "�����" + "�����" + "����" + "���ʴ��" + "�����" + "��ԧ" + "��Ե��" + "��Ե��" + "���������Ź��" + "���ഹ" + "���ҧ" + "���ҹ" + "���ҹ" + "����" + "�ˡó�" + "�ˡ��" + "�˨�" + "�˪ҵ�" + "�˻�ЪҪҵ�" + "�˾ѹ��Ѱ" + "�˾ѹ��" + "���Ҿ" + "���Ѱ" + "��������" + "���֡��" + "��Ѫ" + "�������" + "���ʹ�¹�" + "��������" + "������" + "������" + "����" + "��" + "�ͧ" + "�ʹ" + "�" + "�ͺ" + "�;��" + "���" + "��" + "�С�" + "�СԴ" + "�Ф�ҭ" + "�д�" + "�дǡ" + "�д��" + "�д֧" + "�д��" + "�дش" + "�д��" + "�е�" + "�е�" + "�е��" + "�з�" + "�з�ҹ" + "�кѡ" + "�кѴ" + "�кѴ�к��" + "�к��" + "�к��" + "�о�ѡ" + "�о���" + "�оѴ" + "�о��" + "�оҹ" + "�о��" + "���е�" + "�����˹�" + "����������" + "���������Ҵ" + "����" + "���ҧ" + "���ҧ" + "���Ҵ" + "���Դ�����¹" + "�����" + "���֡" + "�����" + "����ҹ" + "����" + "����" + "�����" + "����" + "�����" + "������" + "������" + "��⾡" + "���ʹ��ͧ" + "�����" + "�ѡ" + "�ѡ��" + "�ѡ��" + "�ѡ��Ҵ" + "�Ѣ��" + "�ѧ����Ѿ��" + "�ѧ��" + "�ѧ�ó�" + "�ѧ�еѧ" + "�ѧ����" + "�ѧ�Ѵ" + "�ѧ�ѻ��" + "�ѧ��" + "�ѧ���" + "�ѧ���" + "�ѧ���" + "�ѧ��" + "�ѧ��ҵ�" + "�ѧ��" + "�ѧ�ѧ" + "�ѧ��¹�" + "�ѧ��¹��" + "�ѧ�յ" + "�ѧ��" + "�ѧ�����" + "�ѧ���¡" + "�ѧ�����" + "�ѧ������" + "�ѧ��Ҫ" + "�ѧ����" + "�ѧ�ү�" + "�ѧ�����" + "�ѧ��" + "�ѧ�Ѹ���" + "�ѧ���" + "�ѧ���" + "�ѧʴ���" + "�ѧ��ä�" + "�ѧ����ѯ" + "�ѧ��" + "�ѧ�ó�" + "�ѧ���" + "�ѧ�������Ѿ��" + "�ѧ�Ե" + "�ѧࡵ" + "�ѧࢻ" + "�ѧ������" + "�ѧ�Ǥ�" + "�ѧ�Ǫ" + "�ѧ���" + "�ѧ���¹" + "�ѧ�¤" + "�ѧ�ª��" + "�Ѩ" + "�Ѩ������" + "�Ѩ��" + "�Ѩ�ҳ" + "�Ѩ����" + "�Ѩ����" + "�Ѫ��" + "�ѭ��" + "�ѭ���" + "�ѭ�ҵ�ҳ" + "�ѭ�ҵ�" + "�ѭ��" + "�ѭ��" + "�ѭ�ҳ" + "�ѭ��" + "�ѭ��С��" + "�ѭ�ѡɳ�" + "�ѭਵ��" + "�ѳ�ҹ" + "�ѳ��" + "�ѳ��" + "�Ѵ" + "�ѵ" + "�ѵ��" + "�ѵ��ó" + "�ѵ�Һѹ" + "�ѵ��" + "�ѵǺ��" + "�ѵ��Է��" + "�ѵ��" + "�ѵ���" + "�ѵ�ᾷ��" + "�ѵ��š" + "�ѵ��" + "�ѷ����" + "�ѷ��" + "�ѷ��ʵ��" + "�ѹ" + "�ѹ�ҹ" + "�ѹ�һ" + "�ѹ�лһ�" + "�ѹ��" + "�ѹ��" + "�ѹ�������" + "�ѹ�ѵ" + "�ѹ���" + "�ѹ���" + "�ѹ��ҡ��" + "�ѹ��" + "�ѹ�Ѵ" + "�ѹ�ҹ" + "�ѹ�Ժҵ" + "�ѹ�����" + "�ѹ��ɰҹ" + "�ѹ�����" + "�ѹʡĵ" + "�ѹ��" + "�Ѻ" + "�Ѻ��Ѻ" + "�Ѻ��ô" + "�ѻ�Ѻ" + "�ѻ��" + "�ѻ����" + "�ѻ��" + "�ѻ���ط��" + "�ѻ˧�" + "�ѻ�����" + "�Ѿ" + "�Ѿ��" + "�Ѿ�ѭ��" + "�Ѿ�͡" + "�Ѿ�����" + "�����ó�" + "�����ѭ��" + "������" + "�����ҹ" + "�����ص" + "�������Է���" + "���������" + "���������" + "�������ԡ��" + "�����¤" + "������" + "����ѷ��" + "����ѹ���" + "����ѹ��Ҿ" + "����ѹ��Ե�" + "����ѹ������" + "����ѹ��" + "����Ҹ�" + "����ط��" + "�������" + "�����ɳ�" + "������" + "�����" + "����Ҫվ" + "���ķ���" + "���⾸�" + "��������¡��" + "��ʴ�" + "�����" + "���" + "���" + "���" + "��" + "�ҡ" + "�ҡ�è�" + "�ҡ�" + "�Ң�" + "�Ҥ�" + "�Ҥ�" + "�Ҥ���" + "�ҧ" + "�Ҵ" + "�ҷ�" + "�ҷ��" + "�Ҹ�" + "�Ҹ���" + "�Ҹ�ó���" + "�Ҹ�ó�Ѱ" + "�Ҹ�ó�آ" + "�Ҹ�ó�" + "�Ҹ�óٻ���" + "�Ҹ�óٻ���" + "�ҸԵ" + "�Ҹ�" + "�ҹ" + "�ҹ������" + "�Һ" + "�Һ�٭" + "�Һҹ" + "�һ" + "���" + "���Ѥ��" + "���ѭ" + "���ҹ��" + "����ö" + "���Ե" + "�����ѡ���" + "����" + "�����" + "���" + "��ª�" + "�����" + "���ѳ��" + "���" + "��ä��" + "��ö�" + "��÷" + "��ù���" + "��ú�" + "��ú�ó" + "��úѭ" + "��úѺ" + "��úҭ" + "��þѴ" + "��þѹ" + "��þҧ��" + "����Ҿ" + "�����" + "����ѵ�" + "����" + "�����" + "���ѷ��" + "�������" + "���ҳ�¡�" + "���ҹء��" + "�����ԡ�ҵ�" + "����ǹ" + "���ԡ�" + "���Թ�" + "����" + "�����" + "���" + "��ǡ" + "���ԡ�" + "���Ե�" + "���Ե��" + "��ʹ�" + "����" + "�������" + "�����" + "���" + "���˵�" + "����á" + "���" + "���ê" + "����" + "��" + "�Ӥѭ" + "�ӷѺ" + "�ӹǹ" + "�ӹѡ" + "�ӹ֡" + "�ӺѴ�ӹǹ" + "�ӻ���ѧ" + "�ӻ��" + "������" + "����������" + "�������" + "���Ǩ" + "�����" + "�����" + "�����" + "���͡" + "���ͧ" + "���Ѻ" + "���ҡ" + "���ҭ" + "���Դ" + "���ѡ" + "���ҹ" + "����" + "����" + "����Ѻ" + "����" + "�����" + "���ҧ" + "����" + "����§" + "�����" + "����ԧ" + "�����" + "���˹�¡" + "������" + "��ᴧ" + "���ŧ" + "���ç" + "��" + "�ԡ��" + "�Ԣ�" + "�Ԥ��" + "�ԧ" + "�ԧ��" + "�ԧ���" + "�ԧ���" + "�ԧ����" + "�ԧ��" + "�ԧ�����ѵ��" + "�ԧ˹ҷ" + "�ԧ˺ѭ��" + "�ԧ��Ҫ" + "�ԧ��" + "�ԧ�Ҥ�" + "�ԧ��ʹ�" + "�ԧ��" + "�ԧ�" + "�ԭ���" + "�Ե" + "�Զ��" + "�Է�" + "�Է��" + "�Է��ö" + "�Է��" + "�Է���" + "�Թ" + "�Թ���" + "�Թ��" + "�Թ�" + "�Թ����" + "�Ժ" + "������" + "����" + "���ԡԵ��" + "����" + "���" + "���ˡ" + "�����" + "������" + "���" + "����" + "���" + "��" + "�ա�" + "�մ�" + "���" + "�֡" + "�" + "����" + "��" + "�ء" + "�ء��" + "�ء�" + "�ء���ҡ��" + "�آ" + "�آ�" + "�آ�" + "�آ��Ժ��" + "�آ�����" + "�آ�Ǵ�" + "�آ�" + "�آ��" + "�آ����" + "�ؤ�" + "�ؤ��" + "�ؤ����" + "�ؤ���" + "�ؤѹ��" + "�ا�ҡ�" + "�ا�ԧ" + "�ب�Ե" + "�ب˹��" + "�ب�" + "�ت�" + "�تҴ�" + "�ح" + "�ح�ҡ��" + "�س" + "�س���" + "�ش" + "�ش�" + "�ص" + "�ص��" + "�ص�" + "�ط�����" + "�ط��" + "�ط��" + "�ط�ȹ�" + "�ظ�" + "�ظ�" + "�ع��" + "�ع���" + "�ع�����Ҿ" + "�ع������ʵ��" + "�عѢ" + "�عѹ��" + "�غ�ó" + "�غԹ" + "�ؾ�ó" + "���Ѥ" + "���Ҿ" + "�����Ե" + "���" + "������" + "����" + "�����" + "������" + "�����˹ҷ" + "���ѵ�" + "�����Ǵ�" + "����" + "���ҧ���" + "���ҧ��ҧ��" + "�����ѡ��" + "�������" + "����ɮ��" + "���Թ���" + "����¡��" + "����¡��" + "����¤��" + "����¤���" + "����§" + "����¹" + "���������" + "������" + "�����ѹ" + "������" + "�����ػ�Ҥ�" + "�����������" + "�����¹���" + "�������" + "������" + "������" + "������������" + "������§" + "��ŵ�ҹ" + "����Ҿ" + "����ó" + "���ҹ" + "���Է��" + "���Թ��" + "������" + "���ҹ" + "��˹ѵ" + "�������" + "�����" + "������" + "�������" + "���ͫ" + "����" + "����" + "��" + "�٧" + "�٨�" + "�٭" + "�ٴ" + "�ٵ" + "�ٵ�" + "�ٵ�" + "�ٵԡ���" + "�ٵԺѵ�" + "�ٵ���ʵ��" + "�ٵ�ᾷ��" + "�ٷ" + "�ٺ" + "����" + "���" + "���" + "�ࡵ" + "�������" + "���" + "�����" + "�" + "�����" + "�" + "��ô�յ" + "�" + "��ŧ" + "�����" + "��ê" + "����" + "��" + "��Ŵ�" + "��" + "��ǹ" + "����" + "���" + "��ͧ" + "��" + "���" + "��ҹ" + "����" + "�������" + "��������" + "���" + "��" + "���" + "�������" + "��ǧ" + "����" + "����" + "��ͧ" + "����" + "ˡ" + "˧" + "˧��" + "˧�" + "˧͡" + "˧ʹ" + "˧" + "˧��" + "˧ѡ" + "˧Ѻ" + "˧��" + "˧�" + "˧ԡ" + "˧ԧ" + "˧��" + "˧֡" + "˧ا˧ԧ" + "˧ش˧Դ" + "˧غ" + "˧���" + "˧���" + "˧�ҧ" + "˧���" + "˭ԧ" + "˭Ժ" + "˭��" + "˴" + "˷��" + "˹" + "˹ǡ" + "˹Ǵ" + "˹�" + "˹͡" + "˹ͧ" + "˹" + "˹ѡ" + "˹ѧ" + "˹ѧ���" + "˹Ѻ" + "˹��" + "˹�" + "˹Ҵ" + "˹ҹ" + "˹��" + "˹��" + "˹�" + "˹�����º" + "˹�" + "˹պ" + "˹��" + "˹ֺ" + "˹��" + "˹״" + "˹�" + "˹ع" + "˹غ" + "˹���" + "˹���" + "˹�" + "˹�����" + "˹�ǧ" + "˹���" + "˹��¡Ե" + "˹��" + "˹���" + "˹��" + "˹�ҧ" + "˹���" + "˹��" + "˹�ҷ��" + "���" + "���" + "��ǡ" + "��Ǵ" + "���" + "��͡" + "��ͧ" + "��" + "��ͺ" + "����" + "��ѡ" + "��Ѵ" + "��ѹ" + "��Ѻ" + "����" + "����" + "���" + "��ҡ" + "��ҡ���" + "��ҧ" + "��Ҵ" + "����" + "����" + "���" + "����" + "��֡" + "����" + "��ش" + "��ع" + "��غ" + "��غ��Ժ" + "�����" + "���" + "����" + "���" + "���ͧ" + "���" + "�����" + "����" + "����" + "����" + "�����" + "�¡" + "�´" + "��ǡ" + "��Ǻ" + "��͡" + "��͡��Թ" + "��ͧ" + "��ʹ" + "��������" + "����" + "��ѡ" + "��ѧ" + "��Ѵ" + "��ѹ" + "��Ѻ" + "����" + "��ҡ���" + "��Ҵ" + "��Һ" + "����" + "����" + "����" + "��ԡ" + "��Ժ" + "����" + "����" + "���" + "��ء��ԡ" + "��ش" + "��غ" + "��������" + "����" + "��١��" + "���ͧ����" + "���" + "���ͧ" + "���" + "�����" + "�����" + "����" + "�ô�" + "�����" + "���" + "��͡" + "����" + "���" + "���" + "����" + "��մ" + "����" + "����" + "��غ" + "��غ���" + "��غ����" + "�����" + "���" + "����������" + "�ķ��" + "�������" + "���˴" + "��" + "�ŧ" + "�Ŵ" + "�Ź" + "�ź" + "��ǧ" + "����" + "���" + "��͡" + "��ʹ" + "��" + "����" + "���" + "��ѡ" + "��ѧ" + "��Ѵ" + "��Ѻ" + "����" + "����" + "����" + "���" + "��ҡ" + "��ҹ" + "��Һ" + "����" + "����" + "����" + "��ԡ" + "����" + "����" + "�����" + "���" + "��ա" + "�������" + "��" + "��ء��ԡ" + "��ش" + "��ع" + "��غ" + "����" + "����" + "���" + "����" + "����" + "���" + "����" + "����" + "�ǧ" + "�Ǵ" + "�ǹ" + "���" + "���" + "��ʹ" + "���" + "��ѧ" + "��Ѵ" + "����" + "�������" + "����" + "���" + "��Ҵ" + "��ҹ" + "����" + "����" + "���" + "��Դ" + "����" + "���" + "��մ" + "����" + "����" + "��ش��Դ" + "����" + "��ٴ" + "�����" + "����" + "���ҧ" + "���ҹ" + "����" + "��" + "�͡" + "�ͧ" + "�" + "�ͺ" + "���" + "���" + "���á" + "�ѡ" + "�Ѵ" + "�ѵ�����" + "�ѵ����" + "�ѵ��Ԩ" + "�ѵ����" + "�ѵ���Ż�" + "�ѵ��֡��" + "�ѵ��" + "�ѵ��" + "�ѹ" + "�Ѻ" + "���" + "��Ǻء" + "���˹��" + "�������" + "���" + "���" + "���" + "��" + "�ҡ" + "�ҧ" + "�ҭ" + "�Ҵ" + "�ҹ" + "�Һ" + "���" + "���" + "��¹�" + "���" + "�����" + "���" + "��" + "�ԧ��" + "�ԧ����" + "�Դ" + "�Թ" + "����" + "�������" + "���ѭ" + "����" + "���" + "�������" + "���" + "����" + "�չ�ҹ" + "�պ" + "��" + "�֧" + "���" + "�״" + "�" + "���" + "���" + "����" + "�ا" + "�ع" + "�غ" + "�����" + "���" + "���" + "����" + "��" + "�١" + "�ٴ" + "���" + "��´�" + "���" + "��ǧ" + "����" + "���" + "��" + "���" + "��ҧ" + "��ҹ" + "����" + "��ǧ" + "��ǹ" + "����" + "���" + "��ͧ" + "����" + "����" + "���" + "��ҧ" + "����" + "����" + "���" + "͡" + "͡�ѭ�ص�" + "͡�ѭ��" + "͡��ɰ�" + "͡ó���" + "͡��������" + "͡���" + "ͤ��" + "ͤҸ" + "ͧ��" + "ͧ��ҵ�" + "ͧ������" + "ͧ�����" + "ͧ��ѡ��" + "ͧ��Է��" + "ͧ�Ҿ¾" + "ͧ���" + "ͧ����" + "ͧ��" + "ͧ���" + "ͧ����" + "ͧ��" + "ͧ�Ҩ" + "ͧ��" + "ͨ��" + "ͨԵ��" + "ͨԹ��" + "ͨԹ��" + "ͨ���" + "ͪ" + "ͪ�" + "ͪԹ" + "ͪԹ�" + "ͪ��" + "ͯ��" + "ͳ�" + "ͳ�" + "ͳ�" + "ʹ" + "ʹԶ�" + "ʹ���" + "ʹ����" + "ʹ����" + "ʹ�" + "ʹ��á" + "ʹյ" + "ʹ��" + "ʹ���" + "ʹ����" + "͵Ԫҵ" + "͵��ҹ�" + "͵��Ҫ" + "͵����" + "͵��á" + "ͷԹ�ҷҹ" + "���" + "ԡ���" + "ԡó�" + "ԡ���" + "ԡ��÷Թ" + "ԡ��" + "Ԥ�" + "ԯ�ҹ" + "Ժ��" + "Ժ��" + "Ի" + "Ի��" + "��Ҫ" + "�ɰҹ" + "֡" + "����" + "���Ţ�" + "���" + "��Ţ" + "����" + "ѵ��" + "ѹ��" + "Ҥ�" + "Ҥ���" + "Ҩ��" + "Ҷ" + "Ҷ�" + "ҷ�" + "ҸԻ��" + "����" + "��ª�" + "��¸���" + "����" + "����" + "Ԩ" + "Ԩ�ѧ" + "Ԩ��" + "ԯ������" + "���" + "��" + "�" + "ء�" + "ء��" + "ء������" + "ءҪҴ" + "ء��" + "ء��" + "ب�" + "ت�" + "ت�" + "تҵ" + "تԵ" + "حҵ" + "ح���ҡ��" + "طԹ" + "غ�" + "غ��" + "ػ�ԭ��" + "ؾ���" + "ؾѹ��" + "������" + "������" + "��Ҥ" + "��ѵ�" + "��ҵ��" + "��ҹ" + "����" + "��ѡɹ���" + "��ѡ��" + "��Ҫ" + "��ٻ" + "�ǧ��" + "��ѵ" + "���ʡ" + "���ʵ�Ҩ����" + "���ʹ�" + "���ɯ�" + "�ʵ�" + "�ʹ��" + "���" + "��ó�" + "��ѭ��" + "����" + "��������" + "���ʹ�" + "�������" + "����" + "������" + "��¤" + "����" + "ͺ" + "ͺ��" + "ͺ������" + "ͺ���آ" + "ͻ����" + ";¾" + ";��������" + "����" + "��Ԫ�" + "��Ԫҵ" + "��ԭ��" + "��Ը���" + "��Ըҹ" + "��Թѹ��" + "��Թ��" + "��Թ����" + "��Ժ��" + "��Ի�Ѫ��" + "��Ի���" + "�������ӹҨ" + "����ҹ�" + "����آ" + "���ô�" + "�������" + "����ѡ��" + "����ѡ�Ե����" + "����ѹ��" + "����ҷ��" + "�������" + "�����Ҩ��" + "�����⾸�" + "������⾸�" + "����Է���" + "����Ż��" + "����ɡ" + "�����" + "��" + "����" + "�������" + "���" + "����" + "����Ǵ�" + "���Թ���" + "��ĵ" + "��ĵ��" + "��Ե�" + "�����" + "��ҡ" + "��ظ��" + "����" + "����" + "���ҧ" + "��" + "�ê�" + "��ó�" + "��ö" + "��öҸԺ��" + "����" + "���ѧ" + "���ѹ��" + "��ѭ" + "���" + "���ºؤ��" + "�����" + "��������" + "��س" + "�����" + "���" + "�����" + "�����" + "�ŧ��" + "�ŧ�ó�" + "�ŧ���" + "��ǹ" + "�����ҹ" + "��ѧ���" + "��Ѫ��" + "���觩��" + "���ǧ" + "���ͧ��ͧ" + "���ҧ��ҧ" + "�ǡ��" + "�Ǵ" + "�ǵ��" + "�ǹ" + "�Ǻ" + "������" + "���" + "���" + "���ҹ" + "�����" + "������" + "��Ԫ��" + "�ʧ��" + "�ʹպҵ" + "������" + "����ҵ�" + "��þ��" + "��ѧ�������Ѿ��" + "��ѭ��" + "��ѭ����" + "��ѵ��" + "��յ�" + "��ب�" + "��عպҵ" + "���á��" + "�����" + "����" + "��ѧ���" + "��ԧ��" + "����ҵ��ä" + "��" + "�͡" + "�͡��ਹ" + "�͡��പѹ" + "�͡��" + "�͡䫴�" + "�ʹ" + "�ʹ���" + "�����" + "��" + "���" + "��Ź�" + "�ͻ�ѹ" + "�ͻ�硵�" + "�Ϳ" + "�Ϳ����" + "�Ϳ���" + "���" + "�������" + "����" + "���" + "���������" + "�Ф����" + "�д�չ��Թ" + "�е��" + "����������" + "�����������" + "�����������" + "����������" + "������" + "����չ" + "����" + "������" + "�ѡ" + "�ѡ�" + "�ѡ���Ը�" + "�ѡ���Ժѵ�" + "�ѡ������" + "�ѡ���" + "�ѡ��" + "�ѡ��" + "�ѡ�ʺ" + "�ѡ�" + "�Ѥ��" + "�Ѥ��" + "�Ѥ��" + "�Ѥê���" + "�Ѥ������" + "�Ѥ��Ҫ�ٵ" + "�ѧ" + "�ѧ���" + "�ѧ���ا" + "�ѧ���" + "�ѧ���" + "�ѧ���" + "�ѧʵ���" + "�ѧʹ�" + "�Ѩ��Ѻ" + "�Ѩ�ѹ��" + "�Ѩ���" + "�Ѩ��" + "�Ѩ���" + "�Ѩ���ºؤ��" + "�Ѩ�����" + "�Ѩ��" + "�Ѫ��" + "�Ѫ�����" + "�ѭ���" + "�ѭ���" + "�ѭ�ѹ" + "�ѭ��С��" + "�ѭ���" + "�ѭ�ѭ��" + "�ѭ�ٻ" + "�ѭ�ԭ" + "�ѯ" + "�ѯ��" + "�Ѱ" + "�Ѱ��" + "�Ѱ�" + "�Ѳ�ѹ���" + "�Ѳ�Ҥ" + "�Ѳ����" + "�Ѳ���" + "�Ѳ�ѵ��" + "�ѳ���" + "�ѳ��" + "�ѳ�ҡ��" + "�Ѵ" + "�ѵ�Ѵ" + "�ѵ��ǻ���ѵ�" + "�ѵ��" + "�ѵ��" + "�ѵ�ҸԻ��" + "�ѵ���" + "�ѵ�Ҿ" + "�ѵ��" + "�ѵ�ԹԺҵ����" + "�ѵ��ѵ�" + "�Ѹ�����" + "�ѹ" + "�ѹ�Ѻ" + "�ѹ�øҹ" + "�ѹ����" + "�ѹ����" + "�ѹ����" + "�ѹ����" + "�Ѻ" + "�ѻ�Ҥ��" + "�ѻ����" + "�ѻ��" + "�ѻ���ҳ" + "�ѻ�Ҫ��" + "�ѻ����" + "�ѻ�ѡɳ�" + "�ѻ��" + "�ѻ���" + "�Ѿ�ô" + "�Ѿവ" + "�Ѿഷ" + "�ѿ" + "�����" + "����ġ��" + "�����" + "����ҵ" + "����ت" + "����������" + "��¡�" + "��¡��" + "����ԡ�" + "��Ũ�����" + "��ź���" + "��ź����" + "�������" + "��Ȩ����" + "����Թ" + "����Թ�" + "��������" + "��ɮ��ط" + "��ɮ��ظ" + "��ʴ�" + "��ʴ���" + "��ʴ�" + "��ʹ�" + "�����" + "�������" + "�����" + "���" + "������" + "������" + "���" + "���" + "���" + "��" + "�ҡ�" + "�ҡѻ������" + "�ҡ��" + "�ҡ��" + "�ҡ��" + "�ҡ��" + "�Ң�ҹ" + "�Ҥ�" + "�Ҥѹ�ء�" + "�Ҥ��" + "�Ҥ���" + "�Ҧҵ" + "�ҧ��ҧ" + "�Ҩ" + "�Ҩ�" + "�Ҩ����ѵ�" + "�ҨҴ" + "�Ҩ����" + "�ҨԳ" + "�Ҫ��" + "�Ҫ�" + "�Ҫ���" + "�Ҫվ" + "�Ҫ���֡��" + "�Ҫ���" + "�ҭ�" + "�ҳѵ�" + "�ҳ�" + "�Ҵ" + "�Ҵ��" + "�ҵ��Ҿ" + "�ҵ��" + "�Ҷ�þ��" + "�Ҷ�þ�" + "�ҷ�" + "�ҷ�" + "�ҷԵ��" + "�ҹ" + "�ҹ�ʧ��" + "�ҹ��Ҿ" + "�Һ" + "�Һѵ�" + "�ҾҸ" + "�ҿ�ҹ�ʶҹ" + "�ҿ�ԡ�" + "���ó�" + "���Ѿ" + "����" + "�����" + "���" + "��µ��" + "���Ѵ" + "����" + "�������ʵ��" + "������Ǫ" + "�����ᾷ��" + "��úԤ" + "������" + "���ª�" + "���ªҵ�" + "���¸���" + "���»����" + "�����" + "����ѹ" + "���ѡ��" + "���ѡ��" + "���������" + "��������" + "���Ҹ��" + "�����" + "�����ԡ" + "�������" + "����" + "���줵ԡ" + "����ૹ��" + "��Ż��" + "�����Ҵ" + "���ѡɳ�" + "�����" + "�����" + "���" + "���ó�" + "�����" + "������" + "���ظ" + "������" + "����" + "�����" + "�����" + "������ҷ" + "��ʹ�" + "��ʹ�" + "���ѭ" + "����" + "�����˺٪�" + "�����" + "����Ѻ" + "�����" + "����¹" + "�����" + "�������" + "���Ǥ" + "�����" + "��������ҷ" + "��" + "�ӹ��" + "�ӹҨ" + "�Ӿй�" + "�Ӿѹ" + "���ĵ" + "����Ե" + "���ҵ��" + "����" + "�����" + "���" + "�ԧ" + "�ԧ��" + "�ԧ����" + "�Ԩ��" + "�ԩѹ" + "�ԯ������" + "�" + "�Դ" + "�Ե��" + "�Ե���" + "�Ե����¹" + "�Է��" + "�Թ" + "�Թ���Թ" + "�Թ����" + "�Թ�����" + "�Թ�ø��" + "�Թ��ǧ��" + "�Թ��������" + "�Թ���" + "�Թ�����" + "�Թ���" + "�Թ�����ѧ��" + "�Թ�����" + "�Թ���" + "�Թ�ص" + "�Թ����ô" + "�Թ�����ԡ" + "�Թѧ" + "�Թ���" + "�Թ��¹ᴧ" + "�Թ����" + "�Թ������" + "�Թ����" + "�Թ��" + "�Թ����" + "�Թ������" + "�Թ����" + "�Թⴹ����" + "�Թⴹ����" + "�Թ����" + "�������" + "������" + "���Ի��" + "�����Һ�" + "�����" + "��ɯ�" + "��ɯ�" + "���" + "��ʵ��" + "�����Ҿ" + "�����" + "��������" + "��������" + "�������" + "��������ó�" + "�����" + "����" + "����" + "�������" + "�����ҹ" + "����ѡ��������" + "����硵�" + "����硷�ԡ��" + "�����ⷹ" + "����" + "��" + "�ա" + "�ա�" + "�ա��" + "�դ�������" + "�չا�ا�ѧ" + "����" + "���Ի��" + "�����©��ᩡ" + "������" + "���ҹ" + "���ء����" + "����ͺ" + "����ѡ��������" + "�����" + "�����" + "������" + "������" + "�������Т�" + "����š�š�š" + "���" + "���" + "��" + "�֡" + "�֡�֡" + "�֡�ѡ" + "�֧" + "�֧���" + "�֧��" + "�ִ" + "���" + "���" + "��鴷��" + "���" + "�״" + "���" + "���" + "���" + "����" + "��" + "�ء" + "�ء�Һҵ" + "�ء�ɯ�" + "�ب����" + "�بҴ" + "�ب����ä" + "�ب" + "�ت�" + "�د�ҡ��" + "�س�����" + "�س��" + "�س�ҡ��" + "�س���" + "�س�" + "�ش" + "�ش�" + "�ش�" + "�ش˹ع" + "�ص�Դ" + "�صôԵ��" + "�ص��" + "�ص�ش" + "�ص��ˡ���" + "�ص����" + "�ص�����" + "�ص�" + "�ط�" + "�ط�ó�" + "�ط�Ѩ" + "�ط�ҹ" + "�ط�" + "�ط���" + "�طѪ" + "�ط��" + "�طҹ" + "�ط��" + "�ط��ó�" + "�ط��" + "�ط����" + "�ظѨ" + "�غ" + "�غ�" + "�غ�Ժ" + "�غ�" + "�غѵ�" + "�غҷ" + "�غҷ��" + "�غ��" + "�غ�ʡ" + "�غ��ԡ�" + "�غ��" + "�ػ" + "�ػ�ó�" + "�ػ���" + "�ػ����" + "�ػ����" + "�ػ�����" + "�ػ�����" + "�ػ�ҹ" + "�ػ�ٵ" + "�ػ���" + "�ػ��¡" + "�ػ�����" + "�ػ��" + "�ػ�ҹ" + "�ػ�Ҫ" + "�ػʧ��" + "�ػ����" + "�ػ��ä" + "�ػ������" + "�ػѪ����" + "�ػѪ����" + "�ػѯ�ҡ" + "�ػѯ�ҹ�" + "�ػѷ�ѹ����" + "�ػѷ��˵�" + "�ػҷҹ" + "�ػ���" + "�ػ�¤" + "�ػ�š��" + "�ػ���" + "���" + "����" + "���ѧ�صѧ" + "����" + "����" + "���ا�صѧ" + "��ɳ���" + "����" + "����" + "����" + "��ມ��" + "������" + "�����" + "����" + "���ʶ" + "�������" + "����" + "���" + "����" + "���" + "����" + "����" + "����" + "��" + "�ٰ" + "�ٴ" + "���" + "����" + "���" + "���" + "������" + "������" + "��š" + "����" + "�" + "��س" + "�Ҷ" + "����" + "���" + "����ԡѹ" + "����ԡ�" + "��Ǩ�" + "�ᴻ����" + "����" + "���" + "��" + "�ҵ" + "�����" + "��ȡ" + "�����" + "��ͧ" + "��" + "����" + "���" + "��ҧ" + "��ҹ" + "����" + "���" + "��" + "��ǡ" + "��ǹ" + "���" + "��" + "�����" + "����" + "����" + "��������" + "�������" + "���" + "��ҧ" + "����" + "����" + "������" + "��ʹ" + "���" + "���" + "��ͧ" + "����" + "Ρ���¹" + "�ǧ����" + "�ǹ" + "�Ǻ" + "�͡���" + "�ʹ" + "������" + "�������" + "���ѹ��" + "����Ź��" + "��" + "�ѡ" + "�ѧ����" + "���" + "����" + "��" + "���" + "���촴�ʤ�" + "��������" + "������" + "�����չ" + "�Ե" + "�Թ��" + "�Ի������" + "��ʷ�����" + "�������" + "�����" + "��" + "�֡" + "�ִ" + "�ִ�Ѵ" + "���" + "���" + "����" + "�״�Ҵ" + "���" + "����" + "����" + "�غ" + "��������" + "�١" + "���" + "���" + "���" + "��ͧ��" + "��ͧ��" + "���" + "���" + "�" + "ࡡ����á" + "ࡨ��Ҩ����" + "ࡳ��" + "ࡴ" + "ࡵ�" + "ࡹ" + "��" + "����" + "��" + "�ç" + "�ô" + "����" + "����" + "��ԡ" + "����" + "���¡" + "���§" + "���¹" + "���º" + "�����" + "�����" + "������" + "���" + "���" + "����" + "��" + "���" + "���" + "���§" + "���´" + "�����" + "�����" + "�����" + "����§" + "����" + "���͡" + "����" + "�����" + "����" + "���" + "����" + "���¹" + "��" + "���" + "��Թ�" + "�ɵ�" + "�ɵá�" + "�ɵá���" + "���" + "���³" + "���¹" + "���" + "��" + "����" + "��Ԫ�" + "��" + "�С�" + "��" + "�ҵ�" + "�ҷѳ��" + "���Ѵ" + "�����" + "���" + "������" + "�ԧ" + "�Դ" + "�Թ" + "���" + "��§" + "��¨" + "��´" + "��¹" + "���õ�" + "���õԤس" + "���õԹ���" + "���õԻ���ѵ�" + "���õ�����" + "���õ���" + "���õ��ѡ���" + "���õ��" + "�����" + "����" + "���§" + "�����" + "��������" + "�������" + "�����" + "�����" + "�����" + "��͡" + "��ͺ" + "����" + "���" + "��" + "��" + "��" + "��" + "�觡Ҩ" + "��" + "���" + "��" + "��" + "�駡�ҧ" + "���" + "���" + "������" + "��" + "��" + "�����" + "��" + "��" + "���" + "�" + "ࢡ" + "ࢵ" + "ࢹ" + "ࢹ�" + "ࢹ�" + "ࢹ�" + "ࢺ稢�ǹ" + "ࢺ�" + "���" + "���" + "���ͺ" + "���" + "������" + "���" + "����" + "���" + "��" + "�¡" + "��Ժ" + "����" + "���" + "����" + "�������" + "����" + "�ŧ" + "����" + "���" + "���" + "����" + "��" + "���" + "���" + "�Т�" + "��" + "�Թ" + "��§" + "��´" + "��¹" + "����" + "����" + "����" + "�����" + "���" + "���ͧ" + "���" + "��" + "��" + "��" + "���" + "��" + "��" + "���" + "���" + "���" + "ह��" + "���" + "��" + "�ç" + "�ôԵ" + "���" + "������" + "���´" + "����" + "����ͧ" + "����ͧ�����" + "���" + "��觤�Ѵ" + "��Ժ�����" + "�����" + "����" + "���ͺ" + "����" + "���" + "���" + "����" + "���" + "��" + "���" + "���" + "������" + "���" + "�ҹ�����" + "��þ" + "���" + "��§" + "��´" + "��¹" + "����" + "�����" + "�����" + "�����" + "��ͧ" + "����" + "���" + "��" + "��" + "���" + "����" + "���¹" + "ৡ" + "��" + "���" + "��Ч�" + "��" + "���" + "�Թ" + "��º" + "���§" + "���¹" + "������" + "�����" + "��͡" + "��ʹ" + "��ͺ" + "���ͧ" + "���" + "����" + "����" + "�����" + "���" + "���" + "�" + "��ʶҹ" + "���" + "ਵ" + "ਵ���" + "ਵ�ӹ�" + "ਵ��" + "ਵ������" + "ਵ�ٵ" + "ਵ�ԡ" + "ਹ" + "����" + "�è�" + "��ԭ" + "��Դ" + "���" + "�ɮ�" + "��" + "����" + "���" + "���" + "�Դ" + "���" + "���" + "���" + "��´" + "��¹" + "����" + "������" + "����" + "���º" + "�����" + "����Ǩ���" + "���¹" + "����������" + "���" + "���" + "�����" + "��" + "��" + "���" + "���" + "���" + "��Ҫ��" + "��" + "��" + "��" + "��" + "���" + "���" + "�" + "" + "ੴ" + "��" + "��" + "�����" + "���" + "���" + "����" + "���§" + "�����" + "�����" + "���§" + "���¹" + "�����" + "��" + "�ҡ���" + "���" + "�Դ" + "�Ժ" + "��§" + "��´" + "��º" + "����" + "�����" + "��" + "�����" + "��" + "��" + "હ" + "��" + "��" + "���" + "�ɰ�" + "��" + "����" + "��ǹ�" + "����" + "�ԧ" + "�ԭ" + "�Դ" + "���" + "��§" + "��§����" + "��º" + "�����" + "����" + "���¹" + "�����" + "��͡" + "��ʹ" + "��" + "����" + "���ͧ" + "�����" + "����" + "��" + "��" + "��" + "���" + "��" + "���" + "�" + "" + "ૹ" + "ૹ�ԡ���" + "ૹ���Ե�" + "ૹ���ô" + "ૹ������" + "ૹ��" + "ૻѡ��С���" + "૿" + "�����" + "������´�" + "�������" + "����" + "����" + "������" + "��" + "����" + "�������" + "���" + "��" + "���" + "�ԧ" + "���������" + "���" + "��¹" + "������" + "����" + "���§���" + "���ͧ" + "�������" + "��" + "��" + "������" + "��" + "��" + "���" + "��" + "��ҫ��" + "��" + "�����" + "���" + "��" + "ഡ�����" + "തҡ���" + "ത��Ե�" + "ത�����" + "പ" + "പ�" + "ഫԡ���" + "ഫ��Ե�" + "ഫ�����" + "ഹ" + "ഹ����" + "ഹ����" + "ഺԵ" + "��Ѩ�ҹ" + "����" + "��Դ" + "�ʡ�ͻ" + "���" + "��" + "���" + "�Թ" + "���" + "���" + "��§" + "��´" + "����" + "���ô��" + "���ö���" + "����Ѩ�ҹ" + "����" + "����" + "�����" + "����" + "�����" + "��ʹ" + "��" + "����" + "��" + "��" + "��" + "��" + "��" + "��" + "���" + "��" + "���" + "���" + "��ʹ��" + "��" + "����" + "���´" + "�����" + "���" + "���" + "��Դ" + "���" + "����" + "�����" + "���" + "��" + "��" + "�����" + "�Ժ" + "���" + "���" + "��§" + "��¹" + "��º" + "����" + "�����" + "����" + "�����" + "��" + "����" + "��" + "�繷�" + "���" + "��" + "���" + "���" + "��" + "���" + "��ҷ֧" + "�����ǹ" + "������" + "������" + "��������" + "������º" + "��" + "���" + "���" + "ඡԧ" + "ඹ" + "��" + "���" + "��ҹ����" + "��ԧ" + "���͡�Ź" + "����" + "���" + "��" + "�������" + "���" + "�ԡ" + "�Դ" + "�Դ�ԧ" + "�Թ" + "��§" + "���" + "��͡" + "���" + "���" + "���" + "�" + "�Ԥ" + "�����" + "���" + "" + "" + "��" + "�Դ�" + "��" + "´�" + "����" + "��ѡ��" + "�" + "���" + "������" + "�ô����" + "�ù����" + "�Ǵ�" + "�Ƿѳ��" + "�Ƿٵ" + "�Ǹ���" + "�ǸԴ�" + "�ǹ���" + "���ٻ" + "���" + "��ʶҹ" + "��ѭ" + "��ѹ" + "������" + "���" + "���š" + "��" + "�ȡ��" + "�ȹ�" + "�ȹ�" + "�Ⱥ��" + "�������" + "����Ժ��" + "�ʵ�" + "���ѵ��" + "���" + "�ͭ" + "���" + "������������" + "��з�" + "��" + "�Դ" + "�Թ" + "�Ժ" + "���" + "����" + "��¹" + "��º" + "����" + "����" + "���§" + "�����" + "��͡" + "����" + "��Ť��" + "������" + "�������" + "��" + "��" + "��" + "���" + "���" + "����" + "���" + "���" + "ู" + "ู��" + "��" + "�" + "" + "�" + "�ऻ" + "�" + "����" + "�ٹ" + "��" + "��" + "�äس" + "���Ե" + "����" + "��" + "�Թ" + "�Ժ" + "���" + "���" + "��¹" + "����" + "��ͧ" + "����" + "���ͧ" + "����" + "��" + "�������" + "�������" + "���" + "��" + "���" + "�" + "" + "ວ���" + "ອ�" + "ອ��" + "ອ�����ҳ�" + "ອ�����س" + "ອ�����" + "ອ���þ�" + "ອ����" + "ອ�ç��" + "ອ��" + "ອ�ҧ���д�ɰ�" + "ອ�ҧ��" + "ອ���" + "ີ��" + "ູ" + "ູ�Թ" + "ູ��" + "�á" + "���" + "��������" + "��" + "��" + "�ʺ��" + "����" + "�����Թ" + "���" + "��к�" + "��" + "��" + "���" + "�����" + "�ԡ" + "����" + "���" + "��´" + "��¹" + "�����" + "���§" + "����" + "�����" + "���" + "��" + "����" + "����" + "���ͧ" + "��" + "�����" + "������" + "��" + "��" + "���" + "��������" + "�������" + "���" + "" + "�õ" + "���" + "���" + "���" + "����" + "����" + "���§" + "���" + "���º" + "�����" + "�����" + "����§" + "������" + "������" + "����ͧ" + "������" + "��" + "���" + "����" + "����¹" + "������" + "�����" + "���͡" + "���ͧ" + "�����" + "����ͧ" + "���" + "����" + "��" + "����" + "�����繵�" + "��" + "��" + "���" + "����" + "�ԡ" + "�ԧ" + "�Դ" + "�Ժ" + "���" + "���" + "���" + "��¡" + "�����" + "�����" + "���¡" + "�����" + "��͡" + "�����" + "���" + "��" + "��" + "�繵�" + "��" + "���" + "��" + "��" + "���" + "��" + "��" + "��" + "���" + "�������" + "���" + "�������" + "�" + "༧" + "༪ԭ" + "༴��" + "༴�§" + "༴�" + "��" + "���" + "���" + "�����" + "���" + "����" + "���" + "��ԭ" + "�����" + "��" + "��" + "���" + "�Թ" + "��͡" + "��ʹ" + "����" + "��" + "��" + "���" + "���" + "���" + "��͡" + "���" + "���" + "�" + "ྨ" + "ྪ��ҵ" + "ྪ�" + "ྪ���ظ" + "ྴҹ" + "ྷ��" + "ྷ��" + "ྷغ��" + "ྐྵ��Թ" + "ྐྵ�´" + "ྐྵ����" + "�ç" + "���" + "����" + "��Դ" + "����" + "���¡" + "���§" + "���º" + "�����" + "�����" + "��" + "�ŧ" + "���" + "����" + "��ԧ" + "��Դ��Թ" + "��Թ" + "����" + "����§" + "�����" + "��" + "���" + "�ԡ" + "�ԧ" + "���" + "����" + "��§" + "��º" + "����" + "����" + "���§" + "���¹" + "����" + "���" + "��" + "��" + "��" + "�紷��" + "��" + "�蹾�ҹ" + "���" + "���" + "" + "��" + "����" + "���������" + "���������" + "���" + "��" + "�Թ" + "�����" + "�����" + "���" + "��ͧ" + "��" + "����" + "���ͧ" + "����" + "���ͧ" + "�����" + "��" + "��" + "���" + "�����" + "���" + "���غ��" + "����" + "���Ѫ" + "��" + "����" + "�������õ��" + "�����" + "���" + "����" + "���Թ���" + "����" + "�����" + "����" + "����ԡ" + "���ع" + "�����" + "���Թ�" + "����" + "����" + "������" + "�������" + "����" + "�������" + "�����" + "����" + "����ͧ" + "�������" + "�������" + "����" + "����" + "���" + "����¹" + "���" + "���" + "�����" + "�����" + "�����" + "����" + "��Թ" + "����" + "���§" + "����§" + "����¹" + "���͡" + "���ͧ" + "�����" + "������" + "������" + "��硫��" + "���" + "���" + "����" + "����" + "������" + "��" + "�§" + "�«�" + "�¹" + "���" + "�����ѹ" + "�����ѹ��" + "�����ѹ�" + "����" + "���" + "���Ǫ�" + "���Ǿ�" + "���Ǿҹ" + "���������" + "�����ʹ" + "�����Ҫ" + "�����ѡɳ�" + "�������" + "�����" + "����" + "��Թ" + "��Ժ" + "����" + "��������" + "�����" + "����" + "���¹" + "���º" + "�����" + "����§" + "������" + "������" + "���͡" + "���" + "�����" + "�����" + "����ͧ" + "����" + "���" + "���" + "���" + "����" + "���" + "����" + "����" + "�â" + "�â�" + "�âҤ�Ե" + "�ó�" + "�ô" + "�ô���" + "���ǹ" + "��Ǵ�" + "���" + "���" + "����" + "��ԧ" + "��Դ" + "����" + "�����" + "�����" + "���¡" + "���§" + "���´" + "���¹" + "���º" + "�����" + "�����" + "�����" + "������" + "������" + "������á" + "����" + "���͡" + "���ͧ" + "���ʹ" + "���" + "�����" + "����ͧ" + "������" + "�����" + "����" + "����" + "����" + "���" + "���" + "����" + "����" + "���" + "����" + "�Ţ" + "�Ţ�" + "�ŢҸԡ��" + "�Ţҹء��" + "�Ŵ��" + "�ŵ" + "�Ź" + "�Ź��" + "�źҹ" + "���" + "���" + "���" + "����ѧ" + "���" + "����" + "�������" + "���" + "�����" + "���" + "����" + "��ԡ" + "��ԡ���" + "��Թ����" + "����" + "����" + "����" + "���§" + "���¹" + "���º" + "�����" + "�����" + "����§" + "����¹" + "������" + "����§" + "������" + "���͡" + "���ʹ" + "���" + "����ͧ" + "����" + "������" + "��������" + "������" + "������" + "������" + "���" + "���" + "���" + "���" + "���" + "���" + "����" + "���" + "����" + "�����" + "����" + "����" + "���" + "����" + "�Ǥ" + "�ǤԹ" + "�Ǥ�" + "�Ǩ" + "�Ǫ" + "�Ǫ����" + "�ǰ��" + "�dz�" + "�dz�" + "�dzԡ" + "�dz�" + "�ǵ��" + "�ǵ�" + "�ǵ��" + "�Ƿ" + "�Ƿ��" + "�Ƿ��" + "�Ƿҧ���ʵ��" + "�Ƿҧ��" + "�Ƿҹ��" + "�Ƿҹ��" + "�Ƿ�" + "�Ƿ�" + "�Ǹ�" + "�ǹ" + "�ǹ��" + "�ǹ��" + "�Ǻ䫵�" + "��������" + "����" + "���ѵ" + "���ҵԡ" + "���" + "������" + "���ѳ" + "���ѳ����" + "����" + "�����" + "����" + "�����" + "�����" + "�����" + "��ʵ�" + "��ʹ�" + "�����" + "�����" + "�����" + "����ѳ" + "�����" + "����ѹ��" + "����ء���" + "������ѳ" + "�����Ѫ" + "����" + "������" + "��˹" + "����" + "���ѧ��" + "���ѻ��" + "����" + "������" + "�����" + "����" + "���" + "�����" + "�����ѹ" + "��ԡ" + "������൪ѹ" + "�����" + "����" + "���§" + "���´���" + "���¹" + "���è��" + "����" + "���" + "���" + "����" + "���" + "���" + "����" + "����" + "���ɰ�Ԩ" + "���ɰ��ʵ��" + "���ɰҹ�" + "���ɰ�" + "���ɰ�" + "�����" + "��ǵ" + "���" + "�����" + "��" + "�ʡ" + "�ʧ����" + "�ʩǹ" + "�ʴ" + "�ʴ�" + "�ʶ���" + "�ʶ����Ҿ" + "�ʹ" + "�ʹ�" + "�ʹ��" + "�ʹ�" + "�ʹ�" + "�ʹ�" + "�ʹҸԡ��" + "�ʹҺ��" + "�ʹ�ʹ�" + "�ʹ��" + "�ʹ�´" + "�ʹ���" + "�ʹ�" + "�ʹ���" + "�ʹ���" + "�ʹ��" + "�ʺ�" + "�ʺ�§" + "�ʾ" + "�ʾ��" + "����" + "�����" + "����" + "����" + "����¹" + "����" + "����" + "���" + "���Դ" + "���Կ" + "�����" + "����" + "����" + "��Ŵ" + "����" + "�����§" + "����͡�Ź" + "��ǡ" + "��ǡ��ҵ��" + "��ǹ�" + "��ǹ�" + "����" + "����¹" + "���" + "�������" + "�����" + "���Ǥ���" + "���dzԵ" + "���ǹ�" + "���ǹ���" + "������" + "�����Ҥ��" + "�����Ҿ" + "������" + "�����ѡɳ�" + "����" + "�����" + "����" + "���§" + "���´" + "���º" + "�����" + "�����" + "�����" + "����§" + "������" + "����¹" + "������" + "������" + "����" + "���͡" + "�����" + "������" + "�����" + "����" + "���" + "����" + "������" + "���" + "���" + "����" + "��" + "�˧" + "�˧�" + "�˧�͡" + "�˧���" + "�˧�" + "�˵�" + "�˵ء�ó�" + "�˹��" + "�˹��˹�" + "�˹��" + "�˹�§" + "�˹���" + "�˹���" + "�˹����" + "�˹��" + "�˹����" + "�˹�" + "�˹�" + "�˹�" + "�˹��" + "�˹��" + "���" + "���Ǵ�" + "���ѹ��" + "����" + "�����" + "������" + "�������" + "����ͧ" + "����ʹ" + "����" + "����" + "����" + "����" + "�����" + "���" + "��§" + "�����" + "���ԧ" + "����´" + "����º" + "�������" + "����͡" + "������" + "�����" + "���ѭ�ԡ" + "����" + "����" + "��Ź" + "����" + "����" + "����" + "���������" + "���ԧ" + "����¹" + "������" + "�������" + "�����" + "����͡" + "����ͧ" + "����ͺ" + "�������" + "����" + "����" + "�����" + "�����" + "���" + "��ǧ" + "����" + "�����" + "��������" + "�����§" + "����" + "����" + "���" + "����" + "��Թ" + "����" + "���¹" + "������" + "�����" + "����¹" + "������" + "���ʹ" + "�����" + "���" + "���" + "���" + "���" + "���" + "����" + "����" + "��" + "�͡" + "�͡�ѹ��" + "�͡��" + "�͡�����" + "�͡��" + "�͡��" + "�͡�Ҿ" + "�͡���" + "�͡�ö����¤" + "�͡�Ҫ" + "�͡�ѡɳ�" + "�͡���" + "�͡Ѥ��" + "�͡ҸԻ��" + "�͡ࢹ�" + "�͡��" + "�ͧ" + "�ͪ��" + "�ʹ��" + "�ʹ�����" + "�͵�Ѥ��" + "�ͷ�����" + "�" + "���ҹ��" + "����" + "�ͻ�ѹ" + "���" + "���" + "�����ѳ" + "���������" + "���" + "���ѧ" + "���" + "��̡" + "����" + "���" + "�����" + "����" + "���" + "��ҷ�ص" + "������" + "��ԡ" + "��Ժ" + "����" + "���§" + "���´" + "���¹" + "����¹" + "������" + "������" + "����§" + "�����������" + "������" + "����´" + "������" + "���������" + "���" + "�����" + "������" + "�����" + "����ͧ" + "����" + "������" + "������" + "������" + "�����" + "�����¹����" + "�����" + "����蹵�" + "��Ấ" + "��硫�" + "��硫��������" + "��硫����" + "���" + "���" + "��紵���" + "����֧" + "���" + "��繴�" + "�������" + "����" + "����" + "���" + "����" + "���������" + "�������" + "���" + "����" + "����" + "���" + "���" + "����" + "��" + "�Χ" + "���" + "���Ԥͻ����" + "���õ��" + "����" + "����¹" + "����º" + "������" + "���͡" + "���" + "�����չ" + "����" + "����" + "����" + "����" + "�" + "ᡧ" + "" + "��" + "����" + "�á" + "�ùԵ" + "���" + "��俵�" + "���" + "���" + "����" + "��" + "�ź" + "���" + "���" + "�������" + "���" + "����" + "����" + "��" + "���" + "���" + "��" + "��������" + "��" + "��" + "�����" + "��" + "��" + "��" + "���" + "���" + "��" + "��" + "���" + "�" + "ᢡ" + "ᢹ" + "ᢹ�" + "��" + "���" + "����" + "�§" + "���" + "���" + "�ǡ" + "�ǧ" + "�ǹ" + "���" + "��" + "��" + "�觢ѹ" + "��" + "��" + "�" + "ᤪ�����" + "ᤪ������" + "ᤵ���ͤ" + "᤹" + "᤺" + "᤻���" + "��" + "�ç" + "���" + "���" + "���" + "�Ť����" + "�ŧ" + "�Ź" + "�����" + "��Կ������" + "������" + "���Ǥ��ͧ" + "����" + "��" + "�ǡ" + "���" + "��" + "��" + "��" + "��" + "�" + "��" + "��" + "��" + "��" + "���" + "�" + "ᨡ" + "ᨧ" + "��" + "��" + "���" + "���" + "��" + "��" + "��" + "���" + "��" + "��" + "���" + "�������" + "�" + "ᩡ" + "ᩧ" + "�ź" + "���" + "����" + "��" + "��" + "��" + "�" + "����" + "��" + "���" + "����" + "��" + "��" + "���" + "" + "" + "���Ԫ" + "" + "��" + "��Դ" + "��" + "��" + "��" + "���" + "�" + "ᴡ" + "ᴧ" + "ᴴ" + "ᴹ" + "��" + "��" + "��" + "��" + "���" + "ᵡ" + "ᵧ" + "ᵧ���" + "ᵧ��" + "ᵧ��" + "ᵴ" + "ᵹ" + "��" + "��" + "��" + "��" + "��" + "�����" + "���" + "����" + "�" + "ᶡ" + "ᶺ" + "��" + "�ŧ" + "��" + "ᷧ" + "᷹" + "᷹�����" + "᷺" + "�á" + "�á����" + "��" + "�硫��" + "�秡���" + "��" + "��" + "��" + "��" + "Ṻ" + "��" + "��" + "��" + "��" + "��" + "��" + "���" + "���" + "�" + "ạ" + "Ấ������" + "ầ��" + "ầ��" + "Ẵ�Թ�ѹ" + "ẵ�����" + "ẹ" + "ẹ�" + "Ẻ" + "��" + "������" + "��" + "��" + "�" + "ừԿԤ" + "Ỵ" + "Ỻ" + "��" + "�á" + "�ç" + "�û�ǹ" + "���" + "���" + "���" + "���" + "���" + "��" + "�š" + "�ŧ" + "�Ź" + "�ź" + "���" + "��" + "��" + "��" + "���" + "��" + "��" + "���" + "��Ы�" + "��" + "���" + "ἡ" + "ἧ" + "ἴ" + "Ἱ" + "Ἱ�" + "��" + "�ŧ" + "���" + "���" + "����" + "��" + "��" + "���" + "���" + "ὡ" + "ὧ" + "ὴ" + "�" + "ᾧ" + "ᾧ���" + "ᾷ���ʵ��" + "ᾷ����" + "ᾷ��" + "ᾷ��" + "Ᾱ" + "Ᾱ�" + "Ᾱ��ԭ" + "��" + "�á" + "���" + "���" + "���" + "����" + "�ŧ" + "�ŵ�����" + "�ŷԹ��" + "���" + "����" + "����" + "��" + "��" + "��ࡨ" + "��" + "��" + "��" + "���" + "ῡ��" + "ῧ" + "Ὺ��" + "Ό" + "Ό��" + "Ὼ" + "���" + "�š��" + "�ŵ" + "��" + "���" + "���" + "���������" + "�����" + "���" + "����ҹ��" + "���" + "���������" + "��ŧ" + "���" + "���" + "���" + "���" + "�����ͧ�" + "���" + "���" + "����" + "�¡" + "�§" + "�º" + "���" + "���" + "����" + "���" + "���" + "���" + "���" + "���" + "����" + "��" + "�á" + "�ç" + "�ô" + "���" + "���" + "���ࡵ" + "���" + "���" + "���" + "�����" + "����" + "��" + "�š" + "�ŧ" + "�Ź" + "�Ź�" + "�Ź��" + "�ź" + "���" + "�����" + "���" + "���" + "���" + "���" + "���" + "����" + "�ǧ" + "�Ǵ" + "�Ǻ" + "���" + "���" + "���" + "���" + "����" + "���" + "���" + "��" + "�ʡ" + "�ʧ" + "�ʴ" + "�ʴ�" + "�ʵ���" + "�ʹ" + "�ʹ�ҡ�" + "�ʹ�ҹ��Ҿ" + "�ʺ" + "���" + "��¡" + "��§" + "����" + "����" + "��ŧ" + "��ǧ" + "���" + "���" + "���" + "������" + "��" + "�ˡ" + "�˧" + "�˧�" + "�˧��" + "�˧�" + "�˧�" + "�˹" + "�˹�" + "�˹�" + "�˹�" + "�˺" + "���" + "����" + "����" + "�����" + "���" + "��§" + "����" + "����" + "����" + "����" + "���" + "��š" + "��Ź" + "����" + "����" + "����" + "����" + "���" + "��ǡ" + "��ǹ" + "����" + "����" + "���" + "���" + "���" + "���" + "���" + "����" + "��" + "�͡" + "�ʹ" + "�ʹ�ҹ��" + "�ʹ���" + "�" + "���" + "����졵ԡ" + "��Ժʹ�" + "���ਹ" + "����" + "�ͺ" + "�;���पѹ" + "�;���" + "�Ϳ�ԡ�" + "���������" + "������" + "��������" + "�����" + "����" + "���" + "��š�����" + "��ſ�" + "��ʿ�ŵ�" + "�����Թ" + "���Ѵ" + "��" + "���" + "���" + "����" + "���" + "������" + "���" + "����" + "��ꤪ��" + "���" + "���" + "��" + "�ι����" + "���" + "�����������" + "���" + "���" + "�����" + "�" + "⡡" + "⡧" + "⡧�ҧ" + "⡯�" + "⡴ѧ" + "⡹" + "���" + "��ط" + "��" + "�á" + "�ç" + "�ø" + "�ø�" + "���" + "���" + "�Ŵ�" + "�Ź" + "�����" + "���" + "�ʹ" + "��Թ���" + "�����" + "����" + "�ˡ" + "����" + "���" + "������" + "����" + "��" + "��" + "����" + "��" + "��" + "�" + "⢡" + "⢧" + "⢴" + "⢹" + "⢹�" + "��" + "���" + "���" + "�¡" + "�§" + "���" + "�š" + "�ŧ" + "��" + "�" + "⤡" + "⤨�" + "⤵�" + "⤹" + "⤹�" + "⤺�ŵ�" + "��" + "����" + "�á" + "�ç" + "�ç���" + "���" + "��Ҫ" + "�������" + "������" + "���" + "��" + "�ŧ" + "�ŧ�ŧ" + "�Ź" + "�Ź���" + "�������" + "�ǵ�" + "�ह" + "��" + "��" + "��" + "��" + "��" + "�ɡ" + "�ɳ�" + "���" + "��Ե" + "�" + "⧡" + "⧧" + "⧧১" + "⧹" + "��" + "��" + "��" + "����" + "��" + "�" + "⨡" + "⨧" + "⨧���" + "⨷" + "⨷��" + "⨷��" + "⨹" + "��" + "��" + "�á���" + "��" + "�ɨѹ" + "�觤����" + "����" + "��" + "�매����" + "�" + "⩧੧" + "⩴" + "⩹�" + "⩺" + "��" + "�š" + "��" + "�觩�ҧ" + "⪡" + "⪡ع" + "⪤" + "⪴�" + "⪴֡" + "⪵�" + "⪹" + "��" + "���" + "�" + "⫡" + "⫴�" + "��" + "���" + "���" + "��٪��" + "�����" + "����µ" + "��" + "�" + "ⴡഡ" + "ⴴ" + "ⴹ" + "ⴹѷ" + "��" + "����" + "��" + "��" + "��" + "��" + "�" + "ⵡ" + "ⵧ൧" + "" + "�" + "���" + "�á" + "�����" + "��" + "��" + "��" + "���" + "��" + "���" + "����������" + "�" + "" + "ⶺ" + "��" + "�" + "ⷡ" + "ⷧ" + "ⷧ෧" + "ⷹ" + "�����" + "��" + "�ä��Ҥ�" + "�÷��ȹ�" + "�÷�ȹ�" + "�þ����" + "���Ҿ" + "���" + "���Ѿ��" + "���Ţ" + "��" + "�ɷѳ��" + "��ҹ���" + "�������" + "���" + "��Ҥ��" + "���" + "��" + "��" + "�" + "" + "���" + "���" + "��" + "��" + "�鵺��" + "����" + "��" + "���" + "�" + "⺡" + "⺡�ó�" + "⺡��" + "⺵" + "⺵��" + "⺹��" + "��" + "���չ" + "��" + "��ҳ" + "�������" + "������" + "�ʶ�" + "����" + "��" + "�" + "⻡" + "⻧" + "⻧�ҧ" + "" + "��" + "�ç" + "�ô" + "�õ" + "�õչ" + "�õ���" + "���" + "��������" + "����ᵹ��" + "�����" + "����������" + "�����ѹ" + "�����" + "���" + "���" + "�����" + "���" + "�ʡ���" + "������" + "��" + "��Ź��" + "���" + "��" + "�觢���" + "��" + "��" + "��" + "��" + "������" + "�����¹" + "���" + "�" + "⼧" + "⼹" + "��" + "�š�š" + "�Ź" + "���" + "���" + "��" + "�" + "⾡" + "⾧" + "⾧�ҧ" + "⾫Ե�" + "⾸ԭҳ" + "⾸Ժ���ѧ��" + "⾸������" + "⾸��ѵ��" + "⾸��" + "⾹" + "⾹�й�" + "��" + "�¡�ǹ" + "���" + "�á" + "�ç" + "��д�" + "��ⵤ��" + "�ŧ" + "�Ź" + "���" + "���" + "���" + "������" + "�ʾ" + "�������" + "��" + "��" + "⿹" + "�������" + "���" + "���Թ" + "����" + "�����" + "�����" + "����ҡ�" + "����ҡ��" + "��������" + "�����" + "��" + "���" + "�����" + "�������" + "����ѭ��" + "����" + "����¡���" + "������" + "���" + "��������" + "�����" + "�����" + "���Ժ�չ��" + "����" + "����" + "���ѹ��" + "���Ҥ��" + "����" + "�����" + "����" + "�������" + "���š��" + "���ʡ" + "�����" + "���" + "����" + "����" + "���" + "���" + "���" + "��" + "�¡" + "�¡���" + "�¤�" + "�¤�" + "�§" + "�ª��" + "�¸�" + "�¸Թ" + "�¹" + "�¹�" + "���" + "����" + "����" + "���" + "������" + "���" + "��" + "�ä" + "�ä�Ե���" + "�ä�" + "�äҾҸ" + "�ç" + "�ç���" + "�ç���¹" + "�ç���" + "�è" + "�è��" + "�õ�" + "�ø" + "�ø�" + "���" + "���ѹ" + "�������" + "���" + "���" + "���Ե" + "������" + "���" + "�š" + "�š�Է�" + "�šѹ���" + "�š�" + "�šҸԺ��" + "�šҸ���" + "�š����" + "�š��Թ��" + "�š���" + "�š���ѵ�" + "�š���" + "�šصø���" + "�šص��" + "�ŧ" + "�Ũ��" + "�ų�" + "�Ŵ" + "�ŵ��" + "�Ź" + "���" + "���" + "����" + "����" + "���Ѫ" + "���Ե" + "���" + "����" + "���" + "���" + "���" + "���" + "��" + "���" + "������" + "�����" + "���" + "���" + "����" + "������" + "�ȡ" + "�ȡ�" + "�ȡҴ��" + "�ȡ����" + "�ȡ�" + "��" + "�ʡѹ��" + "�ʳ" + "�ʳ��" + "�ʴ" + "�ʴ�" + "�ʴҺѹ" + "�ʵ" + "�ʷ�" + "�ʷ�" + "�ʸ�" + "�ʸ��" + "�ʹ" + "����" + "����" + "���Գ�" + "����" + "���" + "������" + "����" + "�����" + "��è" + "����" + "����ó" + "������" + "����" + "������" + "���á" + "�˧" + "�˴" + "�˹" + "�˹�" + "�˹�" + "���" + "����" + "����" + "���" + "��¡��¡" + "��§" + "����" + "���" + "��ç��ç" + "���о�" + "����" + "���Ҩ����" + "������ʵ��" + "���" + "��ŧ��" + "��Ź" + "����" + "���" + "��ǡ��ǡ" + "��ǧ" + "��Ǵ" + "��ǵ" + "����" + "���" + "��" + "�͡" + "�͡��" + "�͡Թ���" + "�ͧ���" + "�ͧ⢴�" + "�ͪ�" + "�ͪ�" + "�ʹ" + "�͵�ѻ��" + "�" + "�ͺ" + "����" + "�����" + "���" + "���" + "����" + "���о��" + "������ԡ" + "���ҷ" + "��ɰ���" + "��ɰ�" + "��ʶ" + "���ѧ" + "�����" + "�����" + "�����ԡ" + "�����֡" + "��" + "������§" + "�������" + "���ͫ��" + "�����" + "��⫹" + "���" + "���" + "������" + "���" + "���" + "������" + "������" + "�����" + "���" + "����" + "���" + "��" + "�Ρ" + "���" + "�����" + "��ʵ�" + "�����" + "�����" + "���" + "��" + "���" + "�" + "��" + "��" + "�" + "��" + "�" + "���ǧ" + "�" + "��" + "��" + "��" + "��" + "���" + "�˭�" + "����" + "���" + "�" + "��" + "�����" + "����" + "����" + "��" + "���" + "��" + "��" + "���" + "��" + "�" + "���" + "���" + "����" + "��" + "��ѹ" + "���ء" + "��" + "�" + "���" + "��" + "����繵�" + "�����" + "���" + "��" + "�" + "�" + "䩹" + "���" + "�" + "��" + "���" + "�" + "䫵�" + "䫹�" + "䫺�����" + "䫻���" + "���乴�" + "���" + "����" + "�����" + "��ù" + "��Ź" + "���" + "��" + "�" + "䴹���" + "䴹�����" + "�������" + "���" + "�����͡" + "�����͡��͡��" + "������" + "��á����" + "�������" + "��" + "�" + "��" + "�����" + "����ͧ" + "��" + "��" + "���" + "����" + "����ѹ" + "��" + "�" + "��" + "��" + "��" + "�" + "䷡�" + "䷿�´�" + "��" + "���Ѱ" + "��" + "���´�" + "������" + "��" + "�" + "乵��Ѻ" + "��" + "���" + "���ਹ" + "亵�" + "����" + "����" + "�" + "����" + "��ɳ�º�ó" + "��ɳ�ºѵ�" + "��ɳ���ѳ��" + "��ɳ���ѵ��" + "��ɳ��ҡ�" + "��ɳ���" + "���" + "��" + "��" + "�" + "伷" + "��" + "�" + "�" + "侨Ե�" + "侱����" + "侺����" + "��" + "�èԵ�" + "�ñ����" + "��Ѫ" + "��Թ" + "���" + "���" + "��Թ" + "���" + "����" + "�����" + "��è��" + "��" + "���͡" + "�" + "���" + "�ṹ��" + "����" + "�����" + "����Һ" + "����" + "����" + "���ëͿ��" + "�����ǿ" + "����⿹" + "���" + "���" + "��" + "���" + "��" + "���" + "���" + "���" + "��ૹ��" + "���" + "��������" + "���" + "��" + "�ǡٳ��" + "�DZ����" + "�Ƿ��" + "�ǹ�" + "�Ǿ���" + "���ҡó�" + "�����Ѩ��" + "�����Ѩ���" + "�����" + "�����Թ" + "���" + "���" + "��" + "���" + "����" + "����" + "���" + "���" + "��" + "�˹" + "���" + "����" + "����" + "���" + "����" + "���" + "����" + "�����" + "���" + "���" + "��" + "�ͤ" + "�ͷ�" + "�ͺ�����" + "�����" + "������" + "�����ѳ" + "�����Ź��" + "��ȡ���" + "��������" + "�������" + "���" + "���ⷻ" + "���ʹչ" + "���" + "�δ��" + "����������" + "���ä���" + "����" + ))) + (setq thai-word-table (list 'thai-words)) + (while l + (set-nested-alist (car l) 1 thai-word-table) + (setq l (cdr l)))) + + +(defun thai-update-word-table (file &optional append) + "Update Thai word table by replacing the current word list with +FILE. If called with a prefix argument, FILE is appended instead to +the current word list." + (interactive "FThai word table file: \nP") + (let ((buf (generate-new-buffer "*thai-work*")) + (coding-system-for-read 'thai-tis620) + (table (if append thai-word-table (list 'thai-words)))) + (unwind-protect + (save-excursion + (set-buffer buf) + (insert-file-contents file) + (goto-char (point-min)) + (while (re-search-forward "\\ct+" nil t) + (set-nested-alist (match-string 0) 1 table))) + (kill-buffer buf)) + (setq thai-word-table table))) + + +;; Two special Thai characters regarded as suffix of words. + +(defconst thai-MaiYaMok (make-char 'thai-tis620 ?\xE6)) +(defconst thai-PaiYanNoi (make-char 'thai-tis620 ?\xCF)) + + +;; Find Thai words starting at POS and return a list of positions of +;; the Thai word ends. It doesn't move point. LIMIT limits the +;; maximum position. IGNORE is a list of positions to ignore. It is +;; assumed that all following characters to LIMIT are Thai. If the +;; following char is not Thai (i.e., POS is equal to LIMIT), return t. +;; +;; Note that the longest word position comes first. + +(defun thai-find-word-ends (pos limit &optional ignore) + (if (>= pos limit) + t + (let* ((char (char-after pos)) + (this (cdr (assq char (cdr thai-word-table)))) + category-set + positions) + ;; Look up the following character sequence in `thai-word-table' + ;; character by character. + (while this + (setq pos (1+ pos) + char (char-after pos) + category-set (char-category-set char)) + ;; If the current sequence is recorded in `thai-word-table' + ;; (i.e. (car THIS) is 1) and the following Thai character is + ;; not an upper-vowel, lower-vowel, or tone-mark, we have + ;; found a possible word ending position. + (if (and (eq (car this) 1) + (not (or (aref category-set ?2) + (aref category-set ?3) + (aref category-set ?4)))) + (progn + ;; Skip possible Thai suffices. + (while (or (eq char thai-MaiYaMok) (eq char thai-PaiYanNoi)) + (setq pos (1+ pos) + char (char-after pos))) + ;; Skip character positions in IGNORE list. + (or (memq pos ignore) + (setq positions (cons pos positions))))) + ;; Set up next loop. + (setq this (and (< pos limit) (cdr (assq char this))))) + positions))) + + +;; Move point forward to the end of Thai word which follows point and +;; update VEC. VEC is a vector of three elements used to cache word +;; end positions. The Nth element, if non-nil, is a list of end +;; points of the Nth word, or t indicating that there is no Thai +;; character. LIMIT limits the point movement. + +(defun thai-forward-word-update-info (vec limit) + (let ((pos (point)) + v0 v1 v2 v3 + second-best + tried + positions) + (if + ;; If four succeeding Thai words are found, throw t, otherwise + ;; throw nil. + (catch 'tag + ;; Start with first vector element. + (setq v0 (aref vec 0)) + (unless v0 + ;; Update VEC if V0 is empty. + (setq v0 (thai-find-word-ends pos limit)) + (aset vec 0 v0) + (aset vec 1 nil)) + ;; In case we haven't found any wordbreaks resp. point has + ;; reached LIMIT, exit the catch body. + (if (symbolp v0) ; i.e. nil or t? + (throw 'tag nil)) + ;; OK, V0 holds possible word ends for the current position. + ;; We save V0 for later reference. + (setq tried v0) + (setq v1 (aref vec 1)) + ;; Now we try all end word positions to find the next word. + (while v0 + (setq pos (car v0)) + (unless v1 + ;; Update VEC if V1 is empty, ignoring positions already + ;; found -- for Thai, we need the longest match, so if + ;; we have + ;; + ;; start(long-word) = start(short-word1) + ;; end(short-word1) = start(short-word2) + ;; end(short-word2) = end(long-word) + ;; + ;; only long-word is used. + (setq v1 (thai-find-word-ends pos limit tried)) + (aset vec 1 v1) + (aset vec 2 nil)) + ;; If point has reached LIMIT, exit the catch body. + (if (eq v1 t) + (throw 'tag t)) + ;; Save SECOND-BEST, if this hasn't been done already. + ;; The `second best' solution is the end position of the + ;; longest first word followed by the longest second word. + (or second-best + (not v1) + (setq second-best (cons v0 v1))) + ;; Update the already tried end word positions. + (setq tried (append tried v1)) + ;; Now repeat the whole process to find a third word. + (when v1 + (setq v2 (aref vec 2)) + (while v1 + (setq pos (car v1)) + (unless v2 + (setq v2 (thai-find-word-ends pos limit tried)) + (aset vec 2 v2)) + (if (eq v2 t) + (throw 'tag t)) + (setq tried (append tried v2)) + ;; And the same for a fourth word. + (while v2 + (setq pos (car v2)) + (setq v3 (thai-find-word-ends pos limit tried)) + (if v3 + (throw 'tag t)) + (setq v2 (cdr v2))) + (setq v1 (cdr v1)))) + (setq v0 (cdr v0))) + ;; No success. + nil) + (progn + ;; We found four succeeding Thai words (or LIMIT has been + ;; reached). Move to the end of the first word. + (goto-char (car v0)) + ;; Update VEC for the next function call. If no larger word + ;; positions have been found, set the corresponding vector + ;; element to nil. + (if (and (consp v1) (< (car v1) (car (aref vec 1)))) + (aset vec 0 nil) + (aset vec 0 v1) + (if (and (consp v2) (< (car v2) (car (aref vec 2)))) + (aset vec 1 nil) + (aset vec 1 v2) + (aset vec 2 v3)))) ; exit function successfully + + ;; We didn't find four consecutive words. If we have found a + ;; `second best' solution and the length of those two words is + ;; longer than the longest word we can see at the current point, + ;; adopt the second best solution. This decision is based on + ;; heuristic tests. + (if (and second-best + (< (car (aref vec 0)) (car (cdr second-best)))) + (progn + (goto-char (car (car second-best))) + (aset vec 0 (cdr second-best))) + ;; We finally failed to find a word break. For Thai, the best + ;; solution is to extend the first longest word so that the + ;; end point starts a second word. + (setq pos (or (car (aref vec 0)) pos)) + (while (and (< pos limit) + (not (setq positions (thai-find-word-ends pos limit)))) + (setq pos (1+ pos))) + (goto-char pos) + (aset vec 0 positions)) + (aset vec 1 nil) + nil))) + + +;; Return a list of Thai word boundary positions after the current +;; point. LIMIT, if non-nil, limits the region to check. + +(defun thai-find-word-boundaries (&optional limit) + (or limit + (setq limit (point-max))) + (save-excursion + (let ((vec (make-vector 3 nil)) + (boundaries nil) + this-limit) + ;; Loop over all (consecutive) Thai regions by using the + ;; character property `t' until LIMIT is reached. + (while (and (< (point) limit) + (re-search-forward "\\ct+" nil t)) + (setq this-limit (point)) + (goto-char (match-beginning 0)) + (fillarray vec nil) + ;; Check the first word, initializing VEC. + (thai-forward-word-update-info vec this-limit) + ;; Then loop over the remaining words in the current Thai + ;; region, collecting the boundaries. + (while (< (point) this-limit) + (setq boundaries (cons (point) boundaries)) + (thai-forward-word-update-info vec this-limit))) + boundaries))) + + +(defun thai-break-words (separator &optional limit) + "Break Thai words by inserting a separator string at word boundaries." + (interactive "sSeparator: ") + (save-excursion + (let ((boundaries (thai-find-word-boundaries limit))) + (while boundaries + (goto-char (car boundaries)) + (insert separator) + (setq boundaries (cdr boundaries)))))) + + +(defun thai-forward-word (count) + "Move point forward COUNT words considering Thai word boundaries. +If COUNT is negative, move point backward (- COUNT) words." + (interactive "p") + (if (> count 0) + (while (> count 0) + (skip-syntax-forward "^w") + (if (looking-at "\\ct+") + ;; We have reached a Thai region, so we must do something + ;; special instead of using forward-word. + (let ((start (point)) + (limit (match-end 0)) + boundaries + tail) + ;; If thai-forward-word has been called within a Thai + ;; region, we must go back until the Thai region starts + ;; to do the contextual analysis for finding word + ;; breaks. + (while (aref (char-category-set (preceding-char)) ?t) + (forward-char -1)) + ;; OK, we ask for the list of word boundaries in + ;; reversed order. + (setq boundaries (nreverse (thai-find-word-boundaries limit))) + ;; Now we search for the next boundary after START. + (while (and boundaries (<= (car boundaries) start)) + (setq boundaries (cdr boundaries))) + ;; Adjust loop for next while loop. + (setq count (1- count)) + ;; Now we skip Thai words until the BOUNDARIES list is + ;; empty or count-1 words have been passed. + (if (not boundaries) + (goto-char limit) + (while (and (> count 0) + boundaries) + (setq boundaries (cdr boundaries) + count (1- count))) + ;; If BOUNDARIES is empty, the word counter is not + ;; zero yet (remember that we have decreased COUNT by + ;; one), so we go to LIMIT. Otherwise go to next + ;; boundary. + (if boundaries + (goto-char (car boundaries)) + (goto-char limit)))) + ;; No Thai region. + (forward-word 1) + (setq count (1- count)))) + ;; The symmetrical action for negative values. + (if (< count 0) + (while (< count 0) + (skip-syntax-backward "^w") + (if (aref (char-category-set (preceding-char)) ?t) + (let ((start (point)) + (limit (if (looking-at "\\ct+") (match-end 0) + (point))) + boundaries) + (forward-char -1) + (while (aref (char-category-set (preceding-char)) ?t) + (forward-char -1)) + (setq boundaries (thai-find-word-boundaries limit)) + (while (and boundaries (>= (car boundaries) start)) + (setq boundaries (cdr boundaries))) + (setq count (1+ count)) + (if boundaries + (progn + (while (and (< count 0) boundaries) + (setq boundaries (cdr boundaries) + count (1+ count))) + (if boundaries + (goto-char (car boundaries)))))) + (forward-word -1) + (setq count (1+ count))))))) + + +(defun thai-backward-word (count) + "Move point backward COUNT words considering Thai word boundaries. +If COUNT is negative, move point forward (- COUNT) words." + (interactive "p") + (thai-forward-word (- count))) + + +(provide 'thai-word) + + +;; Local Variables: +;; coding: tis-620 +;; End: + +;; end of thai-word.el + +;; arch-tag: 29927f02-e177-4224-a270-7e67210b038a diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 5223193a2e..a8c30182a4 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -64,7 +64,7 @@ should return a grid vector array that is the new solution. ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (16561 46414)) +;;;;;; (16858 50933)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload (quote ada-add-extensions) "ada-mode" "\ @@ -151,7 +151,7 @@ Completion is available. ;;;;;; 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" (16816 23720)) +;;;;;; "add-log.el" (16958 58756)) ;;; Generated autoloads from add-log.el (defvar add-log-current-defun-function nil "\ @@ -388,7 +388,7 @@ See Info node `(elisp)Advising Functions' for comprehensive documentation. ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (16780 55376)) +;;;;;; align) "align" "align.el" (16942 52925)) ;;; Generated autoloads from align.el (autoload (quote align) "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads (allout-init) "allout" "allout.el" (16775 26705)) +;;;### (autoloads (allout-init) "allout" "allout.el" (16908 33360)) ;;; Generated autoloads from allout.el (autoload (quote allout-init) "allout" "\ @@ -513,7 +513,7 @@ the following two lines in your Emacs init file: ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (16746 18215)) +;;;;;; "net/ange-ftp.el" (16908 33362)) ;;; Generated autoloads from net/ange-ftp.el (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir)) @@ -535,7 +535,7 @@ Not documented ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (16442 4954)) +;;;;;; "animate" "play/animate.el" (16944 24675)) ;;; Generated autoloads from play/animate.el (autoload (quote animate-string) "animate" "\ @@ -563,7 +563,7 @@ You can specify the one's name by NAME; the default value is \"Sarah\". ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (16213 43266)) +;;;;;; "ansi-color" "ansi-color.el" (16858 50906)) ;;; Generated autoloads from ansi-color.el (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\ @@ -589,7 +589,7 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules) -;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (16377 12872)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (16858 50933)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\ @@ -628,7 +628,7 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;### (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" (16547 17258)) +;;;;;; appt-issue-message) "appt" "calendar/appt.el" (16925 43112)) ;;; Generated autoloads from calendar/appt.el (defvar appt-issue-message t "\ @@ -690,13 +690,16 @@ Delete an appointment from the list of appointments. \(fn)" t nil) (autoload (quote appt-make-list) "appt" "\ -Create the appointments list from today's diary buffer. +Update the appointments list from today's diary buffer. The time must be at the beginning of a line for it to be put in the appointments list (see examples in documentation of the function `appt-check'). We assume that the variables DATE and NUMBER hold the arguments that `list-diary-entries' received. They specify the range of dates that the diary is being processed for. +Any appointments made with `appt-add' are not affected by this +function. + \(fn)" nil nil) (autoload (quote appt-activate) "appt" "\ @@ -710,7 +713,7 @@ ARG is positive, otherwise off. ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property ;;;;;; apropos-command apropos-variable) "apropos" "apropos.el" -;;;;;; (16768 48631)) +;;;;;; (16942 52925)) ;;; Generated autoloads from apropos.el (autoload (quote apropos-variable) "apropos" "\ @@ -856,8 +859,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (16572 -;;;;;; 19411)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (16858 +;;;;;; 50939)) ;;; Generated autoloads from textmodes/artist.el (autoload (quote artist-mode) "artist" "\ @@ -1062,8 +1065,8 @@ Keymap summary ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (16764 -;;;;;; 51521)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (16908 +;;;;;; 33362)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload (quote asm-mode) "asm-mode" "\ @@ -1211,7 +1214,7 @@ insert a template for the file depending on the mode of the buffer. ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (16775 26709)) +;;;;;; (16866 20010)) ;;; Generated autoloads from emacs-lisp/autoload.el (autoload (quote update-file-autoloads) "autoload" "\ @@ -1246,7 +1249,7 @@ Calls `update-directory-autoloads' on the command line arguments. ;;;### (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" (16775 26705)) +;;;;;; "autorevert" "autorevert.el" (16923 3604)) ;;; Generated autoloads from autorevert.el (autoload (quote auto-revert-mode) "autorevert" "\ @@ -1379,9 +1382,10 @@ Vectors work just like lists. Nested backquotes are permitted. ;;;*** -;;;### (autoloads (display-battery battery) "battery" "battery.el" -;;;;;; (16718 40975)) +;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" +;;;;;; (16861 9525)) ;;; Generated autoloads from battery.el + (put 'battery-mode-line-string 'risky-local-variable t) (autoload (quote battery) "battery" "\ Display battery status information in the echo area. @@ -1390,14 +1394,22 @@ The text being displayed in the echo area is controlled by the variables \(fn)" t nil) -(autoload (quote display-battery) "battery" "\ +(defvar display-battery-mode nil "\ +Non-nil if Display-Battery mode is enabled. +See the command `display-battery-mode' for a description of this minor-mode. +Setting this variable directly does not take effect; +use either \\[customize] or the function `display-battery-mode'.") + +(custom-autoload (quote display-battery-mode) "battery") + +(autoload (quote display-battery-mode) "battery" "\ Display battery status information in the mode line. The text being displayed in the mode line is controlled by the variables `battery-mode-line-format' and `battery-status-function'. The mode line will be updated automatically every `battery-update-interval' seconds. -\(fn)" t nil) +\(fn &optional ARG)" t nil) ;;;*** @@ -1434,8 +1446,8 @@ non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (16820 -;;;;;; 16328)) +;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (16887 +;;;;;; 27628)) ;;; Generated autoloads from textmodes/bibtex.el (autoload (quote bibtex-mode) "bibtex" "\ @@ -1497,7 +1509,7 @@ if that value is non-nil. ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "gnus/binhex.el" -;;;;;; (16719 60883)) +;;;;;; (16908 33361)) ;;; Generated autoloads from gnus/binhex.el (defconst binhex-begin-line "^:...............................................................$") @@ -1643,7 +1655,7 @@ a reflection. ;;;### (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" (16588 19249)) +;;;;;; bookmark-set) "bookmark" "bookmark.el" (16858 50906)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-map "rb" 'bookmark-jump) (define-key ctl-x-map "rm" 'bookmark-set) @@ -1831,8 +1843,9 @@ deletion, or > if it is flagged for displaying. ;;;;;; browse-url-galeon browse-url-mozilla browse-url-netscape ;;;;;; browse-url-default-browser browse-url-at-mouse browse-url-at-point ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file -;;;;;; browse-url-of-buffer browse-url-of-file browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (16783 21522)) +;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point +;;;;;; browse-url-browser-function) "browse-url" "net/browse-url.el" +;;;;;; (16944 24675)) ;;; 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))) "\ @@ -1848,6 +1861,11 @@ regexp should probably be \".\" to specify a default browser.") (custom-autoload (quote browse-url-browser-function) "browse-url") +(autoload (quote browse-url-url-at-point) "browse-url" "\ +Not documented + +\(fn)" nil nil) + (autoload (quote browse-url-of-file) "browse-url" "\ Ask a WWW browser to display FILE. Display the current buffer's file if FILE is nil or if called @@ -1910,8 +1928,9 @@ the effect of `browse-url-new-window-flag'. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'. -The order attempted is gnome-moz-remote, Mozilla, Galeon, Netscape, -Mosaic, IXI Mosaic, Lynx in an xterm, MMM, Konqueror, and then W3. +The order attempted is gnome-moz-remote, Mozilla, Galeon, +Konqueror, Netscape, Mosaic, IXI Mosaic, Lynx in an xterm, MMM, +and then W3. \(fn URL &rest ARGS)" nil nil) @@ -1925,6 +1944,10 @@ non-nil, load the document in a new Netscape window, otherwise use a random existing one. A non-nil interactive prefix argument reverses the effect of `browse-url-new-window-flag'. +If `browse-url-netscape-new-window-is-tab' is non-nil, then +whenever a document would otherwise be loaded in a new window, it +is loaded in a new tab in an existing window instead. + When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'. @@ -2173,8 +2196,8 @@ name of buffer configuration. ;;;*** ;;;### (autoloads (insert-text-button make-text-button insert-button -;;;;;; make-button define-button-type) "button" "button.el" (16750 -;;;;;; 18527)) +;;;;;; make-button define-button-type) "button" "button.el" (16934 +;;;;;; 57456)) ;;; 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) "\ @@ -2262,7 +2285,7 @@ Also see `make-text-button'. ;;;;;; 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" -;;;;;; (16801 58026)) +;;;;;; (16942 52931)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (autoload (quote byte-force-recompile) "bytecomp" "\ @@ -2378,12 +2401,12 @@ from the cursor position. ;;;### (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" "calc/calc.el" (16816 -;;;;;; 23730)) +;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (16949 +;;;;;; 24050)) ;;; Generated autoloads from calc/calc.el -(defvar calc-settings-file user-init-file "\ -*File in which to record permanent settings; default is `user-init-file'.") +(defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\ +*File in which to record permanent settings.") (global-set-key "\e#" 'calc-dispatch) (autoload (quote calc-dispatch) "calc" "\ @@ -2455,8 +2478,8 @@ Not documented ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (16213 -;;;;;; 43267)) +;;;### (autoloads (calculator) "calculator" "calculator.el" (16858 +;;;;;; 50907)) ;;; Generated autoloads from calculator.el (autoload (quote calculator) "calculator" "\ @@ -2467,12 +2490,12 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads (calendar calendar-setup solar-holidays bahai-holidays -;;;;;; islamic-holidays christian-holidays hebrew-holidays other-holidays -;;;;;; local-holidays oriental-holidays general-holidays holidays-in-diary-buffer -;;;;;; diary-list-include-blanks nongregorian-diary-marking-hook -;;;;;; mark-diary-entries-hook nongregorian-diary-listing-hook diary-display-hook -;;;;;; diary-hook list-diary-entries-hook print-diary-entries-hook +;;;### (autoloads (calendar-week-start-day calendar calendar-setup +;;;;;; solar-holidays bahai-holidays islamic-holidays christian-holidays +;;;;;; hebrew-holidays other-holidays local-holidays oriental-holidays +;;;;;; general-holidays holidays-in-diary-buffer diary-list-include-blanks +;;;;;; nongregorian-diary-marking-hook mark-diary-entries-hook nongregorian-diary-listing-hook +;;;;;; diary-display-hook diary-hook list-diary-entries-hook print-diary-entries-hook ;;;;;; american-calendar-display-form european-calendar-display-form ;;;;;; european-date-diary-pattern american-date-diary-pattern european-calendar-style ;;;;;; abbreviated-calendar-year sexp-diary-entry-symbol diary-include-string @@ -2483,17 +2506,10 @@ See the documentation for `calculator-mode' for more information. ;;;;;; all-christian-calendar-holidays all-hebrew-calendar-holidays ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar -;;;;;; number-of-diary-entries view-diary-entries-initially calendar-offset -;;;;;; calendar-week-start-day) "calendar" "calendar/calendar.el" -;;;;;; (16738 29931)) +;;;;;; number-of-diary-entries view-diary-entries-initially calendar-offset) +;;;;;; "calendar" "calendar/calendar.el" (16953 20625)) ;;; Generated autoloads from calendar/calendar.el -(defvar calendar-week-start-day 0 "\ -*The day of the week on which a week in the calendar begins. -0 means Sunday (default), 1 means Monday, and so on.") - -(custom-autoload (quote calendar-week-start-day) "calendar") - (defvar calendar-offset 0 "\ *The offset of the principal month from the center of the calendar window. 0 means the principal month is in the center (default), -1 means on the left, @@ -3068,10 +3084,21 @@ See the documentation of that function for more information. \(fn &optional ARG)" t nil) +(defvar calendar-week-start-day 0 "\ +*The day of the week on which a week in the calendar begins. +0 means Sunday (default), 1 means Monday, and so on. + +If you change this variable directly (without using customize) +after starting `calendar', you should call `redraw-calendar' to +update the calendar display to reflect the change, otherwise +movement commands will not work correctly.") + +(custom-autoload (quote calendar-week-start-day) "calendar") + ;;;*** ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock" -;;;;;; "gnus/canlock.el" (16697 49031)) +;;;;;; "gnus/canlock.el" (16822 52985)) ;;; Generated autoloads from gnus/canlock.el (autoload (quote canlock-insert-header) "canlock" "\ @@ -3090,7 +3117,7 @@ it fails. ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (16816 23740)) +;;;;;; (16858 50934)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -3305,7 +3332,7 @@ and exists only for compatibility reasons. ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program ;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el" -;;;;;; (16585 28856)) +;;;;;; (16942 52931)) ;;; Generated autoloads from international/ccl.el (autoload (quote ccl-compile) "ccl" "\ @@ -3341,7 +3368,9 @@ CCL-PROGRAM has this form: BUFFER_MAGNIFICATION is an integer value specifying the approximate output buffer magnification size compared with the bytes of input data -text. If the value is zero, the CCL program can't execute `read' and +text. It is assured that the actual output buffer has 256 bytes +more than the size calculated by BUFFER_MAGNIFICATION. +If the value is zero, the CCL program can't execute `read' and `write' commands. CCL_MAIN_CODE and CCL_EOF_CODE are CCL program codes. CCL_MAIN_CODE @@ -3562,7 +3591,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el" -;;;;;; (16534 3809)) +;;;;;; (16908 33362)) ;;; Generated autoloads from progmodes/cfengine.el (autoload (quote cfengine-mode) "cfengine" "\ @@ -3584,7 +3613,7 @@ to the action header. ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc) "checkdoc" "emacs-lisp/checkdoc.el" -;;;;;; (16709 44237)) +;;;;;; (16829 43426)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (autoload (quote checkdoc) "checkdoc" "\ @@ -3899,7 +3928,7 @@ of `scheme-program-name'). Runs the hooks `inferior-scheme-mode-hook' ;;;*** ;;;### (autoloads (cp-make-coding-system) "code-pages" "international/code-pages.el" -;;;;;; (16589 26258)) +;;;;;; (16939 44105)) ;;; Generated autoloads from international/code-pages.el (autoload (quote cp-make-coding-system) "code-pages" "\ @@ -3911,6 +3940,17 @@ corresponding args of `make-coding-system'. If MNEMONIC isn't given, Return an updated `non-iso-charset-alist'. \(fn NAME V &optional DOC-STRING MNEMONIC)" nil (quote macro)) +(autoload-coding-system 'windows-1250 '(require 'code-pages)) +(autoload-coding-system 'windows-1253 '(require 'code-pages)) +(autoload-coding-system 'windows-1254 '(require 'code-pages)) +(autoload-coding-system 'windows-1255 '(require 'code-pages)) +(autoload-coding-system 'windows-1256 '(require 'code-pages)) +(autoload-coding-system 'windows-1257 '(require 'code-pages)) +(autoload-coding-system 'windows-1258 '(require 'code-pages)) +(autoload-coding-system 'iso-8859-16 '(require 'code-pages)) +(autoload-coding-system 'iso-8859-10 '(require 'code-pages)) +(autoload-coding-system 'iso-8859-13 '(require 'code-pages)) +(autoload-coding-system 'georgian-ps '(require 'code-pages)) (autoload-coding-system 'pt154 '(require 'code-pages)) (autoload-coding-system 'iso-8859-11 '(require 'code-pages)) @@ -3977,7 +4017,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal. ;;;### (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" -;;;;;; (16810 63790)) +;;;;;; (16908 33360)) ;;; Generated autoloads from comint.el (autoload (quote make-comint-in-buffer) "comint" "\ @@ -4084,7 +4124,7 @@ on third call it again advances points to the next difference and so on. ;;;### (autoloads (compilation-next-error-function compilation-minor-mode ;;;;;; compilation-shell-minor-mode compilation-mode compile compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook) -;;;;;; "compile" "progmodes/compile.el" (16805 44924)) +;;;;;; "compile" "progmodes/compile.el" (16939 44105)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4470,7 +4510,7 @@ Optional 3rd arg WITH-COMPOSITION-RULE is ignored. ;;;### (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" (16813 38253)) +;;;;;; conf-mode) "conf-mode" "textmodes/conf-mode.el" (16908 33363)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload (quote conf-mode) "conf-mode" "\ @@ -4651,8 +4691,8 @@ Randomly permute the elements of VECTOR (all permutations equally likely). ;;;*** -;;;### (autoloads (copyright copyright-update) "copyright" "emacs-lisp/copyright.el" -;;;;;; (16675 7397)) +;;;### (autoloads (copyright copyright-fix-years copyright-update) +;;;;;; "copyright" "emacs-lisp/copyright.el" (16932 19775)) ;;; Generated autoloads from emacs-lisp/copyright.el (autoload (quote copyright-update) "copyright" "\ @@ -4666,6 +4706,12 @@ interactively. \(fn &optional ARG INTERACTIVEP)" t nil) +(autoload (quote copyright-fix-years) "copyright" "\ +Convert 2 digit years to 4 digit years. +Uses heuristic: year >= 50 means 19xx, < 50 means 20xx. + +\(fn)" t nil) + (autoload (quote copyright) "copyright" "\ Insert a copyright by $ORGANIZATION notice at cursor. @@ -4674,7 +4720,7 @@ Insert a copyright by $ORGANIZATION notice at cursor. ;;;*** ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el" -;;;;;; (16805 44924)) +;;;;;; (16858 50935)) ;;; Generated autoloads from progmodes/cperl-mode.el (autoload (quote cperl-mode) "cperl-mode" "\ @@ -4925,8 +4971,8 @@ INHERIT-INPUT-METHOD. ;;;*** -;;;### (autoloads (cua-mode) "cua-base" "emulation/cua-base.el" (16775 -;;;;;; 26710)) +;;;### (autoloads (cua-mode) "cua-base" "emulation/cua-base.el" (16942 +;;;;;; 52931)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -4964,7 +5010,7 @@ paste (in addition to the normal emacs bindings). ;;;;;; 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" (16820 16328)) +;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (16930 25645)) ;;; Generated autoloads from cus-edit.el (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'") @@ -5158,16 +5204,35 @@ Create a tree browser for the customize hierarchy. (defvar custom-file nil "\ File used for storing customization information. The default is nil, which means to use your init file -as specified by `user-init-file'. To make this feature work, -you'll need to put something in your init file to specify -the value of `custom-file'. Just customizing the variable -won't suffice, because Emacs won't know which file to load -unless the init file sets `custom-file'. - -When you change this variable, look in the previous custom file -\(usually your init file) for the forms `(custom-set-variables ...)' -and `(custom-set-faces ...)', and copy them (whichever ones you find) -to the new custom file. This will preserve your existing customizations.") +as specified by `user-init-file'. If the value is not nil, +it should be an absolute file name. + +You can set this option through Custom, if you carefully read the +last paragraph below. However, usually it is simpler to write +something like the following in your init file: + +\(setq custom-file \"~/.emacs-custom.el\") +\(load custom-file) + +Note that both lines are necessary: the first line tells Custom to +save all customizations in this file, but does not load it. + +When you change this variable outside Custom, look in the +previous custom file (usually your init file) for the +forms `(custom-set-variables ...)' and `(custom-set-faces ...)', +and copy them (whichever ones you find) to the new custom file. +This will preserve your existing customizations. + +If you save this option using Custom, Custom will write all +currently saved customizations, including the new one for this +option itself, into the file you specify, overwriting any +`custom-set-variables' and `custom-set-faces' forms already +present in that file. It will not delete any customizations from +the old custom file. You should do that manually if that is what you +want. You also have to put something like `(load \"CUSTOM-FILE\") +in your init file, where CUSTOM-FILE is the actual name of the +file. Otherwise, Emacs will not load the file when it starts up, +and hence will not set `custom-file' to that file either.") (custom-autoload (quote custom-file) "cus-edit") @@ -5199,7 +5264,7 @@ The format is suitable for use with `easy-menu-define'. ;;;### (autoloads (custom-reset-faces custom-theme-reset-faces custom-theme-face-value ;;;;;; custom-set-faces custom-declare-face) "cus-face" "cus-face.el" -;;;;;; (16589 26258)) +;;;;;; (16861 9526)) ;;; Generated autoloads from cus-face.el (autoload (quote custom-declare-face) "cus-face" "\ @@ -5350,7 +5415,7 @@ If the argument is nil, we return the display table to its standard state. ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (16795 7139)) +;;;;;; (16908 33360)) ;;; Generated autoloads from dabbrev.el (define-key esc-map "/" 'dabbrev-expand) (define-key esc-map [?\C-/] 'dabbrev-completion) @@ -5397,8 +5462,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (16213 -;;;;;; 43281)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (16958 +;;;;;; 58759)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload (quote dcl-mode) "dcl-mode" "\ @@ -5525,7 +5590,7 @@ There is some minimal font-lock support (see vars ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (16213 43273)) +;;;;;; "emacs-lisp/debug.el" (16953 20625)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger (quote debug)) @@ -5560,7 +5625,7 @@ If argument is nil or an empty string, cancel for all functions. ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (16213 43281)) +;;;;;; (16876 58220)) ;;; Generated autoloads from play/decipher.el (autoload (quote decipher) "decipher" "\ @@ -5694,7 +5759,7 @@ any selection. ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (16213 43273)) +;;;;;; "derived" "emacs-lisp/derived.el" (16908 33361)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload (quote define-derived-mode) "derived" "\ @@ -5756,7 +5821,7 @@ the first time the mode is used. ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (16801 58019)) +;;;;;; "descr-text.el" (16908 33360)) ;;; Generated autoloads from descr-text.el (autoload (quote describe-text-properties) "descr-text" "\ @@ -5781,7 +5846,7 @@ as well as widgets, buttons, overlays, and text properties. ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-save-mode) "desktop" -;;;;;; "desktop.el" (16808 48569)) +;;;;;; "desktop.el" (16908 33360)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -5856,7 +5921,7 @@ Revert to the last loaded desktop. ;;;;;; 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" -;;;;;; (16775 26711)) +;;;;;; (16908 33361)) ;;; Generated autoloads from gnus/deuglify.el (defvar gnus-outlook-deuglify-unwrap-min 45 "\ @@ -5923,7 +5988,7 @@ Not documented ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (16785 59559)) +;;;;;; "calendar/diary-lib.el" (16953 20625)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@ -6032,7 +6097,7 @@ Minor mode for viewing/editing context diffs. ;;;;;; dired-other-window 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" (16804 23129)) +;;;;;; dired-listing-switches) "dired" "dired.el" (16915 11400)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches "-al" "\ @@ -6762,7 +6827,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** ;;;### (autoloads (double-mode double-mode) "double" "double.el" -;;;;;; (16213 43267)) +;;;;;; (16932 19773)) ;;; Generated autoloads from double.el (defvar double-mode nil "\ @@ -7286,8 +7351,8 @@ See `ebnf-style-database' documentation. ;;;;;; 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" (16234 -;;;;;; 50257)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (16875 +;;;;;; 35928)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload (quote ebrowse-tree-mode) "ebrowse" "\ @@ -7438,7 +7503,7 @@ Display statistics for a class tree. ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (16787 16350)) +;;;;;; (16868 63463)) ;;; Generated autoloads from ebuff-menu.el (autoload (quote electric-buffer-list) "ebuff-menu" "\ @@ -7538,7 +7603,7 @@ already is one.) ;;;;;; 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" (16580 11202)) +;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (16923 3605)) ;;; Generated autoloads from ediff.el (autoload (quote ediff-files) "ediff" "\ @@ -7797,7 +7862,7 @@ Not documented ;;;*** ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el" -;;;;;; (16626 19946)) +;;;;;; (16923 3605)) ;;; Generated autoloads from ediff-mult.el (autoload (quote ediff-show-registry) "ediff-mult" "\ @@ -7831,7 +7896,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (16733 11795)) +;;;;;; (16822 52984)) ;;; Generated autoloads from edmacro.el (defvar edmacro-eight-bits nil "\ @@ -7989,7 +8054,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el" -;;;;;; (16816 23731)) +;;;;;; (16870 21079)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload (quote elint-initialize) "elint" "\ @@ -8128,7 +8193,7 @@ Not documented ;;;*** ;;;### (autoloads (encoded-kbd-mode) "encoded-kb" "international/encoded-kb.el" -;;;;;; (16657 61756)) +;;;;;; (16884 52115)) ;;; Generated autoloads from international/encoded-kb.el (defvar encoded-kbd-mode nil "\ @@ -8199,8 +8264,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (16548 -;;;;;; 34615)) +;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (16858 +;;;;;; 50924)) ;;; Generated autoloads from eshell/esh-test.el (autoload (quote eshell-test) "esh-test" "\ @@ -8554,7 +8619,7 @@ for \\[find-tag] (which see). ;;;;;; 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" (16498 35858)) +;;;;;; "ethio-util" "language/ethio-util.el" (16953 20625)) ;;; Generated autoloads from language/ethio-util.el (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\ @@ -8749,7 +8814,7 @@ Transcribe Ethiopic characters in ASCII depending on the file extension. ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (16775 26715)) +;;;;;; (16884 52115)) ;;; Generated autoloads from net/eudc.el (autoload (quote eudc-set-server) "eudc" "\ @@ -8869,9 +8934,9 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p -;;;;;; executable-self-display executable-set-magic executable-find -;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (16435 60138)) +;;;;;; executable-self-display executable-set-magic executable-interpret +;;;;;; executable-find executable-command-find-posix-p) "executable" +;;;;;; "progmodes/executable.el" (16858 50935)) ;;; Generated autoloads from progmodes/executable.el (autoload (quote executable-command-find-posix-p) "executable" "\ @@ -8886,6 +8951,14 @@ Return nil if COMMAND is not found anywhere in `exec-path'. \(fn COMMAND)" nil nil) +(autoload (quote executable-interpret) "executable" "\ +Run script with user-specified args, and collect output in a buffer. +While script runs asynchronously, you can use the \\[next-error] +command to find the next error. The buffer is also in `comint-mode' and +`compilation-shell-minor-mode', so that you can answer any prompts. + +\(fn COMMAND)" t nil) + (autoload (quote executable-set-magic) "executable" "\ Set this buffer's interpreter to INTERPRETER with optional ARGUMENT. The variables `executable-magicless-file-regexp', `executable-prefix', @@ -8954,7 +9027,7 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (16805 44924)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (16858 50935)) ;;; Generated autoloads from progmodes/f90.el (autoload (quote f90-mode) "f90" "\ @@ -9023,9 +9096,9 @@ with no args, if that value is non-nil. ;;;;;; 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" (16698 21925)) +;;;;;; "facemenu" "facemenu.el" (16942 52929)) ;;; Generated autoloads from facemenu.el - (define-key global-map "\M-g" 'facemenu-keymap) + (define-key global-map "\M-o" 'facemenu-keymap) (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap) (defvar facemenu-face-menu (let ((map (make-sparse-keymap "Face"))) (define-key map "o" (cons "Other..." (quote facemenu-set-face))) map) "\ @@ -9174,10 +9247,11 @@ Read a color using the minibuffer. (autoload (quote list-colors-display) "facemenu" "\ Display names of defined colors, and show what they look like. If the optional argument LIST is non-nil, it should be a list of -colors to display. Otherwise, this command computes a list -of colors that the current display can handle. +colors to display. Otherwise, this command computes a list of +colors that the current display can handle. If the optional +argument BUFFER-NAME is nil, it defaults to *Colors*. -\(fn &optional LIST)" t nil) +\(fn &optional LIST BUFFER-NAME)" t nil) ;;;*** @@ -9277,7 +9351,7 @@ you can set feedmail-queue-reminder-alist to nil. ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (16585 28850)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (16858 50909)) ;;; Generated autoloads from ffap.el (autoload (quote ffap-next) "ffap" "\ @@ -9336,7 +9410,7 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** ;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el" -;;;;;; (16435 26305)) +;;;;;; (16830 50347)) ;;; Generated autoloads from filecache.el (autoload (quote file-cache-minibuffer-complete) "filecache" "\ @@ -9356,7 +9430,7 @@ the name is considered already unique; only the second substitution ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (16580 11202)) +;;;;;; (16908 33360)) ;;; 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"))) "\ @@ -9504,11 +9578,12 @@ Visit the file you click on in another window. ;;;*** ;;;### (autoloads (find-function-setup-keys find-variable-at-point -;;;;;; find-function-at-point find-function-on-key find-variable-other-frame -;;;;;; find-variable-other-window 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" (16795 7139)) +;;;;;; find-function-at-point find-function-on-key find-face-definition +;;;;;; find-definition-noselect find-variable-other-frame find-variable-other-window +;;;;;; 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" (16953 20625)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload (quote find-library) "find-func" "\ @@ -9517,11 +9592,13 @@ Find the elisp source of LIBRARY. \(fn LIBRARY)" t nil) (autoload (quote find-function-search-for-symbol) "find-func" "\ -Search for SYMBOL. -If VARIABLE-P is nil, `find-function-regexp' is used, otherwise -`find-variable-regexp' is used. The search is done in library LIBRARY. +Search for SYMBOL's definition of type TYPE in LIBRARY. +If TYPE is nil, look for a function definition. +Otherwise, TYPE specifies the kind of definition, +and it is interpreted via `find-function-regexp-alist'. +The search is done in the source for library LIBRARY. -\(fn SYMBOL VARIABLE-P LIBRARY)" nil nil) +\(fn SYMBOL TYPE LIBRARY)" nil nil) (autoload (quote find-function-noselect) "find-func" "\ Return a pair (BUFFER . POINT) pointing to the definition of FUNCTION. @@ -9540,9 +9617,9 @@ in `load-path'. Find the definition of the FUNCTION near point. Finds the Emacs Lisp library containing the definition of the function -near point (selected by `function-at-point') in a buffer and -places point before the definition. Point is saved in the buffer if -it is one of the current buffers. +near point (selected by `function-called-at-point') in a buffer and +places point before the definition. +Set mark before moving, if the buffer already existed. The library where FUNCTION is defined is searched for in `find-function-source-path', if non nil, otherwise in `load-path'. @@ -9568,8 +9645,8 @@ See `find-function' for more details. Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL. Finds the Emacs Lisp library containing the definition of SYMBOL -in a buffer and the point of the definition. The buffer is -not selected. +in a buffer, and the point of the definition. It does not switch +to the buffer or display it. The library where VARIABLE is defined is searched for in FILE or `find-function-source-path', if non nil, otherwise in `load-path'. @@ -9581,8 +9658,9 @@ Find the definition of the VARIABLE near point. Finds the Emacs Lisp library containing the definition of the variable near point (selected by `variable-at-point') in a buffer and -places point before the definition. Point is saved in the buffer if -it is one of the current buffers. +places point before the definition. + +Set mark before moving, if the buffer already existed. The library where VARIABLE is defined is searched for in `find-function-source-path', if non nil, otherwise in `load-path'. @@ -9604,9 +9682,35 @@ See `find-variable' for more details. \(fn VARIABLE)" t nil) +(autoload (quote find-definition-noselect) "find-func" "\ +Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL. +TYPE says what type of definition: nil for a function, +`defvar' or `defface' for a variable or face. This functoin +does not switch to the buffer or display it. + +The library where SYMBOL is defined is searched for in FILE or +`find-function-source-path', if non nil, otherwise in `load-path'. + +\(fn SYMBOL TYPE &optional FILE)" nil nil) + +(autoload (quote find-face-definition) "find-func" "\ +Find the definition of FACE. FACE defaults to the name near point. + +Finds the Emacs Lisp library containing the definition of the face +near point (selected by `variable-at-point') in a buffer and +places point before the definition. + +Set mark before moving, if the buffer already existed. + +The library where FACE is defined is searched for in +`find-function-source-path', if non nil, otherwise in `load-path'. +See also `find-function-recenter-line' and `find-function-after-hook'. + +\(fn FACE)" t nil) + (autoload (quote find-function-on-key) "find-func" "\ Find the function that KEY invokes. KEY is a string. -Point is saved if FUNCTION is in the current buffer. +Set mark before moving, if the buffer already existed. \(fn KEY)" t nil) @@ -9649,7 +9753,7 @@ Change the filter on a find-lisp-find-dired buffer to REGEXP. ;;;*** ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords) -;;;;;; "finder" "finder.el" (16488 3556)) +;;;;;; "finder" "finder.el" (16958 58756)) ;;; Generated autoloads from finder.el (autoload (quote finder-list-keywords) "finder" "\ @@ -9693,7 +9797,7 @@ to get the effect of a C-q. ;;;*** ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el" -;;;;;; (16727 56924)) +;;;;;; (16908 33361)) ;;; Generated autoloads from gnus/flow-fill.el (autoload (quote fill-flowed-encode) "flow-fill" "\ @@ -9728,7 +9832,7 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; flyspell-version flyspell-mode flyspell-prog-mode flyspell-mode-line-string) -;;;;;; "flyspell" "textmodes/flyspell.el" (16795 7139)) +;;;;;; "flyspell" "textmodes/flyspell.el" (16939 44105)) ;;; Generated autoloads from textmodes/flyspell.el (defvar flyspell-mode-line-string " Fly" "\ @@ -9878,7 +9982,7 @@ in your `~/.emacs' file, replacing [f7] by your favourite key: ;;;### (autoloads (font-lock-fontify-buffer font-lock-remove-keywords ;;;;;; font-lock-add-keywords font-lock-mode-internal) "font-lock" -;;;;;; "font-lock.el" (16808 48569)) +;;;;;; "font-lock.el" (16960 18194)) ;;; Generated autoloads from font-lock.el (autoload (quote font-lock-mode-internal) "font-lock" "\ @@ -9934,8 +10038,8 @@ Fontify the current buffer the way the function `font-lock-mode' would. ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (16635 -;;;;;; 35910)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (16908 +;;;;;; 33362)) ;;; Generated autoloads from mail/footnote.el (autoload (quote footnote-mode) "footnote" "\ @@ -9993,7 +10097,7 @@ Visit a file in Forms mode in other window. ;;;*** ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran" -;;;;;; "progmodes/fortran.el" (16534 3809)) +;;;;;; "progmodes/fortran.el" (16908 33362)) ;;; Generated autoloads from progmodes/fortran.el (defvar fortran-tab-mode-default nil "\ @@ -10129,7 +10233,7 @@ and choose the directory as the fortune-file. ;;;*** ;;;### (autoloads (fringe-indicators set-fringe-style fringe-mode -;;;;;; fringe-mode) "fringe" "fringe.el" (16810 63790)) +;;;;;; fringe-mode) "fringe" "fringe.el" (16908 33360)) ;;; Generated autoloads from fringe.el (defvar fringe-mode nil "\ @@ -10205,7 +10309,7 @@ Setting this variable, changes `default-indicate-buffer-boundaries'.") ;;;*** -;;;### (autoloads (gdba) "gdb-ui" "progmodes/gdb-ui.el" (16808 48570)) +;;;### (autoloads (gdba) "gdb-ui" "progmodes/gdb-ui.el" (16960 18194)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload (quote gdba) "gdb-ui" "\ @@ -10262,50 +10366,66 @@ detailed description of this mode. ;;;*** -;;;### (autoloads (generic-mode define-generic-mode) "generic" "generic.el" -;;;;;; (16810 63790)) +;;;### (autoloads (generic-mode generic-mode-internal define-generic-mode) +;;;;;; "generic" "generic.el" (16960 18194)) ;;; Generated autoloads from generic.el +(defvar generic-mode-list nil "\ +A list of mode names for `generic-mode'. +Do not add entries to this list directly; use `define-generic-mode' +instead (which see).") + (autoload (quote define-generic-mode) "generic" "\ -Create a new generic mode with NAME. +Create a new generic mode MODE. -NAME should be a symbol; its string representation is used as the function -name. If DESCRIPTION is provided, it is used as the docstring for the new -function. +MODE is the name of the command for the generic mode; it need not +be quoted. The optional DOCSTRING is the documentation for the +mode command. If you do not supply it, a default documentation +string will be used instead. -COMMENT-LIST is a list, whose entries are either a single character, -a one or two character string or a cons pair. If the entry is a character -or a one-character string, it is added to the mode's syntax table with -`comment-start' syntax. If the entry is a cons pair, the elements of the -pair are considered to be `comment-start' and `comment-end' respectively. -\(The latter should be nil if you want comments to end at end of line.) -Note that Emacs has limitations regarding comment characters. +COMMENT-LIST is a list, whose entries are either a single +character, a one or two character string or a cons pair. If the +entry is a character or a string, it is added to the mode's +syntax table with `comment-start' syntax. If the entry is a cons +pair, the elements of the pair are considered to be +`comment-start' and `comment-end' respectively. (The latter +should be nil if you want comments to end at end of line.) Note +that Emacs has limitations regarding comment characters. -KEYWORD-LIST is a list of keywords to highlight with `font-lock-keyword-face'. -Each keyword should be a string. +KEYWORD-LIST is a list of keywords to highlight with +`font-lock-keyword-face'. Each keyword should be a string. -FONT-LOCK-LIST is a list of additional expressions to highlight. Each entry -in the list should have the same form as an entry in `font-lock-keywords'. +FONT-LOCK-LIST is a list of additional expressions to highlight. +Each entry in the list should have the same form as an entry in +`font-lock-keywords'. -AUTO-MODE-LIST is a list of regular expressions to add to `auto-mode-alist'. -These regexps are added to `auto-mode-alist' as soon as `define-generic-mode' -is called; any old regexps with the same name are removed. +AUTO-MODE-LIST is a list of regular expressions to add to +`auto-mode-alist'. These regexps are added to `auto-mode-alist' +as soon as `define-generic-mode' is called. -FUNCTION-LIST is a list of functions to call to do some additional setup. +FUNCTION-LIST is a list of functions to call to do some +additional setup. See the file generic-x.el for some examples of `define-generic-mode'. -\(fn NAME COMMENT-LIST KEYWORD-LIST FONT-LOCK-LIST AUTO-MODE-LIST FUNCTION-LIST &optional DESCRIPTION)" nil nil) +\(fn MODE COMMENT-LIST KEYWORD-LIST FONT-LOCK-LIST AUTO-MODE-LIST FUNCTION-LIST &optional DOCSTRING)" nil (quote macro)) + +(autoload (quote generic-mode-internal) "generic" "\ +Go into the generic mode MODE. + +\(fn MODE COMMENTS KEYWORDS FONT-LOCK-LIST FUNS)" nil nil) (autoload (quote generic-mode) "generic" "\ -Basic comment and font-lock functionality for `generic' files. -\(Files which are too small to warrant their own mode, but have -comment characters, keywords, and the like.) +Enter generic mode MODE. + +Generic modes provide basic comment and font-lock functionality +for \"generic\" files. (Files which are too small to warrant their +own mode, but have comment characters, keywords, and the like.) To define a generic-mode, use the function `define-generic-mode'. Some generic modes are defined in `generic-x.el'. -\(fn TYPE)" t nil) +\(fn MODE)" t nil) ;;;*** @@ -10323,7 +10443,7 @@ at places they belong to. ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (16775 26712)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (16954 46150)) ;;; Generated autoloads from gnus/gnus.el (autoload (quote gnus-slave-no-server) "gnus" "\ @@ -10374,7 +10494,7 @@ prompt the user for the name of an NNTP server to use. ;;;;;; 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" (16775 26712)) +;;;;;; "gnus/gnus-agent.el" (16908 33361)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload (quote gnus-unplugged) "gnus-agent" "\ @@ -10461,7 +10581,7 @@ If CLEAN, obsolete (ignore). ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (16788 34909)) +;;;;;; (16954 46150)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@ -10484,8 +10604,8 @@ Play a sound FILE through the speaker. ;;;### (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" (16764 -;;;;;; 51520)) +;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (16858 +;;;;;; 50925)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload (quote gnus-jog-cache) "gnus-cache" "\ @@ -10523,7 +10643,7 @@ next enabled. Depends upon the caller to determine whether group deletion is sup ;;;*** ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article) -;;;;;; "gnus-delay" "gnus/gnus-delay.el" (16775 26712)) +;;;;;; "gnus-delay" "gnus/gnus-delay.el" (16908 33361)) ;;; Generated autoloads from gnus/gnus-delay.el (defgroup gnus-delay nil "Arrange for sending postings later." :version "22.1" :group (quote gnus)) @@ -10584,8 +10704,8 @@ Reminder user if there are unsent drafts. ;;;### (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" (16730 -;;;;;; 31107)) +;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (16908 +;;;;;; 33361)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload (quote gnus-random-x-face) "gnus-fun" "\ @@ -10624,7 +10744,7 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (16770 10720)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (16927 493)) ;;; Generated autoloads from gnus/gnus-group.el (autoload (quote gnus-fetch-group) "gnus-group" "\ @@ -10794,7 +10914,7 @@ Update the .newsrc.eld file to reflect the change of nntp server. ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (16784 39521)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (16923 3623)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload (quote gnus-msg-mail) "gnus-msg" "\ @@ -10915,7 +11035,7 @@ Add NUM into sorted LIST by side effect. ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (16775 26712)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (16923 3623)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload (quote gnus-registry-initialize) "gnus-registry" "\ @@ -10980,7 +11100,7 @@ Note -- this function hasn't been implemented yet. ;;;*** ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el" -;;;;;; (16775 26712)) +;;;;;; (16908 33361)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload (quote gnus-update-format) "gnus-spec" "\ @@ -10991,8 +11111,8 @@ Update the format specification near point. ;;;*** ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news -;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (16792 -;;;;;; 36614)) +;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (16908 +;;;;;; 33361)) ;;; Generated autoloads from gnus/gnus-start.el (autoload (quote gnus-declare-backend) "gnus-start" "\ @@ -11008,7 +11128,7 @@ Not documented ;;;*** ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el" -;;;;;; (16775 26712)) +;;;;;; (16908 33361)) ;;; Generated autoloads from gnus/gnus-win.el (autoload (quote gnus-add-configuration) "gnus-win" "\ @@ -11045,7 +11165,7 @@ Use \\[describe-mode] for more info. ;;;*** ;;;### (autoloads (goto-address goto-address-at-point goto-address-at-mouse) -;;;;;; "goto-addr" "net/goto-addr.el" (16602 38814)) +;;;;;; "goto-addr" "net/goto-addr.el" (16858 50931)) ;;; Generated autoloads from net/goto-addr.el (autoload (quote goto-address-at-mouse) "goto-addr" "\ @@ -11079,7 +11199,7 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and ;;;### (autoloads (grep-tree grep-find grep grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (16805 44924)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (16908 33362)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -11110,7 +11230,7 @@ List of hook functions run by `grep-process-setup' (see `run-hooks').") (custom-autoload (quote grep-setup-hook) "grep") -(defvar grep-regexp-alist (quote (("^\\(.+?\\)[: ]+\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[: ]" 1 (2 . 5) (4 . 6)) ("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\\[01;41m\\)\\(.*?\\)\\(\\[00m\\)" 1 2 ((lambda nil (setq compilation-error-screen-columns nil) (- (match-beginning 5) (match-end 3) 8)) lambda nil (- (match-end 5) (match-end 3) 8))) ("^Binary file \\(.+\\) matches$" 1 nil nil 1))) "\ +(defvar grep-regexp-alist (quote (("^\\(.+?\\)[: ]+\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[: ]" 1 (2 . 5) (4 . 6)) ("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\\[01;41m\\)\\(.*?\\)\\(\\[00m\\(\\[K\\)?\\)" 1 2 ((lambda nil (setq compilation-error-screen-columns nil) (- (match-beginning 5) (match-end 3) 8)) lambda nil (- (match-end 5) (match-end 3) 8))) ("^Binary file \\(.+\\) matches$" 1 nil nil 1))) "\ Regexp used to match grep hits. See `compilation-error-regexp-alist'.") (defvar grep-program "grep" "\ @@ -11174,6 +11294,8 @@ easily repeat a find command. \(fn COMMAND-ARGS)" t nil) +(defalias (quote find-grep) (quote grep-find)) + (autoload (quote grep-tree) "grep" "\ Grep for REGEXP in FILES in directory tree rooted at DIR. Collect output in a buffer. @@ -11210,7 +11332,7 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** ;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx -;;;;;; sdb gdb) "gud" "progmodes/gud.el" (16808 48570)) +;;;;;; sdb gdb) "gud" "progmodes/gud.el" (16896 54110)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@ -11338,9 +11460,9 @@ to be updated. ;;;*** ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region -;;;;;; scan-buf-move-to-region 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" (16775 26706)) +;;;;;; 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" (16908 33360)) ;;; Generated autoloads from help-at-pt.el (autoload (quote help-at-pt-string) "help-at-pt" "\ @@ -11386,6 +11508,35 @@ This is done by setting a timer, if none is currently active. \(fn)" t nil) +(defvar help-at-pt-display-when-idle (quote never) "\ +*Automatically show local help on point-over. +If the value is t, the string obtained from any `kbd-help' or +`help-echo' property at point is automatically printed in the +echo area, if nothing else is already displayed there, or after a +quit. If both `kbd-help' and `help-echo' produce help strings, +`kbd-help' is used. If the value is a list, the help only gets +printed if there is a text or overlay property at point that is +included in this list. Suggested properties are `keymap', +`local-map', `button' and `kbd-help'. Any value other than t or +a non-empty list disables the feature. + +This variable only takes effect after a call to +`help-at-pt-set-timer'. The help gets printed after Emacs has +been idle for `help-at-pt-timer-delay' seconds. You can call +`help-at-pt-cancel-timer' to cancel the timer set by, and the +effect of, `help-at-pt-set-timer'. + +When this variable is set through Custom, `help-at-pt-set-timer' +is called automatically, unless the value is `never', in which +case `help-at-pt-cancel-timer' is called. Specifying an empty +list of properties through Custom will set the timer, thus +enabling buffer local values. It sets the actual value to nil. +Thus, Custom distinguishes between a nil value and other values +that disable the feature, which Custom identifies with `never'. +The default is `never'.") + +(custom-autoload (quote help-at-pt-display-when-idle) "help-at-pt") + (autoload (quote scan-buf-move-to-region) "help-at-pt" "\ Go to the start of the next region with non-nil PROP property. Then run HOOK, which should be a quoted symbol that is a normal @@ -11440,7 +11591,7 @@ different regions. With numeric argument ARG, behaves like ;;;### (autoloads (describe-categories describe-syntax describe-variable ;;;;;; variable-at-point describe-function-1 describe-function locate-library -;;;;;; help-with-tutorial) "help-fns" "help-fns.el" (16784 39521)) +;;;;;; help-with-tutorial) "help-fns" "help-fns.el" (16899 17454)) ;;; Generated autoloads from help-fns.el (autoload (quote help-with-tutorial) "help-fns" "\ @@ -11483,8 +11634,9 @@ Not documented (autoload (quote variable-at-point) "help-fns" "\ Return the bound variable symbol found around point. Return 0 if there is no such symbol. +If ANY-SYMBOL is non-nil, don't insist the symbol be bound. -\(fn)" nil nil) +\(fn &optional ANY-SYMBOL)" nil nil) (autoload (quote describe-variable) "help-fns" "\ Display the full documentation of VARIABLE (a symbol). @@ -11512,7 +11664,7 @@ BUFFER should be a buffer or a buffer name. ;;;*** ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el" -;;;;;; (16213 43268)) +;;;;;; (16875 35928)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -11528,7 +11680,7 @@ A value of nil means skip the middle step, so that ;;;### (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" (16654 2763)) +;;;;;; help-mode) "help-mode" "help-mode.el" (16939 44104)) ;;; Generated autoloads from help-mode.el (autoload (quote help-mode) "help-mode" "\ @@ -11627,7 +11779,7 @@ Provide help for current mode. ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (16801 58021)) +;;;;;; "hexl.el" (16858 50912)) ;;; Generated autoloads from hexl.el (autoload (quote hexl-mode) "hexl" "\ @@ -11722,8 +11874,8 @@ This discards the buffer's undo information. ;;;### (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" (16219 -;;;;;; 35448)) +;;;;;; hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (16898 +;;;;;; 6195)) ;;; Generated autoloads from hi-lock.el (defvar hi-lock-mode nil "\ @@ -11834,7 +11986,7 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** ;;;### (autoloads (hide-ifdef-lines hide-ifdef-read-only hide-ifdef-initially -;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (16213 43281)) +;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (16924 23221)) ;;; Generated autoloads from progmodes/hideif.el (autoload (quote hide-ifdef-mode) "hideif" "\ @@ -11889,7 +12041,7 @@ how the hiding is done: ;;;*** ;;;### (autoloads (hs-minor-mode hs-hide-comments-when-hiding-all) -;;;;;; "hideshow" "progmodes/hideshow.el" (16275 41871)) +;;;;;; "hideshow" "progmodes/hideshow.el" (16858 50936)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-hide-comments-when-hiding-all t "\ @@ -11952,11 +12104,9 @@ Key bindings: ;;;;;; 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" (16435 26305)) +;;;;;; "hilit-chg" "hilit-chg.el" (16876 58220)) ;;; Generated autoloads from hilit-chg.el -(defvar highlight-changes-mode nil) - (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\ Remove the change face from the region between BEG and END. This allows you to manually remove highlighting from uninteresting changes. @@ -12157,7 +12307,7 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el" -;;;;;; (16469 33009)) +;;;;;; (16908 33360)) ;;; Generated autoloads from hl-line.el (autoload (quote hl-line-mode) "hl-line" "\ @@ -12197,7 +12347,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el" -;;;;;; (16722 36135)) +;;;;;; (16822 52985)) ;;; Generated autoloads from calendar/holidays.el (autoload (quote holidays) "holidays" "\ @@ -12279,7 +12429,7 @@ Convert HTML to plain text in the current buffer. ;;;;;; 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" (16764 51518)) +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (16934 57456)) ;;; Generated autoloads from ibuf-ext.el (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\ @@ -12727,7 +12877,7 @@ bound to the current value of the filter. ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (16775 26706)) +;;;;;; "ibuffer" "ibuffer.el" (16908 33360)) ;;; Generated autoloads from ibuffer.el (autoload (quote ibuffer-list-buffers) "ibuffer" "\ @@ -12766,25 +12916,81 @@ locally in this buffer. ;;;*** -;;;### (autoloads (icomplete-minibuffer-setup icomplete-mode) "icomplete" -;;;;;; "icomplete.el" (16213 43269)) +;;;### (autoloads (icalendar-import-buffer icalendar-import-file +;;;;;; icalendar-export-region icalendar-export-file) "icalendar" +;;;;;; "calendar/icalendar.el" (16939 44105)) +;;; Generated autoloads from calendar/icalendar.el + +(autoload (quote icalendar-export-file) "icalendar" "\ +Export diary file to iCalendar format. +All diary entries in the file DIARY-FILENAME are converted to iCalendar +format. The result is appended to the file ICAL-FILENAME. + +\(fn DIARY-FILENAME ICAL-FILENAME)" t nil) + +(autoload (quote icalendar-export-region) "icalendar" "\ +Export region in diary file to iCalendar format. +All diary entries in the region from MIN to MAX in the current buffer are +converted to iCalendar format. The result is appended to the file +ICAL-FILENAME. +This function attempts to return t if something goes wrong. In this +case an error string which describes all the errors and problems is +written into the buffer `*icalendar-errors*'. + +\(fn MIN MAX ICAL-FILENAME)" t nil) + +(autoload (quote icalendar-import-file) "icalendar" "\ +Import a iCalendar file and append to a diary file. +Argument ICAL-FILENAME output iCalendar file. +Argument DIARY-FILENAME input `diary-file'. +Optional argument NON-MARKING determines whether events are created as +non-marking or not. + +\(fn ICAL-FILENAME DIARY-FILENAME &optional NON-MARKING)" t nil) + +(autoload (quote icalendar-import-buffer) "icalendar" "\ +Extract iCalendar events from current buffer. + +This function searches the current buffer for the first iCalendar +object, reads it and adds all VEVENT elements to the diary +DIARY-FILE. + +It will ask for each appointment whether to add it to the diary +when DO-NOT-ASK is non-nil. When called interactively, +DO-NOT-ASK is set to t, so that you are asked fore each event. + +NON-MARKING determines whether diary events are created as +non-marking. + +Return code t means that importing worked well, return code nil +means that an error has occured. Error messages will be in the +buffer `*icalendar-errors*'. + +\(fn &optional DIARY-FILE DO-NOT-ASK NON-MARKING)" t nil) + +;;;*** + +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (16960 +;;;;;; 18194)) ;;; Generated autoloads from icomplete.el +(defvar icomplete-mode nil "\ +Non-nil if Icomplete mode is enabled. +See the command `icomplete-mode' for a description of this minor-mode. +Setting this variable directly does not take effect; +use either \\[customize] or the function `icomplete-mode'.") + +(custom-autoload (quote icomplete-mode) "icomplete") + (autoload (quote icomplete-mode) "icomplete" "\ Toggle incremental minibuffer completion for this Emacs session. With a numeric argument, turn Icomplete mode on iff ARG is positive. \(fn &optional ARG)" t nil) -(autoload (quote icomplete-minibuffer-setup) "icomplete" "\ -Run in minibuffer on activation to establish incremental completion. -Usually run by inclusion in `minibuffer-setup-hook'. - -\(fn)" nil nil) - ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (16435 26306)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (16858 50936)) ;;; Generated autoloads from progmodes/icon.el (autoload (quote icon-mode) "icon" "\ @@ -12825,7 +13031,7 @@ with no args, if that value is non-nil. ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (16796 28018)) +;;;;;; (16830 50350)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload (quote idlwave-shell) "idlw-shell" "\ @@ -12851,7 +13057,7 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (16796 28018)) +;;;;;; (16958 58759)) ;;; Generated autoloads from progmodes/idlwave.el (autoload (quote idlwave-mode) "idlwave" "\ @@ -12935,7 +13141,7 @@ The main features of this mode are \\i IF statement template \\elif IF-ELSE statement template \\b BEGIN - + For a full list, use \\[idlwave-list-abbrevs]. Some templates also have direct keybindings - see the list of keybindings below. @@ -12987,8 +13193,8 @@ The main features of this mode are ;;;;;; 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" (16804 -;;;;;; 23129)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (16916 +;;;;;; 30957)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -13249,7 +13455,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (16686 1588)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (16908 33360)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names "*ielm*") @@ -13277,9 +13483,10 @@ Toggle inline image minor mode. ;;;*** -;;;### (autoloads (defimage find-image remove-images insert-image -;;;;;; put-image create-image image-type-available-p image-type-from-file-header -;;;;;; image-type-from-data) "image" "image.el" (16722 36133)) +;;;### (autoloads (defimage find-image remove-images insert-sliced-image +;;;;;; insert-image put-image create-image image-type-available-p +;;;;;; image-type-from-file-header image-type-from-data) "image" +;;;;;; "image.el" (16954 46150)) ;;; Generated autoloads from image.el (defvar image-library-alist nil "\ @@ -13360,6 +13567,19 @@ height of the image; integer values are taken as pixel values. \(fn IMAGE &optional STRING AREA SLICE)" nil nil) +(autoload (quote insert-sliced-image) "image" "\ +Insert IMAGE into current buffer at point. +IMAGE is displayed by inserting STRING into the current buffer +with a `display' property whose value is the image. STRING is +defaulted if you omit it. +AREA is where to display the image. AREA nil or omitted means +display it in the text area, a value of `left-margin' means +display it in the left marginal area, a value of `right-margin' +means display it in the right marginal area. +The image is automatically split into ROW x COLS slices. + +\(fn IMAGE &optional STRING AREA ROWS COLS)" nil nil) + (autoload (quote remove-images) "image" "\ Remove images between START and END in BUFFER. Remove only images that were put in BUFFER with calls to `put-image'. @@ -13412,7 +13632,7 @@ Example: ;;;### (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" (16213 43269)) +;;;;;; "image-file.el" (16942 52930)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\ @@ -13472,8 +13692,33 @@ Image files are those whose name has an extension in ;;;*** +;;;### (autoloads (image-mode) "image-mode" "image-mode.el" (16960 +;;;;;; 18194)) +;;; Generated autoloads from image-mode.el + (push '("\\.jpg\\'" . image-mode) auto-mode-alist) + (push '("\\.jpeg\\'" . image-mode) auto-mode-alist) + (push '("\\.gif\\'" . image-mode) auto-mode-alist) + (push '("\\.png\\'" . image-mode) auto-mode-alist) + (push '("\\.tiff\\'" . image-mode) auto-mode-alist) + (push '("\\.tif\\'" . image-mode) auto-mode-alist) + (push '("\\.xbm\\'" . image-mode) auto-mode-alist) + (push '("\\.xpm\\'" . image-mode) auto-mode-alist) + (push '("\\.pbm\\'" . image-mode) auto-mode-alist) + (push '("\\.pgm\\'" . image-mode) auto-mode-alist) + (push '("\\.ppm\\'" . image-mode) auto-mode-alist) + (push '("\\.pnm\\'" . image-mode) auto-mode-alist) + +(autoload (quote image-mode) "image-mode" "\ +Major mode for image files. +You can use \\<image-mode-map>\\[image-toggle-display] +to toggle between display as an image and display as text. + +\(fn)" t nil) + +;;;*** + ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (16816 23724)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (16908 33360)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -13718,7 +13963,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node ;;;;;; info-apropos Info-index Info-directory Info-goto-node info-standalone ;;;;;; info-emacs-manual info info-other-window) "info" "info.el" -;;;;;; (16810 63790)) +;;;;;; (16953 20624)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@ -13830,7 +14075,7 @@ Restore an info buffer specified in a desktop file. ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (16783 21520)) +;;;;;; (16875 35928)) ;;; Generated autoloads from info-look.el (autoload (quote info-lookup-reset) "info-look" "\ @@ -13946,7 +14191,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (16213 43274)) +;;;;;; (16829 43426)) ;;; Generated autoloads from international/isearch-x.el (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\ @@ -13981,7 +14226,7 @@ accessed via isearchb. ;;;*** ;;;### (autoloads (iso-accents-mode) "iso-acc" "international/iso-acc.el" -;;;;;; (16213 43274)) +;;;;;; (16927 496)) ;;; Generated autoloads from international/iso-acc.el (autoload (quote iso-accents-mode) "iso-acc" "\ @@ -14109,9 +14354,9 @@ Add submenus to the File menu, to convert to and from various formats. ;;;### (autoloads (ispell-message ispell-minor-mode ispell ispell-complete-word-interior-frag ;;;;;; ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell -;;;;;; ispell-help ispell-pdict-save ispell-word ispell-dictionary-alist -;;;;;; ispell-local-dictionary-alist ispell-personal-dictionary) -;;;;;; "ispell" "textmodes/ispell.el" (16805 44925)) +;;;;;; ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist +;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" +;;;;;; (16954 46151)) ;;; Generated autoloads from textmodes/ispell.el (defvar ispell-personal-dictionary nil "\ @@ -14122,14 +14367,12 @@ where DICTNAME is the name of your default dictionary.") (custom-autoload (quote ispell-personal-dictionary) "ispell") (defvar ispell-local-dictionary-alist nil "\ -*Contains local or customized dictionary definitions. +*List of local or customized dictionary definitions. +These can override the values in `ispell-dictionary-alist'. -These will override the values in `ispell-dictionary-alist'. - -Customization changes made to `ispell-dictionary-alist' will not operate -over emacs sessions. To make permanent changes to your dictionary -definitions, you will need to make your changes in this variable, save, -and then re-start emacs.") +To make permanent changes to your dictionary definitions, you +will need to make your changes in this variable, save, and then +re-start emacs.") (custom-autoload (quote ispell-local-dictionary-alist) "ispell") @@ -14139,13 +14382,13 @@ and then re-start emacs.") (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-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" "[']" t ("-C") nil 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) ("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)))) -(defvar ispell-dictionary-alist (append ispell-local-dictionary-alist ispell-dictionary-alist-1 ispell-dictionary-alist-2 ispell-dictionary-alist-3 ispell-dictionary-alist-4 ispell-dictionary-alist-5 ispell-dictionary-alist-6) "\ +(defvar ispell-dictionary-alist (append ispell-dictionary-alist-1 ispell-dictionary-alist-2 ispell-dictionary-alist-3 ispell-dictionary-alist-4 ispell-dictionary-alist-5 ispell-dictionary-alist-6) "\ An alist of dictionaries and their associated parameters. Each element of this list is also a list: @@ -14171,6 +14414,12 @@ regular expression \"[']\" for OTHERCHARS. Then \"they're\" and If you want OTHERCHARS to be empty, use the empty string. Hint: regexp syntax requires the hyphen to be declared first here. +CASECHAS, NOT-CASECHARS, and OTHERCHARS must be a unibyte string +containing bytes of CHARACTER-SET. In addition, if they contain +a non-ASCII byte, the regular expression must be a single +`character set' construct that doesn't specify a character range +for non-ASCII bytes. + MANY-OTHERCHARS-P is non-nil when multiple OTHERCHARS are allowed in a word. Otherwise only a single OTHERCHARS character is allowed to be part of any single word. @@ -14193,8 +14442,6 @@ Note that the CASECHARS and OTHERCHARS slots of the alist should contain the same character set as casechars and otherchars in the LANGUAGE.aff file (e.g., english.aff).") -(custom-autoload (quote ispell-dictionary-alist) "ispell") - (defvar ispell-menu-map nil "\ Key map for ispell menu.") @@ -14251,7 +14498,8 @@ when called interactively, non-corrective messages are suppressed. With a prefix argument (or if CONTINUE is non-nil), resume interrupted spell-checking of a buffer or region. -Word syntax described by `ispell-dictionary-alist' (which see). +Word syntax is controlled by the definition of the chosen dictionary, +which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'. This will check or reload the dictionary. Use \\[ispell-change-dictionary] or \\[ispell-region] to update the Ispell process. @@ -14304,13 +14552,12 @@ With NO-ERROR, just return non-nil if there was no Ispell running. \(fn &optional NO-ERROR)" t nil) (autoload (quote ispell-change-dictionary) "ispell" "\ -Change `ispell-dictionary' (q.v.) to DICT and kill old Ispell process. -A new one will be started as soon as necessary. +Change to dictionary DICT for Ispell. +With a prefix arg, set it \"globally\", for all buffers. +Without a prefix arg, set it \"locally\", just for this buffer. By just answering RET you can find out what the current dictionary is. -With prefix argument, set the default dictionary. - \(fn DICT &optional ARG)" t nil) (autoload (quote ispell-region) "ispell" "\ @@ -14499,8 +14746,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (16484 -;;;;;; 6598)) +;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (16939 +;;;;;; 44104)) ;;; Generated autoloads from jit-lock.el (autoload (quote jit-lock-register) "jit-lock" "\ @@ -14514,7 +14761,7 @@ If non-nil, CONTEXTUAL means that a contextual fontification would be useful. ;;;*** ;;;### (autoloads (with-auto-compression-mode auto-compression-mode) -;;;;;; "jka-compr" "jka-compr.el" (16484 6598)) +;;;;;; "jka-compr" "jka-compr.el" (16960 18194)) ;;; Generated autoloads from jka-compr.el (defvar auto-compression-mode nil "\ @@ -14541,7 +14788,7 @@ Evalute BODY with automatic file compression and uncompression enabled. ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup ;;;;;; keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el" -;;;;;; (16213 43273)) +;;;;;; (16908 33361)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -14644,7 +14891,7 @@ and the return value is the length of the conversion. ;;;### (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" (16814 63075)) +;;;;;; "kmacro.el" (16908 33360)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -14872,7 +15119,7 @@ Not documented ;;;*** ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display) -;;;;;; "latin1-disp" "international/latin1-disp.el" (16680 26004)) +;;;;;; "latin1-disp" "international/latin1-disp.el" (16908 33362)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -15044,8 +15291,8 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (16435 -;;;;;; 26305)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (16858 +;;;;;; 50917)) ;;; Generated autoloads from loadhist.el (autoload (quote unload-feature) "loadhist" "\ @@ -15068,7 +15315,7 @@ such as redefining an Emacs function. ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (16580 11202)) +;;;;;; "locate" "locate.el" (16908 33360)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches "-al" "\ @@ -15093,7 +15340,7 @@ shown; this is often useful to constrain a big search. ;;;*** -;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (16680 26002)) +;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (16908 33360)) ;;; Generated autoloads from log-edit.el (autoload (quote log-edit) "log-edit" "\ @@ -15114,8 +15361,8 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (16534 -;;;;;; 3808)) +;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (16923 +;;;;;; 3606)) ;;; Generated autoloads from log-view.el (autoload (quote log-view-mode) "log-view" "\ @@ -15362,7 +15609,7 @@ and then select the region of un-tablified names and use ;;;*** ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr" -;;;;;; "mail/mail-extr.el" (16746 18215)) +;;;;;; "mail/mail-extr.el" (16908 33362)) ;;; Generated autoloads from mail/mail-extr.el (autoload (quote mail-extract-address-components) "mail-extr" "\ @@ -15477,7 +15724,7 @@ If 4th arg LIST is non-nil, return a list of all such fields. ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup) -;;;;;; "mailabbrev" "mail/mailabbrev.el" (16250 35353)) +;;;;;; "mailabbrev" "mail/mailabbrev.el" (16858 50930)) ;;; Generated autoloads from mail/mailabbrev.el (autoload (quote mail-abbrevs-setup) "mailabbrev" "\ @@ -15640,7 +15887,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads (man-follow man) "man" "man.el" (16816 23724)) +;;;### (autoloads (man-follow man) "man" "man.el" (16958 58756)) ;;; Generated autoloads from man.el (defalias (quote manual-entry) (quote man)) @@ -15689,8 +15936,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (16810 -;;;;;; 63790)) +;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (16939 +;;;;;; 44104)) ;;; Generated autoloads from menu-bar.el (put (quote menu-bar-mode) (quote standard-value) (quote (t))) @@ -15727,10 +15974,7 @@ turn on menu bars; otherwise, turn off menu bars. ;;;;;; message-signature message-indent-citation-function message-cite-function ;;;;;; message-yank-prefix message-citation-line-function message-send-mail-function ;;;;;; message-user-organization-file message-signature-separator -;;;;;; message-cross-post-note-function message-followup-to-note -;;;;;; message-cross-post-note message-cross-post-default message-archive-note -;;;;;; message-archive-header message-mark-insert-end message-mark-insert-begin -;;;;;; message-from-style) "message" "gnus/message.el" (16775 26713)) +;;;;;; message-from-style) "message" "gnus/message.el" (16953 20625)) ;;; Generated autoloads from gnus/message.el (defvar message-from-style (quote default) "\ @@ -15748,54 +15992,6 @@ Otherwise, most addresses look like `angles', but they look like (custom-autoload (quote message-from-style) "message") -(defvar message-mark-insert-begin "--8<---------------cut here---------------start------------->8---\n" "\ -How to mark the beginning of some inserted text.") - -(custom-autoload (quote message-mark-insert-begin) "message") - -(defvar message-mark-insert-end "--8<---------------cut here---------------end--------------->8---\n" "\ -How to mark the end of some inserted text.") - -(custom-autoload (quote message-mark-insert-end) "message") - -(defvar message-archive-header "X-No-Archive: Yes\n" "\ -Header to insert when you don't want your article to be archived. -Archives (such as groups.google.com) respect this header.") - -(custom-autoload (quote message-archive-header) "message") - -(defvar message-archive-note "X-No-Archive: Yes - save http://groups.google.com/" "\ -Note to insert why you wouldn't want this posting archived. -If nil, don't insert any text in the body.") - -(custom-autoload (quote message-archive-note) "message") - -(defvar message-cross-post-default t "\ -When non-nil `message-cross-post-followup-to' will perform a crosspost. -If nil, `message-cross-post-followup-to' will only do a followup. Note that -you can explicitly override this setting by calling -`message-cross-post-followup-to' with a prefix.") - -(custom-autoload (quote message-cross-post-default) "message") - -(defvar message-cross-post-note "Crosspost & Followup-To: " "\ -Note to insert before signature to notify of cross-post and follow-up.") - -(custom-autoload (quote message-cross-post-note) "message") - -(defvar message-followup-to-note "Followup-To: " "\ -Note to insert before signature to notify of follow-up only.") - -(custom-autoload (quote message-followup-to-note) "message") - -(defvar message-cross-post-note-function (quote message-cross-post-insert-note) "\ -Function to use to insert note about Crosspost or Followup-To. -The function will be called with four arguments. The function should not only -insert a note, but also ensure old notes are deleted. See the documentation -for `message-cross-post-insert-note'.") - -(custom-autoload (quote message-cross-post-note-function) "message") - (defvar message-signature-separator "^-- *$" "\ Regexp matching the signature separator.") @@ -16084,7 +16280,7 @@ which specify the range to operate on. ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (16681 45593)) +;;;;;; (16923 3630)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload (quote metafont-mode) "meta-mode" "\ @@ -16331,7 +16527,7 @@ Returns non-nil if the new state is enabled. ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (16213 43282)) +;;;;;; (16858 50936)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload (quote mixal-mode) "mixal-mode" "\ @@ -16397,7 +16593,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (16775 26713)) +;;;;;; "mm-url" "gnus/mm-url.el" (16954 46150)) ;;; Generated autoloads from gnus/mm-url.el (autoload (quote mm-url-insert-file-contents) "mm-url" "\ @@ -16413,8 +16609,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (16775 -;;;;;; 26713)) +;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (16908 +;;;;;; 33361)) ;;; Generated autoloads from gnus/mm-uu.el (autoload (quote mm-uu-dissect) "mm-uu" "\ @@ -16442,7 +16638,7 @@ Not documented ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (16775 26713)) +;;;;;; "mml2015" "gnus/mml2015.el" (16908 33361)) ;;; Generated autoloads from gnus/mml2015.el (autoload (quote mml2015-decrypt) "mml2015" "\ @@ -16483,7 +16679,7 @@ Not documented ;;;*** ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el" -;;;;;; (16213 43282)) +;;;;;; (16858 50936)) ;;; Generated autoloads from progmodes/modula2.el (autoload (quote modula-2-mode) "modula2" "\ @@ -16791,7 +16987,7 @@ system which uses fontsets). ;;;;;; 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" (16747 61767)) +;;;;;; "mule-util" "international/mule-util.el" (16908 33362)) ;;; Generated autoloads from international/mule-util.el (autoload (quote string-to-sequence) "mule-util" "\ @@ -17230,7 +17426,7 @@ unless optional argument SOFT is non-nil. ;;;*** ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el" -;;;;;; (16775 26713)) +;;;;;; (16908 33361)) ;;; Generated autoloads from gnus/nndiary.el (autoload (quote nndiary-generate-nov-databases) "nndiary" "\ @@ -17256,7 +17452,7 @@ symbol in the alist. ;;;*** ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el" -;;;;;; (16792 36614)) +;;;;;; (16927 494)) ;;; Generated autoloads from gnus/nnfolder.el (autoload (quote nnfolder-generate-active-file) "nnfolder" "\ @@ -17312,13 +17508,16 @@ Revert posting and mailing methods to the standard Emacs methods. ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (16710 51031)) +;;;;;; "novice" "novice.el" (16939 44104)) ;;; Generated autoloads from novice.el (defvar disabled-command-function (quote disabled-command-function) "\ Function to call to handle disabled commands. If nil, the feature is disabled, i.e., all commands work normally.") +(defvaralias (quote disabled-command-hook) (quote disabled-command-function)) + (make-obsolete-variable 'disabled-command-hook 'disabled-command-function "22.1") + (autoload (quote disabled-command-function) "novice" "\ Not documented @@ -17515,13 +17714,14 @@ The Custom feature is intended to make this obsolete. ;;;*** -;;;### (autoloads (org-remember-handler org-remember-annotation org-store-link -;;;;;; org-diary org-agenda org-agenda-mode org-mode) "org" "textmodes/org.el" -;;;;;; (16819 61740)) +;;;### (autoloads (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" (16876 +;;;;;; 58220)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ -Outline-based notes management and organizer, alias +Outline-based notes management and organizer, alias \"Carstens outline-mode for keeping track of everything.\" Org-mode develops organizational tasks around a NOTES file which @@ -17535,7 +17735,7 @@ messages (Gnus), BBDB entries, and any files related to the project. For printing and sharing of notes, an Org-mode file (or a part of it) can be exported as a well-structured ASCII or HTML file. -+ The following commands are available: +The following commands are available: \\{org-mode-map} @@ -17544,6 +17744,10 @@ can be exported as a well-structured ASCII or HTML file. (autoload (quote org-agenda-mode) "org" "\ Mode for time-sorted view on action items in Org-mode files. +The following commands are available: + +\\{org-agenda-mode-map} + \(fn)" t nil) (autoload (quote org-agenda) "org" "\ @@ -17658,6 +17862,16 @@ See also the variable `org-reverse-note-order'. \(fn)" nil nil) +(autoload (quote turn-on-orgtbl) "org" "\ +Unconditionally turn on orgtbl-mode. + +\(fn)" nil nil) + +(autoload (quote orgtbl-mode) "org" "\ +The org-mode table editor as a minor mode for use in other modes. + +\(fn &optional ARG)" t nil) + ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" @@ -17716,7 +17930,7 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (16816 23724)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (16821 35887)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -18022,8 +18236,8 @@ Completion for the `chgrp' command. ;;;### (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" (16768 -;;;;;; 48631)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (16880 +;;;;;; 58563)) ;;; Generated autoloads from pcomplete.el (autoload (quote pcomplete) "pcomplete" "\ @@ -18082,7 +18296,7 @@ Setup shell-mode to use pcomplete. ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "pcvs.el" (16814 63075)) +;;;;;; "pcvs.el" (16953 20624)) ;;; Generated autoloads from pcvs.el (autoload (quote cvs-checkout) "pcvs" "\ @@ -18159,7 +18373,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (16764 51518)) +;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (16858 50918)) ;;; 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))) @@ -18167,7 +18381,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (16213 43282)) +;;;;;; (16958 58759)) ;;; Generated autoloads from progmodes/perl-mode.el (autoload (quote perl-mode) "perl-mode" "\ @@ -19135,10 +19349,10 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads (ps-mule-begin-page ps-mule-begin-job ps-mule-header-string-charsets -;;;;;; 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" (16702 49514)) +;;;### (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" (16923 3608)) ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ @@ -19241,11 +19455,6 @@ FONTTAG should be a string \"/h0\" or \"/h1\". \(fn STRING FONTTAG)" nil nil) -(autoload (quote ps-mule-header-string-charsets) "ps-mule" "\ -Return a list of character sets that appears in header strings. - -\(fn)" nil nil) - (autoload (quote ps-mule-begin-job) "ps-mule" "\ Start printing job for multi-byte chars between FROM and TO. This checks if all multi-byte characters in the region are printable or not. @@ -19264,8 +19473,8 @@ Not documented ;;;;;; 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" (16801 -;;;;;; 58023)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (16958 +;;;;;; 58756)) ;;; 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")) "\ @@ -19462,7 +19671,7 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (16816 23742)) +;;;;;; (16908 33362)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@ -19549,7 +19758,7 @@ them into characters should be done separately. ;;;;;; 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" (16547 17258)) +;;;;;; "international/quail.el" (16954 46150)) ;;; Generated autoloads from international/quail.el (autoload (quote quail-title) "quail" "\ @@ -19864,18 +20073,23 @@ See \\[compile]. ;;;*** -;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (16675 7397)) +;;;### (autoloads (re-builder regexp-builder) "re-builder" "emacs-lisp/re-builder.el" +;;;;;; (16930 25649)) ;;; Generated autoloads from emacs-lisp/re-builder.el +(autoload (quote regexp-builder) "re-builder" "\ +Alias for `re-builder': Construct a regexp interactively. + +\(fn)" t nil) + (autoload (quote re-builder) "re-builder" "\ -Call up the RE Builder for the current window. +Construct a regexp interactively. \(fn)" t nil) ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (16783 21521)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (16958 58756)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -19901,8 +20115,8 @@ that were operated on recently. ;;;### (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" (16213 -;;;;;; 43271)) +;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (16894 +;;;;;; 3339)) ;;; Generated autoloads from rect.el (autoload (quote move-to-column-force) "rect" "\ @@ -20024,8 +20238,8 @@ rectangle which were empty. ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (16213 -;;;;;; 43283)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (16884 +;;;;;; 52115)) ;;; Generated autoloads from textmodes/refill.el (autoload (quote refill-mode) "refill" "\ @@ -20041,7 +20255,7 @@ refilling if they would cause auto-filling. ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (16213 43284)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (16896 54112)) ;;; Generated autoloads from textmodes/reftex.el (autoload (quote turn-on-reftex) "reftex" "\ @@ -20091,7 +20305,7 @@ This enforces rescanning the buffer on next use. ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (16213 43283)) +;;;;;; (16913 6364)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload (quote reftex-citation) "reftex-cite" "\ @@ -20103,12 +20317,13 @@ to `reftex-cite-format' and inserted into the buffer. If NO-INSERT is non-nil, nothing is inserted, only the selected key returned. -FORAT-KEY can be used to pre-select a citation format. +FORMAT-KEY can be used to pre-select a citation format. -When called with one or two `C-u' prefixes, first rescans the document. -When called with a numeric prefix, make that many citations. When -called with point inside the braces of a `\\cite' command, it will -add another key, ignoring the value of `reftex-cite-format'. +When called with a `C-u' prefix, prompt for optional arguments in +cite macros. When called with a numeric prefix, make that many +citations. When called with point inside the braces of a `\\cite' +command, it will add another key, ignoring the value of +`reftex-cite-format'. The regular expression uses an expanded syntax: && is interpreted as `and'. Thus, `aaaa&&bbb' matches entries which contain both `aaaa' and `bbb'. @@ -20119,8 +20334,27 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** +;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" +;;;;;; (16887 27629)) +;;; Generated autoloads from textmodes/reftex-global.el + +(defvar reftex-isearch-minor-mode nil) + +(autoload (quote reftex-isearch-minor-mode) "reftex-global" "\ +When on, isearch searches the whole document, not only the current file. +This minor mode allows isearch to search through all the files of +the current TeX document. + +With no argument, this command toggles +`reftex-isearch-minor-mode'. With a prefix argument ARG, turn +`reftex-isearch-minor-mode' on iff ARG is positive. + +\(fn &optional ARG)" t nil) + +;;;*** + ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (16213 43283)) +;;;;;; (16875 35929)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload (quote reftex-index-phrases-mode) "reftex-index" "\ @@ -20153,7 +20387,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (16213 43283)) +;;;;;; (16875 35929)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload (quote reftex-all-document-files) "reftex-parse" "\ @@ -20166,7 +20400,7 @@ of master file. ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (16213 43273)) +;;;;;; (16821 35887)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload (quote regexp-opt) "regexp-opt" "\ @@ -20186,8 +20420,8 @@ by \\=\\< and \\>. (autoload (quote regexp-opt-depth) "regexp-opt" "\ Return the depth of REGEXP. -This means the number of regexp grouping constructs (parenthesised expressions) -in REGEXP. +This means the number of non-shy regexp grouping constructs +\(parenthesised expressions) in REGEXP. \(fn REGEXP)" nil nil) @@ -20282,7 +20516,7 @@ Clear out the file used for transmitting args when Emacs resumes. ;;;*** ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el" -;;;;;; (16804 23129)) +;;;;;; (16942 52930)) ;;; Generated autoloads from reveal.el (autoload (quote reveal-mode) "reveal" "\ @@ -20420,15 +20654,22 @@ variable. ;;;*** -;;;### (autoloads (rmail-restore-desktop-buffer rmail-set-pop-password +;;;### (autoloads (rmail-restore-desktop-buffer rmail-set-remote-password ;;;;;; rmail-input rmail-mode rmail rmail-enable-mime rmail-show-message-hook ;;;;;; rmail-confirm-expunge rmail-secondary-file-regexp rmail-secondary-file-directory ;;;;;; 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" "mail/rmail.el" (16792 36615)) +;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (16954 +;;;;;; 46150)) ;;; Generated autoloads from mail/rmail.el +(autoload (quote rmail-movemail-variant-p) "rmail" "\ +Return t if the current movemail variant is any of VARIANTS. +Currently known variants are 'emacs and 'mailutils. + +\(fn &rest VARIANTS)" nil nil) + (defvar rmail-dont-reply-to-names nil "\ *A regexp specifying addresses to prune from a reply message. A value of nil means exclude your own email address as an address @@ -20668,8 +20909,8 @@ Run Rmail on file FILENAME. \(fn FILENAME)" t nil) -(autoload (quote rmail-set-pop-password) "rmail" "\ -Set PASSWORD to be used for retrieving mail from a POP server. +(autoload (quote rmail-set-remote-password) "rmail" "\ +Set PASSWORD to be used for retrieving mail from a POP or IMAP server. \(fn PASSWORD)" t nil) @@ -21042,8 +21283,8 @@ This function is obsolete. ;;;*** -;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (16478 -;;;;;; 51572)) +;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (16908 +;;;;;; 33360)) ;;; Generated autoloads from ruler-mode.el (autoload (quote ruler-mode) "ruler-mode" "\ @@ -21362,7 +21603,7 @@ enclosed in `(and ...)'. ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (16391 49851)) +;;;;;; (16923 3630)) ;;; Generated autoloads from progmodes/scheme.el (autoload (quote scheme-mode) "scheme" "\ @@ -21464,12 +21705,13 @@ apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads (mail-other-frame mail-other-window mail mail-mode -;;;;;; mail-default-directory mail-signature mail-personal-alias-file -;;;;;; 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" (16534 3809)) +;;;### (autoloads (mail-other-frame mail-other-window mail mail-mailing-lists +;;;;;; mail-mode mail-default-directory mail-signature mail-citation-hook +;;;;;; mail-personal-alias-file 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" +;;;;;; (16954 46150)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style (quote angles) "\ @@ -21516,7 +21758,7 @@ nil means let mailer mail back a message to report errors.") (custom-autoload (quote mail-interactive) "sendmail") -(defvar mail-yank-ignored-headers "^via:\\|^mail-from:\\|^origin:\\|^status:\\|^remailed\\|^received:\\|^message-id:\\|^summary-line:\\|^to:\\|^subject:\\|^in-reply-to:\\|^return-path:" "\ +(defvar mail-yank-ignored-headers "^via:\\|^mail-from:\\|^origin:\\|^status:\\|^remailed\\|^received:\\|^message-id:\\|^summary-line:\\|^to:\\|^subject:\\|^in-reply-to:\\|^return-path:\\|^mail-reply-to:\\|^mail-followup-to:" "\ *Delete these headers from old message when it's inserted in a reply.") (custom-autoload (quote mail-yank-ignored-headers) "sendmail") @@ -21565,6 +21807,19 @@ This file need not actually exist.") (custom-autoload (quote mail-personal-alias-file) "sendmail") +(defvar mail-citation-hook nil "\ +*Hook for modifying a citation just inserted in the mail buffer. +Each hook function can find the citation between (point) and (mark t), +and should leave point and mark around the citation text as modified. +The hook functions can find the header of the cited message +in the variable `mail-citation-header', whether or not this is included +in the cited portion of the message. + +If this hook is entirely empty (nil), a default action is taken +instead of no action.") + +(custom-autoload (quote mail-citation-hook) "sendmail") + (defvar mail-signature nil "\ *Text inserted at end of mail buffer when a message is initialized. If t, it means to insert the contents of the file `mail-signature-file'. @@ -21591,6 +21846,8 @@ Here are commands that move to a header field (and create it if there isn't): \\[mail-to] move to To: \\[mail-subject] move to Subject: \\[mail-cc] move to CC: \\[mail-bcc] move to BCC: \\[mail-fcc] move to FCC: \\[mail-reply-to] move to Reply-To: + \\[mail-mail-reply-to] move to Mail-Reply-To: + \\[mail-mail-followup-to] move to Mail-Followup-To: \\[mail-text] mail-text (move to beginning of message text). \\[mail-signature] mail-signature (insert `mail-signature-file' file). \\[mail-yank-original] mail-yank-original (insert current message, in Rmail). @@ -21601,6 +21858,14 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and \(fn)" t nil) +(defvar mail-mailing-lists nil "\ +*List of mailing list addresses the user is subscribed to. + +The variable is used to trigger insertion of the \"Mail-Followup-To\" +header when sending a message to a mailing list.") + +(custom-autoload (quote mail-mailing-lists) "sendmail") + (defvar sendmail-coding-system nil "\ *Coding system for encoding the outgoing mail. This has higher priority than `default-buffer-file-coding-system' @@ -21677,7 +21942,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** ;;;### (autoloads (server-mode server-start) "server" "server.el" -;;;;;; (16764 51518)) +;;;;;; (16908 33360)) ;;; Generated autoloads from server.el (autoload (quote server-start) "server" "\ @@ -21709,7 +21974,7 @@ Server mode runs a process that accepts commands from the ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (16801 58023)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (16923 3608)) ;;; Generated autoloads from ses.el (autoload (quote ses-mode) "ses" "\ @@ -21728,7 +21993,7 @@ These are active only in the minibuffer, when entering or editing a formula: ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (16787 16350)) +;;;;;; (16942 52931)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload (quote sgml-mode) "sgml-mode" "\ @@ -21796,7 +22061,7 @@ To work around that, do: ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (16820 16328)) +;;;;;; (16878 27292)) ;;; Generated autoloads from progmodes/sh-script.el (autoload (quote sh-mode) "sh-script" "\ @@ -21859,7 +22124,7 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (16775 26713)) +;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (16908 33361)) ;;; Generated autoloads from gnus/sha1.el (autoload (quote sha1) "sha1" "\ @@ -22008,7 +22273,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (16775 26714)) +;;;;;; "sieve" "gnus/sieve.el" (16908 33361)) ;;; Generated autoloads from gnus/sieve.el (autoload (quote sieve-manage) "sieve" "\ @@ -22044,8 +22309,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (16213 -;;;;;; 43282)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (16858 +;;;;;; 50937)) ;;; Generated autoloads from progmodes/simula.el (autoload (quote simula-mode) "simula" "\ @@ -22223,7 +22488,7 @@ Minor mode to simplify editing output from the diff3 program. ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (16719 60886)) +;;;;;; (16912 31021)) ;;; Generated autoloads from gnus/smiley.el (autoload (quote smiley-region) "smiley" "\ @@ -22241,7 +22506,7 @@ interactively. If there's no argument, do it at the current buffer ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (16747 61767)) +;;;;;; "mail/smtpmail.el" (16908 33362)) ;;; Generated autoloads from mail/smtpmail.el (autoload (quote smtpmail-send-it) "smtpmail" "\ @@ -22280,7 +22545,7 @@ Snake mode keybindings: ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (16213 43280)) +;;;;;; (16858 50931)) ;;; Generated autoloads from net/snmp-mode.el (autoload (quote snmp-mode) "snmp-mode" "\ @@ -22602,8 +22867,8 @@ From a program takes two point or marker arguments, BEG and END. ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (16777 -;;;;;; 65418)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (16908 +;;;;;; 33362)) ;;; Generated autoloads from gnus/spam.el (autoload (quote spam-initialize) "spam" "\ @@ -22614,7 +22879,7 @@ Install the spam.el hooks and do other initialization ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (16775 26708)) +;;;;;; "speedbar.el" (16931 6984)) ;;; Generated autoloads from speedbar.el (defalias (quote speedbar) (quote speedbar-frame-mode)) @@ -22694,8 +22959,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;### (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" (16536 -;;;;;; 52890)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (16908 +;;;;;; 33362)) ;;; Generated autoloads from progmodes/sql.el (autoload (quote sql-add-product-keywords) "sql" "\ @@ -23257,7 +23522,7 @@ Studlify-case the current buffer. ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (16808 48569)) +;;;;;; (16830 50349)) ;;; Generated autoloads from mail/supercite.el (autoload (quote sc-cite-original) "supercite" "\ @@ -23338,7 +23603,7 @@ The variable `tab-width' controls the spacing of tab stops. ;;;;;; 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" (16779 20952)) +;;;;;; "table" "textmodes/table.el" (16958 58759)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -23936,7 +24201,7 @@ Connect to display DISPLAY for the Emacs talk group. ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (16768 48632)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (16954 46150)) ;;; Generated autoloads from tar-mode.el (autoload (quote tar-mode) "tar-mode" "\ @@ -24038,8 +24303,8 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads (ansi-term term make-term) "term" "term.el" (16805 -;;;;;; 44920)) +;;;### (autoloads (ansi-term term make-term) "term" "term.el" (16829 +;;;;;; 43426)) ;;; Generated autoloads from term.el (autoload (quote make-term) "term" "\ @@ -24146,7 +24411,7 @@ tetris-mode keybindings: ;;;;;; 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" -;;;;;; (16820 16329)) +;;;;;; (16958 58759)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -24448,7 +24713,7 @@ Major mode to edit DocTeX files. ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (16565 48737)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (16939 44105)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload (quote texinfo-format-buffer) "texinfmt" "\ @@ -24488,7 +24753,7 @@ if large. You can use Info-split to do this manually. ;;;*** ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote) -;;;;;; "texinfo" "textmodes/texinfo.el" (16777 65419)) +;;;;;; "texinfo" "textmodes/texinfo.el" (16858 50941)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote "``" "\ @@ -24572,9 +24837,10 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads (thai-composition-function thai-post-read-conversion -;;;;;; thai-compose-buffer thai-compose-string thai-compose-region) -;;;;;; "thai-util" "language/thai-util.el" (16213 43280)) +;;;### (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" +;;;;;; (16954 46150)) ;;; Generated autoloads from language/thai-util.el (autoload (quote thai-compose-region) "thai-util" "\ @@ -24609,6 +24875,11 @@ The return value is number of composed characters. \(fn FROM TO PATTERN &optional STRING)" nil nil) +(autoload (quote thai-auto-composition-mode) "thai-util" "\ +Minor mode for automatically correct Thai character composition. + +\(fn &optional ARG)" t nil) + ;;;*** ;;;### (autoloads (list-at-point number-at-point symbol-at-point @@ -24670,7 +24941,7 @@ Not documented ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show-all thumbs-dired-show-marked ;;;;;; thumbs-show-all-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (16775 26708)) +;;;;;; (16908 33361)) ;;; Generated autoloads from thumbs.el (autoload (quote thumbs-find-thumb) "thumbs" "\ @@ -24812,7 +25083,7 @@ This function performs no refilling of the changed text. ;;;*** ;;;### (autoloads (display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (16484 6599)) +;;;;;; "time" "time.el" (16908 33361)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -25076,7 +25347,7 @@ relative only to the time worked today, and not to past time. ;;;### (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" (16552 32697)) +;;;;;; "emacs-lisp/timer.el" (16908 33361)) ;;; Generated autoloads from emacs-lisp/timer.el (defalias (quote disable-timeout) (quote cancel-timer)) @@ -25380,23 +25651,23 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap. ;;;*** -;;;### (autoloads (tooltip-mode tooltip-mode) "tooltip" "tooltip.el" -;;;;;; (16805 44920)) +;;;### (autoloads (tooltip-mode) "tooltip" "tooltip.el" (16960 18194)) ;;; Generated autoloads from tooltip.el -(autoload (quote tooltip-mode) "tooltip" "\ -Mode for tooltip display. -With ARG, turn tooltip mode on if and only if ARG is positive. - -\(fn &optional ARG)" t nil) - (defvar tooltip-mode nil "\ Non-nil if Tooltip mode is enabled. +See the command `tooltip-mode' for a description of this minor-mode. Setting this variable directly does not take effect; use either \\[customize] or the function `tooltip-mode'.") (custom-autoload (quote tooltip-mode) "tooltip") +(autoload (quote tooltip-mode) "tooltip" "\ +Toggle Tooltip display. +With ARG, turn tooltip mode on if and only if ARG is positive. + +\(fn &optional ARG)" t nil) + ;;;*** ;;;### (autoloads (tpu-edt-on) "tpu-edt" "emulation/tpu-edt.el" (16812 @@ -25449,7 +25720,7 @@ to a tcp server on another machine. ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (16213 43273)) +;;;;;; "trace" "emacs-lisp/trace.el" (16930 25650)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -25482,7 +25753,7 @@ the window or buffer configuration at all. ;;;### (autoloads (tramp-completion-file-name-handler tramp-file-name-handler ;;;;;; tramp-completion-file-name-regexp tramp-file-name-regexp) -;;;;;; "tramp" "net/tramp.el" (16820 16328)) +;;;;;; "tramp" "net/tramp.el" (16958 58758)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@ -25610,7 +25881,7 @@ First column's text sSs Second column's text ;;;;;; 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" -;;;;;; (16768 48632)) +;;;;;; (16884 52115)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -25865,7 +26136,7 @@ of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (16801 58038)) +;;;### (autoloads nil "url" "url/url.el" (16875 35929)) ;;; Generated autoloads from url/url.el (defvar url-configuration-directory "~/.url") @@ -26130,8 +26401,8 @@ Will not make a connexion if `url-gateway-unplugged' is non-nil. ;;;*** ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file -;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (16746 -;;;;;; 18215)) +;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (16829 +;;;;;; 43427)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -26175,7 +26446,7 @@ Not documented ;;;### (autoloads (url-history-save-history url-history-parse-history ;;;;;; url-history-setup-save-timer) "url-history" "url/url-history.el" -;;;;;; (16746 18215)) +;;;;;; (16930 25655)) ;;; Generated autoloads from url/url-history.el (autoload (quote url-history-setup-save-timer) "url-history" "\ @@ -26199,7 +26470,7 @@ user for what type to save as. ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (16812 58719)) +;;;;;; url-http) "url-http" "url/url-http.el" (16912 31025)) ;;; Generated autoloads from url/url-http.el (autoload (quote url-http) "url-http" "\ @@ -26569,7 +26840,7 @@ The buffer in question is current when this function is called. ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal ;;;;;; uudecode-decode-region-external) "uudecode" "gnus/uudecode.el" -;;;;;; (16719 60886)) +;;;;;; (16908 33362)) ;;; Generated autoloads from gnus/uudecode.el (autoload (quote uudecode-decode-region-external) "uudecode" "\ @@ -26599,7 +26870,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;;;; 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-before-checkin-hook vc-checkin-hook -;;;;;; vc-checkout-hook) "vc" "vc.el" (16812 26771)) +;;;;;; vc-checkout-hook) "vc" "vc.el" (16930 4639)) ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ @@ -26881,7 +27152,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-arch" "vc-arch.el" (16764 51519)) +;;;### (autoloads nil "vc-arch" "vc-arch.el" (16866 20008)) ;;; Generated autoloads from vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -26891,7 +27162,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (16812 26771)) +;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (16908 33361)) ;;; Generated autoloads from vc-cvs.el (defun vc-cvs-registered (f) (when (file-readable-p (expand-file-name @@ -26901,7 +27172,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (16777 65418)) +;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (16908 33361)) ;;; Generated autoloads from vc-mcvs.el (defun vc-mcvs-registered (file) (if (vc-find-root file "MCVS/CVS") @@ -26912,7 +27183,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el" -;;;;;; (16801 58024)) +;;;;;; (16858 50920)) ;;; Generated autoloads from vc-rcs.el (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -26942,7 +27213,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc-svn.el" (16683 1170)) +;;;### (autoloads nil "vc-svn" "vc-svn.el" (16908 33361)) ;;; Generated autoloads from vc-svn.el (defun vc-svn-registered (f) (when (file-readable-p (expand-file-name @@ -26955,7 +27226,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (16775 26717)) +;;;;;; (16858 50937)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload (quote vhdl-mode) "vhdl-mode" "\ @@ -27806,7 +28077,7 @@ Turn on VIP emulation of VI. ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (16213 43273)) +;;;;;; (16923 3621)) ;;; Generated autoloads from emulation/viper.el (autoload (quote toggle-viper-mode) "viper" "\ @@ -27823,7 +28094,7 @@ Turn on Viper emulation of Vi. ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" -;;;;;; (16478 51573)) +;;;;;; (16908 33361)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -27906,7 +28177,7 @@ this is equivalent to `display-warning', using ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (16644 49446)) +;;;;;; (16923 3610)) ;;; Generated autoloads from wdired.el (autoload (quote wdired-change-to-wdired-mode) "wdired" "\ @@ -28086,8 +28357,8 @@ With arg, turn widget mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (16820 -;;;;;; 16328)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (16894 +;;;;;; 3340)) ;;; Generated autoloads from wid-edit.el (autoload (quote widgetp) "wid-edit" "\ @@ -28202,7 +28473,7 @@ With arg, turn Winner mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" -;;;;;; "woman.el" (16767 25304)) +;;;;;; "woman.el" (16875 35928)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@ -28351,7 +28622,7 @@ The key bindings are: ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (16814 63075)) +;;;;;; (16830 50347)) ;;; Generated autoloads from xml.el (autoload (quote xml-parse-file) "xml" "\ @@ -28376,8 +28647,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded. ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (16213 -;;;;;; 43272)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (16875 +;;;;;; 35928)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -28441,7 +28712,7 @@ Zippy goes to the analyst. ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (16423 23573)) +;;;### (autoloads (zone) "zone" "play/zone.el" (16858 50933)) ;;; Generated autoloads from play/zone.el (autoload (quote zone) "zone" "\ @@ -28492,11 +28763,11 @@ Zone-mode does two things: ;;;;;; "calendar/cal-coptic.el" "calendar/cal-french.el" "calendar/cal-islam.el" ;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-mayan.el" ;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" -;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/icalendar.el" -;;;;;; "case-table.el" "cdl.el" "cus-dep.el" "cus-load.el" "cus-start.el" -;;;;;; "custom.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" -;;;;;; "ediff-init.el" "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" -;;;;;; "ediff-wind.el" "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el" +;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "case-table.el" +;;;;;; "cdl.el" "cus-dep.el" "cus-start.el" "custom.el" "dos-fns.el" +;;;;;; "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el" +;;;;;; "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el" +;;;;;; "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el" ;;;;;; "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/byte-run.el" ;;;;;; "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" ;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" @@ -28516,28 +28787,28 @@ Zone-mode does two things: ;;;;;; "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" "faces.el" "files.el" "filesets.el" "finder-inf.el" -;;;;;; "foldout.el" "font-core.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" -;;;;;; "gnus/gnus-demon.el" "gnus/gnus-diary.el" "gnus/gnus-dup.el" -;;;;;; "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-gl.el" -;;;;;; "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el" -;;;;;; "gnus/gnus-nocem.el" "gnus/gnus-salt.el" "gnus/gnus-score.el" -;;;;;; "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-sum.el" -;;;;;; "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el" -;;;;;; "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/hex-util.el" "gnus/ietf-drums.el" -;;;;;; "gnus/imap.el" "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" -;;;;;; "gnus/mail-prsvr.el" "gnus/mail-source.el" "gnus/mailcap.el" -;;;;;; "gnus/messcompat.el" "gnus/mm-bodies.el" "gnus/mm-decode.el" -;;;;;; "gnus/mm-encode.el" "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el" -;;;;;; "gnus/mml-smime.el" "gnus/mml.el" "gnus/nnagent.el" "gnus/nnbabyl.el" -;;;;;; "gnus/nndb.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el" -;;;;;; "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnlistserv.el" +;;;;;; "eshell/esh-cmd.el" "eshell/esh-ext.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" +;;;;;; "faces.el" "files.el" "filesets.el" "foldout.el" "font-core.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" "gnus/gnus-demon.el" "gnus/gnus-diary.el" +;;;;;; "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el" +;;;;;; "gnus/gnus-gl.el" "gnus/gnus-int.el" "gnus/gnus-logic.el" +;;;;;; "gnus/gnus-mh.el" "gnus/gnus-nocem.el" "gnus/gnus-salt.el" +;;;;;; "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el" +;;;;;; "gnus/gnus-sum.el" "gnus/gnus-topic.el" "gnus/gnus-undo.el" +;;;;;; "gnus/gnus-util.el" "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/hex-util.el" +;;;;;; "gnus/ietf-drums.el" "gnus/imap.el" "gnus/legacy-gnus-agent.el" +;;;;;; "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el" +;;;;;; "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-bodies.el" +;;;;;; "gnus/mm-decode.el" "gnus/mm-encode.el" "gnus/mm-util.el" +;;;;;; "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/mml.el" +;;;;;; "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndb.el" "gnus/nndir.el" +;;;;;; "gnus/nndraft.el" "gnus/nneething.el" "gnus/nngateway.el" +;;;;;; "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnlistserv.el" ;;;;;; "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmbox.el" "gnus/nnmh.el" ;;;;;; "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnrss.el" "gnus/nnslashdot.el" ;;;;;; "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnultimate.el" "gnus/nnvirtual.el" @@ -28565,10 +28836,10 @@ Zone-mode does two things: ;;;;;; "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.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" +;;;;;; "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" @@ -28579,27 +28850,27 @@ Zone-mode does two things: ;;;;;; "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/float.el" "obsolete/hilit19.el" "obsolete/mlsupport.el" -;;;;;; "obsolete/ooutline.el" "obsolete/profile.el" "obsolete/rnews.el" -;;;;;; "obsolete/sc.el" "obsolete/sun-curs.el" "obsolete/sun-fns.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" -;;;;;; "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-engine.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" -;;;;;; "progmodes/cc-menus.el" "progmodes/cc-vars.el" "progmodes/ebnf-abn.el" -;;;;;; "progmodes/ebnf-bnf.el" "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" -;;;;;; "progmodes/ebnf-iso.el" "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.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" "scroll-bar.el" -;;;;;; "select.el" "simple.el" "soundex.el" "startup.el" "subdirs.el" -;;;;;; "subr.el" "tempo.el" "term/AT386.el" "term/apollo.el" "term/bg-mouse.el" -;;;;;; "term/bobcat.el" "term/internal.el" "term/iris-ansi.el" "term/keyswap.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" +;;;;;; "obsolete/float.el" "obsolete/hilit19.el" "obsolete/keyswap.el" +;;;;;; "obsolete/mlsupport.el" "obsolete/ooutline.el" "obsolete/profile.el" +;;;;;; "obsolete/rnews.el" "obsolete/sc.el" "obsolete/sun-curs.el" +;;;;;; "obsolete/sun-fns.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" "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-engine.el" +;;;;;; "progmodes/cc-fonts.el" "progmodes/cc-langs.el" "progmodes/cc-menus.el" +;;;;;; "progmodes/cc-vars.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" +;;;;;; "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el" +;;;;;; "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.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" "scroll-bar.el" "select.el" "simple.el" "soundex.el" +;;;;;; "startup.el" "subdirs.el" "subr.el" "tempo.el" "term/AT386.el" +;;;;;; "term/apollo.el" "term/bg-mouse.el" "term/bobcat.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" @@ -28607,15 +28878,15 @@ Zone-mode does two things: ;;;;;; "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-global.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" "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") (16820 23750 66854)) +;;;;;; "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" "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") (16960 18483 123965)) ;;;*** diff --git a/lisp/man.el b/lisp/man.el index 02661c5551..8c384028e1 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1305,7 +1305,9 @@ Specify which REFERENCE to use; default is based on word at point." (error "There are no references in the current man page") (list (let* ((default (or (car (all-completions - (let ((word (Man-possibly-hyphenated-word))) + (let ((word + (or (Man-possibly-hyphenated-word) + ""))) ;; strip a trailing '-': (if (string-match "-$" word) (substring word 0 diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 8dfb6a792d..d988cae126 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1,6 +1,7 @@ ;;; menu-bar.el --- define a default menu bar -;; Copyright (C) 1993,94,1995,2000,01,02,2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2005 +;; Free Software Foundation, Inc. ;; Author: RMS ;; Maintainer: FSF @@ -596,7 +597,7 @@ DOC is the text to use for the menu entry. HELP is the text to use for the tooltip. PROPS are additional properties." `'(menu-item ,doc ,fname - ,@(if props props) + ,@props :help ,help :button (:toggle . (and (default-boundp ',fname) (default-value ',fname))))) @@ -693,18 +694,10 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-showhide-menu [linecolumn-separator] '("--")) -(defun showhide-date-time () - "Toggle whether to show date and time in the mode-line." - (interactive) - (if (display-time-mode) - (message "Display-time mode enabled.") - (message "Display-time mode disabled.")) - (customize-mark-as-set 'display-time-mode)) - (define-key menu-bar-showhide-menu [showhide-date-time] - '(menu-item "Date, Time and Mail" showhide-date-time - :help "Display date, time, mail status in mode line" - :button (:toggle . display-time-mode))) + (menu-bar-make-mm-toggle display-time-mode + "Date, Time and Mail" + "Display date, time, mail status in mode line")) (define-key menu-bar-showhide-menu [datetime-separator] '("--")) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 55ab9e693f..ebdbc354ec 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -1,8 +1,8 @@ ;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*- -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -;; Author: Michael Albinus <[email protected]> +;; Author: Michael Albinus <[email protected]> ;; Keywords: comm, processes ;; This file is part of GNU Emacs. @@ -75,7 +75,7 @@ :group 'tramp :type 'string) -(defconst tramp-smb-prompt "^smb: \\S-+> \\|^\\s-+Server\\s-+Comment$" +(defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$" "Regexp used as prompt in smbclient.") (defconst tramp-smb-errors @@ -235,10 +235,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." (file-exists-p newname)) (error "copy-file: file %s already exists" newname)) -; (with-parsed-tramp-file-name newname nil - (let (user host localname) - (with-parsed-tramp-file-name newname l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name newname nil (save-excursion (let ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname t))) @@ -258,59 +255,46 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." (defun tramp-smb-handle-delete-directory (directory) "Like `delete-directory' for tramp files." (setq directory (directory-file-name (expand-file-name directory))) - (unless (file-exists-p directory) - (error "Cannot delete non-existing directory `%s'" directory)) -; (with-parsed-tramp-file-name directory nil - (let (user host localname) - (with-parsed-tramp-file-name directory l - (setq user l-user host l-host localname l-localname)) - (save-excursion - (let ((share (tramp-smb-get-share localname)) - (dir (tramp-smb-get-localname (file-name-directory localname) t)) - (file (file-name-nondirectory localname))) - (tramp-smb-maybe-open-connection user host share) - (if (and - (tramp-smb-send-command user host (format "cd \"%s\"" dir)) - (tramp-smb-send-command user host (format "rmdir \"%s\"" file))) - ;; Go Home + (when (file-exists-p directory) + (with-parsed-tramp-file-name directory nil + (save-excursion + (let ((share (tramp-smb-get-share localname)) + (dir (tramp-smb-get-localname (file-name-directory localname) t)) + (file (file-name-nondirectory localname))) + (tramp-smb-maybe-open-connection user host share) + (if (and + (tramp-smb-send-command user host (format "cd \"%s\"" dir)) + (tramp-smb-send-command user host (format "rmdir \"%s\"" file))) + ;; Go Home + (tramp-smb-send-command user host (format "cd \\")) + ;; Error (tramp-smb-send-command user host (format "cd \\")) - ;; Error - (tramp-smb-send-command user host (format "cd \\")) - (error "Cannot delete directory `%s'" directory)))))) + (error "Cannot delete directory `%s'" directory))))))) (defun tramp-smb-handle-delete-file (filename) "Like `delete-file' for tramp files." (setq filename (expand-file-name filename)) - (unless (file-exists-p filename) - (error "Cannot delete non-existing file `%s'" filename)) -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) - (save-excursion - (let ((share (tramp-smb-get-share localname)) - (dir (tramp-smb-get-localname (file-name-directory localname) t)) - (file (file-name-nondirectory localname))) - (unless (file-exists-p filename) - (error "Cannot delete non-existing file `%s'" filename)) - (tramp-smb-maybe-open-connection user host share) - (if (and - (tramp-smb-send-command user host (format "cd \"%s\"" dir)) - (tramp-smb-send-command user host (format "rm \"%s\"" file))) - ;; Go Home + (when (file-exists-p filename) + (with-parsed-tramp-file-name filename nil + (save-excursion + (let ((share (tramp-smb-get-share localname)) + (dir (tramp-smb-get-localname (file-name-directory localname) t)) + (file (file-name-nondirectory localname))) + (tramp-smb-maybe-open-connection user host share) + (if (and + (tramp-smb-send-command user host (format "cd \"%s\"" dir)) + (tramp-smb-send-command user host (format "rm \"%s\"" file))) + ;; Go Home + (tramp-smb-send-command user host (format "cd \\")) + ;; Error (tramp-smb-send-command user host (format "cd \\")) - ;; Error - (tramp-smb-send-command user host (format "cd \\")) - (error "Cannot delete file `%s'" filename)))))) + (error "Cannot delete file `%s'" filename))))))) (defun tramp-smb-handle-directory-files (directory &optional full match nosort) "Like `directory-files' for tramp files." (setq directory (directory-file-name (expand-file-name directory))) -; (with-parsed-tramp-file-name directory nil - (let (user host localname) - (with-parsed-tramp-file-name directory l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name directory nil (save-excursion (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil)) @@ -340,17 +324,14 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." (mapcar (lambda (x) ;; We cannot call `file-attributes' for backward compatibility reasons. - ;; Its optional parameter ID-FORMAT is introduced with Emacs 22.1. + ;; Its optional parameter ID-FORMAT is introduced with Emacs 22. (cons x (tramp-smb-handle-file-attributes (if full x (concat (file-name-as-directory directory) x)) id-format))) (directory-files directory full match nosort))) (defun tramp-smb-handle-file-attributes (filename &optional id-format) "Like `file-attributes' for tramp files." -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name filename nil (save-excursion (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil)) @@ -380,10 +361,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." (defun tramp-smb-handle-file-directory-p (filename) "Like `file-directory-p' for tramp files." -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name filename nil (save-excursion (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil)) @@ -396,10 +374,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." (defun tramp-smb-handle-file-exists-p (filename) "Like `file-exists-p' for tramp files." -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name filename nil (save-excursion (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil)) @@ -433,10 +408,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." ;; files. (defun tramp-smb-handle-file-name-all-completions (filename directory) "Like `file-name-all-completions' for tramp files." -; (with-parsed-tramp-file-name directory nil - (let (user host localname) - (with-parsed-tramp-file-name directory l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name directory nil (save-match-data (save-excursion (let* ((share (tramp-smb-get-share localname)) @@ -467,10 +439,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server." (let ((dir (file-name-directory filename))) (and (file-exists-p dir) (file-writable-p dir))) -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name filename nil (save-excursion (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil)) @@ -490,10 +459,7 @@ WILDCARD and FULL-DIRECTORY-P are not handled." ;; This check is a little bit strange, but in `dired-add-entry' ;; this function is called with a non-directory ... (setq filename (file-name-as-directory filename))) -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name filename nil (save-match-data (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil)) @@ -543,10 +509,7 @@ WILDCARD and FULL-DIRECTORY-P are not handled." (setq dir (directory-file-name (expand-file-name dir))) (unless (file-name-absolute-p dir) (setq dir (concat default-directory dir))) -; (with-parsed-tramp-file-name dir nil - (let (user host localname) - (with-parsed-tramp-file-name dir l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name dir nil (save-match-data (let* ((share (tramp-smb-get-share localname)) (ldir (file-name-directory dir))) @@ -564,10 +527,7 @@ WILDCARD and FULL-DIRECTORY-P are not handled." (setq directory (directory-file-name (expand-file-name directory))) (unless (file-name-absolute-p directory) (setq directory (concat default-directory directory))) -; (with-parsed-tramp-file-name directory nil - (let (user host localname) - (with-parsed-tramp-file-name directory l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name directory nil (save-match-data (let* ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname nil))) @@ -597,10 +557,7 @@ WILDCARD and FULL-DIRECTORY-P are not handled." (file-exists-p newname)) (error "rename-file: file %s already exists" newname)) -; (with-parsed-tramp-file-name newname nil - (let (user host localname) - (with-parsed-tramp-file-name newname l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name newname nil (save-excursion (let ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname t))) @@ -636,10 +593,7 @@ Catches errors for shares like \"C$/\", which are common in Microsoft Windows." (unless (y-or-n-p (format "File %s exists; overwrite anyway? " filename)) (error "File not overwritten"))) -; (with-parsed-tramp-file-name filename nil - (let (user host localname) - (with-parsed-tramp-file-name filename l - (setq user l-user host l-host localname l-localname)) + (with-parsed-tramp-file-name filename nil (save-excursion (let ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname t)) @@ -969,6 +923,10 @@ then sends the password to the remote host. Domain names in USER and port numbers in HOST are acknowledged." + (when (and (fboundp 'executable-find) + (not (funcall 'executable-find tramp-smb-program))) + (error "Cannot find command %s in %s" tramp-smb-program exec-path)) + (save-match-data (let* ((buffer (tramp-get-buffer nil tramp-smb-method user host)) (real-user user) diff --git a/lisp/net/tramp-util.el b/lisp/net/tramp-util.el index 8f195fe4ad..1621c2c818 100644 --- a/lisp/net/tramp-util.el +++ b/lisp/net/tramp-util.el @@ -34,7 +34,7 @@ ;; Define a Tramp minor mode. It's intention is to redefine some keys for Tramp ;; specific functions, like compilation. -;; The key remapping works since Emacs 22.1 only. Unknown for XEmacs. +;; The key remapping works since Emacs 22 only. Unknown for XEmacs. (when (fboundp 'define-minor-mode) @@ -59,10 +59,10 @@ If remapping functionality for keymaps is defined, this happens for all bindings. Otherwise, only bindings active during invocation are taken into account. XEmacs menubar bindings are not changed by this." (if (functionp 'command-remapping) - ;; Emacs 22.1 + ;; Emacs 22 (eval `(define-key tramp-minor-mode-map [remap ,old-command] new-command)) - ;; previous Emacs 21 versions. + ;; previous Emacs versions. (mapcar '(lambda (x) (define-key tramp-minor-mode-map x new-command)) diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el index 7c75b0f01c..c58d83504c 100644 --- a/lisp/net/tramp-vc.el +++ b/lisp/net/tramp-vc.el @@ -1,6 +1,6 @@ ;;; tramp-vc.el --- Version control integration for TRAMP.el -;; Copyright (C) 2000, 2001, 2002, 2003, 2004 by Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc. ;; Author: Daniel Pittman <[email protected]> ;; Keywords: comm, processes @@ -409,7 +409,7 @@ filename we are thinking about..." ;; boundness-checking into this function? (let* ((file (symbol-value 'file)) (remote-uid - ;; With Emacs 22.1, `file-attributes' has got an optional parameter + ;; With Emacs 22, `file-attributes' has got an optional parameter ;; ID-FORMAT. Handle this case backwards compatible. (if (and (functionp 'subr-arity) (= 2 (cdr (funcall (symbol-function 'subr-arity) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 14682975fe..bfdf7ed067 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -47,16 +47,12 @@ ;; Also see the todo list at the bottom of this file. ;; ;; The current version of Tramp can be retrieved from the following URL: -;; http://savannah.nongnu.org/download/tramp/ +;; http://ftp.gnu.org/gnu/tramp/ ;; ;; There's a mailing list for this, as well. Its name is: -;; Send a mail with `help' in the subject (!) to the administration -;; address for instructions on joining the list. The administration -;; address is: -;; You can also use the Web to subscribe, under the following URL: -;; http://mail.freesoftware.fsf.org/mailman/listinfo/tramp-devel +;; You can use the Web to subscribe, under the following URL: +;; http://lists.gnu.org/mailman/listinfo/tramp-devel ;; ;; For the adventurous, the current development sources are available ;; via CVS. You can find instructions about this at the following URL: @@ -3501,7 +3497,7 @@ Used in `tramp-handle-shell-command'") This will break if COMMAND prints a newline, followed by the value of `tramp-end-of-output', followed by another newline." ;; Asynchronous processes are far from being perfect. But it works at least - ;; for `find-grep-dired' and `find-name-dired' in Emacs 22.1. + ;; for `find-grep-dired' and `find-name-dired' in Emacs 22. (if (tramp-tramp-file-p default-directory) (with-parsed-tramp-file-name default-directory nil (let ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command)) @@ -4108,7 +4104,7 @@ ARGS are the arguments OPERATION has been called with." (list 'dired-call-process ; Emacs only 'shell-command - ; Post Emacs 21.3 only + ; Emacs 22 only 'process-file ; XEmacs only 'dired-print-file 'dired-shell-call-process)) @@ -4213,7 +4209,7 @@ Falls back to normal file name handler if no tramp file name handler exists." (defun tramp-repair-jka-compr () "If jka-compr is already loaded, move it to the front of -`file-name-handler-alist'. On Emacs 22.1 or so this will not be +`file-name-handler-alist'. On Emacs 22 or so this will not be necessary anymore." (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist))) (when jka @@ -6937,8 +6933,8 @@ as default." (tramp-make-auto-save-file-name (buffer-file-name))) ad-do-it)) -;; In Emacs < 22.1 and XEmacs < 21.5 autosaved remote files have -;; permission 666 minus umask. This is a security threat. +;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have +;; permission 0666 minus umask. This is a security threat. (defun tramp-set-auto-save-file-modes () "Set permissions of autosaved remote files to the original permissions." @@ -6946,20 +6942,18 @@ as default." (when (and (stringp bfn) (tramp-tramp-file-p bfn) (stringp buffer-auto-save-file-name) - (not (equal bfn buffer-auto-save-file-name)) - (not (file-exists-p buffer-auto-save-file-name))) - (write-region "" nil buffer-auto-save-file-name) + (not (equal bfn buffer-auto-save-file-name))) + (unless (file-exists-p buffer-auto-save-file-name) + (write-region "" nil buffer-auto-save-file-name)) + ;; Permissions should be set always, because there might be an old + ;; auto-saved file belonging to another original file. This could + ;; be a security threat. (set-file-modes buffer-auto-save-file-name (file-modes bfn))))) (unless (or (> emacs-major-version 21) (and (featurep 'xemacs) (= emacs-major-version 21) - (> emacs-minor-version 4)) - (and (not (featurep 'xemacs)) - (= emacs-major-version 21) - (or (> emacs-minor-version 3) - (and (string-match "^21\\.3\\.\\([0-9]+\\)" emacs-version) - (>= (string-to-int (match-string 1 emacs-version)) 50))))) + (> emacs-minor-version 4))) (add-hook 'auto-save-hook 'tramp-set-auto-save-file-modes)) (defun tramp-subst-strs-in-string (alist string) @@ -7206,72 +7200,73 @@ Only works for Bourne-like shells." "Submit a bug report to the TRAMP developers." (interactive) (require 'reporter) - (let ((reporter-prompt-for-summary-p t)) - (reporter-submit-bug-report - tramp-bug-report-address ; to-address - (format "tramp (%s)" tramp-version) ; package name and version - `(;; Current state - tramp-ls-command - tramp-test-groks-nt - tramp-file-exists-command - tramp-current-multi-method - tramp-current-method - tramp-current-user - tramp-current-host - - ;; System defaults - tramp-auto-save-directory ; vars to dump - tramp-default-method - tramp-rsh-end-of-line - tramp-default-password-end-of-line - tramp-remote-path - tramp-login-prompt-regexp - tramp-password-prompt-regexp - tramp-wrong-passwd-regexp - tramp-yesno-prompt-regexp - tramp-yn-prompt-regexp - tramp-terminal-prompt-regexp - tramp-out-of-band-prompt-regexp - tramp-temp-name-prefix - tramp-file-name-structure - tramp-file-name-regexp - tramp-multi-file-name-structure - tramp-multi-file-name-hop-structure - tramp-multi-methods - tramp-multi-connection-function-alist - tramp-methods - tramp-end-of-output - tramp-coding-commands - tramp-actions-before-shell - tramp-actions-copy-out-of-band - tramp-multi-actions - tramp-terminal-type - tramp-shell-prompt-pattern - tramp-chunksize - ,(when (boundp 'tramp-backup-directory-alist) - 'tramp-backup-directory-alist) - ,(when (boundp 'tramp-bkup-backup-directory-info) - 'tramp-bkup-backup-directory-info) - - ;; Non-tramp variables of interest - shell-prompt-pattern - backup-by-copying - backup-by-copying-when-linked - backup-by-copying-when-mismatch - ,(when (boundp 'backup-by-copying-when-privileged-mismatch) - 'backup-by-copying-when-privileged-mismatch) - ,(when (boundp 'password-cache) - 'password-cache) - ,(when (boundp 'password-cache-expiry) - 'password-cache-expiry) - ,(when (boundp 'backup-directory-alist) - 'backup-directory-alist) - ,(when (boundp 'bkup-backup-directory-info) - 'bkup-backup-directory-info) - file-name-handler-alist) - nil ; pre-hook - nil ; post-hook - "\ + (catch 'dont-send + (let ((reporter-prompt-for-summary-p t)) + (reporter-submit-bug-report + tramp-bug-report-address ; to-address + (format "tramp (%s)" tramp-version) ; package name and version + `(;; Current state + tramp-ls-command + tramp-test-groks-nt + tramp-file-exists-command + tramp-current-multi-method + tramp-current-method + tramp-current-user + tramp-current-host + + ;; System defaults + tramp-auto-save-directory ; vars to dump + tramp-default-method + tramp-rsh-end-of-line + tramp-default-password-end-of-line + tramp-remote-path + tramp-login-prompt-regexp + tramp-password-prompt-regexp + tramp-wrong-passwd-regexp + tramp-yesno-prompt-regexp + tramp-yn-prompt-regexp + tramp-terminal-prompt-regexp + tramp-out-of-band-prompt-regexp + tramp-temp-name-prefix + tramp-file-name-structure + tramp-file-name-regexp + tramp-multi-file-name-structure + tramp-multi-file-name-hop-structure + tramp-multi-methods + tramp-multi-connection-function-alist + tramp-methods + tramp-end-of-output + tramp-coding-commands + tramp-actions-before-shell + tramp-actions-copy-out-of-band + tramp-multi-actions + tramp-terminal-type + tramp-shell-prompt-pattern + tramp-chunksize + ,(when (boundp 'tramp-backup-directory-alist) + 'tramp-backup-directory-alist) + ,(when (boundp 'tramp-bkup-backup-directory-info) + 'tramp-bkup-backup-directory-info) + + ;; Non-tramp variables of interest + shell-prompt-pattern + backup-by-copying + backup-by-copying-when-linked + backup-by-copying-when-mismatch + ,(when (boundp 'backup-by-copying-when-privileged-mismatch) + 'backup-by-copying-when-privileged-mismatch) + ,(when (boundp 'password-cache) + 'password-cache) + ,(when (boundp 'password-cache-expiry) + 'password-cache-expiry) + ,(when (boundp 'backup-directory-alist) + 'backup-directory-alist) + ,(when (boundp 'bkup-backup-directory-info) + 'bkup-backup-directory-info) + file-name-handler-alist) + nil ; pre-hook + 'tramp-append-tramp-buffers ; post-hook + "\ Enter your bug report in this message, including as much detail as you possibly can about the problem, what you did to cause it and what the local and remote machines are. @@ -7286,7 +7281,73 @@ of the *tramp/foo* buffer and the *debug tramp/foo* buffer in your bug report. --bug report follows this line-- -"))) +")))) + +(defun tramp-append-tramp-buffers () + "Append Tramp buffers into the bug report." + + ;; We load mml.el from Gnus. + (if (featurep 'xemacs) + (load "mml" 'noerror) + (require 'mml nil 'noerror)) + + (when (and + ;; We don't want to add another dependency. + (functionp 'mml-insert-empty-tag) + ;; 2nd parameter since Emacs 22. + (condition-case nil + (list-buffers-noselect nil nil) + (t nil))) + (let ((buffer-list + (delq nil + (mapcar '(lambda (b) + (when (string-match "^\\*\\(debug \\)?tramp/" (buffer-name b)) b)) + (buffer-list)))) + (curbuf (current-buffer))) + + ;; There is at least one Tramp buffer. + (when buffer-list + (switch-to-buffer (list-buffers-noselect nil buffer-list)) + (delete-other-windows) + (setq buffer-read-only nil) + (goto-char (point-max)) + (insert " +The buffer(s) above will be appended to this message. If you don't want +to append a buffer because it contains sensible data, or because the buffer +is too large, you should delete the respective buffer. The buffer(s) will +contain user and host names. Passwords will never be included there.") + + (when (and tramp-debug-buffer (> tramp-verbose 9)) + (insert "\n\n") + (let ((start (point))) + (insert "\ +Please note that you have set `tramp-verbose' to a value greater than 9. +Therefore, the contents of files might be included in the debug buffer(s).") + (add-text-properties start (point) (list 'face 'italic)))) + + (set-buffer-modified-p nil) + (setq buffer-read-only t) + (goto-char (point-min)) + + (if (y-or-n-p "Do you want to append the buffer(s)? ") + ;; OK, let's send. First we delete the buffer list. + (progn + (kill-buffer nil) + (switch-to-buffer curbuf) + (goto-char (point-max)) + (insert "\n\n") + (dolist (buffer buffer-list) + (mml-insert-empty-tag + 'part 'type "text/plain" 'encoding "base64" + 'disposition "attachment" 'buffer (buffer-name buffer) + 'description (buffer-name buffer))) + (set-buffer-modified-p nil)) + + ;; Don't send. Delete the message buffer. + (set-buffer curbuf) + (set-buffer-modified-p nil) + (kill-buffer nil) + (throw 'dont-send nil)))))) (defalias 'tramp-submit-bug 'tramp-bug) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index a4aced2425..12e56600f0 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -30,10 +30,10 @@ ;; are auto-frobbed from configure.ac, so you should edit that file and run ;; "autoconf && ./configure" to change them. -(defconst tramp-version "2.0.47" +(defconst tramp-version "2.0.48" "This version of Tramp.") -(defconst tramp-bug-report-address "[email protected]" +(defconst tramp-bug-report-address "[email protected]" "Email address to send bug reports to.") (provide 'trampver) diff --git a/lisp/term/keyswap.el b/lisp/obsolete/keyswap.el index d636a22bb9..d636a22bb9 100644 --- a/lisp/term/keyswap.el +++ b/lisp/obsolete/keyswap.el diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 81ed7780a6..b52e004e5b 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -78,7 +78,7 @@ (defvar dcl-font-lock-keywords '(("\\<\\(if\\|then\\|else\\|endif\\)\\>" 1 font-lock-keyword-face) - ("\\<f[$][a-z]+\\>" + ("\\<f[$][a-z_]+\\>" 0 font-lock-builtin-face) ("[.]\\(eq\\|not\\|or\\|and\\|lt\\|gt\\|le\\|ge\\|eqs\\|nes\\)[.]" 0 font-lock-builtin-face)) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 86d0bfaaf4..c71f067ca2 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -1160,20 +1160,34 @@ static char *magick[] = { (define-fringe-bitmap 'breakpoint "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")) -(defface breakpoint-enabled-bitmap-face - '((t - :inherit fringe +(defface breakpoint-enabled + '((((type tty)) + :weight bold + :foreground "red") + (t + :weight bold :foreground "red")) "Face for enabled breakpoint icon in fringe." :group 'gud) - -(defface breakpoint-disabled-bitmap-face - '((t - :inherit fringe - :foreground "grey60")) +;; compatibility alias for old name +(put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled) + +(defface breakpoint-disabled + ;; We use different values of grey for different background types, + ;; so that on low-color displays it will end up as something visible + ;; if it has to be approximated. + '((((type tty) (background dark)) + :foreground "grey60") + (((type tty) (background light)) + :foreground "grey40") + (((background dark)) + :foreground "grey60") + (((background light)) + :foreground "grey40")) "Face for disabled breakpoint icon in fringe." :group 'gud) - +;; compatibility alias for old name +(put 'breakpoint-disabled-bitmap-face 'face-alias 'breakpoint-disabled) ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer) (defun gdb-info-breakpoints-custom () @@ -2194,8 +2208,8 @@ BUFFER nil or omitted means use the current buffer." nil (1+ start) `(left-fringe breakpoint ,(if enabled - 'breakpoint-enabled-bitmap-face - 'breakpoint-disabled-bitmap-face))) + 'breakpoint-enabled + 'breakpoint-disabled))) (when (< left-margin-width 2) (save-current-buffer (setq left-margin-width 2) @@ -2232,7 +2246,10 @@ BUFFER nil or omitted means use the current buffer." (set-window-margins (get-buffer-window (current-buffer) 0) left-margin-width right-margin-width)))) - (gdb-put-string putstring (1+ start))))) + (gdb-put-string + (propertize putstring + 'face (if enabled 'breakpoint-enabled 'breakpoint-disabled)) + (1+ start))))) (defun gdb-remove-breakpoint-icons (start end &optional remove-margin) (gdb-remove-strings start end) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index c6a70173e6..8eba384730 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -7926,7 +7926,7 @@ If we do not know about MODULE, just return KEYWORD literally." "\n Source information truncated to %d entries." idlwave-rinfo-max-source-lines)) (setq all nil))) - (beginning-of-buffer) + (goto-char (point-min)) (setq buffer-read-only t)) (display-buffer "*Help*") (if (and (setq win (get-buffer-window "*Help*")) diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index 2bd30da0bf..6fcd16e97c 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -207,11 +207,11 @@ The expansion is entirely correct because it uses the C preprocessor." '("\\<\\(local\\|my\\)\\>" . font-lock-type-face) ;; ;; Fontify function, variable and file name references. - '("&\\(\\sw+\\)" 1 font-lock-function-name-face) + '("&\\(\\sw+\\(::\\sw+\\)*\\)" 1 font-lock-function-name-face) ;; Additionally underline non-scalar variables. Maybe this is a bad idea. ;;'("[$@%*][#{]?\\(\\sw+\\)" 1 font-lock-variable-name-face) - '("[$*]{?\\(\\sw+\\)" 1 font-lock-variable-name-face) - '("\\([@%]\\|\\$#\\)\\(\\sw+\\)" + '("[$*]{?\\(\\sw+\\(::\\sw+\\)*\\)" 1 font-lock-variable-name-face) + '("\\([@%]\\|\\$#\\)\\(\\sw+\\(::\\sw+\\)*\\)" (2 (cons font-lock-variable-name-face '(underline)))) '("<\\(\\sw+\\)>" 1 font-lock-constant-face) ;; @@ -330,30 +330,34 @@ The expansion is entirely correct because it uses the C preprocessor." nil nil state 'syntax-table))) ;; The open/close chars are matched like () [] {} and <>. (let ((parse-sexp-lookup-properties nil)) - (ignore-errors - (with-syntax-table st - (goto-char (nth 8 state)) (forward-sexp 1)) - (when twoargs - (save-excursion - ;; Skip whitespace and make sure that font-lock will - ;; refontify the second part in the proper context. - (put-text-property - (point) (progn (forward-comment (point-max)) (point)) - 'font-lock-multiline t) - ;; - (unless - (save-excursion - (let* ((char2 (char-after)) - (st2 (perl-quote-syntax-table char2))) - (with-syntax-table st2 (forward-sexp 1)) - (put-text-property pos (line-end-position) - 'jit-lock-defer-multiline t) - (looking-at "\\s-*\\sw*e"))) - (put-text-property (point) (1+ (point)) - 'syntax-table - (if (assoc (char-after) - perl-quote-like-pairs) - '(15) '(7))))))))) + (condition-case err + (progn + (with-syntax-table st + (goto-char (nth 8 state)) (forward-sexp 1)) + (when twoargs + (save-excursion + ;; Skip whitespace and make sure that font-lock will + ;; refontify the second part in the proper context. + (put-text-property + (point) (progn (forward-comment (point-max)) (point)) + 'font-lock-multiline t) + ;; + (unless + (save-excursion + (with-syntax-table + (perl-quote-syntax-table (char-after)) + (forward-sexp 1)) + (put-text-property pos (line-end-position) + 'jit-lock-defer-multiline t) + (looking-at "\\s-*\\sw*e")) + (put-text-property (point) (1+ (point)) + 'syntax-table + (if (assoc (char-after) + perl-quote-like-pairs) + '(15) '(7))))))) + ;; The arg(s) is not terminated, so it extends until EOB. + (scan-error (goto-char (point-max)))))) + ;; Point is now right after the arg(s). ;; Erase any syntactic marks within the quoted text. (put-text-property pos (1- (point)) 'syntax-table nil) (when (eq (char-before (1- (point))) ?$) @@ -649,20 +653,7 @@ changed by, or (parse-state) if line starts in a quoted string." ((looking-at (or nochange perl-nochange)) 0) (t (skip-chars-forward " \t\f") - (cond ((looking-at "\\(\\w\\|\\s_\\)+:[^:]") - (setq indent (max 1 (+ indent perl-label-offset)))) - ((= (char-syntax (following-char)) ?\)) - (setq indent - (save-excursion - (forward-char 1) - (forward-sexp -1) - (forward-char 1) - (if (perl-hanging-paren-p) - (- indent perl-indent-level) - (forward-char -1) - (current-column))))) - ((= (following-char) ?{) - (setq indent (+ indent perl-brace-offset)))) + (setq indent (perl-indent-new-calculate nil indent bof)) (- indent (current-column))))) (skip-chars-forward " \t\f") (if (and (numberp shift-amt) (/= 0 shift-amt)) @@ -698,13 +689,30 @@ changed by, or (parse-state) if line starts in a quoted string." (save-excursion (skip-syntax-backward " (") (not (bolp))))) +(defun perl-indent-new-calculate (&optional virtual default parse-start) + (or + (and virtual (save-excursion (skip-chars-backward " \t") (bolp)) + (current-column)) + (and (looking-at "\\(\\w\\|\\s_\\)+:[^:]") + (max 1 (+ (or default (perl-calculate-indent parse-start)) + perl-label-offset))) + (and (= (char-syntax (following-char)) ?\)) + (save-excursion + (forward-char 1) + (forward-sexp -1) + (perl-indent-new-calculate 'virtual nil parse-start))) + (and (and (= (following-char) ?{) + (save-excursion (forward-char) (perl-hanging-paren-p))) + (+ (or default (perl-calculate-indent parse-start)) + perl-brace-offset)) + (or default (perl-calculate-indent parse-start)))) + (defun perl-calculate-indent (&optional parse-start) "Return appropriate indentation for current line as Perl code. In usual case returns an integer: the column to indent to. Returns (parse-state) if line starts inside a string. Optional argument PARSE-START should be the position of `beginning-of-defun'." (save-excursion - (beginning-of-line) (let ((indent-point (point)) (case-fold-search nil) (colon-line-end 0) diff --git a/lisp/ps-print.el b/lisp/ps-print.el index d8c8f1f6de..726b0e4402 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1,7 +1,7 @@ ;;; ps-print.el --- print text from the buffer as PostScript ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jim Thompson (was <[email protected]>) ;; Jacques Duthen (was <[email protected]>) @@ -10,12 +10,12 @@ ;; Maintainer: Kenichi Handa <[email protected]> (multi-byte characters) ;; Vinicius Jose Latorre <[email protected]> ;; Keywords: wp, print, PostScript -;; Time-stamp: <2004/07/21 23:12:05 vinicius> -;; Version: 6.6.5 +;; Time-stamp: <2005/03/19 00:40:12 vinicius> +;; Version: 6.6.6 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ -(defconst ps-print-version "6.6.5" - "ps-print.el, v 6.6.5 <2004/07/21 vinicius> +(defconst ps-print-version "6.6.6" + "ps-print.el, v 6.6.6 <2005/03/19 vinicius> Vinicius's last change version -- this file may have been edited as part of Emacs without changes to the version number. When reporting bugs, please also @@ -4831,7 +4831,7 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th ((stringp (car content)) (car content)) ;; function symbol - ((and (symbolp (car content)) (fboundp (car content))) + ((functionp (car content)) (concat "(" (funcall (car content)) ")")) ;; variable symbol ((and (symbolp (car content)) (boundp (car content))) @@ -4869,7 +4869,7 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th ;; Functions are called -- they should return strings; they will be inserted ;; as strings and the PS string delimiters added. - ((and (symbolp content) (fboundp content)) + ((functionp content) (ps-output-string (ps-mule-encode-header-string (funcall content) fonttag))) diff --git a/lisp/recentf.el b/lisp/recentf.el index 169fee9952..40a9204267 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -1,6 +1,6 @@ ;;; recentf.el --- setup a menu of recently opened files -;; Copyright (C) 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 ;; Free Software Foundation, Inc. ;; Author: David Ponce <[email protected]> @@ -84,6 +84,22 @@ must return non-nil to exclude it." :group 'recentf :type '(repeat (choice regexp function))) +(defcustom recentf-keep + '(file-readable-p) + "*List of regexps and predicates for filenames kept in the recent list. +Regexps and predicates are tried in the specified order. +When nil all filenames are kept in the recent list. +When a filename matches any of the regexps or satisfies any of the +predicates it is kept in the recent list. +The default is to keep readable files. +A predicate is a function that is passed a filename to check and that +must return non-nil to keep it. For example, you can add the +`file-remote-p' predicate in front of this list to keep remote file +names in the recent list without checking their readability through a +remote access." + :group 'recentf + :type '(repeat (choice regexp function))) + (defun recentf-menu-customization-changed (variable value) "Function called when the recentf menu customization has changed. Set VARIABLE with VALUE, and force a rebuild of the recentf menu." @@ -114,9 +130,9 @@ If nil add it at end of menu (see also `easy-menu-add-item')." (const :tag "Last" nil)) :set 'recentf-menu-customization-changed) -(defcustom recentf-menu-action 'recentf-find-file +(defcustom recentf-menu-action 'find-file "*Function to invoke with a filename item of the recentf menu. -The default is to call `recentf-find-file' to edit the selected file." +The default is to call `find-file' to edit the selected file." :group 'recentf :type 'function :set 'recentf-menu-customization-changed) @@ -194,17 +210,6 @@ elements (see `recentf-make-menu-element' for menu element form)." 'recentf-menu-append-commands-flag "22.1") -(defcustom recentf-keep-non-readable-files-flag nil - "*non-nil means to keep non readable files in the recent list." - :group 'recentf - :type 'boolean) - -(defvaralias 'recentf-keep-non-readable-files-p - 'recentf-keep-non-readable-files-flag) -(make-obsolete-variable 'recentf-keep-non-readable-files-p - 'recentf-keep-non-readable-files-flag - "22.1") - (defcustom recentf-auto-cleanup 'mode "*Define when to automatically cleanup the recent list. The following values can be set: @@ -351,56 +356,56 @@ process the canonical name." (funcall recentf-filename-handler filename)) filename))) -(defsubst recentf-file-readable-p (filename) - "Return t if file FILENAME exists and you can read it. -Like the function `file-readable-p' but return nil on error." - (condition-case nil - (file-readable-p filename) - (error nil))) - (defun recentf-include-p (filename) "Return non-nil if FILENAME should be included in the recent list. That is, if it doesn't match any of the `recentf-exclude' checks." (let ((case-fold-search recentf-case-fold-search) (checks recentf-exclude) - (keepit t) - check) + (keepit t)) (while (and checks keepit) - (setq check (car checks) - checks (cdr checks) - keepit (not (if (stringp check) - ;; A regexp - (string-match check filename) - ;; A predicate - (funcall check filename))))) + (setq keepit (condition-case nil + (not (if (stringp (car checks)) + ;; A regexp + (string-match (car checks) filename) + ;; A predicate + (funcall (car checks) filename))) + (error nil)) + checks (cdr checks))) + keepit)) + +(defun recentf-keep-p (filename) + "Return non-nil if FILENAME should be kept in the recent list. +That is, if it matches any of the `recentf-keep' checks." + (let* ((case-fold-search recentf-case-fold-search) + (checks recentf-keep) + (keepit (null checks))) + (while (and checks (not keepit)) + (setq keepit (condition-case nil + (if (stringp (car checks)) + ;; A regexp + (string-match (car checks) filename) + ;; A predicate + (funcall (car checks) filename)) + (error nil)) + checks (cdr checks))) keepit)) (defsubst recentf-add-file (filename) "Add or move FILENAME at the beginning of the recent list. -Does nothing if the name satisfies any of the `recentf-exclude' regexps or -predicates." +Does nothing if the name satisfies any of the `recentf-exclude' +regexps or predicates." (setq filename (recentf-expand-file-name filename)) (when (recentf-include-p filename) (recentf-push filename))) -(defsubst recentf-remove-if-non-readable (filename) - "Remove FILENAME from the recent list, if file is not readable. +(defsubst recentf-remove-if-non-kept (filename) + "Remove FILENAME from the recent list, if file is not kept. Return non-nil if FILENAME has been removed." - (unless (recentf-file-readable-p filename) + (unless (recentf-keep-p filename) (let ((m (recentf-string-member (recentf-expand-file-name filename) recentf-list))) (and m (setq recentf-list (delq (car m) recentf-list)))))) -(defun recentf-find-file (filename) - "Edit file FILENAME using `find-file'. -If the file does not exist or is non readable, and -`recentf-keep-non-readable-files-flag' is nil, it is not edited and -its name is removed from the recent list." - (if (and (not recentf-keep-non-readable-files-flag) - (recentf-remove-if-non-readable filename)) - (message "File `%s' not found" filename) - (find-file filename))) - (defsubst recentf-directory-compare (f1 f2) "Compare absolute filenames F1 and F2. First compare directories, then filenames sans directory. @@ -417,7 +422,7 @@ Return non-nil if F1 is less than F2." (defvar recentf-menu-items-for-commands (list ["Cleanup list" recentf-cleanup - :help "Remove all non-readable and excluded files from the recent list" + :help "Remove all excluded and non-kept files from the recent list" :active t] ["Edit list..." recentf-edit-list @@ -933,11 +938,9 @@ IGNORE arguments." (defun recentf-track-closed-file () "Update the recent list when a buffer is killed. -That is, remove a non readable file from the recent list, if -`recentf-keep-non-readable-files-flag' is nil." +That is, remove a non kept file from the recent list." (and buffer-file-name - (not recentf-keep-non-readable-files-flag) - (recentf-remove-if-non-readable buffer-file-name))) + (recentf-remove-if-non-kept buffer-file-name))) (defun recentf-update-menu () "Update the recentf menu from the current recent list." @@ -1164,16 +1167,18 @@ empty `file-name-history' with the recent list." recentf-list)))))) (defun recentf-cleanup () - "Remove all excluded or non-readable files from the recent list." + "Remove all non-kept and excluded files from the recent list." (interactive) (message "Cleaning up the recentf list...") - (let (newlist) + (let ((n 0) newlist) (dolist (f recentf-list) - (if (and (recentf-include-p f) (recentf-file-readable-p f)) + (if (and (recentf-include-p f) + (recentf-keep-p f)) (push f newlist) + (setq n (1+ n)) (message "File %s removed from the recentf list" f))) - (setq recentf-list (nreverse newlist)) - (message "Cleaning up the recentf list...done"))) + (message "Cleaning up the recentf list...done (%d removed)" n) + (setq recentf-list (nreverse newlist)))) ;;;###autoload (define-minor-mode recentf-mode diff --git a/lisp/simple.el b/lisp/simple.el index 81c1aba688..20563dc543 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -735,9 +735,10 @@ that uses or sets the mark." (defun goto-line (arg &optional buffer) "Goto line ARG, counting from line 1 at beginning of buffer. -Normally, move point in the curren buffer. -With just C-u as argument, move point in the most recently displayed -other buffer, and switch to it. +Normally, move point in the current buffer. +With just \\[universal-argument] as argument, move point in the most recently +displayed other buffer, and switch to it. When called from Lisp code, +the optional argument BUFFER specifies a buffer to switch to. If there's a number in the buffer at point, it is the default for ARG." (interactive diff --git a/lisp/subr.el b/lisp/subr.el index 5cabedd0e6..adaf2f481c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2762,7 +2762,9 @@ change the displayed message." (min-value (aref parameters 1)) (max-value (aref parameters 2)) (one-percent (/ (- max-value min-value) 100.0)) - (percentage (truncate (/ (- value min-value) one-percent))) + (percentage (if (= max-value min-value) + 0 + (truncate (/ (- value min-value) one-percent)))) (update-time (aref parameters 0)) (current-time (float-time)) (enough-time-passed diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index d15b72c98b..7e5d9fee78 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -2237,6 +2237,9 @@ because there is no standard value that would generally work." (interactive) (or tex-dvi-view-command (error "You must set `tex-dvi-view-command'")) + ;; Restart the TeX shell if necessary. + (or (tex-shell-running) + (tex-start-shell)) (let ((tex-dvi-print-command (eval tex-dvi-view-command))) (tex-print))) diff --git a/lisp/tooltip.el b/lisp/tooltip.el index e4cab1beba..6ed93a0e99 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -454,7 +454,7 @@ This function must return nil if it doesn't handle EVENT." expr))))))) (defun gdb-tooltip-print () - (tooltip-show + (tooltip-show (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer) (let ((string (buffer-string))) ;; remove newline for tooltip-use-echo-area @@ -477,6 +477,8 @@ MSG is either a help string to display, or nil to cancel the display." (string-match "^mouse-2" msg)) (setq mp (mouse-pixel-position)) (consp (setq pos (cdr mp))) + (car pos) (>= (car pos) 0) + (cdr pos) (>= (cdr pos) 0) (setq pos (posn-at-x-y (car pos) (cdr pos) (car mp))) (windowp (posn-window pos))) (with-current-buffer (window-buffer (posn-window pos)) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 25c0995565..bc49eb9f65 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,23 @@ +2005-03-20 Chong Yidong <[email protected]> + + * display.texi (Invisible Text): State default value of + line-move-ignore-invisible. + (Managing Overlays): Document remove-overlays. + (Standard Faces): Document escape-glyph face. + + * minibuf.texi (Reading File Names): Document + read-file-name-function. + + * modes.texi (Other Font Lock Variables): Document + font-lock-lines-before. + + * positions.texi (Skipping Characters): skip-chars-forward allows + character classes. + +2005-03-18 Lute Kamstra <[email protected]> + + * edebug.texi (Instrumenting Macro Calls): Fix another typo. + 2005-03-17 Richard M. Stallman <[email protected]> * text.texi (Undo): Document extensible undo entries. diff --git a/lispref/anti.texi b/lispref/anti.texi index bd82c7d137..a744ddf421 100644 --- a/lispref/anti.texi +++ b/lispref/anti.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2005 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/lispref/display.texi b/lispref/display.texi index 1b25c92442..2e490983b5 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -753,8 +753,8 @@ major mode should use the mode's own name as an element of Ordinarily, functions that operate on text or move point do not care whether the text is invisible. The user-level line motion commands explicitly ignore invisible newlines if -@code{line-move-ignore-invisible} is non-@code{nil}, but only because -they are explicitly programmed to do so. +@code{line-move-ignore-invisible} is non-@code{nil} (the default), but +only because they are explicitly programmed to do so. However, if a command ends with point inside or immediately after invisible text, the main editing loop moves point further forward or @@ -1138,6 +1138,18 @@ update other vital data structures and can cause some overlays to be ``lost''. @end defun +@defun remove-overlays &optional start end name value +This function removes all the overlays between @var{start} and +@var{end} whose property @var{name} has the value @var{value}. It can +move the endpoints of the overlays in the region, or split them. + +If @var{name} is omitted or nil, it means to delete all overlays in +the specified region. If @var{start} and/or @var{end} are omitted or +nil, that means the beginning and end of the buffer respectively. +Therefore, @code{(remove-overlays)} removes all the overlays in the +current buffer. +@end defun + Here are some examples: @example @@ -1718,6 +1730,10 @@ This face is meant to be used for highlighting for various purposes. @kindex trailing-whitespace @r{(face name)} This face is used to display excess whitespace at the end of a line, if @code{show-trailing-whitespace} is non-@code{nil}. + +@item escape-glyph +@kindex escape-glyph @r{(face name)} +This face is used to display control characters and escape glyphs. @end table In contrast, these faces are provided to change the appearance of text diff --git a/lispref/edebug.texi b/lispref/edebug.texi index a007f81dcf..c53bc8653d 100644 --- a/lispref/edebug.texi +++ b/lispref/edebug.texi @@ -1082,7 +1082,7 @@ the @code{for} example macro (@pxref{Argument Evaluation}). (defmacro for (var from init to final do &rest body) "Execute a simple \"for\" loop. For example, (for i from 1 to 10 do (print i))." - (declare (debug symbolp "from" form "to" form "do" &rest form)) + (declare (debug (symbolp "from" form "to" form "do" &rest form))) ...) @end example diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index 288bacc5e9..bfe5214174 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi @@ -1289,6 +1289,13 @@ If the user types @key{RET}, @code{read-file-name} returns the file name as the string @code{"/gp/gnu/elisp/manual.texi"}. @end defun +@defvar read-file-name-function +If non-@code{nil}, this should be a function that accepts the same +arguments as @code{read-file-name}. When @code{read-file-name} is +called, it calls this function with the supplied arguments instead of +doing its usual work. +@end defvar + @defun read-directory-name prompt &optional directory default existing initial This function is like @code{read-file-name} but allows only directory names as completion possibilities. diff --git a/lispref/modes.texi b/lispref/modes.texi index f7510540d0..9464f900d4 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -2381,6 +2381,14 @@ comments differently. It is also sometimes abused together with multiple lines, but this is too obscure to document in this manual. @end defvar +@defvar font-lock-lines-before +This variable specifies the number of extra lines to consider when +refontifying the buffer after each text change. Font lock begins +refontifying from that number of lines before the changed region. The +default is 1, but using a larger value can be useful for coping with +multi-line patterns. +@end defvar + @node Levels of Font Lock @subsection Levels of Font Lock diff --git a/lispref/positions.texi b/lispref/positions.texi index 282f897eba..19a2675414 100644 --- a/lispref/positions.texi +++ b/lispref/positions.texi @@ -770,7 +770,8 @@ The argument @var{character-set} is a string, like the inside of a terminate it, and @samp{\} quotes @samp{^}, @samp{-} or @samp{\}. Thus, @code{"a-zA-Z"} skips over all letters, stopping before the first nonletter, and @code{"^a-zA-Z"} skips nonletters stopping before -the first letter. @xref{Regular Expressions}. +the first letter. See @xref{Regular Expressions}. Character classes +can also be used, e.g. @code{"[:alnum:]"}. See @pxref{Char Classes}. If @var{limit} is supplied (it must be a number or a marker), it specifies the maximum position in the buffer that point can be skipped diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 61cb6babc9..7823673ec1 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,10 @@ +2005-03-22 Jan Dj,Ad(Brv <[email protected]> + + * xlwmenuP.h: Temporary #undef HAVE_X_I18N until FontSet for UTF-8 + on XFree86 is investigated. + + * xlwmenu.c: Ditto. + 2005-03-17 Stefan Monnier <[email protected]> Add support for I18N to Lucid menus. diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index b128e6cefb..77b61d32e2 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -131,6 +131,9 @@ xlwMenuTranslations [] = /* FIXME: F10 should enter the menu, the first one in the menu-bar. */ +/* FIXME: HAVE_X_I18N does not work yet. */ +#undef HAVE_X_I18N + #define offset(field) XtOffset(XlwMenuWidget, field) static XtResource xlwMenuResources[] = diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h index 9937aa174e..12cc1790d9 100644 --- a/lwlib/xlwmenuP.h +++ b/lwlib/xlwmenuP.h @@ -24,6 +24,9 @@ Boston, MA 02111-1307, USA. */ #include "xlwmenu.h" #include <X11/CoreP.h> +/* FIXME: HAVE_X_I18N does not work yet. */ +#undef HAVE_X_I18N + /* Elements in the stack arrays. */ typedef struct _window_state { diff --git a/man/ChangeLog b/man/ChangeLog index 855d97973e..197f45c1d9 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,98 @@ +2005-03-23 Nick Roberts <[email protected]> + + * building.texi (Stack Buffer): Mention reverse contrast for + *selected* frame (might not be current frame). + +2005-03-22 Jay Belanger <[email protected]> + + * calc.texi (Embedded Mode): Add new information on changing + modes. + +2005-03-21 Richard M. Stallman <[email protected]> + + * building.texi (Starting GUD): Add bashdb. + +2005-03-20 Chong Yidong <[email protected]> + + * basic.texi (Moving Point): Add M-g M-g binding. + (Undo): Document undo-only. + (Position Info): Document M-g M-g and C-u M-g M-g. + + * building.texi (Building): Put Grep Searching after Compilation + Shell. + (Compilation Mode): Document M-n, M-p, M-}, M-{, and C-c C-f bindings. + Document next-error-highlight. + (Grep Searching): Document grep-highlight-matches. + (Lisp Eval): Typing C-x C-e twice prints integers specially. + + * calendar.texi (Importing Diary): Rename node from iCalendar. + Document diary-from-outlook. + + * dired.texi (Misc Dired Features): Rename node from Misc Dired + Commands. + Mention effect of X drag and drop on Dired buffers. + + * files.texi (Visiting): Document large-file-warning-threshold. + Move paragraph on file-selection dialog. + Mention visiting files using X drag and drop. + (Reverting): Mention using Auto-Revert mode to tail files. + Document auto-revert-tail-mode. + (Version Systems): Minor correction. + (Comparing Files): Diff-mode is no longer based on Compilation + mode. + Document compare-ignore-whitespace. + (Misc File Ops): Explain passing a directory to rename-file. + Likewise for copy-file and make-symbolic-link. + + * frames.texi (Wheeled Mice): Mouse wheel support on by default. + Document mouse-wheel-progressive speed. + + * help.texi (Misc Help): Document numeric argument for C-h i. + Correctly explain the effect of just C-u as argument. + + * killing.texi (Deletion): Document numeric argument for + just-one-space. + + * mini.texi (Completion): Completion acts on text before point. + + * misc.texi (Saving Emacs Sessions): Document desktop-restore-eager. + (Emulation): CUA mode replaces pc-bindings-mode, + pc-selection-mode, and s-region. + + * mule.texi (Input Methods): Leim is now built-in. + (Select Input Method): Document quail-show-key. + (Specify Coding): Document revert-buffer-with-coding-system. + + * programs.texi (Fortran Motion): Document f90-next-statement, + f90-previous-statement, f90-next-block, f90-previous-block, + f90-end-of-block, and f90-beginning-of-block. + + * text.texi (Format Faces): Replace old M-g key prefix with M-o. + + * emacs.texi (Acknowledgments): Updated. + + * anti.texi: Total rewrite. + +2005-03-20 Michael Albinus <[email protected]> + + Sync with Tramp 2.0.48. + + * trampver.texi.in: Replace "Emacs" by "GNU Emacs". + + * tramp.texi: Replace "Emacs" by "GNU Emacs". Replace "Linux" by + "GNU/Linux". Change all addresses to .gnu.org. + (Default Method): Offer shortened syntax for "su" and "sudo" + methods. + +2005-03-19 Chong Yidong <[email protected]> + + * ack.texi (Acknowledgments): Update. + +2005-03-19 Eli Zaretskii <[email protected]> + + * anti.texi (Antinews): Refer to Emacs 21.4, not 21.3. Update + copyright years. + 2005-03-14 Nick Roberts <[email protected]> * building.texi (Commands of GUD): Move paragraph on setting @@ -37,7 +132,7 @@ (Rmail Display): Mention Mouse-1. (Movemail): Clarify two movemail versions. Clarify rmail-movemail-program. - + * pcl-cvs.texi (About PCL-CVS): Get rid of "Emacs 21". (Installation): Node deleted. diff --git a/man/ack.texi b/man/ack.texi index 0d957dcef8..5920bd197e 100644 --- a/man/ack.texi +++ b/man/ack.texi @@ -38,9 +38,10 @@ Joe Arceneaux wrote the original text property implementation, and implemented support for X11. @item -Miles Bader wrote @file{image-file.el}, support code for visiting image -files; and @file{minibuf-eldef.el}, a minor mode whereby the default -value is shown in the minibuffer prompt only when appropriate. +Miles Bader wrote @file{image-file.el}, support code for visiting +image files, @file{minibuf-eldef.el}, a minor mode whereby the default +value is shown in the minibuffer prompt only when appropriate, and +@file{button.el}, the library that implements clickable buttons. @item David Bakhash wrote @file{strokes.el}, a mode for controlling Emacs by @@ -187,8 +188,12 @@ text replace the current selection. Eric Ding contributed @file{goto-addr.el}, @item +Jan Dj@"{a}rv added support for the GTK+ toolkit and X drag-and-drop. + +@item Carsten Dominik wrote @file{reftex.el}, a package for setting up -labels and cross-references in La@TeX{} documents. +labels and cross-references in La@TeX{} documents, and @file{org.el}, +a mode for maintaining notes, todo lists, and project planning. @item Scott Draves wrote @file{tq.el}, help functions for maintaining @@ -284,6 +289,10 @@ Kevin Gallo added multiple-frame support for Windows NT and wrote @file{w32-win.el}, support functions for the MS-Windows window system. @item +Juan Le@'{o}n Lahoz Garc@'{i}a wrote @file{wdired.el}, a package for +performing file operations by directly editing Dired buffers. + +@item Howard Gayle wrote: @itemize @minus @@ -319,8 +328,9 @@ David Gillespie wrote: @itemize @minus @item -Emacs 19's Common Lisp compatibility packages, replacing the old package -by Cesar Augusto Quiroz Gonzalez, +The Common Lisp compatibility packages, +@item +@code{Calc}, an advanced calculator and mathematical tool, @item @file{complete.el}, a partial completion mechanism, and @item @@ -358,6 +368,10 @@ taking the file name from the buffer. Odd Gripenstam wrote @file{dcl-mode.el} for editing DCL command files. @item +Kai Gro@ss{}johann wrote the Tramp package, which provides transparent +remote file editing using rcp, ssh, and other network protocols. + +@item Michael Gschwind wrote @file{iso-cvt.el}, a package to convert between the ISO 8859-1 character set and the notations for non-@acronym{ASCII} characters used by @TeX{} and net tradition, and @file{latin-2.el}, code @@ -449,6 +463,10 @@ Andrew Innes contributed extensively to the MS-Windows support. Seiichiro Inoue improved Emacs's XIM support. @item +Ulf Jasper wrote @file{icalendar.el}, a package for converting Emacs +diary entries to and from the iCalendar format. + +@item Kyle Jones wrote @file{life.el}, a package to play Conway's ``life'' game, and @file{mldrag.el}, a package which allows the user to resize windows by dragging mode lines and vertical window separators with the mouse. @@ -458,11 +476,23 @@ Terry Jones wrote @file{shadow.el}, a package for finding potential load-path problems when some Lisp file ``shadows'' another. @item -Simon Josefsson wrote @file{flow-fill.el}, a package for interpreting -RFC2646 formatted text in messages, @file{imap.el}, an Emacs Lisp -library for talking to IMAP servers, @file{nnimap}, the IMAP back-end -for Gnus, @file{rfc2104.el}, a hashed message authentication facility, -and @file{fringe.el} a package for customizing the fringe. +Simon Josefsson wrote: + +@itemize @minus +@item +@file{dns-mode.el}, an editing mode for Domain Name System master files, +@item +@file{flow-fill.el}, a package for interpreting RFC2646 formatted text +in messages, +@item +@file{fringe.el}, a package for customizing the fringe, +@item +@file{imap.el}, an Emacs Lisp library for talking to IMAP servers, +@item +@file{nnimap}, the IMAP back-end for Gnus, and +@item +@file{rfc2104.el}, a hashed message authentication facility. +@end itemize @item Tomoji Kagatani implemented @file{smtpmail.el}, used for sending out @@ -479,6 +509,10 @@ version) and @code{lookbib}, and @file{refbib.el}, a package to convert those databases to the format used by the LaTeX text formatting package. @item +Taichi Kawabata added support for Devanagari script and the Indian +languages. + +@item Howard Kaye wrote @file{sort.el}, commands to sort text in Emacs buffers. @@ -501,6 +535,10 @@ PostScript files and running a PostScript interpreter interactively from within Emacs. @item +Pavel Kobiakov wrote @file{flymake.el}, a minor mode for performing +on-the-fly syntax checking. + +@item Larry K.@: Kolodney wrote @file{cvtmail.c}, a program to convert the mail directories used by Gosling Emacs into RMAIL format. @@ -509,6 +547,10 @@ David M.@: Koppelman wrote @file{hi-lock.el}, a minor mode for interactive automatic highlighting of parts of the buffer text. @item +Koseki Yoshinori wrote @file{iinline.el}, a minor mode for displaying +inline images. + +@item Robert Krawitz wrote the original @file{xmenu.c}, part of Emacs's pop-up menu support. @@ -548,7 +590,7 @@ Lisp, and James R.@: Larus wrote @file{mh-e.el}, an interface to the MH mail system. @item -Vinicius Jose Latorre wrote: +Vinicius Jose Latorre wrote the Emacs printing facilities, as well as: @itemize @minus @item @@ -581,7 +623,14 @@ constructs; and @file{follow.el}, a minor mode to synchronize windows that show the same buffer. @item -Dave Love wrote: +Thomas Link wrote @file{filesets.el}, a package for handling sets of +files. + +@item +Dave Love wrote much of the code dealing with Unicode support and +Latin-N unification. He added support for many coding systems, +including those in @file{code-pages.el} and the various UTF-7 and +UTF-16 coding systems. He also wrote: @itemize @minus @item @@ -592,6 +641,8 @@ numeric keys to digit arguments, @file{autoconf.el}, a mode for editing Autoconf @file{configure.in} files, @item +@file{cfengine.el}, a mode for editing Cfengine files, +@item @file{elide-head.el}, a package for eliding boilerplate text, such as copyright notices, from file headers, @item @@ -606,6 +657,8 @@ character sets, characters on Latin-1 terminals by setting up appropriate display tables, @item +@file{python.el}, a major mode for the Python programming language. +@item @file{refill.el}, a mode for automatic paragraph refilling, akin to typical word processors, @item @@ -731,7 +784,8 @@ used in mail messages and news articles, @end itemize @item -Gerd Moellmann wrote: +Gerd Moellmann was the Emacs maintainer from the beginning of Emacs 21 +development until the release of 21.1. He wrote: @itemize @minus @item @@ -748,17 +802,19 @@ the @code{ebrowse} C@t{++} browser, @file{authors.el} package for maintaining the @file{AUTHORS} files. @end itemize -Gerd took over the Emacs maintenance as the head maintainer since the -beginning of Emacs 21 development. - @item -Stefan Monnier wrote: +Stefan Monnier added support for Arch, Subversion, and Meta-CVS to VC, +and re-wrote much of the Emacs server to use the built-in networking +primitives. He also wrote: @itemize @minus @item @code{PCL-CVS}, a directory-level front end to the CVS version control system, @item +@file{reveal.el}, a minor mode for automatically revealing invisible +text, +@item @file{smerge-mode.el}, a minor mode for resolving @code{diff3} conflicts, and @item @@ -811,6 +867,14 @@ Alexandre Oliva wrote @file{gnus-mlspl.el}, a group params-based mail splitting mechanism. @item +Takaaki Ota wrote @file{table.el}, a package for creating and editing +embedded text-based tables. + +@item +Pieter E.@: J.@: Pareit wrote @file{mixal-mode.el}, an editing mode for +the MIX assembly language. + +@item David Pearson contributed @file{quickurl.el}, a simple method of inserting a URL into the current buffer based on text at point; @file{5x5.el}, a game to fill all squares on the field. @@ -836,8 +900,8 @@ the ``Towers of Hanoi'' puzzle. @item William M.@: Perry wrote @file{mailcap.el}, a MIME media types -configuration facility, and @file{mwheel.el}, support for MS -Intellimouse type mice with wheels. +configuration facility, @file{mwheel.el}, a package for supporting +mouse wheels, and the URL package. @item Per Persson wrote @file{gnus-vm.el}, the VM interface for Gnus. @@ -851,6 +915,8 @@ Daniel Pfeiffer wrote: @itemize @minus @item +@file{conf-mode.el}, a major mode for editing configuration files, +@item @file{copyright.el}, a package for updating copyright notices in files, @item @file{executable.el}, a package for executing interpreter scripts, @@ -881,7 +947,9 @@ Soundex algorithm for comparing English words by their pronunciation. @item David Ponce wrote @file{recentf.el}, a package that puts a menu of -recently visited files in the Emacs menu bar. +recently visited files in the Emacs menu bar, and +@file{ruler-mode.el}, a minor mode for displaying a ruler in the +header line. @item Francesco A.@: Potorti wrote @file{cmacexp.el}, providing a command which @@ -957,6 +1025,10 @@ editor, and @file{vt-control.el}, providing some control functions for the DEC VT line of terminals. @item +Nick Roberts wrote @file{gdb-ui.el}, the graphical user interface to +GDB. + +@item Roland B.@: Roberts contributed much of the VMS support distributed with Emacs 19, along with Joseph M.@: Kelsey, and @file{vms-pmail.el}, support for using Emacs within VMS MAIL. @@ -991,6 +1063,10 @@ Wolfgang Rupprecht contributed Emacs 19's floating-point support @file{sup-mouse.el}, support for the Supdup mouse on lisp machines. @item +Kevin Ryde wrote @file{info-xref.el}, a library for checking +references in Info files. + +@item James B.@: Salem and Brewster Kahle wrote @file{completion.el}, providing dynamic word completion. @@ -1141,6 +1217,22 @@ automatic highlighting in source code buffers, mail readers, and other contexts. @item +Kim F.@: Storm made many improvements to the Emacs display engine, +process support, and networking support. He also wrote: + +@itemize @minus +@item +@file{bindat.el}, a package for encoding and decoding binary data. +@item +@file{cua.el}, which allows Emacs to emulate the standard CUA key +bindings. +@item +@file{ido.el}, a package for selecting buffers and files quickly. +@item +@file{kmacro.el}, the keyboard macro facility. +@end itemize + +@item Martin Stjernholm co-authored CC Mode, a major editing mode for C, C@t{++}, Objective-C, Java, Pike, CORBA IDL, and AWK code. @@ -1161,8 +1253,8 @@ Naoto Takahashi wrote @file{utf-8.el}, support for encoding and decoding UTF-8 data. @item -Taichi Kawabata wrote support for Devanagari script and the Indian -languages. +Jean-Philippe Theberge wrote @file{thumbs.el}, a package for viewing +image files as ``thumbnails''. @item Jens T.@: Berger Thielemann wrote @file{word-help.el}, which is @@ -1237,6 +1329,10 @@ mode for filling in forms, and @file{iso-acc.el}, a minor mode providing electric accent keys for text using the ISO-8859 character set. @item +Colin Walters wrote @file{ibuffer.el}, a Dired-like major mode for +operating on buffers. + +@item Barry Warsaw wrote: @itemize @minus @@ -1340,6 +1436,15 @@ Tom Wurgler wrote @file{emacs-lock.el}, which makes it harder to exit with valuable buffers unsaved. @item +Masatake Yamato wrote @file{ld-script.el}, an editing mode for GNU +linker scripts. + +@item +Jonathan Yavner wrote @file{testcover.el}, a package for keeping track +of the testing status of Emacs Lisp code, and the SES spreadsheet +package. + +@item Ilya Zakharevich and Bob Olson contributed @file{cperl-mode.el}, a major mode for editing Perl code. Ilya Zakharevich also wrote @file{tmm.el}, a mode for accessing the Emacs menu bar on a text-mode terminal. diff --git a/man/anti.texi b/man/anti.texi index 242a430171..f20cada4f4 100644 --- a/man/anti.texi +++ b/man/anti.texi @@ -1,79 +1,80 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2002 Free Software Foundation, Inc. +@c Copyright (C) 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Antinews, Mac OS, X Resources, Top -@appendix Emacs 21.3 Antinews +@appendix Emacs 22.1 Antinews For those users who live backwards in time, here is information about -downgrading to Emacs version 21.3. We hope you will enjoy the greater -simplicity that results from the absence of many newer features. +downgrading to Emacs version 21.4. We hope you will enjoy the greater +simplicity that results from the absence of many Emacs 22 features. @itemize @bullet + @item -The input methods for Emacs are included in a separate distribution -called ``Leim''. To use them, you must extract the Leim tar file on -top of the Emacs distribution, into the same directory, before you -build Emacs. +The buffer position and line number are now displayed at the end of +the mode line, where they can be more easily seen. @item -The file position and line number information is now at the end -of the mode line. +The mode line of the selected window is no longer displayed with a +special face. All mode lines are created equal. @item -When a file is managed with version control, the command @kbd{C-x C-q} -(whose general meaning is to make a buffer read-only or writable) now -does so by checking the file in or out. Checking the file out makes -the buffer writable; checking it in makes the buffer read-only (at -least with RCS). +Clicking on a link with the left mouse button (@kbd{mouse-1}) will +always set point at the position clicked, instead of following the +link. If you want to follow the link, use the middle mouse button +(@kbd{mouse-2}). -You can still use @kbd{C-x v v} to do these operations if you wish; -its meaning is unchanged. If you want to control the buffer's -read-only flag without performing any version control operation, -use @kbd{M-x toggle-read-only}. +@item +Emacs is tired of X droppings. If you drop a file or a piece of text +onto an Emacs window, nothing will happen. @item -Filesets are not supported. +On an xterm, Emacs provides a more convincing simulation of a text +terminal by not responding to mouse-clicks on the mode-line, +header-line, or display margin. @item -For simplicity, windows always have fringes. We wouldn't want -to in-fringe anyone's windows. Likewise, horizontal scrolling -always works the same automatic way. +For simplicity, windows always have fringes. We wouldn't want to +in-fringe anyone's windows. Likewise, horizontal scrolling always +works in the same automatic way. @item -When you are logged in as root, all files now give you writable -buffers in Emacs reflecting the fact that you can write any files. +The horizontal-bar cursor shape has been removed. @item -Unicode support and unification between Latin-@var{n} character -sets have been removed. Cutting and pasting X selections does not -support ``extended segments'' so there are certain coding systems -it cannot handle. +If command line arguments are given, Emacs will not display a splash +screen, so that you can immediately get on with your editing. The +command-line option @samp{--no-splash} is therefore obsolete, and has +been removed. @item -@kbd{C-w} in an incremental search always grabs an entire word -into the search string. More precisely, it grabs text through -the next end of a word. +The command line options @samp{--color}, @samp{--fullwidth}, +@samp{--fullheight}, @samp{--fullscreen}, @samp{--no-blinking-cursor}, +@samp{--no-desktop}, and @samp{-Q} have also been removed. @item -Yanking now preserves all text properties that were in the killed -text. The variable @code{yank-excluded-properties} has no meaning. +The @samp{--geometry} option applies only to the initial frame, and +the @samp{-f} option will not read arguments for interactive +functions. @item -Occur mode, Info mode, and Comint-derived modes now control -fontification in their own way, and @kbd{M-x font-lock-mode} -has nothing to do with it. To control fontification in Info -mode, use the variable @code{Info-fontify}. +Emacs now looks for @file{.emacs} and @file{.emacs_SHELL} in one +standard location---your home directory. Don't put these files in +@file{~/.emacs.d}; they won't be found. @item -In Dired's @kbd{!} command, @samp{*} and @samp{?} now -cause substitution of the file names wherever they appear---not -only when they are surrounded by whitespace. +Emacs will not read @file{~/.abbrev_defs} automatically. If you want +to load abbrev definitions from a file, you must always do so +explicitly. + +@item +When you are logged in as root, all files now give you writable +buffers, reflecting the fact that you can write any files. @item -Minibuffer completion commands now always complete the entire -minibuffer contents, just as if you had typed them at the end -of the minibuffer, no matter where point is actually located. +The maximum size of buffers and integer variables has been halved. On +32-bit machines, the maximum buffer size is now 128 megabytes. @item An unquoted @samp{$} in a file name is now an error, if the following @@ -82,69 +83,206 @@ the file name @file{foo$bar} would probably be an error. Meanwhile, the @code{setenv} command does not expand @samp{$} at all. @item +Emacs will not query you if a command accumulates too much undo +information. If Emacs runs out of memory as a result, it will handle +this by crashing. + +@item +Many commands have been removed from the menus or rearranged. + +@item +The @kbd{C-h} (help) subcommands have been rearranged---especially +those that display specific files. Type @kbd{C-h C-h} to see a list +of these commands; that will show you what is different. + +@item +The @kbd{C-h v} and @kbd{C-h f} commands no longer show a hyperlink to +the C source code, even if it is available. If you want to find the +source code, grep for it. + +@item +The apropos commands will not accept a list of words to match, in +order to encourage users to be more specific. Also, the user option +@code{apropos-sort-by-scores} has been removed. + +@item +The minibuffer prompt is now displayed using the default face. +The colon is enough to show you what part is the prompt. + +@item +Minibuffer completion commands always complete the entire minibuffer +contents, just as if you had typed them at the end of the minibuffer, +no matter where point is actually located. + +@item +The command @code{backward-kill-sexp} is now bound to @kbd{C-M-delete} +and @kbd{C-M-backspace}. Be careful when using these key sequences! +It may shut down your X server, or reboot your operating system. + +@item Commands to set the mark at a place away from point, including @kbd{M-@@}, @kbd{M-h}, etc., don't do anything special when you repeat them. In most cases, typing these commands multiple times is -equivalent to using them once. @kbd{M-h} does not use its numeric -argument. +equivalent to typing them once. @kbd{M-h} ignores numeric arguments. @item -@kbd{C-@key{SPC} C-@key{SPC}} has no special meaning and neither does -@kbd{C-u C-x C-x}. +If you want to repeat a jump to a previous mark, you should supply the +prefix argument explicitly. So, instead of typing @kbd{C-u C-SPC +C-SPC C-SPC}, type @kbd{C-u C-SPC C-u C-SPC C-u C-SPC}. @item -There is no horizontal-bar cursor. +@kbd{C-@key{SPC} C-@key{SPC}} has no special meaning--it just sets the +mark twice. Neither does @kbd{C-u C-x C-x}, which simply exchanges +point and mark like @kbd{C-x C-x}. @item -The faces @code{minibuffer-prompt} and @code{mode-line-inactive} -do not exist, and the features they control don't exist either. +The function @code{sentence-end} has been eliminated in favor of a +more straightforward approach: directly setting the variable +@code{sentence-end}. For example, to end each sentence with a single +space, use + +@lisp +(setq sentence-end "[.?!][]\"')@}]*\\($\\|[ \t]\\)[ \t\n]*") +@end lisp @item -The default value of @code{keyboard-coding-system} is always @code{nil}. -Emacs does not set it based on your locale settings. -If you want some other value, you must set it yourself. +The variable @code{fill-nobreak-predicate} is no longer customizable, +and it can only hold a single function. @item -SGML mode does not handle XML syntax, and does not have indentation support. +Non-breaking spaces and hyphens are displayed just like normal +characters. The user option @code{show-nonbreak-escape} is therefore +obsolete, and has been removed. @item -The @kbd{C-h} subcommands have been rearranged---especially those that -display specific files. Type @kbd{C-h C-h} to see a list of these -commands; that will show you what is different. +@kbd{C-w} in an incremental search always grabs an entire word +into the search string. More precisely, it grabs text through +the next end of a word. @item -Emacs does not read @file{~/.abbrev_defs} automatically; if you want -to load abbrev definitions from a file, you must always do so -explicitly. +Yanking now preserves all text properties that were in the killed +text. The variable @code{yank-excluded-properties} has been removed. @item -The @samp{--fullwidth}, @samp{--fullheight} and @samp{--fullscreen} -command line options are not supported. +Occur mode, Info mode, and Comint-derived modes now control +fontification in their own way, and @kbd{M-x font-lock-mode} has +nothing to do with it. To control fontification in Info mode, use the +variable @code{Info-fontify}. @item -The @samp{--geometry} option now entirely applies only to the initial -frame. +The Grep package has been merged with Compilation mode. Many +grep-specific commands and user options have thus been eliminated. +Also, @kbd{M-x grep} never tries the GNU grep @samp{-H} option, +and instead silently appends @file{/dev/null} to the command line. @item -Many commands have been removed from the menus or rearranged. +In Dired's @kbd{!} command, @samp{*} and @samp{?} now +cause substitution of the file names wherever they appear---not +only when they are surrounded by whitespace. + +@item +When a file is managed with version control, the command @kbd{C-x C-q} +(whose general meaning is to make a buffer read-only or writable) now +does so by checking the file in or out. Checking the file out makes +the buffer writable; checking it in makes the buffer read-only. + +You can still use @kbd{C-x v v} to do these operations if you wish; +its meaning is unchanged. If you want to control the buffer's +read-only flag without performing any version control operation, +use @kbd{M-x toggle-read-only}. + +@item +SGML mode does not handle XML syntax, and does not have indentation +support. + +@item +Many Info mode commands have been removed. Incremental search in Info +searches only the current node. @item Many @code{etags} features for customizing parsing using regexps have been removed. @item -The CUA, ido, table, tramp, reveal, ruler-mode, and ibuffer packages -have been removed. So has the spreadsheet, SES, and the algebraic -calculator, Calc. (We distribute Calc separately.) +The Emacs server now runs a small C program called @file{emacsserver}, +rather than trying to handle everything in Emacs Lisp. Now there can +only be one Emacs server running at a time. The @code{server-mode} +command and @code{server-name} user option have been eliminated. + +@item +The @file{emacsclient} program no longer accepts the @samp{--eval} and +@samp{--display} command line options. + +@item +The command @code{quail-show-key}, for showing how to input a +character, has been removed. + +@item +The default value of @code{keyboard-coding-system} is always +@code{nil}, regardless of your locale settings. If you want some +other value, set it yourself. + +@item +Unicode support and unification between Latin-@var{n} character sets +have been removed. Cutting and pasting X selections does not support +``extended segments'', so there are certain coding systems it cannot +handle. + +@item +The input methods for Emacs are included in a separate distribution +called ``Leim''. To use this, you must extract the Leim tar file on +top of the Emacs distribution, into the same directory, before you +build Emacs. + +@item +The following input methods have been eliminated: belarusian, +bulgarian-bds, bulgarian-phonetic, chinese-sisheng, croatian, dutch, +georgian, latin-alt-postfix, latin-postfix, latin-prefix, +latvian-keyboard, lithuanian-numeric, lithuanian-keyboard, +malayalam-inscript, rfc1345, russian-computer, sgml, slovenian, +tamil-inscript ucs, ukrainian-computer, vietnamese-telex, and welsh. + +@item +The following language environments have been eliminated: Belarusian, +Bulgarian, Chinese-EUC-TW, Croatian, French, Georgian, Italian, +Latin-6, Latin-7, Latvian, Lithuanian, Malayalam, Russian, Russian, +Slovenian, Swedish, Tajik, Tamil, UTF-8, Ukrainian, Ukrainian, Welsh, +and Windows-1255. + +@item +The @code{code-pages} library, which contained various 8-bit coding +systems, has been removed. + +@item +The Kmacro package has been replaced with a simple and elegant +keyboard macro system. Use @kbd{C-x (} to start a new keyboard macro, +@kbd{C-x )} to end the macro, and @kbd{C-x e} to execute the last +macro. + +@item +The Calc, CUA, GDB-UI, Ibuffer, Ido, Password, Printing, Reveal, +Ruler-mode, SES, Table, Tramp, and URL packages have been removed. +The Benchmark, Cfengine, Conf, Dns, Flymake, Python, Thumbs, and +Wdired modes have also been removed. + +@item +The Emacs Lisp Reference Manual and the Introduction to Programming in +Emacs Lisp are now distributed separately, not in the Emacs +distribution. + +@item +On MS Windows, there is no longer any support for tooltips, images, +sound, different mouse pointer shapes, or pointing devices with more +than 3 buttons. If you want these features, consider switching to +another operating system. But even if you don't want these features, +you should still switch---for freedom's sake. @item -The kmacro package has been removed. To start a keyboard macro you -must use @kbd{C-x (}; to end one, @kbd{C-x )}; to execute the last -one, @kbd{C-x e}. +Emacs will not use Unicode for clipboard operations on MS Windows. @item To keep up with decreasing computer memory capacity and disk space, many -other functions and files have been eliminated in Emacs 21.3. +other functions and files have been eliminated in Emacs 21.4. @end itemize @ignore diff --git a/man/basic.texi b/man/basic.texi index 487e9579ec..2f8c2bc176 100644 --- a/man/basic.texi +++ b/man/basic.texi @@ -237,7 +237,8 @@ it is commonly used to do so. If your keyboard has a @key{PAGEUP} or @item M-x goto-char Read a number @var{n} and move point to buffer position @var{n}. Position 1 is the beginning of the buffer. -@item M-x goto-line +@item M-g M-g +@itemx M-x goto-line Read a number @var{n} and move point to line number @var{n}. Line 1 is the beginning of the buffer. @item C-x C-n @@ -343,11 +344,15 @@ earlier changes, back to the limit of the undo information available. If all recorded changes have already been undone, the undo command displays an error message and does nothing. +@findex undo-only Any command other than an undo command breaks the sequence of undo commands. Starting from that moment, the previous undo commands become ordinary changes that you can undo. Thus, to redo changes you have undone, type @kbd{C-f} or any other command that will harmlessly break -the sequence of undoing, then type more undo commands. +the sequence of undoing, then type more undo commands. On the other +hand, if you want to ignore previous undo commands, use @kbd{M-x +undo-only}. This is like @code{undo}, but will not redo changes +you have just undone. @cindex selective undo @kindex C-u C-x u @@ -591,10 +596,12 @@ Toggle automatic display of the size of the buffer. @cindex cursor location @cindex point location There are two commands for working with line numbers. @kbd{M-x -what-line} computes the current line number and displays it in the echo -area. To go to a given line by number, use @kbd{M-x goto-line}; it -prompts you for the number. These line numbers count from one at the -beginning of the buffer. +what-line} computes the current line number and displays it in the +echo area. To go to a given line by number, use @kbd{M-g M-g} or +@kbd{M-g g} (@code{goto-line}). This prompts you for a line number, +then moves point to the beginning of that line. To move to a given +line in the most recently displayed other buffer, use @kbd{C-u M-g +M-g}. Line numbers in Emacs count from one at the beginning of the buffer. You can also see the current line number in the mode line; see @ref{Mode Line}. If you narrow the buffer, then the line number in the mode line diff --git a/man/building.texi b/man/building.texi index 8d0caaae28..50490e34dd 100644 --- a/man/building.texi +++ b/man/building.texi @@ -14,10 +14,10 @@ in the larger process of developing and maintaining programs. @menu * Compilation:: Compiling programs in languages other than Lisp (C, Pascal, etc.). -* Grep Searching:: Running grep as if it were a compiler. * Compilation Mode:: The mode for visiting compiler errors. * Compilation Shell:: Customizing your shell properly for use in the compilation buffer. +* Grep Searching:: Searching with grep. * Debuggers:: Running symbolic debuggers for non-Lisp programs. * Executing Lisp:: Various modes for editing Lisp programs, with different facilities for running @@ -147,36 +147,6 @@ of environment variable settings; each element should be a string of the form @code{"@var{envvarname}=@var{value}"}. These environment variable settings override the usual ones. -@node Grep Searching -@section Searching with Grep under Emacs - -@findex grep - Just as you can run a compiler from Emacs and then visit the lines -where there were compilation errors, you can also run @code{grep} and -then visit the lines on which matches were found. This works by -treating the matches reported by @code{grep} as if they were ``errors.'' - - To do this, type @kbd{M-x grep}, then enter a command line that -specifies how to run @code{grep}. Use the same arguments you would give -@code{grep} when running it normally: a @code{grep}-style regexp -(usually in single-quotes to quote the shell's special characters) -followed by file names, which may use wildcards. The output from -@code{grep} goes in the @samp{*grep*} buffer. You can find the -corresponding lines in the original files using @kbd{C-x `} and -@key{RET}, as with compilation errors. - - If you specify a prefix argument for @kbd{M-x grep}, it figures out -the tag (@pxref{Tags}) around point, and puts that into the default -@code{grep} command. - -@findex grep-find -@findex find-grep - The command @kbd{M-x grep-find} (also available as @kbd{M-x -find-grep}) is similar to @kbd{M-x grep}, but it supplies a different -initial default for the command---one that runs both @code{find} and -@code{grep}, so as to search every file in a directory tree. See also -the @code{find-grep-dired} command, in @ref{Dired and Find}. - @node Compilation Mode @section Compilation Mode @@ -199,6 +169,21 @@ Visit the locus of the error message that point is on. This command is used in the compilation buffer. @item Mouse-2 Visit the locus of the error message that you click on. +@item M-n +Find and highlight the locus of the next error message, without +selecting the source buffer. +@item M-p +Find and highlight the locus of the previous error message, without +selecting the source buffer. +@item M-@} +Move point to the next error for a different file than the current +one. +@item M-@{ +Move point to the previous error for a different file than the current +one. +@item C-c C-f +Toggle Next Error Follow minor mode, which makes cursor motion in the +compilation buffer produce automatic source display. @end table @kindex C-x ` @@ -209,12 +194,15 @@ typing @key{RET} (@code{compile-goto-error}). Alternatively, you can click @kbd{Mouse-2} on the error message; you need not switch to the @samp{*compilation*} buffer first. +@vindex next-error-highlight To parse the compiler error messages sequentially, type @kbd{C-x `} (@code{next-error}). The character following the @kbd{C-x} is the backquote or ``grave accent,'' not the single-quote. This command is -available in all buffers, not just in @samp{*compilation*}; it displays -the next error message at the top of one window and source location of -the error in another window. +available in all buffers, not just in @samp{*compilation*}; it +displays the next error message at the top of one window and source +location of the error in another window. It also momentarily +highlights the relevant source line. You can change the behavior of +this highlighting with the variable @code{next-error-highlight}. The first time @kbd{C-x `} is used after the start of a compilation, it moves to the first error's location. Subsequent uses of @kbd{C-x `} @@ -245,10 +233,25 @@ supported, you can tailor Compilation mode to it by adding elements to that list. A similar variable @code{grep-regexp-alist} tells Emacs how to parse output of a @code{grep} command. +@findex compilation-next-error +@findex compilation-previous-error +@findex compilation-next-file +@findex compilation-previous-file Compilation mode also redefines the keys @key{SPC} and @key{DEL} to -scroll by screenfuls, and @kbd{M-n} and @kbd{M-p} to move to the next or -previous error message. You can also use @kbd{M-@{} and @kbd{M-@}} to -move up or down to an error message for a different source file. +scroll by screenfuls, and @kbd{M-n} (@code{compilation-next-error}) +and @kbd{M-p} (@code{compilation-previous-error}) to move to the next +or previous error message. You can also use @kbd{M-@{} +(@code{compilation-next-file} and @kbd{M-@}} +(@code{compilation-previous-file}) to move up or down to an error +message for a different source file. + +@cindex Next Error Follow mode +@findex next-error-follow-minor-mode + You can type @kbd{C-c C-f} to toggle Next Error Follow mode. In +this minor mode, ordinary cursor motion in the compilation buffer +automatically updates the source buffer. For instance, moving the +cursor to the next error message causes the location of that error to +be displayed immediately. The features of Compilation mode are also available in a minor mode called Compilation Minor mode. This lets you parse error messages in @@ -298,6 +301,42 @@ compilation command synchronously on MS-DOS. As a consequence, you must wait until the command finishes before you can do anything else in Emacs. @xref{MS-DOS}. +@node Grep Searching +@section Searching with Grep under Emacs + +@findex grep + Just as you can run a compiler from Emacs and then visit the lines +where there were compilation errors, you can also run @code{grep} and +then visit the lines on which matches were found. This works by +treating the matches reported by @code{grep} as if they were ``errors.'' + + To do this, type @kbd{M-x grep}, then enter a command line that +specifies how to run @code{grep}. Use the same arguments you would give +@code{grep} when running it normally: a @code{grep}-style regexp +(usually in single-quotes to quote the shell's special characters) +followed by file names, which may use wildcards. If you specify a +prefix argument for @kbd{M-x grep}, it figures out the tag +(@pxref{Tags}) around point, and puts that into the default +@code{grep} command. + + The output from @code{grep} goes in the @samp{*grep*} buffer. You +can find the corresponding lines in the original files using @kbd{C-x +`}, @key{RET}, and so forth, just like compilation errors. + + Some grep programs accept a @samp{--color} option to output special +markers around matches for the purpose of highlighting. You can make +use of this feature by setting @code{grep-highlight-matches} to t. +When displaying a match in the source buffer, the exact match will be +highlighted, instead of the entire source line. + +@findex grep-find +@findex find-grep + The command @kbd{M-x grep-find} (also available as @kbd{M-x +find-grep}) is similar to @kbd{M-x grep}, but it supplies a different +initial default for the command---one that runs both @code{find} and +@code{grep}, so as to search every file in a directory tree. See also +the @code{find-grep-dired} command, in @ref{Dired and Find}. + @node Debuggers @section Running Debuggers Under Emacs @cindex debuggers @@ -307,6 +346,7 @@ Emacs. @xref{MS-DOS}. @cindex SDB @cindex XDB @cindex Perldb +@cindex bashdb @cindex JDB @cindex PDB @@ -366,6 +406,10 @@ of the functions, you get a message saying @samp{The sdb support requires a valid tags table to work}. If this happens, generate a valid tags table in the working directory and try again. +@item M-x bashdb @key{RET} @var{file} @key{RET} +@findex bashdb +Run the bash debugger to debug @var{file}, a shell script. + @item M-x perldb @key{RET} @var{file} @key{RET} @findex perldb Run the Perl interpreter in debug mode to debug @var{file}, a Perl program. @@ -760,7 +804,8 @@ Delete the breakpoint at the current line (@code{gdb-delete-breakpoint}). @kindex RET @r{(GDB breakpoints buffer)} @findex gdb-goto-breakpoint Display the file in the source buffer at the breakpoint specified at -the current line (@code{gdb-goto-breakpoint}). Alternatively, click @kbd{Mouse-2} on the breakpoint that you wish to visit. +the current line (@code{gdb-goto-breakpoint}). Alternatively, click +@kbd{Mouse-2} on the breakpoint that you wish to visit. @end table @node Stack Buffer @@ -770,12 +815,12 @@ The stack buffer displays a @dfn{call stack}, with one line for each of the nested subroutine calls (@dfn{stack frames}) now active in the program. @xref{Backtrace,,info stack, gdb, The GNU debugger}. -Move point to any frame in the stack and type @key{RET} to make it -become the current frame (@code{gdb-frames-select}) and display the -associated source in the source buffer. Alternatively, click -@kbd{Mouse-2} to make the selected frame become the current one. If the -locals buffer is displayed then its contents update to display the -variables that are local to the new frame. +The selected frame is displayed in reverse contrast. Move point to +any frame in the stack and type @key{RET} to select it (@code{gdb-frames-select}) +and display the associated source in the source buffer. Alternatively, +click @kbd{Mouse-2} to make the selected frame become the current one. +If the locals buffer is displayed then its contents update to display +the variables that are local to the new frame. @node Watch Expressions @subsubsection Watch Expressions @@ -1046,6 +1091,10 @@ expression preceding point in the buffer, and displays the value in the echo area. It is available in all major modes, not just Emacs-Lisp mode. It does not treat @code{defvar} specially. + When the result of an evaluation is an integer, you can type +@kbd{C-x C-e} a second time to display the value of the integer result +in additional formats (octal, hexadecimal, and character). + If @kbd{C-M-x}, @kbd{C-x C-e}, or @kbd{M-:} is given a numeric argument, it inserts the value into the current buffer at point, rather than displaying it in the echo area. The argument's value does not diff --git a/man/calc.texi b/man/calc.texi index 72c243c355..c45fd8cd22 100644 --- a/man/calc.texi +++ b/man/calc.texi @@ -29881,6 +29881,17 @@ Note that @kbd{M-# e} is not to be used in the Calc stack buffer like most Calc commands, but rather in regular editing buffers that are visiting your own files. +Calc will try to guess an appropriate language based on the major mode +of the editing buffer. (@xref{Language Modes}.) If the current buffer is +in @code{latex-mode}, for example, Calc will set its language to La@TeX{}. +Similarly, Calc will use @TeX{} language for @code{tex-mode}, +@code{plain-tex-mode} and @code{context-mode}, C language for +@code{c-mode} and @code{c++-mode}, FORTRAN language for +@code{fortran-mode} and @code{f90-mode}, Pascal for @code{pascal-mode}, +and eqn for @code{nroff-mode}. These can be overridden with Calc's mode +changing commands (@pxref{Mode Settings in Embedded Mode}). If no +suitable language is available, Calc will continue with its current language. + Calc normally scans backward and forward in the buffer for the nearest opening and closing @dfn{formula delimiters}. The simplest delimiters are blank lines. Other delimiters that Embedded mode @@ -29922,8 +29933,7 @@ forward and backward to delimit the formula. @kbd{M-# w} When you enable Embedded mode for a formula, Calc reads the text between the delimiters and tries to interpret it as a Calc formula. -It's best if the current Calc language mode is correct for the -formula, but Calc can generally identify @TeX{} formulas and +Calc can generally identify @TeX{} formulas and Big-style formulas even if the language mode is wrong. If Calc can't make sense of the formula, it beeps and refuses to enter Embedded mode. But if the current language is wrong, Calc can @@ -30034,11 +30044,9 @@ be written in multi-line Big mode, it is parsed in Big mode. Otherwise, it is parsed according to the current language mode. Note that Calc does not change the current language mode according -to what it finds. Even though it can read a La@TeX{} formula when +the formula it reads in. Even though it can read a La@TeX{} formula when not in La@TeX{} mode, it will immediately rewrite this formula using -whatever language mode is in effect. You must then type @kbd{d L} -to switch Calc permanently into La@TeX{} mode if that is what you -desire. +whatever language mode is in effect. @tex \bigskip @@ -30441,6 +30449,11 @@ use @kbd{M-# u} to update the buffer by hand. @section Mode Settings in Embedded Mode @noindent +The mode settings can be changed while Calc is in embedded mode, but +will revert to their original values when embedded mode is ended +(except for the modes changed while the mode-setting mode was +@code{Save}). + Embedded mode has a rather complicated mechanism for handling mode settings in Embedded formulas. It is possible to put annotations in the file that specify mode settings either global to the entire diff --git a/man/calendar.texi b/man/calendar.texi index 7f90dfcb64..fa37ab88d2 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -37,7 +37,7 @@ information about the calendar and diary. * Other Calendars:: Converting dates to other calendar systems. * Diary:: Displaying events from your diary. * Appointments:: Reminders when it's time to do something. -* iCalendar:: Converting diary events to/from iCalendar format. +* Importing Diary:: Converting diary events to/from other formats. * Daylight Savings:: How to specify when daylight savings time is active. * Time Intervals:: Keeping track of time intervals. @end menu @@ -1396,15 +1396,24 @@ clock. The command @kbd{M-x appt-add} adds entries to the appointment list without affecting your diary file. You delete entries from the appointment list with @kbd{M-x appt-delete}. -@node iCalendar -@section iCalendar -@cindex iCalendar support +@node Importing Diary +@section Importing and Exporting Diary Entries + + You can transfer diary entries between Emacs diary files and a +variety of other formats. - The icalendar package aims at providing an implementation of the -iCalendar standard, as defined in ``RFC 2445 -- Internet Calendaring and -Scheduling Core Object Specification (iCalendar)''. It provides a means -for importing iCalendar (and the earlier vCalendar format) data into -Emacs diary files and vice versa. +@vindex diary-outlook-formats + You can import diary entries from Outlook-generated appointment +messages. While viewing such a message in Rmail or Gnus, do @kbd{M-x +diary-from-outlook} to import the entry. You can make this command +recognize additional appointment message formats by customizing the +variable @code{diary-outlook-formats}. + +@cindex iCalendar support + The icalendar package allows you to transfer data between your Emacs +diary file and iCalendar files, which are defined in ``RFC +2445---Internet Calendaring and Scheduling Core Object Specification +(iCalendar)'' (as well as the earlier vCalendar format). Importing works for ``ordinary'' (i.e. non-recurring) events, but (at present) may not work correctly (if at all) for recurring events. diff --git a/man/dired.texi b/man/dired.texi index 3ce58f2b46..6973a4e400 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -39,7 +39,7 @@ files. * Hiding Subdirectories:: Making subdirectories visible or invisible. * Updating: Dired Updating. Discarding lines for files of no interest. * Find: Dired and Find. Using `find' to choose the files for Dired. -* Misc: Misc Dired Commands. Various other features. +* Misc: Misc Dired Features. Various other features. @end menu @node Dired Enter @@ -1098,33 +1098,38 @@ may need to change the value of this variable. program. @kbd{M-x locate-with-filter} is similar, but keeps only lines matching a given regular expression. -These buffers don't work entirely like ordinary Dired buffers. File + These buffers don't work entirely like ordinary Dired buffers. File operations work, but do not always automatically update the buffer. Reverting the buffer with @kbd{g} deletes all inserted subdirectories, and erases all flags and marks. -@node Misc Dired Commands -@section Other Dired Commands +@node Misc Dired Features +@section Other Dired Features -@table @kbd -@item w @cindex Adding to the kill ring in Dired. @kindex w @r{(Dired)} @findex dired-copy-filename-as-kill -The @kbd{w} command (@code{dired-copy-filename-as-kill}) puts the + The @kbd{w} command (@code{dired-copy-filename-as-kill}) puts the names of the marked (or next @var{n}) files into the kill ring, as if -you had killed them with @kbd{C-w}. With a zero prefix argument -@var{n}=0, use the absolute file name of each marked file. With just -@kbd{C-u} as the prefix argument, use the relative file name of each -marked file. As a special case, if no prefix argument is given and -point is on a directory headerline, @kbd{w} gives you the name of that -directory without looking for marked files. - -The main purpose of the @kbd{w} command is so that you can yank the -file names into arguments for other Emacs commands. It also displays -what was pushed onto the kill ring, so you can use it to display the -list of currently marked files in the echo area. -@end table +you had killed them with @kbd{C-w}. + + The main purpose of this command is so that you can yank the file +names into arguments for other Emacs commands. It also displays what +was pushed onto the kill ring, so you can use it to display the list +of currently marked files in the echo area. With a zero prefix +argument @var{n}=0, this uses the absolute file name of each marked +file. With just @kbd{C-u} as the prefix argument, it uses the +relative file name of each marked file. As a special case, if no +prefix argument is given and point is on a directory headerline, +@kbd{w} gives you the name of that directory without looking for +marked files. + + On the X window system, Emacs supports the ``drag and drop'' +protocol. You can drag a file object from another program, and drop +it onto a Dired buffer; this either moves, copies, or creates a link +to the file in that directory. Precisely which action is taken is +determined by the originating program. Dragging files out of a Dired +buffer is currently not supported. @ignore arch-tag: d105f9b9-fc1b-4c5f-a949-9b2cf3ca2fc1 diff --git a/man/emacs.texi b/man/emacs.texi index dea25cdaa2..a619448a8b 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -965,47 +965,70 @@ occasionally, or subscribing to periodic updates. @node Acknowledgments, Intro, Distrib, Top @unnumberedsec Acknowledgments -Contributors to GNU Emacs include Per Abrahamsen, Jay K. Adams, Joe -Arceneaux, Boaz Ben-Zvi, Jim Blandy, Terrence Brannon, Frank Bresz, -Peter Breton, Kevin Broadey, Vincent Broman, David M. Brown, Bill -Carpenter, Hans Chalupsky, Bob Chassell, James Clark, Mike Clarkson, -Glynn Clements, Andrew Csillag, Doug Cutting, Michael DeCorte, Gary -Delp, Matthieu Devin, Eri Ding, Carsten Dominik, Scott Draves, Viktor -Dukhovni, John Eaton, Rolf Ebert, Stephen Eglen, Torbj@"orn Einarsson, -Tsugutomo Enami, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, -Frederick Farnbach, Fred Fish, Karl Fogel, Gary Foster, Noah Friedman, -Keith Gabryelski, Kevin Gallagher, Kevin Gallo, Howard Gayle, Stephen -Gildea, David Gillespie, Bob Glickstein, Boris Goldowsky, Michelangelo -Grigni, Michael Gschwind, Henry Guillaume, Doug Gwyn, Ken'ichi Handa, -Chris Hanson, K. Shane Hartman, John Heidemann, Markus Heritsch, Karl -Heuer, Manabu Higashida, Anders Holst, Kurt Hornik, Tom Houlder, Lars -Ingebrigtsen, Andrew Innes, Michael K. Johnson, Kyle Jones, Tomoji -Kagatani, Brewster Kahle, David Kaufman, Henry Kautz, Howard Kaye, -Michael Kifer, Richard King, Larry K. Kolodney, Robert Krawitz, -Sebastian Kremer, Geoff Kuenning, David K@aa{}gedal, Daniel LaLiberte, -Aaron Larson, James R. Larus, Frederic Lepied, Lars Lindberg, Eric -Ludlam, Neil M. Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon +Contributors to GNU Emacs include Per Abrahamsen, Tomas Abrahamsson, +Jay K.@: Adams, Joe Arceneaux, Miles Bader, David Bakhash, Eli +Barzilay, Steven L.@: Baur, Boaz Ben-Zvi, Ray Blaak, Jim Blandy, Per +Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, +Kevin Broadey, Vincent Broman, David M.@: Brown, Georges Brun-Cottan, +W@l{}odek Bzyl, Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris +Chase, Bob Chassell, Andrew Choi, James Clark, Mike Clarkson, Glynn +Clements, Andrew Csillag, Doug Cutting, Michael DeCorte, Gary Delp, +Matthieu Devin, Eri Ding, Jan Dj@"{a}rv, Carsten Dominik, Scott +Draves, Benjamin Drieu, Viktor Dukhovni, John Eaton, Rolf Ebert, +Stephen Eglen, Torbj@"orn Einarsson, Tsugutomo Enami, Hans Henrik +Eriksen, Michael Ernst, Ata Etemadi, Frederick Farnbach, Oscar +Figueiredo, Fred Fish, Karl Fogel, Gary Foster, Noah Friedman, +Hallvard Furuseth, Keith Gabryelski, Kevin Gallagher, Kevin Gallo, +Juan Le@'{o}n Lahoz Garc@'{i}a, Howard Gayle, Stephen Gildea, Julien +Gilles, David Gillespie, Bob Glickstein, Boris Goldowsky, Michelangelo +Grigni, Odd Gripenstam, Kai Gro@ss{}johann, Michael Gschwind, Henry +Guillaume, Doug Gwyn, Ken'ichi Handa, Chris Hanson, K. Shane Hartman, +John Heidemann, Jon K.@: Hellan, Markus Heritsch, Karl Heuer, Manabu +Higashida, Anders Holst, Kurt Hornik, Tom Houlder, Denis Howe, Lars +Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Ulf Jasper, Michael +K. Johnson, Kyle Jones, Terry Jones, Simon Josefsson, Tomoji Kagatani, +Brewster Kahle, David Kaufman, Henry Kautz, Taichi Kawabata, Howard +Kaye, Michael Kifer, Richard King, Peter Kleiweg, Larry K.@: Kolodney, +Pavel Kobiakov, Larry K.@: Kolodney, David M.@: Koppelman, Koseki +Yoshinori, Robert Krawitz, Sebastian Kremer, Ryszard Kubiak, Geoff +Kuenning, David K@aa{}gedal, Daniel LaLiberte, Aaron Larson, James +R.@: Larus, Vinicius Jose Latorre, Frederic Lepied, Peter Liljenberg, +Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Dave +Love, Eric Ludlam, Alan Mackenzie, Christopher J.@: Madsen, +Neil M.@: Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin, Thomas May, Roland McGrath, -David Megginson, Wayne Mesard, Richard Mlynarik, Keith Moore, Erik -Naggum, Thomas Neumann, Mike Newton, Jurgen Nickelsen, Jeff Norden, -Andrew Norman, Jeff Peck, Damon Anton Permezel, Tom Perrine, Jens -Petersen, Daniel Pfeiffer, Fred Pierresteguy, Christian Plaunt, -Francesco A. Potorti, Michael D. Prange, Ashwin Ram, Eric S. Raymond, -Paul Reilly, Edward M. Reingold, Rob Riepel, Roland B. Roberts, John -Robinson, Danny Roozendaal, William Rosenblatt, Guillermo J. Rozas, Ivar -Rummelhoff, Wolfgang Rupprecht, James B. Salem, Masahiko Sato, William -Schelter, Ralph Schleicher, Gregor Schmid, Michael Schmidt, Ronald -S. Schnell, Philippe Schnoebelen, Stephen Schoef, Randal Schwartz, -Manuel Serrano, Stanislav Shalunov, Mark Shapiro, Richard Sharman, Olin -Shivers, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith, David -Smith, Paul D. Smith, William Sommerfeld, Michael Staats, Sam Steingold, -Ake Stenhoff, Peter Stephenson, Jonathan Stigelman, Steve Strassman, -Jens T. Berger Thielemann, Spencer Thomas, Jim Thompson, Masanobu Umeda, -Neil W. Van Dyke, Ulrik Vieth, Geoffrey Voelker, Johan Vromans, Barry -Warsaw, Morten Welinder, Joseph Brian Wells, Rodney Whitby, Ed -Wilkinson, Mike Williams, Steven A. Wood, Dale R. Worley, Felix -S. T. Wu, Tom Wurgler, Eli Zaretskii, Jamie Zawinski, Ian T. Zimmermann, -Reto Zimmermann, and Neal Ziring. +Will Mengarini, David Megginson, Wayne Mesard, Brad Miller, Richard +Mlynarik, Gerd Moellmann, Stefan Monnier, Morioka Tomohiko, Keith +Moore, Sen Nagata, Erik Naggum, Thomas Neumann, Thien-Thi Nguyen, Mike +Newton, Jurgen Nickelsen, Dan Nicolaescu, Jeff Norden, Andrew Norman, +Alexandre Oliva, Bob Olson, Takaaki Ota, Pieter E.@: J.@: Pareit, +David Pearson, Jeff Peck, Damon Anton Permezel, Tom Perrine, William +M.@: Perry, Per Persson, Jens Petersen, Daniel Pfeiffer, Richard +L.@: Pieri, Fred Pierresteguy, Christian Plaunt, David Ponce, Francesco +A. Potorti, Michael D. Prange, Mukesh Prasad, Marko Rahamaa, Ashwin +Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, Alex Rezinsky, +Rob Riepel, Nick Roberts, Roland B.@: Roberts, John Robinson, Danny +Roozendaal, William Rosenblatt, Guillermo J.@: Rozas, Ivar Rummelhoff, +Jason Rumney, Wolfgang Rupprecht, Kevin Ryde, James B. Salem, Masahiko +Sato, Holger Schauer, William Schelter, Ralph Schleicher, Gregor +Schmid, Michael Schmidt, Ronald S. Schnell, Philippe Schnoebelen, Jan +Schormann, Alex Schroeder, Stephen Schoef, Randal Schwartz, Oliver +Seidel, Manuel Serrano, Hovav Shacham, Stanislav Shalunov, Mark +Shapiro, Richard Sharman, Olin Shivers, Espen Skoglund, Rick Sladkey, +Lynn Slater, Chris Smith, David Smith, Paul D.@: Smith, Andre Spiegel, +Michael Staats, William Sommerfeld, Michael Staats, Sam Steingold, Ake +Stenhoff, Peter Stephenson, Ken Stevens, Jonathan Stigelman, Martin +Stjernholm, Kim F.@: Storm, Steve Strassman, Olaf Sylvester, Naoto +Takahashi, Jean-Philippe Theberge, Jens T.@: Berger Thielemann, +Spencer Thomas, Jim Thompson, Tom Tromey, Daiki Ueno, Masanobu Umeda, +Rajesh Vaidheeswarran, Neil W.@: Van Dyke, Didier Verna, Ulrik Vieth, +Geoffrey Voelker, Johan Vromans, Inge Wallin, Colin Walters, Barry +Warsaw, Morten Welinder, Joseph Brian Wells, Rodney Whitby, John +Wiegley, Ed Wilkinson, Mike Williams, Bill Wohler, Steven A. Wood, +Dale R.@: Worley, Francis J.@: Wright, Felix S. T. Wu, Tom Wurgler, +Masatake Yamato, Jonathan Yavner, Ilya Zakharevich, Milan Zamazal, +Victor Zandy, Eli Zaretskii, Jamie Zawinski, Shenghuo Zhu, Ian +T.@: Zimmermann, Reto Zimmermann, Neal Ziring, and Detlev Zundel. @end iftex @node Intro, Glossary, Distrib, Top diff --git a/man/files.texi b/man/files.texi index fff30e2121..4e944f83af 100644 --- a/man/files.texi +++ b/man/files.texi @@ -207,15 +207,6 @@ While in the minibuffer, you can abort @kbd{C-x C-f} by typing @kbd{C-g}. File-name completion ignores certain filenames; for more about this, see @ref{Completion Options}. -@cindex file selection dialog - When Emacs is built with a suitable GUI toolkit, commands invoked -with the mouse or the menu bar use the toolkit's standard File -Selection dialog instead of prompting for the file name in the -minibuffer. On Unix and GNU/Linux platforms, Emacs does that when -built with GTK, LessTif, and Motif toolkits; on MS-Windows, the GUI -version does that by default. @xref{Dialog Boxes}, for info -on customization of this. - Your confirmation that @kbd{C-x C-f} has completed successfully is the appearance of new text on the screen and a new buffer name in the mode line. If the specified file does not exist and could not be created, or @@ -228,11 +219,33 @@ However, before doing so, it checks that the file itself has not changed since you visited or saved it last. If the file has changed, a warning message is shown. @xref{Interlocking,,Simultaneous Editing}. +@vindex large-file-warning-threshold @cindex maximum buffer size exceeded, error message - Since Emacs reads the visited file in its entirety, files whose size -is larger than the maximum Emacs buffer size (@pxref{Buffers}) cannot be -visited; if you try, Emacs will display an error message saying that the -maximum buffer size has been exceeded. + If you try to visit a file larger than +@code{large-file-warning-threshold} (the default is 10000000, which is +about 10 megabytes), Emacs will ask you for confirmation first. You +can answer @kbd{y} to proceed with visiting the file. Note, however, +that Emacs cannot visit files that are larger than the maximum Emacs +buffer size, which is around 256 megabytes on 32-bit machines +(@pxref{Buffers}). If you try, Emacs will display an error message +saying that the maximum buffer size has been exceeded. + +@cindex file selection dialog + On graphical terminals, there are two additional methods for +visiting files. Firstly, when Emacs is built with a suitable GUI +toolkit, commands invoked with the mouse (by clicking on the menu bar +or tool bar) use the toolkit's standard File Selection dialog instead +of prompting for the file name in the minibuffer. On Unix and +GNU/Linux platforms, Emacs does that when built with GTK, LessTif, and +Motif toolkits; on MS-Windows, the GUI version does that by default. +For information on how to customize this, see @xref{Dialog Boxes}. + + Secondly, Emacs supports the ``drag and drop'' protocol on the X +window system. Dropping a file into an ordinary Emacs window visits +the file using that window. However, dropping a file into a window +displaying a Dired buffer moves or copies the file into the displayed +directory. For details, see @xref{Drag and Drop} and @xref{Misc Dired +Features}. @cindex creating files What if you want to create a new file? Just visit it. Emacs displays @@ -905,15 +918,27 @@ discard your changes.) @cindex mode, Auto-Revert @findex global-auto-revert-mode @findex auto-revert-mode +@findex auto-revert-tail-mode + + You may find it useful to have Emacs revert files automatically when +they change. Three minor modes are available to do this. + + @kbd{M-x global-auto-revert-mode} runs Global Auto-Revert mode, +which periodically checks all file buffers and reverts when the +corresponding file has changed. @kbd{M-x auto-revert-mode} runs a +local version, Auto-Revert mode, which applies only to the buffer in +which it was activated. Auto-Revert mode can be used to ``tail'' a +file, such as a system log, so that changes made to that file by other +programs are continuously displayed. To do this, just move the point +to the end of the buffer, and it will stay there as the file contents +change. However, if you are sure that the file will only change by +growing at the end, you can tail the file more efficiently using +Auto-Revert Tail mode, @kbd{M-x auto-revert-tail-mode}. + @vindex auto-revert-interval -You may find it useful to have Emacs revert files automatically when -they change. Two minor modes are available to do this. In Global -Auto-Revert mode, Emacs periodically checks all file buffers and -reverts any when the corresponding file has changed. The local -variant, Auto-Revert mode, applies only to buffers in which it was -activated. The variable @code{auto-revert-interval} controls how -often to check for a changed file. Since checking a remote file is -too slow, these modes do not check or revert remote files. + The variable @code{auto-revert-interval} controls how often to check +for a changed file. Since checking a remote file is too slow, these +modes do not check or revert remote files. @node Auto Save @section Auto-Saving: Protection Against Disasters @@ -1225,7 +1250,7 @@ and deletes. It can be used via http or via its own protocol. @cindex MCVS @cindex Meta-CVS - Meta-CVS is another attempt to solve problems, arising in CVS. It + Meta-CVS is another attempt to solve problems arising in CVS. It supports directory structure versioning, improved branching and merging, and use of symbolic links and meta-data in repositories. @@ -2839,14 +2864,12 @@ running the @code{diff} program, using options taken from the variable @code{diff-switches}. The value of @code{diff-switches} should be a string; the default is @code{"-c"} to specify a context diff. - The buffer @samp{*diff*} has Compilation mode as its major mode, so -you can use @kbd{C-x `} to visit successive changed locations in the two -source files. You can also move to a particular hunk of changes and -type @key{RET} or @kbd{C-c C-c}, or click @kbd{Mouse-2} on it, to move -to the corresponding source location. You can also use the other -special commands of Compilation mode: @key{SPC} and @key{DEL} for -scrolling, and @kbd{M-p} and @kbd{M-n} for cursor motion. -@xref{Compilation}. +@findex diff-goto-source + After running @kbd{M-x diff}, you can use @kbd{C-x `} to visit +successive changed locations in the two source files, as in +Compilation mode (@pxref{Compilation}.) In the @samp{*diff*} buffer, +you can move to a particular hunk of changes and type @kbd{C-c C-c} +(@code{diff-goto-source}) to visit the corresponding source location. @findex diff-backup The command @kbd{M-x diff-backup} compares a specified file with its most @@ -2864,9 +2887,13 @@ the command is finished. For more information about windows in Emacs, @ref{Windows}. @vindex compare-ignore-case +@vindex compare-ignore-whitespace With a numeric argument, @code{compare-windows} ignores changes in whitespace. If the variable @code{compare-ignore-case} is -non-@code{nil}, it ignores differences in case as well. +non-@code{nil}, the comparison ignores differences in case as well. +If the variable @code{compare-ignore-whitespace} is non-nil, +@code{compare-windows} normally ignores changes in whitespace, and a +prefix argument turns that off. @findex diff-mode @cindex diffs @@ -2943,36 +2970,40 @@ done; this is because renaming causes the old meaning of the name @var{new} to be lost. If @var{old} and @var{new} are on different file systems, the file @var{old} is copied and deleted. + If the argument @var{new} is just a directory name, the real new +name is in that directory, with the same non-directory component as +@var{old}. For example, @kbd{M-x rename-file RET ~/foo RET /tmp RET} +renames @file{~/foo} to @file{/tmp/foo}. The same rule applies to all +the remaining commands in this section. All of them ask for +confirmation when the new file name already exists, too. + @findex add-name-to-file @cindex hard links (creation) The similar command @kbd{M-x add-name-to-file} is used to add an additional name to an existing file without removing its old name. The new name is created as a ``hard link'' to the existing file. The new name must belong on the same file system that the file is on. -On Windows, this command works only if the file resides in an NTFS +On MS-Windows, this command works only if the file resides in an NTFS file system. On MS-DOS, it works by copying the file. @findex copy-file @cindex copying files - @kbd{M-x copy-file} reads the file @var{old} and writes a new file named -@var{new} with the same contents. Confirmation is required if a file named -@var{new} already exists, because copying has the consequence of overwriting -the old contents of the file @var{new}. + @kbd{M-x copy-file} reads the file @var{old} and writes a new file +named @var{new} with the same contents. @findex make-symbolic-link @cindex symbolic links (creation) @kbd{M-x make-symbolic-link} reads two file names @var{target} and -@var{linkname}, then creates a symbolic link named @var{linkname}, which -points at @var{target}. The effect is that future attempts to open file -@var{linkname} will refer to whatever file is named @var{target} at the -time the opening is done, or will get an error if the name @var{target} is -not in use at that time. This command does not expand the argument -@var{target}, so that it allows you to specify a relative name -as the target of the link. - - Confirmation is required when creating the link if @var{linkname} is -in use. Note that not all systems support symbolic links; on systems -that don't support them, this command is not defined. +@var{linkname}, then creates a symbolic link named @var{linkname}, +which points at @var{target}. The effect is that future attempts to +open file @var{linkname} will refer to whatever file is named +@var{target} at the time the opening is done, or will get an error if +the name @var{target} is nonexistent at that time. This command does +not expand the argument @var{target}, so that it allows you to specify +a relative name as the target of the link. + + Not all systems support symbolic links; on systems that don't +support them, this command is not defined. @node Compressed Files @section Accessing Compressed Files diff --git a/man/frames.texi b/man/frames.texi index 3fdaac6d02..edbda679b4 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -810,16 +810,18 @@ command @kbd{M-x toggle-scroll-bar}. usually click the wheel to act as either @kbd{Mouse-2} or @kbd{Mouse-3}, depending on the setup. You can also use the wheel to scroll windows instead of using the scroll bar or keyboard commands. -To do so, turn on Mouse Wheel global minor mode with the command -@kbd{M-x mouse-wheel-mode} or by customizing the variable -@code{mouse-wheel-mode}. Support for the wheel depends on the system -generating appropriate events for Emacs. +Mouse wheel support only works if the system generates appropriate +events; whenever possible, it is turned on by default. To toggle this +feature, use @kbd{M-x mouse-wheel-mode}. @vindex mouse-wheel-follow-mouse @vindex mouse-wheel-scroll-amount +@vindex mouse-wheel-progressive-speed The variables @code{mouse-wheel-follow-mouse} and @code{mouse-wheel-scroll-amount} determine where and by how much -buffers are scrolled. +buffers are scrolled. The variable +@code{mouse-wheel-progressive-speed} determines whether the the scroll +speed is linked to how fast you move the wheel. @node Drag and Drop @section Drag and Drop diff --git a/man/help.texi b/man/help.texi index ebc650412b..8f7eed4915 100644 --- a/man/help.texi +++ b/man/help.texi @@ -456,11 +456,15 @@ system will be available. Type @kbd{h} after entering Info to run a tutorial on using Info. @cindex find Info manual by its file name - If you specify a numeric argument, @kbd{C-h i} prompts for the name of -a documentation file. This way, you can browse a file which doesn't + With a numeric argument, @kbd{C-h i} selects an Info buffer with the +number appended to the default @samp{*info*} buffer name +(e.g. @samp{*info*<2>}). This is useful if you want to browse +multiple Info manuals simultaneously. If you specify just @kbd{C-u} +as the prefix argument, @kbd{C-h i} prompts for the name of a +documentation file. This way, you can browse a file which doesn't have an entry in the top-level Info menu. It is also handy when you -need to get to the documentation quickly, and you know the exact name of -the file. +need to get to the documentation quickly, and you know the exact name +of the file. @kindex C-h F @kindex C-h K diff --git a/man/killing.texi b/man/killing.texi index 51e352dec6..9950e405cd 100644 --- a/man/killing.texi +++ b/man/killing.texi @@ -151,7 +151,8 @@ characters: spaces, tabs and newlines. @kbd{M-\} characters before and after point. @kbd{M-@key{SPC}} (@code{just-one-space}) does likewise but leaves a single space after point, regardless of the number of spaces that existed previously (even -if there were none before). +if there were none before). With a numeric argument @var{n}, it +leaves @var{n} spaces after point. @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines after the current line. If the current line is blank, it deletes all diff --git a/man/mini.texi b/man/mini.texi index cef1df7074..fbe1d1e390 100644 --- a/man/mini.texi +++ b/man/mini.texi @@ -209,6 +209,10 @@ command names). Thus, @samp{fo} does not complete to @samp{Foo}. Completion does ignore case distinctions for certain arguments in which case does not matter. + Completion acts only on the text before point. If there is text in +the minibuffer after point---i.e., if you move point backward after +typing some text into the minibuffer---it remains unchanged. + @menu * Example: Completion Example. Examples of using completion. * Commands: Completion Commands. A list of completion commands. diff --git a/man/misc.texi b/man/misc.texi index d5c7572abc..5ef15d45d8 100644 --- a/man/misc.texi +++ b/man/misc.texi @@ -1928,6 +1928,13 @@ another directory by typing @kbd{M-x desktop-change-dir}. Typing Specify the option @samp{--no-desktop} on the command line when you don't want it to reload any saved desktop. +@vindex desktop-restore-eager + By default, all the buffers in the desktop are restored at one go. +However, this may be slow if there are a lot of buffers in the +desktop. You can specify the maximum number of buffers to restore +immediately with the variable @code{desktop-restore-eager}; the +remaining buffers are restored ``lazily,'' when Emacs is idle. + @findex desktop-clear @vindex desktop-globals-to-clear @vindex desktop-clear-preserve-buffers-regexp @@ -2048,41 +2055,28 @@ Emacs key bindings are still available. The EDT emulation rebindings are done in the global keymap, so there is no problem switching buffers or major modes while in EDT emulation. -@item ``PC'' bindings -@findex pc-bindings-mode -@cindex ``PC'' key bindings -The command @kbd{M-x pc-bindings-mode} sets up certain key bindings -for ``PC compatibility''---what people are often used to on PCs---as -follows: @kbd{M-Backspace} does undo, and @kbd{C-Escape} does -@code{list-buffers}. - -@item PC Selection mode -@findex pc-selection-mode -@cindex PC Selection minor mode -@cindex mode, PC selection -@cindex selection, PC -The command @kbd{M-x pc-selection-mode} toggles a global minor mode -that emulates the mark, copy, cut and paste commands of various other -systems---an interface known as CUA. It establishes the key bindings -of PC mode, and also modifies the bindings of the cursor keys and the -@kbd{next}, @kbd{prior}, @kbd{home} and @kbd{end} keys. It does not -provide the full set of CUA key bindings---the fundamental Emacs keys -@kbd{C-c}, @kbd{C-v} and @kbd{C-x} are not changed. - -The standard keys for moving around (@kbd{right}, @kbd{left}, -@kbd{up}, @kbd{down}, @kbd{home}, @kbd{end}, @kbd{prior}, @kbd{next}, -called ``move-keys'') deactivate the mark in PC selection mode. -However, using @kbd{Shift} together with the ``move keys'' activates -the region over which they move. The copy, cut and paste functions -are available on @kbd{C-insert}, @kbd{S-delete} and @kbd{S-insert} -respectively. - -Turning @code{pc-selection-mode} off restores the old key bindings of -these keys. - -@cindex s-region package -The @code{s-region} package provides similar, but less complete, -facilities. +@item CUA bindings +@findex cua-mode +@vindex cua-mode +@cindex CUA key bindings +@vindex cua-enable-cua-keys +The command @kbd{M-x cua-mode} sets up key bindings that are +compatible with the Common User Access (CUA) system used in many other +applications. @kbd{C-x} means cut (kill), @kbd{C-c} copy, @kbd{C-v} +paste (yank), and @kbd{C-z} undo. Standard Emacs commands like +@kbd{C-x C-c} still work, because @kbd{C-x} and @kbd{C-c} only take +effect when the mark is active. However, if you don't want these +bindings at all, set @code{cua-enable-cua-keys} to nil. + +In CUA mode, using @kbd{Shift} together with the movement keys +activates the region over which they move. The standard (unshifted) +movement keys deactivate the mark, and typed text replaces the active +region as in Delete-Selection mode (@pxref{Graphical Kill}). + +CUA mode also provides enhanced rectangle support with visible +rectangle highlighting. Use @kbd{Shift-RET} to start a rectangle, +extend it using the movement commands, and cut or copy it using +@kbd{C-x} or @kbd{C-c}. @item TPU (DEC VMS editor) @findex tpu-edt-on diff --git a/man/mule.texi b/man/mule.texi index a726265ff7..be71bd6440 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -439,12 +439,6 @@ most input methods---some disable this feature). If possible characters to type next is displayed in the echo area (but not when you are in the minibuffer). -@cindex Leim package - Input methods are implemented in the separate Leim package: they are -available only if the system administrator used Leim when building -Emacs. If Emacs was built without Leim, you will find that no input -methods are defined. - @node Select Input Method @section Selecting an Input Method @@ -528,6 +522,11 @@ for those scripts. How to do this remapping properly depends on your actual keyboard layout. To specify which layout your keyboard has, use the command @kbd{M-x quail-set-keyboard-layout}. +@findex quail-show-key + You can use the command @kbd{M-x quail-show-key} to show what key +(or key sequence) to type in order to input the character following +point, using the selected keyboard layout. + @findex list-input-methods To display a list of all the supported input methods, type @kbd{M-x list-input-methods}. The list gives information about each input @@ -903,6 +902,9 @@ file in the current buffer. Specify coding system @var{coding} for the immediately following command. +@item C-x @key{RET} r @var{coding} @key{RET} +Revisit the current file using the coding system @var{coding}. + @item C-x @key{RET} k @var{coding} @key{RET} Use coding system @var{coding} for keyboard input. @@ -975,6 +977,12 @@ in a file. Selecting a language environment typically sets this variable to a good choice of default coding system for that language environment. +@kindex C-x RET r +@findex revert-buffer-with-coding-system + If you visit a file with a wrong coding system, you can correct this +with @kbd{C-x @key{RET} r} (@code{revert-buffer-with-coding-system}). +This visits the current file again, using a coding system you specify. + @kindex C-x RET t @findex set-terminal-coding-system The command @kbd{C-x @key{RET} t} (@code{set-terminal-coding-system}) diff --git a/man/programs.texi b/man/programs.texi index 2a631a23b5..353cb85aa6 100644 --- a/man/programs.texi +++ b/man/programs.texi @@ -1843,15 +1843,51 @@ mode provides special commands to move by statements. @table @kbd @kindex C-c C-n @r{(Fortran mode)} @findex fortran-next-statement +@findex f90-next-statement @item C-c C-n -Move to beginning of current or next statement -(@code{fortran-next-statement}). +Move to the beginning of the next statement +(@code{fortran-next-statement}/@code{f90-next-statement}). @kindex C-c C-p @r{(Fortran mode)} @findex fortran-previous-statement +@findex f90-previous-statement @item C-c C-p -Move to beginning of current or previous statement -(@code{fortran-previous-statement}). +Move to the beginning of the previous statement +(@code{fortran-previous-statement}/@code{f90-previous-statement}). +If there is no previous statement (i.e. if called from the first +statement in the buffer), move to the start of the buffer. + +@kindex C-c C-e @r{(F90 mode)} +@findex f90-next-block +@item C-c C-e +Move point forward to the start of the next code block +(@code{f90-next-block}). A code block is a subroutine, +@code{if}--@code{endif} statement, and so forth. This command exists +for F90 mode only, not Fortran mode. With a numeric argument, this +moves forward that many blocks. + +@kindex C-c C-a @r{(F90 mode)} +@findex f90-previous-block +@item C-c C-a +Move point backward to the previous code block +(@code{f90-previous-block}). This is like @code{f90-next-block}, but +moves backwards. + +@kindex C-M-n @r{(F90 mode)} +@findex f90-end-of-block +@item C-M-n +Move to the end of the current code block (@code{f90-end-of-block}). +This is for F90 mode only. With a numeric agument, move forward that +number of blocks. This command checks for consistency of block types +and labels (if present), but it does not check the outermost block +since that may be incomplete. The mark is set before moving point. + +@kindex C-M-p @r{(F90 mode)} +@findex f90-beginning-of-block +@item C-M-p +Move to the start of the current code block +(@code{f90-beginning-of-block}). This is like @code{f90-end-of-block}, +but moves backwards. @end table @node Fortran Indent diff --git a/man/text.texi b/man/text.texi index 4b15eff4f1..327a03116f 100644 --- a/man/text.texi +++ b/man/text.texi @@ -1981,34 +1981,34 @@ chosen face to the region. @xref{Faces}. You can also specify a face with these keyboard commands: @table @kbd -@kindex M-g d @r{(Enriched mode)} +@kindex M-o d @r{(Enriched mode)} @findex facemenu-set-default -@item M-g d +@item M-o d Set the region, or the next inserted character, to the @code{default} face (@code{facemenu-set-default}). -@kindex M-g b @r{(Enriched mode)} +@kindex M-o b @r{(Enriched mode)} @findex facemenu-set-bold -@item M-g b +@item M-o b Set the region, or the next inserted character, to the @code{bold} face (@code{facemenu-set-bold}). -@kindex M-g i @r{(Enriched mode)} +@kindex M-o i @r{(Enriched mode)} @findex facemenu-set-italic -@item M-g i +@item M-o i Set the region, or the next inserted character, to the @code{italic} face (@code{facemenu-set-italic}). -@kindex M-g l @r{(Enriched mode)} +@kindex M-o l @r{(Enriched mode)} @findex facemenu-set-bold-italic -@item M-g l +@item M-o l Set the region, or the next inserted character, to the @code{bold-italic} face (@code{facemenu-set-bold-italic}). -@kindex M-g u @r{(Enriched mode)} +@kindex M-o u @r{(Enriched mode)} @findex facemenu-set-underline -@item M-g u +@item M-o u Set the region, or the next inserted character, to the @code{underline} face (@code{facemenu-set-underline}). -@kindex M-g o @r{(Enriched mode)} +@kindex M-o o @r{(Enriched mode)} @findex facemenu-set-face -@item M-g o @var{face} @key{RET} +@item M-o o @var{face} @key{RET} Set the region, or the next inserted character, to the face @var{face} (@code{facemenu-set-face}). @end table diff --git a/man/tramp.texi b/man/tramp.texi index afd5fd273e..854dbba591 100644 --- a/man/tramp.texi +++ b/man/tramp.texi @@ -88,7 +88,7 @@ combination of @command{rsh} and @command{rcp} or other work-alike programs, such as @command{ssh}/@command{scp}. You can find the latest version of this document on the web at -@uref{http://www.freesoftware.fsf.org/tramp/}. +@uref{http://www.gnu.org/software/tramp/}. @c Pointer to the other Emacs flavor is necessary only in case of @c standalone installation. @@ -111,18 +111,18 @@ Japanese translation}. @end ifset The latest release of @value{tramp} is available for -@uref{http://savannah.nongnu.org/download/tramp/, download}, or you -may see @ref{Obtaining Tramp} for more details, including the CVS -server details. +@uref{http://ftp.gnu.org/gnu/tramp/, download}, or you may see +@ref{Obtaining Tramp} for more details, including the CVS server +details. -@value{tramp} also has a @uref{http://savannah.nongnu.org/projects/tramp/, +@value{tramp} also has a @uref{http://savannah.gnu.org/projects/tramp/, Savannah Project Page}. @end ifhtml There is a mailing list for @value{tramp}, available at -@email{tramp-devel@@mail.freesoftware.fsf.org}, and archived at -@uref{http://savannah.nongnu.org/mail/?group=tramp, Savannah Mail -Archive}. +@email{tramp-devel@@gnu.org}, and archived at +@uref{http://lists.gnu.org/archive/html/tramp-devel/, the +@value{tramp} Mail Archive}. @ifhtml Older archives are located at @uref{http://sourceforge.net/mailarchive/forum.php?forum=tramp-devel, @@ -377,14 +377,14 @@ behind the scenes when you open a file with @value{tramp}. @chapter Obtaining Tramp. @cindex obtaining Tramp -@value{tramp} is freely available on the Internet and the latest release -may be downloaded from -@uref{http://savannah.nongnu.org/download/tramp/}. This -release includes the full documentation and code for @value{tramp}, -suitable for installation. But Emacs (22.1 or later) includes -@value{tramp} already, and there is a @value{tramp} package for XEmacs, as well. -So maybe it is easier to just use those. But if you want the bleeding -edge, read on@dots{...} +@value{tramp} is freely available on the Internet and the latest +release may be downloaded from +@uref{http://ftp.gnu.org/gnu/tramp/}. This release includes the full +documentation and code for @value{tramp}, suitable for installation. +But GNU Emacs (22 or later) includes @value{tramp} already, and there +is a @value{tramp} package for XEmacs, as well. So maybe it is easier +to just use those. But if you want the bleeding edge, read +on@dots{...} For the especially brave, @value{tramp} is available from CVS. The CVS version is the latest version of the code and may contain incomplete @@ -396,7 +396,7 @@ following URL and then clicking on the CVS link in the navigation bar at the top. @noindent -@uref{http://savannah.nongnu.org/projects/tramp/} +@uref{http://savannah.gnu.org/projects/tramp/} @noindent Or follow the example session below: @@ -404,7 +404,7 @@ Or follow the example session below: @example ] @strong{cd ~/@value{emacsdir}} ] @strong{export CVS_RSH="ssh"} -] @strong{cvs -z3 -d:ext:anoncvs@@savannah.nongnu.org:/cvsroot/tramp co tramp} +] @strong{cvs -z3 -d:ext:anoncvs@@savannah.gnu.org:/cvsroot/tramp co tramp} @end example @noindent @@ -1112,7 +1112,9 @@ might like the @code{plink} method which uses the PuTTY implementation of @code{ssh}. Or you use Kerberos and thus like @code{krlogin}. For the special case of editing files on the local host as another -user, see the @code{su} or @code{sudo} method. +user, see the @code{su} or @code{sudo} method. It offers shortened +syntax for the @samp{root} account, like +@file{@value{prefix}su@value{postfixsinglehop}@value{postfix}/etc/motd}. People who edit large files may want to consider @code{scp} instead of @code{ssh}, or @code{pscp} instead of @code{plink}. These out-of-band @@ -1603,7 +1605,7 @@ directory an auto-saved file should go. By default, it is initialized for @value{tramp} files to the local temporary directory. On some versions of @value{emacsname}, namely the version built for -Debian Linux, the variable @code{auto-save-file-name-transforms} +Debian GNU/Linux, the variable @code{auto-save-file-name-transforms} contains the directory where @value{emacsname} was built. A workaround is to manually set the variable to a sane value. @@ -1924,13 +1926,13 @@ The @value{tramp} mailing list is a great place to get information on working with @value{tramp}, solving problems and general discussion and advice on topics relating to the package. -The mailing list is at @email{tramp-devel@@mail.freesoftware.fsf.org}. -Messages sent to this address go to all the subscribers. This is -@emph{not} the address to send subscription requests to. +The mailing list is at @email{tramp-devel@@gnu.org}. Messages sent to +this address go to all the subscribers. This is @emph{not} the address +to send subscription requests to. -For help on subscribing to the list, send mail to the administrative -address, @email{tramp-devel-request@@mail.freesoftware.fsf.org}, with the -subject @samp{help}. +Subscribing to the list is performed via +@uref{http://lists.gnu.org/mailman/listinfo/tramp-devel/, +the @value{tramp} Mail Subscription Page}. To report a bug in @value{tramp}, you should execute @kbd{M-x tramp-bug}. This will automatically generate a buffer with the details of your system and @@ -1956,20 +1958,21 @@ Where can I get the latest @value{tramp}? @value{tramp} is available under the URL below. @noindent -@uref{http://savannah.nongnu.org/download/tramp/} +@uref{http://ftp.gnu.org/gnu/tramp/} @noindent There is also a Savannah project page. @noindent -@uref{http://savannah.nongnu.org/projects/tramp/} +@uref{http://savannah.gnu.org/projects/tramp/} @item Which systems does it work on? -The package has been used successfully on Emacs 20 and Emacs 21, as well -as XEmacs 21. XEmacs 20 is more problematic, see the notes in -@file{tramp.el}. I don't think anybody has really tried it on Emacs 19. +The package has been used successfully on GNU Emacs 20, GNU Emacs 21 +and GNU Emacs 22, as well as XEmacs 21. XEmacs 20 is more +problematic, see the notes in @file{tramp.el}. I don't think anybody +has really tried it on GNU Emacs 19. The package was intended to work on Unix, and it really expects a Unix-like system on the remote end (except the @option{smb} method), @@ -2336,9 +2339,9 @@ emulation macro to @value{tramp}, but if somebody who uses XEmacs 20 steps forward and wishes to implement and test it, please contact me or the mailing list. -@item The @value{tramp} filename syntax differs between Emacs and XEmacs. +@item The @value{tramp} filename syntax differs between GNU Emacs and XEmacs. -The Emacs maintainers wish to use a unified filename syntax for +The GNU Emacs maintainers wish to use a unified filename syntax for Ange-FTP and @value{tramp} so that users don't have to learn a new syntax. It is sufficient to learn some extensions to the old syntax. diff --git a/man/trampver.texi b/man/trampver.texi index 87b1dc8ebd..3e9f32a7fa 100644 --- a/man/trampver.texi +++ b/man/trampver.texi @@ -4,7 +4,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.0.47 +@set trampver 2.0.48 @c Other flags from configuration @set prefix /usr/local @@ -25,7 +25,7 @@ @c Emacs values. @ifset emacs -@set emacsname Emacs +@set emacsname GNU Emacs @set emacsdir emacs @set ftppackagename Ange-FTP @set prefix / @@ -49,7 +49,7 @@ @set postfix ] @set postfixsinglehop / @set postfixmultihop : -@set emacsothername Emacs +@set emacsothername GNU Emacs @set emacsotherdir emacs @set emacsotherfilename tramp-emacs.html @set japanesemanual tramp_ja-xemacs.html diff --git a/src/ChangeLog b/src/ChangeLog index 92be15873c..2354e59784 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,49 @@ +2005-03-22 Kim F. Storm <[email protected]> + + * xfaces.c (lookup_derived_face): Add arg SIGNAL_P. + * dispextern.h (lookup_derived_face): Fix prototype. + * msdos.c (XMenuActivate): Fix call to lookup_derived_face. + + * xdisp.c (handle_single_display_spec): Derive left-fringe and + right-fringe face from fringe face. + + * fringe.c (draw_fringe_bitmap_1, Fset_fringe_bitmap_face): + Derive face from fringe face. + +2005-03-22 Jan Dj,Ad(Brv <[email protected]> + + * xrdb.c (x_load_resources): Undo previous change (2005-03-18). + +2005-03-22 David Kastrup <[email protected]> + + * textprop.c (Fnext_char_property_change) + (Fprevious_char_property_change): allow marker as limit. + (Fnext_single_char_property_change) + (Fprevious_single_char_property_change): Check that limit is a + number in strings. + (Fnext_single_char_property_change): Coerce position to integer. + (Fprevious_single_char_property_change): Same here. + +2005-03-21 Thien-Thi Nguyen <[email protected]> + + * s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Define if undefined. + +2005-03-19 Stefan Monnier <[email protected]> + + * frame.c (Fignore_event): Remove. + (syms_of_frame): Don't defsubr it. + + * keyboard.c (keys_of_keyboard): Just use `ignore' instead of the + redundant `ignore-event'. + +2005-03-19 Eli Zaretskii <[email protected]> + + * unexec.c (write_segment, unexec): Move these functions to avoid + forward references (which cause errors with "gcc -gcoff"). + 2005-03-18 Jan Dj,Ad(Brv <[email protected]> - * xfns.c (x_create_tip_frame): Removed setting of Vx_resource_name so + * xfns.c (x_create_tip_frame): Remove setting of Vx_resource_name so that it doesn't become "tooltip". The specbind is enough. * xrdb.c (x_load_resources): Use different char *helv when I18N diff --git a/src/dispextern.h b/src/dispextern.h index 8861a9705c..fbc816865b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2770,7 +2770,7 @@ int lookup_face P_ ((struct frame *, Lisp_Object *, int, struct face *)); int lookup_named_face P_ ((struct frame *, Lisp_Object, int, int)); int smaller_face P_ ((struct frame *, int, int)); int face_with_height P_ ((struct frame *, int, int)); -int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int)); +int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int, int)); void init_frame_faces P_ ((struct frame *)); void free_frame_faces P_ ((struct frame *)); void recompute_basic_faces P_ ((struct frame *)); diff --git a/src/frame.c b/src/frame.c index 6c8f837bbd..40be721078 100644 --- a/src/frame.c +++ b/src/frame.c @@ -943,32 +943,6 @@ to that frame. */) return do_switch_frame (event, 0, 0); } -DEFUN ("ignore-event", Fignore_event, Signore_event, 0, 0, "", - doc: /* Do nothing. -This is a suitable binding for `iconify-frame' and `make-frame-visible'. */) - () -{ - /* Contrary to `handle-switch-frame', `ignore-event' is used from - `special-event-map'. Commands from that map are run in a special - way that automatically preserves the prefix-arg. Restoring - the prefix arg here is not just redundant but harmful: - - C-u C-x v = - - current-prefix-arg is set to non-nil, prefix-arg is set to nil. - - after the first prompt, the exit-minibuffer-hook is run which may - iconify a frame and thus push a `iconify-frame' event. - - after running exit-minibuffer-hook, current-prefix-arg is - restored to the non-nil value it had before the prompt. - - we enter the second prompt. - current-prefix-arg is non-nil, prefix-arg is nil. - - before running the first real event, we run the special iconify-frame - event, but we pass the `special' arg to execute-command so - current-prefix-arg and prefix-arg are left untouched. - - here we foolishly copy the non-nil current-prefix-arg to prefix-arg. - - the next key event will have a spuriously non-nil current-prefix-arg. - current_kboard->Vprefix_arg = Vcurrent_prefix_arg; */ - return Qnil; -} - DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0, doc: /* Return the frame that is now selected. */) () @@ -4376,7 +4350,6 @@ This variable is local to the current terminal and cannot be buffer-local. */); defsubr (&Swindow_system); defsubr (&Smake_terminal_frame); defsubr (&Shandle_switch_frame); - defsubr (&Signore_event); defsubr (&Sselect_frame); defsubr (&Sselected_frame); defsubr (&Swindow_frame); diff --git a/src/fringe.c b/src/fringe.c index 5344d58737..39479dfed2 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -552,7 +552,8 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which) Lisp_Object face; if ((face = fringe_faces[which], NILP (face)) - || (face_id = lookup_named_face (f, face, 'A', 1), face_id < 0)) + || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0), + face_id < 0)) face_id = FRINGE_FACE_ID; } @@ -1366,7 +1367,8 @@ If FACE is nil, reset face to default fringe face. */) if (!NILP (face)) { - face_id = lookup_named_face (SELECTED_FRAME (), face, 'A', 1); + face_id = lookup_derived_face (SELECTED_FRAME (), face, + 'A', FRINGE_FACE_ID, 1); if (face_id < 0) error ("No such face"); } diff --git a/src/keyboard.c b/src/keyboard.c index 9291fd990d..f29a7676d3 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11562,10 +11562,29 @@ keys_of_keyboard () initial_define_lispy_key (Vspecial_event_map, "delete-frame", "handle-delete-frame"); + /* Here we used to use `ignore-event' which would simple set prefix-arg to + current-prefix-arg, as is done in `handle-switch-frame'. + But `handle-switch-frame is not run from the special-map. + Commands from that map are run in a special way that automatically + preserves the prefix-arg. Restoring the prefix arg here is not just + redundant but harmful: + - C-u C-x v = + - current-prefix-arg is set to non-nil, prefix-arg is set to nil. + - after the first prompt, the exit-minibuffer-hook is run which may + iconify a frame and thus push a `iconify-frame' event. + - after running exit-minibuffer-hook, current-prefix-arg is + restored to the non-nil value it had before the prompt. + - we enter the second prompt. + current-prefix-arg is non-nil, prefix-arg is nil. + - before running the first real event, we run the special iconify-frame + event, but we pass the `special' arg to execute-command so + current-prefix-arg and prefix-arg are left untouched. + - here we foolishly copy the non-nil current-prefix-arg to prefix-arg. + - the next key event will have a spuriously non-nil current-prefix-arg. */ initial_define_lispy_key (Vspecial_event_map, "iconify-frame", - "ignore-event"); + "ignore"); initial_define_lispy_key (Vspecial_event_map, "make-frame-visible", - "ignore-event"); + "ignore"); /* Handling it at such a low-level causes read_key_sequence to get * confused because it doesn't realize that the current_buffer was * changed by read_char. diff --git a/src/msdos.c b/src/msdos.c index ab71b642e8..e17e79a6d1 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -3799,15 +3799,15 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, screensize = screen_size * 2; faces[0] = lookup_derived_face (sf, intern ("msdos-menu-passive-face"), - 0, DEFAULT_FACE_ID); + 0, DEFAULT_FACE_ID, 1); faces[1] = lookup_derived_face (sf, intern ("msdos-menu-active-face"), - 0, DEFAULT_FACE_ID); + 0, DEFAULT_FACE_ID, 1); selectface = intern ("msdos-menu-select-face"); faces[2] = lookup_derived_face (sf, selectface, - 0, faces[0]); + 0, faces[0], 1); faces[3] = lookup_derived_face (sf, selectface, - 0, faces[1]); + 0, faces[1], 1); /* Make sure the menu title is always displayed with `msdos-menu-active-face', no matter where the mouse pointer is. */ diff --git a/src/s/openbsd.h b/src/s/openbsd.h index d3730324ce..39e48da39a 100644 --- a/src/s/openbsd.h +++ b/src/s/openbsd.h @@ -3,6 +3,13 @@ /* Mostly the same as NetBSD. */ #include "netbsd.h" +/* This very-badly named symbol is conditionally defined in netbsd.h. + Better would be either to not need it in the first place, or to choose + a more descriptive name. */ +#ifndef LD_SWITCH_SYSTEM_tmp +#define LD_SWITCH_SYSTEM_tmp /* empty */ +#endif + /* David Mazieres <[email protected]> says this is necessary. Otherwise Emacs dumps core when run -nw. */ #undef LIBS_TERMCAP diff --git a/src/textprop.c b/src/textprop.c index 317f8fa6aa..e6dd411dcc 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -729,7 +729,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) temp = Fnext_overlay_change (position); if (! NILP (limit)) { - CHECK_NUMBER (limit); + CHECK_NUMBER_COERCE_MARKER (limit); if (XINT (limit) < XINT (temp)) temp = limit; } @@ -754,7 +754,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) temp = Fprevious_overlay_change (position); if (! NILP (limit)) { - CHECK_NUMBER (limit); + CHECK_NUMBER_COERCE_MARKER (limit); if (XINT (limit) > XINT (temp)) temp = limit; } @@ -787,7 +787,10 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) if (NILP (limit)) position = make_number (SCHARS (object)); else - position = limit; + { + CHECK_NUMBER (limit); + position = limit; + } } } else @@ -804,6 +807,8 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) Fset_buffer (object); } + CHECK_NUMBER_COERCE_MARKER (position); + initial_value = Fget_char_property (position, prop, object); if (NILP (limit)) @@ -856,7 +861,10 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) if (NILP (limit)) position = make_number (SCHARS (object)); else - position = limit; + { + CHECK_NUMBER (limit); + position = limit; + } } } else @@ -872,6 +880,8 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) Fset_buffer (object); } + CHECK_NUMBER_COERCE_MARKER (position); + if (NILP (limit)) XSETFASTINT (limit, BUF_BEGV (current_buffer)); else diff --git a/src/unexec.c b/src/unexec.c index dadea560e0..156cad16f9 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -368,48 +368,6 @@ static int copy_sym (); static void mark_x (); /* **************************************************************** - * unexec - * - * driving logic. - */ -unexec (new_name, a_name, data_start, bss_start, entry_address) - char *new_name, *a_name; - unsigned data_start, bss_start, entry_address; -{ - int new, a_out = -1; - - if (a_name && (a_out = open (a_name, O_RDONLY)) < 0) - { - PERROR (a_name); - } - if ((new = creat (new_name, 0666)) < 0) - { - PERROR (new_name); - } - - if (make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 - || copy_text_and_data (new, a_out) < 0 - || copy_sym (new, a_out, a_name, new_name) < 0 -#ifdef COFF -#ifndef COFF_BSD_SYMBOLS - || adjust_lnnoptrs (new, a_out, new_name) < 0 -#endif -#endif - ) - { - close (new); - /* unlink (new_name); /* Failed, unlink new a.out */ - return -1; - } - - close (new); - if (a_out >= 0) - close (a_out); - mark_x (new_name); - return 0; -} - -/* **************************************************************** * make_hdr * * Make the header in the new a.out from the header in core. @@ -835,6 +793,61 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) #endif /* not COFF */ } +write_segment (new, ptr, end) + int new; + register char *ptr, *end; +{ + register int i, nwrite, ret; + char buf[80]; +#ifndef USE_CRT_DLL + extern int errno; +#endif + /* This is the normal amount to write at once. + It is the size of block that NFS uses. */ + int writesize = 1 << 13; + int pagesize = getpagesize (); + char zeros[1 << 13]; + + bzero (zeros, sizeof (zeros)); + + for (i = 0; ptr < end;) + { + /* Distance to next multiple of writesize. */ + nwrite = (((int) ptr + writesize) & -writesize) - (int) ptr; + /* But not beyond specified end. */ + if (nwrite > end - ptr) nwrite = end - ptr; + ret = write (new, ptr, nwrite); + /* If write gets a page fault, it means we reached + a gap between the old text segment and the old data segment. + This gap has probably been remapped into part of the text segment. + So write zeros for it. */ + if (ret == -1 +#ifdef EFAULT + && errno == EFAULT +#endif + ) + { + /* Write only a page of zeros at once, + so that we we don't overshoot the start + of the valid memory in the old data segment. */ + if (nwrite > pagesize) + nwrite = pagesize; + write (new, zeros, nwrite); + } +#if 0 /* Now that we have can ask `write' to write more than a page, + it is legit for write do less than the whole amount specified. */ + else if (nwrite != ret) + { + sprintf (buf, + "unexec write failure: addr 0x%x, fileno %d, size 0x%x, wrote 0x%x, errno %d", + ptr, new, nwrite, ret, errno); + PERROR (buf); + } +#endif + i += nwrite; + ptr += nwrite; + } +} /* **************************************************************** * copy_text_and_data * @@ -1060,62 +1073,6 @@ copy_text_and_data (new, a_out) return 0; } - -write_segment (new, ptr, end) - int new; - register char *ptr, *end; -{ - register int i, nwrite, ret; - char buf[80]; -#ifndef USE_CRT_DLL - extern int errno; -#endif - /* This is the normal amount to write at once. - It is the size of block that NFS uses. */ - int writesize = 1 << 13; - int pagesize = getpagesize (); - char zeros[1 << 13]; - - bzero (zeros, sizeof (zeros)); - - for (i = 0; ptr < end;) - { - /* Distance to next multiple of writesize. */ - nwrite = (((int) ptr + writesize) & -writesize) - (int) ptr; - /* But not beyond specified end. */ - if (nwrite > end - ptr) nwrite = end - ptr; - ret = write (new, ptr, nwrite); - /* If write gets a page fault, it means we reached - a gap between the old text segment and the old data segment. - This gap has probably been remapped into part of the text segment. - So write zeros for it. */ - if (ret == -1 -#ifdef EFAULT - && errno == EFAULT -#endif - ) - { - /* Write only a page of zeros at once, - so that we we don't overshoot the start - of the valid memory in the old data segment. */ - if (nwrite > pagesize) - nwrite = pagesize; - write (new, zeros, nwrite); - } -#if 0 /* Now that we have can ask `write' to write more than a page, - it is legit for write do less than the whole amount specified. */ - else if (nwrite != ret) - { - sprintf (buf, - "unexec write failure: addr 0x%x, fileno %d, size 0x%x, wrote 0x%x, errno %d", - ptr, new, nwrite, ret, errno); - PERROR (buf); - } -#endif - i += nwrite; - ptr += nwrite; - } -} /* **************************************************************** * copy_sym @@ -1264,6 +1221,48 @@ adjust_lnnoptrs (writedesc, readdesc, new_name) #endif /* COFF */ +/* **************************************************************** + * unexec + * + * driving logic. + */ +unexec (new_name, a_name, data_start, bss_start, entry_address) + char *new_name, *a_name; + unsigned data_start, bss_start, entry_address; +{ + int new, a_out = -1; + + if (a_name && (a_out = open (a_name, O_RDONLY)) < 0) + { + PERROR (a_name); + } + if ((new = creat (new_name, 0666)) < 0) + { + PERROR (new_name); + } + + if (make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 + || copy_text_and_data (new, a_out) < 0 + || copy_sym (new, a_out, a_name, new_name) < 0 +#ifdef COFF +#ifndef COFF_BSD_SYMBOLS + || adjust_lnnoptrs (new, a_out, new_name) < 0 +#endif +#endif + ) + { + close (new); + /* unlink (new_name); /* Failed, unlink new a.out */ + return -1; + } + + close (new); + if (a_out >= 0) + close (a_out); + mark_x (new_name); + return 0; +} + #endif /* not CANNOT_DUMP */ /* arch-tag: 62409b69-e27a-4a7c-9413-0210d6b54e7f diff --git a/src/xdisp.c b/src/xdisp.c index b08029b5b7..68aeae2aea 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3722,7 +3722,8 @@ handle_single_display_spec (it, spec, object, position, if (CONSP (XCDR (XCDR (spec)))) { Lisp_Object face_name = XCAR (XCDR (XCDR (spec))); - int face_id2 = lookup_named_face (it->f, face_name, 'A', 0); + int face_id2 = lookup_derived_face (it->f, face_name, + 'A', FRINGE_FACE_ID, 0); if (face_id2 >= 0) face_id = face_id2; } diff --git a/src/xfaces.c b/src/xfaces.c index f09e1f3134..f237e0630b 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5778,7 +5778,7 @@ face_with_height (f, face_id, height) is assumed to be already realized. */ int -lookup_derived_face (f, symbol, c, face_id) +lookup_derived_face (f, symbol, c, face_id, signal_p) struct frame *f; Lisp_Object symbol; int c; @@ -5791,7 +5791,7 @@ lookup_derived_face (f, symbol, c, face_id) if (!default_face) abort (); - get_lface_attributes (f, symbol, symbol_attrs, 1); + get_lface_attributes (f, symbol, symbol_attrs, signal_p); bcopy (default_face->lface, attrs, sizeof attrs); merge_face_vectors (f, symbol_attrs, attrs, 0); return lookup_face (f, attrs, c, default_face); @@ -7740,7 +7740,7 @@ merge_faces (f, face_name, face_id, base_face_id) if (face_id < 0 || face_id >= lface_id_to_name_size) return base_face_id; face_name = lface_id_to_name[face_id]; - face_id = lookup_derived_face (f, face_name, 0, base_face_id); + face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1); if (face_id >= 0) return face_id; return base_face_id; diff --git a/src/xrdb.c b/src/xrdb.c index e4d8b34cab..852fa2b808 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -527,11 +527,9 @@ x_load_resources (display, xrm_string, myname, myclass) XrmDatabase rdb; XrmDatabase db; char line[256]; -#ifdef HAVE_X_I18N - char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*,*"; -#else + char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; -#endif + #ifdef USE_MOTIF char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; extern Lisp_Object Vdouble_click_time; diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el index 666ca4ae65..700822c29b 100644 --- a/vms/make-mms-derivative.el +++ b/vms/make-mms-derivative.el @@ -1,10 +1,9 @@ ;;; make-mms-derivative.el --- framework to do horrible things for VMS support -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2005 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen <[email protected]> ;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose -;; Favorite-TV-Game-Show: L'Eredit� ;; This file is part of GNU Emacs. @@ -27,7 +26,7 @@ ;; Under OpenVMS the standard make-like program is called MMS, which ;; looks for an input file in the default directory named DESCRIP.MMS -;; and runs the DCL command rules therein. As of 2003, the build +;; and runs the DCL command rules therein. As of 2005, the build ;; process requires a hand translation of the Makefile.in and related ;; Emacs-specific methodology to DCL and TPU commands, so to alleviate ;; this pain, we provide `make-mms-derivative', which given a source @@ -67,9 +66,6 @@ (cons (cons key newval) make-mms-derivative-data)) (cdr (assq key make-mms-derivative-data)))) -(defun make-mms-derivative-write-under-root (rel-filename) - (write-file (expand-file-name rel-filename make-mms-derivative-root-dir))) - (defmacro make-mms-derivative-progn (msg &rest body) `(progn (message "(%s) %s" (point) ,msg) @@ -95,11 +91,11 @@ (setq raw-data (cons (list i line) raw-data))))) (kill-buffer wbuf) (set-buffer cur) - (mapcar '(lambda (ent) - (setcdr ent (mapconcat '(lambda (line) - (concat line "\n")) - (cdr ent) - ""))) + (mapcar (lambda (ent) + (setcdr ent (mapconcat (lambda (line) + (concat line "\n")) + (cdr ent) + ""))) raw-data) (make-mms-derivative-data 'raw-data raw-data)) (load name)) @@ -126,7 +122,9 @@ (insert-file file) (make-mms-derivative-load-edits-file edits-filename) (let ((out (make-mms-derivative-data 'write-under-root))) - (when out (make-mms-derivative-write-under-root out)) + (when out + (write-file + (expand-file-name rel-filename make-mms-derivative-root-dir))) (kill-buffer buf) (unless out (message "Munging ... done"))))))) |