[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100579: Text-fitting fixes for pr
|
From: |
Chong Yidong |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100579: Text-fitting fixes for printed Emacs manual on 7x9 paper. |
|
Date: |
Sun, 15 May 2011 10:21:31 -0400 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 100579
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-05-15 10:21:31 -0400
message:
Text-fitting fixes for printed Emacs manual on 7x9 paper.
* 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.
modified:
doc/emacs/ChangeLog
doc/emacs/building.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/fixit.texi
doc/emacs/frames.texi
doc/emacs/help.texi
doc/emacs/macos.texi
doc/emacs/mini.texi
doc/emacs/misc.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/rmail.texi
doc/emacs/text.texi
doc/emacs/trouble.texi
doc/emacs/windows.texi
doc/emacs/xresources.texi
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2011-04-13 11:50:12 +0000
+++ b/doc/emacs/ChangeLog 2011-05-15 14:21:31 +0000
@@ -1,3 +1,33 @@
+2011-05-15 Chong Yidong <address@hidden>
+
+ 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-04-13 Juanma Barranquero <address@hidden>
* mini.texi (Minibuffer Edit):
=== modified file 'doc/emacs/building.texi'
--- a/doc/emacs/building.texi 2011-01-15 03:10:38 +0000
+++ b/doc/emacs/building.texi 2011-05-15 14:21:31 +0000
@@ -439,8 +439,8 @@
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 @@
@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
=== modified file 'doc/emacs/calendar.texi'
--- a/doc/emacs/calendar.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/calendar.texi 2011-05-15 14:21:31 +0000
@@ -1474,12 +1474,12 @@
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:
=== modified file 'doc/emacs/cmdargs.texi'
--- a/doc/emacs/cmdargs.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/cmdargs.texi 2011-05-15 14:21:31 +0000
@@ -465,9 +465,8 @@
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,
address@hidden@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 address@hidden
Here and below, whenever we say ``colon-separated list of directories,''
@@ -713,14 +712,14 @@
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
@address@hidden:@address@hidden, 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
=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi 2011-02-04 03:17:58 +0000
+++ b/doc/emacs/custom.texi 2011-05-15 14:21:31 +0000
@@ -527,7 +527,8 @@
(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
@@ -583,15 +584,15 @@
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 @address@hidden@address@hidden
-(@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
address@hidden, @samp{white}, @samp{gray}, @samp{gray1}, and
address@hidden 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
address@hidden@address@hidden@var{bb}}. (@samp{#000000} is black,
address@hidden 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},
address@hidden, @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 @@
(c-mode . ((c-file-style . "BSD")))
(java-mode . ((c-file-style . "BSD")))
("src/imported"
- . ((nil . ((change-log-default-name . "ChangeLog.local"))))))
+ . ((nil . ((change-log-default-name .
+ "ChangeLog.local"))))))
@end example
@noindent
@@ -1561,7 +1563,7 @@
@code{minibuffer-local-must-match-map} is for strict completion and
for cautious completion.
@item
-Finally, @code{minibuffer-local-filename-completion-map} and
address@hidden 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}.
@@ -1692,7 +1694,6 @@
(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
@@ -1756,8 +1757,10 @@
@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
=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi 2011-03-26 19:03:24 +0000
+++ b/doc/emacs/display.texi 2011-05-15 14:21:31 +0000
@@ -647,17 +647,17 @@
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
@@ -670,7 +670,8 @@
(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
@@ -874,9 +875,9 @@
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
address@hidden 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
=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi 2011-03-11 17:17:33 +0000
+++ b/doc/emacs/emacs.texi 2011-05-15 14:21:31 +0000
@@ -39,7 +39,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.
address@hidden set smallbook
address@hidden @smallbook
@ifset smallbook
@smallbook
=== modified file 'doc/emacs/fixit.texi'
--- a/doc/emacs/fixit.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/fixit.texi 2011-05-15 14:21:31 +0000
@@ -347,8 +347,7 @@
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.
=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/frames.texi 2011-05-15 14:21:31 +0000
@@ -586,7 +586,8 @@
@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
@@ -753,12 +754,9 @@
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
address@hidden, 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
@@ -831,9 +829,9 @@
@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},
address@hidden or @samp{normal} (some font names support other
-values).
+The font width---normally @samp{normal}, @samp{condensed},
address@hidden, 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.
=== modified file 'doc/emacs/help.texi'
--- a/doc/emacs/help.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/help.texi 2011-05-15 14:21:31 +0000
@@ -630,7 +630,7 @@
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
=== modified file 'doc/emacs/macos.texi'
--- a/doc/emacs/macos.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/macos.texi 2011-05-15 14:21:31 +0000
@@ -162,10 +162,6 @@
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
=== modified file 'doc/emacs/mini.texi'
--- a/doc/emacs/mini.texi 2011-04-13 11:50:12 +0000
+++ b/doc/emacs/mini.texi 2011-05-15 14:21:31 +0000
@@ -69,10 +69,10 @@
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
address@hidden/u2/emacs/lisp/simple.el}. Alternatively, you can use
address@hidden@key{DEL}} to kill directory names backwards (@pxref{Words}).
+ You can specify the parent directory with @file{..}:
address@hidden/a/b/../foo.el} is equivalent to @file{/a/foo.el}.
+Alternatively, you can use @address@hidden 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}).
=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/misc.texi 2011-05-15 14:21:31 +0000
@@ -1585,16 +1585,8 @@
@item -a @var{command}
@itemx address@hidden
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:
-
address@hidden
-EDITOR="emacsclient --alternate-editor emacs +%d %s"
address@hidden example
-
address@hidden
+This is useful when running @code{emacsclient} in a script.
+
As a special exception, if @var{command} is the empty string, then
@code{emacsclient} starts Emacs in daemon mode and then tries
connecting again.
@@ -2490,9 +2482,8 @@
@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
=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi 2011-03-11 11:17:24 +0000
+++ b/doc/emacs/msdog.texi 2011-05-15 14:21:31 +0000
@@ -85,30 +85,29 @@
@cindex invoking Emacs from Windows Explorer
@pindex emacsclient.exe
@pindex emacsclientw.exe
-Via the Emacs client program, @file{emacsclient.exe} or
address@hidden 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
address@hidden, 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
address@hidden 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
address@hidden
+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.
address@hidden 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
address@hidden will pop up a command window if it is invoked
+from a GUI program. A notable situation where you would want
address@hidden 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
address@hidden, Emacs will start in the current directory of
+the program that invoked @command{emacsclient}.
@end enumerate
@node Text and Binary
@@ -402,11 +401,11 @@
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 address@hidden Data} on
-Windows 2K/XP/2K3, @file{C:address@hidden on
-Windows Vista/7/2K8, and either @file{C:\WINDOWS\Application Data}
-or @file{C:address@hidden Data} on the
+depends on the Windows version; typical values are @file{C:\Documents
+and address@hidden Data} on Windows 2K/XP/2K3,
address@hidden:address@hidden on Windows Vista/7/2K8,
+and either @file{C:\WINDOWS\Application Data} or
address@hidden:address@hidden 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 @@
@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,
address@hidden 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,
address@hidden 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
=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/mule.texi 2011-05-15 14:21:31 +0000
@@ -226,7 +226,8 @@
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
@@ -316,7 +317,7 @@
@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
@@ -641,9 +642,9 @@
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
@@ -1469,18 +1470,22 @@
@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
@@ -1645,9 +1650,9 @@
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
=== modified file 'doc/emacs/programs.texi'
--- a/doc/emacs/programs.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/programs.texi 2011-05-15 14:21:31 +0000
@@ -609,7 +609,9 @@
@example
(setq c-default-style
- '((java-mode . "java") (awk-mode . "awk") (other . "gnu")))
+ '((java-mode . "java")
+ (awk-mode . "awk")
+ (other . "gnu")))
@end example
@noindent
=== modified file 'doc/emacs/rmail.texi'
--- a/doc/emacs/rmail.texi 2011-02-05 06:13:36 +0000
+++ b/doc/emacs/rmail.texi 2011-05-15 14:21:31 +0000
@@ -621,13 +621,13 @@
@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
=== modified file 'doc/emacs/text.texi'
--- a/doc/emacs/text.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/text.texi 2011-05-15 14:21:31 +0000
@@ -2810,20 +2810,20 @@
lines):
@example
address@hidden 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
@@ -2837,22 +2837,22 @@
@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
@@ -2862,22 +2862,22 @@
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
=== modified file 'doc/emacs/trouble.texi'
--- a/doc/emacs/trouble.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/trouble.texi 2011-05-15 14:21:31 +0000
@@ -444,8 +444,7 @@
@item
The @samp{bug-gnu-emacs} mailing list (also available as the newsgroup
address@hidden). This is where you will find most Emacs bug
-reports. You can read the list archives at
address@hidden). 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
@@ -455,10 +454,10 @@
@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
=== modified file 'doc/emacs/windows.texi'
--- a/doc/emacs/windows.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/windows.texi 2011-05-15 14:21:31 +0000
@@ -343,10 +343,10 @@
@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
=== modified file 'doc/emacs/xresources.texi'
--- a/doc/emacs/xresources.texi 2011-01-02 23:50:46 +0000
+++ b/doc/emacs/xresources.texi 2011-05-15 14:21:31 +0000
@@ -454,22 +454,6 @@
@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:
-
address@hidden
-Emacs*menu*fontSet: -*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*
address@hidden example
-
address@hidden
-The @samp{*menu*} as a wildcard matches @samp{pane.menubar} and
address@hidden@dots{}}.
-
-Experience shows that on some systems you may need to add
address@hidden@: 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
@@ -661,10 +645,10 @@
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"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100579: Text-fitting fixes for printed Emacs manual on 7x9 paper.,
Chong Yidong <=