Commit 58635e4d authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from mainline.

parents 5489860b 555e9b5c
2011-03-06 Glenn Morris <rgm@gnu.org>
* configure.in (FREETYPE_LIBS): Actually set it to something.
2011-03-02 Paul Eggert <eggert@cs.ucla.edu>
Work around some portability problems with symlinks.
......
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......
This diff is collapsed.
......@@ -162,7 +162,7 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system])
OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system])
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
......@@ -2244,15 +2244,23 @@ if test "${HAVE_X11}" = "yes"; then
fi # "$HAVE_XFT" != no
fi # "x${with_xft}" != "xno"
dnl For the "Does Emacs use" message at the end.
## We used to allow building with FreeType and without Xft.
## However, the ftx font backend driver is not in good shape.
if test "$HAVE_XFT" != "yes"; then
dnl For the "Does Emacs use" message at the end.
HAVE_XFT=no
HAVE_FREETYPE=no
else
dnl Strict linkers fail with
dnl ftfont.o: undefined reference to symbol 'FT_New_Face'
dnl if -lfreetype is not specified.
dnl The following is needed to set FREETYPE_LIBS.
PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes,
HAVE_FREETYPE=no)
test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype)
fi
## We used to allow building with FreeType and without Xft.
## However, the ftx font backend driver is not in good shape.
HAVE_FREETYPE=$HAVE_XFT
HAVE_LIBOTF=no
if test "${HAVE_FREETYPE}" = "yes"; then
AC_DEFINE(HAVE_FREETYPE, 1,
......
2011-03-03 Drake Wilson <drake@begriffli.ch> (tiny change)
* misc.texi (emacsclient Options): Add q/quiet.
2011-03-02 Glenn Morris <rgm@gnu.org>
* mule.texi (Communication Coding) <x-select-request-type>:
Remove duplicate (essentially) paragraph. (Bug#8148)
2011-03-01 Christoph Scholtes <cschol2112@googlemail.com>
* maintaining.texi (Format of ChangeLog): Add reference to
......
......@@ -1672,6 +1672,11 @@ all server buffers are finished. You can take as long as you like to
edit the server buffers within Emacs, and they are @emph{not} killed
when you type @kbd{C-x #} in them.
@item -q
@itemx --quiet
Do not let @command{emacsclient} display messages about waiting for
Emacs or connecting to remote server sockets.
@item -s @var{server-name}
@itemx --socket-name=@var{server-name}
Connect to the Emacs server named @var{server-name}. The server name
......
......@@ -1153,15 +1153,6 @@ specified by one of the environment variables @env{LC_ALL},
specified above, whose value is nonempty is the one that determines
the text representation.)
@vindex x-select-request-type
The variable @code{x-select-request-type} specifies a selection data
type of selection to request from the X server. The default value is
@code{nil}, which means Emacs tries @code{COMPOUND_TEXT} and
@code{UTF8_STRING}, and uses whichever result seems more appropriate.
You can explicitly specify the data type by setting the variable to
one of the symbols @code{COMPOUND_TEXT}, @code{UTF8_STRING},
@code{STRING} and @code{TEXT}.
@node File Name Coding
@section Coding Systems for File Names
......
2011-03-06 Chong Yidong <cyd@stupidchicken.com>
* Makefile.in (srcs): Add package.texi.
2011-03-05 Chong Yidong <cyd@stupidchicken.com>
* processes.texi (Synchronous Processes): Minor clarification
(Bug#8149).
2011-03-03 Glenn Morris <rgm@gnu.org>
* files.texi (Truenames): Minor clarification. (Bug#2341)
2011-03-01 Glenn Morris <rgm@gnu.org>
* variables.texi (Directory Local Variables):
......
......@@ -80,6 +80,7 @@ srcs = \
$(srcdir)/numbers.texi \
$(srcdir)/objects.texi \
$(srcdir)/os.texi \
$(srcdir)/package.texi \
$(srcdir)/positions.texi \
$(srcdir)/processes.texi \
$(srcdir)/searching.texi \
......
......@@ -1041,7 +1041,8 @@ because they eliminate symbolic links as a cause of name variation.
@defun file-truename filename
The function @code{file-truename} returns the truename of the file
@var{filename}. The argument must be an absolute file name.
@var{filename}. If the argument is not an absolute file name,
this function first expands it against @code{default-directory}.
This function does not expand environment variables. Only
@code{substitute-in-file-name} does that. @xref{Definition of
......
......@@ -266,10 +266,9 @@ subprocess by @code{call-process-region} is encoded using a coding
system, much like text written into a file. @xref{Coding Systems}.
@defun call-process program &optional infile destination display &rest args
This function calls @var{program} in a separate process and waits for
it to finish.
This function calls @var{program} and waits for it to finish.
The standard input for the process comes from file @var{infile} if
The standard input for the new process comes from file @var{infile} if
@var{infile} is not @code{nil}, and from the null device otherwise.
The argument @var{destination} says where to put the process output.
Here are the possibilities:
......@@ -488,10 +487,10 @@ inputinput@point{}
@end defun
@defun call-process-shell-command command &optional infile destination display &rest args
This function executes the shell command @var{command} synchronously
in a separate process. The final arguments @var{args} are additional
arguments to add at the end of @var{command}. The other arguments
are handled as in @code{call-process}.
This function executes the shell command @var{command} synchronously.
The final arguments @var{args} are additional arguments to add at the
end of @var{command}. The other arguments are handled as in
@code{call-process}.
@end defun
@defun process-file-shell-command command &optional infile destination display &rest args
......@@ -506,12 +505,12 @@ then returns the command's output as a string.
@end defun
@defun process-lines program &rest args
This function runs @var{program} in a separate process, waits for it
to finish, and returns its output as a list of strings. Each string
in the list holds a single line of text output by the program; the
end-of-line characters are stripped from each line. The arguments
beyond @var{program}, @var{args}, are strings that specify
command-line arguments with which to run the program.
This function runs @var{program}, waits for it to finish, and returns
its output as a list of strings. Each string in the list holds a
single line of text output by the program; the end-of-line characters
are stripped from each line. The arguments beyond @var{program},
@var{args}, are strings that specify command-line arguments with which
to run the program.
If @var{program} exits with a non-zero exit status, this function
signals an error.
......
2011-03-06 Jay Belanger <jay.p.belanger@gmail.com>
* calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
respectively.
(Musical Notes): New section.
(Customizing Calc): Mention the customizable variable
calc-note-threshold.
2011-03-03 Glenn Morris <rgm@gnu.org>
* url.texi (Dealing with HTTP documents): Remove reference to
function url-decode-text-part; never seems to have existed. (Bug#6038)
(Configuration): Update url-configuration-directory description.
2011-03-02 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Multiple Dired Directories): Remove mentions
of dired-default-directory-alist and dired-default-directory.
Move dired-smart-shell-command here...
(Miscellaneous Commands): ... from here.
2011-03-02 Paul Eggert <eggert@cs.ucla.edu>
* texinfo.tex: Update to version 2011-02-24.09.
......
......@@ -27676,6 +27676,7 @@ begin with the @kbd{u} prefix key.
* Predefined Units::
* User-Defined Units::
* Logarithmic Units::
* Musical Notes::
@end menu
 
@node Basic Operations on Units, The Units Table, Units, Units
......@@ -28121,7 +28122,7 @@ was already a set of user-defined units in your Calc init file, it
is replaced by the new set. (@xref{General Mode Commands}, for a way to
tell Calc to use a different file for the Calc init file.)
 
@node Logarithmic Units, , User-Defined Units, Units
@node Logarithmic Units, Musical Notes, User-Defined Units, Units
@section Logarithmic Units
 
The units @code{dB} (decibels) and @code{Np} (nepers) are logarithmic
......@@ -28251,18 +28252,18 @@ The @kbd{H l q} [@code{fieldquant}] command behaves like @kbd{l q} but
computes field quantities instead of power quantities.
 
@kindex l d
@pindex calc-logunits-dblevel
@pindex calc-dblevel
@tindex dbpowerlevel
@tindex dbfieldlevel
@kindex l n
@pindex calc-logunits-nplevel
@pindex calc-nplevel
@tindex nppowerlevel
@tindex npfieldlevel
The @kbd{l d} (@code{calc-logunits-dblevel}) [@code{dbpowerlevel}]
The @kbd{l d} (@code{calc-dblevel}) [@code{dbpowerlevel}]
command will compute the decibel level of a power quantity using the
default reference level; @kbd{H l d} [@code{dbfieldlevel}] will
compute the decibel level of a field quantity. The commands @kbd{l n}
(@code{calc-logunits-nplevel}) [@code{nppowerlevel}] and @kbd{H l n}
(@code{calc-nplevel}) [@code{nppowerlevel}] and @kbd{H l n}
[@code{npfieldlevel}] will similarly compute neper levels. With the
capital @kbd{O} prefix these commands will read a reference level
from the stack; in an algebraic formula the reference level can be
......@@ -28363,6 +28364,76 @@ a logarithmic unit by a number; the @kbd{l /}
logarithmic unit by a number. Note that the reference quantities don't
play a role in this arithmetic.
 
@node Musical Notes, , Logarithmic Units, Units
@section Musical Notes
Calc can convert between musical notes and their associated
frequencies. Notes can be given using either scientific pitch
notation or midi numbers. Since these note systems are basically
logarithmic scales, Calc uses the @kbd{l} prefix for functions
operating on notes.
Scientific pitch notation refers to a note by giving a letter
A through G, possibly followed by a flat or sharp) with a subscript
indicating an octave number. Each octave starts with C and ends with
B and
@c increasing each note by a semitone will result
@c in the sequence @expr{C}, @expr{C} sharp, @expr{D}, @expr{E} flat, @expr{E},
@c @expr{F}, @expr{F} sharp, @expr{G}, @expr{A} flat, @expr{A}, @expr{B}
@c flat and @expr{B}.
the octave numbered 0 was chosen to correspond to the lowest
audible frequency. Using this system, middle C (about 261.625 Hz)
corresponds to the note @expr{C} in octave 4 and is denoted
@expr{C_4}. Any frequency can be described by giving a note plus an
offset in cents (where a cent is a ratio of frequencies so that a
semitone consists of 100 cents).
The midi note number system assigns numbers to notes so that
@expr{C_(-1)} corresponds to the midi note number 0 and @expr{G_9}
corresponds to the midi note number 127. A midi controller can have
up to 128 keys and each midi note number from 0 to 127 corresponds to
a possible key.
@kindex l s
@pindex calc-spn
@tindex spn
The @kbd{l s} (@code{calc-spn}) [@code{spn}] command converts either
a frequency or a midi number to scientific pitch notation. For
example, @code{500 Hz} gets converted to
@code{B_4 + 21.3094853649 cents} and @code{84} to @code{C_6}.
@kindex l m
@pindex calc-midi
@tindex midi
The @kbd{l m} (@code{calc-midi}) [@code{midi}] command converts either
a frequency or a note given in scientific pitch notation to the
corresponding midi number. For example, @code{C_6} gets converted to 84
and @code{440 Hz} to 69.
@kindex l f
@pindex calc-freq
@tindex freq
The @kbd{l f} (@code{calc-freq}) [@code{freq}] command converts either
either a midi number or a note given in scientific pitch notation to
the corresponding frequency. For example, @code{Asharp_2 + 30 cents}
gets converted to @code{118.578040134 Hz} and @code{55} to
@code{195.99771799 Hz}.
Since the frequencies of notes are not usually given exactly (and are
typically irrational), the customizable variable
@code{calc-note-threshold} determines how close (in cents) a frequency
needs to be to a note to be recognized as that note
(@pxref{Customizing Calc}). This variable has a default value of
@code{1}. For example, middle @var{C} is approximately
@expr{261.625565302 Hz}; this frequency is often shortened to
@expr{261.625 Hz}. Without @code{calc-note-threshold} (or a value of
@expr{0}), Calc would convert @code{261.625 Hz} to scientific pitch
notation @code{B_3 + 99.9962592773 cents}; with the default value of
@code{1}, Calc converts @code{261.625 Hz} to @code{C_4}.
@node Store and Recall, Graphics, Units, Top
@chapter Storing and Recalling
 
......@@ -35481,6 +35552,15 @@ and the default value of @code{calc-logunits-field-reference} is
@code{"20 uPa"}.
@end defvar
 
@defvar calc-note-threshold
See @ref{Musical Notes}.@*
The variable @code{calc-note-threshold} is a number (written as a
string) which determines how close (in cents) a frequency needs to be
to a note to be recognized as that note.
The default value of @code{calc-note-threshold} is 1.
@end defvar
@defvar calc-highlight-selections-with-faces
@defvarx calc-selected-face
@defvarx calc-nonselected-face
......@@ -36129,26 +36209,29 @@ keystrokes are not listed in this summary.
@r{ v x@: I k T @: @: @:ltpt@:(x,v)}
 
@c
@r{ a b@: l + @: @: 2 @:lupoweradd@:(a,b)}
@r{ a b@: H l + @: @: 2 @:lufieldadd@:(a,b)}
@r{ a b@: l - @: @: 2 @:lupowersub@:(a,b)}
@r{ a b@: H l - @: @: 2 @:lufieldsub@:(a,b)}
@r{ a b@: l * @: @: 2 @:lupowermul@:(a,b)}
@r{ a b@: H l * @: @: 2 @:lufieldmul@:(a,b)}
@r{ a b@: l / @: @: 2 @:lupowerdiv@:(a,b)}
@r{ a b@: H l / @: @: 2 @:lufielddiv@:(a,b)}
@r{ a@: l d @: @: 1 @:dbpowerlevel@:(a)}
@r{ a b@: O l d @: @: 2 @:dbpowerlevel@:(a,b)}
@r{ a@: H l d @: @: 1 @:dbfieldlevel@:(a)}
@r{ a b@: O H l d @: @: 2 @:dbfieldlevel@:(a,b)}
@r{ a@: l n @: @: 1 @:nppowerlevel@:(a)}
@r{ a b@: O l n @: @: 2 @:nppowerlevel@:(a,b)}
@r{ a@: H l n @: @: 1 @:npfieldlevel@:(a)}
@r{ a b@: O H l n @: @: 2 @:npfieldlevel@:(a,b)}
@r{ a@: l q @: @: 1 @:powerquant@:(a)}
@r{ a b@: O l q @: @: 2 @:powerquant@:(a,b)}
@r{ a@: H l q @: @: 1 @:fieldquant@:(a)}
@r{ a b@: O H l q @: @: 2 @:fieldquant@:(a,b)}
@r{ a b@: l + @: @: @:lupoweradd@:(a,b)}
@r{ a b@: H l + @: @: @:lufieldadd@:(a,b)}
@r{ a b@: l - @: @: @:lupowersub@:(a,b)}
@r{ a b@: H l - @: @: @:lufieldsub@:(a,b)}
@r{ a b@: l * @: @: @:lupowermul@:(a,b)}
@r{ a b@: H l * @: @: @:lufieldmul@:(a,b)}
@r{ a b@: l / @: @: @:lupowerdiv@:(a,b)}
@r{ a b@: H l / @: @: @:lufielddiv@:(a,b)}
@r{ a@: l d @: @: @:dbpowerlevel@:(a)}
@r{ a b@: O l d @: @: @:dbpowerlevel@:(a,b)}
@r{ a@: H l d @: @: @:dbfieldlevel@:(a)}
@r{ a b@: O H l d @: @: @:dbfieldlevel@:(a,b)}
@r{ a@: l n @: @: @:nppowerlevel@:(a)}
@r{ a b@: O l n @: @: @:nppowerlevel@:(a,b)}
@r{ a@: H l n @: @: @:npfieldlevel@:(a)}
@r{ a b@: O H l n @: @: @:npfieldlevel@:(a,b)}
@r{ a@: l q @: @: @:powerquant@:(a)}
@r{ a b@: O l q @: @: @:powerquant@:(a,b)}
@r{ a@: H l q @: @: @:fieldquant@:(a)}
@r{ a b@: O H l q @: @: @:fieldquant@:(a,b)}
@r{ a@: l s @: @: @:spn@:(a)}
@r{ a@: l m @: @: @:midi@:(a)}
@r{ a@: l f @: @: @:freq@:(a)}
 
@c
@r{ @: m a @: @: 12,13 @:calc-algebraic-mode@:}
......@@ -867,24 +867,12 @@ some commands it is appropriate that they use the current Dired
directory instead of @code{default-directory}, e.g., @code{find-file} and
@code{compile}.
A general mechanism is provided for special handling of the working
directory in special major modes:
@table @code
@item dired-default-directory-alist
@vindex dired-default-directory-alist
Default: @code{((dired-mode . (dired-current-directory)))}
Alist of major modes and their notion of @code{default-directory}, as a
Lisp expression to evaluate. A resulting value of @code{nil} is ignored
in favor of @code{default-directory}.
@item dired-default-directory
@findex dired-default-directory
Use this function like you would use the variable
@code{default-directory}, except that @code{dired-default-directory}
also consults the variable @code{dired-default-directory-alist}.
@end table
@findex dired-smart-shell-command
@findex shell-command
@kindex M-!
The command @code{dired-smart-shell-command}, bound to @kbd{M-!} in
Dired buffers, is like @code{shell-command}, but it runs with
@code{default-directory} bound to the current Dired directory.
@node Find File At Point, Miscellaneous Commands, Multiple Dired Directories, Top
@section Find File At Point
......@@ -993,12 +981,6 @@ inserted subdirectories.
@end table
@table @code
@item dired-smart-shell-command
@findex dired-smart-shell-command
@findex shell-command
@kindex M-!
Like function @code{shell-command}, but in the current Dired directory.
Bound to @kbd{M-!} in Dired buffers.
@item dired-jump
@findex dired-jump
......
......@@ -1042,11 +1042,11 @@ Emacs now supports using both X displays and ttys in the same session
@item
Emacs can be started as a daemon in the background.
@cindex NeXTSTEP port
@cindex NeXTstep port
@cindex GNUstep port
@cindex Mac OS X Cocoa
@item
There is a new NeXTSTEP port of Emacs. This supports GNUstep and Mac OS
There is a new NeXTstep port of Emacs. This supports GNUstep and Mac OS
X (via the Cocoa libraries). The Carbon port of Emacs, which supported
Mac OS X in Emacs 22, has been removed.
......
......@@ -116,7 +116,10 @@ The meaning of the @var{path} component depends on the service.
@cindex @file{~/.url}
@cindex configuration files
The directory in which URL configuration files, the cache etc.,
reside. Default @file{~/.url}.
reside. The old default was @file{~/.url}, and this directory
is still used if it exists. The new default is a @file{url/}
directory in @code{user-emacs-directory}, which is normally
@file{~/.emacs.d}.
@end defvar
@node Parsed URLs
......@@ -383,20 +386,7 @@ Currently this is just the raw header contents.
HTTP URLs are retrieved into a buffer containing the HTTP headers
followed by the body. Since the headers are quasi-MIME, they may be
processed using the MIME library. @xref{Top,, Emacs MIME,
emacs-mime, The Emacs MIME Manual}. The URL package provides a
function to do this in general:
@defun url-decode-text-part handle &optional coding
This function decodes charset-encoded text in the current buffer. In
Emacs, the buffer is expected to be unibyte initially and is set to
multibyte after decoding.
HANDLE is the MIME handle of the original part. CODING is an explicit
coding to use, overriding what the MIME headers specify.
The coding system used for the decoding is returned.
Note that this function doesn't deal with @samp{http-equiv} charset
specifications in HTML @samp{<meta>} elements.
@end defun
emacs-mime, The Emacs MIME Manual}.
@node file/ftp
@section file and ftp
......
2011-03-06 Juanma Barranquero <lekktu@gmail.com>
* srecode/el.srt: Fix typo.
2011-02-21 Chong Yidong <cyd@stupidchicken.com>
* themes/tango-dark-theme.el: Tweak background on low-color
......@@ -117,7 +121,7 @@
* NEWS: Mention new Tramp method "ksu".
2010-12-13 W. Martin Borgert <debacle@debian.org> (tiny change)
2010-12-13 W. Martin Borgert <debacle@debian.org> (tiny change)
* schema/schemas.xml: Add DocBook (Bug#7491).
......
......@@ -71,6 +71,9 @@ from load-path. -Q now implies this.
client frame in parent X window ID, via XEmbed. This works like the
--parent-id argument to Emacs.
+++
*** New emacsclient argument -q/--quiet suppresses some status messages.
*** If emacsclient shuts down as a result of Emacs signalling an
error, its exit status is 1.
......@@ -176,6 +179,8 @@ higher-resolution time stamps.
and SIGHUP, and upon SIGINT in batch mode.
** kill-emacs-hook is now also run in batch mode.
If you have code that adds something to kill-emacs-hook, you should
consider if it is still appropriate to add it in the noninteractive case.
** New scrolling commands `scroll-up-command' and `scroll-down-command'
(bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom
......@@ -651,6 +656,8 @@ Notifications API. It requires D-Bus for communication.
** soap-client.el supports access to SOAP web services from Emacs.
soap-inspect.el is an interactive inspector for SOAP WSDL structures.
** xmodmap-generic-mode for xmodmap files.
* Incompatible Lisp Changes in Emacs 24.1
......
......@@ -129,7 +129,7 @@ starting from the first line of text below the header line.
* Changes in Emacs 23.3 on non-free operating systems
** The nextstep port can have different modifiers for the left and right
** The NeXTstep port can have different modifiers for the left and right
alt/option key by customizing the value for ns-right-alternate-modifier.
......@@ -697,7 +697,7 @@ a GIF library.
*** Emacs now supports multi-page TIFF images.
** New NeXTSTEP-based port.
** New NeXTstep-based port.
This provides support for GNUstep (via the GNUstep libraries) and Mac
OS X (via the Cocoa libraries).
......@@ -707,7 +707,7 @@ other emacsen (e.g. X11 build) use --disable-ns-self-contained. See
nextstep/README and nextstep/INSTALL in the Emacs source directory.
** Mac OS X is no longer supported via Carbon.
Use the NeXTSTEP port, described above.
Use the NeXTstep port, described above.
** The new configuration option "--with-dbus" enables D-Bus language
bindings for Emacs.
......
......@@ -261,7 +261,7 @@ template defgroup :indent :blank
----
(defgroup $?MODESYM$-mode nil
"$MODESYM$ group."
:group 'langauges)
:group 'languages)
----
bind "g"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment