From: Glenn Morris <rgm@gnu.org>
Date: Tue, 17 May 2011 02:26:56 +0000 (-0700)
Subject: Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7?hp=e5946384189a9c0cc818687a497978182914f395

Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.
---

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d3521dcd52..ec0e3b51a0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,33 @@
+2011-05-17  Chong Yidong  <cyd@stupidchicken.com>
+
+	Fixes for fitting text into 7x9 printed manual.
+	* building.texi (Flymake, Breakpoints Buffer):
+	* calendar.texi (Appointments):
+	* cmdargs.texi (General Variables, Display X):
+	* custom.texi (Saving Customizations, Face Customization)
+	(Directory Variables, Minibuffer Maps, Init Rebinding):
+	* display.texi (Font Lock, Font Lock, Useless Whitespace):
+	* fixit.texi (Spelling):
+	* frames.texi (Creating Frames, Fonts):
+	* help.texi (Help Files):
+	* mini.texi (Minibuffer File):
+	* misc.texi (emacsclient Options, Emulation):
+	* msdog.texi (Windows Startup, Windows HOME, Windows Fonts):
+	* mule.texi (International Chars, Language Environments)
+	(Select Input Method, Modifying Fontsets, Charsets):
+	* programs.texi (Custom C Indent):
+	* rmail.texi (Rmail Labels):
+	* text.texi (Table Conversion):
+	* trouble.texi (Known Problems, Known Problems):
+	* windows.texi (Change Window):
+	* xresources.texi (GTK resources): Reflow text and re-indent code
+	examples to avoid TeX overflows and underflows on 7x9 paper.
+
+	* emacs.texi: Fix the (commented out) smallbook command.
+
+	* macos.texi (Mac / GNUstep Events):
+	* xresources.texi (Lucid Resources): Remove extraneous examples.
+
 2011-05-10  Glenn Morris  <rgm@gnu.org>
 
 	* custom.texi (Specifying File Variables):
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index a07e758201..cca9e441ed 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -438,8 +438,8 @@ syntax checking tool used depends on the language; for example, for
 C/C++ files this is usually the C compiler.  Flymake can also use
 build tools such as @code{make} for checking complicated projects.
 
-  To activate Flymake mode, type @kbd{M-x flymake-mode}.  You can move
-to the errors spotted by Flymake mode with @kbd{M-x
+  To enable Flymake mode, type @kbd{M-x flymake-mode}.  You can go to
+the errors found by Flymake mode with @kbd{M-x
 flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.  To
 display any error messages associated with the current line, use
 @kbd{M-x flymake-display-err-menu-for-current-line}.
@@ -992,7 +992,7 @@ breakpoint}, the breakpoint which point is on.
 @item @key{SPC}
 @kindex SPC @r{(GDB breakpoints buffer)}
 @findex gdb-toggle-breakpoint
-Enable/disable the current breakpoint (@code{gdb-toggle-breakpoint}).
+Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}).
 On a graphical display, this changes the color of a bullet in the
 margin of a source buffer at the relevant line.  This is red when
 the breakpoint is enabled and grey when it is disabled.  Text-only
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index fabd38ecc1..9de223854c 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1473,12 +1473,12 @@ give the names of functions used to create and destroy the window,
 respectively.
 
 @findex appt-activate
-  To enable appointment notification, use the command @kbd{M-x
-appt-activate}.  With a positive argument, it enables notification;
-with a negative argument, it disables notification; with no argument,
-it toggles.  Enabling notification also sets up an appointment list
-for today from the diary file, giving all diary entries found with
-recognizable times of day, and reminds you just before each of them.
+  To enable appointment notification, type @kbd{M-x appt-activate}.
+With a positive argument, it enables notification; with a negative
+argument, it disables notification; with no argument, it toggles.
+Enabling notification also sets up an appointment list for today from
+the diary file, giving all diary entries found with recognizable times
+of day, and reminds you just before each of them.
 
   For example, suppose the diary file contains these lines:
 
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 12c1d9a8bf..1c3b85559d 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -474,9 +474,8 @@ when you specify a relative directory name.
 Directory for the architecture-independent files that come with Emacs.
 This is used to initialize the Lisp variable @code{data-directory}.
 @item EMACSDOC
