Merge from mainline.

12 files changed, 185 insertions, 89 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8438fa4952c..dc43450110f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d7143d1498a..1299895a06e 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -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
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index f0facec86c1..22c155d26de 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -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
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1a980f14f3d..7bb1919b837 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,16 @@
+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):
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index a9664a4e197..d5427f6e477 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -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 \
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 3697f18badd..e3bdebd28a1 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.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
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 8a8de0e7fa8..dc9fed58076 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -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.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b50dafb62ee..2c5f998737a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,25 @@
+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.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index b9d4f8c4a23..88103fc0034 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -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@:}
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index dba99d9c6c7..eb797789922 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -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
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index a9a5e4dc6eb..7528abca58d 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -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.
 
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 2bde54a8dea..42594457ab1 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -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