From 0b128ac42684060c8183c645667dc4c6730e9ba3 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 15 May 2012 11:38:50 +0200 Subject: Some minor fixes of Elisp manual. * commands.texi (Recursive Editing): recursive-edit is a command. * compile.texi (Docs and Compilation): byte-compile-dynamic-docstrings is an option. * debugging.texi (Invoking the Debugger): debug is a command. * display.texi (Progress): progress-reporter-update and progress-reporter-force-update have VALUE argument optional. (Animated Images): Use non-@code{nil} instead of non-nil. * files.texi (Format Conversion Round-Trip): Use non-@code{nil} instead of non-nil. * frames.texi (Creating Frames): make-frame is a command. (Input Focus): select-frame is a command. (Pointer Shape): void-text-area-pointer is an option. * help.texi (Describing Characters): read-kbd-macro is a command. (Help Functions): describe-prefix-bindings is a command. * markers.texi (Creating Markers): Both arguments of copy-marker are optional. * minibuf.texi (Reading File Names): Use @kbd instead of @code. * modes.texi (Mode Line Variables): mode-line-remote and mode-line-client are not options. (Imenu): imenu-add-to-menubar is a command. (SMIE Indentation Helpers): Use non-@code{nil} instead of non-nil. * os.texi (Sound Output): play-sound-file is a command. * package.texi (Package Archives): Use @key{RET} instead of @kbd{RET}. * processes.texi (Signals to Processes): Use @key{RET} instead of @code{RET}. (Signals to Processes): signal-process is a command. * text.texi (Clickable Text): Use @key{RET} instead of @kbd{RET}. (Base 64): base64-encode-string is not a command while base64-decode-region is. * windows.texi (Switching Buffers): pop-to-buffer is a command. --- doc/lispref/ChangeLog | 52 ++++++++++++++++++++++++++++++++++++++++++++++ doc/lispref/commands.texi | 4 ++-- doc/lispref/compile.texi | 4 ++-- doc/lispref/debugging.texi | 4 ++-- doc/lispref/display.texi | 6 +++--- doc/lispref/files.texi | 8 +++---- doc/lispref/frames.texi | 12 +++++------ doc/lispref/help.texi | 8 +++---- doc/lispref/markers.texi | 2 +- doc/lispref/minibuf.texi | 2 +- doc/lispref/modes.texi | 18 ++++++++-------- doc/lispref/os.texi | 4 ++-- doc/lispref/package.texi | 4 ++-- doc/lispref/processes.texi | 6 +++--- doc/lispref/text.texi | 10 ++++----- doc/lispref/windows.texi | 4 ++-- 16 files changed, 100 insertions(+), 48 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 273396e57c3..935815bc00c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,55 @@ +2012-05-15 Martin Rudalics + + * commands.texi (Recursive Editing): recursive-edit is a + command. + + * compile.texi (Docs and Compilation): + byte-compile-dynamic-docstrings is an option. + + * debugging.texi (Invoking the Debugger): debug is a command. + + * display.texi (Progress): progress-reporter-update and + progress-reporter-force-update have VALUE argument optional. + (Animated Images): Use non-@code{nil} instead of non-nil. + + * files.texi (Format Conversion Round-Trip): Use non-@code{nil} + instead of non-nil. + + * frames.texi (Creating Frames): make-frame is a command. + (Input Focus): select-frame is a command. + (Pointer Shape): void-text-area-pointer is an option. + + * help.texi (Describing Characters): read-kbd-macro is a + command. + (Help Functions): describe-prefix-bindings is a command. + + * markers.texi (Creating Markers): Both arguments of copy-marker + are optional. + + * minibuf.texi (Reading File Names): Use @kbd instead of @code. + + * modes.texi (Mode Line Variables): mode-line-remote and + mode-line-client are not options. + (Imenu): imenu-add-to-menubar is a command. + (SMIE Indentation Helpers): Use non-@code{nil} instead of + non-nil. + + * os.texi (Sound Output): play-sound-file is a command. + + * package.texi (Package Archives): Use @key{RET} instead of + @kbd{RET}. + + * processes.texi (Signals to Processes): Use @key{RET} instead + of @code{RET}. + (Signals to Processes): signal-process is a command. + + * text.texi (Clickable Text): Use @key{RET} instead of + @kbd{RET}. + (Base 64): base64-encode-string is not a command while + base64-decode-region is. + + * windows.texi (Switching Buffers): pop-to-buffer is a command. + 2012-05-08 Glenn Morris * Makefile.in (clean, mostlyclean): Add some more vol1/2 items. diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index ec5a95a3f3b..a6dfbe2f8ee 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -3211,7 +3211,7 @@ a recursive edit but also provides the other features of the debugger. Recursive editing levels are also used when you type @kbd{C-r} in @code{query-replace} or use @kbd{C-x q} (@code{kbd-macro-query}). -@defun recursive-edit +@deffn Command recursive-edit @cindex suspend evaluation This function invokes the editor command loop. It is called automatically by the initialization of Emacs, to let the user begin @@ -3238,7 +3238,7 @@ then type @kbd{C-M-c} to exit and continue executing @code{simple-rec}. (simple-rec) @result{} nil @end example -@end defun +@end deffn @deffn Command exit-recursive-edit This function exits from the innermost recursive edit (including diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index 06767a4a329..032ba052484 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -291,10 +291,10 @@ is by adding this string to the file's first line: -*-byte-compile-dynamic-docstrings: nil;-*- @end example -@defvar byte-compile-dynamic-docstrings +@defopt byte-compile-dynamic-docstrings If this is non-@code{nil}, the byte compiler generates compiled files that are set up for dynamic loading of documentation strings. -@end defvar +@end defopt @node Dynamic Loading @section Dynamic Loading of Individual Functions diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 115d8ff42de..885766bd1cc 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -448,7 +448,7 @@ erroneously show up in this list. Here we describe in full detail the function @code{debug} that is used to invoke the debugger. -@defun debug &rest debugger-args +@deffn Command debug &rest debugger-args This function enters the debugger. It switches buffers to a buffer named @file{*Backtrace*} (or @file{*Backtrace*<2>} if it is the second recursive entry to the debugger, etc.), and fills it with information @@ -535,7 +535,7 @@ are printed on the top line of the buffer. You can use this feature to display messages---for example, to remind yourself of the conditions under which @code{debug} is called. @end table -@end defun +@end deffn @node Internals of Debugger @subsection Internals of the Debugger diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 1fe5a92e8a3..bc2a905a043 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -414,7 +414,7 @@ This function calls @code{progress-reporter-update}, so the first message is printed immediately. @end defun -@defun progress-reporter-update reporter value +@defun progress-reporter-update reporter &optional value This function does the main work of reporting progress of your operation. It displays the message of @var{reporter}, followed by progress percentage determined by @var{value}. If percentage is zero, @@ -435,7 +435,7 @@ try to reduce the number of calls to it: resulting overhead will most likely negate your effort. @end defun -@defun progress-reporter-force-update reporter value &optional new-message +@defun progress-reporter-force-update reporter &optional value new-message This function is similar to @code{progress-reporter-update} except that it prints a message in the echo area unconditionally. @@ -4905,7 +4905,7 @@ create animation. Currently, Emacs only supports animated GIF files. The following functions related to animated images are available. @defun image-animated-p image -This function returns non-nil if @var{image} can be animated. +This function returns non-@code{nil} if @var{image} can be animated. The actual return value is a cons @code{(@var{nimages} . @var{delay})}, where @var{nimages} is the number of frames and @var{delay} is the delay in seconds between them. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index d18ba458969..f558089a205 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -3129,10 +3129,10 @@ in the order of appearance in the list. This command writes the current buffer contents into the file @var{file} in a format based on @var{format}, which is a list of format names. It constructs the actual format starting from @var{format}, then appending -any elements from the value of @code{buffer-file-format} with a non-nil -@var{preserve} flag (see above), if they are not already present in -@var{format}. It then updates @code{buffer-file-format} with this -format, making it the default for future saves. Except for the +any elements from the value of @code{buffer-file-format} with a +non-@code{nil} @var{preserve} flag (see above), if they are not already +present in @var{format}. It then updates @code{buffer-file-format} with +this format, making it the default for future saves. Except for the @var{format} argument, this command is similar to @code{write-file}. In particular, @var{confirm} has the same meaning and interactive treatment as the corresponding argument to @code{write-file}. @xref{Definition of diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 9d10326c294..29c3dcad404 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -109,7 +109,7 @@ for @code{framep} above. To create a new frame, call the function @code{make-frame}. -@defun make-frame &optional alist +@deffn Command make-frame &optional alist This function creates and returns a new frame, displaying the current buffer. @@ -135,7 +135,7 @@ This function itself does not make the new frame the selected frame. @xref{Input Focus}. The previously selected frame remains selected. On graphical terminals, however, the windowing system may select the new frame for its own reasons. -@end defun +@end deffn @defvar before-make-frame-hook A normal hook run by @code{make-frame} before it creates the frame. @@ -1396,7 +1396,7 @@ same meaning as for @code{select-frame} (see below). The return value of this function is not significant. @end defun -@defun select-frame frame &optional norecord +@deffn Command select-frame frame &optional norecord This function selects frame @var{frame}, temporarily disregarding the focus of the X server if any. The selection of @var{frame} lasts until the next time the user does something to select a different frame, or @@ -1419,7 +1419,7 @@ been deleted. In general, you should never use @code{select-frame} in a way that could switch to a different terminal without switching back when you're done. -@end defun +@end deffn Emacs cooperates with the window system by arranging to select frames as the server and window manager request. It does so by generating a @@ -1882,12 +1882,12 @@ of the buffer contents), the mouse pointer usually uses the @code{arrow} style, but you can specify a different style (one of those above) by setting @code{void-text-area-pointer}. -@defvar void-text-area-pointer +@defopt void-text-area-pointer This variable specifies the mouse pointer style for void text areas. These include the areas after the end of a line or below the last line in the buffer. The default is to use the @code{arrow} (non-text) pointer style. -@end defvar +@end defopt When using X, you can specify what the @code{text} pointer style really looks like by setting the variable @code{x-pointer-shape}. diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 3edeac2b6d5..16a2caf03b4 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -512,7 +512,7 @@ for Meta. @end smallexample @end defun -@defun read-kbd-macro string &optional need-vector +@deffn Command read-kbd-macro string &optional need-vector This function is used mainly for operating on keyboard macros, but it can also be used as a rough inverse for @code{key-description}. You call it with a string containing key descriptions, separated by spaces; @@ -520,7 +520,7 @@ it returns a string or vector containing the corresponding events. (This may or may not be a single valid key sequence, depending on what events you use; @pxref{Key Sequences}.) If @var{need-vector} is non-@code{nil}, the return value is always a vector. -@end defun +@end deffn @node Help Functions @section Help Functions @@ -627,12 +627,12 @@ character, and the help character has no binding after that prefix. The variable's default value is @code{describe-prefix-bindings}. @end defvar -@defun describe-prefix-bindings +@deffn Command describe-prefix-bindings This function calls @code{describe-bindings} to display a list of all the subcommands of the prefix key of the most recent key sequence. The prefix described consists of all but the last event of that key sequence. (The last event is, presumably, the help character.) -@end defun +@end deffn The following two functions are meant for modes that want to provide help without relinquishing control, such as the ``electric'' modes. diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 25a9fc88fc5..1e8829396a7 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -206,7 +206,7 @@ chapter. @end example @end defun -@defun copy-marker marker-or-integer &optional insertion-type +@defun copy-marker &optional marker-or-integer insertion-type If passed a marker as its argument, @code{copy-marker} returns a new marker that points to the same place and the same buffer as does @var{marker-or-integer}. If passed an integer as its argument, diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index e40cbd14687..7b4e589a704 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1404,7 +1404,7 @@ returns the pre-inserted contents of the minibuffer. If the user types @key{RET} in an empty minibuffer, this function returns an empty string, regardless of the value of @var{require-match}. This is, for instance, how the user can make the -current buffer visit no file using @code{M-x set-visited-file-name}. +current buffer visit no file using @kbd{M-x set-visited-file-name}. If @var{predicate} is non-@code{nil}, it specifies a function of one argument that decides which file names are acceptable completion diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index e9be9f1763f..e42011c34a2 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1991,14 +1991,14 @@ default value also displays the recursive editing level, information on the process status, and whether narrowing is in effect. @end defopt -@defopt mode-line-remote +@defvar mode-line-remote This variable is used to show whether @code{default-directory} for the current buffer is remote. -@end defopt +@end defvar -@defopt mode-line-client +@defvar mode-line-client This variable is used to identify @code{emacsclient} frames. -@end defopt +@end defvar The following three variables are used in @code{mode-line-modes}: @@ -2316,10 +2316,10 @@ definitions, or other named portions of the buffer; then the user can choose one of them and move point to it. Major modes can add a menu bar item to use Imenu using @code{imenu-add-to-menubar}. -@defun imenu-add-to-menubar name +@deffn Command imenu-add-to-menubar name This function defines a local menu bar item named @var{name} to run Imenu. -@end defun +@end deffn The user-level commands for using Imenu are described in the Emacs Manual (@pxref{Imenu,, Imenu, emacs, the Emacs Manual}). This section @@ -3861,9 +3861,9 @@ Return non-@code{nil} if the current token's parent is among @var{parents}. @end defun @defun smie-rule-sibling-p -Return non-nil if the current token's parent is actually a sibling. -This is the case for example when the parent of a @code{","} is just the -previous @code{","}. +Return non-@code{nil} if the current token's parent is actually a +sibling. This is the case for example when the parent of a @code{","} +is just the previous @code{","}. @end defun @defun smie-rule-parent &optional offset diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 35ac7c20384..384531c8e37 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -2106,10 +2106,10 @@ calls the functions in the list @code{play-sound-functions}. Each function is called with one argument, @var{sound}. @end defun -@defun play-sound-file file &optional volume device +@deffn Command play-sound-file file &optional volume device This function is an alternative interface to playing a sound @var{file} specifying an optional @var{volume} and @var{device}. -@end defun +@end deffn @defvar play-sound-functions A list of functions to be called before playing a sound. Each function diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index e9737f15a1c..387fba52c63 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -295,8 +295,8 @@ How to accomplish this is beyond the scope of this manual. A convenient way to set up and update a package archive is via the @code{package-x} library. This is included with Emacs, but not loaded -by default; type @kbd{M-x load-library @kbd{RET} package-x @kbd{RET}} -to load it, or add @code{(require 'package-x)} to your init file. +by default; type @kbd{M-x load-library @key{RET} package-x @key{RET}} to +load it, or add @code{(require 'package-x)} to your init file. @xref{Lisp Libraries,, Lisp Libraries, emacs, The GNU Emacs Manual}. Once loaded, you can make use of the following: diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 6275ce0b1b7..7426437e6f0 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1071,7 +1071,7 @@ job-control shells won't work when a pipe is used. See @defun interrupt-process &optional process current-group This function interrupts the process @var{process} by sending the signal @code{SIGINT}. Outside of Emacs, typing the ``interrupt -character'' (normally @kbd{C-c} on some systems, and @code{DEL} on +character'' (normally @kbd{C-c} on some systems, and @key{DEL} on others) sends this signal. When the argument @var{current-group} is non-@code{nil}, you can think of this function as ``typing @kbd{C-c}'' on the terminal by which Emacs talks to the subprocess. @@ -1110,7 +1110,7 @@ it the signal @code{SIGCONT}. This presumes that @var{process} was stopped previously. @end defun -@defun signal-process process signal +@deffn Command signal-process process signal This function sends a signal to process @var{process}. The argument @var{signal} specifies which signal to send; it should be an integer, or a symbol whose name is a signal. @@ -1118,7 +1118,7 @@ or a symbol whose name is a signal. The @var{process} argument can be a system process @acronym{ID} (an integer); that allows you to send signals to processes that are not children of Emacs. @xref{System Processes}. -@end defun +@end deffn @node Output from Processes @section Receiving Output from Processes diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 3e9135a7d81..1963d2519a3 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -3531,7 +3531,7 @@ properties. For simplicity, we will refer to the clickable text as a @dfn{link}. Implementing a link involves three separate steps: (1) indicating -clickability when the mouse moves over the link; (2) making @kbd{RET} +clickability when the mouse moves over the link; (2) making @key{RET} or @kbd{Mouse-2} on that link do something; and (3) setting up a @code{follow-link} condition so that the link obeys @code{mouse-1-click-follows-link}. @@ -4069,7 +4069,7 @@ text, to avoid overlong lines. However, if the optional argument the output is just one long line. @end deffn -@deffn Command base64-encode-string string &optional no-line-break +@defun base64-encode-string string &optional no-line-break This function converts the string @var{string} into base 64 code. It returns a string containing the encoded text. As for @code{base64-encode-region}, an error is signaled if a character in the @@ -4079,15 +4079,15 @@ Normally, this function inserts newline characters into the encoded text, to avoid overlong lines. However, if the optional argument @var{no-line-break} is non-@code{nil}, these newlines are not added, so the result string is just one long line. -@end deffn +@end defun -@defun base64-decode-region beg end +@deffn Command base64-decode-region beg end This function converts the region from @var{beg} to @var{end} from base 64 code into the corresponding decoded text. It returns the length of the decoded text. The decoding functions ignore newline characters in the encoded text. -@end defun +@end deffn @defun base64-decode-string string This function converts the string @var{string} from base 64 code into diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index c8a9316bcfa..75d4a9beb8c 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1559,7 +1559,7 @@ displaying the buffer. Hence, all the variables affecting @code{display-buffer} will affect it as well. @xref{Choosing Window}, for the documentation of @code{display-buffer}. -@defun pop-to-buffer buffer-or-name &optional action norecord +@deffn Command pop-to-buffer buffer-or-name &optional action norecord This function makes @var{buffer-or-name} the current buffer and displays it in some window, preferably not the window previously selected. It then selects the displaying window. If that window is @@ -1582,7 +1582,7 @@ displayed in the selected window. Like @code{switch-to-buffer}, this function updates the buffer list unless @var{norecord} is non-@code{nil}. -@end defun +@end deffn @node Choosing Window @section Choosing a Window for Display -- cgit v1.2.1 From fcf2993fbb6d1b280fc1a4940c07627bb51b3613 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 15 May 2012 23:16:13 +0800 Subject: * net/gnutls.el (gnutls-min-prime-bits): Default to 256. Fixes: debbugs:11267 --- lisp/ChangeLog | 4 ++++ lisp/net/gnutls.el | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 93127c43783..d6c5b0e9886 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-05-15 Chong Yidong + + * net/gnutls.el (gnutls-min-prime-bits): Default to 256 (Bug#11267). + 2012-05-06 Troels Nielsen (tiny change) * progmodes/compile.el (compilation-internal-error-properties): diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 1bc319c796e..92400730f56 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -66,14 +66,12 @@ The files may not exist, in which case they will be ignored." (repeat (file :tag "Bundle filename")))) ;;;###autoload -(defcustom gnutls-min-prime-bits nil - "The minimum number of bits to be used in Diffie-Hellman key exchange. +(defcustom gnutls-min-prime-bits 256 + "Minimum number of bits to be used in Diffie-Hellman key exchange. +During a client-server handshake, if the server sends a prime +with fewer than this number of bits, the handshake will fail. -This sets the minimum accepted size of the key to be used in a -client-server handshake. If the server sends a prime with fewer than -the specified number of bits the handshake will fail. - -A value of nil says to use the default gnutls value." +A value of nil says to use the default GnuTLS value." :type '(choice (const :tag "Use default value" nil) (integer :tag "Number of bits" 512)) :group 'gnutls) -- cgit v1.2.1 From 27d1f87a35539846cc11238f1feaa6b7e6138775 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 15 May 2012 23:43:06 +0800 Subject: Misc docfixes. Suggested by Martin Rudalics. * doc/lispref/display.texi (Face Functions): Fix define-obsolete-face-alias. * doc/lispref/functions.texi (Obsolete Functions): Fix doc for set-advertised-calling-convention. * doc/lispref/modes.texi (Mode Help): Fix describe-mode. * doc/lispref/variables.texi (Variable Aliases): Fix make-obsolete-variable. * lisp/help.el (describe-mode): Doc fix. --- doc/lispref/ChangeLog | 11 +++++++++++ doc/lispref/display.texi | 12 +++++++----- doc/lispref/functions.texi | 8 +++++--- doc/lispref/modes.texi | 16 +++++++++------- doc/lispref/variables.texi | 21 ++++++++++++--------- lisp/ChangeLog | 2 ++ lisp/help.el | 5 ++++- 7 files changed, 50 insertions(+), 25 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 935815bc00c..2cf433d0940 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,14 @@ +2012-05-15 Chong Yidong + + * functions.texi (Obsolete Functions): Fix doc for + set-advertised-calling-convention. + + * modes.texi (Mode Help): Fix describe-mode. + + * display.texi (Face Functions): Fix define-obsolete-face-alias. + + * variables.texi (Variable Aliases): Fix make-obsolete-variable. + 2012-05-15 Martin Rudalics * commands.texi (Recursive Editing): recursive-edit is a diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index bc2a905a043..9110d6962e4 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2663,11 +2663,13 @@ makes @code{modeline} an alias for the @code{mode-line} face. (put 'modeline 'face-alias 'mode-line) @end example -@defun define-obsolete-face-alias obsolete-face current-face &optional when -This function defines a face alias and marks it as obsolete, indicating -that it may be removed in future. The optional string @var{when} -indicates when the face was made obsolete (for example, a release number). -@end defun +@defmac define-obsolete-face-alias obsolete-face current-face when +This macro defines @code{obsolete-face} as an alias for +@var{current-face}, and also marks it as obsolete, indicating that it +may be removed in future. @var{when} should be a string indicating +when @code{obsolete-face} was made obsolete (usually a version number +string). +@end defmac @node Auto Faces @subsection Automatic Face Assignment diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 21f365efe56..1d37b1b220e 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1179,12 +1179,14 @@ equivalent to the following: In addition, you can mark a certain a particular calling convention for a function as obsolete: -@defun set-advertised-calling-convention function signature +@defun set-advertised-calling-convention function signature when This function specifies the argument list @var{signature} as the correct way to call @var{function}. This causes the Emacs byte compiler to issue a warning whenever it comes across an Emacs Lisp program that calls @var{function} any other way (however, it will -still allow the code to be byte compiled). +still allow the code to be byte compiled). @var{when} should be a +string indicating when the variable was first made obsolete (usually a +version number string). For instance, in old versions of Emacs the @code{sit-for} function accepted three arguments, like this @@ -1199,7 +1201,7 @@ this: @example (set-advertised-calling-convention - 'sit-for '(seconds &optional nodisp)) + 'sit-for '(seconds &optional nodisp) "22.1") @end example @end defun diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index e42011c34a2..83a38b60bca 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -735,13 +735,15 @@ modes. It is normally bound to @kbd{C-h m}. It uses the value of the variable @code{major-mode} (@pxref{Major Modes}), which is why every major mode command needs to set that variable. -@deffn Command describe-mode -This function displays the documentation of the current major mode. - -The @code{describe-mode} function calls the @code{documentation} -function using the value of @code{major-mode} as an argument. Thus, it -displays the documentation string of the major mode command. -(@xref{Accessing Documentation}.) +@deffn Command describe-mode &optional buffer +This command displays the documentation of the current buffer's major +mode and minor modes. It uses the @code{documentation} function to +retrieve the documentation strings of the major and minor mode +commands (@pxref{Accessing Documentation}). + +If called from Lisp with a non-nil @var{buffer} argument, this +function displays the documentation for that buffer's major and minor +modes, rather than those of the current buffer. @end deffn @node Derived Modes diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 6f54acea26a..93fb4d5f873 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1853,16 +1853,19 @@ variable with a new name. @code{make-obsolete-variable} declares that the old name is obsolete and therefore that it may be removed at some stage in the future. -@defun make-obsolete-variable obsolete-name current-name &optional when +@defun make-obsolete-variable obsolete-name current-name when &optional access-type This function makes the byte compiler warn that the variable -@var{obsolete-name} is obsolete. If @var{current-name} is a symbol, it is -the variable's new name; then the warning message says to use -@var{current-name} instead of @var{obsolete-name}. If @var{current-name} -is a string, this is the message and there is no replacement variable. - -If provided, @var{when} should be a string indicating when the -variable was first made obsolete---for example, a date or a release -number. +@var{obsolete-name} is obsolete. If @var{current-name} is a symbol, +it is the variable's new name; then the warning message says to use +@var{current-name} instead of @var{obsolete-name}. If +@var{current-name} is a string, this is the message and there is no +replacement variable. @var{when} should be a string indicating when +the variable was first made obsolete (usually a version number +string). + +The optional argument @var{access-type}, if non-@code{nil}, should +should specify the kind of access that will trigger obsolescence +warnings; it can be either @code{get} or @code{set}. @end defun You can make two variables synonyms and declare one obsolete at the diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6c5b0e9886..b4428860cb3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-05-15 Chong Yidong + * help.el (describe-mode): Doc fix. + * net/gnutls.el (gnutls-min-prime-bits): Default to 256 (Bug#11267). 2012-05-06 Troels Nielsen (tiny change) diff --git a/lisp/help.el b/lisp/help.el index 1a6aa9d13d2..317d5cf8f46 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -783,7 +783,10 @@ descriptions of the minor modes, each on a separate page. For this to work correctly for a minor mode, the mode's indicator variable \(listed in `minor-mode-alist') must also be a function -whose documentation describes the minor mode." +whose documentation describes the minor mode. + +If called from Lisp with a non-nil BUFFER argument, display +documentation for the major and minor modes of that buffer." (interactive "@") (unless buffer (setq buffer (current-buffer))) (help-setup-xref (list #'describe-mode buffer) -- cgit v1.2.1 From ccbf309ce0aa34ef55405945ed29db41250aa34e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 15 May 2012 19:17:42 +0300 Subject: Fix the changes in 2012-04-22T13:58:00Z!cyd@gnu.org for bug #11464. src/xdisp.c (pos_visible_p): Fix last change. --- src/ChangeLog | 4 ++++ src/xdisp.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2f3643f4f80..2a7f8e2958f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-05-15 Eli Zaretskii + + * xdisp.c (pos_visible_p): Fix last change. (Bug#11464) + 2012-05-13 Eli Zaretskii * xdisp.c (handle_stop): Don't call get_overlay_strings_1 if we diff --git a/src/xdisp.c b/src/xdisp.c index a2c4589766d..e8253c714e3 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1313,7 +1313,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, visible_p = bottom_y > window_top_y; else if (top_y < it.last_visible_y) visible_p = 1; - if (bottom_y >= it.last_visible_y + if (bottom_y <= it.last_visible_y && it.bidi_p && it.bidi_it.scan_dir == -1 && IT_CHARPOS (it) < charpos) { -- cgit v1.2.1 From 4f32cc6c579a7cad630732643088e89ed3868b53 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 16 May 2012 10:49:19 +0800 Subject: * net/gnutls.el (gnutls-min-prime-bits): Improve docstring. --- lisp/ChangeLog | 4 ++++ lisp/net/gnutls.el | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4428860cb3..9a668fa2704 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 Chong Yidong + + * net/gnutls.el (gnutls-min-prime-bits): Improve docstring. + 2012-05-15 Chong Yidong * help.el (describe-mode): Doc fix. diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 92400730f56..a306384c775 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -67,9 +67,13 @@ The files may not exist, in which case they will be ignored." ;;;###autoload (defcustom gnutls-min-prime-bits 256 - "Minimum number of bits to be used in Diffie-Hellman key exchange. -During a client-server handshake, if the server sends a prime -with fewer than this number of bits, the handshake will fail. + ;; Several mail servers send fewer bits than the GnuTLS default. + ;; Currently, 256 appears to be a reasonable choice (Bug#11267). + "Minimum number of prime bits accepted by GnuTLS for key exchange. +During a Diffie-Hellman handshake, if the server sends a prime +number with fewer than this number of bits, the handshake is +rejected. \(The smaller the prime number, the less secure the +key exchange is against man-in-the-middle attacks.) A value of nil says to use the default GnuTLS value." :type '(choice (const :tag "Use default value" nil) -- cgit v1.2.1 From 8c8b834fa997dbfd1b87abc1368a4680d1833e15 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 16 May 2012 19:33:50 +0200 Subject: Merge Org 7.8.10 -- important bug fixes since Org 7.8.09. --- doc/misc/ChangeLog | 4 +++ doc/misc/org.texi | 10 +++--- etc/refcards/orgcard.pdf | Bin 118982 -> 118613 bytes etc/refcards/orgcard.tex | 2 +- lisp/org/ChangeLog | 76 ++++++++++++++++++++++++++++++++++++++++ lisp/org/ob.el | 2 +- lisp/org/org-agenda.el | 4 +-- lisp/org/org-bibtex.el | 5 +-- lisp/org/org-list.el | 66 +++++++++++++++++++++++++++-------- lisp/org/org-protocol.el | 2 +- lisp/org/org-table.el | 50 ++++++++++++++------------- lisp/org/org.el | 88 ++++++++++++++++++++++++++--------------------- 12 files changed, 219 insertions(+), 90 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 99c14897db0..7f29b930709 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 Bastien Guerry + + * org.texi (Durations and time values): Fix typo. + 2012-05-12 Andreas Schwab * cc-mode.texi: Avoid space before macro in 4th argument of cross diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 775ff638eef..d4353e26eba 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -4,8 +4,8 @@ @setfilename ../../info/org @settitle The Org Manual -@set VERSION 7.8.09 -@set DATE April 2012 +@set VERSION 7.8.10 +@set DATE May 2012 @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 @@ -2625,7 +2625,7 @@ formulas or Elisp formulas: Input duration values must be of the form @code{[HH:MM[:SS]}, where seconds are optional. With the @code{T} flag, computed durations will be displayed -as @code{[HH:MM:SS} (see the first formula above). With the @code{t} flag, +as @code{HH:MM:SS} (see the first formula above). With the @code{t} flag, computed durations will be displayed according to the value of the variable @code{org-table-duration-custom-format}, which defaults to @code{'hours} and will display the result as a fraction of hours (see the second formula in the @@ -7900,9 +7900,9 @@ Interactively select another agenda view and append it to the current view. Delete other windows. @c @orgcmdkskc{v d,d,org-agenda-day-view} -@xorgcmdkskc{v w,w,org-agenda-day-view} +@xorgcmdkskc{v w,w,org-agenda-week-view} @xorgcmd{v m,org-agenda-month-view} -@xorgcmd{v y,org-agenda-month-year} +@xorgcmd{v y,org-agenda-year-view} @xorgcmd{v SPC,org-agenda-reset-view} @vindex org-agenda-span Switch to day/week/month/year view. When switching to day or week view, this diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf index 3bedb6f2cf5..44cc7bf89ae 100644 Binary files a/etc/refcards/orgcard.pdf and b/etc/refcards/orgcard.pdf differ diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index d06afca8083..6bebbaa9f61 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{7.8.09} +\def\orgversionnumber{7.8.10} \def\versionyear{2012} % latest update \def\year{2012} % latest copyright year diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 1f4c1f90997..3839100ff4d 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,79 @@ +2012-05-16 Bastien Guerry + + * org.el (org-scan-tags): Correctly match TODO keywords. + +2012-05-16 Nicolas Goaziou + + * org-list.el (org-list-struct): Fix white spaces. + (org-list-swap-items, org-list-send-item): Fix visibility + preservation. + +2012-05-16 Nicolas Goaziou + + * org-list.el (org-list-swap-items, org-list-send-item): Preserve + visibility when moving items. + +2012-05-16 Mark E. Shoulson (tiny change) + + * org.el (org-fontify-entities): Hide {} when prettifying + entities. + +2012-05-16 Bastien Guerry + + * org.el (org-cycle-internal-global): Prevent the display of + messages when cycling from with a Gnus article buffer. + +2012-05-16 Bastien Guerry + + * org-table.el (org-table-time-seconds-to-string): Fix bug about + handling a negative duration value. + +2012-05-16 Nicolas Goaziou + + * org.el (org-link-expand-abbrev): Fix docstring. + +2012-05-16 Nicolas Goaziou + + * org.el (org-translate-link): Fix bug. + +2012-05-16 Bastien Guerry + + * org-agenda.el (org-agenda-bulk-mark-regexp): Fix bug when + setting the number of marked entries. + +2012-05-16 Bastien Guerry + + * org-table.el (org-tbl-calc-modes): Rename from + `org-table-modes'. + (org-set-calc-mode, org-table-eval-formula): Use it. + +2012-05-16 Eric Schulte + + * ob.el (org-babel-find-named-result): Fix bug finding empty named + results. + +2012-05-16 Nicolas Goaziou + + * org.el (org-set-regexps-and-options): Fix + `org-planning-or-clock-line-re' regexp. Indeed "\\>" will never + match since time keywords must end with colons, which are not word + constituent. + +2012-05-16 Bastien Guerry + + * org-ctags.el (org-ctags-new-topic-template): Fix the option + default value back again. + +2012-05-16 Eric Schulte + + * org-bibtex.el (org-bibtex-export-to-kill-ring): Don't rely on + kill-new to return a string. + +2012-05-16 Eric Schulte + + * org-bibtex.el (org-bibtex-headline): Remove call to + bibtex-reformat which often hangs. + 2012-04-26 Nicolas Goaziou * org-table.el (org-table-number-fraction): Fix typo. diff --git a/lisp/org/ob.el b/lisp/org/ob.el index ac6de9f1bbf..f3b7d6814bd 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el @@ -1498,7 +1498,7 @@ buffer or nil if no such result exists." (catch 'is-a-code-block (when (re-search-forward (concat org-babel-result-regexp - "[ \t]" (regexp-quote name) "[ \t\n\f\v\r]+") nil t) + "[ \t]" (regexp-quote name) "[ \t]*[\n\f\v\r]") nil t) (when (and (string= "name" (downcase (match-string 1))) (or (beginning-of-line 1) (looking-at org-babel-src-block-regexp) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index ddb56ca4bac..367d8e84471 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -8315,13 +8315,13 @@ This is a command that has to be installed in `calendar-mode-map'." (defun org-agenda-bulk-mark-regexp (regexp) "Mark entries match REGEXP." (interactive "sMark entries matching regexp: ") - (let (entries-marked) + (let ((entries-marked 0)) (save-excursion (goto-char (point-min)) (goto-char (next-single-property-change (point) 'txt)) (while (re-search-forward regexp nil t) (when (string-match regexp (get-text-property (point) 'txt)) - (setq entries-marked (+ entries-marked 1)) + (setq entries-marked (1+ entries-marked)) (call-interactively 'org-agenda-bulk-mark)))) (if (not entries-marked) (message "No entry matching this regexp.")))) diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index 21e36a7c187..4c852fcb875 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -369,7 +369,7 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t." (progn (goto-char (match-end 1)) (insert ", ")) (bibtex-make-field "keywords" t t)) (insert (mapconcat #'identity tags ", "))) - (bibtex-reformat) (buffer-string))))))) + (buffer-string))))))) (defun org-bibtex-ask (field) (unless (assoc field org-bibtex-fields) @@ -661,7 +661,8 @@ This uses `bibtex-parse-entry'." (defun org-bibtex-export-to-kill-ring () "Export current headline to kill ring as bibtex entry." (interactive) - (kill-new (org-bibtex-headline))) + (let ((result (org-bibtex-headline))) + (kill-new result) result)) (defun org-bibtex-search (string) "Search for bibliographical entries in agenda files. diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 4498280ac77..8d3948698fc 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -714,15 +714,15 @@ Assume point is at an item." ;; equally indented than BEG-CELL's cdr. Also, store ending ;; position of items in END-LST-2. (catch 'exit - (while t - (let ((ind (+ (or (get-text-property (point) 'original-indentation) 0) + (while t + (let ((ind (+ (or (get-text-property (point) 'original-indentation) 0) (org-get-indentation)))) - (cond - ((>= (point) lim-down) + (cond + ((>= (point) lim-down) ;; At downward limit: this is de facto the end of the ;; list. Save point as an ending position, and jump to ;; part 3. - (throw 'exit + (throw 'exit (push (cons 0 (funcall end-before-blank)) end-lst-2))) ;; At a verbatim block, move to its end. Point is at bol ;; and 'org-example property is set by whole lines: @@ -1071,8 +1071,10 @@ It determines the number of whitespaces to append by looking at (defun org-list-swap-items (beg-A beg-B struct) "Swap item starting at BEG-A with item starting at BEG-B in STRUCT. -Blank lines at the end of items are left in place. Return the -new structure after the changes. + +Blank lines at the end of items are left in place. Item +visibility is preserved. Return the new structure after the +changes. Assume BEG-A is lesser than BEG-B and that BEG-A and BEG-B belong to the same sub-list. @@ -1089,7 +1091,17 @@ This function modifies STRUCT." (body-B (buffer-substring beg-B end-B-no-blank)) (between-A-no-blank-and-B (buffer-substring end-A-no-blank beg-B)) (sub-A (cons beg-A (org-list-get-subtree beg-A struct))) - (sub-B (cons beg-B (org-list-get-subtree beg-B struct)))) + (sub-B (cons beg-B (org-list-get-subtree beg-B struct))) + ;; Store overlays responsible for visibility status. We + ;; also need to store their boundaries as they will be + ;; removed from buffer. + (overlays (cons + (mapcar (lambda (ov) + (list ov (overlay-start ov) (overlay-end ov))) + (overlays-in beg-A end-A)) + (mapcar (lambda (ov) + (list ov (overlay-start ov) (overlay-end ov))) + (overlays-in beg-B end-B))))) ;; 1. Move effectively items in buffer. (goto-char beg-A) (delete-region beg-A end-B-no-blank) @@ -1122,7 +1134,22 @@ This function modifies STRUCT." (setcar e (+ pos (- size-B size-A))) (setcar (nthcdr 6 e) (+ end-e (- size-B size-A)))))))) struct) - (sort struct (lambda (e1 e2) (< (car e1) (car e2))))))) + (setq struct (sort struct (lambda (e1 e2) (< (car e1) (car e2))))) + ;; Restore visibility status, by moving overlays to their new + ;; position. + (mapc (lambda (ov) + (move-overlay + (car ov) + (+ (nth 1 ov) (- (+ beg-B (- size-B size-A)) beg-A)) + (+ (nth 2 ov) (- (+ beg-B (- size-B size-A)) beg-A)))) + (car overlays)) + (mapc (lambda (ov) + (move-overlay (car ov) + (+ (nth 1 ov) (- beg-A beg-B)) + (+ (nth 2 ov) (- beg-A beg-B)))) + (cdr overlays)) + ;; Return structure. + struct))) (defun org-list-separating-blank-lines-number (pos struct prevs) "Return number of blank lines that should separate items in list. @@ -1340,8 +1367,8 @@ If DEST is a buffer position, the function will assume it points to another item in the same list as ITEM, and will move the latter just before the former. -If DEST is `begin' \(respectively `end'\), ITEM will be moved at -the beginning \(respectively end\) of the list it belongs to. +If DEST is `begin' (respectively `end'), ITEM will be moved at +the beginning (respectively end) of the list it belongs to. If DEST is a string like \"N\", where N is an integer, ITEM will be moved at the Nth position in the list. @@ -1351,6 +1378,8 @@ added to the kill-ring. If DEST is `delete', ITEM will be deleted. +Visibility of item is preserved. + This function returns, destructively, the new list structure." (let* ((prevs (org-list-prevs-alist struct)) (item-end (org-list-get-item-end item struct)) @@ -1393,7 +1422,9 @@ This function returns, destructively, the new list structure." (org-list-get-last-item item struct prevs)) (point-at-eol))))) (t dest))) - (org-M-RET-may-split-line nil)) + (org-M-RET-may-split-line nil) + ;; Store visibility. + (visibility (overlays-in item item-end))) (cond ((eq dest 'delete) (org-list-delete-item item struct)) ((eq dest 'kill) @@ -1429,9 +1460,14 @@ This function returns, destructively, the new list structure." (+ end shift))))))) moved-items)) (lambda (e1 e2) (< (car e1) (car e2)))))) - ;; 2. Eventually delete extra copy of the item and clean marker. - (prog1 - (org-list-delete-item (marker-position item) struct) + ;; 2. Restore visibility. + (mapc (lambda (ov) + (move-overlay ov + (+ (overlay-start ov) (- (point) item)) + (+ (overlay-end ov) (- (point) item)))) + visibility) + ;; 3. Eventually delete extra copy of the item and clean marker. + (prog1 (org-list-delete-item (marker-position item) struct) (move-marker item nil))) (t struct)))) diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index 775f60990d0..74fc35f2db1 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -225,7 +225,7 @@ Consider using the interactive functions `org-protocol-create' and :type 'alist) (defcustom org-protocol-protocol-alist nil - "* Register custom handlers for org-protocol. + "Register custom handlers for org-protocol. Each element of this list must be of the form: diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 37e5c4f91a6..e02062a2b93 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -2368,7 +2368,7 @@ of the new mark." (looking-at org-table-auto-recalculate-regexp)) (org-table-recalculate) t)) -(defvar org-table-modes) +(defvar org-tbl-calc-modes) ;; Dynamically bound in `org-table-eval-formula' (defsubst org-set-calc-mode (var &optional value) (if (stringp var) (setq var (assoc var '(("D" calc-angle-mode deg) @@ -2376,10 +2376,10 @@ of the new mark." ("F" calc-prefer-frac t) ("S" calc-symbolic-mode t))) value (nth 2 var) var (nth 1 var))) - (if (memq var org-table-modes) - (setcar (cdr (memq var org-table-modes)) value) - (cons var (cons value org-table-modes))) - org-table-modes) + (if (memq var org-tbl-calc-modes) + (setcar (cdr (memq var org-tbl-calc-modes)) value) + (cons var (cons value org-tbl-calc-modes))) + org-tbl-calc-modes) (defun org-table-eval-formula (&optional arg equation suppress-align suppress-const @@ -2437,7 +2437,7 @@ not overwrite the stored one." equation (org-table-get-formula equation (equal arg '(4))))) (n0 (org-table-current-column)) - (modes (copy-sequence org-calc-default-modes)) + (org-tbl-calc-modes (copy-sequence org-calc-default-modes)) (numbers nil) ; was a variable, now fixed default (keep-empty nil) n form form0 formrpl formrg bw fmt x ev orig c lispp literal @@ -2453,12 +2453,13 @@ not overwrite the stored one." (setq c (string-to-char (match-string 1 fmt)) n (string-to-number (match-string 2 fmt))) (if (= c ?p) - (setq modes (org-set-calc-mode 'calc-internal-prec n)) - (setq modes (org-set-calc-mode - 'calc-float-format - (list (cdr (assoc c '((?n . float) (?f . fix) - (?s . sci) (?e . eng)))) - n)))) + (setq org-tbl-calc-modes (org-set-calc-mode 'calc-internal-prec n)) + (setq org-tbl-calc-modes + (org-set-calc-mode + 'calc-float-format + (list (cdr (assoc c '((?n . float) (?f . fix) + (?s . sci) (?e . eng)))) + n)))) (setq fmt (replace-match "" t t fmt))) (if (string-match "T" fmt) (setq duration t numbers t @@ -2479,7 +2480,7 @@ not overwrite the stored one." (setq keep-empty t fmt (replace-match "" t t fmt))) (while (string-match "[DRFS]" fmt) - (setq modes (org-set-calc-mode (match-string 0 fmt))) + (setq org-tbl-calc-modes (org-set-calc-mode (match-string 0 fmt))) (setq fmt (replace-match "" t t fmt))) (unless (string-match "\\S-" fmt) (setq fmt nil)))) @@ -2588,7 +2589,7 @@ not overwrite the stored one." duration-output-format) ev)) (or (fboundp 'calc-eval) (error "Calc does not seem to be installed, and is needed to evaluate the formula")) - (setq ev (calc-eval (cons form modes) (if numbers 'num)) + (setq ev (calc-eval (cons form org-tbl-calc-modes) (if numbers 'num)) ev (if duration (org-table-time-seconds-to-string (string-to-number ev) duration-output-format) ev))) @@ -3309,15 +3310,18 @@ If S is a string representing a number, keep this number." "Convert a number of seconds to a time string. If OUTPUT-FORMAT is non-nil, return a number of days, hours, minutes or seconds." - (cond ((eq output-format 'days) - (format "%.3f" (/ (float secs) 86400))) - ((eq output-format 'hours) - (format "%.2f" (/ (float secs) 3600))) - ((eq output-format 'minutes) - (format "%.1f" (/ (float secs) 60))) - ((eq output-format 'seconds) - (format "%d" secs)) - (t (org-format-seconds "%.2h:%.2m:%.2s" secs)))) + (let* ((secs0 (abs secs)) + (res + (cond ((eq output-format 'days) + (format "%.3f" (/ (float secs0) 86400))) + ((eq output-format 'hours) + (format "%.2f" (/ (float secs0) 3600))) + ((eq output-format 'minutes) + (format "%.1f" (/ (float secs0) 60))) + ((eq output-format 'seconds) + (format "%d" secs0)) + (t (org-format-seconds "%.2h:%.2m:%.2s" secs0))))) + (if (< secs 0) (concat "-" res) res))) (defun org-table-fedit-convert-buffer (function) "Convert all references in this buffer, using FUNCTION." diff --git a/lisp/org/org.el b/lisp/org/org.el index 838a9a18ad4..4710bd5bd86 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -6,7 +6,7 @@ ;; Maintainer: Bastien Guerry ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 7.8.09 +;; Version: 7.8.10 ;; ;; This file is part of GNU Emacs. ;; @@ -206,7 +206,7 @@ identifier." ;;; Version -(defconst org-version "7.8.09" +(defconst org-version "7.8.10" "The version number of the file org.el.") ;;;###autoload @@ -4789,10 +4789,11 @@ but the stars and the body are.") "\\|" org-clock-string "\\)\\)?" " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)") org-planning-or-clock-line-re - (concat "\\(?:^[ \t]*\\(" org-scheduled-string - "\\|" org-deadline-string - "\\|" org-closed-string "\\|" org-clock-string - "\\)\\>\\)") + (concat "^[ \t]*\\(" + org-scheduled-string "\\|" + org-deadline-string "\\|" + org-closed-string "\\|" + org-clock-string "\\)") org-all-time-keywords (mapcar (lambda (w) (substring w 0 -1)) (list org-scheduled-string org-deadline-string @@ -5916,16 +5917,19 @@ needs to be inserted at a specific position in the font-lock sequence.") (when org-pretty-entities (catch 'match (while (re-search-forward - "\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|[^[:alpha:]\n]\\)" + "\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)" limit t) (if (and (not (org-in-indented-comment-line)) (setq ee (org-entity-get (match-string 1))) (= (length (nth 6 ee)) 1)) - (progn + (let* + ((end (if (equal (match-string 2) "{}") + (match-end 2) + (match-end 1)))) (add-text-properties - (match-beginning 0) (match-end 1) + (match-beginning 0) end (list 'font-lock-fontified t)) - (compose-region (match-beginning 0) (match-end 1) + (compose-region (match-beginning 0) end (nth 6 ee) nil) (backward-char 1) (throw 'match t)))) @@ -6255,34 +6259,36 @@ in special contexts. (defun org-cycle-internal-global () "Do the global cycling action." - (cond - ((and (eq last-command this-command) - (eq org-cycle-global-status 'overview)) - ;; We just created the overview - now do table of contents - ;; This can be slow in very large buffers, so indicate action - (run-hook-with-args 'org-pre-cycle-hook 'contents) - (message "CONTENTS...") - (org-content) - (message "CONTENTS...done") - (setq org-cycle-global-status 'contents) - (run-hook-with-args 'org-cycle-hook 'contents)) - - ((and (eq last-command this-command) - (eq org-cycle-global-status 'contents)) - ;; We just showed the table of contents - now show everything - (run-hook-with-args 'org-pre-cycle-hook 'all) - (show-all) - (message "SHOW ALL") - (setq org-cycle-global-status 'all) - (run-hook-with-args 'org-cycle-hook 'all)) + ;; Hack to avoid display of messages for .org attachments in Gnus + (let ((ga (string-match "\\*fontification" (buffer-name)))) + (cond + ((and (eq last-command this-command) + (eq org-cycle-global-status 'overview)) + ;; We just created the overview - now do table of contents + ;; This can be slow in very large buffers, so indicate action + (run-hook-with-args 'org-pre-cycle-hook 'contents) + (unless ga (message "CONTENTS...")) + (org-content) + (unless ga (message "CONTENTS...done")) + (setq org-cycle-global-status 'contents) + (run-hook-with-args 'org-cycle-hook 'contents)) + + ((and (eq last-command this-command) + (eq org-cycle-global-status 'contents)) + ;; We just showed the table of contents - now show everything + (run-hook-with-args 'org-pre-cycle-hook 'all) + (show-all) + (unless ga (message "SHOW ALL")) + (setq org-cycle-global-status 'all) + (run-hook-with-args 'org-cycle-hook 'all)) - (t - ;; Default action: go to overview - (run-hook-with-args 'org-pre-cycle-hook 'overview) - (org-overview) - (message "OVERVIEW") - (setq org-cycle-global-status 'overview) - (run-hook-with-args 'org-cycle-hook 'overview)))) + (t + ;; Default action: go to overview + (run-hook-with-args 'org-pre-cycle-hook 'overview) + (org-overview) + (unless ga (message "OVERVIEW")) + (setq org-cycle-global-status 'overview) + (run-hook-with-args 'org-cycle-hook 'overview))))) (defun org-cycle-internal-local () "Do the local cycling action." @@ -8574,7 +8580,7 @@ call CMD." ;;; Link abbreviations (defun org-link-expand-abbrev (link) - "Apply replacements as defined in `org-link-abbrev-alist." + "Apply replacements as defined in `org-link-abbrev-alist'." (if (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link) (let* ((key (match-string 1 link)) (as (or (assoc key org-link-abbrev-alist-local) @@ -9432,7 +9438,7 @@ If the link is in hidden text, expose it." (string-match "\\([a-zA-Z0-9]+\\):\\(.*\\)" s)) (progn (setq s (funcall org-link-translation-function - (match-string 1) (match-string 2))) + (match-string 1 s) (match-string 2 s))) (concat (car s) ":" (cdr s))) s)) @@ -12823,7 +12829,9 @@ headlines matching this string." " *\\(\\<\\(" (mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (org-re - "\\>\\)\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))) + (if todo-only + "\\>\\)\\)[ \t]+\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$" + "\\>\\)\\)? *\\([^ ].*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))) (props (list 'face 'default 'done-face 'org-agenda-done 'undone-face 'default -- cgit v1.2.1 From eb2adf0a299180c4c78253c8b3ccc9c3da9c3805 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 16 May 2012 23:53:39 +0200 Subject: ob.el: Fix bug. --- lisp/org/ChangeLog | 5 +++++ lisp/org/ob.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 3839100ff4d..19f6a15dc9c 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,8 @@ +2012-05-16 Eric Schulte + + * ob.el (org-babel-parse-src-block-match): Save match data during + indentation check. + 2012-05-16 Bastien Guerry * org.el (org-scan-tags): Correctly match TODO keywords. diff --git a/lisp/org/ob.el b/lisp/org/ob.el index f3b7d6814bd..69d7da4cb0e 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el @@ -1159,7 +1159,8 @@ may be specified in the properties of the current outline entry." (substring body 0 sub-length) (or body ""))))) (preserve-indentation (or org-src-preserve-indentation - (string-match "-i\\>" switches)))) + (save-match-data + (string-match "-i\\>" switches))))) (list lang ;; get block body less properties, protective commas, and indentation (with-temp-buffer -- cgit v1.2.1 From ee812c5f1657fd19ea9b183ec44121b860335b93 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 17 May 2012 10:36:40 +0800 Subject: Bump version to 24.0.97. Regenerate ldefs-boot.el and AUTHORS. --- README | 2 +- configure.in | 2 +- doc/emacs/emacsver.texi | 2 +- doc/man/emacs.1 | 2 +- etc/AUTHORS | 44 +- lisp/ldefs-boot.el | 592 ++++++++++----------- msdos/sed2v2.inp | 2 +- nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 +- .../Resources/English.lproj/InfoPlist.strings | 4 +- .../GNUstep/Emacs.base/Resources/Emacs.desktop | 2 +- .../Emacs.base/Resources/Info-gnustep.plist | 4 +- nt/config.nt | 2 +- nt/emacs.rc | 8 +- nt/emacsclient.rc | 8 +- nt/makefile.w32-in | 2 +- 15 files changed, 342 insertions(+), 338 deletions(-) diff --git a/README b/README index aebfaa87871..847e525dd33 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2012 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 24.0.96 of GNU Emacs, the extensible, +This directory tree holds version 24.0.97 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.in b/configure.in index ee533f6eccf..b3582ecb906 100644 --- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) -AC_INIT(emacs, 24.0.96) +AC_INIT(emacs, 24.0.97) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) AC_CONFIG_AUX_DIR(build-aux) diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index dd0274e6bcb..cbd3d4808dc 100644 --- a/doc/emacs/emacsver.texi +++ b/doc/emacs/emacsver.texi @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.0.96 +@set EMACSVER 24.0.97 diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 4047077f44e..9db400ac524 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.96" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.97" . . .SH NAME diff --git a/etc/AUTHORS b/etc/AUTHORS index 867441b5e0c..681088a1b4a 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -300,11 +300,11 @@ Barry Fishman: changed gnu-linux.h Bastien Guerry: wrote gnus-bookmark.el org-latex.el and co-wrote org-bibtex.el org-list.el org-protocol.el org-src.el -and changed org.el org-agenda.el org-html.el org-clock.el org-exp.el - org-table.el org.texi org-capture.el org-publish.el org-timer.el +and changed org.el org-agenda.el org-html.el org-clock.el org-table.el + org.texi org-exp.el org-capture.el org-publish.el org-timer.el org-export-latex.el org-archive.el org-ascii.el org-colview.el org-exp-blocks.el org-faces.el org-mobile.el ob.el org-eshell.el - org-pcomplete.el bookmark.el and 36 other files + org-pcomplete.el bookmark.el and 37 other files Ben A. Mesander: co-wrote erc-dcc.el @@ -499,10 +499,10 @@ Chip Coldwell: changed font.c Chong Yidong: wrote compile-tests.el dichromacy-theme.el font-parse-tests.el redisplay-testsuite.el tabulated-list.el and co-wrote longlines.el tango-dark-theme.el tango-theme.el -and changed xdisp.c simple.el display.texi files.el frames.texi +and changed xdisp.c display.texi simple.el files.el frames.texi files.texi cus-edit.el keyboard.c custom.el text.texi package.el startup.el faces.el misc.texi subr.el xterm.c emacs.texi custom.texi - image.c mouse.el xfns.c and 846 other files + image.c mouse.el xfns.c and 847 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -1032,7 +1032,7 @@ Eli Tziperman: wrote rmail-spam-filter.el Eli Zaretskii: wrote [bidirectional display in xdisp.c] bidi.c rxvt.el tty-colors.el and changed makefile.w32-in xdisp.c msdos.c Makefile.in files.el - config.bat simple.el fileio.c msdos.h info.el mainmake.v2 rmail.el + config.bat simple.el fileio.c msdos.h rmail.el info.el mainmake.v2 sed1v2.inp display.texi w32.c pc-win.el process.c dispnew.c startup.el dispextern.h dired.c and 703 other files @@ -1339,9 +1339,9 @@ Giuseppe Scrivano: changed browse-url.el buffer.c configure.in sysdep.c Glenn Morris: wrote automated/f90.el automated/vc-bzr.el check-declare.el and changed Makefile.in configure.in calendar.el diary-lib.el rmail.el - progmodes/f90.el files.el cal-menu.el appt.el cal-hebrew.el emacs.texi + files.el progmodes/f90.el cal-menu.el appt.el cal-hebrew.el emacs.texi fortran.el bytecomp.el holidays.el calendar.texi ack.texi simple.el - make-dist sed1v2.inp cal-islam.el dired-x.el and 1255 other files + make-dist sed1v2.inp cal-islam.el dired-x.el and 1257 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1613,6 +1613,8 @@ Jason Baker: changed gnus-art.el Jason Dunsmore: changed org-html.el org.el +Jason L. Wright: changed smtpmail.el + Jason Merrill: changed gnus-sum.el add-log.el gnus-salt.el imap.el nnfolder.el @@ -1701,10 +1703,10 @@ and changed keyboard.c xterm.c xfns.c Makefile.in window.c process.c Jim Kingdon: changed emacsclient.c emacs.tex functions.texinfo hp300bsd.h rmail.el -Jim Meyering: changed lread.c w32.c copyright.el ebrowse.c emacs.c - make-docfile.c nsfont.m term.c w32font.c xfaces.c xselect.c Makefile.in - alloc.c artist.el autoinsert.el buffer.h character.h charset.c - configure configure.in doprnt.c and 53 other files +Jim Meyering: changed lread.c w32.c w32font.c copyright.el ebrowse.c + emacs.c make-docfile.c nsfont.m pop.c term.c xfaces.c xselect.c + Makefile.in alloc.c artist.el autoinsert.el buffer.h character.h + charset.c configure configure.in and 54 other files Jim Radford: changed gnus-start.el @@ -1895,9 +1897,9 @@ Juan Pechiar: wrote ob-mscgen.el and changed ob-octave.el Juanma Barranquero: wrote emacs-lock.el -and changed makefile.w32-in subr.el w32fns.c files.el server.el - emacsclient.c bs.el help-fns.el faces.el org.el simple.el buffer.c - xdisp.c keyboard.c desktop.el process.c w32term.c window.c ido.el w32.c +and changed makefile.w32-in subr.el w32fns.c files.el emacsclient.c + server.el bs.el help-fns.el faces.el org.el simple.el buffer.c xdisp.c + keyboard.c desktop.el process.c w32term.c window.c ido.el w32.c allout.el and 1089 other files Juergen Kreileder: changed imap.el nnimap.el @@ -2367,6 +2369,8 @@ Mark Davies: changed Makefile.in amdx86-64.h configure configure.in Mark Diekhans: changed files.el progmodes/compile.el subr.el +Mark E. Shoulson: changed org.el + Mark H. Weaver: changed comint.el Mark Hood: changed gnus-uu.el @@ -2441,8 +2445,8 @@ Martin Pohlack: changed iimage.el pc-select.el Martin Rudalics: changed window.el window.c windows.texi frame.c buffer.c help.el window.h cus-start.el frame.el cus-edit.el files.el - buffers.texi dired.el subr.el add-log.el mouse.el xdisp.c font-lock.el - help-fns.el lisp.h wid-edit.el and 137 other files + buffers.texi dired.el subr.el add-log.el mouse.el xdisp.c display.texi + font-lock.el help-fns.el help.texi and 142 other files Martin Stjernholm: wrote cc-bytecomp.el and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el @@ -3433,7 +3437,7 @@ and co-wrote font-lock.el and changed vc.el subr.el simple.el lisp.h keyboard.c files.el bytecomp.el keymap.c Makefile.in progmodes/compile.el xdisp.c pcvs.el alloc.c newcomment.el vc-hooks.el tex-mode.el buffer.c fileio.c eval.c - sh-script.el fill.el and 1034 other files + sh-script.el fill.el and 1035 other files Stefan Reichör: changed gnus-agent.el @@ -3599,7 +3603,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el url-future.el and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el auth.texi gnus-util.el gnutls.c netrc.el gnus-start.el message.el spam-stat.el - Makefile.in encrypt.el nnir.el nnmail.el gnutls.h imap.el + encrypt.el nnir.el nnmail.el Makefile.in gnutls.h imap.el mail-source.el nnmairix.el nntp.el and 99 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -3754,7 +3758,7 @@ Trey Jackson: changed spam-stat.el Triet Hoai Lai: changed vntelex.el viet-util.el vietnamese.el -Troels Nielsen: changed process.c +Troels Nielsen: changed process.c progmodes/compile.el Trung Tran-Duc: changed nntp.el diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 26a4a3e3662..afe3c7f92d6 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -68,7 +68,7 @@ should return a grid vector array that is the new solution. ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -99,7 +99,7 @@ Insert a descriptive header at the top of the file. ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -114,7 +114,7 @@ Completion is available. ;;;;;; 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" "vc/add-log.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -489,7 +489,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;### (autoloads (outlineify-sticky allout-mode allout-mode-p allout-auto-activation ;;;;;; allout-setup allout-auto-activation-helper) "allout" "allout.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from allout.el (autoload 'allout-auto-activation-helper "allout" "\ @@ -850,7 +850,7 @@ for details on preparing Emacs for automatic allout activation. ;;;### (autoloads (allout-widgets-mode allout-widgets-auto-activation ;;;;;; allout-widgets-setup allout-widgets) "allout-widgets" "allout-widgets.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from allout-widgets.el (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads)))) @@ -910,7 +910,7 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (20352 65510)) +;;;;;; "net/ange-ftp.el" (20400 62402)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -932,7 +932,7 @@ directory, so that Emacs will know its current contents. ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (20352 65510)) +;;;;;; "animate" "play/animate.el" (20400 62402)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -965,7 +965,7 @@ the buffer *Birthday-Present-for-Name*. ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (20352 65510)) +;;;;;; "ansi-color" "ansi-color.el" (20391 15703)) ;;; Generated autoloads from ansi-color.el (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\ @@ -991,7 +991,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" (20352 65510)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (20400 62402)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload 'antlr-show-makefile-rules "antlr-mode" "\ @@ -1050,7 +1050,7 @@ ARG is positive, otherwise off. ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20373 20070)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20400 62402)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1158,8 +1158,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1250,8 +1250,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1457,8 +1457,8 @@ Keymap summary ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1486,7 +1486,7 @@ Special commands: ;;;*** ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1571,7 +1571,7 @@ Major mode for editing Autoconf configure.in files. ;;;*** ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert) -;;;;;; "autoinsert" "autoinsert.el" (20352 65510)) +;;;;;; "autoinsert" "autoinsert.el" (20400 62402)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1611,7 +1611,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" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1662,7 +1662,7 @@ should be non-nil). ;;;### (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" (20352 65510)) +;;;;;; "autorevert" "autorevert.el" (20400 62402)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1751,7 +1751,7 @@ specifies in the mode line. ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (20352 65510)) +;;;;;; "avoid.el" (20400 62402)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1792,7 +1792,7 @@ definition of \"random distance\".) ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (20369 4240)) +;;;;;; (20400 62402)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1861,7 +1861,7 @@ For non-interactive use see also `benchmark-run' and ;;;*** ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize) -;;;;;; "bibtex" "textmodes/bibtex.el" (20352 65510)) +;;;;;; "bibtex" "textmodes/bibtex.el" (20400 62402)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1962,7 +1962,7 @@ Major mode for editing BibTeX style files. ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "mail/binhex.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2110,7 +2110,7 @@ a reflection. ;;;;;; bookmark-save bookmark-write bookmark-delete bookmark-insert ;;;;;; bookmark-rename bookmark-insert-location bookmark-relocate ;;;;;; bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark" -;;;;;; "bookmark.el" (20352 65510)) +;;;;;; "bookmark.el" (20400 62402)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2311,7 +2311,7 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;;;; browse-url-xdg-open 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" (20352 65510)) +;;;;;; "browse-url" "net/browse-url.el" (20400 62402)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2626,8 +2626,8 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from play/bruce.el (autoload 'bruce "bruce" "\ @@ -2643,7 +2643,7 @@ Return a vector containing the lines from `bruce-phrases-file'. ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (20352 65510)) +;;;;;; "bs" "bs.el" (20400 62402)) ;;; Generated autoloads from bs.el (autoload 'bs-cycle-next "bs" "\ @@ -2729,7 +2729,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20352 65510)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20400 62402)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2887,8 +2887,8 @@ 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" (20352 -;;;;;; 65510)) +;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2995,8 +2995,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3105,7 +3105,7 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (20358 29669)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3716,7 +3716,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** ;;;### (autoloads (cconv-closure-convert) "cconv" "emacs-lisp/cconv.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3731,7 +3731,7 @@ Returns a form where all lambdas don't have any free variables. ;;;*** ;;;### (autoloads (cfengine-auto-mode cfengine2-mode cfengine3-mode) -;;;;;; "cfengine" "progmodes/cfengine.el" (20352 65510)) +;;;;;; "cfengine" "progmodes/cfengine.el" (20400 62402)) ;;; Generated autoloads from progmodes/cfengine.el (autoload 'cfengine3-mode "cfengine" "\ @@ -3786,7 +3786,7 @@ Returns non-nil if any false statements are found. ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p) -;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (20352 65510)) +;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (20400 62402)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp) (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp) @@ -4154,7 +4154,7 @@ For example, the function `case' has an indent property ;;;*** ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4217,7 +4217,7 @@ If FRAME cannot display COLOR, return nil. ;;;### (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" -;;;;;; (20368 16194)) +;;;;;; (20400 62402)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4354,8 +4354,8 @@ on third call it again advances points to the next difference and so on. ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20352 -;;;;;; 65510)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4535,7 +4535,7 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4716,7 +4716,7 @@ For details see `conf-mode'. Example: ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (20352 65510)) +;;;;;; "cookie1" "play/cookie1.el" (20400 62402)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4748,8 +4748,8 @@ Randomly permute the elements of VECTOR (all permutations equally likely). ;;;*** ;;;### (autoloads (copyright-update-directory copyright copyright-fix-years -;;;;;; copyright-update) "copyright" "emacs-lisp/copyright.el" (20352 -;;;;;; 65510)) +;;;;;; copyright-update) "copyright" "emacs-lisp/copyright.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4987,7 +4987,7 @@ Run a `perldoc' on the word around point. ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -5079,7 +5079,7 @@ Major mode to edit Cascading Style Sheets. ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (20359 53408)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5139,7 +5139,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;;;; customize-mode customize customize-push-and-save customize-save-variable ;;;;;; customize-set-variable customize-set-value custom-menu-sort-alphabetically ;;;;;; custom-buffer-sort-alphabetically custom-browse-sort-alphabetically) -;;;;;; "cus-edit" "cus-edit.el" (20352 65510)) +;;;;;; "cus-edit" "cus-edit.el" (20400 62402)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5490,7 +5490,7 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "vc/cvs-status.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5501,7 +5501,7 @@ Mode used for cvs status output. ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (20352 65510)) +;;;;;; "cwarn" "progmodes/cwarn.el" (20400 62402)) ;;; Generated autoloads from progmodes/cwarn.el (autoload 'cwarn-mode "cwarn" "\ @@ -5581,7 +5581,7 @@ If the argument is nil, we return the display table to its standard state. ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5628,7 +5628,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** ;;;### (autoloads (data-debug-new-buffer) "data-debug" "cedet/data-debug.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5638,8 +5638,8 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5652,8 +5652,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5878,8 +5878,8 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/delphi.el (autoload 'delphi-mode "delphi" "\ @@ -6028,7 +6028,7 @@ the first time the mode is used. ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (20352 65510)) +;;;;;; "descr-text.el" (20400 62402)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6065,7 +6065,7 @@ relevant to POS. ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (20352 65510)) +;;;;;; "desktop.el" (20400 62402)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6328,7 +6328,7 @@ Major mode for editing the diary file. ;;;*** ;;;### (autoloads (diff-buffer-with-file diff-backup diff diff-command -;;;;;; diff-switches) "diff" "vc/diff.el" (20375 44114)) +;;;;;; diff-switches) "diff" "vc/diff.el" (20400 62402)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6372,7 +6372,7 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6416,7 +6416,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (20352 65510)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (20400 62402)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6538,7 +6538,7 @@ Keybindings: ;;;*** ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6771,8 +6771,8 @@ Locate SOA record and increment the serial field. ;;;*** ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe -;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20352 -;;;;;; 65510)) +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6856,7 +6856,7 @@ Switch to *dungeon* buffer and start game. ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (20362 26480)) +;;;;;; "emacs-lisp/easy-mmode.el" (20400 62402)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -7137,7 +7137,7 @@ To implement dynamic menus, either call this from ;;;;;; ebnf-eps-file ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ;;;;;; ebnf-spool-file ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (20352 65510)) +;;;;;; "progmodes/ebnf2ps.el" (20400 62402)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload 'ebnf-customize "ebnf2ps" "\ @@ -7411,8 +7411,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" (20352 -;;;;;; 65510)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7561,7 +7561,7 @@ Display statistics for a class tree. ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7635,7 +7635,7 @@ an EDE controlled project. ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (20352 65510)) +;;;;;; "emacs-lisp/edebug.el" (20400 62402)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7708,7 +7708,7 @@ Toggle edebugging of all forms. ;;;;;; ediff-merge-directories-with-ancestor ediff-merge-directories ;;;;;; ediff-directories3 ediff-directory-revisions ediff-directories ;;;;;; ediff-buffers3 ediff-buffers ediff-backup ediff-current-file -;;;;;; ediff-files3 ediff-files) "ediff" "vc/ediff.el" (20352 65510)) +;;;;;; ediff-files3 ediff-files) "ediff" "vc/ediff.el" (20400 62402)) ;;; Generated autoloads from vc/ediff.el (autoload 'ediff-files "ediff" "\ @@ -8136,7 +8136,7 @@ Emacs Lisp mode) that support ElDoc.") ;;;*** ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode) -;;;;;; "electric" "electric.el" (20352 65510)) +;;;;;; "electric" "electric.el" (20400 62402)) ;;; Generated autoloads from electric.el (defvar electric-indent-chars '(10) "\ @@ -8296,7 +8296,7 @@ displayed. ;;;*** ;;;### (autoloads (emacs-lock-mode) "emacs-lock" "emacs-lock.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8324,7 +8324,7 @@ Other values are interpreted as usual. ;;;*** ;;;### (autoloads (report-emacs-bug-query-existing-bugs report-emacs-bug) -;;;;;; "emacsbug" "mail/emacsbug.el" (20352 65510)) +;;;;;; "emacsbug" "mail/emacsbug.el" (20400 62402)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8345,7 +8345,7 @@ The result is an alist with items of the form (URL SUBJECT NO). ;;;;;; emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote ;;;;;; emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor ;;;;;; emerge-buffers emerge-files-with-ancestor emerge-files) "emerge" -;;;;;; "vc/emerge.el" (20352 65510)) +;;;;;; "vc/emerge.el" (20400 62402)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8446,8 +8446,8 @@ Commands: ;;;;;; epa-sign-region epa-verify-cleartext-in-region epa-verify-region ;;;;;; epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file ;;;;;; epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys -;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20352 -;;;;;; 65510)) +;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8754,7 +8754,7 @@ Return a context object. ;;;*** ;;;### (autoloads (epg-expand-group epg-check-configuration epg-configuration) -;;;;;; "epg-config" "epg-config.el" (20352 65510)) +;;;;;; "epg-config" "epg-config.el" (20400 62402)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8775,7 +8775,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** ;;;### (autoloads (erc-handle-irc-url erc-tls erc erc-select-read-args) -;;;;;; "erc" "erc/erc.el" (20352 65510)) +;;;;;; "erc" "erc/erc.el" (20400 62402)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8823,14 +8823,14 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (20352 -;;;;;; 65510)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (20352 65510)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (20400 62402)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) @@ -8849,7 +8849,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (20352 65510)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (20400 62402)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8990,7 +8990,7 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20352 65510)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20400 62402)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) @@ -9003,7 +9003,7 @@ system. ;;;*** ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" -;;;;;; "erc/erc-log.el" (20352 65510)) +;;;;;; "erc/erc-log.el" (20400 62402)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -9035,7 +9035,7 @@ You can save every individual message by putting this function on ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9118,7 +9118,7 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" -;;;;;; "erc/erc-notify.el" (20352 65510)) +;;;;;; "erc/erc-notify.el" (20400 62402)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9142,8 +9142,8 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (20352 -;;;;;; 65510)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) @@ -9162,7 +9162,7 @@ with args, toggle notify status of people. ;;;*** ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode) -;;;;;; "erc-services" "erc/erc-services.el" (20352 65510)) +;;;;;; "erc-services" "erc/erc-services.el" (20400 62402)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9179,7 +9179,7 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (20352 65510)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (20400 62402)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") @@ -9204,14 +9204,14 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (20352 65510)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (20400 62402)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9237,7 +9237,7 @@ keybindings will not do anything useful. ;;;*** ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size) -;;;;;; "erc-truncate" "erc/erc-truncate.el" (20352 65510)) +;;;;;; "erc-truncate" "erc/erc-truncate.el" (20400 62402)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9257,7 +9257,7 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9270,7 +9270,7 @@ Add a file to `erc-xdcc-files'. ;;;### (autoloads (ert-describe-test ert-run-tests-interactively ;;;;;; ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest) -;;;;;; "ert" "emacs-lisp/ert.el" (20352 65510)) +;;;;;; "ert" "emacs-lisp/ert.el" (20400 62402)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9340,7 +9340,7 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** ;;;### (autoloads (ert-kill-all-test-buffers) "ert-x" "emacs-lisp/ert-x.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9366,7 +9366,7 @@ Emacs shell interactive mode. ;;;*** ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell" -;;;;;; "eshell/eshell.el" (20352 65510)) +;;;;;; "eshell/eshell.el" (20400 62402)) ;;; Generated autoloads from eshell/eshell.el (autoload 'eshell "eshell" "\ @@ -9407,7 +9407,7 @@ corresponding to a successful execution. ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9725,7 +9725,7 @@ for \\[find-tag] (which see). ;;;;;; ethio-fidel-to-sera-marker ethio-fidel-to-sera-region ethio-fidel-to-sera-buffer ;;;;;; ethio-sera-to-fidel-marker ethio-sera-to-fidel-region ethio-sera-to-fidel-buffer ;;;;;; setup-ethiopic-environment-internal) "ethio-util" "language/ethio-util.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -10014,8 +10014,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -10044,7 +10044,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -10136,7 +10136,7 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (20352 65510)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (20400 62402)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10206,8 +10206,8 @@ with no args, if that value is non-nil. ;;;### (autoloads (variable-pitch-mode buffer-face-toggle buffer-face-set ;;;;;; buffer-face-mode text-scale-adjust text-scale-decrease text-scale-increase ;;;;;; text-scale-set face-remap-set-base face-remap-reset-base -;;;;;; face-remap-add-relative) "face-remap" "face-remap.el" (20370 -;;;;;; 22954)) +;;;;;; face-remap-add-relative) "face-remap" "face-remap.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10355,7 +10355,7 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20352 65510)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20400 62402)) ;;; Generated autoloads from mail/feedmail.el (autoload 'feedmail-send-it "feedmail" "\ @@ -10409,7 +10409,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" (20352 65510)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (20400 62402)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10533,7 +10533,7 @@ the name is considered already unique; only the second substitution ;;;;;; copy-file-locals-to-dir-locals delete-dir-local-variable ;;;;;; add-dir-local-variable delete-file-local-variable-prop-line ;;;;;; add-file-local-variable-prop-line delete-file-local-variable -;;;;;; add-file-local-variable) "files-x" "files-x.el" (20352 65510)) +;;;;;; add-file-local-variable) "files-x" "files-x.el" (20400 62402)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10670,7 +10670,7 @@ use in place of \"-ls\" as the final argument. ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file ;;;;;; ff-find-other-file ff-get-other-file) "find-file" "find-file.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -11004,7 +11004,7 @@ to get the effect of a C-q. ;;;*** ;;;### (autoloads (flymake-find-file-hook flymake-mode-off flymake-mode-on -;;;;;; flymake-mode) "flymake" "progmodes/flymake.el" (20352 65510)) +;;;;;; flymake-mode) "flymake" "progmodes/flymake.el" (20400 62402)) ;;; Generated autoloads from progmodes/flymake.el (autoload 'flymake-mode "flymake" "\ @@ -11034,7 +11034,7 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (20352 65510)) +;;;;;; "flyspell" "textmodes/flyspell.el" (20400 62402)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11106,7 +11106,7 @@ Flyspell whole buffer. ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11182,8 +11182,8 @@ in your `~/.emacs' file, replacing [f7] by your favorite key: ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from mail/footnote.el (autoload 'footnote-mode "footnote" "\ @@ -11202,7 +11202,7 @@ play around with the following keys: ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (20352 65510)) +;;;;;; "forms" "forms.el" (20400 62402)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11366,7 +11366,7 @@ and choose the directory as the fortune-file. ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (20370 20099)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11433,8 +11433,8 @@ detailed description of this mode. ;;;*** ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal -;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (20352 -;;;;;; 65510)) +;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11511,7 +11511,7 @@ regular expression that can be used as an element of ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -12348,23 +12348,23 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** ;;;### (autoloads (gnutls-min-prime-bits) "gnutls" "net/gnutls.el" -;;;;;; (20352 65510)) +;;;;;; (20403 5511)) ;;; Generated autoloads from net/gnutls.el -(defvar gnutls-min-prime-bits nil "\ -The minimum number of bits to be used in Diffie-Hellman key exchange. - -This sets the minimum accepted size of the key to be used in a -client-server handshake. If the server sends a prime with fewer than -the specified number of bits the handshake will fail. +(defvar gnutls-min-prime-bits 256 "\ +Minimum number of prime bits accepted by GnuTLS for key exchange. +During a Diffie-Hellman handshake, if the server sends a prime +number with fewer than this number of bits, the handshake is +rejected. (The smaller the prime number, the less secure the +key exchange is against man-in-the-middle attacks.) -A value of nil says to use the default gnutls value.") +A value of nil says to use the default GnuTLS value.") (custom-autoload 'gnutls-min-prime-bits "gnutls" t) ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20352 65510)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20400 62402)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12391,8 +12391,8 @@ Use \\[describe-mode] for more info. ;;;*** ;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address -;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (20352 -;;;;;; 65510)) +;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12452,7 +12452,7 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20366 22731)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20400 62402)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12629,7 +12629,7 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20368 16951)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20400 62402)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12765,7 +12765,7 @@ to be updated. ;;;### (autoloads (mail-check-payment mail-add-payment-async mail-add-payment ;;;;;; hashcash-verify-payment hashcash-insert-payment-async hashcash-insert-payment) -;;;;;; "hashcash" "mail/hashcash.el" (20352 65510)) +;;;;;; "hashcash" "mail/hashcash.el" (20400 62402)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13146,7 +13146,7 @@ Provide help for current mode. ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (20352 65510)) +;;;;;; "hexl.el" (20400 62402)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13426,7 +13426,7 @@ Several variables affect how the hiding is done: ;;;*** ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13754,7 +13754,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;;;; holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays ;;;;;; holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays ;;;;;; holiday-oriental-holidays holiday-general-holidays) "holidays" -;;;;;; "calendar/holidays.el" (20354 57191)) +;;;;;; "calendar/holidays.el" (20400 62402)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14045,7 +14045,7 @@ bound to the current value of the filter. ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (20352 65510)) +;;;;;; "ibuffer" "ibuffer.el" (20400 62402)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14161,7 +14161,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (20352 65510)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (20400 62402)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14202,7 +14202,7 @@ with no args, if that value is non-nil. ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14228,7 +14228,7 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/idlwave.el (autoload 'idlwave-mode "idlwave" "\ @@ -14362,8 +14362,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" (20352 -;;;;;; 65510)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14655,7 +14655,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;;;; create-image image-type-auto-detected-p image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15056,7 +15056,7 @@ An image file is one whose name has an extension in ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (20352 65510)) +;;;;;; image-mode) "image-mode" "image-mode.el" (20400 62402)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15101,7 +15101,7 @@ on these modes. ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (20358 29669)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (20400 62402)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15250,7 +15250,7 @@ Convert old Emacs Devanagari characters to UCS. ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command ;;;;;; inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp" -;;;;;; "progmodes/inf-lisp.el" (20352 65510)) +;;;;;; "progmodes/inf-lisp.el" (20400 62402)) ;;; Generated autoloads from progmodes/inf-lisp.el (defvar inferior-lisp-filter-regexp (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'") "\ @@ -15317,7 +15317,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node ;;;;;; Info-mode info-finder info-apropos Info-index Info-directory ;;;;;; Info-on-current-buffer info-standalone info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (20352 65510)) +;;;;;; info info-other-window) "info" "info.el" (20400 62402)) ;;; Generated autoloads from info.el (autoload 'info-other-window "info" "\ @@ -15822,7 +15822,7 @@ Add submenus to the File menu, to convert to and from various formats. ;;;;;; 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-personal-dictionary) -;;;;;; "ispell" "textmodes/ispell.el" (20354 28814)) +;;;;;; "ispell" "textmodes/ispell.el" (20400 62402)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16048,8 +16048,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -16178,7 +16178,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20352 65510)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20400 62402)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16295,7 +16295,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-exec-ring-item) -;;;;;; "kmacro" "kmacro.el" (20352 65510)) +;;;;;; "kmacro" "kmacro.el" (20400 62402)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16406,7 +16406,7 @@ If kbd macro currently being defined end it before activating it. ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (20352 65510)) +;;;;;; "language/korea-util.el" (20400 62402)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16421,7 +16421,7 @@ If kbd macro currently being defined end it before activating it. ;;;*** ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16671,8 +16671,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16756,7 +16756,7 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (20352 65510)) +;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (20400 62402)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16944,8 +16944,8 @@ This function is suitable for execution in a .emacs file. ;;;*** -;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17059,7 +17059,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" (20352 65510)) +;;;;;; "mail/mail-extr.el" (20400 62402)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17091,7 +17091,7 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history ;;;;;; mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17198,8 +17198,8 @@ matches may be returned from the message body. ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup -;;;;;; mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (20352 -;;;;;; 65510)) +;;;;;; mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17316,7 +17316,7 @@ The mail client is taken to be the handler of mailto URLs. ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (20352 65510)) +;;;;;; "make-mode" "progmodes/make-mode.el" (20400 62402)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17446,7 +17446,7 @@ Previous contents of that buffer are killed first. ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17722,7 +17722,7 @@ which specify the range to operate on. ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload 'metafont-mode "meta-mode" "\ @@ -17739,7 +17739,7 @@ Major mode for editing MetaPost sources. ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17891,7 +17891,7 @@ Display version information about MH-E and the MH mail handling system. ;;;*** ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder" -;;;;;; "mh-e/mh-folder.el" (20352 65510)) +;;;;;; "mh-e/mh-folder.el" (20400 62402)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18000,7 +18000,7 @@ to its second argument TM. ;;;*** ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" -;;;;;; "minibuf-eldef.el" (20352 65510)) +;;;;;; "minibuf-eldef.el" (20400 62402)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18030,7 +18030,7 @@ is modified to remove the default indication. ;;;*** ;;;### (autoloads (list-dynamic-libraries butterfly) "misc" "misc.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18316,8 +18316,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18377,7 +18377,7 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** ;;;### (autoloads (mouse-drag-drag mouse-drag-throw) "mouse-drag" -;;;;;; "mouse-drag.el" (20352 65510)) +;;;;;; "mouse-drag.el" (20400 62402)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18424,8 +18424,8 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -18468,7 +18468,7 @@ kill ring; mouse-1 or mouse-3 kills it. ;;;*** -;;;### (autoloads (mpc) "mpc" "mpc.el" (20352 65510)) +;;;### (autoloads (mpc) "mpc" "mpc.el" (20400 62402)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18488,7 +18488,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (20352 65510)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (20400 62402)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18999,7 +18999,7 @@ STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality. ;;;;;; uncomment-region comment-kill comment-set-column comment-indent ;;;;;; comment-indent-default comment-normalize-vars comment-multi-line ;;;;;; comment-padding comment-style comment-column) "newcomment" -;;;;;; "newcomment.el" (20352 65510)) +;;;;;; "newcomment.el" (20400 62402)) ;;; Generated autoloads from newcomment.el (defalias 'indent-for-comment 'comment-indent) @@ -19366,7 +19366,7 @@ Generate NOV databases in all nnml directories. ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (20352 65510)) +;;;;;; "novice" "novice.el" (20400 62402)) ;;; Generated autoloads from novice.el (defvar disabled-command-function 'disabled-command-function "\ @@ -19414,7 +19414,7 @@ closing requests for requests that are used in matched pairs. ;;;*** ;;;### (autoloads (nxml-glyph-display-string) "nxml-glyph" "nxml/nxml-glyph.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19426,8 +19426,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19513,7 +19513,7 @@ the variable `nxml-enabled-unicode-blocks'. ;;;;;; org-babel-pop-to-session-maybe org-babel-load-in-session-maybe ;;;;;; org-babel-expand-src-block-maybe org-babel-view-src-block-info ;;;;;; org-babel-execute-maybe org-babel-execute-safely-maybe) "ob" -;;;;;; "org/ob.el" (20352 65510)) +;;;;;; "org/ob.el" (20404 23547)) ;;; Generated autoloads from org/ob.el (autoload 'org-babel-execute-safely-maybe "ob" "\ @@ -19814,7 +19814,7 @@ exported source code blocks by language. ;;;*** ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/octave-inf.el (autoload 'inferior-octave "octave-inf" "\ @@ -19837,7 +19837,7 @@ startup file, `~/.emacs-octave'. ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload 'octave-mode "octave-mod" "\ @@ -19925,7 +19925,7 @@ including a reproducible test case and send the message. ;;;;;; org-insert-link-global org-store-link org-run-like-in-org-mode ;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle ;;;;;; org-mode org-version org-babel-do-load-languages) "org" "org/org.el" -;;;;;; (20377 65403)) +;;;;;; (20404 23547)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -20158,7 +20158,7 @@ Call the customize function with org as argument. ;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda -;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (20377 65403)) +;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (20404 23547)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-agenda "org-agenda" "\ @@ -21462,7 +21462,7 @@ See also the variable `org-reverse-note-order'. ;;;*** ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl) -;;;;;; "org-table" "org/org-table.el" (20377 65403)) +;;;;;; "org-table" "org/org-table.el" (20404 23547)) ;;; Generated autoloads from org/org-table.el (autoload 'turn-on-orgtbl "org-table" "\ @@ -21587,7 +21587,7 @@ The XOXO buffer is named *xoxo-* ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -21651,7 +21651,7 @@ See the command `outline-mode' for more information on this mode. ;;;### (autoloads (list-packages describe-package package-initialize ;;;;;; package-refresh-contents package-install-file package-install-from-buffer ;;;;;; package-install package-enable-at-startup) "package" "emacs-lisp/package.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/package.el (defvar package-enable-at-startup t "\ @@ -21721,7 +21721,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (20352 65510)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (20400 62402)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -21761,8 +21761,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -21837,7 +21837,7 @@ Check if KEY is in the cache. ;;;*** ;;;### (autoloads (pcase-let pcase-let* pcase) "pcase" "emacs-lisp/pcase.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -21969,7 +21969,7 @@ Completion for the `rpm' command. ;;;### (autoloads (pcomplete/scp pcomplete/ssh pcomplete/chgrp pcomplete/chown ;;;;;; pcomplete/which pcomplete/xargs pcomplete/rm pcomplete/rmdir -;;;;;; pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (20352 65510)) +;;;;;; pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (20400 62402)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -22026,8 +22026,8 @@ Includes files as well as host names followed by a colon. ;;;### (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" (20352 -;;;;;; 65510)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -22086,7 +22086,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" -;;;;;; "vc/pcvs.el" (20352 65510)) +;;;;;; "vc/pcvs.el" (20400 62402)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -22161,7 +22161,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20352 65510)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20400 62402)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -22170,7 +22170,7 @@ Global menu used by PCL-CVS.") ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -22232,7 +22232,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -22312,8 +22312,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -23035,7 +23035,7 @@ See `proced-mode' for a description of features available in Proced buffers. ;;;*** ;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog" -;;;;;; "progmodes/prolog.el" (20352 65510)) +;;;;;; "progmodes/prolog.el" (20400 62402)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -23082,8 +23082,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload 'ps-mode "ps-mode" "\ @@ -23332,7 +23332,7 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** ;;;### (autoloads (jython-mode python-mode python-after-info-look -;;;;;; run-python) "python" "progmodes/python.el" (20352 65510)) +;;;;;; run-python) "python" "progmodes/python.el" (20400 62402)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode)) @@ -23441,7 +23441,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" (20352 65510)) +;;;;;; "international/quail.el" (20400 62402)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -23672,8 +23672,8 @@ of each directory. ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20352 -;;;;;; 65510)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -23745,7 +23745,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (20353 36975)) +;;;;;; "net/rcirc.el" (20400 62402)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -23814,7 +23814,7 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (20352 65510)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (20400 62402)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -24105,7 +24105,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -24150,8 +24150,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20352 -;;;;;; 65510)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -24161,7 +24161,7 @@ of master file. ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -24223,7 +24223,7 @@ Extract diary entries from the region. ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (20352 65510)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (20400 62402)) ;;; Generated autoloads from repeat.el (autoload 'repeat "repeat" "\ @@ -24356,7 +24356,7 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (20352 65510)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (20398 608)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -24405,7 +24405,7 @@ variable. ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-user-mail-address-regexp rmail-movemail-variant-p) -;;;;;; "rmail" "mail/rmail.el" (20370 20099)) +;;;;;; "rmail" "mail/rmail.el" (20400 62402)) ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -24666,7 +24666,7 @@ Return a pattern. ;;;*** ;;;### (autoloads (rng-nxml-mode-init) "rng-nxml" "nxml/rng-nxml.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -24809,7 +24809,7 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -24846,7 +24846,7 @@ for modes derived from Text mode, like Mail mode. ;;;*** ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/ruby-mode.el (autoload 'ruby-mode "ruby-mode" "\ @@ -25230,7 +25230,7 @@ histories, which is probably undesirable. ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -25286,7 +25286,7 @@ This mode is an extended emacs-lisp mode. ;;;*** ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -25336,7 +25336,7 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic" -;;;;;; "cedet/semantic.el" (20352 65510)) +;;;;;; "cedet/semantic.el" (20400 62402)) ;;; Generated autoloads from cedet/semantic.el (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\ @@ -25390,7 +25390,7 @@ Semantic mode. ;;;;;; mail-personal-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-interactive ;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) -;;;;;; "sendmail" "mail/sendmail.el" (20370 20099)) +;;;;;; "sendmail" "mail/sendmail.el" (20400 62402)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -25672,8 +25672,8 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (20362 -;;;;;; 35575)) +;;;;;; server-force-delete server-start) "server" "server.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -25740,7 +25740,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (20352 65510)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (20400 62402)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -25759,7 +25759,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" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -25825,7 +25825,7 @@ To work around that, do: ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -25980,7 +25980,7 @@ Set up file shadowing. ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (20352 65510)) +;;;;;; (20396 34067)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -26078,8 +26078,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -26128,7 +26128,7 @@ with no arguments, if that value is non-nil. ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (20352 65510)) +;;;;;; define-skeleton) "skeleton" "skeleton.el" (20400 62402)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -26238,7 +26238,7 @@ symmetrical ones, and the same character twice for the others. ;;;*** ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff) -;;;;;; "smerge-mode" "vc/smerge-mode.el" (20352 65510)) +;;;;;; "smerge-mode" "vc/smerge-mode.el" (20400 62402)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -26284,7 +26284,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" (20352 65510)) +;;;;;; "mail/smtpmail.el" (20396 34067)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -26323,7 +26323,7 @@ Snake mode keybindings: ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -26650,7 +26650,7 @@ Spam reports will be queued with the method used when ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (20352 65510)) +;;;;;; "speedbar.el" (20400 62402)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -27518,7 +27518,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" (20352 65510)) +;;;;;; "table" "textmodes/table.el" (20400 62402)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -28107,7 +28107,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** ;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el" -;;;;;; (20365 34527)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emacs-lisp/tabulated-list.el (autoload 'tabulated-list-mode "tabulated-list" "\ @@ -28164,7 +28164,7 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20352 65510)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20400 62402)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -28188,7 +28188,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (20352 65510)) +;;;;;; "progmodes/tcl.el" (20400 62402)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -28262,7 +28262,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -28383,7 +28383,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" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -28685,7 +28685,7 @@ Major mode to edit DocTeX files. ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (20352 65510)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (20400 62402)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -28941,8 +28941,8 @@ In dired, call the setroot program on the image at point. ;;;;;; tibetan-post-read-conversion tibetan-compose-buffer tibetan-decompose-buffer ;;;;;; tibetan-decompose-string tibetan-decompose-region tibetan-compose-region ;;;;;; tibetan-compose-string tibetan-transcription-to-tibetan tibetan-tibetan-to-transcription -;;;;;; tibetan-char-p) "tibet-util" "language/tibet-util.el" (20352 -;;;;;; 65510)) +;;;;;; tibetan-char-p) "tibet-util" "language/tibet-util.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -29016,7 +29016,7 @@ See also docstring of the function tibetan-compose-region. ;;;*** ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from textmodes/tildify.el (autoload 'tildify-region "tildify" "\ @@ -29041,7 +29041,7 @@ This function performs no refilling of the changed text. ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world ;;;;;; display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (20352 65510)) +;;;;;; "time" "time.el" (20400 62402)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -29388,7 +29388,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (20352 65510)) +;;;;;; "tmm.el" (20400 62402)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -29559,7 +29559,7 @@ holds a keymap. ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -29674,7 +29674,7 @@ BUFFER defaults to `trace-buffer'. ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (20352 65510)) +;;;;;; "net/tramp.el" (20400 62402)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29807,7 +29807,7 @@ Discard Tramp from loading remote files. ;;;*** ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -29817,8 +29817,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -29854,7 +29854,7 @@ resumed later. ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (20352 65510)) +;;;;;; "textmodes/two-column.el" (20400 62402)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -29905,7 +29905,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" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -30192,7 +30192,7 @@ which specify the range to operate on. ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -30225,7 +30225,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (20352 65510)) +;;;;;; "url/url.el" (20400 62402)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -30343,7 +30343,7 @@ Extract FNAM from the local disk cache. ;;;*** ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (20352 65510)) +;;;;;; "url/url-dav.el" (20400 62402)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -30390,7 +30390,7 @@ Might do a non-blocking connection; use `process-status' to check. ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file ;;;;;; url-file-handler url-handler-mode) "url-handlers" "url/url-handlers.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -30445,7 +30445,7 @@ accessible. ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (20352 65510)) +;;;;;; url-http) "url-http" "url/url-http.el" (20400 62402)) ;;; Generated autoloads from url/url-http.el (autoload 'url-http "url-http" "\ @@ -30524,8 +30524,8 @@ HTTPS retrievals are asynchronous.") ;;;*** -;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (20352 -;;;;;; 65510)) +;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -30645,7 +30645,7 @@ Fetch a data URL (RFC 2397). ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (20352 65510)) +;;;;;; "url/url-parse.el" (20400 62402)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -30694,7 +30694,7 @@ The variable `url-queue-timeout' sets a timeout. ;;;;;; url-pretty-length url-strip-leading-spaces url-eat-trailing-space ;;;;;; url-get-normalized-date url-lazy-message url-normalize-url ;;;;;; url-insert-entities-in-string url-parse-args url-debug url-debug) -;;;;;; "url-util" "url/url-util.el" (20352 65510)) +;;;;;; "url-util" "url/url-util.el" (20400 62402)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -30897,7 +30897,7 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal ;;;;;; uudecode-decode-region-external) "uudecode" "mail/uudecode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -30927,8 +30927,8 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers ;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff ;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20375 -;;;;;; 44124)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -31206,7 +31206,7 @@ Return the branch part of a revision number REV. ;;;*** ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -31243,7 +31243,7 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20352 65510)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20400 62402)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -31253,7 +31253,7 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20352 65510)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20400 62402)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -31269,7 +31269,7 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20352 65510)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20400 62402)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -31280,7 +31280,7 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20352 65510)) +;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20400 62402)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -31305,7 +31305,7 @@ These are the commands available for use in the file status buffer: ;;;*** ;;;### (autoloads (vc-do-command) "vc-dispatcher" "vc/vc-dispatcher.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -31328,7 +31328,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20377 65403)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20400 62402)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -31339,7 +31339,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20352 65510)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20400 62402)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -31350,7 +31350,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20352 65510)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20400 62402)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -31412,7 +31412,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/vera-mode.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -31470,7 +31470,7 @@ Key bindings: ;;;*** ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -31609,7 +31609,7 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -32524,7 +32524,7 @@ Turn on VIP emulation of VI. ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (20352 65510)) +;;;;;; (20400 62402)) ;;; Generated autoloads from emulation/viper.el (autoload 'toggle-viper-mode "viper" "\ @@ -32647,7 +32647,7 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (20352 65510)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (20400 62402)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -32664,7 +32664,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** ;;;### (autoloads (which-function-mode which-func-mode) "which-func" -;;;;;; "progmodes/which-func.el" (20371 45292)) +;;;;;; "progmodes/which-func.el" (20400 62402)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -33128,8 +33128,8 @@ if ARG is omitted or nil. ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20352 -;;;;;; 65510)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20400 +;;;;;; 62402)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -33245,7 +33245,7 @@ With arg, turn Winner mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file -;;;;;; woman woman-locale) "woman" "woman.el" (20352 65510)) +;;;;;; woman woman-locale) "woman" "woman.el" (20400 62402)) ;;; Generated autoloads from woman.el (defvar woman-locale nil "\ @@ -33406,7 +33406,7 @@ The key bindings are: ;;;*** -;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20352 65510)) +;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20400 62402)) ;;; Generated autoloads from net/xesam.el (autoload 'xesam-search "xesam" "\ @@ -33517,7 +33517,7 @@ Extract file name from an yenc header. ;;;*** ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (20352 65510)) +;;;;;; yow) "yow" "play/yow.el" (20400 62402)) ;;; Generated autoloads from play/yow.el (autoload 'yow "yow" "\ @@ -33543,7 +33543,7 @@ Zippy goes to the analyst. ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (20352 65510)) +;;;### (autoloads (zone) "zone" "play/zone.el" (20400 62402)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -33754,7 +33754,7 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el" -;;;;;; "w32-vars.el" "x-dnd.el") (20378 51005 591713)) +;;;;;; "w32-vars.el" "x-dnd.el") (20404 25051 894126)) ;;;*** diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index e41e8f8a371..8f44968b3fd 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -59,7 +59,7 @@ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ -/^#undef VERSION/s/^.*$/#define VERSION "24.0.96"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.0.97"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/ diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 2e66f8a0f8c..85a32f2fa16 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 24.0.96 Copyright (C) 2012 Free Software Foundation, Inc. + Emacs 24.0.97 Copyright (C) 2012 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 24.0.96 + 24.0.97 CFBundleSignature EMAx diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index f1ca770b1df..6366423e318 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 24.0.96"; -CFBundleGetInfoString = "Emacs version 24.0.96, NS Windowing"; +CFBundleShortVersionString = "Version 24.0.97"; +CFBundleGetInfoString = "Emacs version 24.0.97, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index 0e69c5bb045..40f2452f264 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=24.0.96 +Version=24.0.97 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index 14d7a79c59a..8f7bc101d42 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "24.0.96"; + ApplicationRelease = "24.0.97"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 24.0.96, NS Windowing"; + FullVersionID = "Emacs 24.0.97, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/config.nt b/nt/config.nt index 9180033b3a1..a65fe26314b 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -331,7 +331,7 @@ along with GNU Emacs. If not, see . */ #define PACKAGE "emacs" /* Version number of package */ -#define VERSION "24.0.96" +#define VERSION "24.0.97" /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ diff --git a/nt/emacs.rc b/nt/emacs.rc index baa8f68d698..7d165c35f8a 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,96,0 - PRODUCTVERSION 24,0,96,0 + FILEVERSION 24,0,97,0 + PRODUCTVERSION 24,0,97,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 96, 0\0" + VALUE "FileVersion", "24, 0, 97, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 0, 96, 0\0" + VALUE "ProductVersion", "24, 0, 97, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 4a6bfd15e55..b5aaefd2b25 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,96,0 - PRODUCTVERSION 24,0,96,0 + FILEVERSION 24,0,97,0 + PRODUCTVERSION 24,0,97,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 96, 0\0" + VALUE "FileVersion", "24, 0, 97, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 0, 96, 0\0" + VALUE "ProductVersion", "24, 0, 97, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 121b2804af8..fa110d19777 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.0.96 +VERSION = 24.0.97 TMP_DIST_DIR = emacs-$(VERSION) -- cgit v1.2.1 From 77e1259ea00f89904dfcdbd863cc63cdfa7f5112 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 17 May 2012 07:17:28 -0400 Subject: Auto-commit of generated files. --- autogen/configure | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/autogen/configure b/autogen/configure index 1c17b77e754..632fd6e1e17 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for emacs 24.0.96. +# Generated by GNU Autoconf 2.65 for emacs 24.0.97. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='24.0.96' -PACKAGE_STRING='emacs 24.0.96' +PACKAGE_VERSION='24.0.97' +PACKAGE_STRING='emacs 24.0.97' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1887,7 +1887,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 24.0.96 to adapt to many kinds of systems. +\`configure' configures emacs 24.0.97 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1961,7 +1961,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 24.0.96:";; + short | recursive ) echo "Configuration of emacs 24.0.97:";; esac cat <<\_ACEOF @@ -2124,7 +2124,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 24.0.96 +emacs configure 24.0.97 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2846,7 +2846,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 24.0.96, which was +It was created by emacs $as_me 24.0.97, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3679,7 +3679,7 @@ fi # Define the identity of the package. PACKAGE='emacs' - VERSION='24.0.96' + VERSION='24.0.97' cat >>confdefs.h <<_ACEOF @@ -23158,7 +23158,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 24.0.96, which was +This file was extended by emacs $as_me 24.0.97, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23224,7 +23224,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -emacs config.status 24.0.96 +emacs config.status 24.0.97 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -- cgit v1.2.1 From 6d4a05e3e06c9891ba953c28eb5a721cce412a9a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 17 May 2012 11:17:53 -0400 Subject: * lisp/emacs-lisp/cl-macs.el (cl-transform-lambda): Don't add spurious parens around the arg list. Silly backport. Fixes: debbugs:11499 --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/cl-macs.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a668fa2704..ac5783b7951 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-17 Stefan Monnier + + * emacs-lisp/cl-macs.el (cl-transform-lambda): Don't add spurious + parens around the arg list (bug#11499). Silly backport. + 2012-05-16 Chong Yidong * net/gnutls.el (gnutls-min-prime-bits): Improve docstring. diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 4fc71bbbc60..f58fc70053f 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -313,8 +313,9 @@ It is a list of elements of the form either: (require 'help-fns) (cons (help-add-fundoc-usage (if (stringp (car hdr)) (pop hdr)) - (format "(fn %S)" - (cl--make-usage-args orig-args))) + (format "%S" + (cons 'fn + (cl--make-usage-args orig-args)))) hdr))) (list (nconc (list 'let* bind-lets) (nreverse bind-forms) body))))))) -- cgit v1.2.1 From ce1287227544c3a131e002352cff2a01276f2e24 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 May 2012 11:21:19 +0300 Subject: Fix redirection in nt/configure.bat. nt/configure.bat: Ensure a space between %var% expansion and redirection symbol '>', which breaks when %var% ends in a digit, such as 1. --- nt/ChangeLog | 6 ++++++ nt/configure.bat | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 23e93907552..15516c891cd 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2012-05-18 Eli Zaretskii + + * configure.bat: Ensure a space between %var% expansion and + redirection symbol '>', which breaks when %var% ends in a digit, + such as 1. + 2012-04-11 Dani Moncayo (tiny change) * makefile.w32-in: Fix typo (Bug#10261). diff --git a/nt/configure.bat b/nt/configure.bat index e0362c5c278..caee800bacf 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -725,25 +725,25 @@ rem NB. Be very careful to not have a space before redirection symbols rem except when there is a preceding digit, when a space is required. rem echo # Start of settings from configure.bat >config.settings -echo COMPILER=%COMPILER%>>config.settings -if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings -if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo%>>config.settings +echo COMPILER=%COMPILER% >>config.settings +if not "(%mf%)" == "()" echo MCPU_FLAG=%mf% >>config.settings +if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo% >>config.settings if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings if (%noopt%) == (Y) echo NOOPT=1 >>config.settings if (%enablechecking%) == (Y) echo ENABLECHECKS=1 >>config.settings if (%profile%) == (Y) echo PROFILE=1 >>config.settings if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings -if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings -if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles%>>config.settings +if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix% >>config.settings +if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles% >>config.settings rem We go thru docflags because usercflags could be "-DFOO=bar" -something rem and the if command cannot cope with this for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y -if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings -if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags%>>config.settings +if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags% >>config.settings +if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags% >>config.settings for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y -if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings +if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags% >>config.settings for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y -if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs%>>config.settings +if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs% >>config.settings echo # End of settings from configure.bat>>config.settings echo. >>config.settings @@ -752,8 +752,8 @@ echo. >>config.tmp echo /* Start of settings from configure.bat. */ >>config.tmp rem We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify rem processing of compiler options in w32.c:get_emacs_configuration_options -if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%">>config.tmp -if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%">>config.tmp +if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%" >>config.tmp +if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%" >>config.tmp if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp -- cgit v1.2.1 From b30b64b9096c0ffd4070259fa17b1d365865e94b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 May 2012 12:41:42 +0300 Subject: Fix "C-c C-r" in mail-mode invoked from Rmail. lisp/mail/sendmail.el (mail-yank-region): Recognize rmail-yank-current-message in addition to insert-buffer. Fixes mail-mode's "C-c C-r" that otherwise does nothing when invoked in a *mail* buffer created through rmail-start-mail with sendmail as mail-user-agent. --- lisp/ChangeLog | 8 ++++++++ lisp/mail/sendmail.el | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ac5783b7951..5b27dcfb52e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2012-05-18 Eli Zaretskii + + * mail/sendmail.el (mail-yank-region): Recognize + rmail-yank-current-message in addition to insert-buffer. Fixes + mail-mode's "C-c C-r" that otherwise does nothing when invoked in + a *mail* buffer created through rmail-start-mail with sendmail as + mail-user-agent. + 2012-05-17 Stefan Monnier * emacs-lisp/cl-macs.el (cl-transform-lambda): Don't add spurious diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 1ecae9faa59..5ae4c44060f 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1679,7 +1679,8 @@ Just \\[universal-argument] as argument means don't indent, insert no prefix, and don't delete any header fields." (interactive "P") (and (consp mail-reply-action) - (eq (car mail-reply-action) 'insert-buffer) + (memq (car mail-reply-action) + '(rmail-yank-current-message insert-buffer)) (with-current-buffer (nth 1 mail-reply-action) (or (mark t) (error "No mark set: %S" (current-buffer)))) -- cgit v1.2.1 From f467fdc6f924765fde80ac50da08e8a49ad191eb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 18 May 2012 07:17:30 -0400 Subject: Auto-commit of loaddefs files. --- lisp/emacs-lisp/cl-loaddefs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 5bb86628bb8..b75239d2a38 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -286,7 +286,7 @@ This also does some trivial optimizations to make the form prettier. ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "91b45885535a73dd8015973cb8c988e1") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "0be85e9c7ef309d2ccbac18b9b0f1d42") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ -- cgit v1.2.1 From 44e27368281d4078a83c55003454d76683ddaad4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 19 May 2012 15:14:11 +0300 Subject: A better fix for bug #11464 with pos-visible-in-window-p and R2L text. src/xdisp.c (move_it_to): Under MOVE_TO_Y, when restoring iterator state after an additional call to move_it_in_display_line_to, keep the values of it->max_ascent and it->max_descent found for the entire line. (pos_visible_p): Revert the comparison against bottom_y to what it was in 2012-05-13T18:22:35Z!eliz@gnu.org. --- src/ChangeLog | 10 ++++++++++ src/xdisp.c | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2a7f8e2958f..b117a1e0406 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2012-05-19 Eli Zaretskii + + * xdisp.c (move_it_to): Under MOVE_TO_Y, when restoring iterator + state after an additional call to move_it_in_display_line_to, keep + the values of it->max_ascent and it->max_descent found for the + entire line. + (pos_visible_p): Revert the comparison against bottom_y to what it + was in revid eliz@gnu.org-20120513182235-4p6386j761ld0nwb. + (Bug#11464) + 2012-05-15 Eli Zaretskii * xdisp.c (pos_visible_p): Fix last change. (Bug#11464) diff --git a/src/xdisp.c b/src/xdisp.c index e8253c714e3..a3227b556a9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1313,7 +1313,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, visible_p = bottom_y > window_top_y; else if (top_y < it.last_visible_y) visible_p = 1; - if (bottom_y <= it.last_visible_y + if (bottom_y >= it.last_visible_y && it.bidi_p && it.bidi_it.scan_dir == -1 && IT_CHARPOS (it) < charpos) { @@ -8689,8 +8689,18 @@ move_it_to (struct it *it, EMACS_INT to_charpos, int to_x, int to_y, int to_vpos { /* If TO_Y is in this line and TO_X was reached above, we scanned too far. We have to restore - IT's settings to the ones before skipping. */ + IT's settings to the ones before skipping. But + keep the more accurate values of max_ascent and + max_descent we've found while skipping the rest + of the line, for the sake of callers, such as + pos_visible_p, that need to know the line + height. */ + int max_ascent = it->max_ascent; + int max_descent = it->max_descent; + RESTORE_IT (it, &it_backup, backup_data); + it->max_ascent = max_ascent; + it->max_descent = max_descent; reached = 6; } else -- cgit v1.2.1 From 1d692e76345b318f1c3e60d96a9c4450d9f9590f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 21 May 2012 15:29:35 -0400 Subject: Fix BUGS typo --- BUGS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUGS b/BUGS index 552be81a0f9..d0106645995 100644 --- a/BUGS +++ b/BUGS @@ -4,7 +4,7 @@ Bugs section of the Emacs manual for advice on (1) how to tell when to report a bug, and (2) how to write a useful bug report and what information it needs to have. -You can read the read the Bugs section of the manual from inside Emacs. +You can read the Bugs section of the manual from inside Emacs. Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the Emacs manual, then m Bugs RET to get to the section on bugs. Or you can use the standalone Info program in a like manner. -- cgit v1.2.1 From 23415acf5a2af6ac1d84359f36a3fe9f43886879 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 21 May 2012 22:56:36 +0300 Subject: Update value of window-system-version for MS-DOS build. src/msdos.c (internal_terminal_init) : Update value to 24. --- src/ChangeLog | 5 +++++ src/msdos.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b117a1e0406..d97c313e465 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Eli Zaretskii + + * msdos.c (internal_terminal_init) : + Update value to 24. + 2012-05-19 Eli Zaretskii * xdisp.c (move_it_to): Under MOVE_TO_Y, when restoring iterator diff --git a/src/msdos.c b/src/msdos.c index 885cedd3df0..ede864087ca 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1813,7 +1813,7 @@ internal_terminal_init (void) } Vinitial_window_system = Qpc; - Vwindow_system_version = make_number (23); /* RE Emacs version */ + Vwindow_system_version = make_number (24); /* RE Emacs version */ tty->terminal->type = output_msdos_raw; /* If Emacs was dumped on DOS/V machine, forget the stale VRAM -- cgit v1.2.1 From 1b7e0ab8c77f6a6fdb9758adc7297ac907fee3c5 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 21 May 2012 23:29:03 +0000 Subject: gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is a string so that Gcc works (bug#11514) --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/gnus-msg.el | 1 + 2 files changed, 6 insertions(+) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9d9ffb2fcbd..05eb0dd76c6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Katsumi Yamaoka + + * gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is + a string so that Gcc works (bug#11514). + 2012-04-21 Andreas Schwab * gnus.el (debbugs-gnu): Don't override existing autoload definition. diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 815bd9e44a6..c6d0c3213a0 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -490,6 +490,7 @@ instead." (message-mail to subject other-headers continue nil yank-action send-actions return-action) (let ((buf (current-buffer)) + (gnus-newsgroup-name (or gnus-newsgroup-name "")) mail-buf) (gnus-setup-message 'message (message-mail to subject other-headers continue -- cgit v1.2.1 From 52c55cc7d2bec9795533f58e15c61f7a7b51d1b0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 23 May 2012 20:32:28 +0300 Subject: Fix bug #11519 with relocation of buffer text during regex search. src/lisp.h [REL_ALLOC]: Add prototypes for external functions defined on ralloc.c. src/buffer.c [REL_ALLOC]: Remove prototypes of r_alloc_reset_variable, r_alloc, r_re_alloc, and r_alloc_free, they are now on lisp.h. src/ralloc.c (r_alloc_inhibit_buffer_relocation): New function. src/search.c (search_buffer): Use it to inhibit relocation of buffer text while re_search_2 is doing its job, because re_search_2 is passed C pointers to buffer text. --- src/ChangeLog | 15 +++++++++++++++ src/buffer.c | 11 ----------- src/lisp.h | 9 +++++++++ src/ralloc.c | 6 ++++++ src/search.c | 22 ++++++++++++++++++++++ 5 files changed, 52 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d97c313e465..cbfd6631892 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2012-05-23 Eli Zaretskii + + * lisp.h [REL_ALLOC]: Add prototypes for external functions + defined on ralloc.c. + + * buffer.c [REL_ALLOC]: Remove prototypes of + r_alloc_reset_variable, r_alloc, r_re_alloc, and r_alloc_free, + they are now on lisp.h. + + * ralloc.c (r_alloc_inhibit_buffer_relocation): New function. + + * search.c (search_buffer): Use it to inhibit relocation of buffer + text while re_search_2 is doing its job, because re_search_2 is + passed C pointers to buffer text. (Bug#11519) + 2012-05-21 Eli Zaretskii * msdos.c (internal_terminal_init) : diff --git a/src/buffer.c b/src/buffer.c index 1fea19b0d65..ac14ec9c37c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2014,10 +2014,6 @@ advance_to_char_boundary (EMACS_INT byte_pos) return byte_pos; } -#ifdef REL_ALLOC -extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *); -#endif /* REL_ALLOC */ - DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, 1, 1, 0, doc: /* Swap the text between current buffer and BUFFER. */) @@ -4779,13 +4775,6 @@ mmap_realloc (POINTER_TYPE **var, size_t nbytes) Buffer-text Allocation ***********************************************************************/ -#ifdef REL_ALLOC -extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t); -extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t); -extern void r_alloc_free (POINTER_TYPE **ptr); -#endif /* REL_ALLOC */ - - /* Allocate NBYTES bytes for buffer B's text buffer. */ static void diff --git a/src/lisp.h b/src/lisp.h index bd19da55b2a..aee5b0b1ec2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3565,6 +3565,15 @@ void syms_of_dbusbind (void); /* Defined in msdos.c, w32.c */ extern char *emacs_root_dir (void); #endif /* DOS_NT */ + +#ifdef REL_ALLOC +/* Defined in ralloc.c */ +extern void r_alloc_reset_variable (POINTER_TYPE **, POINTER_TYPE **); +extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t); +extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t); +extern void r_alloc_free (POINTER_TYPE **ptr); +extern void r_alloc_inhibit_buffer_relocation (int); +#endif /* REL_ALLOC */ /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */ diff --git a/src/ralloc.c b/src/ralloc.c index 896ad9f3155..db3638a54e6 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1201,6 +1201,12 @@ r_alloc_reset_variable (POINTER *old, POINTER *new) bloc->variable = new; } +void +r_alloc_inhibit_buffer_relocation (int inhibit) +{ + use_relocatable_buffers = !inhibit; +} + /*********************************************************************** Initialization diff --git a/src/search.c b/src/search.c index 1f3ccc25dc8..67f9e505fad 100644 --- a/src/search.c +++ b/src/search.c @@ -1158,12 +1158,25 @@ search_buffer (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte, while (n < 0) { EMACS_INT val; + +#ifdef REL_ALLOC + /* re_search_2 below is passed C pointers to buffer text. + If some code called by it causes memory (re)allocation, + buffer text could be relocated on platforms that use + REL_ALLOC, which invalidates those C pointers. So we + inhibit relocation of buffer text for as long as + re_search_2 runs. */ + r_alloc_inhibit_buffer_relocation (1); +#endif val = re_search_2 (bufp, (char *) p1, s1, (char *) p2, s2, pos_byte - BEGV_BYTE, lim_byte - pos_byte, (NILP (Vinhibit_changing_match_data) ? &search_regs : &search_regs_1), /* Don't allow match past current point */ pos_byte - BEGV_BYTE); +#ifdef REL_ALLOC + r_alloc_inhibit_buffer_relocation (0); +#endif if (val == -2) { matcher_overflow (); @@ -1202,11 +1215,20 @@ search_buffer (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte, while (n > 0) { EMACS_INT val; + +#ifdef REL_ALLOC + /* See commentary above for the reasons for inhibiting + buffer text relocation here. */ + r_alloc_inhibit_buffer_relocation (1); +#endif val = re_search_2 (bufp, (char *) p1, s1, (char *) p2, s2, pos_byte - BEGV_BYTE, lim_byte - pos_byte, (NILP (Vinhibit_changing_match_data) ? &search_regs : &search_regs_1), lim_byte - BEGV_BYTE); +#ifdef REL_ALLOC + r_alloc_inhibit_buffer_relocation (0); +#endif if (val == -2) { matcher_overflow (); -- cgit v1.2.1 From 2f9b9adb4652f52c12b6388b1fd3d03fa4f99b32 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Thu, 24 May 2012 07:21:34 -0400 Subject: * src/callproc.c (Fcall_process): Restore a line that was accidentally commented out (bug#11547). --- src/ChangeLog | 5 +++++ src/callproc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index cbfd6631892..0b1ef220fc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-05-24 Ken Brown + + * callproc.c (Fcall_process): Restore a line that was accidentally + commented out in the 2011-02-13 change (bug#11547). + 2012-05-23 Eli Zaretskii * lisp.h [REL_ALLOC]: Add prototypes for external functions diff --git a/src/callproc.c b/src/callproc.c index b5b8cadeb68..d3ca7ebac95 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -640,7 +640,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) /* GConf causes us to ignore SIGPIPE, make sure it is restored in the child. */ - //signal (SIGPIPE, SIG_DFL); + signal (SIGPIPE, SIG_DFL); #ifdef HAVE_WORKING_VFORK pthread_sigmask (SIG_SETMASK, &procmask, 0); #endif -- cgit v1.2.1 From 2a88ee23dbe4182c8671b2fa6a1b091ce512cb99 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 25 May 2012 09:39:32 +0200 Subject: Merge Org 7.8.11 -- important bug fixes. --- doc/misc/org.texi | 4 ++-- etc/refcards/orgcard.pdf | Bin 118613 -> 118438 bytes etc/refcards/orgcard.tex | 2 +- lisp/org/ChangeLog | 30 ++++++++++++++++++++++++++++++ lisp/org/ob-plantuml.el | 3 ++- lisp/org/ob.el | 15 +++++++++++---- lisp/org/org-exp-blocks.el | 8 +++++++- lisp/org/org-lparse.el | 3 --- lisp/org/org-odt.el | 7 +++++-- lisp/org/org.el | 9 +++------ 10 files changed, 61 insertions(+), 20 deletions(-) diff --git a/doc/misc/org.texi b/doc/misc/org.texi index d4353e26eba..c5e59c9c7e8 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -4,8 +4,8 @@ @setfilename ../../info/org @settitle The Org Manual -@set VERSION 7.8.10 -@set DATE May 2012 +@set VERSION 7.8.11 +@set DATE mai 2012 @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf index 44cc7bf89ae..2b474bf4e93 100644 Binary files a/etc/refcards/orgcard.pdf and b/etc/refcards/orgcard.pdf differ diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 6bebbaa9f61..3c0584d6db4 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{7.8.10} +\def\orgversionnumber{7.8.11} \def\versionyear{2012} % latest update \def\year{2012} % latest copyright year diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 19f6a15dc9c..24133ef850d 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,33 @@ +2012-05-25 Jambunathan K + + * org-odt.el (org-odt-init-outfile) + (org-odt-write-manifest-file): Disable + `nxml-auto-insert-xml-declaration-flag'. + +2012-05-25 Bastien Guerry + + * org.el (org-scan-tags): Fix bug when building the scanner + regexp. + +2012-05-25 Eric Schulte + + * ob.el (org-babel-capitalize-examplize-region-markers): Controls + the capitalization of begin and end example blocks. + (org-babel-examplize-region): Optionally capitalize example block + delimiters. + +2012-05-25 Eric Schulte + + * ob-plantuml.el (org-babel-execute:plantuml): Adding a :java + header argument to plantuml. + +2012-05-25 Eric Schulte + + * org-exp-blocks.el (org-export-blocks-preprocess): Even when the + body of a block is not indented the boundary markers should be + indented to their original positions so things like list + indentation still work. + 2012-05-16 Eric Schulte * ob.el (org-babel-parse-src-block-match): Save match data during diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el index 55729eb4172..7da689393a3 100644 --- a/lisp/org/ob-plantuml.el +++ b/lisp/org/ob-plantuml.el @@ -55,9 +55,10 @@ This function is called by `org-babel-execute-src-block'." (error "plantuml requires a \":file\" header argument"))) (cmdline (cdr (assoc :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) + (java (or (cdr (assoc :java params)) "")) (cmd (if (not org-plantuml-jar-path) (error "`org-plantuml-jar-path' is not set") - (concat "java -jar " + (concat "java " java " -jar " (shell-quote-argument (expand-file-name org-plantuml-jar-path)) (if (string= (file-name-extension out-file) "svg") diff --git a/lisp/org/ob.el b/lisp/org/ob.el index 69d7da4cb0e..05122487588 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el @@ -1958,11 +1958,16 @@ file's directory then expand relative links." (stringp (car result)) (stringp (cadr result))) (format "[[file:%s][%s]]" (car result) (cadr result)))))) +(defvar org-babel-capitalize-examplize-region-markers nil + "Make true to capitalize begin/end example markers inserted by code blocks.") + (defun org-babel-examplize-region (beg end &optional results-switches) "Comment out region using the inline '==' or ': ' org example quote." (interactive "*r") (flet ((chars-between (b e) - (not (string-match "^[\\s]*$" (buffer-substring b e))))) + (not (string-match "^[\\s]*$" (buffer-substring b e)))) + (maybe-cap (str) (if org-babel-capitalize-examplize-region-markers + (upcase str) str))) (if (or (chars-between (save-excursion (goto-char beg) (point-at-bol)) beg) (chars-between end (save-excursion (goto-char end) (point-at-eol)))) (save-excursion @@ -1979,10 +1984,12 @@ file's directory then expand relative links." (t (goto-char beg) (insert (if results-switches - (format "#+begin_example%s\n" results-switches) - "#+begin_example\n")) + (format "%s%s\n" + (maybe-cap "#+begin_example") + results-switches) + (maybe-cap "#+begin_example\n"))) (if (markerp end) (goto-char end) (forward-char (- end beg))) - (insert "#+end_example\n")))))))) + (insert (maybe-cap "#+end_example\n"))))))))) (defun org-babel-update-block-body (new-body) "Update the body of the current code block to NEW-BODY." diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el index 7d466cec65d..fbac6592090 100644 --- a/lisp/org/org-exp-blocks.el +++ b/lisp/org/org-exp-blocks.el @@ -211,7 +211,13 @@ which defaults to the value of `org-export-blocks-witheld'." (when replacement (delete-region match-start match-end) (goto-char match-start) (insert replacement) - (unless preserve-indent + (if preserve-indent + ;; indent only the code block markers + (save-excursion + (indent-line-to indentation) ; indent end_block + (goto-char match-start) + (indent-line-to indentation)) ; indent begin_block + ;; indent everything (indent-code-rigidly match-start (point) indentation))))) ;; cleanup markers (set-marker match-start nil) diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el index c9669dd8ab4..9c3cd5b4811 100644 --- a/lisp/org/org-lparse.el +++ b/lisp/org/org-lparse.el @@ -1111,9 +1111,6 @@ version." (unless body-only (org-lparse-end 'DOCUMENT-CONTENT)) - (unless (plist-get opt-plist :buffer-will-be-killed) - (set-auto-mode t)) - (org-lparse-end 'EXPORT) ;; kill collection buffer diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el index 2e984a575bd..8475eaae58f 100644 --- a/lisp/org/org-odt.el +++ b/lisp/org/org-odt.el @@ -2211,7 +2211,9 @@ captions on export.") (content-file (expand-file-name "content.xml" outdir))) ;; init conten.xml - (with-current-buffer (find-file-noselect content-file t)) + (with-current-buffer + (let ((nxml-auto-insert-xml-declaration-flag nil)) + (find-file-noselect content-file t))) ;; reset variables (setq org-odt-manifest-file-entries nil @@ -2320,7 +2322,8 @@ visually." (make-directory "META-INF") (let ((manifest-file (expand-file-name "META-INF/manifest.xml"))) (with-current-buffer - (find-file-noselect manifest-file t) + (let ((nxml-auto-insert-xml-declaration-flag nil)) + (find-file-noselect manifest-file t)) (insert " \n") diff --git a/lisp/org/org.el b/lisp/org/org.el index 4710bd5bd86..fd5250a24be 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -6,7 +6,7 @@ ;; Maintainer: Bastien Guerry ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 7.8.10 +;; Version: 7.8.11 ;; ;; This file is part of GNU Emacs. ;; @@ -206,7 +206,7 @@ identifier." ;;; Version -(defconst org-version "7.8.10" +(defconst org-version "7.8.11" "The version number of the file org.el.") ;;;###autoload @@ -12828,10 +12828,7 @@ headlines matching this string." org-outline-regexp) " *\\(\\<\\(" (mapconcat 'regexp-quote org-todo-keywords-1 "\\|") - (org-re - (if todo-only - "\\>\\)\\)[ \t]+\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$" - "\\>\\)\\)? *\\([^ ].*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))) + (org-re "\\)\\>\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))) (props (list 'face 'default 'done-face 'org-agenda-done 'undone-face 'default -- cgit v1.2.1 From 9893229fd65b38e8f6b519550b7e1af491017f76 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 25 May 2012 23:09:08 +0200 Subject: Fix major bug in the Org>ODT exporter. --- lisp/org/ChangeLog | 17 +++++++++++++++++ lisp/org/org-odt.el | 6 +++--- lisp/org/org.el | 19 ++++++++++--------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 24133ef850d..ec21c5f2470 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,20 @@ +2012-05-25 Mark Shoulson (tiny change) + + * org.el (org-fontify-entities): Fix bug: The entities \sup[123] + and \there4 were not "prettified" when org-pretty-entities was + enabled. + +2012-05-235 Nicolas Goaziou + + * org.el (org-font-lock-add-priority-faces): Restrict priorities + fontification to headlines and inlinetasks. + +2012-05-25 Jambunathan K + + * org-odt.el (org-odt-init-outfile): Fix previous commit. Make + sure that nxml-mode is loaded before let-binding + `nxml-auto-insert-xml-declaration-flag'. + 2012-05-25 Jambunathan K * org-odt.el (org-odt-init-outfile) diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el index 8475eaae58f..ca43d05bdbd 100644 --- a/lisp/org/org-odt.el +++ b/lisp/org/org-odt.el @@ -2211,9 +2211,9 @@ captions on export.") (content-file (expand-file-name "content.xml" outdir))) ;; init conten.xml - (with-current-buffer - (let ((nxml-auto-insert-xml-declaration-flag nil)) - (find-file-noselect content-file t))) + (require 'nxml-mode) + (let ((nxml-auto-insert-xml-declaration-flag nil)) + (find-file-noselect content-file t)) ;; reset variables (setq org-odt-manifest-file-entries nil diff --git a/lisp/org/org.el b/lisp/org/org.el index fd5250a24be..972f7801afc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -5917,7 +5917,7 @@ needs to be inserted at a specific position in the font-lock sequence.") (when org-pretty-entities (catch 'match (while (re-search-forward - "\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)" + "\\\\\\(there4\\|sup[123]\\|frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)" limit t) (if (and (not (org-in-indented-comment-line)) (setq ee (org-entity-get (match-string 1))) @@ -5990,14 +5990,15 @@ When FACE-OR-COLOR is not a string, just return it." (defun org-font-lock-add-priority-faces (limit) "Add the special priority faces." (while (re-search-forward "\\[#\\([A-Z0-9]\\)\\]" limit t) - (add-text-properties - (match-beginning 0) (match-end 0) - (list 'face (or (org-face-from-face-or-color - 'priority 'org-special-keyword - (cdr (assoc (char-after (match-beginning 1)) - org-priority-faces))) - 'org-special-keyword) - 'font-lock-fontified t)))) + (when (save-match-data (org-at-heading-p)) + (add-text-properties + (match-beginning 0) (match-end 0) + (list 'face (or (org-face-from-face-or-color + 'priority 'org-special-keyword + (cdr (assoc (char-after (match-beginning 1)) + org-priority-faces))) + 'org-special-keyword) + 'font-lock-fontified t))))) (defun org-get-tag-face (kwd) "Get the right face for a TODO keyword KWD. -- cgit v1.2.1 From a5532eb31eed098a37799536f369b0b5235bd5a0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 25 May 2012 17:28:05 -0400 Subject: Fix typos in previous --- doc/misc/org.texi | 2 +- lisp/org/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/misc/org.texi b/doc/misc/org.texi index c5e59c9c7e8..575b9cbebe6 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -5,7 +5,7 @@ @settitle The Org Manual @set VERSION 7.8.11 -@set DATE mai 2012 +@set DATE May 2012 @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index ec21c5f2470..d282fc556be 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -4,7 +4,7 @@ and \there4 were not "prettified" when org-pretty-entities was enabled. -2012-05-235 Nicolas Goaziou +2012-05-25 Nicolas Goaziou * org.el (org-font-lock-add-priority-faces): Restrict priorities fontification to headlines and inlinetasks. -- cgit v1.2.1 From ed7bebbb489cf6f893fc35a2a6714b0d8e7e8a90 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 26 May 2012 01:17:15 +0200 Subject: Add a forgotten lisp/org/ChangeLog entry. --- lisp/org/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index d282fc556be..9573989d824 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -21,6 +21,9 @@ (org-odt-write-manifest-file): Disable `nxml-auto-insert-xml-declaration-flag'. + * org-lparse.el (org-do-lparse): Don't trigger auto-mode + processing. + 2012-05-25 Bastien Guerry * org.el (org-scan-tags): Fix bug when building the scanner -- cgit v1.2.1