-Directory for the documentation string file,
-@file{DOC-@var{emacsversion}}.  This is used to initialize the Lisp
-variable @code{doc-directory}.
+Directory for the documentation string file, which is used to
+initialize the Lisp variable @code{doc-directory}.
 @item EMACSLOADPATH
 A colon-separated list of directories@footnote{
 Here and below, whenever we say ``colon-separated list of directories,''
@@ -722,14 +721,14 @@ window displayed at their local terminal.  You might need to log in
 to another system because the files you want to edit are there, or
 because the Emacs executable file you want to run is there.
 
-  The syntax of the @env{DISPLAY} environment variable is
+  @env{DISPLAY} has the syntax
 @samp{@var{host}:@var{display}.@var{screen}}, where @var{host} is the
 host name of the X Window System server machine, @var{display} is an
-arbitrarily-assigned number that distinguishes your server (X terminal)
-from other servers on the same machine, and @var{screen} is a
-rarely-used field that allows an X server to control multiple terminal
-screens.  The period and the @var{screen} field are optional.  If
-included, @var{screen} is usually zero.
+arbitrarily-assigned number that distinguishes your server (X
+terminal) from other servers on the same machine, and @var{screen} is
+a rarely-used field that allows an X server to control multiple
+terminal screens.  The period and the @var{screen} field are optional.
+If included, @var{screen} is usually zero.
 
   For example, if your host is named @samp{glasperle} and your server is
 the first (or perhaps the only) server listed in the configuration, your
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index d7a99d49d6..d9fdff138a 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -526,7 +526,8 @@ files for different Emacs versions, like this:
 (cond ((< emacs-major-version 22)
        ;; @r{Emacs 21 customization.}
        (setq custom-file "~/.custom-21.el"))
-      ((and (= emacs-major-version 22) (< emacs-minor-version 3))
+      ((and (= emacs-major-version 22)
+            (< emacs-minor-version 3))
        ;; @r{Emacs 22 customization, before version 22.3.}
        (setq custom-file "~/.custom-22.el"))
       (t
@@ -582,15 +583,15 @@ means that it's disabled.  You can enable or disable the attribute by
 clicking that button.  When the attribute is enabled, you can change
 the attribute value in the usual ways.
 
-  For the colors, you can specify a color name (use @kbd{M-x
-list-colors-display} for a list of them) or a hexadecimal color
-specification of the form @samp{#@var{rr}@var{gg}@var{bb}}.
-(@samp{#000000} is black, @samp{#ff0000} is red, @samp{#00ff00} is
-green, @samp{#0000ff} is blue, and @samp{#ffffff} is white.)  On a
-black-and-white display, the colors you can use for the background are
-@samp{black}, @samp{white}, @samp{gray}, @samp{gray1}, and
-@samp{gray3}.  Emacs supports these shades of gray by using background
-stipple patterns instead of a color.
+  You can specify a color name (use @kbd{M-x list-colors-display} for
+a list of them) or a hexadecimal color specification of the form
+@samp{#@var{rr}@var{gg}@var{bb}}.  (@samp{#000000} is black,
+@samp{#ff0000} is red, @samp{#00ff00} is green, @samp{#0000ff} is
+blue, and @samp{#ffffff} is white.)  On a black-and-white display, the
+colors you can use for the background are @samp{black}, @samp{white},
+@samp{gray}, @samp{gray1}, and @samp{gray3}.  Emacs supports these
+shades of gray by using background stipple patterns instead of a
+color.
 
   Setting, saving and resetting a face work like the same operations for
 variables (@pxref{Changing a Variable}).
@@ -1334,7 +1335,8 @@ corresponding alist applies to all the files in that subdirectory.
  (java-mode . ((c-file-style . "BSD")
                (subdirs . nil)))
  ("src/imported"
-  . ((nil . ((change-log-default-name . "ChangeLog.local"))))))
+  . ((nil . ((change-log-default-name .
+              "ChangeLog.local"))))))
 @end example
 
 @noindent
@@ -1563,7 +1565,7 @@ just like @key{RET}.
 @code{minibuffer-local-must-match-map} is for strict completion and
 for cautious completion.
 @item
-Finally, @code{minibuffer-local-filename-completion-map} and
+@code{minibuffer-local-filename-completion-map} and
 @code{minibuffer-local-must-match-filename-map} are like the two
 previous ones, but they are specifically for file name completion.
 They do not bind @key{SPC}.
@@ -1694,7 +1696,6 @@ and mouse events:
 (global-set-key (kbd "C-<f5>") 'linum-mode)
 (global-set-key (kbd "C-<right>") 'forward-sentence)
 (global-set-key (kbd "<mouse-2>") 'mouse-save-then-kill)
-(global-set-key (kbd "C-<down-mouse-3>") 'mouse-yank-at-click)
 @end example
 
   Instead of using the @code{kbd} macro, you can use a Lisp string or
@@ -1758,8 +1759,10 @@ and @kbd{C-c p} in Texinfo mode:
 @example
 (add-hook 'texinfo-mode-hook
           '(lambda ()
-             (define-key texinfo-mode-map "\C-cp" 'backward-paragraph)
-             (define-key texinfo-mode-map "\C-cn" 'forward-paragraph)))
+             (define-key texinfo-mode-map "\C-cp"
+                         'backward-paragraph)
+             (define-key texinfo-mode-map "\C-cn"
+                         'forward-paragraph)))
 @end example
 
 @node Modifier Keys
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 7777aacf0e..3cec3e8fb8 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -662,17 +662,17 @@ that follows an open-parenthesis or open-brace in the leftmost column
 that is inside a string or comment.
 
 @cindex slow display during scrolling
-  The variable @code{font-lock-beginning-of-syntax-function} (always
-buffer-local) specifies how Font Lock mode can find a position
-guaranteed to be outside any comment or string.  In modes which use the
-leftmost column parenthesis convention, the default value of the variable
-is @code{beginning-of-defun}---that tells Font Lock mode to use the
-convention.  If you set this variable to @code{nil}, Font Lock no longer
-relies on the convention.  This avoids incorrect results, but the price
-is that, in some cases, fontification for a changed text must rescan
-buffer text from the beginning of the buffer.  This can considerably
-slow down redisplay while scrolling, particularly if you are close to
-the end of a large buffer.
+  The variable @code{font-lock-beginning-of-syntax-function}, which is
+always buffer-local, specifies how Font Lock mode can find a position
+guaranteed to be outside any comment or string.  In modes which use
+the leftmost column parenthesis convention, the default value of the
+variable is @code{beginning-of-defun}---that tells Font Lock mode to
+use the convention.  If you set this variable to @code{nil}, Font Lock
+no longer relies on the convention.  This avoids incorrect results,
+but the price is that, in some cases, fontification for a changed text
+must rescan buffer text from the beginning of the buffer.  This can
+considerably slow down redisplay while scrolling, particularly if you
+are close to the end of a large buffer.
 
 @findex font-lock-add-keywords
   Font Lock highlighting patterns already exist for many modes, but you
@@ -685,7 +685,8 @@ comments, use this:
 (add-hook 'c-mode-hook
           (lambda ()
            (font-lock-add-keywords nil
-            '(("\\<\\(FIXME\\):" 1 font-lock-warning-face t)))))
+            '(("\\<\\(FIXME\\):" 1
+               font-lock-warning-face t)))))
 @end example
 
 @findex font-lock-remove-keywords
@@ -892,9 +893,9 @@ the location of point is enough to show you that the spaces are
 present.
 
 @findex delete-trailing-whitespace
-  To delete all trailing whitespace within the buffer's accessible
-portion (@pxref{Narrowing}), type @kbd{M-x delete-trailing-whitespace
-@key{RET}}.  This command does not remove newline characters.
+  Type @kbd{M-x delete-trailing-whitespace @key{RET}} to delete all
+trailing whitespace within the buffer's accessible portion
+(@pxref{Narrowing}).  This command does not remove newline characters.
 
 @vindex indicate-empty-lines
 @cindex unused lines
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 7ca6204a99..ed7d48877e 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -39,7 +39,7 @@ developing GNU and promoting software freedom.''
 @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 set smallbook
+@c @smallbook
 
 @ifset smallbook
 @smallbook
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 72100f8caf..0c9cc829fc 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -347,8 +347,7 @@ Quit interactive spell checking and move point back to where it was
 when you started spell checking.
 
 @item q
-Quit interactive spell checking and kill the Aspell/Ispell/Hunspell
-subprocess.
+Quit interactive spell checking and kill the spell-checker subprocess.
 
 @item ?
 Show the list of options.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index b952ef15af..298a7d4598 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -576,7 +576,8 @@ the default foreground color and font:
 
 @example
 (add-to-list 'default-frame-alist '(font . "10x20"))
-(add-to-list 'default-frame-alist '(foreground-color . "blue"))
+(add-to-list 'default-frame-alist
+             '(foreground-color . "blue"))
 @end example
 
 @noindent
@@ -743,12 +744,9 @@ DejaVu Sans Mono:bold:italic
 Monospace-12:weight=bold:slant=italic
 @end smallexample
 
-See the Fontconfig manual for a more detailed description of
-Fontconfig patterns.  This manual is located in the file
-@file{fontconfig-user.html}, distributed with Fontconfig.  It is also
-available online at @url{http://fontconfig.org/fontconfig-user.html}.
-In particular, that manual describes additional font properties that
-influence how the font is hinted, antialiased, or scaled.
+For a more detailed description of Fontconfig patterns, see the
+Fontconfig manual, which is distributed with Fontconfig and available
+online at @url{http://fontconfig.org/fontconfig-user.html}.
 
   The second way to specify a font is to use a @dfn{GTK font
 description}.  These have the syntax
@@ -821,9 +819,9 @@ The font slant---normally @samp{r} (roman), @samp{i} (italic),
 @samp{o} (oblique), @samp{ri} (reverse italic), or @samp{ot} (other).
 Some font names support other values.
 @item widthtype
-The font width---normally @samp{condensed}, @samp{extended},
-@samp{semicondensed} or @samp{normal} (some font names support other
-values).
+The font width---normally @samp{normal}, @samp{condensed},
+@samp{extended}, or @samp{semicondensed} (some font names support
+other values).
 @item style
 An optional additional style name.  Usually it is empty---most long
 font names have two hyphens in a row at this point.
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 8c0d768939..2c3630adba 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -629,7 +629,7 @@ C-@var{char}}; that is, @kbd{C-h} followed by a control character.
 Display the Emacs copying conditions (@code{describe-copying}).
 These are the rules under which you can copy and redistribute Emacs.
 @item C-h C-d
-Display how to debug Emacs problems (@code{view-emacs-debugging}).
+Display help for debugging Emacs (@code{view-emacs-debugging}).
 @item C-h C-f
 Display the Emacs frequently-answered-questions list (@code{view-emacs-FAQ}).
 @item C-h g
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 5d5705456f..85d92c9fcd 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -161,10 +161,6 @@ This event occurs when another application requests that Emacs open a
 temporary file.  By default, this is handled by just generating a
 @code{ns-open-file} event, the results of which are described above.
 
-You can bind @key{ns-pop-up-frames} and @key{ns-open-temp-file} to
-other Lisp functions.  When the event is registered, the name of the
-file to open is stored in the variable @code{ns-input-file}.
-
 @item ns-open-file-line
 Some applications, such as ProjectBuilder and gdb, request not only a
 particular file, but also a particular line or sequence of lines in
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index dcc1c445e6..ce0d396fd0 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -68,10 +68,10 @@ the default directory.  If you now type @kbd{buffer.c} as input, that
 specifies the file @file{/u2/emacs/src/buffer.c}.  @xref{File Names},
 for information about the default directory.
 
-  You can specify the parent directory by adding @file{..}: for
-example, @file{/u2/emacs/src/../lisp/simple.el} is equivalent to
-@file{/u2/emacs/lisp/simple.el}.  Alternatively, you can use
-@kbd{M-@key{DEL}} to kill directory names backwards (@pxref{Words}).
+  You can specify the parent directory with @file{..}:
+@file{/a/b/../foo.el} is equivalent to @file{/a/foo.el}.
+Alternatively, you can use @kbd{M-@key{DEL}} to kill directory names
+backwards (@pxref{Words}).
 
   To specify a file in a completely different directory, you can kill
 the entire default with @kbd{C-a C-k} (@pxref{Minibuffer Edit}).
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 06267851d4..290e5dc53b 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1603,16 +1603,8 @@ listed below:
 @item -a @var{command}
 @itemx --alternate-editor=@var{command}
 Specify a command to run if @code{emacsclient} fails to contact Emacs.
-This is useful when running @code{emacsclient} in a script.  For
-example, the following setting for the @env{EDITOR} environment
-variable will always give you an editor, even if no Emacs server is
-running:
+This is useful when running @code{emacsclient} in a script.
 
-@example
-EDITOR="emacsclient --alternate-editor emacs +%d %s"
-@end example
-
-@noindent
 As a special exception, if @var{command} is the empty string, then
 @code{emacsclient} starts Emacs in daemon mode and then tries
 connecting again.
@@ -2513,9 +2505,8 @@ also use the command @kbd{M-x scroll-all-mode} or set the variable
 @item EDT (DEC VMS editor)
 @findex edt-emulation-on
 @findex edt-emulation-off
-Turn on EDT emulation with the command @kbd{M-x edt-emulation-on},
-while @kbd{M-x edt-emulation-off} restores normal Emacs command
-bindings.
+Turn on EDT emulation @kbd{M-x edt-emulation-on}; use @kbd{M-x
+edt-emulation-off} to restore normal Emacs command bindings.
 
 Most of the EDT emulation commands are keypad keys, and most standard
 Emacs key bindings are still available.  The EDT emulation rebindings
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 0a454db86b..56fe20f079 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -84,30 +84,29 @@ Emacs will start in the current directory of the Windows shell.
 @cindex invoking Emacs from Windows Explorer
 @pindex emacsclient.exe
 @pindex emacsclientw.exe
-Via the Emacs client program, @file{emacsclient.exe} or
-@file{emacsclientw.exe}.  This allows to invoke Emacs from other
-programs, and to reuse a running Emacs process for serving editing
-jobs required by other programs.  @xref{Emacs Server}.  The difference
-between @file{emacsclient.exe} and @file{emacsclientw.exe} is that the
-former is a console program, while the latter is a Windows GUI
-program.  Both programs wait for Emacs to signal that the editing job
-is finished, before they exit and return control to the program that
-invoked them.  Which one of them to use in each case depends on the
-expectations of the program that needs editing services.  If that
-program is itself a console (text-mode) program, you should use
-@file{emacsclient.exe}, so that any of its messages and prompts appear
-in the same command window as those of the invoking program.  By
-contrast, if the invoking program is a GUI program, you will be better
-off using @file{emacsclientw.exe}, because @file{emacsclient.exe} will
-pop up a command window if it is invoked from a GUI program.  A
-notable situation where you would want @file{emacsclientw.exe} is when
-you right-click on a file in the Windows Explorer and select ``Open
-With'' from the pop-up menu.  Use the @samp{--alternate-editor=} or
-@samp{-a} options if Emacs might not be running (or not running as a
-server) when @command{emacsclient} is invoked---that will always give
-you an editor.  When invoked via @command{emacsclient}, Emacs will
-start in the current directory of the program that invoked
-@command{emacsclient}.
+Via @file{emacsclient.exe} or @file{emacsclientw.exe}, which allow you
+to invoke Emacs from other programs, and to reuse a running Emacs
+process for serving editing jobs required by other programs.
+@xref{Emacs Server}.  The difference between @file{emacsclient.exe}
+and @file{emacsclientw.exe} is that the former is a console program,
+while the latter is a Windows GUI program.  Both programs wait for
+Emacs to signal that the editing job is finished, before they exit and
+return control to the program that invoked them.  Which one of them to
+use in each case depends on the expectations of the program that needs
+editing services.  If that program is itself a console (text-mode)
+program, you should use @file{emacsclient.exe}, so that any of its
+messages and prompts appear in the same command window as those of the
+invoking program.  By contrast, if the invoking program is a GUI
+program, you will be better off using @file{emacsclientw.exe}, because
+@file{emacsclient.exe} will pop up a command window if it is invoked
+from a GUI program.  A notable situation where you would want
+@file{emacsclientw.exe} is when you right-click on a file in the
+Windows Explorer and select ``Open With'' from the pop-up menu.  Use
+the @samp{--alternate-editor=} or @samp{-a} options if Emacs might not
+be running (or not running as a server) when @command{emacsclient} is
+invoked---that will always give you an editor.  When invoked via
+@command{emacsclient}, Emacs will start in the current directory of
+the program that invoked @command{emacsclient}.
 @end enumerate
 
 @node Text and Binary
@@ -402,11 +401,11 @@ names, which might cause misalignment of columns in Dired display.
 
   The Windows equivalent of the @code{HOME} directory is the
 @dfn{user-specific application data directory}.  The actual location
-depends on your Windows version and system configuration; typical values
-are @file{C:\Documents and Settings\@var{username}\Application Data} on
-Windows 2K/XP/2K3, @file{C:\Users\@var{username}\AppData\Roaming} on
-Windows Vista/7/2K8, and either @file{C:\WINDOWS\Application Data}
-or @file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the
+depends on the Windows version; typical values are @file{C:\Documents
+and Settings\@var{username}\Application Data} on Windows 2K/XP/2K3,
+@file{C:\Users\@var{username}\AppData\Roaming} on Windows Vista/7/2K8,
+and either @file{C:\WINDOWS\Application Data} or
+@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the
 older Windows 9X/ME systems.  If this directory does not exist or
 cannot be accessed, Emacs falls back to @file{C:\} as the default
 value of @code{HOME}.
@@ -955,11 +954,12 @@ The following scripts are recognized on Windows: @code{latin}, @code{greek},
 
 @cindex font antialiasing (MS Windows)
 @item antialias
-Specifies the antialiasing to use for the font.  The value @code{none}
-means no antialiasing, @code{standard} means use standard antialiasing,
-@code{subpixel} means use subpixel antialiasing (known as Cleartype on Windows),
-and @code{natural} means use subpixel antialiasing with adjusted spacing between
-letters.  If unspecified, the font will use the system default antialiasing.
+Specifies the antialiasing method.  The value @code{none} means no
+antialiasing, @code{standard} means use standard antialiasing,
+@code{subpixel} means use subpixel antialiasing (known as Cleartype on
+Windows), and @code{natural} means use subpixel antialiasing with
+adjusted spacing between letters.  If unspecified, the font will use
+the system default antialiasing.
 @end table
 
 @node Windows Misc
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index e12ec70706..1a4d0d33bc 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -232,7 +232,8 @@ preferred charset: unicode (Unicode (ISO10646))
       buffer code: #xC3 #x80
         file code: not encodable by coding system undecided-unix
           display: by this font (glyph code)
-    xft:-unknown-DejaVu Sans Mono-normal-normal-normal-*-13-*-*-*-m-0-iso10646-1 (#x82)
+    xft:-unknown-DejaVu Sans Mono-normal-normal-
+        normal-*-13-*-*-*-m-0-iso10646-1 (#x82)
 
 Character code properties: customize what to show
   name: LATIN CAPITAL LETTER A WITH GRAVE
@@ -322,7 +323,7 @@ language environment also specifies a default input method.
 
 @findex set-language-environment
 @vindex current-language-environment
-  To select a language environment, customize the variable
+  To select a language environment, customize
 @code{current-language-environment} or use the command @kbd{M-x
 set-language-environment}.  It makes no difference which buffer is
 current when you use this command, because the effects apply globally
@@ -648,9 +649,9 @@ shows that information in addition to the other information about the
 character.
 
 @findex list-input-methods
-  To see a list of all the supported input methods, type @kbd{M-x
-list-input-methods}.  The list gives information about each input
-method, including the string that stands for it in the mode line.
+  @kbd{M-x list-input-methods} displays a list of all the supported
+input methods.  The list gives information about each input method,
+including the string that stands for it in the mode line.
 
 @node Coding Systems
 @section Coding Systems
@@ -1468,18 +1469,22 @@ examples are:
 
 @example
 ;; Use Liberation Mono for latin-3 charset.
-(set-fontset-font "fontset-default" 'iso-8859-3 "Liberation Mono")
+(set-fontset-font "fontset-default" 'iso-8859-3
+                  "Liberation Mono")
 
 ;; Prefer a big5 font for han characters
-(set-fontset-font "fontset-default" 'han (font-spec :registry "big5")
+(set-fontset-font "fontset-default"
+                  'han (font-spec :registry "big5")
                   nil 'prepend)
 
-;; Use DejaVu Sans Mono as a fallback in fontset-startup before
-;; resorting to fontset-default.
-(set-fontset-font "fontset-startup" nil "DejaVu Sans Mono" nil 'append)
+;; Use DejaVu Sans Mono as a fallback in fontset-startup
+;; before resorting to fontset-default.
+(set-fontset-font "fontset-startup" nil "DejaVu Sans Mono"
+                  nil 'append)
 
 ;; Use MyPrivateFont for the Unicode private use area.
-(set-fontset-font "fontset-default"  '(#xe000 . #xf8ff) "MyPrivateFont")
+(set-fontset-font "fontset-default"  '(#xe000 . #xf8ff)
+                  "MyPrivateFont")
 
 @end example
 
@@ -1644,9 +1649,9 @@ name, and displays information about that charset, including its
 internal representation within Emacs.
 
 @findex list-character-sets
-  To display a list of all supported charsets, type @kbd{M-x
-list-character-sets}.  The list gives the names of charsets and
-additional information to identity each charset (see
+  @kbd{M-x list-character-sets} displays a list of all supported
+charsets.  The list gives the names of charsets and additional
+information to identity each charset (see
 @url{http://www.itscj.ipsj.or.jp/ISO-IR/} for details).  In this list,
 charsets are divided into two categories: @dfn{normal charsets} are
 listed first, followed by @dfn{supplementary charsets}.  A
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 5b7322f214..803f6b6ce4 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -608,7 +608,9 @@ example,
 
 @example
 (setq c-default-style
-      '((java-mode . "java") (awk-mode . "awk") (other . "gnu")))
+      '((java-mode . "java")
+        (awk-mode . "awk")
+        (other . "gnu")))
 @end example
 
 @noindent
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 7a5a734443..ad22ae921e 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -620,13 +620,13 @@ are three ways to use the labels: in moving, in summaries, and in sorting.
 @kindex C-M-p @r{(Rmail)}
 @findex rmail-next-labeled-message
 @findex rmail-previous-labeled-message
-  The command @kbd{C-M-n @var{labels} @key{RET}}
+  @kbd{C-M-n @var{labels} @key{RET}}
 (@code{rmail-next-labeled-message}) moves to the next message that has
-one of the labels @var{labels}.  The argument @var{labels} specifies one
-or more label names, separated by commas.  @kbd{C-M-p}
-(@code{rmail-previous-labeled-message}) is similar, but moves backwards
-to previous messages.  A numeric argument to either command serves as a
-repeat count.
+one of the labels @var{labels}.  The argument @var{labels} specifies
+one or more label names, separated by commas.  @kbd{C-M-p}
+(@code{rmail-previous-labeled-message}) is similar, but moves
+backwards to previous messages.  A numeric argument to either command
+serves as a repeat count.
 
   The command @kbd{C-M-l @var{labels} @key{RET}}
 (@code{rmail-summary-by-labels}) displays a summary containing only the
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 48f3bd1558..c0139c6055 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2809,20 +2809,20 @@ following three paragraphs (the latter two are indented with header
 lines):
 
 @example
-@samp{table-capture} is a powerful command, but mastering its
-power requires some practice.  Here are some things it can do:
-
-Parse Cell Items      By using column delimiter regular
-                      expression and raw delimiter regular
-                      expression, it parses the specified text
-                      area and extracts cell items from
-                      non-table text and then forms a table out
-                      of them.
-
-Capture Text Area     When no delimiters are specified it
-                      creates a single cell table.  The text in
-                      the specified region is placed in that
-                      cell.
+table-capture is a powerful command.
+Here are some things it can do:
+
+Parse Cell Items  By using column delimiter regular
+                  expression and raw delimiter regular
+                  expression, it parses the specified text
+                  area and extracts cell items from
+                  non-table text and then forms a table out
+                  of them.
+
+Capture Text Area When no delimiters are specified it
+                  creates a single cell table.  The text in
+                  the specified region is placed in that
+                  cell.
 @end example
 
 @noindent
@@ -2836,22 +2836,22 @@ following one.
 @c produced output!!
 @smallexample
 @group
-+-----------------------------------------------------------------+
-|@samp{table-capture} is a powerful command, but mastering its         |
-|power requires some practice.  Here are some things it can do:   |
-|                                                                 |
-|Parse Cell Items      By using column delimiter regular          |
-|                      expression and raw delimiter regular       |
-|                      expression, it parses the specified text   |
-|                      area and extracts cell items from          |
-|                      non-table text and then forms a table out  |
-|                      of them.                                   |
-|                                                                 |
-|Capture Text Area     When no delimiters are specified it        |
-|                      creates a single cell table.  The text in  |
-|                      the specified region is placed in that     |
-|                      cell.                                      |
-+-----------------------------------------------------------------+
++-------------------------------------------------------------+
+|table-capture is a powerful command.                         |
+|Here are some things it can do:                              |
+|                                                             |
+|Parse Cell Items  By using column delimiter regular          |
+|                  expression and raw delimiter regular       |
+|                  expression, it parses the specified text   |
+|                  area and extracts cell items from          |
+|                  non-table text and then forms a table out  |
+|                  of them.                                   |
+|                                                             |
+|Capture Text Area When no delimiters are specified it        |
+|                  creates a single cell table.  The text in  |
+|                  the specified region is placed in that     |
+|                  cell.                                      |
++-------------------------------------------------------------+
 @end group
 @end smallexample
 
@@ -2861,22 +2861,22 @@ paragraphs occupying its own cell.  Each cell can now be edited
 independently without affecting the layout of other cells.
 
 @smallexample
-+-----------------------------------------------------------------+
-|@samp{table-capture} is a powerful command, but mastering its         |
-|power requires some practice.  Here are some things it can do:   |
-+---------------------+-------------------------------------------+
-|Parse Cell Items     |By using column delimiter regular          |
-|                     |expression and raw delimiter regular       |
-|                     |expression, it parses the specified text   |
-|                     |area and extracts cell items from          |
-|                     |non-table text and then forms a table out  |
-|                     |of them.                                   |
-+---------------------+-------------------------------------------+
-|Capture Text Area    |When no delimiters are specified it        |
-|                     |creates a single cell table.  The text in  |
-|                     |the specified region is placed in that     |
-|                     |cell.                                      |
-+---------------------+-------------------------------------------+
++--------------------------------------------------------------+
+|table-capture is a powerful command.                          |
+|Here are some things it can do:                               |
++------------------+-------------------------------------------+
+|Parse Cell Items  |By using column delimiter regular          |
+|                  |expression and raw delimiter regular       |
+|                  |expression, it parses the specified text   |
+|                  |area and extracts cell items from          |
+|                  |non-table text and then forms a table out  |
+|                  |of them.                                   |
++------------------+-------------------------------------------+
+|Capture Text Area |When no delimiters are specified it        |
+|                  |creates a single cell table.  The text in  |
+|                  |the specified region is placed in that     |
+|                  |cell.                                      |
++------------------+-------------------------------------------+
 @end smallexample
 
 @noindent
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index a2b9b16bae..28c0285cf0 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -443,8 +443,7 @@ problems, , Bugs and problems, efaq, GNU Emacs FAQ}.
 
 @item
 The @samp{bug-gnu-emacs} mailing list (also available as the newsgroup
-@samp{gnu.emacs.bug}).  This is where you will find most Emacs bug
-reports.  You can read the list archives at
+@samp{gnu.emacs.bug}).  You can read the list archives at
 @url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs}.  If you
 like, you can also subscribe to the list.  Be aware that the sole
 purpose of this list is to provide the Emacs maintainers with
@@ -454,10 +453,10 @@ this.
 
 @item
 The bug tracker at @url{http://debbugs.gnu.org}.  From early 2008,
-reports from the @samp{bug-gnu-emacs} list have been sent here.  The
-tracker contains the same information as the mailing list, just in a
-different format.  You may prefer to browse and read reports using the
-tracker.
+reports from the @samp{bug-gnu-emacs} list have also been sent here.
+The tracker contains the same information as the mailing list, just in
+a different format.  You may prefer to browse and read reports using
+the tracker.
 
 @item
 The @samp{emacs-pretest-bug} mailing list.  This list is no longer
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index ae9b69ef3f..6aa8a06778 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -343,10 +343,10 @@ to an adjacent window.  The minimum size is specified by the variables
 
 @kindex C-x -
 @findex shrink-window-if-larger-than-buffer
-  The command @kbd{C-x -} (@code{shrink-window-if-larger-than-buffer})
-reduces the height of the selected window, if it is taller than
-necessary to show the whole text of the buffer it is displaying.  It
-gives the extra lines to other windows in the frame.
+  @kbd{C-x -} (@code{shrink-window-if-larger-than-buffer}) reduces the
+height of the selected window, if it is taller than necessary to show
+the whole text of the buffer it is displaying.  It gives the extra
+lines to other windows in the frame.
 
 @kindex C-x +
 @findex balance-windows
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 33ea83d7d6..d30f7e4225 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -451,13 +451,6 @@ fonts.  For more information about fontsets see the man page for
 @code{font} and @code{fontSet} resources are specified, the
 @code{fontSet} resource is used.
 
-  Thus, to specify @samp{-*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*}
-for both the popup and menu bar menus, write this:
-
-@example
-Emacs*menu*fontSet:  -*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*
-@end example
-
 @noindent
 Resources for @emph{non-menubar} toolkit pop-up menus have
 @samp{menu*} instead of @samp{pane.menubar}.  For example, to specify
@@ -474,15 +467,6 @@ For dialog boxes, use @samp{dialog*}:
 Emacs.dialog*.font: Sans-12
 @end example
 
-@noindent
-The @samp{*menu*} as a wildcard matches @samp{pane.menubar} and
-@samp{menu@dots{}}.
-
-Experience shows that on some systems you may need to add
-@samp{shell.}@: before the @samp{pane.menubar} or @samp{menu*}.  On
-some other systems, you must not add @samp{shell.}.  The generic wildcard
-approach should work on both kinds of systems.
-
   Here is a list of the specific resources for menu bars and pop-up menus:
 
 @table @code
@@ -677,10 +661,10 @@ to courier with size 12:
 gtk-font-name = "courier 12"
 @end smallexample
 
-  The thing to note is that the font name is not an X font name, like
--*-helvetica-medium-r-*--*-120-*-*-*-*-*-*, but a Pango font name.  A Pango
-font name is basically of the format "family style size", where the style
-is optional as in the case above.  A name with a style could be for example:
+  The thing to note is that the font name is not an X font name, but a
+Pango font name.  A Pango font name is basically of the format "family
+style size", where the style is optional as in the case above.  A name
+with a style could be for example:
 
 @smallexample
 gtk-font-name = "helvetica bold 10"
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97fb9711b6..dae3ab5c71 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Juanma Barranquero  <lekktu@gmail.com>
+
+	* progmodes/python.el (python-font-lock-keywords):
+	Add the Python 3.X keyword "nonlocal" (bug#8639).
+
 2011-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/eieio.el (defmethod): Fix quoting of code (bug#8677).
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a7851c5435..67a51dfbee 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -99,7 +99,9 @@
 	     "import" "in" "is" "lambda" "not" "or" "pass" "print"
 	     "raise" "return" "try" "while" "with" "yield"
              ;; Not real keywords, but close enough to be fontified as such
-             "self" "True" "False")
+             "self" "True" "False"
+             ;; Python 3
+             "nonlocal")
 	 symbol-end)
     (,(rx symbol-start "None" symbol-end)	; see § Keywords in 2.7 manual
      . font-lock-constant-face)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index a493f0dcfc..56ebe868a2 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1119,46 +1119,46 @@ else cover the whole buffer."
       (goto-char end) (diff-end-of-hunk nil 'donttrustheader)
       (let ((plus 0) (minus 0) (space 0) (bang 0))
 	(while (and (= (forward-line -1) 0) (<= start (point)))
-          (if (not (looking-at
-                    (concat diff-hunk-header-re-unified
-                            "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
-                            "\\|--- .+\n\\+\\+\\+ ")))
-              (case (char-after)
-                (?\s (incf space))
-                (?+ (incf plus))
-                (?- (incf minus))
-                (?! (incf bang))
-                ((?\\ ?#) nil)
-                (t  (setq space 0 plus 0 minus 0 bang 0)))
-            (cond
-             ((looking-at diff-hunk-header-re-unified)
-              (let* ((old1 (match-string 2))
-                     (old2 (match-string 4))
-                     (new1 (number-to-string (+ space minus)))
-                     (new2 (number-to-string (+ space plus))))
-                (if old2
-                    (unless (string= new2 old2) (replace-match new2 t t nil 4))
-                  (goto-char (match-end 3))
-                  (insert "," new2))
-                (if old1
-                    (unless (string= new1 old1) (replace-match new1 t t nil 2))
-                  (goto-char (match-end 1))
-                  (insert "," new1))))
-             ((looking-at diff-context-mid-hunk-header-re)
-              (when (> (+ space bang plus) 0)
-                (let* ((old1 (match-string 1))
-                       (old2 (match-string 2))
-                       (new (number-to-string
-                             (+ space bang plus -1 (string-to-number old1)))))
-                  (unless (string= new old2) (replace-match new t t nil 2)))))
-             ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$")
-              (when (> (+ space bang minus) 0)
-                (let* ((old (match-string 1))
-                       (new (format
-                             (concat "%0" (number-to-string (length old)) "d")
-                             (+ space bang minus -1 (string-to-number old)))))
-                  (unless (string= new old) (replace-match new t t nil 2))))))
-            (setq space 0 plus 0 minus 0 bang 0)))))))
+	  (if (not (looking-at
+		    (concat diff-hunk-header-re-unified
+			    "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
+			    "\\|--- .+\n\\+\\+\\+ ")))
+	      (case (char-after)
+		(?\s (incf space))
+		(?+ (incf plus))
+		(?- (incf minus))
+		(?! (incf bang))
+		((?\\ ?#) nil)
+		(t  (setq space 0 plus 0 minus 0 bang 0)))
+	    (cond
+	     ((looking-at diff-hunk-header-re-unified)
+	      (let* ((old1 (match-string 2))
+		     (old2 (match-string 4))
+		     (new1 (number-to-string (+ space minus)))
+		     (new2 (number-to-string (+ space plus))))
+		(if old2
+		    (unless (string= new2 old2) (replace-match new2 t t nil 4))
+		  (goto-char (match-end 3))
+		  (insert "," new2))
+		(if old1
+		    (unless (string= new1 old1) (replace-match new1 t t nil 2))
+		  (goto-char (match-end 1))
+		  (insert "," new1))))
+	     ((looking-at diff-context-mid-hunk-header-re)
+	      (when (> (+ space bang plus) 0)
+		(let* ((old1 (match-string 1))
+		       (old2 (match-string 2))
+		       (new (number-to-string
+			     (+ space bang plus -1 (string-to-number old1)))))
+		  (unless (string= new old2) (replace-match new t t nil 2)))))
+	     ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$")
+	      (when (> (+ space bang minus) 0)
+		(let* ((old (match-string 1))
+		       (new (format
+			     (concat "%0" (number-to-string (length old)) "d")
+			     (+ space bang minus -1 (string-to-number old)))))
+		  (unless (string= new old) (replace-match new t t nil 2))))))
+	    (setq space 0 plus 0 minus 0 bang 0)))))))
 
 ;;;;
 ;;;; Hooks