diff options
1077 files changed, 4823 insertions, 3303 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5b23f9af189..92c2ff70b47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -39,7 +39,6 @@ Eli Zaretskii lisp/term/tty-colors.el lisp/international/codepage.el - man/faq.texi man/msdog.texi Kenichi Handa @@ -66,6 +65,12 @@ Miles Bader lisp/minibuf-eldef.el lisp/rfn-eshadow.el +Jay Belanger + Calc + lisp/calc/* + etc/calccard.tex + man/calc.texi + ============================================================================== 2. ============================================================================== diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 396f591bf89..ab17c84eab9 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -66,35 +66,35 @@ DIRECTORY STATUS IN CHARGE --------- ------ --------- etc (and subdirs) done Thien-Thi Nguyen (ttn(@gnu.org)) leim working Kenichi Handa -lib-src working ttn -lisp working ttn -lisp/calc working ttn -lisp/calendar working Glenn Morris -lisp/emacs-lisp working ttn -lisp/emulation working ttn -lisp/eshell working ttn +lib-src done ttn +lisp done ttn +lisp/calc done Jay Belanger +lisp/calendar done Glenn Morris +lisp/emacs-lisp done ttn +lisp/emulation done ttn +lisp/eshell done ttn lisp/gnus done Romain Francoise lisp/international working Kenichi Handa lisp/language working Kenichi Handa -lisp/mail working ttn +lisp/mail done ttn lisp/mh-e done Bill Wohler -lisp/net working ttn +lisp/net done ttn lisp/obsolete done ttn lisp/play done Romain Francoise -lisp/progmodes working Nick Roberts -lisp/term working ttn -lisp/textmodes working ttn +lisp/progmodes done Nick Roberts +lisp/term done ttn +lisp/textmodes done ttn lisp/url done ttn lispintro done ttn -lispref working ttn +lispref done ttn lwlib done ttn m4 done ttn -mac (and subdirs) working ttn +mac (and subdirs) done ttn man done ttn -msdos working ttn -nt (and subdirs) working ttn +msdos done ttn +nt (and subdirs) done ttn oldXMenu done ttn -src (and subdirs) working ttn +src (and subdirs) done ttn vms done ttn ** Check the Emacs manual. diff --git a/etc/ChangeLog b/etc/ChangeLog index 3d64ba12cc3..382a97ab50a 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,11 @@ +2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * PROBLEMS (Mac OS X): Add QuickTime 7.0.4 / Mac OS X 10.3.9 breakage. + +2006-02-09 Mathias Dahl <mathias.dahl@gmail.com> + + * NEWS: New key bindings for Tumme in Dired. + 2006-02-05 Jay Belanger <belanger@truman.edu> * calccard.tex: Update copyright year. @@ -1833,6 +1833,12 @@ boundaries during scrolling. * Changes in Specialized Modes and Packages in Emacs 22.1: +** Changes in Dired +*** Bindings for Tumme added +Several new keybindings, all starting with the C-t prefix, have been +added to Dired. They are all bound to commands in Tumme. As a starting +point, mark some image files in a dired buffer and do C-t d to display +thumbnails of them in a separate buffer. ** Changes in Hi Lock: +++ diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 587d9090436..490c59aa922 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1774,6 +1774,13 @@ There appears to be a problem with the implementation of pty's on the Mac OS X that causes process output to be truncated. To avoid this, leave process-connection-type set to its default value of nil. +*** Mac OS X 10.3.9 (Carbon): QuickTime 7.0.4 updater breaks build. + +On the above environment, build fails at the link stage with the +message like "Undefined symbols: _HICopyAccessibilityActionDescription +referenced from QuickTime expected to be defined in Carbon". A +workaround is to use QuickTime 7.0.1 reinstaller. + ** FreeBSD *** FreeBSD 2.1.5: useless symbolic links remain in /tmp or other diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c8d1cb41dea..df8639f31fa 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -5788,8 +5788,8 @@ Tue Jul 1 01:09:07 1997 Geoff Voelker <voelker@cs.washington.edu> ;; End: Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 7f071543965..33af87019e0 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for lib-src subdirectory in GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c index 562c5522ed9..c9f4f3713a7 100644 --- a/lib-src/cvtmail.c +++ b/lib-src/cvtmail.c @@ -1,5 +1,5 @@ /* Copyright (C) 1985, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c index d3df334841e..7b5a9677e7c 100644 --- a/lib-src/digest-doc.c +++ b/lib-src/digest-doc.c @@ -2,7 +2,7 @@ standard output a file of nroff output containing the doc strings. Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index a9a3eb78442..94fa9114d23 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -1,7 +1,7 @@ /* 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 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3689,7 +3689,7 @@ void version () { printf ("ebrowse %s\n", VERSION); - puts ("Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc."); + puts ("Copyright (C) 1992-2006 Free Software Foundation, Inc."); puts ("This program is distributed under the same terms as Emacs."); exit (EXIT_SUCCESS); } diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index b6d33c9c2c2..42c90934b4b 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1,6 +1,6 @@ /* Client process that communicates with GNU Emacs acting as server. Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c index b883b442bd9..0843a3c5083 100644 --- a/lib-src/emacstool.c +++ b/lib-src/emacstool.c @@ -1,6 +1,6 @@ /* Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/etags.c b/lib-src/etags.c index fecf7904117..a073acb92d6 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1,7 +1,7 @@ /* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*- Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. and Ken Arnold + 2005, 2006 Free Software Foundation, Inc. and Ken Arnold This file is not considered part of GNU Emacs. @@ -858,7 +858,7 @@ static void print_version () { printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); - puts ("Copyright (C) 2002 Free Software Foundation, Inc. and Ken Arnold"); + puts ("Copyright (C) 2006 Free Software Foundation, Inc. and Ken Arnold"); puts ("This program is distributed under the same terms as Emacs"); exit (EXIT_SUCCESS); diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index de1e2cbf858..c8bfcfc0931 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -1,6 +1,6 @@ /* sendmail-like interface to /bin/mail for system V, Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/getopt.c b/lib-src/getopt.c index 70fd4186261..a0698bba77a 100644 --- a/lib-src/getopt.c +++ b/lib-src/getopt.c @@ -4,7 +4,7 @@ before changing it! Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c index 8aa9b183578..48d263e922a 100644 --- a/lib-src/getopt1.c +++ b/lib-src/getopt1.c @@ -1,6 +1,6 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, - 1998, 2004, 2005 Free Software Foundation, Inc. + 1998, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h index fbd45d42aab..e17da9e243c 100644 --- a/lib-src/getopt_.h +++ b/lib-src/getopt_.h @@ -1,6 +1,6 @@ /* Declarations for getopt. Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, - 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h index f59ab32ce28..f20d417b11f 100644 --- a/lib-src/getopt_int.h +++ b/lib-src/getopt_int.h @@ -1,6 +1,6 @@ /* Internal declarations for getopt. Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, - 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/gettext.h b/lib-src/gettext.h index 658fa17fcb8..eb1976b6588 100644 --- a/lib-src/gettext.h +++ b/lib-src/gettext.h @@ -1,6 +1,6 @@ /* Convenience header for conditional use of GNU <libintl.h>. Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog index 45bf841ae59..e3d3af2c577 100755 --- a/lib-src/grep-changelog +++ b/lib-src/grep-changelog @@ -1,7 +1,7 @@ #! /usr/bin/perl # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 0dfdddf468f..62fdd52b5a1 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -1,5 +1,6 @@ /* Convert files for Emacs Hexl mode. - Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 537eafec7f5..bfdb206ad97 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -1,6 +1,6 @@ /* Generate doc-string file for GNU Emacs from source files. Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index bf7a293adc6..0e725fad7e8 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lib-src/movemail.c b/lib-src/movemail.c index e8f1122e943..d3ec1fcd178 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -1,7 +1,7 @@ /* movemail foo bar -- move file foo to file bar, locking file foo the way /bin/mail respects. Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index caaf521206b..94110e4306c 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c @@ -1,5 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index 07e730567f7..96862aa334b 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h @@ -1,5 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/pop.c b/lib-src/pop.c index 9bc73e90a54..7d6bcc5cdc9 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -1,6 +1,6 @@ /* pop.c: client routines for talking to a POP3-protocol post-office server Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Written by Jonathan Kamens, jik@security.ov.com. This file is part of GNU Emacs. diff --git a/lib-src/pop.h b/lib-src/pop.h index eed24a89934..102fef6327b 100644 --- a/lib-src/pop.h +++ b/lib-src/pop.h @@ -1,6 +1,6 @@ /* pop.h: Header file for the "pop.c" client POP3 protocol. Copyright (C) 1991, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Written by Jonathan Kamens, jik@security.ov.com. This file is part of GNU Emacs. diff --git a/lib-src/profile.c b/lib-src/profile.c index 615a43d912c..399752b5808 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c @@ -1,6 +1,6 @@ /* profile.c --- generate periodic events for profiling of Emacs Lisp code. Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Author: Boaz Ben-Zvi <boaz@lcs.mit.edu> diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin index beee6ce29f7..f805705ae6a 100755 --- a/lib-src/rcs-checkin +++ b/lib-src/rcs-checkin @@ -3,7 +3,7 @@ # This script accepts any number of file arguments and checks them into RCS. # Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 4e7c6c1bb1b..795c70ecd85 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -55,7 +55,7 @@ Report bugs to <bug-gnu-emacs@gnu.org>.' Id='$Id$' # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, -# 2004, 2005 Free Software Foundation, Inc. +# 2004, 2005, 2006 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ Id='$Id$' # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -Copyright='Copyright (C) 2005 Free Software Foundation, Inc. +Copyright='Copyright (C) 2006 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. diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index cb04be26842..a2416993a1b 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -2,7 +2,7 @@ standard output a file of texinfo input containing the doc strings. Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c index 0d3587af8da..0fdb29b1f39 100644 --- a/lib-src/test-distrib.c +++ b/lib-src/test-distrib.c @@ -1,7 +1,7 @@ /* test-distrib.c --- testing distribution of nonprinting chars Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 46d0d8b0600..56d873044e7 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -1,5 +1,5 @@ /* update-game-score.c --- Update a score file - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/vcdiff b/lib-src/vcdiff index a57811a7f6d..52fdaee0f7f 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff @@ -4,7 +4,7 @@ # This version is more compatible with rcsdiff(1). # # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ae98b5f389c..ddd50210928 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,246 @@ +2006-02-12 Miles Bader <miles@gnu.org> + + * net/rcirc.el (rcirc-nick-abbrevs, rcirc-response-formats): + New variables. + (rcirc-abbrev-nick): New function. + (rcirc-format-response-string): Rewrite to use the formats in + `rcirc-response-formats' and expand escape sequences therein. + A text-property `rcirc-text' is added over the actual response + text to make easy to find inside the returned string. + (rcirc-print): When filling, just look for the `rcirc-text' + text-property to find the appropriate fill prefix, instead of + using hardwired patterns. + +2006-02-11 Mathias Dahl <brakjoller@hotmail.com> + + * tumme.el: Enhanced some docstrings. Added todo item about + Thumbnail Managing Standard. + +2006-02-11 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-buffer-internal): Set mark for ido-insert-buffer. + Don't use insert-buffer; do insert-buffer-substring directly. + (ido-file-internal): Set mark for ido-insert-file. Use insert-file-1. + +2006-02-11 Martin Rudalics <rudalics@gmx.at> + + * files.el (revert-buffer, recover-file): Replace buffer-read-only + with inhibit-read-only. Suggested by Stefan Monnier. + (revert-buffer): Let insert-file-contents discard + buffer-undo-list. Simplify code. + (find-file, find-file-existing, revert-buffer): Doc-string fixes. + +2006-02-11 Eli Zaretskii <eliz@gnu.org> + + * menu-bar.el (menu-bar-select-yank): Add a doc string. + + * help.el (describe-key-briefly): Now a wrapper for + describe-key-briefly-internal. Bind enable-disabled-menus-and-buttons + to t. Populate yank-menu if empty. + (describe-key-briefly-internal): Renamed from describe-key-briefly. + (describe-key): Now a wrapper for describe-key-internal. Bind + enable-disabled-menus-and-buttons to t. Populate yank-menu if empty. + (describe-key-internal): Renamed from describe-key. + +2006-02-11 Milan Zamazal <pdm@zamazal.org> + + * progmodes/glasses.el (glasses-separator): Doc fix. + (glasses-original-separator): New defcustom. + (glasses-make-readable, glasses-convert-to-unreadable): Use it. + +2006-02-11 Martin Rudalics <rudalics@gmx.at> + + * mwheel.el (mouse-wheel-up-event): Doc fix. + +2006-02-11 Mathias Dahl <brakjoller@hotmail.com> + + * tumme.el (tumme-dir): Changed default value to + "~/.emacs-d/tumme" + (tumme-dir): New function. Copied from thumbs.el. + +2006-02-10 Juanma Barranquero <lekktu@gmail.com> + + * desktop.el (desktop-outvar): Fix typo. + (desktop-save-buffer-p): Doc fix. + + * subr.el (substitute-key-definition): Fix typo. + +2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * frame.el (select-frame-set-input-focus): Call x-focus-frame also + when window-system is mac. + + * term/mac-win.el (fontset-standard): Rename from "fontset-mac". + +2006-02-10 Kim F. Storm <storm@cua.dk> + + * subr.el (substitute-key-definition-key): Pass t for NOERROR to + indirect-function instead of using condition-case. + +2006-02-10 Mathias Dahl <mathias.dahl@gmail.com> + + * tumme.el (tumme-copy-with-exif-file-name): Tried to make + docstring less `colloquial'... + +2006-02-09 Mathias Dahl <mathias.dahl@gmail.com> + + * tumme.el: Added a couple of todo items. + +2006-02-09 Lars Hansen <larsh@soem.dk> + + * hilit-chg.el: Add highlight-changes-mode to desktop-locals-to-save. + (highlight-changes-mode): Don't change desktop-locals-to-save. + +2006-02-09 Chong Yidong <cyd@stupidchicken.com> + + * image-mode.el (image-toggle-display): Clear image cache if using + filename. + +2006-02-09 Masatake YAMATO <jet@gyve.org> + + * dired-x.el (dired-guess-shell-alist-default): Add .man as + a `dired-man' target. + + * progmodes/autoconf.el (autoconf-font-lock-keywords): Check start + boundary of symbols. + +2006-02-08 Peter Doornbosch <peter.doornbosch@luminis.nl> (tiny change) + + * vc-svn.el (vc-svn-print-log): Show recent commits as well. + +2006-02-09 Juanma Barranquero <lekktu@gmail.com> + + * hilit-chg.el (hilit-chg-update-all-buffers): Use `mapc' instead of + `mapcar'; return nil. + +2006-02-08 Chong Yidong <cyd@stupidchicken.com> + + * mouse.el (mouse-drag-track): Don't change window if we rebind to + some other event. + +2006-02-08 Ryan Yeske <rcyeske@gmail.com> + + * net/rcirc.el (rcirc-startup-channels-alist): + Add irc.freenode.net and #emacs as defaults. + (rcirc-ignore-all-activity-flag): Remove variable. + (rcirc-authinfo): New variable. + (rcirc-authinfo-filename): Remove variable. + (rcirc-always-use-server-buffer-flag): New flag. + (rcirc): M-x rcirc will automatically connect without prompting. + C-u M-x rcirc will prompt. Use rcirc-connect to create a + connection in lisp. + (rcirc-process-server-response-1): Remove everything but the nick + portion of the sender so it doesn't need to be done everywhere + else. Update related code. + (global-map): Remove global keybindings. + (rcirc-get-buffer-create): Make sure rcirc-topic is set. + (rcirc-send-input): Split into several functions. + (rcirc-process-input-line, rcirc-process-message) + (rcirc-process-command): New functions. + (rcirc-target-buffer): New function to determine where to route + messages. + (rcirc-user-nick): Save match data. + (rcirc-toggle-ignore-buffer-activity) + (rcirc-update-activity-string): Remove global ignore functionality, + which can be done now by toggling rcirc-track-minor-mode. + (rcirc-track-minor-mode-map): New keymap. + (rcirc-track-minor-mode): New minor-mode. + (ignore): Make the ignore output nicer. Always print it when + adding or removing nicks. + (rcirc-url-regexp): Improve. + (rcirc-mangle-text): Remove properties before using text in the + modeline. + (rcirc-authenticate): Authentication data comes from + rcirc-authinfo, not the file pointed to by rcirc-authinfo-file. + (rcirc-server-prefix): Inherit from rcirc-server. + +2006-02-08 Mathias Megyei <Mathias.Megyei@micronas.com> (tiny change) + + * Makefile.in (compile): Append "|| true" to the end of the `find' + command, like compile-always does. + +2006-02-08 Sam Steingold <sds@gnu.org> + + * net/tramp.el (tramp-maybe-open-connection): Do not wait for + output from a dead connection. + +2006-02-07 Mathias Dahl <brakjoller@hotmail.com> + + * dired.el (dired-mode-map): Add more bindings for tumme. + +2006-02-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * wdired.el (wdired-mode-map): Use remap. + (wdired-get-filename): Massage. + (wdired-perm-mode-map): Don't copy bindings from wdired-mode-map. + (wdired-preprocess-perms, wdired-set-bit, wdired-toggle-bit): Use the + `keymap' property rather than `local-map'. + +2006-02-07 Mathias Dahl <brakjoller@hotmail.com> + + * tumme.el (tumme-get-thumbnail-image): New utility function. + Suggested by from Chong Yidong. + (tumme-dired-with-window-configuration): Rename from + `tumme-dired'. Add code to save window configuration. + (tumme-restore-window-configuration): New command to restore the + window configuration that `tumme-dired-with-window-configuration' + saves before it changes the window configuration. + (tumme-show-all-from-dir): New command to display thumbnails for + all files in a directory entered by the user, like M-x thumbs. + (tumme-display-thumbs): Call `pop-to-buffer' after all thumbnails + have been created. + (tumme-display-thumbnail-original-image): Call `display-buffer'. + (obsolete-tumme-display-thumbnail-original-image-and-buffer): + Remove obsolete test function. + +2006-02-07 Juanma Barranquero <lekktu@gmail.com> + + * vc.el (small-temporary-file-directory): Remove defvar; there's + a defcustom for it in files.el. + + * tumme.el (tumme-get-thumbnail-image): Add missing arg to `error'. + Fix typo in message. + (tumme-gallery-generate): Fix typo in `error' message. + (tumme-display-window-height-correction) + (tumme-display-window-width-correction, tumme-line-up-dynamic) + (tumme-line-up-interactive): Dox fixes. + (tumme-cmd-rotate-original-options, tumme-display-properties-format) + (tumme-restore-window-configuration, tumme-format-properties-string) + (tumme-create-thumbs, tumme-display-previous-thumbnail-original): + Fix typos in docstrings. + +2006-02-07 Chris Moore <christopher.ian.moore@gmail.com> (tiny change) + + * wdired.el (wdired-get-filename): Fix bug: Don't re-normalize OLD. + +2006-02-07 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-tooltip-mode): Remove autoload cookie. + User should use hook if desired. + + * progmodes/gdb-ui.el (gdb-post-prompt): Regenerate breakpoints + buffer if necessary. + (gdb-delete-frame-or-window): New function. + (gdb-breakpoints-mode-map): Bind "q" to it. + +2006-02-06 Stefan Monnier <monnier@iro.umontreal.ca> + + * textmodes/nroff-mode.el: Clean up name space. + (nroff-mode-syntax-table): Remove spurious `1' in the syntax of \n. + (nroff-mode): Obey the global setting of nroff-electric-mode. + (nroff-electric-mode): Use define-minor-mode and derived-mode-p. + + * calendar/calendar.el (calendar-increment-month): Typo in last change. + +2006-02-06 Thien-Thi Nguyen <ttn@gnu.org> + + * vc-svn.el (vc-svn-previous-version, vc-svn-next-version): New funcs. + +2006-02-06 Lars Hansen <larsh@soem.dk> + + * generic-x.el (etc-fstab-generic-mode): Add file system types + cifs and usbdevfs. Allow special chars in file names. + 2006-02-05 Jay Belanger <belanger@truman.edu> Update copyright notices of the files in lisp/calc. @@ -37,13 +280,12 @@ * textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be greedy to find the closing bracket in \*[...] and similar expressions. This is a first rough fix -- many additional - refinements are necessary to make nroff mode really usable with - groff. + refinements are necessary to make nroff mode really usable with groff. 2006-02-03 Jens Petersen <petersen@redhat.com> (tiny change) - * international/mule-cmds.el (set-locale-environment): Add - "/usr/share/X11/locale/locale.alias" to search list for xorg-x11 + * international/mule-cmds.el (set-locale-environment): + Add "/usr/share/X11/locale/locale.alias" to search list for xorg-x11 libX11. 2006-02-03 Joe Wells <jbw@macs.hw.ac.uk> (tiny change) @@ -275,7 +517,7 @@ * international/latexenc.el: Add a suitable `coding:' tag. (latexenc-find-file-coding-system): Undo last change. -2006-01-27 Arne J,bx(Brgensen <arne@arnested.dk> +2006-01-27 Arne J,Ax(Brgensen <arne@arnested.dk> * international/latexenc.el (latexenc-find-file-coding-system): Make sure latexenc-main-file is a regular file and is readable. @@ -20079,7 +20321,7 @@ See ChangeLog.11 for earlier changes. ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index c3ac8a7ea19..e90c6161f75 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -1,5 +1,6 @@ # Maintenance productions for the Lisp directory -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -152,8 +153,10 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) # subdirectories, to make sure require's and load's in the files being # compiled find the right files. +# `|| true' below prevents old Bash versions from getting confused +# by an error. compile: $(lisp)/subdirs.el mh-autoloads doit - find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \ + find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \ wd=$(lisp); $(setwins); \ els=`echo $$wins | tr ' \011' '\012\012' | \ sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ diff --git a/lisp/abbrev.el b/lisp/abbrev.el index 774bb1892b7..bd0c6ffc094 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -1,7 +1,7 @@ ;;; abbrev.el --- abbrev mode commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev convenience diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el index 3be9c257af2..bd3482f974b 100644 --- a/lisp/abbrevlist.el +++ b/lisp/abbrevlist.el @@ -1,7 +1,7 @@ ;;; abbrevlist.el --- list one abbrev table alphabetically ordered ;; Copyright (C) 1986, 1992, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Suggested by a previous version by Gildea. ;; Maintainer: FSF diff --git a/lisp/align.el b/lisp/align.el index f63085011b7..b40f96e7f83 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -1,7 +1,7 @@ ;;; align.el --- align text to a specific column, by regexp ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: convenience languages lisp diff --git a/lisp/allout.el b/lisp/allout.el index bfadf27f058..78e61dacde2 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1,7 +1,7 @@ ;;; allout.el --- extensive outline mode for use alone and with other modes ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com> ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com> diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index ce84af445a5..20cdfaad2cf 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -1,7 +1,7 @@ ;;; ansi-color.el --- translate ANSI escape sequences into faces ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Alex Schroeder <alex@gnu.org> diff --git a/lisp/apropos.el b/lisp/apropos.el index c8201de492a..3333981c5e5 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -1,7 +1,7 @@ ;;; apropos.el --- apropos commands for users and programmers ;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Joe Wells <jbw@bigbird.bu.edu> ;; Rewritten: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 2d97c319c88..9799e3e0834 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1,7 +1,7 @@ ;;; arc-mode.el --- simple editing of archives ;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@gnu.org> ;; Keywords: archives msdog editing major-mode diff --git a/lisp/autoarg.el b/lisp/autoarg.el index aca22ace5b5..1b87c664514 100644 --- a/lisp/autoarg.el +++ b/lisp/autoarg.el @@ -1,7 +1,7 @@ ;;; autoarg.el --- make digit keys supply prefix args ;; Copyright (C) 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Created: 1998-09-04 diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 465817d5b81..c1a2047a9c6 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -1,7 +1,7 @@ ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files ;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Charlie Martin <crm@cs.duke.edu> ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 9892dca2d41..4119dba5755 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -1,7 +1,7 @@ ;;; autorevert.el --- revert buffers when files on disk change ;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Anders Lindgren <andersl@andersl.com> ;; Keywords: convenience diff --git a/lisp/avoid.el b/lisp/avoid.el index e99d09d6753..1d97dd306db 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -1,7 +1,7 @@ ;;; avoid.el --- make mouse pointer stay out of the way of editing ;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: mouse diff --git a/lisp/battery.el b/lisp/battery.el index 54a0e207ffc..fa816c585b4 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -1,7 +1,7 @@ ;;; battery.el --- display battery status information ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org> ;; Keywords: hardware diff --git a/lisp/bindings.el b/lisp/bindings.el index 7819916130b..6cbec4a1a86 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1,7 +1,7 @@ ;;; bindings.el --- define standard key bindings and some variables ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 31616469454..104a9c6512f 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1,7 +1,7 @@ ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Maintainer: Karl Fogel <kfogel@red-bean.com> diff --git a/lisp/bs.el b/lisp/bs.el index bdeb00f5804..a1dfad6ac7a 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -1,7 +1,7 @@ ;;; bs.el --- menu for selecting and displaying buffers ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de> ;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de> ;; Keywords: convenience diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 62ff0c0a01d..5388ff9863d 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -1,7 +1,7 @@ ;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*- ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience diff --git a/lisp/button.el b/lisp/button.el index d50452fc97a..3924a9c9418 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -1,6 +1,7 @@ ;;; button.el --- clickable buttons ;; -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: extensions diff --git a/lisp/calculator.el b/lisp/calculator.el index b9ba03f657f..fb5e9e41f69 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -1,11 +1,11 @@ ;;; calculator.el --- a [not so] simple calculator for Emacs ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eli Barzilay <eli@barzilay.org> ;; Keywords: tools, convenience -;; Time-stamp: <2005-07-18 17:45:34 juri> +;; Time-stamp: <2006-02-06 13:36:00 ttn> ;; This file is part of GNU Emacs. diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 40c6bfc2c86..571b4ec132a 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -1,7 +1,7 @@ ;;; appt.el --- appointment notification functions -;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Neil Mager <neilm@juliet.ll.mit.edu> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index 91d4d3636df..f6419cf9a82 100644 --- a/lisp/calendar/cal-bahai.el +++ b/lisp/calendar/cal-bahai.el @@ -1,6 +1,7 @@ ;;; cal-bahai.el --- calendar functions for the Baha'i calendar. -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: calendar diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index a4b83b87b15..5cdaa5092aa 100644 --- a/lisp/calendar/cal-china.el +++ b/lisp/calendar/cal-china.el @@ -1,6 +1,6 @@ ;;; cal-china.el --- calendar functions for the Chinese calendar -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el index 4673053246f..c37ab17567f 100644 --- a/lisp/calendar/cal-coptic.el +++ b/lisp/calendar/cal-coptic.el @@ -1,6 +1,6 @@ ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index 1f3859d8bf1..62327a99c65 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el @@ -1,7 +1,7 @@ ;;; cal-dst.el --- calendar functions for daylight savings rules -;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Paul Eggert <eggert@twinsun.com> ;; Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index ed974d312bb..0d88f161a03 100644 --- a/lisp/calendar/cal-french.el +++ b/lisp/calendar/cal-french.el @@ -1,7 +1,7 @@ ;;; cal-french.el --- calendar functions for the French Revolutionary calendar ;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index 99823db8215..1272e9966d4 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el @@ -1,6 +1,6 @@ ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu> diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el index 52801600157..105bb288eb0 100644 --- a/lisp/calendar/cal-islam.el +++ b/lisp/calendar/cal-islam.el @@ -1,6 +1,6 @@ ;;; cal-islam.el --- calendar functions for the Islamic calendar -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el index 41a3713d3ea..c11968e8421 100644 --- a/lisp/calendar/cal-iso.el +++ b/lisp/calendar/cal-iso.el @@ -1,6 +1,6 @@ ;;; cal-iso.el --- calendar functions for the ISO calendar -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el index 068e705410a..8f7af039d94 100644 --- a/lisp/calendar/cal-julian.el +++ b/lisp/calendar/cal-julian.el @@ -1,6 +1,6 @@ ;;; cal-julian.el --- calendar functions for the Julian calendar -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el index ce4f42e3328..b2d111a4b18 100644 --- a/lisp/calendar/cal-mayan.el +++ b/lisp/calendar/cal-mayan.el @@ -1,7 +1,7 @@ ;;; cal-mayan.el --- calendar functions for the Mayan calendars -;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu> ;; Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el index 70275017bfd..f7c8b284f1b 100644 --- a/lisp/calendar/cal-move.el +++ b/lisp/calendar/cal-move.el @@ -1,6 +1,6 @@ ;;; cal-move.el --- calendar functions for movement in the calendar -;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el index e9583a3f00d..33c296a7730 100644 --- a/lisp/calendar/cal-persia.el +++ b/lisp/calendar/cal-persia.el @@ -1,6 +1,6 @@ ;;; cal-persia.el --- calendar functions for the Persian calendar -;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 7b029bc93c5..a67d90c832e 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -1,6 +1,6 @@ ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX -;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Steve Fisk <fisk@bowdoin.edu> diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index a512c7c1e20..2e465e1093b 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el @@ -1,6 +1,6 @@ ;;; cal-x.el --- calendar windows in dedicated frames in X -;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.sunysb.edu> diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index f01f4305708..b48f63458dc 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1308,7 +1308,7 @@ A negative YR is interpreted as BC; -1 being 1 BC, and so on." The return value is a pair (MONTH . YEAR). MON defaults to `displayed-month'. YR defaults to `displayed-year'." (unless mon (setq mon displayed-month)) - (unless yr (setq mon displayed-year)) + (unless yr (setq yr displayed-year)) (increment-calendar-month mon yr n) (cons mon yr)) diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 91c396f7bf5..a8eeebae8fc 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1,7 +1,7 @@ ;;; diary-lib.el --- diary functions ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index b18844c18d9..c9a1a0f17e5 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -1,7 +1,7 @@ ;;; holidays.el --- holiday functions for the calendar package ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 33f89474504..e1d513ce680 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -1,6 +1,6 @@ ;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*- -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Created: August 2002 diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index ed54bc88394..dd2f546fc37 100644 --- a/lisp/calendar/lunar.el +++ b/lisp/calendar/lunar.el @@ -1,7 +1,7 @@ ;;; lunar.el --- calendar functions for phases of the moon -;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el index 3e09e7b1fb6..9587eb57a9f 100644 --- a/lisp/calendar/parse-time.el +++ b/lisp/calendar/parse-time.el @@ -1,6 +1,6 @@ ;;; parse-time.el --- parsing time strings -;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 5b58b739dba..660abb14f88 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -1,7 +1,7 @@ ;;; solar.el --- calendar functions for solar events -;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Denis B. Roegel <Denis.Roegel@loria.fr> diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index fd74e5a6251..0de9806d2bb 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -1,6 +1,6 @@ ;;; time-date.el --- Date and time handling functions -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index f46ec4eba23..3f2697509f3 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -1,6 +1,6 @@ ;;; timeclock.el --- mode for keeping track of how much you work -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index b6871a38ab9..6f96ec1cdb2 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -1,6 +1,6 @@ ;;; todo-mode.el --- major mode for editing TODO list files -;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Oliver Seidel <os10000@seidel-space.de> diff --git a/lisp/case-table.el b/lisp/case-table.el index 4dfdd0538fb..a69ed329cb1 100644 --- a/lisp/case-table.el +++ b/lisp/case-table.el @@ -1,7 +1,7 @@ ;;; case-table.el --- code to extend the character set and support case tables ;; Copyright (C) 1988, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/cdl.el b/lisp/cdl.el index abd339de9b8..378bc993aed 100644 --- a/lisp/cdl.el +++ b/lisp/cdl.el @@ -1,6 +1,7 @@ ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi) ;; Maintainer: FSF diff --git a/lisp/chistory.el b/lisp/chistory.el index c05fd849db4..3fbc068ac86 100644 --- a/lisp/chistory.el +++ b/lisp/chistory.el @@ -1,6 +1,7 @@ ;;; chistory.el --- list command history -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 82d39fd2c00..622612648f3 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -1,7 +1,7 @@ ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el ;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu> ;; Maintainer: FSF diff --git a/lisp/comint.el b/lisp/comint.el index 6676e836735..0cae078f481 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1,7 +1,7 @@ ;;; comint.el --- general command interpreter in a window stuff ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> ;; Simon Marshall <simon@gnu.org> diff --git a/lisp/compare-w.el b/lisp/compare-w.el index e3e7bd3945d..2d23de8c54c 100644 --- a/lisp/compare-w.el +++ b/lisp/compare-w.el @@ -1,7 +1,7 @@ ;;; compare-w.el --- compare text between windows for Emacs ;; Copyright (C) 1986, 1989, 1993, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience files diff --git a/lisp/complete.el b/lisp/complete.el index cde669a943f..a48942d2df1 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -1,7 +1,7 @@ ;;; complete.el --- partial completion mechanism plus other goodies ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: abbrev convenience diff --git a/lisp/completion.el b/lisp/completion.el index e231906ad27..64bf8026e9d 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -1,7 +1,7 @@ ;;; completion.el --- dynamic word-completion code ;; Copyright (C) 1990, 1993, 1995, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev convenience diff --git a/lisp/cus-face.el b/lisp/cus-face.el index c5547657a17..e847ae1f230 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -1,7 +1,7 @@ ;;; cus-face.el --- customization support for faces ;; ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: help, faces diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 30af30045f8..eaf700774df 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -1,7 +1,7 @@ ;;; cus-start.el --- define customization properties of builtins ;; ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: internal diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index a21832c7b62..3a89c6a664e 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -1,6 +1,7 @@ ;;; cus-theme.el -- custom theme creation user interface ;; -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: FSF diff --git a/lisp/custom.el b/lisp/custom.el index 6267febe0d5..0f95e3bab73 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1,7 +1,7 @@ ;;; custom.el --- tools for declaring and initializing options ;; ;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: FSF diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el index 792dcb2ef26..cf0ee85db23 100644 --- a/lisp/cvs-status.el +++ b/lisp/cvs-status.el @@ -1,7 +1,7 @@ ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*- ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs cvs status tree tools diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index ea99030d943..624a59bf880 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -1,7 +1,7 @@ ;;; dabbrev.el --- dynamic abbreviation package ;; Copyright (C) 1985, 1986, 1992, 1994, 1996, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Don Morrison ;; Maintainer: Lars Lindberg <Lars.Lindberg@sypro.cap.se> diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 50d09a6414b..7433c728405 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -1,11 +1,11 @@ ;;; delim-col.el --- prettify all columns in a region or rectangle ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/03/09 21:32:06 vinicius> +;; Time-stamp: <2006-02-06 13:37:10 ttn> ;; Version: 2.1 ;; Keywords: internal ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ diff --git a/lisp/delsel.el b/lisp/delsel.el index d7a3d90e969..278849233b7 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -1,7 +1,7 @@ ;;; delsel.el --- delete selection if you insert ;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Matthieu Devin <devin@lucid.com> ;; Maintainer: FSF diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 550268ac1d9..6200be63d68 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -1,7 +1,7 @@ ;;; descr-text.el --- describe text mode ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Maintainer: FSF diff --git a/lisp/desktop.el b/lisp/desktop.el index 249ed91ab29..f56e2204e78 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1,7 +1,7 @@ ;;; desktop.el --- save partial status of Emacs when killed ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Maintainter: Lars Hansen <larsh@soem.dk> @@ -57,17 +57,17 @@ ;; are supplied to handle special major and minor modes respectively. ;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions ;; to restore a desktop buffer. Elements must have the form -;; +;; ;; (MAJOR-MODE . RESTORE-BUFFER-FUNCTION). -;; +;; ;; Functions listed are called by `desktop-create-buffer' when `desktop-read' ;; evaluates the desktop file. Buffers with a major mode not specified here, ;; are restored by the default handler `desktop-restore-file-buffer'. ;; `desktop-minor-mode-handlers' is an alist of functions to restore ;; non-standard minor modes. Elements must have the form -;; +;; ;; (MINOR-MODE . RESTORE-FUNCTION). -;; +;; ;; Functions are called by `desktop-create-buffer' to restore minor modes. ;; Minor modes not specified here, are restored by the standard minor mode ;; function. If you write a module that defines a major or minor mode that @@ -661,7 +661,7 @@ Not all types of values are supported." (defun desktop-outvar (varspec) "Output a setq statement for variable VAR to the desktop file. The argument VARSPEC may be the variable name VAR (a symbol), -or a cons cell of the form (VAR . MAX-SIZE), +or a cons cell of the form (VAR . MAX-SIZE), which means to truncate VAR's value to at most MAX-SIZE elements \(if the value is a list) before saving the value." (let (var size) @@ -684,7 +684,8 @@ which means to truncate VAR's value to at most MAX-SIZE elements (defun desktop-save-buffer-p (filename bufname mode &rest dummy) "Return t if buffer should have its state saved in the desktop file. FILENAME is the visited file name, BUFNAME is the buffer name, and -MODE is the major mode." +MODE is the major mode. +\n\(fn FILENAME BUFNAME MODE)" (let ((case-fold-search nil)) (and (not (string-match desktop-buffers-not-to-save bufname)) (not (memq mode desktop-modes-not-to-save)) diff --git a/lisp/dframe.el b/lisp/dframe.el index e15b57af605..e238a469dd5 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -1,7 +1,7 @@ ;;; dframe --- dedicate frame support modes ;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 8f018185c98..09645864573 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1,7 +1,7 @@ ;;; diff-mode.el --- a mode for viewing/editing context diffs ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: convenience patch diff diff --git a/lisp/diff.el b/lisp/diff.el index 8c4332b2da2..221d7b2e363 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -1,7 +1,7 @@ ;;; diff.el --- run `diff' in compilation-mode ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: unix, tools diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 7a34c39bed5..20b0037ab7e 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1,7 +1,7 @@ ;;; dired-aux.el --- less commonly used parts of dired -*-byte-compile-dynamic: t;-*- ;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>. ;; Maintainer: FSF diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 14e0a459f86..e207c60502d 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -8,7 +8,7 @@ ;; Keywords: dired extensions files ;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -1027,11 +1027,11 @@ dired." " " dired-guess-shell-znew-switches)) ;; The following four extensions are useful with dired-man ("N" key) - (list "\\.[0-9]$" '(progn (require 'man) + (list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man) (if (Man-support-local-filenames) "man -l" "cat * | tbl | nroff -man -h"))) - (list "\\.[0-9]\\.g?z$" '(progn (require 'man) + (list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man) (if (Man-support-local-filenames) "man -l" "gunzip -qc * | tbl | nroff -man -h")) diff --git a/lisp/dired.el b/lisp/dired.el index fe8f6996b28..8433432ff09 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1,7 +1,7 @@ ;;; dired.el --- directory-browsing commands ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> ;; Maintainer: FSF @@ -1247,6 +1247,17 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map "\177" 'dired-unmark-backward) (define-key map [remap undo] 'dired-undo) (define-key map [remap advertised-undo] 'dired-undo) + ;; thumbnail manipulation (tumme) + (define-key map "\C-td" 'tumme-display-thumbs) + (define-key map "\C-tt" 'tumme-tag-files) + (define-key map "\C-tr" 'tumme-tag-remove) + (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer) + (define-key map "\C-ti" 'tumme-display-dired-image) + (define-key map "\C-tx" 'tumme-dired-display-external) + (define-key map "\C-ta" 'tumme-display-thumbs-append) + (define-key map "\C-t." 'tumme-display-thumb) + (define-key map "\C-tc" 'tumme-dired-comment-files) + (define-key map "\C-tf" 'tumme-mark-tagged-files) ;; Make menu bar items. diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index 573803bfb98..30ef3570ad2 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el @@ -1,6 +1,7 @@ ;;; dirtrack.el --- Directory Tracking by watching the prompt -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Nov 17 1996 diff --git a/lisp/disp-table.el b/lisp/disp-table.el index 1474a82885c..7681e85b4ae 100644 --- a/lisp/disp-table.el +++ b/lisp/disp-table.el @@ -1,7 +1,7 @@ ;;; disp-table.el --- functions for dealing with char tables ;; Copyright (C) 1987, 1994, 1995, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> ;; Based on a previous version by Howard Gayle diff --git a/lisp/dnd.el b/lisp/dnd.el index f85984fb7d8..dec57481570 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -1,6 +1,6 @@ ;;; dnd.el --- drag and drop support. -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. ;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se> ;; Maintainer: FSF diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index bf25ce1f589..7270dc8fa27 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -1,7 +1,7 @@ ;;; dos-fns.el --- MS-Dos specific functions ;; Copyright (C) 1991, 1993, 1995, 1996, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Morten Welinder <terra@diku.dk> ;; Keywords: internal diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el index 1909e941c1f..9d00756804f 100644 --- a/lisp/dos-vars.el +++ b/lisp/dos-vars.el @@ -1,6 +1,7 @@ ;;; dos-vars.el --- MS-Dos specific user options -;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 697f6eb4d5c..ae2bd8052bb 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -1,6 +1,7 @@ ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: Geoff Voelker <voelker@cs.washington.edu> ;; Keywords: internal diff --git a/lisp/double.el b/lisp/double.el index d112fbed3cd..25fd2c42672 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -1,7 +1,7 @@ ;;; double.el --- support for keyboard remapping with double clicking ;; Copyright (C) 1994, 1997, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: i18n diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index 61895db4308..222fe05e1e5 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -1,7 +1,7 @@ ;;; ebuff-menu.el --- electric-buffer-list mode ;; Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@ai.mit.edu> ;; Maintainer: FSF diff --git a/lisp/echistory.el b/lisp/echistory.el index a8ec7632c41..46a1f532c74 100644 --- a/lisp/echistory.el +++ b/lisp/echistory.el @@ -1,6 +1,7 @@ ;;; echistory.el --- Electric Command History Mode -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 0a3f6920e2b..67da6eae25d 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1,7 +1,7 @@ ;;; ediff-diff.el --- diff-related utilities ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el index 21fe85c415f..cc266e3c8a3 100644 --- a/lisp/ediff-help.el +++ b/lisp/ediff-help.el @@ -1,7 +1,7 @@ ;;; ediff-help.el --- Code related to the contents of Ediff help buffers ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index c0add7f8f86..1b86e2f8f62 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -1,7 +1,7 @@ ;;; ediff-hook.el --- setup for Ediff's menus and autoloads ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 5bffea1ec4b..4897ffd2e59 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1,7 +1,7 @@ ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 5a5a2983327..7f0eea2cf09 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -1,7 +1,7 @@ ;;; ediff-merg.el --- merging utilities ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index f4ad4f1e612..c24e32a2124 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -1,7 +1,7 @@ ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 9379b6127a9..9c5c75d847c 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -1,7 +1,7 @@ ;;; ediff-ptch.el --- Ediff's patch support ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index caa927f2113..feb7b69d7b6 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1,7 +1,7 @@ ;;; ediff-util.el --- the core commands and utilities of ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index f1f2305de81..4c9dc4dd9c8 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -1,7 +1,7 @@ ;;; ediff-vers.el --- version control interface to Ediff ;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 9fd9f45ff03..648a80b6156 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -1,7 +1,7 @@ ;;; ediff-wind.el --- window manipulation utilities ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/ediff.el b/lisp/ediff.el index 32ca177388e..abb0f22b047 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -1,7 +1,7 @@ ;;; ediff.el --- a comprehensive visual interface to diff & patch ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Created: February 2, 1994 diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 68de4404cb8..86bf29f0381 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -1,7 +1,7 @@ ;;; edmacro.el --- keyboard macro editor ;; Copyright (C) 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Maintainer: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/ehelp.el b/lisp/ehelp.el index d0dfd8d6bed..376f31f1ca5 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el @@ -1,7 +1,7 @@ ;;; ehelp.el --- bindings for electric-help mode ;; Copyright (C) 1986, 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, extensions diff --git a/lisp/electric.el b/lisp/electric.el index 4c4f70b0939..e4506190571 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -1,7 +1,7 @@ ;;; electric.el --- window maker and Command loop for `electric' modes ;; Copyright (C) 1985, 1986, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/elide-head.el b/lisp/elide-head.el index 8be40ce17c3..6f14a5275a8 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -1,6 +1,7 @@ ;;; elide-head.el --- hide headers in files -;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: outlines tools diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index dc285a717af..486a3b049ae 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1,7 +1,7 @@ ;;; advice.el --- an overloading mechanism for Emacs Lisp functions ;; Copyright (C) 1993, 1994, 2000, 2001, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el index d12b1dcbcb5..f3d0b9efc9b 100644 --- a/lisp/emacs-lisp/assoc.el +++ b/lisp/emacs-lisp/assoc.el @@ -1,6 +1,7 @@ ;;; assoc.el --- insert/delete/sort functions on association lists -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 437332baec9..d18567580aa 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -1,6 +1,7 @@ ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: Kim F. Storm <storm@cua.dk> diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index a6bc4dd9514..d6477b854a1 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1,7 +1,7 @@ ;; autoload.el --- maintain autoloads in loaddefs.el ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Keywords: maint diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el index 627c2cfdbc7..c9f2a052b0b 100644 --- a/lisp/emacs-lisp/backquote.el +++ b/lisp/emacs-lisp/backquote.el @@ -1,7 +1,7 @@ ;;; backquote.el --- implement the ` Lisp construct ;; Copyright (C) 1990, 1992, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rick Sladkey <jrs@world.std.com> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index c2be5a5c3b5..d46c86b623b 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -1,6 +1,6 @@ ;;; benchmark.el --- support for benchmarking code -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: lisp, extensions diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index f2b1d19a696..455b049dc8a 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -1,6 +1,6 @@ ;;; bindat.el --- binary data structure packing and unpacking. -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Assignment name: struct.el diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index b46366a94b9..8c3fcffbc7d 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1,7 +1,7 @@ ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler ;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 1ebc8f765fa..ba68b842305 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -1,6 +1,7 @@ ;;; byte-run.el --- byte-compiler support for inlining -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index bab50a1c822..bbeea5d703d 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1,7 +1,7 @@ ;;; checkdoc.el --- check documentation strings for style requirements ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 0.6.2 diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el index 66425576b5f..34f9642fe1f 100644 --- a/lisp/emacs-lisp/cl-compat.el +++ b/lisp/emacs-lisp/cl-compat.el @@ -1,6 +1,7 @@ ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index c5a006912df..2e741408c04 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,7 +1,7 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- ;; Copyright (C) 1993, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 2497e02dc62..c3ceb4c2f3a 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -1,7 +1,7 @@ ;;; cl-indent.el --- enhanced lisp-indent mode ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> ;; Created: July 1987 diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 244029491de..e8590933863 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,6 +1,6 @@ ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index ba7845aaa9c..6b14acd23df 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -1,6 +1,7 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index 650a341f955..9d3f1f63061 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -1,6 +1,7 @@ ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Keywords: lisp, tools, maint diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index b7cf3ad8bcc..222407f86f2 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -1,6 +1,7 @@ ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index ff44b3cb59e..4b5cbe51dd6 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -1,7 +1,7 @@ ;;; copyright.el --- update the copyright notice in current buffer ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Keywords: maint, tools diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 12f0788a0de..5a9787b5ca8 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -1,7 +1,7 @@ ;;; crm.el --- read multiple strings with completion ;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: completion, minibuffer, multiple elements diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el index 102efdae9b9..332ea81932e 100644 --- a/lisp/emacs-lisp/cust-print.el +++ b/lisp/emacs-lisp/cust-print.el @@ -1,6 +1,7 @@ ;;; cust-print.el --- handles print-level and print-circle -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Adapted-By: ESR diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 612abaf7091..0c79a3eae9b 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -1,7 +1,7 @@ ;;; debug.el --- debuggers and related commands for Emacs ;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, tools, maint diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 899c40456e7..10482bd49c4 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -2,7 +2,7 @@ ;; (formerly mode-clone.el) ;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index fa0898f609e..db114e3cdf8 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el @@ -1,7 +1,7 @@ ;;; disass.el --- disassembler for compiled Emacs Lisp code ;; Copyright (C) 1986, 1991, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Doug Cutting <doug@csli.stanford.edu> ;; Jamie Zawinski <jwz@lucid.com> diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 9d118cd5351..caac02c2ee3 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -1,7 +1,7 @@ ;;; easy-mmode.el --- easy definition for major and minor modes -;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr> ;; Maintainer: Stefan Monnier <monnier@gnu.org> diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 65826290851..92f5251a8b1 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -1,7 +1,7 @@ ;;; easymenu.el --- support the easymenu interface for defining a menu ;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman <rms@gnu.org> diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index beb88cfea25..49cf4115923 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1,7 +1,7 @@ ;;; edebug.el --- a source-level debugger for Emacs Lisp ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 7712ab5af1c..805184e15de 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -1,7 +1,7 @@ ;;; eldoc.el --- show function arglist or variable docstring in echo area ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> ;; Maintainer: friedman@splode.com diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index e72613695e3..85c0026e801 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1,6 +1,7 @@ ;;; elint.el --- Lint Emacs Lisp -;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Peter Liljenberg <petli@lysator.liu.se> ;; Created: May 1997 diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el index 569847a0ea1..da5fd6c760c 100644 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@ -1,7 +1,7 @@ ;;; elp.el --- Emacs Lisp Profiler ;; Copyright (C) 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index da9aa09119a..085ae532a63 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -1,7 +1,7 @@ ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Cederqvist <ceder@lysator.liu.se> ;; Inge Wallin <inge@lysator.liu.se> diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index f9957a98e68..8776d4522c2 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -1,7 +1,7 @@ ;;; find-func.el --- find the definition of the Emacs Lisp function near point ;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp> ;; Maintainer: petersen@kurims.kyoto-u.ac.jp diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el index 29e9dffbbde..dedadfa8c36 100644 --- a/lisp/emacs-lisp/find-gc.el +++ b/lisp/emacs-lisp/find-gc.el @@ -1,6 +1,7 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el index 1d30d60ea99..fb367d1cac4 100644 --- a/lisp/emacs-lisp/float-sup.el +++ b/lisp/emacs-lisp/float-sup.el @@ -1,7 +1,7 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. ;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el index 3b423f20d88..20df0b7ad6f 100644 --- a/lisp/emacs-lisp/generic.el +++ b/lisp/emacs-lisp/generic.el @@ -1,7 +1,7 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; ;; Copyright (C) 1997, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Fri Sep 27 1996 diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el index 6e0c4ded4dd..d6b963a7e3d 100644 --- a/lisp/emacs-lisp/gulp.el +++ b/lisp/emacs-lisp/gulp.el @@ -1,6 +1,7 @@ ;;; gulp.el --- ask for updates for Lisp packages -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Sam Shteingold <shteingd@math.ucla.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el index e97491aa6bb..3b614be26f4 100644 --- a/lisp/emacs-lisp/helper.el +++ b/lisp/emacs-lisp/helper.el @@ -1,6 +1,7 @@ ;;; helper.el --- utility help package supporting help in electric modes -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/levents.el b/lisp/emacs-lisp/levents.el index 70961912815..fa747ed3eb4 100644 --- a/lisp/emacs-lisp/levents.el +++ b/lisp/emacs-lisp/levents.el @@ -1,7 +1,7 @@ ;;; levents.el --- emulate the Lucid event data type and associated functions ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index 0fd49024beb..d83bf182e7a 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -1,7 +1,7 @@ ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers ;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f9b77c58eed..84841aea97b 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1,7 +1,7 @@ ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 30505c95223..29c70f8c344 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -1,7 +1,7 @@ ;;; lisp.el --- Lisp editing commands for Emacs ;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el index 68d3a3de9a9..aa87b7fed09 100644 --- a/lisp/emacs-lisp/lmenu.el +++ b/lisp/emacs-lisp/lmenu.el @@ -1,7 +1,7 @@ ;;; lmenu.el --- emulate Lucid's menubar support ;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Keywords: emulations obsolete diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el index d0b333edfe4..1d40d2e8368 100644 --- a/lisp/emacs-lisp/lselect.el +++ b/lisp/emacs-lisp/lselect.el @@ -1,7 +1,7 @@ ;;; lselect.el --- Lucid interface to X Selections ;; Copyright (C) 1990, 1993, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el index f3c9519edf0..81bdd13171e 100644 --- a/lisp/emacs-lisp/lucid.el +++ b/lisp/emacs-lisp/lucid.el @@ -1,7 +1,7 @@ ;;; lucid.el --- emulate some Lucid Emacs functions ;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 98e4f67f630..97a4d8c52c1 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -1,6 +1,6 @@ ;;; macroexp.el --- Additional macro-expansion support ;; -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: lisp, compiler, macros diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 84c7ae58ced..dc966a75cd6 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -1,7 +1,7 @@ ;;; map-ynp.el --- general-purpose boolean question-asker ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index 1635aa4bfeb..f30b69ddac0 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -1,7 +1,7 @@ ;;; pp.el --- pretty printer for Emacs Lisp ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Randal Schwartz <merlyn@stonehenge.com> ;; Keywords: lisp diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 1d1e002cf5f..827578f694c 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -1,7 +1,7 @@ ;;; re-builder.el --- building Regexps with visual feedback ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Detlev Zundel <dzu@gnu.org> ;; Keywords: matching, lisp, tools diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index da2fdf85f81..52cbc956bc3 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -1,7 +1,7 @@ ;;; regexp-opt.el --- generate efficient regexps to match strings ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 4326ba37786..06ed2880ee1 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -1,6 +1,7 @@ ;;; regi.el --- REGular expression Interpreting engine -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com> ;; Maintainer: bwarsaw@cen.com diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el index f04d98f399d..c5391f94b05 100644 --- a/lisp/emacs-lisp/ring.el +++ b/lisp/emacs-lisp/ring.el @@ -1,6 +1,7 @@ ;;; ring.el --- handle rings of items -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: extensions diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index f526ffae948..763aa97f214 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -1,6 +1,7 @@ ;;; rx.el --- sexp notation for regular expressions -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 9e68fb08967..5a2521ff7cb 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -1,6 +1,7 @@ ;;; shadow.el --- locate Emacs Lisp file shadowings -;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Terry Jones <terry@santafe.edu> ;; Keywords: lisp diff --git a/lisp/emacs-lisp/sregex.el b/lisp/emacs-lisp/sregex.el index 7bfa9402836..23145bccc36 100644 --- a/lisp/emacs-lisp/sregex.el +++ b/lisp/emacs-lisp/sregex.el @@ -1,7 +1,7 @@ ;;; sregex.el --- symbolic regular expressions ;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Bob Glickstein <bobg+sregex@zanshin.com> ;; Maintainer: Bob Glickstein <bobg+sregex@zanshin.com> diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index feccf7939c5..1484c38a403 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -1,7 +1,7 @@ ;;; syntax.el --- helper functions to find syntactic context ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el index e79c42180f4..340096429d1 100644 --- a/lisp/emacs-lisp/tcover-ses.el +++ b/lisp/emacs-lisp/tcover-ses.el @@ -1,6 +1,6 @@ ;;;; testcover-ses.el -- Example use of `testcover' to test "SES" -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@engineer.com> ;; Maintainer: Jonathan Yavner <jyavner@engineer.com> diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el index 7f7a8fa57de..7390e6a830d 100644 --- a/lisp/emacs-lisp/tcover-unsafep.el +++ b/lisp/emacs-lisp/tcover-unsafep.el @@ -1,6 +1,6 @@ ;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@engineer.com> ;; Maintainer: Jonathan Yavner <jyavner@engineer.com> diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index c0afffdf391..4ee83cfdba2 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -1,6 +1,6 @@ ;;;; testcover.el -- Visual code-coverage tool -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org> diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 2aa30220f4f..a98dd60fc21 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -1,6 +1,7 @@ ;;; timer.el --- run a function with args at some time in future -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el index 8b1baad6596..a4a22806d09 100644 --- a/lisp/emacs-lisp/tq.el +++ b/lisp/emacs-lisp/tq.el @@ -1,7 +1,7 @@ ;;; tq.el --- utility to maintain a transaction queue ;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Scott Draves <spot@cs.cmu.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el index cda23f39c04..1ebf1186c2d 100644 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@ -1,7 +1,7 @@ ;;; trace.el --- tracing facility for Emacs Lisp functions ;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el index 27e079b1dcd..41e98694c71 100644 --- a/lisp/emacs-lisp/unsafep.el +++ b/lisp/emacs-lisp/unsafep.el @@ -1,6 +1,6 @@ ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org> diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index 61f6b98005e..133c4c42f2a 100644 --- a/lisp/emacs-lisp/warnings.el +++ b/lisp/emacs-lisp/warnings.el @@ -1,6 +1,6 @@ ;;; warnings.el --- log and display warnings -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index e94be04213c..7a084adcb6b 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -1,7 +1,7 @@ ;;; emacs-lock.el --- prevents you from exiting emacs if a buffer is locked ;; Copyright (C) 1994, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc +;; 2005, 2006 Free Software Foundation, Inc ;; Author: Tom Wurgler <twurgler@goodyear.com> ;; Created: 12/8/94 diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 66ff29ecab1..361d1b98d3b 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -1,7 +1,7 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator ;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM> ;; Keywords: emulations brief crisp diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a65fe0b636c..594e9617501 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1,7 +1,7 @@ ;;; cua-base.el --- emulate CUA key bindings ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulation convenience cua diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index c7c5dd3db6d..c3e6727ab65 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -1,7 +1,7 @@ ;;; cua-gmrk.el --- CUA unified global mark support ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience cua mark diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index aa82e148aff..120866e7925 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1,7 +1,7 @@ ;;; cua-rect.el --- CUA unified rectangle support ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience CUA diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el index 4db235c60fa..17308c132e0 100644 --- a/lisp/emulation/edt-lk201.el +++ b/lisp/emulation/edt-lk201.el @@ -1,7 +1,7 @@ ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 9334c74392b..14838987d1d 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -1,7 +1,7 @@ ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el index 419f6549ba6..6f393197281 100644 --- a/lisp/emulation/edt-pc.el +++ b/lisp/emulation/edt-pc.el @@ -1,7 +1,7 @@ ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards ;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el index cd9a065acf8..b4599cdb2cd 100644 --- a/lisp/emulation/edt-vt100.el +++ b/lisp/emulation/edt-vt100.el @@ -1,7 +1,7 @@ ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 8d5071be314..ae131dc50e9 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -1,7 +1,7 @@ ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19 ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el index a42edaa78a1..5009ae86d65 100644 --- a/lisp/emulation/keypad.el +++ b/lisp/emulation/keypad.el @@ -1,6 +1,7 @@ ;;; keypad.el --- simplified keypad bindings -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el index 1ec66664b6a..e2b0d36f0f4 100644 --- a/lisp/emulation/pc-mode.el +++ b/lisp/emulation/pc-mode.el @@ -1,6 +1,7 @@ ;;; pc-mode.el --- emulate certain key bindings used on PCs -;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el index 9b9f4d51b41..bc048fd46d1 100644 --- a/lisp/emulation/pc-select.el +++ b/lisp/emulation/pc-select.el @@ -3,7 +3,7 @@ ;;; including key bindings. ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE> ;; Keywords: convenience emulation diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index eca6e5c74ce..878ac56ac8d 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el @@ -1,7 +1,7 @@ ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT ;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el index c48aa974762..2aed6f464d5 100644 --- a/lisp/emulation/tpu-extras.el +++ b/lisp/emulation/tpu-extras.el @@ -1,7 +1,7 @@ ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt ;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el index e21a85db2af..eb71542e811 100644 --- a/lisp/emulation/tpu-mapper.el +++ b/lisp/emulation/tpu-mapper.el @@ -1,7 +1,7 @@ ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file ;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index b07c634d9b4..227fe88b1a1 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -1,7 +1,7 @@ ;;; vip.el --- a VI Package for GNU Emacs ;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masahiko Sato <ms@sail.stanford.edu> ;; Keywords: emulations diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 08ebbbcc9d0..db82952a6ef 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1,7 +1,7 @@ ;;; viper-cmd.el --- Vi command support for Viper ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 5321228fe29..e2824246fad 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -1,7 +1,7 @@ ;;; viper-ex.el --- functions implementing the Ex commands for Viper ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 33713e8a869..59a78e46dee 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -1,7 +1,7 @@ ;;; viper-init.el --- some common definitions for Viper ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index c8a5d53b504..6f9ade2f9e4 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -1,7 +1,7 @@ ;;; viper-keym.el --- Viper keymaps ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index d401c148ad6..1cd1ce1f627 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -1,7 +1,7 @@ ;;; viper-macs.el --- functions implementing keyboard macros for Viper ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 084d70050a2..7670e3226db 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -1,7 +1,7 @@ ;;; viper-mous.el --- mouse support for Viper ;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index def90669885..8f79c0dab4a 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -1,7 +1,7 @@ ;;; viper-util.el --- Utilities used by viper.el ;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index ad366135ff1..223cff3dd99 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -4,7 +4,7 @@ ;; Viper Is also a Package for Emacs Rebels. ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Keywords: emulations diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index e677e5a20ff..0230d6e118a 100644 --- a/lisp/emulation/ws-mode.el +++ b/lisp/emulation/ws-mode.el @@ -1,6 +1,7 @@ ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs -;; Copyright (C) 1991, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1991, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de> ;; Version: 0.7 diff --git a/lisp/env.el b/lisp/env.el index 54bd0cdfb33..22a86f13f3d 100644 --- a/lisp/env.el +++ b/lisp/env.el @@ -1,7 +1,7 @@ ;;; env.el --- functions to manipulate environment variables ;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: processes, unix diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 9646318e758..50b37eb044f 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,37 @@ +2006-02-07 Michael Olson <mwolson@gnu.org> + + * ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04, + ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate + the filenames in DOS. + + * erc-goodies.el: Comment fix. + + * erc-hecomplete.el: Rename from erc-complete.el. Update + commentary. Use define-erc-module so that it's possible to + actually use this. + (erc-hecomplete): Rename function from `erc-complete'. + (erc-hecomplete): Rename group from `erc-old-complete'. Docfix. + + * erc-join.el: Rename from erc-autojoin.el. + + * erc-networks.el: Rename from erc-nets.el. + + * erc-services.el: Rename from erc-nickserv.el. + + * erc-stamp.el (erc-insert-aligned): Don't take 3rd argument. Use + the simpler `indent-to' function when + `erc-timestamp-right-align-by-pixel' is nil. + (erc-insert-timestamp-right): If the timestamp goes on the + following line, don't add timestamp properties to the spaces in + front of it. + + * erc.el (erc-migrate-modules): New function that eases migration + of module names. + (erc-modules): Call erc-migrate-modules in the :get accessor. + (erc-modules, erc-update-modules): Update for new modules names. + (erc-cmd-SMV): Remove, since this does not give useful output due + to the version strings being removed from ERC modules. + 2006-02-05 Michael Olson <mwolson@gnu.org> * erc-spelling.el (erc-spelling-init): If @@ -393,7 +427,7 @@ where global-mode-string is not a list. Emacs22 permits this. -See ChangeLog.2005 for earlier changes. +See ChangeLog.05 for earlier changes. Copyright (C) 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/lisp/erc/ChangeLog.2001 b/lisp/erc/ChangeLog.01 index 20a03801477..20a03801477 100644 --- a/lisp/erc/ChangeLog.2001 +++ b/lisp/erc/ChangeLog.01 diff --git a/lisp/erc/ChangeLog.2002 b/lisp/erc/ChangeLog.02 index 81b3169e98c..006ac0c1415 100644 --- a/lisp/erc/ChangeLog.2002 +++ b/lisp/erc/ChangeLog.02 @@ -2594,7 +2594,7 @@ Default it is used for URLs, but other things could be added. see if you can find another use, erc-button-alist -See ChangeLog.2001 for earlier changes. +See ChangeLog.01 for earlier changes. Copyright (C) 2002 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/lisp/erc/ChangeLog.2003 b/lisp/erc/ChangeLog.03 index 6d650c9e150..6f55258c04e 100644 --- a/lisp/erc/ChangeLog.2003 +++ b/lisp/erc/ChangeLog.03 @@ -2138,7 +2138,7 @@ behavior - if you think this was the wrong decision, please correct it and I'll remember it for next time. -See ChangeLog.2002 for earlier changes. +See ChangeLog.02 for earlier changes. Copyright (C) 2003 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/lisp/erc/ChangeLog.2004 b/lisp/erc/ChangeLog.04 index fd5e0aff795..3ab41db65b4 100644 --- a/lisp/erc/ChangeLog.2004 +++ b/lisp/erc/ChangeLog.04 @@ -2067,7 +2067,7 @@ * erc-list.el: Added variable erc-chanlist-mode-hook. -See ChangeLog.2003 for earlier changes. +See ChangeLog.03 for earlier changes. Copyright (C) 2004 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/lisp/erc/ChangeLog.2005 b/lisp/erc/ChangeLog.05 index 09dc245d13c..8fa725459e2 100644 --- a/lisp/erc/ChangeLog.2005 +++ b/lisp/erc/ChangeLog.05 @@ -1215,7 +1215,7 @@ bug where emacs would get stuck in a loop when \C-g was in a message and `erc-beep-p' was set to nil (default setting). -See ChangeLog.2004 for earlier changes. +See ChangeLog.04 for earlier changes. Copyright (C) 2005 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/lisp/erc/erc-complete.el b/lisp/erc/erc-hecomplete.el index dd0130156f9..763d75c8fc7 100644 --- a/lisp/erc/erc-complete.el +++ b/lisp/erc/erc-hecomplete.el @@ -1,4 +1,4 @@ -;;; erc-complete.el --- Provides Nick name completion for ERC +;;; erc-hecomplete.el --- Provides Nick name completion for ERC ;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. @@ -24,12 +24,11 @@ ;;; Commentary: -;; This file is obsolete. Use completion from erc-pcomplete instead. -;; This file is based on hippie-expand, while the new file is based on -;; pcomplete. There is no autoload cookie in this file. If you want -;; to use the code in this file, add the following to your ~/.emacs: +;; This file is considered obsolete. It is recommended to use +;; completion from erc-pcomplete instead. -;; (autoload 'erc-complete "erc-complete" "Complete nick at point." t) +;; This file is based on hippie-expand, while the new file is based on +;; pcomplete. ;;; Code: @@ -37,8 +36,13 @@ (require 'erc-match); for erc-pals (require 'hippie-exp); for the hippie expand stuff -;;;###autoload -(defun erc-complete () +;;;###autoload (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t) +(define-erc-module hecomplete nil + "Complete nick at point." + ((add-hook 'erc-complete-functions 'erc-hecomplete)) + ((remove-hook 'erc-complete-functions 'erc-hecomplete))) + +(defun erc-hecomplete () "Complete nick at point. See `erc-try-complete-nick' for more technical info. This function is obsolete, use `erc-pcomplete' instead." @@ -46,8 +50,8 @@ This function is obsolete, use `erc-pcomplete' instead." (let ((hippie-expand-try-functions-list '(erc-try-complete-nick))) (hippie-expand nil))) -(defgroup erc-old-complete nil - "Nick completion. Obsolete, use erc-pcomplete instead." +(defgroup erc-hecomplete nil + "Nick completion. It is recommended to use erc-pcomplete instead." :group 'erc) (defcustom erc-nick-completion 'all @@ -67,14 +71,14 @@ or you may use an arbitrary lisp expression." (repeat :tag "List" (string :tag "Nick")) function sexp) - :group 'erc-old-complete) + :group 'erc-hecomplete) (defcustom erc-nick-completion-ignore-case t "*Non-nil means don't consider case significant in nick completion. Case will be automatically corrected when non-nil. For instance if you type \"dely TAB\" the word completes and changes to \"delYsid\"." - :group 'erc-old-complete + :group 'erc-hecomplete :type 'boolean) (defun erc-nick-completion-exclude-myself () @@ -91,7 +95,7 @@ typing \"f o TAB\" will directly give you foobar. Use this with (defcustom erc-nick-completion-postfix ": " "*When `erc-complete' is used in the first word after the prompt, add this string when a unique expansion was found." - :group 'erc-old-complete + :group 'erc-hecomplete :type 'string) (defun erc-command-list () @@ -209,9 +213,9 @@ Window configurations are stored in "Returns t if point is directly after `erc-prompt' when doing completion." (erc-at-beginning-of-line-p (he-dabbrev-beg))) -(provide 'erc-complete) +(provide 'erc-hecomplete) -;;; erc-complete.el ends here +;;; erc-hecomplete.el ends here ;; ;; Local Variables: ;; indent-tabs-mode: t diff --git a/lisp/erc/erc-autojoin.el b/lisp/erc/erc-join.el index 06b1547b327..da41ea77374 100644 --- a/lisp/erc/erc-autojoin.el +++ b/lisp/erc/erc-join.el @@ -1,4 +1,4 @@ -;;; erc-autojoin.el --- autojoin channels on connect and reconnects +;;; erc-join.el --- autojoin channels on connect and reconnects ;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. @@ -40,7 +40,7 @@ "Enable autojoining." :group 'erc) -;;;###autoload (autoload 'erc-autojoin-mode "erc-autojoin" nil t) +;;;###autoload (autoload 'erc-autojoin-mode "erc-join" nil t) (define-erc-module autojoin nil "Makes ERC autojoin on connects and reconnects." ((add-hook 'erc-after-connect 'erc-autojoin-channels) @@ -127,9 +127,9 @@ servers, presumably in the same domain." ;; functions. nil) -(provide 'erc-autojoin) +(provide 'erc-join) -;;; erc-autojoin.el ends here +;;; erc-join.el ends here ;; ;; Local Variables: ;; indent-tabs-mode: t diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el index 785e4d19750..9bc561523d9 100644 --- a/lisp/erc/erc-list.el +++ b/lisp/erc/erc-list.el @@ -32,7 +32,7 @@ ;;; Code: (require 'erc) -(require 'erc-nets) +(require 'erc-networks) (require 'sort) (unless (fboundp 'make-overlay) (require 'overlay)) diff --git a/lisp/erc/erc-nets.el b/lisp/erc/erc-networks.el index 716a42996d5..b79a56a359c 100644 --- a/lisp/erc/erc-nets.el +++ b/lisp/erc/erc-networks.el @@ -1,4 +1,4 @@ -;;; erc-nets.el --- IRC networks +;;; erc-networks.el --- IRC networks ;; Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. @@ -30,7 +30,7 @@ ;; ;; Put into your .emacs: ;; -;; (require 'erc-nets) +;; (require 'erc-networks) ;; ;; M-x erc-server-select provides an alternative way to connect to servers by ;; choosing networks. @@ -742,7 +742,7 @@ network as a symbol." (intern (downcase (symbol-name erc-network))))) (erc-make-obsolete 'erc-current-network 'erc-network - "Obsolete since erc-nets 1.5") + "Obsolete since erc-networks 1.5") (defun erc-network-name () "Returns the name of the current network as a string." @@ -848,10 +848,9 @@ VALUE is the options value.") (erc-get 'pals 'freenode) +(provide 'erc-networks) -(provide 'erc-nets) - -;;; erc-nets.el ends here +;;; erc-networks.el ends here ;; ;; Local Variables: ;; indent-tabs-mode: t diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el index 9fc7f572977..1d2bdbd5f45 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el @@ -30,7 +30,7 @@ ;;; Code: (require 'erc) -(require 'erc-nets) +(require 'erc-networks) (eval-when-compile (require 'cl) (require 'pcomplete)) diff --git a/lisp/erc/erc-nickserv.el b/lisp/erc/erc-services.el index be5541d3b5c..676948752fd 100644 --- a/lisp/erc/erc-nickserv.el +++ b/lisp/erc/erc-services.el @@ -1,4 +1,4 @@ -;;; erc-nickserv.el --- Identify to NickServ +;;; erc-services.el --- Identify to NickServ ;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. @@ -37,7 +37,7 @@ ;; ;; Put into your .emacs: ;; -;; (require 'erc-nickserv) +;; (require 'erc-services) ;; (erc-services-mode 1) ;; ;; Add your nickname and NickServ password to `erc-nickserv-passwords'. @@ -60,7 +60,7 @@ ;;; Code: (require 'erc) -(require 'erc-nets) +(require 'erc-networks) (eval-when-compile (require 'cl)) ;; Customization: @@ -77,7 +77,7 @@ This group allows you to set variables to somewhat automate communication with those Services." :group 'erc) -;;;###autoload (autoload 'erc-services-mode "erc-nickserv" nil t) +;;;###autoload (autoload 'erc-services-mode "erc-services" nil t) (define-erc-module services nickserv "This mode automates communication with services." ((erc-nickserv-identify-mode erc-nickserv-identify-mode)) @@ -325,9 +325,9 @@ When called interactively, read the password using `read-passwd'." (erc-message msgtype (concat nickserv " " identify-word " " nick password))))) -(provide 'erc-nickserv) +(provide 'erc-services) -;;; erc-nickserv.el ends here +;;; erc-services.el ends here ;; ;; Local Variables: ;; indent-tabs-mode: t diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index 6b34a2592f4..ead847ff73f 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -199,20 +199,20 @@ Window System." (erc-put-text-property 0 len 'field 'erc-timestamp s) (insert s))) -(defun erc-insert-aligned (string pos &optional fallback) +(defun erc-insert-aligned (string pos) "Insert STRING based on a fraction of the width of the buffer. Fraction is roughly (/ POS (window-width)). -If `erc-timestamp-right-align-by-pixel' is nil, use -\(- POS FALLBACK) to determine how many spaces to insert." +If `erc-timestamp-right-align-by-pixel' is nil, insert STRING at the +POSth column, without using pixel coordinates." (if (not erc-timestamp-right-align-by-pixel) - (insert (make-string (- pos fallback) ? ) string) + (indent-to pos) (insert " ") (let ((offset (floor (* (/ (1- pos) (window-width) 1.0) (nth 2 (window-inside-pixel-edges)))))) (put-text-property (1- (point)) (point) 'display - `(space :align-to (,offset)))) - (insert string))) + `(space :align-to (,offset))))) + (insert string)) (defun erc-insert-timestamp-right (string) "Insert timestamp on the right side of the screen. @@ -257,14 +257,16 @@ be printed just before the window-width." indent) ;; deal with variable-width characters (setq pos (- pos (string-width string)) - ;; the following is a kludge that works with most - ;; international input + ;; The following is a kludge that works with most + ;; international input. It is now only used to calculate + ;; whether to move to the next line before inserting a + ;; stamp. col (+ col (ceiling (/ (- col (- (point) (point-at-bol))) 1.6)))) (if (< col pos) - (erc-insert-aligned string pos col) + (erc-insert-aligned string pos) (newline) - (setq from (point)) (indent-to pos) + (setq from (point)) (insert string)) (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp) (erc-put-text-property from (1+ (point)) 'rear-nonsticky t) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 8d380847f5a..936fffa252f 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1716,6 +1716,22 @@ all channel buffers on all servers." "Used to keep track of how many times an attempt at changing nick is made.") (make-variable-buffer-local 'erc-nick-change-attempt-count) +(defun erc-migrate-modules (mods) + "Migrate old names of ERC modules to new ones." + ;; modify `transforms' to specify what needs to be changed + ;; each item is in the format '(new .old) + (let ((transforms '((pcomplete . completion))) + (modules (copy-alist mods))) + (dolist (transform transforms) + (let ((addp nil)) + (setq modules (erc-delete-if `(lambda (val) + (and (eq val ',(car transform)) + (setq addition t))) + modules)) + (when addp + (add-to-list 'modules (cdr transform))))) + (erc-delete-dups modules))) + (defcustom erc-modules '(netsplit fill button match track pcomplete readonly ring autojoin noncommands irccontrols stamp) @@ -1723,6 +1739,9 @@ all channel buffers on all servers." If you set the value of this without using `customize' remember to call \(erc-update-modules) after you change it. When using `customize', modules removed from the list will be disabled." + :get (lambda (sym) + ;; replace outdated names with their newer equivalents + (erc-migrate-modules (symbol-value sym))) :set (lambda (sym val) ;; disable modules which have just been removed (when (and (boundp 'erc-modules) erc-modules val) @@ -1732,7 +1751,7 @@ removed from the list will be disabled." (when (and (fboundp f) (boundp f) (symbol-value f)) (message "Disabling `erc-%s'" module) (funcall f 0)))))) - (set-default sym val) + (set sym val) ;; this test is for the case where erc hasn't been loaded yet (when (fboundp 'erc-update-modules) (erc-update-modules))) @@ -1753,8 +1772,8 @@ removed from the list will be disabled." "Notify when the online status of certain users changes" notify) (const :tag "Complete nicknames and commands (programmable)" - pcomplete) - (const :tag "Complete nicknames and commands (old)" completion) + completion) + (const :tag "Complete nicknames and commands (old)" hecomplete) (const :tag "Make displayed lines read-only" readonly) (const :tag "Replace text in messages" replace) (const :tag "Enable an input history" ring) @@ -1781,10 +1800,13 @@ removed from the list will be disabled." ;; yuck. perhaps we should bring the filenames into sync? ((string= req "erc-completion") (setq req "erc-pcomplete") - (setq mod 'pcomplete)) - ((string= req "erc-services") - (setq req "erc-nickserv") - (setq mod 'services))) + (setq mod 'completion)) + ((string= req "erc-pcomplete") + (setq req "erc-pcomplete") + (setq mod 'completion)) + ((string= req "erc-autojoin") + (setq req "erc-join") + (setq mod 'autojoin))) (condition-case nil (require (intern req)) (error nil)) @@ -3142,12 +3164,6 @@ the message given by REASON." (erc-modes))) t) -(defun erc-cmd-SMV () - "Say the current ERC module versions into channel." - (erc-send-message (format "I'm using the following module revisions: %s!" - (erc-version-modules))) - t) - (defun erc-cmd-DEOP (&rest people) "Remove the operator setting from user(s) given in PEOPLE." (when (> (length people) 0) diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index 67e007a7f00..30b7f69cc38 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el @@ -1,7 +1,7 @@ ;;; em-alias.el --- creation and management of command aliases ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el index 017474ca6f1..18f7cd84c04 100644 --- a/lisp/eshell/em-banner.el +++ b/lisp/eshell/em-banner.el @@ -1,7 +1,7 @@ ;;; em-banner.el --- sample module that displays a login banner ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index c42b843add4..c942b3c6913 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el @@ -1,7 +1,7 @@ ;;; em-basic.el --- basic shell builtin commands ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 423a93d46e2..19b1ad34569 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -1,7 +1,7 @@ ;;; em-cmpl.el --- completion using the TAB key ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 3a18b1e042a..12e84b5403f 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -1,7 +1,7 @@ ;;; em-dirs.el --- directory navigation commands ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 869144dad74..76bde7784dc 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -1,7 +1,7 @@ ;;; em-glob.el --- extended file name globbing ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index e7844028542..66356c11925 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -1,7 +1,7 @@ ;;; em-hist.el --- history list management ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 24b61aa492f..f705ca0e375 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -1,7 +1,7 @@ ;;; em-ls.el --- implementation of ls in Lisp ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 9e2e8a32af2..a506bc03b2a 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -1,7 +1,7 @@ ;;; em-pred.el --- argument predicates and modifiers (ala zsh) ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el index a4ba51609b5..e55008fe2e8 100644 --- a/lisp/eshell/em-prompt.el +++ b/lisp/eshell/em-prompt.el @@ -1,7 +1,7 @@ ;;; em-prompt.el --- command prompts ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index da36551a4dc..98627be2363 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -1,7 +1,7 @@ ;;; em-rebind.el --- rebind keys when point is at current input ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index d67c5e063c9..782d70bb864 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -1,7 +1,7 @@ ;;; em-script.el --- Eshell script files ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index 1d8133effef..65a3280d34e 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el @@ -1,7 +1,7 @@ ;;; em-smart.el --- smart display of output ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index 8e0786349a6..a91eb044987 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -1,7 +1,7 @@ ;;; em-term.el --- running visual commands ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 340b95f4d53..ead8e6e48a6 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -1,7 +1,7 @@ ;;; em-unix.el --- UNIX command aliases ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el index 3db159ad84e..d53d67314a0 100644 --- a/lisp/eshell/em-xtra.el +++ b/lisp/eshell/em-xtra.el @@ -1,7 +1,7 @@ ;;; em-xtra.el --- extra alias functions ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index 322a0173b27..5f636c66611 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -1,7 +1,7 @@ ;;; esh-arg.el --- argument processing ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index e655a87f898..aad62bfc7dc 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1,7 +1,7 @@ ;;; esh-cmd.el --- command invocation ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 0aa3f4486ad..9f77f1e2868 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -1,7 +1,7 @@ ;;; esh-ext.el --- commands external to Eshell ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 1c3fd219455..19f90e67f92 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -1,7 +1,7 @@ ;;; esh-io.el --- I/O management ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el index 56d92b0c6a3..d0d9f85ece7 100644 --- a/lisp/eshell/esh-maint.el +++ b/lisp/eshell/esh-maint.el @@ -1,7 +1,7 @@ ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*- ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index fce998e543f..2da540a0abd 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -1,7 +1,7 @@ ;;; esh-mode.el --- user interface ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el index ea87c662c1d..412ee68d4a2 100644 --- a/lisp/eshell/esh-module.el +++ b/lisp/eshell/esh-module.el @@ -1,7 +1,7 @@ ;;; esh-module.el --- Eshell modules ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: processes diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 73fdf84c41f..d2f4f76cf43 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -1,7 +1,7 @@ ;;; esh-opt.el --- command options processing ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 530eb9c900a..379ac972206 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -1,7 +1,7 @@ ;;; esh-proc.el --- process management ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el index b7dcfab0274..5aad4126f91 100644 --- a/lisp/eshell/esh-test.el +++ b/lisp/eshell/esh-test.el @@ -1,7 +1,7 @@ ;;; esh-test.el --- Eshell test suite ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index c05f6abb23b..50ff77c7725 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -1,7 +1,7 @@ ;;; esh-util.el --- general utilities ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 10cc7c703d5..2bebb6a79cc 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -1,7 +1,7 @@ ;;; esh-var.el --- handling of variables ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index ce9641026c7..ed9e3e56c9e 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -1,7 +1,7 @@ ;;; eshell.el --- the Emacs command shell ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Version: 2.4.2 diff --git a/lisp/expand.el b/lisp/expand.el index aeb9ec83b14..5d213128ad4 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -1,7 +1,7 @@ ;;; expand.el --- make abbreviations more usable ;; Copyright (C) 1995, 1996, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org> ;; Maintainer: Frederic Lepied <Frederic.Lepied@sugix.frmug.org> diff --git a/lisp/ezimage.el b/lisp/ezimage.el index a689adc25cd..84ad10ad599 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el @@ -1,7 +1,7 @@ ;;; ezimage --- Generalized Image management -;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;;; 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 00fb13fe8f9..04f70708359 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -1,7 +1,7 @@ ;;; facemenu.el --- create a face menu for interactively adding fonts to text ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: faces diff --git a/lisp/faces.el b/lisp/faces.el index 24bbde154d8..ee11868b549 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1,7 +1,7 @@ ;;; faces.el --- Lisp faces ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/ffap.el b/lisp/ffap.el index ff35ae0deac..d487c4f67a0 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1,7 +1,7 @@ ;;; ffap.el --- find file (or url) at point ;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu> ;; Maintainer: Rajesh Vaidheeswarran <rv@gnu.org> diff --git a/lisp/filecache.el b/lisp/filecache.el index 442f729dd15..c0e9e9e5f5d 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -5,7 +5,7 @@ ;; Keywords: convenience ;; ;; Copyright (C) 1996, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/files.el b/lisp/files.el index ec974ceebe7..0a33a658d9d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1,7 +1,8 @@ ;;; files.el --- file input and output commands for Emacs -;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -;; 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, +;; 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF @@ -1024,7 +1025,7 @@ type M-n to pull it into the minibuffer. Interactively, or if WILDCARDS is non-nil in a call from Lisp, expand wildcards (if any) and visit multiple files. You can -suppress wildcard expansion by setting `find-file-wildcards'. +suppress wildcard expansion by setting `find-file-wildcards' to nil. To visit a file without any kind of conversion and without automatically choosing a major mode, use \\[find-file-literally]." @@ -1076,7 +1077,7 @@ expand wildcards (if any) and visit multiple files." (defun find-file-existing (filename &optional wildcards) "Edit the existing file FILENAME. -Like \\[find-file] but only allow files that exists." +Like \\[find-file] but only allow a file that exists." (interactive (find-file-read-args "Find existing file: " t)) (unless (file-exists-p filename) (error "%s does not exist" filename)) (find-file filename wildcards) @@ -3795,8 +3796,8 @@ sake of backward compatibility. IGNORE-AUTO is optional, defaulting to nil. Optional second argument NOCONFIRM means don't ask for confirmation at -all. (The local variable `revert-without-query', if non-nil, prevents -confirmation.) +all. \(The variable `revert-without-query' offers another way to +revert buffers without querying for confirmation.) Optional third argument PRESERVE-MODES non-nil means don't alter the files modes. Normally we reinitialize them using `normal-mode'. @@ -3831,13 +3832,10 @@ non-nil, it is called instead of rereading visited file contents." (error "Buffer does not seem to be associated with any file")) ((or noconfirm (and (not (buffer-modified-p)) - (let ((tail revert-without-query) - (found nil)) - (while tail - (if (string-match (car tail) file-name) - (setq found t)) - (setq tail (cdr tail))) - found)) + (catch 'found + (dolist (regexp revert-without-query) + (when (string-match regexp file-name) + (throw 'found t))))) (yes-or-no-p (format "Revert buffer from file %s? " file-name))) (run-hooks 'before-revert-hook) @@ -3846,50 +3844,51 @@ non-nil, it is called instead of rereading visited file contents." (and (not auto-save-p) (not (verify-visited-file-modtime (current-buffer))) (setq buffer-backed-up nil)) - ;; Get rid of all undo records for this buffer. - (or (eq buffer-undo-list t) - (setq buffer-undo-list nil)) ;; Effectively copy the after-revert-hook status, ;; since after-find-file will clobber it. (let ((global-hook (default-value 'after-revert-hook)) - (local-hook-p (local-variable-p 'after-revert-hook)) - (local-hook (and (local-variable-p 'after-revert-hook) - after-revert-hook))) - (let (buffer-read-only - ;; Don't make undo records for the reversion. - (buffer-undo-list t)) - (if revert-buffer-insert-file-contents-function - (funcall revert-buffer-insert-file-contents-function - file-name auto-save-p) - (if (not (file-exists-p file-name)) - (error (if buffer-file-number - "File %s no longer exists!" - "Cannot revert nonexistent file %s") - file-name)) - ;; Bind buffer-file-name to nil - ;; so that we don't try to lock the file. - (let ((buffer-file-name nil)) - (or auto-save-p - (unlock-buffer))) - (widen) - (let ((coding-system-for-read - ;; Auto-saved file shoule be read by Emacs' - ;; internal coding. - (if auto-save-p 'auto-save-coding - (or coding-system-for-read - buffer-file-coding-system-explicit)))) - ;; This force after-insert-file-set-coding - ;; (called from insert-file-contents) to set - ;; buffer-file-coding-system to a proper value. - (kill-local-variable 'buffer-file-coding-system) - - ;; Note that this preserves point in an intelligent way. - (if preserve-modes - (let ((buffer-file-format buffer-file-format)) - (insert-file-contents file-name (not auto-save-p) - nil nil t)) - (insert-file-contents file-name (not auto-save-p) - nil nil t))))) + (local-hook (when (local-variable-p 'after-revert-hook) + after-revert-hook)) + (inhibit-read-only t)) + (cond + (revert-buffer-insert-file-contents-function + (unless (eq buffer-undo-list t) + ;; Get rid of all undo records for this buffer. + (setq buffer-undo-list nil)) + ;; Don't make undo records for the reversion. + (let ((buffer-undo-list t)) + (funcall revert-buffer-insert-file-contents-function + file-name auto-save-p))) + ((not (file-exists-p file-name)) + (error (if buffer-file-number + "File %s no longer exists!" + "Cannot revert nonexistent file %s") + file-name)) + (t + ;; Bind buffer-file-name to nil + ;; so that we don't try to lock the file. + (let ((buffer-file-name nil)) + (or auto-save-p + (unlock-buffer))) + (widen) + (let ((coding-system-for-read + ;; Auto-saved file should be read by Emacs' + ;; internal coding. + (if auto-save-p 'auto-save-coding + (or coding-system-for-read + buffer-file-coding-system-explicit)))) + ;; This force after-insert-file-set-coding + ;; (called from insert-file-contents) to set + ;; buffer-file-coding-system to a proper value. + (kill-local-variable 'buffer-file-coding-system) + + ;; Note that this preserves point in an intelligent way. + (if preserve-modes + (let ((buffer-file-format buffer-file-format)) + (insert-file-contents file-name (not auto-save-p) + nil nil t)) + (insert-file-contents file-name (not auto-save-p) + nil nil t))))) ;; Recompute the truename in case changes in symlinks ;; have changed the truename. (setq buffer-file-truename @@ -3897,7 +3896,7 @@ non-nil, it is called instead of rereading visited file contents." (after-find-file nil nil t t preserve-modes) ;; Run after-revert-hook as it was before we reverted. (setq-default revert-buffer-internal-hook global-hook) - (if local-hook-p + (if local-hook (set (make-local-variable 'revert-buffer-internal-hook) local-hook) (kill-local-variable 'revert-buffer-internal-hook)) @@ -3943,7 +3942,7 @@ non-nil, it is called instead of rereading visited file contents." (insert-directory-safely file-name switches)))) (yes-or-no-p (format "Recover auto save file %s? " file-name))) (switch-to-buffer (find-file-noselect file t)) - (let ((buffer-read-only nil) + (let ((inhibit-read-only t) ;; Keep the current buffer-file-coding-system. (coding-system buffer-file-coding-system) ;; Auto-saved file shoule be read with special coding. diff --git a/lisp/filesets.el b/lisp/filesets.el index 1ee126465a5..4ca5a9d1420 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -1,6 +1,6 @@ ;;; filesets.el --- handle group of files -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Thomas Link <t.link@gmx.at> ;; Maintainer: FSF diff --git a/lisp/find-dired.el b/lisp/find-dired.el index 8347e68c58e..88e5414d525 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -1,7 +1,7 @@ ;;; find-dired.el --- run a `find' command and dired the output ;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org>, ;; Sebastian Kremer <sk@thp.uni-koeln.de> diff --git a/lisp/find-file.el b/lisp/find-file.el index db03adce29f..e15d6e62b0b 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -5,7 +5,7 @@ ;; Keywords: c, matching, tools ;; Copyright (C) 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el index 19ebe3fae6f..c7527fe21f5 100644 --- a/lisp/find-lisp.el +++ b/lisp/find-lisp.el @@ -3,10 +3,10 @@ ;; Author: Peter Breton ;; Created: Fri Mar 26 1999 ;; Keywords: unix -;; Time-stamp: <2005-11-11 20:37:50 teirllm> +;; Time-stamp: <2006-02-06 13:40:10 ttn> ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/finder.el b/lisp/finder.el index dfbd6851129..fc96381e8f7 100644 --- a/lisp/finder.el +++ b/lisp/finder.el @@ -1,7 +1,7 @@ ;;; finder.el --- topic & keyword-based code finder ;; Copyright (C) 1992, 1997, 1998, 1999, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Created: 16 Jun 1992 diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el index 0acbe41c6ed..bfa86317809 100644 --- a/lisp/flow-ctrl.el +++ b/lisp/flow-ctrl.el @@ -1,7 +1,7 @@ ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control ;; Copyright (C) 1990, 1991, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author Kevin Gallagher ;; Maintainer: FSF diff --git a/lisp/foldout.el b/lisp/foldout.el index 42f889fb96e..7666ee48bc7 100644 --- a/lisp/foldout.el +++ b/lisp/foldout.el @@ -1,6 +1,7 @@ ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode -;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk> ;; Maintainer: FSF diff --git a/lisp/follow.el b/lisp/follow.el index ef1b2231950..1958c407664 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -1,7 +1,7 @@ ;;; follow.el --- synchronize windows showing the same buffer ;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Anders Lindgren <andersl@andersl.com> ;; Maintainer: FSF (Anders' email bounces, Sep 2005) diff --git a/lisp/font-core.el b/lisp/font-core.el index cfddbca5f5c..85bbf60f0d9 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -1,7 +1,7 @@ ;;; font-core.el --- Core interface to font-lock ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages, faces diff --git a/lisp/format.el b/lisp/format.el index 30e9ee207c7..58c69575d36 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -1,7 +1,7 @@ ;;; format.el --- read and save files in multiple formats ;; Copyright (C) 1994, 1995, 1997, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> diff --git a/lisp/forms.el b/lisp/forms.el index e7282ee0ea5..ab5e591938c 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -1,7 +1,7 @@ ;;; forms.el --- Forms mode: edit a file as a form to fill in ;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Johan Vromans <jvromans@squirrel.nl> diff --git a/lisp/frame.el b/lisp/frame.el index 541d1c364d6..d1ee9db01a2 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1,7 +1,7 @@ ;;; frame.el --- multi-frame management independent of window systems ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -769,7 +769,7 @@ automatically." (select-frame frame) (raise-frame frame) ;; Ensure, if possible, that frame gets input focus. - (cond ((eq (window-system frame) 'x) + (cond ((memq (window-system frame) '(x max)) (x-focus-frame frame)) ((eq (window-system frame) 'w32) (w32-focus-frame frame))) diff --git a/lisp/fringe.el b/lisp/fringe.el index a32d6b5902c..fd9e70b5846 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -1,6 +1,6 @@ ;;; fringe.el --- change fringes appearance in various ways -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Maintainer: FSF diff --git a/lisp/generic-x.el b/lisp/generic-x.el index d6f56cfc76c..5b1d0bfb93d 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1,7 +1,7 @@ ;;; generic-x.el --- A collection of generic modes ;; Copyright (C) 1997, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Tue Oct 08 1996 @@ -1706,6 +1706,8 @@ like an INI file. You can add this hook to `find-file-hook'." "reiserfs" "romfs" "smbfs" + "cifs" + "usbdevfs" "sysv" "tmpfs" "udf" @@ -1717,7 +1719,7 @@ like an INI file. You can add this hook to `find-file-hook'." "swap" "auto" "ignore") - '(("^\\([/-A-Za-z0-9_]+\\)\\s-+\\([/-A-Za-z0-9_]+\\)" + '(("^\\([^# \t]+\\)\\s-+\\([^# \t]+\\)" (1 font-lock-type-face t) (2 font-lock-variable-name-face t))) '("/etc/[v]*fstab\\'") @@ -1725,7 +1727,7 @@ like an INI file. You can add this hook to `find-file-hook'." (function (lambda () (setq imenu-generic-expression - '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1)))))))) + '((nil "^\\([^# \t]+\\)\\s-+" 1)))))))) ;; From Jacques Duthen <jacques.duthen@sncf.fr> (when (memq 'show-tabs-generic-mode generic-extras-enable-list) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 620e017b38e..be9436d350c 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,85 @@ +2006-02-10 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.el: Remove bogus comment. + +2006-02-09 Daiki Ueno <ueno@unixuser.org> + + * pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings + in elisp. + (pgg-gpg-encrypt-symmetric-region): Ditto. + (pgg-gpg-sign-region): Ditto. + + * pgg-def.el (pgg-text-mode): New variable. + + * mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode. + (mml2015-pgg-encrypt): Ditto. + + * mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode. + (mml1991-pgg-encrypt): Ditto. + +2006-02-08 Katsumi Yamaoka <yamaoka@jpl.org> + + * nnfolder.el (nnfolder-insert-newsgroup-line): Use + message-make-date instead of current-time-string. + + * mm-view.el (mm-inline-message): Don't set gnus-newsgroup-charset + to gnus-decoded which mm-uu might set. + +2006-02-08 Katsumi Yamaoka <yamaoka@jpl.org> + + * rfc2231.el (rfc2231-parse-string): Sort segmented parameters; + don't decode quoted parameters; remove misimported Emacs code. + Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>. + (rfc2231-decode-encoded-string): Don't use split-string which + behaves differently according to Emacs version; use + mm-decode-coding-region to convert charset to coding-system. + Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>. + (rfc2231-encode-string): Remove misimported Emacs code. + +2006-02-07 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (article-decode-charset): Don't use ignore-errors + when calling mail-header-parse-content-type. + (article-de-quoted-unreadable): Ditto. + (article-de-base64-unreadable): Ditto. + (article-wash-html): Ditto. + + * mm-decode.el (mm-dissect-buffer): Don't use ignore-errors when + calling mail-header-parse-content-type and + mail-header-parse-content-disposition. + (mm-find-raw-part-by-type): Don't use ignore-errors when calling + mail-header-parse-content-type. + + * mml.el (mml-insert-mime-headers): Use mml-insert-parameter to + insert charset and format parameters; encode description after + inserting it to buffer. + (mml-insert-parameter): Fold lines properly even if a parameter is + segmented into two or more lines; change the max column to 76. + + * rfc1843.el (rfc1843-decode-article-body): Don't use + ignore-errors when calling mail-header-parse-content-type. + + * rfc2231.el (rfc2231-parse-string): Return at least type if + possible; don't cause an error even if it fails in parsing of + parameters. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>. + (rfc2231-encode-string): Don't break lines at the beginning, leave + it to mml-insert-parameter. + + * webmail.el (webmail-yahoo-article): Don't use ignore-errors when + calling mail-header-parse-content-type. + +2006-02-06 Reiner Steib <Reiner.Steib@gmx.de> + + * spam-report.el (spam-report-gmane-use-article-number): Improve + doc string. + (spam-report-gmane-internal): Check if a suitable header was found + in the article. + +2006-02-04 Katsumi Yamaoka <yamaoka@jpl.org> + + * rfc2231.el (rfc2231-parse-string): Revert 2006-02-03 change. + (rfc2231-encode-string): Make param*=value always begin with LWSP. + 2006-02-05 Romain Francoise <romain@orebokech.com> Update copyright notices of all files in the gnus directory. @@ -6,7 +88,7 @@ * gnus-util.el (gnus-error): Describe `args'. -2006-02-03 Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de> +2006-02-03 Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de> * nnweb.el (nnweb-request-group): Avoid growing overview files. @@ -23,7 +105,7 @@ * mml.el (mml-generate-mime-1): Correct the order of inline signed parts. -2006-01-31 Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de> +2006-01-31 Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de> * nnweb.el (nnweb-group-alist): Use defvar instead of defvoo, there's only one active file for all servers. @@ -64,7 +146,7 @@ * nnweb.el (nnweb-google-parse-1): Clarify some comments. -2006-01-30 Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de> +2006-01-30 Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de> * nnweb.el (nnweb-type-definition, nnweb-google-parse-1) (nnweb-google-create-mapping, nnweb-google-search): Adapt to @@ -422,6 +504,98 @@ as a buffer-local variable. This avoids creating truncated dribble files as a result of a hang up, eg. +2005-11-04 Ken Manheimer <ken.manheimer@gmail.com> + + * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region) + (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric) + (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt) + (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase' + argument to all these routines, so the passphrase can be managed + externally and passed in to the system. + (pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for + pgg-add-passphrase-to-cache function. + + * pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region) + (pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric) + (pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt) + (pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase' + argument to all these routines, so the passphrase can be managed + externally and passed in to the system. + (pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache + function. + +2005-10-29 Ken Manheimer <ken.manheimer@gmail.com> + + * pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right + part of the decoded armor to find the key-identifier. + (pgg-gpg-lookup-key-owner): New function to return the + human-readable identifier of a key owner. + (pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the + key itself. + (pgg-gpg-decrypt-region): Prompt with the key owner (rather than + the key value) if we have a key and can match it against a secret + key. Also, added a note pointing out fact that the prompt only + indicates the first matching key. + + * pgg.el (pgg-decrypt): Passing along 'passphrase' in call to + pgg-decrypt-region. + (pgg-pending-timers): A new hash for tracking the passphrase cache + timers, so that new ones supercede old ones. + (pgg-add-passphrase-to-cache): Rename from + `pgg-add-passphrase-cache' to reduce confusion (all callers + changed). Modified to cancel old timers when new ones are added. + (pgg-remove-passphrase-from-cache): Rename from + `pgg-remove-passphrase-cache' to reduce confusion (all callers + changed). Modified to cancel old timers when their keys are + removed from the cache. + (pgg-cancel-timer): In Emacs, an alias for cancel-timer; in + XEmacs, an indirection to delete-itimer. + (pgg-read-passphrase-from-cache, pgg-read-passphrase): + Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so + users can only check cache without risk of prompting. Correct bug in + notruncate behavior. + (pgg-read-passphrase-from-cache, pgg-read-passphrase) + (pgg-add-passphrase-cache, pgg-remove-passphrase-cache): + Add informative docstrings. + (pgg-decrypt): Convey provided passphrase in subordinate call to + pgg-decrypt-region. + +2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com> + + * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region) + (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region) + (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional + 'passphrase' argument, so the passphrase can be managed externally + and then passed in to the system. + + * pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache) + (pgg-remove-passphrase-cache): Add optional 'notruncate' argument, + so the passphrase cache can be used reliably with identifiers + besides a pgp packet's key id. + + * pgg-gpg.el (pgg-pgp-encrypt-region) + (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric) + (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt) + (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase' + argument to all these routines, so the passphrase can be managed + externally and passed in to the system. + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional + 'notruncate' argument, so the passphrase cache can be used + reliably with identifiers besides a pgp packet's key id. + +2005-10-29 Sascha Wilde <swilde@sha-bang.de> + + * pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for + symmetric encryption. + (pgg-gpg-symmetric-key-p): New function to check for an symmetric + encrypted session key. + (pgg-gpg-decrypt-region): When decrypting a symmetric encrypted + message ask for the passphrase in a proper way. + + * pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region): + New user commands for symmetric encryption. + 2005-11-30 Stefan Monnier <monnier@iro.umontreal.ca> * gnus-delay.el (gnus-delay-group): Don't autoload. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index b51ceff29a9..c15151729a0 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -2267,38 +2267,37 @@ If PROMPT (the prefix), prompt for a coding system to use." (error)) gnus-newsgroup-ignored-charsets)) ct cte ctl charset format) - (save-excursion - (save-restriction - (article-narrow-to-head) - (setq ct (message-fetch-field "Content-Type" t) - cte (message-fetch-field "Content-Transfer-Encoding" t) - ctl (and ct (ignore-errors - (mail-header-parse-content-type ct))) - charset (cond - (prompt - (mm-read-coding-system "Charset to decode: ")) - (ctl - (mail-content-type-get ctl 'charset))) - format (and ctl (mail-content-type-get ctl 'format))) - (when cte - (setq cte (mail-header-strip cte))) - (if (and ctl (not (string-match "/" (car ctl)))) - (setq ctl nil)) - (goto-char (point-max))) - (forward-line 1) - (save-restriction - (narrow-to-region (point) (point-max)) - (when (and (eq mail-parse-charset 'gnus-decoded) - (eq (mm-body-7-or-8) '8bit)) - ;; The text code could have been decoded. - (setq charset mail-parse-charset)) - (when (and (or (not ctl) - (equal (car ctl) "text/plain")) - (not format)) ;; article with format will decode later. - (mm-decode-body - charset (and cte (intern (downcase - (gnus-strip-whitespace cte)))) - (car ctl))))))) + (save-excursion + (save-restriction + (article-narrow-to-head) + (setq ct (message-fetch-field "Content-Type" t) + cte (message-fetch-field "Content-Transfer-Encoding" t) + ctl (and ct (mail-header-parse-content-type ct)) + charset (cond + (prompt + (mm-read-coding-system "Charset to decode: ")) + (ctl + (mail-content-type-get ctl 'charset))) + format (and ctl (mail-content-type-get ctl 'format))) + (when cte + (setq cte (mail-header-strip cte))) + (if (and ctl (not (string-match "/" (car ctl)))) + (setq ctl nil)) + (goto-char (point-max))) + (forward-line 1) + (save-restriction + (narrow-to-region (point) (point-max)) + (when (and (eq mail-parse-charset 'gnus-decoded) + (eq (mm-body-7-or-8) '8bit)) + ;; The text code could have been decoded. + (setq charset mail-parse-charset)) + (when (and (or (not ctl) + (equal (car ctl) "text/plain")) + (not format)) ;; article with format will decode later. + (mm-decode-body + charset (and cte (intern (downcase + (gnus-strip-whitespace cte)))) + (car ctl))))))) (defun article-decode-encoded-words () "Remove encoded-word encoding from headers." @@ -2390,9 +2389,7 @@ If READ-CHARSET, ask for a coding system." (setq type (gnus-fetch-field "content-transfer-encoding")) (let* ((ct (gnus-fetch-field "content-type")) - (ctl (and ct - (ignore-errors - (mail-header-parse-content-type ct))))) + (ctl (and ct (mail-header-parse-content-type ct)))) (setq charset (and ctl (mail-content-type-get ctl 'charset))) (if (stringp charset) @@ -2420,9 +2417,7 @@ If READ-CHARSET, ask for a coding system." (setq type (gnus-fetch-field "content-transfer-encoding")) (let* ((ct (gnus-fetch-field "content-type")) - (ctl (and ct - (ignore-errors - (mail-header-parse-content-type ct))))) + (ctl (and ct (mail-header-parse-content-type ct)))) (setq charset (and ctl (mail-content-type-get ctl 'charset))) (if (stringp charset) @@ -2488,9 +2483,7 @@ charset defined in `gnus-summary-show-article-charset-alist' is used." (when (gnus-buffer-live-p gnus-original-article-buffer) (with-current-buffer gnus-original-article-buffer (let* ((ct (gnus-fetch-field "content-type")) - (ctl (and ct - (ignore-errors - (mail-header-parse-content-type ct))))) + (ctl (and ct (mail-header-parse-content-type ct)))) (setq charset (and ctl (mail-content-type-get ctl 'charset))) (when (stringp charset) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 359e48cb701..2caccc0b70e 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -4257,9 +4257,6 @@ current display is used." (delete-frame gnus-other-frame-object)) (setq gnus-other-frame-object nil))))))) -;;(setq thing ? ; this is a comment -;; more 'yes) - ;;;###autoload (defun gnus (&optional arg dont-connect slave) "Read network news. diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index b275807c051..996c934191c 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -534,13 +534,13 @@ Postpone undisplaying of viewers for types in loose-mime (mail-fetch-field "mime-version")) (setq ct (mail-fetch-field "content-type") - ctl (ignore-errors (mail-header-parse-content-type ct)) + ctl (and ct (mail-header-parse-content-type ct)) cte (mail-fetch-field "content-transfer-encoding") cd (mail-fetch-field "content-disposition") description (mail-fetch-field "content-description") id (mail-fetch-field "content-id")) (unless from - (setq from (mail-fetch-field "from"))) + (setq from (mail-fetch-field "from"))) ;; FIXME: In some circumstances, this code is running within ;; an unibyte macro. mail-extract-address-components ;; creates unibyte buffers. This `if', though not a perfect @@ -557,7 +557,7 @@ Postpone undisplaying of viewers for types in (mail-header-remove-comments cte))))) no-strict-mime - (and cd (ignore-errors (mail-header-parse-content-disposition cd))) + (and cd (mail-header-parse-content-disposition cd)) description) (setq type (split-string (car ctl) "/")) (setq subtype (cadr type) @@ -592,8 +592,7 @@ Postpone undisplaying of viewers for types in (mail-header-remove-comments cte))))) no-strict-mime - (and cd (ignore-errors - (mail-header-parse-content-disposition cd))) + (and cd (mail-header-parse-content-disposition cd)) description id) ctl)))) (when id @@ -1401,9 +1400,8 @@ If RECURSIVE, search recursively." (save-excursion (save-restriction (narrow-to-region start (1- (point))) - (when (let ((ctl (ignore-errors - (mail-header-parse-content-type - (mail-fetch-field "content-type"))))) + (when (let* ((ct (mail-fetch-field "content-type")) + (ctl (and ct (mail-header-parse-content-type ct)))) (if notp (not (equal (car ctl) type)) (equal (car ctl) type))) @@ -1414,9 +1412,8 @@ If RECURSIVE, search recursively." (save-excursion (save-restriction (narrow-to-region start end) - (when (let ((ctl (ignore-errors - (mail-header-parse-content-type - (mail-fetch-field "content-type"))))) + (when (let* ((ct (mail-fetch-field "content-type")) + (ctl (and ct (mail-header-parse-content-type ct)))) (if notp (not (equal (car ctl) type)) (equal (car ctl) type))) diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 73cab0a5676..43d6bddf194 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -486,7 +486,8 @@ ;; disable prepare hook gnus-article-prepare-hook (gnus-newsgroup-charset - (or charset gnus-newsgroup-charset))) + (unless (eq charset 'gnus-decoded) ;; mm-uu might set it. + (or charset gnus-newsgroup-charset)))) (let ((gnus-original-article-buffer (mm-handle-buffer handle))) (run-hooks 'gnus-article-decode-hook)) (gnus-article-prepare-display) diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index f8c34b370d6..0ceda113f49 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -664,10 +664,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." "Can't encode a part with several charsets")) (insert "Content-Type: " type) (when charset - (insert "; " (mail-header-encode-parameter - "charset" (symbol-name charset)))) + (mml-insert-parameter + (mail-header-encode-parameter "charset" (symbol-name charset)))) (when flowed - (insert "; format=flowed")) + (mml-insert-parameter "format=flowed")) (when parameters (mml-insert-parameter-string cont mml-content-type-parameters)) @@ -687,8 +687,11 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (unless (eq encoding '7bit) (insert (format "Content-Transfer-Encoding: %s\n" encoding))) (when (setq description (cdr (assq 'description cont))) - (insert "Content-Description: " - (mail-encode-encoded-word-string description) "\n")))) + (insert "Content-Description: ") + (setq description (prog1 + (point) + (insert description "\n"))) + (mail-encode-encoded-word-region description (point))))) (defun mml-parameter-string (cont types) (let ((string "") @@ -841,14 +844,20 @@ If HANDLES is non-nil, use it instead reparsing the buffer." (defun mml-insert-parameter (&rest parameters) "Insert PARAMETERS in a nice way." - (dolist (param parameters) - (insert ";") - (let ((point (point))) + (let (start end) + (dolist (param parameters) + (insert ";") + (setq start (point)) (insert " " param) - (when (> (current-column) 71) - (goto-char point) - (insert "\n ") - (end-of-line))))) + (setq end (point)) + (goto-char start) + (end-of-line) + (if (> (current-column) 76) + (progn + (goto-char start) + (insert "\n") + (goto-char (1+ end))) + (goto-char end))))) ;;; ;;; Mode for inserting and editing MML forms diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 761ce4f0af4..0c6bb675388 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -229,7 +229,8 @@ (defvar pgg-output-buffer)) (defun mml1991-pgg-sign (cont) - (let (headers cte) + (let ((pgg-text-mode t) + headers cte) ;; Don't sign headers. (goto-char (point-min)) (while (not (looking-at "^$")) @@ -261,7 +262,8 @@ t)) (defun mml1991-pgg-encrypt (cont &optional sign) - (let (cte) + (let ((pgg-text-mode t) + cte) ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index cb9e77983d3..80dd5b26597 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -814,6 +814,7 @@ (boundary (mml-compute-boundary cont)) (pgg-default-user-id (or (message-options-get 'mml-sender) pgg-default-user-id)) + (pgg-text-mode t) entry) (unless (pgg-sign-region (point-min) (point-max)) (pop-to-buffer mml2015-result-buffer) @@ -841,6 +842,7 @@ (defun mml2015-pgg-encrypt (cont &optional sign) (let ((pgg-errors-buffer mml2015-result-buffer) + (pgg-text-mode t) (boundary (mml-compute-boundary cont))) (unless (pgg-encrypt-region (point-min) (point-max) (split-string diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index c7043011fa2..bd9957283f4 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -826,7 +826,7 @@ deleted. Point is left where the deleted region was." (insert "\n")) (forward-char -1) (insert (format (concat nnfolder-article-marker "%d %s\n") - (cdr group-art) (current-time-string))))) + (cdr group-art) (message-make-date))))) (defun nnfolder-active-number (group) ;; Find the next article number in GROUP. diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el index 8de64ce7c99..aac75758c05 100644 --- a/lisp/gnus/rfc1843.el +++ b/lisp/gnus/rfc1843.el @@ -149,8 +149,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc" (let* ((inhibit-point-motion-hooks t) (case-fold-search t) (ct (message-fetch-field "Content-Type" t)) - (ctl (and ct (ignore-errors - (mail-header-parse-content-type ct))))) + (ctl (and ct (mail-header-parse-content-type ct)))) (if (and ctl (not (string-match "/" (car ctl)))) (setq ctl nil)) (goto-char (point-max)) diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index fb2d070328e..7b4cf2447f4 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -41,22 +41,19 @@ N.B. This is in violation with RFC2047, but it seem to be in common use." (rfc2231-parse-string (rfc2047-decode-string string))) -(defun rfc2231-parse-string (string) +(defun rfc2231-parse-string (string &optional signal-error) "Parse STRING and return a list. The list will be on the form - `(name (attribute . value) (attribute . value)...)" + `(name (attribute . value) (attribute . value)...)'. + +If the optional SIGNAL-ERROR is non-nil, signal an error when this +function fails in parsing of parameters." (with-temp-buffer (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token)) (stoken (ietf-drums-token-to-list ietf-drums-tspecials)) (ntoken (ietf-drums-token-to-list "0-9")) - (prev-value "") - display-name mailbox c display-string parameters - attribute value type subtype number encoded - prev-attribute prev-encoded) - ;; Some mailer (e.g. Thunderbird 1.5) doesn't terminate each - ;; line with semicolon when folding a long parameter value. - (while (string-match "\\([^\t\n\r ;]\\)[\t ]*\r?\n[\t ]+" string) - (setq string (replace-match "\\1;\n " nil nil string))) + c type attribute encoded number prev-attribute vals + prev-encoded parameters value) (ietf-drums-init (mail-header-remove-whitespace (mail-header-remove-comments string))) (let ((table (copy-syntax-table ietf-drums-syntax-table))) @@ -74,63 +71,76 @@ The list will be on the form (setq type (downcase (buffer-substring (point) (progn (forward-sexp 1) (point))))) ;; Do the params - (while (not (eobp)) - (setq c (char-after)) - (unless (eq c ?\;) - (error "Invalid header: %s" string)) - (forward-char 1) - ;; If c in nil, then this is an invalid header, but - ;; since elm generates invalid headers on this form, - ;; we allow it. - (when (setq c (char-after)) - (if (and (memq c ttoken) - (not (memq c stoken))) - (setq attribute - (intern - (downcase - (buffer-substring - (point) (progn (forward-sexp 1) (point)))))) - (error "Invalid header: %s" string)) - (setq c (char-after)) - (when (eq c ?*) - (forward-char 1) - (setq c (char-after)) - (if (not (memq c ntoken)) - (setq encoded t - number nil) - (setq number - (string-to-number - (buffer-substring - (point) (progn (forward-sexp 1) (point))))) + (condition-case err + (progn + (while (not (eobp)) (setq c (char-after)) - (when (eq c ?*) - (setq encoded t) + (unless (eq c ?\;) + (error "Invalid header: %s" string)) + (forward-char 1) + ;; If c in nil, then this is an invalid header, but + ;; since elm generates invalid headers on this form, + ;; we allow it. + (when (setq c (char-after)) + (if (and (memq c ttoken) + (not (memq c stoken))) + (setq attribute + (intern + (downcase + (buffer-substring + (point) (progn (forward-sexp 1) (point)))))) + (error "Invalid header: %s" string)) + (setq c (char-after)) + (if (eq c ?*) + (progn + (forward-char 1) + (setq c (char-after)) + (if (not (memq c ntoken)) + (setq encoded t + number nil) + (setq number + (string-to-number + (buffer-substring + (point) (progn (forward-sexp 1) (point))))) + (setq c (char-after)) + (when (eq c ?*) + (setq encoded t) + (forward-char 1) + (setq c (char-after))))) + (setq number nil + encoded nil)) + ;; See if we have any previous continuations. + (when (and prev-attribute + (not (eq prev-attribute attribute))) + (setq vals + (mapconcat 'cdr (sort vals 'car-less-than-car) "")) + (push (cons prev-attribute + (if prev-encoded + (rfc2231-decode-encoded-string vals) + vals)) + parameters) + (setq prev-attribute nil + vals nil + prev-encoded nil)) + (unless (eq c ?=) + (error "Invalid header: %s" string)) (forward-char 1) - (setq c (char-after))))) - ;; See if we have any previous continuations. - (when (and prev-attribute - (not (eq prev-attribute attribute))) - (push (cons prev-attribute - (if prev-encoded - (rfc2231-decode-encoded-string prev-value) - prev-value)) - parameters) - (setq prev-attribute nil - prev-value "" - prev-encoded nil)) - (unless (eq c ?=) - (error "Invalid header: %s" string)) - (forward-char 1) - (setq c (char-after)) - (cond - ((eq c ?\") - (setq value - (buffer-substring (1+ (point)) - (progn (forward-sexp 1) (1- (point)))))) - ((and (or (memq c ttoken) - (> c ?\177)) ;; EXTENSION: Support non-ascii chars. - (not (memq c stoken))) - (setq value (buffer-substring + (setq c (char-after)) + (cond + ((eq c ?\") + (setq value (buffer-substring (1+ (point)) + (progn + (forward-sexp 1) + (1- (point))))) + (when encoded + (setq value (mapconcat (lambda (c) (format "%%%02x" c)) + value "")))) + ((and (or (memq c ttoken) + ;; EXTENSION: Support non-ascii chars. + (> c ?\177)) + (not (memq c stoken))) + (setq value + (buffer-substring (point) (progn (forward-sexp) @@ -142,59 +152,72 @@ The list will be on the form (forward-char 1) (forward-sexp)) (point))))) - (t - (error "Invalid header: %s" string))) - (if number - (setq prev-attribute attribute - prev-value (concat prev-value value) - prev-encoded encoded) - (push (cons attribute - (if encoded - (rfc2231-decode-encoded-string value) - value)) - parameters)))) + (t + (error "Invalid header: %s" string))) + (if number + (progn + (push (cons number value) vals) + (setq prev-attribute attribute + prev-encoded encoded)) + (push (cons attribute + (if encoded + (rfc2231-decode-encoded-string value) + value)) + parameters)))) - ;; Take care of any final continuations. - (when prev-attribute - (push (cons prev-attribute - (if prev-encoded - (rfc2231-decode-encoded-string prev-value) - prev-value)) - parameters)) + ;; Take care of any final continuations. + (when prev-attribute + (setq vals (mapconcat 'cdr (sort vals 'car-less-than-car) "")) + (push (cons prev-attribute + (if prev-encoded + (rfc2231-decode-encoded-string vals) + vals)) + parameters))) + (error + (setq parameters nil) + (if signal-error + (signal (car err) (cdr err)) + ;;(message "%s" (error-message-string err)) + ))) (when type `(,type ,@(nreverse parameters))))))) (defun rfc2231-decode-encoded-string (string) "Decode an RFC2231-encoded string. -These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"." - (with-temp-buffer - (let ((elems (split-string string "'"))) - ;; The encoded string may contain zero to two single-quote - ;; marks. This should give us the encoded word stripped - ;; of any preceding values. - (insert (car (last elems))) +These look like: + \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\", + \"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\", + \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\", + \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or + \"This is ***fun***\"." + (string-match "\\`\\(\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string) + (let ((coding-system (mm-charset-to-coding-system (match-string 2 string))) + ;;(language (match-string 3 string)) + (value (match-string 4 string))) + (mm-with-multibyte-buffer + (insert value) (goto-char (point-min)) (while (search-forward "%" nil t) (insert (prog1 (string-to-number (buffer-substring (point) (+ (point) 2)) 16) (delete-region (1- (point)) (+ (point) 2))))) - ;; Encode using the charset, if any. - (when (and (mm-multibyte-p) - (> (length elems) 1) - (not (equal (intern (downcase (car elems))) 'us-ascii))) - (mm-decode-coding-region (point-min) (point-max) - (intern (downcase (car elems))))) + ;; Decode using the charset, if any. + (unless (memq coding-system '(nil ascii)) + (mm-decode-coding-region (point-min) (point-max) coding-system)) (buffer-string)))) (defun rfc2231-encode-string (param value) - "Return and PARAM=VALUE string encoded according to RFC2231." + "Return and PARAM=VALUE string encoded according to RFC2231. +Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert +the result of this function." (let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token)) (tspecial (ietf-drums-token-to-list ietf-drums-tspecials)) (special (ietf-drums-token-to-list "*'%\n\t")) (ascii (ietf-drums-token-to-list ietf-drums-text-token)) (num -1) + ;; Don't make lines exceeding 76 column. (limit (- 74 (length param))) spacep encodep charsetp charset broken) (with-temp-buffer @@ -241,17 +264,17 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"." (if (not broken) (insert param "*=") (while (not (eobp)) - (insert (if (>= num 0) " " "\n ") + (insert (if (>= num 0) " " "") param "*" (format "%d" (incf num)) "*=") (forward-line 1)))) (spacep (goto-char (point-min)) - (insert "\n " param "=\"") + (insert param "=\"") (goto-char (point-max)) (insert "\"")) (t (goto-char (point-min)) - (insert "\n " param "="))) + (insert param "="))) (buffer-string)))) (provide 'rfc2231) diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el index 04ef6b60f5f..a5f46bb79f4 100644 --- a/lisp/gnus/spam-report.el +++ b/lisp/gnus/spam-report.el @@ -50,7 +50,11 @@ instead." :group 'spam-report) (defcustom spam-report-gmane-use-article-number t - "Whether the article number (faster!) or the header should be used." + "Whether the article number (faster!) or the header should be used. + +You must set this to nil if you don't read Gmane groups directly +from news.gmane.org, e.g. when using local newsserver such as +leafnode." :type 'boolean :group 'spam-report) diff --git a/lisp/gnus/webmail.el b/lisp/gnus/webmail.el index a7e53702fef..304a206a97f 100644 --- a/lisp/gnus/webmail.el +++ b/lisp/gnus/webmail.el @@ -637,7 +637,7 @@ (goto-char (point-min)) (delete-blank-lines) (setq ct (mail-fetch-field "content-type") - ctl (ignore-errors (mail-header-parse-content-type ct)) + ctl (and ct (mail-header-parse-content-type ct)) ;;cte (mail-fetch-field "content-transfer-encoding") cd (mail-fetch-field "content-disposition") description (mail-fetch-field "content-description") diff --git a/lisp/gs.el b/lisp/gs.el index 8f9414f0e5f..4594fb00bc2 100644 --- a/lisp/gs.el +++ b/lisp/gs.el @@ -1,7 +1,7 @@ ;;; gs.el --- interface to Ghostscript ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el index fcb431feba9..db00fff6c1c 100644 --- a/lisp/help-at-pt.el +++ b/lisp/help-at-pt.el @@ -1,6 +1,6 @@ ;;; help-at-pt.el --- local help through the keyboard -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Luc Teirlinck <teirllm@auburn.edu> ;; Keywords: help diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 3170bf287b5..cc78bd71210 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -1,7 +1,7 @@ ;;; help-macro.el --- makes command line help such as help-for-help ;; Copyright (C) 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lynn Slater <lrs@indetech.com> ;; Maintainer: FSF diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 2e5bbb9315b..c2e1f59e578 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -1,7 +1,7 @@ ;;; help-mode.el --- `help-mode' used by *Help* buffers ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, internal diff --git a/lisp/help.el b/lisp/help.el index 3b78194b6a3..bea404f5112 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1,7 +1,7 @@ ;;; help.el --- help commands for Emacs ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, internal @@ -556,7 +556,34 @@ or `keymap' property, return the binding of KEY in the string's keymap." string (format "%s (translated from %s)" string otherstring)))))) -(defun describe-key-briefly (key &optional insert untranslated) +(defun describe-key-briefly (&optional key insert untranslated) + "Print the name of the function KEY invokes. KEY is a string. +If INSERT (the prefix arg) is non-nil, insert the message in the buffer. +If non-nil, UNTRANSLATED is a vector of the untranslated events. +It can also be a number in which case the untranslated events from +the last key hit are used. + +If KEY is a menu item or a tool-bar button that is disabled, this command +temporarily enables it to allow getting help on disabled items and buttons." + (interactive) + (let ((enable-disabled-menus-and-buttons t) + (save-yank-menu)) + (if key + ;; Non-interactive invocation + (describe-key-briefly-internal key insert untranslated) + ;; If yank-menu is empty, populate it temporarily, so that + ;; "Select and Paste" menu can generate a complete event + (if (null (cdr yank-menu)) + (unwind-protect + (progn + (setq save-yank-menu (copy-sequence yank-menu)) + (menu-bar-update-yank-menu "(any string)" nil) + (call-interactively 'describe-key-briefly-internal)) + (progn (setq yank-menu (copy-sequence save-yank-menu)) + (fset 'yank-menu (cons 'keymap yank-menu)))) + (call-interactively 'describe-key-briefly-internal))))) + +(defun describe-key-briefly-internal (key &optional insert untranslated) "Print the name of the function KEY invokes. KEY is a string. If INSERT (the prefix arg) is non-nil, insert the message in the buffer. If non-nil UNTRANSLATED is a vector of the untranslated events. @@ -601,7 +628,38 @@ the last key hit are used." key-desc (if (symbolp defn) defn (prin1-to-string defn))))))))) -(defun describe-key (key &optional untranslated up-event) +(defun describe-key (&optional key untranslated up-event) + "Display documentation of the function invoked by KEY. +KEY can be any kind of a key sequence; it can include keyboard events, +mouse events, and/or menu events. When calling from a program, +pass KEY as a string or a vector. + +If non-nil, UNTRANSLATED is a vector of the corresponding untranslated events. +It can also be a number, in which case the untranslated events from +the last key sequence entered are used. +UP-EVENT is the up-event that was discarded by reading KEY, or nil. + +If KEY is a menu item or a tool-bar button that is disabled, this command +temporarily enables it to allow getting help on disabled items and buttons." + (interactive) + (let ((enable-disabled-menus-and-buttons t) + (save-yank-menu)) + (if key + ;; Non-interactive invocation + (describe-key-internal key untranslated up-event) + ;; If yank-menu is empty, populate it temporarily, so that + ;; "Select and Paste" menu can generate a complete event + (if (null (cdr yank-menu)) + (unwind-protect + (progn + (setq save-yank-menu (copy-sequence yank-menu)) + (menu-bar-update-yank-menu "(any string)" nil) + (call-interactively 'describe-key-internal)) + (progn (setq yank-menu (copy-sequence save-yank-menu)) + (fset 'yank-menu (cons 'keymap yank-menu)))) + (call-interactively 'describe-key-internal))))) + +(defun describe-key-internal (key &optional untranslated up-event) "Display documentation of the function invoked by KEY. KEY can be any kind of a key sequence; it can include keyboard events, mouse events, and/or menu events. When calling from a program, @@ -609,8 +667,8 @@ pass KEY as a string or a vector. If non-nil, UNTRANSLATED is a vector of the corresponding untranslated events. It can also be a number, in which case the untranslated events from -the last key sequence entered are used." - ;; UP-EVENT is the up-event that was discarded by reading KEY, or nil. +the last key sequence entered are used. +UP-EVENT is the up-event that was discarded by reading KEY, or nil." (interactive "kDescribe key (or click or menu item): \np\nU") (if (numberp untranslated) (setq untranslated (this-single-command-raw-keys))) diff --git a/lisp/hexl.el b/lisp/hexl.el index 45044da0985..bdece19f96b 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -1,7 +1,7 @@ ;;; hexl.el --- edit a file in a hex dump format using the hexl filter ;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu> ;; Maintainer: FSF diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index f028bd1f464..fcba2466d01 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -1,7 +1,7 @@ ;;; hi-lock.el --- minor mode for interactive automatic highlighting ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David M. Koppelman, koppel@ee.lsu.edu ;; Keywords: faces, minor-mode, matching, display diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 55eafb5c617..d6408412c0b 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -1,7 +1,7 @@ ;;; hilit-chg.el --- minor mode displaying buffer changes with special face ;; Copyright (C) 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Sharman <rsharman@pobox.com> ;; Keywords: faces @@ -521,7 +521,7 @@ the text properties of type `hilit-chg'." This allows you to manually remove highlighting from uninteresting changes." (interactive "r") (let ((after-change-functions nil)) - (remove-text-properties beg end '(hilit-chg nil)) + (remove-text-properties beg end '(hilit-chg nil)) (hilit-chg-fixup beg end))) (defun hilit-chg-set-face-on-change (beg end leng-before @@ -662,7 +662,7 @@ Hook variables: ;; an argument is given ((eq arg 'active) 'active) - ((eq arg 'passive) + ((eq arg 'passive) 'passive) ((> (prefix-numeric-value arg) 0) 'active) @@ -673,7 +673,6 @@ Hook variables: (if new-highlight-changes-mode ;; mode is turned on -- but may be passive (progn - (add-to-list 'desktop-locals-to-save 'highlight-changes-mode) (hilit-chg-set new-highlight-changes-mode) (or was-on ;; run highlight-changes-enable-hook once @@ -960,9 +959,9 @@ changes are made, so \\[highlight-changes-next-change] and ;; which calls this function as a hook (defvar x) ;; placate the byte-compiler (defvar y) - (setq e (current-buffer)) + (setq e (current-buffer)) (let ((n 0) extent p va vb a b) - (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info + (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info (while (< n ediff-number-of-differences) (ediff-make-fine-diffs n) (setq va (ediff-get-fine-diff-vector n 'A)) @@ -1085,7 +1084,7 @@ variable `highlight-changes-global-changes-existing-buffers' is non-nil). (progn (if (eq arg 'active) (setq highlight-changes-global-initial-state 'active) - (if (eq arg 'passive) + (if (eq arg 'passive) (setq highlight-changes-global-initial-state 'passive))) (setq global-highlight-changes t) (message "Turning ON Global Highlight Changes mode in %s state" @@ -1131,7 +1130,7 @@ from `global-highlight-changes' when turning on global Highlight Changes mode." (memq major-mode highlight-changes-global-modes))) (t (and - (not (string-match "^[ *]" (buffer-name))) + (not (string-match "^[ *]" (buffer-name))) (buffer-file-name)))) (progn (hilit-chg-set value) @@ -1146,14 +1145,15 @@ from `global-highlight-changes' when turning on global Highlight Changes mode." (defun hilit-chg-update-all-buffers (value) - (mapcar + (mapc (function (lambda (buffer) (with-current-buffer buffer (if value (hilit-chg-turn-on-maybe value) (hilit-chg-turn-off-maybe)) ))) - (buffer-list))) + (buffer-list)) + nil) ;;;; Desktop support. @@ -1165,6 +1165,8 @@ from `global-highlight-changes' when turning on global Highlight Changes mode." (add-to-list 'desktop-minor-mode-handlers '(highlight-changes-mode . hilit-chg-desktop-restore)) +(add-to-list 'desktop-locals-to-save 'highlight-changes-mode) + ;; ===================== debug ================== ;; For debug & test use: ;; diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index 1210166305b..92fb9083cd4 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -1,6 +1,7 @@ ;;; hippie-exp.el --- expand text trying various ways to find its expansion -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Anders Holst <aho@sans.kth.se> ;; Last change: 3 March 1998 diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 3e814d4770f..38fee1b56c1 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -1,7 +1,7 @@ ;;; ibuf-macs.el --- macros for ibuffer ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Colin Walters <walters@verbum.org> ;; Maintainer: John Paul Wallington <jpw@gnu.org> diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 085c111d856..f835d91ff9a 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -1,7 +1,7 @@ ;;; icomplete.el --- minibuffer completion incremental feedback ;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Ken Manheimer <klm@i.am> ;; Maintainer: Ken Manheimer <klm@i.am> diff --git a/lisp/ido.el b/lisp/ido.el index 9fe063bade6..77479de04d8 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1,7 +1,7 @@ ;;; ido.el --- interactively do things with buffers and files. ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk> @@ -2022,9 +2022,10 @@ If INITIAL is non-nil, it specifies the initial input string." (if (eq method 'insert) (progn (ido-record-command 'insert-buffer buf) - (with-no-warnings - ;; we really want to run insert-buffer here - (insert-buffer buf))) + (push-mark + (save-excursion + (insert-buffer-substring (get-buffer buf)) + (point)))) (ido-visit-buffer buf method t))) ;; buffer doesn't exist @@ -2225,9 +2226,10 @@ If INITIAL is non-nil, it specifies the initial input string." (if ido-find-literal 'insert-file-literally 'insert-file) filename) (ido-record-work-directory) - (if ido-find-literal - (insert-file-contents-literally filename) - (insert-file-contents filename))) + (insert-file-1 filename + (if ido-find-literal + #'insert-file-contents-literally + #'insert-file-contents))) (filename (ido-record-work-file filename) diff --git a/lisp/ielm.el b/lisp/ielm.el index 57354008b1b..ff0de14c3b1 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -1,6 +1,7 @@ ;;; ielm.el --- interaction mode for Emacs Lisp -;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: David Smith <maa036@lancaster.ac.uk> ;; Maintainer: FSF diff --git a/lisp/iimage.el b/lisp/iimage.el index ace21702a0f..b5633582081 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -1,6 +1,6 @@ ;;; iimage.el --- Inline image minor mode. -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: KOSEKI Yoshinori <kose@meadowy.org> ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org> diff --git a/lisp/image-file.el b/lisp/image-file.el index 94028b740f5..d90f5efc8cd 100644 --- a/lisp/image-file.el +++ b/lisp/image-file.el @@ -1,7 +1,7 @@ ;;; image-file.el --- support for visiting image files ;; ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: multimedia diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 3c0544edf89..258f852a4d6 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -1,6 +1,6 @@ ;;; image-mode.el --- support for visiting image files ;; -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Richard Stallman <rms@gnu.org> ;; Keywords: multimedia @@ -140,7 +140,8 @@ and showing the image as an image." (let* ((image (if (and (buffer-file-name) (not (buffer-modified-p))) - (create-image (buffer-file-name)) + (progn (clear-image-cache) + (create-image (buffer-file-name))) (create-image (string-make-unibyte (buffer-substring-no-properties (point-min) (point-max))) diff --git a/lisp/image.el b/lisp/image.el index 87102dd34e4..316896cabce 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -1,7 +1,7 @@ ;;; image.el --- image API ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: multimedia diff --git a/lisp/imenu.el b/lisp/imenu.el index 1a107ed8aea..774903e1092 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -1,7 +1,7 @@ ;;; imenu.el --- framework for mode-specific buffer indexes ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se> ;; Lars Lindberg <lli@sypro.cap.se> diff --git a/lisp/indent.el b/lisp/indent.el index 9e84dfe13e0..ee3eea8d901 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -1,7 +1,7 @@ ;;; indent.el --- indentation commands for Emacs ;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/info-look.el b/lisp/info-look.el index ad09df777cf..404eee3f2d0 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -2,7 +2,7 @@ ;; An older version of this was known as libc.el. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org> ;; (did not show signs of life (Nov 2001) -stef) diff --git a/lisp/info-xref.el b/lisp/info-xref.el index 18d64cf0a1c..75bc72f25b4 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -1,6 +1,6 @@ ;;; info-xref.el --- check external references in an Info document -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Ryde <user42@zip.com.au> ;; Keywords: docs diff --git a/lisp/info.el b/lisp/info.el index dbcfaed31c4..fa1e3060c10 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1,7 +1,7 @@ ;;; info.el --- info package for Emacs ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help diff --git a/lisp/informat.el b/lisp/informat.el index c9198d93191..96dc0180418 100644 --- a/lisp/informat.el +++ b/lisp/informat.el @@ -1,6 +1,7 @@ ;;; informat.el --- info support functions package for Emacs -;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help diff --git a/lisp/isearch.el b/lisp/isearch.el index 8a3f068f839..ace20881737 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1,7 +1,7 @@ ;;; isearch.el --- incremental search minor mode ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> ;; Maintainer: FSF diff --git a/lisp/isearchb.el b/lisp/isearchb.el index 0e7a20a57ec..56797bd0fb1 100644 --- a/lisp/isearchb.el +++ b/lisp/isearchb.el @@ -1,6 +1,6 @@ ;;; isearchb --- a marriage between iswitchb and isearch -;; Copyright (C) 2004, 2005 John Wiegley +;; Copyright (C) 2004, 2005, 2006 John Wiegley ;; Author: John Wiegley <johnw@gnu.org> ;; Created: 16 Apr 2004 diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index 3fd03cf5d0a..d7d82ae5551 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -1,7 +1,7 @@ ;;; iswitchb.el --- switch between buffers using substrings ;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@gnu.org> ;; Maintainer: Stephen Eglen <stephen@gnu.org> diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 16db1e25a9a..09870310584 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -1,7 +1,7 @@ ;;; jit-lock.el --- just-in-time fontification ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Keywords: faces files diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index d5305211f50..3de3b7daccc 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -1,7 +1,7 @@ ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: jka@ece.cmu.edu (Jay K. Adams) ;; Maintainer: FSF diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index c15cfbdea30..389944fa3e2 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -1,7 +1,7 @@ ;;; jka-compr.el --- reading/writing/loading compressed files ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: jka@ece.cmu.edu (Jay K. Adams) ;; Maintainer: FSF diff --git a/lisp/kermit.el b/lisp/kermit.el index 73cac8f3bc8..e1bec988ccd 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el @@ -1,6 +1,7 @@ ;;; kermit.el --- additions to shell mode for use with kermit -;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Norden <jeff@colgate.csnet> ;; Maintainer: FSF diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 6bb1ab6f58d..4566d4c32c3 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1,6 +1,6 @@ ;;; kmacro.el --- enhanced keyboard macros -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience diff --git a/lisp/ledit.el b/lisp/ledit.el index bf17f3cad4f..6aafdcfea4b 100644 --- a/lisp/ledit.el +++ b/lisp/ledit.el @@ -1,6 +1,7 @@ ;;; ledit.el --- Emacs side of ledit interface -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages diff --git a/lisp/loadhist.el b/lisp/loadhist.el index f23715f3825..81dc8ebe3df 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -1,7 +1,7 @@ ;;; loadhist.el --- lisp functions for working with feature groups ;; Copyright (C) 1995, 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: FSF diff --git a/lisp/loadup.el b/lisp/loadup.el index 5e1f455ab05..44b048eee67 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,7 +1,7 @@ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs ;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/locate.el b/lisp/locate.el index 9676c84f80c..bca53a32152 100644 --- a/lisp/locate.el +++ b/lisp/locate.el @@ -1,7 +1,7 @@ ;;; locate.el --- interface to the locate command ;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Keywords: unix files diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 4c66f7f280b..0c7a655a237 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el @@ -1,7 +1,7 @@ ;;; log-edit.el --- Major mode for editing CVS commit messages ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs cvs commit log diff --git a/lisp/log-view.el b/lisp/log-view.el index e7a58dad8b7..8a6f88650d2 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -1,7 +1,7 @@ ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: rcs sccs cvs log version-control diff --git a/lisp/longlines.el b/lisp/longlines.el index dadd8a5d58f..b11d4e6faba 100644 --- a/lisp/longlines.el +++ b/lisp/longlines.el @@ -1,6 +1,6 @@ ;;; longlines.el --- automatically wrap long lines -;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> ;; Alex Schroeder <alex@gnu.org> diff --git a/lisp/lpr.el b/lisp/lpr.el index c44971e4f30..14d1049f074 100644 --- a/lisp/lpr.el +++ b/lisp/lpr.el @@ -1,7 +1,7 @@ ;;; lpr.el --- print Emacs buffer on line printer ;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: unix diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 0da64128118..3a18442ef13 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -1,7 +1,7 @@ ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp ;; Copyright (C) 1992, 1994, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk> diff --git a/lisp/macros.el b/lisp/macros.el index 7075300ba18..55916ba80d6 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -1,7 +1,7 @@ ;;; macros.el --- non-primitive commands for keyboard macros ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el index 01c52f82046..41bad17d70e 100644 --- a/lisp/mail/blessmail.el +++ b/lisp/mail/blessmail.el @@ -1,6 +1,7 @@ ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*- -;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 47b7f1c3a1b..c58411c1e56 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -1,7 +1,7 @@ ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list ;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 58b6be4f5fc..e831b89ef84 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -1,7 +1,7 @@ ;;; footnote.el --- footnote support for message mode -*- coding: iso-latin-1;-*- ;; Copyright (C) 1997, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L Baur <steve@xemacs.org> ;; Keywords: mail, news diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index 0f5aa1e18f7..d891a031e59 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1,7 +1,7 @@ ;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*- ;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Joe Wells <jbw@cs.bu.edu> ;; Maintainer: FSF diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el index 3010e85d31b..a2d7b0aab0f 100644 --- a/lisp/mail/mail-hist.el +++ b/lisp/mail/mail-hist.el @@ -1,6 +1,7 @@ ;;; mail-hist.el --- headers and message body history for outgoing mail -;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Created: March, 1994 diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el index e76da171fbc..a6b774fc0c9 100644 --- a/lisp/mail/mail-utils.el +++ b/lisp/mail/mail-utils.el @@ -1,7 +1,7 @@ ;;; mail-utils.el --- utility functions used both by rmail and rnews ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail, news diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index 587b7d0187e..eab55bdef25 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -1,7 +1,7 @@ ;;; mailabbrev.el --- abbrev-expansion of mail aliases ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com>, now <jwz@jwz.org> ;; Maintainer: FSF diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 48f3494a0e6..7d60ed27e5c 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -1,7 +1,7 @@ ;;; mailalias.el --- expand and complete mailing address aliases ;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el index 45afbd782d9..408527be8eb 100644 --- a/lisp/mail/mailclient.el +++ b/lisp/mail/mailclient.el @@ -1,6 +1,6 @@ ;;; mailclient.el --- mail sending via system's mail client. -*- byte-compile-dynamic: t -*- -;; Copyright (C) 2005 Free Software Foundation +;; Copyright (C) 2005, 2006 Free Software Foundation ;; Author: David Reitter <david.reitter@gmail.com> ;; Keywords: mail diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el index 1e9a24da341..377144f7d68 100644 --- a/lisp/mail/mailheader.el +++ b/lisp/mail/mailheader.el @@ -1,6 +1,7 @@ ;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> ;; Keywords: tools, mail, news diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el index 6d13bda9823..2388ab87971 100644 --- a/lisp/mail/metamail.el +++ b/lisp/mail/metamail.el @@ -1,7 +1,7 @@ ;;; metamail.el --- Metamail interface for GNU Emacs ;; Copyright (C) 1993, 1996, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> ;; Keywords: mail, news, mime, multimedia diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el index 7a01a5e5361..a2f460d13a0 100644 --- a/lisp/mail/mspools.el +++ b/lisp/mail/mspools.el @@ -1,6 +1,7 @@ ;;; mspools.el --- show mail spools waiting to be read -;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@gnu.org> ;; Maintainer: Stephen Eglen <stephen@gnu.org> diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index 058d0a83f23..fa6c1c5e307 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el @@ -1,7 +1,7 @@ ;;; reporter.el --- customizable bug reporting of lisp programs ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el index a21deb394cf..ef20ac0398d 100644 --- a/lisp/mail/rfc2368.el +++ b/lisp/mail/rfc2368.el @@ -4,7 +4,7 @@ ;; Keywords: mail ;; Copyright (C) 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el index 9e57226d7c2..97a47f56f99 100644 --- a/lisp/mail/rfc822.el +++ b/lisp/mail/rfc822.el @@ -1,7 +1,7 @@ ;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike ;; Copyright (C) 1986, 1987, 1990, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> ;; Maintainer: FSF diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 525bcd4096b..933e1f6c8a2 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -1,6 +1,6 @@ ;;; rmail-spam-filter.el --- spam filter for rmail, the emacs mail reader. -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Keywords: email, spam, filter, rmail ;; Author: Eli Tziperman <eli AT deas.harvard.edu> diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 4fe936d9d2d..13856096e28 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1,7 +1,7 @@ ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs ;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el index 75de9810a37..fe288bb2904 100644 --- a/lisp/mail/rmailedit.el +++ b/lisp/mail/rmailedit.el @@ -1,7 +1,7 @@ ;;; rmailedit.el --- "RMAIL edit mode" Edit the current message ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el index 843c6fc80a3..e4583574ede 100644 --- a/lisp/mail/rmailkwd.el +++ b/lisp/mail/rmailkwd.el @@ -1,7 +1,7 @@ ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs ;; Copyright (C) 1985, 1988, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el index 26d61b56837..3502c0a7c57 100644 --- a/lisp/mail/rmailmsc.el +++ b/lisp/mail/rmailmsc.el @@ -1,6 +1,7 @@ ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index bd37a41aef8..e09e1ebe1c8 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -1,7 +1,7 @@ ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file ;; Copyright (C) 1985, 1987, 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el index 8bb8ab69278..c3f7362b18a 100644 --- a/lisp/mail/rmailsort.el +++ b/lisp/mail/rmailsort.el @@ -1,7 +1,7 @@ ;;; rmailsort.el --- Rmail: sort messages ;; Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> ;; Maintainer: FSF diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 47602885f92..539a1769386 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -1,7 +1,7 @@ ;;; rmailsum.el --- make summary buffers for the mail reader ;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index a03209e5dc9..ee512b3af31 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1,7 +1,7 @@ ;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*- ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 6cbd3e3b8f8..ff38cd25ff8 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -1,7 +1,7 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> ;; Maintainer: Simon Josefsson <simon@josefsson.org> diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index b4ded1335b8..cdb917701f7 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -1,7 +1,7 @@ ;;; supercite.el --- minor mode for citing mail and news replies ;; Copyright (C) 1993, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index 07c09765971..4d48f467b59 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -1,7 +1,7 @@ ;;; uce.el --- facilitate reply to unsolicited commercial email ;; Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: stanislav shalunov <shalunov@mccme.ru> ;; Created: 10 Dec 1996 diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el index 5588ecf9108..210a1d254f3 100644 --- a/lisp/mail/undigest.el +++ b/lisp/mail/undigest.el @@ -1,7 +1,7 @@ ;;; undigest.el --- digest-cracking support for the RMAIL mail reader ;; Copyright (C) 1985, 1986, 1994, 1996, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el index 76764d21ed7..cf12472fb0e 100644 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@ -1,6 +1,7 @@ ;;; unrmail.el --- convert Rmail files to mailbox files -;;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el index b53b32be71a..3126f813000 100644 --- a/lisp/mail/vms-pmail.el +++ b/lisp/mail/vms-pmail.el @@ -1,6 +1,7 @@ ;;; vms-pmail.el --- use Emacs as the editor within VMS mail -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Roland B Roberts <roberts@panix.com> ;; Maintainer: FSF diff --git a/lisp/makesum.el b/lisp/makesum.el index 41ecb630f96..3e43d75191b 100644 --- a/lisp/makesum.el +++ b/lisp/makesum.el @@ -1,6 +1,7 @@ ;;; makesum.el --- generate key binding summary for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help diff --git a/lisp/man.el b/lisp/man.el index acd3decdc61..706961b0450 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1,7 +1,7 @@ ;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*- ;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> ;; Maintainer: FSF diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index e005fc09df6..0ec4339f822 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1,7 +1,7 @@ ;;; menu-bar.el --- define a default menu bar ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: RMS ;; Maintainer: FSF @@ -1502,6 +1502,8 @@ for the definition of the menu frame." (put 'menu-bar-select-yank 'apropos-inhibit t) (defun menu-bar-select-yank () + "Insert the stretch of previously-killed text selected from menu. +The menu shows all the killed text sequences stored in `kill-ring'." (interactive "*") (push-mark (point)) (insert last-command-event)) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 47c7808f192..349bae9f072 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,22 @@ +2006-02-10 Bill Wohler <wohler@newt.com> + + * mh-search.el (mh-search): Wrap code in (block mh-search ...) + rather than use defun*. XEmacs cannot create a proper autoload for + a defun*. + +2006-02-09 Bill Wohler <wohler@newt.com> + + * mh-utils.el (mh-folder-list): Don't replace "/*$" with "/" since + that causes an infinite loop on XEmacs. + + * mh-compat.el(mh-replace-regexp-in-string): Add missing regexp + argument. + +2006-02-08 Peter S Galbraith <psg@debian.org> + + * mh-e.el (mh-invisible-header-fields-internal): Added entries + "X-BrightmailFiltered:", "X-Brightmail-Tracker:" and "X-Hashcash" + 2006-02-04 Bill Wohler <wohler@newt.com> * mh-e.el (mh-inc-spool-list): Update example for Emacs 22 which diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 1d7f1c90e79..090ee51c5fc 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -144,7 +144,7 @@ The argument STRING is ignored." (match-beginning num) (match-end num))) (mh-defun-compat mh-replace-regexp-in-string replace-regexp-in-string - (rep string &optional fixedcase literal subexp start) + (regexp rep string &optional fixedcase literal subexp start) "Replace REGEXP with REP everywhere in STRING and return result. This function is used by XEmacs that lacks `replace-regexp-in-string'. The function `replace-in-string' is used instead. diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 8012eab5c8a..ab0143c0c85 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -2306,6 +2306,8 @@ of citations entirely, choose \"None\"." "X-Authentication-Warning:" ; sendmail "X-Beenthere:" ; Mailman mailing list manager "X-Bogosity:" ; bogofilter + "X-BrightmailFiltered:" ; Brightmail + "X-Brightmail-Tracker:" ; Brightmail "X-Bugzilla-*" ; Bugzilla "X-Complaints-To:" "X-ContentStamp:" ; NetZero @@ -2333,6 +2335,7 @@ of citations entirely, choose \"None\"." "X-Habeas-SWE-7:" ; Spam "X-Habeas-SWE-8:" ; Spam "X-Habeas-SWE-9:" ; Spam + "X-Hashcash:" ; hashcash "X-Info:" ; NTMail "X-Juno-" ; Juno "X-List-Host:" ; Unknown mailing list managers diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index f1292dd8e1e..9980b6a9b68 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -81,8 +81,8 @@ message number, and optionally the match.") ;;; MH-Folder Commands ;;;###mh-autoload -(defun* mh-search (folder search-regexp - &optional redo-search-flag window-config) +(defun mh-search (folder search-regexp + &optional redo-search-flag window-config) "Search your MH mail. This command helps you find messages in your entire corpus of @@ -230,96 +230,98 @@ folder containing the index search results." mh-search-regexp-builder) (current-window-configuration) nil))) - ;; Redoing a sequence search? - (when (and redo-search-flag mh-index-data mh-index-sequence-search-flag - (not mh-flists-called-flag)) - (let ((mh-flists-called-flag t)) - (apply #'mh-index-sequenced-messages mh-index-previous-search)) - (return-from mh-search)) - ;; We have fancy query parsing. - (when (symbolp search-regexp) - (mh-search-folder folder window-config) - (return-from mh-search)) - ;; Begin search proper. - (mh-checksum-choose) - (let ((result-count 0) - (old-window-config (or window-config mh-previous-window-config)) - (previous-search mh-index-previous-search) - (index-folder (format "%s/%s" mh-index-folder - (mh-index-generate-pretty-name search-regexp)))) - ;; Create a new folder for the search results or recreate the old one... - (if (and redo-search-flag mh-index-previous-search) - (let ((buffer-name (buffer-name (current-buffer)))) - (mh-process-or-undo-commands buffer-name) - (save-excursion (mh-exec-cmd-quiet nil "rmf" buffer-name)) - (mh-exec-cmd-quiet nil "folder" "-create" "-fast" buffer-name) - (setq index-folder buffer-name)) - (setq index-folder (mh-index-new-folder index-folder search-regexp))) - - (let ((folder-path (format "%s%s" mh-user-path (substring folder 1))) - (folder-results-map (make-hash-table :test #'equal)) - (origin-map (make-hash-table :test #'equal))) - ;; Run search program... - (message "Executing %s... " mh-searcher) - (funcall mh-search-function folder-path search-regexp) - - ;; Parse searcher output. - (message "Processing %s output... " mh-searcher) - (goto-char (point-min)) - (loop for next-result = (funcall mh-search-next-result-function) - while next-result - do (unless (eq next-result 'error) - (unless (gethash (car next-result) folder-results-map) - (setf (gethash (car next-result) folder-results-map) - (make-hash-table :test #'equal))) - (setf (gethash (cadr next-result) - (gethash (car next-result) folder-results-map)) - t))) - - ;; Copy the search results over. - (maphash #'(lambda (folder msgs) - (let ((cur (car (mh-translate-range folder "cur"))) - (msgs (sort (loop for msg being the hash-keys of msgs - collect msg) - #'<))) - (mh-exec-cmd "refile" msgs "-src" folder - "-link" index-folder) - ;; Restore cur to old value, that refile changed - (when cur - (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero" - "-sequence" "cur" (format "%s" cur))) - (loop for msg in msgs - do (incf result-count) - (setf (gethash result-count origin-map) - (cons folder msg))))) - folder-results-map) - - ;; Vist the results folder. - (mh-visit-folder index-folder () (list folder-results-map origin-map)) + (block mh-search + ;; Redoing a sequence search? + (when (and redo-search-flag mh-index-data mh-index-sequence-search-flag + (not mh-flists-called-flag)) + (let ((mh-flists-called-flag t)) + (apply #'mh-index-sequenced-messages mh-index-previous-search)) + (return-from mh-search)) + ;; We have fancy query parsing. + (when (symbolp search-regexp) + (mh-search-folder folder window-config) + (return-from mh-search)) + ;; Begin search proper. + (mh-checksum-choose) + (let ((result-count 0) + (old-window-config (or window-config mh-previous-window-config)) + (previous-search mh-index-previous-search) + (index-folder (format "%s/%s" mh-index-folder + (mh-index-generate-pretty-name search-regexp)))) + ;; Create a new folder for the search results or recreate the old one... + (if (and redo-search-flag mh-index-previous-search) + (let ((buffer-name (buffer-name (current-buffer)))) + (mh-process-or-undo-commands buffer-name) + (save-excursion (mh-exec-cmd-quiet nil "rmf" buffer-name)) + (mh-exec-cmd-quiet nil "folder" "-create" "-fast" buffer-name) + (setq index-folder buffer-name)) + (setq index-folder (mh-index-new-folder index-folder search-regexp))) + + (let ((folder-path (format "%s%s" mh-user-path (substring folder 1))) + (folder-results-map (make-hash-table :test #'equal)) + (origin-map (make-hash-table :test #'equal))) + ;; Run search program... + (message "Executing %s... " mh-searcher) + (funcall mh-search-function folder-path search-regexp) + + ;; Parse searcher output. + (message "Processing %s output... " mh-searcher) + (goto-char (point-min)) + (loop for next-result = (funcall mh-search-next-result-function) + while next-result + do (unless (eq next-result 'error) + (unless (gethash (car next-result) folder-results-map) + (setf (gethash (car next-result) folder-results-map) + (make-hash-table :test #'equal))) + (setf (gethash (cadr next-result) + (gethash (car next-result) folder-results-map)) + t))) + + ;; Copy the search results over. + (maphash #'(lambda (folder msgs) + (let ((cur (car (mh-translate-range folder "cur"))) + (msgs (sort (loop for msg being the hash-keys of msgs + collect msg) + #'<))) + (mh-exec-cmd "refile" msgs "-src" folder + "-link" index-folder) + ;; Restore cur to old value, that refile changed + (when cur + (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero" + "-sequence" + "cur" (format "%s" cur))) + (loop for msg in msgs + do (incf result-count) + (setf (gethash result-count origin-map) + (cons folder msg))))) + folder-results-map) + + ;; Vist the results folder. + (mh-visit-folder index-folder () (list folder-results-map origin-map)) - (goto-char (point-min)) - (forward-line) - (mh-update-sequences) - (mh-recenter nil) - - ;; Update the speedbar, if needed. - (when (mh-speed-flists-active-p) - (mh-speed-flists t mh-current-folder)) - - ;; Maintain history. - (when (or (and redo-search-flag previous-search) window-config) - (setq mh-previous-window-config old-window-config)) - (setq mh-index-previous-search (list folder mh-searcher search-regexp)) - - ;; Write out data to disk. - (unless mh-flists-called-flag (mh-index-write-data)) - - (message "%s found %s matches in %s folders" - (upcase-initials (symbol-name mh-searcher)) - (loop for msg-hash being hash-values of mh-index-data - sum (hash-table-count msg-hash)) - (loop for msg-hash being hash-values of mh-index-data - count (> (hash-table-count msg-hash) 0)))))) + (goto-char (point-min)) + (forward-line) + (mh-update-sequences) + (mh-recenter nil) + + ;; Update the speedbar, if needed. + (when (mh-speed-flists-active-p) + (mh-speed-flists t mh-current-folder)) + + ;; Maintain history. + (when (or (and redo-search-flag previous-search) window-config) + (setq mh-previous-window-config old-window-config)) + (setq mh-index-previous-search (list folder mh-searcher search-regexp)) + + ;; Write out data to disk. + (unless mh-flists-called-flag (mh-index-write-data)) + + (message "%s found %s matches in %s folders" + (upcase-initials (symbol-name mh-searcher)) + (loop for msg-hash being hash-values of mh-index-data + sum (hash-table-count msg-hash)) + (loop for msg-hash being hash-values of mh-index-data + count (> (hash-table-count msg-hash) 0))))))) ;; Shush compiler. (eval-when-compile (mh-do-in-xemacs (defvar pick-folder))) diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 42f11376262..dc86d19ae77 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -516,13 +516,15 @@ value of `mh-recursive-folders-flag'. If this flag is nil, and the sub-folders have not been explicitly viewed, then they will not be returned." (let ((folder-list)) - ;; Normalize folder. Strip leading +. Add trailing slash. If no - ;; folder is specified, ensure it is nil to ensure we get the - ;; top-level folders; otherwise mh-sub-folders returns all the - ;; files in / if given an empty string or +. + ;; Normalize folder. Strip leading +. Add trailing slash (done in + ;; two steps to avoid infinite loops when replacing "/*$" with "/" + ;; in XEmacs). If no folder is specified, ensure it is nil to + ;; ensure we get the top-level folders; otherwise mh-sub-folders + ;; returns all the files in / if given an empty string or +. (when folder (setq folder (mh-replace-regexp-in-string "^\+" "" folder)) - (setq folder (mh-replace-regexp-in-string "/*$" "/" folder)) + (setq folder (mh-replace-regexp-in-string "/+$" "" folder)) + (setq folder (concat folder "/")) (if (equal folder "") (setq folder nil))) (loop for f in (mh-sub-folders folder) do diff --git a/lisp/midnight.el b/lisp/midnight.el index aa93c1b5bab..1d5974f686f 100644 --- a/lisp/midnight.el +++ b/lisp/midnight.el @@ -1,6 +1,7 @@ ;;; midnight.el --- run something every midnight, e.g., kill old buffers -;;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Sam Steingold <sds@usa.net> ;; Maintainer: Sam Steingold <sds@usa.net> diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 0657baedd5f..d1c407c6eca 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -1,7 +1,7 @@ ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable ;; ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience diff --git a/lisp/misc.el b/lisp/misc.el index f906fb0db7b..e4c54092a49 100644 --- a/lisp/misc.el +++ b/lisp/misc.el @@ -1,6 +1,7 @@ ;;; misc.el --- some nonstandard basic editing commands for Emacs -;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index f5034a1dac1..445b64ecb26 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el @@ -1,6 +1,7 @@ ;;; mouse-copy.el --- one-click text copy and move -;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@ISI.EDU> ;; Keywords: mouse diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index 11bacd6b8a2..446ef27a030 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -1,7 +1,7 @@ ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@ISI.EDU> ;; Keywords: mouse diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index ccd469200be..a64dabaec81 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -1,7 +1,7 @@ ;;; mouse-sel.el --- multi-click selection support for Emacs 19 ;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Mike Williams <mdub@bigfoot.com> ;; Keywords: mouse diff --git a/lisp/mouse.el b/lisp/mouse.el index e772858b3c7..9922b0f9aed 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1,7 +1,7 @@ ;;; mouse.el --- window system-independent mouse support ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: hardware, mouse @@ -1036,13 +1036,13 @@ should only be used by mouse-drag-region." (if (> mouse-1-click-follows-link 0) (<= (- t1 t0) mouse-1-click-follows-link) (< (- t0 t1) mouse-1-click-follows-link)))))))) - ;; Reselect previous selected window, + ;; If we rebind to mouse-2, reselect previous selected window, ;; so that the mouse-2 event runs in the same ;; situation as if user had clicked it directly. ;; Fixes the bug reported by juri@jurta.org on 2005-12-27. - (select-window original-window) (if (or (vectorp on-link) (stringp on-link)) (setq event (aref on-link 0)) + (select-window original-window) (setcar event 'mouse-2) ;; If this mouse click has never been done by ;; the user, it doesn't have the necessary diff --git a/lisp/msb.el b/lisp/msb.el index 94a1599371f..95cbfc85df4 100644 --- a/lisp/msb.el +++ b/lisp/msb.el @@ -1,7 +1,7 @@ ;;; msb.el --- customizable buffer-selection with multiple menus ;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Lindberg <lars.lindberg@home.se> ;; Maintainer: FSF diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 391ce3a5e04..aca959e8577 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -1,7 +1,7 @@ ;;; mwheel.el --- Wheel mouse support ;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: mouse @@ -77,7 +77,7 @@ 'wheel-down (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") mouse-wheel-up-button))) - "Event used for scrolling down." + "Event used for scrolling up." :group 'mouse :type 'symbol :set 'mouse-wheel-change-button) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 758346e3647..c77dbbd64b3 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1,7 +1,7 @@ ;;; ange-ftp.el --- transparent FTP support for GNU Emacs ;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Andy Norman (ange@hplb.hpl.hp.com) ;; Maintainer: FSF diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 8d57bb30c11..101b9cf210d 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -1,7 +1,7 @@ ;;; browse-url.el --- pass a URL to a WWW browser ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Denis Howe <dbh@doc.ic.ac.uk> ;; Maintainer: FSF diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index 668b9edfcda..c6506fddb93 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -1,7 +1,7 @@ ;;; eudc-bob.el --- Binary Objects Support for EUDC ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 214481ce7fa..c5f31c6b2f9 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -1,7 +1,7 @@ ;;; eudc-export.el --- functions to export EUDC query results ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index a8e7f6e328f..1e43e88dff4 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -1,7 +1,7 @@ ;;; eudc-hotlist.el --- hotlist management for EUDC ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index ecff0564192..987b71f3613 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -1,7 +1,7 @@ ;;; eudc-vars.el --- Emacs Unified Directory Client ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 6c877df6ea4..2d5d8f6978d 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -1,7 +1,7 @@ ;;; eudc.el --- Emacs Unified Directory Client ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 8081cb1aacd..0fee937758e 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -1,7 +1,7 @@ ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 93f7c24d077..9b6a77dd2e1 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -1,7 +1,7 @@ ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el index 4d4fb423ff3..a734b90ecaf 100644 --- a/lisp/net/eudcb-mab.el +++ b/lisp/net/eudcb-mab.el @@ -1,6 +1,6 @@ ;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> ;; Keywords: comm diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el index 30a8efbbae3..9edfc4870e5 100644 --- a/lisp/net/eudcb-ph.el +++ b/lisp/net/eudcb-ph.el @@ -1,7 +1,7 @@ ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index e1ae498923b..89695b61b36 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el @@ -1,7 +1,7 @@ ;;; goto-addr.el --- click to browse URL or to send to e-mail address ;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric Ding <ericding@alum.mit.edu> ;; Maintainer: FSF diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index f8e99abd182..180e14fcc20 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -1,7 +1,7 @@ ;;; ldap.el --- client interface to LDAP for Emacs ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: FSF diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 043c18fc0df..f6a8c2c2157 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -1,7 +1,7 @@ ;;; net-utils.el --- network functions ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Mar 16 1997 diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 228e02bf3a6..b386fde7994 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -1,6 +1,6 @@ ;;; netrc.el --- .netrc parsing functionality ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index c07faa4ca63..f812cf01c65 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -1,6 +1,6 @@ ;;; newsticker.el --- A Newsticker for Emacs. -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 81a2e8a09a5..48c3cf3cbaf 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -1,7 +1,7 @@ ;;; quickurl.el --- insert an URL based on text at point in buffer ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Pearson <davep@davep.org> ;; Maintainer: Dave Pearson <davep@davep.org> diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 2e512ae4e19..c0bf8be3cf8 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1,6 +1,6 @@ ;;; rcirc.el --- default, simple IRC client. -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. ;; Author: Ryan Yeske ;; URL: http://www.nongnu.org/rcirc @@ -79,7 +79,7 @@ :type 'string :group 'rcirc) -(defcustom rcirc-startup-channels-alist nil +(defcustom rcirc-startup-channels-alist '(("^irc.freenode.net$" "#emacs")) "Alist of channels to join at startup. Each element looks like (SERVER-REGEXP . CHANNEL-LIST)." :type '(alist :key-type string :value-type (repeat string)) @@ -111,11 +111,6 @@ underneath each nick." "If non-nil, ignore activity in this buffer.") (make-variable-buffer-local 'rcirc-ignore-buffer-activity-flag) -(defcustom rcirc-ignore-all-activity-flag nil - "*Non-nil means do not indicate any activity in the modeline." - :type 'boolean - :group 'rcirc) - (defcustom rcirc-time-format "%H:%M " "*Describes how timestamps are printed. Used as the first arg to `format-time-string'." @@ -140,29 +135,42 @@ number. If zero or nil, no truncating is done." (integer :tag "Number of lines")) :group 'rcirc) -(defcustom rcirc-authinfo-file-name - "~/.rcirc-authinfo" - "File containing rcirc authentication passwords. -The file consists of a single list, with each element itself a -list with a SERVER-REGEXP string, a NICK-REGEXP string, a METHOD -and the remaining method specific ARGUMENTS. The valid METHOD -symbols are `nickserv', `chanserv' and `bitlbee'. +(defcustom rcirc-authinfo nil + "List of authentication passwords. +Each element of the list is a list with a SERVER-REGEXP string +and a method symbol followed by method specific arguments. + +The valid METHOD symbols are `nickserv', `chanserv' and +`bitlbee'. The required ARGUMENTS for each METHOD symbol are: - `nickserv': PASSWORD - `chanserv': CHANNEL PASSWORD - `bitlbee': PASSWORD + `nickserv': NICK PASSWORD + `chanserv': NICK CHANNEL PASSWORD + `bitlbee': NICK PASSWORD Example: - ((\"freenode\" \"bob\" nickserv \"p455w0rd\") - (\"freenode\" \"bob\" chanserv \"#bobland\" \"passwd99\") - (\"bitlbee\" \"robert\" bitlbee \"sekrit\"))" - :type 'string + ((\"freenode\" nickserv \"bob\" \"p455w0rd\") + (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\") + (\"bitlbee\" bitlbee \"robert\" \"sekrit\"))" + :type '(alist :key-type (string :tag "Server") + :value-type (choice (list :tag "NickServ" + (const nickserv) + (string :tag "Nick") + (string :tag "Password")) + (list :tag "ChanServ" + (const chanserv) + (string :tag "Nick") + (string :tag "Channel") + (string :tag "Password")) + (list :tag "BitlBee" + (const bitlbee) + (string :tag "Nick") + (string :tag "Password")))) :group 'rcirc) -(defcustom rcirc-auto-authenticate-flag (file-readable-p rcirc-authinfo-file-name) +(defcustom rcirc-auto-authenticate-flag t "*Non-nil means automatically send authentication string to server. -See also `rcirc-authinfo-file-name'." +See also `rcirc-authinfo'." :type 'boolean :group 'rcirc) @@ -187,6 +195,12 @@ Use /ignore to list them, use /ignore NICK to add or remove a nick." :type '(repeat string) :group 'rcirc) +(defcustom rcirc-nick-abbrevs nil + "List of short replacements for printing nicks." + :type '(alist :key-type (string :tag "Nick") + :value-type (string :tag "Abbrev")) + :group 'rcirc) + (defvar rcirc-ignore-list-automatic () "List of ignored nicks added to `rcirc-ignore-list' because of renaming. When an ignored person renames, their nick is added to both lists. @@ -199,6 +213,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." :type 'hook :group 'rcirc) +(defcustom rcirc-always-use-server-buffer-flag nil + "Non-nil means messages without a channel target will go to the server buffer." + :type 'boolean + :group 'rcirc) + (defvar rcirc-prompt-start-marker nil) (defvar rcirc-prompt-end-marker nil) @@ -238,37 +257,35 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." (defvar rcirc-startup-channels nil) ;;;###autoload -(defun rcirc (&optional server port nick channels) +(defun rcirc (arg) "Connect to IRC. - -If any of the the optional SERVER, PORT, NICK or CHANNELS are not -supplied, they are taken from the variables `rcirc-server', -`rcirc-port', `rcirc-nick', and `rcirc-startup-channels-alist', -respectively." - (interactive (list (read-string "IRC Server: " rcirc-server) - (read-string "IRC Port: " (number-to-string rcirc-port)) - (read-string "IRC Nick: " rcirc-nick))) - (or server (setq server rcirc-server)) - (or port (setq port rcirc-port)) - (or nick (setq nick rcirc-nick)) - (or channels - (setq channels - (if (interactive-p) - (split-string - (read-string "Channels: " - (mapconcat 'identity - (rcirc-startup-channels server) - " ")) - "[, ]+" t) - (rcirc-startup-channels server)))) - (or global-mode-string (setq global-mode-string '(""))) - (and (not (memq 'rcirc-activity-string global-mode-string)) - (setq global-mode-string - (append global-mode-string '(rcirc-activity-string)))) - (add-hook 'window-configuration-change-hook - 'rcirc-window-configuration-change) - (rcirc-connect server port nick rcirc-user-name rcirc-user-full-name - channels)) +If ARG is non-nil, prompt for a server to connect to." + (interactive "P") + (if arg + (let* ((server (read-string "IRC Server: " rcirc-server)) + (port (read-string "IRC Port: " (number-to-string rcirc-port))) + (nick (read-string "IRC Nick: " rcirc-nick)) + (channels (split-string + (read-string "IRC Channels: " + (mapconcat 'identity + (rcirc-startup-channels server) + " ")) + "[, ]+" t))) + (rcirc-connect server port nick rcirc-user-name rcirc-user-full-name + channels)) + ;; make new connection using defaults unless already connected to + ;; the default rcirc-server + (let ((default-server (default-value 'rcirc-server)) + connected) + (dolist (p (rcirc-process-list)) + (when (string= default-server (process-name p)) + (setq connected p))) + (if (not connected) + (rcirc-connect rcirc-server rcirc-port rcirc-nick + rcirc-user-name rcirc-user-full-name + (rcirc-startup-channels rcirc-server)) + (switch-to-buffer (process-buffer connected)) + (message "Connected to %s" rcirc-server))))) ;;;###autoload (defalias 'irc 'rcirc) @@ -279,11 +296,9 @@ respectively." (defvar rcirc-keepalive-timer nil) (defvar rcirc-last-server-message-time nil) (defun rcirc-connect (server port nick user-name full-name startup-channels) - "Return a connection to SERVER on PORT. + (add-hook 'window-configuration-change-hook + 'rcirc-window-configuration-change) -User will identify using the values of NICK, USER-NAME and -FULL-NAME. The variable list of channel names in -STARTUP-CHANNELS will automatically be joined on startup." (save-excursion (message "Connecting to %s..." server) (let* ((inhibit-eol-conversion) @@ -377,13 +392,13 @@ Functions are called with PROCESS and SENTINEL arguments.") (rcirc-debug process (format "SENTINEL: %S %S\n" process sentinel)) (with-rcirc-process-buffer process (dolist (buffer (cons nil (mapcar 'cdr rcirc-buffer-alist))) - (rcirc-print process "rcirc.el" "ERROR" buffer - (format "%s: %s (%S)" - (process-name process) - sentinel - (process-status process)) t) - ;; remove the prompt from buffers (with-current-buffer (or buffer (current-buffer)) + (rcirc-print process "rcirc.el" "ERROR" rcirc-target + (format "%s: %s (%S)" + (process-name process) + sentinel + (process-status process)) t) + ;; remove the prompt from buffers (let ((inhibit-read-only t)) (delete-region rcirc-prompt-start-marker rcirc-prompt-end-marker))))) @@ -428,7 +443,8 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") (defun rcirc-process-server-response-1 (process text) (if (string-match "^\\(:\\([^ ]+\\) \\)?\\([^ ]+\\) \\(.+\\)$" text) - (let* ((sender (match-string 2 text)) + (let* ((user (match-string 2 text)) + (sender (rcirc-user-nick user)) (cmd (match-string 3 text)) (args (match-string 4 text)) (handler (intern-soft (concat "rcirc-handler-" cmd)))) @@ -470,6 +486,11 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") (with-rcirc-process-buffer process rcirc-nick)) +(defun rcirc-abbrev-nick (nick) + "If NICK has an entry in `rcirc-nick-abbrevs', return its abbreviation, +otherwise return NICK." + (or (cdr (assoc nick rcirc-nick-abbrevs)) nick)) + (defvar rcirc-max-message-length 450 "Messages longer than this value will be split.") @@ -487,12 +508,10 @@ If NOTICEP is non-nil, send a notice instead of privmsg." text)) (more (if oversize (substring message rcirc-max-message-length)))) - (rcirc-print process (rcirc-nick process) response - (rcirc-get-buffer-create process target) - text) + (rcirc-get-buffer-create process target) + (rcirc-print process (rcirc-nick process) response target text) (rcirc-send-string process (concat response " " target " :" text)) - (if more - (rcirc-send-message process target more noticep)))) + (when more (rcirc-send-message process target more noticep)))) (defvar rcirc-input-ring nil) (defvar rcirc-input-ring-index 0) @@ -582,10 +601,6 @@ If buffer is nil, return the target of the current buffer." (define-key rcirc-mode-map (kbd "C-c C-s") 'rcirc-switch-to-server-buffer) (define-key rcirc-mode-map (kbd "C-c C-a") 'rcirc-jump-to-first-unread-line) -(define-key global-map (kbd "C-c `") 'rcirc-next-active-buffer) -(define-key global-map (kbd "C-c C-@") 'rcirc-next-active-buffer) -(define-key global-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer) - (defvar rcirc-browse-url-map (make-sparse-keymap) "Keymap used for browsing URLs in `rcirc-mode'.") @@ -730,8 +745,6 @@ This is used for the initial name given to IRC buffers." (defun rcirc-get-buffer (process target &optional server) "Return the buffer associated with the PROCESS and TARGET. -If TARGET is nil, return the server buffer. - If optional argument SERVER is non-nil, return the server buffer if there is no existing buffer for TARGET, otherwise return nil." (with-rcirc-process-buffer process @@ -744,7 +757,11 @@ if there is no existing buffer for TARGET, otherwise return nil." "Return the buffer associated with the PROCESS and TARGET. Create the buffer if it doesn't exist." (let ((buffer (rcirc-get-buffer process target))) - (or buffer + (if buffer + (progn + (when (not rcirc-target) + (setq rcirc-target target)) + buffer) ;; create the buffer (with-rcirc-process-buffer process (let ((new-buffer (get-buffer-create @@ -781,36 +798,45 @@ Create the buffer if it doesn't exist." (delete-backward-char 1)) (let ((input (buffer-substring-no-properties rcirc-prompt-end-marker (point)))) - ;; process a /cmd - (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" input) - (let* ((command (match-string 1 input)) - (fun (intern-soft (concat "rcirc-cmd-" command))) - (args (match-string 2 input))) - (newline) - (with-current-buffer (current-buffer) - (delete-region rcirc-prompt-end-marker (point)) - (if (string= command "me") - (rcirc-print rcirc-process (rcirc-nick rcirc-process) - "ACTION" (current-buffer) args) - (rcirc-print rcirc-process (rcirc-nick rcirc-process) - "COMMAND" (current-buffer) input)) - (set-marker rcirc-prompt-end-marker (point)) - (if (fboundp fun) - (funcall fun args rcirc-process target) - (rcirc-send-string rcirc-process - (concat command " " args))))) - ;; send message to server - (if (not rcirc-target) - (message "Not joined") - (delete-region rcirc-prompt-end-marker (point)) - (mapc (lambda (message) - (rcirc-send-message rcirc-process target message)) - (split-string input "\n")))) + (dolist (line (split-string input "\n")) + (rcirc-process-input-line rcirc-process target line)) ;; add to input-ring (save-excursion (ring-insert rcirc-input-ring input) (setq rcirc-input-ring-index 0))))))) +(defun rcirc-process-input-line (process target line) + (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" line) + (rcirc-process-command (match-string 1 line) + (match-string 2 line) + line) + (rcirc-process-message line))) + +(defun rcirc-process-message (line) + (if (not rcirc-target) + (message "Not joined") + (delete-region rcirc-prompt-end-marker (point)) + (rcirc-send-message rcirc-process rcirc-target line))) + +(defun rcirc-process-command (command args line) + (if (eq (aref command 0) ?/) + ;; "//text" will send "/text" as a message + (rcirc-process-message (substring line 1)) + (let* ((fun (intern-soft (concat "rcirc-cmd-" command)))) + (newline) + (with-current-buffer (current-buffer) + (delete-region rcirc-prompt-end-marker (point)) + (if (string= command "me") + (rcirc-print rcirc-process (rcirc-nick rcirc-process) + "ACTION" rcirc-target args) + (rcirc-print rcirc-process (rcirc-nick rcirc-process) + "COMMAND" rcirc-target line)) + (set-marker rcirc-prompt-end-marker (point)) + (if (fboundp fun) + (funcall fun args rcirc-process rcirc-target) + (rcirc-send-string rcirc-process + (concat command " " args))))))) + (defvar rcirc-parent-buffer nil) (defvar rcirc-window-configuration nil) (defun rcirc-edit-multiline () @@ -828,7 +854,8 @@ Create the buffer if it doesn't exist." (setq rcirc-parent-buffer parent) (setq rcirc-process process) (insert text) - (and (> pos 0) (goto-char pos))))) + (and (> pos 0) (goto-char pos)) + (message "Type C-c C-c to return text to %s, or C-c C-k to cancel" parent)))) (define-derived-mode rcirc-multiline-edit-mode text-mode "rcirc multi" @@ -879,46 +906,130 @@ Create the buffer if it doesn't exist." buffer (process-buffer process)))) +(defcustom rcirc-response-formats + '(("PRIVMSG" . "%T<%n> %m") + ("NOTICE" . "%T-%n- %m") + ("ACTION" . "%T[%n] %m") + ("COMMAND" . "%T%m") + ("ERROR" . "%T%fw!!! %m") + (t . "%T%fp*** %fs%n %r %m")) + "An alist of formats used for printing responses. +The format is looked up using the response-type as a key; +if no match is found, the default entry (with a key of `t') is used. + +The entry's value part should be a string, which is inserted with +the of the following escape sequences replaced by the described values: + + %m The message text + %n The sender's nick (with face `rcirc-my-nick' or `rcirc-other-nick') + %r The response-type + %T The timestamp (with face `rcirc-timestamp') + %t The target + %fw Following text uses the face `font-lock-warning-face' + %fp Following text uses the face `rcirc-server-prefix' + %fs Following text uses the face `rcirc-server' + %f[FACE] Following text uses the face FACE + %f- Following text uses the default face + %% A literal `%' character +" + :type '(alist :key-type (choice (string :tag "Type") + (const :tag "Default" t)) + :value-type string) + :group 'rcirc) + (defun rcirc-format-response-string (process sender response target text) - (concat (rcirc-facify (format-time-string rcirc-time-format (current-time)) - 'rcirc-timestamp) - (cond ((or (string= response "PRIVMSG") - (string= response "NOTICE") - (string= response "ACTION")) - (let (first middle end) - (cond ((string= response "PRIVMSG") - (setq first "<" middle "> ")) - ((string= response "NOTICE") - (when sender - (setq first "-" middle "- "))) - (t - (setq first "[" middle " " end "]"))) - (concat first - (rcirc-facify (rcirc-user-nick sender) - (if (string= sender - (rcirc-nick process)) - 'rcirc-my-nick - 'rcirc-other-nick)) - middle - (rcirc-mangle-text process text) - end))) - ((string= response "COMMAND") - text) - ((string= response "ERROR") - (propertize (concat "!!! " text) - 'face 'font-lock-warning-face)) - (t - (rcirc-mangle-text - process - (concat (rcirc-facify "*** " 'rcirc-server-prefix) - (rcirc-facify - (concat - (when (not (string= sender (rcirc-server process))) - (concat (rcirc-user-nick sender) " ")) - (when (zerop (string-to-number response)) - (concat response " ")) - text) - 'rcirc-server))))))) + "Return a nicely-formatted response string, incorporating TEXT +\(and perhaps other arguments). The specific formatting used +is found by looking up RESPONSE in `rcirc-response-formats'." + (let ((chunks + (split-string (or (cdr (assoc response rcirc-response-formats)) + (cdr (assq t rcirc-response-formats))) + "%")) + (result "") + (face nil) + key face-key repl) + (when (equal (car chunks) "") + (pop chunks)) + (dolist (chunk chunks) + (if (equal chunk "") + (setq key ?%) + (setq key (aref chunk 0)) + (setq chunk (substring chunk 1))) + (setq repl + (cond ((eq key ?%) + ;; %% -- literal % character ; + "%") + ((eq key ?n) + ;; %n -- nick ; + (rcirc-facify (concat (rcirc-abbrev-nick sender) + (and target (concat "," target))) + (if (string= sender (rcirc-nick process)) + 'rcirc-my-nick + 'rcirc-other-nick))) + ((eq key ?T) + ;; %T -- timestamp ; + (rcirc-facify + (format-time-string rcirc-time-format (current-time)) + 'rcirc-timestamp)) + ((eq key ?m) + ;; %m -- message text ; + ;; We add the text property `rcirc-text' to identify this ; + ;; as the body text. ; + (propertize + (rcirc-mangle-text process (rcirc-facify text face)) + 'rcirc-text text)) + ((eq key ?t) + ;; %t -- target ; + (rcirc-facify (or rcirc-target "") face)) + ((eq key ?r) + ;; %r -- response ; + (rcirc-facify response face)) + ((eq key ?f) + ;; %f -- change face ; + (setq face-key (aref chunk 0)) + (cond ((eq face-key ?w) + ;; %fw -- warning face ; + (setq face 'font-lock-warning-face)) + ((eq face-key ?p) + ;; %fp -- server-prefix face ; + (setq face 'rcirc-server-prefix)) + ((eq face-key ?s) + ;; %fs -- warning face ; + (setq face 'rcirc-server)) + ((eq face-key ?-) + ;; %fs -- warning face ; + (setq face nil)) + ((and (eq face-key ?\[) + (string-match "^[[]\\([^]]*\\)[]]" chunk) + (facep (match-string 1 chunk))) + ;; %f[...] -- named face ; + (setq face (intern (match-string 1 chunk))) + (setq chunk (substring chunk (match-end 1))))) + (setq chunk (substring chunk 1)) + "") + (t + ;; just insert the key literally ; + (rcirc-facify (substring chunk 0 1) face)))) + (setq result (concat result repl (rcirc-facify chunk face)))) + result)) + +(defun rcirc-target-buffer (process sender response target text) + "Return a buffer to print the server response." + (assert (not (bufferp target))) + (with-rcirc-process-buffer process + (cond ((not target) + (if rcirc-always-use-server-buffer-flag + (process-buffer process) + (rcirc-get-any-buffer process))) + ((not (rcirc-channel-p target)) + ;; message from another user + (if (string= response "PRIVMSG") + (rcirc-get-buffer-create process (if (string= sender rcirc-nick) + target + sender)) + (rcirc-get-buffer process target t))) + ((or (rcirc-get-buffer process target) + (rcirc-get-any-buffer process)))))) (defvar rcirc-activity-type nil) (make-variable-buffer-local 'rcirc-activity-type) @@ -926,19 +1037,11 @@ Create the buffer if it doesn't exist." "Print TEXT in the buffer associated with TARGET. Format based on SENDER and RESPONSE. If ACTIVITY is non-nil, record activity." - (unless (or (member (rcirc-user-nick sender) rcirc-ignore-list) + (unless (or (member sender rcirc-ignore-list) (member (with-syntax-table rcirc-nick-syntax-table (when (string-match "^\\([^/]\\w*\\)[:,]" text) (match-string 1 text))) rcirc-ignore-list)) - (let* ((buffer (cond ((bufferp target) - target) - ((not target) - (rcirc-get-any-buffer process)) - ((not (rcirc-channel-p target)) - (rcirc-get-buffer-create process - (rcirc-user-nick sender))) - ((or (rcirc-get-buffer process target) - (rcirc-get-any-buffer process))))) + (let* ((buffer (rcirc-target-buffer process sender response target text)) (inhibit-read-only t)) (with-current-buffer buffer (let ((moving (= (point) rcirc-prompt-end-marker)) @@ -960,38 +1063,31 @@ record activity." (goto-char rcirc-prompt-start-marker) (set-marker-insertion-type rcirc-prompt-start-marker t) (set-marker-insertion-type rcirc-prompt-end-marker t) - (insert - (rcirc-format-response-string process sender response target text) - (propertize "\n" 'hard t)) - (set-marker-insertion-type rcirc-prompt-start-marker nil) - (set-marker-insertion-type rcirc-prompt-end-marker nil) - - ;; fill the text we just inserted, maybe - (when (and rcirc-fill-flag - (not (string= response "372"))) ;/motd - (let ((fill-prefix - (or rcirc-fill-prefix - (make-string - (+ (if rcirc-time-format - (length (format-time-string - rcirc-time-format)) - 0) - (cond ((or (string= response "PRIVMSG") - (string= response "NOTICE")) - (+ (length (rcirc-user-nick sender)) - 2)) ; <> - ((string= response "ACTION") - (+ (length (rcirc-user-nick sender)) - 1)) ; [ - (t 3)) ; *** - 1) - ?\s))) - (fill-column (cond ((eq rcirc-fill-column 'frame-width) - (1- (frame-width))) - (rcirc-fill-column - rcirc-fill-column) - (t fill-column)))) - (fill-region fill-start rcirc-prompt-start-marker 'left t))) + + (let ((fmted-text + (rcirc-format-response-string process sender response nil + text))) + + (insert fmted-text (propertize "\n" 'hard t)) + (set-marker-insertion-type rcirc-prompt-start-marker nil) + (set-marker-insertion-type rcirc-prompt-end-marker nil) + + ;; fill the text we just inserted, maybe + (when (and rcirc-fill-flag + (not (string= response "372"))) ;/motd + (let ((fill-prefix + (or rcirc-fill-prefix + (make-string + (or (next-single-property-change 0 'rcirc-text + fmted-text) + 8) + ?\s))) + (fill-column (cond ((eq rcirc-fill-column 'frame-width) + (1- (frame-width))) + (rcirc-fill-column + rcirc-fill-column) + (t fill-column)))) + (fill-region fill-start rcirc-prompt-start-marker 'left t)))) ;; set inserted text to be read-only (when rcirc-read-only-flag @@ -1056,17 +1152,17 @@ record activity." (defun rcirc-join-channels (process channels) "Join CHANNELS." (save-window-excursion - (mapc (lambda (channel) - (with-rcirc-process-buffer process - (rcirc-cmd-join channel process))) - channels))) + (dolist (channel channels) + (with-rcirc-process-buffer process + (rcirc-cmd-join channel process))))) ;;; nick management (defun rcirc-user-nick (user) "Return the nick from USER. Remove any non-nick junk." - (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user "")) - (match-string 1 user) - user)) + (save-match-data + (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user "")) + (match-string 1 user) + user))) (defun rcirc-user-non-nick (user) "Return the non-nick portion of USER." @@ -1076,17 +1172,15 @@ record activity." (defun rcirc-nick-channels (process nick) "Return list of channels for NICK." - (let ((nick (rcirc-user-nick nick))) - (with-rcirc-process-buffer process - (mapcar (lambda (x) (car x)) - (gethash nick rcirc-nick-table))))) + (with-rcirc-process-buffer process + (mapcar (lambda (x) (car x)) + (gethash nick rcirc-nick-table)))) (defun rcirc-put-nick-channel (process nick channel) "Add CHANNEL to list associated with NICK." (with-rcirc-process-buffer process - (let* ((nick (rcirc-user-nick nick)) - (chans (gethash nick rcirc-nick-table)) - (record (assoc-string channel chans t))) + (let* ((chans (gethash nick rcirc-nick-table)) + (record (assoc-string channel chans t))) (if record (setcdr record (current-time)) (puthash nick (cons (cons channel (current-time)) @@ -1101,8 +1195,7 @@ record activity." (defun rcirc-remove-nick-channel (process nick channel) "Remove the CHANNEL from list associated with NICK." (with-rcirc-process-buffer process - (let* ((nick (rcirc-user-nick nick)) - (chans (gethash nick rcirc-nick-table)) + (let* ((chans (gethash nick rcirc-nick-table)) (newchans ;; instead of assoc-string-delete-all: (let ((record (assoc-string channel chans t))) @@ -1136,28 +1229,44 @@ if NICK is also on `rcirc-ignore-list-automatic'." (delete nick rcirc-ignore-list)))) ;;; activity tracking +(defvar rcirc-track-minor-mode-map (make-sparse-keymap) + "Keymap for rcirc track minor mode.") + +(define-key rcirc-track-minor-mode-map (kbd "C-c `") 'rcirc-next-active-buffer) +(define-key rcirc-track-minor-mode-map (kbd "C-c C-@") 'rcirc-next-active-buffer) +(define-key rcirc-track-minor-mode-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer) + +;;; FIXME: the code to insert `rcirc-activity-string' into +;;; `global-mode-string' isn't called when the mode is activated by +;;; customize. I don't know how to set that up. +(define-minor-mode rcirc-track-minor-mode + "Global minor mode for tracking activity in rcirc buffers." + :init-value nil + :lighter "" + :keymap rcirc-track-minor-mode-map + :global t + :group 'rcirc + (or global-mode-string (setq global-mode-string '(""))) + ;; toggle the mode-line channel indicator + (if rcirc-track-minor-mode + (and (not (memq 'rcirc-activity-string global-mode-string)) + (setq global-mode-string + (append global-mode-string '(rcirc-activity-string)))) + (setq global-mode-string + (delete 'rcirc-activity-string global-mode-string)))) + (or (assq 'rcirc-ignore-buffer-activity-flag minor-mode-alist) (setq minor-mode-alist (cons '(rcirc-ignore-buffer-activity-flag " Ignore") minor-mode-alist))) -(defun rcirc-toggle-ignore-buffer-activity (&optional all) - "Toggle the value of `rcirc-ignore-buffer-activity-flag'. -If ALL is non-nil, instead toggle the value of -`rcirc-ignore-all-activity-flag'." - (interactive "P") - (if all - (progn - (setq rcirc-ignore-all-activity-flag - (not rcirc-ignore-all-activity-flag)) - (message (if rcirc-ignore-all-activity-flag - "Hide all buffer activity" - "Display buffer activity")) - (rcirc-update-activity-string)) - (setq rcirc-ignore-buffer-activity-flag - (not rcirc-ignore-buffer-activity-flag)) - (message (if rcirc-ignore-buffer-activity-flag - "Ignore activity in this buffer" - "Notice activity in this buffer"))) +(defun rcirc-toggle-ignore-buffer-activity () + "Toggle the value of `rcirc-ignore-buffer-activity-flag'." + (interactive) + (setq rcirc-ignore-buffer-activity-flag + (not rcirc-ignore-buffer-activity-flag)) + (message (if rcirc-ignore-buffer-activity-flag + "Ignore activity in this buffer" + "Notice activity in this buffer")) (force-mode-line-update)) (defvar rcirc-switch-to-buffer-function 'switch-to-buffer @@ -1229,21 +1338,18 @@ activity. Only run if the buffer is not visible and (defun rcirc-update-activity-string () "Update mode-line string." (setq rcirc-activity-string - (cond (rcirc-ignore-all-activity-flag - " DND") - ((not rcirc-activity) - "") - (t - (concat " [" - (mapconcat - (lambda (b) - (let ((s (rcirc-short-buffer-name b))) - (with-current-buffer b - (if (not (eq rcirc-activity-type 'nick)) - s - (rcirc-facify s 'rcirc-mode-line-nick))))) - rcirc-activity ",") - "]"))))) + (if (not rcirc-activity) + "" + (concat " [" + (mapconcat + (lambda (b) + (let ((s (rcirc-short-buffer-name b))) + (with-current-buffer b + (if (not (eq rcirc-activity-type 'nick)) + s + (rcirc-facify s 'rcirc-mode-line-nick))))) + rcirc-activity ",") + "]")))) (defun rcirc-short-buffer-name (buffer) "Return a short name for BUFFER to use in the modeline indicator." @@ -1488,23 +1594,22 @@ Ignore NICK, unignore NICK if already ignored, or list ignored nicks when no NICK is given. When listing ignored nicks, the ones added to the list automatically are marked with an asterisk." (interactive "sToggle ignoring of nick: ") - (if (string= "" nick) - (rcirc-print process (rcirc-nick process) "NOTICE" target - (mapconcat - (lambda (nick) - (concat nick - (if (member nick rcirc-ignore-list-automatic) - "*" ""))) - rcirc-ignore-list " ")) + (when (not (string= "" nick)) (if (member nick rcirc-ignore-list) (setq rcirc-ignore-list (delete nick rcirc-ignore-list)) - (setq rcirc-ignore-list (cons nick rcirc-ignore-list))))) - + (setq rcirc-ignore-list (cons nick rcirc-ignore-list)))) + (rcirc-print process (rcirc-nick process) "IGNORE" target + (mapconcat + (lambda (nick) + (concat nick + (if (member nick rcirc-ignore-list-automatic) + "*" ""))) + rcirc-ignore-list " "))) (defun rcirc-message-leader (sender face) "Return a string with SENDER propertized with FACE." - (rcirc-facify (concat "<" (rcirc-user-nick sender) "> ") face)) + (rcirc-facify (concat "<" sender "> ") face)) (defun rcirc-facify (string face) "Return a copy of STRING with FACE property added." @@ -1518,8 +1623,8 @@ ones added to the list automatically are marked with an asterisk." "://" (1+ (char "a-zA-Z0-9_.")) (optional ":" (1+ (char "0-9"))))) - (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,")) - (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;")) + (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]")) + (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]")) "Regexp matching URLs. Set to nil to disable URL features in rcirc.") (defun rcirc-browse-url (&optional arg) @@ -1603,7 +1708,7 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." 'mouse-face 'highlight 'keymap rcirc-browse-url-map) string)) - (push (substring string start end) rcirc-urls)) + (push (substring-no-properties string start end) rcirc-urls)) rcirc-url-regexp text)) text) @@ -1627,7 +1732,7 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (defun rcirc-handler-PRIVMSG (process sender args text) (let ((target (if (rcirc-channel-p (car args)) (car args) - (rcirc-user-nick sender))) + sender)) (message (or (cadr args) ""))) (if (string-match "^\C-a\\(.*\\)\C-a$" message) (rcirc-handler-CTCP process target sender (match-string 1 message)) @@ -1650,25 +1755,21 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (match-string 1 message)) (sender (if (string= sender (rcirc-server process)) - (process-buffer process) - (rcirc-user-nick sender)))) + nil ; server notice + sender))) message t)))) - ;; do we need this: - ;;(and sender (rcirc-put-nick-channel process sender target)))) (defun rcirc-handler-WALLOPS (process sender args text) - (let ((target (rcirc-user-nick sender))) - (rcirc-print process sender "WALLOPS" target (car args) t))) + (rcirc-print process sender "WALLOPS" sender (car args) t)) (defun rcirc-handler-JOIN (process sender args text) - (let ((channel (car args)) - (nick (rcirc-user-nick sender))) + (let ((channel (car args))) (rcirc-get-buffer-create process channel) (rcirc-print process sender "JOIN" channel "") ;; print in private chat buffer if it exists - (when (rcirc-get-buffer rcirc-process nick) - (rcirc-print process sender "JOIN" nick channel)) + (when (rcirc-get-buffer rcirc-process sender) + (rcirc-print process sender "JOIN" sender channel)) (rcirc-put-nick-channel process sender channel))) @@ -1695,9 +1796,9 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (setq rcirc-target nil)))))) (defun rcirc-handler-PART (process sender args text) - (rcirc-ignore-update-automatic (rcirc-user-nick sender)) + (rcirc-ignore-update-automatic sender) (rcirc-handler-PART-or-KICK process "PART" - (car args) sender (rcirc-user-nick sender) + (car args) sender sender (cadr args))) (defun rcirc-handler-KICK (process sender args text) @@ -1705,21 +1806,19 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (caddr args))) (defun rcirc-handler-QUIT (process sender args text) - (rcirc-ignore-update-automatic (rcirc-user-nick sender)) - (let ((nick (rcirc-user-nick sender))) - (mapc (lambda (channel) - (rcirc-print process sender "QUIT" channel (apply 'concat args))) - (rcirc-nick-channels process nick)) + (rcirc-ignore-update-automatic sender) + (mapc (lambda (channel) + (rcirc-print process sender "QUIT" channel (apply 'concat args))) + (rcirc-nick-channels process sender)) - ;; print in private chat buffer if it exists - (let ((buffer (rcirc-get-buffer rcirc-process nick))) - (when buffer - (rcirc-print process sender "QUIT" buffer (apply 'concat args)))) + ;; print in private chat buffer if it exists + (when (rcirc-get-buffer rcirc-process sender) + (rcirc-print process sender "QUIT" sender (apply 'concat args))) - (rcirc-nick-remove process nick))) + (rcirc-nick-remove process sender)) (defun rcirc-handler-NICK (process sender args text) - (let* ((old-nick (rcirc-user-nick sender)) + (let* ((old-nick sender) (new-nick (car args)) (channels (rcirc-nick-channels process old-nick))) ;; update list of ignored nicks @@ -1796,9 +1895,8 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." ;; print in private chat buffers if they exist (mapc (lambda (nick) - (let ((existing-buffer (rcirc-get-buffer process nick))) - (when existing-buffer - (rcirc-print process sender "MODE" existing-buffer msg)))) + (when (rcirc-get-buffer process nick) + (rcirc-print process sender "MODE" nick msg))) (cddr args)))) (defun rcirc-get-temp-buffer-create (process channel) @@ -1834,40 +1932,35 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (defun rcirc-authenticate () "Send authentication to process associated with current buffer. -Passwords are read from `rcirc-authinfo-file-name' (which see)." +Passwords are stored in `rcirc-authinfo' (which see)." (interactive) - (let ((password-alist - (with-temp-buffer - (insert-file-contents-literally rcirc-authinfo-file-name) - (goto-char (point-min)) - (read (current-buffer))))) - (with-rcirc-process-buffer rcirc-process - (dolist (i password-alist) - (let ((server (car i)) - (nick (cadr i)) - (method (caddr i)) - (args (cdddr i))) - (when (and (string-match server rcirc-server) - (string-match nick rcirc-nick)) - (cond ((equal method 'nickserv) - (rcirc-send-string - rcirc-process - (concat - "PRIVMSG nickserv :identify " - (car args)))) - ((equal method 'chanserv) - (rcirc-send-string - rcirc-process - (concat - "PRIVMSG chanserv :identify " - (car args) " " (cadr args)))) - ((equal method 'bitlbee) - (rcirc-send-string - rcirc-process - (concat "PRIVMSG #bitlbee :identify " (car args)))) - (t - (message "No %S authentication method defined" - method))))))))) + (with-rcirc-process-buffer rcirc-process + (dolist (i rcirc-authinfo) + (let ((server (car i)) + (nick (caddr i)) + (method (cadr i)) + (args (cdddr i))) + (when (and (string-match server rcirc-server) + (string-match nick rcirc-nick)) + (cond ((equal method 'nickserv) + (rcirc-send-string + rcirc-process + (concat + "PRIVMSG nickserv :identify " + (car args)))) + ((equal method 'chanserv) + (rcirc-send-string + rcirc-process + (concat + "PRIVMSG chanserv :identify " + (cadr args) " " (car args)))) + ((equal method 'bitlbee) + (rcirc-send-string + rcirc-process + (concat "PRIVMSG &bitlbee :identify " (car args)))) + (t + (message "No %S authentication method defined" + method)))))))) (defun rcirc-handler-INVITE (process sender args text) (rcirc-print process sender "INVITE" nil (mapconcat 'identity args " ") t)) @@ -1879,22 +1972,19 @@ Passwords are read from `rcirc-authinfo-file-name' (which see)." (if (string-match "^\\([^ ]+\\) *\\(.*\\)$" text) (let* ((request (upcase (match-string 1 text))) (args (match-string 2 text)) - (nick (rcirc-user-nick sender)) (handler (intern-soft (concat "rcirc-handler-ctcp-" request)))) (if (not (fboundp handler)) - (rcirc-print process sender "ERROR" - (rcirc-get-buffer process target) - (format "%s sent unsupported ctcp: %s" nick text) + (rcirc-print process sender "ERROR" target + (format "%s sent unsupported ctcp: %s" sender text) t) (funcall handler process target sender args) (if (not (string= request "ACTION")) - (rcirc-print process sender "CTCP" - (rcirc-get-buffer process target) + (rcirc-print process sender "CTCP" target (format "%s" text) t)))))) (defun rcirc-handler-ctcp-VERSION (process target sender args) (rcirc-send-string process - (concat "NOTICE " (rcirc-user-nick sender) + (concat "NOTICE " sender " :\C-aVERSION " rcirc-id-string "\C-a"))) @@ -1903,7 +1993,7 @@ Passwords are read from `rcirc-authinfo-file-name' (which see)." (defun rcirc-handler-ctcp-TIME (process target sender args) (rcirc-send-string process - (concat "NOTICE " (rcirc-user-nick sender) + (concat "NOTICE " sender " :\C-aTIME " (current-time-string) "\C-a"))) (defun rcirc-handler-CTCP-response (process target sender message) @@ -1960,7 +2050,7 @@ Passwords are read from `rcirc-authinfo-file-name' (which see)." :group 'rcirc-faces) (defface rcirc-server-prefix ; font-lock-comment-delimiter-face - '((default :inherit font-lock-comment-face) + '((default :inherit rcirc-server) (((class grayscale))) (((class color) (min-colors 16))) (((class color) (min-colors 8) (background light)) diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el index c643d72da97..469f268fb9c 100644 --- a/lisp/net/rcompile.el +++ b/lisp/net/rcompile.el @@ -1,7 +1,7 @@ ;;; rcompile.el --- run a compilation on a remote machine ;; Copyright (C) 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Albert <alon@milcse.rtsg.mot.com> ;; Maintainer: FSF diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index 693113203ba..74b9e034f9a 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -1,7 +1,7 @@ ;;; rlogin.el --- remote login interface ;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman <friedman@splode.com> diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el index 31c600a2804..62f6bb87b69 100644 --- a/lisp/net/snmp-mode.el +++ b/lisp/net/snmp-mode.el @@ -1,7 +1,7 @@ ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode ;; Copyright (C) 1995, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Paul D. Smith <psmith@BayNetworks.com> ;; Keywords: data diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el index e4f91351c25..28bc552551b 100644 --- a/lisp/net/telnet.el +++ b/lisp/net/telnet.el @@ -1,7 +1,7 @@ ;;; telnet.el --- run a telnet session from within an Emacs buffer ;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: William F. Schelter ;; Maintainer: FSF diff --git a/lisp/net/tls.el b/lisp/net/tls.el index e46c98b6f6a..fe089decad0 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -1,7 +1,7 @@ ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: comm, tls, gnutls, ssl diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 5644e081e6c..04fbd3636f8 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -1,6 +1,6 @@ ;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*- -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el index e1e22af3cab..c33e8175315 100644 --- a/lisp/net/tramp-uu.el +++ b/lisp/net/tramp-uu.el @@ -1,7 +1,7 @@ ;;; -*- coding: iso-2022-7bit; -*- ;;; tramp-uu.el --- uuencode in Lisp -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net> ;; Keywords: comm, terminals diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5ff8a0832bc..afe5308a918 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1735,7 +1735,7 @@ on the remote host.") (defvar tramp-perl-encode "%s -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2006 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -1777,7 +1777,7 @@ This string is passed to `format', so percent characters need to be doubled.") (defvar tramp-perl-decode "%s -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2006 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -6482,7 +6482,8 @@ connection if a previous connection has died for some reason." p (processp p) (memq (process-status p) '(run open))) (tramp-send-command multi-method method user host "echo are you awake" nil t) - (unless (tramp-wait-for-output 10) + (unless (and (memq (process-status p) '(run open)) + (tramp-wait-for-output 10)) (delete-process p) (setq p nil)) (erase-buffer))) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 632d958249d..a71667291da 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -2,7 +2,7 @@ ;;; trampver.el --- Transparent Remote Access, Multiple Protocol ;;; lisp/trampver.el. Generated from trampver.el.in by configure. -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net> ;; Keywords: comm, processes diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index 4a3baea4f41..e24ce702397 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -1,7 +1,7 @@ ;;; webjump.el --- programmable Web hotlist ;; Copyright (C) 1996, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Neil W. Van Dyke <nwv@acm.org> ;; Created: 09-Aug-1996 diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el index 9f6c9d1c778..441ef143f9c 100644 --- a/lisp/net/zone-mode.el +++ b/lisp/net/zone-mode.el @@ -1,6 +1,7 @@ ;;; zone-mode.el --- major mode for editing DNS zone files -;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@isi.edu> ;; Keywords: DNS, languages diff --git a/lisp/novice.el b/lisp/novice.el index dfaf0b6c6d3..97e27da5e5e 100644 --- a/lisp/novice.el +++ b/lisp/novice.el @@ -1,7 +1,7 @@ ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs ;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, help diff --git a/lisp/outline.el b/lisp/outline.el index eed84bd61c7..fdbad00ada3 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -1,7 +1,7 @@ ;;; outline.el --- outline mode commands for Emacs ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: outlines diff --git a/lisp/paren.el b/lisp/paren.el index 8b5a134d2d4..29506174c6b 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -1,7 +1,7 @@ ;;; paren.el --- highlight matching paren ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: rms@gnu.org ;; Maintainer: FSF diff --git a/lisp/paths.el b/lisp/paths.el index f248eac9242..846f91793d1 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -1,7 +1,7 @@ ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*- ;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el index 628ad8399ce..5915b5f5a9d 100644 --- a/lisp/pcmpl-cvs.el +++ b/lisp/pcmpl-cvs.el @@ -1,7 +1,7 @@ ;;; pcmpl-cvs.el --- functions for dealing with cvs completions ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index bf7653618b8..7dc7808404f 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -1,7 +1,7 @@ ;;; pcmpl-gnu.el --- completions for GNU project tools ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el index 02f840bee30..bd68d00ce76 100644 --- a/lisp/pcmpl-linux.el +++ b/lisp/pcmpl-linux.el @@ -1,7 +1,7 @@ ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el index 5e9afcf51cb..5855a3e5d15 100644 --- a/lisp/pcmpl-rpm.el +++ b/lisp/pcmpl-rpm.el @@ -1,7 +1,7 @@ ;;; pcmpl-rpm.el --- functions for dealing with rpm completions ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index de9c143ae6f..35637c01363 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -1,7 +1,7 @@ ;;; pcmpl-unix.el --- standard UNIX completions ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index c8d0ac19bd6..36878d2dff9 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -1,7 +1,7 @@ ;;; pcomplete.el --- programmable completion ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -;; 2005 Free Sofware Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: processes abbrev diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el index cd981581711..8f7de913261 100644 --- a/lisp/pcvs-defs.el +++ b/lisp/pcvs-defs.el @@ -1,7 +1,7 @@ ;;; pcvs-defs.el --- variable definitions for PCL-CVS ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 291e4ae85c4..7d1a11ccb68 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -1,7 +1,7 @@ ;;; pcvs-info.el --- internal representation of a fileinfo entry ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 66c791db51c..2053d8f5bd5 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -1,7 +1,7 @@ ;;; pcvs-parse.el --- the CVS output parser ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 1c4896435db..9ff40d09494 100644 --- a/lisp/pcvs-util.el +++ b/lisp/pcvs-util.el @@ -1,7 +1,7 @@ ;;; pcvs-util.el --- utility functions for PCL-CVS -*- byte-compile-dynamic: t -*- ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 0f0ff76ed0c..b9d04522181 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -1,7 +1,7 @@ ;;; pcvs.el --- a front-end to CVS ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com ;; (Per Cederqvist) ceder@lysator.liu.se diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el index c6197db447d..058dca4fa8f 100644 --- a/lisp/pgg-def.el +++ b/lisp/pgg-def.el @@ -1,6 +1,7 @@ ;;; pgg-def.el --- functions/macros for defining PGG functions -;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/11/02 @@ -82,6 +83,9 @@ Whether the passphrase is cached at all is controlled by (defvar pgg-scheme nil "Current scheme of PGP implementation.") +(defvar pgg-text-mode nil + "If t, inform the recipient that the input is text.") + (defmacro pgg-truncate-key-identifier (key) `(if (> (length ,key) 8) (substring ,key 8) ,key)) diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index c1ab5104c4c..0c9f45ab5b9 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -1,7 +1,7 @@ ;;; pgg-gpg.el --- GnuPG support for PGG. ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de> @@ -87,7 +87,9 @@ (buffer-disable-undo) (erase-buffer) (if (file-exists-p output-file-name) - (let ((coding-system-for-read 'raw-text-dos)) + (let ((coding-system-for-read (if pgg-text-mode + 'raw-text + 'binary))) (insert-file-contents output-file-name))) (set-buffer errors-buffer) (if (not (equal exit-status 0)) @@ -187,7 +189,8 @@ passphrase cache or user." pgg-gpg-user-id)))) (args (append - (list "--batch" "--textmode" "--armor" "--always-trust" "--encrypt") + (list "--batch" "--armor" "--always-trust" "--encrypt") + (if pgg-text-mode (list "--textmode")) (if sign (list "--sign" "--local-user" pgg-gpg-user-id)) (if recipients (apply #'nconc @@ -196,8 +199,7 @@ passphrase cache or user." (append recipients (if pgg-encrypt-for-me (list pgg-gpg-user-id))))))))) - (pgg-as-lbt start end 'CRLF - (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) + (pgg-gpg-process-region start end passphrase pgg-gpg-program args) (when sign (with-current-buffer pgg-errors-buffer ;; Possibly cache passphrase under, e.g. "jas", for future sign. @@ -215,9 +217,9 @@ passphrase cache or user." (pgg-read-passphrase "GnuPG passphrase for symmetric encryption: "))) (args - (append (list "--batch" "--textmode" "--armor" "--symmetric" )))) - (pgg-as-lbt start end 'CRLF - (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) + (append (list "--batch" "--armor" "--symmetric" ) + (if pgg-text-mode (list "--textmode"))))) + (pgg-gpg-process-region start end passphrase pgg-gpg-program args) (pgg-process-when-success))) (defun pgg-gpg-decrypt-region (start end &optional passphrase) @@ -279,13 +281,13 @@ passphrase cache or user." (format "GnuPG passphrase for %s: " pgg-gpg-user-id) pgg-gpg-user-id))) (args - (list (if cleartext "--clearsign" "--detach-sign") - "--armor" "--batch" "--verbose" - "--local-user" pgg-gpg-user-id)) + (append (list (if cleartext "--clearsign" "--detach-sign") + "--armor" "--batch" "--verbose" + "--local-user" pgg-gpg-user-id) + (if pgg-text-mode (list "--textmode")))) (inhibit-read-only t) buffer-read-only) - (pgg-as-lbt start end 'CRLF - (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) + (pgg-gpg-process-region start end passphrase pgg-gpg-program args) (with-current-buffer pgg-errors-buffer ;; Possibly cache passphrase under, e.g. "jas", for future sign. (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id) diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el index 422ccc6ac23..40ebcd9b195 100644 --- a/lisp/pgg-parse.el +++ b/lisp/pgg-parse.el @@ -1,6 +1,7 @@ ;;; pgg-parse.el --- OpenPGP packet parsing -;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/10/28 diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el index 19668f23c01..f58fd0d3c6d 100644 --- a/lisp/pgg-pgp.el +++ b/lisp/pgg-pgp.el @@ -1,7 +1,7 @@ ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/11/02 diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el index 6cb5331ed55..3cba59916e5 100644 --- a/lisp/pgg-pgp5.el +++ b/lisp/pgg-pgp5.el @@ -1,7 +1,7 @@ ;;; pgg-pgp5.el --- PGP 5.* support for PGG. ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/11/02 diff --git a/lisp/pgg.el b/lisp/pgg.el index 70aa27b8536..7a30dafce8d 100644 --- a/lisp/pgg.el +++ b/lisp/pgg.el @@ -1,7 +1,7 @@ ;;; pgg.el --- glue for the various PGP implementations. ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de> diff --git a/lisp/printing.el b/lisp/printing.el index c199dcacc28..94be3dfbfab 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1,10 +1,11 @@ ;;; printing.el --- printing utilities -;; Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2005-09-18 05:57:14 deego> +;; Time-stamp: <2006-02-06 15:06:40 ttn> ;; Keywords: wp, print, PostScript ;; Version: 6.8.4 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 6442463796c..d7e1ecb67e1 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -1,7 +1,7 @@ ;;; ada-mode.el --- major-mode for editing Ada sources ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rolf Ebert <ebert@inf.enst.fr> ;; Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de> diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el index 91adf1ed187..1d42a391066 100644 --- a/lisp/progmodes/ada-prj.el +++ b/lisp/progmodes/ada-prj.el @@ -1,6 +1,6 @@ ;;; ada-prj.el --- easy editing of project files for the ada-mode -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Emmanuel Briot <briot@gnat.com> diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el index 87825b1d624..525b53c2146 100644 --- a/lisp/progmodes/ada-stmt.el +++ b/lisp/progmodes/ada-stmt.el @@ -1,7 +1,7 @@ ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates ;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 241296d8f67..9e3f8e14332 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1,7 +1,7 @@ ;;; ada-xref.el --- for lookup and completion in Ada mode ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de> ;; Rolf Ebert <ebert@inf.enst.fr> diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 229bec56dd5..7ddd9212f6c 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -1,6 +1,6 @@ ;;; antlr-mode.el --- major mode for ANTLR grammar files -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; ;; Author: Christoph.Wedler@sap.com diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index 44605b1fa9a..b79237adba7 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -1,6 +1,6 @@ ;;; asm-mode.el --- mode for editing assembler code -;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 2949b2da92f..fe021d04cea 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -1,6 +1,6 @@ ;;; autoconf.el --- mode for editing Autoconf configure.in files -;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005 +;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> @@ -52,7 +52,7 @@ "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\(\\sw+\\)") (defvar autoconf-font-lock-keywords - `(("A[CHMS]_\\sw+" . font-lock-keyword-face) + `(("\\_<A[CHMS]_\\sw+" . font-lock-keyword-face) (,autoconf-definition-regexp 3 font-lock-function-name-face) ;; Are any other M4 keywords really appropriate for configure.in, diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index 83b4d8387d4..8420ec99636 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el @@ -1,6 +1,7 @@ ;;; cc-align.el --- custom indentation functions for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index b16d571d277..9f86638696c 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -1,7 +1,7 @@ ;;; cc-awk.el --- AWK specific code within cc-mode. -;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005 Free -;; Software Foundation, Inc. +;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el) ;; Maintainer: FSF diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 6358f230e7c..f001fa60b25 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -1,7 +1,7 @@ ;;; cc-bytecomp.el --- compile time setup for proper compilation -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Martin Stjernholm ;; Maintainer: bug-cc-mode@gnu.org diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index e17656e54dd..4c8aa1518b7 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1,7 +1,7 @@ ;;; cc-cmds.el --- user level commands for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el index 66bf9a55d79..0cd7973857c 100644 --- a/lisp/progmodes/cc-compat.el +++ b/lisp/progmodes/cc-compat.el @@ -1,7 +1,7 @@ ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1994-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 9de0a24f09e..0053cfcf443 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1,7 +1,7 @@ ;;; cc-defs.el --- compile time definitions for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 7f829bd26d5..548fc74d961 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1,7 +1,7 @@ ;;; cc-engine.el --- core syntax guessing engine for CC mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index e5dcecf459f..75d631ac399 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1,6 +1,6 @@ ;;; cc-fonts.el --- font lock support for CC Mode -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 2002- Martin Stjernholm diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 3c1df93e0f9..bea3b4f7e8c 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1,7 +1,7 @@ ;;; cc-langs.el --- language specific settings for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw @@ -258,9 +258,12 @@ the evaluated constant value at compile time." (c-fn-region-is-active-p)])) "----" ("Toggle..." - ["Syntactic indentation" c-toggle-syntactic-indentation t] - ["Auto newline" c-toggle-auto-newline t] - ["Hungry delete" c-toggle-hungry-state t]))) + ["Syntactic indentation" c-toggle-syntactic-indentation + :style toggle :selected c-syntactic-indentation] + ["Auto newline" c-toggle-auto-newline + :style toggle :selected c-auto-newline] + ["Hungry delete" c-toggle-hungry-state + :style toggle :selected c-hungry-delete-key]))) ;;; Syntax tables. diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index e11f50c581b..418823b71fa 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -1,7 +1,7 @@ ;;; cc-menus.el --- imenu support for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 247a4021abf..3994fe5cf09 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1,7 +1,7 @@ ;;; cc-mode.el --- major mode for editing C and similar languages -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 2377b4ce8bd..758720a3fd6 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -1,7 +1,7 @@ ;;; cc-styles.el --- support for styles in CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-subword.el b/lisp/progmodes/cc-subword.el index fd4ca891298..6ba76708ebf 100644 --- a/lisp/progmodes/cc-subword.el +++ b/lisp/progmodes/cc-subword.el @@ -1,6 +1,6 @@ ;;; cc-subword.el --- Handling capitalized subwords in a nomenclature -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masatake YAMATO diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 4c5d03c6f4c..9bde0c5dbaf 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1,7 +1,7 @@ ;;; cc-vars.el --- user customization variables for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index a4b0389ab86..1b62774a72d 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -1,6 +1,7 @@ ;;; cfengine.el --- mode for editing Cfengine files -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: languages diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index b3051f37b9d..8531a2f3133 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -1,6 +1,6 @@ ;;; cmacexp.el --- expand C macros in a region -;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Francesco Potorti` <pot@gnu.org> diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index da2a3ee9d65..b1f02ed2ebf 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1,7 +1,7 @@ ;;; compile.el --- run compiler as inferior of Emacs, parse error messages ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: Roland McGrath <roland@gnu.org>, ;; Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index dd1dcad3cc4..36f75b757b5 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1,7 +1,7 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Ilya Zakharevich and Bob Olson diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 06a141016e5..62f74b41a70 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -1,6 +1,6 @@ ;;; cpp.el --- highlight or hide text according to cpp conditionals -;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el index 979913f10c0..f0933bba8cd 100644 --- a/lisp/progmodes/cwarn.el +++ b/lisp/progmodes/cwarn.el @@ -1,6 +1,6 @@ ;;; cwarn.el --- highlight suspicious C and C++ constructions -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Anders Lindgren <andersl@andersl.com> diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 16d1d7ba415..c3bc75c0d79 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -1,6 +1,6 @@ ;;; dcl-mode.el --- major mode for editing DCL command files -;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Odd Gripenstam <gripenstamol@decus.se> diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index 4c271113b72..03ab24adf47 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -1,6 +1,6 @@ ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs -;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Ray Blaak <blaak@infomatch.com> diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index a1b3658c0b4..f393f78203b 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -1,6 +1,7 @@ ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF) -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el index f0811d0ad80..fd58ec096b3 100644 --- a/lisp/progmodes/ebnf-bnf.el +++ b/lisp/progmodes/ebnf-bnf.el @@ -1,6 +1,6 @@ ;;; ebnf-bnf.el --- parser for EBNF -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index 4a596154c43..a52469966fc 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -1,6 +1,7 @@ ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML) -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index ada523c6c34..7e65611cedf 100644 --- a/lisp/progmodes/ebnf-ebx.el +++ b/lisp/progmodes/ebnf-ebx.el @@ -1,6 +1,7 @@ ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX) -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el index 96ae2842863..7596d366a12 100644 --- a/lisp/progmodes/ebnf-iso.el +++ b/lisp/progmodes/ebnf-iso.el @@ -1,6 +1,6 @@ ;;; ebnf-iso.el --- parser for ISO EBNF -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el index 4beeaa8ad8f..df18beb690a 100644 --- a/lisp/progmodes/ebnf-otz.el +++ b/lisp/progmodes/ebnf-otz.el @@ -1,6 +1,6 @@ ;;; ebnf-otz.el --- syntactic chart OpTimiZer -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el index 49f69f857ac..6e5465f0f01 100644 --- a/lisp/progmodes/ebnf-yac.el +++ b/lisp/progmodes/ebnf-yac.el @@ -1,6 +1,6 @@ ;;; ebnf-yac.el --- parser for Yacc/Bison -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 18d88c92699..bce4381c614 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -1,6 +1,6 @@ ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index 371cb4861d8..0d8d7bebbcb 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -1,7 +1,7 @@ ;;; ebrowse.el --- Emacs C++ class browser & tags facility ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005 +;; 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index d9f4698ecf7..6fe9fec3094 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1,7 +1,7 @@ ;;; etags.el --- etags facility for Emacs ;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998, -;; 2000, 2001, 2002, 2003, 2004, 2005 +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index 615e9d0ae93..e74208431a3 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el @@ -1,6 +1,6 @@ ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*- -;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 3816fc3fb43..e661552c331 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1,7 +1,7 @@ ;;; f90.el --- Fortran-90 mode (free format) -;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se> ;; Maintainer: Glenn Morris <rgm@gnu.org> diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index e7bda34e080..755e83646fc 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -4,7 +4,8 @@ ;; Maintainer: FSF ;; Keywords: unix, tools -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -77,16 +78,9 @@ ;;; TODO: ;; 1) Use MI command -data-read-memory for memory window. -;; 2) Highlight changed register values (use MI commands -;; -data-list-register-values and -data-list-changed-registers instead -;; of 'info registers' after release of 22.1. -;; 3) Use tree-widget.el instead of the speedbar for watch-expressions? -;; 4) Mark breakpoint locations on scroll-bar of source buffer? -;; 5) After release of 22.1, use "-var-list-children --all-values" -;; and "-stack-list-locals --simple-values" which need GDB 6.1 onwards. -;; 6) After release of 22.1, use "-var-update --all-values" which needs -;; GDB 6.4 onwards. -;; 7) With gud-print and gud-pstar, print the variable name in the GUD +;; 2) Use tree-widget.el instead of the speedbar for watch-expressions? +;; 3) Mark breakpoint locations on scroll-bar of source buffer? +;; 4) With gud-print and gud-pstar, print the variable name in the GUD ;; buffer instead of the value's history number. ;;; Code: @@ -1192,6 +1186,8 @@ happens to be appropriate." (unless (or gdb-pending-triggers gdb-first-post-prompt) (gdb-get-selected-frame) (gdb-invalidate-frames) + ;; Regenerate breakpoints buffer in case it has been inadvertantly deleted. + (gdb-get-create-buffer 'gdb-breakpoints-buffer) (gdb-invalidate-breakpoints) ;; Do this through gdb-get-selected-frame -> gdb-frame-handler ;; so gdb-frame-address is updated. @@ -1645,12 +1641,19 @@ static char *magick[] = { (define-key map [menu-bar breakpoints] (cons "Breakpoints" menu)) (define-key map " " 'gdb-toggle-breakpoint) (define-key map "D" 'gdb-delete-breakpoint) - (define-key map "q" 'kill-this-buffer) + ;; Don't bind "q" to kill-this-buffer as we need it for breakpoint icons. + (define-key map "q" 'gdb-delete-frame-or-window) (define-key map "\r" 'gdb-goto-breakpoint) (define-key map [mouse-2] 'gdb-goto-breakpoint) (define-key map [follow-link] 'mouse-face) map)) +(defun gdb-delete-frame-or-window () + "Delete frame if there is only one window. Otherwise delete the window." + (interactive) + (if (one-window-p) (delete-frame) + (delete-window))) + (defun gdb-breakpoints-mode () "Major mode for gdb breakpoints. @@ -2966,6 +2969,35 @@ BUFFER nil or omitted means use the current buffer." (gdb-invalidate-assembler)) +;; For debugging Emacs only (assumes that usual stack buffer already exists). +(defun gdb-xbacktrace () + "Generate a full lisp level backtrace with arguments." + (interactive) + (setq my-frames nil) + (with-current-buffer (get-buffer-create "xbacktrace") + (erase-buffer)) + (let (frame-number gdb-frame-number) + (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer) + (save-excursion + (goto-char (point-min)) + (while (search-forward "in Ffuncall " nil t) + (goto-char (line-beginning-position)) + (looking-at "^#\\([0-9]+\\)") + (push (match-string-no-properties 1) my-frames) + (forward-line 1)))) + (dolist (frame my-frames) + (gdb-enqueue-input (list (concat "server frame " frame "\n") + 'ignore)) +; (gdb-enqueue-input (list "server ppargs\n" 'gdb-get-arguments)) + (gud-basic-call "server ppargs") +) + (gdb-enqueue-input (list (concat "server frame " frame-number "\n") + 'ignore)))) + +(defun gdb-get-arguments () + (with-current-buffer "xbacktrace" + (insert-buffer-substring (gdb-get-buffer 'gdb-partial-output-buffer)))) + ;; Code specific to GDB 6.4 (defconst gdb-source-file-regexp-1 "fullname=\"\\(.*?\\)\"") diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el index d19f636ff93..a8d2d8b8fe1 100644 --- a/lisp/progmodes/glasses.el +++ b/lisp/progmodes/glasses.el @@ -1,6 +1,6 @@ ;;; glasses.el --- make cantReadThis readable -;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Milan Zamazal <pdm@zamazal.org> @@ -67,13 +67,31 @@ (defcustom glasses-separator "_" - "*String to be displayed as a visual separator in unreadable identifiers." + "*String to be displayed as a visual separator in identifiers. +It is used both for adding missing separators and for replacing separators +defined by `glasses-original-separator'. If you don't want to add missing +separators, set `glasses-separator' to an empty string. If you don't want to +replace existent separators, set `glasses-original-separator' to an empty +string." :group 'glasses :type 'string :set 'glasses-custom-set :initialize 'custom-initialize-default) +(defcustom glasses-original-separator "_" + "*String to be displayed as `glasses-separator' in separator positions. +For instance, if you set it to \"_\" and set `glasses-separator' to \"-\", +underscore separators are displayed as hyphens. +If `glasses-original-separator' is an empty string, no such display change is +performed." + :group 'glasses + :type 'string + :set 'glasses-custom-set + :initialize 'custom-initialize-default + :version "22.1") + + (defcustom glasses-face nil "*Face to be put on capitals of an identifier looked through glasses. If it is nil, no face is placed at the capitalized letter. @@ -196,15 +214,20 @@ CATEGORY is the overlay category. If it is nil, use the `glasses' category." (overlay-put o 'invisible t) (overlay-put o 'after-string (downcase (match-string n)))))) ;; Separator change - (unless (string= glasses-separator "_") + (when (and (not (string= glasses-original-separator glasses-separator)) + (not (string= glasses-original-separator ""))) (goto-char beg) - (while (re-search-forward "[a-zA-Z0-9]\\(_+\\)[a-zA-Z0-9]" end t) - (goto-char (match-beginning 1)) - (while (eql (char-after) ?\_) - (let ((o (glasses-make-overlay (point) (1+ (point))))) - ;; `concat' ensures the character properties won't merge - (overlay-put o 'display (concat glasses-separator))) - (forward-char)))) + (let ((original-regexp (regexp-quote glasses-original-separator))) + (while (re-search-forward + (format "[a-zA-Z0-9]\\(\\(%s\\)+\\)[a-zA-Z0-9]" + original-regexp) + end t) + (goto-char (match-beginning 1)) + (while (looking-at original-regexp) + (let ((o (glasses-make-overlay (point) (1+ (point))))) + ;; `concat' ensures the character properties won't merge + (overlay-put o 'display (concat glasses-separator))) + (goto-char (match-end 0)))))) ;; Parentheses (when glasses-separate-parentheses-p (goto-char beg) @@ -237,13 +260,13 @@ recognized according to the current value of the variable `glasses-separator'." (let ((n (if (match-string 1) 1 2))) (replace-match "" t nil nil n) (goto-char (match-end n)))) - (unless (string= glasses-separator "_") - (goto-char (point-min)) - (while (re-search-forward (format "[a-zA-Z0-9]\\(%s+\\)[a-zA-Z0-9]" - separator) - nil t) - (replace-match "_" nil nil nil 1) - (goto-char (match-beginning 1)))) + (unless (string= glasses-separator glasses-original-separator) + (goto-char (point-min)) + (while (re-search-forward (format "[a-zA-Z0-9]\\(%s+\\)[a-zA-Z0-9]" + separator) + nil t) + (replace-match glasses-original-separator nil nil nil 1) + (goto-char (match-beginning 1)))) (when glasses-separate-parentheses-p (goto-char (point-min)) (while (re-search-forward "[a-zA-Z]_*\\( \\)\(" nil t) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 48d1c09d138..0e151ce9be2 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -1,7 +1,7 @@ ;;; grep.el --- run Grep as inferior of Emacs, parse match messages ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Maintainer: FSF diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 92c3eb55884..b927c765476 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -5,7 +5,7 @@ ;; Keywords: unix, tools ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -3231,7 +3231,6 @@ Treats actions as defuns." ;;; Customizable settings -;;;###autoload (define-minor-mode gud-tooltip-mode "Toggle the display of GUD tooltips." :global t diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 1f843dea03c..04e44e2dac1 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1,6 +1,6 @@ ;;; hideif.el --- hides selected code within ifdef -;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004 2005 +;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index ddc0e277200..e7ed67ce61c 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -1,7 +1,7 @@ ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen <ttn@gnu.org> ;; Dan Nicolaescu <dann@ics.uci.edu> diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el index dc2cfd01683..393ba6dfb08 100644 --- a/lisp/progmodes/icon.el +++ b/lisp/progmodes/icon.el @@ -1,6 +1,6 @@ ;;; icon.el --- mode for editing Icon code -;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Chris Smith <csmith@convex.com> diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el index bc659666a08..cec25fcc25e 100644 --- a/lisp/progmodes/idlw-complete-structtag.el +++ b/lisp/progmodes/idlw-complete-structtag.el @@ -1,5 +1,6 @@ ;;; idlw-complete-structtag.el --- Completion of structure tags. -;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation +;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu> diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 0a848128032..17961fa7d9a 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1,7 +1,7 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE ;; Copyright (c) 2000 Carsten Dominik ;; Copyright (c) 2001, 2002 J.D. Smith -;; Copyright (c) 2003, 2004, 2005, Free Software Foundation +;; Copyright (c) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; ;; Authors: J.D. Smith <jdsmith@as.arizona.edu> ;; Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/progmodes/idlw-rinfo.el b/lisp/progmodes/idlw-rinfo.el index 367de774bcf..dfb08b289a5 100644 --- a/lisp/progmodes/idlw-rinfo.el +++ b/lisp/progmodes/idlw-rinfo.el @@ -1,7 +1,7 @@ ;;; idlw-rinfo.el --- Routine Information for IDLWAVE ;; Copyright (c) 1999 Carsten Dominik -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: J.D. Smith <jdsmith@as.arizona.edu> ;; Version: 5.7_22 diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 27360a54969..ff1bb7b689f 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -1,6 +1,6 @@ ;; idlw-shell.el --- run IDL as an inferior process of Emacs. -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: J.D. Smith <jdsmith@as.arizona.edu> ;; Carsten Dominik <dominik@astro.uva.nl> diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 08dd08335bb..af94d02ec91 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -1,6 +1,6 @@ ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@astro.uva.nl> ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu> diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 3ee01d07b0a..03d181da250 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -1,6 +1,6 @@ ;; idlwave.el --- IDL editing mode for GNU Emacs -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: J.D. Smith <jdsmith@as.arizona.edu> ;; Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 64845e38aea..092c7736c27 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -1,6 +1,6 @@ ;;; inf-lisp.el --- an inferior-lisp mode -;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index bdb386dc5e9..ec12468e5d9 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -1,6 +1,7 @@ ;;; ld-script.el --- GNU linker script editing mode for Emacs -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Masatake YAMATO<jet@gyve.org> ;; Keywords: languages, faces diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el index 84174e2ca5d..af719a2854b 100644 --- a/lisp/progmodes/m4-mode.el +++ b/lisp/progmodes/m4-mode.el @@ -1,6 +1,6 @@ ;;; m4-mode.el --- m4 code editing commands for Emacs -;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Andrew Csillag <drew_csillag@geocities.com> diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 42a021ec692..3bbfeaac683 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1,6 +1,6 @@ ;;; make-mode.el --- makefile editing commands for Emacs -;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Thomas Neumann <tom@smart.bo.open.de> diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el index 71791ef965b..d883254fdb7 100644 --- a/lisp/progmodes/mantemp.el +++ b/lisp/progmodes/mantemp.el @@ -1,6 +1,6 @@ ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output -;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Tom Houlder <thoulder@icor.fr> diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index d113f94280f..3c4fdc2330e 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -1,6 +1,6 @@ ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Ulrik Vieth <vieth@thphy.uni-duesseldorf.de> diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 741ae8097a0..8b7084675d4 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -1,6 +1,6 @@ ;;; mixal-mode.el --- Major mode for the mix asm language. -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as diff --git a/lisp/progmodes/octave-hlp.el b/lisp/progmodes/octave-hlp.el index f9654ef71cb..18ea9c1f699 100644 --- a/lisp/progmodes/octave-hlp.el +++ b/lisp/progmodes/octave-hlp.el @@ -1,6 +1,6 @@ ;;; octave-hlp.el --- getting help on Octave symbols using info -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el index 67b5b108fa5..b6e6e4fc456 100644 --- a/lisp/progmodes/octave-inf.el +++ b/lisp/progmodes/octave-inf.el @@ -1,6 +1,6 @@ ;;; octave-inf.el --- running Octave as an inferior Emacs process -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 56dac972472..5f52e6f4d3c 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -1,6 +1,6 @@ ;;; octave-mod.el --- editing Octave source files under Emacs -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index d462557f291..02d5c509c62 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -1,7 +1,7 @@ ;;; pascal.el --- major mode for editing pascal source in Emacs ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Espen Skoglund <esk@gnu.org> ;; Keywords: languages diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index f5a857f9015..b0e31bafc28 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -1,6 +1,6 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs -;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: William F. Mann diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 9191d5f95ee..14b47475eb1 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -1,6 +1,6 @@ ;;; prolog.el --- major mode for editing and running Prolog under Emacs -;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 299093b29bc..61b075b3bce 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -1,6 +1,6 @@ ;;; ps-mode.el --- PostScript mode for GNU Emacs -;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Peter Kleiweg <p.c.j.kleiweg@rug.nl> diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 0ed58fd558e..f110828d602 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1,6 +1,6 @@ ;;; python.el --- silly walks for Python -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Maintainer: FSF diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index 26d6e05fc2c..ce420015326 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -1,7 +1,7 @@ ;;; scheme.el --- Scheme (and DSSSL) editing mode -;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Bill Rozas <jinx@martigny.ai.mit.edu> ;; Adapted-by: Dave Love <d.love@dl.ac.uk> diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 51291d717b6..e331268391a 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1,7 +1,7 @@ ;;; sh-script.el --- shell-script editing commands for Emacs -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Version: 2.0f diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index eba9a03b2ae..891549ac2aa 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1,6 +1,6 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no> diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 6d73abb1432..ff5493de364 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -1,6 +1,6 @@ ;;; sql.el --- specialized comint.el for SQL interpreters -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index ed64de4c89c..d81a5fcf47b 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -1,6 +1,6 @@ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992-2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann <reto@gnu.org> ;; Rodney J. Whitby <software.vhdl-mode@rwhitby.net> diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 66d91dce3da..8ca7eb188ec 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -1,6 +1,6 @@ ;;; which-func.el --- print current function in mode line -;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Alex Rezinsky <alexr@msil.sps.mot.com> diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index d568bca5b75..4f1cd37a9f7 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -1,6 +1,6 @@ ;;; xscheme.el --- run MIT Scheme under Emacs -;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el index 090f0431218..0c3736fab9e 100644 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el @@ -1,6 +1,6 @@ ;;; ps-bdf.el --- BDF font file handler for ps-print -;; Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2001, 2006 Free Software Foundation, Inc. ;; Copyright (C) 1998, 1999, 2001, 2003 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index 1be2eafba9d..c4a19cd3871 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -1,7 +1,7 @@ ;;; ps-mule.el --- provide multi-byte character facility to ps-print ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br> ;; Kenichi Handa <handa@etl.go.jp> (multi-byte characters) diff --git a/lisp/ps-print.el b/lisp/ps-print.el index fc91e55a746..5307e1bf97c 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1,7 +1,7 @@ ;;; ps-print.el --- print text from the buffer as PostScript ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jim Thompson (was <thompson@wg2.waii.com>) ;; Jacques Duthen (was <duthen@cegelec-red.fr>) diff --git a/lisp/recentf.el b/lisp/recentf.el index 1106fea18b6..2afb0955c46 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -1,7 +1,7 @@ ;;; recentf.el --- setup a menu of recently opened files ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: July 19 1999 diff --git a/lisp/rect.el b/lisp/rect.el index a7a863e204b..63979cb967c 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -1,7 +1,7 @@ ;;; rect.el --- rectangle functions for GNU Emacs ;; Copyright (C) 1985, 1999, 2000, 2001, 2002, 2003, 2004 -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Didier Verna <didier@xemacs.org> ;; Keywords: internal diff --git a/lisp/register.el b/lisp/register.el index 14d7494633a..8dea532410c 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -1,7 +1,7 @@ ;;; register.el --- register commands for Emacs ;; Copyright (C) 1985, 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/repeat.el b/lisp/repeat.el index adaf8a4bb9a..b225b729def 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -1,6 +1,7 @@ ;;; repeat.el --- convenient way to repeat the previous command -;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Will Mengarini <seldon@eskimo.com> ;; Created: Mo 02 Mar 98 diff --git a/lisp/replace.el b/lisp/replace.el index 92b4be7fd7b..3187bbbbd36 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1,7 +1,7 @@ ;;; replace.el --- replace commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/reposition.el b/lisp/reposition.el index 7a6ea277b02..a87b72443df 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -1,7 +1,7 @@ ;;; reposition.el --- center a Lisp function or comment on the screen ;; Copyright (C) 1991, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu> ;; Created: Jan 1991 diff --git a/lisp/resume.el b/lisp/resume.el index 29ce253e4a2..0a719278266 100644 --- a/lisp/resume.el +++ b/lisp/resume.el @@ -1,6 +1,7 @@ ;;; resume.el --- process command line args from within a suspended Emacs job -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Joe Wells <jbw@bucsf.bu.edu> ;; Adapted-By: ESR diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el index a9f55ced0e4..e8f0ab74caa 100644 --- a/lisp/rfn-eshadow.el +++ b/lisp/rfn-eshadow.el @@ -1,7 +1,7 @@ ;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text ;; ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience minibuffer diff --git a/lisp/rot13.el b/lisp/rot13.el index 664e2cfadc6..449583ab8dd 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el @@ -1,6 +1,7 @@ ;;; rot13.el --- display a buffer in rot13 -;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 4763072a424..a441c3a112e 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -1,6 +1,7 @@ ;;; ruler-mode.el --- display a ruler in the header line -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Maintainer: David Ponce <david@dponce.com> diff --git a/lisp/s-region.el b/lisp/s-region.el index 06b5bb3f926..6bc4b481d7b 100644 --- a/lisp/s-region.el +++ b/lisp/s-region.el @@ -1,7 +1,7 @@ ;;; s-region.el --- set region using shift key ;; Copyright (C) 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: terminals diff --git a/lisp/savehist.el b/lisp/savehist.el index 6c6d936af6a..8b8ca9c0f8a 100644 --- a/lisp/savehist.el +++ b/lisp/savehist.el @@ -1,6 +1,6 @@ ;;; savehist.el --- Save minibuffer history. -;; Copyright (C) 1997, 2005 Free Software Foundation +;; Copyright (C) 1997, 2005, 2006 Free Software Foundation ;; Author: Hrvoje Niksic <hniksic@xemacs.org> ;; Keywords: minibuffer diff --git a/lisp/saveplace.el b/lisp/saveplace.el index 645b298ee66..a2bc18e9de1 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -1,7 +1,7 @@ ;;; saveplace.el --- automatically save place in files ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Maintainer: FSF diff --git a/lisp/sb-image.el b/lisp/sb-image.el index e1ed8d06a86..c608346cd02 100644 --- a/lisp/sb-image.el +++ b/lisp/sb-image.el @@ -1,6 +1,7 @@ ;;; sb-image --- Image management for speedbar -;;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, +;; 2006 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index f2a953f7a21..9e816480f38 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el @@ -1,6 +1,7 @@ ;;; scroll-all.el --- scroll all buffers together minor mode -;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com> ;; Keywords: scroll crisp brief lock diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 1fabb78dc49..69d696f7741 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -1,7 +1,7 @@ ;;; scroll-bar.el --- window system-independent scroll bar support ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: hardware diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el index e5fca2d1c6e..8eb3977752f 100644 --- a/lisp/scroll-lock.el +++ b/lisp/scroll-lock.el @@ -1,6 +1,6 @@ ;;; scroll-lock.el --- Scroll lock scrolling. -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de> ;; Maintainer: FSF diff --git a/lisp/select.el b/lisp/select.el index 1d8d13208fa..01d1af6edf1 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -4,7 +4,7 @@ ;; Keywords: internal ;; Copyright (C) 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Based partially on earlier release by Lucid. ;; This file is part of GNU Emacs. diff --git a/lisp/server.el b/lisp/server.el index 382befd5349..87fbf640f06 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1,7 +1,7 @@ ;;; server.el --- Lisp code for GNU Emacs running as server process ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: William Sommerfeld <wesommer@athena.mit.edu> ;; Maintainer: FSF diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index 8dd5f375daa..f5f8bac7edc 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -1,7 +1,7 @@ ;;; shadowfile.el --- automatic file copying ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: comm files diff --git a/lisp/shell.el b/lisp/shell.el index 84de8efd8df..f7eaeb84341 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1,7 +1,7 @@ ;;; shell.el --- specialized comint.el for running the shell ;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> ;; Simon Marshall <simon@gnu.org> diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 26d6613d1bf..0b3fc82f025 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -1,7 +1,7 @@ ;;; skeleton.el --- Lisp language extension for writing statement skeletons ;; Copyright (C) 1993, 1994, 1995, 1996, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Maintainer: FSF diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 87c572372b0..9fddc4b1a05 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,7 +1,7 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: tools revision-control merge diff3 cvs conflict diff --git a/lisp/sort.el b/lisp/sort.el index 6a008b82425..174a8531786 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -1,7 +1,7 @@ ;;; sort.el --- commands to sort text in an Emacs buffer ;; Copyright (C) 1986, 1987, 1994, 1995, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Howie Kaye ;; Maintainer: FSF diff --git a/lisp/soundex.el b/lisp/soundex.el index 58ba1872503..e48dbcf3bd6 100644 --- a/lisp/soundex.el +++ b/lisp/soundex.el @@ -1,6 +1,7 @@ ;;; soundex.el --- implement Soundex algorithm -;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> ;; Maintainer: FSF diff --git a/lisp/speedbar.el b/lisp/speedbar.el index a48f480a756..c3f949ead37 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -1,6 +1,7 @@ ;;; speedbar --- quick access to files and tags in a frame -;;; Copyright (C) 1996, 97, 98, 99, 00, 01, 02, 03, 04, 05 Free Software Foundation +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/strokes.el b/lisp/strokes.el index 84bff1b6ba0..bcf7656347e 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -1,7 +1,7 @@ ;;; strokes.el --- control Emacs through mouse strokes ;; Copyright (C) 1997, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David Bakhash <cadet@alum.mit.edu> ;; Maintainer: FSF diff --git a/lisp/subr.el b/lisp/subr.el index b97ed1ba566..3aad35d05e8 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1,7 +1,7 @@ ;;; subr.el --- basic lisp subroutines for Emacs ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -561,7 +561,7 @@ In other words, OLDDEF is replaced with NEWDEF where ever it appears. Alternatively, if optional fourth argument OLDMAP is specified, we redefine in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP. -For most uses, it is simpler and safer to use command remappping like this: +For most uses, it is simpler and safer to use command remapping like this: \(define-key KEYMAP [remap OLDDEF] NEWDEF)" ;; Don't document PREFIX in the doc string because we don't want to ;; advertise it. It's meant for recursive calls only. Here's its @@ -607,8 +607,7 @@ For most uses, it is simpler and safer to use command remappping like this: (nconc (nreverse skipped) newdef))) ;; Look past a symbol that names a keymap. (setq inner-def - (and defn - (condition-case nil (indirect-function defn) (error defn)))) + (or (indirect-function defn t) defn)) ;; For nested keymaps, we use `inner-def' rather than `defn' so as to ;; avoid autoloading a keymap. This is mostly done to preserve the ;; original non-autoloading behavior of pre-map-keymap times. diff --git a/lisp/tabify.el b/lisp/tabify.el index 84809839883..6e12270bf47 100644 --- a/lisp/tabify.el +++ b/lisp/tabify.el @@ -1,7 +1,7 @@ ;;; tabify.el --- tab conversion commands for Emacs ;; Copyright (C) 1985, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/talk.el b/lisp/talk.el index 0807e655703..8ec443b5d6e 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -1,6 +1,7 @@ ;;; talk.el --- allow several users to talk to each other through Emacs -;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: comm, frames diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 5a400ffbec4..f24a91d4145 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -1,7 +1,7 @@ ;;; tar-mode.el --- simple editing of tar files from GNU emacs ;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Maintainer: FSF diff --git a/lisp/tempo.el b/lisp/tempo.el index 62ba3c9acae..e65a8179518 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -1,7 +1,7 @@ ;;; tempo.el --- Flexible template insertion ;; Copyright (C) 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David K}gedal <davidk@lysator.liu.se> ;; Created: 16 Feb 1994 diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el index fda2da44ac8..adec1f1505f 100644 --- a/lisp/term/AT386.el +++ b/lisp/term/AT386.el @@ -3,7 +3,8 @@ ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Keywords: terminals -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/term/internal.el b/lisp/term/internal.el index e9de649158a..0cbb3ae10f6 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -1,7 +1,7 @@ ;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*- ;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 1a3a65fa716..c68aa7f8984 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -1,6 +1,7 @@ ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- -;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <dann@ics.uci.edu> diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index dea988868eb..ba0466f9c6f 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1,7 +1,7 @@ ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Andrew Choi <akochoi@mac.com> ;; Keywords: terminals @@ -1918,9 +1918,9 @@ It returns a name of the created fontset." ;; characters decoded from mac-roman encoding (ascii, latin-iso8859-1, ;; and mule-unicode-xxxx-yyyy) are displayed by a mac-roman font. (create-fontset-from-fontset-spec - "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-mac, + "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-standard, ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman") -(fontset-add-mac-fonts "fontset-mac" t) +(fontset-add-mac-fonts "fontset-standard" t) ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). (create-fontset-from-x-resource) diff --git a/lisp/term/news.el b/lisp/term/news.el index ab2d10158c8..eaf662c8cfc 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el @@ -1,7 +1,7 @@ ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- ;; Copyright (C) 1989, 1993, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index bdaef8813e7..fd63e5a1db9 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -1,7 +1,7 @@ ;;; pc-win.el --- setup support for `PC windows' (whatever that is) ;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Maintainer: FSF diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 79994403301..fe29b87f2e6 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -1,6 +1,6 @@ ;;; rxvt.el --- define function key sequences and standard colors for rxvt -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Keywords: terminals diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el index a55c8902320..329e88e23e6 100644 --- a/lisp/term/sun-mouse.el +++ b/lisp/term/sun-mouse.el @@ -1,6 +1,7 @@ ;;; sun-mouse.el --- mouse handling for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck ;; Maintainer: FSF diff --git a/lisp/term/sun.el b/lisp/term/sun.el index 99e3ec28c7c..8913fa98268 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el @@ -1,7 +1,7 @@ ;;; sun.el --- keybinding for standard default sunterm keys ;; Copyright (C) 1987, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck <peck@sun.com> ;; Keywords: terminals diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el index 54da5b34505..ebc406d8206 100644 --- a/lisp/term/sup-mouse.el +++ b/lisp/term/sup-mouse.el @@ -1,7 +1,7 @@ ;;; sup-mouse.el --- supdup mouse support for lisp machines ;; Copyright (C) 1985, 1986, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Wolfgang Rupprecht ;; Maintainer: FSF diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index 6fcf5d3edba..c03aebf4068 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el @@ -1,7 +1,7 @@ ;;; tty-colors.el --- color support for character terminals ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Maintainer: FSF diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index 647e4cc2745..bcdf886638f 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el @@ -3,7 +3,8 @@ ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992 ;; Keywords: terminals -;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el index 9822bd6e5a2..d17f61bc782 100644 --- a/lisp/term/vt100.el +++ b/lisp/term/vt100.el @@ -1,7 +1,7 @@ ;;; vt100.el --- define VT100 function key sequences in function-key-map ;; Copyright (C) 1989, 1993, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el index d561329d9c6..07de09914d1 100644 --- a/lisp/term/wyse50.el +++ b/lisp/term/wyse50.el @@ -1,7 +1,7 @@ ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- ;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org>, ;; Jim Blandy <jimb@occs.cs.oberlin.edu> diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index a61577215e5..db31dc36684 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1,7 +1,7 @@ ;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals, i18n diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 399385b4fc4..049d65c62fa 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -1,6 +1,7 @@ ;;; xterm.el --- define function key sequences and standard colors for xterm -;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/terminal.el b/lisp/terminal.el index 645d7a6bd6a..63092e3caea 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el @@ -1,7 +1,7 @@ ;;; terminal.el --- terminal emulator for GNU Emacs ;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> ;; Maintainer: FSF diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index b13b080cf79..9305bdbf9bc 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1,7 +1,7 @@ ;;; artist.el --- draw ascii graphics with your mouse ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Tomas Abrahamsson <tab@lysator.liu.se> ;; Maintainer: Tomas Abrahamsson <tab@lysator.liu.se> diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el index 6609673289b..1c4dacf71d8 100644 --- a/lisp/textmodes/bib-mode.el +++ b/lisp/textmodes/bib-mode.el @@ -1,6 +1,7 @@ ;;; bib-mode.el --- major mode for editing bib files -;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: bib diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index c708355ce7e..f1e055594b7 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1,7 +1,7 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs ;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de> ;; Bengt Martensson <bengt@mathematik.uni-Bremen.de> diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 764c831d1b3..e762f87f328 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -1,6 +1,6 @@ ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Keywords: conf ini windows java diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index 12f99ba090e..a323d4c4468 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -1,6 +1,6 @@ ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files -;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: DNS master zone file SOA diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el index dc8d4c96b2b..1c81b5cf25e 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -1,7 +1,7 @@ ;;; enriched.el --- read and save files in text/enriched format ;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: wp, faces diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 48defb7d786..f472743ef16 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -1,7 +1,7 @@ ;;; fill.el --- fill commands for Emacs -*- coding: iso-2022-7bit -*- ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index 542c4829e9c..26a47a65e84 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -1,7 +1,7 @@ ;;; makeinfo.el --- run makeinfo conveniently ;; Copyright (C) 1991, 1993, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: FSF diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el index ababc041099..4a07b091e2a 100644 --- a/lisp/textmodes/nroff-mode.el +++ b/lisp/textmodes/nroff-mode.el @@ -42,8 +42,9 @@ :group 'wp :prefix "nroff-") + (defcustom nroff-electric-mode nil - "*Non-nil means automatically closing requests when you insert an open." + "Non-nil means automatically closing requests when you insert an open." :group 'nroff :type 'boolean) @@ -51,10 +52,10 @@ (let ((map (make-sparse-keymap))) (define-key map "\t" 'tab-to-tab-stop) (define-key map "\es" 'center-line) - (define-key map "\e?" 'count-text-lines) - (define-key map "\n" 'electric-nroff-newline) - (define-key map "\en" 'forward-text-line) - (define-key map "\ep" 'backward-text-line) + (define-key map "\e?" 'nroff-count-text-lines) + (define-key map "\n" 'nroff-electric-newline) + (define-key map "\en" 'nroff-forward-text-line) + (define-key map "\ep" 'nroff-backward-text-line) map) "Major mode keymap for `nroff-mode'.") @@ -66,7 +67,7 @@ (modify-syntax-entry ?\" "\" 2" st) ;; Comments are delimited by \" and newline. (modify-syntax-entry ?\\ "\\ 1" st) - (modify-syntax-entry ?\n "> 1" st) + (modify-syntax-entry ?\n ">" st) st) "Syntax table used while in `nroff-mode'.") @@ -116,7 +117,6 @@ closing requests for requests that are used in matched pairs." ;; near the end of large buffers due to searching to buffer's ;; beginning. '(nroff-font-lock-keywords nil t nil backward-paragraph)) - (set (make-local-variable 'nroff-electric-mode) nil) (set (make-local-variable 'outline-regexp) "\\.H[ ]+[1-7]+ ") (set (make-local-variable 'outline-level) 'nroff-outline-level) ;; now define a bunch of variables for use by commands in this mode @@ -138,8 +138,8 @@ closing requests for requests that are used in matched pairs." (skip-chars-forward ".H ") (string-to-number (buffer-substring (point) (+ 1 (point)))))) -;;; Compute how much to indent a comment in nroff/troff source. -;;; By mit-erl!gildea April 86 +;; Compute how much to indent a comment in nroff/troff source. +;; By mit-erl!gildea April 86 (defun nroff-comment-indent () "Compute indent for an nroff/troff comment. Puts a full-stop before comments on a line by themselves." @@ -161,21 +161,21 @@ Puts a full-stop before comments on a line by themselves." 9) 8)))))) ; add 9 to ensure at least two blanks (goto-char pt)))) -(defun count-text-lines (start end &optional print) +(defun nroff-count-text-lines (start end &optional print) "Count lines in region, except for nroff request lines. All lines not starting with a period are counted up. Interactively, print result in echo area. Noninteractively, return number of non-request lines from START to END." (interactive "r\np") (if print - (message "Region has %d text lines" (count-text-lines start end)) + (message "Region has %d text lines" (nroff-count-text-lines start end)) (save-excursion (save-restriction (narrow-to-region start end) (goto-char (point-min)) (- (buffer-size) (forward-text-line (buffer-size))))))) -(defun forward-text-line (&optional cnt) +(defun nroff-forward-text-line (&optional cnt) "Go forward one nroff text line, skipping lines of nroff requests. An argument is a repeat count; if negative, move backward." (interactive "p") @@ -193,11 +193,11 @@ An argument is a repeat count; if negative, move backward." (setq cnt (+ cnt 1))) cnt) -(defun backward-text-line (&optional cnt) +(defun nroff-backward-text-line (&optional cnt) "Go backward one nroff text line, skipping lines of nroff requests. An argument is a repeat count; negative means move forward." (interactive "p") - (forward-text-line (- cnt))) + (nroff-forward-text-line (- cnt))) (defconst nroff-brace-table '((".(b" . ".)b") @@ -235,7 +235,7 @@ An argument is a repeat count; negative means move forward." (".nf" . ".fi") (".de" . ".."))) -(defun electric-nroff-newline (arg) +(defun nroff-electric-newline (arg) "Insert newline for nroff mode; special if electric-nroff mode. In `electric-nroff-mode', if ending a line containing an nroff opening request, automatically inserts the matching closing request after point." @@ -256,23 +256,23 @@ automatically inserts the matching closing request after point." (if needs-nl (insert "\n"))) (forward-char 1)))) -(defun electric-nroff-mode (&optional arg) +(define-minor-mode nroff-electric-mode "Toggle `nroff-electric-newline' minor mode. `nroff-electric-newline' forces Emacs to check for an nroff request at the beginning of the line, and insert the matching closing request if necessary. This command toggles that mode (off->on, on->off), with an argument, turns it on iff arg is positive, otherwise off." - (interactive "P") - (or (eq major-mode 'nroff-mode) (error "Must be in nroff mode")) - (or (assq 'nroff-electric-mode minor-mode-alist) - (setq minor-mode-alist (append minor-mode-alist - (list '(nroff-electric-mode - " Electric"))))) - (setq nroff-electric-mode - (cond ((null arg) (null nroff-electric-mode)) - (t (> (prefix-numeric-value arg) 0))))) + :lighter " Electric" + (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode"))) + +;; Old names that were not namespace clean. +(define-obsolete-function-alias 'count-text-lines 'nroff-count-text-lines "22.1") +(define-obsolete-function-alias 'forward-text-line 'nroff-forward-text-line "22.1") +(define-obsolete-function-alias 'backward-text-line 'nroff-backward-text-line "22.1") +(define-obsolete-function-alias 'electric-nroff-newline 'nroff-electric-newline "22.1") +(define-obsolete-function-alias 'electric-nroff-mode 'nroff-electric-mode "22.1") (provide 'nroff-mode) -;;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c +;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c ;;; nroff-mode.el ends here diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 0381854542a..3c70314703b 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -1,6 +1,6 @@ ;;; org.el --- Outline-based notes management and organize ;; Carstens outline-mode for keeping track of everything. -;; Copyright (c) 2004, 2005, 2006 Free Software Foundation +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <dominik at science dot uva dot nl> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index 365ed19d9ce..280a8d28020 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -1,7 +1,7 @@ ;;; page-ext.el --- extended page handling commands ;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell <bob@gnu.org> ;; Keywords: wp data diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el index 3ec1eca1fb7..20458491808 100644 --- a/lisp/textmodes/page.el +++ b/lisp/textmodes/page.el @@ -1,6 +1,7 @@ ;;; page.el --- page motion commands for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp convenience diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index b196001c799..927fa644b9d 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -1,7 +1,7 @@ ;;; paragraphs.el --- paragraph and sentence parsing ;; Copyright (C) 1985, 1986, 1987, 1991, 1994, 1995, 1996, 1997, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 78741065100..1c3e1baa9b1 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -1,7 +1,7 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model ;; Copyright (C) 1985, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index c9af801bef0..07b9ba1a2b1 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -1,7 +1,7 @@ ;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*- ;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: François Pinard <pinard@iro.umontreal.ca>, ;; Greg McGary <gkm@magilla.cichlid.com>, diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index 99e2b780999..25613cff8ca 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -1,6 +1,7 @@ ;;; refbib.el --- convert refer-style references to ones usable by Latex bib -;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Henry Kautz <kautz@research.att.com> ;; Maintainer: FSF diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el index 9fa0afe2046..ce0f96956df 100644 --- a/lisp/textmodes/refer.el +++ b/lisp/textmodes/refer.el @@ -1,7 +1,7 @@ ;;; refer.el --- look up references in bibliography files ;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ashwin Ram <ashwin@cc.gatech.edu> ;; Maintainer: Gernot Heiser <gernot@acm.org> diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el index bf8938a7ec5..28ecd3bb4fe 100644 --- a/lisp/textmodes/refill.el +++ b/lisp/textmodes/refill.el @@ -1,6 +1,7 @@ ;;; refill.el --- `auto-fill' by refilling paragraphs on changes -;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Maintainer: Miles Bader <miles@gnu.org> diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 65815dd2885..ff044230803 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -1,6 +1,6 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG @@ -75,7 +75,7 @@ What is being used depends upon `reftex-plug-into-AUCTeX'." (defun reftex-arg-index-tag (optional &optional prompt &rest args) - "Prompt for an index tag with completion. + "Prompt for an index tag with completion. This is the name of an index, not the entry." (let (tag taglist) (setq prompt (concat (if optional "(Optional) " "") @@ -85,8 +85,8 @@ This is the name of an index, not the entry." ;; Use RefTeX completion (progn (reftex-access-scan-info nil) - (setq taglist - (cdr (assoc 'index-tags + (setq taglist + (cdr (assoc 'index-tags (symbol-value reftex-docstruct-symbol))) tag (completing-read prompt (mapcar 'list taglist)))) ;; Just ask like AUCTeX does. @@ -131,7 +131,7 @@ argument identify one of multiple indices." ;; Replace AUCTeX functions with RefTeX functions. ;; Which functions are replaced is controlled by the variable ;; `reftex-plug-into-AUCTeX'. - + (if (reftex-plug-flag 0) (setq LaTeX-label-function 'reftex-label) (setq LaTeX-label-function nil)) @@ -143,11 +143,11 @@ argument identify one of multiple indices." (and (reftex-plug-flag 3) (fboundp 'TeX-arg-cite) (fset 'TeX-arg-cite 'reftex-arg-cite)) - - (and (reftex-plug-flag 4) + + (and (reftex-plug-flag 4) (fboundp 'TeX-arg-index-tag) (fset 'TeX-arg-index-tag 'reftex-arg-index-tag)) - (and (reftex-plug-flag 4) + (and (reftex-plug-flag 4) (fboundp 'TeX-arg-index) (fset 'TeX-arg-index 'reftex-arg-index))) diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index cb85ea201fa..c6f43a07d26 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -1,6 +1,6 @@ ;;; reftex-cite.el --- creating citations with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 56adf2956c6..7546c654f70 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -1,6 +1,6 @@ ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index 580a0c8e314..fafc1a30998 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -1,6 +1,6 @@ ;;; reftex-global.el --- operations on entire documents with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index 65025645c0d..a7e7203a639 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1,6 +1,6 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 032bcba7dc9..ce43840c888 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -1,6 +1,6 @@ ;;; reftex-parse.el --- parser functions for RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index c250806c118..f1a8d6d3965 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -1,6 +1,6 @@ ;;; reftex-ref.el --- code to create labels and references with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index f4fc8368a50..9aa7edbf438 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -1,6 +1,6 @@ ;;; reftex-sel.el --- the selection modes for RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2440, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2440, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 541b3091af0..f9eb3cfef82 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -1,6 +1,6 @@ ;;; reftex-toc.el --- RefTeX's table of contents mode -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 01e8a1b4ddf..b8eddcd0386 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1,6 +1,6 @@ ;;; reftex-vars.el --- configuration variables for RefTeX -;; Copyright (c) 1997, 1998, 1999, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 386f19f1797..cb2e960225d 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1,6 +1,6 @@ ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: VERSIONTAG diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 77f625b8456..ff6df4a5a56 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -1,7 +1,7 @@ ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- coding: iso-2022-7bit -*- ;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: James Clark <jjc@jclark.com> ;; Maintainer: FSF diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el index 077e9b0fd35..ddc6788123d 100644 --- a/lisp/textmodes/spell.el +++ b/lisp/textmodes/spell.el @@ -1,6 +1,7 @@ ;;; spell.el --- spelling correction interface for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp, unix diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index bdd4e659a0e..97153e31a25 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,7 +1,7 @@ ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*- ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tex diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 15a15eb37fb..8794ebddc15 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, ;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org> ;; Keywords: maint, tex, docs diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 8392e56dc00..36603174948 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -1,7 +1,7 @@ ;;; texinfo.el --- major mode for editing Texinfo files -*- coding: iso-2022-7bit -*- ;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Date: [See date below for texinfo-version] diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index 110981d33b0..29af72162d0 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -1,7 +1,7 @@ ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files ;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: bug-texinfo@gnu.org diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 5e4cfc88471..a4b67057676 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -1,7 +1,7 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands ;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 1810e41cbca..bf6edac230c 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -1,7 +1,7 @@ ;;; tildify.el --- adding hard spaces into texts ;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Version: 4.5 diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 1e83b7a725b..b8ab100c19d 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,7 +1,7 @@ ;;; two-column.el --- minor mode for editing of two-column text ;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Adapted-By: ESR, Daniel Pfeiffer diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el index 3c67307da51..8e8ef3b399e 100644 --- a/lisp/textmodes/underline.el +++ b/lisp/textmodes/underline.el @@ -1,6 +1,7 @@ ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index c76a3bf2d70..27fecacdd36 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -1,7 +1,7 @@ ;;; thingatpt.el --- get the `thing' at point ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000 -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz> ;; Maintainer: FSF diff --git a/lisp/thumbs.el b/lisp/thumbs.el index bcab502b0f4..ff5fcf2b33c 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -1,6 +1,6 @@ ;;; thumbs.el --- Thumbnails previewer for images files -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca> ;; Maintainer: FSF diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el index 7020dd0c2b7..3e3fcf78ae6 100644 --- a/lisp/time-stamp.el +++ b/lisp/time-stamp.el @@ -1,11 +1,11 @@ ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs ;; Copyright (C) 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. -;; Maintainer's Time-stamp: <2004-09-25 20:55:35 gildea> +;; Maintainer's Time-stamp: <2006-02-06 15:11:58 ttn> ;; Maintainer: Stephen Gildea <gildea@stop.mail-abuse.org> ;; Keywords: tools diff --git a/lisp/time.el b/lisp/time.el index 614bb055b25..115681c1b58 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -1,7 +1,7 @@ ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*- ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/timezone.el b/lisp/timezone.el index 7093aec22a4..2529f7da865 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el @@ -1,7 +1,7 @@ ;;; timezone.el --- time zone package for GNU Emacs ;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu Umeda ;; Maintainer: umerin@mse.kyutech.ac.jp diff --git a/lisp/tmm.el b/lisp/tmm.el index f73e3fa0980..86c326616aa 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el @@ -1,7 +1,7 @@ ;;; tmm.el --- text mode access to menu-bar ;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu> ;; Maintainer: FSF diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el index 15321a4ffd8..0a1d706a694 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -1,7 +1,7 @@ ;;; tool-bar.el --- setting up the tool bar ;; ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Dave Love <fx@gnu.org> ;; Keywords: mouse frames diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 5d19e8cfba4..8dc811c09e6 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -1,7 +1,7 @@ ;;; tooltip.el --- show tooltip windows ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@acm.org> ;; Keywords: help c mouse tools diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el index 8ee1d5f9ed9..55385d42e95 100644 --- a/lisp/tree-widget.el +++ b/lisp/tree-widget.el @@ -1,6 +1,6 @@ ;;; tree-widget.el --- Tree widget -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Maintainer: David Ponce <david@dponce.com> diff --git a/lisp/tumme.el b/lisp/tumme.el index 91d7f72b5b9..8f75da24ca2 100644 --- a/lisp/tumme.el +++ b/lisp/tumme.el @@ -1,8 +1,8 @@ ;;; tumme.el --- use dired to browse and manipulate your images ;; -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. ;; -;; Version: 0.4.10 +;; Version: 0.4.11 ;; Keywords: multimedia ;; Author: Mathias Dahl <mathias.rem0veth1s.dahl@gmail.com> @@ -57,8 +57,8 @@ ;; ;; `tumme' stores the thumbnail files in `tumme-dir' using the file ;; name format ORIGNAME.thumb.ORIGEXT. For example -;; ~/.tumme/myimage01.thumb.jpg. The "database" is for now just a -;; plain text file with the following format: +;; ~/.emacs.d/tumme/myimage01.thumb.jpg. The "database" is for now +;; just a plain text file with the following format: ;; ;; file-name-non-directory;comment:comment-text;tag1;tag2;tag3;...;tagN ;; @@ -128,11 +128,6 @@ ;; LIMITATIONS ;; =========== ;; -;; * In order to work well, `tumme' require that all your images have -;; unique names. The reason is the way thumbnail file names are -;; generated. I will probably not fix this problem as my images all -;; have unique names. -;; ;; * Supports all image formats that Emacs and convert supports, but ;; the thumbnails are hard-coded to JPEG format. ;; @@ -489,10 +484,41 @@ ;; * To be included in Emacs 22. ;; ;; +;; Version 0.4.11, 2006-MM-DD +;; +;; * Changed `tumme-display-thumbs' so that it calls `display-buffer' +;; after generating the thumbnails and changed +;; `tumme-display-thumbnail-original-image' to display the image +;; buffer. These small changes should make it easier for a user to +;; start using tumme. +;; +;; * Added `tumme-show-all-from-dir' to mimic thumbs.el's easy-to-use +;; `thumbs' command. A new customize option, +;; `tumme-show-all-from-dir-max-files' was added too. +;; +;; * Renamed `tumme-dired' to `tumme-dired-with-window-configuration' +;; and added code to save the window configuration before messing it +;; up. The saved window configuration can be restored using the new +;; command `tumme-restore-window-configuration'. +;; +;; * Added `tumme-get-thumbnail-image', created by Chong Yidong. His +;; own comments: ..., that just takes the original filename and +;; returns a thumbnail image descriptor. Then third-party libraries +;; won't have to muck around with tumme.el's internal functions like +;; `thumme-thumb-name', `tumme-create-thumb', etc. His code to get +;; speedbar display tumme thumbnails, might be integrated soon. +;; +;; * Changed the default value of `tumme-dir' to "~/.emacs.d/tumme" +;; and added a new function, `tumme-dir' to handle the creating of +;; it. Code copied from thumbs.el. +;; ;; ;; TODO ;; ==== ;; +;; * Look into supporting the Thumbnail Managing Standard, maybe as a +;; configurable option. +;; ;; * Support gallery creation when using per-directory thumbnail ;; storage. ;; @@ -506,10 +532,16 @@ ;; files. ;; ;; * From thumbs.el: Add an option for clean-up/max-size functionality -;; for thumbnail directory. +;; for thumbnail directory. ;; ;; * From thumbs.el: Add setroot function. ;; +;; * From thumbs.el: Add image resizing, if useful (tumme's automatic +;; "image fit" might be enough) +;; +;; * From thumbs.el: Add the "modify" commands (emboss, negate, +;; monochrome etc). +;; ;; * Asynchronous creation of thumbnails. ;; ;; * Add `tumme-display-thumbs-ring' and functions to cycle that. Find @@ -524,7 +556,8 @@ ;; `dired-next-line' and `dired-previous-line' figure out if tumme is ;; enabled in the current buffer and, if it is, call ;; `tumme-dired-next-line' and `tumme-dired-previous-line', -;; respectively. +;; respectively. Update: This is partly done; some bindings have now +;; been added to dired. ;; ;; * Enhanced gallery creation with basic CSS-support and pagination ;; of tag pages with many pictures. @@ -548,8 +581,8 @@ :prefix "tumme-" :group 'files) -(defcustom tumme-dir "~/.tumme/" - "*Directory where thumbnail images for are stored." +(defcustom tumme-dir "~/.emacs.d/tumme/" + "*Directory where thumbnail images are stored." :type 'string :group 'tumme) @@ -565,17 +598,17 @@ means that each thumbnail is stored in a subdirectory called (const :tag "Per-directory" per-directory)) :group 'tumme) -(defcustom tumme-db-file "~/.tumme/.tumme_db" +(defcustom tumme-db-file "~/.emacs.d/tumme/.tumme_db" "*Database file where file names and their associated tags are stored." :type 'string :group 'tumme) -(defcustom tumme-temp-image-file "~/.tumme/.tumme_temp" +(defcustom tumme-temp-image-file "~/.emacs.d/tumme/.tumme_temp" "*Name of temporary image file used by various commands." :type 'string :group 'tumme) -(defcustom tumme-gallery-dir "~/.tumme/.tumme_gallery" +(defcustom tumme-gallery-dir "~/.emacs.d/tumme/.tumme_gallery" "*Directory to store generated gallery html pages. This path needs to be \"shared\" to the public so that it can access the index.html page that tumme creates." @@ -667,12 +700,12 @@ Available options are %p which is replaced by number of (positive) degrees to rotate the image, normally 90 or 270 \(for 90 degrees right and left), %o which is replaced by the original image file name and %t which is replaced by -`tumme-temp-image-file'" +`tumme-temp-image-file'." :type 'string :group 'tumme) (defcustom tumme-temp-rotate-image-file - "~/.tumme/.tumme_rotate_temp" + "~/.emacs.d/tumme/.tumme_rotate_temp" "*Temporary file for rotate operations." :type 'string :group 'tumme) @@ -760,7 +793,7 @@ line-up means that no automatic line-up will be done." :group 'tumme) (defcustom tumme-display-window-width-correction 1 - "*Number to be used to correct image display window height. + "*Number to be used to correct image display window width. Change if the default (1) does not work (i.e. if the image does not completely fit)." :type 'integer @@ -768,7 +801,7 @@ completely fit)." (defcustom tumme-display-window-height-correction 0 "*Number to be used to correct image display window height. -Use if the default (0) does not work (i.e. if the image does not +Change if the default (0) does not work (i.e. if the image does not completely fit)." :type 'integer :group 'tumme) @@ -801,7 +834,7 @@ dired and you might want to turn it off." :group 'tumme) (defcustom tumme-display-properties-format "%b: %f (%t): %c" - "* Display format for thumbnail properties. + "*Display format for thumbnail properties. %b is replaced with associated dired buffer name, %f with file name \(without path) of original image file, %t with the list of tags and %c with the comment." @@ -821,6 +854,22 @@ Used by `tumme-copy-with-exif-file-name'." :type 'string :group 'tumme) +(defcustom tumme-show-all-from-dir-max-files 50 + "*Maximum number of files to show using`tumme-show-all-from-dir'. +before warning the user." + :type 'integer + :group 'tumme) + +(defun tumme-dir () + "Return the current thumbnails directory (from `tumme-dir'). +Create the thumbnails directory if it does not exist." + (let ((tumme-dir (file-name-as-directory + (expand-file-name tumme-dir)))) + (unless (file-directory-p tumme-dir) + (make-directory tumme-dir t) + (message "Creating thumbnails directory")) + tumme-dir)) + (defun tumme-insert-image (file type relief margin) "Insert image FILE of image TYPE, using RELIEF and MARGIN, at point." @@ -830,6 +879,18 @@ Used by `tumme-copy-with-exif-file-name'." :margin ,margin))) (insert-image i))) +(defun tumme-get-thumbnail-image (file) + "Return the image descriptor for a thumbnail of image file FILE." + (unless (string-match (image-file-name-regexp) file) + (error "%s is not a valid image file" file)) + (let ((thumb-file (tumme-thumb-name file))) + (unless (and (file-exists-p thumb-file) + (<= (float-time (nth 5 (file-attributes file))) + (float-time (nth 5 (file-attributes thumb-file))))) + (tumme-create-thumb file thumb-file)) + (list 'image :type 'jpeg :file thumb-file + :relief tumme-thumb-relief :margin tumme-thumb-margin))) + (defun tumme-insert-thumbnail (file original-file-name associated-dired-buffer) "Insert thumbnail image FILE. @@ -867,7 +928,7 @@ add a subdirectory." ;; be used here. (setq md5-hash (md5 (file-name-as-directory (file-name-directory file)))) - (file-name-as-directory (expand-file-name tumme-dir))) + (file-name-as-directory (expand-file-name (tumme-dir)))) ((eq 'per-directory tumme-thumbnail-storage) (format "%s.tumme/" (file-name-directory f)))) @@ -969,8 +1030,11 @@ add a subdirectory." (tumme-display-image-mode))) buf)) +(defvar tumme-saved-window-configuration nil + "Saved window configuration.") + ;;;###autoload -(defun tumme-dired (dir &optional arg) +(defun tumme-dired-with-window-configuration (dir &optional arg) "Open directory DIR and create a default window configuration. Convenience command that: @@ -979,11 +1043,21 @@ Convenience command that: - Splits windows in most useful (?) way - Set `truncate-lines' to t -If called with prefix argument ARG, skip splitting of windows." +After the command has finished, you would typically mark some +image files in dired and type +\\[tumme-display-thumbs] (`tumme-display-thumbs'). + +If called with prefix argument ARG, skip splitting of windows. + +The current window configuration is saved and can be restored by +calling `tumme-restore-window-configuration'." (interactive "DDirectory: \nP") (let ((buf (tumme-create-thumbnail-buffer)) (buf2 (tumme-create-display-image-buffer))) + (setq tumme-saved-window-configuration + (current-window-configuration)) (dired dir) + (delete-other-windows) (when (not arg) (split-window-horizontally) (setq truncate-lines t) @@ -995,6 +1069,16 @@ If called with prefix argument ARG, skip splitting of windows." (switch-to-buffer buf2) (other-window -2))))) +(defun tumme-restore-window-configuration () + "Restore window configuration. +Restore any changes to the window configuration made by calling +`tumme-dired-with-window-configuration'." + (interactive) + (if tumme-saved-window-configuration + (set-window-configuration tumme-saved-window-configuration) + (message "No saved window configuration"))) + +;;;###autoload (defun tumme-display-thumbs (&optional arg append) "Display thumbnails of all marked files, in `tumme-thumbnail-buffer'. If a thumbnail image does not exist for a file, it is created on the @@ -1038,7 +1122,31 @@ instead of erasing it first." ((eq 'none tumme-line-up-method) nil) (t - (tumme-line-up-dynamic)))))) + (tumme-line-up-dynamic)))) + (pop-to-buffer tumme-thumbnail-buffer))) + +(defun tumme-show-all-from-dir (dir) + "Make a preview buffer for all images in DIR and display it. +If the number of files in DIR matching `image-file-name-regexp' +exceeds `tumme-show-all-from-dir-max-files', a warning will be +displayed." + (interactive "DDir: ") + (dired dir) + (dired-mark-files-regexp (image-file-name-regexp)) + (let ((files (dired-get-marked-files))) + (if (or (<= (length files) tumme-show-all-from-dir-max-files) + (and (> (length files) tumme-show-all-from-dir-max-files) + (y-or-n-p + (format + "Directory contains more than %d image files. Proceed? " + tumme-show-all-from-dir-max-files)))) + (progn + (tumme-display-thumbs) + (pop-to-buffer tumme-thumbnail-buffer)) + (message "Cancelled.")))) + +;;;###autoload +(defalias 'tumme 'tumme-show-all-from-dir) (defun tumme-write-tag (files tag) "For all FILES, writes TAG to the image database." @@ -1125,6 +1233,7 @@ instead of erasing it first." (kill-buffer buf) (split-string tags ";")))) +;;;###autoload (defun tumme-tag-files (arg) "Tag marked file(s) in dired. With prefix ARG, tag file at point." (interactive "P") @@ -1143,6 +1252,7 @@ instead of erasing it first." (tumme-update-property 'tags (tumme-list-tags (tumme-original-file-name)))) +;;;###autoload (defun tumme-tag-remove (arg) "Remove tag for selected file(s). With prefix argument ARG, remove tag from file at point." @@ -1310,7 +1420,7 @@ move ARG lines." (defun tumme-format-properties-string (buf file props comment) "Format display properties. BUF is the associated dired buffer, FILE is the original image file -name, PROPS is a list of tags and COMMENT is the images files's +name, PROPS is a list of tags and COMMENT is the image files's comment." (format-spec tumme-display-properties-format @@ -1406,6 +1516,7 @@ You probably want to use this together with (select-window window)) (message "Associated dired buffer not visible")))) +;;;###autoload (defun tumme-jump-thumbnail-buffer () "Jump to thumbnail buffer." (interactive) @@ -1804,11 +1915,13 @@ Ask user for number of images to show and the delay in between." (if (looking-at " ") (delete-char 1)))) +;;;###autoload (defun tumme-display-thumbs-append () "Append thumbnails to `tumme-thumbnail-buffer'." (interactive) (tumme-display-thumbs nil t)) +;;;###autoload (defun tumme-display-thumb () "Shorthard for `tumme-display-thumbs' with prefix argument." (interactive) @@ -1845,7 +1958,7 @@ See also `tumme-line-up-dynamic'." (defun tumme-line-up-dynamic () "Line up thumbnails images dynamically. -Calculate how many thumbnails that fits." +Calculate how many thumbnails fit." (interactive) (let* ((char-width (frame-char-width)) (width (tumme-window-width-pixels (tumme-thumbnail-window))) @@ -1858,7 +1971,7 @@ Calculate how many thumbnails that fits." (defun tumme-line-up-interactive () "Line up thumbnails interactively. -Ask user how many thumbnails that should be displayed per row." +Ask user how many thumbnails should be displayed per row." (interactive) (let ((tumme-thumbs-per-row (string-to-number (read-string "How many thumbs per row: ")))) @@ -1879,6 +1992,7 @@ Ask user how many thumbnails that should be displayed per row." tumme-external-viewer file)))))) +;;;###autoload (defun tumme-dired-display-external () "Display file at point using an external viewer." (interactive) @@ -1984,8 +2098,10 @@ With prefix argument ARG, display image in its original size." (message "No thumbnail at point") (if (not file) (message "No original file name found") - (tumme-display-image file arg)))))) + (tumme-display-image file arg) + (display-buffer tumme-display-image-buffer)))))) +;;;###autoload (defun tumme-display-dired-image (&optional arg) "Display current image file. See documentation for `tumme-display-image' for more information. @@ -2151,21 +2267,17 @@ default value at the prompt." (defun tumme-copy-with-exif-file-name () "Copy file with unique name to main image directory. -Copy current or all marked files in dired to a new file in your main -image directory, using a file name generated by -`tumme-get-exif-file-name'. This might or might not be useful for -other people, but I use it each time I fetch images from my digital -camera, for copying the images into my main image directory. - -Typically I open up the folder where I store my incoming digital -images, with file names like dscn0319.jpg, dscn0320.jpg etc., mark the -files I want to copy into my main image directory, and execute this -function. The result is a couple of new files in -`tumme-main-image-directory' called 2005_05_08_12_52_00_dscn0319.jpg, -2005_05_08_14_27_45_dscn0320.jpg etc. +Copy current or all marked files in dired to a new file in your +main image directory, using a file name generated by +`tumme-get-exif-file-name'. A typical usage for this if when +copying images from a digital camera into the image directory. -When the images are safely in my main image directory I start to -browse and tag them using rest of the functionality in `tumme'." + Typically, you would open up the folder with the incoming +digital images, mark the files to be copied, and execute this +function. The result is a couple of new files in +`tumme-main-image-directory' called +2005_05_08_12_52_00_dscn0319.jpg, +2005_05_08_14_27_45_dscn0320.jpg etc." (interactive) (let (new-name (files (dired-get-marked-files))) @@ -2187,7 +2299,7 @@ browse and tag them using rest of the functionality in `tumme'." (tumme-display-thumbnail-original-image)) (defun tumme-display-previous-thumbnail-original () - "Move to previous thumbnail and display image." + "Move to previous thumbnail and display image." (interactive) (tumme-backward-char) @@ -2236,6 +2348,7 @@ browse and tag them using rest of the functionality in `tumme'." prop value))) +;;;###autoload (defun tumme-dired-comment-files () "Add comment to current or marked files in dired." (interactive) @@ -2256,8 +2369,9 @@ browse and tag them using rest of the functionality in `tumme'." (tumme-display-thumb-properties)) (defun tumme-read-comment (&optional file) - "Read comment, optionally using old comment from FILE as initial value." - + "Read comment for an image. +Read comment for an image, optionally using old comment from FILE +as initial value." (let ((comment (read-string "Comment: " @@ -2286,8 +2400,14 @@ browse and tag them using rest of the functionality in `tumme'." (kill-buffer buf) comment))) +;;;###autoload (defun tumme-mark-tagged-files () - "Use regexp to mark files with matching tag." + "Use regexp to mark files with matching tag. +A `tag' is a keyword, a piece of meta data, associated with an +image file and stored in tumme's database file. This command +lets you input a regexp and this will be matched against all tags +on all image files in the database file. The files that have a +matching tags will be marked in the dired buffer." (interactive) (let ((tag (read-string "Mark tagged files (regexp): ")) (hits 0) @@ -2506,7 +2626,7 @@ when using per-directory thumbnail file storage")) ;; Make sure gallery root exist (if (file-exists-p tumme-gallery-dir) (if (not (file-directory-p tumme-gallery-dir)) - (error "Tumme-gallery-dir is not a directory")) + (error "Variable tumme-gallery-dir is not a directory")) (make-directory tumme-gallery-dir)) ;; Open index file (setq index-buf (find-file @@ -2555,7 +2675,7 @@ when using per-directory thumbnail file storage")) ;; Insert thumbnail with link to full image (insert (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n" - tumme-gallery-image-root-url file + tumme-gallery-image-root-url (file-name-nondirectory file) tumme-gallery-thumb-image-root-url (file-name-nondirectory (tumme-thumb-name file)) file)) ;; Insert comment, if any @@ -2597,38 +2717,53 @@ when using per-directory thumbnail file storage")) (error nil)) (kill-buffer buffer))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;; TEST-SECTION ;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defvar tumme-dir-max-size 12300000) - -(defun tumme-test () - "Clean `tumme-dir' from old thumbnail files. -\"Oldness\" measured using last access time. If the total size of all -thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size', -old files are deleted until the max size is reached." - (let* ((files - (sort - (mapcar - (lambda (f) - (let ((fattribs (file-attributes f))) - ;; Get last access time and file size - `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) - (directory-files tumme-dir t ".+\.thumb\..+$")) - ;; Sort function. Compare time between two files. - '(lambda (l1 l2) - (time-less-p (car l1) (car l2))))) - (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files)))) - (while (> dirsize tumme-dir-max-size) - (y-or-n-p - (format "Size of thumbnail directory: %d, delete old file %s? " - dirsize (cadr (cdar files)))) - (delete-file (cadr (cdar files))) - (setq dirsize (- dirsize (car (cdar files)))) - (setq files (cdr files))))) +;; (defvar tumme-dir-max-size 12300000) + +;; (defun tumme-test-clean-old-files () +;; "Clean `tumme-dir' from old thumbnail files. +;; \"Oldness\" measured using last access time. If the total size of all +;; thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size', +;; old files are deleted until the max size is reached." +;; (let* ((files +;; (sort +;; (mapcar +;; (lambda (f) +;; (let ((fattribs (file-attributes f))) +;; ;; Get last access time and file size +;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) +;; (directory-files (tumme-dir) t ".+\.thumb\..+$")) +;; ;; Sort function. Compare time between two files. +;; '(lambda (l1 l2) +;; (time-less-p (car l1) (car l2))))) +;; (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files)))) +;; (while (> dirsize tumme-dir-max-size) +;; (y-or-n-p +;; (format "Size of thumbnail directory: %d, delete old file %s? " +;; dirsize (cadr (cdar files)))) +;; (delete-file (cadr (cdar files))) +;; (setq dirsize (- dirsize (car (cdar files)))) +;; (setq files (cdr files))))) + +;;;;;;;;;;;;;;;;;;;;;;, + +;; (defun dired-speedbar-buttons (dired-buffer) +;; (when (and (boundp 'tumme-use-speedbar) +;; tumme-use-speedbar) +;; (let ((filename (with-current-buffer dired-buffer +;; (dired-get-filename)))) +;; (when (and (not (string-equal filename (buffer-string))) +;; (string-match (image-file-name-regexp) filename)) +;; (erase-buffer) +;; (insert (propertize +;; filename +;; 'display +;; (tumme-get-thumbnail-image filename))))))) + +;; (setq tumme-use-speedbar t) (provide 'tumme) diff --git a/lisp/type-break.el b/lisp/type-break.el index 9c49a5b6672..beb7e6f3725 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -1,7 +1,7 @@ ;;; type-break.el --- encourage rests from typing at appropriate intervals ;; Copyright (C) 1994, 1995, 1997, 2000, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman <friedman@splode.com> diff --git a/lisp/uniquify.el b/lisp/uniquify.el index cc08ab70836..24b49a983ad 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -1,7 +1,7 @@ ;;; uniquify.el --- unique buffer names dependent on file name ;; Copyright (C) 1989, 1995, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dick King <king@reasoning.com> ;; Maintainer: FSF diff --git a/lisp/userlock.el b/lisp/userlock.el index 37ff1f13ba2..8a539daace8 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -1,7 +1,7 @@ ;;; userlock.el --- handle file access contention between multiple users ;; Copyright (C) 1985, 1986, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index 79056c4c947..a0fc8af8345 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -1,6 +1,6 @@ ;;; vc-arch.el --- VC backend for the Arch version-control system -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier <monnier@gnu.org> diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 51d4174b40f..94fd3d0acd9 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -1,7 +1,7 @@ ;;; vc-cvs.el --- non-resident support for CVS version-control ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 1c1f0844303..13425391647 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -1,7 +1,7 @@ ;;; vc-hooks.el --- resident support for version-control ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index 4394dd510f5..4075ffc3649 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -1,6 +1,6 @@ ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier <monnier@gnu.org> diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index bfb66e8a5cf..00700c5a652 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -1,7 +1,7 @@ ;;; vc-rcs.el --- support for RCS version-control ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index ef2c8b34ff1..ae349f57f32 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el @@ -1,7 +1,7 @@ ;;; vc-sccs.el --- support for SCCS version-control ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index b08765b89a3..6d27c5c6a7e 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -1,6 +1,6 @@ ;;; vc-svn.el --- non-resident support for Subversion version-control -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier <monnier@gnu.org> @@ -114,7 +114,7 @@ This is only meaningful if you don't use the implicit checkout model (file-name-directory file))) (with-temp-buffer (cd (file-name-directory file)) - (let ((status + (let ((status (condition-case nil ;; Ignore all errors. (vc-svn-command t t file "status" "-v") @@ -176,6 +176,23 @@ This is only meaningful if you don't use the implicit checkout model ((eq svn-state 'needs-patch) "(patch)") ((eq svn-state 'needs-merge) "(merge)")))) +(defun vc-svn-previous-version (file rev) + (let ((newrev (1- (string-to-number rev)))) + (when (< 0 newrev) + (number-to-string newrev)))) + +(defun vc-svn-next-version (file rev) + (let ((newrev (1+ (string-to-number rev)))) + ;; The "workfile version" is an uneasy conceptual fit under Subversion; + ;; we use it as the upper bound until a better idea comes along. If the + ;; workfile version W coincides with the tree's latest revision R, then + ;; this check prevents a "no such revision: R+1" error. Otherwise, it + ;; inhibits showing of W+1 through R, which could be considered anywhere + ;; from gracious to impolite. + (unless (< (string-to-number (vc-file-getprop file 'vc-workfile-version)) + newrev) + (number-to-string newrev)))) + ;;; ;;; State-changing functions @@ -353,7 +370,11 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (vc-svn-command buffer (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) - file "log"))) + file "log" + ;; By default Subversion only shows the log upto the working version, + ;; whereas we also want the log of the subsequent commits. At least + ;; that's what the vc-cvs.el code does. + "-rHEAD:0"))) (defun vc-svn-diff (file &optional oldvers newvers buffer) "Get a difference report using SVN between two versions of FILE." diff --git a/lisp/vc.el b/lisp/vc.el index 6fa31fa6502..b130aadb085 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1,7 +1,7 @@ ;;; vc.el --- drive a version-control system from within Emacs ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> @@ -2800,9 +2800,6 @@ backend to NEW-BACKEND, and unregister FILE from the current backend. (vc-mode-line new) (set-buffer-modified-p nil))))) -;; Only defined in very recent Emacsen -(defvar small-temporary-file-directory nil) - ;;;###autoload (defun vc-update-change-log (&rest args) "Find change log file and add entries from recent version control logs. diff --git a/lisp/vcursor.el b/lisp/vcursor.el index 11ac28ae14a..a9d3fd68d74 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -1,7 +1,7 @@ ;;; vcursor.el --- manipulate an alternative ("virtual") cursor ;; Copyright (C) 1994, 1996, 1998, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Peter Stephenson <pws@ibmth.df.unipi.it> ;; Maintainer: FSF diff --git a/lisp/version.el b/lisp/version.el index f02f291c4b5..5b9fccfefb3 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -1,7 +1,7 @@ ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/view.el b/lisp/view.el index ea7762cb7d1..457d5efc1c1 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -1,7 +1,7 @@ ;;; view.el --- peruse file or buffer without editing ;; Copyright (C) 1985, 1989, 1994, 1995, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: Inge Frick <inge@nada.kth.se> diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el index b591c0d56f2..eb365c3b580 100644 --- a/lisp/vms-patch.el +++ b/lisp/vms-patch.el @@ -1,7 +1,7 @@ ;;; vms-patch.el --- override parts of files.el for VMS ;; Copyright (C) 1986, 1992, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: vms diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el index aa96560ee48..649d3a22534 100644 --- a/lisp/vmsproc.el +++ b/lisp/vmsproc.el @@ -1,6 +1,7 @@ ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs -;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Mukesh Prasad ;; Maintainer: FSF diff --git a/lisp/vt-control.el b/lisp/vt-control.el index 61d8ec32a7b..d5bc90044b1 100644 --- a/lisp/vt-control.el +++ b/lisp/vt-control.el @@ -1,7 +1,7 @@ ;;; vt-control.el --- Common VTxxx control functions ;; Copyright (C) 1993, 1994, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el index 0238962082e..541f06ef471 100644 --- a/lisp/vt100-led.el +++ b/lisp/vt100-led.el @@ -1,6 +1,7 @@ ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones -;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 004a4662f5e..072606d97da 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -1,7 +1,7 @@ ;;; w32-fns.el --- Lisp routines for Windows NT ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Geoff Voelker <voelker@cs.washington.edu> ;; Keywords: internal diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 1b4ea8ee60b..0918ed4c569 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -1,6 +1,6 @@ ;;; w32-vars.el --- MS-Windows specific user options -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jason Rumney <jasonr@gnu.org> ;; Keywords: internal diff --git a/lisp/wdired.el b/lisp/wdired.el index 298d20a370d..2471ab909c6 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -1,6 +1,6 @@ ;;; wdired.el --- Rename files editing their names in dired buffers -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Filename: wdired.el ;; Author: Juan León Lahoz García <juanleon1@gmail.com> @@ -30,10 +30,10 @@ ;; renaming files. ;; ;; Have you ever wished to use C-x r t (string-rectangle), M-% -;; (query-replace), M-c (capitalize-word), etc. to change the name of +;; (query-replace), M-c (capitalize-word), etc... to change the name of ;; the files in a "dired" buffer? Now you can do this. All the power ;; of Emacs commands are available to renaming files! -;; +;; ;; This package provides a function that makes the filenames of a a ;; dired buffer editable, by changing the buffer mode (which inhibits ;; all of the commands of dired mode). Here you can edit the names of @@ -102,20 +102,17 @@ ;;; Code: (defvar dired-backup-overwrite) ; Only in Emacs 20.x this is a custom var -(eval-when-compile - (set (make-local-variable 'byte-compile-dynamic) t)) -(eval-and-compile - (require 'dired) - (autoload 'dired-do-create-files-regexp "dired-aux") - (autoload 'dired-call-process "dired-aux")) +(require 'dired) +(autoload 'dired-do-create-files-regexp "dired-aux") +(autoload 'dired-call-process "dired-aux") (defgroup wdired nil "Mode to rename files by editing their names in dired buffers." :group 'dired) (defcustom wdired-use-interactive-rename nil - "*If non-nil, WDired requires confirmation before actually renaming files. + "If non-nil, WDired requires confirmation before actually renaming files. If nil, WDired doesn't require confirmation to change the file names, and the variable `wdired-confirm-overwrite' controls whether it is ok to overwrite files without asking." @@ -123,14 +120,14 @@ to overwrite files without asking." :group 'wdired) (defcustom wdired-confirm-overwrite t - "*If nil the renames can overwrite files without asking. + "If nil the renames can overwrite files without asking. This variable has no effect at all if `wdired-use-interactive-rename' is not nil." :type 'boolean :group 'wdired) (defcustom wdired-use-dired-vertical-movement nil - "*If t, the \"up\" and \"down\" movement works as in Dired mode. + "If t, the \"up\" and \"down\" movement works as in Dired mode. That is, always move the point to the beginning of the filename at line. If `sometimes, only move to the beginning of filename if the point is @@ -144,14 +141,14 @@ If nil, \"up\" and \"down\" movement is done as in any other buffer." :group 'wdired) (defcustom wdired-allow-to-redirect-links t - "*If non-nil, the target of the symbolic links are editable. + "If non-nil, the target of the symbolic links are editable. In systems without symbolic links support, this variable has no effect at all." :type 'boolean :group 'wdired) (defcustom wdired-allow-to-change-permissions nil - "*If non-nil, the permissions bits of the files are editable. + "If non-nil, the permissions bits of the files are editable. If t, to change a single bit, put the cursor over it and press the space bar, or left click over it. You can also hit the letter you want @@ -197,13 +194,11 @@ program `dired-chmod-program', which must exist." :help "Abort changes and return to dired mode")) (define-key map [menu-bar wdired wdired-finish-edit] '("Commit Changes" . wdired-finish-edit)) - ;; FIXME: Use the new remap trick. - (substitute-key-definition 'upcase-word 'wdired-upcase-word - map global-map) - (substitute-key-definition 'capitalize-word 'wdired-capitalize-word - map global-map) - (substitute-key-definition 'downcase-word 'wdired-downcase-word - map global-map) + + (define-key map [remap upcase-word] 'wdired-upcase-word) + (define-key map [remap capitalize-word] 'wdired-capitalize-word) + (define-key map [remap downcase-word] 'wdired-downcase-word) + map)) (defvar wdired-mode-hook nil @@ -314,21 +309,20 @@ relies on WDired buffer's properties. Optional arg NO-DIR with value non-nil means don't include directory. Optional arg OLD with value non-nil means return old filename." ;; FIXME: Use dired-get-filename's new properties. - (let (beg end file) - (save-excursion - (setq end (progn (end-of-line) (point))) - (beginning-of-line) - (setq beg (next-single-property-change (point) 'old-name nil end)) - (unless (eq beg end) - (if old - (setq file (get-text-property beg 'old-name)) - (setq end (next-single-property-change (1+ beg) 'end-name)) - (setq file (buffer-substring-no-properties (+ 2 beg) end))) - (and file (setq file (wdired-normalize-filename file)))) - (if (or no-dir old) - file - (and file (> (length file) 0) - (concat (dired-current-directory) file)))))) + (let* ((end (line-end-position)) + (beg (next-single-property-change + (line-beginning-position) 'old-name nil end))) + (unless (eq beg end) + (let ((file + (if old + (get-text-property beg 'old-name) + (wdired-normalize-filename + (buffer-substring-no-properties + (+ 2 beg) (next-single-property-change (1+ beg) 'end-name)))))) + (if (or no-dir old) + file + (and file (> (length file) 0) + (concat (dired-current-directory) file))))))) (defun wdired-change-to-dired-mode () @@ -344,7 +338,7 @@ non-nil means return old filename." (setq mode-name "Dired") (dired-advertise) (remove-hook 'kill-buffer-hook 'wdired-check-kill-buffer t) - (setq revert-buffer-function 'dired-revert)) + (set (make-local-variable 'revert-buffer-function) 'dired-revert)) (defun wdired-abort-changes () @@ -412,7 +406,7 @@ non-nil means return old filename." (forward-line -1))) (if changes (revert-buffer) ;The "revert" is necessary to re-sort the buffer - (let ((buffer-read-only nil)) + (let ((inhibit-read-only t)) (remove-text-properties (point-min) (point-max) '(old-name nil end-name nil old-link nil end-link nil end-perm nil @@ -425,9 +419,9 @@ non-nil means return old filename." (set-buffer-modified-p nil) (setq buffer-undo-list nil)) -;; Renames a file, searching it in a modified dired buffer, in order +;; Rename a file, searching it in a modified dired buffer, in order ;; to be able to use `dired-do-create-files-regexp' and get its -;; "benefits" +;; "benefits". (defun wdired-search-and-rename (filename-ori filename-new) (save-excursion (goto-char (point-max)) @@ -528,21 +522,18 @@ says how many lines to move; default is one line." (defun wdired-get-previous-link (&optional old move) "Return the next symlink target. If OLD, return the old target. If MOVE, move point before it." - (let (beg end target) - (setq beg (previous-single-property-change (point) 'old-link nil)) - (if beg - (progn - (if old - (setq target (get-text-property (1- beg) 'old-link)) - (setq end (next-single-property-change beg 'end-link)) - (setq target (buffer-substring-no-properties (1+ beg) end))) - (if move (goto-char (1- beg))))) - (and target (wdired-normalize-filename target)))) - - + (let ((beg (previous-single-property-change (point) 'old-link nil))) + (when beg + (let ((target + (if old + (get-text-property (1- beg) 'old-link) + (buffer-substring-no-properties + (1+ beg) (next-single-property-change beg 'end-link))))) + (if move (goto-char (1- beg))) + (and target (wdired-normalize-filename target)))))) ;; Perform the changes in the target of the changed links. -(defun wdired-do-symlink-changes() +(defun wdired-do-symlink-changes () (let ((changes nil) (errors 0) link-to-ori link-to-new link-from) @@ -550,36 +541,34 @@ If OLD, return the old target. If MOVE, move point before it." (while (setq link-to-new (wdired-get-previous-link)) (setq link-to-ori (wdired-get-previous-link t t)) (setq link-from (wdired-get-filename nil t)) - (if (not (equal link-to-new link-to-ori)) - (progn - (setq changes t) - (if (equal link-to-new "") ;empty filename! - (setq link-to-new "/dev/null")) - (condition-case err - (progn - (delete-file link-from) - (make-symbolic-link - (substitute-in-file-name link-to-new) link-from)) - (error - (setq errors (1+ errors)) - (dired-log (concat "Link `" link-from "' to `" - link-to-new "' failed:\n%s\n") - err)))))) + (unless (equal link-to-new link-to-ori) + (setq changes t) + (if (equal link-to-new "") ;empty filename! + (setq link-to-new "/dev/null")) + (condition-case err + (progn + (delete-file link-from) + (make-symbolic-link + (substitute-in-file-name link-to-new) link-from)) + (error + (setq errors (1+ errors)) + (dired-log (concat "Link `" link-from "' to `" + link-to-new "' failed:\n%s\n") + err))))) (cons changes errors))) ;; Perform a "case command" skipping read-only words. (defun wdired-xcase-word (command arg) (if (< arg 0) (funcall command arg) - (progn - (while (> arg 0) - (condition-case err - (progn - (funcall command 1) - (setq arg (1- arg))) - (error - (if (not (forward-word 1)) - (setq arg 0)))))))) + (while (> arg 0) + (condition-case err + (progn + (funcall command 1) + (setq arg (1- arg))) + (error + (if (not (forward-word 1)) + (setq arg 0))))))) (defun wdired-downcase-word (arg) "WDired version of `downcase-word'. @@ -603,25 +592,25 @@ Like original function but it skips read-only words." ;; The following code deals with changing the access bits (or ;; permissions) of the files. -(defvar wdired-perm-mode-map nil) -(unless wdired-perm-mode-map - (setq wdired-perm-mode-map (copy-keymap wdired-mode-map)) - (define-key wdired-perm-mode-map " " 'wdired-toggle-bit) - (define-key wdired-perm-mode-map "r" 'wdired-set-bit) - (define-key wdired-perm-mode-map "w" 'wdired-set-bit) - (define-key wdired-perm-mode-map "x" 'wdired-set-bit) - (define-key wdired-perm-mode-map "-" 'wdired-set-bit) - (define-key wdired-perm-mode-map "S" 'wdired-set-bit) - (define-key wdired-perm-mode-map "s" 'wdired-set-bit) - (define-key wdired-perm-mode-map "T" 'wdired-set-bit) - (define-key wdired-perm-mode-map "t" 'wdired-set-bit) - (define-key wdired-perm-mode-map "s" 'wdired-set-bit) - (define-key wdired-perm-mode-map "l" 'wdired-set-bit) - (define-key wdired-perm-mode-map [down-mouse-1] 'wdired-mouse-toggle-bit)) +(defvar wdired-perm-mode-map + (let ((map (make-sparse-keymap))) + (define-key map " " 'wdired-toggle-bit) + (define-key map "r" 'wdired-set-bit) + (define-key map "w" 'wdired-set-bit) + (define-key map "x" 'wdired-set-bit) + (define-key map "-" 'wdired-set-bit) + (define-key map "S" 'wdired-set-bit) + (define-key map "s" 'wdired-set-bit) + (define-key map "T" 'wdired-set-bit) + (define-key map "t" 'wdired-set-bit) + (define-key map "s" 'wdired-set-bit) + (define-key map "l" 'wdired-set-bit) + (define-key map [down-mouse-1] 'wdired-mouse-toggle-bit) + map)) ;; Put a local-map to the permission bits of the files, and store the ;; original name and permissions as a property -(defun wdired-preprocess-perms() +(defun wdired-preprocess-perms () (let ((inhibit-read-only t) filename) (set (make-local-variable 'wdired-col-perm) nil) @@ -638,7 +627,7 @@ Like original function but it skips read-only words." (put-text-property (match-beginning 0) (match-end 0) 'read-only nil) (put-text-property (1+ (match-beginning 0)) (match-end 0) - 'local-map wdired-perm-mode-map)) + 'keymap wdired-perm-mode-map)) (put-text-property (match-end 0) (1+ (match-end 0)) 'end-perm t) (put-text-property (match-beginning 0) (1+ (match-beginning 0)) 'old-perm (match-string-no-properties 0)))) @@ -663,25 +652,24 @@ Like original function but it skips read-only words." (let ((new-bit (char-to-string last-command-char)) (inhibit-read-only t) (pos-prop (- (point) (- (current-column) wdired-col-perm)))) - (put-text-property 0 1 'local-map wdired-perm-mode-map new-bit) + (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit) (put-text-property 0 1 'read-only t new-bit) (insert new-bit) (delete-char 1) (put-text-property pos-prop (1- pos-prop) 'perm-changed t)) (forward-char 1))) -(defun wdired-toggle-bit() +(defun wdired-toggle-bit () "Toggle the permission bit at point." (interactive) (let ((inhibit-read-only t) - (new-bit "-") + (new-bit (cond + ((not (eq (char-after (point)) ?-)) "-") + ((= (% (- (current-column) wdired-col-perm) 3) 0) "r") + ((= (% (- (current-column) wdired-col-perm) 3) 1) "w") + (t "x"))) (pos-prop (- (point) (- (current-column) wdired-col-perm)))) - (if (eq (char-after (point)) ?-) - (setq new-bit - (if (= (% (- (current-column) wdired-col-perm) 3) 0) "r" - (if (= (% (- (current-column) wdired-col-perm) 3) 1) "w" - "x")))) - (put-text-property 0 1 'local-map wdired-perm-mode-map new-bit) + (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit) (put-text-property 0 1 'read-only t new-bit) (insert new-bit) (delete-char 1) @@ -697,23 +685,28 @@ Like original function but it skips read-only words." ;; Allowed chars for 2000 bit are Ssl in position 6 ;; Allowed chars for 1000 bit are Tt in position 9 (defun wdired-perms-to-number (perms) - (let ((nperm 0777)) - (if (= (elt perms 1) ?-) (setq nperm (- nperm 400))) - (if (= (elt perms 2) ?-) (setq nperm (- nperm 200))) - (let ((p-bit (elt perms 3))) - (if (memq p-bit '(?- ?S)) (setq nperm (- nperm 100))) - (if (memq p-bit '(?s ?S)) (setq nperm (+ nperm 4000)))) - (if (= (elt perms 4) ?-) (setq nperm (- nperm 40))) - (if (= (elt perms 5) ?-) (setq nperm (- nperm 20))) - (let ((p-bit (elt perms 6))) - (if (memq p-bit '(?- ?S ?l)) (setq nperm (- nperm 10))) - (if (memq p-bit '(?s ?S ?l)) (setq nperm (+ nperm 2000)))) - (if (= (elt perms 7) ?-) (setq nperm (- nperm 4))) - (if (= (elt perms 8) ?-) (setq nperm (- nperm 2))) - (let ((p-bit (elt perms 9))) - (if (memq p-bit '(?- ?T)) (setq nperm (- nperm 1))) - (if (memq p-bit '(?t ?T)) (setq nperm (+ nperm 1000)))) - nperm)) + (+ + (if (= (elt perms 1) ?-) 0 400) + (if (= (elt perms 2) ?-) 0 200) + (case (elt perms 3) + (?- 0) + (?S 4000) + (?s 4100) + (t 100)) + (if (= (elt perms 4) ?-) 0 40) + (if (= (elt perms 5) ?-) 0 20) + (case (elt perms 6) + (?- 0) + (?S 2000) + (?s 2010) + (t 10)) + (if (= (elt perms 7) ?-) 0 4) + (if (= (elt perms 8) ?-) 0 2) + (case (elt perms 9) + (?- 0) + (?T 1000) + (?t 1001) + (t 1)))) ;; Perform the changes in the permissions of the files that have ;; changed. @@ -729,28 +722,31 @@ Like original function but it skips read-only words." (setq perms-ori (get-text-property (point) 'old-perm)) (setq perms-new (buffer-substring-no-properties (point) (next-single-property-change (point) 'end-perm))) - (if (not (equal perms-ori perms-new)) - (progn - (setq changes t) - (setq filename (wdired-get-filename nil t)) - (if (= (length perms-new) 10) - (progn - (setq perm-tmp - (int-to-string (wdired-perms-to-number perms-new))) - (if (not (equal 0 (dired-call-process dired-chmod-program - t perm-tmp filename))) - (progn - (setq errors (1+ errors)) - (dired-log (concat dired-chmod-program " " perm-tmp - " `" filename "' failed\n\n"))))) - (setq errors (1+ errors)) - (dired-log (concat "Cannot parse permission `" perms-new - "' for file `" filename "'\n\n"))))) + (unless (equal perms-ori perms-new) + (setq changes t) + (setq filename (wdired-get-filename nil t)) + (if (= (length perms-new) 10) + (progn + (setq perm-tmp + (int-to-string (wdired-perms-to-number perms-new))) + (unless (equal 0 (dired-call-process dired-chmod-program + t perm-tmp filename)) + (setq errors (1+ errors)) + (dired-log (concat dired-chmod-program " " perm-tmp + " `" filename "' failed\n\n")))) + (setq errors (1+ errors)) + (dired-log (concat "Cannot parse permission `" perms-new + "' for file `" filename "'\n\n")))) (goto-char (next-single-property-change (1+ (point)) prop-wanted nil (point-max)))) (cons changes errors))) (provide 'wdired) +;; Local Variables: +;; coding: latin-1 +;; byte-compile-dynamic: t +;; End: + ;; arch-tag: bc00902e-526f-4305-bc7f-8862a559184f ;;; wdired.el ends here diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 8ef4d449e01..7f3cbd913ca 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -1,7 +1,7 @@ ;;; whitespace.el --- warn about and clean bogus whitespaces in the file ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rajesh Vaidheeswarran <rv@gnu.org> ;; Keywords: convenience diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index c8a34140f69..887f6553592 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el @@ -1,6 +1,7 @@ ;;; wid-browse.el --- functions for browsing widgets ;; -;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: extensions diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 21cbf72797e..720fb9929e4 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -1,7 +1,7 @@ ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*- ;; ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: FSF diff --git a/lisp/widget.el b/lisp/widget.el index f99429b5910..6acfdfd48d8 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -1,7 +1,7 @@ ;;; widget.el --- a library of user interface components ;; ;; Copyright (C) 1996, 1997, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: help, extensions, faces, hypermedia diff --git a/lisp/windmove.el b/lisp/windmove.el index b3aacf62d51..3b62437e280 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -1,7 +1,7 @@ ;;; windmove.el --- directional window-selection routines ;; ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Hovav Shacham (hovav@cs.stanford.edu) ;; Created: 17 October 1998 diff --git a/lisp/window.el b/lisp/window.el index 917edaac57f..4d02390be16 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1,7 +1,7 @@ ;;; window.el --- GNU Emacs window commands aside from those written in C ;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/winner.el b/lisp/winner.el index 0fbd0221e49..de0dcde6b06 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -1,11 +1,11 @@ ;;; winner.el --- Restore old window configurations ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation. Inc. +;; 2005, 2006 Free Software Foundation. Inc. ;; Author: Ivar Rummelhoff <ivarru@math.uio.no> ;; Created: 27 Feb 1997 -;; Time-stamp: <2002-02-20 22:06:58 ivarru> +;; Time-stamp: <2006-02-06 15:13:57 ttn> ;; Keywords: convenience frames ;; This file is part of GNU Emacs. diff --git a/lisp/woman.el b/lisp/woman.el index 5e8aff75e7f..22fcc0e3f62 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1,6 +1,7 @@ ;;; woman.el --- browse UN*X manual pages `wo (without) man' -;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk> ;; Maintainer: FSF diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 423c6cdfc52..3ad9a5f0e2c 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -1,6 +1,6 @@ ;;; x-dnd.el --- drag and drop support for X. -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se> ;; Maintainer: FSF diff --git a/lisp/xml.el b/lisp/xml.el index c97c8052148..2ce3ec7b4f9 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -1,7 +1,7 @@ ;;; xml.el --- XML parser ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Emmanuel Briot <briot@gnat.com> ;; Maintainer: Mark A. Hershberger <mah@everybody.org> diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index 0036712fec4..2d1710fce01 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -1,7 +1,7 @@ ;;; xt-mouse.el --- support the mouse when emacs run in an xterm ;; Copyright (C) 1994, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: mouse, terminals diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 2700e2f2261..b396e8b3ee7 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,36 @@ +2006-02-10 Kim F. Storm <storm@cua.dk> + + * eval.texi (Function Indirection): Add NOERROR to indirect-function. + +2006-02-08 Juanma Barranquero <lekktu@gmail.com> + + * modes.texi (%-Constructs): Remove obsolete info about + `global-mode-string'. + +2006-02-07 Richard M. Stallman <rms@gnu.org> + + * commands.texi (Prefix Command Arguments): Minor cleanup. + + * display.texi: "Graphical display", not window system. + + * functions.texi (What Is a Function): Fix xref. + + * keymaps.texi (Key Lookup): Clarify wrt commands vs other functions. + (Changing Key Bindings): Clarify when remapping is better than + substitute-key-definition. + +2006-02-02 Richard M. Stallman <rms@gnu.org> + + * minibuf.texi (Basic Completion): Completion alists are risky. + + * keymaps.texi (Active Keymaps): Clarifications. + (Searching Keymaps): New node. + (Keymaps): Update menu. + + * frames.texi (Layout Parameters): Minor clarification. + (Drag and Drop): New node. + (Frames): Update menu. + 2006-01-29 Chong Yidong <cyd@stupidchicken.com> * display.texi (Other Display Specs, Image Descriptors): Image @@ -21,6 +54,15 @@ * markers.texi (Overview of Markers): Count insertion type as one of a marker's attributes. + * keymaps.texi (Controlling Active Maps): New node, split out of + Active Keymaps. + (Keymaps): Menu updated. + (Active Keymaps): Give pseudocode to explain how the active + maps are searched. current-active-maps and key-binding moved here. + (Functions for Key Lookup): current-active-maps and key-binding moved. + Clarifications. + (Searching the Keymaps): New subnode. + * elisp.texi (Top): Menu clarification. * display.texi (Other Display Specs): Delete duplicate entry for @@ -4213,7 +4255,7 @@ Tue Apr 11 12:23:28 1989 Robert J. Chassell (bob@rice-chex.ai.mit.edu) ;; End: Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lispref/Makefile.in b/lispref/Makefile.in index 7d5ce02714d..e3d09fe2c6f 100644 --- a/lispref/Makefile.in +++ b/lispref/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the GNU Emacs Lisp Reference Manual. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lispref/abbrevs.texi b/lispref/abbrevs.texi index 38c5854adc6..52b3dfe1ad6 100644 --- a/lispref/abbrevs.texi +++ b/lispref/abbrevs.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/abbrevs @node Abbrevs, Processes, Syntax Tables, Top diff --git a/lispref/advice.texi b/lispref/advice.texi index 595649303ed..a21bce33448 100644 --- a/lispref/advice.texi +++ b/lispref/advice.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1998, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/advising @node Advising Functions, Debugging, Byte Compilation, Top diff --git a/lispref/anti.texi b/lispref/anti.texi index d6ae30f2106..6cebff7ece9 100644 --- a/lispref/anti.texi +++ b/lispref/anti.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002, 2003, 2004, 2005, +@c 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/lispref/backups.texi b/lispref/backups.texi index 3b5363f64a3..39e3d908f7e 100644 --- a/lispref/backups.texi +++ b/lispref/backups.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/backups @node Backups and Auto-Saving, Buffers, Files, Top diff --git a/lispref/buffers.texi b/lispref/buffers.texi index 30031a10d6e..c0eb2ee6664 100644 --- a/lispref/buffers.texi +++ b/lispref/buffers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/buffers @node Buffers, Windows, Backups and Auto-Saving, Top diff --git a/lispref/commands.texi b/lispref/commands.texi index 0d5e8b232ff..7a2cdb8edf9 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/commands @node Command Loop, Keymaps, Minibuffers, Top @@ -2780,7 +2780,7 @@ command, so setting it has no effect on the prefix arguments for future commands. Normally, commands specify which representation to use for the prefix -argument, either numeric or raw, in the @code{interactive} declaration. +argument, either numeric or raw, in the @code{interactive} specification. (@xref{Using Interactive}.) Alternatively, functions may look at the value of the prefix argument directly in the variable @code{current-prefix-arg}, but this is less clean. diff --git a/lispref/compile.texi b/lispref/compile.texi index 46afbad2b0b..1d8823a48c5 100644 --- a/lispref/compile.texi +++ b/lispref/compile.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/compile @node Byte Compilation, Advising Functions, Loading, Top diff --git a/lispref/control.texi b/lispref/control.texi index 8dae3d46484..b6df04810b7 100644 --- a/lispref/control.texi +++ b/lispref/control.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/control @node Control Structures, Variables, Evaluation, Top diff --git a/lispref/customize.texi b/lispref/customize.texi index d899e1be042..1ae3b5b5132 100644 --- a/lispref/customize.texi +++ b/lispref/customize.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/customize @node Customization, Loading, Macros, Top diff --git a/lispref/debugging.texi b/lispref/debugging.texi index 9c0fa9bc865..854e0ef1ca2 100644 --- a/lispref/debugging.texi +++ b/lispref/debugging.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/debugging @node Debugging, Read and Print, Advising Functions, Top diff --git a/lispref/display.texi b/lispref/display.texi index 0bb68bd4166..c6bc63d2ff9 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/display @node Display, System Interface, Processes, Top @@ -126,7 +126,7 @@ the rightmost column indicates a line that ``wraps'' onto the next line, which is also called @dfn{continuing} the line. (The display table can specify alternative indicators; see @ref{Display Tables}.) - On a window system display, the @samp{$} and @samp{\} indicators are + On a graphical display, the @samp{$} and @samp{\} indicators are replaced with arrow images displayed in the window fringes (@pxref{Fringes}). @@ -1651,13 +1651,13 @@ parts of Emacs text. However, if the variable @code{default-line-spacing} is non-@code{nil}, it overrides the frame's @code{line-spacing} parameter. An integer value specifies the number of pixels put below -lines on window systems. A floating point number specifies the +lines on graphical displays. A floating point number specifies the spacing relative to the frame's default line height. @vindex line-spacing You can specify the line spacing for all lines in a buffer via the buffer-local @code{line-spacing} variable. An integer value specifies -the number of pixels put below lines on window systems. A floating +the number of pixels put below lines on graphical displays. A floating point number specifies the spacing relative to the default frame line height. This overrides line spacings specified for the frame. @@ -4603,9 +4603,9 @@ command @code{tab-to-tab-stop}. @xref{Indent Tabs}. @tindex indicate-empty-lines @cindex fringes, and empty line indication When this is non-@code{nil}, Emacs displays a special glyph in the -fringe of each empty line at the end of the buffer, on terminals that -support it (window systems). @xref{Fringes}. -This variable is automatically buffer-local in every buffer. +fringe of each empty line at the end of the buffer, on graphical +displays. @xref{Fringes}. This variable is automatically +buffer-local in every buffer. @end defopt @defvar indicate-buffer-boundaries @@ -4854,7 +4854,7 @@ on character terminals. On graphical displays, all glyphs are simple. @item @var{string} Send the characters in @var{string} to the terminal to output this glyph. This alternative is available on character terminals, -but not under a window system. +but not on graphical displays. @item @var{integer} Define this glyph code as an alias for glyph code @var{integer}. You @@ -4896,7 +4896,7 @@ This is a synonym for @code{ding}. @defopt visible-bell This variable determines whether Emacs should flash the screen to represent a bell. Non-@code{nil} means yes, @code{nil} means no. This -is effective on a window system, and on a character-only terminal +is effective on graphical displays, and on text-only terminals provided the terminal's Termcap entry defines the visible bell capability (@samp{vb}). @end defopt diff --git a/lispref/edebug.texi b/lispref/edebug.texi index a32c5e9189c..4257f77f384 100644 --- a/lispref/edebug.texi +++ b/lispref/edebug.texi @@ -1,7 +1,7 @@ @comment -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This file can also be used by an independent Edebug User diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 76b09f764f6..e4a87e6dca9 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -30,8 +30,8 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual, corresponding to Emacs version @value{EMACSVER}. -Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, - 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/lispref/errors.texi b/lispref/errors.texi index 9906a691eea..092a2662e5b 100644 --- a/lispref/errors.texi +++ b/lispref/errors.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/errors @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top diff --git a/lispref/eval.texi b/lispref/eval.texi index 36bc941f26b..803f3d4a70d 100644 --- a/lispref/eval.texi +++ b/lispref/eval.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/eval @node Evaluation, Control Structures, Symbols, Top @@ -314,16 +314,20 @@ symbol function indirection when calling @code{erste}. perform symbol function indirection explicitly. @c Emacs 19 feature -@defun indirect-function function +@defun indirect-function function &optional noerror @anchor{Definition of indirect-function} This function returns the meaning of @var{function} as a function. If @var{function} is a symbol, then it finds @var{function}'s function definition and starts over with that value. If @var{function} is not a symbol, then it returns @var{function} itself. -This function signals a @code{void-function} error if the final -symbol is unbound and a @code{cyclic-function-indirection} error if -there is a loop in the chain of symbols. +This function signals a @code{void-function} error if the final symbol +is unbound and optional argument @var{noerror} is @code{nil} or +omitted. Otherwise, if @var{noerror} is non-@code{nil}, it returns +@code{nil} if the final symbol is unbound. + +It signals a @code{cyclic-function-indirection} error if there is a +loop in the chain of symbols. Here is how you could define @code{indirect-function} in Lisp: diff --git a/lispref/files.texi b/lispref/files.texi index a681756632b..36cdfa5d2bd 100644 --- a/lispref/files.texi +++ b/lispref/files.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/files @node Files, Backups and Auto-Saving, Documentation, Top diff --git a/lispref/frames.texi b/lispref/frames.texi index 8212e9325f9..2c2b8e10641 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/frames @node Frames, Positions, Windows, Top diff --git a/lispref/functions.texi b/lispref/functions.texi index 17a96734b10..9c7381b80d7 100644 --- a/lispref/functions.texi +++ b/lispref/functions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/functions @node Functions, Macros, Variables, Top @@ -99,7 +99,7 @@ Keyboard macros (strings and vectors) are commands also, even though they are not functions. A symbol is a command if its function definition is a command; such symbols can be invoked with @kbd{M-x}. The symbol is a function as well if the definition is a function. -@xref{Command Overview}. +@xref{Interactive Call}. @item keystroke command @cindex keystroke command diff --git a/lispref/hash.texi b/lispref/hash.texi index 7b4c8c67711..66420476d42 100644 --- a/lispref/hash.texi +++ b/lispref/hash.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002, 2003, 2004, 2005, +@c 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/hash @node Hash Tables, Symbols, Sequences Arrays Vectors, Top diff --git a/lispref/help.texi b/lispref/help.texi index 664e8c69c18..0fe996dfd7c 100644 --- a/lispref/help.texi +++ b/lispref/help.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/help @node Documentation, Files, Modes, Top diff --git a/lispref/hooks.texi b/lispref/hooks.texi index ce671a8499a..2ba06a2b19a 100644 --- a/lispref/hooks.texi +++ b/lispref/hooks.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/hooks @node Standard Hooks, Index, Standard Keymaps, Top diff --git a/lispref/internals.texi b/lispref/internals.texi index 8c367f63ebd..ee6423ef37b 100644 --- a/lispref/internals.texi +++ b/lispref/internals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/internals @node GNU Emacs Internals, Standard Errors, Tips, Top diff --git a/lispref/intro.texi b/lispref/intro.texi index 8c3501c823b..b2294be4c2d 100644 --- a/lispref/intro.texi +++ b/lispref/intro.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/intro diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index 5a732af4ebb..b7bc34ece84 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/keymaps @node Keymaps, Modes, Command Loop, Top @@ -933,8 +933,10 @@ is a keymap, and is treated as a keymap (see above). @item @cindex @code{lambda} in keymap If the @sc{car} of @var{list} is @code{lambda}, then the list is a -lambda expression. This is presumed to be a command, and is treated as -such (see above). +lambda expression. This is presumed to be a function, and is treated +as such (see above). In order to execute properly as a key binding, +this function must be a command---it must have an @code{interactive} +specification. @xref{Defining Commands}. @item If the @sc{car} of @var{list} is a keymap and the @sc{cdr} is an event @@ -1282,9 +1284,9 @@ default global map. The function @code{substitute-key-definition} scans a keymap for keys that have a certain binding and rebinds them with a different -binding. Another feature you can use for similar effects, but which -is often cleaner, is to add a binding that remaps a command -(@pxref{Remapping Commands}). +binding. Another feature which is cleaner and can often produce the +same results to remap one command into another (@pxref{Remapping +Commands}). @defun substitute-key-definition olddef newdef keymap &optional oldmap @cindex replace bindings diff --git a/lispref/lists.texi b/lispref/lists.texi index ef9220d2411..5cefce9da7c 100644 --- a/lispref/lists.texi +++ b/lispref/lists.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/lists @node Lists, Sequences Arrays Vectors, Strings and Characters, Top diff --git a/lispref/loading.texi b/lispref/loading.texi index 260b96f6ccf..b78fb92ad82 100644 --- a/lispref/loading.texi +++ b/lispref/loading.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/loading @node Loading, Byte Compilation, Customization, Top diff --git a/lispref/locals.texi b/lispref/locals.texi index e24117270a5..10a41bf5cca 100644 --- a/lispref/locals.texi +++ b/lispref/locals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/locals @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top diff --git a/lispref/macros.texi b/lispref/macros.texi index dc822352ab3..01805f6655b 100644 --- a/lispref/macros.texi +++ b/lispref/macros.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/macros @node Macros, Customization, Functions, Top diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in index 038c05db7c3..0b4c080b956 100644 --- a/lispref/makefile.w32-in +++ b/lispref/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lispref/maps.texi b/lispref/maps.texi index ef5984cc32f..9ee1b52fa59 100644 --- a/lispref/maps.texi +++ b/lispref/maps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/maps @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top diff --git a/lispref/markers.texi b/lispref/markers.texi index aa26a0aa030..1ad54c63e91 100644 --- a/lispref/markers.texi +++ b/lispref/markers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/markers @node Markers, Text, Positions, Top diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index c0990bae3ee..65887c4c172 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/minibuf @node Minibuffers, Command Loop, Read and Print, Top diff --git a/lispref/modes.texi b/lispref/modes.texi index ed6f0bc7f82..b9eb33dcb88 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, -@c 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/modes @node Modes, Documentation, Keymaps, Top @@ -2012,8 +2012,7 @@ obsolete, since you can get the same results with the variables The value of @code{mode-name}. @item %M -The value of @code{global-mode-string}. Currently, only -@code{display-time} modifies the value of @code{global-mode-string}. +The value of @code{global-mode-string}. @end table @node Properties in Mode diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi index 6e41a462934..b09a3fc78a3 100644 --- a/lispref/nonascii.texi +++ b/lispref/nonascii.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1998, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/characters @node Non-ASCII Characters, Searching and Matching, Text, Top diff --git a/lispref/numbers.texi b/lispref/numbers.texi index db28a2850a6..3cbc1a7ae16 100644 --- a/lispref/numbers.texi +++ b/lispref/numbers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/numbers @node Numbers, Strings and Characters, Lisp Data Types, Top diff --git a/lispref/objects.texi b/lispref/objects.texi index f8a093656b9..93848cffe09 100644 --- a/lispref/objects.texi +++ b/lispref/objects.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/objects @node Lisp Data Types, Numbers, Introduction, Top diff --git a/lispref/os.texi b/lispref/os.texi index 3761620c7d0..475a8bd8687 100644 --- a/lispref/os.texi +++ b/lispref/os.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/os @node System Interface, Antinews, Display, Top diff --git a/lispref/positions.texi b/lispref/positions.texi index 83ac383ddae..f56e1a6a389 100644 --- a/lispref/positions.texi +++ b/lispref/positions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/positions @node Positions, Markers, Frames, Top diff --git a/lispref/processes.texi b/lispref/processes.texi index 14fd069dc01..4cbc4b72e33 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/processes @node Processes, Display, Abbrevs, Top diff --git a/lispref/searching.texi b/lispref/searching.texi index 84de54984ae..7c10ed6881b 100644 --- a/lispref/searching.texi +++ b/lispref/searching.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/searching @node Searching and Matching, Syntax Tables, Non-ASCII Characters, Top diff --git a/lispref/sequences.texi b/lispref/sequences.texi index eade483bda3..9efd38e3abe 100644 --- a/lispref/sequences.texi +++ b/lispref/sequences.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/sequences @node Sequences Arrays Vectors, Hash Tables, Lists, Top diff --git a/lispref/streams.texi b/lispref/streams.texi index cb8a7fcf297..34dbc584e2c 100644 --- a/lispref/streams.texi +++ b/lispref/streams.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004, -@c 2005 Free Software Foundation, Inc. +@c 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/streams @node Read and Print, Minibuffers, Debugging, Top diff --git a/lispref/strings.texi b/lispref/strings.texi index 18c516041d6..e722b74e54c 100644 --- a/lispref/strings.texi +++ b/lispref/strings.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/strings @node Strings and Characters, Lists, Numbers, Top diff --git a/lispref/symbols.texi b/lispref/symbols.texi index 9e4b482cfa0..f95fca9740b 100644 --- a/lispref/symbols.texi +++ b/lispref/symbols.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/symbols @node Symbols, Evaluation, Hash Tables, Top diff --git a/lispref/syntax.texi b/lispref/syntax.texi index 7de2cee2f81..7297f6b9104 100644 --- a/lispref/syntax.texi +++ b/lispref/syntax.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/syntax @node Syntax Tables, Abbrevs, Searching and Matching, Top diff --git a/lispref/text.texi b/lispref/text.texi index 8e269cbbd56..7b384033c11 100644 --- a/lispref/text.texi +++ b/lispref/text.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/text @node Text, Non-ASCII Characters, Markers, Top diff --git a/lispref/tindex.pl b/lispref/tindex.pl index 68931bc9ed6..6d9be40dfcb 100755 --- a/lispref/tindex.pl +++ b/lispref/tindex.pl @@ -1,6 +1,7 @@ #! /usr/bin/perl -# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lispref/tips.texi b/lispref/tips.texi index 165c4a9f084..07689b4c9a4 100644 --- a/lispref/tips.texi +++ b/lispref/tips.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/tips @node Tips, GNU Emacs Internals, GPL, Top diff --git a/lispref/variables.texi b/lispref/variables.texi index 1b527864d2c..32a6e9b7873 100644 --- a/lispref/variables.texi +++ b/lispref/variables.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2002, -@c 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/variables @node Variables, Functions, Control Structures, Top diff --git a/lispref/vol1.texi b/lispref/vol1.texi index e0a1f02df8d..b6b071bf444 100644 --- a/lispref/vol1.texi +++ b/lispref/vol1.texi @@ -3,7 +3,7 @@ It is still present in CVS in case we ever want to use some of it again. @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. \input texinfo @c -*-texinfo-*- diff --git a/lispref/vol2.texi b/lispref/vol2.texi index 40ec8c4904f..e5da029db1a 100644 --- a/lispref/vol2.texi +++ b/lispref/vol2.texi @@ -3,7 +3,7 @@ It is still present in CVS in case we ever want to use some of it again. @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. diff --git a/lispref/windows.texi b/lispref/windows.texi index 15517c1128b..fe1d6212df0 100644 --- a/lispref/windows.texi +++ b/lispref/windows.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2004, 2005, 2006 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/windows @node Windows, Frames, Buffers, Top diff --git a/mac/ChangeLog b/mac/ChangeLog index 5f538eb09e0..5da9f7aca76 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * makefile.MPW (shortlisp, SOME_MACHINE_LISP): Sync with + src/Makefile.in. + 2005-12-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * makefile.MPW (macselect.c.x): Depend on keymap.h. @@ -805,7 +810,8 @@ ;; coding: iso-2022-7bit-unix ;; End: - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index 8aa3d82c261..db6b39880e2 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -2,4 +2,4 @@ CFBundleName = "Emacs"; CFBundleShortVersionString = "22.0.50"; -CFBundleGetInfoString = "22.0.50, Copyright (C) 2005 Free Software Foundation, Inc."; +CFBundleGetInfoString = "22.0.50, Copyright (C) 2006 Free Software Foundation, Inc."; diff --git a/mac/INSTALL b/mac/INSTALL index 9162ae6f08b..e887537354b 100644 --- a/mac/INSTALL +++ b/mac/INSTALL @@ -1,6 +1,7 @@ * BUILDING EMACS ON MAC OS Classic AND MAC OS X -*- outline -*- -Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that diff --git a/mac/README b/mac/README index e63086050f4..63ff2e76dd1 100644 --- a/mac/README +++ b/mac/README @@ -1,6 +1,7 @@ Emacs for Mac OS Classic and Mac OS X -Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml index 54bfc4be7e9..c05a57d0b53 100644 --- a/mac/cw6-mcp.xml +++ b/mac/cw6-mcp.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h index 216af944738..851089b3dac 100644 --- a/mac/inc/alloca.h +++ b/mac/inc/alloca.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/config.h b/mac/inc/config.h index 24fe3b30c98..cdb7fd5b0e8 100644 --- a/mac/inc/config.h +++ b/mac/inc/config.h @@ -2,7 +2,7 @@ /* GNU Emacs site configuration template file. -*- C -*- Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h index 5073d8059a7..d4e309ebea7 100644 --- a/mac/inc/defs-cw6.h +++ b/mac/inc/defs-cw6.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h index 17bbb60b8f4..da7b30085dc 100644 --- a/mac/inc/dirent.h +++ b/mac/inc/dirent.h @@ -1,6 +1,6 @@ /* Replacement dirent.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h index c65f8589c6e..8d0539404f4 100644 --- a/mac/inc/epaths.h +++ b/mac/inc/epaths.h @@ -2,7 +2,7 @@ /* Handcrafted epaths.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/grp.h b/mac/inc/grp.h index 058bc657016..90bb12a4078 100755 --- a/mac/inc/grp.h +++ b/mac/inc/grp.h @@ -1,5 +1,5 @@ /* Replacement grp.h file for building GNU Emacs on the Macintosh. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h index 5e1f7db8112..a9a3fc3cd17 100644 --- a/mac/inc/m-mac.h +++ b/mac/inc/m-mac.h @@ -1,6 +1,6 @@ /* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h index df452f30d97..17fcc8ff6ba 100644 --- a/mac/inc/pwd.h +++ b/mac/inc/pwd.h @@ -1,6 +1,6 @@ /* Replacement pwd.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h index d0f00ed6c13..de1f573438a 100644 --- a/mac/inc/s-mac.h +++ b/mac/inc/s-mac.h @@ -1,6 +1,6 @@ /* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h index f2686a5cc13..508a89869a6 100644 --- a/mac/inc/sys/file.h +++ b/mac/inc/sys/file.h @@ -1,6 +1,6 @@ /* Replacement sys/file.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h index bdf68b97357..22335db7c38 100644 --- a/mac/inc/sys/ioctl.h +++ b/mac/inc/sys/ioctl.h @@ -1,6 +1,6 @@ /* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h index 8849489f7c6..28f8f1e9d2c 100644 --- a/mac/inc/sys/param.h +++ b/mac/inc/sys/param.h @@ -1,6 +1,6 @@ /* Replacement sys/param.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h index 2b8f9bfce79..dd99df5fda2 100644 --- a/mac/inc/sys/stat.h +++ b/mac/inc/sys/stat.h @@ -1,6 +1,6 @@ /* Replacement sys/stat.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h index b28a87e7d32..e584cb89ff7 100644 --- a/mac/inc/sys/time.h +++ b/mac/inc/sys/time.h @@ -1,5 +1,6 @@ /* Replacement sys/time.h file for building GNU Emacs on the Macintosh. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h index bdc4f6c5be2..34f3cbca87f 100644 --- a/mac/inc/sys/types.h +++ b/mac/inc/sys/types.h @@ -1,6 +1,6 @@ /* Replacement sys/types.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/termio.h b/mac/inc/termio.h index 596d6342177..fe1dd8ed945 100644 --- a/mac/inc/termio.h +++ b/mac/inc/termio.h @@ -1,6 +1,6 @@ /* Replacement termio.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/utime.h b/mac/inc/utime.h index 43281d40bfa..3a7456ee78e 100644 --- a/mac/inc/utime.h +++ b/mac/inc/utime.h @@ -1,5 +1,6 @@ /* Replacement utime.h file for building GNU Emacs on the Macintosh. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h index fc120b014d7..e0c32e1c1ae 100644 --- a/mac/inc/utsname.h +++ b/mac/inc/utsname.h @@ -1,5 +1,6 @@ /* Replacement utsname.h file for building GNU Emacs on the Macintosh. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/make-package b/mac/make-package index 85c6646c5da..26663f8eccf 100755 --- a/mac/make-package +++ b/mac/make-package @@ -18,7 +18,7 @@ #### files inside /usr. This will replace the default version of #### emacs included with Mac OS X. -# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/mac/makefile.MPW b/mac/makefile.MPW index ec9e4126371..6dc10cbbc81 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -1,6 +1,6 @@ # Make file for building GNU Emacs on the Macintosh. # Copyright (C) 1999, 2000, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # Author: Andrew Choi <akochoi@users.sourceforge.net> # @@ -1039,6 +1039,7 @@ shortlisp = ¶ {Lisp}help.elc ¶ {Lisp}indent.elc ¶ {Lisp}isearch.elc ¶ + {Lisp}rfn-eshadow.elc ¶ {Lisp}loadup.el ¶ {Lisp}loaddefs.el ¶ {Lisp}bindings.elc ¶ @@ -1113,9 +1114,13 @@ SOME_MACHINE_LISP = {Lisp}mouse.elc ¶ {Lisp}ls-lisp.elc {Lisp}dos-fns.elc ¶ {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶ {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶ - {Lisp}tooltip.elc ¶ + {Lisp}tooltip.elc {Lisp}image.elc ¶ + {Lisp}dnd.elc {Lisp}mwheel.elc ¶ + {Lisp}tool-bar.elc ¶ + {Lisp}x-dnd.elc ¶ {Lisp}international:ccl.elc ¶ - {Lisp}international:codepage.elc + {Lisp}international:codepage.elc ¶ + {Lisp}international:fontset.elc Doc Ä {DocTarget}DOC diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 4984704f9fc..138afca2ead 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -1,6 +1,6 @@ /* Resource definitions for GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -222,7 +222,7 @@ resource 'vers' (1) { 50, /* Non-final release # */ 0, /* Region code */ "22.0.50", /* Short version number */ - "22.0.50, Copyright \0xa9 2005 " + "22.0.50, Copyright \0xa9 2006 " "Free Software Foundation, Inc." /* Long version number */ }; diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r index 16866de9574..113524e6d3f 100644 --- a/mac/src/EmacsMPW.r +++ b/mac/src/EmacsMPW.r @@ -2,7 +2,7 @@ under MPW. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/src/chdir.c b/mac/src/chdir.c index 61d0b63a78e..324fdd801b2 100644 --- a/mac/src/chdir.c +++ b/mac/src/chdir.c @@ -1,6 +1,6 @@ /* Implementation of chdir on the Mac for use with make-docfile. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/man/ChangeLog b/man/ChangeLog index fb5a76e6f19..fa6e236959f 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,154 @@ +2006-02-11 Mathias Dahl <mathias.dahl@gmail.com> + + * dired.texi (Tumme): More tumme documentation. + +2006-02-11 Alan Mackenzie <acm@muc.de> + + * programs.texi ("Hungry Delete"): Correct the appellation of the + backspace and delete keys to @kbd{DEL} and @kbd{DELETE}. + +2006-02-11 Mathias Dahl <mathias.dahl@gmail.com> + + * dired.texi (Tumme): Fixed small bug. + +2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macos.texi (Mac International): Rename "fontset-mac" to + "fontset-standard". + +2006-02-09 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (Gnus Versions): Add history beyond start of Oort. + +2006-02-09 Mathias Dahl <mathias.dah@gmail.com> + + * dired.texi (Tumme): Basic documentation for Tumme added. + +2006-02-08 Romain Francoise <romain@orebokech.com> + + * faq.texi (Top): Remove paragraph about the FAQ being a + transitional document, etc. + (Searching for/replacing newlines): New node. + (Yanking text in isearch): New node. + (Inserting text at the beginning of each line): Rename and make + more general, mention `M-;' in Message mode. + +2006-02-07 Luc Teirlinck <teirllm@auburn.edu> + + * mule.texi (International): + * programs.texi (Basic Indent): Fix typos. + + * faq.texi (Meta key does not work in xterm) + (Emacs does not display 8-bit characters) + (Inputting eight-bit characters): + * custom.texi (Minor Modes): + * display.texi (Text Display): + * commands.texi (Text Characters): Update xrefs. + +2006-02-07 Richard M. Stallman <rms@gnu.org> + + * emacs.texi (Top): Update subnode menu. + Update info on old Emacs papers. + (Intro): "Graphical display", not window system. + + * xresources.texi (GTK styles): Minor clarifications. + + * trouble.texi: "Graphical display", not window system. + (Stuck Recursive): Minor clarification. + + * text.texi: Minor clarifications. + (Sentences): Explain why two-space convention is better. + Explain sentence-end-without-period here. + (Fill Commands): Not here. + (Refill): Node moved down. + (Filling): Update menu. + (Table Creation, Cell Justification, Column Commands): Clarify. + + * sending.texi: Minor clarifications. + + * search.texi (Regexp Backslash): Clarification. + + * rmail.texi: Minor cleanups. + (Rmail): Delete digression about `rmail-mode'. + (Rmail Inbox): Delete false advice wrt rmail-primary-inbox-list. + (Rmail Files): Mention C-u M-x rmail. + (Rmail Reply): Mention References. + (Rmail Display): Mention rmail-nonignored-headers. + + * programs.texi: Minor cleanups. + (Comment Commands): Mention momentary Transient Mark mode. + (Matching): Be more specific about customizing show-paren-mode. + (Info Lookup): Don't list the modes that support C-h S. + Just say what it does in an unsupported mode. + (Man Page): Delete excessive info on customizing woman. + (Motion in C): Don't mention c-for/backward-into-nomenclature. + + * abbrevs.texi: Minor clarifications. + (Dabbrev Customization): Talk about "dynamic abbrev expansion", + not "dynamic abbrevs" as if they were a kind of abbrev. + + * picture.texi (Picture): Minor cleanup. + + * mule.texi (Communication Coding): Say "other applications". + (Fontsets): Not specific to X. Add xref to X Resources. + (Unibyte Mode): Renamed from Single-Byte Character Support. + "Graphical display", not window system. + (International): Update menu. + + * maintaining.texi (Format of ChangeLog): + New node, split out from ChangeLog. + (ChangeLog): Clarifications in the remaining text. + (Create Tags Table, Etags Regexps, Select Tags Table): Cleanups. + (Find Tag): Add @w. + (Tags Search): Explain tag table order here. Simplify grep ref. + (List Tags): tags-tag-face is a variable, not a face. + (Emerge): Cleanups. + + * kmacro.texi (Keyboard Macro Counter): Rewrite for clarity. + (Keyboard Macros): Avoid "the user". + + * killing.texi: "Graphical display", not window system. + + * help.texi (Help Echo): "Graphical display", not window system. + + * glossary.texi: Say "you", not "the user". Say "graphical display". + + * frames.texi: Minor cleanups. "Graphical display", not window system. + + * files.texi (Visiting): Make drag-and-drop not X-specific. + + * custom.texi: Minor cleanups. "Graphical display", not window system. + + * cmdargs.texi: Minor cleanups. + + * building.texi (Compilation): Move and split kill-compilation para. + Add para about multiple compilers. + (Compilation Mode): Commands also available in grep mode and others. + Mention C-u C-x ` more tutorially. Clarify C-x `. + (Compilation Shell): Clarify. Put Bash example first. + (Grep Searching): Minor cleanups; add @w. + (Debuggers): Minor cleanups. + (Starting GUD): Make GDB xgraphical mode issue clearer. + (Debugger Operation): Lots of clarifications including + GDB tooltip side-effect issue. + (Commands of GUD): Clarify. + (GUD Customization): Add bashdb-mode-hook. + (GDB Graphical Interface): Rewrite for clarity. + (GDB User Interface Layout): Rewrite for clarity. + (Stack Buffer, Watch Expressions): Likewise. + (Other GDB User Interface Buffers): Cleanups. + (Lisp Libraries, External Lisp): Cleanup. + + * basic.texi (Position Info): "Graphical displays", rather than + window systems. + + * anti.texi: Minor cleanup. + +2006-02-06 Romain Francoise <romain@orebokech.com> + + * faq.texi (VM): VM now at version 7.19. + Set myself as maintainer of this file. + 2006-02-04 Michael Olson <mwolson@gnu.org> * erc.texi (History): Note that ERC is now included with Emacs. diff --git a/man/abbrevs.texi b/man/abbrevs.texi index 9c66df9ff03..683da2204c1 100644 --- a/man/abbrevs.texi +++ b/man/abbrevs.texi @@ -10,7 +10,7 @@ A defined @dfn{abbrev} is a word which @dfn{expands}, if you insert it, into some different text. Abbrevs are defined by the user to expand in specific ways. For example, you might define @samp{foo} as an abbrev -expanding to @samp{find outer otter}. Then you would be able to insert +expanding to @samp{find outer otter}. Then you could insert @samp{find outer otter } into the buffer by typing @kbd{f o o @key{SPC}}. @@ -20,9 +20,9 @@ to expand the letters in the buffer before point by looking for other words in the buffer that start with those letters. @xref{Dynamic Abbrevs}. -``Hippie'' expansion generalizes abbreviation expansion. @xref{Hippie -Expand, , Hippie Expansion, autotype, Features for Automatic -Typing}. + ``Hippie'' expansion generalizes abbreviation expansion. +@xref{Hippie Expand, , Hippie Expansion, autotype, Features for +Automatic Typing}. @menu * Abbrev Concepts:: Fundamentals of defined abbrevs. @@ -57,16 +57,16 @@ turns Abbrev mode on if the argument is positive, off otherwise. on when the variable is non-@code{nil}. The variable @code{abbrev-mode} automatically becomes local to the current buffer when it is set. - Abbrev definitions can be @dfn{mode-specific}---active only in one major + Abbrevs can have @dfn{mode-specific} definitions, active only in one major mode. Abbrevs can also have @dfn{global} definitions that are active in all major modes. The same abbrev can have a global definition and various mode-specific definitions for different major modes. A mode-specific definition for the current major mode overrides a global definition. - Abbrevs can be defined interactively during the editing session. Lists -of abbrev definitions can also be saved in files and reloaded in later -sessions. Some users keep extensive lists of abbrevs that they load in -every session. + Yu can define abbrevs interactively during the editing session. You +can also save lists of abbrev definitions in files for use in later +sessions. Some users keep extensive lists of abbrevs that they load +in every session. @node Defining Abbrevs @section Defining Abbrevs @@ -88,8 +88,7 @@ Define @var{abbrev} as an abbrev expanding into @var{exp}. @item M-x define-mode-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET} Define @var{abbrev} as a mode-specific abbrev expanding into @var{exp}. @item M-x kill-all-abbrevs -This command discards all abbrev definitions currently in effect, -leaving a blank slate. +Discard all abbrev definitions, leaving a blank slate. @end table @kindex C-x a g @@ -118,13 +117,13 @@ as for @kbd{C-x a g}. @findex inverse-add-global-abbrev @kindex C-x a i l @findex inverse-add-mode-abbrev - If the text already in the buffer is the abbrev, rather than its -expansion, use command @kbd{C-x a i g} -(@code{inverse-add-global-abbrev}) instead of @kbd{C-x a g}, or use -@kbd{C-x a i l} (@code{inverse-add-mode-abbrev}) instead of @kbd{C-x a -l}. These commands are called ``inverse'' because they invert the -meaning of the two text strings they use (one from the buffer and one -read with the minibuffer). + If the abbrev text itself is already in the buffer, you can use the +commands @kbd{C-x a i g} (@code{inverse-add-global-abbrev}) and +@kbd{C-x a i l} (@code{inverse-add-mode-abbrev}) to define it as an +abbrev by specify the expansion in the minibuffer. These commands are +called ``inverse'' because they invert the meaning of the two text +strings they use (one from the buffer and one read with the +minibuffer). @findex define-mode-abbrev @findex define-global-abbrev @@ -137,14 +136,12 @@ It reads two arguments---the abbrev, and its expansion. The command When the abbrev has a prior definition, the abbrev definition commands ask for confirmation before replacing it. - To remove an abbrev definition, give a negative argument to the abbrev -definition command: @kbd{C-u - C-x a g} or @kbd{C-u - C-x a l}. The -former removes a global definition, while the latter removes a -mode-specific definition. - @findex kill-all-abbrevs - @kbd{M-x kill-all-abbrevs} removes all the abbrev definitions there -are, both global and local. + To remove an abbrev definition, give a negative argument to the +abbrev definition command: @kbd{C-u - C-x a g} or @kbd{C-u - C-x a l}. +The former removes a global definition, while the latter removes a +mode-specific definition. @kbd{M-x kill-all-abbrevs} removes all +abbrev definitions, both global and local. @node Expanding Abbrevs @section Controlling Abbrev Expansion @@ -179,9 +176,9 @@ Expand some or all abbrevs found in the region. @kindex M-' @findex abbrev-prefix-mark - You may wish to expand an abbrev with a prefix attached; for example, -if @samp{cnst} expands into @samp{construction}, you might want to use -it to enter @samp{reconstruction}. It does not work to type + You may wish to expand an abbrev and attach a prefix to the expansion; +for example, if @samp{cnst} expands into @samp{construction}, you might want +to use it to enter @samp{reconstruction}. It does not work to type @kbd{recnst}, because that is not necessarily a defined abbrev. What you can do is use the command @kbd{M-'} (@code{abbrev-prefix-mark}) in between the prefix @samp{re} and the abbrev @samp{cnst}. First, insert @@ -195,7 +192,7 @@ used. The result is the desired @samp{reconstruction}. If you actually want the text of the abbrev in the buffer, rather than its expansion, you can accomplish this by inserting the following punctuation with @kbd{C-q}. Thus, @kbd{foo C-q ,} leaves @samp{foo,} in -the buffer. +the buffer, not expanding it. @findex unexpand-abbrev If you expand an abbrev by mistake, you can undo the expansion and @@ -234,6 +231,7 @@ Edit a list of abbrevs; you can add, alter or remove definitions. The output from @kbd{M-x list-abbrevs} looks like this: @example +@var{various other tables@dots{}} (lisp-mode-abbrev-table) "dk" 0 "define-key" (global-abbrev-table) @@ -322,16 +320,16 @@ variable @code{save-abbrevs} to @code{nil}. similar to the previous commands but work on text in an Emacs buffer. @kbd{M-x insert-abbrevs} inserts text into the current buffer after point, describing all current abbrev definitions; @kbd{M-x define-abbrevs} parses -the entire current buffer and defines abbrevs accordingly.@refill +the entire current buffer and defines abbrevs accordingly. @node Dynamic Abbrevs @section Dynamic Abbrev Expansion - The abbrev facility described above operates automatically as you insert -text, but all abbrevs must be defined explicitly. By contrast, -@dfn{dynamic abbrevs} allow the meanings of abbrevs to be determined -automatically from the contents of the buffer, but dynamic abbrev expansion -happens only when you request it explicitly. + The abbrev facility described above operates automatically as you +insert text, but all abbrevs must be defined explicitly. By contrast, +@dfn{dynamic abbrevs} allow the meanings of abbreviations to be +determined automatically from the contents of the buffer, but dynamic +abbrev expansion happens only when you request it explicitly. @kindex M-/ @kindex C-M-/ @@ -357,7 +355,7 @@ expansion found looking backward from point. Repeating @kbd{M-/} searches for an alternative expansion by looking farther back. After scanning all the text before point, it searches the text after point. The variable @code{dabbrev-limit}, if non-@code{nil}, specifies how far -in the buffer to search for an expansion. +away in the buffer to search for an expansion. @vindex dabbrev-check-all-buffers After scanning the current buffer, @kbd{M-/} normally searches other @@ -372,21 +370,20 @@ expressions, dynamic abbrev expansion skips that buffer. A negative argument to @kbd{M-/}, as in @kbd{C-u - M-/}, says to search first for expansions after point, then other buffers, and -consider expansions before point only as a last resort. - - If you repeat the @kbd{M-/} to look for another expansion, do not -specify an argument. This tries all the expansions after point and -then the expansions before point. +consider expansions before point only as a last resort. If you repeat +the @kbd{M-/} to look for another expansion, do not specify an +argument. Repeating @kbd{M-/} cycles through all the expansions after +point and then the expansions before point. After you have expanded a dynamic abbrev, you can copy additional words that follow the expansion in its original context. Simply type -@kbd{@key{SPC} M-/} for each word you want to copy. The spacing and -punctuation between words is copied along with the words. +@kbd{@key{SPC} M-/} for each additional word you want to copy. The +spacing and punctuation between words is copied along with the words. The command @kbd{C-M-/} (@code{dabbrev-completion}) performs -completion of a dynamic abbreviation. Instead of trying the possible -expansions one by one, it finds all of them, then inserts the text that -they have in common. If they have nothing in common, @kbd{C-M-/} +completion of a dynamic abbrev. Instead of trying the possible +expansions one by one, it finds all of them, then inserts the text +that they have in common. If they have nothing in common, @kbd{C-M-/} displays a list of completions, from which you can select a choice in the usual manner. @xref{Completion}. @@ -411,24 +408,25 @@ in case. If the value of @code{dabbrev-case-fold-search} is for expansions. @vindex dabbrev-case-replace - Normally, dynamic abbrev expansion preserves the case pattern @emph{of -the abbrev you have typed}, by converting the expansion to that case -pattern. + Normally, dynamic abbrev expansion preserves the case pattern +@emph{of the dynamic abbrev you are expanding}, by converting the +expansion to that case pattern. @vindex dabbrev-case-fold-search - The variable @code{dabbrev-case-replace} controls whether to preserve -the case pattern of the abbrev. If it is @code{t}, the abbrev's case -pattern is preserved in most cases; if it is @code{nil}, the expansion is -always copied verbatim. If the value of @code{dabbrev-case-replace} is -@code{case-replace}, which is true by default, then the variable -@code{case-replace} controls whether to copy the expansion verbatim. + The variable @code{dabbrev-case-replace} controls whether to +preserve the case pattern of the dynamic abbrev. If it is @code{t}, +the dynamic abbrev's case pattern is preserved in most cases; if it is +@code{nil}, the expansion is always copied verbatim. If the value of +@code{dabbrev-case-replace} is @code{case-replace}, which is true by +default, then the variable @code{case-replace} controls whether to +copy the expansion verbatim. However, if the expansion contains a complex mixed case pattern, and -the abbrev matches this pattern as far as it goes, then the expansion is -always copied verbatim, regardless of those variables. Thus, for -example, if the buffer contains @code{variableWithSillyCasePattern}, and -you type @kbd{v a M-/}, it copies the expansion verbatim including its -case pattern. +the dynamic abbrev matches this pattern as far as it goes, then the +expansion is always copied verbatim, regardless of those variables. +Thus, for example, if the buffer contains +@code{variableWithSillyCasePattern}, and you type @kbd{v a M-/}, it +copies the expansion verbatim including its case pattern. @vindex dabbrev-abbrev-char-regexp The variable @code{dabbrev-abbrev-char-regexp}, if non-@code{nil}, @@ -436,16 +434,16 @@ controls which characters are considered part of a word, for dynamic expansion purposes. The regular expression must match just one character, never two or more. The same regular expression also determines which characters are part of an expansion. The value @code{nil} has a special -meaning: abbreviations are made of word characters, but expansions are +meaning: dynamic abbrevs are made of word characters, but expansions are made of word and symbol characters. @vindex dabbrev-abbrev-skip-leading-regexp In shell scripts and makefiles, a variable name is sometimes prefixed with @samp{$} and sometimes not. Major modes for this kind of text can -customize dynamic abbreviation to handle optional prefixes by setting +customize dynamic abbrev expansion to handle optional prefixes by setting the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value should be a regular expression that matches the optional prefix that -dynamic abbreviation should ignore. +dynamic abbrev expression should ignore. @ignore arch-tag: 638e0079-9540-48ec-9166-414083e16445 diff --git a/man/anti.texi b/man/anti.texi index c0ea6666a87..bfcd8badae0 100644 --- a/man/anti.texi +++ b/man/anti.texi @@ -107,7 +107,7 @@ source code, grep for it. @item The apropos commands will not accept a list of words to match, in -order to encourage users to be more specific. Also, the user option +order to encourage you to be more specific. Also, the user option @code{apropos-sort-by-scores} has been removed. @item diff --git a/man/basic.texi b/man/basic.texi index f3ae93ccad3..f4d15f9171b 100644 --- a/man/basic.texi +++ b/man/basic.texi @@ -618,9 +618,9 @@ What to type to input the character in the current input method (if it supports the character). @item -If you are running Emacs on a window system, the font name and glyph -code for the character. If you are running Emacs on a terminal, the -code(s) sent to the terminal. +If you are running Emacs on a graphical display, the font name and +glyph code for the character. If you are running Emacs on a text-only +terminal, the code(s) sent to the terminal. @item The character's text properties (@pxref{Text Properties,,, diff --git a/man/building.texi b/man/building.texi index bc7ab649407..e3e3b5ac5a2 100644 --- a/man/building.texi +++ b/man/building.texi @@ -90,23 +90,12 @@ above point, which remains at the end. If point is not at the end of the buffer, it remains fixed while more compilation output is added at the end of the buffer. -@cindex compilation buffer, keeping current position at the end +@cindex compilation buffer, keeping point at end @vindex compilation-scroll-output If you set the variable @code{compilation-scroll-output} to a non-@code{nil} value, then the compilation buffer always scrolls to follow output as it comes in. -@findex kill-compilation - When the compiler process terminates, for whatever reason, the mode -line of the @samp{*compilation*} buffer changes to say @samp{exit} -(followed by the exit code, @samp{[0]} for a normal exit), or -@samp{signal} (if a signal terminated the process), instead of -@samp{run}. Starting a new compilation also kills any running -compilation, as only one can exist at any time. However, @kbd{M-x -compile} asks for confirmation before actually killing a compilation -that is running. You can also kill the compilation process with -@kbd{M-x kill-compilation}. - @findex recompile To rerun the last compilation with the same command, type @kbd{M-x recompile}. This automatically reuses the compilation command from @@ -115,6 +104,25 @@ the last invocation of @kbd{M-x compile}. It also reuses the directory, which is the directory in which the previous compilation was started. + When the compiler process terminates, for whatever reason, the mode +line of the @samp{*compilation*} buffer changes to say @samp{exit} +(followed by the exit code, @samp{[0]} for a normal exit), or +@samp{signal} (if a signal terminated the process), instead of +@samp{run}. + +@findex kill-compilation + Starting a new compilation also kills any compilation +running in @samp{*compilation*}, as the buffer can only handle one +compilation at any time. However, @kbd{M-x compile} asks for +confirmation before actually killing a compilation that is running. +You can also kill the compilation process with @kbd{M-x +kill-compilation}. + + If you want to run two compilations at once, you should start the +first one, then rename the @samp{*compilation*} buffer (perhaps using +@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other +compilation. That will create a new @samp{*compilation*} buffer. + Emacs does not expect a compiler process to launch asynchronous subprocesses; if it does, and they keep running after the main compiler process has terminated, Emacs may kill them or their output @@ -146,21 +154,23 @@ variable settings override the usual ones. @node Compilation Mode @section Compilation Mode -@findex compile-goto-error @cindex Compilation mode @cindex mode, Compilation - The @samp{*compilation*} buffer uses a special major mode, Compilation -mode, whose main feature is to provide a convenient way to look at the -source line where the error happened. + The @samp{*compilation*} buffer uses a special major mode, +Compilation mode, whose main feature is to provide a convenient way to +visit the source line corresponding to an error message. These +commands are also available in other special buffers that list +locations in files, including those made by @kbd{M-x grep} and +@kbd{M-x occur}. @table @kbd @item M-g M-n @itemx M-g n @itemx C-x ` -Visit the locus of the next compiler error message or @code{grep} match. +Visit the locus of the next error message or match. @item M-g M-p @itemx M-g p -Visit the locus of the previous compiler error message or @code{grep} match. +Visit the locus of the previous error message or match. @item @key{RET} Visit the locus of the error message that point is on. This command is used in the compilation buffer. @@ -183,16 +193,17 @@ Toggle Next Error Follow minor mode, which makes cursor motion in the compilation buffer produce automatic source display. @end table -@kindex M-g M-n -@kindex M-g n -@kindex C-x ` -@findex next-error +@findex compile-goto-error You can visit the source for any particular error message by moving point in the @samp{*compilation*} buffer to that error message and typing @key{RET} (@code{compile-goto-error}). Alternatively, you can click @kbd{Mouse-2} on the error message; you need not switch to the @samp{*compilation*} buffer first. +@kindex M-g M-n +@kindex M-g n +@kindex C-x ` +@findex next-error @vindex next-error-highlight To parse the compiler error messages sequentially, type @kbd{C-x `} (@code{next-error}). The character following the @kbd{C-x} is the @@ -203,27 +214,30 @@ location of the error in another window. It also momentarily highlights the relevant source line. You can change the behavior of this highlighting with the variable @code{next-error-highlight}. - The first time @kbd{C-x `} is used after the start of a compilation, -it moves to the first error's location. Subsequent uses of @kbd{C-x `} -advance down to subsequent errors. If you visit a specific error -message with @key{RET} or @kbd{Mouse-2}, subsequent @kbd{C-x `} -commands advance from there. When @kbd{C-x `} gets to the end of the + The first time @w{@kbd{C-x `}} is used after the start of a compilation, +it moves to the first error's location. Subsequent uses of @kbd{C-x +`} advance down to subsequent errors. If you visit a specific error +message with @key{RET} or @kbd{Mouse-2}, subsequent @w{@kbd{C-x `}} +commands advance from there. When @w{@kbd{C-x `}} gets to the end of the buffer and finds no more error messages to visit, it fails and signals -an Emacs error. +an Emacs error. @w{@kbd{C-u C-x `}} starts scanning from the beginning of +the compilation buffer, and goes to the first error's location. @vindex compilation-skip-threshold - By default, @kbd{C-x `} skips less important messages. The variable + By default, @w{@kbd{C-x `}} skips less important messages. The variable @code{compilation-skip-threshold} controls this. If its value is 2, -@kbd{C-x `} skips anything less than error, 1 skips anything less -than warning, and 0 doesn't skip any messages. +@w{@kbd{C-x `}} skips anything less than error, 1 skips anything less +than warning, and 0 doesn't skip any messages. The default is 1. -When the left fringe is displayed, an arrow points to the -current message in the compilation buffer. The variable + When the window has a left fringe, an arrow in the fringe points to +the current message in the compilation buffer. The variable @code{compilation-context-lines} controls the number of lines of -leading context in the window before the current message. If it is -@code{nil} and the left fringe is displayed, the window doesn't -scroll. If there is no left fringe, no arrow is displayed and a value -of @code{nil} means display the message at the top of the window. +leading context to display before the current message. Going to an +error message location scrolls the @samp{*compilation*} buffer to put +the message that far down from the top. The value @code{nil} is +special: if there's a left fringe, the window doesn't scroll at all +if the message is already visible. If there is no left fringe, +@code{nil} means display the message at the top of the window. If you're not in the compilation buffer when you run @code{next-error}, Emacs will look for a buffer that contains error @@ -233,9 +247,6 @@ then at the current buffer. Finally, Emacs looks at all the remaining buffers. @code{next-error} signals an error if it can't find any such buffer. - @kbd{C-u C-x `} starts scanning from the beginning of the compilation -buffer. This is one way to process the same set of errors again. - @vindex compilation-error-regexp-alist @vindex grep-regexp-alist To parse messages from the compiler, Compilation mode uses the @@ -280,28 +291,28 @@ files by FTP (@pxref{File Names}). @node Compilation Shell @section Subshells for Compilation - Emacs uses a shell to run the compilation command, but specifies -the option for a noninteractive shell. This means, in particular, that + Emacs uses a shell to run the compilation command, but specifies the +option for a noninteractive shell. This means, in particular, that the shell should start with no prompt. If you find your usual shell prompt making an unsightly appearance in the @samp{*compilation*} buffer, it means you have made a mistake in your shell's init file by setting the prompt unconditionally. (This init file's name may be -@file{.bashrc}, @file{.profile}, @file{.cshrc}, @file{.shrc}, or various -other things, depending on the shell you use.) The shell init file -should set the prompt only if there already is a prompt. In csh, here -is how to do it: +@file{.bashrc}, @file{.profile}, @file{.cshrc}, @file{.shrc}, or +various other things, depending on the shell you use.) The shell init +file should set the prompt only if there already is a prompt. Here's +how to do it in bash: @example -if ($?prompt) set prompt = @dots{} +if [ "$@{PS1+set@}" = set ] +then PS1=@dots{} +fi @end example @noindent -And here's how to do it in bash: +And here's how to do it in csh: @example -if [ "$@{PS1+set@}" = set ] -then PS1=@dots{} -fi +if ($?prompt) set prompt = @dots{} @end example There may well be other things that your shell's init file @@ -335,18 +346,18 @@ Kill the running @code{grep} subprocess. @end table @findex grep - To run @code{grep}, type @kbd{M-x grep}, then enter a command line that -specifies how to run @code{grep}. Use the same arguments you would give -@code{grep} when running it normally: a @code{grep}-style regexp -(usually in single-quotes to quote the shell's special characters) -followed by file names, which may use wildcards. If you specify a -prefix argument for @kbd{M-x grep}, it figures out the tag + To run @code{grep}, type @kbd{M-x grep}, then enter a command line +that specifies how to run @code{grep}. Use the same arguments you +would give @code{grep} when running it normally: a @code{grep}-style +regexp (usually in single-quotes to quote the shell's special +characters) followed by file names, which may use wildcards. If you +specify a prefix argument for @kbd{M-x grep}, it detects the tag (@pxref{Tags}) around point, and puts that into the default @code{grep} command. The output from @code{grep} goes in the @samp{*grep*} buffer. You -can find the corresponding lines in the original files using @kbd{C-x -`}, @key{RET}, and so forth, just like compilation errors. +can find the corresponding lines in the original files using @w{@kbd{C-x +`}}, @key{RET}, and so forth, just like compilation errors. Some grep programs accept a @samp{--color} option to output special markers around matches for the purpose of highlighting. You can make @@ -403,12 +414,11 @@ Flymake, flymake, The Flymake Manual}. @c Do you believe in GUD? The GUD (Grand Unified Debugger) library provides an interface to various symbolic debuggers from within Emacs. We recommend the -debugger GDB, which is free software, but you can also run DBX, SDB or -XDB if you have them. GUD can also serve as an interface to Perl's -debugging mode, the Python debugger PDB, the bash debugger, and to -JDB, the Java Debugger. @xref{Debugging,, The Lisp Debugger, elisp, -the Emacs Lisp Reference Manual}, for information on debugging Emacs -Lisp programs. +debugger GDB, which is free software, but GUD can also run DBX, SDB or +XDB. GUD can also serve as an interface to Perl's debugging mode, the +Python debugger PDB, the Bash debugger, and to JDB, the Java Debugger. +@xref{Debugging,, The Lisp Debugger, elisp, the Emacs Lisp Reference +Manual}, for information on debugging Emacs Lisp programs. @menu * Starting GUD:: How to start a debugger subprocess. @@ -429,24 +439,27 @@ to a particular debugger program. @table @kbd @item M-x gdb @key{RET} @var{file} @key{RET} @findex gdb -Run GDB as a subprocess of Emacs. By default, this operates in -graphical mode; @xref{GDB Graphical Interface}. Graphical mode -does not support any other debuggers. +Run GDB as a subprocess of Emacs. By default, this uses an IDE-like +graphical interface; see @ref{GDB Graphical Interface}. Only GDB +works with the graphical interface. @item M-x dbx @key{RET} @var{file} @key{RET} @findex dbx -Similar, but run DBX instead of GDB. +Run DBX as a subprocess of Emacs. Since Emacs does not implement a +graphical interface for DBX, communication with DBX works by typing +commands in the GUD interaction buffer. The same is true for all +the other supported debuggers. @item M-x xdb @key{RET} @var{file} @key{RET} @findex xdb @vindex gud-xdb-directories -Similar, but run XDB instead of GDB. Use the variable +Similar, but run XDB. Use the variable @code{gud-xdb-directories} to specify directories to search for source files. @item M-x sdb @key{RET} @var{file} @key{RET} @findex sdb -Similar, but run SDB instead of GDB. +Similar, but run SDB. Some versions of SDB do not mention source file names in their messages. When you use them, you need to have a valid tags table @@ -484,27 +497,25 @@ allowed. GUD assumes that the first argument not starting with a @subsection Debugger Operation @cindex fringes, and current execution line in GUD - When you run a debugger with GUD, the debugger uses an Emacs buffer -for its ordinary input and output. This is called the GUD buffer. The -debugger displays the source files of the program by visiting them in -Emacs buffers. An arrow (@samp{=>}) in one of these buffers indicates -the current execution line.@footnote{Under a window system, the arrow -appears in the left fringe of the Emacs window.} Moving point in this -buffer does not move the arrow. + When you run a debugger with GUD using the textual interface, the +debugger uses an Emacs buffer for its ordinary input and output. This +is called the GUD buffer. Input and output from the program you are +debugging also use this buffer. + + The debugger displays the source files of the program by visiting +them in Emacs buffers. An arrow in the left fringe indicates the +current execution line.@footnote{On a text-only terminal, the arrow +appears as @samp{=>} and overlays the first two text columns.} Moving +point in this buffer does not move the arrow. The arrow is not part +of the file's text; it appears only on the screen. You can start editing these source files at any time in the buffers -that display them. The arrow is not part of the file's -text; it appears only on the screen. If you do modify a source file, -keep in mind that inserting or deleting lines will throw off the arrow's -positioning; GUD has no way of figuring out which line corresponded -before your changes to the line number in a debugger message. Also, -you'll typically have to recompile and restart the program for your -changes to be reflected in the debugger's tables. - - If you wish, you can control your debugger process entirely through the -debugger buffer, which uses a variant of Shell mode. All the usual -commands for your debugger are available, and you can use the Shell mode -history commands to repeat them. @xref{Shell Mode}. +that display them. If you do modify a source file, keep in mind that +inserting or deleting lines will throw off the arrow's positioning; +GUD has no way of figuring out which line corresponded before your +changes to the line number in a debugger message. Also, you'll +typically have to recompile and restart the program for your changes +to be reflected in the debugger's tables. @cindex tooltips with GUD @vindex tooltip-gud-modes @@ -521,23 +532,30 @@ the list @code{gud-tooltip-modes}. If the variable @code{gud-tooltip-echo-area} is non-@code{nil} then the variable's value is displayed in the echo area. -With GDB in text command mode (@pxref{GDB Graphical Interface}), -it is possible that use of GUD tooltips can cause a function to be -called with harmful side-effects. In this case, Emacs disables -them. + GUD tooltips are disabled when you use GDB in text command mode +(@pxref{GDB Graphical Interface}), because displaying an expression's +value in GDB can sometimes expand a macro and result in a side effect +that interferes with the program's operation. The GDB graphical +interface supports GUD tooltips and assures they will not cause side +effects. @node Commands of GUD @subsection Commands of GUD The GUD interaction buffer uses a variant of Shell mode, so the -commands of Shell mode are available (@pxref{Shell Mode}). GUD mode -also provides commands for setting and clearing breakpoints, for -selecting stack frames, and for stepping through the program. These -commands are available both in the GUD buffer and globally, but with -different key bindings. It also has its own tool bar from which you -can invoke the more common commands by clicking on the appropriate -icon. This is particularly useful for repetitive commands like -gud-next and gud-step and allows the user to hide the GUD buffer. +Emacs commands of Shell mode are available (@pxref{Shell Mode}). All +the usual commands for your debugger are available, and you can use +the Shell mode history commands to repeat them. If you wish, you can +control your debugger process entirely through this buffer. + + GUD mode also provides commands for setting and clearing +breakpoints, for selecting stack frames, and for stepping through the +program. These commands are available both in the GUD buffer and +globally, but with different key bindings. It also has its own tool +bar from which you can invoke the more common commands by clicking on +the appropriate icon. This is particularly useful for repetitive +commands like @code{gud-next} and @code{gud-step}, and allows you to +keep the GUD buffer hidden. The breakpoint commands are normally used in source file buffers, because that is the easiest way to specify where to set or clear the @@ -550,7 +568,7 @@ Set a breakpoint on the source line that point is on. @end table @kindex C-x C-a @r{(GUD)} - Here are the other special commands provided by GUD. The keys + Here are the other special commands provided by GUD@. The keys starting with @kbd{C-c} are available only in the GUD interaction buffer. The key bindings that start with @kbd{C-x C-a} are available in the GUD interaction buffer and also in source files. @@ -606,9 +624,9 @@ buffer, it applies to the line where the program last stopped. @kindex C-c C-t @r{(GUD)} @itemx C-x C-a C-t @findex gud-tbreak -Set a temporary breakpoint on the current source line, if any. -If you use this command in the GUD interaction buffer, -it applies to the line where the program last stopped. +Set a temporary breakpoint on the current source line, if any +(@code{gud-tbreak}). If you use this command in the GUD interaction +buffer, it applies to the line where the program last stopped. @end table The above commands are common to all supported debuggers. If you are @@ -620,14 +638,14 @@ using GDB or (some versions of) DBX, these additional commands are available: @itemx C-x C-a < @findex gud-up Select the next enclosing stack frame (@code{gud-up}). This is -equivalent to the @samp{up} command. +equivalent to the GDB command @samp{up}. @item C-c > @kindex C-c > @r{(GUD)} @itemx C-x C-a > @findex gud-down Select the next inner stack frame (@code{gud-down}). This is -equivalent to the @samp{down} command. +equivalent to the GDB command @samp{down}. @end table If you are using GDB, these additional key bindings are available: @@ -643,29 +661,28 @@ Start execution of the program (@code{gud-run}). @kindex C-c C-u @r{(GUD)} @itemx C-x C-a C-u @findex gud-until -Continue execution to the current line. The program will run until -it hits a breakpoint, terminates, gets a signal that the debugger is -checking for, or reaches the line on which the cursor currently sits -(@code{gud-until}). +Continue execution to the current line (@code{gud-until}). The +program will run until it hits a breakpoint, terminates, gets a signal +that the debugger is checking for, or reaches the line on which the +cursor currently sits. @item @key{TAB} @kindex TAB @r{(GUD)} @findex gud-gdb-complete-command With GDB, complete a symbol name (@code{gud-gdb-complete-command}). -This key is available only in the GUD interaction buffer, and requires -GDB versions 4.13 and later. +This key is available only in the GUD interaction buffer. @item C-c C-f @kindex C-c C-f @r{(GUD)} @itemx C-x C-a C-f @findex gud-finish -Run the program until the selected stack frame returns (or until it -stops for some other reason). +Run the program until the selected stack frame returns or +stops for some other reason (@code{gud-finish}). @item C-x C-a C-j @kindex C-x C-a C-j @r{(GUD)} @findex gud-jump -Only useful in a source buffer, (@code{gud-jump}) transfers the +Only useful in a source buffer, @code{gud-jump} transfers the program's execution point to the current line. In other words, the next line that the program executes will be the one where you gave the command. If the new execution line is in a different function from @@ -691,11 +708,13 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab. @vindex perldb-mode-hook @vindex pdb-mode-hook @vindex jdb-mode-hook +@vindex bashdb-mode-hook On startup, GUD runs one of the following hooks: @code{gdb-mode-hook}, if you are using GDB; @code{dbx-mode-hook}, if you are using DBX; @code{sdb-mode-hook}, if you are using SDB; @code{xdb-mode-hook}, if you are using XDB; @code{perldb-mode-hook}, for Perl debugging mode; -@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB. You can +@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB; +@code{bashdb-mode-hook}, for the Bash debugger. You can use these hooks to define custom key bindings for the debugger interaction buffer. @xref{Hooks}. @@ -750,37 +769,37 @@ ignores any numeric argument. @node GDB Graphical Interface @subsection GDB Graphical Interface -@findex gdb-mouse-set-clear-breakpoint -@findex gdb-mouse-toggle-breakpoint By default, the command @code{gdb} starts GDB using a graphical -interface where you view and control the program's data using Emacs -windows. You can still interact with GDB through the GUD buffer, but -the point of this mode is that you can do it through menus and clicks, -without needing to know GDB commands. For example, you can click -@kbd{Mouse-1} in the fringe or display margin of a source buffer to -set a breakpoint there and, on a graphical display, a red bullet will -appear. If a breakpoint already exists on that line, this action will -remove it. You can also enable or disable a breakpoint by clicking -@kbd{Mouse-3} on the bullet. If you drag the debugger arrow in the -fringe with @kbd{Mouse-1}, execution will continue to the line where -you release the button, provided it is still in the same frame -(@code{gdb-mouse-until}). Alternatively, you can click @kbd{Mouse-2} -at some point in the fringe of this buffer and execution will advance -to there. - -This mode requires that GDB think that the screen size is unlimited, -and sets the height and width accordingly. For correct operation it -is important that you don't change these values during the session. +interface, using Emacs windows for display program state information. +In effect, this makes Emacs into an IDE (interactive development +environment). With it, you do not need to use textual GDB commands; +you can control the debugging session with the mouse. + +@c @findex gdb-mouse-set-clear-breakpoint +@c @findex gdb-mouse-toggle-breakpoint + For example, you can click @kbd{Mouse-1} in the fringe or display +margin of a source buffer to set a breakpoint there and, on a +graphical display, a red bullet will appear on that line. If a +breakpoint already exists on that line, the same click will remove it. +You can also enable or disable a breakpoint by clicking @kbd{Mouse-3} +on the bullet. If you drag the debugger arrow in the fringe with +@kbd{Mouse-1} (@code{gdb-mouse-until}), execution will continue to the +line where you release the button, provided it is still in the same +frame. Alternatively, you can click @kbd{Mouse-2} at some point in +the fringe of this buffer and execution will advance to there. + + This mode requires telling GDB that its ``screen size'' is +unlimited, so it sets the height and width accordingly. For correct +operation you must not change these values during the GDB session. @vindex gud-gdb-command-name @findex gdba - You can also run GDB in text command mode, which creates a buffer -for input and output to GDB. To do this, set -@code{gud-gdb-command-name} to @code{"gdb --fullname"} or edit the -startup command in the minibuffer to say that. You need to do use -text command mode to run multiple debugging sessions within one Emacs -session. If you have customized @code{gud-gdb-command-name} in that -way, then you can use @kbd{M-x gdba} to invoke GDB in graphical mode. + You can also run GDB in text command mode, like other debuggers. To +do this, set @code{gud-gdb-command-name} to @code{"gdb --fullname"} or +edit the startup command in the minibuffer to say that. You need to +do use text command mode to run multiple debugging sessions within one +Emacs session. If you have customized @code{gud-gdb-command-name} in +that way, you can use @kbd{M-x gdba} to invoke GDB in graphical mode. @menu * GDB User Interface Layout:: Control the number of displayed buffers. @@ -795,19 +814,16 @@ way, then you can use @kbd{M-x gdba} to invoke GDB in graphical mode. @subsubsection GDB User Interface Layout @cindex GDB User Interface layout -@findex gdb-many-windows @vindex gdb-many-windows + If the variable @code{gdb-many-windows} is @code{nil} (the default +value) then @kbd{M-x gdb} normally displays only the GUD buffer. +However, if the variable @code{gdb-show-main} is also non-@code{nil}, +it starts with two windows: one displaying the GUD buffer, and the +other showing the source for the @code{main} function of the program +you are debugging. -If the variable @code{gdb-many-windows} is @code{nil} (the default -value) then gdb just pops up the GUD buffer unless the variable -@code{gdb-show-main} is non-@code{nil}. In this case it starts with -two windows: one displaying the GUD buffer and the other with the -source file with the main routine of the inferior. - -If @code{gdb-many-windows} is non-@code{nil}, regardless of the value of -@code{gdb-show-main}, the layout below will appear unless -@code{gdb-use-inferior-io-buffer} is @code{nil}. In this case the -source buffer occupies the full width of the frame. + If @code{gdb-many-windows} is non-@code{nil}, then @kbd{M-x gdb} +displays the following frame layout: @example +--------------------------------+--------------------------------+ @@ -825,121 +841,131 @@ source buffer occupies the full width of the frame. +--------------------------------+--------------------------------+ @end example -To toggle this layout, do @kbd{M-x gdb-many-windows}. + However, if @code{gdb-use-inferior-io-buffer} is @code{nil}, the I/O +buffer does not appear and the source buffer occupies the full width +of the frame. @findex gdb-restore-windows -If you change the window layout, for example, while editing and -re-compiling your program, then you can restore it with the command -@code{gdb-restore-windows}. - -You may also choose which additional buffers you want to display, -either in the same frame or a different one. Select them from -@samp{GUD->GDB-windows} or @samp{GUD->GDB-Frames} sub-menu -respectively. If the menu-bar is unavailable, type @code{M-x + If you change the window layout, for example, while editing and +re-compiling your program, then you can restore this standard window +layout with the command @code{gdb-restore-windows}. + +@findex gdb-many-windows + To switch between this standard layout and a simple layout +containing just the GUD buffer and a source file, type @kbd{M-x +gdb-many-windows}. + + You may also specify additional GUD-related buffers to display, +either in the same frame or a different one. Select the buffers you +want with the @samp{GUD->GDB-windows} and @samp{GUD->GDB-Frames} +sub-menus. If the menu-bar is unavailable, type @code{M-x gdb-display-@var{buffertype}-buffer} or @code{M-x gdb-frame-@var{buffertype}-buffer} respectively, where -@var{buffertype} is the relevant buffer type e.g breakpoints. -Most of these buffers are read-only and be killed by simply -pressing @kbd{q} in them. +@var{buffertype} is the relevant buffer type, such as +@samp{breakpoints}. Most of these buffers are read-only, and typing +@kbd{q} in them kills them. -When you finish debugging then kill the GUD buffer with @kbd{C-x k}, + When you finish debugging, kill the GUD buffer with @kbd{C-x k}, which will also kill all the buffers associated with the session. However you need not do this if, after editing and re-compiling your source code within Emacs, you wish continue debugging. When you restart execution, GDB will automatically find your new executable. Keeping the GUD buffer has the advantage of keeping the shell history -as well as GDB's breakpoints. You need to check, however, that the -breakpoints in the recently edited code are still where you want them. +as well as GDB's breakpoints. You do need to check that the +breakpoints in recently edited source files are still in the right +places. @node Breakpoints Buffer @subsubsection Breakpoints Buffer -The breakpoints buffer shows the existing breakpoints and watchpoints -(@pxref{Breakpoints,,, gdb, The GNU debugger}). It has three special -commands: + The breakpoints buffer shows the existing breakpoints and +watchpoints (@pxref{Breakpoints,,, gdb, The GNU debugger}). It has +these special commands, which mostly apply to the @dfn{current +breakpoint}, the breakpoint which point is on. @table @kbd @item @key{SPC} @kindex SPC @r{(GDB breakpoints buffer)} @findex gdb-toggle-breakpoint -Enable/disable the breakpoint at the current line -(@code{gdb-toggle-breakpoint}). On a graphical display, this changes -the color of a bullet in the margin of the source buffer at the -relevant line. This is red when the breakpoint is enabled and grey -when it is disabled. Text-only terminals correspondingly display -a @samp{B} or @samp{b}. +Enable/disable the current breakpoint (@code{gdb-toggle-breakpoint}). +On a graphical display, this changes the color of a bullet in the +margin of the source buffer at the relevant line. This is red when +the breakpoint is enabled and grey when it is disabled. Text-only +terminals correspondingly display a @samp{B} or @samp{b}. @item D @kindex D @r{(GDB breakpoints buffer)} @findex gdb-delete-breakpoint -Delete the breakpoint at the current line (@code{gdb-delete-breakpoint}). +Delete the current breakpoint (@code{gdb-delete-breakpoint}). @item @key{RET} @kindex RET @r{(GDB breakpoints buffer)} @findex gdb-goto-breakpoint -Display the file in the source buffer at the breakpoint specified at -the current line (@code{gdb-goto-breakpoint}). Alternatively, click -@kbd{Mouse-2} on the breakpoint that you wish to visit. +Visit the source line for the current breakpoint +(@code{gdb-goto-breakpoint}). + +@item Mouse-2 +@kindex Mouse-2 @r{(GDB breakpoints buffer)} +Visit the source line for the breakpoint you click on. @end table @node Stack Buffer @subsubsection Stack Buffer -The stack buffer displays a @dfn{call stack}, with one line for each + The stack buffer displays a @dfn{call stack}, with one line for each of the nested subroutine calls (@dfn{stack frames}) now active in the program. @xref{Backtrace,, Backtraces, gdb, The GNU debugger}. @findex gdb-frames-select -The selected frame number is displayed in reverse contrast. Move -point to any frame in the stack and type @key{RET} to select it -(@code{gdb-frames-select}) and display the associated source in the -source buffer. Alternatively, click @kbd{Mouse-2} on a frame to -select it. If the locals buffer is displayed then its contents update -to display the variables that are local to the new frame. + The selected frame number is displayed in reverse contrast. To +select a frame in GDB, move point in the stack buffer to that stack +frame and type @key{RET} (@code{gdb-frames-select}), or click +@kbd{Mouse-2} on a stack frame. If the locals buffer is visible, +selecting a stack frame updates it to display the local variables of +the new frame. @node Watch Expressions @subsubsection Watch Expressions @cindex Watching expressions in GDB @findex gud-watch -If you want to see how a variable changes each time your program stops -then place the cursor over the variable name and click on the watch -icon in the tool bar (@code{gud-watch}). + If you want to see how a variable changes each time your program +stops, move point into the variable name and click on the watch icon +in the tool bar (@code{gud-watch}). -Each watch expression is displayed in the speedbar. Complex data + Each watch expression is displayed in the speedbar. Complex data types, such as arrays, structures and unions are represented in a tree format. Leaves and simple data types show the name of the expression and its value, and display the type as a tooltip. Higher levels show the name, type and address value for pointers and just the name and type otherwise. -To expand or contract a complex data type, click @kbd{Mouse-2} + To expand or contract a complex data type, click @kbd{Mouse-2} on the tag to the left of the expression. @findex gdb-var-delete -With the cursor over the root expression of a complex data type, type -@kbd{D} to delete it from the speedbar -(@code{gdb-var-delete}). + To delete a complex watch expression, move point to the root +expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}). @kindex RET @r{(GDB speedbar)} @findex gdb-edit-value -With the cursor over a simple data type or an element of a complex -data type which holds a value, type @key{RET} or click @kbd{Mouse-2} to edit -its value. A prompt for a new value appears in the mini-buffer -(@code{gdb-edit-value}). + To edit a variable with a simple data type, or a simple element of a +complex data type, move point there in the speedbar and type @key{RET} +(@code{gdb-edit-value}). Or you can click @kbd{Mouse-2} on a value to +edit it. Either way, this reads the new value using the minibuffer. @vindex gdb-show-changed-values -If you set the variable @code{gdb-show-changed-values} to -non-@code{nil} (the default value), Emacs will use -font-lock-warning-face to display values that have recently changed in -the speedbar. + If you set the variable @code{gdb-show-changed-values} to +non-@code{nil} (the default value), Emacs uses +@code{font-lock-warning-face} to highlight values that have recently +changed. @vindex gdb-use-colon-colon-notation -If you set the variable @code{gdb-use-colon-colon-notation} to a -non-@code{nil} value then, in C, Emacs will use the -@var{function}::@var{variable} format to display variables in the -speedbar. Since this does not work for variables defined in compound -statements, the default value is @code{nil}. + If the variable @code{gdb-use-colon-colon-notation} is +non-@code{nil}, Emacs uses the @samp{@var{function}::@var{variable}} +format to display variables in the speedbar. Since this does not work +for variables defined in compound statements, the default value is +@code{nil}. @node Other GDB User Interface Buffers @subsubsection Other Buffers @@ -949,8 +975,9 @@ statements, the default value is @code{nil}. @vindex gdb-use-inferior-io-buffer If the variable @code{gdb-use-inferior-io-buffer} is non-@code{nil}, the executable program that is being debugged takes its input and -displays its output here, otherwise it uses the GUD buffer. To toggle -the use of this buffer, do @kbd{M-x gdb-use-inferior-io-buffer}. +displays its output here. Otherwise it uses the GUD buffer for that. +To toggle the use of this buffer, do @kbd{M-x +gdb-use-inferior-io-buffer}. Some of the commands from shell mode are available here. @xref{Shell Mode}. @@ -972,15 +999,15 @@ The registers buffer displays the values held by the registers (@pxref{Registers,,, gdb, The GNU debugger}). Press @key{RET} or click @kbd{Mouse-2} on a register if you want to change its value. With GDB 6.4 or later, recently changed register values display with -font-lock-warning-face. With earlier versions of GDB, you can press -@key{SPC} to toggle the display of floating point registers +@code{font-lock-warning-face}. With earlier versions of GDB, you can +press @key{SPC} to toggle the display of floating point registers (@code{toggle-gdb-all-registers}). @item Assembler Buffer The assembler buffer displays the current frame as machine code. An -overlay arrow points to the current instruction and you can set and -remove breakpoints as with the source buffer. Breakpoint icons also -appear in the fringe or margin. +arrow points to the current instruction, and you can set and remove +breakpoints as in a source buffer. Breakpoint icons also appear in +the fringe or margin. @item Threads Buffer @findex gdb-threads-select @@ -990,15 +1017,15 @@ threads, gdb, The GNU debugger}). Move point to any thread in the list and press @key{RET} to select it (@code{gdb-threads-select}) and display the associated source in the source buffer. Alternatively, click @kbd{Mouse-2} on a thread to select it. If the locals buffer is -displayed then its contents update to display the variables that are -local to the new thread. +visible, its contents update to display the variables that are local +in the new thread. @item Memory Buffer -The memory buffer allows the user to examine sections of program -memory (@pxref{Memory, Memory, Examining memory, gdb, The GNU -debugger}). Click @kbd{Mouse-1} on the appropriate part of the header -line to change the starting address or number of data items that the -buffer displays. Click @kbd{Mouse-3} on the header line to select the +The memory buffer lets you examine sections of program memory +(@pxref{Memory, Memory, Examining memory, gdb, The GNU debugger}). +Click @kbd{Mouse-1} on the appropriate part of the header line to +change the starting address or number of data items that the buffer +displays. Click @kbd{Mouse-3} on the header line to select the display format or unit size for these data items. @end table @@ -1045,6 +1072,14 @@ available globally. @xref{Programs}. conventionally end in @file{.el}. This ending tells Emacs to edit them in Emacs-Lisp mode (@pxref{Executing Lisp}). +@cindex byte code + Emacs Lisp code can be compiled into byte-code, which loads faster, +takes up less space, and executes faster. @xref{Byte Compilation,, +Byte Compilation, elisp, the Emacs Lisp Reference Manual}. By +convention, the compiled code for a library goes in a separate file +whose name ends in @samp{.elc}. Thus, the compiled code for +@file{foo.el} goes in @file{foo.elc}. + @findex load-file To execute a file of Emacs Lisp code, use @kbd{M-x load-file}. This command reads a file name using the minibuffer and then executes the @@ -1055,9 +1090,9 @@ not text in an Emacs buffer. @findex load @findex load-library Once a file of Lisp code is installed in the Emacs Lisp library -directories, users can load it using @kbd{M-x load-library}. Programs can -load it by calling @code{load-library}, or with @code{load}, a more primitive -function that is similar but accepts some additional arguments. +directories, users can load it using @kbd{M-x load-library}. Programs +can load it by calling @code{load}, a more primitive function that is +similar but accepts some additional arguments. @kbd{M-x load-library} differs from @kbd{M-x load-file} in that it searches a sequence of directories and tries three file names in each @@ -1068,9 +1103,11 @@ the result of compiling @file{@var{lib}.el}; it is better to load the compiled file, since it will load and run faster. If @code{load-library} finds that @file{@var{lib}.el} is newer than -@file{@var{lib}.elc} file, it issues a warning, because it's likely that -somebody made changes to the @file{.el} file and forgot to recompile -it. +@file{@var{lib}.elc} file, it issues a warning, because it's likely +that somebody made changes to the @file{.el} file and forgot to +recompile it. Nonetheless, it loads @file{@var{lib}.elc}. This is +because people often leave unfinished edits the source file, and don't +recompile it until they think it is ready to use. Because the argument to @code{load-library} is usually not in itself a valid file name, file name completion is not available. Indeed, when @@ -1080,7 +1117,7 @@ will be used. @vindex load-path The sequence of directories searched by @kbd{M-x load-library} is specified by the variable @code{load-path}, a list of strings that are -directory names. The default value of the list contains the directory where +directory names. The default value of the list contains the directories where the Lisp code for Emacs itself is stored. If you have libraries of your own, put them in a single directory and add that directory to @code{load-path}. @code{nil} in this list stands for the current default @@ -1096,15 +1133,6 @@ library. Trying to run any of those commands calls @code{load} to load the library; this replaces the autoload definitions with the real ones from the library. -@cindex byte code - Emacs Lisp code can be compiled into byte-code which loads faster, -takes up less space when loaded, and executes faster. @xref{Byte -Compilation,, Byte Compilation, elisp, the Emacs Lisp Reference Manual}. -By convention, the compiled code for a library goes in a separate file -whose name consists of the library source file with @samp{c} appended. -Thus, the compiled code for @file{foo.el} goes in @file{foo.elc}. -That's why @code{load-library} searches for @samp{.elc} files first. - @vindex load-dangerous-libraries @cindex Lisp files byte-compiled by XEmacs By default, Emacs refuses to load compiled Lisp files which were @@ -1217,7 +1245,7 @@ The customizable variables @code{eval-expression-print-level} and of lists to print in the result of the evaluation commands before abbreviating them. @code{eval-expression-debug-on-error} controls whether evaluation errors invoke the debugger when these commands are -used. +used; its default is @code{t}. @node Lisp Interaction @section Lisp Interaction Buffers @@ -1279,9 +1307,9 @@ mode. @findex lisp-mode For the source files of programs to run in external Lisps, use Lisp -mode. This mode can be selected with @kbd{M-x lisp-mode}, and is used -automatically for files whose names end in @file{.l}, @file{.lsp}, or -@file{.lisp}, as most Lisp systems usually expect. +mode. You can switch to this mode with @kbd{M-x lisp-mode}, and it is +used automatically for files whose names end in @file{.l}, +@file{.lsp}, or @file{.lisp}. @kindex C-M-x @r{(Lisp mode)} @findex lisp-eval-defun @@ -1292,12 +1320,13 @@ which finds the defun around or following point and sends it as input to the Lisp process. (Emacs can send input to any inferior process regardless of what buffer is current.) - Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing programs -to be run in another Lisp system) and Emacs-Lisp mode (for editing Lisp -programs to be run in Emacs): in both modes it has the effect of installing -the function definition that point is in, but the way of doing so is -different according to where the relevant Lisp environment is found. -@xref{Executing Lisp}. + Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing +programs to be run in another Lisp system) and Emacs-Lisp mode (for +editing Lisp programs to be run in Emacs; see @pxref{Lisp Eval}): in +both modes it has the effect of installing the function definition +that point is in, but the way of doing so is different according to +where the relevant Lisp environment is found. + @ignore arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed diff --git a/man/cmdargs.texi b/man/cmdargs.texi index 35684ca2715..f266913d266 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi @@ -477,7 +477,7 @@ This variable defaults to @file{~/.bash_history} if you use Bash, to @file{~/.sh_history} if you use ksh, and to @file{~/.history} otherwise. @item HOME -The location of the user's files in the directory tree; used for +The location of your files in the directory tree; used for expansion of file names starting with a tilde (@file{~}). On MS-DOS, it defaults to the directory from which Emacs was started, with @samp{/bin} removed from the end if it was present. On Windows, the @@ -525,11 +525,11 @@ environment and coding system. @xref{Language Environments}. @item LOGNAME The user's login name. See also @env{USER}. @item MAIL -The name of the user's system mail inbox. +The name of your system mail inbox. @item MH Name of setup file for the mh system. (The default is @file{~/.mh_profile}.) @item NAME -The real-world name of the user. +Your real-world name. @item NNTPSERVER The name of the news server. Used by the mh and Gnus packages. @item ORGANIZATION @@ -987,7 +987,7 @@ emacs -ms coral -cr 'slate blue' & @samp{-rv} option or with the X resource @samp{reverseVideo}. The @samp{-fg}, @samp{-bg}, and @samp{-rv} options function on -text-only terminals as well as on window systems. +text-only terminals as well as on graphical displays. @node Window Size X @appendixsec Options for Window Size and Position @@ -1165,7 +1165,7 @@ for the initial Emacs frame. @appendixsec Icons @cindex icons (X Window System) - Most window managers allow the user to ``iconify'' a frame, removing + Most window managers allow you to ``iconify'' a frame, removing it from sight, and leaving a small, distinctive ``icon'' window in its place. Clicking on the icon window makes the frame itself appear again. If you have many clients running at once, you can avoid cluttering up diff --git a/man/commands.texi b/man/commands.texi index 5c692f6d93b..eba539c15b7 100644 --- a/man/commands.texi +++ b/man/commands.texi @@ -268,7 +268,7 @@ with codes 128 through 255 can also appear in multibyte buffers. If you disable multibyte characters, then you can use only one alphabet of non-@acronym{ASCII} characters, but they all fit in one byte. They -use codes 0200 through 0377. @xref{Single-Byte Character Support}. +use codes 0200 through 0377. @xref{Unibyte Mode}. @ifnottex @lowersections diff --git a/man/custom.texi b/man/custom.texi index 227d74f87e8..2efbdd81398 100644 --- a/man/custom.texi +++ b/man/custom.texi @@ -117,14 +117,14 @@ system crash. @xref{Auto Save}. Font-Lock mode automatically highlights certain textual units found in programs, such as comments, strings, and function names being defined. -This requires a window system that can display multiple fonts. +This requires a graphical display that can show multiple fonts. @xref{Faces}. ISO Accents mode makes the characters @samp{`}, @samp{'}, @samp{"}, @samp{^}, @samp{/} and @samp{~} combine with the following letter, to produce an accented letter in the ISO Latin-1 character set. The newer and more general feature of input methods more or less -supersedes ISO Accents mode. @xref{Single-Byte Character Support}. +supersedes ISO Accents mode. @xref{Unibyte Mode}. Outline minor mode provides the same facilities as the major mode called Outline mode; but since it is a minor mode instead, you can @@ -201,7 +201,7 @@ and set their values, and to save settings permanently in your @file{~/.emacs} file (@pxref{Init File}). The appearance of the example buffers in this section is typically -different under a window system, since faces are then used to indicate +different under a graphical display, since faces are then used to indicate buttons, links and editable fields. @menu @@ -2030,7 +2030,7 @@ Reference Manual}. When Emacs is started, it normally loads a Lisp program from the file @file{.emacs} or @file{.emacs.el} in your home directory -(see @ref{General Variables, HOME} if you don't know where that is). +(see @ref{General Variables, HOME}, if you don't know where that is). We call this file your @dfn{init file} because it specifies how to initialize Emacs for you. You can use the command line switch @samp{-q} to prevent loading your init file, and @samp{-u} (or @@ -2456,7 +2456,7 @@ currently pretending to be. The idea is that you should get your own editor customizations even if you are running as the super user. More precisely, Emacs first determines which user's init file to use. -It gets the user name from the environment variables @env{LOGNAME} and +It gets your user name from the environment variables @env{LOGNAME} and @env{USER}; if neither of those exists, it uses effective user-ID. If that user name matches the real user-ID, then Emacs uses @env{HOME}; otherwise, it looks up the home directory corresponding to that user diff --git a/man/dired.texi b/man/dired.texi index a432d681918..d391e4566f1 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -40,6 +40,8 @@ files. * Updating: Dired Updating. Discarding lines for files of no interest. * Find: Dired and Find. Using `find' to choose the files for Dired. * Wdired:: Operating on files by editing the Dired buffer. +* Tumme:: Image file and thumbnail viewing and + manipulation from the Dired buffer. * Misc: Misc Dired Features. Various other features. @end menu @@ -1140,6 +1142,78 @@ you can change @samp{-rw-r--r--} to @samp{-rw-rw-rw-} to make a file world-writable. These changes also take effect when you type @kbd{C-c C-c}. +@node Tumme +@section Thumbnail and image file viewing and manipulation + +@cindex tumme mode + Tumme provides for simple viewing of thumbnails of image files. It +provides viewing of the original file, sized or in full size, inside +Emacs or in an external viewer. + + Tumme aims to be both easy to use for a beginner but also powerful +and useful to an experienced user. + + The quickest way to try out Tumme is to use the command +@code{tumme}. It will prompt for a directory where there are images +files. All images in that directory will get thumbnail files created +for them, and the thumbnails will be displayed in the ``thumbnail +buffer''. + + Because thumbnails are created on the fly and before they can be +displayed, the above command might take a long time, especially the +first time, if the directory contains many image files. If the number +of image files is higher than +@code{tumme-show-all-from-dir-max-files}, the command will be aborted. +To work around this you can instead mark the files you want to look +at, using @kbd{m} as usual in Dired, and then type @kbd{C-t d} +(@code{tumme-display-thumbs}). + + Regardless of which command you chose to display the thumbnails, a +new buffer will open up, displaying thumbnail images of the files that +were marked in dired. The new buffer will be the active one. + + With point in the thumbnail buffer, type @kbd{RET} +(@code{tumme-display-thumbnail-original-image}) to display a sized +version of it in another window. The image will be sized to fit the +window. Use the arrow keys to move around in the buffer. For easy +browing, type @kbd{SPC} (@code{tumme-display-next-thumbnail-original}) +to advance and display the next image. Typing @kbd{DEL} +(@code{tumme-display-previous-thumbnail-original}) backs up to the +previous thumbnail and displays that instead. + + If you want to see the image in its original size, either provide a +prefix argument (@kbd{C-u}) before pressing @kbd{RET}, or type +@kbd{C-return} (@code{tumme-thumbnail-display-external}) to display +the image in an external viewer. To use the latter, +@code{tumme-external-viewer} must be configured. + + If you find in image that you want to delete, type @kbd{d} +(@code{tumme-flag-thumb-original-file}) and the file will be flagged +for deletion in the dired buffer. If you just want visually to delete +the thumbnail image from the thumbnail buffer, type @kbd{C-d} +(@code{tumme-delete-char}). + + More advanced features include commands for using ``tags'' (another +name for ``keyword'' or ``label'') to tag image files and to search +for image files with a certain tag. + + The tags put on image files are stored in a database file and can be +used for marking image files. For example, you can let Tumme mark all +files in the current directory tagged with the tag `flowers'. To tag +image files, mark them in the dired buffer and type @kbd{C-t t} +(@code{tumme-tag-files}). To mark files having a certain tag, type +@kbd{C-t f} (@code{tumme-mark-tagged-files}). + + After marking image files with a certain tag, they can be viewed as +explained earlier, by typing @key{C-t d}. + + Tumme also provide simple image manipulation commands, like rotating +thumbnails and original image files. In the thumbnail buffer, type +@kbd{L} to rotate the original image 90 degrees anti clockwise, and +@kbd{R} to rotate it 90 degrees clockwise. + + + @node Misc Dired Features @section Other Dired Features diff --git a/man/display.texi b/man/display.texi index 61cbc057e23..9c653e2ca56 100644 --- a/man/display.texi +++ b/man/display.texi @@ -985,7 +985,7 @@ either as escape sequences or as graphics. They do not normally occur in multibyte buffers, but if they do, they are displayed as Latin-1 graphics. In unibyte mode, if you enable European display they are displayed using their graphics (assuming your terminal supports them), -otherwise as escape sequences. @xref{Single-Byte Character Support}. +otherwise as escape sequences. @xref{Unibyte Mode}. @vindex nobreak-char-display @cindex no-break space, display diff --git a/man/emacs.texi b/man/emacs.texi index cc994e5b825..8a5c5842ed6 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -469,7 +469,7 @@ International Character Set Support that cover the whole spectrum of characters. * Defining Fontsets:: Defining a new fontset. * Undisplayable Characters::When characters don't display. -* Single-Byte Character Support:: You can pick one European character set +* Unibyte Mode:: You can pick one European character set to use without multibyte characters. * Charsets:: How Emacs groups its internal character codes. @@ -612,9 +612,7 @@ Running Debuggers Under Emacs Maintaining Programs * Change Log:: Maintaining a change history for your program. -@ignore -* Authors:: Maintaining the Emacs @file{AUTHORS} file. -@end ignore +* Format of ChangeLog:: What the change log file looks like. * Tags:: Go direct to any function in your program in one command. Tags remembers which file it is in. * Emerge:: A convenient way of merging two versions of a program. @@ -956,12 +954,11 @@ files, which are also distributed along with GNU Emacs. editors, all sharing common principles of organization. For information on the underlying philosophy of Emacs and the lessons learned from its development, write for a copy of AI memo 519a, @cite{Emacs, the Extensible, -Customizable Self-Documenting Display Editor}, to Publications Department, -Artificial Intelligence Lab, 545 Tech Square, Cambridge, MA 02139, USA@. At -last report they charge $2.25 per copy. Another useful publication is LCS -TM-165, @cite{A Cookbook for an Emacs}, by Craig Finseth, available from -Publications Department, Laboratory for Computer Science, 545 Tech Square, -Cambridge, MA 02139, USA@. The price today is $3. +Customizable Self-Documenting Display Editor}, is available from +@url{ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-519A.pdf}. +Another useful publication is LCS TM-165, @cite{A Cookbook for an +Emacs}, by Craig Finseth, is available from the MIT libraries in some +fashion. This edition of the manual is intended for use with GNU Emacs installed on GNU and Unix systems. GNU Emacs can also be used on VMS, @@ -1152,11 +1149,12 @@ can write an extension, anybody can use it afterward. @xref{Top, Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in Emacs Lisp}, if you want to learn Emacs Lisp programming. - When running on a graphics terminal, Emacs provides its own menus + When running on a graphical display, Emacs provides its own menus and convenient handling of mouse buttons. But Emacs provides many of -the benefits of a window system even on a text-only terminal. For -instance, you can look at or edit several files at once, move text -between files, and edit files while running shell commands. +the benefits of a graphical display even on a text-only terminal. For +instance, it can highlight parts of a file, display and edit several +files at once, move text between files, and edit files while running +shell commands. @include screen.texi @include commands.texi diff --git a/man/faq.texi b/man/faq.texi index 88ebbdaab6f..734212758d5 100644 --- a/man/faq.texi +++ b/man/faq.texi @@ -9,6 +9,10 @@ @c This is used in many places @set VER 22.1 +@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>. +@c Feel free to install changes without prior permission (but I'd +@c appreciate a notice if you do). + @copying Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@* @@ -55,12 +59,9 @@ distribution.] This is the GNU Emacs FAQ, last updated on @today{}. -The FAQ is maintained as a Texinfo document, allowing us to create HTML, -Info, and TeX documents from a single source file, and is slowly but -surely being improved. Please bear with us as we improve on this -format. This FAQ is maintained as a part of GNU Emacs. If you find -any errors, or have any suggestions, please use @kbd{M-x report-emacs-bug} -to report them. +This FAQ is maintained as a part of GNU Emacs. If you find any errors, +or have any suggestions, please use @kbd{M-x report-emacs-bug} to report +them. @menu * FAQ notation:: @@ -1173,6 +1174,8 @@ In addition, Emacs 22 now includes the Emacs Lisp Reference Manual * Highlighting a region:: * Controlling case sensitivity:: * Wrapping words automatically:: +* Searching for/replacing newlines:: +* Yanking text in isearch:: * Spell-checkers:: * Checking TeX and *roff documents:: * Changing load-path:: @@ -1191,7 +1194,7 @@ In addition, Emacs 22 now includes the Emacs Lisp Reference Manual * Valid X resources:: * Evaluating Emacs Lisp code:: * Changing the length of a Tab:: -* Inserting > at the beginning of each line:: +* Inserting text at the beginning of each line:: * Underlining paragraphs:: * Repeating a command as many times as possible:: * Forcing the cursor to remain in the same column:: @@ -1530,7 +1533,7 @@ including in your @file{.emacs} file. (Also see @ref{Turning on syntax highlighting}.) -@node Controlling case sensitivity, Wrapping words automatically, Highlighting a region, Common requests +@node Controlling case sensitivity, Searching for/replacing newlines, Highlighting a region, Common requests @section How do I control Emacs's case-sensitivity when searching/replacing? @cindex @code{case-fold-search} @cindex Case sensitivity of searches @@ -1562,7 +1565,23 @@ mode's hook. For example: (setq case-fold-search nil))) @end lisp -@node Wrapping words automatically, Spell-checkers, Controlling case sensitivity, Common requests +@node Searching for/replacing newlines, Yanking text in isearch, Controlling case sensitivity, Common requests +@section How do I input a newline character in isearch or query-replace? +@cindex Searching for newlines +@cindex Replacing newlines + +Use @kbd{C-q C-j}. For more information, see @inforef{Special Isearch, +Special Input for Incremental Search, emacs}. + + +@node Yanking text in isearch, Wrapping words automatically, Searching for/replacing newlines, Common requests +@section How do I copy text from the kill ring into the search string? +@cindex Yanking text into the search string +@cindex isearch yanking + +Use @kbd{M-y}. @inforef{Isearch Yank, Isearch Yanking, emacs}. + +@node Wrapping words automatically, Spell-checkers, Yanking text in isearch, Common requests @section How do I make Emacs wrap words for me? @cindex Wrapping word automatically @cindex Wrapping lines @@ -2098,7 +2117,7 @@ about them. @end itemize -@node Changing the length of a Tab, Inserting > at the beginning of each line, Evaluating Emacs Lisp code, Common requests +@node Changing the length of a Tab, Inserting text at the beginning of each line, Evaluating Emacs Lisp code, Common requests @section How do I change Emacs's idea of the @key{TAB} character's length? @cindex Tab length @cindex Length of tab character @@ -2117,8 +2136,9 @@ Do not confuse variable @code{tab-width} with variable @key{TAB} characters. The latter controls what characters are inserted when you press the @key{TAB} character in certain modes. -@node Inserting > at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests -@section How do I insert @samp{>} at the beginning of every line? +@node Inserting text at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests +@section How do I insert <some text> at the beginning of every line? +@cindex Prefixing a region with some text @cindex Prefix character, inserting in mail/news replies @cindex Replies to mail/news, inserting a prefix character @cindex @code{mail-yank-prefix} @@ -2126,7 +2146,7 @@ when you press the @key{TAB} character in certain modes. @cindex News replies, inserting a prefix character To do this to an entire buffer, type @kbd{M-< M-x replace-regexp -@key{RET} ^ @key{RET} > @key{RET}}. +@key{RET} ^ @key{RET} your text @key{RET}}. To do this to a region, use @code{string-insert-rectangle}. Set the mark (@kbd{C-@key{SPC}}) at the beginning of the first line you @@ -2135,13 +2155,12 @@ want to prefix, move the cursor to last line to be prefixed, and type buffer, type @kbd{C-x h M-x string-insert-rectangle @key{RET}}. If you are trying to prefix a yanked mail message with @samp{>}, you -might want to set the variable @code{mail-yank-prefix}. Better yet, use -the Supercite package (@pxref{Supercite}), which provides flexible -citation for yanked mail and news messages; it is included in Emacs -since version 19.20. @xref{Changing the included text prefix}, for -additional information. +might want to set the variable @code{mail-yank-prefix}. In Message +buffers, you can even use @kbd{M-;} to cite yanked messages (@kbd{M-;} +runs the function @code{comment-region}, it is a general-purpose +mechanism to comment regions). -@node Underlining paragraphs, Repeating a command as many times as possible, Inserting > at the beginning of each line, Common requests +@node Underlining paragraphs, Repeating a command as many times as possible, Inserting text at the beginning of each line, Common requests @section How do I insert @samp{_^H} before each character in a region to get an underlined paragraph? @cindex Underlining a region of text @cindex @code{underline-region} @@ -3754,7 +3773,7 @@ Java code. It is distributed with Emacs, but has @email{kyle_jones@@wonderworks.com, Kyle Jones} @item Latest version -7.15 +7.19 @item Distribution @uref{ftp://ftp.wonderworks.com/pub/vm/vm.tar.gz} @@ -4675,8 +4694,7 @@ terminals. Non-@acronym{ASCII} keys and mouse events (e.g. @kbd{C-=} and @cindex @key{Meta} key and @code{xterm} @cindex Xterm and @key{Meta} key -@inforef{Single-Byte Character Support, Single-Byte Character Set -Support, emacs}. +@inforef{Unibyte Mode, Single-Byte Character Set Support, emacs}. If the advice in the Emacs manual fails, try all of these methods before asking for further help: @@ -4776,10 +4794,10 @@ You can get the old behavior by binding @kbd{SPC} to @code{minibuffer-complete-word} in the minibuffer, as follows: @lisp -(define-key minibuffer-local-filename-completion-map (kbd "SPC") +(define-key minibuffer-local-filename-completion-map (kbd "SPC") 'minibuffer-complete-word) -(define-key minibuffer-local-must-match-filename-map (kbd "SPC") +(define-key minibuffer-local-must-match-filename-map (kbd "SPC") 'minibuffer-complete-word) @end lisp @@ -4800,7 +4818,7 @@ You can get the old behavior by binding @kbd{SPC} to @cindex Displaying eight-bit characters @cindex Eight-bit characters, displaying -@inforef{Single-Byte Character Support, Single-byte Character Set +@inforef{Unibyte Mode, Single-byte Character Set Support, emacs}. On a Unix, when Emacs runs on a text-only terminal display or is invoked with @samp{emacs -nw}, you typically need to use @code{set-terminal-coding-system} to tell Emacs what the terminal can @@ -4817,7 +4835,7 @@ terminal coding system automatically. @cindex Input, 8-bit characters Various methods are available for input of eight-bit characters. See -@inforef{Single-Byte Character Support, Single-byte Character Set +@inforef{Unibyte Mode, Single-byte Character Set Support, emacs}. For more sophisticated methods, @inforef{Input Methods, Input Methods, emacs}. diff --git a/man/files.texi b/man/files.texi index f8080993fba..4bafc9b736c 100644 --- a/man/files.texi +++ b/man/files.texi @@ -242,12 +242,11 @@ GNU/Linux platforms, Emacs does that when built with GTK, LessTif, and Motif toolkits; on MS-Windows, the GUI version does that by default. For information on how to customize this, see @ref{Dialog Boxes}. - Secondly, Emacs supports the ``drag and drop'' protocol on the X -window system. Dropping a file into an ordinary Emacs window visits -the file using that window. However, dropping a file into a window -displaying a Dired buffer moves or copies the file into the displayed -directory. For details, see @ref{Drag and Drop}, @ref{Misc Dired -Features}. + Secondly, Emacs supports ``drag and drop''; dropping a file into an +ordinary Emacs window visits the file using that window. However, +dropping a file into a window displaying a Dired buffer moves or +copies the file into the displayed directory. For details, see +@ref{Drag and Drop}, and @ref{Misc Dired Features}. @cindex creating files What if you want to create a new file? Just visit it. Emacs displays diff --git a/man/frames.texi b/man/frames.texi index 0d28572c1ac..f25399e071b 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -510,8 +510,10 @@ Here's a similar example for specifying a foreground color: @kindex C-z @r{(X windows)} @findex iconify-or-deiconify-frame Iconify the selected Emacs frame (@code{iconify-or-deiconify-frame}). -The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under a -window system, so it has a different binding in that case. +The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under +a graphical display that allows multiple applications to operate +simultaneously in their own windies, so Emacs gives @kbd{C-z} a +different binding in that case. If you type this command on an Emacs frame's icon, it deiconifies the frame. @@ -967,8 +969,8 @@ customizing the windows that display tooltips. @cindex mouse avoidance @vindex mouse-avoidance-mode -Mouse Avoidance mode keeps the window system mouse pointer away from -point, to avoid obscuring text. Whenever it moves the mouse, it also +Mouse Avoidance mode keeps the mouse pointer away from point, to avoid +obscuring text you want to edit. Whenever it moves the mouse, it also raises the frame. To use Mouse Avoidance mode, customize the variable @code{mouse-avoidance-mode}. You can set this to various values to move the mouse in several ways: diff --git a/man/glossary.texi b/man/glossary.texi index a085bb53948..9d86a8d12cc 100644 --- a/man/glossary.texi +++ b/man/glossary.texi @@ -367,7 +367,7 @@ Buttons}. @item Dribble File A dribble file is a file into which Emacs writes all the characters that -the user types on the keyboard. Dribble files are used to make a record +you type on the keyboard. Dribble files are used to make a record for debugging Emacs bugs. Emacs does not make a dribble file unless you tell it to. @xref{Bugs}. @@ -506,7 +506,7 @@ into Emacs windows (q.v.@:). When you are using a window system but in Emacs a window means something else. @item Fringe -On a graphical terminal (q.v.@:), there's a narrow portion of the +On a graphical display (q.v.@:), there's a narrow portion of the frame (q.v.@:) between the text area and the window's border. Emacs displays the fringe using a special face (q.v.@:) called @code{fringe}. @xref{Faces,fringe}. @@ -557,8 +557,8 @@ letters, digits, punctuation, and spaces; they do not include @key{RET} or @key{ESC}. In Emacs, typing a graphic character inserts that character (in ordinary editing modes). @xref{Inserting Text}. -@item Graphical Terminal -A graphical terminal is one that can display images and multiple fonts. +@item Graphical Display +A graphical display is one that can display images and multiple fonts. Usually it also has a window system (q.v.@:). @item Highlighting @@ -869,7 +869,7 @@ location in text so that you can move point to that location. @item Narrowing Narrowing means creating a restriction (q.v.@:) that limits editing in the current buffer to only a part of the text in the buffer. Text -outside that part is inaccessible to the user until the boundaries are +outside that part is inaccessible for editing until the boundaries are widened again, but it is still there, and saving the file saves it all. @xref{Narrowing}. @@ -982,7 +982,7 @@ one corner and putting the mark at the diagonally opposite corner. @item Recursive Editing Level A recursive editing level is a state in which part of the execution of -a command involves asking the user to edit some text. This text may +a command involves asking you to edit some text. This text may or may not be the same as the text to which the command was applied. The mode line indicates recursive editing levels with square brackets (@samp{[} and @samp{]}). @xref{Recursive Edit}. @@ -1289,8 +1289,10 @@ other editors use the term ``window'' for what we call a `frame' (q.v.@:) in Emacs. @item Window System -A window system is a graphical terminal (q.v.@:) that can display multiple -windows for different programs at the same time. +A window system is software that operates on a graphical display +(q.v.@:), to subdivide the screen so that multiple applications can +have their] own windows at the same time. All modern operating systems +include a window system. @item Word Abbrev See `abbrev.' diff --git a/man/gnus.texi b/man/gnus.texi index 8fe7355a4c8..bdfe5ab2194 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -24547,14 +24547,17 @@ Gnus 5.6 begat Pterodactyl Gnus on August 29th 1998 and was released as ``Gnus 5.8'' (after 99 releases and a CVS repository) on December 3rd 1999. -On the 26th of October 2000, Oort Gnus was begun. +On the 26th of October 2000, Oort Gnus was begun and was released as +Gnus 5.10 on May 1st 2003 (24 releases). + +On the January 4th 2004, No Gnus was begun. If you happen upon a version of Gnus that has a prefixed name -- ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'', -``Pterodactyl Gnus'', ``Oort Gnus'' -- don't panic. Don't let it know -that you're frightened. Back away. Slowly. Whatever you do, don't -run. Walk away, calmly, until you're out of its reach. Find a proper -released version of Gnus and snuggle up to that instead. +``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't panic. +Don't let it know that you're frightened. Back away. Slowly. Whatever +you do, don't run. Walk away, calmly, until you're out of its reach. +Find a proper released version of Gnus and snuggle up to that instead. @node Other Gnus Versions diff --git a/man/help.texi b/man/help.texi index 3f059b2c85c..634dca792f0 100644 --- a/man/help.texi +++ b/man/help.texi @@ -644,7 +644,7 @@ Emacs (@code{describe-no-warranty}). @cindex balloon help When a region of text is ``active,'' so that you can select it with the mouse or a key like @kbd{RET}, it often has associated help text. -Areas of the mode line are examples. On most window systems, the help +Areas of the mode line are examples. On graphical displays, the help text is displayed as a ``tooltip'' (sometimes known as ``balloon help''), when you move the mouse over the active text. @xref{Tooltips}. On some systems, it is shown in the echo area. On text-only diff --git a/man/killing.texi b/man/killing.texi index 1d5b0ba116e..449197e4eef 100644 --- a/man/killing.texi +++ b/man/killing.texi @@ -125,7 +125,7 @@ character backwards. should be. Why do we say ``or it should be''? When Emacs starts up using a -window system, it determines automatically which key or keys should be +graphical display, it determines automatically which key or keys should be equivalent to @key{DEL}. As a result, @key{BACKSPACE} and/or @key{DELETE} keys normally do the right things. But in some unusual cases Emacs gets the wrong information from the system. If these keys don't do @@ -264,7 +264,7 @@ them into Emacs. @cindex Delete Selection mode @cindex mode, Delete Selection @findex delete-selection-mode - Many window systems follow the convention that insertion while text + Many graphical applications follow the convention that insertion while text is selected deletes the selected text. You can make Emacs behave this way by enabling Delete Selection mode---with @kbd{M-x delete-selection-mode} or using Custom. Another effect of this mode diff --git a/man/kmacro.texi b/man/kmacro.texi index 2c723a7e9f2..7f14c40a95b 100644 --- a/man/kmacro.texi +++ b/man/kmacro.texi @@ -10,7 +10,7 @@ In this chapter we describe how to record a sequence of editing commands so you can repeat it conveniently later. - A @dfn{keyboard macro} is a command defined by the user to stand for + A @dfn{keyboard macro} is a command defined by an Emacs user to stand for another sequence of keys. For example, if you discover that you are about to type @kbd{C-n M-d C-d} forty times, you can speed your work by defining a keyboard macro to do @kbd{C-n M-d C-d}, and then executing @@ -303,54 +303,43 @@ macro, the counter will increase by 2 on each repetition of the macro. @findex kmacro-insert-counter @kindex C-x C-k C-i The command @kbd{C-x C-k C-i} (@code{kmacro-insert-counter}) inserts -the current value of the keyboard macro counter and increments the -counter by 1. You can use a numeric prefix argument to specify a -different increment. If you just specify a @kbd{C-u} prefix, the last -inserted counter value is repeated and the counter is not incremented. -For example, if you enter the following sequence while defining a macro +the current value of the current keyboard macro's counter, and +increments the counter by 1. You can use a numeric prefix argument to +specify a different increment. If you just specify a @kbd{C-u} +prefix, then the increment is zero, so it repeats the last inserted +counter value. For example, if you enter the following sequence while +defining a macro @example C-x C-k C-i C-x C-k C-i C-u C-x C-k C-i C-x C-k C-i @end example @noindent -the text @samp{0112} is inserted in the buffer, and for the first and -second execution of the macro @samp{3445} and @samp{6778} are -inserted. +it inserts @samp{0112} in the buffer. The next two iterations +of the macro will insert @samp{3445} and @samp{6778}. - This command usually only makes sense while defining a keyboard macro. -But its behavior when no keyboard macro is being defined or executed -is predictable: it inserts and increments the counter of the head of -the keyboard macro ring. + This command usually only makes sense while defining a keyboard +macro. But its behavior when no keyboard macro is being defined or +executed is predictable: it inserts and increments the counter of the +macro at the head of the keyboard macro ring. @findex kmacro-set-counter @kindex C-x C-k C-c - The command @kbd{C-x C-k C-c} (@code{kmacro-set-counter}) prompts -for the initial value of the keyboard macro counter if you use it -before you define a keyboard macro. If you use it before executing a -keyboard macro, it resets that macro's counter. If you use it while -defining a keyboard macro, then the macro counter gets reset to that same -value on each repetition of the macro. Rather than having the command -prompt for a value, you can also specify the value with a numeric -prefix argument. If you just specify a @kbd{C-u} prefix, the counter -is reset to the value it had prior to the current repetition of the -macro (undoing any increments so far in this repetition). If you just -specify a @kbd{C-u} prefix while no macro is being defined or executed, -then the new value of the counter is essentially unpredictable. + The command @kbd{C-x C-k C-c} (@code{kmacro-set-counter}) sets the +current macro counter to the value of the numeric argument. If you use +it inside the macro, it operates on each repetition of the macro. If +you specify just @kbd{C-u} as the prefix, while executing the macro, +that resets the counter to the value it had at the beginning of the +current repetition of the macro (undoing any increments so far in this +repetition). @findex kmacro-add-counter @kindex C-x C-k C-a - The command @kbd{C-x C-k C-a} (@code{kmacro-add-counter}) prompts -for a value to add to the macro counter. You can also specify the -value with a numeric prefix argument. If you just specify a @kbd{C-u} -prefix, the counter is reset to the last value inserted by any -keyboard macro. Usually, this will only make sense if that value was -inserted during the current macro definition or repetition. - - This command normally only makes sense while defining a keyboard macro. -But its behavior when no keyboard macro is being defined or executed -is predictable: it affects the counter of the head of the keyboard -macro ring. + The command @kbd{C-x C-k C-a} (@code{kmacro-add-counter}) adds the +prefix argument to the current macro counter. With just @kbd{C-u} as +argument, it resets the counter to the last value inserted by any +keyboard macro. (Normally, when you use this, the last insertion +will be in the same macro and it will be the same counter.) @findex kmacro-set-format @kindex C-x C-k C-f @@ -364,7 +353,7 @@ integer extra argument (@pxref{Formatting Strings,,, elisp, The Emacs Lisp Reference Manual}). Do not put the format string inside double quotes when you insert it in the minibuffer. -If you use this command while no keyboard macro is being defined or + If you use this command while no keyboard macro is being defined or executed, the new format affects all subsequent macro definitions. Existing macros continue to use the format in effect when they were defined. If you set the format while defining a keyboard macro, this @@ -375,7 +364,7 @@ to the macro format during execution of a macro, like the corresponding changes during its definition, have no effect on subsequent macros. -The format set by @kbd{C-x C-k C-f} does not affect insertion of + The format set by @kbd{C-x C-k C-f} does not affect insertion of numbers stored in registers. @node Keyboard Macro Query diff --git a/man/macos.texi b/man/macos.texi index 76a11ea92e7..ba0f9e995ca 100644 --- a/man/macos.texi +++ b/man/macos.texi @@ -104,12 +104,12 @@ character codes in the range 128-159. The coding systems @code{mac-roman}, @code{mac-centraleurroman}, and @code{mac-cyrillic} are used to represent these Mac encodings. - The fontset @code{fontset-mac} is created automatically when Emacs -is run on Mac, and used by default. It displays as many kinds of -characters as possible using 12-point Monaco as a base font. If you -see some character as a hollow box with this fontset, then it's almost -impossible to display it only by customizing font settings (@pxref{Mac -Font Specs}). + The fontset @code{fontset-standard} is created automatically when +Emacs is run on Mac, and used by default. It displays as many kinds +of characters as possible using 12-point Monaco as a base font. If +you see some character as a hollow box with this fontset, then it's +almost impossible to display it only by customizing font settings +(@pxref{Mac Font Specs}). You can use input methods provided either by LEIM (@pxref{Input Methods}) or Mac OS to enter international characters. To use the diff --git a/man/maintaining.texi b/man/maintaining.texi index b885c8b7580..66a235ae119 100644 --- a/man/maintaining.texi +++ b/man/maintaining.texi @@ -14,6 +14,7 @@ useful for this purpose. @menu * Change Log:: Maintaining a change history for your program. +* Format of ChangeLog:: What the change log file looks like. * Tags:: Go direct to any function in your program in one command. Tags remembers which file it is in. * Emerge:: A convenient way of merging two versions of a program. @@ -22,6 +23,14 @@ useful for this purpose. @node Change Log @section Change Logs + A change log file contains a chronological record of when and why you +have changed a program, consisting of a sequence of entries describing +individual changes. Normally it is kept in a file called +@file{ChangeLog} in the same directory as the file you are editing, or +one of its parent directories. A single @file{ChangeLog} file can +record changes for all the files in its directory and all its +subdirectories. + @cindex change log @kindex C-x 4 a @findex add-change-log-entry-other-window @@ -32,58 +41,6 @@ a backup file, it makes an entry appropriate for the file's parent---that is useful for making log entries for functions that have been deleted in the current version. - A change log file contains a chronological record of when and why you -have changed a program, consisting of a sequence of entries describing -individual changes. Normally it is kept in a file called -@file{ChangeLog} in the same directory as the file you are editing, or -one of its parent directories. A single @file{ChangeLog} file can -record changes for all the files in its directory and all its -subdirectories. - - You should put a copyright notice and permission notice at the -end of the change log file. Here is an example: - -@example -Copyright 1997, 1998 Free Software Foundation, Inc. -Copying and distribution of this file, with or without modification, are -permitted provided the copyright notice and this notice are preserved. -@end example - -@noindent -Of course, you should substitute the proper years and copyright holder. - - A change log entry starts with a header line that contains the current -date, your name, and your email address (taken from the variable -@code{add-log-mailing-address}). Aside from these header lines, every -line in the change log starts with a space or a tab. The bulk of the -entry consists of @dfn{items}, each of which starts with a line starting -with whitespace and a star. Here are two entries, both dated in May -1993, with two items and one item respectively. - -@iftex -@medbreak -@end iftex -@smallexample -1993-05-25 Richard Stallman <rms@@gnu.org> - - * man.el: Rename symbols `man-*' to `Man-*'. - (manual-entry): Make prompt string clearer. - - * simple.el (blink-matching-paren-distance): - Change default to 12,000. - -1993-05-24 Richard Stallman <rms@@gnu.org> - - * vc.el (minor-mode-map-alist): Don't use it if it's void. - (vc-cancel-version): Doc fix. -@end smallexample - - One entry can describe several changes; each change should have its -own item, or its own line in an item. Normally there should be a -blank line between items. When items are related (parts of the same -change, in different places), group them by leaving no blank line -between them. - @kbd{C-x 4 a} visits the change log file and creates a new entry unless the most recent entry is for today's date and your name. It also creates a new item for the current file. For many languages, it @@ -95,6 +52,11 @@ changed. non-@code{nil}, @kbd{C-x 4 a} adds to any existing item for the file rather than starting a new item. +@vindex add-log-always-start-new-record + If @code{add-log-always-start-new-record} is non-@code{nil}, +@kbd{C-x 4 a} always makes a new entry, even if the last entry +was made by you and on the same date. + @vindex change-log-version-info-enabled @vindex change-log-version-number-regexp-list @cindex file version in change log entries @@ -104,11 +66,6 @@ change log entry. It finds the version number by searching the first ten percent of the file, using regular expressions from the variable @code{change-log-version-number-regexp-list}. -@vindex add-log-always-start-new-record - If @code{add-log-always-start-new-record} is non-@code{nil}, -@kbd{C-x 4 a} always makes a new entry, even if the last entry -was made by you and on the same date. - @cindex Change Log mode @findex change-log-mode The change log file is visited in Change Log mode. In this major @@ -122,52 +79,55 @@ this is convenient for entering the contents of an entry. log files into a buffer in Change Log Mode, preserving the date ordering of entries. -@findex change-log-redate -@cindex converting change log date style - Versions of Emacs before 20.1 used a different format for the time of -the change log entry: + Version control systems are another way to keep track of changes in your +program and keep a change log. @xref{Log Buffer}. + +@node Format of ChangeLog +@section Format of ChangeLog + A change log entry starts with a header line that contains the current +date, your name, and your email address (taken from the variable +@code{add-log-mailing-address}). Aside from these header lines, every +line in the change log starts with a space or a tab. The bulk of the +entry consists of @dfn{items}, each of which starts with a line starting +with whitespace and a star. Here are two entries, both dated in May +1993, with two items and one item respectively. + +@iftex +@medbreak +@end iftex @smallexample -Fri May 25 11:23:23 1993 Richard Stallman <rms@@gnu.org> +1993-05-25 Richard Stallman <rms@@gnu.org> + + * man.el: Rename symbols `man-*' to `Man-*'. + (manual-entry): Make prompt string clearer. + + * simple.el (blink-matching-paren-distance): + Change default to 12,000. + +1993-05-24 Richard Stallman <rms@@gnu.org> + + * vc.el (minor-mode-map-alist): Don't use it if it's void. + (vc-cancel-version): Doc fix. @end smallexample -@noindent -The @kbd{M-x change-log-redate} command converts all the old-style -date entries in the change log file visited in the current buffer to -the new format, to make the file uniform in style. This is handy when -entries are contributed by many different people, some of whom use old -versions of Emacs. + One entry can describe several changes; each change should have its +own item, or its own line in an item. Normally there should be a +blank line between items. When items are related (parts of the same +change, in different places), group them by leaving no blank line +between them. - Version control systems are another way to keep track of changes in your -program and keep a change log. @xref{Log Buffer}. + You should put a copyright notice and permission notice at the +end of the change log file. Here is an example: -@ignore -@c This is commented out because the command is specific -@c to maintenance of Emacs itself. - -@node Authors -@section @file{AUTHORS} files -@cindex @file{AUTHORS} file - - Programs which have many contributors usually include a file named -@file{AUTHORS} in their distribution, which lists the individual -contributions. Emacs has a special command for maintaining the -@file{AUTHORS} file that is part of the Emacs distribution. - -@findex authors - The @kbd{M-x authors} command prompts for the name of the root of the -Emacs source directory. It then scans @file{ChangeLog} files and Lisp -source files under that directory for information about authors of -individual packages, and people who made changes in source files, and -puts the information it gleans into a buffer named @samp{*Authors*}. -You can then edit the contents of that buffer and merge it with the -existing @file{AUTHORS} file. - - Do not assume that this command finds all the contributors; don't -assume that a person not listed in the output was not a contributor. -If you merged in someone's contribution and did not put his name -in the change log, he won't show up in @kbd{M-x authors} either. -@end ignore +@example +Copyright 1997, 1998 Free Software Foundation, Inc. +Copying and distribution of this file, with or without modification, are +permitted provided the copyright notice and this notice are preserved. +@end example + +@noindent +Of course, you should substitute the proper years and copyright holder. @node Tags @section Tags Tables @@ -425,15 +385,15 @@ way it was made in the first place. If the tags table fails to record a tag, or records it for the wrong file, then Emacs cannot possibly find its definition until you update the tags table. However, if the position recorded in the tags table becomes a little bit wrong (due to -other editing), the only consequence is a slight delay in finding the +other editing), the worst consequence is a slight delay in finding the tag. Even if the stored position is very far wrong, Emacs will still -find the tag, after searching most of the file for it. Even that -delay is hardly noticeable with today's computers. +find the tag, after searching most of the file for it. That delay is +hardly noticeable with today's computers. - So you should update a tags table when you define new tags that you want -to have listed, or when you move tag definitions from one file to another, -or when changes become substantial. Normally there is no need to update -the tags table after each edit, or even every day. + Thus, there is no need to update the tags table after each edit. +You should update a tags table when you define new tags that you want +to have listed, or when you move tag definitions from one file to +another, or when changes become substantial. One tags table can virtually include another. Specify the included tags file name with the @samp{--include=@var{file}} option when @@ -480,21 +440,21 @@ place of a file name on the command line. @code{Etags} will read from standard input and mark the produced tags as belonging to the file @var{file}. - @samp{etags --help} prints the list of the languages @code{etags} + @samp{etags --help} outputs the list of the languages @code{etags} knows, and the file name rules for guessing the language. It also prints a list of all the available @code{etags} options, together with a short explanation. If followed by one or more @samp{--language=@var{lang}} -options, prints detailed information about how tags are generated for +options, it outputs detailed information about how tags are generated for @var{lang}. @node Etags Regexps @subsection Etags Regexps The @samp{--regex} option provides a general way of recognizing tags -based on regexp matching. You can freely intermix it with file names. +based on regexp matching. You can freely intermix this option with +file names, and each one applies to the source files that follow it. If you specify multiple @samp{--regex} options, all of them are used -in parallel, but each one applies only to the source files that follow -it. The syntax is: +in parallel. The syntax is: @smallexample --regex=[@var{@{language@}}]/@var{tagregexp}/[@var{nameregexp}/]@var{modifiers} @@ -537,8 +497,8 @@ Match this regular expression against the whole file, and allow @end table The @samp{-R} option cancels all the regexps defined by preceding -@samp{--regex} options. It applies to the file names following it, as -you can see from the following example: +@samp{--regex} options. It too applies to the file names following +it. Here's an example: @smallexample etags --regex=/@var{reg1}/i voo.doo --regex=/@var{reg2}/m \ @@ -647,30 +607,25 @@ etags --language=none \ @vindex tags-file-name @findex visit-tags-table - Emacs has at any time one @dfn{selected} tags table, and all the commands -for working with tags tables use the selected one. To select a tags table, -type @kbd{M-x visit-tags-table}, which reads the tags table file name as an -argument. The name @file{TAGS} in the default directory is used as the -default file name. - - All this command does is store the file name in the variable -@code{tags-file-name}. Emacs does not actually read in the tags table -contents until you try to use them. Setting this variable yourself is just -as good as using @code{visit-tags-table}. The variable's initial value is -@code{nil}; that value tells all the commands for working with tags tables -that they must ask for a tags table file name to use. + Emacs has at any time one @dfn{selected} tags table, and all the +commands for working with tags tables use the selected one. To select +a tags table, type @kbd{M-x visit-tags-table}, which reads the tags +table file name as an argument, with @file{TAGS} in the default +directory as the default. + + Emacs does not actually read in the tags table contents until you +try to use them; all @code{visit-tags-table} does is store the file +name in the variable @code{tags-file-name}, and setting the variable +yourself is just as good. The variable's initial value is @code{nil}; +that value tells all the commands for working with tags tables that +they must ask for a tags table file name to use. Using @code{visit-tags-table} when a tags table is already loaded gives you a choice: you can add the new tags table to the current list of tags tables, or start a new list. The tags commands use all the tags tables in the current list. If you start a new list, the new tags table is used @emph{instead} of others. If you add the new table to the -current list, it is used @emph{as well as} the others. When the tags -commands scan the list of tags tables, they don't always start at the -beginning of the list; they start with the first tags table (if any) -that describes the current file, proceed from there to the end of the -list, and then scan from the beginning of the list until they have -covered all the tables in the list. +current list, it is used @emph{as well as} the others. @vindex tags-table-list You can specify a precise list of tags tables by setting the variable @@ -749,13 +704,13 @@ alternative to @kbd{C-u M-.}. @findex find-tag-other-frame Like most commands that can switch buffers, @code{find-tag} has a variant that displays the new buffer in another window, and one that -makes a new frame for it. The former is @kbd{C-x 4 .}, which invokes -the command @code{find-tag-other-window}. The latter is @kbd{C-x 5 .}, +makes a new frame for it. The former is @w{@kbd{C-x 4 .}}, which invokes +the command @code{find-tag-other-window}. The latter is @w{@kbd{C-x 5 .}}, which invokes @code{find-tag-other-frame}. To move back to places you've found tags recently, use @kbd{C-u - M-.}; more generally, @kbd{M-.} with a negative numeric argument. This -command can take you to another buffer. @kbd{C-x 4 .} with a negative +command can take you to another buffer. @w{@kbd{C-x 4 .}} with a negative argument finds the previous tag location in another window. @kindex M-* @@ -781,9 +736,13 @@ that it does regexp matching instead of substring matching. @cindex search and replace in multiple files @cindex multiple-file search and replace - The commands in this section visit and search all the files listed in the -selected tags table, one by one. For these commands, the tags table serves -only to specify a sequence of files to search. + The commands in this section visit and search all the files listed +in the selected tags table, one by one. For these commands, the tags +table serves only to specify a sequence of files to search. These +commands scan the list of tags tables starting with the first tags +table (if any) that describes the current file, proceed from there to +the end of the list, and then scan from the beginning of the list +until they have covered all the tables in the list. @table @kbd @item M-x tags-search @key{RET} @var{regexp} @key{RET} @@ -846,9 +805,7 @@ continue to exist. It may have struck you that @code{tags-search} is a lot like @code{grep}. You can also run @code{grep} itself as an inferior of -Emacs and have Emacs show you the matching lines one by one. This works -much like running a compilation; finding the source locations of the -@code{grep} matches works like finding the compilation errors. +Emacs and have Emacs show you the matching lines one by one. @xref{Grep Searching}. @node List Tags @@ -882,9 +839,9 @@ of the tags files together with the tag names. @vindex tags-tag-face @vindex tags-apropos-additional-actions -You can customize the appearance of the output with the face -@code{tags-tag-face}. You can display additional output with @kbd{M-x -tags-apropos} by customizing the variable + You can customize the appearance of the output by setting the +variable @code{tags-tag-face} to a face. You can display additional +output with @kbd{M-x tags-apropos} by customizing the variable @code{tags-apropos-additional-actions}---see its documentation for details. @@ -896,11 +853,11 @@ name in the buffer. @xref{Symbol Completion}. @cindex Emerge @cindex merging files -It's not unusual for programmers to get their signals crossed and modify -the same program in two different directions. To recover from this -confusion, you need to merge the two versions. Emerge makes this -easier. See also @ref{Comparing Files}, for commands to compare -in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}. + It's not unusual for programmers to get their signals crossed and +modify the same program in two different directions. To recover from +this confusion, you need to merge the two versions. Emerge makes this +easier. See also @ref{Comparing Files}, for other ways to compare +files, and @ref{Top, Ediff,, ediff, The Ediff Manual}. @menu * Overview of Emerge:: How to start Emerge. Basic concepts. @@ -918,7 +875,7 @@ in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}. @node Overview of Emerge @subsection Overview of Emerge -To start Emerge, run one of these four commands: + To start Emerge, run one of these four commands: @table @kbd @item M-x emerge-files diff --git a/man/mule.texi b/man/mule.texi index ec4b02c560f..4b63fb90d4e 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -72,8 +72,7 @@ your language environment. If your keyboard can produce non-@acronym{ASCII} characters, you can select an appropriate keyboard coding system (@pxref{Terminal Coding}), and Emacs will accept those characters. Latin-1 characters can also be input by -using the @kbd{C-x 8} prefix, see @ref{Single-Byte Character Support, -C-x 8}. +using the @kbd{C-x 8} prefix, see @ref{Unibyte Mode}. On X Window systems, your locale should be set to an appropriate value to make sure Emacs interprets keyboard input correctly; see @@ -101,7 +100,7 @@ to make sure Emacs interprets keyboard input correctly; see that cover the whole spectrum of characters. * Defining Fontsets:: Defining a new fontset. * Undisplayable Characters:: When characters don't display. -* Single-Byte Character Support:: You can pick one European character set +* Unibyte Mode:: You can pick one European character set to use without multibyte characters. * Charsets:: How Emacs groups its internal character codes. @end menu @@ -1000,11 +999,11 @@ in communication with other processes. @table @kbd @item C-x @key{RET} x @var{coding} @key{RET} Use coding system @var{coding} for transferring selections to and from -other programs through the window system. +other window-based applications. @item C-x @key{RET} X @var{coding} @key{RET} Use coding system @var{coding} for transferring @emph{one} -selection---the next one---to or from the window system. +selection---the next one---to or from another window-based application. @item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET} Use coding systems @var{input-coding} and @var{output-coding} for @@ -1166,34 +1165,39 @@ non-graphic characters. @section Fontsets @cindex fontsets - A font for X Windows typically defines shapes for a single alphabet -or script. Therefore, displaying the entire range of scripts that -Emacs supports requires a collection of many fonts. In Emacs, such a -collection is called a @dfn{fontset}. A fontset is defined by a list -of fonts, each assigned to handle a range of character codes. - - Each fontset has a name, like a font. The available X fonts are -defined by the X server; fontsets, however, are defined within Emacs -itself. Once you have defined a fontset, you can use it within Emacs by -specifying its name, anywhere that you could use a single font. Of -course, Emacs fontsets can use only the fonts that the X server -supports; if certain characters appear on the screen as hollow boxes, -this means that the fontset in use for them has no font for those -characters.@footnote{The Emacs installation instructions have information on -additional font support.} + A font typically defines shapes for a single alphabet or script. +Therefore, displaying the entire range of scripts that Emacs supports +requires a collection of many fonts. In Emacs, such a collection is +called a @dfn{fontset}. A fontset is defined by a list of fonts, each +assigned to handle a range of character codes. + + Each fontset has a name, like a font. However, while fonts are +stored in the system and the available font names are defined by the +system, fontsets are defined within Emacs itself. Once you have +defined a fontset, you can use it within Emacs by specifying its name, +anywhere that you could use a single font. Of course, Emacs fontsets +can use only the fonts that the system supports; if certain characters +appear on the screen as hollow boxes, this means that the fontset in +use for them has no font for those characters.@footnote{The Emacs +installation instructions have information on additional font +support.} Emacs creates two fontsets automatically: the @dfn{standard fontset} and the @dfn{startup fontset}. The standard fontset is most likely to have fonts for a wide variety of non-@acronym{ASCII} characters; however, this is not the default for Emacs to use. (By default, Emacs tries to find a font that has bold and italic variants.) You can -specify use of the standard fontset with the @samp{-fn} option, or -with the @samp{Font} X resource (@pxref{Font X}). For example, +specify use of the standard fontset with the @samp{-fn} option. For +example, @example emacs -fn fontset-standard @end example +@noindent +You can also specify a fontset with the @samp{Font} resource (@pxref{X +Resources}). + A fontset does not necessarily specify a font for every character code. If a fontset specifies no font for a certain character, or if it specifies a font that does not exist on your system, then it cannot @@ -1353,8 +1357,8 @@ Latin-1 characters and @acronym{ASCII} mnemonics. Customize the variable @code{latin1-display} to enable this. The mnemonic @acronym{ASCII} sequences mostly correspond to those of the prefix input methods. -@node Single-Byte Character Support -@section Single-byte Character Set Support +@node Unibyte Mode +@section Unibyte Editing Mode @cindex European character sets @cindex accented characters @@ -1376,8 +1380,8 @@ non-@acronym{ASCII} characters. @vindex unibyte-display-via-language-environment Emacs can also display those characters, provided the terminal or font -in use supports them. This works automatically. Alternatively, if you -are using a window system, Emacs can also display single-byte characters +in use supports them. This works automatically. Alternatively, on a +graphical display, Emacs can also display single-byte characters through fontsets, in effect by displaying the equivalent multibyte characters according to the current language environment. To request this, set the variable @code{unibyte-display-via-language-environment} diff --git a/man/picture.texi b/man/picture.texi index 575f041c9e5..2e162c04057 100644 --- a/man/picture.texi +++ b/man/picture.texi @@ -29,7 +29,7 @@ to do essentially the same thing but in a quarter-plane way. In addition, Picture mode defines various keys starting with the @kbd{C-c} prefix to run special picture editing commands. - One of these keys, @kbd{C-c C-c}, is pretty important. Often a + One of these keys, @kbd{C-c C-c}, is particularly important. Often a picture is part of a larger file that is usually edited in some other major mode. @kbd{M-x edit-picture} records the name of the previous major mode so you can use the @kbd{C-c C-c} command diff --git a/man/programs.texi b/man/programs.texi index b3870eeafee..6404e3466bc 100644 --- a/man/programs.texi +++ b/man/programs.texi @@ -259,8 +259,8 @@ defun. This is the easiest way to get ready to kill the defun in order to move it to a different place in the file. If you use the command while point is between defuns, it uses the following defun. Successive uses of @kbd{C-M-h}, or using it in Transient Mark mode -when the mark is active, includes an additional defun in the region -each time. +when the mark is active, extends the end of the region to include one +more defun each time. In C mode, @kbd{C-M-h} runs the function @code{c-mark-function}, which is almost the same as @code{mark-defun}; the difference is that @@ -296,9 +296,9 @@ name. You can also add the buffer's index to the menu bar by calling @code{imenu-add-menubar-index}. If you want to have this menu bar item available for all buffers in a certain major mode, you can do this by adding @code{imenu-add-menubar-index} to its mode hook. But -if you have done that, you will have to wait each time you visit a -file in that mode, while Emacs finds all the definitions in that -buffer. +if you have done that, you will have to wait a little while each time +you visit a file in that mode, while Emacs finds all the definitions +in that buffer. @vindex imenu-auto-rescan When you change the contents of a buffer, if you add or delete @@ -374,8 +374,6 @@ usual conventions of the language you are editing. Adjust indentation of current line. @item C-j Equivalent to @key{RET} followed by @key{TAB} (@code{newline-and-indent}). -@item @key{LINEFEED} -This key, if the keyboard has it, is another way to enter @kbd{C-j}. @end table @kindex TAB @r{(programming modes)} @@ -400,8 +398,8 @@ the characters around it. @kindex C-j @findex newline-and-indent When entering lines of new code, use @kbd{C-j} -(@code{newline-and-indent}), which is equivalent to a @key{RET} -followed by a @key{TAB}. @kbd{C-j} at the end of a line creates a +(@code{newline-and-indent}), which is equivalent to @key{RET} +followed by @key{TAB}. @kbd{C-j} at the end of a line creates a blank line and then gives it the appropriate indentation. @key{TAB} indents a line that starts within a parenthetical grouping @@ -412,7 +410,7 @@ behavior is convenient in cases where you have overridden the standard result of @key{TAB} because you find it unaesthetic for a particular line. - By default, an open-parenthesis, open-brace or other opening + In some modes, an open-parenthesis, open-brace or other opening delimiter at the left margin is assumed by Emacs (including the indentation routines) to be the start of a function. This speeds up indentation commands. If you will be editing text which contains @@ -422,7 +420,7 @@ functions, even inside strings or comments, you must set Paren}, for more information on this. Normally, lines are indented with tabs and spaces. If you want Emacs -to use spaces only, see @ref{Just Spaces}. +to use spaces only, set @code{indent-tabs-mode} (@pxref{Just Spaces}). @node Multi-line Indent @subsection Indenting Several Lines @@ -587,8 +585,8 @@ typing @key{C-M-q} at the start of a function definition. @kindex C-c . @r{(C mode)} @findex c-set-style - To choose a style for the current buffer, use the command @kbd{C-c -.}. Specify a style name as an argument (case is not significant). + To choose a style for the current buffer, use the command @w{@kbd{C-c +.}}. Specify a style name as an argument (case is not significant). This command affects the current buffer only, and it affects only future invocations of the indentation commands; it does not reindent the code already in the buffer. To reindent the whole buffer in the @@ -740,7 +738,7 @@ that @kbd{C-M-f} would move to. @kbd{C-M-@@} takes arguments like the mark at the beginning of the previous balanced expression. The alias @kbd{C-M-@key{SPC}} is equivalent to @kbd{C-M-@@}. When you repeat this command, or use it in Transient Mark mode when the mark is -active, it extends the region by one sexp each time. +active, it extends the end of the region by one sexp each time. In languages that use infix operators, such as C, it is not possible to recognize all balanced expressions as such because there can be @@ -791,9 +789,7 @@ parenthetical groupings, skipping blithely over any amount of text that doesn't include meaningful parentheses (symbols, strings, etc.). @kindex C-M-u -@kindex C-M-d @findex backward-up-list -@findex down-list @kbd{C-M-n} and @kbd{C-M-p} try to stay at the same level in the parenthesis structure. To move @emph{up} one (or @var{n}) levels, use @kbd{C-M-u} (@code{backward-up-list}). @kbd{C-M-u} moves backward up @@ -801,6 +797,8 @@ past one unmatched opening delimiter. A positive argument serves as a repeat count; a negative argument reverses the direction of motion, so that the command moves forward and up one or more levels. +@kindex C-M-d +@findex down-list To move @emph{down} in the parenthesis structure, use @kbd{C-M-d} (@code{down-list}). In Lisp mode, where @samp{(} is the only opening delimiter, this is nearly the same as searching for a @samp{(}. An @@ -852,11 +850,9 @@ highlighted. (There is no need to highlight the opening delimiter in that case, because the cursor appears on top of that character.) Use the command @kbd{M-x show-paren-mode} to enable or disable this mode. - By default, @code{show-paren-mode} uses colors to highlight the -parentheses. However, if your display doesn't support colors, you can -customize the faces @code{show-paren-match-face} and -@code{show-paren-mismatch-face} to use other attributes, such as bold or -underline. @xref{Face Customization}. + Show Paren mode uses the faces @code{show-paren-match} and +@code{show-paren-mismatch} to highlight parentheses; you can customize +them to control how highlighting looks. @xref{Face Customization}. @node Comments @section Manipulating Comments @@ -911,11 +907,11 @@ The new comment begins with the string Emacs thinks comments should start with (the value of @code{comment-start}; see below). Point is after that string, so you can insert the text of the comment right away. If the major mode has specified a string to terminate comments, -@kbd{M-;} inserts that too, to keep the syntax valid. +@kbd{M-;} inserts that after point, to keep the syntax valid. - If the text of the line extends past the comment column, then the -comment start string is indented to a suitable boundary (usually, at -least one space is inserted). + If the text of the line extends past the comment column, this +command indents the comment start string to a suitable boundary +(usually, at least one space is inserted). You can also use @kbd{M-;} to align an existing comment. If a line already contains the comment-start string, @kbd{M-;} reindents it to @@ -943,7 +939,8 @@ removes comment delimiters on each line of the region. (If every line is a comment, it removes comment delimiters from each; otherwise, it adds comment delimiters to each.) If you are not using Transient Mark mode, then you should use the commands @code{comment-region} and -@code{uncomment-region} to do these jobs (@pxref{Multi-Line Comments}). +@code{uncomment-region} to do these jobs (@pxref{Multi-Line Comments}), +or else enable Transient Mark mode momentarily (@pxref{Momentary Mark}). A prefix argument used in these circumstances specifies how many comment delimiters to add or how many to delete. @@ -964,8 +961,8 @@ and by not changing the indentation of a triple-semicolon comment at all. (1+ x)) ; This line adds one. @end example - For C-like buffers, you can configure the exact effect of @kbd{M-;} -more flexibly than for most buffers by setting the user options + For C-like modes, you can configure the exact effect of @kbd{M-;} +more flexibly than for most buffers by setting the variables @code{c-indent-comment-alist} and @code{c-indent-comments-syntactically-p}. For example, on a line ending in a closing brace, @kbd{M-;} puts the comment one space after @@ -992,7 +989,7 @@ in just this fashion. @kindex C-c C-c (C mode) @findex comment-region To turn existing lines into comment lines, use the @kbd{M-x -comment-region} command (or type @kbd{C-c C-c} in C-like buffers). It +comment-region} command (or type @kbd{C-c C-c} in C-like modes). It adds comment delimiters to the lines that start in the region, thus commenting them out. With a negative argument, it does the opposite---it deletes comment delimiters from the lines in the region. @@ -1103,29 +1100,31 @@ use in your program. @findex info-lookup-symbol @findex info-lookup-file @kindex C-h S - For C, Lisp, and other languages that have documentation in Info, -you can use @kbd{C-h S} (@code{info-lookup-symbol}) to view the Info -documentation for a symbol used in the program. You specify the -symbol with the minibuffer; the default is the symbol appearing in the -buffer at point. For example, in C mode this looks for the symbol in -the C Library Manual. + For many major modes, that apply to languages that have +documentation in Info, you can use @kbd{C-h S} +(@code{info-lookup-symbol}) to view the Info documentation for a +symbol used in the program. You specify the symbol with the +minibuffer; the default is the symbol appearing in the buffer at +point. For example, in C mode this looks for the symbol in the C +Library Manual. The command only works if the appropriate manual's +Info files are installed. The major mode determines where to look for documentation for the symbol---which Info files to look in, and which indices to search. You can also use @kbd{M-x info-lookup-file} to look for documentation for a file name. - This feature currently supports the modes AWK, Autoconf, Bison, C, -Emacs Lisp, LaTeX, M4, Makefile, Octave, Perl, Scheme, and Texinfo, -provided you have installed the relevant Info files, which are -typically available with the appropriate GNU package. + If you use @kbd{C-h S} in a major mode that does not support it, +it asks you to specify the ``symbol help mode''. You should enter +a command such as @code{c-mode} that would select a major +mode which @kbd{C-h S} does support. @node Man Page @subsection Man Page Lookup @cindex manual page On Unix, the main form of on-line documentation was the @dfn{manual -page} or @dfn{man page}. In the GNU operating system, we hope to +page} or @dfn{man page}. In the GNU operating system, we aim to replace man pages with better-organized manuals that you can browse with Info (@pxref{Misc Help}). This process is not finished, so it is still useful to read manual pages. @@ -1151,8 +1150,8 @@ a man page from a specific section, type when @kbd{M-x manual-entry} prompts for the topic. For example, to read the man page for the C library function @code{chmod} (as opposed to a command of the same name), type @kbd{M-x manual-entry @key{RET} -chmod(2) @key{RET}} (@code{chmod} is a system call, so it is in -section @samp{2}). +chmod(2) @key{RET}}. (@code{chmod} is a system call, so it is in +section @samp{2}.) @vindex Man-switches If you do not specify a section, the results depend on how the @@ -1203,42 +1202,6 @@ several manual pages by the same name exist in different sections, it pops up a window with possible candidates asking you to choose one of them. -@vindex woman-manpath - By default, @kbd{M-x woman} looks for manual pages in the -directories specified in the @code{MANPATH} environment variable. (If -@code{MANPATH} is not set, @code{woman} uses a suitable default value, -which can be customized.) More precisely, @code{woman} looks for -subdirectories that match the shell wildcard pattern @file{man*} in each one -of these directories, and tries to find the manual pages in those -subdirectories. When first invoked, @kbd{M-x woman} converts the -value of @code{MANPATH} to a list of directory names and stores that -list in the @code{woman-manpath} variable. Changing the value of this -variable is another way to control the list of directories used. - -@vindex woman-path - You can also augment the list of directories searched by -@code{woman} by setting the value of the @code{woman-path} variable. -This variable should hold a list of specific directories which -@code{woman} should search, in addition to those in -@code{woman-manpath}. Unlike @code{woman-manpath}, the directories in -@code{woman-path} are searched for the manual pages, not for -@file{man*} subdirectories. - -@findex woman-find-file - Occasionally, you might need to display manual pages that are not in -any of the directories listed by @code{woman-manpath} and -@code{woman-path}. The @kbd{M-x woman-find-file} command prompts for a -name of a manual page file, with completion, and then formats and -displays that file like @kbd{M-x woman} does. - -@vindex woman-dired-keys - The first time you invoke @kbd{M-x woman}, it defines the Dired -@kbd{W} key to run the @code{woman-find-file} command on the current -line's file. You can disable this by setting the variable -@code{woman-dired-keys} to @code{nil}. @xref{Dired}. In addition, -the Tar-mode @kbd{w} key is define to invoke @code{woman-find-file} on -the current line's archive member. - For more information about setting up and using @kbd{M-x woman}, see @ref{Top, WoMan, Browse UN*X Manual Pages WithOut Man, woman, The WoMan Manual}. @@ -1325,8 +1288,8 @@ Hide all blocks @var{n} levels below this block Non-@code{nil} says that @kbd{hs-hide-all} should hide comments too. @item hs-isearch-open -Specifies what kind of hidden blocks to open in Isearch mode. -The value should be one of these four symbols: +Specifies what kind of hidden blocks incremental search should make +visible. The value should be one of these four symbols: @table @code @item code @@ -1533,24 +1496,6 @@ moves by sentences instead of statements. Move point to the end of the innermost C statement or sentence; like @kbd{M-a} except that it moves in the other direction (@code{c-end-of-statement}). - -@item M-x c-backward-into-nomenclature -@findex c-backward-into-nomenclature -Move point backward to beginning of a C++ nomenclature section or -word. With prefix argument @var{n}, move @var{n} times. If @var{n} -is negative, move forward. C++ nomenclature means a symbol name in -the style of NamingSymbolsWithMixedCaseAndNoUnderlines; each capital -letter begins a section or word. Rather than this command, you might -well prefer the newer ``Subword Mode'', which does the same thing -better. @xref{Other C Commands}. - -In the GNU project, we recommend using underscores to separate words -within an identifier in C or C++, rather than using case distinctions. - -@item M-x c-forward-into-nomenclature -@findex c-forward-into-nomenclature -Move point forward to end of a C++ nomenclature section or word. -With prefix argument @var{n}, move @var{n} times. @end table @node Electric C @@ -1607,28 +1552,28 @@ whitespace either before point or after point in a single operation. preprocessor commands. @table @kbd -@item C-c C-@key{BS} -@itemx C-c @key{BS} +@item C-c C-@key{DEL} +@itemx C-c @key{DEL} @findex c-hungry-backspace -@kindex C-c C-@key{BS} (C Mode) -@kindex C-c @key{BS} (C Mode) +@kindex C-c C-@key{DEL} (C Mode) +@kindex C-c @key{DEL} (C Mode) @code{c-hungry-backspace}---Delete the entire block of whitespace preceding point. @item C-c C-d -@itemx C-c C-@key{DEL} -@itemx C-c @key{DEL} +@itemx C-c C-@key{DELETE} +@itemx C-c @key{DELETE} @findex c-hungry-delete-forward @kindex C-c C-d (C Mode) -@kindex C-c C-@key{DEL} (C Mode) -@kindex C-c @key{DEL} (C Mode) +@kindex C-c C-@key{DELETE} (C Mode) +@kindex C-c @key{DELETE} (C Mode) @code{c-hungry-delete-forward}---Delete the entire block of whitespace following point. @end table As an alternative to the above commands, you can enable @dfn{hungry delete mode}. When this feature is enabled (indicated by @samp{/h} in -the mode line after the mode name), a single @key{BS} command deletes +the mode line after the mode name), a single @key{DEL} command deletes all preceding whitespace, not just one space, and a single @kbd{C-c C-d} (but @emph{not} @key{DELETE}) deletes all following whitespace. @@ -1661,6 +1606,9 @@ the flag @samp{/w} on the mode line after the mode name (e.g. @samp{C/law}). You can even use @kbd{M-x c-subword-mode} in non-CC Mode buffers. +In the GNU project, we recommend using underscores to separate words +within an identifier in C or C++, rather than using case distinctions. + @item M-x c-context-line-break @findex c-context-line-break This command inserts a line break and indents the new line in a manner diff --git a/man/rmail.texi b/man/rmail.texi index 6cdbfb9a5a2..3ad50ff3b71 100644 --- a/man/rmail.texi +++ b/man/rmail.texi @@ -10,15 +10,11 @@ @findex rmail-mode @vindex rmail-mode-hook - Rmail is an Emacs subsystem for reading and disposing of mail that you -receive. Rmail stores mail messages in files called Rmail files. -Reading the message in an Rmail file is done in a special major mode, -Rmail mode, which redefines most letters to run commands for managing -mail. The command @code{rmail-mode} is used to switch into Rmail mode, -and it runs the hook @code{rmail-mode-hook} as usual, but don't run this -command by hand; it can't do a reasonable job unless the buffer is -visiting a proper Rmail file. - + Rmail is an Emacs subsystem for reading and disposing of mail that +you receive. Rmail stores mail messages in files called Rmail files +which use a special format. Reading the message in an Rmail file is +done in a special major mode, Rmail mode, which redefines most letters +to run commands for managing mail. @menu * Basic: Rmail Basics. Basic concepts of Rmail, and simple use. * Scroll: Rmail Scrolling. Scrolling through a message. @@ -66,16 +62,16 @@ messages between them. @cindex message number Within the Rmail file, messages are normally arranged sequentially in order of receipt; you can specify other ways to sort them. Messages are -assigned consecutive integers as their @dfn{message numbers}. The -number of the current message is displayed in Rmail's mode line, -followed by the total number of messages in the file. You can move to a -message by specifying its message number with the @kbd{j} key +identified by consecutive integers which are their @dfn{message numbers}. +The number of the current message is displayed in Rmail's mode line, +followed by the total number of messages in the file. You can move to +a message by specifying its message number with the @kbd{j} key (@pxref{Rmail Motion}). @kindex s @r{(Rmail)} @findex rmail-expunge-and-save Following the usual conventions of Emacs, changes in an Rmail file -become permanent only when the file is saved. You can save it with +become permanent only when you save the file. You can save it with @kbd{s} (@code{rmail-expunge-and-save}), which also expunges deleted messages from the file first (@pxref{Rmail Deletion}). To save the file without expunging, use @kbd{C-x C-s}. Rmail also saves the Rmail @@ -89,12 +85,12 @@ file after merging new mail from an inbox file (@pxref{Rmail Inbox}). and saves the Rmail file, then buries the Rmail buffer as well as its summary buffer, if present (@pxref{Rmail Summary}). But there is no need to ``exit'' formally. If you switch from Rmail to editing in -other buffers, and never happen to switch back, you have exited. Just -make sure to save the Rmail file eventually (like any other file you -have changed). @kbd{C-x s} is a good enough way to do this -(@pxref{Save Commands}). The Rmail command @kbd{b}, @code{rmail-bury}, -buries the Rmail buffer and its summary buffer without expunging and -saving the Rmail file. +other buffers, and never switch back, you have exited. Just make sure +to save the Rmail file eventually (like any other file you have +changed). @kbd{C-x s} is a suitable way to do this (@pxref{Save +Commands}). The Rmail command @kbd{b}, @code{rmail-bury}, buries the +Rmail buffer and its summary buffer without expunging and saving the +Rmail file. @node Rmail Scrolling @section Scrolling Within a Message @@ -102,7 +98,7 @@ saving the Rmail file. When Rmail displays a message that does not fit on the screen, you must scroll through it to read the rest. You could do this with @kbd{C-v}, @kbd{M-v} and @kbd{M-<}, but in Rmail scrolling is so -frequent that it deserves to be easier to type. +frequent that it deserves to be easier. @table @kbd @item @key{SPC} @@ -184,7 +180,7 @@ deleted messages---for example, if you want to move to a message to undelete it---use the variants @kbd{M-n} and @kbd{M-p} (@code{rmail-next-message} and @code{rmail-previous-message}). A numeric argument to any of these commands serves as a repeat -count.@refill +count. In Rmail, you can specify a numeric argument by typing just the digits. You don't need to type @kbd{C-u} first. @@ -315,14 +311,13 @@ any time in Rmail by typing @kbd{g}. files which are inboxes for your primary Rmail file. If you don't set this variable explicitly, it is initialized from the @env{MAIL} environment variable, or, as a last resort, set to @code{nil}, which -means to use the default inbox. The default inbox is -@file{/var/mail/@var{username}}, @file{/usr/spool/mail/@var{username}}, -or @file{/usr/mail/@var{username}}, depending on your operating system. +means to use the default inbox. The default inbox file depends on +your operating system; often it is @file{/var/mail/@var{username}}, +@file{/usr/spool/mail/@var{username}}, or +@file{/usr/mail/@var{username}}. - To see what the default is on your system, use @kbd{C-h v -rmail-primary-inbox-list @key{RET}}. You can specify the inbox file(s) for -any Rmail file with the command @code{set-rmail-inbox-list}; see -@ref{Rmail Files}. + You can specify the inbox file(s) for any Rmail file with the +command @code{set-rmail-inbox-list}; see @ref{Rmail Files}. There are two reasons for having separate Rmail files and inboxes. @@ -346,18 +341,18 @@ the rest of Rmail, since only Rmail operates on the Rmail file. then, we have recognized that the usual inbox format on Unix and GNU systems is adequate for the job, and we plan to change Rmail to use that as its internal format. However, the Rmail file will still be separate -from the inbox file, even on systems where their format is the same. +from the inbox file, even when their format is the same. @vindex rmail-preserve-inbox - When getting new mail, Rmail first copies the new mail from the inbox -file to the Rmail file; then it saves the Rmail file; then it truncates -the inbox file. This way, a system crash may cause duplication of mail -between the inbox and the Rmail file, but cannot lose mail. If -@code{rmail-preserve-inbox} is non-@code{nil}, then Rmail will copy new -mail from the inbox file to the Rmail file without truncating the inbox -file. You may wish to set this, for example, on a portable computer you -use to check your mail via POP while traveling, so that your mail will -remain on the server and you can save it later on your workstation. + When getting new mail, Rmail first copies the new mail from the +inbox file to the Rmail file; then it saves the Rmail file; then it +clears out the inbox file. This way, a system crash may cause +duplication of mail between the inbox and the Rmail file, but cannot +lose mail. If @code{rmail-preserve-inbox} is non-@code{nil}, then +Rmail does not clear out the inbox file when it gets new mail. You +may wish to set this, for example, on a portable computer you use to +check your mail via POP while traveling, so that your mail will remain +on the server and you can save it later on your workstation. In some cases, Rmail copies the new mail from the inbox file indirectly. First it runs the @code{movemail} program to move the mail @@ -403,10 +398,11 @@ Merge new mail from inbox file @var{file}. @kindex i @r{(Rmail)} @findex rmail-input - To run Rmail on a file other than your primary Rmail file, you may use + To run Rmail on a file other than your primary Rmail file, you can use the @kbd{i} (@code{rmail-input}) command in Rmail. This visits the file in Rmail mode. You can use @kbd{M-x rmail-input} even when not in -Rmail. +Rmail, but it is easier to type @kbd{C-u M-x rmail}, which does the +same thing. The file you read with @kbd{i} should normally be a valid Rmail file. If it is not, Rmail tries to decompose it into a stream of messages in @@ -416,23 +412,22 @@ initializes a new buffer for creating a new Rmail file. @vindex rmail-secondary-file-directory @vindex rmail-secondary-file-regexp - You can also select an Rmail file from a menu. Choose first the menu -bar Classify item, then from the Classify menu choose the Input Rmail -File item; then choose the Rmail file you want. The variables -@code{rmail-secondary-file-directory} and + You can also select an Rmail file from a menu. In the Classify menu, +choose the Input Rmail File item; then choose the Rmail file you want. +The variables @code{rmail-secondary-file-directory} and @code{rmail-secondary-file-regexp} specify which files to offer in the menu: the first variable says which directory to find them in; the -second says which files in that directory to offer (all those that match -the regular expression). These variables also apply to choosing a file -for output (@pxref{Rmail Output}). +second says which files in that directory to offer (all those that +match the regular expression). These variables also apply to choosing +a file for output (@pxref{Rmail Output}). @findex set-rmail-inbox-list Each Rmail file can contain a list of inbox file names; you can specify this list with @kbd{M-x set-rmail-inbox-list @key{RET} @var{files} @key{RET}}. The argument can contain any number of file names, separated by commas. It can also be empty, which specifies that this file should -have no inboxes. Once a list of inboxes is specified, the Rmail file -remembers it permanently until you specify a different list. +have no inboxes. Once you specify a list of inboxes in an Rmail file, +the Rmail file remembers it permanently until you specify a different list. As a special exception, if your primary Rmail file does not specify any inbox files, it uses your standard system inbox. @@ -440,9 +435,9 @@ inbox files, it uses your standard system inbox. @kindex g @r{(Rmail)} @findex rmail-get-new-mail The @kbd{g} command (@code{rmail-get-new-mail}) merges mail into the -current Rmail file from its specified inboxes. If the Rmail file -has no inboxes, @kbd{g} does nothing. The command @kbd{M-x rmail} -also merges new mail into your primary Rmail file. +current Rmail file from its inboxes. If the Rmail file has no +inboxes, @kbd{g} does nothing. The command @kbd{M-x rmail} also +merges new mail into your primary Rmail file. To merge mail from a file that is not the usual inbox, give the @kbd{g} key a numeric argument, as in @kbd{C-u g}. Then it reads a file @@ -501,14 +496,14 @@ default for the output file name. However, the file name is read using the minibuffer, so you can specify a different name if you wish. You can also output a message to an Rmail file chosen with a menu. -Choose first the menu bar Classify item, then from the Classify menu -choose the Output Rmail File menu item; then choose the Rmail file you want. -This outputs the current message to that file, like the @kbd{o} command. -The variables @code{rmail-secondary-file-directory} and +In the Classify menu, choose the Output Rmail File menu item; then +choose the Rmail file you want. This outputs the current message to +that file, like the @kbd{o} command. The variables +@code{rmail-secondary-file-directory} and @code{rmail-secondary-file-regexp} specify which files to offer in the menu: the first variable says which directory to find them in; the -second says which files in that directory to offer (all those that match -the regular expression). +second says which files in that directory to offer (all those that +match the regular expression). @vindex rmail-delete-after-output Copying a message with @kbd{o} or @kbd{C-o} gives the original copy @@ -606,7 +601,7 @@ repeat count. (@code{rmail-summary-by-labels}) displays a summary containing only the messages that have at least one of a specified set of labels. The argument @var{labels} is one or more label names, separated by commas. -@xref{Rmail Summary}, for information on summaries.@refill +@xref{Rmail Summary}, for information on summaries. If the @var{labels} argument to @kbd{C-M-n}, @kbd{C-M-p} or @kbd{C-M-l} is empty, it means to use the last set of labels specified @@ -616,9 +611,9 @@ for any of these commands. @section Rmail Attributes Some labels such as @samp{deleted} and @samp{filed} have built-in -meanings and are assigned to or removed from messages automatically at -appropriate times; these labels are called @dfn{attributes}. Here is a -list of Rmail attributes: +meanings, and Rmail assigns them to messages automatically at +appropriate times; these labels are called @dfn{attributes}. Here is +a list of Rmail attributes: @table @samp @item unseen @@ -648,7 +643,7 @@ Means you have resent the message. Assigned by the command @kbd{M-x rmail-resend}. @xref{Rmail Reply}. @end table - All other labels are assigned or removed only by the user, and have no + All other labels are assigned or removed only by users, and have no standard meaning. @node Rmail Reply @@ -659,7 +654,7 @@ standard meaning. certain features meant to work with Rmail. What this section documents are the special commands of Rmail for entering Mail mode. Note that the usual keys for sending mail---@kbd{C-x m}, @kbd{C-x 4 m}, and @kbd{C-x 5 -m}---are available in Rmail mode and work just as they usually do. +m}---also work normally in Rmail mode. @table @kbd @item m @@ -679,15 +674,15 @@ Try sending a bounced message a second time (@code{rmail-retry-failure}). @kindex r @r{(Rmail)} @findex rmail-reply @cindex reply to a message - The most common reason to send a message while in Rmail is to reply to -the message you are reading. To do this, type @kbd{r} -(@code{rmail-reply}). This displays the @samp{*mail*} buffer in another -window, much like @kbd{C-x 4 m}, but preinitializes the @samp{Subject}, -@samp{To}, @samp{CC} and @samp{In-reply-to} header fields based on the -message you are replying to. The @samp{To} field starts out as the -address of the person who sent the message you received, and the -@samp{CC} field starts out with all the other recipients of that -message. + The most common reason to send a message while in Rmail is to reply +to the message you are reading. To do this, type @kbd{r} +(@code{rmail-reply}). This displays the @samp{*mail*} buffer in +another window, much like @kbd{C-x 4 m}, but preinitializes the +@samp{Subject}, @samp{To}, @samp{CC}, @samp{In-reply-to} and +@samp{References} header fields based on the message you are replying +to. The @samp{To} field starts out as the address of the person who +sent the message you received, and the @samp{CC} field starts out with +all the other recipients of that message. @vindex rmail-dont-reply-to-names You can exclude certain recipients from being placed automatically in @@ -700,13 +695,14 @@ of using them for large mailing lists to broadcast announcements.) To omit the @samp{CC} field completely for a particular reply, enter the reply command with a numeric argument: @kbd{C-u r} or @kbd{1 r}. +This means to reply only to the sender of the original message. Once the @samp{*mail*} buffer has been initialized, editing and sending the mail goes as usual (@pxref{Sending Mail}). You can edit the -presupplied header fields if they are not right for you. You can also +presupplied header fields if they are not what you want. You can also use the commands of Mail mode (@pxref{Mail Mode}), including @kbd{C-c C-y} which yanks in the message that you are replying to. You can -switch to the Rmail buffer, select a different message there, switch +also switch to the Rmail buffer, select a different message there, switch back, and yank the new current message. @kindex M-m @r{(Rmail)} @@ -764,13 +760,13 @@ outgoing message that is not a reply. It leaves the header fields empty. Its only difference from @kbd{C-x 4 m} is that it makes the Rmail buffer accessible for @kbd{C-c C-y}, just as @kbd{r} does. Thus, @kbd{m} can be used to reply to or forward a message; it can do anything @kbd{r} or @kbd{f} -can do.@refill +can do. @kindex c @r{(Rmail)} @findex rmail-continue The @kbd{c} (@code{rmail-continue}) command resumes editing the @samp{*mail*} buffer, to finish editing an outgoing message you were -already composing, or to alter a message you have sent.@refill +already composing, or to alter a message you have sent. @vindex rmail-mail-new-frame If you set the variable @code{rmail-mail-new-frame} to a @@ -845,14 +841,14 @@ It then displays and selects the summary buffer in another window. @kbd{C-M-l @var{labels} @key{RET}} (@code{rmail-summary-by-labels}) makes a partial summary mentioning only the messages that have one or more of the labels @var{labels}. @var{labels} should contain label names separated by -commas.@refill +commas. @kindex C-M-r @r{(Rmail)} @findex rmail-summary-by-recipients @kbd{C-M-r @var{rcpts} @key{RET}} (@code{rmail-summary-by-recipients}) makes a partial summary mentioning only the messages that have one or more of the recipients @var{rcpts}. @var{rcpts} should contain mailing -addresses separated by commas.@refill +addresses separated by commas. @kindex C-M-t @r{(Rmail)} @findex rmail-summary-by-topic @@ -867,8 +863,8 @@ makes a partial summary which mentions only the messages whose headers (including the date and the subject lines) match the regular expression @var{regexp}. - Note that there is only one summary buffer for any Rmail file; making one -kind of summary discards any previously made summary. + Note that there is only one summary buffer for any Rmail file; +making any kind of summary discards any previous summary. @vindex rmail-summary-window-size @vindex rmail-summary-line-count-flag @@ -1007,19 +1003,25 @@ 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. +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. @kindex t @r{(Rmail)} @findex rmail-toggle-header Rmail saves the complete original header before reformatting; to see it, 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. Selecting the message again also reformats. +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 those variable. Selecting the message again also +reformats it if necessary. One consequence of this is that if you edit the reformatted header (using @kbd{e}; @pxref{Rmail Editing}), subsequent use of @kbd{t} will @@ -1041,10 +1043,10 @@ of a header field, that whole field is highlighted. If you specify unusual colors for your text foreground and background, the colors used for highlighting may not go well with -them. If so, specify different colors for the face -@code{rmail-highlight-face}. @xref{Faces}, for how to do this. To -turn off highlighting entirely in Rmail, set -@code{rmail-highlighted-headers} to @code{nil}. +them. If so, specify different colors by setting the variable +@code{rmail-highlight-face} to a suitable face. To turn off +highlighting entirely in Rmail, set @code{rmail-highlighted-headers} +to @code{nil}. You can highlight and activate URLs in incoming messages by adding the function @code{goto-address} to the hook diff --git a/man/search.texi b/man/search.texi index dc6c16d4a72..443de66cbf5 100644 --- a/man/search.texi +++ b/man/search.texi @@ -737,7 +737,7 @@ specifies a ``shy'' group that does not record the matched substring; you can't refer back to it with @samp{\@var{d}}. This is useful in mechanically combining regular expressions, so that you can add groups for syntactic purposes without interfering with -the numbering of the groups that were written by the user. +the numbering of the groups that are meant to be referred to. @item \@var{d} matches the same text that matched the @var{d}th occurrence of a diff --git a/man/sending.texi b/man/sending.texi index 4670a98f467..2fbf9a189c7 100644 --- a/man/sending.texi +++ b/man/sending.texi @@ -93,9 +93,10 @@ header fields, such as @samp{Date} and @samp{Sender}, are created automatically when you send the message. Others, such as the recipient names, must be specified by you in order to send the message properly. - Mail mode provides a few commands to help you edit some header fields, -and some are preinitialized in the buffer automatically at times. You can -insert and edit header fields using ordinary editing commands. + In the mail buffer, you can insert and edit header fields using +ordinary editing commands. Mail mode provides a commands to help you +edit some header fields, and some are preinitialized in the buffer +automatically when appropriate. The line in the buffer that says @@ -110,7 +111,7 @@ headers precede it. The delimiter line itself does not appear in the message actually sent. The text used for the delimiter line is controlled by the variable @code{mail-header-separator}. -Here is an example of what the headers and text in the mail buffer + Here is an example of what the headers and text in the mail buffer might look like. @example @@ -221,7 +222,7 @@ of places to send the message. These fields can also have continuation lines: one or more lines starting with whitespace, following the starting line of the field, are considered part of the field. Here's an example of a @samp{To} field with a continuation -line:@refill +line: @example @group @@ -433,9 +434,8 @@ lowest priority for reselection by default, since you are finished with using it. This is the usual way to send the message. In a file-visiting buffer, sending the message does not clear the -modified flag, because only saving the file should do that. As a -result, you don't get a warning if you try to send the same message -twice. +modified flag, because only saving the file should do that. Also, you +don't get a warning if you try to send the same message twice. @c This is indexed in mule.texi, node "Recognize Coding". @c @vindex sendmail-coding-system diff --git a/man/text.texi b/man/text.texi index 8c624c42dde..4fb5ee9cc1e 100644 --- a/man/text.texi +++ b/man/text.texi @@ -12,7 +12,8 @@ computer field. One is data that is a sequence of characters. Any file that you edit with Emacs is text, in this sense of the word. The other meaning is more restrictive: a sequence of characters in a human language for humans to read (possibly after processing by a text formatter), as -opposed to a program or commands for a program. +opposed to a program or binary data. This chapter is concerned with +editing text in the narrower sense. Human languages have syntactic/stylistic conventions that can be supported or used to advantage by editor commands: conventions involving @@ -41,7 +42,7 @@ mode (@pxref{TeX Mode}). @ifinfo mode. @end ifinfo -For input to nroff, use Nroff mode. +For input to groff or nroff, use Nroff mode. Instead of using a text formatter, you can edit formatted text in WYSIWYG style (``what you see is what you get''), with Enriched mode. @@ -113,7 +114,7 @@ in the text. 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 a negative argument moves forward. Forward motion stops right after the last letter of the word, while backward motion -stops right before the first letter.@refill +stops right before the first letter. @kindex M-d @findex kill-word @@ -130,10 +131,10 @@ the end, and kill the word backwards with @kbd{M-@key{DEL}}.) @kindex M-DEL @kbd{M-@key{DEL}} (@code{backward-kill-word}) kills the word before point. It kills everything from point back to where @kbd{M-b} would -move to. If point is after the space in @w{@samp{FOO, BAR}}, then -@w{@samp{FOO, }} is killed. (If you wish to kill just @samp{FOO}, and -not the comma and the space, use @kbd{M-b M-d} instead of -@kbd{M-@key{DEL}}.) +move to. For instance, if point is after the space in @w{@samp{FOO, +BAR}}, it kills @w{@samp{FOO, }}. If you wish to kill just +@samp{FOO}, and not the comma and the space, use @kbd{M-b M-d} instead +of @kbd{M-@key{DEL}}. @c Don't index M-t and transpose-words here, they are indexed in @c fixit.texi, in the node "Transpose". @@ -155,9 +156,9 @@ to. @kbd{M-@@} accepts a numeric argument that says how many words to scan for the place to put the mark. In Transient Mark mode, this command activates the mark. - The word commands' understanding of syntax is completely controlled by -the syntax table. Any character can, for example, be declared to be a word -delimiter. @xref{Syntax}. + The word commands' understanding of word boundaries is controlled +by the syntax table. Any character can, for example, be declared to +be a word delimiter. @xref{Syntax}. @node Sentences @section Sentences @@ -206,7 +207,7 @@ beginning of the sentence. Larger arguments serve as a repeat count. There is also a command, @kbd{C-x @key{DEL}} (@code{backward-kill-sentence}), for killing back to the beginning of a sentence. This command is useful when you change your mind in the -middle of composing text.@refill +middle of composing text. The sentence commands assume that you follow the American typist's convention of putting two spaces at the end of a sentence; they consider @@ -214,34 +215,36 @@ a sentence to end wherever there is a @samp{.}, @samp{?} or @samp{!} followed by the end of a line or two spaces, with any number of @samp{)}, @samp{]}, @samp{'}, or @samp{"} characters allowed in between. A sentence also begins or ends wherever a paragraph begins or ends. +It is useful to follow this convention, because it makes a distinction +between periods that end a sentence and periods that indicate +abbreviations; that enables the Emacs sentence commands to distinguish, +too. These commands to not stop for periods that indicate abbreviations. -@vindex sentence-end - The variable @code{sentence-end} controls recognition of the end of -a sentence. If non-@code{nil}, it is a regexp that matches the last -few characters of a sentence, together with the whitespace following -the sentence. If the value is @code{nil}, the default, then Emacs -computes the regexp according to various criteria. The result is -normally similar to the following regexp: - -@example -"[.?!][]\"')]*\\($\\| $\\|\t\\| \\)[ \t\n]*" -@end example - -@noindent -This example is explained in the section on regexps. @xref{Regexp Example}. - - If you want to use just one space between sentences, you should -set @code{sentence-end} to this value: +@vindex sentence-end-double-space + If you want to use just one space between sentences, you can set the +variable @code{sentence-end-double-space} to @code{nil} to make the +sentence commands stop for single spaces. However, this mode has a +drawback: there is no way to distinguish between periods that end +sentences and those that indicate abbreviations. For convenient and +reliable editing, we therefore recommend you follow the two-space +convention. The variable @code{sentence-end-double-space} also +affects filling (@pxref{Fill Commands}) in related ways. -@example -"[.?!][]\"')]*\\($\\|\t\\| \\)[ \t\n]*" -@end example +@vindex sentence-end + The variable @code{sentence-end} controls how to recognize the end +of a sentence. If non-@code{nil}, it is a regexp that matches the +last few characters of a sentence, together with the whitespace +following the sentence. If the value is @code{nil}, the default, then +Emacs computes the regexp according to various criteria such as the +value of @code{sentence-end-double-space}. @xref{Regexp Example}, for +a detailed explanation of one of the regular expressions Emacs uses +for this purpose. -@noindent -This is what setting the variable @code{sentence-end-double-space} to -@code{nil} automatically does. But note that this makes it impossible -to distinguish between periods that end sentences and those that -indicate abbreviations. +@vindex sentence-end-without-period + Some languages do not use period to indicate end of sentence. For +example, a sentence in Thai text ends with double space but without a +period. Set the variable @code{sentence-end-without-period} to +@code{t} to tell the sentence commands that a period is not necessary. @node Paragraphs @section Paragraphs @@ -266,18 +269,20 @@ Put point and mark around this or next paragraph (@code{mark-paragraph}). @kbd{M-@{} moves to the beginning of the current or previous paragraph, while @kbd{M-@}} moves to the end of the current or next paragraph. Blank lines and text-formatter command lines separate -paragraphs and are not considered part of any paragraph. In -Paragraph-Indent Text mode, but not in Text mode, an indented line -also starts a new paragraph. If there is a blank line before the -paragraph, @kbd{M-@{} moves to the blank line, because that is -convenient in practice. +paragraphs and are not considered part of any paragraph. If there is +a blank line before the paragraph, @kbd{M-@{} moves to the blank line, +because that is convenient in practice. + + In Text mode, an indented line is not a paragraph break. If you +want indented lines to have this effect, use Paragraph-Indent Text +mode instead. @xref{Text Mode}. In major modes for programs, paragraphs begin and end only at blank -lines. This makes the paragraph commands continue to be useful even -though there are no paragraphs per se. +lines. This makes the paragraph commands useful, even though there +are no paragraphs as such in a program. - When there is a fill prefix, then paragraphs are delimited by all lines -which don't start with the fill prefix. @xref{Filling}. + When you have set a fill prefix, then paragraphs are delimited by +all lines which don't start with the fill prefix. @xref{Filling}. @kindex M-h @findex mark-paragraph @@ -399,11 +404,11 @@ Text}). @menu * Auto Fill:: Auto Fill mode breaks long lines automatically. -* Refill:: Keeping paragraphs filled. * Fill Commands:: Commands to refill paragraphs and center lines. * Fill Prefix:: Filling paragraphs that are indented or in a comment, etc. * Adaptive Fill:: How Emacs can determine the fill prefix automatically. +* Refill:: Keeping paragraphs filled. * Longlines:: Editing text with very long lines. @end menu @@ -464,31 +469,6 @@ paragraph properly filled again is usually with the explicit fill commands. The section on init files says how to arrange this permanently for yourself. @xref{Init File}. -@node Refill -@subsection Refill Mode -@cindex refilling text, word processor style -@cindex modes, Refill -@cindex Refill minor mode - - Refill minor mode provides support for keeping paragraphs filled as -you type or modify them in other ways. It provides an effect similar -to typical word processor behavior. This works by running a -paragraph-filling command at suitable times. - - To toggle the use of Refill mode in the current buffer, type -@kbd{M-x refill-mode}. When you are typing text, only characters -which normally trigger auto filling, like the space character, will -trigger refilling. This is to avoid making it too slow. Apart from -self-inserting characters, other commands which modify the text cause -refilling. - - The current implementation is preliminary and not robust. You can -get better ``line wrapping'' behavior using Longlines mode. -@xref{Longlines}. However, Longlines mode has an important -side-effect: the newlines that it inserts for you are not saved to -disk, so the files that you make with Longlines mode will appear to be -completely unfilled if you edit them without Longlines mode. - @node Fill Commands @subsection Explicit Fill Commands @@ -515,24 +495,24 @@ where necessary. @findex fill-region To refill many paragraphs, use @kbd{M-x fill-region}, which -divides the region into paragraphs and fills each of them. +finds the paragraphs in the region and fills each of them. @findex fill-region-as-paragraph @kbd{M-q} and @code{fill-region} use the same criteria as @kbd{M-h} for finding paragraph boundaries (@pxref{Paragraphs}). For more control, you can use @kbd{M-x fill-region-as-paragraph}, which refills -everything between point and mark. This command deletes any blank lines -within the region, so separate blocks of text end up combined into one -block.@refill +everything between point and mark as a single paragraph. This command +deletes any blank lines within the region, so separate blocks of text +end up combined into one block. @cindex justification - A numeric argument to @kbd{M-q} causes it to @dfn{justify} the text as -well as filling it. This means that extra spaces are inserted to make -the right margin line up exactly at the fill column. To remove the -extra spaces, use @kbd{M-q} with no argument. (Likewise for + A numeric argument to @kbd{M-q} tells it to @dfn{justify} the text +as well as filling it. This means that extra spaces are inserted to +make the right margin line up exactly at the fill column. To remove +the extra spaces, use @kbd{M-q} with no argument. (Likewise for @code{fill-region}.) Another way to control justification, and choose -other styles of filling, is with the @code{justification} text property; -see @ref{Format Justification}. +other styles of filling, is with the @code{justification} text +property; see @ref{Format Justification}. @kindex M-s @r{(Text mode)} @cindex centering @@ -561,7 +541,6 @@ indicates an abbreviation and not the end of a sentence. To preserve the distinction between these two ways of using a period, the fill commands do not break a line after a period followed by just one space. -@vindex sentence-end-double-space If the variable @code{sentence-end-double-space} is @code{nil}, the fill commands expect and leave just one space at the end of a sentence. Ordinarily this variable is @code{t}, so the fill commands insist on @@ -571,18 +550,13 @@ two spaces for the end of a sentence, as explained above. @xref{Sentences}. If the variable @code{colon-double-space} is non-@code{nil}, the fill commands put two spaces after a colon. -@vindex sentence-end-without-period - Some languages do not use period to indicate end of sentence. For -example, a sentence in Thai text ends with double space but without a -period. Set the variable @code{sentence-end-without-period} to -@code{t} to tell the sentence commands that a period is not necessary. - @vindex fill-nobreak-predicate The variable @code{fill-nobreak-predicate} specifies additional conditions for where line-breaking is allowed. Its value is either @code{nil} or a Lisp function; the function is called with no -arguments, and if it returns a non-@code{nil} value, then point is not -a good place to break the line. Two standard functions you can use are +arguments, with point at a place where Emacs is considering breaking +the line. If the function returns a non-@code{nil} value, then that's +a bad place to break the line. Two standard functions you can use are @code{fill-single-word-nobreak-p} (don't break after the first word of a sentence or before the last) and @code{fill-french-nobreak-p} (don't break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}). @@ -615,20 +589,20 @@ a new paragraph. @findex set-fill-prefix To specify a fill prefix for the current buffer, move to a line that starts with the desired prefix, put point at the end of the prefix, -and give the command @w{@kbd{C-x .}}@: (@code{set-fill-prefix}). -That's a period after the @kbd{C-x}. To turn off the fill prefix, -specify an empty prefix: type @w{@kbd{C-x .}}@: with point at the -beginning of a line.@refill +and type @w{@kbd{C-x .}}@: (@code{set-fill-prefix}). (That's a period +after the @kbd{C-x}.) To turn off the fill prefix, specify an empty +prefix: type @w{@kbd{C-x .}}@: with point at the beginning of a line. When a fill prefix is in effect, the fill commands remove the fill -prefix from each line before filling and insert it on each line after -filling. (The beginning of the first line is left unchanged, since -often that is intentionally different.) Auto Fill mode also inserts -the fill prefix automatically when it makes a new line. The @kbd{C-o} -command inserts the fill prefix on new lines it creates, when you use -it at the beginning of a line (@pxref{Blank Lines}). Conversely, the -command @kbd{M-^} deletes the prefix (if it occurs) after the newline -that it deletes (@pxref{Indentation}). +prefix from each line of the paragraph before filling and insert it on +each line after filling. (The beginning of the first line of the +paragraph is left unchanged, since often that is intentionally +different.) Auto Fill mode also inserts the fill prefix automatically +when it makes a new line. The @kbd{C-o} command inserts the fill +prefix on new lines it creates, when you use it at the beginning of a +line (@pxref{Blank Lines}). Conversely, the command @kbd{M-^} deletes +the prefix (if it occurs) after the newline that it deletes +(@pxref{Indentation}). For example, if @code{fill-column} is 40 and you set the fill prefix to @samp{;; }, then @kbd{M-q} in the following text @@ -749,6 +723,31 @@ line, and it should return the appropriate fill prefix based on that line. If it returns @code{nil}, @code{adaptive-fill-regexp} gets a chance to find a prefix. +@node Refill +@subsection Refill Mode +@cindex refilling text, word processor style +@cindex modes, Refill +@cindex Refill minor mode + + Refill minor mode provides support for keeping paragraphs filled as +you type or modify them in other ways. It provides an effect similar +to typical word processor behavior. This works by running a +paragraph-filling command at suitable times. + + To toggle the use of Refill mode in the current buffer, type +@kbd{M-x refill-mode}. When you are typing text, only characters +which normally trigger auto filling, like the space character, will +trigger refilling. This is to avoid making it too slow. Apart from +self-inserting characters, other commands which modify the text cause +refilling. + + The current implementation is preliminary and not robust. You can +get better ``line wrapping'' behavior using Longlines mode. +@xref{Longlines}. However, Longlines mode has an important +side-effect: the newlines that it inserts for you are not saved to +disk, so the files that you make with Longlines mode will appear to be +completely unfilled if you edit them without Longlines mode. + @node Longlines @subsection Long Lines Mode @cindex refilling text, word processor style @@ -786,11 +785,11 @@ line wrapping, with @kbd{C-u M-x longlines-auto-wrap}. To turn automatic line wrapping back on, type @kbd{M-x longlines-auto-wrap}. @findex longlines-show-hard-newlines - Whenever you type @kbd{RET}, you are inserting a hard newline. If -you want to see where all the hard newlines are, type @kbd{M-x -longlines-show-hard-newlines}. This will mark each hard newline with -a special symbol. The same command with a prefix argument turns this -display off. + Type @kbd{RET} to insert a hard newline, one which automatic +refilling will not remove. If you want to see where all the hard +newlines are, type @kbd{M-x longlines-show-hard-newlines}. This will +mark each hard newline with a special symbol. The same command with a +prefix argument turns this display off. Long Lines mode does not change normal text files that are already filled, since the existing newlines are considered hard newlines. @@ -845,10 +844,11 @@ to the appropriate number of words before point, but do not move point. This is convenient when you have just typed a word in the wrong case: you can give the case conversion command and continue typing. - If a word case conversion command is given in the middle of a word, it -applies only to the part of the word which follows point. This is just -like what @kbd{M-d} (@code{kill-word}) does. With a negative argument, -case conversion applies only to the part of the word before point. + If a word case conversion command is given in the middle of a word, +it applies only to the part of the word which follows point. (This is +comparable to what @kbd{M-d} (@code{kill-word}) does.) With a +negative argument, case conversion applies only to the part of the +word before point. @kindex C-x C-l @kindex C-x C-u @@ -888,22 +888,23 @@ the previous line. Text mode turns off the features concerned with comments except when you explicitly invoke them. It changes the syntax table so that single-quotes are considered part of words. However, if a word starts -with single-quotes, then these are treated as a prefix for purposes -such as capitalization. That is, @kbd{M-c} will convert -@samp{'hello'} into @samp{'Hello'}, as expected. +with single-quotes, these are treated as a prefix for purposes such as +capitalization. That is, @kbd{M-c} will convert @samp{'hello'} into +@samp{'Hello'}, as expected. @cindex Paragraph-Indent Text mode @cindex mode, Paragraph-Indent Text @findex paragraph-indent-text-mode @findex paragraph-indent-minor-mode If you indent the first lines of paragraphs, then you should use -Paragraph-Indent Text mode rather than Text mode. In this mode, you do -not need to have blank lines between paragraphs, because the first-line -indentation is sufficient to start a paragraph; however paragraphs in -which every line is indented are not supported. Use @kbd{M-x -paragraph-indent-text-mode} to enter this mode. Use @kbd{M-x -paragraph-indent-minor-mode} to enter an equivalent minor mode, for -instance during mail composition. +Paragraph-Indent Text mode rather than Text mode. In this mode, you +do not need to have blank lines between paragraphs, because the +first-line indentation is sufficient to start a paragraph; however +paragraphs in which every line is indented are not supported. Use +@kbd{M-x paragraph-indent-text-mode} to enter this mode. Use @kbd{M-x +paragraph-indent-minor-mode} to enable an equivalent minor mode in +situations where you can't change the major mode---in mail +composition, for instance. @kindex M-TAB @r{(Text mode)} Text mode, and all the modes based on it, define @kbd{M-@key{TAB}} @@ -1083,7 +1084,7 @@ heading line. @kbd{C-c C-p} (@code{outline-previous-visible-heading}) moves similarly backward. Both accept numeric arguments as repeat counts. The names emphasize that invisible headings are skipped, but this is not really a special feature. All editing commands that look for lines ignore the -invisible lines automatically.@refill +invisible lines automatically. @findex outline-up-heading @findex outline-forward-same-level @@ -1164,7 +1165,7 @@ and @kbd{C-c C-s} (@code{show-subtree}). Both apply to the current heading line's @dfn{subtree}: its body, all its subheadings, both direct and indirect, and all of their bodies. In other words, the subtree contains everything following the current heading line, up to -and not including the next heading of the same or higher rank.@refill +and not including the next heading of the same or higher rank. @findex hide-leaves @findex show-branches @@ -1181,7 +1182,7 @@ bodies or make the subheadings visible. They are @kbd{C-c C-l} A little weaker than @code{show-branches} is @kbd{C-c C-i} (@code{show-children}). It makes just the direct subheadings visible---those one level down. Deeper subheadings remain invisible, if -they were invisible.@refill +they were invisible. @findex hide-body @findex show-all @@ -1356,13 +1357,14 @@ automatically by putting this in your @file{.emacs} file: @findex slitex-mode @findex doctex-mode - @TeX{} is a powerful text formatter written by Donald Knuth; it is also -free, like GNU Emacs. La@TeX{} is a simplified input format for @TeX{}, -implemented by @TeX{} macros; it comes with @TeX{}. Sli@TeX{} is a special -form of La@TeX{}.@footnote{Sli@TeX{} is obsoleted by the @samp{slides} -document class in recent La@TeX{} versions.} Doc@TeX{} (@file{.dtx}) -is a special file format in which the La@TeX{} sources are written, -combining sources with documentation. + @TeX{} is a powerful text formatter written by Donald Knuth; it is +also free software, like GNU Emacs. La@TeX{} is a simplified input +format for @TeX{}, implemented by @TeX{} macros; it comes with @TeX{}. +Sli@TeX{} is a special form of La@TeX{}.@footnote{Sli@TeX{} is +obsoleted by the @samp{slides} document class in recent La@TeX{} +versions.} Doc@TeX{} (@file{.dtx}) is a special file format in which +the La@TeX{} sources are written, combining sources with +documentation. Emacs has a special @TeX{} mode for editing @TeX{} input files. It provides facilities for checking the balance of delimiters and for @@ -1611,7 +1613,7 @@ C-l}. Type @kbd{C-c C-k} (@code{tex-kill-job}) to kill the @TeX{} process if you see that its output is no longer useful. Using @kbd{C-c C-b} or -@kbd{C-c C-r} also kills any @TeX{} process still running.@refill +@kbd{C-c C-r} also kills any @TeX{} process still running. @findex tex-region @kindex C-c C-r @r{(@TeX{} mode)} @@ -1838,7 +1840,7 @@ used as a cheap preview. @vindex sgml-xml-mode SGML mode and HTML mode support XML also. In XML, every opening tag must have an explicit closing tag. When @code{sgml-xml-mode} is -non-@code{nil}, SGML mode (and HTML mode) always insert explicit +non-@code{nil}, SGML mode and HTML mode always insert explicit closing tags. When you visit a file, these modes determine from the file contents whether it is XML or not, and set @code{sgml-xml-mode} accordingly, so that they do the right thing for the file in either @@ -2380,7 +2382,7 @@ appropriate, use @code{format-find-file} with suitable arguments. @cindex table mode @cindex text-based tables - Table Mode provides an easy and intuitive way to create and edit WYSIWYG + Table mode provides an easy and intuitive way to create and edit WYSIWYG text-based tables. Here is an example of such a table: @smallexample @@ -2402,7 +2404,7 @@ text-based tables. Here is an example of such a table: +-----------------+--------------------------------+-----------------+ @end smallexample - Table Mode allows the contents of the table such as this one to be + Table mode allows the contents of the table such as this one to be easily manipulated by inserting or deleting characters inside a cell. A cell is effectively a localized rectangular edit region and edits to a cell do not affect the contents of the surrounding cells. If the @@ -2428,8 +2430,8 @@ growth of the cell. @node Table Definition @subsection What is a Text-based Table? - Look at the following examples of valid tables as a reference while -you read this section: + Keep the following examples of valid tables in mind as a reference +while you read this section: @example +--+----+---+ +-+ +--+-----+ @@ -2441,15 +2443,13 @@ you read this section: +-----+--+ @end example - A table consists of a rectangular frame and the contents inside the -frame. A table's cells must be at least one character wide and one -character high with two adjacent cells sharing a boarder line. A cell -can be subdivided into multiple rectangular cells but cannot nest or -overlap. + A table consists of a rectangular frame whose inside is divided into +cells. Each cell must be at least one character wide and one +character high, not counting its border lines. A cell can be +subdivided into multiple rectangular cells, but cells cannot overlap. - Both the table frame and cell border lines must consist of one of -three special characters. The variables that hold these characters -are described below: + The table frame and cell border lines are made of three special +characters. These variables specify those characters: @table @code @vindex table-cell-vertical-char @@ -2487,10 +2487,10 @@ From left to right: @enumerate a @item -Nested cells are not allowed. -@item Overlapped cells or non-rectangular cells are not allowed. @item +Same as a. +@item The border must be rectangular. @item Cells must have a minimum width/height of one character. @@ -2506,16 +2506,15 @@ Same as d. @findex table-insert The command to create a table is @code{table-insert}. When called interactively, it asks for the number of columns, number of rows, cell -width and cell height. The number of columns is a number of cells -within the table's width. The number of rows is the number of cells -within the table's height. The cell width is a number of characters -that fit within a cell width. The cell height is a number of lines -within cell height. While the number of columns and number of rows -must be an integer number, the cell width and the cell height can be -either an integer number (when the value is constant across the table) -or a series of integer numbers, separated by spaces or commas, where -each number corresponds to each cell width within a row from left to -right or each cell height within a column from top to bottom. +width and cell height. The number of columns is the number of cells +horizontally side by side. The number of rows is the number of cells +vertically within the table's height. The cell width is a number of +characters that each cell holds, left to right. The cell height is a +number of lines each cell holds. The cell width and the cell height +can be either an integer (when the value is constant across the table) +or a series of integer, separated by spaces or commas, where each +number corresponds to the next cell within a row from left to right, +or the next cell within a column from top to bottom. @node Table Recognition @subsection Table Recognition @@ -2523,7 +2522,7 @@ right or each cell height within a column from top to bottom. @findex table-recognize @findex table-unrecognize - Table Mode maintains special text properties in the buffer to allow + Table mode maintains special text properties in the buffer to allow editing in a convenient fashion. When a buffer with tables is saved to its file, these text properties are lost, so when you visit this file again later, Emacs does not see a table, but just formatted text. @@ -2531,15 +2530,10 @@ To resurrect the table text properties, issue the @kbd{M-x table-recognize} command. It scans the current buffer, recognizes valid table cells, and attaches appropriate text properties to allow for table editing. The converse command, @code{table-unrecognize}, is -used to remove the special text properties and revert the buffer back +used to remove the special text properties and convert the buffer back to plain text. - An optional numeric prefix argument can precede the -@code{table-recognize} command. If the argument is negative, tables -in the buffer become inactive. This is equivalent to invoking -@code{table-unrecognize}. - - Similar functions exist to enable or disable tables within a region, + Special commands exist to enable or disable tables within a region, enable or disable individual tables, and enable/disable individual cells. These commands are: @@ -2575,10 +2569,10 @@ Conversion}. The commands @code{table-forward-cell} and @code{table-backward-cell} move point from the current cell to an adjacent cell forward and backward respectively. The order of the -cell is wrapped. When point is positioned in the last cell of a -table, typing @kbd{M-x table-forward-cell} moves point to the first -cell in the table. Likewise @kbd{M-x table-backward-cell} from the -first cell in a table moves point to the last cell in the table. +cells is cyclic: when point is in the last cell of a table, typing +@kbd{M-x table-forward-cell} moves to the first cell in the table. +Likewise @kbd{M-x table-backward-cell} from the first cell in a table +moves to the last cell. @findex table-span-cell The command @code{table-span-cell} spans the current cell into one @@ -2602,18 +2596,17 @@ point is located. The content in the original cell is split as well. @findex table-split-cell-horizontally The command @code{table-split-cell-horizontally} splits the current cell horizontally and creates a pair of cells right and left of where -point is located. If the subject cell to split is not empty the user -is asked how to handle the cell contents. The three options are: -@code{split}, @code{left}, or @code{right}. @code{split} splits the -contents at point literally while the @code{left} and @code{right} -options move the entire contents into the left or right cell -respectively. +point is located. If the cell being split is not empty, this asks you +how to handle the cell contents. The three options are: @code{split}, +@code{left}, or @code{right}. @code{split} splits the contents at +point literally, while the @code{left} and @code{right} options move +the entire contents into the left or right cell respectively. @cindex enlarge a table cell @cindex shrink a table cell - The next four commands enlarge or shrink a cell. These commands -accept numeric arguments (@pxref{Arguments}) to specify how many -columns or rows to enlarge or shrink a particular table. + The next four commands enlarge or shrink a cell. They use numeric +arguments (@pxref{Arguments}) to specify how many columns or rows to +enlarge or shrink a particular table. @table @kbd @findex table-heighten-cell @@ -2639,21 +2632,20 @@ is remembered independently for each cell and the subsequent editing of cell contents is subject to the specified justification. @findex table-justify - The command @code{table-justify} requests the user to specify what -to justify: a cell,a column, or a row. If you select cell -justification, this command sets the justification only to the current -cell. Selecting column or row justification set the justification to -all the cells within a column or row respectively. The command then -requests the user to enter which justification to apply: @code{left}, -@code{center}, @code{right}, @code{top}, @code{middle}, @code{bottom}, -or @code{none}. The options @code{left}, @code{center}, and + The command @code{table-justify} ask you to specify what to justify: +a cell, a column, or a row. If you select cell justification, this +command sets the justification only for the current cell. Selecting +column or row justification sets the justification for all the cells +within a column or row respectively. The command then ask you which +kind of justification to apply: @code{left}, @code{center}, +@code{right}, @code{top}, @code{middle}, @code{bottom}, or +@code{none}. Horizontal justification and vertical justification are +specified independently. The options @code{left}, @code{center}, and @code{right} specify horizontal justification while the options @code{top}, @code{middle}, @code{bottom}, and @code{none} specify vertical justification. The vertical justification @code{none} -effectively removes vertical justification while horizontal -justification must be one of @code{left}, @code{center}, or -@code{right}. Horizontal justification and vertical justification are -specified independently. +effectively removes vertical justification. Horizontal justification +must be one of @code{left}, @code{center}, or @code{right}. @vindex table-detect-cell-alignment Justification information is stored in the buffer as a part of text @@ -2667,8 +2659,8 @@ the contents of a cell are examined to determine which justification was originally applied to the cell and then applies this justification to the cell. This is a speculative algorithm and is therefore not perfect, however, the justification is deduced correctly most of the -time. If you desire to disable this feature, customize the variable -@code{table-detect-cell-alignment} to set it to @code{nil}. +time. To disable this feature, customize the variable +@code{table-detect-cell-alignment} and set it to @code{nil}. @node Row Commands @subsection Commands for Table Rows @@ -2681,7 +2673,7 @@ the current row in a table. The current row where point is located is pushed down after the newly inserted row. A numeric prefix argument specifies the number of rows to insert. Note that in order to insert rows @emph{after} the last row at the bottom of a table, you must -place point below the table, i.e.@: outside the table, prior to +place point below the table---that is, outside the table---prior to invoking this command. @cindex delete row in table @@ -2696,12 +2688,11 @@ A numeric prefix argument specifies the number of rows to delete. @cindex insert column in table @findex table-insert-column The command @code{table-insert-column} inserts a column of cells to -the left of the current row in a table. The current column where -point is located at is pushed right of the newly inserted column. To -insert a column to the right side of the right most column, place -point to the right of the rightmost column, which is outside of the -table, prior to invoking this command. A numeric prefix argument -specifies the number of columns to insert. +the left of the current row in a table. This pushes the current +column to the right. To insert a column to the right side of the +rightmost column, place point to the right of the rightmost column, +which is outside of the table, prior to invoking this command. A +numeric prefix argument specifies the number of columns to insert. @cindex delete column in table A command @code{table-delete-column} deletes a column of cells at @@ -2714,11 +2705,10 @@ delete. @findex table-fixed-width-mode The command @code{table-fixed-width-mode} toggles fixed width mode -on and off. When the fixed width mode is turned on, editing inside a +on and off. When fixed width mode is turned on, editing inside a cell never changes the cell width; when it is off, the cell width expands automatically in order to prevent a word from being folded -into multiple lines. By default, the fixed width mode is turned off. - +into multiple lines. By default, fixed width mode is disabled. @node Table Conversion @subsection Conversion Between Plain Text and Tables @@ -2731,9 +2721,11 @@ turns it into a table. Unlike @code{table-recognize} (@pxref{Table Recognition}), the original text does not have a table appearance but may hold a logical table structure. For example, some elements separated by known patterns form a two dimensional structure which can -be turned into a table. Look at the numbers below. The numbers are -horizontally separated by a comma and vertically separated by a -newline character. +be turned into a table. + + Here's an example of data that @code{table-capture} can operate on. +The numbers are horizontally separated by a comma and vertically +separated by a newline character. @example 1, 2, 3, 4 @@ -2742,8 +2734,7 @@ newline character. @end example @noindent -When you invoke @kbd{M-x table-capture} on the above three-line -region, the region can be turned into the next table: +Invoking @kbd{M-x table-capture} on that text produces this table: @example +-----+-----+-----+-----+ @@ -2756,9 +2747,9 @@ region, the region can be turned into the next table: @end example @noindent -where @samp{,} is used for a column delimiter regexp, a newline is -used for a row delimiter regexp, cells are left justified, and minimum -cell width is 5. +The conversion uses @samp{,} for the column delimiter and newline for +a row delimiter, cells are left justified, and minimum cell width is +5. @findex table-release The command @code{table-release} does the opposite of @@ -2771,7 +2762,7 @@ lines): @example @samp{table-capture} is a powerful command however mastering its power -requires some practice. Here is a list of items what it can do. +requires some practice. Here are some things it can do: Parse Cell Items By using column delimiter regular expression and raw delimiter regular @@ -2797,9 +2788,8 @@ following one. @c produced output!! @example +-----------------------------------------------------------------+ -|@samp{table-capture} is a powerful command however mastering its | -|power requires some practice. Here is a list of items what it | -|can do. | +|@samp{table-capture} is a powerful command, but mastering its | +|power requires some practice. Here are some things it can do: | | | |Parse Cell Items By using column delimiter regular | | expression and raw delimiter regular | @@ -2822,9 +2812,8 @@ independently without affecting the layout of other cells. @example +-----------------------------------------------------------------+ -|@samp{table-capture} is a powerful command however mastering its | -|power requires some practice. Here is a list of items what it | -|can do. | +|@samp{table-capture} is a powerful command, but mastering its | +|power requires some practice. Here are some things it can do: | +---------------------+-------------------------------------------+ |Parse Cell Items |By using column delimiter regular | | |expression and raw delimiter regular | @@ -2877,7 +2866,7 @@ increasing integer numbers. @cindex table in language format @cindex table for HTML and LaTeX @findex table-generate-source -The command @code{table-generate-source} generates a table formatted + The command @code{table-generate-source} generates a table formatted for a specific markup language. It asks for a language (which must be one of @code{html}, @code{latex}, or @code{cals}), a destination buffer where to put the result, and the table caption (a string), and diff --git a/man/trouble.texi b/man/trouble.texi index e318ce2f2b5..a6b1e8e564a 100644 --- a/man/trouble.texi +++ b/man/trouble.texi @@ -158,14 +158,14 @@ erasure key}. In Emacs, it is supposed to be equivalent to @key{DEL}, and when Emacs is properly configured for your terminal, it translates that key into the character @key{DEL}. - When Emacs starts up using a window system, it determines + 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. If the usual erasure key deletes forwards instead of backwards, that is probably what happened---Emacs ought to be treating the @key{DELETE} key as @key{DEL}, but it isn't. - With a window system, if the usual erasure key is labeled + On a graphical display, if the usual erasure key is labeled @key{BACKSPACE} and there is a @key{DELETE} key elsewhere, but the @key{DELETE} key deletes backward instead of forward, that too suggests Emacs got the wrong information---but in the opposite sense. @@ -213,7 +213,7 @@ customize the variable @code{normal-erase-is-backspace}: the value @key{DEL}, and @code{nil} specifies the other mode. @xref{Easy Customization}. - With a window system, it can also happen that the usual erasure key + On a graphical display, it can also happen that the usual erasure key is labeled @key{BACKSPACE}, there is a @key{DELETE} key elsewhere, and both keys delete forward. This probably means that someone has redefined your @key{BACKSPACE} key as a @key{DELETE} key. With X, @@ -226,7 +226,7 @@ you simply remove it now. @subsection Recursive Editing Levels Recursive editing levels are important and useful features of Emacs, but -they can seem like malfunctions to the user who does not understand them. +they can seem like malfunctions if you do not understand them. If the mode line has square brackets @samp{[@dots{}]} around the parentheses that contain the names of the major and minor modes, you have entered a diff --git a/man/xresources.texi b/man/xresources.texi index 8ff09ef9594..f7947edda17 100644 --- a/man/xresources.texi +++ b/man/xresources.texi @@ -877,14 +877,14 @@ also for the trough of a scroll bar, i.e. @code{bg[ACTIVE] = "red"} sets the scroll bar trough to red. Buttons that have been pressed but not released yet (``armed'') are in this state. @item PRELIGHT -This is the state when widgets that can be manipulated have the mouse -pointer over them. For example when the mouse is over the thumb in the -scroll bar or over a menu item. When the mouse is over a button that -is not pressed, the button is in this state. +This is the state for a widget that can be manipulated, when the mouse +pointer is over it---for example when the mouse is over the thumb in +the scroll bar or over a menu item. When the mouse is over a button +that is not pressed, the button is in this state. @item SELECTED -This is the state when some data has been selected by the user. It can -be selected text or items selected in a list. -There is no place in Emacs where this setting has any effect. +This is the state for data that has been selected by the user. It can +be selected text or items selected in a list. This state is not used +in Emacs. @item INSENSITIVE This is the state for widgets that are visible, but they can not be manipulated in the usual way---for example, buttons that can't be diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7846f90c508..988f073cb53 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -615,7 +615,7 @@ ;; End: Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/msdos/README b/msdos/README index 3827d2944d7..40f579cf49f 100644 --- a/msdos/README +++ b/msdos/README @@ -6,7 +6,8 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/mainmake b/msdos/mainmake index d09f11b4e40..1b69bfd24e6 100644 --- a/msdos/mainmake +++ b/msdos/mainmake @@ -1,5 +1,5 @@ # Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index b31dcb8905c..d46651e3253 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -1,7 +1,7 @@ # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/sed1.inp b/msdos/sed1.inp index 2efbde37a6f..b13a7ae08ac 100644 --- a/msdos/sed1.inp +++ b/msdos/sed1.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 358faa24dc4..63f62985f52 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2.inp b/msdos/sed2.inp index 945b753d01d..3f5852e6c59 100644 --- a/msdos/sed2.inp +++ b/msdos/sed2.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, -# 2004, 2005 Free Software Foundation, Inc. +# 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 3beb48650e7..89fae6d7a41 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, -# 2004, 2005 Free Software Foundation, Inc. +# 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index b1cbd696030..b31d1361ace 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp @@ -2,7 +2,8 @@ # Extra configuration script for src/config.h for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1994, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3.inp b/msdos/sed3.inp index efbe448d0d1..299e44fe6df 100644 --- a/msdos/sed3.inp +++ b/msdos/sed3.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index fb6b67cc422..39d644999fa 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed4.inp b/msdos/sed4.inp index 23883bc8e2d..fcdf6cef47d 100644 --- a/msdos/sed4.inp +++ b/msdos/sed4.inp @@ -2,7 +2,8 @@ # Configuration script for src/paths.h # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1994, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index c9a3ac998ce..54d56825bef 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp @@ -2,7 +2,8 @@ # Configuration script for oldxmenu/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1994, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed6.inp b/msdos/sed6.inp index 2aae6aa441c..b74d2aa3a54 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -4,7 +4,7 @@ # --------------------------------------------------------------------------- # # Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index 287dfad7c44..c5d2e1daded 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1999, 2000, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index bb7d8b8e620..49dcabc588a 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -2,7 +2,8 @@ # Configuration script for lisp/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2003, 2004, 2005, +# 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/nt/ChangeLog b/nt/ChangeLog index cc161f830e6..097f1f1e2af 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1204,7 +1204,7 @@ ;; End: Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/nt/INSTALL b/nt/INSTALL index d756585ce20..c0706e3dadf 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -1,7 +1,8 @@ Building and Installing Emacs on Windows NT/2K/XP and Windows 95/98/ME - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. See the end of the file for copying permissions. If you used WinZip to unpack the distribution, we suggest to diff --git a/nt/README b/nt/README index 0bb1625fecd..b1d7cb5ae57 100644 --- a/nt/README +++ b/nt/README @@ -1,6 +1,7 @@ Emacs for Windows NT/2000 and Windows 95/98/ME - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. See the end of the INSTALL file in this directory for copying permissions. This directory contains support for compiling and running GNU Emacs on diff --git a/nt/addpm.c b/nt/addpm.c index 0827d2453c0..65a403b7eaf 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -1,5 +1,6 @@ /* Add entries to the GNU Emacs Program Manager folder. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/addsection.c b/nt/addsection.c index 5a58f3e1c07..b6d119fe6a8 100644 --- a/nt/addsection.c +++ b/nt/addsection.c @@ -1,5 +1,6 @@ /* Add an uninitialized data section to an executable. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index be7c7531bf6..0b47ecd52b9 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -1,5 +1,6 @@ /* Proxy shell designed for use with Emacs on Windows 95 and NT. - Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Accepts subset of Unix sh(1) command-line options, for compatability with elisp code written for Unix. When possible, executes external diff --git a/nt/config.nt b/nt/config.nt index 0f66a441c7b..482d2e6052b 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1,6 +1,6 @@ /* GNU Emacs site configuration template file. -*- C -*- Copyright (C) 1988, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/configure.bat b/nt/configure.bat index b5f78f2ab51..ffc11542ce0 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -1,8 +1,8 @@ @echo off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows 95/98/Me and NT/2000/XP
-rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-rem Free Software Foundation, Inc.
+rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+rem 2006 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/ddeclient.c b/nt/ddeclient.c index 540cac24ebf..bd192c61f47 100644 --- a/nt/ddeclient.c +++ b/nt/ddeclient.c @@ -1,5 +1,6 @@ /* Simple client interface to DDE servers. - Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/emacs.rc b/nt/emacs.rc index fd75506b97f..486b1eecf23 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -26,7 +26,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" VALUE "FileVersion", "22, 0, 50, 0\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005\0" + VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" VALUE "ProductVersion", "22, 0, 50, 0\0" diff --git a/nt/envadd.bat b/nt/envadd.bat index d48e6cc8bf1..ece62f971bd 100644 --- a/nt/envadd.bat +++ b/nt/envadd.bat @@ -1,7 +1,7 @@ rem Hack to change/add environment variables in the makefiles for the
rem Windows platform.
rem
-rem Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
rem
rem This file is part of GNU Emacs.
rem
diff --git a/nt/gmake.defs b/nt/gmake.defs index 9b93aa92074..56799f783e1 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -1,6 +1,6 @@ # -*- Makefile -*- definition file for building GNU Emacs on Windows NT. -# Copyright (c) 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. # # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/nt/inc/grp.h b/nt/inc/grp.h index 39f98d31cdc..04c2982086b 100755 --- a/nt/inc/grp.h +++ b/nt/inc/grp.h @@ -1,5 +1,5 @@ /* Replacement grp.h file for building GNU Emacs on Windows. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 19b8a65adda..c0a3bc26ec4 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index fb1ea246663..ca1e22b93bb 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# Top level makefile for building GNU Emacs on Windows NT
#
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat index f06f94c9ca4..0b21962a458 100644 --- a/nt/multi-install-info.bat +++ b/nt/multi-install-info.bat @@ -3,7 +3,7 @@ rem Hack to run install-info with multiple info files on the command
rem line on the Windows platform.
rem
-rem Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
rem
rem This file is part of GNU Emacs.
rem
diff --git a/nt/nmake.defs b/nt/nmake.defs index 76a3462969e..94fa9f431e9 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -1,6 +1,6 @@ # -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# GNU Emacs is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/nt/paths.h b/nt/paths.h index 0bb883067c3..f3d272da350 100644 --- a/nt/paths.h +++ b/nt/paths.h @@ -1,5 +1,5 @@ /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/preprep.c b/nt/preprep.c index e99fe38a484..fb686f42b96 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -1,5 +1,6 @@ /* Pro-process emacs.exe for profiling by MSVC. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/runemacs.c b/nt/runemacs.c index 709389deb8f..a998134ec72 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/.gdbinit b/src/.gdbinit index 0d1f51e5d54..2cdb9fc7511 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -1,5 +1,5 @@ -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, +# 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/ChangeLog b/src/ChangeLog index 166222ae33c..8c1fffe9911 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,90 @@ +2006-02-11 Eli Zaretskii <eliz@gnu.org> + + * keyboard.c (Venable_disabled_menus_and_buttons): New variable. + (syms_of_keyboard): DEVFAR_LISP and initialize it. + (parse_tool_bar_item, parse_menu_item): If that variable is + non-nil, don't disable menu items and tool-bar buttons. + +2006-02-11 Juanma Barranquero <lekktu@gmail.com> + + * doc.c (Fsubstitute_command_keys): Doc fix. + +2006-02-10 Thien-Thi Nguyen <ttn@gnu.org> + + * data.c (Findirect_function): Rewrite docstring. + Fix omission bug: Declare new arg NOERROR. + +2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (x_set_mouse_color): Don't call rif->define_frame_cursor + if window_desc is not set yet. + (Fx_create_frame): Remove variable x_frame_name. Apply 2005-12-07 + and 2006-01-26 changes for xfns.c. Call x_iconify_frame if frame + parameter `visibility' is `icon'. + (Fx_create_frame, x_create_tip_frame): Use "fontset-standard" + instead of "fontset-mac". + (Fx_focus_frame): New defun. + (syms_of_macfns): Defsubr it. + + * macterm.c (mac_define_frame_cursor): Don't change pointer shape + for unfocused frame. + (x_raise_frame): Call BringToFront instead of SelectWindow. + (x_lower_frame): Use NULL instead of nil. + (x_make_frame_visible): Don't call SelectWindow. + (XTread_socket): Increment handling_signal at the start, decrement + it at the end. + [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): Use + CFPreferencesGetAppIntegerValue instead of Fmac_get_preference. + +2006-02-10 Kim F. Storm <storm@cua.dk> + + * data.c (Findirect_function): Add NOERROR arg. All callers changed + to pass Qnil for NOERROR. + + * keymap.c (current_minor_maps_error): Remove. + (current_minor_maps): Pass Qt for NOERROR to Findirect_function + instead of using internal_condition_case_1+current_minor_maps_error. + +2006-02-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xterm.c (handle_one_xevent): Must note mouse movement even for nil + frames for GTK, in that case it is the tool bar. This is so that + highlighted text get reset properly. + +2006-02-09 Juanma Barranquero <lekktu@gmail.com> + + * alloc.c (Fmake_bool_vector, Fpurecopy): Doc fixes. + +2006-02-08 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * window.c (adjust_window_trailing_edge): Check that shrinking + does not set a window to size zero or less. + +2006-02-08 Miles Bader <miles@gnu.org> + + * editfns.c (Fconstrain_to_field): Use Fget_char_property instead + of Fget_text_property (other field functions work with overlays as + well as text-properties). + +2006-02-07 Kenichi Handa <handa@m17n.org> + + * dispextern.h (unibyte_display_via_language_environment): Extern it. + + * xterm.h (unibyte_display_via_language_environment): + * w32term.h (unibyte_display_via_language_environment): + * macterm.h (unibyte_display_via_language_environment): Delete extern. + +2006-02-07 Kenichi Handa <handa@m17n.org> + + * term.c (append_glyph): Refer to it->char_to_display instead of it->c. + (produce_glyphs): Set the character to print in + it->char_to_display. Handle unibyte-display-via-language-environment. + (produce_stretch_glyph): Set character to print in it->char_to_display. + +2006-02-06 Kenichi Handa <handa@m17n.org> + + * lread.c (openp): Initialize encoded_fn before GCPRO it. + 2006-02-05 Ken Raeburn <raeburn@raeburn.org> * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup. @@ -22409,7 +22496,8 @@ See ChangeLog.9 for earlier changes. ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/src/Makefile.in b/src/Makefile.in index 9329dddc516..32f339bb139 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/src/abbrev.c b/src/abbrev.c index 84054892910..e7dcec3a43a 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -1,6 +1,6 @@ /* Primitives for word-abbrev mode. Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/alloc.c b/src/alloc.c index be03f4ebf7c..27fe3f86961 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2301,7 +2301,7 @@ INIT must be an integer that represents a character. */) DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0, - doc: /* Return a new bool-vector of length LENGTH, using INIT for as each element. + doc: /* Return a new bool-vector of length LENGTH, using INIT for each element. LENGTH must be a number. INIT matters only in whether it is t or nil. */) (length, init) Lisp_Object length, init; @@ -4813,7 +4813,7 @@ make_pure_vector (len) DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, - doc: /* Make a copy of OBJECT in pure storage. + doc: /* Make a copy of object OBJ in pure storage. Recursively copies contents of vectors and cons cells. Does not copy symbols. Copies strings without text properties. */) (obj) diff --git a/src/atimer.c b/src/atimer.c index d260f67d24d..8b092270d7b 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -1,5 +1,6 @@ /* Asynchronous timers. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.h b/src/atimer.h index d5ad9c674d5..84b1383ffdf 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -1,5 +1,6 @@ /* Asynchronous timers. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/blockinput.h b/src/blockinput.h index 0eaebbe34df..78dce69fe1f 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -1,6 +1,6 @@ /* blockinput.h - interface to blocking complicated interrupt-driven input. Copyright (C) 1989, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.c b/src/buffer.c index d0719ec9481..dae07edf359 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,7 +1,7 @@ /* Buffer manipulation primitives for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.h b/src/buffer.h index 2387af65a47..737877f15de 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,6 +1,6 @@ /* Header file for the buffer manipulation primitives. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bytecode.c b/src/bytecode.c index af09061dbc3..0d06890eabf 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1,6 +1,6 @@ /* Execution of byte code produced by bytecomp.el. Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callint.c b/src/callint.c index 38db2ea92ec..c54b03394c0 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,6 +1,6 @@ /* Call a Lisp function interactively. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callproc.c b/src/callproc.c index 25861602c85..a6841317e63 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,6 +1,6 @@ /* Synchronous subprocess invocation for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casefiddle.c b/src/casefiddle.c index dee68fcf8c0..02ec3f76b4e 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -1,6 +1,6 @@ /* GNU Emacs case conversion functions. Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casetab.c b/src/casetab.c index a1e8b5a68fb..5c7530eb480 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -1,6 +1,6 @@ /* GNU Emacs routines to deal with case tables. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/category.c b/src/category.c index 866a7cdd429..929cd7ea1c0 100644 --- a/src/category.c +++ b/src/category.c @@ -1,5 +1,5 @@ /* GNU Emacs routines to deal with category tables. - Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 1999 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/ccl.c b/src/ccl.c index 69658f779a7..779755cf39e 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1,5 +1,6 @@ /* CCL (Code Conversion Language) interpreter. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/charset.c b/src/charset.c index fb9804c0306..211de24ef89 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1,5 +1,6 @@ /* Basic multilingual character support. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/charset.h b/src/charset.h index d6b1dee187f..0d61aa054c0 100644 --- a/src/charset.h +++ b/src/charset.h @@ -1,5 +1,6 @@ /* Header for multibyte character handler. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2003 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 @@ -1,6 +1,6 @@ /* Cursor motion subroutines for GNU Emacs. Copyright (C) 1985, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. based primarily on public domain code written by Chris Torek This file is part of GNU Emacs. @@ -1,6 +1,6 @@ /* Cursor motion calculation definitions for GNU Emacs Copyright (C) 1985, 1989, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cmds.c b/src/cmds.c index 8f7e3bf02df..f1e92ab2f75 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -1,6 +1,6 @@ /* Simple built-in editing commands. Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.c b/src/coding.c index 2358f3e13f3..2d5618649d1 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1,5 +1,6 @@ /* Coding system handler (conversion, detection, and etc). - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/coding.h b/src/coding.h index 609720b9751..5d649fbf9ff 100644 --- a/src/coding.h +++ b/src/coding.h @@ -1,5 +1,6 @@ /* Header for coding system handler. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2000 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/commands.h b/src/commands.h index ed46141bf11..5c7cad37407 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,6 +1,6 @@ /* Definitions needed by most editing commands. Copyright (C) 1985, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.c b/src/composite.c index 54aa2ed9840..d3be3554c55 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1,5 +1,6 @@ /* Composite sequence support. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1999 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/composite.h b/src/composite.h index 99db0506814..5c19f8aa56e 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,5 +1,6 @@ /* Header for composite sequence handler. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1997 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/config.in b/src/config.in index 69c7543bfab..b6730d0284e 100644 --- a/src/config.in +++ b/src/config.in @@ -1,8 +1,8 @@ /* src/config.in. Generated from configure.in by autoheader. */ /* GNU Emacs site configuration template file. - Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004 - Free Software Foundation, Inc. + Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s index 71076eb8b5f..b05faf57b8e 100644 --- a/src/cxux-crt0.s +++ b/src/cxux-crt0.s @@ -1,6 +1,7 @@ /* * External symbol setup file for GNU Emacs on CX/UX - * Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 1990, 2002, 2003, 2004, 2005, + * 2006 Free Software Foundation, Inc. * * This file is part of GNU Emacs. * diff --git a/src/data.c b/src/data.c index 10d6a1e9eb5..d2f6ce76905 100644 --- a/src/data.c +++ b/src/data.c @@ -1,6 +1,6 @@ /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1984,23 +1984,26 @@ indirect_function (object) return hare; } -DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 1, 0, +DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, doc: /* Return the function at the end of OBJECT's function chain. -If OBJECT is a symbol, follow all function indirections and return the final -function binding. -If OBJECT is not a symbol, just return it. -Signal a void-function error if the final symbol is unbound. +If OBJECT is not a symbol, just return it. Otherwise, follow all +function indirections to find the final function binding and return it. +If the final symbol in the chain is unbound, signal a void-function error. +Optional arg NOERROR non-nil means to return nil instead of signalling. Signal a cyclic-function-indirection error if there is a loop in the function chain of symbols. */) - (object) + (object, noerror) register Lisp_Object object; + Lisp_Object noerror; { Lisp_Object result; result = indirect_function (object); if (EQ (result, Qunbound)) - return Fsignal (Qvoid_function, Fcons (object, Qnil)); + return (NILP (noerror) + ? Fsignal (Qvoid_function, Fcons (object, Qnil)) + : Qnil); return result; } diff --git a/src/dired.c b/src/dired.c index 474683c3c87..8c7c7fd5ac6 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1,6 +1,6 @@ /* Lisp functions for making directory listings. Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispextern.h b/src/dispextern.h index b5a6b21d539..66ec02d724a 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,6 +1,6 @@ /* Interface definitions for display code. Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2644,6 +2644,8 @@ extern int help_echo_pos; extern struct frame *last_mouse_frame; extern int last_tool_bar_item; extern int mouse_autoselect_window; +extern int unibyte_display_via_language_environment; + extern void reseat_at_previous_visible_line_start P_ ((struct it *)); extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object, diff --git a/src/dispnew.c b/src/dispnew.c index 2f3deac5fcc..53ea761178f 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1,7 +1,7 @@ /* Updating of data structures for redisplay. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/disptab.h b/src/disptab.h index 41f4bcbfdbf..80936fb1830 100644 --- a/src/disptab.h +++ b/src/disptab.h @@ -1,5 +1,6 @@ /* Things for GLYPHS and glyph tables. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doc.c b/src/doc.c index 0566c5f9d06..3dd5622d9df 100644 --- a/src/doc.c +++ b/src/doc.c @@ -1,6 +1,6 @@ /* Record indices of function doc strings stored in a file. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -386,7 +386,7 @@ string is passed through `substitute-command-keys'. */) !NILP (tem))) return Fdocumentation_property (function, Qfunction_documentation, raw); - fun = Findirect_function (function); + fun = Findirect_function (function, Qnil); if (SUBRP (fun)) { if (XSUBR (fun)->doc == 0) @@ -739,7 +739,7 @@ Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not on any keys. Substrings of the form \\=\\{MAPVAR} are replaced by summaries -\(made by describe-bindings) of the value of MAPVAR, taken as a keymap. +\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap. Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR as the keymap for future \\=\\[COMMAND] substrings. \\=\\= quotes the following character and is discarded; diff --git a/src/doprnt.c b/src/doprnt.c index 5d824038faf..63c0261e6ae 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -1,7 +1,8 @@ /* Output like sprintf to a buffer of specified size. Also takes args differently: pass one pointer to an array of strings in addition to the format string which is separate. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.c b/src/dosfns.c index c256595cc13..22aaa62f0d1 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -1,7 +1,7 @@ /* MS-DOS specific Lisp utilities. Coded by Manabu Higashida, 1991. Major changes May-July 1993 Morten Welinder (only 10% original code left) Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.h b/src/dosfns.h index 40aaf524e23..4f1cfd83d22 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -3,7 +3,7 @@ Modified by Morten Welinder, 1993-1994. Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ecrt0.c b/src/ecrt0.c index 5ee24dfae8c..a9b993d360e 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -1,6 +1,6 @@ /* C code startup routine. Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/editfns.c b/src/editfns.c index 5bf4eb738ae..b621397eda3 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,7 +1,7 @@ /* Lisp functions pertaining to editing. Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -739,24 +739,24 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */) if (NILP (Vinhibit_field_text_motion) && !EQ (new_pos, old_pos) - && (!NILP (Fget_text_property (new_pos, Qfield, Qnil)) - || !NILP (Fget_text_property (old_pos, Qfield, Qnil)) + && (!NILP (Fget_char_property (new_pos, Qfield, Qnil)) + || !NILP (Fget_char_property (old_pos, Qfield, Qnil)) /* To recognize field boundaries, we must also look at the previous positions; we could use `get_pos_property' instead, but in itself that would fail inside non-sticky fields (like comint prompts). */ || (XFASTINT (new_pos) > BEGV - && !NILP (Fget_text_property (prev_new, Qfield, Qnil))) + && !NILP (Fget_char_property (prev_new, Qfield, Qnil))) || (XFASTINT (old_pos) > BEGV - && !NILP (Fget_text_property (prev_old, Qfield, Qnil)))) + && !NILP (Fget_char_property (prev_old, Qfield, Qnil)))) && (NILP (inhibit_capture_property) /* Field boundaries are again a problem; but now we must decide the case exactly, so we need to call `get_pos_property' as well. */ || (NILP (get_pos_property (old_pos, inhibit_capture_property, Qnil)) && (XFASTINT (old_pos) <= BEGV - || NILP (Fget_text_property (old_pos, inhibit_capture_property, Qnil)) - || NILP (Fget_text_property (prev_old, inhibit_capture_property, Qnil)))))) + || NILP (Fget_char_property (old_pos, inhibit_capture_property, Qnil)) + || NILP (Fget_char_property (prev_old, inhibit_capture_property, Qnil)))))) /* It is possible that NEW_POS is not within the same field as OLD_POS; try to move NEW_POS so that it is. */ { diff --git a/src/epaths.in b/src/epaths.in index ee965cb7615..d494d85139c 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -1,6 +1,6 @@ /* Hey Emacs, this is -*- C -*- code! */ /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/eval.c b/src/eval.c index a6c58bc2425..eff284820f0 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1,6 +1,6 @@ /* Evaluator for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -618,7 +618,7 @@ interactive_p (exclude_subrs_p) /* If this isn't a byte-compiled function, there may be a frame at the top for Finteractive_p. If so, skip it. */ - fun = Findirect_function (*btp->function); + fun = Findirect_function (*btp->function, Qnil); if (SUBRP (fun) && (XSUBR (fun) == &Sinteractive_p || XSUBR (fun) == &Scalled_interactively_p)) btp = btp->next; @@ -639,7 +639,7 @@ interactive_p (exclude_subrs_p) a special form, ignoring frames for Finteractive_p and/or Fbytecode at the top. If this frame is for a built-in function (such as load or eval-region) return nil. */ - fun = Findirect_function (*btp->function); + fun = Findirect_function (*btp->function, Qnil); if (exclude_subrs_p && SUBRP (fun)) return 0; @@ -2079,7 +2079,7 @@ do_autoload (fundef, funname) Vautoload_queue = Qt; unbind_to (count, Qnil); - fun = Findirect_function (fun); + fun = Findirect_function (fun, Qnil); if (!NILP (Fequal (fun, fundef))) error ("Autoloading failed to define function %s", @@ -2142,7 +2142,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0, /* At this point, only original_fun and original_args have values that will be used below */ retry: - fun = Findirect_function (original_fun); + fun = Findirect_function (original_fun, Qnil); if (SUBRP (fun)) { @@ -2841,7 +2841,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */) fun = args[0]; - fun = Findirect_function (fun); + fun = Findirect_function (fun, Qnil); if (SUBRP (fun)) { diff --git a/src/filelock.c b/src/filelock.c index fc6839f5f88..6e8e6da9fbd 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -1,6 +1,6 @@ /* Lock files for editing. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filemode.c b/src/filemode.c index 6257c6a7664..835a8a3778e 100644 --- a/src/filemode.c +++ b/src/filemode.c @@ -1,6 +1,6 @@ /* filemode.c -- make a string describing file modes Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/firstfile.c b/src/firstfile.c index b16f3a3dc44..06e7022d89a 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -1,5 +1,6 @@ /* Mark beginning of data space to dump as pure, for GNU Emacs. - Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/floatfns.c b/src/floatfns.c index 71f53542283..d5ca50f9165 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -1,6 +1,6 @@ /* Primitive operations on floating point for GNU Emacs Lisp interpreter. Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fns.c b/src/fns.c index 48048c5a830..d16222e6fa5 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,7 +1,7 @@ /* Random utility Lisp functions. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fontset.c b/src/fontset.c index 871ce9926f7..23f3c57d241 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1,5 +1,5 @@ /* Fontset handler. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/fontset.h b/src/fontset.h index aaf12facf94..a4360280911 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,5 +1,6 @@ /* Header for fontset handler. - Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 2000 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/frame.c b/src/frame.c index c9061423193..34508a6d2fb 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,6 +1,6 @@ /* Generic frame functions. Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.h b/src/frame.h index cf0e50ed623..ae80c03f9ca 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,6 +1,6 @@ /* Define frame-object for GNU Emacs. Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fringe.c b/src/fringe.c index 8c6d47cbade..991df3bd60d 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1,7 +1,7 @@ /* Fringe handling (split from xdisp.c). Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/getloadavg.c b/src/getloadavg.c index a2ae9bc310b..3f616b47116 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -1,6 +1,6 @@ /* Get the system load averages. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, - 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 1997, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. diff --git a/src/getpagesize.h b/src/getpagesize.h index ed47f80b0e0..f38409da452 100644 --- a/src/getpagesize.h +++ b/src/getpagesize.h @@ -1,6 +1,6 @@ /* Emulate getpagesize on systems that lack it. Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gmalloc.c b/src/gmalloc.c index 55aedb7801b..71df287a6b6 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -6,7 +6,7 @@ /* Declarations for `malloc' and friends. Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. This library is free software; you can redistribute it and/or diff --git a/src/gtkutil.c b/src/gtkutil.c index 67288cab33f..3efc96cfe5d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1,5 +1,5 @@ /* Functions for creating and updating GTK widgets. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gtkutil.h b/src/gtkutil.h index 6b9fd179ec5..742e3ecb1e5 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -1,5 +1,5 @@ /* Definitions and headers for GTK widgets. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/image.c b/src/image.c index 0ed50ac6539..3587515f840 100644 --- a/src/image.c +++ b/src/image.c @@ -1,6 +1,6 @@ /* Functions for image support on window system. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.c b/src/indent.c index 6ca15c67345..9b5a9e32c79 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1,6 +1,6 @@ /* Indentation functions. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.h b/src/indent.h index 6026be827e8..ddfd16a16de 100644 --- a/src/indent.h +++ b/src/indent.h @@ -1,6 +1,6 @@ /* Definitions for interface to indent.c Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/insdel.c b/src/insdel.c index a63dce14928..b9d9574788e 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1,6 +1,6 @@ /* Buffer insertion/deletion and gap motion for GNU Emacs. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.c b/src/intervals.c index 07845f95666..8bbab5a2a28 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1,6 +1,6 @@ /* Code for doing intervals. Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.h b/src/intervals.h index 418520b5c25..052b55d5a3c 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -1,6 +1,6 @@ /* Definitions and global variables for intervals. Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.c b/src/keyboard.c index dc509ad5717..319e6d24974 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,7 +1,7 @@ /* Keyboard and mouse input; editor command loop. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -633,6 +633,11 @@ static EMACS_TIME timer_idleness_start_time; static EMACS_TIME timer_last_idleness_start_time; +/* If non-nil, events produced by disabled menu items and tool-bar + buttons are not ignored. Help functions bind this to allow help on + those items and buttons. */ +Lisp_Object Venable_disabled_menus_and_buttons; + /* Global variable declarations. */ @@ -7453,7 +7458,9 @@ parse_menu_item (item, notreal, inmenubar) if (SYMBOLP (item)) { tem = Fget (item, Qmenu_enable); - if (!NILP (tem)) + if (!NILP (Venable_disabled_menus_and_buttons)) + AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt; + else if (!NILP (tem)) AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem; } } @@ -7482,7 +7489,12 @@ parse_menu_item (item, notreal, inmenubar) item = XCDR (item); if (EQ (tem, QCenable)) - AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item); + { + if (!NILP (Venable_disabled_menus_and_buttons)) + AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt; + else + AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item); + } else if (EQ (tem, QCvisible) && !notreal) { /* If got a visible property and that evaluates to nil @@ -8002,8 +8014,13 @@ parse_tool_bar_item (key, item) value = XCAR (XCDR (item)); if (EQ (key, QCenable)) - /* `:enable FORM'. */ - PROP (TOOL_BAR_ITEM_ENABLED_P) = value; + { + /* `:enable FORM'. */ + if (!NILP (Venable_disabled_menus_and_buttons)) + PROP (TOOL_BAR_ITEM_ENABLED_P) = Qt; + else + PROP (TOOL_BAR_ITEM_ENABLED_P) = value; + } else if (EQ (key, QCvisible)) { /* `:visible FORM'. If got a visible property and that @@ -9907,7 +9924,7 @@ a special event, so ignore the prefix argument and don't clear it. */) while (1) { - final = Findirect_function (cmd); + final = Findirect_function (cmd, Qnil); if (CONSP (final) && (tem = Fcar (final), EQ (tem, Qautoload))) { @@ -11934,6 +11951,14 @@ If the value is not a number, such messages don't time out. */); The value of that variable is passed to `quit-flag' and later causes a peculiar kind of quitting. */); Vthrow_on_input = Qnil; + + DEFVAR_LISP ("enable-disabled-menus-and-buttons", + &Venable_disabled_menus_and_buttons, + doc: /* If non-nil, don't ignore events produced by disabled menu items and tool-bar. + +Help functions bind this to allow help on disabled menu items +and tool-bar buttons. */); + Venable_disabled_menus_and_buttons = Qnil; } void diff --git a/src/keyboard.h b/src/keyboard.h index 19a38ed7446..a3fa54b1042 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -1,6 +1,6 @@ /* Declarations useful when processing input. Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.c b/src/keymap.c index fa64e88d6e5..ca8edab122b 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1,7 +1,7 @@ /* Manipulation of keymaps Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -69,7 +69,7 @@ Lisp_Object Vminibuffer_local_completion_map; /* keymap used for minibuffers when doing completion in filenames */ Lisp_Object Vminibuffer_local_filename_completion_map; -/* keymap used for minibuffers when doing completion in filenames +/* keymap used for minibuffers when doing completion in filenames with require-match*/ Lisp_Object Vminibuffer_local_must_match_filename_map; @@ -1363,13 +1363,6 @@ silly_event_symbol_error (c) static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL; static int cmm_size = 0; -/* Error handler used in current_minor_maps. */ -static Lisp_Object -current_minor_maps_error () -{ - return Qnil; -} - /* Store a pointer to an array of the keymaps of the currently active minor modes in *buf, and return the number of maps it contains. @@ -1471,9 +1464,7 @@ current_minor_maps (modeptr, mapptr) } /* Get the keymap definition--or nil if it is not defined. */ - temp = internal_condition_case_1 (Findirect_function, - XCDR (assoc), - Qerror, current_minor_maps_error); + temp = Findirect_function (XCDR (assoc), Qt); if (!NILP (temp)) { cmm_modes[i] = var; @@ -3875,11 +3866,11 @@ don't alter it yourself. */); Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil); Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map); - DEFVAR_LISP ("minibuffer-local-filename-completion-map", + DEFVAR_LISP ("minibuffer-local-filename-completion-map", &Vminibuffer_local_filename_completion_map, doc: /* Local keymap for minibuffer input with completion for filenames. */); Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil); - Fset_keymap_parent (Vminibuffer_local_filename_completion_map, + Fset_keymap_parent (Vminibuffer_local_filename_completion_map, Vminibuffer_local_completion_map); @@ -3889,11 +3880,11 @@ don't alter it yourself. */); Fset_keymap_parent (Vminibuffer_local_must_match_map, Vminibuffer_local_completion_map); - DEFVAR_LISP ("minibuffer-local-must-match-filename-map", + DEFVAR_LISP ("minibuffer-local-must-match-filename-map", &Vminibuffer_local_must_match_filename_map, doc: /* Local keymap for minibuffer input with completion for filenames with exact match. */); Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil); - Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, + Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, Vminibuffer_local_must_match_map); DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, diff --git a/src/keymap.h b/src/keymap.h index a6598558a76..3170877f497 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -1,5 +1,6 @@ /* Functions to manipulate keymaps. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lastfile.c b/src/lastfile.c index a229d94fd6a..7c5e067dd02 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -1,5 +1,6 @@ /* Mark end of data space to dump as pure, for GNU Emacs. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lisp.h b/src/lisp.h index 66dcdeb00da..63c643604d1 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1,6 +1,6 @@ /* Fundamental definitions for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2179,7 +2179,7 @@ EXFUN (Fsymbol_function, 1); EXFUN (Fsymbol_plist, 1); EXFUN (Fsymbol_name, 1); extern Lisp_Object indirect_function P_ ((Lisp_Object)); -EXFUN (Findirect_function, 1); +EXFUN (Findirect_function, 2); EXFUN (Ffset, 2); EXFUN (Fsetplist, 2); EXFUN (Fsymbol_value, 1); diff --git a/src/lread.c b/src/lread.c index 590ff65bbce..a23278b63ab 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1,7 +1,7 @@ /* Lisp parsing and input streams. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1081,7 +1081,7 @@ openp (path, str, suffixes, storeptr, predicate) SBYTES (XCAR (tail))); } - string = filename = Qnil; + string = filename = encoded_fn = Qnil; GCPRO6 (str, string, filename, path, suffixes, encoded_fn); if (storeptr) diff --git a/src/m/7300.h b/src/m/7300.h index bb261c9188a..a8751efa52a 100644 --- a/src/m/7300.h +++ b/src/m/7300.h @@ -1,5 +1,6 @@ /* machine description file for AT&T UNIX PC model 7300 - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Modified for this machine by mtxinu!rtech!gonzo!daveb This file is part of GNU Emacs. diff --git a/src/m/acorn.h b/src/m/acorn.h index 399fb7c9249..326fb7760ae 100644 --- a/src/m/acorn.h +++ b/src/m/acorn.h @@ -1,5 +1,6 @@ /* Machine description file for Acorn RISCiX machines. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h index b59322e3d0c..d56624a1eac 100644 --- a/src/m/alliant-2800.h +++ b/src/m/alliant-2800.h @@ -1,5 +1,6 @@ /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800. - Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant.h b/src/m/alliant.h index cbc5734ab31..49459c0b7f7 100644 --- a/src/m/alliant.h +++ b/src/m/alliant.h @@ -1,6 +1,6 @@ /* alliant.h Alliant machine running system version 2 or 3. Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Note that for version 1 of the Alliant system you should use alliant1.h instead of this file. Use alliant4.h for version 4. diff --git a/src/m/alpha.h b/src/m/alpha.h index 41fefaf20fd..47003400846 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -1,6 +1,6 @@ /* machine description file For the alpha chip. Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/altos.h b/src/m/altos.h index 743752d99ec..16e7fb7ce06 100644 --- a/src/m/altos.h +++ b/src/m/altos.h @@ -1,6 +1,6 @@ /* altos machine description file Altos 3068 Unix System V Release 2 Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdahl.h b/src/m/amdahl.h index 89d4b6cb6f7..e418e3a43bf 100644 --- a/src/m/amdahl.h +++ b/src/m/amdahl.h @@ -1,6 +1,6 @@ /* amdahl machine description file Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 14ddd16406e..3a1ace91b41 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -1,5 +1,5 @@ /* machine description file for AMD x86-64. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/apollo.h b/src/m/apollo.h index 4aa62b0b209..d9b3cffdb6d 100644 --- a/src/m/apollo.h +++ b/src/m/apollo.h @@ -1,6 +1,6 @@ /* machine description file for Apollo machine. Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/arm.h b/src/m/arm.h index 358445e0649..0a49f0cbd4b 100644 --- a/src/m/arm.h +++ b/src/m/arm.h @@ -1,5 +1,6 @@ /* Machine description file for ARM-based non-RISCiX machines. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/att3b.h b/src/m/att3b.h index 757b47d3f37..049593ebcf4 100644 --- a/src/m/att3b.h +++ b/src/m/att3b.h @@ -1,5 +1,6 @@ /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86 diff --git a/src/m/aviion.h b/src/m/aviion.h index b9a2932ef07..50355b25bd6 100644 --- a/src/m/aviion.h +++ b/src/m/aviion.h @@ -1,6 +1,6 @@ /* machine description file for Data General AViiON. Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/celerity.h b/src/m/celerity.h index 639d680afdb..10d38e14c6c 100644 --- a/src/m/celerity.h +++ b/src/m/celerity.h @@ -1,6 +1,6 @@ /* machine description file for Celerity. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/clipper.h b/src/m/clipper.h index af9f67d8a37..0dfa13382b3 100644 --- a/src/m/clipper.h +++ b/src/m/clipper.h @@ -1,6 +1,6 @@ /* machine description file for clipper Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h index 48727bedbe3..f8df583657a 100644 --- a/src/m/cnvrgnt.h +++ b/src/m/cnvrgnt.h @@ -1,5 +1,6 @@ /* machine description file for convergent S series. - Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/convex.h b/src/m/convex.h index b7fcc71b1c3..fa87d89e3d3 100644 --- a/src/m/convex.h +++ b/src/m/convex.h @@ -1,6 +1,6 @@ /* machine description file for Convex (all models). Copyright (C) 1987, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cydra5.h b/src/m/cydra5.h index 9806fc30a47..a64f4761c25 100644 --- a/src/m/cydra5.h +++ b/src/m/cydra5.h @@ -1,6 +1,6 @@ /* machine description file for Cydrome's CYDRA 5 mini super computer Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/delta88k.h b/src/m/delta88k.h index 517a0f1744b..86e416e887d 100644 --- a/src/m/delta88k.h +++ b/src/m/delta88k.h @@ -1,6 +1,6 @@ /* Machine description file for Motorola System V/88 machines Copyright (C) 1985, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dpx2.h b/src/m/dpx2.h index 8d1ceb3db06..2a90ff46284 100644 --- a/src/m/dpx2.h +++ b/src/m/dpx2.h @@ -1,6 +1,6 @@ /* machine description for Bull DPX/2 range Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dual.h b/src/m/dual.h index 134a5e7720e..d02ac5bc38e 100644 --- a/src/m/dual.h +++ b/src/m/dual.h @@ -1,6 +1,6 @@ /* machine description file for Dual machines using unisoft port. Copyright (C) 1985, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/elxsi.h b/src/m/elxsi.h index f702dcf0de2..0cb0c5513bf 100644 --- a/src/m/elxsi.h +++ b/src/m/elxsi.h @@ -1,6 +1,6 @@ /* machine description file for Elxsi machine (running enix). Copyright (C) 1986, 1992, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Adapted by John Salmon This file is part of GNU Emacs. diff --git a/src/m/ews4800.h b/src/m/ews4800.h index b377bdeddaa..9db133ba682 100644 --- a/src/m/ews4800.h +++ b/src/m/ews4800.h @@ -1,6 +1,6 @@ /* m- file for NEC EWS4800 RISC series. Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h index 1c784f28f4e..272a06cf305 100644 --- a/src/m/gould-np1.h +++ b/src/m/gould-np1.h @@ -1,5 +1,6 @@ /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1) - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/gould.h b/src/m/gould.h index a9168009d47..3b5f1494e78 100644 --- a/src/m/gould.h +++ b/src/m/gould.h @@ -5,7 +5,8 @@ * RELEASE2_1 in config.h. This may also be necessary with un-updated * official releases of 2.1 - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp800.h b/src/m/hp800.h index 2f661989a15..01146e52359 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -1,5 +1,6 @@ /* machine description file for hp9000 series 800 machines. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h index e0b3a5ce5c3..9760b9bd2ed 100644 --- a/src/m/hp9000s300.h +++ b/src/m/hp9000s300.h @@ -1,5 +1,6 @@ /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/i860.h b/src/m/i860.h index 0ecf9e62087..d74a01a889c 100644 --- a/src/m/i860.h +++ b/src/m/i860.h @@ -1,6 +1,6 @@ /* machine description file for i860. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ia64.h b/src/m/ia64.h index af790946afa..560cd30f599 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -1,5 +1,6 @@ /* machine description file for the IA-64 architecture. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Contributed by David Mosberger <davidm@hpl.hp.com> This file is part of GNU Emacs. diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h index 3d954ae9d19..1a9ed6efe11 100644 --- a/src/m/ibm370aix.h +++ b/src/m/ibm370aix.h @@ -1,6 +1,6 @@ /* m/ file for IBM 370 running AIX. Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h index 539de924d17..ea895cd4fd8 100644 --- a/src/m/ibmps2-aix.h +++ b/src/m/ibmps2-aix.h @@ -1,5 +1,6 @@ /* machine description file for ibm ps/2 aix386. - Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 0ff702d090d..3d3e45eda81 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -1,5 +1,6 @@ /* R2 AIX machine/system dependent defines - Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h index 44bfd77c1d0..43e11b36428 100644 --- a/src/m/ibmrt-aix.h +++ b/src/m/ibmrt-aix.h @@ -1,6 +1,6 @@ /* RTPC AIX machine/system dependent defines Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h index f6c23d9d919..e78d182940c 100644 --- a/src/m/ibmrt.h +++ b/src/m/ibmrt.h @@ -1,5 +1,6 @@ /* RTPC machine dependent defines - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibms390.h b/src/m/ibms390.h index 323ef33f633..d60b33fdd04 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -1,6 +1,6 @@ /* machine description file template. Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/intel386.h b/src/m/intel386.h index 238015fd345..0d2aacf8d19 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -1,5 +1,6 @@ /* Machine description file for intel 386. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/iris4d.h b/src/m/iris4d.h index 93fe2062674..bc8d1242710 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -1,5 +1,6 @@ /* machine description file for Iris-4D machines. Use with s/irix*.h. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/irist.h b/src/m/irist.h index b40ffb5dff9..a366b521a9a 100644 --- a/src/m/irist.h +++ b/src/m/irist.h @@ -1,7 +1,7 @@ /* machine description file for Silicon Graphics Iris 2500 Turbos; also possibly for non-turbo Irises with system release 2.5. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h index 416335d1bff..5b6c3cd0214 100644 --- a/src/m/isi-ov.h +++ b/src/m/isi-ov.h @@ -1,6 +1,6 @@ /* machine description file for ISI 68000's Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/m68k.h b/src/m/m68k.h index 7b2ffa81351..31307ffa499 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -1,6 +1,6 @@ /* Machine description file for generic Motorola 68k. Copyright (C) 1985, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/macppc.h b/src/m/macppc.h index 9e4297df3b7..25005888c77 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -1,6 +1,6 @@ /* machine description file For the powerpc Macintosh. Copyright (C) 1994, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/masscomp.h b/src/m/masscomp.h index 01fddc751f1..df0d9a1aa1a 100644 --- a/src/m/masscomp.h +++ b/src/m/masscomp.h @@ -1,5 +1,6 @@ /* machine description file for Masscomp 5000 series running RTU, ucb universe. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mega68.h b/src/m/mega68.h index ef1623ca460..7db67fa0cca 100644 --- a/src/m/mega68.h +++ b/src/m/mega68.h @@ -1,5 +1,6 @@ /* machine description file for Megatest 68000's. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mg1.h b/src/m/mg1.h index 4e4b3525d6e..92e358837c4 100644 --- a/src/m/mg1.h +++ b/src/m/mg1.h @@ -1,5 +1,6 @@ /* machine description file for Whitechapel Computer Works MG1 (ns16000 based). - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. MG-1 version by L.M.McLoughlin This file is part of GNU Emacs. diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h index fc1a8a2e0d6..27274c8b527 100644 --- a/src/m/mips-siemens.h +++ b/src/m/mips-siemens.h @@ -1,6 +1,6 @@ /* m- file for Mips machines. Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file contains some changes for our SVR4 based SINIX-Mips 5.4. I hope this is helpful to port the emacs to our RM?00 series and diff --git a/src/m/mips.h b/src/m/mips.h index 28a35e02677..dc45a99d06b 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -1,6 +1,6 @@ /* m- file for Mips machines. Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/news.h b/src/m/news.h index dec413c3f9e..5ac2cd6b6dc 100644 --- a/src/m/news.h +++ b/src/m/news.h @@ -1,6 +1,6 @@ /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0. Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/next.h b/src/m/next.h index dfb3cd11cbf..b519e41920d 100644 --- a/src/m/next.h +++ b/src/m/next.h @@ -1,5 +1,6 @@ /* Configuration file for the NeXT machine. - Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh3000.h b/src/m/nh3000.h index 42255473020..ad2d8dd1340 100644 --- a/src/m/nh3000.h +++ b/src/m/nh3000.h @@ -1,7 +1,8 @@ /* machine description for Harris Night Hawk Series 1200 and Series 3000 MC68030-based systems (FPP on these is custom). These systems are also known as "ecx" and "gcx". - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh4000.h b/src/m/nh4000.h index 04068f0c065..1c0bc51c896 100644 --- a/src/m/nh4000.h +++ b/src/m/nh4000.h @@ -1,6 +1,7 @@ /* machine description for Harris NightHawk 88k based machines (includes nh4000 and nh5000 machines). - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns16000.h b/src/m/ns16000.h index 49f514ced06..5e9793a44b8 100644 --- a/src/m/ns16000.h +++ b/src/m/ns16000.h @@ -1,5 +1,6 @@ /* machine description file for ns16000. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns32000.h b/src/m/ns32000.h index 858630b74ab..33e48d297bc 100644 --- a/src/m/ns32000.h +++ b/src/m/ns32000.h @@ -1,6 +1,6 @@ /* machine description file for National Semiconductor 32000, running Genix. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nu.h b/src/m/nu.h index 1e5518e451f..ec051150bdf 100644 --- a/src/m/nu.h +++ b/src/m/nu.h @@ -1,5 +1,6 @@ /* machine description file for TI Nu machines using system V. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion.h b/src/m/orion.h index a73b357d50f..3db485dd3f1 100644 --- a/src/m/orion.h +++ b/src/m/orion.h @@ -1,5 +1,6 @@ /* machine description file for HLH Orion. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion105.h b/src/m/orion105.h index e75a8e67a84..66f87748099 100644 --- a/src/m/orion105.h +++ b/src/m/orion105.h @@ -1,5 +1,6 @@ /* machine description file for HLH Orion 1/05 (Clipper). - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk> This file is part of GNU Emacs. diff --git a/src/m/pfa50.h b/src/m/pfa50.h index 50e79b623ca..85d281073f1 100644 --- a/src/m/pfa50.h +++ b/src/m/pfa50.h @@ -1,6 +1,6 @@ /* Machine description file for PFU A-series. Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/plexus.h b/src/m/plexus.h index 10826a70bc2..8b3e9be7849 100644 --- a/src/m/plexus.h +++ b/src/m/plexus.h @@ -1,5 +1,6 @@ /* machine description file for the Plexus running System V.2. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powermac.h b/src/m/powermac.h index 14b2e110734..232e424da35 100644 --- a/src/m/powermac.h +++ b/src/m/powermac.h @@ -1,5 +1,5 @@ /* Machine description file for Apple Power Macintosh - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h index 1dfd2df25b4..b4681db06bd 100644 --- a/src/m/powerpcle.h +++ b/src/m/powerpcle.h @@ -1,5 +1,6 @@ /* machine description file for PowerPC. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/pyramid.h b/src/m/pyramid.h index 12010087a58..2dbd713f881 100644 --- a/src/m/pyramid.h +++ b/src/m/pyramid.h @@ -1,6 +1,6 @@ /* machine description file for pyramid. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h index 3c22639e3b2..dbb0944a330 100644 --- a/src/m/sequent-ptx.h +++ b/src/m/sequent-ptx.h @@ -1,6 +1,6 @@ /* machine description file for SEQUENT machines running DYNIX/ptx Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent.h b/src/m/sequent.h index f082880b4fc..e970275901c 100644 --- a/src/m/sequent.h +++ b/src/m/sequent.h @@ -1,6 +1,6 @@ /* machine description file for SEQUENT BALANCE machines Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sparc.h b/src/m/sparc.h index 20ec53c1344..c9ef035653b 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -1,5 +1,6 @@ /* machine description file for Sun 4 SPARC. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sps7.h b/src/m/sps7.h index 422d2470aaa..52edc570f92 100644 --- a/src/m/sps7.h +++ b/src/m/sps7.h @@ -1,6 +1,6 @@ /* machine description file for Bull SPS-7. Copyright (C) 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sr2k.h b/src/m/sr2k.h index 875f428dc1f..14a90c666f4 100644 --- a/src/m/sr2k.h +++ b/src/m/sr2k.h @@ -1,5 +1,6 @@ /* machine description file for Hitachi SR2001/SR2201 machines. - Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/stride.h b/src/m/stride.h index ff900d49b38..6f05b17d96e 100644 --- a/src/m/stride.h +++ b/src/m/stride.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun1.h b/src/m/sun1.h index 810bad7fd58..5ded70a9e47 100644 --- a/src/m/sun1.h +++ b/src/m/sun1.h @@ -1,6 +1,6 @@ /* machine description file for Sun 68000's Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun2.h b/src/m/sun2.h index 9df032049e3..1afa4a2fa63 100644 --- a/src/m/sun2.h +++ b/src/m/sun2.h @@ -2,7 +2,7 @@ Note that "sun2.h" refers to the operating system version, not the CPU model number. See the MACHINES file for details. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun386.h b/src/m/sun386.h index 5970f90b98b..435c1ded6d2 100644 --- a/src/m/sun386.h +++ b/src/m/sun386.h @@ -1,8 +1,9 @@ /* machine description file for Sun's 386-based RoadRunner. This file borrows heavily from - "sun2.h", but since that file is heavily cpu-specific, it was easier - not to include it. + "sun2.h", but since that file is heavily cpu-specific, it was easier + not to include it. - Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/symmetry.h b/src/m/symmetry.h index 4954f596442..91209d0eb67 100644 --- a/src/m/symmetry.h +++ b/src/m/symmetry.h @@ -1,6 +1,6 @@ /* machine description file for SEQUENT SYMMETRY machines Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tad68k.h b/src/m/tad68k.h index b8b3859f407..fce223da826 100644 --- a/src/m/tad68k.h +++ b/src/m/tad68k.h @@ -1,5 +1,6 @@ /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tahoe.h b/src/m/tahoe.h index 47db3f93deb..07ec23c7bb6 100644 --- a/src/m/tahoe.h +++ b/src/m/tahoe.h @@ -1,5 +1,6 @@ /* machine description file for tahoe. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/targon31.h b/src/m/targon31.h index 5ac18648387..7100e0e8705 100644 --- a/src/m/targon31.h +++ b/src/m/targon31.h @@ -1,6 +1,6 @@ /* targon31 machine description file Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tek4300.h b/src/m/tek4300.h index a84135291cb..3ff3ca4a6a0 100644 --- a/src/m/tek4300.h +++ b/src/m/tek4300.h @@ -1,5 +1,6 @@ /* machine description file for tek4300. - Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h index 4db981a8096..24c10330363 100644 --- a/src/m/tekxd88.h +++ b/src/m/tekxd88.h @@ -1,7 +1,8 @@ /* Configuration file for the Tektronix XD88 running UTekV 3.2e, contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 1/15/93. You probably need to use gnu make (version 3.63 or higher.) - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/template.h b/src/m/template.h index c7ce2c2cb1f..2b39964018a 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -1,6 +1,6 @@ /* machine description file template. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32.h b/src/m/tower32.h index cd4ab96de11..06ed7efe5d7 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -1,5 +1,6 @@ /* machine description file for the NCR Tower 32 running System V.2. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h index 2c1e55c0023..8f5c60cd7c8 100644 --- a/src/m/tower32v3.h +++ b/src/m/tower32v3.h @@ -1,5 +1,6 @@ /* machine description file for the NCR Tower 32 running System V.3. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ustation.h b/src/m/ustation.h index c62d37d6429..0a70df92233 100644 --- a/src/m/ustation.h +++ b/src/m/ustation.h @@ -1,6 +1,6 @@ /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30). Copyright (C) 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/vax.h b/src/m/vax.h index d414d6b57e7..9332b8f494d 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -1,6 +1,6 @@ /* machine description file for vax. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/wicat.h b/src/m/wicat.h index 78842f32a43..24bb2acd210 100644 --- a/src/m/wicat.h +++ b/src/m/wicat.h @@ -1,5 +1,6 @@ /* machine description file for WICAT machines. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index cf48ca8aa88..4351f14144f 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -1,7 +1,7 @@ /* Machine description file for Windows NT. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/xps100.h b/src/m/xps100.h index 3a851aa9ebd..a9ac9bc5e36 100644 --- a/src/m/xps100.h +++ b/src/m/xps100.h @@ -2,7 +2,7 @@ Mark J. Hewitt (mjh@uk.co.kernel) Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mac.c b/src/mac.c index 5a56bd57817..a71194f9aee 100644 --- a/src/mac.c +++ b/src/mac.c @@ -1,6 +1,6 @@ /* Unix emulation routines for GNU Emacs on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfns.c b/src/macfns.c index 110b697ce5e..b6ef85bcd9f 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1,6 +1,6 @@ /* Graphical user interface functions for Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1448,7 +1448,8 @@ x_set_mouse_color (f, arg, oldval) BLOCK_INPUT; - rif->define_frame_cursor (f, cursor); + if (FRAME_MAC_WINDOW (f) != 0) + rif->define_frame_cursor (f, cursor); f->output_data.mac->text_cursor = cursor; f->output_data.mac->nontext_cursor = nontext_cursor; @@ -2398,11 +2399,12 @@ This function is an internal primitive--use `make-frame' instead. */) struct mac_display_info *dpyinfo = NULL; Lisp_Object parent; struct kboard *kb; - char x_frame_name[10]; static int x_frame_count = 2; /* begins at 2 because terminal frame is F1 */ check_mac (); + parms = Fcopy_alist (parms); + /* Use this general default value to start with until we know if this frame has a specified name. */ Vx_resource_name = Vinvocation_name; @@ -2452,18 +2454,6 @@ This function is an internal primitive--use `make-frame' instead. */) else f = make_frame (1); - if (EQ (name, Qunbound) || NILP (name)) - { - sprintf (x_frame_name, "F%d", x_frame_count++); - f->name = build_string (x_frame_name); - f->explicit_name = 0; - } - else - { - f->name = name; - f->explicit_name = 1; - } - XSETFRAME (frame, f); /* Note that X Windows does support scroll bars. */ @@ -2544,7 +2534,7 @@ This function is an internal primitive--use `make-frame' instead. */) font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */ if (! STRINGP (font)) - font = x_new_fontset (f, "fontset-mac"); + font = x_new_fontset (f, "fontset-standard"); if (! STRINGP (font)) font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); if (! STRINGP (font)) @@ -2679,17 +2669,28 @@ This function is an internal primitive--use `make-frame' instead. */) if (EQ (visibility, Qunbound)) visibility = Qt; -#if 0 /* MAC_TODO: really no iconify on Mac */ if (EQ (visibility, Qicon)) x_iconify_frame (f); - else -#endif - if (! NILP (visibility)) + else if (! NILP (visibility)) x_make_frame_visible (f); else /* Must have been Qnil. */ ; } + + /* Initialize `default-minibuffer-frame' in case this is the first + frame on this display device. */ + if (FRAME_HAS_MINIBUF_P (f) + && (!FRAMEP (kb->Vdefault_minibuffer_frame) + || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) + kb->Vdefault_minibuffer_frame = frame; + + /* All remaining specified parameters, which have not been "used" + by x_get_arg and friends, now go in the misc. alist of the frame. */ + for (tem = parms; !NILP (tem); tem = XCDR (tem)) + if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) + f->param_alist = Fcons (XCAR (tem), f->param_alist); + UNGCPRO; /* Make sure windows on this frame appear in calls to next-window @@ -2699,9 +2700,11 @@ This function is an internal primitive--use `make-frame' instead. */) return unbind_to (count, frame); } + /* FRAME is used only to get a handle on the X display. We don't pass the display info directly because we're called from frame.c, which doesn't know about that structure. */ + Lisp_Object x_get_focus_frame (frame) struct frame *frame; @@ -2714,6 +2717,39 @@ x_get_focus_frame (frame) XSETFRAME (xfocus, dpyinfo->x_focus_frame); return xfocus; } + + +DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0, + doc: /* Set the input focus to FRAME. +FRAME nil means use the selected frame. */) + (frame) + Lisp_Object frame; +{ + struct frame *f = check_x_frame (frame); + struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f); + + if (dpyinfo->x_focus_frame != f) + { + BLOCK_INPUT; +#ifdef MAC_OSX + ActivateWindow (ActiveNonFloatingWindow (), false); + ActivateWindow (FRAME_MAC_WINDOW (f), true); +#else +#if !TARGET_API_MAC_CARBON + /* SelectWindow (Non-Carbon) does not issue deactivate events if + the possibly inactive window that is to be selected is + already the frontmost one. */ + SendBehind (FRAME_MAC_WINDOW (f), NULL); +#endif + /* This brings the window to the front. */ + SelectWindow (FRAME_MAC_WINDOW (f)); +#endif + UNBLOCK_INPUT; + } + + return Qnil; +} + DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, doc: /* Internal function called by `color-defined-p', which see. */) @@ -3664,7 +3700,7 @@ x_create_tip_frame (dpyinfo, parms, text) font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */ if (! STRINGP (font)) - font = x_new_fontset (f, "fontset-mac"); + font = x_new_fontset (f, "fontset-standard"); if (! STRINGP (font)) font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); if (! STRINGP (font)) @@ -4513,6 +4549,7 @@ Chinese, Japanese, and Korean. */); defsubr (&Sx_close_connection); defsubr (&Sx_display_list); defsubr (&Sx_synchronize); + defsubr (&Sx_focus_frame); /* Setting callback functions for fontset handler. */ get_font_info_func = x_get_font_info; diff --git a/src/macgui.h b/src/macgui.h index 74c64bfb41d..cfe35e82945 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macmenu.c b/src/macmenu.c index 1b132407df7..91cf28f7456 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -1,6 +1,6 @@ /* Menu support for GNU Emacs on Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.c b/src/macros.c index 8167e274dab..ef3ff8c0523 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,6 +1,6 @@ /* Keyboard macros. Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.h b/src/macros.h index 7acd46dc2ed..bdd510456b0 100644 --- a/src/macros.h +++ b/src/macros.h @@ -1,5 +1,6 @@ /* Definitions for keyboard macro interpretation in GNU Emacs. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.c b/src/macterm.c index 218b1652df2..a0c4f298e66 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1026,12 +1026,15 @@ static int cg_text_anti_aliasing_threshold = 8; static void init_cg_text_anti_aliasing_threshold () { - Lisp_Object val = - Fmac_get_preference (build_string ("AppleAntiAliasingThreshold"), - Qnil, Qnil, Qnil); + int threshold; + Boolean valid_p; - if (INTEGERP (val)) - cg_text_anti_aliasing_threshold = XINT (val); + threshold = + CFPreferencesGetAppIntegerValue (CFSTR ("AppleAntiAliasingThreshold"), + kCFPreferencesCurrentApplication, + &valid_p); + if (valid_p) + cg_text_anti_aliasing_threshold = threshold; } static int @@ -5299,7 +5302,10 @@ mac_define_frame_cursor (f, cursor) struct frame *f; Cursor cursor; { - SetThemeCursor (cursor); + struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f); + + if (dpyinfo->x_focus_frame == f) + SetThemeCursor (cursor); } @@ -5837,7 +5843,7 @@ x_raise_frame (f) if (f->async_visible) { BLOCK_INPUT; - SelectWindow (FRAME_MAC_WINDOW (f)); + BringToFront (FRAME_MAC_WINDOW (f)); UNBLOCK_INPUT; } } @@ -5851,7 +5857,7 @@ x_lower_frame (f) if (f->async_visible) { BLOCK_INPUT; - SendBehind (FRAME_MAC_WINDOW (f), nil); + SendBehind (FRAME_MAC_WINDOW (f), NULL); UNBLOCK_INPUT; } } @@ -5964,7 +5970,6 @@ x_make_frame_visible (f) f->output_data.mac->asked_for_visible = 1; - SelectWindow (FRAME_MAC_WINDOW (f)); CollapseWindow (FRAME_MAC_WINDOW (f), false); ShowWindow (FRAME_MAC_WINDOW (f)); } @@ -9581,6 +9586,8 @@ XTread_socket (sd, expected, hold_quit) /* So people can tell when we have read the available input. */ input_signal_count++; + ++handling_signal; + #if USE_CARBON_EVENTS toolbox_dispatcher = GetEventDispatcherTarget (); @@ -10221,6 +10228,7 @@ XTread_socket (sd, expected, hold_quit) } #endif + --handling_signal; UNBLOCK_INPUT; return count; } diff --git a/src/macterm.h b/src/macterm.h index 2f2ae26b3b3..107814ddb3f 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -1,6 +1,6 @@ /* Display module for Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -206,9 +206,6 @@ extern struct mac_display_info one_mac_display_info; FONT-LIST-CACHE records previous values returned by x-list-fonts. */ extern Lisp_Object x_display_name_list; -/* A flag to control how to display unibyte 8-bit character. */ -extern int unibyte_display_via_language_environment; - extern struct x_display_info *x_display_info_for_display P_ ((Display *)); extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 76ad4624712..a94938a0b80 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/marker.c b/src/marker.c index 36a048537f7..79a7d702bdf 100644 --- a/src/marker.c +++ b/src/marker.c @@ -1,6 +1,6 @@ /* Markers: examining, setting and deleting. Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/md5.c b/src/md5.c index 4f055447eac..d3c25b04d3e 100644 --- a/src/md5.c +++ b/src/md5.c @@ -1,7 +1,7 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU Emacs. The GNU C Library is free software; you can redistribute it and/or diff --git a/src/md5.h b/src/md5.h index adcc6bf48f6..09bf02ff753 100644 --- a/src/md5.h +++ b/src/md5.h @@ -1,7 +1,7 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. The GNU C Library is free software; you can redistribute it and/or diff --git a/src/mem-limits.h b/src/mem-limits.h index d7ac6a3e366..292293b2f98 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -1,6 +1,6 @@ /* Includes for memory limit warnings. Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/minibuf.c b/src/minibuf.c index b9bbaf5b186..300e2e2ccb5 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1,6 +1,7 @@ /* Minibuffer input and completion. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mktime.c b/src/mktime.c index 025f54d95c2..a85ebeb3783 100644 --- a/src/mktime.c +++ b/src/mktime.c @@ -1,6 +1,6 @@ /* Convert a `struct tm' to a time_t value. Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Contributed by Paul Eggert (eggert@twinsun.com). NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/src/msdos.c b/src/msdos.c index 4ea4ab0cf1d..9ac34e008c4 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities. -*- coding: raw-text -*- Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/msdos.h b/src/msdos.h index b6c6aca1493..8bfbcf2d10c 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities, interface. Copyright (C) 1993, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/prefix-args.c b/src/prefix-args.c index c2f6303786f..1f2632c6913 100644 --- a/src/prefix-args.c +++ b/src/prefix-args.c @@ -1,5 +1,6 @@ /* prefix-args.c - echo each argument, prefixed by a string. - Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1992, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/print.c b/src/print.c index e8fcd2b6a45..28e9e86177e 100644 --- a/src/print.c +++ b/src/print.c @@ -1,7 +1,7 @@ /* Lisp object printing and output streams. Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.c b/src/process.c index 4046fae40fd..c58beaea45a 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* Asynchronous subprocess control for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.h b/src/process.h index cadc9b7031c..9625556888c 100644 --- a/src/process.h +++ b/src/process.h @@ -1,6 +1,6 @@ /* Definitions for asynchronous process control in GNU Emacs. Copyright (C) 1985, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/puresize.h b/src/puresize.h index a8a07f052f1..18f0a794269 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -1,5 +1,6 @@ /* How much read-only Lisp storage a dumped Emacs needs. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ralloc.c b/src/ralloc.c index 35a8cb9c58a..fea9ea5d0a8 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,6 +1,6 @@ /* Block-relocating memory allocator. Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/regex.h b/src/regex.h index da0ab3e78d1..c850c640b36 100644 --- a/src/regex.h +++ b/src/regex.h @@ -2,7 +2,7 @@ expression library, version 0.12. Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/region-cache.c b/src/region-cache.c index d49278eb886..cedb0017da0 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -1,6 +1,6 @@ /* Caching facts about regions of the buffer, for optimization. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/region-cache.h b/src/region-cache.h index 51d2ceb1e62..40e68084cce 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -1,6 +1,6 @@ /* Header file: Caching facts about regions of the buffer, for optimization. Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h index eedfe3d15be..f77a209f0d2 100644 --- a/src/s/aix3-1.h +++ b/src/s/aix3-1.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on IBM AIX version 3.1 Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h index f36bc016ca8..3e6a44f1fab 100644 --- a/src/s/bsd4-1.h +++ b/src/s/bsd4-1.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.1. Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h index f4e60b0fdbd..ace519c0d74 100644 --- a/src/s/bsd4-2.h +++ b/src/s/bsd4-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.2 Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h index 37d6a63e984..483effe71c1 100644 --- a/src/s/bsd4-3.h +++ b/src/s/bsd4-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.3 Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cxux.h b/src/s/cxux.h index 118d93d579c..3c4ffcd24a2 100644 --- a/src/s/cxux.h +++ b/src/s/cxux.h @@ -1,5 +1,6 @@ /* Header file for Harris CXUX. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 921cff35bc7..749d1a38e3e 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -2,7 +2,7 @@ This file describes the parameters that system description files should define or not. Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/darwin.h b/src/s/darwin.h index 6227010e3ed..91975cd441b 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -1,5 +1,6 @@ /* System description header file for Darwin (Mac OS X). - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux.h b/src/s/dgux.h index 82956a900d9..d48d95709c8 100644 --- a/src/s/dgux.h +++ b/src/s/dgux.h @@ -1,7 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 4.32 upto and including 5.4.1. Copyright (C) 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux4.h b/src/s/dgux4.h index 35834ad4da2..ee24cd65b50 100644 --- a/src/s/dgux4.h +++ b/src/s/dgux4.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX Release 4.10 and above. - Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h index 7ec88a435eb..d0f6d4f43e8 100644 --- a/src/s/dgux5-4-3.h +++ b/src/s/dgux5-4-3.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 5.4 Release 3.00 and above. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h index 3f059c32c24..be0ba73b4e0 100644 --- a/src/s/dgux5-4r2.h +++ b/src/s/dgux5-4r2.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX 5.4 Release 2.xx systems. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 83949fd2819..78f314700b3 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -2,7 +2,7 @@ This file describes the parameters that system description files should define or not. Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index f87dcaded1b..4ef3db9f2ea 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -1,6 +1,6 @@ /* This file is the configuration file for Linux-based GNU systems Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu.h b/src/s/gnu.h index 0da816c32d3..71f1dd34a5e 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on the GNU Hurd. Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/hpux.h b/src/s/hpux.h index 30ade71bf20..b8f9c62a893 100644 --- a/src/s/hpux.h +++ b/src/s/hpux.h @@ -1,7 +1,7 @@ /* Definitions file for GNU Emacs running on HPUX release 7.0. Based on AT&T System V.2. Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h index a3b6c8ad0ad..6b0009c1c38 100644 --- a/src/s/iris3-5.h +++ b/src/s/iris3-5.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics 3.5 Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h index 1d8b96cc23f..d0c68bd89cb 100644 --- a/src/s/iris3-6.h +++ b/src/s/iris3-6.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6. Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h index a613779913a..a65242179a9 100644 --- a/src/s/irix3-3.h +++ b/src/s/irix3-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3. Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/lynxos.h b/src/s/lynxos.h index 614735d290d..b822bad3691 100644 --- a/src/s/lynxos.h +++ b/src/s/lynxos.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on LynxOS-3.0.1 Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index b1989318fba..5c6d1d07c20 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -1,6 +1,6 @@ /* System description file for Windows NT. Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/msdos.h b/src/s/msdos.h index 9469b33227f..966384ee352 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -1,7 +1,7 @@ /* System description file for MS-DOS Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/newsos5.h b/src/s/newsos5.h index d2bed2189be..0b441d74e24 100644 --- a/src/s/newsos5.h +++ b/src/s/newsos5.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2 Copyright (C) 1992, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/nextstep.h b/src/s/nextstep.h index 0c0b01c10bd..8ea45e16e6e 100644 --- a/src/s/nextstep.h +++ b/src/s/nextstep.h @@ -1,6 +1,6 @@ /* Configuration file for the NeXTstep system. Copyright (C) 1990, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ptx.h b/src/s/ptx.h index 1411dee70d8..319bbc049f2 100644 --- a/src/s/ptx.h +++ b/src/s/ptx.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h index aee5d6ddc58..d6281d256b6 100644 --- a/src/s/riscix1-1.h +++ b/src/s/riscix1-1.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3) - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix12.h b/src/s/riscix12.h index 625b667d7b5..a4811877070 100644 --- a/src/s/riscix12.h +++ b/src/s/riscix12.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3) - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/rtu.h b/src/s/rtu.h index b2d0c16e59a..2a9df14a14c 100644 --- a/src/s/rtu.h +++ b/src/s/rtu.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe. Copyright (C) 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco4.h b/src/s/sco4.h index 627007e9a52..0eda0a3f728 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h @@ -1,6 +1,6 @@ /* System description file for SCO 3.2v4. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco5.h b/src/s/sco5.h index 9fbbf072a12..06166f32fd9 100644 --- a/src/s/sco5.h +++ b/src/s/sco5.h @@ -1,5 +1,5 @@ /* System description file for SCO 3.2v5. - Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/template.h b/src/s/template.h index 0610e16473a..94b3787811f 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -2,7 +2,7 @@ This file describes the parameters that system description files should define or not. Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/umax.h b/src/s/umax.h index f4923f33053..ae3b98cfcad 100644 --- a/src/s/umax.h +++ b/src/s/umax.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on UMAX 4.2 Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h index cca703adb82..096096f9f7a 100644 --- a/src/s/unipl5-2.h +++ b/src/s/unipl5-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h index 5f9943f8477..94389290726 100644 --- a/src/s/usg5-0.h +++ b/src/s/usg5-0.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V.0 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h index b090f3c32b6..a60a985856d 100644 --- a/src/s/usg5-2-2.h +++ b/src/s/usg5-2-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h index e63bddfc060..7f1fcb92ec5 100644 --- a/src/s/usg5-2.h +++ b/src/s/usg5-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h index 12259936928..56a448e9dba 100644 --- a/src/s/usg5-3.h +++ b/src/s/usg5-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 3 Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index b8c2f8d9fa2..5e202e3edad 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 4 Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/vms.h b/src/s/vms.h index e3c9dc725c0..51f3ca1a531 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -1,5 +1,6 @@ /* system description header for VMS - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/xenix.h b/src/s/xenix.h index e67b897faff..09a7b61fcd1 100644 --- a/src/s/xenix.h +++ b/src/s/xenix.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2 Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/scroll.c b/src/scroll.c index 04db528cc64..9b04f47c16b 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,6 +1,6 @@ /* Calculate what line insertion or deletion to do, and do it, Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/search.c b/src/search.c index e12bf69d2a1..04b58c78d3f 100644 --- a/src/search.c +++ b/src/search.c @@ -1,6 +1,6 @@ /* String search routines for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sheap.c b/src/sheap.c index cc740173a24..192af4030c6 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -1,7 +1,7 @@ /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin; complete rewrite of xemacs Cygwin `unexec' code - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sound.c b/src/sound.c index 1e6a17d0275..c1d5c40e9bb 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,6 +1,6 @@ /* sound.c -- sound support. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/strftime.c b/src/strftime.c index 88a54b7bee4..f46b40f232a 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -1,5 +1,5 @@ /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. diff --git a/src/sunfns.c b/src/sunfns.c index 8de639b7480..1c04f1108a8 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -1,6 +1,6 @@ /* Functions for Sun Windows menus and selection buffer. Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is probably totally obsolete. In any case, the FSF is unwilling to support it. We agreed to include it in our distribution diff --git a/src/syntax.c b/src/syntax.c index 251cc553cdf..3f668eac946 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,6 +1,6 @@ /* GNU Emacs routines to deal with syntax tables; also word and list parsing. Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syntax.h b/src/syntax.h index c29e26c20b5..92d55967b33 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -1,6 +1,6 @@ /* Declarations having to do with GNU Emacs syntax tables. Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysdep.c b/src/sysdep.c index 25db4c73080..6e09748bca9 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1,6 +1,6 @@ /* Interfaces to system-dependent kernel and library entries. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysselect.h b/src/sysselect.h index d57527f9ed1..ba204dafe3f 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,6 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syssignal.h b/src/syssignal.h index 3cb28220962..ac77759d258 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,6 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. Copyright (C) 1993, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systime.h b/src/systime.h index 9851db4cf33..00373b257b3 100644 --- a/src/systime.h +++ b/src/systime.h @@ -1,6 +1,6 @@ /* systime.h - System-dependent definitions for time manipulations. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systty.h b/src/systty.h index af9f5e3aa88..6d6a6f01ea9 100644 --- a/src/systty.h +++ b/src/systty.h @@ -1,6 +1,6 @@ /* systty.h - System-dependent definitions for terminals. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syswait.h b/src/syswait.h index 37d59d68ac5..bb4937f353e 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -1,6 +1,6 @@ /* Define wait system call interface for Emacs. Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/term.c b/src/term.c index 899739de6ae..b1183ed9e2a 100644 --- a/src/term.c +++ b/src/term.c @@ -1,6 +1,6 @@ /* Terminal control module for terminals described by TERMCAP Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1328,10 +1328,10 @@ static void produce_stretch_glyph P_ ((struct it *)); /* Append glyphs to IT's glyph_row. Called from produce_glyphs for - terminal frames if IT->glyph_row != NULL. IT->c is the character - for which to produce glyphs; IT->face_id contains the character's - face. Padding glyphs are appended if IT->c has a IT->pixel_width > - 1. */ + terminal frames if IT->glyph_row != NULL. IT->char_to_display is + the character for which to produce glyphs; IT->face_id contains the + character's face. Padding glyphs are appended if IT->c has a + IT->pixel_width > 1. */ static void append_glyph (it) @@ -1351,7 +1351,7 @@ append_glyph (it) { glyph->type = CHAR_GLYPH; glyph->pixel_width = 1; - glyph->u.ch = it->c; + glyph->u.ch = it->char_to_display; glyph->face_id = it->face_id; glyph->padding_p = i > 0; glyph->charpos = CHARPOS (it->position); @@ -1402,6 +1402,9 @@ produce_glyphs (it) xassert (it->what == IT_CHARACTER || it->what == IT_COMPOSITION); + /* Maybe translate single-byte characters to multibyte. */ + it->char_to_display = it->c; + if (it->c >= 040 && it->c < 0177) { it->pixel_width = it->nglyphs = 1; @@ -1431,13 +1434,11 @@ produce_glyphs (it) { int n = nspaces; - it->c = ' '; + it->char_to_display = ' '; it->pixel_width = it->len = 1; while (n--) append_glyph (it); - - it->c = '\t'; } it->pixel_width = nspaces; @@ -1445,14 +1446,30 @@ produce_glyphs (it) } else if (SINGLE_BYTE_CHAR_P (it->c)) { - /* Coming here means that it->c is from display table, thus we - must send the code as is to the terminal. Although there's - no way to know how many columns it occupies on a screen, it - is a good assumption that a single byte code has 1-column - width. */ - it->pixel_width = it->nglyphs = 1; - if (it->glyph_row) - append_glyph (it); + if (unibyte_display_via_language_environment + && (it->c >= 0240 + || !NILP (Vnonascii_translation_table))) + { + int charset; + + it->char_to_display = unibyte_char_to_multibyte (it->c); + charset = CHAR_CHARSET (it->char_to_display); + it->pixel_width = CHARSET_WIDTH (charset); + it->nglyphs = it->pixel_width; + if (it->glyph_row) + append_glyph (it); + } + else + { + /* Coming here means that it->c is from display table, thus we + must send the code as is to the terminal. Although there's + no way to know how many columns it occupies on a screen, it + is a good assumption that a single byte code has 1-column + width. */ + it->pixel_width = it->nglyphs = 1; + if (it->glyph_row) + append_glyph (it); + } } else { @@ -1537,17 +1554,15 @@ produce_stretch_glyph (it) Lisp_Object o_object = it->object; Lisp_Object object = it->stack[it->sp - 1].string; int n = width; - int c = it->c; if (!STRINGP (object)) object = it->w->buffer; it->object = object; - it->c = ' '; + it->char_to_display = ' '; it->pixel_width = it->len = 1; while (n--) append_glyph (it); it->object = o_object; - it->c = c; } it->pixel_width = width; it->nglyphs = width; diff --git a/src/termcap.c b/src/termcap.c index 2f6f324eada..dee5465ebf9 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -1,6 +1,6 @@ /* Work-alike for termcap, plus extra features. Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/termchar.h b/src/termchar.h index 9e9819b97ce..c0d9895462e 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -1,6 +1,6 @@ /* Flags and parameters describing terminal's characteristics. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termhooks.h b/src/termhooks.h index 7045d6ee1e3..13b41f95f70 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -1,6 +1,6 @@ /* Parameters and display hooks for terminal devices. Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/terminfo.c b/src/terminfo.c index 5c0aa1ccf05..7fccfaf1700 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -1,6 +1,6 @@ /* Interface from Emacs to terminfo. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termopts.h b/src/termopts.h index 2e5da3c9948..8d776b3de38 100644 --- a/src/termopts.h +++ b/src/termopts.h @@ -1,6 +1,6 @@ /* Flags and parameters describing user options for handling the terminal. Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/textprop.c b/src/textprop.c index 029f2f41031..65823d9fa3f 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1,6 +1,6 @@ /* Interface code for dealing with text properties. Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/tparam.c b/src/tparam.c index e593589d5cb..ea04f7eaea1 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -1,6 +1,6 @@ /* Merge parameters into a termcap entry string. Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/uaf.h b/src/uaf.h index 7863c41227e..05a8651b6c2 100644 --- a/src/uaf.h +++ b/src/uaf.h @@ -1,5 +1,6 @@ /* GNU Emacs VMS UAF definition file. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/undo.c b/src/undo.c index bf774affac5..3313c8e306c 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1,6 +1,6 @@ /* undo handling for GNU Emacs. Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexaix.c b/src/unexaix.c index 071f09898ed..4785aa1dcb3 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -1,6 +1,6 @@ /* Dump an executable image. Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexalpha.c b/src/unexalpha.c index 069c39b398b..ead259437f6 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -1,7 +1,7 @@ /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). Copyright (C) 1994, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexapollo.c b/src/unexapollo.c index f1481d684a3..ace28dfa38d 100644 --- a/src/unexapollo.c +++ b/src/unexapollo.c @@ -1,6 +1,6 @@ /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x Copyright (C) 1988, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexconvex.c b/src/unexconvex.c index 6f05e4ae938..8409463b783 100644 --- a/src/unexconvex.c +++ b/src/unexconvex.c @@ -8,7 +8,7 @@ break it. Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexcw.c b/src/unexcw.c index cfd87781a16..aee4f58896c 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -1,7 +1,7 @@ /* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexec.c b/src/unexec.c index ebf813306da..7fe7e26568c 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -1,5 +1,5 @@ /* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexelf.c b/src/unexelf.c index c53974be9f2..30a35372544 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1,5 +1,5 @@ /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexenix.c b/src/unexenix.c index 159c0b2f6d8..c1ad8bbf7eb 100644 --- a/src/unexenix.c +++ b/src/unexenix.c @@ -7,7 +7,7 @@ maintenance might break it. Copyright (C) 1988, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 43e1f5e805c..db77a83cee2 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,5 +1,6 @@ /* Dump Emacs in Mach-O format for use on Mac OS X. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmips.c b/src/unexmips.c index 212f7ed5926..86129e052cf 100644 --- a/src/unexmips.c +++ b/src/unexmips.c @@ -7,7 +7,7 @@ maintenance might break it. Copyright (C) 1988, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexnext.c b/src/unexnext.c index b374dd8e9b8..b453da3b023 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -1,6 +1,6 @@ /* Dump Emacs in macho format. Copyright (C) 1990, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. Written by Bradley Taylor (btaylor@next.com). This file is part of GNU Emacs. diff --git a/src/unexsni.c b/src/unexsni.c index d6b3ae68969..8d72acf1a18 100644 --- a/src/unexsni.c +++ b/src/unexsni.c @@ -1,6 +1,6 @@ /* Unexec for Siemens machines running Sinix (modified SVR4). Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexsunos4.c b/src/unexsunos4.c index 5e221050f36..19d982f6140 100644 --- a/src/unexsunos4.c +++ b/src/unexsunos4.c @@ -1,6 +1,6 @@ /* Unexec for Sunos 4 using shared libraries. Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexw32.c b/src/unexw32.c index bc462c18a10..6256062aa3f 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -1,5 +1,6 @@ /* unexec for GNU Emacs on Windows NT. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/vm-limit.c b/src/vm-limit.c index 0c12dec9b04..fb127b27b74 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -1,6 +1,6 @@ /* Functions for memory limit warnings. Copyright (C) 1990, 1992, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w16select.c b/src/w16select.c index b0c30eb58d8..cd3098bae52 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -1,6 +1,6 @@ /* 16-bit Windows Selection processing for emacs on MS-Windows Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.c b/src/w32.c index 9860a6cc353..799a3f6ad9b 100644 --- a/src/w32.c +++ b/src/w32.c @@ -1,6 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API. Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.h b/src/w32.h index 2981e5bb979..ecc986269fb 100644 --- a/src/w32.h +++ b/src/w32.h @@ -2,7 +2,8 @@ #define EMACS_W32_H /* Support routines for the NT version of Emacs. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.c b/src/w32bdf.c index 10780f2f0c9..89d88574188 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -1,5 +1,6 @@ /* Implementation of BDF font handling on the Microsoft W32 API. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.h b/src/w32bdf.h index 9d3d306d56f..dd8cfa276bf 100644 --- a/src/w32bdf.h +++ b/src/w32bdf.h @@ -1,5 +1,6 @@ /* Definitions and header for handling BDF fonts on the Microsoft W32 API. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32console.c b/src/w32console.c index a81591fb96f..dbadee3b10d 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -1,6 +1,6 @@ /* Terminal hooks for GNU Emacs on the Microsoft W32 API. Copyright (C) 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32fns.c b/src/w32fns.c index b82814bca72..34450fd5219 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1,6 +1,6 @@ /* Graphical user interface functions for the Microsoft W32 API. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32gui.h b/src/w32gui.h index 644adcea924..2b1a11987f3 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Microsoft W32 API. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.c b/src/w32heap.c index a0c50da5506..f1fa196abe7 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -1,5 +1,6 @@ /* Heap management routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.h b/src/w32heap.h index 1b3b815b115..c862558b1cf 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -1,5 +1,6 @@ /* Heap management routines (including unexec) for GNU Emacs on Windows NT. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.c b/src/w32inevt.c index ffa2cd0989a..0fededa6aea 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -1,6 +1,6 @@ /* Input event support for Emacs on the Microsoft W32 API. Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.h b/src/w32inevt.h index e0a9428720f..8985df1ee69 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -1,5 +1,6 @@ /* Input routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32menu.c b/src/w32menu.c index dfd885eee08..57db01ac9e9 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1,6 +1,6 @@ /* Menu support for GNU Emacs on the Microsoft W32 API. Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32proc.c b/src/w32proc.c index 628a763c675..a9e0e0cb83f 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1,6 +1,6 @@ /* Process support for GNU Emacs on the Microsoft W32 API. Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32reg.c b/src/w32reg.c index 40d84df3d14..cd2a3bdf755 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -1,6 +1,6 @@ /* Emulate the X Resource Manager through the registry. Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32select.c b/src/w32select.c index 3556c62a35f..99825c23911 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1,6 +1,6 @@ /* Selection processing for Emacs on the Microsoft W32 API. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.c b/src/w32term.c index 79f6ae5206b..0017d2a5c86 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Microsoft W32 API. Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.h b/src/w32term.h index 34932c44d3b..f587d74a485 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication on the Microsoft W32 API. Copyright (C) 1995, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -248,9 +248,6 @@ extern Lisp_Object w32_display_name_list; /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ extern Lisp_Object Vx_pixel_size_width_font_regexp; -/* A flag to control how to display unibyte 8-bit character. */ -extern int unibyte_display_via_language_environment; - struct w32_display_info *x_display_info_for_name (); Lisp_Object display_x_get_resource P_ ((struct w32_display_info *, diff --git a/src/w32xfns.c b/src/w32xfns.c index 46a71b942c7..0e937e9950c 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -1,6 +1,6 @@ /* Functions taken directly from X sources for use with the Microsoft W32 API. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.c b/src/widget.c index 0386890d93b..35bf5631b20 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,6 +1,6 @@ /* The emacs frame widget. Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.h b/src/widget.h index 00d743234c0..b6c5e9f0bcb 100644 --- a/src/widget.h +++ b/src/widget.h @@ -1,5 +1,6 @@ /* The emacs frame widget public header file. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widgetprv.h b/src/widgetprv.h index 2027b4f602d..bde384d3b5f 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -1,5 +1,6 @@ /* The emacs frame widget private header file. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.c b/src/window.c index 25656307648..58ab3ee14a0 100644 --- a/src/window.c +++ b/src/window.c @@ -1,7 +1,7 @@ /* Window creation, deletion and examination for GNU Emacs. Does not include redisplay. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -4286,6 +4286,14 @@ adjust_window_trailing_edge (window, delta, horiz_flag) { if (!NILP (XWINDOW (window)->next)) { + /* This may happen for the minibuffer. In that case + the window_deletion_count check below does not work. */ + if (XINT (CURSIZE (p->next)) - delta <= 0) + { + Fset_window_configuration (old_config); + error ("Cannot adjust window size as specified"); + } + XSETINT (CURBEG (p->next), XINT (CURBEG (p->next)) + delta); size_window (p->next, XINT (CURSIZE (p->next)) - delta, diff --git a/src/xfaces.c b/src/xfaces.c index 7c9230f1140..27edd1a45dc 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1,6 +1,6 @@ /* xfaces.c -- "Face" primitives. Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfns.c b/src/xfns.c index e478bde7984..b8f128b6cdc 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1,6 +1,6 @@ /* Functions for the X window system. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xmenu.c b/src/xmenu.c index 70c07702cae..ddb93aa8c77 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xrdb.c b/src/xrdb.c index 0a138687d7b..2b7888ebe84 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -1,6 +1,6 @@ /* Deal with the X Resource Manager. Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xselect.c b/src/xselect.c index 062336bc050..71232ee87ba 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1,6 +1,6 @@ /* X Selection processing for Emacs. Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsmfns.c b/src/xsmfns.c index 008b50fc489..974b3a1c6ad 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -1,6 +1,6 @@ /* Session management module for systems which understand the X Session management protocol. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.c b/src/xterm.c index a71ffd75e70..27abaebdb83 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6508,6 +6508,12 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) so update things that depend on mouse position. */ if (f && !f->output_data.x->hourglass_p) note_mouse_movement (f, &event.xmotion); +#ifdef USE_GTK + /* We may get an EnterNotify on the buttons in the toolbar. In that + case we moved out of any highlighted area and need to note this. */ + if (!f && last_mouse_glyph_frame) + note_mouse_movement (last_mouse_glyph_frame, &event); +#endif goto OTHER; case FocusIn: @@ -6535,6 +6541,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) if (any_help_event_p) do_help = -1; } +#ifdef USE_GTK + /* See comment in EnterNotify above */ + else if (last_mouse_glyph_frame) + note_mouse_movement (last_mouse_glyph_frame, &event); +#endif goto OTHER; case FocusOut: diff --git a/src/xterm.h b/src/xterm.h index dfb79d9d90f..78d9bc8871c 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication with X protocol. Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -419,9 +419,6 @@ extern Lisp_Object x_display_name_list; /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ extern Lisp_Object Vx_pixel_size_width_font_regexp; -/* A flag to control how to display unibyte 8-bit character. */ -extern int unibyte_display_via_language_environment; - extern struct x_display_info *x_display_info_for_display P_ ((Display *)); extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); |