Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

17 files changed, 65 insertions, 57 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b1ec6b7dfbf..0439cf2be57 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-17  Chong Yidong  <cyd@gnu.org>
+
+	* elisp.texi: Remove urlcolor setting.
+
 2012-06-17  Glenn Morris  <rgm@gnu.org>
 
 	* display.texi (Face Attributes): Copyedits.  Add a few cindex entries.
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 51596224d02..38dfc949264 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -702,7 +702,8 @@ This is done by using a customization type specification instead of a
 symbol for the key.
 
 @example
-:options '("foo" ((function-item some-function) integer)
+:options '("foo"
+           ((function-item some-function) integer)
            "baz")
 @end example
 
@@ -710,7 +711,8 @@ Many alists use lists with two elements, instead of cons cells.  For
 example,
 
 @example
-(defcustom list-alist '(("foo" 1) ("bar" 2) ("baz" 3))
+(defcustom list-alist
+  '(("foo" 1) ("bar" 2) ("baz" 3))
   "Each element is a list of the form (KEY VALUE).")
 @end example
 
@@ -718,7 +720,8 @@ example,
 instead of
 
 @example
-(defcustom cons-alist '(("foo" . 1) ("bar" . 2) ("baz" . 3))
+(defcustom cons-alist
+  '(("foo" . 1) ("bar" . 2) ("baz" . 3))
   "Each element is a cons-cell (KEY . VALUE).")
 @end example
 
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 2e9be1e3201..53c3ebe8b97 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -790,8 +790,8 @@ Its default value is a list of two functions:
 @findex collapse-delayed-warnings
 @findex display-delayed-warnings
 @noindent
-The function @code{collapse-delayed-warnings} iterates through
-@code{delayed-warnings-list}, removing repeated entries.  The function
+The function @code{collapse-delayed-warnings} removes repeated entries
+from @code{delayed-warnings-list}.  The function
 @code{display-delayed-warnings} calls @code{display-warning} on each
 of the entries in @code{delayed-warnings-list}, in turn, and then sets
 @code{delayed-warnings-list} to @code{nil}.
@@ -2081,11 +2081,10 @@ the @code{:family} attribute (a string).  @xref{Fonts,,, emacs, The
 GNU Emacs Manual}.
 
 @item :width
-Relative proportionate character width, also known as the character
-set width.  This should be one of the symbols @code{ultra-condensed},
-@code{extra-condensed}, @code{condensed}, @code{semi-condensed},
-@code{normal}, @code{semi-expanded}, @code{expanded},
-@code{extra-expanded}, or @code{ultra-expanded}.
+Relative character width.  This should be one of the symbols
+@code{ultra-condensed}, @code{extra-condensed}, @code{condensed},
+@code{semi-condensed}, @code{normal}, @code{semi-expanded},
+@code{expanded}, @code{extra-expanded}, or @code{ultra-expanded}.
 
 @item :height
 The height of the font.  In the simplest case, this is an integer in
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index 20b7c0765e6..99b4c217845 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -1035,10 +1035,10 @@ The current match data.  @xref{Match Data}.
 
 @item
 The variables @code{last-command}, @code{this-command},
-@code{last-input-event}, @code{last-command-event},
+@code{last-command-event}, @code{last-input-event},
 @code{last-event-frame}, @code{last-nonmenu-event}, and
-@code{track-mouse}.  Commands used within Edebug do not affect these
-variables outside of Edebug.
+@code{track-mouse}.  Commands in Edebug do not affect these variables
+outside of Edebug.
 
 Executing commands within Edebug can change the key sequence that
 would be returned by @code{this-command-keys}, and there is no way to
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index fcbc6434d11..824934a5ceb 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -61,7 +61,7 @@
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  The manual should go
 @c onto the distribution in the full, 8.5 x 11" size.
-@c @smallbook
+@c @set smallbook
 
 @ifset volflag
 @smallbook
@@ -77,8 +77,6 @@
 @tex
 @ifset smallbook
 @fonttextsize 10
-\global\let\urlcolor=\Black % don't print links in grayscale
-\global\let\linkcolor=\Black
 @end ifset
 \global\hbadness=6666 % don't worry about not-too-underfull boxes
 @end tex
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 1c590b3a3e2..618569c3559 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2950,7 +2950,8 @@ between consecutive checks.  For example:
   (let ((remote-file-name-inhibit-cache
          (- display-time-interval 5)))
     (and (file-exists-p file)
-         (< 0 (nth 7 (file-attributes (file-chase-links file)))))))
+         (< 0 (nth 7 (file-attributes
+                       (file-chase-links file)))))))
 @end example
 @end defopt
 
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 2ba277d9312..5fba243f65f 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1263,8 +1263,8 @@ example, byte-compiling @file{fortran.el} used to warn:
 
 @example
 In end of data:
-fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not known
-    to be defined.
+fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not
+    known to be defined.
 @end example
 
 In fact, @code{gud-find-c-expr} is only used in the function that
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 38e8fc37d7e..ac3d9e47580 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -448,8 +448,8 @@ override any non-@code{nil} binding in any other of the @var{maps}.
 @example
 (defvar help-mode-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map (make-composed-keymap button-buffer-map
-                                                 special-mode-map))
+    (set-keymap-parent map
+      (make-composed-keymap button-buffer-map special-mode-map))
     ... map) ... )
 @end example
 
@@ -1600,10 +1600,11 @@ to @code{self-insert-command}.
 @end defvar
 
 @cindex key translation function
-You can use @code{input-decode-map}, @code{local-function-key-map}, or
-@code{key-translation-map} for more than simple aliases, by using a
-function, instead of a key sequence, as the ``translation'' of a key.
-Then this function is called to compute the translation of that key.
+You can use @code{input-decode-map}, @code{local-function-key-map},
+and @code{key-translation-map} for more than simple aliases, by using
+a function, instead of a key sequence, as the ``translation'' of a
+key.  Then this function is called to compute the translation of that
+key.
 
 The key translation function receives one argument, which is the prompt
 that was specified in @code{read-key-sequence}---or @code{nil} if the
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index a406d4649dc..0d3acf3a968 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -513,9 +513,10 @@ the following:
 
 @item Definitions for major or minor modes:
 @code{define-minor-mode}, @code{define-globalized-minor-mode},
-@code{define-generic-mode}, @code{easy-mmode-define-minor-mode},
+@code{define-generic-mode}, @code{define-derived-mode},
+@code{easy-mmode-define-minor-mode},
 @code{easy-mmode-define-global-mode}, @code{define-compilation-mode},
