[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117035: Merge from emacs-24; up to r117038
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] trunk r117035: Merge from emacs-24; up to r117038 |
|
Date: |
Wed, 30 Apr 2014 19:55:35 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117035 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2014-04-30 21:54:52 +0200
message:
Merge from emacs-24; up to r117038
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/anti.texi anti.texi-20091113204419-o5vbwnq5f7feedwu-6231
doc/emacs/basic.texi basic.texi-20091113204419-o5vbwnq5f7feedwu-6233
doc/emacs/buffers.texi
buffers.texi-20091113204419-o5vbwnq5f7feedwu-6234
doc/emacs/building.texi
building.texi-20091113204419-o5vbwnq5f7feedwu-6235
doc/emacs/calendar.texi
calendar.texi-20091113204419-o5vbwnq5f7feedwu-6237
doc/emacs/commands.texi
commands.texi-20091113204419-o5vbwnq5f7feedwu-6239
doc/emacs/custom.texi
custom.texi-20091113204419-o5vbwnq5f7feedwu-6240
doc/emacs/dired.texi dired.texi-20091113204419-o5vbwnq5f7feedwu-6242
doc/emacs/display.texi
display.texi-20091113204419-o5vbwnq5f7feedwu-6243
doc/emacs/files.texi files.texi-20091113204419-o5vbwnq5f7feedwu-6249
doc/emacs/frames.texi
frames.texi-20091113204419-o5vbwnq5f7feedwu-6252
doc/emacs/glossary.texi
glossary.texi-20091113204419-o5vbwnq5f7feedwu-6253
doc/emacs/help.texi help.texi-20091113204419-o5vbwnq5f7feedwu-6256
doc/emacs/killing.texi
killing.texi-20091113204419-o5vbwnq5f7feedwu-6258
doc/emacs/kmacro.texi
kmacro.texi-20091113204419-o5vbwnq5f7feedwu-6259
doc/emacs/mark.texi mark.texi-20091113204419-o5vbwnq5f7feedwu-6265
doc/emacs/mini.texi mini.texi-20091113204419-o5vbwnq5f7feedwu-6266
doc/emacs/misc.texi misc.texi-20091113204419-o5vbwnq5f7feedwu-6267
doc/emacs/msdog-xtra.texi
msdogxtra.texi-20091113204419-o5vbwnq5f7feedwu-6268
doc/emacs/msdog.texi msdog.texi-20091113204419-o5vbwnq5f7feedwu-6269
doc/emacs/mule.texi mule.texi-20091113204419-o5vbwnq5f7feedwu-6270
doc/emacs/picture-xtra.texi
picturextra.texi-20091113204419-o5vbwnq5f7feedwu-6271
doc/emacs/programs.texi
programs.texi-20091113204419-o5vbwnq5f7feedwu-6272
doc/emacs/rmail.texi rmail.texi-20091113204419-o5vbwnq5f7feedwu-6274
doc/emacs/screen.texi
screen.texi-20091113204419-o5vbwnq5f7feedwu-6275
doc/emacs/search.texi
search.texi-20091113204419-o5vbwnq5f7feedwu-6276
doc/emacs/sending.texi
sending.texi-20091113204419-o5vbwnq5f7feedwu-6277
doc/emacs/text.texi text.texi-20091113204419-o5vbwnq5f7feedwu-6278
doc/emacs/trouble.texi
trouble.texi-20091113204419-o5vbwnq5f7feedwu-6279
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/processes.texi
processes.texi-20091113204419-o5vbwnq5f7feedwu-6207
lib-src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1608
lib-src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-475
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/battery.el battery.el-20091113204419-o5vbwnq5f7feedwu-1189
lisp/desktop.el desktop.el-20091113204419-o5vbwnq5f7feedwu-591
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
lisp/faces.el faces.el-20091113204419-o5vbwnq5f7feedwu-562
lisp/mail/rmail.el rmail.el-20091113204419-o5vbwnq5f7feedwu-8812
lisp/textmodes/rst.el rst.el-20091113204419-o5vbwnq5f7feedwu-8690
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
nt/cmdproxy.c cmdproxy.c-20091113204419-o5vbwnq5f7feedwu-1241
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
src/term.c term.c-20091113204419-o5vbwnq5f7feedwu-220
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-04-21 09:38:44 +0000
+++ b/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,7 @@
+2014-04-30 Glenn Morris <address@hidden>
+
+ * configure.ac: Treat MirBSD as OpenBSD. (Bug#17339)
+
2014-04-21 Daniel Colascione <address@hidden>
* .bzrignore: Add a.out to bzr ignore list (a test generates this
=== modified file 'configure.ac'
--- a/configure.ac 2014-04-19 22:19:54 +0000
+++ b/configure.ac 2014-04-30 19:54:52 +0000
@@ -505,7 +505,7 @@
;;
## OpenBSD ports
- *-*-openbsd* )
+ *-*-openbsd* | *-*-mirbsd* )
opsys=openbsd
;;
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2014-04-22 21:32:51 +0000
+++ b/doc/emacs/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,81 @@
+2014-04-30 Eli Zaretskii <address@hidden>
+
+ * trouble.texi (Quitting, DEL Does Not Delete, Emergency Escape)
+ (Bug Criteria): Fix usage of @kbd and @key. (Bug#17362)
+
+ * text.texi (Words, Pages, Foldout, HTML Mode): Fix usage of @kbd
+ and @key.
+
+ * search.texi (Special Isearch, Regexp Search): Fix usage of @kbd
+ and @key.
+
+ * screen.texi (Echo Area, Menu Bar): Fix usage of @kbd and @key.
+
+ * rmail.texi (Rmail Scrolling): Fix usage of @kbd and @key.
+
+ * programs.texi (Hungry Delete, Other C Commands): Fix usage of
+ @kbd and @key.
+
+ * picture-xtra.texi (Insert in Picture): Fix usage of @kbd and
+ @key.
+
+ * mule.texi (Unibyte Mode, Bidirectional Editing): Fix usage of
+ @kbd and @key.
+
+ * msdog.texi (Windows Keyboard, Windows Processes): Fix usage of
+ @kbd and @key.
+
+ * msdog-xtra.texi (MS-DOS Keyboard, MS-DOS Printing)
+ (MS-DOS Processes): Fix usage of @kbd and @key.
+
+ * misc.texi (Shell Ring, Printing Package): Fix usage of @kbd and
+ @key.
+
+ * mini.texi (Completion Commands, Minibuffer History): Fix usage
+ of @kbd and @key.
+
+ * kmacro.texi (Keyboard Macro Step-Edit): Fix usage of @kbd and
+ @key.
+
+ * killing.texi (Deletion, Rectangles, CUA Bindings): Fix usage of
+ @kbd and @key.
+
+ * indent.texi (Indentation Commands): Fix usage of @kbd and @key.
+
+ * help.texi (Help Mode, Misc Help): Fix usage of @kbd and @key.
+
+ * glossary.texi (Glossary): Fix usage of @kbd and @key.
+
+ * frames.texi (Speedbar): Fix usage of @kbd and @key.
+
+ * files.texi (Misc File Ops, File Name Cache, File Conveniences)
+ (Filesets): Fix usage of @kbd and @key.
+
+ * display.texi (View Mode): Fix usage of @kbd and @key.
+
+ * dired.texi (Image-Dired): Fix usage of @kbd and @key.
+
+ * custom.texi (Modifier Keys, Function Keys, Named ASCII Chars)
+ (Init Syntax): Fix usage of @kbd and @key.
+
+ * commands.texi (User Input): Fix usage of @kbd and @key.
+
+ * calendar.texi (Counting Days, General Calendar): Fix usage of
+ @kbd and @key.
+
+ * building.texi (Threads Buffer): Fix usage of @kbd and @key.
+
+ * buffers.texi (Select Buffer, Icomplete): Fix usage of @kbd and
+ @key.
+
+ * basic.texi (Inserting Text, Erasing, Arguments): Fix usage of
+ @kbd and @key.
+
+ * anti.texi (Antinews): Fix usage of @kbd and @key.
+
+ * sending.texi (Mail Signature): Document signature variables used
+ by Message mode. (Bug#17308)
+
2014-04-22 Eli Zaretskii <address@hidden>
* buffers.texi (Uniquify): Clarify the default uniquification.
=== modified file 'doc/emacs/anti.texi'
--- a/doc/emacs/anti.texi 2014-02-07 07:13:21 +0000
+++ b/doc/emacs/anti.texi 2014-04-29 15:17:02 +0000
@@ -17,8 +17,8 @@
removed. Text is now always displayed on the screen in a single
consistent direction---left to right---regardless of the underlying
script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text
-cursor to the right and left respectively. Also, @key{right} and
address@hidden are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might
+cursor to the right and left respectively. Also, @key{RIGHT} and
address@hidden are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might
expect, rather than moving forward or backward based on the underlying
``paragraph direction''.
@@ -36,7 +36,7 @@
@item
The option @code{delete-active-region} has been deleted. When the
-region is active, typing @key{DEL} or @key{delete} no longer deletes
+region is active, typing @key{DEL} or @key{Delete} no longer deletes
the text in the region; it deletes a single character instead.
@item
=== modified file 'doc/emacs/basic.texi'
--- a/doc/emacs/basic.texi 2014-03-18 21:14:36 +0000
+++ b/doc/emacs/basic.texi 2014-04-29 15:17:02 +0000
@@ -67,7 +67,7 @@
@findex quoted-insert
Only graphic characters can be inserted by typing the associated
key; other keys act as editing commands and do not insert themselves.
-For instance, @kbd{DEL} runs the command @code{delete-backward-char}
+For instance, @key{DEL} runs the command @code{delete-backward-char}
by default (some modes bind it to a different command); it does not
insert a literal @samp{DEL} character (@acronym{ASCII} character code
127).
@@ -139,8 +139,8 @@
point (@pxref{Point}). The keyboard commands @kbd{C-f}, @kbd{C-b},
@kbd{C-n}, and @kbd{C-p} move point to the right, left, down, and up,
respectively. You can also move point using the @dfn{arrow keys}
-present on most keyboards: @address@hidden, @address@hidden,
address@hidden@key{down}}, and @address@hidden; however, many Emacs users find
+present on most keyboards: @key{RIGHT}, @key{LEFT},
address@hidden, and @key{UP}; however, many Emacs users find
that it is slower to use the arrow keys than the control keys, because
you need to move your hand to the area of the keyboard where those
keys are located.
@@ -156,7 +156,7 @@
@findex forward-char
Move forward one character (@code{forward-char}).
address@hidden @key{right}
address@hidden @key{RIGHT}
@kindex RIGHT
@findex right-char
@vindex visual-order-cursor-movement
@@ -176,7 +176,7 @@
@findex backward-char
Move backward one character (@code{backward-char}).
address@hidden @key{left}
address@hidden @key{LEFT}
@kindex LEFT
@findex left-char
This command (@code{left-char}) behaves like @kbd{C-b}, except it
@@ -187,7 +187,7 @@
screen line as appropriate.
@item C-n
address@hidden @key{down}
address@hidden @key{DOWN}
@kindex C-n
@kindex DOWN
@findex next-line
@@ -196,7 +196,7 @@
middle of one line, you move to the middle of the next.
@item C-p
address@hidden @key{up}
address@hidden @key{UP}
@kindex C-p
@kindex UP
@findex previous-line
@@ -222,8 +222,8 @@
@findex forward-word
Move forward one word (@code{forward-word}).
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
@kindex C-RIGHT
@kindex M-RIGHT
@findex right-word
@@ -236,8 +236,8 @@
@findex backward-word
Move backward one word (@code{backward-word}).
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
@kindex C-LEFT
@kindex M-LEFT
@findex left-word
@@ -366,7 +366,7 @@
@table @kbd
@item @key{DEL}
address@hidden @key{Backspace}
address@hidden @key{BACKSPACE}
Delete the character before point, or the region if it is active
(@code{delete-backward-char}).
@@ -394,20 +394,20 @@
If, however, the region is active, @address@hidden instead deletes
the text in the region. @xref{Mark}, for a description of the region.
- On most keyboards, @key{DEL} is labeled @key{Backspace}, but we
+ On most keyboards, @key{DEL} is labeled @key{BACKSPACE}, but we
refer to it as @key{DEL} in this manual. (Do not confuse @key{DEL}
with the @key{Delete} key; we will discuss @key{Delete} momentarily.)
On some text terminals, Emacs may not recognize the @key{DEL} key
properly. @xref{DEL Does Not Delete}, if you encounter this problem.
- The @key{delete} (@code{delete-forward-char}) command deletes in the
+ The @key{Delete} (@code{delete-forward-char}) command deletes in the
``opposite direction'': it deletes the character after point, i.e., the
character under the cursor. If point was at the end of a line, this
joins the following line onto this one. Like @address@hidden, it
deletes the text in the region if the region is active (@pxref{Mark}).
@kbd{C-d} (@code{delete-char}) deletes the character after point,
-similar to @key{delete}, but regardless of whether the region is
+similar to @key{Delete}, but regardless of whether the region is
active.
@xref{Deletion}, for more detailed information about the above
@@ -723,7 +723,7 @@
moves down five lines. The keys @kbd{M-1}, @kbd{M-2}, and so on, as
well as @kbd{M--}, are bound to commands (@code{digit-argument} and
@code{negative-argument}) that set up an argument for the next
-command. @kbd{Meta--} without digits normally means @minus{}1.
+command. @kbd{M--} without digits normally means @minus{}1.
If you enter more than one digit, you need not hold down the
@key{META} key for the second and subsequent digits. Thus, to move
=== modified file 'doc/emacs/buffers.texi'
--- a/doc/emacs/buffers.texi 2014-04-21 14:50:19 +0000
+++ b/doc/emacs/buffers.texi 2014-04-29 15:17:02 +0000
@@ -661,17 +661,18 @@
in the minibuffer continuously displays a list of possible completions that
match the string you have typed.
- At any time, you can type @key{C-j} to select the first completion in
+ At any time, you can type @kbd{C-j} to select the first completion in
the list. So the way to select a particular completion is to make it the
first in the list. There are two ways to do this. You can type more
of the completion name and thus narrow down the list, excluding unwanted
completions above the desired one. Alternatively, you can use @kbd{C-.}
and @kbd{C-,} to rotate the list until the desired buffer is first.
- @key{M-TAB} will select the first completion in the list, like @key{C-j} but
-without exiting the minibuffer, so you can edit it further. This is typically
-used when entering a file name, where @key{M-TAB} can be used a few times to
-descend in the hierarchy of directories.
+ @address@hidden will select the first completion in the list, like
address@hidden but without exiting the minibuffer, so you can edit it
+further. This is typically used when entering a file name, where
address@hidden@key{TAB}} can be used a few times to descend in the hierarchy
+of directories.
To enable Icomplete mode, type @kbd{M-x icomplete-mode}, or customize
the variable @code{icomplete-mode} to @code{t} (@pxref{Easy
=== modified file 'doc/emacs/building.texi'
--- a/doc/emacs/building.texi 2014-01-23 08:27:44 +0000
+++ b/doc/emacs/building.texi 2014-04-29 14:45:24 +0000
@@ -1005,7 +1005,7 @@
The GDB Threads buffer displays a summary of the threads in the
debugged program. @xref{Threads, Threads, Debugging programs with
multiple threads, gdb, The GNU debugger}. To select a thread, move
-point there and type @key{RET} (@code{gdb-select-thread}), or click on
+point there and press @key{RET} (@code{gdb-select-thread}), or click on
it with @kbd{Mouse-2}. This also displays the associated source
buffer, and updates the contents of the other GDB buffers.
=== modified file 'doc/emacs/calendar.texi'
--- a/doc/emacs/calendar.texi 2014-01-27 02:02:28 +0000
+++ b/doc/emacs/calendar.texi 2014-04-29 14:45:24 +0000
@@ -288,7 +288,7 @@
@kindex M-= @r{(Calendar mode)}
@findex calendar-count-days-region
To determine the number of days in a range, set the mark on one
-date using @kbd{C-SPC}, move point to another date, and type @kbd{M-=}
+date using @address@hidden, move point to another date, and type @kbd{M-=}
(@code{calendar-count-days-region}). The numbers of days shown is
@emph{inclusive}; that is, it includes the days specified by mark and
point.
@@ -301,10 +301,10 @@
Display day-in-year (@code{calendar-print-day-of-year}).
@item C-c C-l
Regenerate the calendar window (@code{calendar-redraw}).
address@hidden SPC
address@hidden @key{SPC}
Scroll the next window up (@code{scroll-other-window}).
address@hidden DEL
address@hidden S-SPC
address@hidden @key{DEL}
address@hidden address@hidden
Scroll the next window down (@code{scroll-other-window-down}).
@item q
Exit from calendar (@code{calendar-exit}).
@@ -327,8 +327,8 @@
non-Calendar-mode editing commands.)
@kindex SPC @r{(Calendar mode)}
- In Calendar mode, you can use @kbd{SPC} (@code{scroll-other-window})
-and @kbd{DEL} (@code{scroll-other-window-down}) to scroll the other
+ In Calendar mode, you can use @key{SPC} (@code{scroll-other-window})
+and @key{DEL} (@code{scroll-other-window-down}) to scroll the other
window (if there is one) up or down, respectively. This is handy when
you display a list of holidays or diary entries in another window.
=== modified file 'doc/emacs/commands.texi'
--- a/doc/emacs/commands.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/commands.texi 2014-04-29 15:17:02 +0000
@@ -35,35 +35,35 @@
@samp{3}, @samp{=}, and the space character (denoted as @key{SPC}),
are entered by typing the corresponding key. @dfn{Control
characters}, such as @key{RET}, @key{TAB}, @key{DEL}, @key{ESC},
address@hidden, @key{Home}, and @key{left}, are also entered this way, as
address@hidden, @key{Home}, and @key{LEFT}, are also entered this way, as
are certain characters found on non-English keyboards
(@pxref{International}).
@cindex modifier keys
@cindex Control
@cindex C-
address@hidden Meta
address@hidden META
@cindex M-
Emacs also recognizes control characters that are entered using
@dfn{modifier keys}. Two commonly-used modifier keys are
address@hidden (usually labeled @key{Ctrl}), and @key{Meta} (usually
-labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{Meta} for
address@hidden (usually labeled @key{Ctrl}), and @key{META} (usually
+labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{META} for
historical reasons.}. For example, @kbd{Control-a} is entered by
holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
-to this as @kbd{C-a} for short. Similarly @kbd{Meta-a}, or @kbd{M-a}
+to this as @kbd{C-a} for short. Similarly @address@hidden, or @kbd{M-a}
for short, is entered by holding down the @key{Alt} key and pressing
@kbd{a}. Modifier keys can also be applied to non-alphanumerical
-characters, e.g., @address@hidden or @address@hidden
+characters, e.g., @address@hidden or @address@hidden
address@hidden @key{ESC} replacing @key{Meta} key
address@hidden @key{ESC} replacing @key{META} key
You can also type Meta characters using two-character sequences
starting with @key{ESC}. Thus, you can enter @kbd{M-a} by typing
@address@hidden a}. You can enter @kbd{C-M-a} by typing @address@hidden
-C-a}. Unlike @key{Meta}, @key{ESC} is entered as a separate
+C-a}. Unlike @key{META}, @key{ESC} is entered as a separate
character. You don't hold down @key{ESC} while typing the next
character; instead, press @key{ESC} and release it, then enter the
next character. This feature is useful on certain text terminals
-where the @key{Meta} key does not function reliably.
+where the @key{META} key does not function reliably.
@cindex keys stolen by window manager
@cindex window manager, keys stolen by
=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi 2014-03-28 01:29:54 +0000
+++ b/doc/emacs/custom.texi 2014-04-30 19:54:52 +0000
@@ -1766,11 +1766,11 @@
characters case-sensitive when you customize Emacs. For instance, you
could make @kbd{M-a} and @kbd{M-A} run different commands.
- Although only the @key{Control} and @key{Meta} modifier keys are
+ Although only the @key{Control} and @key{META} modifier keys are
commonly used, Emacs supports three other modifier keys. These are
called @key{Super}, @key{Hyper} and @key{Alt}. Few terminals provide
ways to use these modifiers; the key labeled @key{Alt} on most
-keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The
+keyboards usually issues the @key{META} modifier, not @key{Alt}. The
standard key bindings in Emacs do not include any characters with
these modifiers. However, you can customize Emacs to assign meanings
to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and
@@ -1795,10 +1795,10 @@
common function keys:
@table @asis
address@hidden @code{left}, @code{up}, @code{right}, @code{down}
address@hidden @code{LEFT}, @code{UP}, @code{RIGHT}, @code{DOWN}
Cursor arrow keys.
address@hidden @code{begin}, @code{end}, @code{home}, @code{next}, @code{prior}
address@hidden @code{Begin}, @code{End}, @code{Home}, @code{next}, @code{prior}
Other cursor repositioning keys.
@item @code{select}, @code{print}, @code{execute}, @code{backtab}
@@ -1860,7 +1860,7 @@
used so often that they have special keys of their own. For instance,
@key{TAB} was another name for @kbd{C-i}. Later, users found it
convenient to distinguish in Emacs between these keys and the ``same''
-control characters typed with the @key{CTRL} key. Therefore, on most
+control characters typed with the @key{Ctrl} key. Therefore, on most
modern terminals, they are no longer the same: @key{TAB} is different
from @kbd{C-i}.
@@ -2187,8 +2187,8 @@
@samp{\C-} can be used as a prefix for a control character, as in
@samp{\C-s} for @acronym{ASCII} control-S, and @samp{\M-} can be used as a
prefix for
-a Meta character, as in @samp{\M-a} for @kbd{Meta-A} or @samp{\M-\C-a} for
address@hidden
+a Meta character, as in @samp{\M-a} for @address@hidden or
address@hidden for @address@hidden@key{META}-A}.
@xref{Init Non-ASCII}, for information about including
address@hidden in your init file.
=== modified file 'doc/emacs/dired.texi'
--- a/doc/emacs/dired.texi 2014-02-09 03:38:18 +0000
+++ b/doc/emacs/dired.texi 2014-04-29 14:45:24 +0000
@@ -1312,19 +1312,19 @@
asks for confirmation if the number of image files exceeds
@code{image-dired-show-all-from-dir-max-files}.
- With point in the thumbnail buffer, you can type @kbd{RET}
+ With point in the thumbnail buffer, you can type @key{RET}
(@code{image-dired-display-thumbnail-original-image}) to display a
sized version of it in another window. This sizes the image to fit
the window. Use the arrow keys to move around in the buffer. For
-easy browsing, use @kbd{SPC}
+easy browsing, use @key{SPC}
(@code{image-dired-display-next-thumbnail-original}) to advance and
-display the next image. Typing @kbd{DEL}
+display the next image. Typing @key{DEL}
(@code{image-dired-display-previous-thumbnail-original}) backs up to
the previous thumbnail and displays that instead.
@vindex image-dired-external-viewer
To view and the image in its original size, either provide a prefix
-argument (@kbd{C-u}) before pressing @kbd{RET}, or type
+argument (@kbd{C-u}) before pressing @key{RET}, or type
@address@hidden (@code{image-dired-thumbnail-display-external}) to
display the image in an external viewer. You must first configure
@code{image-dired-external-viewer}.
=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi 2014-04-13 07:49:23 +0000
+++ b/doc/emacs/display.texi 2014-04-29 14:45:24 +0000
@@ -428,7 +428,7 @@
screenfuls. It provides commands for scrolling through the buffer
conveniently but not for changing it. Apart from the usual Emacs
cursor motion commands, you can type @key{SPC} to scroll forward one
-windowful, @key{S-SPC} or @key{DEL} to scroll backward, and @kbd{s} to
+windowful, @address@hidden or @key{DEL} to scroll backward, and @kbd{s} to
start an incremental search.
@kindex q @r{(View mode)}
=== modified file 'doc/emacs/files.texi'
--- a/doc/emacs/files.texi 2014-04-04 01:49:28 +0000
+++ b/doc/emacs/files.texi 2014-04-29 14:45:24 +0000
@@ -1569,10 +1569,11 @@
@var{new} are on different file systems, the file @var{old} is copied
and deleted. If the argument @var{new} is just a directory name, the
real new name is in that directory, with the same non-directory
-component as @var{old}. For example, @kbd{M-x rename-file RET ~/foo
-RET /tmp RET} renames @file{~/foo} to @file{/tmp/foo}. The same rule
-applies to all the remaining commands in this section. All of them
-ask for confirmation when the new file name already exists, too.
+component as @var{old}. For example, @kbd{M-x rename-file @key{RET}
+~/foo @key{RET} /tmp @key{RET}} renames @file{~/foo} to
address@hidden/tmp/foo}. The same rule applies to all the remaining commands
+in this section. All of them ask for confirmation when the new file
+name already exists, too.
@ifnottex
If a file is under version control (@pxref{Version Control}), you
@@ -1887,11 +1888,11 @@
@findex file-cache-minibuffer-complete
You can use the @dfn{file name cache} to make it easy to locate a
file by name, without having to remember exactly where it is located.
-When typing a file name in the minibuffer, @address@hidden
+When typing a file name in the minibuffer, @address@hidden
(@code{file-cache-minibuffer-complete}) completes it using the file
-name cache. If you repeat @address@hidden, that cycles through the
+name cache. If you repeat @address@hidden, that cycles through the
possible completions of what you had originally typed. (However, note
-that the @address@hidden character cannot be typed on most text
+that the @address@hidden character cannot be typed on most text
terminals.)
The file name cache does not fill up automatically. Instead, you
@@ -1971,7 +1972,7 @@
@vindex image-animate-loop
@cindex image animation
@cindex animated images
- If the image can be animated, the command @kbd{RET}
+ If the image can be animated, the command @key{RET}
(@code{image-toggle-animation}) starts or stops the animation.
Animation plays once, unless the option @code{image-animate-loop} is
address@hidden With @kbd{f} (@code{image-next-frame}) and @kbd{b}
@@ -2024,7 +2025,7 @@
@findex filesets-remove-buffer
The simplest way to define a fileset is by adding files to it one at
a time. To add a file to fileset @var{name}, visit the file and type
address@hidden filesets-add-buffer @kbd{RET} @var{name} @kbd{RET}}. If
address@hidden filesets-add-buffer @key{RET} @var{name} @key{RET}}. If
there is no fileset @var{name}, this creates a new one, which
initially contains only the current file. The command @kbd{M-x
filesets-remove-buffer} removes the current file from a fileset.
=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi 2014-02-08 02:41:20 +0000
+++ b/doc/emacs/frames.texi 2014-04-29 14:45:24 +0000
@@ -802,8 +802,8 @@
hiding its contents.
You navigate through the speedbar using the keyboard, too. Typing
address@hidden while point is on a line in the speedbar is equivalent to
-clicking the item on the current line, and @kbd{SPC} expands or
address@hidden while point is on a line in the speedbar is equivalent to
+clicking the item on the current line, and @key{SPC} expands or
contracts the item. @kbd{U} displays the parent directory of the
current directory. To copy, delete, or rename the file on the current
line, type @kbd{C}, @kbd{D}, and @kbd{R} respectively. To create a
=== modified file 'doc/emacs/glossary.texi'
--- a/doc/emacs/glossary.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/glossary.texi 2014-04-29 19:23:05 +0000
@@ -26,10 +26,10 @@
@item Alt
Alt is the name of a modifier bit that a keyboard input character may
-have. To make a character Alt, type it while holding down the @key{ALT}
-key. Such characters are given names that start with @kbd{Alt-}
+have. To make a character Alt, type it while holding down the @key{Alt}
+key. Such characters are given names that start with @address@hidden
(usually written @kbd{A-} for short). (Note that many terminals have a
-key labeled @key{ALT} that is really a @key{META} key.) @xref{User
+key labeled @key{Alt} that is really a @key{META} key.) @xref{User
Input, Alt}.
@item Argument
@@ -269,8 +269,8 @@
@item Control Character
A control character is a character that you type by holding down the
address@hidden key. Some control characters also have their own keys, so
-that you can type them without using @key{CTRL}. For example,
address@hidden key. Some control characters also have their own keys, so
+that you can type them without using @key{Ctrl}. For example,
@key{RET}, @key{TAB}, @key{ESC} and @key{DEL} are all control
characters. @xref{User Input}.
@@ -284,8 +284,8 @@
The particular form of copyleft used by the GNU project is called the
GNU General Public License. @xref{Copying}.
address@hidden @key{CTRL}
-The @key{CTRL} or ``control'' key is what you hold down
address@hidden @key{Ctrl}
+The @key{Ctrl} or ``control'' key is what you hold down
in order to enter a control character (q.v.). @xref{Glossary---C-}.
@item Current Buffer
@@ -356,7 +356,7 @@
@item @key{DEL}
@key{DEL} is a character that runs the command to delete one character
-of text before the cursor. It is typically either the @key{DELETE}
+of text before the cursor. It is typically either the @key{Delete}
key or the @key{BACKSPACE} key, whichever one is easy to type.
@xref{Erasing,DEL}.
@@ -687,7 +687,7 @@
@item Hyper
Hyper is the name of a modifier bit that a keyboard input character may
have. To make a character Hyper, type it while holding down the
address@hidden key. Such characters are given names that start with
address@hidden key. Such characters are given names that start with
@kbd{Hyper-} (usually written @kbd{H-} for short). @xref{User Input}.
@item Iff
@@ -842,7 +842,7 @@
@xref{Locals}.
@item @kbd{M-}
address@hidden in the name of a character is an abbreviation for @key{META},
address@hidden in the name of a character is an abbreviation for @key{Meta},
one of the modifier keys that can accompany any character.
@xref{User Input,M-}.
@@ -900,16 +900,16 @@
@item Meta
Meta is the name of a modifier bit which you can use in a command
-character. To enter a meta character, you hold down the @key{META}
+character. To enter a meta character, you hold down the @key{Meta}
key while typing the character. We refer to such characters with
names that start with @kbd{Meta-} (usually written @kbd{M-} for
-short). For example, @kbd{M-<} is typed by holding down @key{META}
+short). For example, @kbd{M-<} is typed by holding down @key{Meta}
and at the same time typing @kbd{<} (which itself is done, on most
terminals, by holding down @key{SHIFT} and typing @kbd{,}).
@xref{User Input,Meta}.
-On some terminals, the @key{META} key is actually labeled @key{ALT}
-or @key{EDIT}.
+On some terminals, the @key{Meta} key is actually labeled @key{Alt}
+or @key{Edit}.
@item Meta Character
A Meta character is one whose character code includes the Meta bit.
=== modified file 'doc/emacs/help.texi'
--- a/doc/emacs/help.texi 2014-03-22 23:47:20 +0000
+++ b/doc/emacs/help.texi 2014-04-30 19:54:52 +0000
@@ -378,7 +378,7 @@
Help buffers provide the same commands as View mode (@pxref{View
Mode}); for instance, @key{SPC} scrolls forward, and @key{DEL} or
address@hidden scrolls backward. A few special commands are also
address@hidden@key{SPC}} scrolls backward. A few special commands are also
provided:
@table @kbd
@@ -553,13 +553,13 @@
@findex describe-prefix-bindings
You can get a list of subcommands for a particular prefix key by
-typing @kbd{C-h}, @kbd{?}, or @kbd{F1}
+typing @kbd{C-h}, @kbd{?}, or @key{F1}
(@code{describe-prefix-bindings}) after the prefix key. (There are a
few prefix keys for which not all of these keys work---those that
provide their own bindings for one of them. One of these prefix keys
-is @key{ESC} in combination with @kbd{C-h}, because @kbd{ESC C-h} is
-actually @kbd{C-M-h}, which marks a defun. However, @kbd{ESC F1} and
address@hidden ?} work fine.)
+is @key{ESC} in combination with @kbd{C-h}, because @address@hidden C-h} is
+actually @kbd{C-M-h}, which marks a defun. However, @address@hidden @key{F1}}
+and @address@hidden ?} work fine.)
@node Help Files
@section Help Files
=== modified file 'doc/emacs/killing.texi'
--- a/doc/emacs/killing.texi 2014-03-02 08:54:32 +0000
+++ b/doc/emacs/killing.texi 2014-04-29 14:45:24 +0000
@@ -78,7 +78,7 @@
@table @kbd
@item @key{DEL}
address@hidden @key{Backspace}
address@hidden @key{BACKSPACE}
Delete the previous character, or the text in the region if it is
active (@code{delete-backward-char}).
@@ -841,7 +841,7 @@
@findex rectangle-mark-mode
@cindex rectangular region
- The command @kbd{C-x SPC} (@code{rectangle-mark-mode}) makes a
+ The command @kbd{C-x @key{SPC}} (@code{rectangle-mark-mode}) makes a
@dfn{rectangular region}. It is a new feature introduced in GNU Emacs
24.4, and most commands now are still unaware of it, but kill and yank
(@pxref{Killing}) do work on the rectangle.
@@ -879,9 +879,9 @@
@cindex rectangle highlighting
CUA mode provides enhanced rectangle support with visible
-rectangle highlighting. Use @kbd{C-RET} to start a rectangle,
+rectangle highlighting. Use @address@hidden to start a rectangle,
extend it using the movement commands, and cut or copy it using
address@hidden or @kbd{C-c}. @kbd{RET} moves the cursor to the next
address@hidden or @kbd{C-c}. @key{RET} moves the cursor to the next
(clockwise) corner of the rectangle, so you can easily expand it in
any direction. Normal text you type is inserted to the left or right
of each line in the rectangle (on the same side as the cursor).
@@ -896,7 +896,7 @@
@cindex global mark
CUA mode also has a global mark feature which allows easy moving and
-copying of text between buffers. Use @kbd{C-S-SPC} to toggle the
+copying of text between buffers. Use @address@hidden to toggle the
global mark on and off. When the global mark is on, all text that you
kill or copy is automatically inserted at the global mark, and text
you type is inserted at the global mark rather than at the current
=== modified file 'doc/emacs/kmacro.texi'
--- a/doc/emacs/kmacro.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/kmacro.texi 2014-04-29 14:45:24 +0000
@@ -506,7 +506,7 @@
@findex kmacro-step-edit-macro
@kindex C-x C-k SPC
You can interactively replay and edit the last keyboard
-macro, one command at a time, by typing @kbd{C-x C-k SPC}
+macro, one command at a time, by typing @kbd{C-x C-k @key{SPC}}
(@code{kmacro-step-edit-macro}). Unless you quit the macro using
@kbd{q} or @kbd{C-g}, the edited macro replaces the last macro on the
macro ring.
@@ -518,15 +518,15 @@
@itemize @bullet{}
@item
address@hidden and @kbd{y} execute the current command, and advance to the
address@hidden and @kbd{y} execute the current command, and advance to the
next command in the keyboard macro.
@item
address@hidden, @kbd{d}, and @kbd{DEL} skip and delete the current command.
address@hidden, @kbd{d}, and @key{DEL} skip and delete the current command.
@item
@kbd{f} skips the current command in this execution of the keyboard
macro, but doesn't delete it from the macro.
@item
address@hidden@key{TAB}} executes the current command, as well as all similar
address@hidden executes the current command, as well as all similar
commands immediately following the current command; for example, @key{TAB}
may be used to insert a sequence of characters (corresponding to a
sequence of @code{self-insert-command} commands).
@@ -542,31 +542,31 @@
@kbd{q} and @kbd{C-g} cancels the step-editing of the keyboard macro;
discarding any changes made to the keyboard macro.
@item
address@hidden KEY... C-j} reads and executes a series of key sequences (not
address@hidden @address@hidden C-j} reads and executes a series of key
sequences (not
including the final @kbd{C-j}), and inserts them before the current
command in the keyboard macro, without advancing over the current
command.
@item
address@hidden KEY...} reads one key sequence, executes it, and inserts it
address@hidden @address@hidden reads one key sequence, executes it, and inserts
it
before the current command in the keyboard macro, without advancing
over the current command.
@item
address@hidden KEY... C-j} reads and executes a series of key sequences (not
address@hidden @address@hidden C-j} reads and executes a series of key
sequences (not
including the final @kbd{C-j}), and replaces the current command in
the keyboard macro with them, advancing over the inserted key
sequences.
@item
address@hidden KEY...} reads one key sequence, executes it, and replaces the
address@hidden @address@hidden reads one key sequence, executes it, and
replaces the
current command in the keyboard macro with that key sequence,
advancing over the inserted key sequence.
@item
address@hidden KEY... C-j} executes the current command, then reads and
address@hidden @address@hidden C-j} executes the current command, then reads and
executes a series of key sequences (not including the final
@kbd{C-j}), and inserts them after the current command in the keyboard
macro; it then advances over the current command and the inserted key
sequences.
@item
address@hidden KEY... C-j} executes the rest of the commands in the keyboard
address@hidden @address@hidden C-j} executes the rest of the commands in the
keyboard
macro, then reads and executes a series of key sequences (not
including the final @kbd{C-j}), and appends them at the end of the
keyboard macro; it then terminates the step-editing and replaces the
=== modified file 'doc/emacs/mark.texi'
--- a/doc/emacs/mark.texi 2014-03-02 08:54:32 +0000
+++ b/doc/emacs/mark.texi 2014-04-29 15:17:02 +0000
@@ -133,7 +133,7 @@
@cindex shift-selection
Finally, you can set the mark by holding down the shift key while
-typing certain cursor motion commands (such as @address@hidden,
+typing certain cursor motion commands (such as @address@hidden,
@kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}.
It sets the mark at point before moving point, but only if there is no
active mark set via shift-selection. The mark set by mouse commands
=== modified file 'doc/emacs/mini.texi'
--- a/doc/emacs/mini.texi 2014-02-12 08:27:27 +0000
+++ b/doc/emacs/mini.texi 2014-04-29 15:17:02 +0000
@@ -357,12 +357,12 @@
point (@code{choose-completion}).
@findex next-completion
address@hidden @key{Right}
address@hidden @key{RIGHT}
While in the completion list buffer, this moves point to the following
completion alternative (@code{next-completion}).
@findex previous-completion
address@hidden @key{Left}
address@hidden @key{LEFT}
While in the completion list buffer, this moves point to the previous
completion alternative (@code{previous-completion}).
@end table
@@ -587,11 +587,11 @@
@table @kbd
@item M-p
address@hidden @key{Up}
address@hidden @key{UP}
Move to the previous item in the minibuffer history, an earlier
argument (@code{previous-history-element}).
@item M-n
address@hidden @key{Down}
address@hidden @key{DOWN}
Move to the next item in the minibuffer history
(@code{next-history-element}).
@item M-r @var{regexp} @key{RET}
@@ -608,11 +608,11 @@
@kindex DOWN @r{(minibuffer history)}
@findex next-history-element
@findex previous-history-element
- While in the minibuffer, @kbd{M-p} or @key{Up}
+ While in the minibuffer, @kbd{M-p} or @key{UP}
(@code{previous-history-element}) moves through the minibuffer history
list, one item at a time. Each @kbd{M-p} fetches an earlier item from
the history list into the minibuffer, replacing its existing contents.
-Typing @kbd{M-n} or @key{Down} (@code{next-history-element}) moves
+Typing @kbd{M-n} or @key{DOWN} (@code{next-history-element}) moves
through the minibuffer history list in the opposite direction,
fetching later entries into the minibuffer.
=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi 2014-03-12 07:26:07 +0000
+++ b/doc/emacs/misc.texi 2014-04-29 15:17:02 +0000
@@ -999,8 +999,8 @@
@key{RET}} over and over.
The command @kbd{C-c .}@: (@code{comint-input-previous-argument})
-copies an individual argument from a previous command, like @kbd{ESC
-.} in Bash. The simplest use copies the last argument from the
+copies an individual argument from a previous command, like
address@hidden@key{ESC} .} in Bash. The simplest use copies the last argument
from the
previous shell command. With a prefix argument @var{n}, it copies the
@var{n}th argument instead. Repeating @kbd{C-c .} copies from an
earlier shell command instead, always using the same value of @var{n}
@@ -1918,11 +1918,11 @@
init file (@pxref{Init File}), followed by @code{(pr-update-menus)}.
This function replaces the usual printing commands in the menu bar
with a @samp{Printing} submenu that contains various printing options.
-You can also type @kbd{M-x pr-interface RET}; this creates a
+You can also type @kbd{M-x pr-interface @key{RET}}; this creates a
@file{*Printing Interface*} buffer, similar to a customization buffer,
where you can set the printing options. After selecting what and how
to print, you start the print job using the @samp{Print} button (click
address@hidden on it, or move point over it and type @kbd{RET}). For
address@hidden on it, or move point over it and type @key{RET}). For
further information on the various options, use the @samp{Interface
Help} button.
=== modified file 'doc/emacs/msdog-xtra.texi'
--- a/doc/emacs/msdog-xtra.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/msdog-xtra.texi 2014-04-29 14:45:24 +0000
@@ -53,13 +53,13 @@
The key that is called @key{DEL} in Emacs (because that's how it is
designated on most workstations) is known as @key{BS} (backspace) on a
address@hidden That is why the PC-specific terminal initialization remaps the
address@hidden key to act as @key{DEL}; the @key{DELETE} key is remapped to act
address@hidden key to act as @key{DEL}; the @key{Delete} key is remapped to act
as @kbd{C-d} for the same reasons.
@kindex C-g @r{(MS-DOS)}
address@hidden C-BREAK @r{(MS-DOS)}
address@hidden C-Break @r{(MS-DOS)}
@cindex quitting on MS-DOS
- Emacs built for MS-DOS recognizes @address@hidden as a quit
+ Emacs built for MS-DOS recognizes @address@hidden as a quit
character, just like @kbd{C-g}. This is because Emacs cannot detect
that you have typed @kbd{C-g} until it is ready for more input. As a
consequence, you cannot use @kbd{C-g} to stop a running command
@@ -69,7 +69,7 @@
@ifnottex
(@pxref{Quitting}).
@end ifnottex
-By contrast, @address@hidden @emph{is} detected as soon as you
+By contrast, @address@hidden @emph{is} detected as soon as you
type it (as @kbd{C-g} is on other systems), so it can be used to stop
a running command and for emergency escape
@iftex
@@ -84,17 +84,17 @@
@cindex Super (under MS-DOS)
@vindex dos-super-key
@vindex dos-hyper-key
- The PC keyboard maps use the left @key{ALT} key as the @key{META} key.
+ The PC keyboard maps use the left @key{Alt} key as the @key{META} key.
You have two choices for emulating the @key{SUPER} and @key{HYPER} keys:
-choose either the right @key{CTRL} key or the right @key{ALT} key by
+choose either the right @key{Ctrl} key or the right @key{Alt} key by
setting the variables @code{dos-hyper-key} and @code{dos-super-key} to 1
or 2 respectively. If neither @code{dos-super-key} nor
address@hidden is 1, then by default the right @key{ALT} key is
address@hidden is 1, then by default the right @key{Alt} key is
also mapped to the @key{META} key. However, if the MS-DOS international
keyboard support program @file{KEYB.COM} is installed, Emacs will
address@hidden map the right @key{ALT} to @key{META}, since it is used for
address@hidden map the right @key{Alt} to @key{META}, since it is used for
accessing characters like @kbd{~} and @kbd{@@} on non-US keyboard
-layouts; in this case, you may only use the left @key{ALT} as @key{META}
+layouts; in this case, you may only use the left @key{Alt} as @key{META}
key.
@kindex C-j @r{(MS-DOS)}
@@ -398,11 +398,11 @@
encoding for the same locale. For example, in the Latin-1 locale, DOS
uses codepage 850 whereas Windows uses codepage 1252. @xref{MS-DOS and
MULE}. When you print to such printers from Windows, you can use the
address@hidden RET c} (@code{universal-coding-system-argument}) command before
address@hidden lpr-buffer}; Emacs will then convert the text to the DOS
-codepage that you specify. For example, @kbd{C-x RET c cp850-dos RET
-M-x lpr-region RET} will print the region while converting it to the
-codepage 850 encoding.
address@hidden @key{RET} c} (@code{universal-coding-system-argument}) command
+before @kbd{M-x lpr-buffer}; Emacs will then convert the text to the DOS
+codepage that you specify. For example,
address@hidden @key{RET} c cp850-dos @key{RET} M-x lpr-region @key{RET}}
+will print the region while converting it to the codepage 850 encoding.
@vindex dos-printer
@vindex dos-ps-printer
@@ -597,7 +597,7 @@
program terminates and does not try to read keyboard input. If the
program does not terminate on its own, you will be unable to terminate
it, because MS-DOS provides no general way to terminate a process.
-Pressing @kbd{C-c} or @address@hidden might sometimes help in these
+Pressing @kbd{C-c} or @address@hidden might sometimes help in these
cases.
Accessing files on other machines is not supported on address@hidden Other
=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/msdog.texi 2014-04-29 14:45:24 +0000
@@ -479,7 +479,7 @@
@findex w32-register-hot-key
@findex w32-unregister-hot-key
MS-Windows reserves certain key combinations, such as
address@hidden@key{TAB}}, for its own use. These key combinations are
address@hidden@address@hidden, for its own use. These key combinations are
intercepted by the system before Emacs can see them. You can use the
@code{w32-register-hot-key} function to allow a key sequence to be
seen by Emacs instead of being grabbed by Windows. This function
@@ -491,7 +491,7 @@
The argument to @code{w32-register-hot-key} must be a single key,
with or without modifiers, in vector form that would be acceptable to
address@hidden The meta modifier is interpreted as the @key{ALT}
address@hidden The meta modifier is interpreted as the @key{Alt}
key if @code{w32-alt-is-meta} is @code{t} (the default), and the hyper
modifier is always interpreted as the Windows key (usually labeled
with @key{start} and the Windows logo). If the function succeeds in
@@ -499,10 +499,10 @@
otherwise it returns @code{nil}.
@kindex address@hidden, (MS-Windows)}
address@hidden @address@hidden vs @address@hidden (MS-Windows)
address@hidden @address@hidden vs @address@hidden (MS-Windows)
address@hidden @address@hidden vs @address@hidden@key{TAB}} (MS-Windows)
address@hidden @address@hidden@key{TAB}} vs @address@hidden (MS-Windows)
For example, @code{(w32-register-hot-key [M-tab])} lets you use
address@hidden normally in Emacs; for instance, to complete the word or
address@hidden@key{TAB}} normally in Emacs; for instance, to complete the word
or
symbol at point at top level, or to complete the current search string
against previously sought strings during incremental search.
@@ -558,14 +558,14 @@
@cindex Windows system menu
@cindex @code{Alt} key invokes menu (Windows)
Emacs compiled as a native Windows application normally turns off
-the Windows feature that tapping the @key{ALT} key invokes the Windows
-menu. The reason is that the @key{ALT} serves as @key{META} in Emacs.
+the Windows feature that tapping the @key{Alt} key invokes the Windows
+menu. The reason is that the @key{Alt} serves as @key{META} in Emacs.
When using Emacs, users often press the @key{META} key temporarily and
then change their minds; if this has the effect of bringing up the
Windows menu, it alters the meaning of subsequent commands. Many
users find this frustrating.
- You can re-enable Windows's default handling of tapping the @key{ALT}
+ You can re-enable Windows's default handling of tapping the @key{Alt}
key by setting @code{w32-pass-alt-to-system} to a address@hidden
value.
@@ -595,7 +595,7 @@
pressed together, is recognized as the @key{AltGr} key. The default
is @code{t}, which means these keys produce @code{AltGr}; setting it
to @code{nil} causes @key{AltGr} or the equivalent key combination to
-be interpreted as the combination of @key{CTRL} and @key{META}
+be interpreted as the combination of @key{Ctrl} and @key{META}
modifiers.
@end ifnottex
@@ -674,7 +674,7 @@
If you have to reboot Windows 9X in this situation, do not use the
@code{Shutdown} command on the @code{Start} menu; that usually hangs the
-system. Instead, type @address@hidden and then choose
+system. Instead, type @address@hidden@address@hidden and then choose
@code{Shutdown}. That usually works, although it may take a few minutes
to do its job.
=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi 2014-03-13 05:27:28 +0000
+++ b/doc/emacs/mule.texi 2014-04-29 14:45:24 +0000
@@ -1671,11 +1671,11 @@
should use the command @code{M-x set-keyboard-coding-system} or customize the
variable @code{keyboard-coding-system} to specify which coding system
your keyboard uses (@pxref{Terminal Coding}). Enabling this feature
-will probably require you to use @kbd{ESC} to type Meta characters;
+will probably require you to use @key{ESC} to type Meta characters;
however, on a console terminal or in @code{xterm}, you can arrange for
-Meta to be converted to @kbd{ESC} and still be able type 8-bit
-characters present directly on the keyboard or using @kbd{Compose} or
address@hidden keys. @xref{User Input}.
+Meta to be converted to @key{ESC} and still be able type 8-bit
+characters present directly on the keyboard or using @key{Compose} or
address@hidden keys. @xref{User Input}.
@kindex C-x 8
@cindex @code{iso-transl} library
@@ -1689,8 +1689,8 @@
a key sequence is allowed.
@kbd{C-x 8} works by loading the @code{iso-transl} library. Once that
-library is loaded, the @key{ALT} modifier key, if the keyboard has
-one, serves the same purpose as @kbd{C-x 8}: use @key{ALT} together
+library is loaded, the @key{Alt} modifier key, if the keyboard has
+one, serves the same purpose as @kbd{C-x 8}: use @key{Alt} together
with an accent character to modify the following letter. In addition,
if the keyboard has keys for the Latin-1 ``dead accent characters'',
they too are defined to compose with the following character, once
@@ -1815,7 +1815,7 @@
The special character @code{RIGHT-TO-LEFT MARK}, or @sc{rlm}, forces
the right-to-left direction on the following paragraph, while
@code{LEFT-TO-RIGHT MARK}, or @sc{lrm} forces the left-to-right
-direction. (You can use @kbd{C-x 8 RET} to insert these characters.)
+direction. (You can use @kbd{C-x 8 @key{RET}} to insert these characters.)
In a GUI session, the @sc{lrm} and @sc{rlm} characters display as very
thin blank characters; on text terminals they display as blanks.
=== modified file 'doc/emacs/picture-xtra.texi'
--- a/doc/emacs/picture-xtra.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/picture-xtra.texi 2014-04-29 15:17:02 +0000
@@ -163,14 +163,14 @@
@itemx C-c @key{DOWN}
Move down after insertion (@code{picture-movement-down}).
@item C-c `
address@hidden C-c @key{HOME}
address@hidden C-c @key{Home}
Move up and left (``northwest'') after insertion (@code{picture-movement-nw}).
@item C-c '
@itemx C-c @key{prior}
Move up and right (``northeast'') after insertion
(@code{picture-movement-ne}).
@item C-c /
address@hidden C-c @key{END}
address@hidden C-c @key{End}
Move down and left (``southwest'') after insertion
@*(@code{picture-movement-sw}).
@item C-c \
=== modified file 'doc/emacs/programs.texi'
--- a/doc/emacs/programs.texi 2014-03-16 02:42:15 +0000
+++ b/doc/emacs/programs.texi 2014-04-29 14:45:24 +0000
@@ -1675,12 +1675,12 @@
Delete the entire block of whitespace preceding point
(@code{c-hungry-delete-backwards}).
@item C-c C-d
address@hidden C-c address@hidden
address@hidden C-c @key{DELETE}
address@hidden C-c address@hidden
address@hidden C-c @key{Delete}
@findex c-hungry-delete-forward
@kindex C-c C-d (C Mode)
address@hidden C-c address@hidden (C Mode)
address@hidden C-c @key{DELETE} (C Mode)
address@hidden C-c address@hidden (C Mode)
address@hidden C-c @key{Delete} (C Mode)
Delete the entire block of whitespace after point
(@code{c-hungry-delete-forward}).
@end table
@@ -1688,7 +1688,7 @@
delete mode}. When this feature is enabled (indicated by @samp{/h} in
the mode line after the mode name), a single @key{DEL} deletes all
preceding whitespace, not just one space, and a single @kbd{C-c C-d}
-(but @emph{not} plain @key{DELETE}) deletes all following whitespace.
+(but @emph{not} plain @key{Delete}) deletes all following whitespace.
@table @kbd
@item M-x c-toggle-hungry-state
@@ -1717,7 +1717,7 @@
@code{c-context-line-break} isn't bound to a key by default, but it
needs a binding to be useful. The following code will bind it to
address@hidden We use @code{c-initialization-hook} here to make sure
address@hidden We use @code{c-initialization-hook} here to make sure
the keymap is loaded before we try to change it.
@example
=== modified file 'doc/emacs/rmail.texi'
--- a/doc/emacs/rmail.texi 2014-02-23 19:25:59 +0000
+++ b/doc/emacs/rmail.texi 2014-04-29 14:45:24 +0000
@@ -101,7 +101,7 @@
@item @key{SPC}
Scroll forward (@code{scroll-up-command}).
@item @key{DEL}
address@hidden @key{S-SPC}
address@hidden address@hidden
Scroll backward (@code{scroll-down-command}).
@item .
Scroll to start of message (@code{rmail-beginning-of-message}).
=== modified file 'doc/emacs/screen.texi'
--- a/doc/emacs/screen.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/screen.texi 2014-04-29 14:45:24 +0000
@@ -123,7 +123,7 @@
you what the command has done, or to provide you with some specific
information. These @dfn{informative} messages, unlike error messages,
are not accompanied with a beep or flash. For example, @kbd{C-x =}
-(hold down @key{CTRL} and type @kbd{x}, then let go of @key{CTRL} and
+(hold down @key{Ctrl} and type @kbd{x}, then let go of @key{Ctrl} and
type @kbd{=}) displays a message describing the character at point,
its position in the buffer, and its current column in the window.
Commands that take a long time often display messages ending in
@@ -304,7 +304,7 @@
item by pressing @key{F10} (to run the command @code{menu-bar-open}).
You can then navigate the menus with the arrow keys. To activate a
selected menu item, press @key{RET}; to cancel menu navigation, press
address@hidden or @kbd{ESC ESC ESC}.
address@hidden or @address@hidden @key{ESC} @key{ESC}}.
@findex tmm-menubar
@vindex tty-menu-open-use-tmm
=== modified file 'doc/emacs/search.texi'
--- a/doc/emacs/search.texi 2014-03-01 02:48:54 +0000
+++ b/doc/emacs/search.texi 2014-04-29 14:45:24 +0000
@@ -233,7 +233,7 @@
sequences of newlines as well as spaces, set it to
@samp{"[[:space:]\n]+"}.
- To toggle lax space matching, type @kbd{M-s SPC}
+ To toggle lax space matching, type @kbd{M-s @key{SPC}}
(@code{isearch-toggle-lax-whitespace}). To disable this feature
entirely, change @code{search-whitespace-regexp} to @code{nil}; then
each space in the search string matches exactly one space.
@@ -261,7 +261,7 @@
octal digits. This adds a character to the search string, similar to
inserting into a buffer using @kbd{C-q} (@pxref{Inserting Text}). For
example, @kbd{C-q C-s} during incremental search adds the
address@hidden character to the search string.
address@hidden character to the search string.
@item
Type @kbd{C-x 8 @key{RET}}, followed by a Unicode name or code-point.
@@ -605,7 +605,7 @@
Just as in ordinary incremental search, any @key{SPC} typed in
incremental regexp search matches any sequence of one or more
whitespace characters. The variable @code{search-whitespace-regexp}
-specifies the regexp for the lax space matching, and @kbd{M-s SPC}
+specifies the regexp for the lax space matching, and @kbd{M-s @key{SPC}}
(@code{isearch-toggle-lax-whitespace}) toggles the feature.
@xref{Special Isearch}.
=== modified file 'doc/emacs/sending.texi'
--- a/doc/emacs/sending.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/sending.texi 2014-04-26 07:46:18 +0000
@@ -592,31 +592,37 @@
@section Mail Signature
@cindex mail signature
address@hidden mail-signature-file
address@hidden mail-signature
address@hidden message-signature-file
address@hidden message-signature
You can add a standard piece of text---your @dfn{mail
signature}---to the end of every message. This signature may contain
information such as your telephone number or your physical location.
-The variable @code{mail-signature} determines how Emacs handles the
+The variable @code{message-signature} determines how Emacs handles the
mail signature.
- The default value of @code{mail-signature} is @code{t}; this means
-to look for your mail signature in the file @file{~/.signature}. If
-this file exists, its contents are automatically inserted into the end
-of the mail buffer. You can change the signature file via the
-variable @code{mail-signature-file}.
+ The default value of @code{message-signature} is @code{t}; this
+means to look for your mail signature in the file @file{~/.signature}.
+If this file exists, its contents are automatically inserted into the
+end of the mail buffer. You can change the signature file via the
+variable @code{message-signature-file}.
- If you change @code{mail-signature} to a string, that specifies the
-text of the signature directly.
+ If you change @code{message-signature} to a string, that specifies
+the text of the signature directly.
@kindex C-c C-w @r{(Message mode)}
@findex message-insert-signature
- If you change @code{mail-signature} to @code{nil}, Emacs will not
+ If you change @code{message-signature} to @code{nil}, Emacs will not
insert your mail signature automatically. You can insert your mail
signature by typing @kbd{C-c C-w} (@code{message-insert-signature}) in
the mail buffer. Emacs will look for your signature in the signature
file.
address@hidden mail-signature-file
address@hidden mail-signature
+ If you use Mail mode rather than Message mode for composing your
+mail, the corresponding variables that determine how your signature is
+sent are @code{mail-signature} and @code{mail-signature-file} instead.
+
By convention, a mail signature should be marked by a line whose
contents are @samp{-- }. If your signature lacks this prefix, it is
added for you. The remainder of your signature should be no more than
=== modified file 'doc/emacs/text.texi'
--- a/doc/emacs/text.texi 2014-03-01 02:48:54 +0000
+++ b/doc/emacs/text.texi 2014-04-29 14:45:24 +0000
@@ -116,7 +116,7 @@
@findex backward-word
The commands @kbd{M-f} (@code{forward-word}) and @kbd{M-b}
(@code{backward-word}) move forward and backward over words. These
address@hidden key sequences are analogous to the key sequences
address@hidden key sequences are analogous to the key sequences
@kbd{C-f} and @kbd{C-b}, which move over single characters. The
analogy extends to numeric arguments, which serve as repeat counts.
@kbd{M-f} with a negative argument moves backward, and @kbd{M-b} with
@@ -330,7 +330,7 @@
@cindex formfeed character
Within some text files, text is divided into @dfn{pages} delimited
by the @dfn{formfeed character} (@acronym{ASCII} code 12, also denoted
-as @key{control-L}), which is displayed in Emacs as the escape
+as @samp{control-L}), which is displayed in Emacs as the escape
sequence @samp{^L} (@pxref{Text Display}). Traditionally, when such
text files are printed to hardcopy, each formfeed character forces a
page break. Most Emacs commands treat it just like any other
@@ -1250,7 +1250,7 @@
@c FIXME not marked as a user variable
@vindex foldout-mouse-modifiers
You can specify different modifier keys (instead of
address@hidden) by setting @code{foldout-mouse-modifiers}; but if
address@hidden@address@hidden) by setting @code{foldout-mouse-modifiers}; but if
you have already loaded the @file{foldout.el} library, you must reload
it in order for this to take effect.
@@ -1910,7 +1910,7 @@
Run a shell command (which you must specify) to validate the current
buffer as SGML (@code{sgml-validate}).
address@hidden C-c TAB
address@hidden C-c @key{TAB}
@kindex C-c TAB @r{(SGML mode)}
@findex sgml-tags-invisible
Toggle the visibility of existing tags in the buffer. This can be
=== modified file 'doc/emacs/trouble.texi'
--- a/doc/emacs/trouble.texi 2014-04-05 18:33:55 +0000
+++ b/doc/emacs/trouble.texi 2014-04-29 14:45:24 +0000
@@ -21,7 +21,7 @@
@table @kbd
@item C-g
address@hidden address@hidden @r{(MS-DOS only)}
address@hidden address@hidden @r{(MS-DOS only)}
Quit: cancel running or partially typed command.
@item C-]
Abort innermost recursive editing level and cancel the command which
@@ -58,11 +58,11 @@
successive @kbd{C-g} characters to get out of a search.
@xref{Incremental Search}, for details.
- On MS-DOS, the character @address@hidden serves as a quit character
+ On MS-DOS, the character @address@hidden serves as a quit character
like @kbd{C-g}. The reason is that it is not feasible, on MS-DOS, to
recognize @kbd{C-g} while a command is running, between interactions
with the user. By contrast, it @emph{is} feasible to recognize
address@hidden@key{BREAK}} at all times.
address@hidden@key{Break}} at all times.
@iftex
@xref{MS-DOS Keyboard,,,emacs-xtra, Specialized Emacs Features}.
@end iftex
@@ -159,13 +159,13 @@
@cindex @key{DEL} vs @key{BACKSPACE}
@cindex @key{BACKSPACE} vs @key{DEL}
- Every keyboard has a large key, usually labeled @key{Backspace},
+ Every keyboard has a large key, usually labeled @key{BACKSPACE},
which is ordinarily used to erase the last character that you typed.
In Emacs, this key is supposed to be equivalent to @key{DEL}.
When Emacs starts up on a graphical display, it determines
automatically which key should be @key{DEL}. In some unusual cases,
-Emacs gets the wrong information from the system, and @key{Backspace}
+Emacs gets the wrong information from the system, and @key{BACKSPACE}
ends up deleting forwards instead of backwards.
Some keyboards also have a @key{Delete} key, which is ordinarily
@@ -173,9 +173,9 @@
too suggests Emacs got the wrong information---but in the opposite
sense.
- On a text terminal, if you find that @key{Backspace} prompts for a
+ On a text terminal, if you find that @key{BACKSPACE} prompts for a
Help command, like @kbd{Control-h}, instead of deleting a character,
-it means that key is actually sending the @key{BS} character. Emacs
+it means that key is actually sending the @samp{BS} character. Emacs
ought to be treating @key{BS} as @key{DEL}, but it isn't.
@findex normal-erase-is-backspace-mode
@@ -189,8 +189,8 @@
To fix the problem in every Emacs session, put one of the following
lines into your initialization file (@pxref{Init File}). For the
-first case above, where @key{Backspace} deletes forwards instead of
-backwards, use this line to make @key{Backspace} act as @key{DEL}:
+first case above, where @key{BACKSPACE} deletes forwards instead of
+backwards, use this line to make @key{BACKSPACE} act as @key{DEL}:
@lisp
(normal-erase-is-backspace-mode 0)
@@ -438,7 +438,7 @@
displays, you can use the mouse to kill Emacs or switch to another
program.
- On MS-DOS, you must type @address@hidden (twice) to cause
+ On MS-DOS, you must type @address@hidden (twice) to cause
emergency escape---but there are cases where it won't work, when
system call hangs or when Emacs is stuck in a tight loop in C code.
@@ -541,7 +541,7 @@
Taking forever to complete a command can be a bug, but you must make
sure that it is really Emacs's fault. Some commands simply take a
-long time. Type @kbd{C-g} (@address@hidden on MS-DOS) and then
+long time. Type @kbd{C-g} (@address@hidden on MS-DOS) and then
@kbd{C-h l} to see whether the input Emacs received was what you
intended to type; if the input was such that you @emph{know} it should
have been processed quickly, report a bug. If you don't know whether
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-04-29 15:16:07 +0000
+++ b/doc/lispref/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,7 @@
+2014-04-30 Stefan Monnier <address@hidden>
+
+ * processes.texi (Filter Functions, Sentinels): Advertise add-function.
+
2014-04-29 Stefan Monnier <address@hidden>
* windows.texi (Window Configurations, Window Configurations):
=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi 2014-03-18 01:19:03 +0000
+++ b/doc/lispref/processes.texi 2014-04-29 04:14:27 +0000
@@ -1364,6 +1364,10 @@
This function returns the filter function of @var{process}.
@end defun
+In case the process's output needs to be passed to several filters, you can
+use @code{add-function} to combine an existing filter with a new one.
address@hidden Functions}.
+
Here is an example of the use of a filter function:
@smallexample
@@ -1617,6 +1621,10 @@
This function returns the sentinel of @var{process}.
@end defun
+In case a process status changes need to be passed to several sentinels, you
+can use @code{add-function} to combine an existing sentinel with a new one.
address@hidden Functions}.
+
@defun waiting-for-user-input-p
While a sentinel or filter function is running, this function returns
address@hidden if Emacs was waiting for keyboard input from the user at
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-04-16 19:43:46 +0000
+++ b/lib-src/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,8 @@
+2014-04-30 Glenn Morris <address@hidden>
+
+ * Makefile.in ($(DESTDIR)${archlibdir}):
+ Avoid non-portable "`\" nesting. (Bug#17339)
+
2014-04-16 Eli Zaretskii <address@hidden>
* update-game-score.c (write_scores): Condition fchmod call on
=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in 2014-03-22 23:08:41 +0000
+++ b/lib-src/Makefile.in 2014-04-30 19:54:52 +0000
@@ -247,8 +247,8 @@
chown ${gameuser} "$(DESTDIR)${gamedir}"; \
chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
fi
- if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" \
- != "`cd ${srcdir} && /bin/pwd`" ]; then \
+ exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+ if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
for file in ${SCRIPTS}; do \
$(INSTALL_SCRIPT) ${srcdir}/$$file
"$(DESTDIR)${archlibdir}/$$file"; \
done ; \
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-28 04:40:41 +0000
+++ b/lisp/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,35 @@
+2014-04-30 Eli Zaretskii <address@hidden>
+
+ * dired.el (dired-initial-position-hook, dired-initial-position):
+ Doc string fixes.
+
+2014-04-30 Glenn Morris <address@hidden>
+
+ * mail/rmail.el (rmail-quit): Handle killed summaries. (Bug#17283)
+
+2014-04-30 Matthias Dahl <address@hidden>
+
+ * faces.el (face-spec-recalc): Apply X resources only after the
+ defface spec has been applied. Thus, X resources are no longer
+ overriden by the defface spec which also fixes issues on win32 where
+ the toolbar coloring was wrong because it is set through X resources
+ and was (wrongfully) overriden. (Bug#16694)
+
+2014-04-30 Stefan Monnier <address@hidden>
+
+ * textmodes/rst.el (electric-pair-pairs): Declare.
+ (rst-mode): Set it (bug#17131).
+
+2014-04-30 Juri Linkov <address@hidden>
+
+ * desktop.el (desktop-value-to-string): Let-bind `print-length'
+ and `print-level' to nil. (Bug#17351)
+
+2014-04-30 Nicolas Richard <address@hidden>
+
+ * battery.el (battery-update): Handle the case where battery
+ status is "N/A" (bug#17319).
+
2014-04-28 Stefan Monnier <address@hidden>
* progmodes/ps-mode.el: Use SMIE. Move string and comment recognition
=== modified file 'lisp/battery.el'
--- a/lisp/battery.el 2014-03-23 06:02:36 +0000
+++ b/lisp/battery.el 2014-04-30 19:54:52 +0000
@@ -201,19 +201,18 @@
(defun battery-update ()
"Update battery status information in the mode line."
- (let ((data (and battery-status-function (funcall battery-status-function))))
+ (let* ((data (and battery-status-function (funcall battery-status-function)))
+ (percentage (car (read-from-string (cdr (assq ?p data))))))
(setq battery-mode-line-string
(propertize (if (and battery-mode-line-format
- (<= (car (read-from-string (cdr (assq ?p data))))
- battery-mode-line-limit))
- (battery-format
- battery-mode-line-format
- data)
+ (numberp percentage)
+ (<= percentage battery-mode-line-limit))
+ (battery-format battery-mode-line-format data)
"")
'face
- (and (<= (car (read-from-string (cdr (assq ?p data))))
- battery-load-critical)
- 'error)
+ (and (numberp percentage)
+ (<= percentage battery-load-critical)
+ 'error)
'help-echo "Battery status information")))
(force-mode-line-update))
=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el 2014-03-12 07:14:30 +0000
+++ b/lisp/desktop.el 2014-04-27 08:22:11 +0000
@@ -844,12 +844,13 @@
"Convert VALUE to a string that when read evaluates to the same value.
Not all types of values are supported."
(let* ((print-escape-newlines t)
+ (print-length nil)
+ (print-level nil)
(float-output-format nil)
(quote.sexp (desktop--v2s value))
(quote (car quote.sexp))
- (txt
- (let ((print-quoted t))
- (prin1-to-string (cdr quote.sexp)))))
+ (print-quoted t)
+ (txt (prin1-to-string (cdr quote.sexp))))
(if (eq quote 'must)
(concat "'" txt)
txt)))
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2014-04-22 21:32:51 +0000
+++ b/lisp/dired.el 2014-04-30 19:54:52 +0000
@@ -222,7 +222,7 @@
(defcustom dired-initial-position-hook nil
"This hook is used to position the point.
-It is run the function `dired-initial-position'."
+It is run by the function `dired-initial-position'."
:group 'dired
:type 'hook
:version "24.4")
@@ -2768,7 +2768,7 @@
;; FIXME document whatever dired-x is doing.
(defun dired-initial-position (dirname)
"Where point should go in a new listing of DIRNAME.
-Point assumed at beginning of new subdir line.
+Point is assumed to be at the beginning of new subdir line.
It runs the hook `dired-initial-position-hook'."
(end-of-line)
(and (featurep 'dired-x) dired-find-subdir
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2014-04-14 15:38:43 +0000
+++ b/lisp/faces.el 2014-04-30 19:54:52 +0000
@@ -1652,18 +1652,22 @@
(defun face-spec-recalc (face frame)
"Reset the face attributes of FACE on FRAME according to its specs.
-After the reset, the specs are applied from the following sources in this
order:
- X resources (if applicable)
+The following sources are applied in this order:
+
+ face reset to default values if it's the default face, otherwise set
+ to unspecified (through `face-spec-reset-face')
|
(theme and user customization)
- or, if nonexistent or does not match the current frame,
+ or: if none of the above exist, and none match the current frame or
+ inherited from the defface spec instead of overwriting it
+ entirely, the following is applied instead:
(defface default spec)
+ (X resources (if applicable))
|
defface override spec"
(while (get face 'face-alias)
(setq face (get face 'face-alias)))
(face-spec-reset-face face frame)
- (make-face-x-resource-internal face frame)
;; If FACE is customized or themed, set the custom spec from
;; `theme-face' records.
(let ((theme-faces (get face 'theme-face))
@@ -1677,10 +1681,12 @@
(setq theme-face-applied t))))
;; If there was a spec applicable to FRAME, that overrides the
;; defface spec entirely (rather than inheriting from it). If
- ;; there was no spec applicable to FRAME, apply the defface spec.
+ ;; there was no spec applicable to FRAME, apply the defface spec
+ ;; as well as any applicable X resources.
(unless theme-face-applied
(setq spec (face-spec-choose (face-default-spec face) frame))
- (face-spec-set-2 face frame spec))
+ (face-spec-set-2 face frame spec)
+ (make-face-x-resource-internal face frame))
(setq spec (face-spec-choose (get face 'face-override-spec) frame))
(face-spec-set-2 face frame spec)))
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2014-03-22 10:18:10 +0000
+++ b/lisp/mail/rmail.el 2014-04-30 19:54:52 +0000
@@ -1,7 +1,6 @@
;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
-;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software Foundation, Inc.
;; Maintainer: address@hidden
;; Keywords: mail
@@ -1573,7 +1572,7 @@
(when (boundp 'rmail-quit-hook)
(run-hooks 'rmail-quit-hook))
;; Don't switch to the summary buffer even if it was recently visible.
- (when rmail-summary-buffer
+ (when (rmail-summary-exists)
(with-current-buffer rmail-summary-buffer
(set-buffer-modified-p nil))
(replace-buffer-in-windows rmail-summary-buffer)
=== modified file 'lisp/textmodes/rst.el'
--- a/lisp/textmodes/rst.el 2014-03-16 03:47:31 +0000
+++ b/lisp/textmodes/rst.el 2014-04-28 15:04:49 +0000
@@ -784,11 +784,9 @@
(modify-syntax-entry ?\u2019 "." st)
(modify-syntax-entry ?\u201c "." st)
(modify-syntax-entry ?\u201d "." st)
-
st)
"Syntax table used while in `rst-mode'.")
-
(defcustom rst-mode-hook nil
"Hook run when `rst-mode' is turned on.
The hook for `text-mode' is run before this one."
@@ -799,6 +797,8 @@
;; Pull in variable definitions silencing byte-compiler.
(require 'newcomment)
+(defvar electric-pair-pairs)
+
;; Use rst-mode for *.rst and *.rest files. Many ReStructured-Text files
;; use *.txt, but this is too generic to be set as a default.
;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" .
rst-mode)))
@@ -860,6 +860,9 @@
(set (make-local-variable 'uncomment-region-function)
'rst-uncomment-region)
+ (set (make-local-variable 'electric-pair-pairs)
+ '((?\" . ?\") (?\* . ?\*) (?\` . ?\`)))
+
;; Imenu and which function.
;; FIXME: Check documentation of `which-function' for alternative ways to
;; determine the current function name.
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-04-22 21:32:51 +0000
+++ b/nt/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,8 @@
+2014-04-30 Eli Zaretskii <address@hidden>
+
+ * cmdproxy.c (make_absolute): Don't copy more characters from PATH
+ than a single directory name can hold. (Bug#17334)
+
2014-04-22 Eli Zaretskii <address@hidden>
* inc/ms-w32.h (lseek): Define only if not already a macro.
=== modified file 'nt/cmdproxy.c'
--- a/nt/cmdproxy.c 2014-01-16 06:24:06 +0000
+++ b/nt/cmdproxy.c 2014-04-26 07:06:33 +0000
@@ -292,11 +292,15 @@
while (*path)
{
+ size_t len;
+
/* Get next directory from path. */
p = path;
while (*p && *p != ';') p++;
- strncpy (dir, path, p - path);
- dir[p - path] = '\0';
+ /* A broken PATH could have too long directory names in it. */
+ len = min (p - path, sizeof (dir) - 1);
+ strncpy (dir, path, len);
+ dir[len] = '\0';
/* Search the directory for the program. */
if (search_dir (dir, prog, MAX_PATH, absname) > 0)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-04-29 15:16:07 +0000
+++ b/src/ChangeLog 2014-04-30 19:54:52 +0000
@@ -1,3 +1,23 @@
+2014-04-30 Paul Eggert <address@hidden>
+
+ * term.c (tty_menu_activate): Don't assume row and col are initialized.
+ GCC 4.9.0 warned about this, and I couldn't easily prove to my own
+ satisfaction that they would always be initialized.
+
+2014-04-30 Eli Zaretskii <address@hidden>
+
+ * term.c (tty_menu_display): Move the cursor to the active menu item.
+ (tty_menu_activate): Return the cursor to the active menu item
+ after displaying the menu and after displaying help-echo. See
+ http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00402.html
+ for the details of why this is needed by screen readers and
+ Braille displays.
+
+2014-04-30 Glenn Morris <address@hidden>
+
+ * process.c (handle_child_signal):
+ Handle systems without WCONTINUED. (Bug#15110, 17339)
+
2014-04-29 Stefan Monnier <address@hidden>
* window.c (struct saved_window): Remove mark.
=== modified file 'src/process.c'
--- a/src/process.c 2014-04-16 19:43:46 +0000
+++ b/src/process.c 2014-04-30 19:54:52 +0000
@@ -6226,7 +6226,11 @@
int status;
if (p->alive
- && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
+#ifndef WCONTINUED
+ && child_status_changed (p->pid, &status, WUNTRACED))
+#else
+ && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
+#endif
{
/* Change the status of the process that was found. */
p->tick = ++process_tick;
=== modified file 'src/term.c'
--- a/src/term.c 2014-04-17 14:59:22 +0000
+++ b/src/term.c 2014-04-30 19:54:52 +0000
@@ -2924,6 +2924,13 @@
menu_help_paneno = pn - 1;
menu_help_itemno = j;
}
+ /* Take note of the coordinates of the active menu item, to
+ display the cursor there. */
+ if (mousehere)
+ {
+ row = y + i;
+ col = x;
+ }
display_tty_menu_item (menu->text[j], max_width, face, x, y + i,
menu->submenu[j] != NULL);
}
@@ -3204,6 +3211,7 @@
bool first_time;
Lisp_Object selectface;
int first_item = 0;
+ int col, row;
/* Don't allow non-positive x0 and y0, lest the menu will wrap
around the display. */
@@ -3391,7 +3399,14 @@
faces, x, y, first_item, 1);
tty_hide_cursor (tty);
fflush (tty->output);
+ /* The call to display help-echo below will move the cursor,
+ so remember its current position as computed by
+ tty_menu_display. */
+ col = cursorX (tty);
+ row = cursorY (tty);
}
+ else
+ row = -1;
/* Display the help-echo message for the currently-selected menu
item. */
@@ -3400,6 +3415,11 @@
{
help_callback (menu_help_message,
menu_help_paneno, menu_help_itemno);
+ /* Move the cursor to the beginning of the current menu
+ item, so that screen readers and other accessibility aids
+ know where the active region is. */
+ if (0 <= row)
+ cursor_to (sf, row, col);
tty_hide_cursor (tty);
fflush (tty->output);
prev_menu_help_message = menu_help_message;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117035: Merge from emacs-24; up to r117038,
Juanma Barranquero <=