Commit 7c420169 authored by Chong Yidong's avatar Chong Yidong
Browse files

Merge changes from emacs-23 branch

parents bb7f5cbc d12f22f5
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* nt/README.W32: Update the information about PNG support libraries.
(Bug#7716)
2010-12-27 Stefan Monnier <monnier@iro.umontreal.ca>
* bzrmerge.el: New file to help merge branches while skipping
......
2011-01-02 Chong Yidong <cyd@stupidchicken.com>
* rmail.texi (Rmail Display): Edit for grammar and conciseness.
2011-01-02 Kenichi Handa <handa@m17n.org>
* rmail.texi (Rmail Display): Describe new features of Rmail in Info.
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Cut and Paste): Modify the section's name and text:
don't mix "cut/paste" with "kill/yank".
(Cut/Paste Other App): Describe the per-session emulation of PRIMARY.
(Bug#7702)
* trouble.texi (Checklist): Mention debug-on-quit. (Bug#7667)
2011-01-02 Glenn Morris <rgm@gnu.org>
* maintaining.texi: Move inclusion of emerge after EDE, so that it
matches its position in the menu. (Bug#7674)
2011-01-02 Glenn Morris <rgm@gnu.org>
* trouble.texi (Checklist): Mention not replying via news either.
2010-12-30 Tassilo Horn <tassilo@member.fsf.org>
* misc.texi (Document View): Update DocView section with newly
......
......@@ -58,10 +58,10 @@ so that you can use many of the features described in this chapter.
@end menu
@node Cut and Paste
@section Killing and Yanking on Graphical Displays
@section Cutting and Pasting on Graphical Displays
This section describes commands for selecting a region, killing, and
yanking using the mouse.
This section describes commands for selecting a region, cutting, and
pasting using the mouse.
@menu
* Mouse Commands:: Moving, cutting, and pasting, with the mouse.
......@@ -248,6 +248,14 @@ has no ``memory'': each time you save something in the primary
selection, either in Emacs or in another X application, the previous
contents of the primary selection are lost.
@cindex MS-Windows, and primary selection
MS-Windows provides no primary selection, but Emacs emulates it
within a single Emacs session, by storing the selected text
internally. Therefore, all the features and commands related to the
primary selection work on Windows as they do on X, for cutting and
pasting within the same session, but not across Emacs sessions or with
other applications.
Whenever you kill some text using a command such as @kbd{C-w}
(@code{kill-region}), or copy it into the kill ring using a command
such as @kbd{M-w} (@code{kill-ring-save}), that text is also saved in
......
......@@ -2354,7 +2354,3 @@ the target should be built.
@ifnottex
@include emerge-xtra.texi
@end ifnottex
@ignore
arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
@end ignore
......@@ -1101,57 +1101,90 @@ buffer before sorting it.
@node Rmail Display
@section Display of Messages
Rmail reformats the header of each message before displaying it for
the first time. Reformatting hides uninteresting header fields to
reduce clutter. You can use the @kbd{t} command to show the entire
header or to repeat the header reformatting operation.
This section describes how Rmail displays mail headers,
@acronym{MIME} sections and attachments, and URLs.
@table @kbd
@item t
Toggle display of complete header (@code{rmail-toggle-header}).
@end table
@vindex rmail-ignored-headers
@vindex rmail-nonignored-headers
Reformatting the header involves deleting most header fields, on the
grounds that they are not interesting. The variable
@code{rmail-ignored-headers} holds a regular expression that specifies
which header fields to hide in this way---if it matches the beginning
of a header field, that whole field is hidden. However, the variable
@code{rmail-nonignored-headers} provides a further override: a header
matching that regular expression is shown even if it matches
@code{rmail-ignored-headers} too.
@vindex rmail-displayed-headers
As an alternative to the previous two variables, you can set
@code{rmail-displayed-headers} instead. If non-@code{nil}, this should
be a regular expression specifying which headers to display.
@kindex t @r{(Rmail)}
@findex rmail-toggle-header
To see the complete, original header, use the @kbd{t} command
(@code{rmail-toggle-header}). This discards the reformatted headers of
the current message and displays it with the original header. Repeating
@kbd{t} reformats the message again, which shows only the interesting
headers according to the current values of the above variables.
Selecting the message again also reformats it if necessary.
Before displaying each message for the first time, Rmail reformats
its header, hiding uninteresting header fields to reduce clutter. The
@kbd{t} (@code{rmail-toggle-header}) command toggles this, switching
between showing the reformatted header fields and showing the
complete, original header. With a positive prefix argument, the
command shows the reformatted header; with a zero or negative prefix
argument, it shows the full header. Selecting the message again also
reformats it if necessary.
When the @kbd{t} command has a prefix argument, a positive argument
means to show the reformatted header, and a zero or negative argument
means to show the full header.
@vindex rmail-ignored-headers
@vindex rmail-displayed-headers
@vindex rmail-nonignored-headers
The variable @code{rmail-ignored-headers} holds a regular expression
specifying the header fields to hide; any matching header line will be
hidden. The variable @code{rmail-nonignored-headers} overrides this:
any header field matching that regular expression is shown even if it
matches @code{rmail-ignored-headers} too. The variable
@code{rmail-displayed-headers} is an alternative to these two
variables; if non-@code{nil}, this should be a regular expression
specifying which headers to display (the default is @code{nil}).
@vindex rmail-highlighted-headers
Rmail highlights certain header fields that are especially
interesting---by default, the @samp{From} and @samp{Subject} fields.
The variable @code{rmail-highlighted-headers} holds a regular expression
that specifies the header fields to highlight; if it matches the
beginning of a header field, that whole field is highlighted. To turn
off this feature, set @code{rmail-highlighted-headers} to @code{nil}.
Customize the face @code{rmail-highlight} to adjust the style of the
highlighting.
This highlighting uses the @code{rmail-highlight} face. The variable
@code{rmail-highlighted-headers} holds a regular expression specifying
the header fields to highlight; if it matches the beginning of a
header field, that whole field is highlighted. To disable this
feature, set @code{rmail-highlighted-headers} to @code{nil}.
@cindex MIME messages (Rmail)
@vindex rmail-enable-mime
By default, Rmail automatically decodes @acronym{MIME} (Multipurpose
Internet Mail Extensions) messages. If the message contains multiple
parts (@acronym{MIME} entities), each part is represented by a tagline
in the Rmail buffer. The tagline summarizes the part's depth, index,
and type, and may also contain a button for handling it, e.g. saving
it to a file or displaying it as an image in the Rmail buffer.
@table @kbd
@findex rmail-mime-toggle-hidden
@item @key{RET}
Hide or show the @acronym{MIME} part at point
(@code{rmail-mime-toggle-hidden}).
You can highlight and activate URLs in incoming messages using
Goto Address mode:
@findex rmail-mime-next-item
@item @key{TAB}
Move point to the next @acronym{MIME} part
(@code{rmail-mime-next-item}).
@findex rmail-mime-previous-item
@item @key{BackTab}
Move point to the previous @acronym{MIME} part
(@code{rmail-mime-previous-item}).
@findex rmail-mime
@item v
@kindex v @r{(Rmail)}
Toggle between @acronym{MIME} display and raw message
(@code{rmail-mime}).
@end table
The @kbd{v} (@code{rmail-mime}) command toggles between the default
@acronym{MIME} display described above, and a ``raw'' display showing
the undecoded @acronym{MIME} data. With a prefix argument, this
command toggles the display of only an entity at point.
To prevent Rmail from handling MIME decoded messages, change the
variable @code{rmail-enable-mime} to @code{nil}. When this is the
case, the @kbd{v} (@code{rmail-mime}) command instead creates a
temporary buffer to display the current @acronym{MIME} message.
You can highlight and activate URLs in the Rmail buffer using Goto
Address mode:
@c FIXME goto-addr.el commentary says to use goto-address instead.
@smallexample
......@@ -1163,13 +1196,6 @@ Then you can browse these URLs by clicking on them with @kbd{Mouse-2}
(or @kbd{Mouse-1} quickly) or by moving to one and typing @kbd{C-c
@key{RET}}. @xref{Goto Address mode, Activating URLs, Activating URLs}.
@cindex MIME messages (Rmail)
@findex rmail-mime
@kindex v @r{(Rmail)}
The @kbd{v} (@code{rmail-mime}) command creates a temporary buffer
displaying the current MIME message. By default, it displays plain text
and multipart messages, and offers buttons to save attachments.
@node Rmail Coding
@section Rmail and Coding Systems
......
......@@ -630,9 +630,10 @@ you can use.
All mail sent to the @samp{bug-gnu-emacs} mailing list is also
gatewayed to the @samp{gnu.emacs.bug} newsgroup. The reverse is also
true, but we ask you not to post bug reports via the newsgroup. It
can make it much harder to contact you if we need to ask for more
information, and it does not integrate well with the bug tracker.
true, but we ask you not to post bug reports (or replies) via the
newsgroup. It can make it much harder to contact you if we need to ask
for more information, and it does not integrate well with the bug
tracker.
If your data is more than 500,000 bytes, please don't include it
directly in the bug report; instead, offer to send it on request, or
......@@ -805,6 +806,13 @@ This use of the debugger is possible only if you know how to make the
bug happen again. If you can't make it happen again, at least copy
the whole error message.
@vindex debug-on-quit
If Emacs appears to be stuck in an infinite loop or in a very long
operation, typing @kbd{C-g} with the variable @code{debug-on-quit}
non-@code{nil} will start the Lisp debugger and show a backtrace.
This backtrace is useful for debugging such long loops, so if you can
produce it, copy it into the bug report.
@item
Check whether any programs you have loaded into the Lisp world,
including your @file{.emacs} file, set any variables that may affect the
......
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* modes.texi (Emulating Mode Line): Fix last change.
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* modes.texi (Emulating Mode Line): Update documentation of
format-mode-line according to changes that fixed bug #7587.
2010-12-18 Stefan Monnier <monnier@iro.umontreal.ca>
* modes.texi (Derived Modes): Mention prog-mode.
......
......@@ -2112,29 +2112,38 @@ the text that would appear in a mode line or header line
based on a certain mode-line specification.
@defun format-mode-line format &optional face window buffer
This function formats a line of text according to @var{format} as if
it were generating the mode line for @var{window}, but instead of
displaying the text in the mode line or the header line, it returns
the text as a string. The argument @var{window} defaults to the
selected window. If @var{buffer} is non-@code{nil}, all the
information used is taken from @var{buffer}; by default, it comes from
@var{window}'s buffer.
This function formats a line of text according to @var{format} as if it
were generating the mode line for @var{window}, but it also returns the
text as a string. The argument @var{window} defaults to the selected
window. If @var{buffer} is non-@code{nil}, all the information used is
taken from @var{buffer}; by default, it comes from @var{window}'s
buffer.
The value string normally has text properties that correspond to the
faces, keymaps, etc., that the mode line would have. And any character
for which no @code{face} property is specified gets a default
value which is usually @var{face}. (If @var{face} is @code{t},
that stands for either @code{mode-line} if @var{window} is selected,
faces, keymaps, etc., that the mode line would have. Any character for
which no @code{face} property is specified by @var{format} gets a
default value determined by @var{face}. If @var{face} is @code{t}, that
stands for either @code{mode-line} if @var{window} is selected,
otherwise @code{mode-line-inactive}. If @var{face} is @code{nil} or
omitted, that stands for no face property.)
omitted, that stands for the default face. If @var{face} is an integer,
the value returned by this function will have no text properties.
However, if @var{face} is an integer, the value has no text properties.
You can also specify other valid faces as the value of @var{face}.
If specified, that face provides the @code{face} property for characters
whose face is not specified by @var{format}.
Note that using @code{mode-line}, @code{mode-line-inactive}, or
@code{header-line} as @var{face} will actually redisplay the mode line
or the header line, respectively, using the current definitions of the
corresponding face, in addition to returning the formatted string.
(Other faces do not cause redisplay.)
For example, @code{(format-mode-line header-line-format)} returns the
text that would appear in the selected window's header line (@code{""}
if it has no header line). @code{(format-mode-line header-line-format
'header-line)} returns the same text, with each character
carrying the face that it will have in the header line itself.
carrying the face that it will have in the header line itself, and also
redraws the header line.
@end defun
@node Imenu
......
2011-01-02 Jari Aalto <jari.aalto@cante.net> (tiny change)
* emacsclient.1: Arrange options alphabetically (Bug#7620).
2010-10-12 Glenn Morris <rgm@gnu.org>
* emacs.1: Small fixes.
......
......@@ -49,36 +49,36 @@ If you set the variable `server-window' to a window or a frame, `C-x
The programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
.TP
.B \-nw, \-t, \-\-tty
open a new Emacs frame on the current terminal
.B \-a, \-\-alternate-editor=EDITOR
if the Emacs server is not running, run the specified editor instead.
This can also be specified via the `ALTERNATE_EDITOR' environment variable.
If the value of EDITOR is the empty string, then Emacs is started in
daemon mode and emacsclient will try to connect to it.
.TP
.B -c, \-\-create-frame
create a new frame instead of trying to use the current Emacs frame
.TP
.B \-d, \-\-display=DISPLAY
tell the server to display the files on the given display.
.TP
.B \-e, \-\-eval
do not visit files but instead evaluate the arguments as Emacs
Lisp expressions.
.TP
.B \-f, \-\-server-file=FILENAME
use TCP configuration file FILENAME for communication.
This can also be specified via the `EMACS_SERVER_FILE' environment variable.
.TP
.B \-n, \-\-no-wait
returns
immediately without waiting for you to "finish" the buffer in Emacs.
.TP
.B \-nw, \-t, \-\-tty
open a new Emacs frame on the current terminal
.TP
.B \-s, \-\-socket-name=FILENAME
use socket named FILENAME for communication.
.TP
.B \-f, \-\-server-file=FILENAME
use TCP configuration file FILENAME for communication.
This can also be specified via the `EMACS_SERVER_FILE' environment variable.
.TP
.B \-a, \-\-alternate-editor=EDITOR
if the Emacs server is not running, run the specified editor instead.
This can also be specified via the `ALTERNATE_EDITOR' environment variable.
If the value of EDITOR is the empty string, then Emacs is started in
daemon mode and emacsclient will try to connect to it.
.TP
.B \-d, \-\-display=DISPLAY
tell the server to display the files on the given display.
.TP
.B \-V, \-\-version
print version information and exit
.TP
......
2011-01-02 Kenichi Handa <handa@m17n.org>
* NEWS.23: Describe the changes for rmail's MIME handling.
2010-12-18 Chong Yidong <cyd@stupidchicken.com>
* images/separator.xpm: Tweak colors.
......
......@@ -67,6 +67,27 @@ Bazaar recognizes the headers "Author", "Date" and "Fixes".
Git, Mercurial, and Monotone recognize "Author" and "Date".
Any unknown header is left as is in the message, so it is not lost.
** Rmail
*** The default value of `rmail-enable-mime' is now t. Rmail decodes
MIME contents automatically. You can customize the variable
`rmail-enable-mime' back to `nil' to disable this automatic MIME
decoding.
*** The command `rmail-mime' change the displaying of a MIME message
between decoded presentation form and raw data if `rmail-enable-mime'
is non-nil. And, with prefix argument, it change only the displaying
of the MIME entity at point.
*** The new command `rmail-mime-next-item' (bound to TAB) moves point
to the next item of MIME message.
*** The new command `rmail-mime-previous-item' (bound to backtab) moves
point to the previous item of MIME message.
*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
body of the MIME entity at point.
** Obsolete packages
+++
......
2011-01-02 Glenn Morris <rgm@gnu.org>
* ebrowse.c (version) <emacs_copyright>:
* etags.c (print_version) <emacs_copyright>:
* rcs2log (Copyright): Set short copyright year to 2011.
2010-11-27 Joe Matarazzo <joe.matarazzo@gmail.com> (tiny change)
* ebrowse.c (yylex): If end of input buffer encountered while
......
/* ebrowse.c --- parsing files for the ebrowse C++ browser
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
......@@ -3577,7 +3577,7 @@ void
version (void)
{
/* Makes it easier to update automatically. */
char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
printf ("ebrowse %s\n", VERSION);
puts (emacs_copyright);
......@@ -3877,7 +3877,4 @@ main (int argc, char **argv)
return EXIT_SUCCESS;
}
/* arch-tag: fc03b4bc-91a9-4c3d-b3b9-12a77fa86dd8
(do not change this comment) */
/* ebrowse.c ends here */
......@@ -29,8 +29,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011 Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.
......@@ -891,7 +891,7 @@ static void
print_version (void)
{
/* Makes it easier to update automatically. */
char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
puts (emacs_copyright);
......@@ -6725,7 +6725,4 @@ xrealloc (char *ptr, unsigned int size)
* End:
*/
/* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
(do not change this comment) */
/* etags.c ends here */
......@@ -3,8 +3,8 @@
# RCS to ChangeLog generator
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
# 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Free Software Foundation, Inc.
# Author: Paul Eggert <eggert@twinsun.com>
......@@ -22,7 +22,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright='Copyright (C) 2010 Free Software Foundation, Inc.
Copyright='Copyright (C) 2011 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
......@@ -777,4 +777,3 @@ exec rm -fr $logdir
# tab-width:4
# End:
# arch-tag: cea067bd-a552-4254-ba17-078208933073
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* term/w32-win.el (dynamic-library-alist): Set up correctly for
libpng versions both before and after 1.4.0. (Bug#7716)
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* time.el (display-time-mode): Mention display-time-interval in
the doc string. (Bug#7713)
2011-01-02 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-mime-parse): Perform parsing in
condition-case and return an error message string if something
goes wrong.
(rmail-show-mime): Adjust for the above change. Insert the
header by rmail-mime-insert-header.
2011-01-02 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el: New key bindings for rmail-mime-next-item,
rmail-mime-previous-item, and rmail-mime-toggle-hidden.
(rmail-mime-mbox-buffer)
(rmail-mime-view-buffer, rmail-mime-coding-system): New variables.
(rmail-mime-entity): Argument changed. All codes handling an
entity object are changed.
(rmail-mime-entity-header, rmail-mime-entity-body): Adjust for
the above change.
(rmail-mime-entity-children, rmail-mime-entity-handler)
(rmail-mime-entity-tagline): New functions.
(rmail-mime-message-p): New function.
(rmail-mime-save): Bind rmail-mime-mbox-buffer.
(rmail-mime-entity-segment, rmail-mime-next-item)
(rmail-mime-previous-item, rmail-mime-shown-mode)
(rmail-mime-hidden-mode, rmail-mime-raw-mode)
(rmail-mime-toggle-raw, rmail-mime-toggle-hidden)
(rmail-mime-insert-tagline, rmail-mime-insert-header):
New functions.
(rmail-mime-text-handler): Call rmail-mime-insert-text.
(rmail-mime-insert-decoded-text): New function.
(rmail-mime-insert-text): Call rmail-mime-insert-decoded-text.
(rmail-mime-insert-image): Argument changed. Caller changed.
(rmail-mime-image): Call rmail-mime-toggle-hidden.
(rmail-mime-set-bulk-data): New funciton.
(rmail-mime-insert-bulk): Argument changed.
(rmail-mime-multipart-handler): Return t.
(rmail-mime-process-multipart): Argument changed.
Handle "multipart/alternative" here.
(rmail-mime-process): Argument changed.
(rmail-mime-parse): Bind rmail-mime-mbox-buffer.
(rmail-mime-insert): Argument changed. Handle raw display mode.
(rmail-mime): Argument changed. Handle toggling of raw display
mode.
(rmail-show-mime): Bind rmail-mime-mbox-buffer and
rmail-mime-view-buffer.
(rmail-insert-mime-forwarded-message): Likewise.
(rmail-search-mime-message): Likewise. Don't bind rmail-buffer.
* mail/rmail.el (rmail-show-message-1): If rmail-enable-mime is
non-nil, handle the header in rmail-show-mime-function.
2011-01-02 Leo <sdl.web@gmail.com>
* help-fns.el (describe-variable): Fix previous change.
2011-01-02 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-lazy-highlight-error): New variable.
(isearch-lazy-highlight-new-loop): Compare `isearch-error' and
`isearch-lazy-highlight-error'. Set `isearch-lazy-highlight-error'
to the current value of `isearch-error' (Bug#7468).
2011-01-02 Chong Yidong <cyd@stupidchicken.com>
* help-fns.el (describe-variable): Don't emit trailing whitespace
(Bug#7511).
2011-01-02 Chong Yidong <cyd@stupidchicken.com>
* textmodes/rst.el (rst-compile-pdf-preview)
(rst-compile-slides-preview): Use make-temp-file (Bug#7646).
2011-01-02 Kevin Gallagher <Kevin.Gallagher@boeing.com>
* emulation/edt-mapper.el: Override mapping of function keys so
that the later call to read-key-sequence works.
2011-01-02 Eli Zaretskii <eliz@gnu.org>
* mail/smtpmail.el (smtpmail-send-it): Write queued mail body with
Unix EOLs. (Bug#7589)
2011-01-02 Leo <sdl.web@gmail.com>
* eshell/em-hist.el (eshell-previous-matching-input): Signal error
if point is not behind eshell-last-output-end (Bug#7585).
2011-01-02 Stefan Monnier <monnier@iro.umontreal.ca>
* files.el (file-local-variables-alist):
Make permanent-local (bug#7767).
2011-01-02 Glenn Morris <rgm@gnu.org>
* version.el (emacs-copyright): Set short copyright year to 2011.
2011-01-02 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change)
* mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering
an existing temp buffer. (Bug#7746)
2011-01-02 Glenn Morris <rgm@gnu.org>
* mail/mail-utils.el (mail-mbox-from): Handle From: headers with
multiple addresses. (Bug#7760)
2010-12-31 Michael Albinus <michael.albinus@gmx.de>
 
* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
......@@ -20285,7 +20401,7 @@ See ChangeLog.14 for earlier changes.
;; coding: utf-8
;; End:
 
Copyright (C) 2009, 2010 Free Software Foundation, Inc.
Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
This file is part of GNU Emacs.
 
......
......@@ -141,6 +141,48 @@
(setq edt-term nil)
(setq edt-term (getenv "TERM")))
;;;
;;; Implements a workaround for a feature that was added to simple.el.
;;;
;;; Many function keys have no Emacs functions assigned to them by
;;; default. A subset of these are typically assigned functions in the
;;; EDT emulation. This includes all the keypad keys and a some others
;;; like Delete.
;;;
;;; Logic in simple.el maps some of these unassigned function keys to
;;; ordinary typing keys. Where this is the case, a call to
;;; read-key-sequence, below, does not return the name of the function
;;; key pressd by the user but, instead, it returns the name of the
;;; key to which it has been mapped. It needs to know the name of the
;;; key pressed by the user. As a workaround, w