Merge from emacs-24; up to 2012-05-08T14:11:47Z!monnier@iro.umontreal.ca

16 files changed, 129 insertions, 109 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index db728d6fec0..8568b024f67 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-05  Bruno Félix Rezende Ribeiro  <oitofelix@gmail.com>  (tiny change)
+
+        * functions.texi (Function Safety): Copyedit.  (Bug#12562)
+
 2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Revert the FOLLOW-SYMLINKS change for file-attributes.
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index cab6d12a3d8..845561f91ec 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1397,7 +1397,7 @@ opposed to an unspecified one).
 @cindex function safety
 @cindex safety of functions
 
-Some major modes such as SES call functions that are stored in user
+Some major modes, such as SES, call functions that are stored in user
 files.  (@inforef{Top, ,ses}, for more information on SES.)  User
 files sometimes have poor pedigrees---you can get a spreadsheet from
 someone you've just met, or you can get one through email from someone
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index dc29868eb04..55f81c7c798 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-05  Glenn Morris  <rgm@gnu.org>
+
+        * newsticker.texi (Overview, Requirements, Usage, Configuration):
+        Copyedits.
+
 2012-10-01  Eric Ludlam  <zappo@gnu.org>
 
         * ede.texi (Quick Start, Project Local Variables)
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index f8f6d06b93a..2b198575bcb 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -35232,7 +35232,7 @@ character of the prefix can simply be typed twice.
 
 Calc is controlled by many variables, most of which can be reset
 from within Calc.  Some variables are less involved with actual
-calculation and can be set outside of Calc using Emacs'ss
+calculation and can be set outside of Calc using Emacs's
 customization facilities.  These variables are listed below.
 Typing @kbd{M-x customize-variable RET @var{variable-name} RET}
 will bring up a buffer in which the variable's value can be redefined.
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 9195ca3f10c..18abb0647a2 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -2087,7 +2087,7 @@ of a list.  @var{list} should evaluate to a list; the body @var{forms}
 are executed with @var{var} bound to each element of the list in
 turn.  Finally, the @var{result} form (or @code{nil}) is evaluated
 with @var{var} bound to @code{nil} to produce the result returned by
-the loop.  Unlike with Emacs'ss built in @code{dolist}, the loop is
+the loop.  Unlike with Emacs's built in @code{dolist}, the loop is
 surrounded by an implicit @code{nil} block.
 @end defspec
 
@@ -2097,7 +2097,7 @@ of times.  The body is executed with @var{var} bound to the integers
 from zero (inclusive) to @var{count} (exclusive), in turn.  Then
 the @code{result} form is evaluated with @var{var} bound to the total
 number of iterations that were done (i.e., @code{(max 0 @var{count})})
-to get the return value for the loop form.  Unlike with Emacs'ss built in
+to get the return value for the loop form.  Unlike with Emacs's built in
 @code{dolist}, the loop is surrounded by an implicit @code{nil} block.
 @end defspec
 
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 919ca21cc3e..5add229724c 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -69,14 +69,14 @@ developing GNU and promoting software freedom.''
 @node Overview
 @chapter Overview
 
-Newsticker provides a newsticker for Emacs. A newsticker is a thing
+Newsticker provides a newsticker for Emacs.  A newsticker is a thing
 that asynchronously retrieves headlines from a list of news sites,
 prepares these headlines for reading, and allows for loading the
 corresponding articles in a web browser.
 
 
 Headlines consist of a title and (possibly) a small description.  They
-are contained in "RSS" (RDF Site Summary) or "Atom" files.  Newsticker
+are contained in ``RSS'' (RDF Site Summary) or ``Atom'' files.  Newsticker
 works with the following RSS formats:
 
 @itemize
@@ -105,8 +105,9 @@ messages in a stock-quote ticker, or just changing.
 
 Newsticker allows for automatic processing of headlines by providing
 hooks and (sample) functions for automatically downloading images and
-enclosed files (as delivered by podcasts, e.g.).
+enclosed files (as delivered by, e.g., podcasts).
 
+@ignore
 @ifhtml
 Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
 (current version)} and some older screen shots:
@@ -116,6 +117,7 @@ Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
 @uref{newsticker-1.3.png, version 1.3},
 @uref{newsticker-1.0.png, version 1.0}.
 @end ifhtml
+@end ignore
 
 @node Requirements
 @chapter Requirements
@@ -123,7 +125,7 @@ Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
 Newsticker can be used with
 @uref{http://www.gnu.org/software/emacs/emacs.html, GNU Emacs} version
 21.1 or later as well as @uref{http://www.xemacs.org, XEmacs}.  It
-requires an XML-parser (@file{xml.el}) which is part of GNU Emacs.  If
+requires an XML-parser (@file{xml.el}), which is part of GNU Emacs.  If
 you are using XEmacs you want to get the @file{net-utils} package
 which contains @file{xml.el} for XEmacs.
 
@@ -161,11 +163,11 @@ You can choose between two different frontends for reading headlines:
 @itemize
 @item Newsticker's @emph{treeview} uses separate windows for the
 feeds (in tree form), a list of headlines for the current feed, and
-the content of the current headline. Feeds can be placed into groups
-which itself can be placed in groups and so on.
+the content of the current headline.  Feeds can be placed into groups,
+which themselves can be placed in groups and so on.
 @item Newsticker's @emph{plainview} displays all headlines in a
-single buffer, called @samp{*newsticker*}. The modeline in the
-@samp{*newsticker*} buffer informs whenever new headlines have
+single buffer, called @samp{*newsticker*}.  The modeline in the
+@samp{*newsticker*} buffer informs you whenever new headlines have
 arrived.
 @end itemize
 In both views clicking mouse-button 2 or pressing RET on a headline
@@ -175,13 +177,13 @@ your favorite web browser.
 @findex newsticker-start-ticker
 @findex newsticker-stop-ticker
 The scrolling, or flashing of headlines in the echo area, can be
-started with the command @code{newsticker-start-ticker}. It can be
+started with the command @code{newsticker-start-ticker}.  It can be
 stopped with @code{newsticker-stop-ticker}.
 
 @findex newsticker-start
 @findex newsticker-stop
 If you just want to start the periodic download of headlines use the
-command @code{newsticker-start}. Calling @code{newsticker-stop} will
+command @code{newsticker-start}.  Calling @code{newsticker-stop} will
 stop the periodic download, but will call
 @code{newsticker-stop-ticker} as well.
 
@@ -189,7 +191,7 @@ stop the periodic download, but will call
 @chapter Configuration
 
 All Newsticker options are customizable, i.e. they can be changed with
-Emacs customization methods: Call the command
+Emacs customization methods.  Call the command
 @code{customize-group} and enter @samp{newsticker} for the customization
 group.
 
@@ -209,7 +211,7 @@ feeds are retrieved and how this is done.
 @itemize
 @item
 @vindex newsticker-url-list
-@code{newsticker-url-list} defines the list of headlines which are
+@code{newsticker-url-list} defines the list of headlines that are
 retrieved.
 @item
 @vindex newsticker-retrieval-method
@@ -245,11 +247,11 @@ commands to newsticker functions.
 @item
 @vindex newsticker-new-item-functions
 @code{newsticker-new-item-functions} allows for automatic
-processing of headlines. See `newsticker-download-images', and
-`newsticker-download-enclosures' for sample functions.
+processing of headlines.  See @code{newsticker-download-images}, and
+@code{newsticker-download-enclosures} for sample functions.
 @item
 @vindex newsticker-plainview-hooks
-The subgroup @code{newsticker-plainview-hooks} contains hook which
+The subgroup @code{newsticker-plainview-hooks} contains hooks that
 apply to the plainview reader only.
 @end itemize
 
@@ -276,7 +278,7 @@ the echo area.
 @itemize
 @item
 @vindex newsticker-frontend
-@code{newsticker-frontend} determines the actual headline reader. The
+@code{newsticker-frontend} determines the actual headline reader.  The
 ``plainview'' reader uses a single buffer, the ``treeview'' uses
 separate buffers and windows.
 @end itemize
diff --git a/etc/ChangeLog b/etc/ChangeLog
index c163683ea39..ad6c6395e49 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-05  Douglas Lewan  <d_lewan2000@yahoo.com>  (tiny change)
+
+        * tutorials/TUTORIAL.pt_BR: Fix typo.  (Bug#12557)
+
 2012-10-01  Eric Ludlam  <zappo@gnu.org>
 
         * srecode/cc.srt, srecode/ede-autoconf.srt: New files.
diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR
index 139789b1d2a..f28f86b3105 100644
--- a/etc/tutorials/TUTORIAL.pt_BR
+++ b/etc/tutorials/TUTORIAL.pt_BR
@@ -46,7 +46,7 @@ META, EDIT ou ALT).
 Os comandos a seguir são úteis para visualizar telas inteiras
 
         C-v     Move para tela inteira posterior
-        M-x     Move para tela inteira anterior
+        M-v     Move para tela inteira anterior
         C-l     Limpa a tela e re-mostrá todo o texto, movendo o texto ao
                 redor do cursor para o centro da tela. (Isso é
                 control-L, não control-1.)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eaef867e9e2..16c64ae1394 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2012-10-05  Glenn Morris  <rgm@gnu.org>
+
+        * net/newst-treeview.el (newsticker-group-move-feed): Doc fix.
+
+        * color.el (color-name-to-rgb, color-rgb-to-hex)
+        (color-hue-to-rgb, color-hsl-to-rgb, color-rgb-to-hsv)
+        (color-rgb-to-hsl, color-srgb-to-xyz, color-saturate-hsl)
+        (color-desaturate-hsl, color-desaturate-name, color-lighten-hsl)
+        (color-lighten-name, color-darken-hsl, color-darken-name): Doc fixes.
+
+        * emacs-lisp/timer.el (with-timeout): Add missing progn.  (Bug#12577)
+
+2012-10-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ido.el (ido-directory-too-big-p): Pass dir through file-truename
+        to get the correct size across symlinks.
+
+        * ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring.
+
 2012-10-04  Juri Linkov  <juri@jurta.org>
 
         * replace.el (query-replace-interactive): Declare obsolete.
diff --git a/lisp/color.el b/lisp/color.el
index 94a98615d94..f618d47a540 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -50,17 +50,17 @@ string (e.g. \"#ff12ec\").
 Normally the return value is a list of three floating-point
 numbers, (RED GREEN BLUE), each between 0.0 and 1.0 inclusive.
 
-Optional arg FRAME specifies the frame where the color is to be
+Optional argument FRAME specifies the frame where the color is to be
 displayed.  If FRAME is omitted or nil, use the selected frame.
 If FRAME cannot display COLOR, return nil."
   ;; `colors-values' maximum value is either 65535 or 65280 depending on the
-  ;; display system. So we use a white conversion to get the max value.
+  ;; display system.  So we use a white conversion to get the max value.
   (let ((valmax (float (car (color-values "#ffffff")))))
     (mapcar (lambda (x) (/ x valmax)) (color-values color frame))))
 
 (defun color-rgb-to-hex  (red green blue)
   "Return hexadecimal notation for the color RED GREEN BLUE.
-RED GREEN BLUE must be numbers between 0.0 and 1.0 inclusive."
+RED, GREEN, and BLUE should be numbers between 0.0 and 1.0, inclusive."
   (format "#%02x%02x%02x"
           (* red 255) (* green 255) (* blue 255)))
 
@@ -76,7 +76,7 @@ a string specifying a color's RGB components (e.g. \"#ff12ec\")."
 (defun color-gradient (start stop step-number)
   "Return a list with STEP-NUMBER colors from START to STOP.
 The color list builds a color gradient starting at color START to
-color STOP. It does not include the START and STOP color in the
+color STOP.  It does not include the START and STOP color in the
 resulting list."
   (let* ((r (nth 0 start))
          (g (nth 1 start))
@@ -93,8 +93,8 @@ resulting list."
     (nreverse result)))
 
 (defun color-hue-to-rgb (v1 v2 h)
-  "Compute hue from V1 and V2 H. Internally used by
-`color-hsl-to-rgb'."
+  "Compute hue from V1 and V2 H.
+Used internally by `color-hsl-to-rgb'."
   (cond
    ((< h (/ 1.0 6))   (+ v1 (* (- v2 v1) h 6.0)))
    ((< h 0.5)         v2)
@@ -102,13 +102,10 @@ resulting list."
    (t                 v1)))
 
 (defun color-hsl-to-rgb (H S L)
-    "Convert H S L (HUE, SATURATION, LUMINANCE) , where HUE is in
-radians and both SATURATION and LUMINANCE are between 0.0 and
-1.0, inclusive to their RGB representation.
-
-Return a list (RED, GREEN, BLUE) which each be numbers between
-0.0 and 1.0, inclusive."
-
+  "Convert hue, saturation and luminance to their RGB representation.
+H, S, and L should each be numbers between 0.0 and 1.0, inclusive.
+Return a list (RED GREEN BLUE), where each element is between 0.0 and 1.0,
+inclusive."
   (if (= S 0.0)
       (list L L L)
     (let* ((m2 (if (<= L 0.5)
@@ -125,9 +122,9 @@ Return a list (RED, GREEN, BLUE) which each be numbers between
   (apply 'color-rgb-to-hex (color-complement color)))
 
 (defun color-rgb-to-hsv (red green blue)
-  "Convert RED, GREEN, and BLUE color components to HSV.
+  "Convert RGB color components to HSV.
 RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0,
-inclusive.  Return a list (HUE, SATURATION, VALUE), where HUE is
+inclusive.  Return a list (HUE SATURATION VALUE), where HUE is
 in radians and both SATURATION and VALUE are between 0.0 and 1.0,
 inclusive."
   (let* ((r (float red))
@@ -155,13 +152,10 @@ inclusive."
        (/ max 255.0)))))
 
 (defun color-rgb-to-hsl (red green blue)
-  "Convert RED GREEN BLUE colors to their HSL representation.
+  "Convert RGB colors to their HSL representation.
 RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0,
-inclusive.
-
-Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
-and both SATURATION and LUMINANCE are between 0.0 and 1.0,
-inclusive."
+inclusive.  Return a list (HUE SATURATION LUMINANCE), where
+each element is between 0.0 and 1.0, inclusive."
   (let* ((r red)
          (g green)
          (b blue)
@@ -187,7 +181,7 @@ inclusive."
 
 (defun color-srgb-to-xyz (red green blue)
   "Convert RED GREEN BLUE colors from the sRGB color space to CIE XYZ.
-RED, BLUE and GREEN must be between 0 and 1, inclusive."
+RED, GREEN and BLUE should be between 0.0 and 1.0, inclusive."
   (let ((r (if (<= red 0.04045)
                (/ red 12.95)
              (expt (/ (+ red 0.055) 1.055) 2.4)))
@@ -225,44 +219,44 @@ RED, BLUE and GREEN must be between 0 and 1, inclusive."
 (defun color-xyz-to-lab (X Y Z &optional white-point)
   "Convert CIE XYZ to CIE L*a*b*.
 WHITE-POINT specifies the (X Y Z) white point for the
-conversion. If omitted or nil, use `color-d65-xyz'."
+conversion.  If omitted or nil, use `color-d65-xyz'."
   (pcase-let* ((`(,Xr ,Yr ,Zr) (or white-point color-d65-xyz))
                (xr (/ X Xr))
-               (yr (/ Y Yr))
-               (zr (/ Z Zr))
-               (fx (if (> xr color-cie-ε)
-                       (expt xr (/ 1 3.0))
-                     (/ (+ (* color-cie-κ xr) 16) 116.0)))
-               (fy (if (> yr color-cie-ε)
-                       (expt yr (/ 1 3.0))
-                     (/ (+ (* color-cie-κ yr) 16) 116.0)))
-               (fz (if (> zr color-cie-ε)
-                       (expt zr (/ 1 3.0))
-                     (/ (+ (* color-cie-κ zr) 16) 116.0))))
-    (list
-     (- (* 116 fy) 16)                ; L
-     (* 500 (- fx fy))                ; a
+             (yr (/ Y Yr))
+             (zr (/ Z Zr))
+             (fx (if (> xr color-cie-ε)
+                     (expt xr (/ 1 3.0))
+                   (/ (+ (* color-cie-κ xr) 16) 116.0)))
+             (fy (if (> yr color-cie-ε)
+                     (expt yr (/ 1 3.0))
+                   (/ (+ (* color-cie-κ yr) 16) 116.0)))
+             (fz (if (> zr color-cie-ε)
+                     (expt zr (/ 1 3.0))
+                   (/ (+ (* color-cie-κ zr) 16) 116.0))))
+        (list
+         (- (* 116 fy) 16)                  ; L
+         (* 500 (- fx fy))                  ; a
      (* 200 (- fy fz)))))             ; b
 
 (defun color-lab-to-xyz (L a b &optional white-point)
   "Convert CIE L*a*b* to CIE XYZ.
 WHITE-POINT specifies the (X Y Z) white point for the
-conversion. If omitted or nil, use `color-d65-xyz'."
+conversion.  If omitted or nil, use `color-d65-xyz'."
   (pcase-let* ((`(,Xr ,Yr ,Zr) (or white-point color-d65-xyz))
                (fy (/ (+ L 16) 116.0))
-               (fz (- fy (/ b 200.0)))
-               (fx (+ (/ a 500.0) fy))
-               (xr (if (> (expt fx 3.0) color-cie-ε)
-                       (expt fx 3.0)
-                     (/ (- (* fx 116) 16) color-cie-κ)))
-               (yr (if (> L (* color-cie-κ color-cie-ε))
-                       (expt (/ (+ L 16) 116.0) 3.0)
-                     (/ L color-cie-κ)))
-               (zr (if (> (expt fz 3) color-cie-ε)
-                       (expt fz 3.0)
-                     (/ (- (* 116 fz) 16) color-cie-κ))))
-    (list (* xr Xr)                   ; X
-          (* yr Yr)                   ; Y
+             (fz (- fy (/ b 200.0)))
+             (fx (+ (/ a 500.0) fy))
+             (xr (if (> (expt fx 3.0) color-cie-ε)
+                     (expt fx 3.0)
+               (/ (- (* fx 116) 16) color-cie-κ)))
+             (yr (if (> L (* color-cie-κ color-cie-ε))
+                     (expt (/ (+ L 16) 116.0) 3.0)
+                   (/ L color-cie-κ)))
+             (zr (if (> (expt fz 3) color-cie-ε)
+                     (expt fz 3.0)
+                   (/ (- (* 116 fz) 16) color-cie-κ))))
+        (list (* xr Xr)                 ; X
+              (* yr Yr)                 ; Y
           (* zr Zr))))                ; Z
 
 (defun color-srgb-to-lab (red green blue)
@@ -349,17 +343,14 @@ returned by `color-srgb-to-lab' or `color-xyz-to-lab'."
   (min 1.0 (max 0.0 value)))
 
 (defun color-saturate-hsl (H S L percent)
-  "Return a color PERCENT more saturated than the one defined in
-H S L color-space.
-
-Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
-and both SATURATION and LUMINANCE are between 0.0 and 1.0,
-inclusive."
+  "Make a color more saturated by a specified amount.
+Given a color defined in terms of hue, saturation, and luminance
+\(arguments H, S, and L), return a color that is PERCENT more
+saturated.  Returns a list (HUE SATURATION LUMINANCE)."
   (list H (color-clamp (+ S (/ percent 100.0))) L))
 
 (defun color-saturate-name (name percent)
-  "Short hand to saturate COLOR by PERCENT.
-
+  "Make a color with a specified NAME more saturated by PERCENT.
 See `color-saturate-hsl'."
   (apply 'color-rgb-to-hex
          (apply 'color-hsl-to-rgb
@@ -370,32 +361,26 @@ See `color-saturate-hsl'."
                         (list percent))))))
 
 (defun color-desaturate-hsl (H S L percent)
-  "Return a color PERCENT less saturated than the one defined in
-H S L color-space.
-
-Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
-and both SATURATION and LUMINANCE are between 0.0 and 1.0,
-inclusive."
+  "Make a color less saturated by a specified amount.
+Given a color defined in terms of hue, saturation, and luminance
+\(arguments H, S, and L), return a color that is PERCENT less
+saturated.  Returns a list (HUE SATURATION LUMINANCE)."
   (color-saturate-hsl H S L (- percent)))
 
 (defun color-desaturate-name (name percent)
-  "Short hand to desaturate COLOR by PERCENT.
-
+  "Make a color with a specified NAME less saturated by PERCENT.
 See `color-desaturate-hsl'."
   (color-saturate-name name (- percent)))
 
 (defun color-lighten-hsl (H S L percent)
-  "Return a color PERCENT lighter than the one defined in
-H S L color-space.
-
-Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
-and both SATURATION and LUMINANCE are between 0.0 and 1.0,
-inclusive."
+  "Make a color lighter by a specified amount.
+Given a color defined in terms of hue, saturation, and luminance
+\(arguments H, S, and L), return a color that is PERCENT lighter.
+Returns a list (HUE SATURATION LUMINANCE)."
   (list H S (color-clamp (+ L (/ percent 100.0)))))
 
 (defun color-lighten-name (name percent)
-  "Short hand to saturate COLOR by PERCENT.
-
+  "Make a color with a specified NAME lighter by PERCENT.
 See `color-lighten-hsl'."
   (apply 'color-rgb-to-hex
          (apply 'color-hsl-to-rgb
@@ -406,17 +391,14 @@ See `color-lighten-hsl'."
                         (list percent))))))
 
 (defun color-darken-hsl (H S L percent)
-  "Return a color PERCENT darker than the one defined in
-H S L color-space.
-
-Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
-and both SATURATION and LUMINANCE are between 0.0 and 1.0,
-inclusive."
+    "Make a color darker by a specified amount.
+Given a color defined in terms of hue, saturation, and luminance
+\(arguments H, S, and L), return a color that is PERCENT darker.
+Returns a list (HUE SATURATION LUMINANCE)."
   (color-lighten-hsl H S L (- percent)))
 
 (defun color-darken-name (name percent)
-  "Short hand to saturate COLOR by PERCENT.
-
+  "Make a color with a specified NAME darker by PERCENT.
 See `color-darken-hsl'."
   (color-lighten-name name (- percent)))
 
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 08b8ced9860..284c591fc61 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -450,7 +450,7 @@ be detected.
                      (with-timeout-timers
                          (cons -with-timeout-timer- with-timeout-timers)))
                 (unwind-protect
-                    ,@body
+                    (progn ,@body)
                   (cancel-timer -with-timeout-timer-))))))
        ;; It is tempting to avoid the `if' altogether and instead run
        ;; timeout-forms in the timer, just before throwing `timeout'.
diff --git a/lisp/files.el b/lisp/files.el
index 76a13f6cefd..c3f9e1ef1a0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -22,7 +22,7 @@
 
 ;;; Commentary:
 
-;; Defines most of Emacs'ss file- and directory-handling functions,
+;; Defines most of Emacs's file- and directory-handling functions,
 ;; including basic file visiting, backup generation, link handling,
 ;; ITS-id version control, load- and write-hook handling, and the like.
 
diff --git a/lisp/ido.el b/lisp/ido.el
index ffa2604d4fb..4ab183b3207 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1720,7 +1720,7 @@ This function also adds a hook to the minibuffer."
          (ido-final-slash dir)
          (not (ido-is-unc-host dir))
          (file-directory-p dir)
-         (> (nth 7 (file-attributes dir)) ido-max-directory-size))))
+         (> (nth 7 (file-attributes (file-truename dir))) ido-max-directory-size))))
 
 (defun ido-set-current-directory (dir &optional subdir no-merge)
   ;; Set ido's current directory to DIR or DIR/SUBDIR
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index fc356a303e2..0bc7d6ad6ea 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -1722,7 +1722,7 @@ return a nested list."
 
 (defun newsticker-group-move-feed (name group-name &optional no-update)
   "Move feed NAME to group GROUP-NAME.
-Update teeview afterwards unless NO-UPDATE is non-nil."
+Update treeview afterwards unless NO-UPDATE is non-nil."
   (interactive
    (let ((completion-ignore-case t))
      (list (completing-read "Feed Name: "
diff --git a/src/ChangeLog b/src/ChangeLog
index 85a4c829063..396240bb7b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-05  Ikumi Keita  <ikumi@ikumi.que.jp>  (tiny change)
+
+        * minibuf.c (Fcompleting_read): Doc fix.  (Bug#12555)
+
 2012-10-04  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (utime): Test for INVALID_HANDLE_VALUE, not for NULL, to
diff --git a/src/minibuf.c b/src/minibuf.c
index 6f9c61dcfb1..dd4ca34c3fb 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1703,7 +1703,7 @@ If INITIAL-INPUT is non-nil, insert it in the minibuffer initially,
   functions, which use one-indexing for POSITION.)  This feature is
   deprecated--it is best to pass nil for INITIAL-INPUT and supply the
   default value DEF instead.  The user can yank the default value into
-  the minibuffer easily using \\[next-history-element].
+  the minibuffer easily using \\<minibuffer-local-map>\\[next-history-element].
 
 HIST, if non-nil, specifies a history list and optionally the initial
   position in the list.  It can be a symbol, which is the history list