Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 05:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from mainline.

Browse source
This commit is contained in:
Paul Eggert 2011-05-17 17:39:40 -07:00
commit 7025ee0019
52 changed files with 795 additions and 354 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
INSTALL
View file

@ -208,7 +208,8 @@ The names of the packages that you need varies according to the
GNU/Linux distribution that you use, and the options that you want to
configure Emacs with. On Debian-based systems, you can install all the
packages needed to build the installed version of Emacs with a command
like `apt-get build-dep emacs23'.
like `apt-get build-dep emacs23'. On Red Hat systems, the
corresponding command is `yum-builddep emacs'.
DETAILED BUILDING AND INSTALLATION:

30
doc/emacs/ChangeLog
View file

@ -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):

6
doc/emacs/building.texi
View file

@ -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

12
doc/emacs/calendar.texi
View file

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

17
doc/emacs/cmdargs.texi
View file

@ -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

33
doc/emacs/custom.texi
View file

@ -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

31
doc/emacs/display.texi
View file

@ -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

2
doc/emacs/emacs.texi
View file

@ -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

3
doc/emacs/fixit.texi
View file

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

18
doc/emacs/frames.texi
View file

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

2
doc/emacs/help.texi
View file

@ -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

4
doc/emacs/macos.texi
View file

@ -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

8
doc/emacs/mini.texi
View file

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

15
doc/emacs/misc.texi
View file

@ -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

68
doc/emacs/msdog.texi
View file

@ -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

33
doc/emacs/mule.texi
View file

@ -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

4
doc/emacs/programs.texi
View file

@ -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

12
doc/emacs/rmail.texi
View file

@ -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

88
doc/emacs/text.texi
View file

@ -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:
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.
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.
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

11
doc/emacs/trouble.texi
View file

@ -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

8
doc/emacs/windows.texi
View file

@ -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

24
doc/emacs/xresources.texi
View file

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

4
doc/misc/ChangeLog
View file

@ -1,3 +1,7 @@
2011-05-17 Glenn Morris <rgm@gnu.org>
* gnus.texi (Face): Fix typo.
2011-05-14 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Omitting Examples): Minor addition.

2
doc/misc/gnus.texi
View file

@ -23501,7 +23501,7 @@ specifications.
The @code{gnus-face-properties-alist} variable affects the appearance of
displayed Face images. @xref{X-Face}.
Viewing an @code{Face} header requires an Emacs that is able to display
Viewing a @code{Face} header requires an Emacs that is able to display
PNG images.
@c Maybe add this:
@c (if (featurep 'xemacs)

30
etc/NEWS
View file

@ -90,8 +90,10 @@ error, its exit status is 1.
** auto-mode-case-fold is now enabled by default.
** Internationalization changes
+++
** Emacs now supports display and editing of bidirectional text.
*** Emacs now supports display and editing of bidirectional text.
See the node "Bidirectional Editing" in the Emacs Manual for some
initial documentation.
@ -117,6 +119,20 @@ Note that some advanced display features, such as overlay strings and
`display' text properties, do not yet work correctly when
bidirectional text is reordered for display.
+++
*** Enhanced support for characters that have no glyphs in available fonts.
If a character has no glyphs in any of the available fonts, Emacs by
default will display it either as a hexadecimal code in a box or as a
thin 1-pixel space. In addition to these two methods, Emacs can
display these characters as empty box, as an acronym, or not display
them at all. To change how these characters are displayed, customize
the variable `glyphless-char-display-control'.
On character terminals these methods are used for characters that
cannot be encoded by the `terminal-coding-system'.
*** There are two new input methods for Persian/Farsi: farsi and farsi-translit.
** GTK scroll-bars are now placed on the right by default.
Use `set-scroll-bar-mode' to change this.
@ -154,18 +170,6 @@ off by customizing x-gtk-use-system-tooltips.
with Xft. To change font, use the X resource font, for example:
Emacs.pane.menubar.font: Courier-12
+++
** Enhanced support for characters that have no glyphs in available fonts.
If a character has no glyphs in any of the available fonts, Emacs by
default will display it either as a hexadecimal code in a box or as a
thin 1-pixel space. In addition to these two methods, Emacs can
display these characters as empty box, as an acronym, or not display
them at all. To change how these characters are displayed, customize
the variable `glyphless-char-display-control'.
On character terminals these methods are used for characters that
cannot be encoded by the `terminal-coding-system'.
** On graphical displays, the mode-line no longer ends in dashes.
** On Nextstep/OSX, the menu bar can be hidden by customizing

10
leim/ChangeLog
View file

@ -1,3 +1,13 @@
2011-05-16 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (OTHERS): Add $(srcdir)/quail/persian.elc.
* makefile.w32-in (MISC): Add $(srcdir)/quail/persian.elc.
2011-05-16 Mohsen BANAN <libre@mohsen.banan.1.byname.net>
* quail/persian.el: New file.
2011-05-05 Eli Zaretskii <eliz@gnu.org>
* quail/latin-ltx.el <\beth, \gimel, \daleth>: Produce

1
leim/Makefile.in
View file

@ -126,6 +126,7 @@ OTHERS= \
${srcdir}/quail/ipa.elc \
${srcdir}/quail/hebrew.elc \
${srcdir}/quail/georgian.elc \
$(srcdir)/quail/persian.elc \
${srcdir}/quail/sisheng.elc
MISC= \

1
leim/makefile.w32-in
View file

@ -120,6 +120,7 @@ MISC= \
$(srcdir)/quail/ipa.elc \
$(srcdir)/quail/hebrew.elc \
$(srcdir)/quail/georgian.elc \
$(srcdir)/quail/persian.elc \
$(srcdir)/quail/sisheng.elc
MISC_DIC=\

296
leim/quail/persian.el Normal file
View file

@ -0,0 +1,296 @@
;;; persian.el --- Quail package for inputting Persian/Farsi keyboard -*- coding: utf-8;-*-
;; Copyright (C) 2011 Free Software Foundation, Inc.
;; Author: Mohsen BANAN <libre@mohsen.banan.1.byname.net>
;; http://mohsen.banan.1.byname.net/contact
;; Keywords: multilingual, input method, Farsi, Persian, keyboard
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;; This is a Halaal Poly-Existential intended to remain perpetually Halaal.
;;; Commentary:
;;
;; This file contains a collection of input methods for
;; Persian languages (Farsi, Urdu, Pashto/Afghanic, ...)
;;
;; At this time, the following input methods are specified:
;;
;; - (farsi) Persian Keyboard based on Islamic Republic of Iran's ISIR-9147
;; - (farsi-translit) Intuitive transliteration keyboard layout for Persian
;;
;;; Code:
(require 'quail)
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; farsi
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; The keyboard mapping defined here is based on:
;;
;; Institute of Standards and Industrial Research of Iran
;; Information Technology – Layout of Persian Letters and Symbols on Computer Keyboards
;; ISIRI 9147 -- 1st edition
;; http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147
;;
;; Only layers 1 and 2 of ISIRI-9147 are applicable to emacs.
;;
;; This input method was built using the Farsi table in X Keyboard Configuration Data Base.
;;
;; 0) Selected gnome keyboard "USA"
;; 1) Created a list of all keys
;; 2) Selected gnome keyboard "Iran"
;; 3) For each key just press it and get the mapped persian character
;;
(quail-define-package
"farsi" "Farsi" " ف" nil "Farsi input method.
Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards.
" nil t t t t nil nil nil nil nil t)
;; +----------------------------------------------------------------+
;; | ۱! | ۲٬ | ۳٫ | ۴﷼ | ۵٪ | ۶× | ۷، | ۸* | ۹) | ۰( | -ـ | =+ | `÷ |
;; +----------------------------------------------------------------+
;; | ضْ| صٌ| ثٍ| قً| فُ| غِ| عَ| هّ| خ] | ح[ | ج} | چ{ |
;; +------------------------------------------------------------+
;; | شؤ | سئ | یي | بإ | لأ | اآ | تة | ن» | م« | ک: | گ؛ | \| |
;; +-----------------------------------------------------------+
;; | ظك | طٓ| زژ | رٰ| ذB | دٔ| پء | و> | .< | /؟ |
;; +-------------------------------------------+
(quail-define-rules
("1" ?۱)
("2" ?۲)
("3" ?۳)
("4" ?۴)
("5" ?۵)
("6" ?۶)
("7" ?۷)
("8" ?۸)
("9" ?۹)
("0" ?۰)
("-" ?-)
("=" ?=)
;;("`" ?‍\)) ;; اتصال مجازى
("q" ?ض)
("w" ?ص)
("e" ?ث)
("r" ?ق)
("t" ?ف)
("y" ?غ)
("u" ?ع)
("i" ?ه)
("o" ?خ)
("p" ?ح)
("[" ?ج)
("]" ?چ)
("a" ?ش)
("s" ?س)
("d" ?ی)
("f" ?ب)
("g" ?ل)
("h" ?ا)
("j" ?ت)
("k" ?ن)
("l" ?م)
(";" ?ک)
("'" ?گ)
("\\" ?\\) ;; خط اريب وارو
("z" ?ظ)
("x" ?ط)
("c" ?ز)
("v" ?ر)
("b" ?ذ)
("n" ?د)
("m" ?پ)
("," ?و)
("." ?.)
("/" ?/)
("!" ?!)
("@" ?٬)
("#" ?٫)
("$" ?﷼)
("%" ?٪)
("^" ?×)
("&" ?،)
("*" ?*)
("(" ?\))
(")" ?\()
("_" ?ـ)
("+" ?+)
("~" ?÷)
("Q" ?ْ) ;; ساکن فارسى
("W" ?ٌ) ;; دو پيش فارسى -- تنوين رفع
("E" ?ٍ) ;; دو زير فارسى -- تنوين جر
("R" ?ً) ;; دو زبر فارسى -- تنوين نصب
("T" ?ُ) ;; پيش فارسى -- ضمه
("Y" ?ِ) ;; زير فارسى -- کسره
("U" ?َ) ;; زبر فارسى -- فتحه
("I" ?ّ) ;; تشديد فارسى
("O" ?\])
("P" ?\[)
("{" ?})
("}" ?{)
("A" ?ؤ)
("S" ?ئ)
("D" ?ي)
("F" ?إ)
("G" ?أ)
("H" ?آ)
("J" ?ة)
("K" ?»)
("L" ?«)
(":" ?:)
("\"" ?؛)
("|" ?|)
("Z" ?ك)
("X" ?ٓ)
("C" ?ژ)
("V" ?ٰ)
;; ("B" ?‌‌) ;; فاصلهً مجازى
("N" ?ٔ) ;; همزه فارسى بالا
("M" ?ء) ;; harf farsi hamzeh
("<" ?>)
(">" ?<)
("?" ?؟)
)
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; farsi-translit
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
;;; This is a persian/farsi transliteration keyboard designed
;;; for people who:
;;; - Know how to write in farsi
;;; - Are comfortable with the qwerty keyboard
;;; - Are familiar with two letter phonetic mapping to persian characters
;;; (e.g.: gh, kh, ch, sh, zh, hh, lh)
;;;
;;; This translit keyboard is designed to be intuitive such that
;;; mapping are easy and natural to remember for a persian writer.
;;; For some persian characters there are multiple ways of inputing
;;; the same character.
;;;
;;; The letter 'h' is used for a number of two character mappings,
;;; this means that some character sequence inputs need to be repeated
;;; followed by a backspace followed by the 'h'.
;;; For example: سحر = 's' 's' '<bs>' 'h' 'h' 'r'
;;; In practice such sequences are rare.
;;;
(quail-define-package
"farsi-translit" "Farsi" "پ" t
"Intuitive transliteration keyboard layout for persian/farsi.
" nil t t t t nil nil nil nil nil t)
(quail-define-rules
("a" ?ا)
("A" ?آ) ;; alef madde
("b" ?ب)
("p" ?پ)
("t" ?ت)
("c" ?ث)
("j" ?ج)
("ch" ?چ)
("hh" ?ح)
("kh" ?خ)
("d" ?د)
("Z" ?ذ)
("r" ?ر)
("z" ?ز)
("zh" ?ژ)
("s" ?س)
("sh" ?ش)
("S" ?ص)
("x" ?ض)
("T" ?ط)
("X" ?ظ)
("w" ?ع)
("Q" ?غ)
("f" ?ف)
("q" ?ق)
("gh" ?ق)
("k" ?ک)
("K" ?ك) ;; Arabic kaf
("g" ?گ)
("l" ?ل)
("lh" ?ﻻ)
("m" ?م)
("n" ?ن)
("v" ?و)
("V" ?ؤ)
("u" ?و)
("H" ?ه)
("h" ?ه)
("th" ?ة) ;; ta marbuteh
("yh" ?ۀ) ;; he ye
("y" ?ى)
("i" ?ي)
("I" ?ئ)
("1" ?۱)
("2" ?۲)
("3" ?۳)
("4" ?۴)
("5" ?۵)
("6" ?۶)
("7" ?۷)
("8" ?۸)
("9" ?۹)
("0" ?۰)
("F" ?إ)
("G" ?أ)
("~" ?ّ) ;; tashdid ;; تشديد فارسى
("`" ?ٓ)
("e" ?ِ) ;; zir زير فارسى -- فتحه
("E" ?ٍ) ;; eizan ;; دو زير فارسى -- تنوين جر
("#" ?ً) ;; ً tanvin nasb ;; دو زبر فارسى -- تنوين نصب
("@" ?ْ) ;; ساکن فارسى
("^" ?َ) ;; zbar ;; زبر فارسى -- فتحه
("o" ?ُ) ;; peesh ;; پيش فارسى -- ضمه
("O" ?ٌ) ;; دو پيش فارسى -- تنوين رفع
("?" ?؟) ;; alamat soal
("&" ?ٔ) ;; همزه فارسى بالا
("$" ?ء) ;; hamzeh
("%" ?÷) ;;
("*" ?×) ;;
(";" ?؛) ;;
(",h" ?،) ;; farsi
(",h" ?,) ;; latin
("." ?.) ;;
("_" ?ـ) ;;
)
;;; persian.el ends here

48
lisp/ChangeLog
View file

@ -1,6 +1,50 @@
2011-05-16 Paul Eggert <eggert@cs.ucla.edu>
2011-05-17 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/diff-mode.el (diff-fixup-modifs): Remove stray ')' (Bug#8672).
* progmodes/grep.el (grep-mode): Disable default
compilation-directory-matcher setting (bug#8684).
2011-05-17 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-insert-file-contents): Use "dd"
instead of "head" and "tail". There were problems with SunOS 5.9,
and it performs better.
2011-05-17 Glenn Morris <rgm@gnu.org>
* mail/mail-utils.el (mail-dont-reply-to): Silence compiler.
* progmodes/idlw-shell.el (idlwave-shell-complete-filename):
Replace obsolete function.
* shell.el (pcomplete-parse-arguments-function): Declare.
* calendar/appt.el (appt-message-warning-time, appt-display-mode-line)
(appt-display-diary, appt-display-interval, appt-prev-comp-time)
(appt-check): Doc fixes.
(appt-disp-window-function, appt-delete-window-function):
Remove needless special case in custom :type.
(appt-display-count): Default to 0, not nil.
(appt-check): Reset appt-display-count to 0, not nil.
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).
2011-05-16 Kevin Ryde <user42@zip.com.au>
* info-look.el (makefile-automake-mode): New setups, looking in
automake manual, then makefile-mode.
(makefile-mode): Remove automake manual, have it just in
makefile-automake-mode since there's various things different or
not relevant to plain make.
(makefile-mode): Remove "other-modes" non-existent automake-mode,
believe a hypothetical automake-mode would go to makefile-mode,
not the other way around.
2011-05-15 Chong Yidong <cyd@stupidchicken.com>

72
lisp/calendar/appt.el
View file

@ -62,15 +62,10 @@
;; `appt-check' reads.
;;
;; You can change the way the appointment window is created/deleted by
;; setting the variables
;;
;; appt-disp-window-function
;; and
;; appt-delete-window-function
;;
;; For instance, these variables could be set to functions that display
;; appointments in pop-up frames, which are lowered or iconified after
;; `appt-display-interval' minutes.
;; setting the variables `appt-disp-window-function' and
;; `appt-delete-window-function'. For instance, you could be set them
;; to functions that display appointments in pop-up frames, which are
;; lowered or iconified after `appt-display-interval' minutes.
;;
;;; Code:
@ -84,7 +79,8 @@
:group 'calendar)
(defcustom appt-message-warning-time 12
"Default time in minutes before an appointment that the warning begins."
"Default time in minutes before an appointment that the warning begins.
You probably want to make `appt-display-interval' a factor of this."
:type 'integer
:group 'appt)
@ -122,7 +118,9 @@ See also `appt-audible' and `appt-display-mode-line'."
(defcustom appt-display-mode-line t
"Non-nil means display minutes to appointment and time on the mode line.
This is in addition to any other display of appointment messages."
This is in addition to any other display of appointment messages.
The mode line updates every minute, independent of the value of
`appt-display-interval'."
:type 'boolean
:group 'appt)
@ -134,12 +132,21 @@ Only relevant if reminders are to be displayed in their own window."
(defcustom appt-display-diary t
"Non-nil displays the diary when the appointment list is first initialized.
This will occur at midnight when the appointment list is updated."
This occurs when this package is first activated, and then at
midnight when the appointment list updates."
:type 'boolean
:group 'appt)
(defcustom appt-display-interval 3
"Number of minutes to wait between checking the appointment list."
"Interval in minutes at which to display appointment reminders.
Once an appointment becomes due, Emacs displays reminders every
`appt-display-interval' minutes. You probably want to make
`appt-message-warning-time' be a multiple of this, so that you get
a final message displayed precisely when the appointment is due.
Note that this variable controls the interval at which
`appt-display-message' is called. The mode line display (if active)
always updates every minute."
:type 'integer
:group 'appt)
@ -148,15 +155,13 @@ This will occur at midnight when the appointment list is updated."
Only relevant if reminders are being displayed in a window.
It should take three string arguments: the number of minutes till
the appointment, the current time, and the text of the appointment."
:type '(choice (const appt-disp-window)
function)
:type 'function
:group 'appt)
(defcustom appt-delete-window-function 'appt-delete-window
"Function called to remove appointment window and buffer.
Only relevant if reminders are being displayed in a window."
:type '(choice (const appt-delete-window)
function)
:type 'function
:group 'appt)
@ -194,10 +199,9 @@ Only used if `appt-display-mode-line' is non-nil.")
(put 'appt-mode-string 'risky-local-variable t) ; for 'face property
(defvar appt-prev-comp-time nil
"Time of day (mins since midnight) at which we last checked appointments.
A nil value forces the diary file to be (re-)checked for appointments.")
"Time of day (mins since midnight) at which we last checked appointments.")
(defvar appt-display-count nil
(defvar appt-display-count 0
"Internal variable used to count number of consecutive reminders.")
(defvar appt-timer nil
@ -249,29 +253,28 @@ The following variables control appointment notification:
Controls the format in which reminders are displayed.
`appt-audible'
Variable used to determine if reminder is audible.
Default is t.
Non-nil means there is an audible component to reminders.
`appt-message-warning-time'
Variable used to determine when appointment message
should first be displayed.
The default number of minutes in advance at which reminders
should start.
`appt-display-mode-line'
If non-nil, a generic message giving the time remaining
is shown in the mode-line when an appointment is due.
Non-nil means show in the mode line a countdown to the
time of each appointment, once reminders start.
`appt-display-interval'
Interval in minutes at which to check for pending appointments.
Interval in minutes at which to display appointment messages.
`appt-display-diary'
Display the diary buffer when the appointment list is
initialized for the first time in a day.
Non-nil means display the diary whenever the appointment list is
initialized (e.g. the first time we check for appointments each day).
The following variables are only relevant if reminders are being
displayed in a window:
`appt-display-duration'
The number of seconds an appointment message is displayed.
Number of seconds for which an appointment message is displayed.
`appt-disp-window-function'
Function called to display appointment window.
@ -281,7 +284,7 @@ displayed in a window:
(interactive "P") ; so people can force updates
(let* ((min-to-app -1)
(prev-appt-mode-string appt-mode-string)
(prev-appt-display-count (or appt-display-count 0))
(prev-appt-display-count appt-display-count)
now now-mins appt-mins appt-warn-time)
(save-excursion ; FIXME ?
;; Convert current time to minutes after midnight (12.01am = 1).
@ -301,9 +304,12 @@ displayed in a window:
;; diary-number-of-entries. Since appt.el only
;; works on a daily basis, no need for more entries.
(diary-list-entries (calendar-current-date) 1 t)))))
;; Reset everything now in case we somehow missed a minute,
;; or (more likely) an appt was deleted. (This is the only
;; reason we need prev-appt-display-count.)
(setq appt-prev-comp-time now-mins
appt-mode-string nil
appt-display-count nil)
appt-display-count 0)
;; Remove any entries that are in the past.
;; FIXME how can there be any such entries, given that this
;; function removes entries when they hit zero minutes,
@ -354,7 +360,7 @@ displayed in a window:
;; appointment on the next cycle.
(if (zerop min-to-app)
(setq appt-time-msg-list (cdr appt-time-msg-list)
appt-display-count nil)
appt-display-count 0)
(setq appt-display-count (1+ prev-appt-display-count)))))
;; If we have changed the mode line string, redisplay all mode lines.
(and appt-display-mode-line

2
lisp/emacs-lisp/eieio.el
View file

@ -1308,7 +1308,7 @@ Summary:
(defgeneric ,method ,args
,(or (documentation code)
(format "Generically created method `%s'." method)))
(eieio--defmethod ',method ',key ',class ',code))))
(eieio--defmethod ',method ',key ',class #',code))))
(defun eieio--defmethod (method kind argclass code)
"Work part of the `defmethod' macro defining METHOD with ARGS."

18
lisp/gnus/ChangeLog
View file

@ -1,3 +1,21 @@
2011-05-17 Glenn Morris <rgm@gnu.org>
* gnus-group.el (gnus-import-other-newsrc-file):
Use insert-file-contents.
2011-05-16 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-sum.el (gnus-summary-hide-all-threads): Add update message every
1000 iterations.
2011-05-16 Katsumi Yamaoka <yamaoka@jpl.org>
* nntp.el (nntp-open-connection): Check if process-type is available.
2011-05-16 Julien Danjou <julien@danjou.info>
* shr.el (shr-tag-del): Add support for del tag.
2011-05-13 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-html.el (gnus-html-put-image): Register a displayer.

2
lisp/gnus/gnus-group.el
View file

@ -4407,7 +4407,7 @@ and the second element is the address."
;; file. Use with caution, if at all.
(defun gnus-import-other-newsrc-file (file)
(with-temp-buffer
(insert-file file)
(insert-file-contents file)
(let (form)
(while (ignore-errors
(setq form (read (current-buffer))))

6
lisp/gnus/gnus-sum.el
View file

@ -11533,8 +11533,12 @@ will not be hidden."
(interactive)
(save-excursion
(goto-char (point-min))
(let ((end nil))
(let ((end nil)
(count 0))
(while (not end)
(incf count)
(when (zerop (mod count 1000))
(message "Hiding all threads... %d" count))
(when (or (not predicate)
(gnus-map-articles
predicate (gnus-summary-article-children)))

3
lisp/gnus/nntp.el
View file

@ -1362,7 +1362,8 @@ password contained in '~/.nntp-authinfo'."
(nntp-kill-buffer pbuffer))
(when (and (buffer-name pbuffer)
process)
(when (and (fboundp 'set-network-process-option)
(when (and (fboundp 'set-network-process-option) ;; Unavailable in XEmacs.
(fboundp 'process-type) ;; Emacs 22 doesn't provide it.
(eq (process-type process) 'network))
;; Use TCP-keepalive so that connections that pass through a NAT router
;; don't hang when left idle.

3
lisp/gnus/shr.el
View file

@ -780,6 +780,9 @@ ones, in case fg and bg are nil."
(defun shr-tag-s (cont)
(shr-fontize-cont cont 'shr-strike-through))
(defun shr-tag-del (cont)
(shr-fontize-cont cont 'shr-strike-through))
(defun shr-tag-b (cont)
(shr-fontize-cont cont 'bold))

28
lisp/info-look.el
View file

@ -720,11 +720,31 @@ Return nil if there is nothing appropriate in the buffer near point."
:mode 'makefile-mode
:regexp "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z][_a-zA-Z0-9-]*"
:doc-spec '(("(make)Name Index" nil
"^[ \t]*`" "'")
("(automake)Macro and Variable Index" nil
"^[ \t]*`" "'"))
:parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+"
:other-modes '(automake-mode))
:parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+")
(info-lookup-maybe-add-help
:topic 'symbol
:mode 'makefile-automake-mode
;; similar regexp/parse-rule as makefile-mode, but also the following
;; (which have index entries),
;; "##" special automake comment
;; "+=" append operator, separate from the GNU make one
:regexp "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z][_a-zA-Z0-9-]*\\|##\\|\\+="
:parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+\\|##\\|\\+="
:doc-spec '(
;; "(automake)Macro Index" is autoconf macros used in
;; configure.in, not Makefile.am, so don't have that here.
("(automake)Variable Index" nil "^[ \t]*`" "'")
;; In automake 1.4 macros and variables were a combined node.
("(automake)Macro and Variable Index" nil "^[ \t]*`" "'")
;; Directives like "if" are in the "General Index".
;; Prefix "`" since the text for say `+=' isn't always an
;; @item etc and so not always at the start of a line.
("(automake)General Index" nil "`" "'")
;; In automake 1.3 there was just a single "Index" node.
("(automake)Index" nil "`" "'"))
:other-modes '(makefile-mode))
(info-lookup-maybe-add-help
:mode 'texinfo-mode

2
lisp/mail/mail-utils.el
View file

@ -236,7 +236,7 @@ comma-separated list, and return the pruned list."
(setq mail-dont-reply-to-names
(concat
;; `rmail-default-dont-reply-to-names' is obsolete.
(if rmail-default-dont-reply-to-names
(if (bound-and-true-p rmail-default-dont-reply-to-names)
(concat rmail-default-dont-reply-to-names "\\|")
"")
(if (and user-mail-address

12
lisp/net/tramp.el
View file

@ -2838,16 +2838,16 @@ User is always nil."
v
(cond
((and beg end)
(format "tail -c +%d %s | head -c +%d >%s"
(1+ beg) (tramp-shell-quote-argument localname)
(format "dd bs=1 skip=%d if=%s count=%d of=%s"
beg (tramp-shell-quote-argument localname)
(- end beg) remote-copy))
(beg
(format "tail -c +%d %s >%s"
(1+ beg) (tramp-shell-quote-argument localname)
(format "dd bs=1 skip=%d if=%s of=%s"
beg (tramp-shell-quote-argument localname)
remote-copy))
(end
(format "head -c +%d %s >%s"
(1+ end) (tramp-shell-quote-argument localname)
(format "dd bs=1 count=%d if=%s of=%s"
end (tramp-shell-quote-argument localname)
remote-copy)))))
;; `insert-file-contents-literally' takes care to avoid

2
lisp/progmodes/cc-defs.el
View file

@ -369,7 +369,7 @@ to it is returned. This function does not modify the point or the mark."
(put 'c-safe 'lisp-indent-function 0)
(defmacro c-int-to-char (integer)
;; In GNU Emacs, a character is an integer. In XEmacs, a character is a
;; In Emacs, a character is an integer. In XEmacs, a character is a
;; type distinct from an integer. Sometimes we need to convert integers to
;; characters. `c-int-to-char' makes this conversion, if necessary.
(if (fboundp 'int-to-char)

1
lisp/progmodes/grep.el
View file

@ -698,6 +698,7 @@ This function is called from `compilation-filter-hook'."
grep-hit-face)
(set (make-local-variable 'compilation-error-regexp-alist)
grep-regexp-alist)
(set (make-local-variable 'compilation-directory-matcher) nil)
(set (make-local-variable 'compilation-process-setup-function)
'grep-process-setup)
(set (make-local-variable 'compilation-disable-input) t)

2
lisp/progmodes/idlw-shell.el
View file

@ -2187,7 +2187,7 @@ args of an executive .run, .rnew or .compile."
;; CWD might have changed, resync, to set default directory
(idlwave-shell-resync-dirs)
(let ((comint-file-name-chars idlwave-shell-file-name-chars))
(comint-dynamic-complete-as-filename)))
(comint-filename-completion)))
(defun idlwave-shell-executive-command ()
"Return the name of the current executive command, if any."

4
lisp/progmodes/python.el
View file

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

2
lisp/shell.el
View file

@ -380,6 +380,8 @@ to `dirtrack-mode'."
:group 'shell
:type '(choice (const nil) regexp))
(defvar pcomplete-parse-arguments-function)
(defun shell-completion-vars ()
"Setup completion vars for `shell-mode' and `read-shell-command'."
(set (make-local-variable 'comint-completion-fignore)

80
lisp/vc/diff-mode.el
View file

@ -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

4
m4/inttypes.m4
View file

@ -1,4 +1,4 @@
# inttypes.m4 serial 23
# inttypes.m4 serial 24
dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@ -13,7 +13,7 @@ AC_DEFUN([gl_INTTYPES_H],
gl_INTTYPES_PRI_SCN
])
AC_DEFUN([gl_INTTYPES_INCOMPLETE],
AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE],
[
AC_REQUIRE([gl_STDINT_H])
AC_CHECK_HEADERS_ONCE([inttypes.h])

4
m4/stdint.m4
View file

@ -1,4 +1,4 @@
# stdint.m4 serial 40
# stdint.m4 serial 41
dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert and Bruno Haible.
dnl Test whether <stdint.h> is supported or must be substituted.
AC_DEFUN([gl_STDINT_H],
AC_DEFUN_ONCE([gl_STDINT_H],
[
AC_PREREQ([2.59])dnl

4
nt/ChangeLog
View file

@ -1,3 +1,7 @@
2011-05-17 Eli Zaretskii <eliz@gnu.org>
* README.W32: Add information about GnuTLS libraries.
2011-05-09 Eli Zaretskii <eliz@gnu.org>
* config.nt [_MSC_VER] (va_copy): Replacement for the MS compiler.

9
nt/README.W32
View file

@ -147,6 +147,15 @@ See the end of the file for license conditions.
unreliable under Windows. See nt/INSTALL in the src distribution if
you wish to compile Emacs with SVG support.
* GnuTLS support
In order to support GnuTLS at runtime, Emacs must be able to find
the relevant DLLs during startup; failure to do so is not an error,
but GnuTLS won't be available to the running session.
You can get pre-built binaries (including any required DLL and the
gnutls.h file) and an installer at http://josefsson.org/gnutls4win/.
* Uninstalling Emacs
If you should need to uninstall Emacs, simply delete all the files

64
src/ChangeLog
View file

@ -1,4 +1,4 @@
2011-05-16 Paul Eggert <eggert@cs.ucla.edu>
2011-05-18 Paul Eggert <eggert@cs.ucla.edu>
* insdel.c (count_size_as_multibyte): Check for string overflow.
@ -17,8 +17,6 @@
* character.c (string_escape_byte8): Likewise.
* lisp.h (string_overflow): New decl.
2011-05-15 Paul Eggert <eggert@cs.ucla.edu>
Fixups, following up to the user-interface timestamp change.
* nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
for UI timestamps, instead of unsigned long.
@ -93,6 +91,10 @@
* window.c (size_window): Avoid needless test at loop start.
2011-05-18 Courtney Bane <emacs-bugs-7626@cbane.org> (tiny change)
* term.c (Fresume_tty): Restore hooks before reinitializing (bug#8687).
2011-05-12 Drew Adams <drew.adams@oracle.com>
* textprop.c (Fprevious_single_char_property_change): Doc fix (bug#8655).
@ -103,8 +105,8 @@
`width' to `bar_area_x' and `bar_area_width', respectively.
(x_scroll_run): Take account of fringe background extension.
* xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]: Rename
local vars `left' and `width' to `bar_area_x' and
* xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]:
Rename local vars `left' and `width' to `bar_area_x' and
`bar_area_width', respectively.
(x_scroll_run) [USE_TOOLKIT_SCROLL_BARS]: Take account of fringe
background extension.
@ -221,8 +223,8 @@
* dbusbind.c: Do not use XPNTR on a value that may be an integer.
Reported by Stefan Monnier in
<http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00919.html>.
(xd_remove_watch, Fdbus_init_bus, xd_read_queued_messages): Use
SYMBOLP-guarded XSYMBOL, not XPNTR.
(xd_remove_watch, Fdbus_init_bus, xd_read_queued_messages):
Use SYMBOLP-guarded XSYMBOL, not XPNTR.
* lisp.h (EMACS_INTPTR): Remove. All uses changed to intptr_t.
(EMACS_UINTPTR): Likewise, with uintptr_t.
@ -408,8 +410,8 @@
* callproc.c: Indentation fixup.
* sysdep.c (wait_for_termination_1): Make static.
(wait_for_termination, interruptible_wait_for_termination): Move
after wait_for_termination_1.
(wait_for_termination, interruptible_wait_for_termination):
Move after wait_for_termination_1.
2011-05-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
@ -525,8 +527,8 @@
(emacs_gnutls_write): Don't use uninitialized rtnval if nbyte <= 0.
* lisp.h: Fix a problem with aliasing and vector headers. (Bug#8546)
GCC 4.6.0 optimizes based on type-based alias analysis. For
example, if b is of type struct buffer * and v of type struct
GCC 4.6.0 optimizes based on type-based alias analysis.
For example, if b is of type struct buffer * and v of type struct
Lisp_Vector *, then gcc -O2 was incorrectly assuming that &b->size
!= &v->size, and therefore "v->size = 1; b->size = 2; return
v->size;" must therefore return 1. This assumption is incorrect
@ -546,8 +548,8 @@
(XSETPSEUDOVECTOR): Rewrite in terms of XSETTYPED_PSEUDOVECTOR.
(XSETSUBR): Rewrite in terms of XSETTYPED_PSEUDOVECTOR and XSIZE,
since Lisp_Subr is a special case (no "next" field).
(ASIZE): Now uses header.size rather than size. All
previous uses of XVECTOR (foo)->size replaced to use this macro,
(ASIZE): Now uses header.size rather than size.
All previous uses of XVECTOR (foo)->size replaced to use this macro,
to avoid the hassle of writing XVECTOR (foo)->header.size.
(struct vectorlike_header): New type.
(TYPED_PSEUDOVECTORP): New macro, also specifying the C type of the
@ -596,7 +598,7 @@
Break out the floating-point parsing into a new
function string_to_number, so that Fstring_to_number parses
floating point numbers consistently with the Lisp reader.
(digit_to_number): Moved here from data.c. Make it static inline.
(digit_to_number): Move here from data.c. Make it static inline.
(E_CHAR, EXP_INT): Remove, replacing with ...
(E_EXP): New macro, to solve the "1.0e+" problem mentioned below.
(string_to_number): New function, replacing isfloat_string.
@ -833,8 +835,8 @@
Fix doprnt so it could be used again safely in `verror'. (Bug#8435)
* doprnt.c: Include limits.h.
(SIZE_MAX): New macro.
(doprnt): Return a size_t value. 2nd arg is now size_t. Many
local variables are now size_t instead of int or unsigned.
(doprnt): Return a size_t value. 2nd arg is now size_t.
Many local variables are now size_t instead of int or unsigned.
Improve overflow protection. Support `l' modifier for integer
conversions. Support %l conversion. Don't assume an EMACS_INT
argument for integer conversions and for %c.
@ -1035,8 +1037,8 @@
* syntax.c (update_syntax_table): Declare 2nd argument EMACS_INT.
* textprop.c (verify_interval_modification, interval_of): Declare
arguments EMACS_INT.
* textprop.c (verify_interval_modification, interval_of):
Declare arguments EMACS_INT.
* intervals.c (adjust_intervals_for_insertion): Declare arguments
EMACS_INT.
@ -1287,8 +1289,8 @@
(free_realized_fontset) #if-0 the body, which does nothing.
(face_suitable_for_char_p): #if-0, as it's never called.
* fontset.h (face_suitable_for_char_p): Remove decl.
* xfaces.c (face_at_string_position): Use
FACE_SUITABLE_FOR_ASCII_CHAR_P, not FACE_SUITABLE_FOR_CHAR_P,
* xfaces.c (face_at_string_position):
Use FACE_SUITABLE_FOR_ASCII_CHAR_P, not FACE_SUITABLE_FOR_CHAR_P,
since 0 is always ASCII.
* fns.c (weak_hash_tables): Now static.
@ -1397,8 +1399,8 @@
(last_point_position_window): Remove decls.
* keyboard.c: Make these variables static.
* coding.h (coding, code_convert_region, encode_coding_gap): Remove
decls.
* coding.h (coding, code_convert_region, encode_coding_gap):
Remove decls.
* coding.c (Vsjis_coding_system, Vbig5_coding_system):
(iso_code_class, detect_coding, code_convert_region): Now static.
(encode_coding_gap): Remove; unused.
@ -1429,7 +1431,7 @@
exported only to the debugger.
* atimer.c (alarm_signal_handler, run_all_atimers): Now static.
* atimer.h (run_all_atimers): Removed; not exported.
* atimer.h (run_all_atimers): Remove; not exported.
font.c: Make copy_font_spec and merge_font_spec ordinary C functions.
* font.c (copy_font_spec): Rename from Fcopy_font_spec, since it
@ -1684,8 +1686,8 @@
2011-04-09 Chong Yidong <cyd@stupidchicken.com>
* ftfont.c (get_adstyle_property, ftfont_pattern_entity): Use
unsigned char, to match FcChar8 type definition.
* ftfont.c (get_adstyle_property, ftfont_pattern_entity):
Use unsigned char, to match FcChar8 type definition.
* xterm.c (handle_one_xevent):
* xmenu.c (create_and_show_popup_menu):
@ -1758,8 +1760,8 @@
2011-04-06 Chong Yidong <cyd@stupidchicken.com>
* process.c (Flist_processes): Removed to Lisp.
(list_processes_1): Deleted.
* process.c (Flist_processes): Remove to Lisp.
(list_processes_1): Delete.
2011-04-06 Eli Zaretskii <eliz@gnu.org>
@ -2017,8 +2019,8 @@
* callint.c (Fcall_interactively): Preserve lexical-binding mode for
interactive spec.
* bytecode.c (Bstack_ref, Bstack_set, Bstack_set2, BdiscardN): New
byte-codes.
* bytecode.c (Bstack_ref, Bstack_set, Bstack_set2, BdiscardN):
New byte-codes.
(exec_byte_code): New function extracted from Fbyte_code to handle new
calling convention for byte-code-functions. Add new byte-codes.
@ -2033,8 +2035,8 @@
2011-03-31 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (SCROLL_LIMIT): New macro.
(try_scrolling): Use it when setting scroll_limit. Limit
scrolling to 100 screen lines.
(try_scrolling): Use it when setting scroll_limit.
Limit scrolling to 100 screen lines.
(redisplay_window): Even when falling back on "recentering",
position point in the window according to scroll-conservatively,
scroll-margin, and scroll-*-aggressively variables. (Bug#6671)

1
src/term.c
View file

@ -2595,6 +2595,7 @@ frame's terminal). */)
FRAME_SET_VISIBLE (XFRAME (t->display_info.tty->top_frame), 1);
}
set_tty_hooks (t);
init_sys_modes (t->display_info.tty);
{