-@code{define-derived-mode}, and @code{define-global-minor-mode}.
+and @code{define-global-minor-mode}.
 
 @item Other definition types:
 @code{defcustom}, @code{defgroup}, @code{defclass}
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 1f02480cd32..b9b0e03c65a 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -338,8 +338,9 @@ problem.  This macro allows us to write a ``for'' loop construct.
   "Execute a simple \"for\" loop.
 For example, (for i from 1 to 10 do (print i))."
   (list 'let (list (list var init))
-        (cons 'while (cons (list '<= var final)
-                           (append body (list (list 'inc var)))))))
+        (cons 'while
+              (cons (list '<= var final)
+                    (append body (list (list 'inc var)))))))
 @end group
 @result{} for
 
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 96e9b78f871..8b5e3da493a 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1234,8 +1234,8 @@ each calls the following function to set various variables:
 
 @smallexample
 @group
-(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive)
-  (when lisp-syntax
+(defun lisp-mode-variables (&optional syntax keywords-case-insensitive)
+  (when syntax
     (set-syntax-table lisp-mode-syntax-table))
   (setq local-abbrev-table lisp-mode-abbrev-table)
   @dots{}
@@ -1308,9 +1308,9 @@ or to switch back to an existing one.
 Entry to this mode calls the value of `lisp-mode-hook'
 if that value is non-nil."
   (lisp-mode-variables nil t)
-  (set (make-local-variable 'find-tag-default-function) 'lisp-find-tag-default)
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip
+  (set (make-local-variable 'find-tag-default-function)
+       'lisp-find-tag-default)
+  (set (make-local-variable 'comment-start-skip)
        "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
   (setq imenu-case-fold-search t))
 @end group
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 67405256779..7895d1616f5 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -408,16 +408,15 @@ codepoint belongs: most unassigned codepoints get the value of
 or @code{R} (strong R).
 
 @item decomposition
-Corresponds to the Unicode @code{Decomposition_Type} and
-@code{Decomposition_Value} properties.  The value is a list, whose
-first element may be a symbol representing a compatibility formatting
-tag, such as @code{small}@footnote{The Unicode specification writes
-these tag names inside @samp{<..>} brackets, but the tag names in
-Emacs do not include the brackets; e.g.@: Unicode specifies
-@samp{<small>} where Emacs uses @samp{small}.  }; the other elements
-are characters that give the compatibility decomposition sequence of
-this character.  For unassigned codepoints, the value is the character
-itself.
+Corresponds to the Unicode properties @code{Decomposition_Type} and
+@code{Decomposition_Value}.  The value is a list, whose first element
+may be a symbol representing a compatibility formatting tag, such as
+@code{small}@footnote{The Unicode specification writes these tag names
+inside @samp{<..>} brackets, but the tag names in Emacs do not include
+the brackets; e.g.@: Unicode specifies @samp{<small>} where Emacs uses
+@samp{small}.  }; the other elements are characters that give the
+compatibility decomposition sequence of this character.  For
+unassigned codepoints, the value is the character itself.
 
 @item decimal-digit-value
 Corresponds to the Unicode @code{Numeric_Value} property for
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 6e4e0e7a9db..e604d92e690 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2322,7 +2322,7 @@ channels and image data, respectively.
 @item :image-path @var{path}
 This is represented either as a URI (@samp{file://} is the only URI
 schema supported right now) or a name in a freedesktop.org-compliant
-icon theme from @samp{$XDG_DATA_DIRS/icons}, like @samp{"mail-message-new"}.
+icon theme from @samp{$XDG_DATA_DIRS/icons}.
 
 @item :sound-file @var{filename}
 The path to a sound file to play when the notification pops up.
@@ -2473,26 +2473,27 @@ a symbol representing a supported external library, and the rest are
 strings giving alternate filenames for that library.
 
 Emacs tries to load the library from the files in the order they
-appear in the list; if none is found, the running session of Emacs
-won't have access to that library, and the features that depend on the
-library will be unavailable.
+appear in the list; if none is found, the Emacs session won't have
+access to that library, and the features it provides will be
+unavailable.
 
 Image support on some platforms uses this facility.  Here's an example
 of setting this variable for supporting images on MS-Windows:
 
-@lisp
+@example
 (setq dynamic-library-alist
       '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
         (png "libpng12d.dll" "libpng12.dll" "libpng.dll"
-	 "libpng13d.dll" "libpng13.dll")
-        (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
+             "libpng13d.dll" "libpng13.dll")
+        (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll"
+              "jpeg.dll")
         (tiff "libtiff3.dll" "libtiff.dll")
         (gif "giflib4.dll" "libungif4.dll" "libungif.dll")
         (svg "librsvg-2-2.dll")
         (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
         (glib "libglib-2.0-0.dll")
 	(gobject "libgobject-2.0-0.dll")))
-@end lisp
+@end example
 
 Note that image types @code{pbm} and @code{xbm} do not need entries in
 this variable because they do not depend on external libraries and are
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index b05db2bc1a1..a59a99d124c 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -828,7 +828,8 @@ consequences, so the byte compiler warns if you call @code{set-buffer}
 during an excursion:
 
 @example
-Warning: Use `with-current-buffer' rather than save-excursion+set-buffer
+Warning: Use `with-current-buffer' rather than
+         save-excursion+set-buffer
 @end example
 
 @noindent
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 64be3ee2695..34b62a48329 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1802,7 +1802,7 @@ The number of threads in the process.
 @item start
 The time when the process was started, in the same
 @w{@code{(@var{high} @var{low} @var{microsec})}} format used by
-@code{current-time} and @code{file-attributes}.
+@code{current-time} and by @code{file-attributes}.
 
 @item etime
 The time elapsed since the process started, in the @w{@code{(@var{high}
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 63a6d2cbab3..d670a85a464 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -215,8 +215,7 @@ properties, just the characters themselves.  @xref{Text Properties}.
 
 @defun buffer-string
 This function returns the contents of the entire accessible portion of
-the current buffer as a string.  It is equivalent to
-@w{@code{(buffer-substring (point-min) (point-max))}}.
+the current buffer, as a string.
 @end defun
 
 @defun filter-buffer-substring start end &optional delete
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 5ae368000f6..c7c466c7d36 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1399,7 +1399,7 @@ When writing an application, you should normally use the higher-level
 functions described in @ref{Switching Buffers}, instead of calling
 @code{set-window-buffer} directly.
 
-This function runs @code{window-scroll-functions}, followed by
+This runs @code{window-scroll-functions}, followed by
 @code{window-configuration-change-hook}.  @xref{Window Hooks}.
 @end defun