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

doc/lispref/ChangeLog

+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.

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

doc/misc/ChangeLog

+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)

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.

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
 

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

etc/ChangeLog

+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.

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.)

lisp/ChangeLog

+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.

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'.

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.
 

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

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: "

src/ChangeLog

+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

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