Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org
This commit is contained in:
Chong Yidong
commit
41b7f8bc6c
43 changed files with 219 additions and 167 deletions
|
|
@ -1,3 +1,25 @@
|
|||
2012-06-11 Chong Yidong <cyd@gnu.org>
|
||||
|
||||
* emacs.texi: Remove urlcolor setting.
|
||||
|
||||
2012-06-10 Chong Yidong <cyd@gnu.org>
|
||||
|
||||
* emacs.texi: Update ISBN and edition number.
|
||||
|
||||
* anti.texi:
|
||||
* building.texi:
|
||||
* cmdargs.texi:
|
||||
* custom.texi:
|
||||
* display.texi:
|
||||
* files.texi:
|
||||
* frames.texi:
|
||||
* glossary.texi:
|
||||
* misc.texi:
|
||||
* mule.texi:
|
||||
* programs.texi:
|
||||
* sending.texi:
|
||||
* text.texi: Copyedits to avoid underfull/overfull in 7x9 manual.
|
||||
|
||||
2012-06-06 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* custom.texi (Directory Variables): Mention enable-remote-dir-locals.
|
||||
|
|
|
|||
|
|
@ -63,19 +63,18 @@ string (@code{isearch-yank-line}), whereas @kbd{M-y} does
|
|||
@kbd{C-y} and @kbd{M-y} is unintended.
|
||||
|
||||
@item
|
||||
Various completion features have been simplified. The options
|
||||
@code{completion-cycle-threshold} and
|
||||
@code{completion-category-overrides} have been removed. Due to the
|
||||
latter removal, Emacs uses a single consistent scheme to generate
|
||||
completions, instead of using a separate scheme for (say) buffer name
|
||||
completion. Several major modes, such as Shell mode, now implement
|
||||
their own inline completion commands instead of using
|
||||
@code{completion-at-point}.
|
||||
Various completion features have been simplified. The option
|
||||
@code{completion-category-overrides} has been removed, so Emacs uses a
|
||||
single consistent scheme to generate completions, instead of using a
|
||||
separate scheme for (say) buffer name completion. Several major
|
||||
modes, such as Shell mode, now implement their own inline completion
|
||||
commands instead of using @code{completion-at-point}.
|
||||
|
||||
@item
|
||||
We have removed various options for controlling how windows are used,
|
||||
e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist},
|
||||
@code{window-combination-limit}, and @code{window-combination-resize}.
|
||||
We have removed several options for controlling how windows are used,
|
||||
such as @code{display-buffer-base-action},
|
||||
@code{display-buffer-alist}, @code{window-combination-limit}, and
|
||||
@code{window-combination-resize}.
|
||||
|
||||
@item
|
||||
The command @kbd{M-x customize-themes} has been removed. Emacs no
|
||||
|
|
|
|||
|
|
@ -426,11 +426,11 @@ 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 enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump to
|
||||
the errors that it finds by using @kbd{M-x
|
||||
flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.
|
||||
Use the command @kbd{M-x flymake-display-err-menu-for-current-line}
|
||||
to display any error messages associated with the current line.
|
||||
To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump
|
||||
to the errors that it finds by using @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, type @kbd{M-x
|
||||
flymake-display-err-menu-for-current-line}.
|
||||
|
||||
For more details about using Flymake,
|
||||
@ifnottex
|
||||
|
|
@ -1495,7 +1495,7 @@ eval-buffer} is similar but evaluates the entire buffer.
|
|||
@vindex eval-expression-print-level
|
||||
@vindex eval-expression-print-length
|
||||
@vindex eval-expression-debug-on-error
|
||||
The customizable variables @code{eval-expression-print-level} and
|
||||
The options @code{eval-expression-print-level} and
|
||||
@code{eval-expression-print-length} control the maximum depth and
|
||||
length of lists to print in the result of the evaluation commands
|
||||
before abbreviating them. @code{eval-expression-debug-on-error}
|
||||
|
|
|
|||
|
|
@ -245,10 +245,10 @@ Scroll calendar one month forward (@code{calendar-scroll-left}).
|
|||
Scroll calendar one month backward (@code{calendar-scroll-right}).
|
||||
@item C-v
|
||||
@itemx @key{next}
|
||||
Scroll three months forward (@code{calendar-scroll-left-three-months}).
|
||||
Scroll forward by three months (@code{calendar-scroll-left-three-months}).
|
||||
@item M-v
|
||||
@itemx @key{prior}
|
||||
Scroll three months backward (@code{calendar-scroll-right-three-months}).
|
||||
Scroll backward by three months (@code{calendar-scroll-right-three-months}).
|
||||
@end table
|
||||
|
||||
@kindex > @r{(Calendar mode)}
|
||||
|
|
|
|||
|
|
@ -436,7 +436,7 @@ Used by the @code{cd} command to search for the directory you specify,
|
|||
when you specify a relative directory name.
|
||||
@item EMACSDATA
|
||||
Directory for the architecture-independent files that come with Emacs.
|
||||
This is used to initialize the Lisp variable @code{data-directory}.
|
||||
This is used to initialize the variable @code{data-directory}.
|
||||
@item EMACSDOC
|
||||
Directory for the documentation string file, which is used to
|
||||
initialize the Lisp variable @code{doc-directory}.
|
||||
|
|
@ -577,7 +577,8 @@ does not use @env{TZ} at all.
|
|||
The user's login name. See also @env{LOGNAME}. On MS-DOS, this
|
||||
defaults to @samp{root}.
|
||||
@item VERSION_CONTROL
|
||||
Used to initialize the @code{version-control} variable (@pxref{Backup Names}).
|
||||
Used to initialize the @code{version-control} variable (@pxref{Backup
|
||||
Names}).
|
||||
@end table
|
||||
|
||||
@node Misc Variables
|
||||
|
|
|
|||
|
|
@ -765,16 +765,14 @@ displays something like this:
|
|||
@example
|
||||
fill-column is a variable defined in `C source code'.
|
||||
fill-column's value is 70
|
||||
Local in buffer custom.texi; global value is 70
|
||||
Automatically becomes buffer-local when set in any fashion.
|
||||
|
||||
Automatically becomes buffer-local when set in any fashion.
|
||||
This variable is safe as a file local variable if its value
|
||||
satisfies the predicate `integerp'.
|
||||
Automatically becomes buffer-local when set in any fashion.
|
||||
This variable is safe as a file local variable if its value
|
||||
satisfies the predicate `integerp'.
|
||||
|
||||
Documentation:
|
||||
*Column beyond which automatic line-wrapping should happen.
|
||||
Interactively, you can set the buffer local value using C-x f.
|
||||
Column beyond which automatic line-wrapping should happen.
|
||||
Interactively, you can set the local value with C-x f.
|
||||
|
||||
You can customize this variable.
|
||||
@end example
|
||||
|
|
@ -1054,13 +1052,14 @@ pair with a colon and semicolon. The special variable/value pair
|
|||
@findex add-file-local-variable-prop-line
|
||||
@findex delete-file-local-variable-prop-line
|
||||
@findex copy-dir-locals-to-file-locals-prop-line
|
||||
You can use the command @kbd{M-x add-file-local-variable-prop-line}
|
||||
instead of adding entries by hand. It prompts for
|
||||
a variable and value, and adds them to the first line in the
|
||||
appropriate way. @kbd{M-x delete-file-local-variable-prop-line}
|
||||
prompts for a variable, and deletes its entry from the line. @kbd{M-x
|
||||
copy-dir-locals-to-file-locals-prop-line} copies directory-local
|
||||
variables to the first line (@pxref{Directory Variables}).
|
||||
You can use @kbd{M-x add-file-local-variable-prop-line} instead of
|
||||
adding entries by hand. This command prompts for a variable and
|
||||
value, and adds them to the first line in the appropriate way.
|
||||
@kbd{M-x delete-file-local-variable-prop-line} prompts for a variable,
|
||||
and deletes its entry from the line. The command @kbd{M-x
|
||||
copy-dir-locals-to-file-locals-prop-line} copies the current
|
||||
directory-local variables to the first line (@pxref{Directory
|
||||
Variables}).
|
||||
|
||||
Here is an example first line that specifies Lisp mode and sets two
|
||||
variables with numeric values:
|
||||
|
|
|
|||
|
|
@ -759,11 +759,10 @@ argument disables it.
|
|||
|
||||
@findex global-font-lock-mode
|
||||
@vindex global-font-lock-mode
|
||||
To toggle Font Lock mode in all buffers, type @kbd{M-x
|
||||
global-font-lock-mode}. To impose this setting for future Emacs
|
||||
sessions, customize the variable @code{global-font-lock-mode}
|
||||
(@pxref{Easy Customization}), or add the following line to your init
|
||||
file:
|
||||
Type @kbd{M-x global-font-lock-mode} to toggle Font Lock mode in all
|
||||
buffers. To impose this setting for future Emacs sessions, customize
|
||||
the variable @code{global-font-lock-mode} (@pxref{Easy
|
||||
Customization}), or add the following line to your init file:
|
||||
|
||||
@example
|
||||
(global-font-lock-mode 0)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
@c be something added by the FSF during the publishing process.
|
||||
@c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
|
||||
@c so the format is not even consistent.
|
||||
@set EDITION Sixteenth
|
||||
@set EDITION Seventeenth
|
||||
@include emacsver.texi
|
||||
|
||||
@copying
|
||||
|
|
@ -54,7 +54,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 @smallbook
|
||||
@c @set smallbook
|
||||
|
||||
@ifset smallbook
|
||||
@smallbook
|
||||
|
|
@ -66,8 +66,6 @@ developing GNU and promoting software freedom.''
|
|||
@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
|
||||
|
|
@ -96,10 +94,10 @@ developing GNU and promoting software freedom.''
|
|||
Published by the Free Software Foundation @*
|
||||
51 Franklin Street, Fifth Floor @*
|
||||
Boston, MA 02110-1301 USA @*
|
||||
ISBN 1-882114-86-8
|
||||
ISBN 978-0-9831592-2-3
|
||||
|
||||
@sp 2
|
||||
Cover art by Etienne Suvasa.
|
||||
Cover art by Etienne Suvasa; cover design by Matt Lee.
|
||||
|
||||
@end titlepage
|
||||
|
||||
|
|
|
|||
|
|
@ -1101,11 +1101,11 @@ recover are present in Emacs buffers. You should then save them. Only
|
|||
this---saving them---updates the files themselves.
|
||||
|
||||
@vindex auto-save-list-file-prefix
|
||||
Emacs records information about interrupted sessions for later
|
||||
recovery in files named @file{.saves-@var{pid}-@var{hostname}} in the
|
||||
directory @file{~/.emacs.d/auto-save-list/}. This directory is
|
||||
determined by the variable @code{auto-save-list-file-prefix}. If you
|
||||
set @code{auto-save-list-file-prefix} to @code{nil}, sessions are not
|
||||
Emacs records information about interrupted sessions in files named
|
||||
@file{.saves-@var{pid}-@var{hostname}} in the directory
|
||||
@file{~/.emacs.d/auto-save-list/}. This directory is determined by
|
||||
the variable @code{auto-save-list-file-prefix}. If you set
|
||||
@code{auto-save-list-file-prefix} to @code{nil}, sessions are not
|
||||
recorded for recovery.
|
||||
|
||||
@node File Aliases
|
||||
|
|
|
|||
|
|
@ -499,7 +499,8 @@ Add a line to your init file, modifying the variable
|
|||
(@pxref{Frame Parameters}), like this:
|
||||
|
||||
@example
|
||||
(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
|
||||
(add-to-list 'default-frame-alist
|
||||
'(font . "DejaVu Sans Mono-10"))
|
||||
@end example
|
||||
|
||||
@cindex X defaults file
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ An @acronym{ASCII} control character is the Control version of an upper-case
|
|||
letter, or the Control version of one of the characters @samp{@@[\]^_?}.
|
||||
|
||||
@item @acronym{ASCII} printing character
|
||||
@acronym{ASCII} printing characters include letters, digits, space, and these
|
||||
punctuation characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
|
||||
@acronym{ASCII} letters, digits, space, and the following punctuation
|
||||
characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
|
||||
|
||||
@item Auto Fill Mode
|
||||
Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is
|
||||
|
|
|
|||
|
|
@ -903,11 +903,11 @@ Display the changes that will be sent by the next push operation
|
|||
|
||||
@kindex C-x v l
|
||||
@findex vc-print-log
|
||||
The command @kbd{C-x v l} (@code{vc-print-log}) displays a buffer
|
||||
named @file{*vc-change-log*}, showing the history of changes made to
|
||||
the current file, including who made the changes, the dates, and the
|
||||
log entry for each change (these are the same log entries you would
|
||||
enter via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is
|
||||
@kbd{C-x v l} (@code{vc-print-log}) displays a buffer named
|
||||
@file{*vc-change-log*}, showing the history of changes made to the
|
||||
current file, including who made the changes, the dates, and the log
|
||||
entry for each change (these are the same log entries you would enter
|
||||
via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is
|
||||
centered at the revision of the file currently being visited. With a
|
||||
prefix argument, the command prompts for the revision to center on,
|
||||
and the maximum number of revisions to display.
|
||||
|
|
|
|||
|
|
@ -2257,18 +2257,18 @@ editors. Standard facilities can emulate these:
|
|||
@cindex Brief emulation
|
||||
@cindex emulation of Brief
|
||||
@cindex mode, CRiSP
|
||||
You can turn on key bindings to emulate the CRiSP/Brief editor with
|
||||
@kbd{M-x crisp-mode}. Note that this rebinds @kbd{M-x} to exit Emacs
|
||||
unless you set the variable @code{crisp-override-meta-x}. You can
|
||||
also use the command @kbd{M-x scroll-all-mode} or set the variable
|
||||
@kbd{M-x crisp-mode} enables key bindings to emulate the CRiSP/Brief
|
||||
editor. Note that this rebinds @kbd{M-x} to exit Emacs unless you set
|
||||
the variable @code{crisp-override-meta-x}. You can also use the
|
||||
command @kbd{M-x scroll-all-mode} or set the variable
|
||||
@code{crisp-load-scroll-all} to emulate CRiSP's scroll-all feature
|
||||
(scrolling all windows together).
|
||||
|
||||
@item EDT (DEC VMS editor)
|
||||
@findex edt-emulation-on
|
||||
@findex edt-emulation-off
|
||||
Turn on EDT emulation @kbd{M-x edt-emulation-on}; use @kbd{M-x
|
||||
edt-emulation-off} to restore normal Emacs command bindings.
|
||||
Turn on EDT emulation with @kbd{M-x edt-emulation-on}; restore normal
|
||||
command bindings with @kbd{M-x edt-emulation-off}.
|
||||
|
||||
Most of the EDT emulation commands are keypad keys, and most standard
|
||||
Emacs key bindings are still available. The EDT emulation rebindings
|
||||
|
|
@ -2454,7 +2454,7 @@ point (@code{dired-at-point}).
|
|||
@code{ffap-read-only-other-window}, analogous to
|
||||
@code{find-file-read-only-other-window}.
|
||||
@item C-x 4 d
|
||||
@code{ffap-dired-other-window}, analogous to @code{dired-other-window}.
|
||||
@code{ffap-dired-other-window}, like @code{dired-other-window}.
|
||||
@item C-x 5 f
|
||||
@kindex C-x 5 f @r{(FFAP)}
|
||||
@code{ffap-other-frame}, analogous to @code{find-file-other-frame}.
|
||||
|
|
@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}).
|
|||
|
||||
@findex animate-birthday-present
|
||||
@cindex animate
|
||||
The @code{animate} package makes text dance (e.g. try
|
||||
@kbd{M-x animate-birthday-present}).
|
||||
The @code{animate} package makes text dance (e.g. @kbd{M-x
|
||||
animate-birthday-present}).
|
||||
|
||||
@findex blackbox
|
||||
@findex mpuz
|
||||
|
|
|
|||
|
|
@ -415,16 +415,15 @@ names, which might cause misalignment of columns in Dired display.
|
|||
@section HOME and Startup Directories on MS-Windows
|
||||
@cindex @code{HOME} directory on MS-Windows
|
||||
|
||||
The Windows equivalent of the @code{HOME} directory is the
|
||||
@dfn{user-specific application data directory}. The actual location
|
||||
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}.
|
||||
The Windows equivalent of @code{HOME} is the @dfn{user-specific
|
||||
application data directory}. The actual location depends on the
|
||||
Windows version; typical values are @file{C:\Documents and
|
||||
Settings\@var{username}\Application Data} on Windows 2000/XP/2K3,
|
||||
@file{C:\Users\@var{username}\AppData\Roaming} on Windows
|
||||
Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or
|
||||
@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows
|
||||
9X/ME. If this directory does not exist or cannot be accessed, Emacs
|
||||
falls back to @file{C:\} as the default value of @code{HOME}.
|
||||
|
||||
You can override this default value of @code{HOME} by explicitly
|
||||
setting the environment variable @env{HOME} to point to any directory
|
||||
|
|
|
|||
|
|
@ -1111,11 +1111,11 @@ in communication with other processes.
|
|||
@table @kbd
|
||||
@item C-x @key{RET} x @var{coding} @key{RET}
|
||||
Use coding system @var{coding} for transferring selections to and from
|
||||
other window-based applications (@code{set-selection-coding-system}).
|
||||
other graphical applications (@code{set-selection-coding-system}).
|
||||
|
||||
@item C-x @key{RET} X @var{coding} @key{RET}
|
||||
Use coding system @var{coding} for transferring @emph{one}
|
||||
selection---the next one---to or from another window-based application
|
||||
selection---the next one---to or from another graphical application
|
||||
(@code{set-next-selection-coding-system}).
|
||||
|
||||
@item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET}
|
||||
|
|
|
|||
|
|
@ -1651,7 +1651,8 @@ the keymap is loaded before we try to change it.
|
|||
|
||||
@example
|
||||
(defun my-bind-clb ()
|
||||
(define-key c-mode-base-map "\C-j" 'c-context-line-break))
|
||||
(define-key c-mode-base-map "\C-j"
|
||||
'c-context-line-break))
|
||||
(add-hook 'c-initialization-hook 'my-bind-clb)
|
||||
@end example
|
||||
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ CC: mongol.soldier@@example.net, rms@@gnu.org
|
|||
Subject: Re: What is best in life?
|
||||
From: conan@@example.org
|
||||
--text follows this line--
|
||||
To crush your enemies, see them driven before you, and to hear the
|
||||
lamentation of their women.
|
||||
To crush your enemies, see them driven before you, and to
|
||||
hear the lamentation of their women.
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
|
|
|
|||
|
|
@ -1015,11 +1015,11 @@ Both accept numeric arguments as repeat counts.
|
|||
@kindex C-c C-f @r{(Outline mode)}
|
||||
@kindex C-c C-b @r{(Outline mode)}
|
||||
@kindex C-c C-u @r{(Outline mode)}
|
||||
The commands @kbd{C-c C-f} (@code{outline-forward-same-level}) and
|
||||
@kbd{C-c C-b} (@code{outline-backward-same-level}) move from one
|
||||
heading line to another visible heading at the same depth in the
|
||||
outline. @kbd{C-c C-u} (@code{outline-up-heading}) moves backward to
|
||||
another heading that is less deeply nested.
|
||||
@kbd{C-c C-f} (@code{outline-forward-same-level}) and @kbd{C-c C-b}
|
||||
(@code{outline-backward-same-level}) move from one heading line to
|
||||
another visible heading at the same depth in the outline. @kbd{C-c
|
||||
C-u} (@code{outline-up-heading}) moves backward to another heading
|
||||
that is less deeply nested.
|
||||
|
||||
@node Outline Visibility
|
||||
@subsection Outline Visibility Commands
|
||||
|
|
@ -2311,8 +2311,7 @@ hides text), and @code{intangible} (which disallows moving point
|
|||
within the text). The @samp{Remove Special} menu item removes all of
|
||||
these special properties from the text in the region.
|
||||
|
||||
The @code{invisible} and @code{intangible} properties are not saved
|
||||
in the @samp{text/enriched} format.
|
||||
The @code{invisible} and @code{intangible} properties are not saved.
|
||||
|
||||
@node Text Based Tables
|
||||
@section Editing Text-based Tables
|
||||
|
|
@ -2345,8 +2344,8 @@ large to fit in the cell. You can use the commands defined in the
|
|||
following sections for navigating and editing the table layout.
|
||||
|
||||
@findex table-fixed-width-mode
|
||||
To toggle the automatic table resizing feature, type @kbd{M-x
|
||||
table-fixed-width-mode}.
|
||||
Type @kbd{M-x table-fixed-width-mode} to toggle the automatic table
|
||||
resizing feature.
|
||||
|
||||
@menu
|
||||
* Table Definition:: What is a text based table.
|
||||
|
|
@ -2506,15 +2505,16 @@ result in an illegitimate cell layout.
|
|||
@cindex text-based tables, splitting cells
|
||||
@cindex splitting table cells
|
||||
@kbd{M-x table-split-cell} splits the current cell vertically or
|
||||
horizontally, prompting for the direction with the minibuffer. The
|
||||
commands @kbd{M-x table-split-cell-vertically} and @kbd{M-x
|
||||
table-split-cell-horizontally} split in a specific direction. When
|
||||
splitting vertically, the old cell contents are automatically split
|
||||
between the two new cells. When splitting horizontally, you are
|
||||
prompted for how to divide the cell contents, if the cell is
|
||||
non-empty; the options are @samp{split} (divide the contents at
|
||||
point), @samp{left} (put all the contents in the left cell), and
|
||||
@samp{right} (put all the contents in the right cell).
|
||||
horizontally, prompting for the direction with the minibuffer. To
|
||||
split in a specific direction, use @kbd{M-x
|
||||
table-split-cell-vertically} and @kbd{M-x
|
||||
table-split-cell-horizontally}. When splitting vertically, the old
|
||||
cell contents are automatically split between the two new cells. When
|
||||
splitting horizontally, you are prompted for how to divide the cell
|
||||
contents, if the cell is non-empty; the options are @samp{split}
|
||||
(divide the contents at point), @samp{left} (put all the contents in
|
||||
the left cell), and @samp{right} (put all the contents in the right
|
||||
cell).
|
||||
|
||||
The following commands enlarge or shrink a cell. By default, they
|
||||
resize by one row or column; if a numeric argument is supplied, that
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
3
etc/NEWS
3
etc/NEWS
|
|
@ -617,7 +617,8 @@ terminal coding system. The new option `glyphless-char-display-control'
|
|||
specifies how to display them: as a hexadecimal code in a box, a thin
|
||||
1-pixel space, an empty box, etc.
|
||||
|
||||
*** New input methods: farsi, farsi-translit, bulgarian-alt-phonetic.
|
||||
*** New input methods for Farsi and Bulgarian
|
||||
(farsi-isiri-9147, farsi-transliterate-banan, bulgarian-alt-phonetic).
|
||||
|
||||
*** `nobreak-char-display' now also highlights Unicode hyphen chars
|
||||
(U+2010 and U+2011).
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2012-06-13 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* international/mule-cmds.el (mule-menu-keymap)
|
||||
(set-language-environment, set-locale-environment): Doc tweaks.
|
||||
|
||||
2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com>
|
||||
|
||||
* cus-face.el (custom-face-attributes): Add wave-style underline
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2012-06-10 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change)
|
||||
|
||||
* nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time'
|
||||
is an integer to avoid later problems.
|
||||
|
||||
2012-06-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* shr.el: Add a iso-8859-1 cookie to make stuff work under other
|
||||
locales.
|
||||
|
||||
2012-04-14 Wolfgang Jenkner <wjenkner@inode.at>
|
||||
|
||||
* gnus-agent.el (gnus-agent-retrieve-headers): Recalculate the range of
|
||||
|
|
|
|||
|
|
@ -1461,7 +1461,7 @@ by nnmaildir-request-article.")
|
|||
(if (eq time 'immediate)
|
||||
(setq time 0)
|
||||
(if (numberp time)
|
||||
(setq time (* time 86400)))))
|
||||
(setq time (round (* time 86400))))))
|
||||
(when no-force
|
||||
(unless (integerp time) ;; handle 'never
|
||||
(throw 'return (gnus-uncompress-range ranges)))
|
||||
|
|
|
|||
|
|
@ -1393,4 +1393,8 @@ ones, in case fg and bg are nil."
|
|||
|
||||
(provide 'shr)
|
||||
|
||||
;; Local Variables:
|
||||
;; coding: iso-8859-1
|
||||
;; End:
|
||||
|
||||
;;; shr.el ends here
|
||||
|
|
|
|||
|
|
@ -129,10 +129,10 @@
|
|||
`(menu-item ,(purecopy "Set Coding Systems") ,set-coding-system-map
|
||||
:enable (default-value 'enable-multibyte-characters)))
|
||||
(define-key-after map [view-hello-file]
|
||||
`(menu-item ,(purecopy "Show Multi-lingual Text") view-hello-file
|
||||
`(menu-item ,(purecopy "Show Multilingual Sample Text") view-hello-file
|
||||
:enable (file-readable-p
|
||||
(expand-file-name "HELLO" data-directory))
|
||||
:help ,(purecopy "Display file which says HELLO in many languages")))
|
||||
:help ,(purecopy "Demonstrate various character sets")))
|
||||
(define-key-after map [separator-coding-system] menu-bar-separator)
|
||||
|
||||
(define-key-after map [describe-language-environment]
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
`(menu-item ,(purecopy "List Character Sets") list-character-sets
|
||||
:help ,(purecopy "Show table of available character sets")))
|
||||
(define-key-after map [mule-diag]
|
||||
`(menu-item ,(purecopy "Show All of Mule Status") mule-diag
|
||||
`(menu-item ,(purecopy "Show All Multilingual Settings") mule-diag
|
||||
:help ,(purecopy "Display multilingual environment settings")))
|
||||
map)
|
||||
"Keymap for Mule (Multilingual environment) menu specific commands.")
|
||||
|
|
@ -1828,7 +1828,7 @@ The default status is as follows:
|
|||
(set-terminal-coding-system (or coding-system coding) display)))
|
||||
|
||||
(defun set-language-environment (language-name)
|
||||
"Set up multi-lingual environment for using LANGUAGE-NAME.
|
||||
"Set up multilingual environment for using LANGUAGE-NAME.
|
||||
This sets the coding system priority and the default input method
|
||||
and sometimes other things. LANGUAGE-NAME should be a string
|
||||
which is the name of a language environment. For example, \"Latin-1\"
|
||||
|
|
@ -2500,7 +2500,7 @@ For example, translate \"swedish\" into \"sv_SE.ISO8859-1\"."
|
|||
locale))
|
||||
|
||||
(defun set-locale-environment (&optional locale-name frame)
|
||||
"Set up multi-lingual environment for using LOCALE-NAME.
|
||||
"Set up multilingual environment for using LOCALE-NAME.
|
||||
This sets the language environment, the coding system priority,
|
||||
the default input method and sometimes other things.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2012-06-17 Jan Djärv <jan.h.d@swipnet.se>
|
||||
|
||||
* nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
|
||||
referenced (Bug#11583).
|
||||
|
||||
2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com>
|
||||
|
||||
Implement wave-style variant of underlining.
|
||||
|
|
|
|||
|
|
@ -1155,14 +1155,14 @@ Free a pool and temporary objects it refers to (callable from C)
|
|||
hlinfo->mouse_face_mouse_frame = 0;
|
||||
}
|
||||
|
||||
xfree (f->output_data.ns);
|
||||
|
||||
if (f->output_data.ns->miniimage != nil)
|
||||
[f->output_data.ns->miniimage release];
|
||||
|
||||
[[view window] close];
|
||||
[view release];
|
||||
|
||||
xfree (f->output_data.ns);
|
||||
|
||||
UNBLOCK_INPUT;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue