Commit 33017faf authored by Glenn Morris's avatar Glenn Morris

Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com

parents caf8a9b2 ed7bebbb
2012-05-27 Chong Yidong <cyd@gnu.org>
* 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-27 Martin Rudalics <rudalics@gmx.at>
* 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-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (MKDIR_P): New, set by configure.
......
......@@ -3210,7 +3210,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
......@@ -3237,7 +3237,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
......
......@@ -290,10 +290,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
......
......@@ -447,7 +447,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
......@@ -534,7 +534,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
......
......@@ -413,7 +413,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,
......@@ -434,7 +434,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.
......@@ -2662,11 +2662,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
......@@ -4904,7 +4906,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.
......
......@@ -3133,10 +3133,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
......
......@@ -108,7 +108,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.
......@@ -134,7 +134,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.
......@@ -1395,7 +1395,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
......@@ -1418,7 +1418,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
......
......@@ -1178,12 +1178,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
......@@ -1198,7 +1200,7 @@ this:
@example
(set-advertised-calling-convention
'sit-for '(seconds &optional nodisp))
'sit-for '(seconds &optional nodisp) "22.1")
@end example
@end defun
......
......@@ -511,7 +511,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;
......@@ -519,7 +519,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
......@@ -626,12 +626,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.
......
......@@ -205,7 +205,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,
......
......@@ -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
......
......@@ -734,13 +734,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
......@@ -1990,14 +1992,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}:
......@@ -2315,10 +2317,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
......@@ -3860,9 +3862,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
......
......@@ -2108,10 +2108,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
......
......@@ -294,8 +294,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:
......
......@@ -1073,7 +1073,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.
......@@ -1112,7 +1112,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.
......@@ -1120,7 +1120,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
......
......@@ -3530,7 +3530,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}.
......@@ -4068,7 +4068,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
......@@ -4078,15 +4078,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
......
......@@ -1852,16 +1852,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
......
......@@ -1558,7 +1558,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
......@@ -1581,7 +1581,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
......
2012-05-27 Bastien Guerry <bzg@gnu.org>
* org.texi (Durations and time values): Fix typo.
2012-05-19 Jay Belanger <jay.p.belanger@gmail.com>
* doc/misc/calc.texi
(Basic Operations on Units, Customizing Calc):
* doc/misc/calc.texi (Basic Operations on Units, Customizing Calc):
Mention `calc-ensure-consistent-units'.
2012-05-14 Andreas Schwab <schwab@linux-m68k.org>
......
......@@ -4,8 +4,8 @@
@setfilename ../../info/org
@settitle The Org Manual
@set VERSION 7.8.09
@set DATE April 2012
@set VERSION 7.8.11
@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
......
This diff was suppressed by a .gitattributes entry.
% Reference Card for Org Mode
\def\orgversionnumber{7.8.09}
\def\orgversionnumber{7.8.11}
\def\versionyear{2012} % latest update
\def\year{2012} % latest copyright year
......
2012-05-27 Eli Zaretskii <eliz@gnu.org>
* 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-27 Chong Yidong <cyd@gnu.org>
* net/gnutls.el (gnutls-min-prime-bits): Improve docstring.
Default to 256 (Bug#11267).
* help.el (describe-mode): Doc fix.
2012-05-26 Glenn Morris <rgm@gnu.org>
* w32-fns.el (w32-init-info): Remove.
......
2012-05-27 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is
a string so that Gcc works (bug#11514).
2012-05-26 Stefan Monnier <monnier@iro.umontreal.ca>
* legacy-gnus-agent.el (gnus-agent-unhook-expire-days):
......
......@@ -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
......
......@@ -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)
......
......@@ -1678,7 +1678,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))))
......
......@@ -66,14 +66,16 @@ 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.
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."
(defcustom gnutls-min-prime-bits 256
;; 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)